Fixes for MYSQL_ASSOC change in db_Fetch

2025-07-31 11:50:30 +02:00 · 2009-01-22 01:58:29 +00:00
parent 31794e5529
commit 57aeaf5020
6 changed files with 434 additions and 434 deletions
--- a/comment.php
+++ b/comment.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/comment.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2008-11-05 21:17:50 $
-|     $Author: e107steved $
+|     $Revision: 1.9 $
+|     $Date: 2009-01-22 01:58:29 $
+|     $Author: mcfly_e107 $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
@@ -33,7 +33,7 @@ $temp_query = explode(".", e_QUERY);
 $action = $temp_query[0];			// Usually says 'comment' - may say 'reply'
 $table = $temp_query[1];			// Table containing item associated with comment(s)
 $id  = intval(varset($temp_query[2], ""));	// ID of item associated with comments (e.g. news ID)
-											// For reply with nested comments, its the ID of the comment
+// For reply with nested comments, its the ID of the comment
 $nid = intval(varset($temp_query[3], ""));	// Action - e.g. 'edit'. Or news ID for reply with nested comments
 $xid = intval(varset($temp_query[4], ""));	// ID of target comment
 global $comment_edit_query;
@@ -87,7 +87,7 @@ if (isset($_POST['commentsubmit']) || isset($_POST['editsubmit']))
 	if($editpid)
 	{
 		$redirectFlag = $id;
-/*		$redir = preg_replace("#\.edit.*#si", "", e_QUERY);
+		/*		$redir = preg_replace("#\.edit.*#si", "", e_QUERY);
 		header("Location: ".e_SELF."?{$redir}");
 		exit;  */
 	}
@@ -123,7 +123,7 @@ if (isset($_POST['replysubmit']))
 if ($redirectFlag)
 {	// Need to go back to original page

-// Check plugin e_comment.php files
+	// Check plugin e_comment.php files
 	$plugin_redir = false;
 	$e_comment = $cobj->get_e_comment();
 	if ($table == $e_comment[$table]['eplug_comment_ids'])
@@ -170,7 +170,7 @@ if ($action == "reply")
 	$query = "`comment_id` = '{$id}' LIMIT 0,1";
 	if ($sql->db_Select("comments", "comment_subject", "`comment_id` = '{$id}'"))
 	{
-		list($comments['comment_subject']) = $sql->db_Fetch();
+		$comments = $sql->db_Fetch();
 		$subject = $comments['comment_subject'];
 		$subject_header = $tp->toHTML($comments['comment_subject']);
 	}
@@ -187,7 +187,7 @@ if ($action == "reply")
 			}
 			else
 			{
-			list($news['news_title']) = $sql->db_Fetch();
+				$news = $sql->db_Fetch();
 				$subject = $news['news_title'];
 				$title = COMLAN_100;
 			}
@@ -199,7 +199,7 @@ if ($action == "reply")
 			}
 			else
 			{
-			list($poll['poll_title']) = $sql->db_Fetch();
+				$poll = $sql->db_Fetch();
 				$subject = $poll['poll_title'];
 				$title = COMLAN_101;
 			}
