Implemented Selectable Print Orientation (Portrait, Landscape) for all reports in...

[fa-stable.git] / themes / default / renderer.php

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;
-            }
-        }
     }