mirror of
https://github.com/e107inc/e107.git
synced 2025-08-06 06:38:00 +02:00
content: small correction to IE7 fix
This commit is contained in:
@@ -12,8 +12,8 @@
|
|||||||
| GNU General Public License (http://gnu.org).
|
| GNU General Public License (http://gnu.org).
|
||||||
|
|
|
|
||||||
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/admin_content_config.php,v $
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/admin_content_config.php,v $
|
||||||
| $Revision: 1.3 $
|
| $Revision: 1.4 $
|
||||||
| $Date: 2007-01-13 22:33:02 $
|
| $Date: 2007-01-13 23:18:39 $
|
||||||
| $Author: lisa_ $
|
| $Author: lisa_ $
|
||||||
+---------------------------------------------------------------+
|
+---------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
@@ -188,7 +188,7 @@ if(isset($_POST['uploadcaticon'])){
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_POST['create_category'])){
|
if(isset($_POST['create_category'])){
|
||||||
if($_POST['cat_heading'] && $_POST['parent'] != "none"){
|
if($_POST['cat_heading'] && $_POST['parent1'] != "none"){
|
||||||
$adb -> dbCategory("create");
|
$adb -> dbCategory("create");
|
||||||
}else{
|
}else{
|
||||||
$message = CONTENT_ADMIN_ITEM_LAN_0;
|
$message = CONTENT_ADMIN_ITEM_LAN_0;
|
||||||
@@ -196,7 +196,7 @@ if(isset($_POST['create_category'])){
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_POST['update_category'])){
|
if(isset($_POST['update_category'])){
|
||||||
if($_POST['cat_heading'] && $_POST['parent'] != "none"){
|
if($_POST['cat_heading'] && $_POST['parent1'] != "none"){
|
||||||
$adb -> dbCategory("update");
|
$adb -> dbCategory("update");
|
||||||
}else{
|
}else{
|
||||||
$message = CONTENT_ADMIN_ITEM_LAN_0;
|
$message = CONTENT_ADMIN_ITEM_LAN_0;
|
||||||
@@ -204,7 +204,7 @@ if(isset($_POST['update_category'])){
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_POST['create_content'])){
|
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 -> dbContentCreate("admin");
|
||||||
$adb -> dbContent("create", "");
|
$adb -> dbContent("create", "");
|
||||||
}else{
|
}else{
|
||||||
@@ -213,7 +213,7 @@ if(isset($_POST['create_content'])){
|
|||||||
}
|
}
|
||||||
|
|
||||||
if(isset($_POST['update_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 -> dbContentUpdate("admin");
|
||||||
$adb -> dbContent("update", "");
|
$adb -> dbContent("update", "");
|
||||||
}else{
|
}else{
|
||||||
|
@@ -12,8 +12,8 @@
|
|||||||
| GNU General Public License (http://gnu.org).
|
| GNU General Public License (http://gnu.org).
|
||||||
|
|
|
|
||||||
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/handlers/content_db_class.php,v $
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/handlers/content_db_class.php,v $
|
||||||
| $Revision: 1.3 $
|
| $Revision: 1.4 $
|
||||||
| $Date: 2007-01-13 22:33:03 $
|
| $Date: 2007-01-13 23:18:39 $
|
||||||
| $Author: lisa_ $
|
| $Author: lisa_ $
|
||||||
+---------------------------------------------------------------+
|
+---------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
@@ -32,7 +32,7 @@ if(isset($_POST['uploadfile'])){
|
|||||||
if($_POST['uploadtype']){
|
if($_POST['uploadtype']){
|
||||||
$pref['upload_storagetype'] = "1";
|
$pref['upload_storagetype'] = "1";
|
||||||
require_once(e_HANDLER."upload_handler.php");
|
require_once(e_HANDLER."upload_handler.php");
|
||||||
$mainparent = $aa -> getMainParent(intval($_POST['parent']));
|
$mainparent = $aa -> getMainParent(intval($_POST['parent1']));
|
||||||
$content_pref = $aa -> getContentPref($mainparent);
|
$content_pref = $aa -> getContentPref($mainparent);
|
||||||
|
|
||||||
if($_POST['content_id']){
|
if($_POST['content_id']){
|
||||||
@@ -123,7 +123,6 @@ class contentdb{
|
|||||||
$_POST['content_text'] = $tp -> toDB($_POST['content_text']);
|
$_POST['content_text'] = $tp -> toDB($_POST['content_text']);
|
||||||
$_POST['content_class'] = ($_POST['content_class'] ? intval($_POST['content_class']) : "0");
|
$_POST['content_class'] = ($_POST['content_class'] ? intval($_POST['content_class']) : "0");
|
||||||
$_POST['content_meta'] = $tp -> toDB($_POST['content_meta']);
|
$_POST['content_meta'] = $tp -> toDB($_POST['content_meta']);
|
||||||
//$_POST['parent'] = ($_POST['parent'] ? intval($_POST['parent']) : "0");
|
|
||||||
|
|
||||||
//content create
|
//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]) ){
|
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;
|
$_POST['parent'] = $parent;
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
if(USER){
|
if(USER){
|
||||||
if($_POST['content_author_id']){
|
if($_POST['content_author_id']){
|
||||||
if(!($_POST['content_author_id'] == USERID && $_POST['content_author_name'] == USERNAME && $_POST['content_author_email'] == USEREMAIL) ){
|
if(!($_POST['content_author_id'] == USERID && $_POST['content_author_name'] == USERNAME && $_POST['content_author_email'] == USEREMAIL) ){
|
||||||
@@ -355,7 +350,7 @@ class contentdb{
|
|||||||
//category create
|
//category create
|
||||||
if( isset($qs[0]) && $qs[0]=='cat' && isset($qs[1]) && $qs[1]=='create' ){
|
if( isset($qs[0]) && $qs[0]=='cat' && isset($qs[1]) && $qs[1]=='create' ){
|
||||||
if( isset($qs[2]) && is_numeric($qs[2]) ){
|
if( isset($qs[2]) && is_numeric($qs[2]) ){
|
||||||
$parent = intval($qs[2]);
|
$parent = "0.".intval($qs[2]);
|
||||||
}else{
|
}else{
|
||||||
$parent = 0;
|
$parent = 0;
|
||||||
}
|
}
|
||||||
|
@@ -12,8 +12,8 @@
|
|||||||
| GNU General Public License (http://gnu.org).
|
| GNU General Public License (http://gnu.org).
|
||||||
|
|
|
|
||||||
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/handlers/content_form_class.php,v $
|
| $Source: /cvs_backup/e107_0.8/e107_plugins/content/handlers/content_form_class.php,v $
|
||||||
| $Revision: 1.2 $
|
| $Revision: 1.3 $
|
||||||
| $Date: 2007-01-13 22:33:03 $
|
| $Date: 2007-01-13 23:18:39 $
|
||||||
| $Author: lisa_ $
|
| $Author: lisa_ $
|
||||||
+---------------------------------------------------------------+
|
+---------------------------------------------------------------+
|
||||||
*/
|
*/
|
||||||
@@ -91,8 +91,9 @@ class contentform{
|
|||||||
{CONTENT_CONTENT_PREVIEW_PAGENAMES}
|
{CONTENT_CONTENT_PREVIEW_PAGENAMES}
|
||||||
</table>\n";
|
</table>\n";
|
||||||
|
|
||||||
$_POST['parent'] = intval($_POST['parent']);
|
$tmp = explode(".",$_POST['parent1']);
|
||||||
$mainparent = $aa -> getMainParent( $_POST['parent'] );
|
$_POST['parent1'] = $tmp[1];
|
||||||
|
$mainparent = $aa -> getMainParent( $_POST['parent1'] );
|
||||||
$content_pref = $aa -> getContentPref($mainparent);
|
$content_pref = $aa -> getContentPref($mainparent);
|
||||||
$content_cat_icon_path_large = $tp -> replaceConstants($content_pref["content_cat_icon_path_large"]);
|
$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"]);
|
$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_file = $tp -> replaceConstants($content_pref["content_file_path_tmp"]);
|
||||||
$content_tmppath_image = $tp -> replaceConstants($content_pref["content_image_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();
|
$row = $sql -> db_Fetch();
|
||||||
$PARENT = $row['content_heading'];
|
$PARENT = $row['content_heading'];
|
||||||
}
|
}
|
||||||
@@ -127,7 +128,7 @@ class contentform{
|
|||||||
}
|
}
|
||||||
$content_text = $tp->post_toHTML($content_text,TRUE);
|
$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_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_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 : "");
|
$CONTENT_CONTENT_PREVIEW_SUMMARY = ($content_summary ? $TRPRE.$TDPRE1.CONTENT_ADMIN_ITEM_LAN_17.$TDPOST.$TDPRE2.$content_summary.$TDPOST.$TRPOST : "");
|
||||||
|
Reference in New Issue
Block a user