--- a/email.php
+++ b/email.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/email.php,v $
-|     $Revision: 1.2 $
-|     $Date: 2007-01-07 15:59:41 $
-|     $Author: e107steved $
+|     $Revision: 1.3 $
+|     $Date: 2009-01-22 01:58:29 $
+|     $Author: mcfly_e107 $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
@@ -122,11 +122,11 @@ if (isset($_POST['emailsubmit']))
 	{

 		$emailurl = $_POST['referer'];
-        $message = "";
-        if($sql->db_Select("news", "*", "news_id='".intval($parms)."'"))
+		$message = '';
+		if($sql->db_Select('news', 'news_title, news_body, news_extended', 'news_id='(int)$parms))
 		{
-            list($news_id, $news_title, $news_body, $news_extended, $news_datestamp, $news_author, $news_source, $news_url, $news_category, $news_allow_comments) = $sql->db_Fetch();
-			$message = "<h3 class='email_heading'>".$news_title."</h3><br />".$news_body."<br />".$news_extended."<br /><br /><a href='{e_BASE}news.php?extend.".$parms."'>{e_BASE}news.php?extend.".$parms."</a><br />";
+			$row = $sql->db_Fetch();
+			$message = "<h3 class='email_heading'>".$row['news_title']."</h3><br />".$row['news_body']."<br />".$row['news_extended']."<br /><br /><a href='{e_BASE}news.php?extend.".$parms."'>{e_BASE}news.php?extend.".$parms."</a><br />";
 			$message = $tp->toEmail($message);

 		}
@@ -169,7 +169,7 @@ if (isset($_POST['emailsubmit']))


 $text = "<form method='post' action='".e_SELF."?".e_QUERY."'>\n
-	<table>";
+<table>";

 if (USER != TRUE)
 {
@@ -183,9 +183,9 @@ if (USER != TRUE)

 $text .= "
 <tr>
-	<td style='width:25%'>".LAN_EMAIL_8."</td>
-	<td style='width:75%'>
-	<textarea class='tbox' name='comment' cols='70' rows='4' style='width:95%'>".LAN_EMAIL_6." ".SITENAME." (".$emailurl.")
+<td style='width:25%'>".LAN_EMAIL_8."</td>
+<td style='width:75%'>
+<textarea class='tbox' name='comment' cols='70' rows='4' style='width:95%'>".LAN_EMAIL_6." ".SITENAME." (".$emailurl.")
 ";

 if (USER == TRUE)
@@ -194,35 +194,35 @@ if (USER == TRUE)
 }

 $text .= "</textarea>
-	</td>
-	</tr>
+</td>
+</tr>

-	<tr>
-	<td style='width:25%'>".LAN_EMAIL_187."</td>
-	<td style='width:75%'>
-	<input class='tbox' type='text' name='email_send' size='60' value='$email_send' style='width:95%' maxlength='100' />
-	</td>
-	</tr>
-	";
+<tr>
+<td style='width:25%'>".LAN_EMAIL_187."</td>
+<td style='width:75%'>
+<input class='tbox' type='text' name='email_send' size='60' value='$email_send' style='width:95%' maxlength='100' />
+</td>
+</tr>
+";

-	if($use_imagecode)
-	{
+if($use_imagecode)
+{
 	$text .= "<tr><td>".LAN_EMAIL_190."</td><td>";
 	$text .= $sec_img->r_image();
 	$text .= " <input class='tbox' type='text' name='code_verify' size='15' maxlength='20' />
 	<input type='hidden' name='rand_num' value='".$sec_img->random_number."' /></td></tr>";
-	}
+}

 $text .= "
-	<tr style='vertical-align:top'>
-	<td style='width:25%'></td>
-	<td style='width:75%'>
-	<input class='button' type='submit' name='emailsubmit' value='".LAN_EMAIL_4."' />
-	<input type='hidden' name='referer' value='".$_SERVER['HTTP_REFERER']."' />
+<tr style='vertical-align:top'>
+<td style='width:25%'></td>
+<td style='width:75%'>
+<input class='button' type='submit' name='emailsubmit' value='".LAN_EMAIL_4."' />
+<input type='hidden' name='referer' value='".$_SERVER['HTTP_REFERER']."' />
 </td>
-	</tr>
-	</table>
-	</form>";
+</tr>
+</table>
+</form>";

 $ns->tablerender(LAN_EMAIL_5, $text);

--- a/online.php
+++ b/online.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/online.php,v $
-|     $Revision: 1.6 $
-|     $Date: 2008-08-01 19:23:35 $
-|     $Author: e107steved $
+|     $Revision: 1.7 $
+|     $Date: 2009-01-22 01:58:29 $
+|     $Author: mcfly_e107 $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
@@ -158,7 +158,7 @@ Think these are no longer used
 		$tmp = explode(".", substr(strrchr($online_location, "php."), 2));
 		if ($tmp[0] == "article") {
 			$sql->db_Select("content", "content_heading, content_class", "content_id='".intval($tmp[1])."'");
-			list($content['content_heading'], $content['content_class']) = $sql->db_Fetch();
+			$content = $sql->db_Fetch();
 			$online_location_page = ARTICLE.": ".$content['content_heading'];
 			$online_location = str_replace("php.", "php?", $online_location);
 			if (!check_class($content['content_class'])) {
@@ -167,7 +167,7 @@ Think these are no longer used
 			}
 		} elseif($tmp[0] == "review") {
 			$sql->db_Select("content", "content_heading, content_class", "content_id='".intval($tmp[1])."'");
-			list($content['content_heading'], $content['content_class']) = $sql->db_Fetch();
+			$content = $sql->db_Fetch();
 			$online_location_page = REVIEW.": ".$content['content_heading'];
 			$online_location = str_replace("php.", "php?", $online_location);
 			if (!check_class($content['content_class'])) {
@@ -176,7 +176,7 @@ Think these are no longer used
 			}
 		} elseif($tmp[0] == "content") {
 			$sql->db_Select("content", "content_heading, content_class", "content_id='".intval($tmp[1])."'");
-			list($content['content_heading'], $content['content_class']) = $sql->db_Fetch();
+			$content = $sql->db_Fetch();
 			$online_location_page = CONTENT.": ".$content['content_heading'];
 			$online_location = str_replace("php.", "php?", $online_location);
 			if (!check_class($content['content_class'])) {
@@ -193,7 +193,7 @@ Think these are no longer used
 		if ($tmp[1] == "news") {
 			$id = ($tmp[0] == "reply" ? $tmp[3] : $tmp[2]);
 			$sql->db_Select("news", "news_title, news_class", "news_id=".intval($id));
-			list($news['news_title'], $news['news_class']) = $sql->db_Fetch();
+			$news = $sql->db_Fetch();
 			$online_location_page = ($tmp[0] == "reply" ? COMMENT.": ".ONLINE_EL12." > ".$news['news_title'] : COMMENT.": ".$news['news_title']);
 			$online_location = "comment.php?comment.news.$id";
 			if (!check_class($news['news_class'])) {
@@ -203,7 +203,7 @@ Think these are no longer used
 		} elseif($tmp[1] == "poll") {
 			$id = ($tmp[0] == "reply" ? $tmp[3] : $tmp[2]);
 			$sql->db_Select("poll", "poll_title", "poll_id=".intval($id));
-			list($poll['poll_title']) = $sql->db_Fetch();
+			$poll = $sql->db_Fetch();
 			$online_location_page = POLLCOMMENT.": ".$poll['poll_title'];
 			$online_location = "comment.php?comment.poll.$id";
 		} else {
@@ -237,7 +237,7 @@ Think these are no longer used
 			}
 		} elseif(strstr($online_location, "_viewforum")) {
 			$sql->db_Select("forum", "forum_name, forum_class", "forum_id=".intval($tmp[0]));
-			list($forum['forum_name'], $forum['forum_class']) = $sql->db_Fetch();
+			$forum = $sql->db_Fetch();
 			$online_location_page = ONLINE_EL13." .:. ".$forum['forum_name'];
 			$online_location = str_replace("php.", "php?", $online_location);
 			if (!check_class($forum['forum_class'])) {
@@ -246,9 +246,9 @@ Think these are no longer used
 			}
 		} elseif(strstr($online_location, "_post")) {
 			$sql->db_Select("forum_t", "thread_name, thread_forum_id", "thread_forum_id=".intval($tmp[0])." AND thread_parent=0");
-			list($forum_t['thread_name'], $forum_t['thread_forum_id']) = $sql->db_Fetch();
+			$forum_t = $sql->db_Fetch();
 			$sql->db_Select("forum", "forum_name", "forum_id=".$forum_t['thread_forum_id']);
-			list($forum['forum_name']) = $sql->db_Fetch();
+			$forum = $sql->db_Fetch();
 			$online_location_page = ONLINE_EL12.": ".ONLINE_EL13." .:. ".$forum['forum_name']."->".ONLINE_EL14." .:. ".$forum_t['thread_name'];
 			$online_location = e_PLUGIN."forum/forum_viewtopic.php?$tmp[0].$tmp[1]";
 		}
--- a/print.php
+++ b/print.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/print.php,v $
-|     $Revision: 1.7 $
-|     $Date: 2008-01-09 22:06:22 $
-|     $Author: e107steved $
+|     $Revision: 1.8 $
+|     $Date: 2009-01-22 01:58:29 $
+|     $Author: mcfly_e107 $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
@@ -65,9 +65,9 @@ else
 	else
 	{
 		$sql->db_Select("news_category", "category_id, category_name", "category_id='{$news_category}'");
-		list($category_id, $category_name) = $sql->db_Fetch();
+		list($category_id, $category_name) = $sql->db_Fetch(MYSQL_NUM);
 		$sql->db_Select("user", "user_id, user_name", "user_id='{$news_author}'");
-		list($a_id, $a_name) = $sql->db_Fetch();
+		list($a_id, $a_name) = $sql->db_Fetch(MYSQL_NUM);
 	}
 	$news_datestamp = $con->convert_date($news_datestamp, "long");
 	$print_text = "<span style=\"font-size: 13px; color: black; font-family: tahoma, verdana, arial, helvetica; text-decoration: none\">
--- a/submitnews.php
+++ b/submitnews.php
@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/submitnews.php,v $
-|     $Revision: 1.7 $
-|     $Date: 2008-06-02 18:28:58 $
-|     $Author: e107steved $
+|     $Revision: 1.8 $
+|     $Date: 2009-01-22 01:58:29 $
+|     $Author: mcfly_e107 $
 +----------------------------------------------------------------------------+
 */
 require_once("class2.php");
@@ -124,8 +124,8 @@ if (isset($_POST['submit']))
 if (!defined("USER_WIDTH")){ define("USER_WIDTH","width:95%"); }

 $text = "<div style='text-align:center'>
-	<form id='dataform' method='post' action='" . e_SELF . "' enctype='multipart/form-data' onsubmit='return frmVerify()'>\n
-	<table style='".USER_WIDTH."' class='fborder'>";
+<form id='dataform' method='post' action='" . e_SELF . "' enctype='multipart/form-data' onsubmit='return frmVerify()'>\n
+<table style='".USER_WIDTH."' class='fborder'>";
 if (!USER)
 {
 	$text .= "<tr>\n<td style='width:20%' class='forumheader3'>" . LAN_7 . "</td>\n<td style='width:80%' class='forumheader3'>\n<input class='tbox' type='text' name='author_name' size='60' value='$author_name' maxlength='100' />\n</td>\n</tr>\n<tr>\n<td style='width:20%' class='forumheader3'>" . LAN_112 . "</td>\n<td style='width:80%' class='forumheader3'>\n<input class='tbox' type='text' name='author_email' size='60' value='$author_email' maxlength='100' />\n</td>\n</tr>";
@@ -139,8 +139,8 @@ if (!empty($pref['news_subheader']))
 }

 $text .= " <tr>
-	<td style='width:20%' class='forumheader3'>" . NWSLAN_6 . ": </td>
-	<td style='width:80%' class='forumheader3'>";
+<td style='width:20%' class='forumheader3'>" . NWSLAN_6 . ": </td>
+<td style='width:80%' class='forumheader3'>";
 if (!$sql->db_Select("news_category"))
 {
 	$text .= NWSLAN_10;
@@ -149,7 +149,7 @@ else
 {
 	$text .= "
 	<select name='cat_id' class='tbox'>";
-    while (list($cat_id, $cat_name, $cat_icon) = $sql->db_Fetch())
+	while (list($cat_id, $cat_name, $cat_icon) = $sql->db_Fetch(MYSQL_NUM))
 	{
 		$sel = ($_POST['cat_id'] == $cat_id) ? "selected='selected'" : "";
 		$text .= "<option value='{$cat_id}' {$sel}>" . $tp->toHTML($cat_name,FALSE,"defs") . "</option>";
@@ -157,12 +157,12 @@ else
 	$text .= "</select>";
 }
 $text .= "</td>
-	</tr><tr>
-	<td style='width:20%' class='forumheader3'>" . LAN_62 . "</td>
-	<td style='width:80%' class='forumheader3'>
-	<input class='tbox' type='text' id='itemtitle' name='itemtitle' size='60' value='{$itemtitle}' maxlength='200' style='width:90%' />
-	</td>
-	</tr>";
+</tr><tr>
+<td style='width:20%' class='forumheader3'>" . LAN_62 . "</td>
+<td style='width:80%' class='forumheader3'>
+<input class='tbox' type='text' id='itemtitle' name='itemtitle' size='60' value='{$itemtitle}' maxlength='200' style='width:90%' />
+</td>
+</tr>";


 if (e_WYSIWYG)
@@ -176,17 +176,17 @@ else
 }

 $text .= "
-	<tr>
-	<td style='width:20%' class='forumheader3'>" . LAN_135 . "</td>
-	<td style='width:80%' class='forumheader3'>
-	<textarea class='tbox' id='e107_submitnews_item' name='e107_submitnews_item'  cols='80'  style='max-width:95%' {$insertjs}></textarea><br />";
+<tr>
+<td style='width:20%' class='forumheader3'>" . LAN_135 . "</td>
+<td style='width:80%' class='forumheader3'>
+<textarea class='tbox' id='e107_submitnews_item' name='e107_submitnews_item'  cols='80'  style='max-width:95%' {$insertjs}></textarea><br />";

 if (!e_WYSIWYG)
 {
 	$text .= display_help("helpb","submitnews");
 }
 $text .= "	</td>
-	</tr>\n";
+</tr>\n";
 if ($pref['subnews_attach'] && $pref['upload_enabled'] && check_class($pref['upload_class']) && FILE_UPLOADS)
 {
 	$text .= "
@@ -199,14 +199,14 @@ if ($pref['subnews_attach'] && $pref['upload_enabled'] && check_class($pref['upl
 }

 $text .= "
-	<tr>
-	<td colspan='2' style='text-align:center' class='forumheader'>
-	<input class='button' type='submit' name='submit' value='" . LAN_136 . "' />
-	</td>
-	</tr>
-	</table>
-	</form>
-	</div>";
+<tr>
+<td colspan='2' style='text-align:center' class='forumheader'>
+<input class='button' type='submit' name='submit' value='" . LAN_136 . "' />
+</td>
+</tr>
+</table>
+</form>
+</div>";
 $ns->tablerender(LAN_136, $text);
 require_once(FOOTERF);

--- a/userposts.php
+++ b/userposts.php
@@ -11,8 +11,8 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/userposts.php,v $
-|     $Revision: 1.8 $
-|     $Date: 2008-12-10 21:00:48 $
+|     $Revision: 1.9 $
+|     $Date: 2009-01-22 01:58:29 $
 |     $Author: mcfly_e107 $
 +----------------------------------------------------------------------------+
 */
@@ -81,8 +81,8 @@ if ($action == "comments")
 	{
 		$ccaption = UP_LAN_1.$user_name;
 		$sql->db_Select("user", "user_comments", "user_id=".$id);
-		list($user_comments) = $sql->db_Fetch();
-		$ctotal = $user_comments;
+		$row = $sql->db_Fetch();
+		$ctotal = $row['user_comments'];
 		$data = $cobj->getCommentData($amount='10', $from, "comment_author = '".$user_id."'");
 	}
 	else