Moved access functions from renderer to current_user. They were cluttered into all...

diff --git a/includes/current_user.inc b/includes/current_user.inc
index 512d09f02de223d4486d623a5306f442d6bbcf58..3c5a92a82f9c4d0af0f17e2e758ac43b91ff4e37 100644 (file)
--- a/includes/current_user.inc
+++ b/includes/current_user.inc
@@ -163,6 +163,74 @@ class current_user
                return $this->can_access($page_level);
        }
 
+       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 != "" && $this->can_access_page($appfunction->access))
+                               {
+                                       return true;
+                               }
+                       }
+               }
+
+               if (sizeof($module->rappfunctions) > 0)
+               {
+                       foreach ($module->rappfunctions as $appfunction)
+                       {
+                               if ($appfunction->label != "" && $this->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;
+               }
+       }
+
        function set_db_connection($id = -1)
        {
                return set_global_connection($id);
@@ -571,4 +639,5 @@ function company_path($comp=null)
                        . '/'.$comp;
 }
 
+
 ?>
\ No newline at end of file

diff --git a/themes/aqua/renderer.php b/themes/aqua/renderer.php
index 72e200cb4bf5481da2a68bf8d75adddcbbc97a23..a5036185273ef75e67cbf5b425208b82c331a89f 100644 (file)
--- 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

diff --git a/themes/cool/renderer.php b/themes/cool/renderer.php
index 8ce153f2a128f17eeaba66703001574f85953d91..bb5621356f31fe1f3b428d200fb267ae682ec22b 100644 (file)
--- a/themes/cool/renderer.php
+++ b/themes/cool/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')
@@ -143,12 +143,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>";
@@ -169,7 +169,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)
@@ -189,7 +189,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)
@@ -204,74 +204,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

diff --git a/themes/default/renderer.php b/themes/default/renderer.php
index 08d015abf77720543ab536995768f780b45cff2f..e32cbb46876460cd79495dce09593d8a09bfbaa1 100644 (file)
--- a/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@ -35,7 +35,7 @@
 
                function menu_header($title, $no_menu, $is_index)
                {
-                       global $path_to_root, $help_base_url, $db_connections, $show_inaccessible_menu_items;
+                       global $path_to_root, $help_base_url, $db_connections;
                        echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
                        echo "<tr>\n";
                        echo "<td colspan='2' rowspan='2'>\n";
@@ -57,7 +57,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,11 +144,11 @@
                        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>";
@@ -169,7 +169,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)
@@ -189,7 +189,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)
@@ -203,74 +203,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;
-            }
-        }
     }