Mambo > Projects > Mambo CMS > SVN

Diff of /mambo/branches/4.6/administrator/components/com_categories/admin.categories.php

-revision 262, Sun Feb 12 23:43:25 2006 UTC
+revision 964, Tue Feb  6 06:05:27 2007 UTC
 Line 1
  <?php
  /**
- * @version $Id: admin.categories.php,v 1.1 2005/07/22 01:52:06 eddieajau Exp $
  * @package Mambo
  * @subpackage Categories
- * @copyright (C) 2000 - 2005 Miro International Pty Ltd
+ * @copyright  Refer to copyright.php
  * @license http://www.gnu.org/copyleft/gpl.html GNU/GPL
- * Mambo is Free Software
+ * @author Mambo Foundation Inc see README.php
  */
  /** ensure this file is being included by a parent file */
-Line 324
+Line 323
                  $types[] = mosHTML::makeOption( 'contact_category_table', T_('Contact Category Table') );
          } else
          if ($row->section == 'com_newsfeeds') {
-                 $types[] = mosHTML::makeOption( 'newsfeed_category_table', T_('Newsfeed Category Table') );
+                 $types[] = mosHTML::makeOption( 'newsfeed_category_table', T_('News Feed Category Table') );
          } else
          if ($row->section == 'com_weblinks') {
-                 $types[] = mosHTML::makeOption( 'weblink_category_table', T_('Weblink Category Table') );
+                 $types[] = mosHTML::makeOption( 'weblink_category_table', T_('Web Link Category Table') );
          } else {
                  $types[] = mosHTML::makeOption( 'content_category', T_('Content Category Table') );
                  $types[] = mosHTML::makeOption( 'content_blog_category', T_('Content Category Blog') );
-Line 556
+Line 555
          $row = new mosCategory( $database );
          $row->bind( $_POST );
+         // sanitize
+         $row->id = intval($row->id);
          $row->checkin();
          mosRedirect( 'index2.php?option=com_categories&section='. $redirect );
  }
-Line 799
+Line 800
                  case 'newsfeed_category_table':
                          $link           = 'index.php?option=com_newsfeeds&catid='. $id;
-                         $menutype       = T_('Newsfeed Category Table');
+                         $menutype       = T_('News Feed Category Table');
                          break;
                  case 'weblink_category_table':
                          $link           = 'index.php?option=com_weblinks&catid='. $id;
-                         $menutype       = T_('Weblink Category Table');
+                         $menutype       = T_('Web Link Category Table');
                          break;
                  default:;
-Line 836
+Line 837
  function saveOrder( &$cid, $section ) {
          global $database;
-         $total          = count( $cid );
          $order          = mosGetParam( $_POST, 'order', array(0) );
          $row            = new mosCategory( $database );
-         $conditions = array();
+         $sections = array();
      // update ordering values
-         for( $i=0; $i < $total; $i++ ) {
+     foreach ($cid as $i=>$ciditem) {
-                 $row->load( $cid[$i] );
+                 $row->load( $ciditem );
                  if ($row->ordering != $order[$i]) {
                          $row->ordering = $order[$i];
                  if (!$row->store()) {
                      echo "<script> alert('".$database->getErrorMsg()."'); window.history.go(-1); </script>\n";
                      exit();
-                 } // if
+                 }
                  // remember to updateOrder this group
-                 $condition = "section='$row->section'";
+                 $sections[$row->section] = $row->id;
-                 $found = false;
+             }
-                 foreach ( $conditions as $cond )
+         }
-                     if ($cond[1]==$condition) {
-                         $found = true;
-                         break;
-                     } // if
-                 if (!$found) $conditions[] = array($row->id, $condition);
-                 } // if
-         } // for
          // execute updateOrder for each group
-         foreach ( $conditions as $cond ) {
+         foreach ($sections as $section=>$rowid) {
-                 $row->load( $cond[0] );
+                 $row->updateOrder("section='$section'");
-                 $row->updateOrder( $cond[1] );
          } // foreach
          $msg    = T_('New ordering saved');
          mosRedirect( 'index2.php?option=com_categories&section='. $section, $msg );
  } // saveOrder

 Legend:



Removed from v.262
 


changed lines


 
Added in v.964
 Legend:



Removed from v.262
 


changed lines


 
Added in v.964
-Removed from v.262
+Added in v.964

	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_categories/admin.categories.php