[prev in list] [next in list] [prev in thread] [next in thread] 

List:       tep-commits
Subject:    [TEP-COMMIT] CVS: admin/admin categories.php,1.145,1.146
From:       Harald Ponce de Leon <hpdl () users ! sourceforge ! net>
Date:       2003-07-11 14:40:30
[Download RAW message or body]

Update of /cvsroot/tep/admin/admin
In directory sc8-pr-cvs1:/tmp/cvs-serv26511

Modified Files:
	categories.php 
Log Message:
fix bug 1226 - prevent categories being moved into one of their child
categories


Index: categories.php
===================================================================
RCS file: /cvsroot/tep/admin/admin/categories.php,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- categories.php	30 Jun 2003 14:29:20 -0000	1.145
+++ categories.php	11 Jul 2003 14:40:27 -0000	1.146
@@ -168,15 +168,24 @@
           $categories_id = tep_db_prepare_input($HTTP_POST_VARS['categories_id']);
           $new_parent_id = \
tep_db_prepare_input($HTTP_POST_VARS['move_to_category_id']);  
-          tep_db_query("update " . TABLE_CATEGORIES . " set parent_id = '" . \
(int)$new_parent_id . "', last_modified = now() where categories_id = '" . \
(int)$categories_id . "'"); +          $path = explode('_', \
tep_get_generated_category_path_ids($new_parent_id));  
-          if (USE_CACHE == 'true') {
-            tep_reset_cache_block('categories');
-            tep_reset_cache_block('also_purchased');
+          if (in_array($categories_id, $path)) {
+            $messageStack->add_session(ERROR_CANNOT_MOVE_CATEGORY_TO_PARENT, \
'error'); +
+            tep_redirect(tep_href_link(FILENAME_CATEGORIES, 'cPath=' . $cPath . \
'&cID=' . $categories_id)); +          } else {
+            tep_db_query("update " . TABLE_CATEGORIES . " set parent_id = '" . \
(int)$new_parent_id . "', last_modified = now() where categories_id = '" . \
(int)$categories_id . "'"); +
+            if (USE_CACHE == 'true') {
+              tep_reset_cache_block('categories');
+              tep_reset_cache_block('also_purchased');
+            }
+
+            tep_redirect(tep_href_link(FILENAME_CATEGORIES, 'cPath=' . \
$new_parent_id . '&cID=' . $categories_id));  }
         }
 
-        tep_redirect(tep_href_link(FILENAME_CATEGORIES, 'cPath=' . $new_parent_id . \
'&cID=' . $categories_id));  break;
       case 'move_product_confirm':
         $products_id = tep_db_prepare_input($HTTP_POST_VARS['products_id']);
@@ -910,9 +919,9 @@
       case 'move_category':
         $heading[] = array('text' => '<b>' . TEXT_INFO_HEADING_MOVE_CATEGORY . \
'</b>');  
-        $contents = array('form' => tep_draw_form('categories', FILENAME_CATEGORIES, \
'action=move_category_confirm') . tep_draw_hidden_field('categories_id', \
$cInfo->categories_id)); +        $contents = array('form' => \
tep_draw_form('categories', FILENAME_CATEGORIES, \
'action=move_category_confirm&cPath=' . $cPath) . \
                tep_draw_hidden_field('categories_id', $cInfo->categories_id));
         $contents[] = array('text' => sprintf(TEXT_MOVE_CATEGORIES_INTRO, \
                $cInfo->categories_name));
-        $contents[] = array('text' => '<br>' . sprintf(TEXT_MOVE, \
$cInfo->categories_name) . '<br>' . tep_draw_pull_down_menu('move_to_category_id', \
tep_get_category_tree('0', '', $cInfo->categories_id), $current_category_id)); +      \
$contents[] = array('text' => '<br>' . sprintf(TEXT_MOVE, $cInfo->categories_name) . \
'<br>' . tep_draw_pull_down_menu('move_to_category_id', tep_get_category_tree(), \
$current_category_id));  $contents[] = array('align' => 'center', 'text' => '<br>' . \
tep_image_submit('button_move.gif', IMAGE_MOVE) . ' <a href="' . \
tep_href_link(FILENAME_CATEGORIES, 'cPath=' . $cPath . '&cID=' . \
$cInfo->categories_id) . '">' . tep_image_button('button_cancel.gif', IMAGE_CANCEL) . \
'</a>');  break;
       case 'delete_product':



-------------------------------------------------------
This SF.Net email sponsored by: Parasoft
Error proof Web apps, automate testing & more.
Download & eval WebKing and get a free book.
www.parasoft.com/bulletproofapps1
_______________________________________________
Tep-commits mailing list
Tep-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/tep-commits


[prev in list] [next in list] [prev in thread] [next in thread]