diff --git a/e107_admin/newspost.php b/e107_admin/newspost.php index 8bd559674..6e9e273a4 100644 --- a/e107_admin/newspost.php +++ b/e107_admin/newspost.php @@ -9,8 +9,8 @@ * News Administration * * $Source: /cvs_backup/e107_0.8/e107_admin/newspost.php,v $ - * $Revision: 1.25 $ - * $Date: 2009-01-18 00:27:10 $ + * $Revision: 1.26 $ + * $Date: 2009-01-18 19:02:07 $ * $Author: secretr $ */ require_once("../class2.php"); @@ -687,13 +687,13 @@ class admin_newspost $sub_action = $this->getSubAction(); - $id = $this->getId(); + $id = $this->getSubAction() != 'sn' && $this->getSubAction() != 'upload' ? $this->getId() : 0; $e107 = &e107::getInstance(); if ($sub_action == "sn" && !varset($_POST['preview'])) { - if ($e107->sql->db_Select("submitnews", "*", "submitnews_id={$id}", TRUE)) + if ($e107->sql->db_Select("submitnews", "*", "submitnews_id=".$this->getId(), TRUE)) { //list($id, $submitnews_name, $submitnews_email, $_POST['news_title'], $submitnews_category, $_POST['data'], $submitnews_datestamp, $submitnews_ip, $submitnews_auth, $submitnews_file) = $sql->db_Fetch(); $row = $e107->sql->db_Fetch(); @@ -719,15 +719,15 @@ class admin_newspost if ($sub_action == "upload" && !varset($_POST['preview'])) { - if ($e107->sql->db_Select('upload', '*', "upload_id={$id}")) { - $row = $sql->db_Fetch(); + if ($e107->sql->db_Select('upload', '*', "upload_id=".$this->getId())) { + $row = $e107->sql->db_Fetch(); $post_author_id = substr($row['upload_poster'], 0, strpos($row['upload_poster'], ".")); $post_author_name = substr($row['upload_poster'], (strpos($row['upload_poster'], ".")+1)); $match = array(); //XXX DB UPLOADS STILL SUPPORTED? $upload_file = "pub_" . (preg_match('#Binary\s(.*?)\/#', $row['upload_file'], $match) ? $match[1] : $row['upload_file']); $_POST['news_title'] = LAN_UPLOAD.": ".$row['upload_name']; - $_POST['data'] = $row['upload_description']."\n[b]".NWSLAN_49." ".$post_author_name."[/b]\n\n[file=request.php?".$upload_file."]{$row['upload_name']}[/file]\n"; + $_POST['data'] = $row['upload_description']."\n[b]".NWSLAN_49." [link=".$e107->url->getUrl('core:user', 'main', 'id='.$post_author_id)."]".$post_author_name."[/link][/b]\n\n[file=request.php?".$upload_file."]{$row['upload_name']}[/file]\n"; } } @@ -987,11 +987,6 @@ class admin_newspost $r_array = array(); foreach($ren_type as $key=>$value) { $r_array[$key] = $value; - /* - $checked = ($_POST['news_rendertype'] == $key) ? "checked='checked'" : ""; - $text .= ""; - $text .= $value."
"; - */ } @@ -1218,7 +1213,7 @@ class admin_newspost list($_POST['user_id'],$_POST['user_name']) = explode(chr(35), $_POST['news_author']); $_POST['news_author'] = $_POST['user_id']; - $_POST['comment_total'] = $this->getId() ? $e107->sql->db_Count("comments", "(*)", " WHERE comment_item_id=".$this->getId()." AND comment_type='0'") : 0; + $_POST['comment_total'] = $id ? $e107->sql->db_Count("comments", "(*)", " WHERE comment_item_id={$id} AND comment_type='0'") : 0; $_PR = $_POST; $_PR['news_body'] = $e107->tp->post_toHTML($_PR['data'],FALSE); @@ -1272,8 +1267,9 @@ class admin_newspost //category icon alias $category['category-button'] = $category['category_icon']; + //Send the prefered response type - echo $jshelper->sendXMLResponse('fill-form', $category); + $jshelper->sendResponse('fill-form', $category); } function show_categories() @@ -1420,7 +1416,7 @@ class admin_newspost function show_news_prefs() { - global $pref, $e_userclass; + global $pref; require_once(e_HANDLER."form_handler.php"); $frm = new e_form(true); //enable inner tabindex counter @@ -1547,20 +1543,15 @@ class admin_newspost $e107->ns->tablerender(NWSLAN_90, $text); } - - - //XXX Lan - many many lans function show_submitted_news() { - global $rs, $ns, $tp, $frm, $e107; - $sql2 = new db; - //FIXME - work in progress + $e107 = &e107::getInstance(); require_once(e_HANDLER."form_handler.php"); $frm = new e_form(true); //enable inner tabindex counter - if ($category_total = $sql2->db_Select("submitnews", "*", "submitnews_id !='' ORDER BY submitnews_id DESC")) + if ($e107->sql->db_Select("submitnews", "*", "submitnews_id !='' ORDER BY submitnews_id DESC")) { $text .= "
@@ -1581,30 +1572,29 @@ class admin_newspost "; - while ($row = $sql2->db_Fetch()) + while ($row = $e107->sql->db_Fetch()) { - extract($row); - $buttext = ($submitnews_auth == 0)? NWSLAN_58 : NWSLAN_103; + $buttext = ($row['submitnews_auth'] == 0)? NWSLAN_58 : NWSLAN_103; - if (substr($submitnews_item,-7,7) == '[/html]') $submitnews_item = substr($submitnews_item,0,-7); - if (substr($submitnews_item,0,6) == '[html]') $submitnews_item = substr($submitnews_item,6); + if (substr($row['submitnews_item'], -7, 7) == '[/html]') $row['submitnews_item'] = substr($row['submitnews_item'], 0, -7); + if (substr($row['submitnews_item'],0 , 6) == '[html]') $row['submitnews_item'] = substr($row['submitnews_item'], 6); $text .= " - {$submitnews_id} + {$row['submitnews_id']} - ".$tp->toHTML($submitnews_title,FALSE,"emotes_off, no_make_clickable")."
".$tp->toHTML($submitnews_item)." + ".$e107->tp->toHTML($row['submitnews_title'], FALSE, "TITLE")."
".$e107->tp->toHTML($row['submitnews_item'])." -
Posted: ".(($submitnews_auth == 0) ? "No" : "Yes")."
-
Date: ".date("D dS M y, g:ia", $submitnews_datestamp)."
-
User: ".$submitnews_name."
-
Email: ".$submitnews_email."
-
IP: ".$e107->ipDecode($submitnews_ip)."
+
".NWSLAN_123.": ".(($row['submitnews_auth'] == 0) ? LAN_NO : LAN_YES)."
+
".LAN_DATE.": ".date("D dS M y, g:ia", $row['submitnews_datestamp'])."
+
".NWSLAN_124.": {$row['submitnews_name']}
+
".NWSLAN_125.": {$row['submitnews_email']}
+
".NWSLAN_126.": ".$e107->ipDecode($row['submitnews_ip'])."

- ".$frm->admin_button("category_edit_{$submitnews_id}", $buttext, 'action', '', array('id'=>false, 'other'=>"onclick=\"document.location='".e_SELF."?create.sn.$submitnews_id'\""))." - ".$frm->admin_button("delete[sn_{$submitnews_id}]", LAN_DELETE, 'delete', '', array('id'=>false, 'title'=>$tp->toJS(NWSLAN_38." [ID: {$submitnews_id} ]")))." + ".$frm->admin_button("category_edit_{$row['submitnews_id']}", $buttext, 'action', '', array('id'=>false, 'other'=>"onclick=\"document.location='".e_SELF."?create.sn.{$row['submitnews_id']}'\""))." + ".$frm->admin_button("delete[sn_{$row['submitnews_id']}]", LAN_DELETE, 'delete', '', array('id'=>false, 'title'=>$e107->tp->toJS(NWSLAN_38." [".LAN_NEWS_45.": {$row['submitnews_id']} ]")))."
@@ -1619,10 +1609,10 @@ class admin_newspost } else { - $text .= "
".NWSLAN_59."
"; + $text .= "
".NWSLAN_59."
"; } - $ns->tablerender(NWSLAN_47, $text); + $e107->ns->tablerender(NWSLAN_47, $text); } @@ -1650,8 +1640,10 @@ class admin_newspost $var['pref']['text'] = NWSLAN_90; $var['pref']['link'] = e_SELF."?pref"; $var['pref']['perm'] = "N"; - if ($e107->sql->db_Select('submitnews', '*', "submitnews_auth=0")) { - $var['sn']['text'] = NWSLAN_47; + + $c = $e107->sql->db_Count('submitnews'); + if ($c) { + $var['sn']['text'] = NWSLAN_47." ({$c})"; $var['sn']['link'] = e_SELF."?sn"; $var['sn']['perm'] = "N"; } diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php index b8c29da37..e3e8f3078 100644 --- a/e107_admin/userclass2.php +++ b/e107_admin/userclass2.php @@ -9,8 +9,8 @@ * Administration Area - User classes * * $Source: /cvs_backup/e107_0.8/e107_admin/userclass2.php,v $ - * $Revision: 1.19 $ - * $Date: 2008-12-29 16:11:02 $ + * $Revision: 1.20 $ + * $Date: 2009-01-18 19:02:07 $ * $Author: secretr $ * */ @@ -106,8 +106,8 @@ if(e_AJAX_REQUEST) $row['uc_icon_select'] = $row['userclass_icon']; //icons select box //Send the prefered response type - //echo $jshelper->sendJSONResponse('fill-form', $row); - echo $jshelper->sendXMLResponse('fill-form', $row); + //$jshelper->sendJSONResponse('fill-form', $row); + $jshelper->sendResponse('fill-form', $row); exit; } } diff --git a/e107_files/jslib/e107.js.php b/e107_files/jslib/e107.js.php index b908e72b0..8e09c7487 100644 --- a/e107_files/jslib/e107.js.php +++ b/e107_files/jslib/e107.js.php @@ -8,8 +8,8 @@ * e107 Javascript API * * $Source: /cvs_backup/e107_0.8/e107_files/jslib/e107.js.php,v $ - * $Revision: 1.24 $ - * $Date: 2009-01-17 22:48:14 $ + * $Revision: 1.25 $ + * $Date: 2009-01-18 19:02:07 $ * $Author: secretr $ * */ @@ -2629,4 +2629,3 @@ function sendInfo(handler, container, form) { $w('autoExternalLinks autoNoHistory autoHide toggleObserver scrollToObserver').each( function(f) { e107.runOnLoad(e107Helper[f], null, true); }); - diff --git a/e107_handlers/js_helper.php b/e107_handlers/js_helper.php index 8ec8bf5b3..386e407bc 100644 --- a/e107_handlers/js_helper.php +++ b/e107_handlers/js_helper.php @@ -9,8 +9,8 @@ * Javascript Helper * * $Source: /cvs_backup/e107_0.8/e107_handlers/js_helper.php,v $ - * $Revision: 1.5 $ - * $Date: 2009-01-17 22:48:14 $ + * $Revision: 1.6 $ + * $Date: 2009-01-18 19:02:07 $ * $Author: secretr $ * */ @@ -41,6 +41,14 @@ class e_jshelper */ var $_response_actions = array(); + /** + * Add response action & action instructions + * 'action' equals to e107Ajax JS method (see JS API) + * + * @param string $action + * @param array $data_array item data for the action + * @return object e_jshelper + */ function addResponseAction($action, $data_array) { if(!isset($this->_response_actions[$action])) @@ -52,6 +60,15 @@ class e_jshelper return $this; } + /** + * Attach response Items array to an action + * Example: addResponseItem('element-invoke-by-id', 'show', array('category-clear','update-category')); + * will add array('category-clear','update-category') to ['element-invoke-by-id']['show'] stack + * + * @param string $action + * @param array $data_array item data for the action + * @return object e_jshelper + */ function addResponseItem($action, $subaction, $data) { if(!isset($this->_response_actions[$action])) @@ -182,6 +199,28 @@ class e_jshelper } echo $this->buildJSONResponse(); } + + /** + * Send Server Response + * Sends the response based on the system + * prefered response type (could be system preference in the future) + * + * @param string $action optional Action + * @param array $data_array optional action array + * @return boolean success + */ + function sendResponse($action = '', $data_array = array()) + { + $prefered_response_type = 'XML'; //TODO - pref? + $method = "send{$prefered_response_type}Response"; + if(method_exists($this, $method)) + { + $this->$method($action, $data_array); + return true; + } + + return false; + } /** * Reset response action array to prevent duplicates diff --git a/e107_languages/English/admin/lan_newspost.php b/e107_languages/English/admin/lan_newspost.php index a2f1b8a00..49106972c 100644 --- a/e107_languages/English/admin/lan_newspost.php +++ b/e107_languages/English/admin/lan_newspost.php @@ -4,8 +4,8 @@ | e107 website system - Language File. | | $Source: /cvs_backup/e107_0.8/e107_languages/English/admin/lan_newspost.php,v $ -| $Revision: 1.8 $ -| $Date: 2009-01-17 22:48:14 $ +| $Revision: 1.9 $ +| $Date: 2009-01-18 19:02:07 $ | $Author: secretr $ +----------------------------------------------------------------------------+ */ @@ -123,6 +123,12 @@ define("NWSLAN_120", "Text to show at the top of Submit News"); define("NWSLAN_121", "Nothing found for %s"); define("NWSLAN_122", "Icon"); +//sn +define("NWSLAN_123", "Posted"); +define("NWSLAN_124", "User"); +define("NWSLAN_125", "Email"); +define("NWSLAN_126", "IP"); + define("LAN_NEWS_5", "Error! - Was unable to update news item into database!"); define("LAN_NEWS_6", "News entered into database."); define("LAN_NEWS_7", "Error! - Was unable to enter news item into database!");