X-Git-Url: https://delta.frontaccounting.com/gitweb/?a=blobdiff_plain;f=themes%2Fdefault%2Frenderer.php;h=438d87debd814313d47325cc6726937db237c720;hb=e79c80704f4d0bc3d3792365dfd7ebf32f9b4227;hp=6df2553f8bec5352239ef03c4690a956af193d6f;hpb=0b555ffc638a7ff241472348d7121301645b47a9;p=fa-stable.git

diff --git a/themes/default/renderer.php b/themes/default/renderer.php
index 6df2553f..438d87de 100644
--- a/themes/default/renderer.php
+++ b/themes/default/renderer.php
@@ -14,12 +14,12 @@
 		function get_icon($category)
 		{
 			global  $path_to_root, $show_menu_category_icons;
-;
+
 			if ($show_menu_category_icons)
 				$img = $category == '' ? 'right.gif' : $category.'.png';
 			else	
 				$img = 'right.gif';
-			return "<img src='$path_to_root/themes/cool/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
+			return "<img src='$path_to_root/themes/default/images/$img' style='vertical-align:middle;' border='0'>&nbsp;&nbsp;";
 		}
 
 		function wa_header()
@@ -44,30 +44,34 @@
 			echo "<td>\n";
 			echo "<table width='100%' border='0' cellpadding='0' cellspacing='0'>\n";
 			echo "<tr>\n";
-			echo "<td class='quick_menu'>\n";
+			echo "<td class='quick_menu'>\n"; // tabs
 			if (!$no_menu)
 			{
 				$applications = $_SESSION['App']->applications;
 				$local_path_to_root = $path_to_root;
-				$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;";
 				$sel_app = $_SESSION['sel_app'];
-				echo "<table cellpadding=0 cellspacing=0 width='100%'><tr><td>";
-				echo "<div class=tabs>";
+				echo "<table cellpadding='0' cellspacing='0' width='100%'><tr><td>";
+				echo "<div class='tabs'>";
 				foreach($applications as $app)
 				{
-					$acc = access_string($app->name);
-					echo "<a class='".($sel_app == $app->id ? 'selected' : 'menu_tab')
-						."' href='$local_path_to_root/index.php?application=".$app->id
-						."'$acc[1]>" .$acc[0] . "</a>";
+                    if ($_SESSION["wa_current_user"]->check_application_access($app))
+                    {
+                        $acc = access_string($app->name);
+                        echo "<a class='".($sel_app == $app->id ? 'selected' : 'menu_tab')
+                            ."' href='$local_path_to_root/index.php?application=".$app->id
+                            ."'$acc[1]>" .$acc[0] . "</a>";
+                    }
 				}
 				echo "</div>";
 				echo "</td></tr></table>";
+				// 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 "<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>";
 				$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;'></td>";
+				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";
 
@@ -80,7 +84,6 @@
 				echo "</td></tr></table>";
 			}
 			echo "</td></tr></table>";
-
 			if ($no_menu)
 				echo "<br>";
 			elseif ($title && !$is_index)
@@ -95,32 +98,32 @@
 
 		function menu_footer($no_menu, $is_index)
 		{
-			global $version, $allow_demo_mode, $app_title, $power_url, 
+			global $version, $allow_demo_mode, $app_title, $power_url,
 				$power_by, $path_to_root, $Pagehelp, $Ajax;
 			include_once($path_to_root . "/includes/date_functions.inc");
 
-			if ($no_menu == false)
+			echo "</td></tr></table>\n"; // 'main_page'
+			if ($no_menu == false) // bottom status line
 			{
 				if ($is_index)
-					echo "<table class=bottomBar>\n";
+					echo "<table class='bottomBar'>\n";
 				else
-					echo "<table class=bottomBar2>\n";
+					echo "<table class='bottomBar2'>\n";
 				echo "<tr>";
 				if (isset($_SESSION['wa_current_user'])) {
 					$phelp = implode('; ', $Pagehelp);
-					echo "<td class=bottomBarCell>" . Today() . " | " . Now() . "</td>\n";
+					echo "<td class='bottomBarCell'>" . Today() . " | " . Now() . "</td>\n";
 					$Ajax->addUpdate(true, 'hotkeyshelp', $phelp);
 					echo "<td id='hotkeyshelp'>".$phelp."</td>";
 				}
 				echo "</tr></table>\n";
 			}
-			echo "</td></tr></table></td>\n";
-			echo "</table>\n";
+			echo "</td></tr> </table>\n"; // 'callout_main'
 			if ($no_menu == false)
 			{
 				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='$power_url' tabindex='-1'><font color='#ffffff'>$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";
@@ -128,7 +131,7 @@
 				if ($allow_demo_mode==true)
 				{
 					echo "<tr>\n";
-					//echo "<td><br><div align='center'><a href='http://sourceforge.net'><img src='http://sourceforge.net/sflogo.php?group_id=89967&amp;type=5' alt='SourceForge.net Logo' width='210' height='62' border='0' align='middle' /></a></div></td>\n";
+					//echo "<td><br><div align='center'><a href='http://sourceforge.net'><img src='http://sourceforge.net/sflogo.php?group_id=89967&amp;type=5' alt='SourceForge.net Logo' width='210' height='62' border='0' align='center' /></a></div></td>\n";
 					echo "</tr>\n";
 				}
 				echo "</table><br><br>\n";
@@ -140,9 +143,20 @@
 			global $path_to_root;
 
 			$selected_app = $waapp->get_selected_application();
+			if (!$_SESSION["wa_current_user"]->check_application_access($selected_app))
+				return;
+
+			if (method_exists($selected_app, 'render_index'))
+			{
+				$selected_app->render_index();
+				return;
+			}
 
+			echo "<table width='100%' cellpadding='0' cellspacing='0'>";
 			foreach ($selected_app->modules as $module)
 			{
+        		if (!$_SESSION["wa_current_user"]->check_module_access($module))
+        			continue;
 				// image
 				echo "<tr>";
 				// values
@@ -162,7 +176,7 @@
 					{
 							echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
 					}
-					else 
+					elseif (!$_SESSION["wa_current_user"]->hide_inaccessible_menu_items())
 					{
 							echo $img.'<span class="inactive">'
 								.access_string($appfunction->label, true)
@@ -182,7 +196,7 @@
 						{
 								echo $img.menu_link($appfunction->link, $appfunction->label)."<br>\n";
 						}
-						else 
+						elseif (!$_SESSION["wa_current_user"]->hide_inaccessible_menu_items())
 						{
 								echo $img.'<span class="inactive">'
 									.access_string($appfunction->label, true)
@@ -194,9 +208,7 @@
 
 				echo "</tr></table></td></tr>";
 			}
-
 			echo "</table>";
 		}
 	}
-
 ?>
\ No newline at end of file