Index: trunk/admin/install/upgrades/inportal_upgrade_v1.0.5.sql =================================================================== diff -u --- trunk/admin/install/upgrades/inportal_upgrade_v1.0.5.sql (revision 0) +++ trunk/admin/install/upgrades/inportal_upgrade_v1.0.5.sql (revision 93) @@ -0,0 +1,2 @@ +INSERT INTO PermissionConfig (PermissionName, Description, ErrorMessage, ModuleId) VALUES ('SYSTEM_ACCESS.READONLY', 'la_PermName_SystemAccess.ReadOnly_desc', 'la_PermName_SystemAccess.ReadOnly_error', 'Admin'); +UPDATE Modules SET Version = '1.0.5' WHERE Name = 'In-Portal'; \ No newline at end of file Index: trunk/kernel/action.php =================================================================== diff -u -r85 -r93 --- trunk/kernel/action.php (.../action.php) (revision 85) +++ trunk/kernel/action.php (.../action.php) (revision 93) @@ -1,10 +1,12 @@ \n"; -echo 'REQUEST:'; -print_pre($_REQUEST); -*/ +if( defined('DEBUG_ACTIONS') && (DEBUG_ACTIONS & KERNEL_ACTIONS) == KERNEL_ACTIONS ) +{ + echo "Kernel Action $Action
\n"; + echo 'REQUEST:'; + print_pre($_REQUEST); +} + switch($Action) { case "m_add_user": @@ -36,7 +38,8 @@ $_POST["user_phone"], $_POST["user_street"], $_POST["user_city"], $_POST["user_state"], $_POST["user_zip"], $_POST["user_country"], $dob); - $objCustomEdit = new clsCustomDataList($objSession->GetEditTable("CustomMetaData")); + $objCustomEdit = new clsCustomDataList(); //$objSession->GetEditTable("CustomMetaData")); + $objCustomEdit->SetTable('edit'); $objCustomEdit->LoadResource($u->Get("ResourceId")); $CustomFields = new clsCustomFieldList(6); $DataChanged = FALSE; @@ -56,6 +59,7 @@ } if($DataChanged) $objCustomEdit->SaveData(); + $objCustomEdit->SetTable('live'); } break; case "m_edit_user": @@ -83,10 +87,16 @@ $_POST["user_street"], $_POST["user_city"], $_POST["user_state"], $_POST["user_zip"], $_POST["user_country"], $dob); - $objCustomEdit = new clsCustomDataList($objSession->GetEditTable("CustomMetaData")); + + $objCustomEdit = new clsCustomDataList(); //$objSession->GetEditTable("CustomMetaData")); + $objCustomEdit->SetTable('edit'); + $DataChanged = false; + + echo "Loading CF by USER_RID: ".$u->Get("ResourceId")."
"; + $objCustomEdit->LoadResource($u->Get("ResourceId")); $CustomFields = new clsCustomFieldList(6); - $DataChanged = FALSE; + foreach($_POST as $key=>$value) { if(substr($key,0,1)=="_") @@ -96,13 +106,16 @@ if(is_object($cvalue)) { + echo "Saving Value of CF [CF_ID: ".$cvalue->Get("CustomFieldId")."; RID: ".$u->Get("ResourceId")."; NEW_VAL: ".$value."]
"; $objCustomEdit->SetFieldValue($cvalue->Get("CustomFieldId"),$u->Get("ResourceId"),$value); $DataChanged = TRUE; } } - } + } + if($DataChanged) $objCustomEdit->SaveData(); + $objCustomEdit->SetTable('live'); break; case "m_user_primarygroup": //print_pre($_REQUEST); @@ -697,8 +710,10 @@ case "m_edit_custom_data": $id = $_POST["ItemId"]; - $objEditData = new clsCustomDataList($objSession->GetEditTable("CustomMetaData")); + $objEditData = new clsCustomDataList(); //$objSession->GetEditTable("CustomMetaData")); + $objEditData->SetTable('edit'); $ado = GetADODBConnection(); + $ado->debug = 1; if($id && is_array($_POST["CustomData"])) { foreach($_POST["CustomData"] as $FieldId => $Value) @@ -720,6 +735,7 @@ } } } + $objEditData->SetTable('live'); break; case "m_customfield_edit": @@ -1982,156 +1998,169 @@ } } -/* category Edit */ -if( GetVar('CatEditStatus') == 1 ) -{ - $adodbConnection = GetADODBConnection(); +// ALL Saving Stuff From Temp Tables Heppens Here -// $sql = "SELECT * FROM ".$objSession->GetEditTable("Category")." WHERE CategoryId=0"; - $sql = "SELECT * FROM ".$objSession->GetEditTable("Category")." WHERE CategoryId=-1"; - $rs = $adodbConnection->Execute($sql); - while ($rs && !$rs->EOF) - { - if($rs->fields["ParentId"]>0) - RunUp($rs->fields["ParentId"],"Increment_Count"); - $rs->MoveNext(); - } - - $objCatList->CopyFromEditTable("CategoryId"); - $objCustomDataList->CopyFromEditTable("CustomDataId"); - $objCatList->Clear(); - - if($_REQUEST['CategoryId'] > 0) // not root category is updated - { - $objImages = new clsImageList(); - $objImages->CopyFromEditTable("ImageId"); - } -} -if( GetVar('CatEditStatus') == 2 ) -{ - $objCatList->PurgeEditTable("CategoryId"); - $objCustomDataList->PurgeEditTable("CustomDataId"); - if($_REQUEST['CategoryId'] > 0) // not root category is updated - { - $objImages = new clsImageList(); - $objImages->PurgeEditTable("ImageId"); - } - $objCatList->Clear(); -} -/* User Edit */ -if( GetVar('UserEditStatus') == 1 ) +if( ! $objSession->HasSystemPermission("SYSTEM_ACCESS.READONLY") ) { - $objUsers->CopyFromEditTable("PortalUserId"); - $objCustomDataList->CopyFromEditTable("CustomDataId"); - $objGroups->Clear(); - $objImages = new clsImageList(); - $objImages->CopyFromEditTable("ImageId"); -} -if( GetVar('UserEditStatus') == 2 ) -{ - $objGroups->PurgeEditTable("PortalUserId"); - $objCustomDataList->PurgeEditTable("CustomDataId"); - $objGroups->Clear(); -} -/* Group Edit */ -if( GetVar('GroupEditStatus') == 1 ) -{ - $objGroups->CopyFromEditTable("GroupId"); - $objCustomDataList->CopyFromEditTable("CustomDataId"); - $objGroups->Clear(); + /* category Edit */ + if( GetVar('CatEditStatus') == 1 ) + { + $adodbConnection = GetADODBConnection(); + + // $sql = "SELECT * FROM ".$objSession->GetEditTable("Category")." WHERE CategoryId=0"; + $sql = "SELECT * FROM ".$objSession->GetEditTable("Category")." WHERE CategoryId=-1"; + $rs = $adodbConnection->Execute($sql); + while ($rs && !$rs->EOF) + { + if($rs->fields["ParentId"]>0) + RunUp($rs->fields["ParentId"],"Increment_Count"); + $rs->MoveNext(); + } + + $objCatList->CopyFromEditTable("CategoryId"); + $objCustomDataList->CopyFromEditTable("CustomDataId"); + $objCatList->Clear(); + + if($_REQUEST['CategoryId'] > 0) // not root category is updated + { + $objImages = new clsImageList(); + $objImages->CopyFromEditTable("ImageId"); + } + } + + if( GetVar('CatEditStatus') == 2 ) + { + $objCatList->PurgeEditTable("CategoryId"); + $objCustomDataList->PurgeEditTable("CustomDataId"); + if($_REQUEST['CategoryId'] > 0) // not root category is updated + { + $objImages = new clsImageList(); + $objImages->PurgeEditTable("ImageId"); + } + $objCatList->Clear(); + } + + /* User Edit */ + if( GetVar('UserEditStatus') == 1 ) + { + $objUsers->CopyFromEditTable("PortalUserId"); + $objCustomDataList->CopyFromEditTable("CustomDataId"); + $objGroups->Clear(); + $objImages = new clsImageList(); + $objImages->CopyFromEditTable("ImageId"); + } + if( GetVar('UserEditStatus') == 2 ) + { + $objGroups->PurgeEditTable("PortalUserId"); + $objCustomDataList->PurgeEditTable("CustomDataId"); + $objGroups->Clear(); + } + + /* Group Edit */ + if( GetVar('GroupEditStatus') == 1 ) + { + $objGroups->CopyFromEditTable("GroupId"); + $objCustomDataList->CopyFromEditTable("CustomDataId"); + $objGroups->Clear(); + } + if( GetVar('GroupEditStatus') == 2 ) + { + $objGroups->PurgeEditTable("GroupId"); + $objCustomDataList->PurgeEditTable("CustomDataId"); + $objGroups->Clear(); + } + + /* Theme Edit */ + if( GetVar('ThemeEditStatus') == 1 ) + { + $objThemes->CopyFromEditTable(); + $objThemes->Clear(); + } + + if( GetVar('ThemeEditStatus') == 2 ) + { + $objThemes->PurgeEditTable(); + $objThemes->Clear(); + } + + /* Language Edit */ + if( GetVar('LangEditStatus') == 1 ) + { + $Messages = new clsEmailMessageList(); + $Messages->CopyFromEditTable(); + $Messages->Clear(); + $objLanguages->CopyFromEditTable(); + $objLanguages->Clear(); + + $Phrases = new clsPhraseList(); + $Phrases->CopyFromEditTable(); + $Phrases->Clear(); + $Phrases->PurgeEditTable(); + } + if( GetVar('LangEditStatus') == 2 ) + { + $objLanguages->PurgeEditTable(); + $objLanguages->Clear(); + $Phrases = new clsPhraseList(); + $Phrases->PurgeEditTable(); + $Messages = new clsEmailMessageList(); + $Messages->PurgeEditTable(); + } + + if( GetVar('MissingLangEditStatus') == 1 ) + { + $objPhraseList = new clsPhraseList(); + $objPhraseList->SourceTable = $objSession->GetSessionKey()."_".$ThemeId."_labels"; + + $objEditList = new clsPhraseList(); + $objEditList->SourceTable = $objSession->GetEditTable("Phrase"); + + $ado = GetADODBConnection(); + $rs = $ado->Execute("SELECT MIN(PhraseId) as MinValue FROM ".$objEditList->SourceTable); + $NewId = $rs->fields["MinValue"]-1; + + $objPhraseList->Query_Item("SELECT * FROM ".$objPhraseList->SourceTable); + foreach($objPhraseList->Items as $p) + { + if(strlen($p->Get("Translation"))>0) + { + $p->tablename = $objEditList->SourceTable; + $p->Dirty(); + $p->UnsetIDField(); + $p->Set("PhraseId",$NewId); + $NewId--; + $p->Create(); + } + } + $ado->Execute("DROP TABLE ".$objPhraseList->SourceTable); + } + + if( GetVar('MissingLangEditStatus') == 2 ) + { + $table = $objSession->GetSessionKey()."_".$ThemeId."_labels"; + $ado = GetADODBConnection(); + $ado->Execute("DROP TABLE ".$table); + } + + /* Ban Rule Edit */ + if( GetVar('RuleEditStatus') == 1 ) + { + $objBanList->CopyFromEditTable("RuleId"); + $objBanList->Clear(); + } + if( GetVar('RuleEditStatus') == 2 ) + { + $objBanList->PurgeEditTable("RuleId"); + $objBanList->Clear(); + } } -if( GetVar('GroupEditStatus') == 2 ) +elseif( defined('DEBUG_ACTIONS') ) { - $objGroups->PurgeEditTable("GroupId"); - $objCustomDataList->PurgeEditTable("CustomDataId"); - $objGroups->Clear(); + if( isset($_REQUEST['Action']) && $_REQUEST['Action'] ) + echo "USER HAS RO-ACCESS on action [".$_REQUEST['Action']."]
"; } -/* Theme Edit */ -if( GetVar('ThemeEditStatus') == 1 ) -{ - $objThemes->CopyFromEditTable(); - $objThemes->Clear(); -} - -if( GetVar('ThemeEditStatus') == 2 ) -{ - $objThemes->PurgeEditTable(); - $objThemes->Clear(); -} - -/* Language Edit */ -if( GetVar('LangEditStatus') == 1 ) -{ - $Messages = new clsEmailMessageList(); - $Messages->CopyFromEditTable(); - $Messages->Clear(); - $objLanguages->CopyFromEditTable(); - $objLanguages->Clear(); - - $Phrases = new clsPhraseList(); - $Phrases->CopyFromEditTable(); - $Phrases->Clear(); - $Phrases->PurgeEditTable(); -} -if( GetVar('LangEditStatus') == 2 ) -{ - $objLanguages->PurgeEditTable(); - $objLanguages->Clear(); - $Phrases = new clsPhraseList(); - $Phrases->PurgeEditTable(); - $Messages = new clsEmailMessageList(); - $Messages->PurgeEditTable(); -} - -if( GetVar('MissingLangEditStatus') == 1 ) -{ - $objPhraseList = new clsPhraseList(); - $objPhraseList->SourceTable = $objSession->GetSessionKey()."_".$ThemeId."_labels"; - - $objEditList = new clsPhraseList(); - $objEditList->SourceTable = $objSession->GetEditTable("Phrase"); - - $ado = GetADODBConnection(); - $rs = $ado->Execute("SELECT MIN(PhraseId) as MinValue FROM ".$objEditList->SourceTable); - $NewId = $rs->fields["MinValue"]-1; - - $objPhraseList->Query_Item("SELECT * FROM ".$objPhraseList->SourceTable); - foreach($objPhraseList->Items as $p) - { - if(strlen($p->Get("Translation"))>0) - { - $p->tablename = $objEditList->SourceTable; - $p->Dirty(); - $p->UnsetIDField(); - $p->Set("PhraseId",$NewId); - $NewId--; - $p->Create(); - } - } - $ado->Execute("DROP TABLE ".$objPhraseList->SourceTable); -} - -if( GetVar('MissingLangEditStatus') == 2 ) -{ - $table = $objSession->GetSessionKey()."_".$ThemeId."_labels"; - $ado = GetADODBConnection(); - $ado->Execute("DROP TABLE ".$table); -} - -/* Ban Rule Edit */ -if( GetVar('RuleEditStatus') == 1 ) -{ - $objBanList->CopyFromEditTable("RuleId"); - $objBanList->Clear(); -} -if( GetVar('RuleEditStatus') == 2 ) -{ - $objBanList->PurgeEditTable("RuleId"); - $objBanList->Clear(); -} - ?>