Index: trunk/admin/config/edit_customfields.php =================================================================== diff -u -N --- trunk/admin/config/edit_customfields.php (revision 2853) +++ trunk/admin/config/edit_customfields.php (revision 0) @@ -1,148 +0,0 @@ -$value) -{ - $path = $pathtoroot. $value."admin/include/parser.php"; - if(file_exists($path)) - { - include_once($path); - } -} -unset($objEditItems); - -$objCustomFields = new clsCustomFieldList($FieldType); - -$envar = "section=$section&DataType=$FieldType&env=".BuildEnv(); - -$formaction = $_SERVER["PHP_SELF"]."?".$envar; - -$sec = $objSections->GetSection($section); - -$objListToolBar = new clsToolBar(); - -$objListToolBar->Set("section",$section); -$objListToolBar->Set("load_menu_func",""); -$objListToolBar->Set("CheckClass","FieldChecks"); -$objListToolBar->Set("CheckForm","configform"); - -$listImages = array(); - //$img, $alt, $link, $onMouseOver, $onMouseOut, $onClick - -$objListToolBar->Add("new_field", "la_ToolTip_New_CustomField",$adminURL."/config/addcustomfield.php?$envar&new=1","swap('new_field','toolbar/tool_forum_new_custom_f2.gif');", - "swap('new_field', 'toolbar/tool_forum_new_custom.gif');","",$imagesURL."/toolbar/tool_forum_new_custom.gif"); - -$objListToolBar->Add("field_edit","la_ToolTip_Edit","#", "if (FieldChecks.itemChecked()) swap('field_edit','toolbar/tool_edit_f2.gif');", - "if (FieldChecks.itemChecked()) swap('field_edit', 'toolbar/tool_edit.gif');","if (FieldChecks.itemChecked()) FieldChecks.check_submit('addcustomfield', '');", - "tool_edit.gif",TRUE,TRUE); -$listImages[] = "FieldChecks.addImage('field_edit','$imagesURL/toolbar/tool_edit.gif','$imagesURL/toolbar/tool_edit_f3.gif',1); "; - -$objListToolBar->Add("field_del","la_ToolTip_Delete","#", "if (FieldChecks.itemChecked()) swap('field_del','toolbar/tool_delete_f2.gif');", - "if (FieldChecks.itemChecked()) swap('field_del', 'toolbar/tool_delete.gif');","if (FieldChecks.itemChecked()) FieldChecks.check_submit('edit_customfields', 'm_customfield_delete');", - "tool_delete.gif", FALSE, TRUE); -$listImages[] = "FieldChecks.addImage('field_del','$imagesURL/toolbar/tool_delete.gif','$imagesURL/toolbar/tool_delete_f3.gif',1); "; - -$objListToolBar->AddToInitScript($listImages); - -//$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Text_CustomFields"); - -$where = "Type = ".$FieldType; -$order = trim($objConfig->Get("CustomConfig_LV_Sortfield")." ".$objConfig->Get("CustomConfig_LV_Sortorder")); - -$objCustomFields->Query_CustomField($where,$order); - -$objListView = new clsListView($objListToolBar,$objCustomFields); -$objListView->IdField = "CustomFieldId"; - -$order = $objConfig->Get("CustomConfig_LV_Sortfield"); -$objListView->ColumnHeaders->Add("FieldName",admin_language("la_ColHeader_FieldName"),1,0,$order,"width=\"30%\"","CustomConfig_LV_Sortfield","CustomConfig_LV_Sortorder","FieldName"); -$objListView->ColumnHeaders->Add("FieldLabel",admin_language("la_ColHeader_FieldLabel"),1,0,$order,"width=\"30%\"","CustomConfig_LV_Sortfield","CustomConfig_LV_Sortorder","FieldLabel"); -$objListView->ColumnHeaders->SetSort($objConfig->Get("CustomConfig_LV_Sortfield"), $objConfig->Get("CustomConfig_LV_Sortorder")); - -$objListView->PrintToolBar = FALSE; -$objListView->checkboxes = TRUE; - -$objListView->CurrentPageVar = "Page_CustomData"; -$objListView->PerPageVar = "Perpage_CustomData"; -$objListView->CheckboxName = "itemlist[]"; -$objListView->extra_env = "section=$section&DataType=$FieldType"; - -for($i=0;$iItems);$i++) -{ - $objListView->RowIcons[] = $imagesURL."/itemicons/icon16_custom.gif"; - $field =& $objCustomFields->GetItemRefByIndex($i); - if ($field->Get('Prompt') != '') { - $field->Set("FieldLabel", admin_language($field->Get('Prompt'))); - } - else { - $field->Set("FieldLabel", admin_language('lu_fieldcustom__'.strtolower($field->Get('FieldName')))); - } -} - - -//$objListView->ConfigureViewMenu($SortFieldVar,$SortOrderVar,$DefaultSortField,"","",0); - -//$objListToolBar->AddToInitScript("fwLoadMenus();"); -$h = "\n\n\n"; - -if( !isset($title) ) $title = ''; -int_header($objListToolBar,NULL,$title, NULL, $h); -?> -
" method=POST> - - -PageLinks = $objListView->PrintPageLinks(); /* call this before we slice! */ - $objListView->SliceItems(); - print $objListView->PrintList(); - -?> - - - - - -" name="viewmenu"> - - - - - - - - - Index: trunk/admin/config/addlang_labels.php =================================================================== diff -u -N --- trunk/admin/config/addlang_labels.php (revision 2853) +++ trunk/admin/config/addlang_labels.php (revision 0) @@ -1,378 +0,0 @@ -$value) -{ - $path = $pathtoroot. $value."admin/include/parser.php"; - if(file_exists($path)) - { - include_once($path); - } -} - -unset($objEditItems); - -$objEditItems = new clsPhraseList(); -$objEditItems->SourceTable = $objSession->GetEditTable("Language"); -$objEditItems->EnablePaging = FALSE; - -//Multiedit init -$en = (int)$_GET["en"]; -$objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable); -$itemcount=$objEditItems->NumItems(); - -$c = $objEditItems->GetItemByIndex($en); - -$name = $c->Get("PackName"); -if($itemcount>1) -{ - if ($en+1 == $itemcount) - $en_next = -1; - else - $en_next = $en+1; - - if ($en == 0) - $en_prev = -1; - else - $en_prev = $en-1; -} - -$action = "m_phrase_edit"; -/* -------------------------------------- Section configuration ------------------------------------------- */ -$envar = "env=" . BuildEnv() . "&en=$en"; -$section = 'in-portal:lang_labels'; -$sec = $objSections->GetSection($section); - -$SortFieldVar = "Phrase_LV_Sortfield"; -$SortOrderVar = "Phrase_LV_Sortorder"; -$DefaultSortField = "Phrase"; -$PerPageVar = "Perpage_Phrase"; -$CurrentPageVar = "Page_Phrase"; -$CurrentFilterVar = "Lang_View"; - -$ListForm = "language"; -$CheckClass = "LangChecks"; - -/* ------------------------------------- Configure the toolbar ------------------------------------------- */ -$objListToolBar = new clsToolBar(); -$objListToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","do_edit_save('language','LangEditStatus','".$admin."/config/config_lang.php',1);","tool_select.gif"); -$objListToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","do_edit_save('language','LangEditStatus','".$admin."/config/config_lang.php',2);",$imagesURL."/toolbar/tool_cancel.gif"); -$objListToolBar->Set("section",$section); -$objListToolBar->Set("load_menu_func",""); -$objListToolBar->Set("CheckClass",$CheckClass); -$objListToolBar->Set("CheckForm",$ListForm); - -if ( isset($en_prev) || isset($en_next) ) -{ - $objListToolBar->Add("divider"); - if($en_prev>-1) - { - $MouseOver="swap('moveleft','toolbar/tool_prev_f2.gif');"; - $MouseOut="swap('moveleft', 'toolbar/tool_prev.gif');"; - $onClick= $sec->Get("onclick"); - $var="?env=".BuildEnv()."&en=$en_prev&lpn=1"; - $link=$_SERVER["PHP_SELF"].$var; - $objListToolBar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Theme"),$link,$MouseOver,$MouseOut,"","tool_prev.gif"); - } - else - { - $MouseOver=""; - $MouseOut=""; - $onClick=""; - $link="#"; - $objListToolBar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Theme"),"#","","","","tool_prev_f3.gif"); - - } - if($en_next>-1) - { - $MouseOver="swap('moveright','toolbar/tool_next_f2.gif');"; - $MouseOut="swap('moveright', 'toolbar/tool_next.gif');"; - $onClick=$sec->Get("onclick"); - $var="?env=".BuildEnv()."&en=$en_next&lpn=1"; - $link=$_SERVER["PHP_SELF"].$var; - $objListToolBar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Theme"),$link,$MouseOver,$MouseOut,"","tool_next.gif"); - } - else - { - $objListToolBar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Theme"),$link,$MouseOver,$MouseOut,"","tool_next_f3.gif"); - } - -} - -$listImages = array(); - //$img, $alt, $link, $onMouseOver, $onMouseOut, $onClick - -$objListToolBar->Add("new_label", "la_ToolTip_New_label","#","swap('new_label','toolbar/tool_new_language_var_f2.gif');", - "swap('new_label', 'toolbar/tool_new_language_var.gif');", - "OpenPhraseEditor('&destform=popup&LanguageId=".$c->Get("LanguageId")."');", - "tool_new_language_var.gif"); - -$objListToolBar->Add("label_edit","la_ToolTip_Edit","#", "if (LangChecks.itemChecked()) swap('label_edit','toolbar/tool_edit_f2.gif');", - "if (LangChecks.itemChecked()) swap('label_edit', 'toolbar/tool_edit.gif');", - "if (LangChecks.itemChecked()) EditPhrase();", - "tool_edit.gif",TRUE,TRUE); -$listImages[] = "LangChecks.addImage('label_edit','$imagesURL/toolbar/tool_edit.gif','$imagesURL/toolbar/tool_edit_f3.gif',1); "; - -$objListToolBar->Add("label_del","la_ToolTip_Delete","#", "if (LangChecks.itemChecked()) swap('label_del','toolbar/tool_delete_f2.gif');", - "if (LangChecks.itemChecked()) swap('label_del', 'toolbar/tool_delete.gif');","if (LangChecks.itemChecked()) LangChecks.check_submit('addlang_labels', 'm_phrase_delete');", - "tool_delete.gif",FALSE,TRUE); -$listImages[] = "LangChecks.addImage('label_del','$imagesURL/toolbar/tool_delete.gif','$imagesURL/toolbar/tool_delete_f3.gif',1); "; - -$objListToolBar->Add("divider"); - -$objListToolBar->Add("viewmenubutton", "la_ToolTip_View","#","swap('viewmenubutton','toolbar/tool_view_f2.gif'); ", - "swap('viewmenubutton', 'toolbar/tool_view.gif');", - "ShowViewMenu();","tool_view.gif"); - - -$objListToolBar->AddToInitScript($listImages); -$objListToolBar->AddToInitScript("fwLoadMenus();"); - -$CurrentLangId = $c->Get("LanguageId"); - -/* ----------------------------------------- Set the View Filter ---------------------------------------- */ -/* bit place holders for view menu */ -$Bit_Front=1; -$Bit_Admin=2; -$Bit_Both = 4; -$Bit_All = 7; - -$FilterLabels = array(); - -$FilterLabels[0] = admin_language("la_Text_Front"); -$FilterLabels[1] = admin_language("la_Text_Admin"); -$FilterLabels[2] = admin_language("la_Text_Both"); - -if( !(isset($objThemeList)&&is_object($objThemeList)) ) -{ - $objThemeList = new clsThemeList(); -} - -if($objThemeList->NumItems()==0) - $objThemeList->LoadThemes(); - -/* determine current view menu settings */ -$LangView = $objConfig->Get($CurrentFilterVar); - -if(!is_numeric($LangView)) -{ - $LangView = $Bit_All; //Set all bits ON - $LangFilter = ""; -} - - if($LangView & $Bit_Both) - $Status[] = 2; - - if($LangView & $Bit_Admin) - $Status[] = 1; - - if($LangView & $Bit_Front) - $Status[] = 0; - - if(count($Status)>0) - { - $LangFilter = "p.PhraseType IN (".implode(",",$Status).")"; - } - else - $LangFilter = "p.PhraseType = -1"; - -$objPhrases = new clsPhraseList(); -$objPhrases->SourceTable = $objSession->GetEditTable("Phrase"); - -$order = trim($objConfig->Get($SortFieldVar)." ".$objConfig->Get($SortOrderVar)); - -$SearchWords = $objSession->GetVariable("PhraseSearchWord"); -if(strlen($SearchWords)) -{ - $where = $objPhrases->AdminSearchWhereClause($SearchWords); -} -else - $where = ""; - -$primary = $objLanguages->GetPrimary(); - -/* ------------------------------------ Build the SQL statement to populate the list ---------------------------*/ - -$ptable = GetTablePrefix()."Phrase"; - -$sql = "SELECT distinct(p.Phrase) as Phrase,p.Translation as Translation,ELT(p.PhraseType+1,'".admin_language("la_Text_Front")."','".admin_language("la_Text_Admin")."','".admin_language("la_Text_Both")."') as Type, "; -$sql .="pri.Translation as PrimaryValue, p.PhraseId as PhraseId "; -$sql .= "FROM ".$objPhrases->SourceTable." as p LEFT JOIN $ptable as pri ON (p.Phrase=pri.Phrase AND pri.LanguageId=".$objLanguages->GetPrimary().") WHERE p.LanguageId=".$c->Get("LanguageId")." "; - -if(strlen($where)) - $sql .= "AND ".$where." "; -if(strlen($LangFilter)) -{ - $sql .= " AND $LangFilter "; -} - -if(strlen($order)) - $sql .= "ORDER BY ".$order." "; - -if(isset($_GET["lpn"])) - $objSession->SetVariable($CurrentPageVar,$_GET["lpn"]); - -$sql .= GetLimitSQL($objSession->GetVariable($CurrentPageVar),$objConfig->Get($PerPageVar)); - -//echo $sql; - -$objPhrases->Query_Item($sql); -$itemcount = QueryCount($sql); - -if($objSession->HasSystemPermission("DEBUG.LIST")) - echo htmlentities($sql,ENT_NOQUOTES)."
\n"; - -/* ---------------------------------------- Configure the list view ---------------------------------------- */ -$objListView = new clsListView($objListToolBar,$objPhrases); -$objListView->IdField = "PhraseId"; - -$order = $objConfig->Get($SortOrderVar); -$objListView->ColumnHeaders->Add("Phrase",admin_language("la_prompt_Label"),1,0,$order,"width=\"30%\"",$SortFieldVar,$SortOrderVar,"Phrase"); -$objListView->ColumnHeaders->Add("Translation",admin_language("la_prompt_Value"),1,0,$order,"width=\"30%\"",$SortFieldVar,$SortOrderVar,"Translation"); -$objListView->ColumnHeaders->Add("PrimaryValue",admin_language("la_prompt_PrimaryValue"),1,0,$order,"width=\"30%\"",$SortFieldVar,$SortOrderVar,"PrimaryValue"); -$objListView->ColumnHeaders->Add("Type",admin_language("la_prompt_Type"),1,0,$order,"width=\"30%\"",$SortFieldVar,$SortOrderVar,"Type"); - -$objListView->ColumnHeaders->SetSort($objConfig->Get($SortFieldVar), $objConfig->Get($SortOrderVar)); - -$objListView->PrintToolBar = FALSE; -$objListView->checkboxes = TRUE; - -$objListView->CurrentPageVar = $CurrentPageVar; -$objListView->PerPageVar = $PerPageVar; -$objListView->CheckboxName = "itemlist[]"; -$objListView->SearchBar = TRUE; -$objListView->SearchKeywords = $SearchWords; -$objListView->SearchAction="m_phrase_search"; - -$objListView->TotalItemCount = $itemcount; - - $objListView->ConfigureViewMenu($SortFieldVar,$SortOrderVar,$DefaultSortField, - $CurrentFilterVar,$LangView,$Bit_All); - - foreach($FilterLabels as $Bit=>$Label) - { - $objListView->AddViewMenuFilter($Label,$Bit); - } - -for($i=0;$iItems);$i++) -{ - $objListView->RowIcons[] = $objPhrases->Items[$i]->AdminIcon(); -} - -$filter = false; // always initialize variables before use -if($objSession->GetVariable("PhraseSearchWord") != '') { - $filter = true; -} -else { - if ($LangView != $Bit_All) { - $filter = true; - } -} - -$title = $title = GetTitle("la_Text_Pack", "la_tab_Labels", $c->Get('LanguageId'), $c->Get('LocalName'));///admin_language("la_Text_Configuration")." - '".$name."' ".admin_language("la_Text_Pack")." - ".admin_language("la_tab_Labels")." ($itemcount)"; -$h = "\n\n\n"; - -define('FORCE_CHARSET', $c->Get("Charset") ); -int_header($objListToolBar,NULL, $title,NULL,$h); - -if ($objSession->GetVariable("HasChanges") == 1) { -?> -
- - - -
- -
- - - - - - -
- -
- -
" method=POST> - - -PrintList(); -?> - - - - -
- - -
" name="viewmenu"> - - - - -
- -
" name="templatemenu"> - - - - -
-
- - -
- -
" ID="popup"> - - - - - - -
- - - Index: trunk/admin/editor/FCKeditor/filemanager/upload/php/upload.php =================================================================== diff -u -N -r2569 -r4065 --- trunk/admin/editor/FCKeditor/filemanager/upload/php/upload.php (.../upload.php) (revision 2569) +++ trunk/admin/editor/FCKeditor/filemanager/upload/php/upload.php (.../upload.php) (revision 4065) @@ -20,6 +20,7 @@ // Init var : +// OLD STARTUP if( !(isset($pathtoroot) && $pathtoroot) ) { Index: trunk/admin/config/importlang.php =================================================================== diff -u -N --- trunk/admin/config/importlang.php (revision 2853) +++ trunk/admin/config/importlang.php (revision 0) @@ -1,119 +0,0 @@ -$value) -{ - $path = $pathtoroot. $value."admin/include/parser.php"; - if(file_exists($path)) - { - include_once($path); - } -} - -$objMessages = new clsEmailMessageList(); - -unset($objEditItems); - -$objEditItems = new clsLanguageList(); -$objEditItems->SourceTable = $objSession->GetEditTable("Language"); -$objEditItems->EnablePaging = FALSE; -$objPhraseList = new clsPhraseList(); - -$section = "in-portal:lang_import"; - -$envar = "env=".BuildEnv(); -$title = prompt_language("la_Title_LanguageImport")." - ".admin_language("la_Step")." 1"; - -$script_name = $objSession->HasSystemPermission("SYSTEM_ACCESS.READONLY") ? 'config_lang' : 'importlang_progress'; -$post = $adminURL.'/config/'.$script_name.'.php?'.$envar; - -//Display header -if ($_GET['importerror'] != '1') { - $sec = $objSections->GetSection($section); - $objCatToolBar = new clsToolBar(); - $objCatToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","edit_submit('language','".$admin."/config/".$script_name.".php',1);",$imagesURL."/toolbar/tool_select.gif"); - $objCatToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","edit_submit('language','".$admin."/config/config_lang.php',2);",$imagesURL."/toolbar/tool_cancel.gif"); -} - - int_header($objCatToolBar,NULL,$title); -?> -
- - - - - > - - - - - > - - - - - - > - - - - - - > - - - - - > - - - - - -
- -
- "> -
- -
-
- -
" name="viewmenu"> - - - - -
- - Index: trunk/core/units/users/users_item.php =================================================================== diff -u -N -r3907 -r4065 --- trunk/core/units/users/users_item.php (.../users_item.php) (revision 3907) +++ trunk/core/units/users/users_item.php (.../users_item.php) (revision 4065) @@ -1,62 +1,8 @@ Application->getUnitOption($this->Prefix, 'ItemType'); - $sql = 'SELECT CustomFieldId, FieldName FROM '.TABLE_PREFIX.'CustomField WHERE Type = %s'; - $this->CustomFields = $this->Conn->GetCol( sprintf($sql, $item_type), 'FieldName' ); - } - - - function defineFields() - { - parent::defineFields(); - - // add custom fields definitions (as virtual fields) - $add_fields = Array(); - $custom_field_options = Array('default' => '', 'not_null' => 1); - foreach ($this->CustomFields as $custom_field => $custom_id) - { - $add_fields[$custom_field] = $custom_field_options; - } - - if($add_fields) - { - $add_fields = array_merge_recursive2($add_fields, $this->VirtualFields); - $this->setVirtualFields($add_fields); - } - } - - /** - * Load custom fields values as virtual fields for dbitem - * - * @return bool - */ - function LoadCustomFields() - { - if (!$this->CustomFields) return false; - - $custom_ids = implode(',', $this->CustomFields); - $sql = 'SELECT Value, CustomFieldId - FROM '.TABLE_PREFIX.'CustomMetaData - WHERE ResourceId = '.$this->GetDBField('ResourceId').' AND CustomFieldId IN ('.$custom_ids.')'; - $custom_values = $this->Conn->GetCol($sql, 'CustomFieldId'); - if (!$custom_values) return false; - - $custom_fields = array_flip($this->CustomFields); - foreach ($custom_values as $custom_id => $custom_value) - { - $this->SetDBField($custom_fields[$custom_id], $custom_value); - } - return true; - } - function LoadPersistantVars() { $sql = 'SELECT VariableValue, VariableName @@ -81,41 +27,10 @@ return getArrayValue($this->persistantVars, $var_name); } - function UpdateCustomFields() - { - $data_table = TABLE_PREFIX.'CustomMetaData'; - - // get values already written, to find their ids - $sql = 'SELECT CustomDataId, CustomFieldId - FROM '.$data_table.' - WHERE ResourceId = '.$this->GetDBField('ResourceId'); - $custom_value_ids = $this->Conn->GetCol($sql, 'CustomFieldId'); - $sql = 'REPLACE INTO '.$data_table.'(CustomDataId,ResourceId,CustomFieldId,Value) VALUES (%1$s,%2$s,%3$s,%4$s)'; - - foreach ($this->CustomFields as $custom_field => $custom_id) - { - $data_id = isset($custom_value_ids[$custom_id]) ? $custom_value_ids[$custom_id] : 0; - $custom_value = $this->GetDBField($custom_field); - - if (!$custom_value && $data_id) - { - $temp_sql = 'DELETE FROM '.$data_table.' WHERE CustomDataId = '.$data_id; - $this->Conn->Query($temp_sql); - } - elseif($custom_value) - { - $temp_sql = sprintf($sql, $data_id, $this->GetDBField('ResourceId'), $custom_id, $this->Conn->qstr( $this->GetDBField($custom_field) ) ); - $this->Conn->Query($temp_sql); - } - } - } - function Load($id, $id_field_name = null) { $ret = parent::Load($id, $id_field_name); - if($ret) - { - $this->LoadCustomFields(); + if ($ret) { $this->LoadPersistantVars(); } return $ret; @@ -184,10 +99,7 @@ function Create($force_id=false, $system_create=false) { $ret = parent::Create($force_id, $system_create); - if ($ret) - { - $this->UpdateCustomFields(); - + if ($ret) { // find out how to syncronize user only when it's copied to live table $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize'); $sync_manager->performAction('createUser', $this->FieldValues); @@ -199,10 +111,7 @@ function Update($id=null, $system_update=false) { $ret = parent::Update($id, $system_update); - if ($ret) - { - $this->UpdateCustomFields(); - + if ($ret) { // find out how to syncronize user only when it's copied to live table $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize'); $sync_manager->performAction('updateUser', $this->FieldValues); @@ -219,9 +128,7 @@ function Delete($id = null) { $ret = parent::Delete($id); - - if ($ret) - { + if ($ret) { $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize'); $sync_manager->performAction('deleteUser', $this->FieldValues); } Index: trunk/admin/config/config_search.php =================================================================== diff -u -N --- trunk/admin/config/config_search.php (revision 4043) +++ trunk/admin/config/config_search.php (revision 0) @@ -1,193 +0,0 @@ -$value) -{ - $path = $pathtoroot. $value."admin/include/parser.php"; - if(file_exists($path)) - { - include_once($path); - } -} -unset($objEditItems); -$envar = "module=$module§ion=$section&env=" . BuildEnv(); - -//$title = prompt_language("la_Text_Editing")." ".prompt_language("la_Tab_Search"); -$sec = $objSections->GetSection($section); - -$objCatToolBar = new clsToolBar(); -$objCatToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","document.configform.submit();","tool_select.gif"); -$objCatToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","history.back();","tool_cancel.gif"); - -$ParentSection = $sec->Get("parent"); -$ParentSec = $objSections->GetSection($ParentSection); -$ParentUrl = $ParentSec->URL(); -if($ParentSec->Get("parent")) -{ - $SubmitUrl = $ParentUrl; -} -else - $SubmitUrl = $_SERVER['PHP_SELF']."?".$envar; - -if( !isset($title) ) $title = ''; -int_header($objCatToolBar,NULL,$title); -?> -
- - -GetHeadingList(); - - for($i=0;$i<=count($headings);$i++) - { - $h = $headings[$i]; - if(strlen($h)) - { - int_subsection_title(prompt_language($h)); - $Items = $objSearchFields->GetHeadingItems($h); - foreach($Items as $c) - { - print "\n"; - print "\n"; - $checked = ""; - if((int)$c->Get("SimpleSearch")==1) - $checked = " CHECKED"; - print "\n"; - $checked = ""; - if((int)$c->Get("AdvancedSearch")==1) - $checked = " CHECKED"; - print "\n"; - print "\n"; - } - int_subsection_title(prompt_language($h)." ".prompt_language("la_prompt_relevence_settings")); - print "\n"; - print ""; - print "\n"; - print "\n"; - print "\n"; - $checked = ""; - if((int)$objConfig->Get($cfg)==1) - $checked = " CHECKED"; - print "\n"; - print "\n"; - } - } - } - - if ($module == 'In-Portal') { - $cfg = "Search_MinKeyword_Length"; - $value = $objConfig->Get($cfg); - if(!is_numeric($value)) { - $value = (int)$objConfig->Get("Search_MinKeyword_Length"); - } - - int_subsection_title(prompt_language("la_Text_MinKeyWordLength")); - print "\n"; - print "\n"; - print "\n"; - print "\n"; - } -?> - > - - - -
".prompt_language($c->Get("DisplayName")); - - if (IsDebugMode()) { - echo '
['.$c->Get('SearchConfigId').'] '.$c->Get('FieldName').''; - } - - print "		"; - print prompt_language("la_prompt_SimpleSearch"); - print "Get("SearchConfigId")."]\" VALUE=\"1\"$checked>"; - print "  ".prompt_language("la_prompt_weight")." Get("SearchConfigId")."]\" VALUE=\"".(int)$c->Get("Priority")."\">"; - print "Get("SearchConfigId")."]\" VALUE=\"1\"$checked>"; - print prompt_language("la_prompt_AdvancedSearch")."
"; - print prompt_language("la_prompt_required_field_increase"); - $cfg_var = strtolower(prompt_language($h,1)); - $cfg = "SearchRel_Increase_".$cfg_var; - $value = $objConfig->Get($cfg); - - if(!is_numeric($value)) - $value = (int)$objConfig->Get("SearchRel_DefaultIncrease"); - - print "%"; - print "%"; - print "
"; - print prompt_language("la_prompt_relevence_percent"); - $cfg = "SearchRel_Keyword_".$cfg_var; - $value = $objConfig->Get($cfg); - if(!is_numeric($value)) - $value = (int)$objConfig->Get("SearchRel_DefaultKeyword"); - print " % "; - print prompt_language("la_text_keyword")." "; - $cfg = "SearchRel_Pop_".$cfg_var; - $value = $objConfig->Get($cfg); - if(!is_numeric($value)) - $value = (int)$objConfig->Get("SearchRel_DefaultPop"); - print "   % "; - print prompt_language("la_text_popularity"); - $cfg = "SearchRel_Rating_".$cfg_var; - $value = $objConfig->Get($cfg); - if(!is_numeric($value)) - $value = (int)$objConfig->Get("SearchRel_DefaultRating"); - print "   % "; - print prompt_language("la_prompt_Rating"); - - if ($module != 'In-Portal') { - $cfg = "Search_ShowMultiple_".$cfg_var; - int_subsection_title(prompt_language($h)." ".prompt_language("la_Text_MultipleShow")); - print "
".prompt_language("la_prompt_MultipleShow").""; - print ""; - print "
".prompt_language("la_prompt_MinKeyWordLength").""; - print ""; - print "
- - -
-
Index: trunk/kernel/units/users/users_item.php =================================================================== diff -u -N -r3907 -r4065 --- trunk/kernel/units/users/users_item.php (.../users_item.php) (revision 3907) +++ trunk/kernel/units/users/users_item.php (.../users_item.php) (revision 4065) @@ -1,62 +1,8 @@ Application->getUnitOption($this->Prefix, 'ItemType'); - $sql = 'SELECT CustomFieldId, FieldName FROM '.TABLE_PREFIX.'CustomField WHERE Type = %s'; - $this->CustomFields = $this->Conn->GetCol( sprintf($sql, $item_type), 'FieldName' ); - } - - - function defineFields() - { - parent::defineFields(); - - // add custom fields definitions (as virtual fields) - $add_fields = Array(); - $custom_field_options = Array('default' => '', 'not_null' => 1); - foreach ($this->CustomFields as $custom_field => $custom_id) - { - $add_fields[$custom_field] = $custom_field_options; - } - - if($add_fields) - { - $add_fields = array_merge_recursive2($add_fields, $this->VirtualFields); - $this->setVirtualFields($add_fields); - } - } - - /** - * Load custom fields values as virtual fields for dbitem - * - * @return bool - */ - function LoadCustomFields() - { - if (!$this->CustomFields) return false; - - $custom_ids = implode(',', $this->CustomFields); - $sql = 'SELECT Value, CustomFieldId - FROM '.TABLE_PREFIX.'CustomMetaData - WHERE ResourceId = '.$this->GetDBField('ResourceId').' AND CustomFieldId IN ('.$custom_ids.')'; - $custom_values = $this->Conn->GetCol($sql, 'CustomFieldId'); - if (!$custom_values) return false; - - $custom_fields = array_flip($this->CustomFields); - foreach ($custom_values as $custom_id => $custom_value) - { - $this->SetDBField($custom_fields[$custom_id], $custom_value); - } - return true; - } - function LoadPersistantVars() { $sql = 'SELECT VariableValue, VariableName @@ -81,41 +27,10 @@ return getArrayValue($this->persistantVars, $var_name); } - function UpdateCustomFields() - { - $data_table = TABLE_PREFIX.'CustomMetaData'; - - // get values already written, to find their ids - $sql = 'SELECT CustomDataId, CustomFieldId - FROM '.$data_table.' - WHERE ResourceId = '.$this->GetDBField('ResourceId'); - $custom_value_ids = $this->Conn->GetCol($sql, 'CustomFieldId'); - $sql = 'REPLACE INTO '.$data_table.'(CustomDataId,ResourceId,CustomFieldId,Value) VALUES (%1$s,%2$s,%3$s,%4$s)'; - - foreach ($this->CustomFields as $custom_field => $custom_id) - { - $data_id = isset($custom_value_ids[$custom_id]) ? $custom_value_ids[$custom_id] : 0; - $custom_value = $this->GetDBField($custom_field); - - if (!$custom_value && $data_id) - { - $temp_sql = 'DELETE FROM '.$data_table.' WHERE CustomDataId = '.$data_id; - $this->Conn->Query($temp_sql); - } - elseif($custom_value) - { - $temp_sql = sprintf($sql, $data_id, $this->GetDBField('ResourceId'), $custom_id, $this->Conn->qstr( $this->GetDBField($custom_field) ) ); - $this->Conn->Query($temp_sql); - } - } - } - function Load($id, $id_field_name = null) { $ret = parent::Load($id, $id_field_name); - if($ret) - { - $this->LoadCustomFields(); + if ($ret) { $this->LoadPersistantVars(); } return $ret; @@ -184,10 +99,7 @@ function Create($force_id=false, $system_create=false) { $ret = parent::Create($force_id, $system_create); - if ($ret) - { - $this->UpdateCustomFields(); - + if ($ret) { // find out how to syncronize user only when it's copied to live table $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize'); $sync_manager->performAction('createUser', $this->FieldValues); @@ -199,10 +111,7 @@ function Update($id=null, $system_update=false) { $ret = parent::Update($id, $system_update); - if ($ret) - { - $this->UpdateCustomFields(); - + if ($ret) { // find out how to syncronize user only when it's copied to live table $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize'); $sync_manager->performAction('updateUser', $this->FieldValues); @@ -219,9 +128,7 @@ function Delete($id = null) { $ret = parent::Delete($id); - - if ($ret) - { + if ($ret) { $sync_manager =& $this->Application->recallObject('UsersSyncronizeManager', null, Array(), 'InPortalSyncronize'); $sync_manager->performAction('deleteUser', $this->FieldValues); } Index: trunk/admin/config/config_lang.php =================================================================== diff -u -N --- trunk/admin/config/config_lang.php (revision 2853) +++ trunk/admin/config/config_lang.php (revision 0) @@ -1,194 +0,0 @@ -$value) -{ - $path = $pathtoroot. $value."admin/include/parser.php"; - if(file_exists($path)) - { - include_once($path); - } -} -unset($objEditItems); - -$envar = "env=".BuildEnv(); - -$formaction = $_SERVER["PHP_SELF"]."?".$envar; - -$sec = $objSections->GetSection($section); - -$objListToolBar = new clsToolBar(); - -$objListToolBar->Set("section",$section); -$objListToolBar->Set("load_menu_func",""); -$objListToolBar->Set("CheckClass","LangChecks"); -$objListToolBar->Set("CheckForm","languages"); - -$listImages = array(); - //$img, $alt, $link, $onMouseOver, $onMouseOut, $onClick - -$objListToolBar->Add("new_lang", "la_ToolTip_New_LangPack",$adminURL."/config/addlang.php?$envar&new=1","swap('new_lang','toolbar/tool_new_language_f2.gif');", - "swap('new_lang', 'toolbar/tool_new_language.gif');","",$imagesURL."/toolbar/tool_new_language.gif"); - -$objListToolBar->Add("import_lang", "la_ToolTip_Import_LangPack",$adminURL."/config/importlang.php?$envar","swap('import_lang','toolbar/tool_import_language_f2.gif');", - "swap('import_lang', 'toolbar/tool_import_language.gif');","",$imagesURL."/toolbar/tool_import_language.gif"); - -$objListToolBar->Add("lang_edit","la_ToolTip_Edit","#", "if (LangChecks.itemChecked()) swap('lang_edit','toolbar/tool_edit_f2.gif');", - "if (LangChecks.itemChecked()) swap('lang_edit', 'toolbar/tool_edit.gif');","if (LangChecks.itemChecked()) LangChecks.check_submit('addlang', '');", - "tool_edit.gif",TRUE,TRUE); - -$listImages[] = "LangChecks.addImage('lang_edit','$imagesURL/toolbar/tool_edit.gif','$imagesURL/toolbar/tool_edit_f3.gif',1); "; - -$objListToolBar->Add("lang_del","la_ToolTip_Delete","#", "if (LangChecks.itemChecked()) swap('lang_del','toolbar/tool_delete_f2.gif');", - "if (LangChecks.itemChecked()) swap('lang_del', 'toolbar/tool_delete.gif');","if (LangChecks.itemChecked()) LangChecks.check_submit('config_lang', 'm_lang_delete');", - "tool_delete.gif",FALSE,TRUE); - -$listImages[] = "LangChecks.addImage('lang_del','$imagesURL/toolbar/tool_delete.gif','$imagesURL/toolbar/tool_delete_f3.gif',1); "; - -$objListToolBar->Add("lang_export","la_ToolTip_Export","#", "if (LangChecks.itemChecked()) swap('lang_export','toolbar/tool_export_language_f2.gif');", - "if (LangChecks.itemChecked()) swap('lang_export', 'toolbar/tool_export_language.gif');","if (LangChecks.itemChecked()) LangChecks.check_submit('addlang_export', '');", - "tool_export_language.gif"); - -$listImages[] = "LangChecks.addImage('lang_export','$imagesURL/toolbar/tool_export_language.gif','$imagesURL/toolbar/tool_export_language_f3.gif',1); "; - -$objListToolBar->AddToInitScript($listImages); -$objListToolBar->AddToInitScript("fwLoadMenus(); \n"); - -$objLang = new clsLanguageList(); - -$SearchWords = $objSession->GetVariable("LangSearchWord"); -if(strlen($SearchWords)) -{ - $where = $objLang->AdminSearchWhereClause($SearchWords); -} -else - $where = ""; -$order = trim($objConfig->Get("Lang_LV_Sortfield")." ".$objConfig->Get("Lang_LV_Sortorder")); - -$sql = "SELECT l.*,ELT(l.Enabled+1,'".admin_language("la_Text_Disabled")."','".admin_language("la_Text_Enabled")."') as Status "; -$sql .= "FROM ".GetTablePrefix()."Language as l "; -if(strlen($where)) - $sql .= "WHERE ".$where." "; -if(strlen($order)) - $sql .= "ORDER BY ".$order; - -$sql .= GetLimitSQL($objSession->GetVariable("Page_LV_Lang"),$objConfig->Get("Perpage_LV_Lang")); -if($objSession->HasSystemPermission("DEBUG.LIST")) - echo htmlentities($sql,ENT_NOQUOTES)."
\n"; - -$objLanguages->Query_Item($sql); -$itemcount = TableCount(GetTablePrefix()."Language", $where,0); - -$objListView = new clsListView($objListToolBar,$objLanguages); -$objListView->IdField = "LanguageId"; - -$order = $objConfig->Get("Lang_LV_Sortfield"); -$objListView->ColumnHeaders->Add("PackName",admin_language("la_prompt_PackName"),1,0,$order,"width=\"30%\"","Lang_LV_Sortfield","Lang_LV_Sortorder","PackName"); -$objListView->ColumnHeaders->Add("LocalName",admin_language("la_prompt_Name"),1,0,$order,"width=\"30%\"","Lang_LV_Sortfield","Lang_LV_Sortorder","LocalName"); -$objListView->ColumnHeaders->Add("Status",admin_language("la_ColHeader_Status"),1,0,$order,"width=\"30%\"","Lang_LV_Sortfield","Lang_LV_Sortorder","Status"); - -$objListView->ColumnHeaders->SetSort($objConfig->Get("Lang_LV_Sortfield"), $objConfig->Get("Lang_LV_Sortorder")); - -$objListView->PrintToolBar = FALSE; -$objListView->checkboxes = TRUE; - -$objListView->CurrentPageVar = "Page_LV_Lang"; -$objListView->PerPageVar = "Perpage_LV_lang"; -$objListView->CheckboxName = "itemlist[]"; -$objListView->SearchBar = TRUE; -$objListView->SearchKeywords = $SearchWords; -$objListView->SearchAction="m_lang_search"; - -$objListView->TotalItemCount = $itemcount; - -for($i=0;$iItems);$i++) -{ - $objListView->RowIcons[] = $objLanguages->Items[$i]->AdminIcon(); -} - - -if ($_GET['action'] == "cancel") { - $ado = &GetADODBConnection(); - - $PhraseTable = "ses_".$objSession->GetSessionKey()."_".GetTablePrefix()."ImportPhrases"; - $EventTable = "ses_".$objSession->GetSessionKey()."_".GetTablePrefix()."ImportEvents"; - - $ado->Execute("DROP TABLE IF EXISTS $PhraseTable"); - $ado->Execute("DROP TABLE IF EXISTS $EventTable"); -} - -$objSession->SetVariable("HasChanges", 0); - -$filter = false; -if ($SearchWords != '') { - $filter = true; -} - -$objListView->ConfigureViewMenu($SortFieldVar,$SortOrderVar,$DefaultSortField,"","",0); - -$title = prompt_language("la_Text_Configuration")." - ".prompt_language("la_tab_Regional")." ".prompt_language("la_Text_Settings"); -$h = "\n\n\n"; -int_header($objListToolBar,NULL,$title, NULL, $h); -if ($filter) { ?> - - - - -
- -
- -
" method=POST> - - -PrintList(); -?> - - - -" name="viewmenu"> - - - - - - - - - - - - - Index: trunk/admin/config/addlang_email.php =================================================================== diff -u -N --- trunk/admin/config/addlang_email.php (revision 2853) +++ trunk/admin/config/addlang_email.php (revision 0) @@ -1,379 +0,0 @@ -SourceTable = $objSession->GetEditTable("Language"); -$objEditItems->EnablePaging = FALSE; -//Multiedit init -$en = (int)$_GET["en"]; -$objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable); -$itemcount=$objEditItems->NumItems(); - -$c = $objEditItems->GetItemByIndex($en); - -$name = $c->Get("PackName"); -$LangId = $c->Get("LanguageId"); - -if($itemcount>1) -{ - if ($en+1 == $itemcount) - $en_next = -1; - else - $en_next = $en+1; - - if ($en == 0) - $en_prev = -1; - else - $en_prev = $en-1; -} -$action = "m_phrase_edit"; - -/* -------------------------------------- Section configuration ------------------------------------------- */ -$envar = "env=" . BuildEnv() . "&en=$en"; -$section = 'in-portal:lang_email'; -$sec = $objSections->GetSection($section); - -$SortFieldVar = "LangEmail_LV_SortField"; -$SortOrderVar = "LangEmail_LV_SortOrder"; -$DefaultSortField = "Description"; -$PerPageVar = "Perpage_LangEmail"; -$CurrentPageVar = "Page_LangEmail"; -$CurrentFilterVar = "LangEmailEvent_View"; - -$ListForm = "language"; -$CheckClass = "EmailChecks"; - -/* ------------------------------------- Configure the toolbar ------------------------------------------- */ -$objListToolBar = new clsToolBar(); -$objListToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","do_edit_save('language','LangEditStatus','".$admin."/config/config_lang.php',1);",$imagesURL."/toolbar/tool_select.gif"); -$objListToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","edit_submit('language','LangEditStatus','".$admin."/config/config_lang.php',2);",$imagesURL."/toolbar/tool_cancel.gif"); -$objListToolBar->Set("section",$section); -$objListToolBar->Set("load_menu_func",""); -$objListToolBar->Set("CheckClass",$CheckClass); -$objListToolBar->Set("CheckForm",$ListForm); - -if ( isset($en_prev) || isset($en_next) ) -{ - $objListToolBar->Add("divider"); - if($en_prev>-1) - { - $MouseOver="swap('moveleft','toolbar/tool_prev_f2.gif');"; - $MouseOut="swap('moveleft', 'toolbar/tool_prev.gif');"; - $onClick= $sec->Get("onclick"); - $var="?env=".BuildEnv()."&en=$en_prev"; - $link=$_SERVER["PHP_SELF"].$var; - $objListToolBar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Theme"),$link,$MouseOver,$MouseOut,"","tool_prev.gif"); - } - else - { - $MouseOver=""; - $MouseOut=""; - $onClick=""; - $link="#"; - $objListToolBar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Theme"),"#","","","","tool_prev_f3.gif"); - - } - if($en_next>-1) - { - $MouseOver="swap('moveright','toolbar/tool_next_f2.gif');"; - $MouseOut="swap('moveright', 'toolbar/tool_next.gif');"; - $onClick=$sec->Get("onclick"); - $var="?env=".BuildEnv()."&en=$en_next"; - $link=$_SERVER["PHP_SELF"].$var; - $objListToolBar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Theme"),$link,$MouseOver,$MouseOut,"","tool_next.gif"); - } - else - { - $objListToolBar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Theme"),$link,$MouseOver,$MouseOut,"","tool_next_f3.gif"); - } - -} -$objListToolBar->Add("divider"); - -$listImages = array(); - //$img, $alt, $link, $onMouseOver, $onMouseOut, $onClick -$EditEnv = $envar."&Lang=".$c->Get("LanguageId"); - -$objListToolBar->Add("email_edit", "la_ToolTip_Edit","#","if (EmailChecks.itemChecked()) swap('email_edit','toolbar/tool_edit_f2.gif');", - "if (EmailChecks.itemChecked()) swap('email_edit', 'toolbar/tool_edit.gif');", - "if (EmailChecks.itemChecked()) EmailChecks.check_submit('email_edit', '');", - "tool_edit.gif",TRUE,TRUE); -$listImages[] = "EmailChecks.addImage('email_edit','$imagesURL/toolbar/tool_edit.gif','$imagesURL/toolbar/tool_edit_f3.gif',1); "; - -/* -$objListToolBar->Add("email_user", "la_ToolTip_Email_UserSelect","#","if (EmailChecks.itemChecked()) swap('email_user','toolbar/tool_usertogroup_f2.gif');", - "if (EmailChecks.itemChecked()) swap('email_user', 'toolbar/tool_usertogroup.gif');", - "OpenUserSelector('$envar&Selector=radio&destform=userpopup&destfield=FromUserId&IdField=PortalUserId',$LangId);", - "tool_usertogroup.gif"); - -$listImages[] = "EmailChecks.addImage('email_user','$imagesURL/toolbar/tool_usertogroup.gif','$imagesURL/toolbar/tool_usertogroup_f3.gif',1); "; -*/ -$objListToolBar->Add("divider"); - -$objListToolBar->Add("viewmenubutton", "la_ToolTip_View","#","swap('viewmenubutton','toolbar/tool_view_f2.gif'); ", - "swap('viewmenubutton', 'toolbar/tool_view.gif');", - "ShowViewMenu();","tool_view.gif"); - -$objListToolBar->AddToInitScript($listImages); -$objListToolBar->AddToInitScript("fwLoadMenus();"); - -/* ----------------------------------------- Set the View Filter ---------------------------------------- */ - -$ViewNormal=1; -$Bit_Disabled=2; -$Bit_Enabled=1; -$Bit_FrontOnly=4; -$Bit_All = 7; - -$FilterLabels = array(); - -$FilterLabels[0] = admin_language("la_Text_Enabled"); -$FilterLabels[1] = admin_language("la_Text_Disabled"); -$FilterLabels[2] = admin_language("la_Text_FrontOnly"); - -/* determine current view menu settings */ -$MsgView = $objConfig->Get($CurrentFilterVar); - -if(!is_numeric($MsgView)) -{ - $MsgView = $Bit_All; //Set all bits ON - $MsgFilter = ""; -} - -if($MsgView & $Bit_Disabled) - $Status[] = 0; - -if($MsgView & $Bit_Enabled) - $Status[] = 1; - - if($MsgView & $Bit_FrontOnly) - $Status[] = 2; - -if(count($Status)>0) -{ - $MsgFilter = "Enabled IN (".implode(",",$Status).")"; -} -else - $MsgFilter = "Enabled = -1"; - -/* ------------------------------------ Build the SQL statement to populate the list ---------------------------*/ - -$objEvents = new clsEventList(); -$order = trim($objConfig->Get($SortFieldVar)." ".$objConfig->Get($SortOrderVar)); - -$SearchWords = $objSession->GetVariable("LangEmailEventSearchWord"); -if(strlen($SearchWords)) -{ - // remove u.Login from search fields in this case - $i = 0; $field_count = count($objEvents->AdminSearchFields); - while($i < $field_count) - { - if( $objEvents->AdminSearchFields[$i] == 'u.Login' ) - { - array_splice($objEvents->AdminSearchFields,$i); - break; - } - $i++; - } - $where = $objEvents->AdminSearchWhereClause($SearchWords); -} -else -{ - $where = ""; -} -$UserTable = GetTablePrefix()."PortalUser"; -$EventTable = GetTablePrefix()."Events"; -$MessageTable = GetTablePrefix()."EmailMessage"; - -$sql = "SELECT e.Description as Description, e.Module as Module, e.EventId as EventId, "; -$sql .="ELT(e.Enabled+1,'".admin_language("la_Text_Disabled")." ','".admin_language("la_Text_Enabled")." ', '".admin_language("la_Text_FrontOnly")." ') as EventStatus, "; -$sql .="ELT(e.Type+1,'".admin_language("la_Text_User")." ','".admin_language("la_Text_Admin")." ') as EventType, "; -$sql .="u.Login as FromUser FROM $EventTable as e LEFT JOIN $UserTable as u ON (e.FromUserId=u.PortalUserId) "; - -$FullWhere = ""; -if(strlen($where)) -{ - $FullWhere = "WHERE $where "; -} -if(strlen($MsgFilter)) -{ - if(!strlen($FullWhere)) - { - $FullWhere = "WHERE $MsgFilter "; - } - else - $FullWhere .= " AND ($MsgFilter) "; -} -$sql .= $FullWhere; - -if(strlen($objConfig->Get($SortFieldVar))) - $sql .= "ORDER BY ".$order." "; - -if(isset($_GET["lpn"])) - $objSession->SetVariable($CurrentPageVar,$_GET["lpn"]); - -$sql .= GetLimitSQL($objSession->GetVariable($CurrentPageVar),$objConfig->Get($PerPageVar)); -//echo $sql; -$objEvents->Query_Item($sql); -$itemcount = TableCount($objEvents->SourceTable, $where,0); - -if($objSession->HasSystemPermission("DEBUG.LIST")) - echo htmlentities($sql,ENT_NOQUOTES)."
\n"; - - -/* ---------------------------------------- Configure the list view ---------------------------------------- */ -$objListView = new clsListView($objListToolBar,$objEvents); -$objListView->IdField = "EventId"; - -$order = $objConfig->Get("LangEmail_LV_SortField"); - -$objListView->ColumnHeaders->Add("Description",admin_language("la_prompt_Description"),1,0,$order,"width=\"50%\"","LangEmail_LV_SortField","LangEmail_LV_SortOrder","Description"); -$objListView->ColumnHeaders->Add("Module",admin_language("la_prompt_Module"),1,0,$order,"width=\"15%\"","LangEmail_LV_SortField","LangEmail_LV_SortOrder","Module"); -$objListView->ColumnHeaders->Add("EventType",admin_language("la_prompt_Type"),1,0,$order,"width=\"10%\"","LangEmail_LV_SortField","LangEmail_LV_SortOrder","EventType"); -$objListView->ColumnHeaders->Add("EventStatus",admin_language("la_prompt_Status"),1,0,$order,"width=\"10%\"","LangEmail_LV_SortField","LangEmail_LV_SortOrder","EventStatus"); -//$objListView->ColumnHeaders->Add("FromUser",admin_language("la_prompt_FromUser"),1,0,$order,"width=\"15%\"","Email_LV_SortField","Email_LV_SortOrder","FromUser"); - -$objListView->ColumnHeaders->SetSort($objConfig->Get($SortFieldVar), $objConfig->Get($SortOrderVar)); - -$objListView->PrintToolBar = FALSE; -$objListView->checkboxes = TRUE; - -$objListView->CurrentPageVar = $CurrentPageVar; -$objListView->PerPageVar = $PerPageVar; -$objListView->CheckboxName = "itemlist[]"; -$objListView->SearchBar = TRUE; -$objListView->SearchKeywords = $SearchWords; -$objListView->SearchAction="m_langemailevent_search"; - -$objListView->TotalItemCount = $itemcount; - - $objListView->ConfigureViewMenu($SortFieldVar,$SortOrderVar,$DefaultSortField, - $CurrentFilterVar,$MsgView,$Bit_All); - - foreach($FilterLabels as $Bit=>$Label) - { - $objListView->AddViewMenuFilter($Label,$Bit); - } - -for($i=0;$iItems);$i++) -{ - $e =& $objEvents->GetItemRefByIndex($i); - $e->Set("Description",prompt_language($e->Get("Description"))); -} - - -$filter = false; // always initialize variables before use -if($objSession->GetVariable("LangEmailEventSearchWord") != '') { - $filter = true; -} -else { - if ($MsgView != $Bit_All) { - $filter = true; - } -} - - -$title = $title = GetTitle("la_Text_Pack", "la_tab_EmailEvents", $c->Get('LanguageId'), $c->Get('LocalName'));///prompt_language("la_Text_Configuration")." - '".$name."' ".prompt_language("la_Text_Pack")." - ".prompt_language("la_tab_EmailEvents"); - -$h = "\n\n\n"; -define('FORCE_CHARSET', $c->Get("Charset") ); -int_header($objListToolBar,NULL, $title,NULL,$h); - -if ($objSession->GetVariable("HasChanges") == 1) { -?> -
- - - -
- -
- - - - - - -
- -
- -
" method=POST> - - -PrintList(); -?> - - - - - - > - - - -
-
- - -
" name="viewmenu"> - - - - -
-
- - -
- -
" ID="popup"> - - - - - - - -
- -
" ID="userpopup"> - -"> - - -
- - - - Index: trunk/admin/subitems.php =================================================================== diff -u -N -r3021 -r4065 --- trunk/admin/subitems.php (.../subitems.php) (revision 3021) +++ trunk/admin/subitems.php (.../subitems.php) (revision 4065) @@ -1,29 +1,11 @@ Init(); - // KERNEL4 INI: END - - // IN-PORTAL INIT: BEGIN - $g_TablePrefix = TABLE_PREFIX; - $pathtoroot = FULL_PATH.'/'; + // new startup: begin + define('REL_PATH', 'admin'); + $relation_level = count( explode('/', REL_PATH) ); + define('FULL_PATH', realpath(dirname(__FILE__) . str_repeat('/..', $relation_level) ) ); require_once FULL_PATH.'/kernel/startup.php'; - // IN-PORTAL INIT: END - - $rootURL = $application->BaseURL(); - $admin = ADMIN_DIR; - - $localURL = $rootURL.'kernel/'; - $adminURL = $rootURL.$admin; - $imagesURL = $adminURL.'/images'; - - $cssURL = $adminURL.'/include'; - $jsURL = $adminURL.'/include/subitems'; + // new startup: end //admin only util $pathtolocal = $pathtoroot.'kernel/'; Index: trunk/compat.php =================================================================== diff -u -N -r13 -r4065 --- trunk/compat.php (.../compat.php) (revision 13) +++ trunk/compat.php (.../compat.php) (revision 4065) @@ -1,5 +1,5 @@ $value) -{ - $path = $pathtoroot. $value."admin/include/parser.php"; - if(file_exists($path)) - { - include_once($path); - } -} - -$objMessages = new clsEmailMessageList(); - -unset($objEditItems); - -$objEditItems = new clsLanguageList(); -$objEditItems->SourceTable = $objSession->GetEditTable("Language"); -$objEditItems->EnablePaging = FALSE; -$objPhraseList = new clsPhraseList(); -$objPhraseList->EnablePaging = FALSE; -if( GetVar('new') ) -{ - $c = new clsLanguage(NULL); - $c->Set("DecimalPoint","."); - $c->Set("ThousandSep",","); - $c->Set("DateFormat","m-d-Y"); - $c->Set("TimeFormat","g:i:s a"); - $en = 0; - $action = "m_lang_add"; - $name = prompt_language("la_Text_New"); - $objLanguages->CreateEmptyEditTable("LanguageId"); - $objPhraseList->CreateEmptyEditTable("PhraseId"); - $objMessages->CreateEmptyEditTable($_POST["itemlist"]); -} -else -{ - $en = (int)$_GET["en"]; - - if (isset($_POST["itemlist"])) - { - $objLanguages->CopyToEditTable("LanguageId",$_POST["itemlist"]); - $objPhraseList->CopyToEditTable("LanguageId",$_POST["itemlist"]); - $objMessages->CopyToEditTable("LanguageId",$_POST["itemlist"]); - } - $objEditItems->Query_Item("SELECT * FROM ".$objEditItems->SourceTable); - $itemcount=$objEditItems->NumItems(); - - $c = $objEditItems->GetItemByIndex($en); - - if($itemcount>1) - { - if ($en+1 == $itemcount) - $en_next = -1; - else - $en_next = $en+1; - - if ($en == 0) - $en_prev = -1; - else - $en_prev = $en-1; - } - $action = "m_lang_edit"; - $name = $c->Get("LocalName"); -} - -$section = "in-portal:lang_general"; - -$envar = "env=".BuildEnv(); - -$title = $title = GetTitle("la_Text_Pack", "la_tab_General", $c->Get('LanguageId'), $c->Get('LocalName'));///prompt_language("la_Text_Configuration")." - ".$name."' ".prompt_language("la_Text_Pack")." - ".prompt_language("la_tab_General"); - -//Display header -$sec = $objSections->GetSection($section); -$objListToolbar = new clsToolBar(); -$objListToolbar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","edit_submit('language','LangEditStatus','".$admin."/config/config_lang.php',1);",$imagesURL."/toolbar/tool_select.gif"); -$objListToolbar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","edit_submit('language','LangEditStatus','".$admin."/config/config_lang.php',2);",$imagesURL."/toolbar/tool_cancel.gif"); - -if ( isset($en_prev) || isset($en_next) ) -{ - $url = $admin."/config/addlang.php"; - $objListToolbar->Add("divider"); - $form = "language"; - if($en_prev>-1) - { - $MouseOver="swap('moveleft','toolbar/tool_prev_f2.gif');"; - $MouseOut="swap('moveleft', 'toolbar/tool_prev.gif');"; - $onClick= $sec->Get("onclick"); - $var="env=".BuildEnv()."&en=$en_prev"; - $link = "javascript:edit_submit('$form','$url',0,'$var');"; - $objListToolbar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Category"),$link,$MouseOver,$MouseOut,"","toolbar/tool_prev.gif"); - } - else - { - $MouseOver=""; - $MouseOut=""; - $onClick=""; - $link="#"; - $objListToolbar->Add("moveleft",admin_language("la_ToolTip_Previous")." ".admin_language("la_Text_Category"),"#","","","","toolbar/tool_prev_f3.gif"); - - } - if($en_next>-1) - { - $MouseOver="swap('moveright','toolbar/tool_next_f2.gif');"; - $MouseOut="swap('moveright', 'toolbar/tool_next.gif');"; - $onClick=$sec->Get("onclick"); - $var="env=".BuildEnv()."&en=$en_next"; - $link = "javascript:edit_submit('$form','$url',0,'$var');"; - $objListToolbar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Category"),$link,$MouseOver,$MouseOut,"","toolbar/tool_next.gif"); - } - else - { - $objListToolbar->Add("moveright",admin_language("la_ToolTip_Next")." ".admin_language("la_Text_Category"),$link,$MouseOver,$MouseOut,"","toolbar/tool_next_f3.gif"); - } -} - - define('FORCE_CHARSET', $c->Get("Charset") ); - int_header($objListToolbar,NULL,$title); -if ($objSession->GetVariable("HasChanges") == 1) { -?> - - - - -
- -
- -
- - -Data=inp_htmlize($c->Data);?> - > - - - - - - > - - - - - - > - - - - - - > - - - - - - > - - - - - - > - - - - - - > - - - - - - > - - - - - - > - - - - - -> - - - - - -> - - - - -> - - - - - "> - - - -
Get("LanguageId"); ?>
">
">
">
">
"> - Get("DateFormat"))) echo prompt_language("la_Text_example").":".adodb_date($c->Get("DateFormat")); ?> -
"> - Get("TimeFormat"))) echo prompt_language("la_Text_example").":".adodb_date($c->Get("TimeFormat")); ?> -
">
">
- Get("Enabled") == 1) echo "checked"; ?>> -  
- Get("PrimaryLang") == 1) echo "checked"; ?>> -  
- - - - -
-
- -
" name="viewmenu"> - - - - -
- - \ No newline at end of file Index: trunk/admin/editor/FCKeditor/css/fck_editorarea.php =================================================================== diff -u -N -r2569 -r4065 --- trunk/admin/editor/FCKeditor/css/fck_editorarea.php (.../fck_editorarea.php) (revision 2569) +++ trunk/admin/editor/FCKeditor/css/fck_editorarea.php (.../fck_editorarea.php) (revision 4065) @@ -12,6 +12,8 @@ ## result in revocation of the license and support ## ## privileges along maximum prosecution allowed by law. ## ############################################################## + +// OLD STARTUP if( !(isset($pathtoroot) && $pathtoroot) ) { $path=dirname(realpath(__FILE__)); Index: trunk/admin/listview/listview.php =================================================================== diff -u -N -r3471 -r4065 --- trunk/admin/listview/listview.php (.../listview.php) (revision 3471) +++ trunk/admin/listview/listview.php (.../listview.php) (revision 4065) @@ -1,7 +1,8 @@ $value) -{ - $path = $pathtoroot. $value."admin/include/parser.php"; - if(file_exists($path)) - { - include_once($path); - } -} - -$objLangList = new clsLanguageList(); - -if (isset($_POST["itemlist"])) -{ - $LangIds = implode(",",$_POST["itemlist"]); - $sql = "SELECT * FROM ".$objLangList->SourceTable." WHERE LanguageId IN ($LangIds)"; - - $objLangList->Query_Item($sql); - $names = array(); - foreach($objLangList->Items as $l) - { - $names[] = $l->Get("PackName"); - } - $names = implode(",",$names); -} -$action = "m_lang_export"; -$section = "in-portal:lang_export"; -$envar = "env=".BuildEnv(); - -$title = prompt_language("la_Text_Export")." ".prompt_language("la_Text_Languages")." - ".$names." - ".admin_language("la_Step")." 1"; - -//Display header -$sec = $objSections->GetSection($section); -$objCatToolBar = new clsToolBar(); -$objCatToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","edit_submit('language','LangEditStatus','".$admin."/config/addlang_export_result.php',1);",$imagesURL."/toolbar/tool_select.gif"); -$objCatToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","edit_submit('language','LangEditStatus','".$admin."/config/config_lang.php',2);",$imagesURL."/toolbar/tool_cancel.gif"); - -int_header($objCatToolBar,NULL,$title); -?> -
- - - - > - - - - - > - - - - - - - -
-
- - - -
-
- -
" name="viewmenu"> - - - - -
- - Index: trunk/kernel/admin/include/navmenu.php =================================================================== diff -u -N -r4052 -r4065 --- trunk/kernel/admin/include/navmenu.php (.../navmenu.php) (revision 4052) +++ trunk/kernel/admin/include/navmenu.php (.../navmenu.php) (revision 4065) @@ -144,13 +144,6 @@ NULL, "in-portal:system", "in-portal:configure_themes", 'in-portal:configure_lang',0,"",1, NULL,NULL,NULL,$module_images.'/icons/icon46_list_style.gif'); -/* -$objSections->AddSection("in-portal:configure_lang", "la_tab_Regional", "la_tab_Regional", $admin."/config/","config_lang.php", - $admin."/icons/icon46_conf_regional.gif", $admin."/icons/icon24_conf_regional.gif", - NULL, "in-portal:system", "in-portal:configure_themes", "in-portal:configure_lang_new", 0,"",1, - NULL,NULL,NULL,$admin."/icons/icon46_list_conf_regional.gif"); -*/ - $objSections->AddSection("in-portal:configure_lang", "la_tab_Regional", "la_tab_Regional", $admin.'/index4.php','kernel4:regional/languages_list.tpl', $admin."/icons/icon46_conf_regional.gif", $admin."/icons/icon24_conf_regional.gif", @@ -169,34 +162,6 @@ $admin."/icons/icon46_conf_themes.gif", $admin."/icons/icon24_conf_themes.gif", NULL, "in-portal:configure_themes", "in-portal:theme_general",NULL,-1); -/*language tabs */ -$objSections->AddSection("in-portal:lang_general", "la_tab_General", NULL, $admin."/config/", - "javascript:edit_submit('language','LangEditStatus','".$admin."/config/addlang.php',0);", - $admin."/icons/icon46_conf_regional.gif", $admin."/icons/icon24_conf_regional.gif", - NULL, "in-portal:configure_lang", NULL, "in-portal:lang_labels",-1); - -$objSections->AddSection("in-portal:lang_labels", "la_tab_Labels", NULL, $admin."/config/", - "javascript:edit_submit('language','LangEditStatus','".$admin."/config/addlang_labels.php',0);", - $admin."/icons/icon46_conf_regional.gif", $admin."/icons/icon24_conf_regional.gif", - NULL, "in-portal:configure_lang", "in-portal:lang_general", "in-portal:lang_email",-1); - -$objSections->AddSection("in-portal:lang_email", "la_tab_EmailEvents", NULL, $admin."/config/", - "javascript:edit_submit('language','LangEditStatus','".$admin."/config/addlang_email.php',0);", - $admin."/icons/icon46_conf_regional.gif", $admin."/icons/icon24_conf_regional.gif", - NULL, "in-portal:configure_lang", "in-portal:lang_labels", NULL,-1); - - -$objSections->AddSection("in-portal:lang_import", "la_tab_ImportLang", "la_tab_ImportLang", $admin."/config/", - "javascript:edit_submit('language','LangEditStatus','".$admin."/config/addlang.php',0);", - $admin."/icons/icon46_conf_regional.gif", $admin."/icons/icon24_conf_regional.gif", - NULL, NULL, NULL, NULL,-1); - -$objSections->AddSection("in-portal:lang_export", "la_tab_ExportLang", "la_tab_ExportLang", $admin."/config/", - "javascript:edit_submit('language','LangEditStatus','".$admin."/config/addlang.php',0);", - $admin."/icons/icon46_conf_regional.gif", $admin."/icons/icon24_conf_regional.gif", - NULL, NULL, NULL, NULL,-1, "", 1); - - /*Community Section tree items */ $objSections->AddSection("in-portal:user_list","la_tab_User_List","la_tab_User_List",$admin."/users/","user_list.php?resetpage=1", $admin."/icons/icon46_users.gif",$admin."/icons/icon24_users.gif", Index: trunk/kernel/startup.php =================================================================== diff -u -N -r3830 -r4065 --- trunk/kernel/startup.php (.../startup.php) (revision 3830) +++ trunk/kernel/startup.php (.../startup.php) (revision 4065) @@ -46,7 +46,11 @@ $pathchar = '/'; // KERNEL4 INIT: END $k4_path_detection = true; + define('OLD_STARTUP', 0); } + else { + define('OLD_STARTUP', 1); + } if(!get_magic_quotes_gpc()) { Index: trunk/admin/config/addcustomfield.php =================================================================== diff -u -N --- trunk/admin/config/addcustomfield.php (revision 3534) +++ trunk/admin/config/addcustomfield.php (revision 0) @@ -1,193 +0,0 @@ -$value) -{ - $path = $pathtoroot. $value."admin/include/parser.php"; - if(file_exists($path)) - { - include_once($path); - } -} - -$FieldType = (int)$_GET["DataType"]; -if($FieldType==0) - $FieldType = (int)$_POST["DataType"]; - -$objCustomFields = new clsCustomFieldList($FieldType); - -//$objEditItems->SourceTable = $objSession->GetEditTable("Images"); - -if(isset($_POST["itemlist"])) -{ - if(is_array($_POST["itemlist"])) - { - $FieldId = $_POST["itemlist"][0]; - } - else - { - $FieldId = $_POST["itemlist"]; - } - $c = $objCustomFields->GetItem($FieldId); - $action = "m_customfield_edit"; - $name = $c->Get("FieldName"); -} -else -{ - $c = new clsCustomField(); - $c->Set("Type",$DataType); - $action = "m_customfield_add"; - $name = prompt_language("la_Text_NewField"); - -} - -$section = $_GET["section"]; -if(strlen($section)==0) - $section = $_POST["section"]; - -$section_env = "section=$section&DataType=$FieldType"; -$envar = "$section_env&env=".BuildEnv(); - -$ado = &GetADODBConnection(); - -/* page header */ -$charset = GetRegionalOption('Charset'); -print << - - In-portal - - - - - - - - - - - -END; - -$title = GetTitle("la_Text_CustomField", '', $FieldId, $name);//prompt_language("la_Text_Editing")." ".prompt_language("la_Text_CustomField")." ".prompt_language("la_text_for")." ".prompt_language("la_Text_DataType_".$_GET["DataType"]); -$title .= " ".prompt_language("la_text_for")." ".prompt_language("la_Text_DataType_".$_GET["DataType"]); -$objCatToolBar = new clsToolBar(); -$objCatToolBar->Add("img_save", "la_Save","#","swap('img_save','toolbar/tool_select_f2.gif');", "swap('img_save', 'toolbar/tool_select.gif');","submit_form('customfield','','".$admin."/config/edit_customfields.php',0,'&$section_env');",$imagesURL."/toolbar/tool_select.gif"); -$objCatToolBar->Add("img_cancel", "la_Cancel","#","swap('img_cancel','toolbar/tool_cancel_f2.gif');", "swap('img_cancel', 'toolbar/tool_cancel.gif');","submit_form('customfield','','".$admin."/config/edit_customfields.php',-1,'&$section_env');",$imagesURL."/toolbar/tool_cancel.gif"); - -int_header($objCatToolBar,NULL,$title); -?> -
- - - - > - - - - - - > - - - - - - > - - - - - - > - - - - > - - - - - > - - - - - > - - - - - > - - - - - > - - - - - > - - - - - -
Get("CustomFieldId"); ?>
">
Get("FieldName"))) echo "lu_fieldcustom__".$c->Get("FieldName"); ?>: - Get("FieldName"),0); ?> -
- - "> - "> -
Get("OnGeneralTab")) echo "CHECKED"; ?>>
">
">
- -
">
- - -
- - - - -
- - Index: trunk/admin/config/addlang_export_result.php =================================================================== diff -u -N --- trunk/admin/config/addlang_export_result.php (revision 2853) +++ trunk/admin/config/addlang_export_result.php (revision 0) @@ -1,99 +0,0 @@ -$value) -{ - $path = $pathtoroot. $value."admin/include/parser.php"; - if(file_exists($path)) - { - include_once($path); - } -} - -$objLangList = new clsLanguageList(); - -if (isset($_POST["itemlist"])) -{ - $LangIds = implode(",",$_POST["itemlist"]); - $sql = "SELECT * FROM ".$objLangList->SourceTable." WHERE LanguageId IN ($LangIds)"; - - $objLangList->Query_Item($sql); - $names = array(); - foreach($objLangList->Items as $l) - { - $names[] = $l->Get("PackName"); - } - $names = implode(",",$names); -} -$action = "m_lang_export"; -$section = "in-portal:lang_export"; -$envar = "env=".BuildEnv(); - -$title = prompt_language("la_Text_Export")." ".prompt_language("la_Text_Languages")." ".prompt_language("la_Text_Results"); - -int_header($objCatToolBar,NULL,$title); -?> - - - - > - - - - - - > - - - - - - > - - - - Index: trunk/admin/config/importlang_progress.php =================================================================== diff -u -N --- trunk/admin/config/importlang_progress.php (revision 2853) +++ trunk/admin/config/importlang_progress.php (revision 0) @@ -1,283 +0,0 @@ -GetSessionKey()."_".GetTablePrefix()."ImportPhrases"; -$EventTable = "ses_".$objSession->GetSessionKey()."_".GetTablePrefix()."ImportEvents"; - -$OverWrite = $_POST['overwrite']; - -if(count($_POST)>0) -{ - $Offset = 0; - $CurrentLang=0; - $file = $_FILES["lang_file"]; - - if(is_array($file)) - { - if((int)$file["size"]>0) - { - $filename = $pathtoroot.$admin."/export/".$file["name"]; - move_uploaded_file($file["tmp_name"],$filename)?1:0; - @chmod($filename, 0666); - - if(file_exists($filename)) - { - /* parse xml file */ - $fp = @fopen($filename,"r"); - $xml = @fread($fp,filesize($filename)); - @fclose($fp); - $objInXML = new xml_doc($xml); - $objInXML->parse(); - - $ado->Execute("DROP TABLE IF EXISTS $PhraseTable"); - $ado->Execute("DROP TABLE IF EXISTS $EventTable"); - - $sql = "CREATE TABLE $PhraseTable SELECT Phrase,Translation,PhraseType,LanguageId FROM ".GetTablePrefix()."Phrase WHERE PhraseId=-1"; - $ado->Execute($sql); - - $sql = "CREATE TABLE $EventTable SELECT Template,MessageType,EventId,LanguageId FROM ".GetTablePrefix()."EmailMessage WHERE EmailMessageId=-1"; - $ado->Execute($sql); - //$sql = "ALTER TABLE $EventTable ADD `Type` INT(11) default 0"; - //$ado->Execute($sql); - $sql = "SELECT EventId,Event,Type FROM ".GetTablePrefix()."Events"; - $rs = $ado->Execute($sql); - $Events = array(); - while($rs && !$rs->EOF) - { - $Events[$rs->fields["Event"]."_".$rs->fields["Type"]] = $rs->fields["EventId"]; - $rs->MoveNext(); - } - $objInXML->getTag(0,$name,$attribs,$contents,$tags); - - if(is_array($tags)) - { - foreach($tags as $t) - { - $LangRoot =& $objInXML->getTagByID($t); - $PackName = $LangRoot->attributes["PACKNAME"]; - $l = $objLanguages->GetItemByField("PackName",$PackName); - if(is_object($l)) - { - $LangId = $l->Get("LanguageId"); - } - else - { - $l = new clsLanguage(); - $l->Create(); - $NewLang = TRUE; - $LangId = $l->Get("LanguageId"); - } - foreach($LangRoot->children as $tag) - { - switch($tag->name) - { - case "PHRASES": - foreach($tag->children as $PhraseTag) - { - $Phrase = $ado->qstr($PhraseTag->attributes["LABEL"]); - $Translation = $ado->qstr(base64_decode($PhraseTag->contents)); - - $PhraseType = $PhraseTag->attributes["TYPE"]; - $psql = "INSERT INTO $PhraseTable (Phrase,Translation,PhraseType,LanguageId) VALUES ($Phrase,$Translation,$PhraseType,$LangId)"; - mysql_query($psql,$ado->_connectionID); - //$ado->Execute($psql); - //echo "$psql
\n"; - } - break; - case "DATEFORMAT": - $DateFormat = $tag->contents; - break; - case "TIMEFORMAT": - $TimeFormat = $tag->contents; - break; - case "DECIMAL": - $Decimal = $tag->contents; - break; - case "THOUSANDS": - $Thousands = $tag->contents; - break; - case 'CHARSET': - $Charset = $tag->contents; - break; - - case "EVENTS": - foreach($tag->children as $EventTag) - { - $event = $EventTag->attributes["EVENT"]; - $MsgType = strtolower($EventTag->attributes["MESSAGETYPE"]); - $template = base64_decode($EventTag->contents); - $Type = $EventTag->attributes["TYPE"]; - $EventId = $Events[$event."_".$Type]; - - $esql = "INSERT INTO $EventTable (Template,MessageType,EventId,LanguageId) VALUES ('$template','$MsgType',$EventId,$LangId)"; - mysql_query($esql,$ado->_connectionID); - //$ado->Execute($esql); - //echo htmlentities($esql)."
\n"; - } - break; - } - if($NewLang) - { - $l->Set("PackName",$PackName); - $l->Set("LocalName",$PackName); - $l->Set("DateFormat",$DateFormat); - $l->Set("TimeFormat",$TimeFormat); - $l->Set("DecimalPoint",$Decimal); - $l->Set("ThousandSep",$Thousands); - $l->Set('Charset', (isset($Charset)&&$Charset)?$Charset:'iso-8859-1'); - $l->Update(); - } - } - } - $Types = implode(",",$_POST["langtypes"]); - $objSession->SetVariable("lang_types",$Types); - $objSession->SetVariable("lang_overwrite",(int)$_POST["overwrite"]); - $Total = $Types?TableCount($PhraseTable,"PhraseType IN ($Types)",0):0; - $objSession->SetVariable("phrase_total",$Total); - $Total = TableCount($EventTable,"",0); - $objSession->SetVariable("event_total",$Total); - $Offset = 0; - $Status = 0; - //unlink($filename); - } - } - } - } -} -else -{ - $Offset = (int)$_GET["Offset"]; - $Status = (int)$_GET["Status"]; - - $OverWrite = $objSession->GetVariable("lang_overwrite"); - $Types = $objSession->GetVariable("lang_types"); - if($Status==0) - { - $Total = $objSession->GetVariable("phrase_total"); - } - else - $Total = $objSession->GetVariable("event_total"); -} -//echo $Total; -if ($Total == "") { - $url = $adminURL."/config/importlang.php?env=".BuildEnv()."&importerror=1"; - Header("Location: $url"); - //reload($url); -} - -$title = admin_language("la_Text_LangImport")." - ".admin_language("la_Step")." 2"; -int_header(NULL,NULL, $title); - -?> -
- - ">
- -
- "> -
-GetVariable("phrase_total"); - stats(prompt_language("la_lang_import_progress"),$Offset,$Total); - $Offset = $objLanguages->ReadImportTable($PhraseTable,1,$Types,$OverWrite,$MaxInserts,$Offset); - if($Offset<$Total) - { - $url = $_SERVER["PHP_SELF"]."?env=".BuildEnv()."&Offset=$Offset&Status=0"; - } - else - { - if($objSession->GetVariable("event_total")>0) - { - $url = $_SERVER["PHP_SELF"]."?env=".BuildEnv()."&Offset=0&Status=1"; - } - else - { - $ado->Execute("DROP TABLE IF EXISTS $PhraseTable"); - $ado->Execute("DROP TABLE IF EXISTS $EventTable"); - $url = $adminURL."/config/config_lang.php?env=".BuildEnv(); - } - } - - reload($url); - } - else - { - $Total = $objSession->GetVariable("event_total"); - $Offset = $objMessageList->ReadImportTable($EventTable,$OverWrite,$MaxInserts,$Offset); - if($Offset<$Total) - { - $url = $_SERVER["PHP_SELF"]."?env=".BuildEnv()."&Offset=$Offset&Status=1"; - } - else - { - $ado->Execute("DROP TABLE IF EXISTS $PhraseTable"); - $ado->Execute("DROP TABLE IF EXISTS $EventTable"); - $url = $adminURL."/config/config_lang.php?env=".BuildEnv(); - } - stats(prompt_language("la_event_import_progress"),$Offset,$Total); - reload($url); - } -function stats($caption,$myprogress,$totalnum) -{ - global $rootURL, $CancelURL, $PageTitle; - - if($totalnum>0) - { - $pct=round(($myprogress/ $totalnum)*100); - } - else - $pct = 100; - $o .="
"; - - echo "\n"; - $o .= int_subsection_title_ret($caption." - ".$pct."%"); - $o .= "

"; - $o .= " "; - $o .=" "; - $comp_pct = 100-$pct; - $o .= " "; - $o .= "
 
"; - $o .= "
"; - echo $o."\n"; - echo "
"; - -} -function reload($url) -{ - print ""; - //echo "Next "; -} - -?> -