[imc-sf-coders] CVS update of sf-active/sf-active/shared/classes/pages (3 files)

[Bart M]

    Date: Saturday, December 31, 2005 @ 11:12:59
  Author: pseudopunk
    Path: /cvsroot/sf-active/sf-active/sf-active/shared/classes/pages

Modified: feature_copy.inc feature_display_copy.inc feature_update.inc

fixed 'feature copy', closes bug #388


Index: sf-active/sf-active/shared/classes/pages/feature_copy.inc
diff -u sf-active/sf-active/shared/classes/pages/feature_copy.inc:1.4 sf-active/sf-active/shared/classes/pages/feature_copy.inc:1.5
--- sf-active/sf-active/shared/classes/pages/feature_copy.inc:1.4	Sun Sep 11 22:43:23 2005
+++ sf-active/sf-active/shared/classes/pages/feature_copy.inc	Sat Dec 31 11:12:59 2005
@@ -18,7 +18,10 @@
 		$cat_dict=$cat_obj->get_category_fields($_POST['category']);
 		$category_name=$cat_dict["name"];
             	$_SESSION['category_name'] = $category_name;
+		$display=true;
+		include_once(SF_ADMIN_URL.'/admin_header.inc');
 		include_once("feature_display_edit.php");
+		include_once(SF_ADMIN_URL.'/admin_footer.inc');
 		return 1;
 	}else{
 		include_once("feature_display_copy.php");
Index: sf-active/sf-active/shared/classes/pages/feature_display_copy.inc
diff -u sf-active/sf-active/shared/classes/pages/feature_display_copy.inc:1.10 sf-active/sf-active/shared/classes/pages/feature_display_copy.inc:1.11
--- sf-active/sf-active/shared/classes/pages/feature_display_copy.inc:1.10	Sun Sep 11 22:43:23 2005
+++ sf-active/sf-active/shared/classes/pages/feature_display_copy.inc	Sat Dec 31 11:12:59 2005
@@ -19,7 +19,6 @@
      */
     function execute()
     {
-		include_once(SF_SHARED_PATH . '/classes/category_class.inc');
 		$this->tkeys['local_title1']=$_POST['title1'];
 		$this->tkeys['local_title2']=$_POST['title2'];	
                 $this->tkeys['local_display_date']=$_POST['display_date'];
@@ -31,13 +30,10 @@
                 $this->tkeys['local_template']=$_POST['template_name'];	
                 $this->tkeys['local_image']=$_POST['image'];
 		$this->tkeys['local_language_id']=$_POST['language_id'];
-        	$cat_opt = new Category;
-		/* replace this by a static variant.
-        	$cat_options = $cat_opt->get_feature_assoc_list(); */
 		$this->tkeys['feature_options'] = $this->get_cached_var('feature_options');
-
-        	$this->tkeys['category_select'] = $this->make_select_form("category", $cat_options, 		$_POST['category']);  
-		$this->tkeys['local_form_action']='feature_copy.php';	
+		$this->tkeys['feature_options'][0] = $this->tr->trans('select_a_category');
+		ksort($this->tkeys['feature_options']);
+		//        	$this->tkeys['category_select'] = $this->make_select_form("category", $cat_options, 		$_POST['category']);  
 		$this->tkeys['local_history_link']="";
         return 1;
     }
Index: sf-active/sf-active/shared/classes/pages/feature_update.inc
diff -u sf-active/sf-active/shared/classes/pages/feature_update.inc:1.9 sf-active/sf-active/shared/classes/pages/feature_update.inc:1.10
--- sf-active/sf-active/shared/classes/pages/feature_update.inc:1.9	Sun Sep 11 22:43:23 2005
+++ sf-active/sf-active/shared/classes/pages/feature_update.inc	Sat Dec 31 11:12:59 2005
@@ -12,7 +12,10 @@
     function feature_update()
     {
 	if (strlen($_POST['copy'])>0){
+		$display=true;
+		include_once(SF_ADMIN_URL.'/admin_header.inc');
 		include_once("feature_display_copy.php");
+		include_once(SF_ADMIN_URL.'/admin_footer.inc');
 		//header("Location: feature_display_copy.php");
 		exit;
 	}