X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=themes%2Faqua%2Frenderer.php;h=a5036185273ef75e67cbf5b425208b82c331a89f;hb=0d2cbe658742c6d7ed2eb09dab0abc6ee4dd1f74;hp=72e200cb4bf5481da2a68bf8d75adddcbbc97a23;hpb=d5ec96e90a4bdcecc7423ca407724415817cb372;p=fa-stable.git

diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index 72e200cb..a5036185 100644
--- a/themes/aqua/renderer.php
+++ b/themes/aqua/renderer.php
@@ -56,7 +56,7 @@
 				echo "<div class=tabs>";
 				foreach($applications as $app)
 				{
-                    if ($this->check_application_access($app))
+                    if ($_SESSION["wa_current_user"]->check_application_access($app))
                     {
 						$acc = access_string($app->name);
 						echo "<a class='".($sel_app == $app->id ? 'selected' : 'menu_tab')
@@ -144,12 +144,12 @@
 			global $path_to_root;
 			
 			$selected_app = $waapp->get_selected_application();
-			if (!$this->check_application_access($selected_app))
+			if (!$_SESSION["wa_current_user"]->check_application_access($selected_app))
 				return;
 
 			foreach ($selected_app->modules as $module)
 			{
-        		if (!$this->check_module_access($module))
+        		if (!$_SESSION["wa_current_user"]->check_module_access($module))
         			continue;
 				// image
 				echo "<tr>";
@@ -170,7 +170,7 @@
 					{
 							echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
 					}
-					elseif (!$this->hide_inaccessible_menu_items()) 
+					elseif (!$_SESSION["wa_current_user"]->hide_inaccessible_menu_items()) 
 					{
 							echo $img.'<span class="inactive">'
 								.access_string($appfunction->label, true)
@@ -190,7 +190,7 @@
 						{
 								echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
 						}
-						elseif (!$this->hide_inaccessible_menu_items()) 
+						elseif (!$_SESSION["wa_current_user"]->hide_inaccessible_menu_items()) 
 						{
 								echo $img.'<span class="inactive">'
 									.access_string($appfunction->label, true)
@@ -205,74 +205,6 @@
 
 			echo "</table>";
 		}
-
-        function check_application_access($waapp)
-        {
-            if (!$this->hide_inaccessible_menu_items())
-            {
-                return true;
-            }
-            
-            foreach ($waapp->modules as $module)
-            {
-                if ($this->check_module_access($module))
-                {
-                    return true;
-                }
-            }
-            
-            return false;
-                    
-        }
-        
-        function check_module_access($module)
-        {
-            
-            if (!$this->hide_inaccessible_menu_items())
-            {
-                return true;
-            }
-            
-            if (sizeof($module->lappfunctions) > 0)
-            {
-                foreach ($module->lappfunctions as $appfunction)
-                {
-                    if ($appfunction->label != "" && $_SESSION["wa_current_user"]->can_access_page($appfunction->access))
-                    {
-                        return true;
-                    }
-                }
-            }
-            
-            if (sizeof($module->rappfunctions) > 0)
-            {
-                foreach ($module->rappfunctions as $appfunction)
-                {
-                    if ($appfunction->label != "" && $_SESSION["wa_current_user"]->can_access_page($appfunction->access))
-                    {
-                        return true;
-                    }
-                }
-            }
-            
-            return false;
-            
-        }
-        
-        function hide_inaccessible_menu_items()
-        {
-            global $hide_inaccessible_menu_items;
-            
-            if (!isset($hide_inaccessible_menu_items) || $hide_inaccessible_menu_items == 0)
-            {
-                return false;
-            }
-            
-            else
-            {
-                return true;
-            }
-        }
 	}
 
 ?>
\ No newline at end of file