Merged changes from stable branch up to 2.3.23.

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

diff --git a/themes/default/renderer.php b/themes/default/renderer.php
index 438d87debd814313d47325cc6726937db237c720..16c6dd655b91c0bfb57e1fcd36bdba1529884967 100644 (file)
--- a/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@ -13,9 +13,9 @@
        {
                function get_icon($category)
                {
-                       global  $path_to_root, $show_menu_category_icons;
+                       global  $path_to_root, $SysPrefs;
 
-                       if ($show_menu_category_icons)
+                       if ($SysPrefs->show_menu_category_icons)
                                $img = $category == '' ? 'right.gif' : $category.'.png';
                        else    
                                $img = 'right.gif';
@@ -34,7 +34,7 @@
 
                function menu_header($title, $no_menu, $is_index)
                {
-                       global $path_to_root, $help_base_url, $db_connections;
+                       global $path_to_root, $SysPrefs, $db_connections;
                        echo "<table class='callout_main' border='0' cellpadding='0' cellspacing='0'>\n";
                        echo "<tr>\n";
                        echo "<td colspan='2' rowspan='2'>\n";
@@ -67,15 +67,14 @@
                                // top status bar
                                $img = "<img src='$local_path_to_root/themes/default/images/login.gif' width='14' height='14' border='0' alt='"._('Logout')."'>&nbsp;&nbsp;";
                                $himg = "<img src='$local_path_to_root/themes/default/images/help.gif' width='14' height='14' border='0' alt='"._('Help')."'>&nbsp;&nbsp;";
-
                                echo "<table class='logoutBar'>";
-                               echo "<tr><td class='headingtext3'>" . $db_connections[$_SESSION["wa_current_user"]->company]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
+                               echo "<tr><td class='headingtext3'>" . $db_connections[user_company()]["name"] . " | " . $_SERVER['SERVER_NAME'] . " | " . $_SESSION["wa_current_user"]->name . "</td>";
                                $indicator = "$path_to_root/themes/".user_theme(). "/images/ajax-loader.gif";
                                echo "<td class='logoutBarRight'><img id='ajaxmark' src='$indicator' align='center' style='visibility:hidden;' alt='ajaxmark'></td>";
                                echo "  <td class='logoutBarRight'><a class='shortcut' href='$path_to_root/admin/display_prefs.php?'>" . _("Preferences") . "</a>&nbsp;&nbsp;&nbsp;\n";
                                echo "  <a class='shortcut' href='$path_to_root/admin/change_current_user_password.php?selected_id=" . $_SESSION["wa_current_user"]->username . "'>" . _("Change password") . "</a>&nbsp;&nbsp;&nbsp;\n";
 
-                               if ($help_base_url != null)
+                               if ($SysPrefs->help_base_url != null)
                                {
                                        echo "$himg<a target = '_blank' onclick=" .'"'."javascript:openWindow(this.href,this.target); return false;".'" '. "href='". help_url()."'>" . _("Help") . "</a>&nbsp;&nbsp;&nbsp;";
                                }
@@ -98,8 +97,8 @@
 
                function menu_footer($no_menu, $is_index)
                {
-                       global $version, $allow_demo_mode, $app_title, $power_url,
-                               $power_by, $path_to_root, $Pagehelp, $Ajax;
+                       global $version, $path_to_root, $Pagehelp, $Ajax, $SysPrefs;
+
                        include_once($path_to_root . "/includes/date_functions.inc");
 
                        echo "</td></tr></table>\n"; // 'main_page'
@@ -123,10 +122,12 @@
                        {
                                echo "<table align='center' id='footer'>\n";
                                echo "<tr>\n";
-                               echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><font color='#ffffff'>$app_title $version - " . _("Theme:") . " " . user_theme() ." - ".show_users_online()."</font></a></td>\n";
+                               echo "<td align='center' class='footer'><a target='_blank' href='".$SysPrefs->power_url."' tabindex='-1'><font color='#ffffff'>".$SysPrefs->app_title
+                                       ." $version - " . _("Theme:") . " " . user_theme() . " - ".show_users_online()."</font></a></td>\n";
                                echo "</tr>\n";
                                echo "<tr>\n";
-                               echo "<td align='center' class='footer'><a target='_blank' href='$power_url' tabindex='-1'><font color='#ffff00'>$power_by</font></a></td>\n";
+                               echo "<td align='center' class='footer'><a target='_blank' href='".$SysPrefs->power_url
+                                       ."' tabindex='-1'><font color='#ffff00'>".$SysPrefs->power_by."</font></a></td>\n";
                                echo "</tr>\n";
                                if ($allow_demo_mode==true)
                                {
@@ -209,6 +210,5 @@
                                echo "</tr></table></td></tr>";
                        }
                        echo "</table>";
-               }
-       }
-?>
\ No newline at end of file
+       }
+}