cleanup redeclaration of db objects - similar issue to bugs #3632 and #3412

e107_admin/plugin.php

@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_admin/plugin.php,v $
-|     $Revision: 1.2 $
+|     $Revision: 1.3 $
-|     $Date: 2006-12-07 15:41:50 $
+|     $Date: 2006-12-31 14:46:30 $
-|     $Author: sweetas $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -195,7 +195,7 @@ if ($action == 'uninstall')
 		}
 
 		if (is_array($eplug_user_prefs)) {
-			$sql = new db;
+			if (!is_object($sql)){ $sql = new db; }
 			$sql->db_Select("core", " e107_value", " e107_name='user_entended'");
 			$row = $sql->db_Fetch();
 			$user_entended = unserialize($row[0]);
@@ -318,7 +318,7 @@ if ($action == 'upgrade') {
 	}
 
 	if (is_array($upgrade_add_user_prefs)) {
-		$sql = new db;
+		if (!is_object($sql)){ $sql = new db; }
 		$sql->db_Select("core", " e107_value", " e107_name='user_entended'");
 		$row = $sql->db_Fetch();
 		$user_entended = unserialize($row[0]);
@@ -335,7 +335,7 @@ if ($action == 'upgrade') {
 	}
 
 	if (is_array($upgrade_remove_user_prefs)) {
-		$sql = new db;
+		if (!is_object($sql)){ $sql = new db; }  
 		$sql->db_Select("core", " e107_value", " e107_name='user_entended'");
 		$row = $sql->db_Fetch();
 		$user_entended = unserialize($row[0]);

e107_handlers/login.php

@@ -12,9 +12,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_handlers/login.php,v $
-|     $Revision: 1.1.1.1 $
+|     $Revision: 1.2 $
-|     $Date: 2006-12-02 04:33:45 $
+|     $Date: 2006-12-31 14:46:30 $
-|     $Author: mcfly_e107 $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 
@@ -37,7 +37,10 @@ class userlogin {
 		# - scope                                        public
 		*/
 		global $pref, $e_event, $sql, $e107, $tp;
-		$sql = new db;
+
+	 	if(!is_object($sql)){
+   		  	$sql = new db;
+		}
 
 		$fip = $e107->getip();
 		if($sql -> db_Select("banlist", "*", "banlist_ip='{$fip}' ")) {

e107_plugins/content/admin_content_config.php

@@ -12,9 +12,9 @@
 |        GNU General Public License (http://gnu.org).
 |
 |		$Source: /cvs_backup/e107_0.8/e107_plugins/content/admin_content_config.php,v $
-|		$Revision: 1.1.1.1 $
+|		$Revision: 1.2 $
-|		$Date: 2006-12-02 04:34:52 $
+|		$Date: 2006-12-31 14:46:30 $
-|		$Author: mcfly_e107 $
+|		$Author: e107coders $
 +---------------------------------------------------------------+
 */
 
@@ -168,9 +168,9 @@ if(isset($_POST['uploadcaticon'])){
 	$pref['upload_storagetype'] = "1";
 	require_once(e_HANDLER."upload_handler.php");
 	$pathiconlarge = $_POST['iconpathlarge'];
-	$pathiconsmall = $_POST['iconpathsmall'];	
+	$pathiconsmall = $_POST['iconpathsmall'];
 	$uploaded = file_upload($pathiconlarge);
-	
+
 	$icon = "";
 	if($uploaded) {
 		$icon = $uploaded[0]['name'];
@@ -180,7 +180,7 @@ if(isset($_POST['uploadcaticon'])){
 		rename($pathiconsmall."thumb_".$icon , $pathiconsmall.$icon);
 	}
 	$message	= ($icon ? CONTENT_ADMIN_CAT_LAN_58 : CONTENT_ADMIN_CAT_LAN_59);
-	
+
 }
 
 if(isset($_POST['create_category'])){
@@ -256,7 +256,7 @@ if(!e_QUERY){																//show main categories
 			$message .= CONTENT_ADMIN_ITEM_LAN_89." <a href='".e_SELF."?content.".$mainparent."'>".CONTENT_ADMIN_ITEM_LAN_90."</a><br />";
 			$message .= CONTENT_ADMIN_ITEM_LAN_91." <a href='".e_SELF."?content.edit.".$qs[2]."'>".CONTENT_ADMIN_ITEM_LAN_90."</a><br />";
 			$message .= CONTENT_ADMIN_ITEM_LAN_124." <a href='".e_PLUGIN."content/content.php?content.".$qs[2]."'>".CONTENT_ADMIN_ITEM_LAN_90."</a>";
-			
+
 			$ns -> tablerender("", "<div style='text-align:center'><b>".$message."</b></div>");
 			require_once(e_ADMIN."footer.php");
 			exit;
@@ -318,7 +318,7 @@ if(!e_QUERY){																//show main categories
 	//order items with parent=2 or category='5'
 	}elseif($qs[0] == "order" && is_numeric($qs[1]) && is_numeric($qs[2]) && !isset($qs[3]) ){
 		$aform -> show_content_order("ci");
-	
+
 	//increase order of items in category
 	}elseif($qs[0] == "order" && is_numeric($qs[1]) && is_numeric($qs[2]) && $qs[3] == "inc" && isset($qs[4]) ){
 		$message = $adb -> dbSetOrder("inc", "ci", $qs[4]);
@@ -366,7 +366,7 @@ if(!e_QUERY){																//show main categories
 		if(!getperms("0")){ header("location:".e_SELF); exit; }
 		//$aform -> show_admin_contentmanager();
 		$aform -> manager();
-	
+
 	//category content manager : view contentmanager
 	}elseif($qs[0] == "manager" && isset($qs[1]) && is_numeric($qs[1]) ){
 		if(!getperms("0")){ header("location:".e_SELF); exit; }
@@ -418,7 +418,7 @@ if(!e_QUERY){																//show main categories
 	}elseif($qs[0] == "restrict" && !isset($qs[1]) ){
 		//if(!getperms("0")){ header("location:".e_SELF); exit; }
 		$aform -> restrict();
-	
+
 	//restrict : view restrict for main parent
 	}elseif($qs[0] == "restrict" && isset($qs[1]) && is_numeric($qs[1]) ){
 		//if(!getperms("0")){ header("location:".e_SELF); exit; }
@@ -472,7 +472,7 @@ function admin_content_config_adminmenu(){
 				$var['option']['text']			= CONTENT_ADMIN_MENU_LAN_6;
                 $var['option']['link']			= e_SELF."?option";
 
-				if(getperms("0")){ 
+				if(getperms("0")){
 					$var['manager']['text']			= CONTENT_ADMIN_MENU_LAN_17;
 					$var['manager']['link']			= e_SELF."?manager";
 				}
@@ -494,7 +494,7 @@ function admin_content_config_adminmenu(){
 					$var['general']['text']			= CONTENT_ADMIN_MENU_LAN_10;
 					$var['menu']['text']			= CONTENT_ADMIN_MENU_LAN_14;
 
-					$sql = new db;
+					if (!is_object($sql)){ $sql = new db; }
 					$category_total			= $sql -> db_Select($plugintable, "content_heading", "content_id='".$qs[1]."' ");
 					list($content_heading)	= $sql -> db_Fetch();
 
@@ -510,11 +510,11 @@ function admin_content_config_adminmenu(){
 					$var['toppage']['text']			= CONTENT_ADMIN_MENU_LAN_20;
 					$var['scorepage']['text']		= CONTENT_ADMIN_MENU_LAN_22;
 					show_admin_menu(CONTENT_ADMIN_MENU_LAN_21.": ".$content_heading."", $act, $var, TRUE);
-				
+
 				}else{
-						
+
 						if($showadmincat){
-							$sql2 = new db;
+							if (!is_object($sql2)){ $sql2 = new db; }  
 							if($category_total = $sql2 -> db_Select($plugintable, "content_id, content_heading", "content_parent='0' ")){
 								while($row = $sql2 -> db_Fetch()){
 
@@ -563,4 +563,4 @@ function admin_content_config_adminmenu(){
 
 require_once(e_ADMIN."footer.php");
 
-?>
+?>

e107_plugins/content/content.php

@@ -12,9 +12,9 @@
 |        GNU General Public License (http://gnu.org).
 |
 |		$Source: /cvs_backup/e107_0.8/e107_plugins/content/content.php,v $
-|		$Revision: 1.1.1.1 $
+|		$Revision: 1.2 $
-|		$Date: 2006-12-02 04:34:54 $
+|		$Date: 2006-12-31 14:46:30 $
-|		$Author: mcfly_e107 $
+|		$Author: e107coders $
 +---------------------------------------------------------------+
 */
 
@@ -118,7 +118,7 @@ if(!e_QUERY){
 
 	//category of parent='X'
 	}elseif( $qs[0] == "cat" && is_numeric($qs[1]) && intval($qs[1])>0 && (!isset($qs[2]) || $qs[2] == "view" || $qs[2] == "comment" || substr($qs[2],0,5) == "order") ){
-		
+
 		if( isset($qs[2]) && $qs[2] == "comment" ){
 			show_content_cat("comment");
 		}elseif( isset($qs[2]) && $qs[2] == "view" ){
@@ -227,7 +227,7 @@ function show_content_search_result($searchkeyword){
 			$content_searchresult_table_string = "";
 			if(!is_object($gen)){ $gen = new convert; }
 			while($row = $sqlsr -> db_Fetch()){
-				
+
 				$row['content_heading']		= parsesearch($row['content_heading'], $searchkeyword, "full");
 				$row['content_subheading']	= parsesearch($row['content_subheading'], $searchkeyword, "full");
 				$row['content_text']		= parsesearch($row['content_text'], $searchkeyword, "");
@@ -246,7 +246,7 @@ function parsesearch($text, $match, $amount){
 		$text = strip_tags($text);
 		$temp = stristr($text,$match);
 		$pos = strlen($text)-strlen($temp);
-		
+
 		if($amount == "full"){
 		}else{
 			if($pos < 140){
@@ -384,7 +384,7 @@ function show_content_archive(){
 
 		$mainparent		= $aa -> getMainParent(intval($qs[1]));
 		$content_pref	= $aa -> getContentPref($mainparent);
-		
+
 		show_content_search_menu("archive", $mainparent);		//show navigator/search/order menu
 
 		if(!isset($CONTENT_ARCHIVE_TABLE)){
@@ -413,7 +413,7 @@ function show_content_archive(){
 		$order			= $aa -> getOrder();
 		$nextprevquery	= (isset($content_pref["content_archive_nextprev"]) && $content_pref["content_archive_nextprev"] ? "LIMIT ".intval($from).",".intval($number) : "");
 		$sql1 = new db;
-		
+
 		if(isset($content_pref["content_archive_letterindex"]) && $content_pref["content_archive_letterindex"]){
 			$distinctfirstletter = $sql -> db_Select($plugintable, " DISTINCT(content_heading) ", "content_refer != 'sa' AND ".$qry." ".$datequery." AND content_class REGEXP '".e_CLASS_REGEXP."' ORDER BY content_heading ASC ");
 			while($row = $sql -> db_Fetch()){
@@ -526,7 +526,7 @@ function displayPreview($qry){
 					$CONTENT_RECENT_TABLE_INFOPRE = TRUE;
 					$CONTENT_RECENT_TABLE_INFOPOST = TRUE;
 				}
-				
+
 				$content_recent_table_string .= $tp -> parseTemplate($CONTENT_RECENT_TABLE, FALSE, $content_shortcodes);
 			}
 		}
@@ -542,7 +542,7 @@ function show_content_recent(){
 
 		$mainparent		= $aa -> getMainParent(intval($qs[1]));
 		$content_pref	= $aa -> getContentPref($mainparent);
-		
+
 		show_content_search_menu("recent", $mainparent);		//show navigator/search/order menu
 
 		$cachestr = "$plugintable.recent.$qs[1]";
@@ -562,7 +562,7 @@ function show_content_recent(){
 		$contenttotal = $sql2 -> db_Count($plugintable, "(*)", "WHERE content_refer != 'sa' AND ".$qry." ".$datequery." AND content_class REGEXP '".e_CLASS_REGEXP."' " );
 
 		if($from > $contenttotal-1){ js_location(e_SELF); }
-		
+
 		$recentqry			= "content_refer !='sa' AND ".$qry." ".$datequery." AND content_class REGEXP '".e_CLASS_REGEXP."' ".$order." ".$nextprevquery;
 		$text				= displayPreview($recentqry);
 		$text				= $aa -> getCrumbPage("recent", $array, $mainparent).$text;
@@ -586,7 +586,7 @@ function show_content_cat_all(){
 
 		$mainparent		= $aa -> getMainParent(intval($qs[2]));
 		$content_pref	= $aa -> getContentPref($mainparent);
-		
+
 		show_content_search_menu("catall", $mainparent);		//show navigator/search/order menu
 
 		if(!isset($CONTENT_CAT_TABLE)){
@@ -628,7 +628,7 @@ function show_content_cat_all(){
 			$totalitems = $aa -> countCatItems($key);
 			$sql -> db_Select($plugintable, "*", "content_id = '".$key."' ");
 			$row = $sql -> db_Fetch();
-			
+
 			$date	= $tp -> parseTemplate('{CONTENT_CAT_TABLE_DATE}', FALSE, $content_shortcodes);
 			$auth	= $tp -> parseTemplate('{CONTENT_CAT_TABLE_AUTHORDETAILS}', FALSE, $content_shortcodes);
 			$ep		= $tp -> parseTemplate('{CONTENT_CAT_TABLE_EPICONS}', FALSE, $content_shortcodes);
@@ -658,7 +658,7 @@ function show_content_cat($mode=""){
 
 		$mainparent		= $aa -> getMainParent(intval($qs[1]));
 		$content_pref	= $aa -> getContentPref($mainparent);
-		
+
 		$array			= $aa -> getCategoryTree("", $mainparent, TRUE);
 		$validparent	= "0,0.".implode(",0.", array_keys($array));
 		$qry			= " content_id = '".intval($qs[1])."' AND content_refer !='sa' AND content_parent REGEXP '".$aa -> CONTENTREGEXP($validparent)."' ".$datequery." AND content_class REGEXP '".e_CLASS_REGEXP."' ";
@@ -679,7 +679,7 @@ function show_content_cat($mode=""){
 
 		$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_icon_path				= $tp -> replaceConstants($content_pref["content_icon_path"]);					
+		$content_icon_path				= $tp -> replaceConstants($content_pref["content_icon_path"]);
 		$order							= $aa -> getOrder();
 		$number							= (isset($content_pref["content_nextprev_number"]) && $content_pref["content_nextprev_number"] ? $content_pref["content_nextprev_number"] : "5");
 		$nextprevquery					= (isset($content_pref["content_nextprev"]) && $content_pref["content_nextprev"] ? "LIMIT ".intval($from).",".intval($number) : "");
@@ -709,7 +709,7 @@ function show_content_cat($mode=""){
 				}
 				$totalparent = $aa -> countCatItems($row['content_id']);
 				$CONTENT_CAT_LIST_TABLE_AUTHORDETAILS = $aa -> prepareAuthor("cat", $row['content_author'], $row['content_id']);
-				$textparent			= $tp -> parseTemplate($CONTENT_CAT_LIST_TABLE, FALSE, $content_shortcodes);							
+				$textparent			= $tp -> parseTemplate($CONTENT_CAT_LIST_TABLE, FALSE, $content_shortcodes);
 			}
 		}
 
@@ -779,7 +779,7 @@ function show_content_cat($mode=""){
 			$captionchild		= $content_pref['content_cat_item_caption'];
 
 			$crumbpage = $aa -> getCrumbPage("cat", $array, $qs[1]);
-			if(isset($textparent)){ 
+			if(isset($textparent)){
 				$textparent = $crumbpage.$textparent;
 			}else{
 				$textchild = $crumbpage.$textchild;
@@ -845,7 +845,7 @@ function show_content_author_all(){
 
 		$mainparent		= $aa -> getMainParent(intval($qs[2]));
 		$content_pref	= $aa -> getContentPref($mainparent);
-		
+
 		show_content_search_menu("authorall", $mainparent);		//show navigator/search/order menu
 
 		if(!isset($CONTENT_AUTHOR_TABLE)){
@@ -874,12 +874,12 @@ function show_content_author_all(){
 		$dateqry		= "AND p.content_datestamp < ".time()." AND (p.content_enddate=0 || p.content_enddate>".time().")";
 
 		$sql1 = new db; $sql2 = new db;
-		$contenttotal = $sql1 -> db_Select($plugintable." AS p", "DISTINCT(p.content_author)", "p.content_refer !='sa' AND ".$qry." ".$datequery." AND p.content_class REGEXP '".e_CLASS_REGEXP."'");					
+		$contenttotal = $sql1 -> db_Select($plugintable." AS p", "DISTINCT(p.content_author)", "p.content_refer !='sa' AND ".$qry." ".$datequery." AND p.content_class REGEXP '".e_CLASS_REGEXP."'");
 
 		$query = "
 		SELECT DISTINCT(p.content_author)
 		FROM #$plugintable AS p
-		WHERE p.content_refer !='sa' AND ".$qry." ".$dateqry." AND p.content_class REGEXP '".e_CLASS_REGEXP."' 
+		WHERE p.content_refer !='sa' AND ".$qry." ".$dateqry." AND p.content_class REGEXP '".e_CLASS_REGEXP."'
 		ORDER BY p.content_author";
 
 		$arr = array();
@@ -983,7 +983,7 @@ function show_content_author(){
 
 		$mainparent		= $aa -> getMainParent(intval($qs[1]));
 		$content_pref	= $aa -> getContentPref($mainparent);
-		
+
 		show_content_search_menu("author", $mainparent);		//show navigator/search/order menu
 
 		$cachestr = "$plugintable.author.$qs[1]";
@@ -1010,7 +1010,7 @@ function show_content_author(){
 		}else{
 			list($content_author)	= $sqla -> db_Fetch();
 			$sqlb = new db;
-			$authordetails	= $aa -> getAuthor($content_author);						
+			$authordetails	= $aa -> getAuthor($content_author);
 			$query			= " content_author = '".$authordetails[3]."' || content_author REGEXP '^".$authordetails[1]."^' ".(is_numeric($content_author) ? " || content_author = '".$authordetails[0]."' " : "")." ";
 			$validparent	= implode(",", array_keys($array));
 			$qry			= " content_refer !='sa' AND content_parent REGEXP '".$aa -> CONTENTREGEXP($validparent)."' ".$datequery." AND content_class REGEXP '".e_CLASS_REGEXP."' AND (".$query.") ";
@@ -1036,7 +1036,7 @@ function show_content_top(){
 
 		$mainparent		= $aa -> getMainParent(intval($qs[1]));
 		$content_pref	= $aa -> getContentPref($mainparent);
-		
+
 		show_content_search_menu("top", $mainparent);		//show navigator/search/order menu
 
 		if(!isset($CONTENT_TOP_TABLE)){
@@ -1067,7 +1067,7 @@ function show_content_top(){
 		$qry1 = "
 		SELECT p.*, r.*, (r.rate_rating / r.rate_votes) as rate_avg
 		FROM #rate AS r
-		LEFT JOIN #pcontent AS p ON p.content_id = r.rate_itemid 
+		LEFT JOIN #pcontent AS p ON p.content_id = r.rate_itemid
 		WHERE p.content_refer !='sa' AND ".$qry." ".$datequery1." AND p.content_class REGEXP '".e_CLASS_REGEXP."' AND r.rate_table='pcontent'
 		ORDER BY rate_avg DESC ";
 		$qry2 = $qry1." ".$np;
@@ -1149,13 +1149,13 @@ function show_content_score(){
 
 // ##### CONTENT ITEM ------------------------------------------
 function show_content_item(){
-		global $pref, $content_pref, $content_icon_path, $content_image_path, $content_file_path, $custom, $plugindir, $plugintable, $array, $content_shortcodes, $datequery, $order, $nextprevquery, $from, $number, $row, $qs, $gen, $sql, $aa, $tp, $rs, $cobj, $e107, $e107cache, $eArrayStorage, $ns, $rater, $ep, $row, $authordetails, $mainparent; 
+		global $pref, $content_pref, $content_icon_path, $content_image_path, $content_file_path, $custom, $plugindir, $plugintable, $array, $content_shortcodes, $datequery, $order, $nextprevquery, $from, $number, $row, $qs, $gen, $sql, $aa, $tp, $rs, $cobj, $e107, $e107cache, $eArrayStorage, $ns, $rater, $ep, $row, $authordetails, $mainparent;
 		global $CONTENT_CONTENT_TABLE_TEXT, $CONTENT_CONTENT_TABLE_PAGENAMES, $CONTENT_CONTENT_TABLE_SUMMARY, $CONTENT_CONTENT_TABLE_CUSTOM_TAGS, $CONTENT_CONTENT_TABLE_PARENT, $CONTENT_CONTENT_TABLE_INFO_PRE, $CONTENT_CONTENT_TABLE_INFO_POST, $CONTENT_CONTENT_TABLE_AUTHORDETAILS, $CONTENT_CONTENT_TABLE_INFO_PRE_HEADDATA, $CONTENT_CONTENT_TABLE_INFO_POST_HEADDATA;
 		global $CONTENT_CONTENT_TABLE_PREV_PAGE, $CONTENT_CONTENT_TABLE_NEXT_PAGE;
 
 		$mainparent			= $aa -> getMainParent(intval($qs[1]));
 		$content_pref		= $aa -> getContentPref($mainparent);
-		
+
 		show_content_search_menu("item", $mainparent);		//show navigator/search/order menu
 		$array				= $aa -> getCategoryTree("", $mainparent, TRUE);
 		$validparent		= implode(",", array_keys($array));
@@ -1178,9 +1178,9 @@ function show_content_item(){
 					}else{
 						$contentrefernew	= ($refertmp[0]+1)."^".$refertmp[1];
 					}
-					$sql = new db;
+					if (!is_object($sql)){ $sql = new db; }  
 					$sql -> db_Update($plugintable, "content_refer='".$contentrefernew."' WHERE content_id='".intval($qs[1])."' ");
-					
+
 					$e107cache->clear("$plugintable.content.$qs[1]");
 					$e107cache->clear("$plugintable.recent.$mainparent");
 					$e107cache->clear("$plugintable.cat.list.$mainparent");
@@ -1270,7 +1270,7 @@ function show_content_item(){
 							$CONTENT_CONTENT_TABLE_NEXT_PAGE = ' ';
 						}
 					}
-					
+
 					//0:normal links, 1:selectbox
 					//$content_pref["content_content_pagenames_rendertype"] = "1";
 					if(isset($content_pref["content_content_pagenames_rendertype"]) && $content_pref["content_content_pagenames_rendertype"] == "1"){
@@ -1334,7 +1334,7 @@ function show_content_item(){
 			$CONTENT_CONTENT_TABLE_INFO_POST_HEADDATA = FALSE;
 			$CONTENT_CONTENT_TABLE_INFO_PRE = FALSE;
 			$CONTENT_CONTENT_TABLE_INFO_POST = FALSE;
-			
+
 			if ($date!="" || $auth!="" || $ep!="" || $edit!="" || $par!="" || $com!="" || $score!="" || $ref!="" || $sub!="" || $rat!="" || $fil!="") {
 				$CONTENT_CONTENT_TABLE_INFO_PRE = TRUE;
 				$CONTENT_CONTENT_TABLE_INFO_POST = TRUE;
@@ -1467,4 +1467,4 @@ function show_content_item(){
 
 require_once(FOOTERF);
 
-?>
+?>

e107_plugins/content/content_update.php

@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/content/content_update.php,v $
-|     $Revision: 1.1.1.1 $
+|     $Revision: 1.2 $
-|     $Date: 2006-12-02 04:34:56 $
+|     $Date: 2006-12-31 14:46:30 $
-|     $Author: mcfly_e107 $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -61,14 +61,14 @@ if(!$sql->db_Query("SHOW COLUMNS FROM ".MPREFIX."pcontent")) {
 	content_datestamp int(10) unsigned NOT NULL default '0',
 	content_enddate int(10) unsigned NOT NULL default '0',
 	content_class varchar(255) NOT NULL default '',
-	content_pref text NOT NULL, 
+	content_pref text NOT NULL,
 	content_order varchar(10) NOT NULL default '0',
 	content_score tinyint(3) unsigned NOT NULL default '0',
 	content_meta text NOT NULL,
 	content_layout varchar(255) NOT NULL default '',
 	PRIMARY KEY  (content_id)
 	) TYPE=MyISAM;";
-	
+
 	$sql->db_Select_gen($query);
 }
 
@@ -90,7 +90,7 @@ if($newcontent == 0){
 	//article:			$content_type == "0" || $content_type == "15"
 
 	// ##### STAGE 1 : ANALYSE OLD CONTENT --------------------------------------------------------
-	$sql = new db;
+	if (!is_object($sql)){ $sql = new db; }  
 	$totaloldcontentrows		= $sql -> db_Count("content");
 	$totaloldrowscat_article	= $sql -> db_Count("content", "(*)", "WHERE content_parent = '0' AND content_type = '6'");
 	$totaloldrowscat_review		= $sql -> db_Count("content", "(*)", "WHERE content_parent = '0' AND content_type = '10'");
@@ -102,7 +102,7 @@ if($newcontent == 0){
 		$totaloldrowsitem_content	= "1";
 		$totaloldrowsitem_article	= "1";
 		$totaloldrowsitem_review	= "1";
-		
+
 		//if no old records exist, create a few default categories
 		$main_convert = create_defaults();
 	}else{
@@ -132,19 +132,19 @@ if($newcontent == 0){
 
 		//convert comments
 		$ac -> convert_comments();
-		
+
 		//convert rating
 		$ac -> convert_rating();
 
 		$conversion_analyses_rows_total		= $totaloldcontentrows;
-		
+
 		$conversion_analyses_rows_converted	= (count($article_cat_array[1]) + count($review_cat_array[1]) + count($content_array[2]) + count($article_array[2]) + count($review_array[2]));
-		
+
 		$conversion_analyses_rows_warning	= (count($content_array[4]) + count($content_array[5]) + count($article_array[4]) + count($article_array[5]) + count($review_array[4]) + count($review_array[5]));
-		
+
 		$conversion_analyses_rows_failed	= (count($article_cat_array[2]) + count($review_cat_array[2]) + count($content_array[3]) + count($article_array[3]) + count($review_array[3]) + count($unknown_array[1]));
-		
+
-		
+
 		//only output detailed information if developer mode is set
 		if ($pref['developer']) {
 			showlink();
@@ -193,7 +193,7 @@ if($newcontent == 0){
 					$text .= "
 					</div>
 				</td>
-			</tr>";		
+			</tr>";
 
 			$text .= $SPACER;
 
@@ -220,28 +220,28 @@ if($newcontent == 0){
 			$text .= "
 
 			".$SPACER."
-			
+
 			".$ac -> results_conversion_mainparent($content_mainarray, $review_mainarray, $article_mainarray)."
-			
+
-			".$SPACER."			
+			".$SPACER."
-			
+
 			<tr><td class='fcaption' colspan='2'>content : ".CONTENT_ADMIN_CONVERSION_LAN_27."</td></tr>
 			".$ac -> results_conversion_row("content", $content_array, $totaloldrowsitem_content)."
-			
+
-			".$SPACER."			
+			".$SPACER."
-			
+
 			<tr><td class='fcaption' colspan='2'>review : ".CONTENT_ADMIN_CONVERSION_LAN_27."</td></tr>
 			".$ac -> results_conversion_category("review", $review_cat_array, $totaloldrowscat_review)."
 			".$ac -> results_conversion_row("review", $review_array, $totaloldrowsitem_review)."
-			
+
-			".$SPACER."			
+			".$SPACER."
-			
+
 			<tr><td class='fcaption' colspan='2'>article : ".CONTENT_ADMIN_CONVERSION_LAN_27."</td></tr>
 			".$ac -> results_conversion_category("article", $article_cat_array, $totaloldrowscat_article)."
 			".$ac -> results_conversion_row("article", $article_array, $totaloldrowsitem_article)."
-			
+
 			".$SPACER."
-			
+
 			</table>";
 
 			$main_convert = array($caption, $text);
@@ -311,7 +311,7 @@ function create_defaults()
 	global $ns, $ac, $plugindir;
 
 	$plugindir		= e_PLUGIN."content/";
-	
+
 	if(!is_object($ac)){
 		require_once($plugindir."handlers/content_convert_class.php");
 		$ac = new content_convert;
@@ -320,12 +320,12 @@ function create_defaults()
 	$content_mainarray			= $ac -> create_mainparent("content", "1", "1");
 	$article_mainarray			= $ac -> create_mainparent("article", "1", "2");
 	$review_mainarray			= $ac -> create_mainparent("review", "1", "3");
-	
+
 	$main_convert = '';
 	//only output detailed information if developer mode is set
 	if ($pref['developer']) {
 		showlink();
-	
+
 		$text = "<table class='fborder' style='width:95%; padding:0px;'>";
 		$text .= $ac -> results_conversion_mainparent($content_mainarray, $review_mainarray, $article_mainarray);
 		$text .= "</table>";
@@ -363,6 +363,6 @@ function set_content_version()
 		$text = CONTENT_ADMIN_CONVERSION_LAN_62." $new_version <br />";
 	}
 	return $text;
-}	
+}
 
-?>
+?>

e107_plugins/links_page/links.php

@@ -11,9 +11,9 @@
 |     GNU General Public License (http://gnu.org).
 |
 |     $Source: /cvs_backup/e107_0.8/e107_plugins/links_page/links.php,v $
-|     $Revision: 1.2 $
+|     $Revision: 1.3 $
-|     $Date: 2006-12-29 12:58:37 $
+|     $Date: 2006-12-31 14:46:30 $
-|     $Author: e107steved $
+|     $Author: e107coders $
 +----------------------------------------------------------------------------+
 */
 require_once('../../class2.php');
@@ -167,7 +167,7 @@ if (isset($qs[0]) && $qs[0] == "comment" && isset($qs[1]) && is_numeric($qs[1])
 //submit link
 if (isset($qs[0]) && $qs[0] == "submit")
 {
-  if (check_class($linkspage_pref['link_submit_class'])) 
+  if (check_class($linkspage_pref['link_submit_class']))
   {
 	echo displayNavigator('');
 	displayLinkSubmit();
@@ -283,7 +283,7 @@ function displayPersonalManager(){
 		if (isset($delete) && $delete == 'main') {
 			$sql->db_Select("links_page", "link_order", "link_id='".intval($del_id)."'");
 			$row = $sql->db_Fetch();
-			$sql2 = new db;
+			if (!is_object($sql2)){ $sql2 = new db; }
 			$sql->db_Select("links_page", "link_id", "link_order>'".$row['link_order']."' && link_category='".intval($id)."'");
 			while ($row = $sql->db_Fetch()) {
 				$sql2->db_Update("links_page", "link_order=link_order-1 WHERE link_id='".$row['link_id']."'");
@@ -521,4 +521,4 @@ require_once(FOOTERF);
 
 
 
-?>
+?>

e107_plugins/list_new/list_class.php

@@ -11,9 +11,9 @@
 |       GNU General Public License (http://gnu.org).
 |
 |		$Source: /cvs_backup/e107_0.8/e107_plugins/list_new/list_class.php,v $
-|		$Revision: 1.1.1.1 $
+|		$Revision: 1.2 $
-|		$Date: 2006-12-02 04:35:26 $
+|		$Date: 2006-12-31 14:46:30 $
-|		$Author: mcfly_e107 $
+|		$Author: e107coders $
 +---------------------------------------------------------------+
 */
 if (!defined('e107_INIT')) { exit; }
@@ -47,7 +47,7 @@ class listclass {
 		global $sql,$eArrayStorage;
 
 		//check preferences from database
-		$sql = new db;
+		if (!is_object($sql)){ $sql = new db; }  
 		$num_rows = $sql -> db_Select("core", "*", "e107_name='list' ");
 		$row = $sql -> db_Fetch();
 
@@ -138,7 +138,7 @@ class listclass {
 					$titles[] = $content_name." : ".$row['content_heading'];
 				}
 			}
-		}		
+		}
 		$content_types = array_unique($content_types);
 
 		return;
@@ -247,7 +247,7 @@ class listclass {
 			$list_pref["$sections[$i]_new_page_order"]			= ($i+1);
 			$list_pref["$sections[$i]_new_page_icon"]			= "1";
 		}
-		
+
 		//new menu preferences
 		$list_pref['new_menu_caption']				= LIST_ADMIN_15;
 		$list_pref['new_menu_icon_use']				= "1";
@@ -343,7 +343,7 @@ class listclass {
 		$menutext = "";
 		$start = "";
 		$end = "";
-		
+
 		$LIST_ICON = "";
 		$LIST_DATE = "";
 		$LIST_HEADING = "";
@@ -356,29 +356,29 @@ class listclass {
 
 		if(is_array($LIST_DATA)){			//if it is an array, data exists and data is not empty
 			for($i=0;$i<count($LIST_DATA[$mode]);$i++)
-			{				
+			{
 				$LIST_ICON		= $LIST_DATA[$mode][$i][0];
 				$LIST_HEADING	= $LIST_DATA[$mode][$i][1];
 				$LIST_AUTHOR	= $LIST_DATA[$mode][$i][2];
 				$LIST_CATEGORY	= $LIST_DATA[$mode][$i][3];
 				$LIST_DATE		= $LIST_DATA[$mode][$i][4];
 				$LIST_INFO		= $LIST_DATA[$mode][$i][5];
-				
+
 				if($mode == "recent_menu"){
 					global $sc_style;
-					$LIST_AUTHOR	= ($LIST_AUTHOR ? $sc_style['LIST_AUTHOR']['pre'].$LIST_AUTHOR.$sc_style['LIST_AUTHOR']['post'] : "");					
+					$LIST_AUTHOR	= ($LIST_AUTHOR ? $sc_style['LIST_AUTHOR']['pre'].$LIST_AUTHOR.$sc_style['LIST_AUTHOR']['post'] : "");
-					$LIST_CATEGORY	= ($LIST_CATEGORY ? $sc_style['LIST_CATEGORY']['pre'].$LIST_CATEGORY.$sc_style['LIST_CATEGORY']['post'] : "");					
+					$LIST_CATEGORY	= ($LIST_CATEGORY ? $sc_style['LIST_CATEGORY']['pre'].$LIST_CATEGORY.$sc_style['LIST_CATEGORY']['post'] : "");
 					$menutext .= preg_replace("/\{(.*?)\}/e", '$\1', $LIST_MENU_RECENT);
-				
+
 				}elseif($mode == "new_menu"){
 					global $sc_style;
-					$LIST_AUTHOR	= ($LIST_AUTHOR ? $sc_style['LIST_AUTHOR']['pre'].$LIST_AUTHOR.$sc_style['LIST_AUTHOR']['post'] : "");					
+					$LIST_AUTHOR	= ($LIST_AUTHOR ? $sc_style['LIST_AUTHOR']['pre'].$LIST_AUTHOR.$sc_style['LIST_AUTHOR']['post'] : "");
-					$LIST_CATEGORY	= ($LIST_CATEGORY ? $sc_style['LIST_CATEGORY']['pre'].$LIST_CATEGORY.$sc_style['LIST_CATEGORY']['post'] : "");					
+					$LIST_CATEGORY	= ($LIST_CATEGORY ? $sc_style['LIST_CATEGORY']['pre'].$LIST_CATEGORY.$sc_style['LIST_CATEGORY']['post'] : "");
 					$menutext .= preg_replace("/\{(.*?)\}/e", '$\1', $LIST_MENU_NEW);
-				
+
 				}elseif($mode == "recent_page"){
 					$menutext .= $tp -> parseTemplate($LIST_PAGE_RECENT, FALSE, $list_shortcodes);
-				
+
 				}elseif($mode == "new_page"){
 					$menutext .= $tp -> parseTemplate($LIST_PAGE_NEW, FALSE, $list_shortcodes);
 				}
@@ -415,13 +415,13 @@ class listclass {
 					$start = preg_replace("/\{(.*?)\}/e", '$\1', $LIST_MENU_RECENT_START);
 					$end = preg_replace("/\{(.*?)\}/e", '$\1', $LIST_MENU_RECENT_END);
 				}
-			
+
 			}elseif($mode == "new_menu"){
 				if($list_pref[$mode."_showempty"] || $menutext){
 					$start = preg_replace("/\{(.*?)\}/e", '$\1', $LIST_MENU_NEW_START);
 					$end = preg_replace("/\{(.*?)\}/e", '$\1', $LIST_MENU_NEW_END);
 				}
-			
+
 			}elseif($mode == "recent_page"){
 				if($list_pref[$mode."_showempty"] || $menutext){
 					$start = preg_replace("/\{(.*?)\}/e", '$\1', $LIST_PAGE_RECENT_START);
@@ -497,7 +497,7 @@ class listclass {
 
 	function parse_heading($heading, $mode){
 		global $list_pref;
-		
+
 		if($list_pref[$mode."_char_heading"] && strlen($heading) > $list_pref[$mode."_char_heading"]){
 			$heading = substr($heading, 0, $list_pref[$mode."_char_heading"]).$list_pref[$mode."_char_postfix"];
 		}
@@ -506,7 +506,7 @@ class listclass {
 
 	function getListDate($datestamp, $mode){
 		global $list_pref;
-		
+
 		$datestamp += TIMEOFFSET;
 
 		$todayarray = getdate();
@@ -548,4 +548,4 @@ class listclass {
 
 }
 
-?>
+?>