Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.6/administrator/components/com_menumanager/admin.menumanager.php

-revision 117, Sat Jan  7 21:26:39 2006 UTC
+revision 165, Mon Jan 23 04:35:36 2006 UTC
 Line 97
                  $i++;
          }
-         $menuhandler = mosMenuHandler::getInstance();
+         // Query to get published menu item counts
+         $query = "SELECT a.menutype, count( a.menutype ) as num"
+         . "\n FROM #__menu AS a"
+         . "\n WHERE a.published = 1"
+         . "\n GROUP BY a.menutype"
+         . "\n ORDER BY a.menutype"
+         ;
+         $database->setQuery( $query );
+         $published = $database->loadObjectList();
+         // Query to get unpublished menu item counts
+         $query = "SELECT a.menutype, count( a.menutype ) as num"
+         . "\n FROM #__menu AS a"
+         . "\n WHERE a.published = 0"
+         . "\n GROUP BY a.menutype"
+         . "\n ORDER BY a.menutype"
+         ;
+         $database->setQuery( $query );
+         $unpublished = $database->loadObjectList();
+         if (!$unpublished) $unpublished = array();
+         // Query to get trash menu item counts
+         $query = "SELECT a.menutype, count( a.menutype ) as num"
+         . "\n FROM #__menu AS a"
+         . "\n WHERE a.published = -2"
+         . "\n GROUP BY a.menutype"
+         . "\n ORDER BY a.menutype"
+         ;
+         $database->setQuery( $query );
+         $trash = $database->loadObjectList();
+         if (!$trash) $trash = array();
          for( $i = 0; $i < $total; $i++ ) {
-                 $count = $menuhandler->getMenuCount($menus[$i]->type, 1);
+                 // adds published count
-                 $menus[$i]->published = $count ? $count : '-';
+                 foreach ( $published as $count ) {
-                 $count = $menuhandler->getMenuCount($menus[$i]->type, 0);
+                         if ( $menus[$i]->type == $count->menutype ) {
-                 $menus[$i]->unpublished = $count ? $count : '-';
+                                 $menus[$i]->published = $count->num;
-                 $count = $menuhandler->getMenuCount($menus[$i]->type, -2);
+                         }
-                 $menus[$i]->trash = $count ? $count : '-';
+                 }
+                 if ( @!$menus[$i]->published ) {
+                         $menus[$i]->published = '-';
+                 }
+                 // adds unpublished count
+                 foreach ( $unpublished as $count ) {
+                         if ( $menus[$i]->type == $count->menutype ) {
+                                 $menus[$i]->unpublished = $count->num;
+                         }
+                 }
+                 if ( @!$menus[$i]->unpublished ) {
+                         $menus[$i]->unpublished = '-';
+                 }
+                 // adds trash count
+                 foreach ( $trash as $count ) {
+                         if ( $menus[$i]->type == $count->menutype ) {
+                                 $menus[$i]->trash = $count->num;
+                         }
+                 }
+                 if ( @!$menus[$i]->trash ) {
+                         $menus[$i]->trash = '-';
+                 }
          }
          require_once( $GLOBALS['mosConfig_absolute_path'] . '/administrator/includes/pageNavigation.php' );
-Line 153
+Line 204
          // block to stop renaming of 'mainmenu' menutype
          if ( $old_menutype == 'mainmenu' ) {
                  if ( $menutype <> 'mainmenu' ) {
-                         echo "<script> alert('You cannot rename the \'mainmenu\' Menu as this will disrupt the proper operation of Mambo'); window.history.go(-1); </script>\n";
+                         echo "<script> alert(".T_('You cannot rename the "mainmenu" Menu as this will disrupt the proper operation of Mambo')."); window.history.go(-1); </script>\n";
                          exit;
                  }
          }
-Line 166
+Line 217
          $database->setQuery( $query );
          $menus = $database->loadResultArray();
          foreach ( $menus as $menu ) {
-                 $params = mosParseParams( $menu );
+                 $pparser = new mosParameters($menu);
+                 $params = $pparser->getParams();
                  if ( $params->menutype == $menutype ) {
-                         echo "<script> alert('A menu already exists with that name - you must enter a unique Menu Name'); window.history.go(-1); </script>\n";
+                         echo "<script> alert(".T_('A menu already exists with that name - you must enter a unique Menu Name')."); window.history.go(-1); </script>\n";
                          exit;
                  }
          }
-Line 203
+Line 255
                                  exit();
                          }
