From dcec02e56ebdd313483e3b692a50631396190c88 Mon Sep 17 00:00:00 2001 From: lia Date: Sat, 13 Jan 2007 23:21:24 +0000 Subject: [PATCH] content: small correction to IE7 fix --- e107_plugins/content/admin_content_config.php | 12 ++++++------ e107_plugins/content/handlers/content_db_class.php | 13 ++++--------- .../content/handlers/content_form_class.php | 13 +++++++------ 3 files changed, 17 insertions(+), 21 deletions(-) diff --git a/e107_plugins/content/admin_content_config.php b/e107_plugins/content/admin_content_config.php index 84519ae87..f695c2ee9 100644 --- a/e107_plugins/content/admin_content_config.php +++ b/e107_plugins/content/admin_content_config.php @@ -12,8 +12,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/content/admin_content_config.php,v $ -| $Revision: 1.3 $ -| $Date: 2007-01-13 22:33:02 $ +| $Revision: 1.4 $ +| $Date: 2007-01-13 23:18:39 $ | $Author: lisa_ $ +---------------------------------------------------------------+ */ @@ -188,7 +188,7 @@ if(isset($_POST['uploadcaticon'])){ } if(isset($_POST['create_category'])){ - if($_POST['cat_heading'] && $_POST['parent'] != "none"){ + if($_POST['cat_heading'] && $_POST['parent1'] != "none"){ $adb -> dbCategory("create"); }else{ $message = CONTENT_ADMIN_ITEM_LAN_0; @@ -196,7 +196,7 @@ if(isset($_POST['create_category'])){ } if(isset($_POST['update_category'])){ - if($_POST['cat_heading'] && $_POST['parent'] != "none"){ + if($_POST['cat_heading'] && $_POST['parent1'] != "none"){ $adb -> dbCategory("update"); }else{ $message = CONTENT_ADMIN_ITEM_LAN_0; @@ -204,7 +204,7 @@ if(isset($_POST['update_category'])){ } if(isset($_POST['create_content'])){ - if($_POST['content_text'] && $_POST['content_heading'] && $_POST['content_author_name'] && $_POST['parent'] != "none"){ + if($_POST['content_text'] && $_POST['content_heading'] && $_POST['content_author_name'] && $_POST['parent1'] != "none"){ //$adb -> dbContentCreate("admin"); $adb -> dbContent("create", ""); }else{ @@ -213,7 +213,7 @@ if(isset($_POST['create_content'])){ } if(isset($_POST['update_content'])){ - if($_POST['content_text'] && $_POST['content_heading'] && $_POST['content_author_name'] && $_POST['content_heading'] && $_POST['parent'] != "none"){ + if($_POST['content_text'] && $_POST['content_heading'] && $_POST['content_author_name'] && $_POST['content_heading'] && $_POST['parent1'] != "none"){ //$adb -> dbContentUpdate("admin"); $adb -> dbContent("update", ""); }else{ diff --git a/e107_plugins/content/handlers/content_db_class.php b/e107_plugins/content/handlers/content_db_class.php index 208b4aa60..57b851af6 100644 --- a/e107_plugins/content/handlers/content_db_class.php +++ b/e107_plugins/content/handlers/content_db_class.php @@ -12,8 +12,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/content/handlers/content_db_class.php,v $ -| $Revision: 1.3 $ -| $Date: 2007-01-13 22:33:03 $ +| $Revision: 1.4 $ +| $Date: 2007-01-13 23:18:39 $ | $Author: lisa_ $ +---------------------------------------------------------------+ */ @@ -32,7 +32,7 @@ if(isset($_POST['uploadfile'])){ if($_POST['uploadtype']){ $pref['upload_storagetype'] = "1"; require_once(e_HANDLER."upload_handler.php"); - $mainparent = $aa -> getMainParent(intval($_POST['parent'])); + $mainparent = $aa -> getMainParent(intval($_POST['parent1'])); $content_pref = $aa -> getContentPref($mainparent); if($_POST['content_id']){ @@ -123,7 +123,6 @@ class contentdb{ $_POST['content_text'] = $tp -> toDB($_POST['content_text']); $_POST['content_class'] = ($_POST['content_class'] ? intval($_POST['content_class']) : "0"); $_POST['content_meta'] = $tp -> toDB($_POST['content_meta']); - //$_POST['parent'] = ($_POST['parent'] ? intval($_POST['parent']) : "0"); //content create if( isset($qs[0]) && $qs[0]=='content' && isset($qs[1]) && ($qs[1]=='create' || $qs[1]=='submit') && isset($qs[2]) && is_numeric($qs[2]) ){ @@ -141,10 +140,6 @@ class contentdb{ $_POST['parent'] = $parent; - - - - if(USER){ if($_POST['content_author_id']){ if(!($_POST['content_author_id'] == USERID && $_POST['content_author_name'] == USERNAME && $_POST['content_author_email'] == USEREMAIL) ){ @@ -355,7 +350,7 @@ class contentdb{ //category create if( isset($qs[0]) && $qs[0]=='cat' && isset($qs[1]) && $qs[1]=='create' ){ if( isset($qs[2]) && is_numeric($qs[2]) ){ - $parent = intval($qs[2]); + $parent = "0.".intval($qs[2]); }else{ $parent = 0; } diff --git a/e107_plugins/content/handlers/content_form_class.php b/e107_plugins/content/handlers/content_form_class.php index 68f572d7b..5075bcd69 100644 --- a/e107_plugins/content/handlers/content_form_class.php +++ b/e107_plugins/content/handlers/content_form_class.php @@ -12,8 +12,8 @@ | GNU General Public License (http://gnu.org). | | $Source: /cvs_backup/e107_0.8/e107_plugins/content/handlers/content_form_class.php,v $ -| $Revision: 1.2 $ -| $Date: 2007-01-13 22:33:03 $ +| $Revision: 1.3 $ +| $Date: 2007-01-13 23:18:39 $ | $Author: lisa_ $ +---------------------------------------------------------------+ */ @@ -91,8 +91,9 @@ class contentform{ {CONTENT_CONTENT_PREVIEW_PAGENAMES} \n"; - $_POST['parent'] = intval($_POST['parent']); - $mainparent = $aa -> getMainParent( $_POST['parent'] ); + $tmp = explode(".",$_POST['parent1']); + $_POST['parent1'] = $tmp[1]; + $mainparent = $aa -> getMainParent( $_POST['parent1'] ); $content_pref = $aa -> getContentPref($mainparent); $content_cat_icon_path_large = $tp -> replaceConstants($content_pref["content_cat_icon_path_large"]); $content_cat_icon_path_small = $tp -> replaceConstants($content_pref["content_cat_icon_path_small"]); @@ -108,7 +109,7 @@ class contentform{ $content_tmppath_file = $tp -> replaceConstants($content_pref["content_file_path_tmp"]); $content_tmppath_image = $tp -> replaceConstants($content_pref["content_image_path_tmp"]); - if($sql -> db_Select("pcontent", "content_heading", " content_id='".$_POST['parent']."' ")){ + if($sql -> db_Select("pcontent", "content_heading", " content_id='".$_POST['parent1']."' ")){ $row = $sql -> db_Fetch(); $PARENT = $row['content_heading']; } @@ -127,7 +128,7 @@ class contentform{ } $content_text = $tp->post_toHTML($content_text,TRUE); - $CONTENT_CONTENT_PREVIEW_CATEGORY = ($_POST['parent'] ? $TRPRE.$TDPRE1.CONTENT_ADMIN_ITEM_LAN_57.$TDPOST.$TDPRE2.$PARENT.$TDPOST.$TRPOST : ""); + $CONTENT_CONTENT_PREVIEW_CATEGORY = ($_POST['parent1'] ? $TRPRE.$TDPRE1.CONTENT_ADMIN_ITEM_LAN_57.$TDPOST.$TDPRE2.$PARENT.$TDPOST.$TRPOST : ""); $CONTENT_CONTENT_PREVIEW_HEADING = ($content_heading ? $TRPRE.$TDPRE1.CONTENT_ADMIN_ITEM_LAN_11.$TDPOST.$TDPRE2.$content_heading.$TDPOST.$TRPOST : ""); $CONTENT_CONTENT_PREVIEW_SUBHEADING = ($content_subheading ? $TRPRE.$TDPRE1.CONTENT_ADMIN_ITEM_LAN_16.$TDPOST.$TDPRE2.$content_subheading.$TDPOST.$TRPOST : ""); $CONTENT_CONTENT_PREVIEW_SUMMARY = ($content_summary ? $TRPRE.$TDPRE1.CONTENT_ADMIN_ITEM_LAN_17.$TDPOST.$TDPRE2.$content_summary.$TDPOST.$TRPOST : "");