From 7b8f5496c0c4fbfd6b8a43799b112e2333d00dd5 Mon Sep 17 00:00:00 2001 From: CaMer0n Date: Tue, 12 Jan 2010 17:25:20 +0000 Subject: [PATCH] Temporary Fix for newpost images --- e107_admin/newspost.php | 79 ++++++++++++++++++---------------- e107_handlers/form_handler.php | 13 ++++-- 2 files changed, 52 insertions(+), 40 deletions(-) diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index 6872ba034..bcd8c68a1 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -9,22 +9,11 @@ * News Administration * * $Source: /cvs_backup/e107_0.8/e107_admin/newspost.php,v $ - * $Revision: 1.65 $ - * $Date: 2010-01-11 21:18:13 $ - * $Author: e107steved $ + * $Revision: 1.66 $ + * $Date: 2010-01-12 17:25:18 $ + * $Author: e107coders $ */ - -/** - * e107 News administration - * - * @package e107 - * @subpackage admin - * @version $Id: newspost.php,v 1.65 2010-01-11 21:18:13 e107steved Exp $; - * - * @todo - e_NEWSIMAGE needs to be defined - */ - require_once('../class2.php'); if (!getperms('H|N')) @@ -1426,8 +1415,8 @@ class admin_newspost - ".NWSLAN_6.": - + ".NWSLAN_6.": + "; if (!$this->news_categories) @@ -1452,15 +1441,15 @@ class admin_newspost - ".NWSLAN_12.": - + ".NWSLAN_12.": + ".$frm->text('news_title', $tp->post_toForm($_POST['news_title']))." - ".LAN_NEWS_27.": - + ".LAN_NEWS_27.": + ".$frm->text('news_summary', $tp->post_toForm($_POST['news_summary']), 250)." @@ -1470,10 +1459,8 @@ class admin_newspost // -------- News Author --------------------- $text .=" - - ".LAN_NEWS_50.": - - + ".LAN_NEWS_50.": + "; if(!getperms('0') && !check_class($pref['news_editauthor'])) @@ -1526,8 +1513,8 @@ class admin_newspost - ".NWSLAN_13.":
- "; + ".NWSLAN_13.":
+ "; $val = (strstr($tp->post_toForm($_POST['news_body']), "[img]http") ? $tp->post_toForm($_POST['news_body']) : str_replace("[img]../", "[img]", $tp->post_toForm($_POST['news_body']))); $text .= $frm->bbarea('news_body', $val, 'news', 'helpb'); @@ -1541,8 +1528,8 @@ class admin_newspost - ".NWSLAN_14.": - + ".NWSLAN_14.": + ".NWSLAN_83."
".$frm->bbarea('news_extended', $val, 'extended', 'helpc')." @@ -1550,9 +1537,16 @@ class admin_newspost - ".NWSLAN_66.": - - ".NWSLAN_69." + ".NWSLAN_66.": + "; + + //FIXME - below is a quick fix for media-manager upload. Requires popup window without header/footer. + $text .= "".NWSLAN_69.""; + + // e_NEWSIMAGE is deprecated. + + // DEPRECATED METHOD below. + /*$text .= "".NWSLAN_69."
"; @@ -1605,16 +1599,22 @@ class admin_newspost } $text .= " -
+
"; + */ + + + $text .= " - ".NWSLAN_67.": - + ".NWSLAN_67.": + ".LAN_NEWS_23."
"; - + + +/* $parms = "name=news_thumbnail"; $parms .= "&path=".e_NEWSIMAGE; $parms .= "&filter=0"; @@ -1624,12 +1624,17 @@ class admin_newspost $parms .= "&label=-- ".LAN_NEWS_48." --"; $parms .= "&subdirs=0"; $parms .= "&tabindex=".$frm->getNext(); + */ + //$parms .= "&click_target=data"; //$parms .= "&click_prefix=[img][[e_IMAGE]]newspost_images/"; //$parms .= "&click_postfix=[/img]"; - $text .= "
".$tp->parseTemplate("{IMAGESELECTOR={$parms}&scaction=select}")."
"; - $text .= "
".$tp->parseTemplate("{IMAGESELECTOR={$parms}&scaction=preview}")."
"; + + $text .= $frm->imagepicker('news_thumbnail', $default,'','news'); + + // $text .= "
".$tp->parseTemplate("{IMAGESELECTOR={$parms}&scaction=select}")."
"; + // $text .= "
".$tp->parseTemplate("{IMAGESELECTOR={$parms}&scaction=preview}")."
"; $text .= "
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php index 5f52d9498..fc3b53819 100644 --- a/e107_handlers/form_handler.php +++ b/e107_handlers/form_handler.php @@ -9,8 +9,8 @@ * Form Handler * * $Source: /cvs_backup/e107_0.8/e107_handlers/form_handler.php,v $ - * $Revision: 1.112 $ - * $Date: 2010-01-10 03:56:27 $ + * $Revision: 1.113 $ + * $Date: 2010-01-12 17:25:20 $ * $Author: e107coders $ * */ @@ -124,8 +124,15 @@ class e_form // Temporary Fix for using Media-Manager data $sql = e107::getDb(); + + // $sc_parameters is currently being used to select the media-category. - if($sql->db_Select('core_media','*',"media_userclass IN (".USERCLASS_LIST.") ORDER BY media_name")) + $qry = "SELECT * FROM `#core_media` WHERE media_userclass IN (".USERCLASS_LIST.") "; + $qry .= vartrue($sc_parameters) ? " AND media_category = '".$sc_parameters."' " : ""; + $qry .= "ORDER BY media_name"; + + + if($sql->db_Select_gen($qry)) { while($row = $sql->db_Fetch()) {