airtime menu now uses ACL with the custom viewscript.

application/configs/ACL.php

@@ -4,9 +4,9 @@ require_once 'Acl_plugin.php';
 
 $ccAcl = new Zend_Acl();
 
-$ccAcl->addRole(new Zend_Acl_Role('guest'))
-      ->addRole(new Zend_Acl_Role('host'), 'guest')
-      ->addRole(new Zend_Acl_Role('admin'), 'host');
+$ccAcl->addRole(new Zend_Acl_Role('G'))
+      ->addRole(new Zend_Acl_Role('H'), 'G')
+      ->addRole(new Zend_Acl_Role('A'), 'H');
 
 $ccAcl->add(new Zend_Acl_Resource('library'))
 	  ->add(new Zend_Acl_Resource('index'))
@@ -23,19 +23,19 @@ $ccAcl->add(new Zend_Acl_Resource('library'))
       ->add(new Zend_Acl_Resource('preference'));
 
 /** Creating permissions */
-$ccAcl->allow('guest', 'index')
-	  ->allow('guest', 'login')
-	  ->allow('guest', 'error')
-	  ->allow('guest', 'nowplaying')
-	  ->allow('guest', 'api')
-      ->allow('guest', 'schedule')
-      ->allow('host', 'library')
-      ->allow('host', 'search')
-      ->allow('host', 'plupload')
-	  ->allow('host', 'playlist')
-	  ->allow('host', 'sideplaylist')
-	  ->allow('admin', 'user')
-      ->allow('admin', 'preference');
+$ccAcl->allow('G', 'index')
+	  ->allow('G', 'login')
+	  ->allow('G', 'error')
+	  ->allow('G', 'nowplaying')
+	  ->allow('G', 'api')
+      ->allow('G', 'schedule')
+      ->allow('H', 'library')
+      ->allow('H', 'search')
+      ->allow('H', 'plupload')
+	  ->allow('H', 'playlist')
+	  ->allow('H', 'sideplaylist')
+	  ->allow('A', 'user')
+      ->allow('A', 'preference');
 
 $aclPlugin = new Zend_Controller_Plugin_Acl($ccAcl);
 

application/configs/navigation.php

@@ -13,7 +13,7 @@ $pages = array(
         'module'     => 'default',
         'controller' => 'Nowplaying',
         'action'     => 'index',
-        'resource'	=>	'Nowplaying'
+        'resource'	=>	'nowplaying'
 	),
 	array(
 		'label'      => 'Schedule',

application/controllers/plugins/Acl_plugin.php

@@ -24,7 +24,7 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
      * @param $roleName
      * @return void
      **/
-    public function __construct(Zend_Acl $aclData, $roleName = 'guest')
+    public function __construct(Zend_Acl $aclData, $roleName = 'G')
     {
         $this->_errorPage = array('module' => 'default', 
                                   'controller' => 'error', 
@@ -71,8 +71,7 @@ class Zend_Controller_Plugin_Acl extends Zend_Controller_Plugin_Abstract
 
 	public function setRoleName($type)
 	{
-		$roles = array("A" => "admin", "H" => "host", "G" => "guest");
-		$this->_roleName = $roles[$type];
+		$this->_roleName = $type;
 	}
 
     /**

application/views/scripts/menu.phtml

@@ -1,5 +1,6 @@
 <ul id="nav">
 <?php foreach ($this->container as $page) : ?>
+    <?php if($this->navigation()->accept($page)) : ?>
 	    <li class="top">
 		    <?php if($page->hasPages()) : ?>
 		    <a class="top_link" href="<?php echo $page->getHref(); ?>">
@@ -18,5 +19,6 @@
 		    </a>
 		    <?php endif; ?>
 	    </li>
+    <?php endif; ?>
 <?php endforeach; ?>
 </ul>