-                         $msg = 'New Menu created [ '. $menutype .' ]';
+                         $msg = sprintf(T_('New Menu created [ %s ]'), $menutype);
                          break;
                  default:
-Line 221
+Line 273
                                  $row->load( $module );
                                  $save = 0;
-                                 $params = mosParseParams( $row->params );
+                                 $pparser = new mosParameters($row->params);
+                                 $params = $pparser->getParams();
                                  if ( $params->menutype == $old_menutype ) {
                                          $params->menutype       = $menutype;
                                          $save                           = 1;
-Line 256
+Line 309
                                  $database->query();
                          }
-                         $msg = 'Menu Items & Modules updated';
+                         $msg = T_('Menu Items & Modules updated');
                          break;
          }
-Line 270
+Line 323
          global $database;
          if ( $type == 'mainmenu' ) {
-                 echo "<script> alert('You cannot delete the \'mainmenu\' menu as it is core menu'); window.history.go(-1); </script>\n";
+                 echo "<script> alert(".T_('You cannot delete the "mainmenu" menu as it is a core menu')."); window.history.go(-1); </script>\n";
                  exit();
          }
          // list of menu items to delete
-         $menuhandler = mosMenuHandler::getInstance();
+         $query =        "SELECT a.name, a.id"
-         $items =& $menuhandler->getMenusByType($type);
+         . "\n FROM #__menu AS a"
+         . "\n WHERE ( a.menutype IN ( '$type' ) )"
+         . "\n ORDER BY a.name"
+         ;
+         $database->setQuery( $query );
+         $items = $database->loadObjectList();
          // list of modules to delete
          $query = "SELECT id"
-Line 290
+Line 348
          foreach ( $mods as $module ) {
                  $row = new mosModule( $database );
                  $row->load( $module );
+                 $pparser = new mosParameters($row->params);
-                 $params = mosParseParams( $row->params );
+                 $params = $pparser->getParams();
                  if ( $params->menutype == $type ) {
                          $mid[] = $module;
                  }
-Line 315
+Line 373
          global $database;
          if ( $type == 'mainmenu' ) {
-                 echo "<script> alert('You cannot delete the \'mainmenu\' menu as it is core menu'); window.history.go(-1); </script>\n";
+                 echo "<script> alert(".T_('You cannot delete the "mainmenu" menu as it is a core menu')."); window.history.go(-1); </script>\n";
                  exit();
          }
-Line 374
+Line 432
          global $database;
          // Content Items query
-         $menuhandler = mosMenuHandler::getInstance();
+         $query =        "SELECT a.name, a.id"
-         $items =& $menuhandler->getMenusByType($type);
+         . "\n FROM #__menu AS a"
+         . "\n WHERE ( a.menutype IN ( '". $type ."' ) )"
+         . "\n ORDER BY a.name"
+         ;
+         $database->setQuery( $query );
+         $items = $database->loadObjectList();
          HTML_menumanager::showCopy( $option, $type, $items );
  }
-Line 398
+Line 461
          $database->setQuery( $query );
          $menus = $database->loadResultArray();
          foreach ( $menus as $menu ) {
-                 $params = mosParseParams( $menu );
+                 $pparser = new mosParameters($menu);
+                 $params = $pparser->getParams();
                  if ( $params->menutype == $menu_name ) {
-                         echo "<script> alert('A menu already exists with that name - you must enter a unique Menu Name'); window.history.go(-1); </script>\n";
+                         echo "<script> alert(".T_('A menu with that name already exists - you must enter a unique Menu Name')."); window.history.go(-1); </script>\n";
                          exit;
                  }
          }
-Line 460
+Line 524
                  exit();
          }
-         $msg = 'Copy of Menu `'. $type .'` created, consisting of '. $total .' items';
+         $msg = sprintf(Tn_('Copy of Menu `%s` created, consisting of %d item', 'Copy of Menu `%s` created, consisting of %d items', $total), $type, $total);
          mosRedirect( 'index2.php?option=' . $option, $msg );
  }

 Legend:



Removed from v.117
 


changed lines


 
Added in v.165
 Legend:



Removed from v.117
 


changed lines


 
Added in v.165
-Removed from v.117
+Added in v.165

	ViewVC Help
Powered by ViewVC 1.0.0

Web Hosting provided by Network Redux.

MyGforge Home

Mambo CMS

Diff of /mambo/branches/4.6/administrator/components/com_menumanager/admin.menumanager.php