RT#73993 - updated selfservice and ngselfservice to allow for the control of changes packages by agent.

2 files changed, 10 insertions, 7 deletions

diff --git a/ng_selfservice/elements/error.php b/ng_selfservice/elements/error.php
index 2cff74f..ee60c6e 100644
--- a/ng_selfservice/elements/error.php
+++ b/ng_selfservice/elements/error.php
@@ -1,2 +1,3 @@
-<FONT SIZE="+1" COLOR="#ff0000"><? echo htmlspecialchars($error); ?><? if ($error) { echo '<BR><BR>'; } ?></FONT>
-
+<? if (isset($error)) { ?>
+	<FONT SIZE="+1" COLOR="#ff0000"><? echo htmlspecialchars($error); echo '<BR><BR>'; ?></FONT>
+<? } ?>
diff --git a/ng_selfservice/elements/menu.php b/ng_selfservice/elements/menu.php
index cb9d617..b68c8c1 100644
--- a/ng_selfservice/elements/menu.php
+++ b/ng_selfservice/elements/menu.php
@@ -32,15 +32,15 @@ extract($skin_info);
 
   foreach ($menu_array AS $menu_item) {
     if ( preg_match('/^\s*$/', $menu_item) ) {
-      print_menu($submenu, $current_menu);
+      print_menu($submenu, $current_menu, $menu_disable);
       $submenu = array();
     } else {
       $submenu[] = $menu_item;
     }
   }
-  print_menu($submenu, $current_menu);
+  print_menu($submenu, $current_menu, $menu_disable);
 
-  function print_menu($submenu_array, $current_menu) {
+  function print_menu($submenu_array, $current_menu, $menu_disable) {
     if ( count($submenu_array) == 0 ) { return; }
 
     $links = array();
@@ -71,8 +71,10 @@ extract($skin_info);
       echo '<ul>';
       foreach ($links AS $link) {
         $label = array_shift($labels);
-        print_link($link, $label, $current_menu, array($link) );
-        echo '</a></li>';
+        if ( in_array($label, $menu_disable) == 0) {
+          print_link($link, $label, $current_menu, array($link) );
+          echo '</a></li>';
+        }
       }
       echo '</ul>';
     }