Index: trunk/kernel/action.php =================================================================== diff -u -r521 -r534 --- trunk/kernel/action.php (.../action.php) (revision 521) +++ trunk/kernel/action.php (.../action.php) (revision 534) @@ -345,7 +345,7 @@ case "m_remove_group": if($ro_perm) break; - $adodbConnection = GetAdodbConnection(); + $adodbConnection = &GetADODBConnection(); $adodbConnection->Execute("DELETE FROM UserGroup where UserId='$UserId' AND GroupId='$GroupId'"); break; @@ -369,7 +369,7 @@ $GroupId = $_POST["GroupId"]; $CatId = $_POST["CategoryId"]; $Module = $_POST["Module"]; - $ado = GetADODBConnection(); + $ado = &GetADODBConnection(); $sql = "SELECT * FROM ".GetTablePrefix()."PermissionConfig WHERE ModuleId='$Module'"; $rs = $ado->Execute($sql); $PermNames = array(); @@ -437,7 +437,7 @@ break; case "m_perm_delete_group": if($ro_perm) break; - $ado = GetADODBConnection(); + $ado = &GetADODBConnection(); $CatId = $_POST["CategoryId"]; foreach($_POST["itemlist"] as $groupid) { @@ -656,7 +656,7 @@ break; case "m_rel_delete": - $adodbConnection= GetADODBConnection(); + $adodbConnection= &GetADODBConnection(); $table = $objSession->GetEditTable("Relationship"); if(isset($_POST["itemlist"])) { @@ -685,7 +685,7 @@ //$r = $RelList->Add($_POST["SourceId"],$_POST["SourceType"],$_POST["TargetId"],$_POST["TargetType"], // 0,(int)$_POST["Enabled"],$_POST["RelType"], $Rel); - $ado = GetADODBConnection(); + $ado = &GetADODBConnection(); $NewId = $ado->GetOne('SELECT MIN(RelationshipId) as MinValue FROM '.$RelList->SourceTable); if($NewId > 0) $NewId = 0; $NewId--; @@ -841,7 +841,7 @@ $id = $_POST["ItemId"]; $objEditData = new clsCustomDataList(); //$objSession->GetEditTable("CustomMetaData")); $objEditData->SetTable('edit'); - $ado = GetADODBConnection(); + $ado = &GetADODBConnection(); if($id && is_array($_POST["CustomData"])) { @@ -999,7 +999,7 @@ $r = $objReviews->AddReview($CreatedOn,$ReviewText,$Status, $IPAddress, (int)$_POST["review_priority"], $_POST["ItemId"],$_POST["ItemType"], $CreatedById,$html, $post_info['Module']); - $ado = GetADODBConnection(); + $ado = &GetADODBConnection(); $rs = $ado->Execute("SELECT MIN(ReviewId) as MinValue FROM ".$objReviews->SourceTable); $NewId = $rs->fields["MinValue"]-1; $sql = "UPDATE ".$objReviews->SourceTable." SET ReviewId=".$NewId." WHERE ReviewId=".$r->Get("ReviewId"); @@ -1115,7 +1115,7 @@ $t = $objEditItems->AddTheme($_POST["name"],$_POST["description"],(int)$_POST["enabled"], (int)$_POST["CacheTimeout"],$Primary); - $ado = GetADODBConnection(); + $ado = &GetADODBConnection(); $rs = $ado->Execute("SELECT MIN(ThemeId) as MinValue FROM ".$objEditItems->SourceTable); $NewId = $rs->fields["MinValue"]-1; $sql = "UPDATE ".$objEditItems->SourceTable." SET ThemeId=".$NewId." WHERE ThemeId=".$t->Get("ThemeId"); @@ -1231,7 +1231,7 @@ $_POST["icon"],$_POST["date_format"],$_POST["time_format"], $_POST["decimal"],$_POST["thousand"]); - $ado = GetADODBConnection(); + $ado = &GetADODBConnection(); $rs = $ado->Execute("SELECT MIN(LanguageId) as MinValue FROM ".$objEditItems->SourceTable); $NewId = $rs->fields["MinValue"]-1; $sql = "UPDATE ".$objEditItems->SourceTable." SET LanguageId=".$NewId." WHERE LanguageId=".$l->Get("LanguageId"); @@ -1293,7 +1293,7 @@ if($_POST["importlabels"]==1 && $_POST["srcpack"]>0) { - $ado = GetADODBConnection(); + $ado = &GetADODBConnection(); $rs = $ado->Execute("SELECT * FROM ".GetTablePrefix()."Phrase WHERE LanguageId=".$_POST["srcpack"]); $plist = new clsPhraseList(); $plist->SourceTable = $objSession->GetEditTable("Phrase"); @@ -1367,7 +1367,7 @@ { $r = $objPhraseList->AddPhrase($_POST["name"][0],$_POST["LanguageId"],$_POST["translation"][0],$_POST["phrasetype"][0]); if ($r != "Error") { - $ado = GetADODBConnection(); + $ado = &GetADODBConnection(); $rs = $ado->Execute("SELECT MIN(PhraseId) as MinValue FROM ".$objPhraseList->SourceTable); $NewId = $rs->fields["MinValue"]-1; $sql = "UPDATE ".$objPhraseList->SourceTable." SET PhraseId=".$NewId." WHERE PhraseId=$PhraseId"; @@ -1420,7 +1420,7 @@ foreach($_POST["itemlist"] as $id) { $sql = "UPDATE ".$objSession->GetEditTable("Phrase")." SET LanguageId = 0 WHERE PhraseId = ".$id; - $ado = GetADODBConnection(); + $ado = &GetADODBConnection(); $ado->Execute($sql); } } @@ -1610,7 +1610,7 @@ break; } - $ado = GetADODBConnection(); + $ado = &GetADODBConnection(); $NewId = $ado->GetOne('SELECT MIN(ImageId) as MinValue FROM '.$objImageList->SourceTable); if($NewId > 0) $NewId = 0; $NewId--; @@ -1995,7 +1995,7 @@ case "m_sql_query": if($ro_perm) break; $SqlQuery = $_POST["sql"]; - $ado = GetADODBConnection(); + $ado = &GetADODBConnection(); if(strlen($sql)) { $SqlResult = $ado->Execute(stripslashes($SqlQuery)); @@ -2005,14 +2005,14 @@ break; case "m_purge_email_log": if($ro_perm) break; - $ado = GetADODBConnection(); + $ado = &GetADODBConnection(); $sql = "DELETE FROM ".GetTablePrefix()."EmailLog"; $ado->Execute($sql); break; case "m_session_delete": if($ro_perm) break; - $ado = GetADODBConnection(); + $ado = &GetADODBConnection(); if (count($_POST['itemlist']) > 0) { foreach($_POST["itemlist"] as $id) { @@ -2169,7 +2169,7 @@ /* category Edit */ if( GetVar('CatEditStatus') == 1 ) { - $adodbConnection = GetADODBConnection(); + $adodbConnection = &GetADODBConnection(); // $sql = "SELECT * FROM ".$objSession->GetEditTable("Category")." WHERE CategoryId=0"; $sql = "SELECT ParentId FROM ".$objSession->GetEditTable("Category")." WHERE CategoryId=-1"; @@ -2279,7 +2279,7 @@ $objEditList = new clsPhraseList(); $objEditList->SourceTable = $objSession->GetEditTable("Phrase"); - $ado = GetADODBConnection(); + $ado = &GetADODBConnection(); $rs = $ado->Execute("SELECT MIN(PhraseId) as MinValue FROM ".$objEditList->SourceTable); $NewId = $rs->fields["MinValue"]-1; @@ -2302,7 +2302,7 @@ if( GetVar('MissingLangEditStatus') == 2 ) { $table = $objSession->GetSessionKey()."_".$ThemeId."_labels"; - $ado = GetADODBConnection(); + $ado = &GetADODBConnection(); $ado->Execute("DROP TABLE IF EXISTS ".$table); }