Index: branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/debugger.php =================================================================== diff -u -r7021 -r7474 --- branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/debugger.php (.../debugger.php) (revision 7021) +++ branches/unlabeled/unlabeled-1.63.4/core/kernel/utility/debugger.php (.../debugger.php) (revision 7474) @@ -144,6 +144,10 @@ $dbg_constMap['DBG_EDITOR'] = 'c:\Program Files\Zend\ZendStudio-5.2.0\bin\ZDE.exe %F'; } + if (isset($_REQUEST['ajax']) && $_REQUEST['ajax'] && constOn('DBG_SKIP_AJAX')) { + $this->safeDefine('DBG_SKIP_REPORTING', 1); + } + // user defined options override debugger defaults $dbg_constMap = $this->array_merge_recursive2($dbg_constMap, $dbg_options); @@ -902,7 +906,7 @@ $is_ajax = isset($_GET['ajax']) && $_GET['ajax'] == 'yes'; $skip_reporting = $this->constOn('DBG_SKIP_REPORTING') || $this->constOn('DBG_ZEND_PRESENT'); - if ($is_ajax || !$skip_reporting) { + if (($is_ajax && !constOn('DBG_SKIP_AJAX')) || !$skip_reporting) { $debug_file = $this->tempFolder.'/debug_'.$this->rowSeparator.'.txt'; if (file_exists($debug_file)) unlink($debug_file); Index: branches/unlabeled/unlabeled-1.8.2/core/units/categories/cache_updater.php =================================================================== diff -u -r7370 -r7474 --- branches/unlabeled/unlabeled-1.8.2/core/units/categories/cache_updater.php (.../cache_updater.php) (revision 7370) +++ branches/unlabeled/unlabeled-1.8.2/core/units/categories/cache_updater.php (.../cache_updater.php) (revision 7474) @@ -191,7 +191,7 @@ function getDonePercent() { if(!$this->totalCats)return 0; - return min(100, intval( round( $this->doneCats / $this->totalCats * 100 ) )); + return min(100, intval( floor( $this->doneCats / $this->totalCats * 100 ) )); } function getData() Index: branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php =================================================================== diff -u -r7466 -r7474 --- branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php (.../application.php) (revision 7466) +++ branches/unlabeled/unlabeled-1.166.4/core/kernel/application.php (.../application.php) (revision 7474) @@ -2168,9 +2168,9 @@ // 2. find what if parent is passed $passed = explode(',', $this->GetVar('passed')); - foreach ($prefixes as $current_prefix) { - if (in_array($current_prefix, $passed)) { - break; + foreach ($prefixes as $a_prefix) { + if (in_array($a_prefix, $passed)) { + return $a_prefix; } } Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/header.tpl =================================================================== diff -u -r7355 -r7474 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/header.tpl (.../header.tpl) (revision 7355) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/header.tpl (.../header.tpl) (revision 7474) @@ -47,7 +47,7 @@ - > + > Index: branches/unlabeled/unlabeled-1.14.2/kernel/include/customfield.php =================================================================== diff -u -r6873 -r7474 --- branches/unlabeled/unlabeled-1.14.2/kernel/include/customfield.php (.../customfield.php) (revision 6873) +++ branches/unlabeled/unlabeled-1.14.2/kernel/include/customfield.php (.../customfield.php) (revision 7474) @@ -2,11 +2,11 @@ class clsCustomField extends clsItem { - + function clsCustomField($CustomFieldId=-1) { $this->clsItem(); - $this->tablename=GetTablePrefix()."CustomField"; + $this->tablename=GetTablePrefix()."CustomField"; $this->type=10; $this->BasePermission=""; $this->id_field = "CustomFieldId"; @@ -31,27 +31,27 @@ $a->ElementType="text"; if(!strlen($a->prompt)) $a->prompt = "lu_fieldcustom__".strtolower($this->Get("FieldName")); - return $a; - } - + return $a; + } + function parsetag($tag) - { + { if(is_object($tag)) - { + { $tagname = $tag->name; } else $tagname = $tag; switch($tagname) - { + { case "fieldlabel": return $this->Get("FieldLabel"); break; - + case "fieldname": return $this->Get("FieldName"); break; - + case "customfieldid": return $this->Get("CustomFieldId"); @@ -75,7 +75,7 @@ if ($table == 'CustomField') { $table = GetTablePrefix().$table; } - + $this->SourceTable = $table; if ($this->Type > 0) { $this->LoadFields(); @@ -87,39 +87,39 @@ $this->Clear(); $sql = 'SELECT * FROM '.$this->SourceTable.' - WHERE Type = '.$this->Type.' AND IsSystem = 0 + WHERE Type = '.$this->Type.' AND (IsSystem = 0 OR OnGeneralTab = 1) ORDER BY DisplayOrder DESC, CustomFieldId ASC'; - if($this->debuglevel > 1) + if($this->debuglevel > 1) echo $sql."
\n"; $rs = $this->adodbConnection->Execute($sql); - + while($rs && !$rs->EOF) { $data = $rs->fields; $this->AddItemFromArray($data); $rs->MoveNext(); - } + } } function LoadFieldsAndValues($ResourceId, $main_prefix, $temp_table = false) { $this->Clear(); - + $table = $this->Application->getUnitOption($main_prefix.'-cdata', 'TableName'); if ($temp_table) { $table = $this->Application->GetTempName($table, 'prefix:'.$main_prefix); } - + $sql = 'SELECT * FROM '.$table.' WHERE ResourceId = '.$ResourceId; $custom_data = $this->adodbConnection->GetRow($sql); - + $sql = 'SELECT * FROM '.TABLE_PREFIX.'CustomField WHERE Type = '.$this->Application->getUnitOption($main_prefix, 'ItemType'); $custom_fields = $this->Conn->Query($sql, 'CustomFieldId'); - + $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); foreach ($custom_fields as $custom_id => $custom_info) { $custom_name = $ml_formatter->LangFieldName('cust_'.$custom_id); @@ -128,7 +128,7 @@ $this->AddItemFromArray($custom_info); } } - + function GetFieldUIList($GeneralTab=FALSE) { $ret = new clsConfigAdmin(); @@ -185,9 +185,9 @@ $ElementType="",$ValueList="") { global $objItemTypes,$objSearchConfig,$objLanguages; - + //if(!is_numeric($Type)) - // { + // { $f = new clsCustomField(); $f->tablename = $this->SourceTable; $f->Set(array("Type","FieldName","FieldLabel","OnGeneralTab","Heading","Prompt", @@ -203,56 +203,56 @@ $Header = "la_text_".strtolower($Item->Get("ItemName")); $Module = $Item->Get("Module"); // $Desc = $FieldLabel; - + if(!is_object($objSearchConfig)) { $objSearchConfig = new clsSearchConfigList(); } - + $NextOrder = $objSearchConfig->GetNextDisplayOrder($Module); $desc = "lu_fieldcustom__".strtolower($FieldName); if(!strlen($FieldLabel)) { $FieldLabel = $FieldName; } - + $l = $objLanguages->GetPrimary(); $phrases = new clsPhraseList(); - $phrases->AddPhrase($desc,$l,$FieldLabel,2, $Item->Get('Module') ); - + $phrases->AddPhrase($desc,$l,$FieldLabel,2, $Item->Get('Module') ); + $dtable = GetTablePrefix()."CustomMetaData"; $Join = "($dtable.ResourceId={Table}.ResourceId)"; $objSearchConfig->AddSearchField($Table,$FieldName,$Module,$Type == 6 ? -1 : 0,0, $FieldLabel,$desc,$Header,$NextOrder,0, $ElementType, NULL, NULL, NULL, NULL, NULL, $f->Get("CustomFieldId"), NULL); - } + } return $f; //} //else // return FALSE; } - + function EditField($FieldId,$Type,$FieldName,$FieldLabel,$ShowGeneral=0,$Heading="", $Prompt="",$ElementType="",$ValueList="") { global $objSearchConfig; - + $f = $this->GetItem($FieldId); $f->Set(array("Type","FieldName","FieldLabel","OnGeneralTab","Heading","Prompt","ElementType","ValueList"), array($Type,$FieldName,$FieldLabel,$ShowGeneral,$Heading,$Prompt,$ElementType,$ValueList)); $f->Update(); - + $db =& $this->adodbConnection; - - if (!$FieldLabel) $FieldLabel = $FieldName; + + if (!$FieldLabel) $FieldLabel = $FieldName; $sql = 'UPDATE '.GetTablePrefix().'SearchConfig SET FieldType = '.$db->qstr($ElementType).', DisplayName = '.$db->qstr('lu_fieldcustom__'.strtolower($FieldName)).', FieldName = '.$db->qstr($FieldName).', Description = '.$db->qstr($FieldLabel).' WHERE CustomFieldId = '.$FieldId; $this->adodbConnection->Execute($sql); - + return $f; } @@ -271,17 +271,17 @@ if(!is_object($objSearchConfig)) { $objSearchConfig = new clsSearchConfigList($Module); - } - + } + $sql = 'DELETE FROM '.$objSearchConfig->SourceTable.' WHERE CustomFieldId = '.$FieldId; $this->adodbConnection->Execute($sql); - + $phrase_name = 'lu_fieldcustom__'.strtolower($f->Get('FieldName')); $sql = 'DELETE FROM '.GetTablePrefix().'Phrase WHERE Phrase = '.$this->adodbConnection->qstr($phrase_name); $this->adodbConnection->Execute($sql); } $f->Delete(); - } + } }/*clsCustomFieldList*/ Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js =================================================================== diff -u -r7472 -r7474 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js (.../script.js) (revision 7472) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js (.../script.js) (revision 7474) @@ -449,7 +449,7 @@ { // if url has additional params - store it and make hidden fields from it (later, below) var $additional = []; - if ($url.match('(.*)&(.*)')) { + if ($url.match('(.*?)&(.*)')) { $url = RegExp.$1; var tmp = RegExp.$2; var pairs = tmp.split('&'); Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl =================================================================== diff -u -r7355 -r7474 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 7355) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/grid_blocks.tpl (.../grid_blocks.tpl) (revision 7474) @@ -159,8 +159,8 @@ - - "> + + "> Index: branches/unlabeled/unlabeled-1.31.2/core/units/categories/categories_tag_processor.php =================================================================== diff -u -r7287 -r7474 --- branches/unlabeled/unlabeled-1.31.2/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 7287) +++ branches/unlabeled/unlabeled-1.31.2/core/units/categories/categories_tag_processor.php (.../categories_tag_processor.php) (revision 7474) @@ -30,7 +30,7 @@ function ItemIcon($params) { - // only for categories, not structure + // only for categor?ies, not structure if ($this->Prefix != 'c') { return parent::ItemIcon($params); } @@ -296,14 +296,19 @@ /** * Substitutes category in last template base on current category + * This is required becasue when you navigate catalog using AJAX, last_template is not updated + * but when you open item edit from catalog last_template is used to build opener_stack + * So, if we don't substitute m_cat_id in last_template, after saving item we'll get redirected + * to the first category we've opened, not the one we navigated to using AJAX * * @param Array $params */ function UpdateLastTemplate($params) { $category_id = $this->Application->GetVar('m_cat_id'); - list($index_file, $env) = explode('|', $this->Application->RecallVar('last_template'), 2); + $wid = $this->Application->GetVar('m_wid'); + list($index_file, $env) = explode('|', $this->Application->RecallVar(rtrim('last_template_'.$wid, '_')), 2); $this->Application->SetVar(ENV_VAR_NAME, str_replace('%5C', '\\', $env)); $this->Application->HttpQuery->processQueryString(); @@ -504,6 +509,19 @@ $params['skip_prefixes'] = implode(',', $skip_prefixes); return $this->Application->ParseBlock($params, 1); } + + function IsActive($params) + { + $cat_id = $this->Application->GetVar('c_id'); + $current_cat = $this->getObject($params); + $current_path = $current_cat->GetDBField('ParentPath'); + + static $parent_path = null; + if (!isset($parent_path)) { + $parent_path = $this->Conn->GetOne('SELECT ParentPath FROM '.TABLE_PREFIX.'Category WHERE CategoryId = '.$this->Application->GetVar('m_cat_id')); + } + return strpos($parent_path, $current_path) !== false; + } } Index: branches/unlabeled/unlabeled-1.3.2/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl =================================================================== diff -u -r6820 -r7474 --- branches/unlabeled/unlabeled-1.3.2/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl (.../item_selector_toolbar.tpl) (revision 6820) +++ branches/unlabeled/unlabeled-1.3.2/core/admin_templates/catalog/item_selector/item_selector_toolbar.tpl (.../item_selector_toolbar.tpl) (revision 7474) @@ -31,7 +31,7 @@ set_hidden_field('selected_ids[' + $prefix + ']', Grids[$Catalog.ActivePrefix].GetSelected()); - submit_event('', 'OnProcessSelected'); + submit_event('', 'OnProcessSelected'); } ) ); a_toolbar.AddButton( new ToolBarButton('cancel', '', function() { Index: branches/unlabeled/unlabeled-1.39.8/core/kernel/event_manager.php =================================================================== diff -u -r7427 -r7474 --- branches/unlabeled/unlabeled-1.39.8/core/kernel/event_manager.php (.../event_manager.php) (revision 7427) +++ branches/unlabeled/unlabeled-1.39.8/core/kernel/event_manager.php (.../event_manager.php) (revision 7474) @@ -218,7 +218,6 @@ } $this->popEvent(); - return true; } @@ -381,9 +380,9 @@ * @param Array $params * @param string $pass */ - function openerStackPush($t, $params, $pass = 'all') + function openerStackPush($t, $params, $pass = 'all', $wid=null) { - $wid = $this->Application->GetVar('m_wid'); + if (!isset($wid)) $wid = $this->Application->GetVar('m_wid'); $stack_name = rtrim('opener_stack_'.$wid, '_'); $opener_stack = $this->Application->RecallVar($stack_name); Index: branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl =================================================================== diff -u -r7355 -r7474 --- branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 7355) +++ branches/unlabeled/unlabeled-1.4.2/core/admin_templates/incs/form_blocks.tpl (.../form_blocks.tpl) (revision 7474) @@ -87,6 +87,7 @@ + " id="" value=""> Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/style.css =================================================================== diff -u -r7283 -r7474 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/style.css (.../style.css) (revision 7283) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/incs/style.css (.../style.css) (revision 7474) @@ -26,6 +26,7 @@ scrollbar-face-color: #009ffd; overflow-x: auto; overflow-y: auto; height: 100%; + margin: 0px 0px 0px 8px } A { Index: branches/unlabeled/unlabeled-1.12.2/kernel/include/custommetadata.php =================================================================== diff -u -r5549 -r7474 --- branches/unlabeled/unlabeled-1.12.2/kernel/include/custommetadata.php (.../custommetadata.php) (revision 5549) +++ branches/unlabeled/unlabeled-1.12.2/kernel/include/custommetadata.php (.../custommetadata.php) (revision 7474) @@ -1,6 +1,6 @@ classname = 'clsCustomMetaData'; } - + function LoadResource($ResourceId) { // TO REMOVE } - + function DeleteResource($ResourceId, $main_prefix) { if (!$ResourceId) return false; - + $custom_table = $this->Application->getUnitOption($main_prefix.'-cdata', 'TableName'); $sql = 'DELETE FROM '.$custom_table.' WHERE ResourceId = '.$ResourceId; $this->adodbConnection->Execute($sql); } - + function CopyResource($OldId,$NewId, $main_prefix) { $custom_data =& $this->Application->recallObject($main_prefix.'-cdata.-item', null, Array('skip_autoload' => true)); $custom_data->Load($OldId, 'ResourceId'); - + if ($custom_data->isLoaded()) { $custom_data->SetDBField('ResourceId', $NewId); $custom_data->Create(); } } - + function &SetFieldValue($FieldId,$ResourceId,$Value) { // so strange construction used, because in normal // way it doesn't work at all (gets item copy not // pointer) $index = $this->GetDataItem($FieldId, true); - + if($index !== false) { $d =& $this->Items[$index]; @@ -70,7 +70,7 @@ { $d = null; } - + if(is_object($d)) { $d->Set('Value', $Value); @@ -83,7 +83,7 @@ $this->Items[$x]->Set("CustomFieldId",0); break; } - } + } $d->Delete(true); } } @@ -108,49 +108,58 @@ { $d =& $this->GetItemRefByIndex($i); if($d->Get("CustomFieldId")==$id) - { + { $found=TRUE; break; - } + } } return $found ? ($return_index ? $i : $d) : false; } - function SaveData($main_prefix, $resource_id) - { - // to call OnAfterConfigRead event - $item_table = $this->Application->getUnitOption($main_prefix, 'TableName'); - - $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); - $custom_data =& $this->Application->recallObject($main_prefix.'-cdata', null, Array('skip_autoload' => true)); - $custom_data->Load($resource_id, 'ResourceId'); - - foreach($this->Items as $f) { - $custom_id = $f->Get('CustomFieldId'); - $value = isset($GLOBALS['_CopyFromEditTable']) ? $f->Get('Value') : stripslashes($f->Get('Value')); - - $custom_name = $ml_formatter->LangFieldName('cust_'.$custom_id); - $custom_data->SetDBField($custom_name, $value); - } - - $custom_data->SetDBField('ResourceId', $resource_id); - return $custom_data->isLoaded() ? $custom_data->Update() : $custom_data->Create(); - } + function SaveData($main_prefix, $resource_id) + { + // to call OnAfterConfigRead event + $item_table = $this->Application->getUnitOption($main_prefix, 'TableName'); + $ml_formatter =& $this->Application->recallObject('kMultiLanguage'); + $custom_data =& $this->Application->recallObject($main_prefix.'-cdata', null, Array('skip_autoload' => true)); + $custom_data->Load($resource_id, 'ResourceId'); + + foreach($this->Items as $f) { + $custom_id = $f->Get('CustomFieldId'); + $value = isset($GLOBALS['_CopyFromEditTable']) ? $f->Get('Value') : stripslashes($f->Get('Value')); + + $custom_name = $ml_formatter->LangFieldName('cust_'.$custom_id); + $custom_data->SetDBField($custom_name, $value); + } + + $custom_data->SetDBField('ResourceId', $resource_id); + return $custom_data->isLoaded() ? $custom_data->Update() : $custom_data->Create(); + } + function &getTempHandler($prefix) { if (strlen($prefix) > 2 || strlen($prefix) == 0) { // not e.g. bb, c, u, but CustomFieldId :) or empty at all $this->Application->reportError(get_class($this), 'CopyToEditTable'); } - + $temp_handler =& $this->Application->recallObject($prefix.'-cdata_TempHandler', 'kTempTablesHandler'); return $temp_handler; } - + function CopyToEditTable($main_prefix, $idlist) { $temp_handler =& $this->getTempHandler($main_prefix); + $tables = $temp_handler->Tables; + $parent_prefix = $this->Application->getUnitOption($main_prefix.'-cdata', 'ParentPrefix'); + if ($parent_prefix) { + $tables['ForeignKey'] = $this->Application->getUnitOption($main_prefix.'-cdata', 'ForeignKey'); + $tables['ParentPrefix'] = $parent_prefix; + $tables['ParentTableKey'] = $this->Application->getUnitOption($main_prefix.'-cdata', 'ParentTableKey'); + } + $temp_handler->Tables = $tables; + $temp_handler->DoCopyLiveToTemp($temp_handler->Tables, $idlist); } @@ -165,9 +174,9 @@ $temp_handler =& $this->getTempHandler($main_prefix); $temp_handler->CancelEdit(); } - + function CreateEmptyEditTable($main_prefix) - { + { $temp_handler =& $this->getTempHandler($main_prefix); $temp_handler->DoCopyLiveToTemp($temp_handler->Tables, Array(0)); } Index: branches/unlabeled/unlabeled-1.52.4/core/kernel/session/session.php =================================================================== diff -u -r7092 -r7474 --- branches/unlabeled/unlabeled-1.52.4/core/kernel/session/session.php (.../session.php) (revision 7092) +++ branches/unlabeled/unlabeled-1.52.4/core/kernel/session/session.php (.../session.php) (revision 7474) @@ -507,7 +507,7 @@ { setcookie($name, $value, $expires, $this->CookiePath, $this->CookieDomain, $this->CookieSecure); } - + function Check() { // we should check referer if cookies are disabled, and in combined mode @@ -731,7 +731,8 @@ } } $this->Application->Debugger->dumpVars($session_data); - + } + if ($this->Application->isDebugMode() && constOn('DBG_SHOW_PERSISTENTDATA')) { // dump persistent session data if ($this->Storage->PersistentVars) { $this->Application->Debugger->appendHTML('Persistant Session:'); @@ -744,10 +745,6 @@ } $this->Application->Debugger->dumpVars($session_data); } - -// to insert after HTTPQuery if it's visible -// $new_row = constOn('DBG_SHOW_HTTPQUERY') ? 4 : 2; -// $debugger->moveAfterRow($new_row,2); } } @@ -765,15 +762,15 @@ { // save last_template $wid = $this->Application->GetVar('m_wid'); - + $last_env = $this->getLastTemplateENV($t, Array('m_opener' => 'u')); $last_template = basename($_SERVER['PHP_SELF']).'|'.substr($last_env, strlen(ENV_VAR_NAME) + 1); $this->StoreVar(rtrim('last_template_'.$wid, '_'), $last_template); - + $last_env = $this->getLastTemplateENV($t, Array()); $last_template = basename($_SERVER['PHP_SELF']).'|'.substr($last_env, strlen(ENV_VAR_NAME) + 1); $this->StoreVar(rtrim('last_template_popup_'.$wid, '_'), $last_template); - + // save other last... variables for mistical purposes (customizations may be) $this->StoreVar('last_url', $_SERVER['REQUEST_URI']); // needed by ord:StoreContinueShoppingLink $this->StoreVar('last_env', substr($last_env, strlen(ENV_VAR_NAME)+1)); @@ -784,7 +781,7 @@ $params['__URLENCODE__'] = 1; return $this->Application->BuildEnv($t, $params, 'all'); } - + function StoreVar($name, $value) { $this->Data->Set($name, $value); Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/footer.tpl =================================================================== diff -u -r7101 -r7474 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/footer.tpl (.../footer.tpl) (revision 7101) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/incs/footer.tpl (.../footer.tpl) (revision 7474) @@ -23,6 +23,7 @@ el.style.height = h; // el.style.width=w; } + @@ -37,6 +38,5 @@

- \ No newline at end of file Index: branches/unlabeled/unlabeled-1.1.2/kernel/include/globals.php =================================================================== diff -u -r6988 -r7474 --- branches/unlabeled/unlabeled-1.1.2/kernel/include/globals.php (.../globals.php) (revision 6988) +++ branches/unlabeled/unlabeled-1.1.2/kernel/include/globals.php (.../globals.php) (revision 7474) @@ -1961,31 +1961,31 @@ */ function saveCustomFields($prefix, $resource_id, $item_type) { - $objCustomEdit = new clsCustomDataList(); + $objCustomEdit = new clsCustomDataList(); $CustomFields = new clsCustomFieldList($item_type); - $data_changed = false; - for ($i = 0; $i < $CustomFields->NumItems(); $i++) { + $data_changed = false; + for ($i = 0; $i < $CustomFields->NumItems(); $i++) { $objField =& $CustomFields->GetItemRefByIndex($i); $field_name = $objField->Get('FieldName'); $element_type = $objField->Get('ElementType'); - + $value = getCustomValue($field_name); if ($element_type == 'checkbox' && $value === false) { // unchecked checkboxes are not submitted $value = 0; } - + if ($value !== false) { $objCustomEdit->SetFieldValue($objField->Get('CustomFieldId'), $resource_id, $value); $data_changed = true; } } - if ($data_changed) { - $objCustomEdit->SaveData($prefix, $resource_id); - } + if ($data_changed) { + $objCustomEdit->SaveData($prefix, $resource_id); + } } /** @@ -2004,7 +2004,7 @@ } return GetVar($field_name); } - + function checkActionPermission($action_mapping, $action, $system = 0) { $application =& kApplication::Instance(); Index: branches/unlabeled/unlabeled-1.9.2/kernel/units/relationship/relationship_event_handler.php =================================================================== diff -u -r7018 -r7474 --- branches/unlabeled/unlabeled-1.9.2/kernel/units/relationship/relationship_event_handler.php (.../relationship_event_handler.php) (revision 7018) +++ branches/unlabeled/unlabeled-1.9.2/kernel/units/relationship/relationship_event_handler.php (.../relationship_event_handler.php) (revision 7474) @@ -65,7 +65,7 @@ $sql = 'SELECT ResourceId FROM '.$this->Application->getUnitOption($target_prefix, 'TableName').' - WHERE '.$this->Application->getUnitOption($target_prefix, 'IDField').' = '.$target_id; + WHERE '.$this->Application->getUnitOption($target_prefix, 'IDField').' IN ('.$target_id.')'; $target_id = $this->Conn->GetOne($sql); $target_type = $this->Application->getUnitOption($target_prefix, 'ItemType'); @@ -82,10 +82,10 @@ // place correct template in opener stack $source_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix'); $template = $this->Application->getUnitOption($source_prefix, 'AdminTemplatePath').'/relations_edit'; - + $redirect_params = Array($event->Prefix.'_event' => 'OnNew', 'target_id' => $target_id, 'm_opener' => 's', 'target_type' => $target_type); $this->Application->EventManager->openerStackPush($template, $redirect_params, 'all,'.$event->Prefix); - + // $event->SetRedirectParam('popup_stay', 1); // if popup mode, then set this } } @@ -236,7 +236,7 @@ $prefix = 'c'; } if (!$this->Application->prefixRegistred($prefix)) continue; - + $configs[$prefix] = $this->Application->getUnitOptions($prefix); if($configs[$prefix] === false) unset($configs[$prefix]); if(!isset($configs[$prefix]['CatalogItem']) || !$configs[$prefix]['CatalogItem']) unset($configs[$prefix]); Index: branches/unlabeled/unlabeled-1.9.2/core/units/relationship/relationship_event_handler.php =================================================================== diff -u -r7018 -r7474 --- branches/unlabeled/unlabeled-1.9.2/core/units/relationship/relationship_event_handler.php (.../relationship_event_handler.php) (revision 7018) +++ branches/unlabeled/unlabeled-1.9.2/core/units/relationship/relationship_event_handler.php (.../relationship_event_handler.php) (revision 7474) @@ -65,7 +65,7 @@ $sql = 'SELECT ResourceId FROM '.$this->Application->getUnitOption($target_prefix, 'TableName').' - WHERE '.$this->Application->getUnitOption($target_prefix, 'IDField').' = '.$target_id; + WHERE '.$this->Application->getUnitOption($target_prefix, 'IDField').' IN ('.$target_id.')'; $target_id = $this->Conn->GetOne($sql); $target_type = $this->Application->getUnitOption($target_prefix, 'ItemType'); @@ -82,10 +82,10 @@ // place correct template in opener stack $source_prefix = $this->Application->getUnitOption($event->Prefix, 'ParentPrefix'); $template = $this->Application->getUnitOption($source_prefix, 'AdminTemplatePath').'/relations_edit'; - + $redirect_params = Array($event->Prefix.'_event' => 'OnNew', 'target_id' => $target_id, 'm_opener' => 's', 'target_type' => $target_type); $this->Application->EventManager->openerStackPush($template, $redirect_params, 'all,'.$event->Prefix); - + // $event->SetRedirectParam('popup_stay', 1); // if popup mode, then set this } } @@ -236,7 +236,7 @@ $prefix = 'c'; } if (!$this->Application->prefixRegistred($prefix)) continue; - + $configs[$prefix] = $this->Application->getUnitOptions($prefix); if($configs[$prefix] === false) unset($configs[$prefix]); if(!isset($configs[$prefix]['CatalogItem']) || !$configs[$prefix]['CatalogItem']) unset($configs[$prefix]); Index: branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_4_0.txt =================================================================== diff -u -r7358 -r7474 --- branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_4_0.txt (.../changelog_1_4_0.txt) (revision 7358) +++ branches/unlabeled/unlabeled-1.1.2/admin/install/upgrades/changelog_1_4_0.txt (.../changelog_1_4_0.txt) (revision 7474) @@ -25,7 +25,7 @@ File in-portal/admin/install/prerequisit_errors.php changed File in-portal/admin/install/upgrade_errors.php changed File in-portal/admin/install/upgrades/changelog_1_3_0.txt changed -File in-portal/admin/install/upgrades/changelog_1_4_0.txt is new; release_1_4_0 revision 1.1.2.7 +File in-portal/admin/install/upgrades/changelog_1_4_0.txt is new; release_1_4_0 revision 1.1.2.8 File in-portal/admin/install/upgrades/inportal_upgrade_v1.3.2.sql is new; release_1_4_0 revision 1.1.2.2 File in-portal/admin/install/upgrades/inportal_upgrade_v1.4.0.sql is new; release_1_4_0 revision 1.1.2.1 File in-portal/admin/users/adduser.php changed @@ -147,7 +147,8 @@ File in-portal/kernel/admin_templates/xml/tree_categories.tpl changed File in-portal/kernel/include/compat.php is new; release_1_4_0 revision 1.1.2.2 File in-portal/kernel/include/customfield.php changed -File in-portal/kernel/include/globals.php is new; release_1_4_0 revision 1.1.2.2 +File in-portal/kernel/include/custommetadata.php changed +File in-portal/kernel/include/globals.php is new; release_1_4_0 revision 1.1.2.3 File in-portal/kernel/include/item.php changed File in-portal/kernel/include/modules.php changed File in-portal/kernel/include/obscure.php is new; release_1_4_0 revision 1.1.2.2 @@ -291,6 +292,7 @@ File kernel4_dev/kernel4/db/dblist.php changed File kernel4_dev/kernel4/fonts/monofont.ttf is new; release_1_4_0 revision 1.1.2.1 File kernel4_dev/kernel4/fonts/monofont_read_me.txt is new; release_1_4_0 revision 1.1.2.1 +File kernel4_dev/kernel4/languages/phrases_cache.php changed File kernel4_dev/kernel4/parser/tags.php changed File kernel4_dev/kernel4/parser/template.php changed File kernel4_dev/kernel4/parser/template_parser.php changed @@ -299,12 +301,14 @@ File kernel4_dev/kernel4/session/session.php changed File kernel4_dev/kernel4/utility/debugger.php changed File kernel4_dev/kernel4/utility/event.php changed +File kernel4_dev/kernel4/utility/http_query.php changed File kernel4_dev/kernel4/utility/temp_handler.php changed File kernel4_dev/kernel4/utility/unit_config_reader.php changed File kernel4_dev/kernel4/utility/debugger/debugger.css changed File kernel4_dev/kernel4/utility/debugger/debugger.js changed File kernel4_dev/kernel4/utility/debugger/debugger_responce.php changed File kernel4_dev/kernel4/utility/formatters/formatter.php changed +File kernel4_dev/kernel4/utility/formatters/multilang_formatter.php changed File kernel4_dev/kernel4/utility/formatters/password_formatter.php changed File kernel.X/core/admin_templates/dummy is new; release_1_4_0 revision 1.1 File kernel.X/core/admin_templates/head.tpl is new; release_1_4_0 revision 1.2.2.3 @@ -313,13 +317,13 @@ File kernel.X/core/admin_templates/logout.tpl is new; release_1_4_0 revision 1.1 File kernel.X/core/admin_templates/no_permission.tpl is new; release_1_4_0 revision 1.1.2.2 File kernel.X/core/admin_templates/sections_list.tpl is new; release_1_4_0 revision 1.2.2.4 -File kernel.X/core/admin_templates/tree.tpl is new; release_1_4_0 revision 1.2.2.4 +File kernel.X/core/admin_templates/tree.tpl is new; release_1_4_0 revision 1.2.2.5 File kernel.X/core/admin_templates/ajax/popup_manager.tpl is new; release_1_4_0 revision 1.1.2.1 -File kernel.X/core/admin_templates/config/config_email.tpl is new; release_1_4_0 revision 1.1.2.3 +File kernel.X/core/admin_templates/config/config_email.tpl is new; release_1_4_0 revision 1.1.2.4 File kernel.X/core/admin_templates/config/config_general.tpl is new; release_1_4_0 revision 1.1.2.1 File kernel.X/core/admin_templates/config/config_search.tpl is new; release_1_4_0 revision 1.1.2.1 File kernel.X/core/admin_templates/config/config_search_edit.tpl is new; release_1_4_0 revision 1.1.2.1 -File kernel.X/core/admin_templates/config/config_universal.tpl is new; release_1_4_0 revision 1.1.2.2 +File kernel.X/core/admin_templates/config/config_universal.tpl is new; release_1_4_0 revision 1.1.2.3 File kernel.X/core/admin_templates/custom_fields/custom_fields_edit.tpl is new; release_1_4_0 revision 1.1.2.2 File kernel.X/core/admin_templates/custom_fields/custom_fields_list.tpl is new; release_1_4_0 revision 1.1.2.1 File kernel.X/core/admin_templates/img/ajax_progress.gif is new; release_1_4_0 revision 1.1 @@ -371,6 +375,7 @@ File kernel.X/core/admin_templates/img/icons/icon24_help.gif is new; release_1_4_0 revision 1.1.2.1 File kernel.X/core/admin_templates/img/icons/icon24_link_editor.gif is new; release_1_4_0 revision 1.1 File kernel.X/core/admin_templates/img/icons/icon24_lock_login.gif is new; release_1_4_0 revision 1.1 +File kernel.X/core/admin_templates/img/icons/icon24_modules.gif is new; release_1_4_0 revision 1.1.2.1 File kernel.X/core/admin_templates/img/icons/icon24_site.gif is new; release_1_4_0 revision 1.1 File kernel.X/core/admin_templates/img/icons/icon24_translate.gif is new; release_1_4_0 revision 1.1 File kernel.X/core/admin_templates/img/icons/icon46_conf.gif is new; release_1_4_0 revision 1.1 @@ -380,6 +385,8 @@ File kernel.X/core/admin_templates/img/icons/icon46_list_conf.gif is new; release_1_4_0 revision 1.1 File kernel.X/core/admin_templates/img/icons/icon46_list_conf_general.gif is new; release_1_4_0 revision 1.1 File kernel.X/core/admin_templates/img/icons/icon46_list_conf_regional.gif is new; release_1_4_0 revision 1.1 +File kernel.X/core/admin_templates/img/icons/icon46_list_modules.gif is new; release_1_4_0 revision 1.1.2.1 +File kernel.X/core/admin_templates/img/icons/icon46_modules.gif is new; release_1_4_0 revision 1.1.2.1 File kernel.X/core/admin_templates/img/icons/icon46_settings_general.gif is new; release_1_4_0 revision 1.1 File kernel.X/core/admin_templates/img/icons/icon46_site.gif is new; release_1_4_0 revision 1.1 File kernel.X/core/admin_templates/img/icons/icon_left.gif is new; release_1_4_0 revision 1.1.2.1 @@ -593,6 +600,9 @@ File kernel.X/core/admin_templates/img/toolbar/tool_refresh_f2.gif is new; release_1_4_0 revision 1.1.2.1 File kernel.X/core/admin_templates/img/toolbar/tool_refresh_f3.gif is new; release_1_4_0 revision 1.1.2.1 File kernel.X/core/admin_templates/img/toolbar/tool_reset.gif is new; release_1_4_0 revision 1.1.2.2 +File kernel.X/core/admin_templates/img/toolbar/tool_reset_edit.gif is new; release_1_4_0 revision 1.1.2.1 +File kernel.X/core/admin_templates/img/toolbar/tool_reset_edit_f2.gif is new; release_1_4_0 revision 1.1.2.1 +File kernel.X/core/admin_templates/img/toolbar/tool_reset_edit_f3.gif is new; release_1_4_0 revision 1.1.2.1 File kernel.X/core/admin_templates/img/toolbar/tool_reset_f2.gif is new; release_1_4_0 revision 1.1.2.2 File kernel.X/core/admin_templates/img/toolbar/tool_reset_f3.gif is new; release_1_4_0 revision 1.1.2.2 File kernel.X/core/admin_templates/img/toolbar/tool_reset_to_base.gif is new; release_1_4_0 revision 1.1.2.1 @@ -652,35 +662,36 @@ File kernel.X/core/admin_templates/incs/blocks.tpl is new; release_1_4_0 revision 1.1.2.4 File kernel.X/core/admin_templates/incs/close_popup.tpl is new; release_1_4_0 revision 1.1.2.7 File kernel.X/core/admin_templates/incs/config_blocks.tpl is new; release_1_4_0 revision 1.1 -File kernel.X/core/admin_templates/incs/footer.tpl is new; release_1_4_0 revision 1.1.2.6 -File kernel.X/core/admin_templates/incs/form_blocks.tpl is new; release_1_4_0 revision 1.4.2.9 +File kernel.X/core/admin_templates/incs/footer.tpl is new; release_1_4_0 revision 1.1.2.7 +File kernel.X/core/admin_templates/incs/form_blocks.tpl is new; release_1_4_0 revision 1.4.2.10 File kernel.X/core/admin_templates/incs/fw_menu.js is new; release_1_4_0 revision 1.1 -File kernel.X/core/admin_templates/incs/grid_blocks.tpl is new; release_1_4_0 revision 1.1.2.14 -File kernel.X/core/admin_templates/incs/header.tpl is new; release_1_4_0 revision 1.1.2.8 +File kernel.X/core/admin_templates/incs/grid_blocks.tpl is new; release_1_4_0 revision 1.1.2.15 +File kernel.X/core/admin_templates/incs/header.tpl is new; release_1_4_0 revision 1.1.2.9 File kernel.X/core/admin_templates/incs/in-portal.tpl is new; release_1_4_0 revision 1.1 File kernel.X/core/admin_templates/incs/menu_blocks.tpl is new; release_1_4_0 revision 1.1.2.5 File kernel.X/core/admin_templates/incs/nlsmenu.css is new; release_1_4_0 revision 1.1.2.1 File kernel.X/core/admin_templates/incs/sections_list.css is new; release_1_4_0 revision 1.1.2.1 -File kernel.X/core/admin_templates/incs/style.css is new; release_1_4_0 revision 1.2.2.9 +File kernel.X/core/admin_templates/incs/style.css is new; release_1_4_0 revision 1.2.2.10 File kernel.X/core/admin_templates/incs/tab_blocks.tpl is new; release_1_4_0 revision 1.2.2.2 File kernel.X/core/admin_templates/js/ajax.js is new; release_1_4_0 revision 1.1.2.6 File kernel.X/core/admin_templates/js/calendar.js is new; release_1_4_0 revision 1.1.2.3 File kernel.X/core/admin_templates/js/grid.js is new; release_1_4_0 revision 1.1.2.3 -File kernel.X/core/admin_templates/js/grid_scroller.js is new; release_1_4_0 revision 1.1.2.14 +File kernel.X/core/admin_templates/js/grid_scroller.js is new; release_1_4_0 revision 1.1.2.15 File kernel.X/core/admin_templates/js/in-portal.js is new; release_1_4_0 revision 1.1 -File kernel.X/core/admin_templates/js/inp_fckconfig.js is new; release_1_4_0 revision 1.1.2.1 +File kernel.X/core/admin_templates/js/inp_fckconfig.js is new; release_1_4_0 revision 1.1.2.2 File kernel.X/core/admin_templates/js/inp_styles.xml is new; release_1_4_0 revision 1.1.2.1 File kernel.X/core/admin_templates/js/is.js is new; release_1_4_0 revision 1.1 -File kernel.X/core/admin_templates/js/nlsmenu.js is new; release_1_4_0 revision 1.1.2.3 +File kernel.X/core/admin_templates/js/nlsmenu.js is new; release_1_4_0 revision 1.1.2.4 File kernel.X/core/admin_templates/js/nlsmenueffect_1_2_1.js is new; release_1_4_0 revision 1.1.2.1 -File kernel.X/core/admin_templates/js/script.js is new; release_1_4_0 revision 1.2.2.18 +File kernel.X/core/admin_templates/js/script.js is new; release_1_4_0 revision 1.2.2.23 File kernel.X/core/admin_templates/js/toolbar.js is new; release_1_4_0 revision 1.3.2.7 -File kernel.X/core/admin_templates/js/tree.js is new; release_1_4_0 revision 1.1.2.3 +File kernel.X/core/admin_templates/js/tree.js is new; release_1_4_0 revision 1.1.2.6 File kernel.X/core/admin_templates/js/calendar/calendar-blue.css is new; release_1_4_0 revision 1.1.2.1 File kernel.X/core/admin_templates/js/calendar/calendar-en.js is new; release_1_4_0 revision 1.1.2.2 File kernel.X/core/admin_templates/js/calendar/calendar-setup.js is new; release_1_4_0 revision 1.1.2.2 File kernel.X/core/admin_templates/js/calendar/calendar.js is new; release_1_4_0 revision 1.1.2.1 -File kernel.X/core/admin_templates/popups/column_picker.tpl is new; release_1_4_0 revision 1.1.2.7 +File kernel.X/core/admin_templates/modules/modules_list.tpl is new; release_1_4_0 revision 1.1.2.1 +File kernel.X/core/admin_templates/popups/column_picker.tpl is new; release_1_4_0 revision 1.1.2.8 File kernel.X/core/admin_templates/popups/editor.tpl is new; release_1_4_0 revision 1.1.2.2 File kernel.X/core/admin_templates/popups/translator.tpl is new; release_1_4_0 revision 1.1.2.3 File kernel.X/core/admin_templates/regional/email_messages_edit.tpl is new; release_1_4_0 revision 1.1.2.3 @@ -693,17 +704,17 @@ File kernel.X/core/admin_templates/regional/languages_import.tpl is new; release_1_4_0 revision 1.1.2.2 File kernel.X/core/admin_templates/regional/languages_import_step2.tpl is new; release_1_4_0 revision 1.1.2.2 File kernel.X/core/admin_templates/regional/languages_list.tpl is new; release_1_4_0 revision 1.1.2.3 -File kernel.X/core/admin_templates/regional/phrases_edit.tpl is new; release_1_4_0 revision 1.1.2.5 +File kernel.X/core/admin_templates/regional/phrases_edit.tpl is new; release_1_4_0 revision 1.1.2.6 File kernel.X/core/admin_templates/tools/system_tools.tpl is new; release_1_4_0 revision 1.1.2.2 File kernel.X/core/units/dummy is new; release_1_4_0 revision 1.1 -File kernel.X/core/units/admin/admin_config.php is new; release_1_4_0 revision 1.20.2.5 -File kernel.X/core/units/admin/admin_events_handler.php is new; release_1_4_0 revision 1.4.2.5 -File kernel.X/core/units/admin/admin_tag_processor.php is new; release_1_4_0 revision 1.27.2.16 -File kernel.X/core/units/categories/cache_updater.php is new; release_1_4_0 revision 1.8.2.3 +File kernel.X/core/units/admin/admin_config.php is new; release_1_4_0 revision 1.20.2.6 +File kernel.X/core/units/admin/admin_events_handler.php is new; release_1_4_0 revision 1.4.2.6 +File kernel.X/core/units/admin/admin_tag_processor.php is new; release_1_4_0 revision 1.27.2.17 +File kernel.X/core/units/categories/cache_updater.php is new; release_1_4_0 revision 1.8.2.5 File kernel.X/core/units/categories/categories_config.php is new; release_1_4_0 revision 1.54 -File kernel.X/core/units/categories/categories_event_handler.php is new; release_1_4_0 revision 1.25.2.12 -File kernel.X/core/units/categories/categories_item.php is new; release_1_4_0 revision 1.10.2.4 -File kernel.X/core/units/categories/categories_tag_processor.php is new; release_1_4_0 revision 1.31.2.4 +File kernel.X/core/units/categories/categories_event_handler.php is new; release_1_4_0 revision 1.25.2.14 +File kernel.X/core/units/categories/categories_item.php is new; release_1_4_0 revision 1.10.2.5 +File kernel.X/core/units/categories/categories_tag_processor.php is new; release_1_4_0 revision 1.31.2.5 File kernel.X/core/units/category_items/category_items_config.php is new; release_1_4_0 revision 1.12 File kernel.X/core/units/category_items/category_items_dbitem.php is new; release_1_4_0 revision 1.4 File kernel.X/core/units/category_items/category_items_event_handler.php is new; release_1_4_0 revision 1.9.2.1 @@ -714,10 +725,10 @@ File kernel.X/core/units/configuration/configuration_tag_processor.php is new; release_1_4_0 revision 1.14 File kernel.X/core/units/custom_data/custom_data_event_handler.php changed File kernel.X/core/units/custom_fields/custom_fields_event_handler.php changed -File kernel.X/core/units/email_events/email_events_config.php is new; release_1_4_0 revision 1.6 +File kernel.X/core/units/email_events/email_events_config.php is new; release_1_4_0 revision 1.6.2.1 File kernel.X/core/units/email_events/email_events_event_handler.php is new; release_1_4_0 revision 1.28.2.1 -File kernel.X/core/units/email_messages/email_messages_config.php is new; release_1_4_0 revision 1.2 -File kernel.X/core/units/email_messages/email_messages_event_handler.php is new; release_1_4_0 revision 1.5 +File kernel.X/core/units/email_messages/email_messages_config.php is new; release_1_4_0 revision 1.2.52.1 +File kernel.X/core/units/email_messages/email_messages_event_handler.php is new; release_1_4_0 revision 1.5.2.1 File kernel.X/core/units/general/brackets.php is new; release_1_4_0 revision 1.4 File kernel.X/core/units/general/cat_dbitem.php is new; release_1_4_0 revision 1.34.2.2 File kernel.X/core/units/general/cat_dbitem_export.php is new; release_1_4_0 revision 1.22.2.1 @@ -736,9 +747,9 @@ File kernel.X/core/units/general/helpers/col_picker_helper.php is new; release_1_4_0 revision 1.1.2.3 File kernel.X/core/units/general/helpers/filenames_helper.php is new; release_1_4_0 revision 1.3 File kernel.X/core/units/general/helpers/helpers_config.php is new; release_1_4_0 revision 1.3.2.3 -File kernel.X/core/units/general/helpers/mod_rewrite_helper.php is new; release_1_4_0 revision 1.7.2.1 +File kernel.X/core/units/general/helpers/mod_rewrite_helper.php is new; release_1_4_0 revision 1.7.2.2 File kernel.X/core/units/general/helpers/modules.php is new; release_1_4_0 revision 1.6.2.2 -File kernel.X/core/units/general/helpers/multilanguage.php is new; release_1_4_0 revision 1.8.2.2 +File kernel.X/core/units/general/helpers/multilanguage.php is new; release_1_4_0 revision 1.8.2.3 File kernel.X/core/units/general/helpers/permissions_helper.php is new; release_1_4_0 revision 1.20.2.3 File kernel.X/core/units/general/helpers/recursive_helper.php is new; release_1_4_0 revision 1.3.2.3 File kernel.X/core/units/general/helpers/search_helper.php is new; release_1_4_0 revision 1.4.2.6 @@ -748,10 +759,12 @@ File kernel.X/core/units/groups/groups_event_handler.php is new; release_1_4_0 revision 1.2 File kernel.X/core/units/groups/groups_item.php is new; release_1_4_0 revision 1.1 File kernel.X/core/units/languages/import_xml.php is new; release_1_4_0 revision 1.22.2.1 -File kernel.X/core/units/languages/languages_config.php is new; release_1_4_0 revision 1.19.2.2 -File kernel.X/core/units/languages/languages_event_handler.php is new; release_1_4_0 revision 1.28.2.1 +File kernel.X/core/units/languages/languages_config.php is new; release_1_4_0 revision 1.19.2.3 +File kernel.X/core/units/languages/languages_event_handler.php is new; release_1_4_0 revision 1.28.2.3 File kernel.X/core/units/languages/languages_item.php is new; release_1_4_0 revision 1.8.2.1 -File kernel.X/core/units/languages/languages_tag_processor.php is new; release_1_4_0 revision 1.7.2.3 +File kernel.X/core/units/languages/languages_tag_processor.php is new; release_1_4_0 revision 1.7.2.7 +File kernel.X/core/units/modules/modules_config.php changed +File kernel.X/core/units/modules/modules_event_handler.php changed File kernel.X/core/units/permissions/permissions_event_handler.php changed File kernel.X/core/units/permissions/permissions_tag_processor.php changed File kernel.X/core/units/phrases/phrases_config.php is new; release_1_4_0 revision 1.9.2.3 @@ -760,15 +773,16 @@ File kernel.X/core/units/themes/themes_tag_processor.php is new; release_1_4_0 revision 1.7 File kernel.X/core/units/translator/translator_config.php is new; release_1_4_0 revision 1.4 File kernel.X/core/units/translator/translator_event_handler.php is new; release_1_4_0 revision 1.9 -File kernel.X/core/units/user_groups/user_groups_config.php is new; release_1_4_0 revision 1.3 -File kernel.X/core/units/users/users_config.php is new; release_1_4_0 revision 1.32.2.2 -File kernel.X/core/units/users/users_event_handler.php is new; release_1_4_0 revision 1.68.2.8 +File kernel.X/core/units/user_groups/user_groups_config.php is new; release_1_4_0 revision 1.3.2.1 +File kernel.X/core/units/user_groups/user_groups_dbitem.php is new; release_1_4_0 revision 1.1.4.1 +File kernel.X/core/units/users/users_config.php is new; release_1_4_0 revision 1.32.2.3 +File kernel.X/core/units/users/users_event_handler.php is new; release_1_4_0 revision 1.68.2.13 File kernel.X/core/units/users/users_item.php is new; release_1_4_0 revision 1.13 File kernel.X/core/units/users/users_syncronize.php is new; release_1_4_0 revision 1.4 File kernel.X/core/units/users/users_tag_processor.php is new; release_1_4_0 revision 1.14.2.2 File kernel.X/core/install/english.lang is new; release_1_4_0 revision 1.1 -File kernel.X/core/install/install_data.sql is new; release_1_4_0 revision 1.3.2.4 -File kernel.X/core/install/install_schema.sql is new; release_1_4_0 revision 1.3.2.7 +File kernel.X/core/install/install_data.sql is new; release_1_4_0 revision 1.3.2.5 +File kernel.X/core/install/install_schema.sql is new; release_1_4_0 revision 1.3.2.8 File kernel.X/core/install/steps_db.xml is new; release_1_4_0 revision 1.2 File kernel.X/core/install/incs/install.tpl is new; release_1_4_0 revision 1.2 File kernel.X/core/install/incs/script.js is new; release_1_4_0 revision 1.1 @@ -796,8 +810,18 @@ File kernel.X/core/install/step_templates/finish.tpl is new; release_1_4_0 revision 1.1 File kernel.X/core/install/step_templates/install_setup.tpl is new; release_1_4_0 revision 1.1 File kernel.X/core/install/step_templates/root_password.tpl is new; release_1_4_0 revision 1.1 +File cmseditor/editor/dialog/fck_document.html changed +File cmseditor/editor/dialog/fck_document/audio.gif is new; release_1_4_0 revision 1.1.2.1 +File cmseditor/editor/dialog/fck_document/doc.gif is new; release_1_4_0 revision 1.1.2.1 +File cmseditor/editor/dialog/fck_document/excel.gif is new; release_1_4_0 revision 1.1.2.1 +File cmseditor/editor/dialog/fck_document/image.gif is new; release_1_4_0 revision 1.1.2.1 +File cmseditor/editor/dialog/fck_document/pdf.gif is new; release_1_4_0 revision 1.1.2.1 +File cmseditor/editor/dialog/fck_document/ppt.gif is new; release_1_4_0 revision 1.1.2.1 +File cmseditor/editor/dialog/fck_document/video.gif is new; release_1_4_0 revision 1.1.2.1 +File cmseditor/editor/dialog/fck_document/xml.gif is new; release_1_4_0 revision 1.1.2.1 File cmseditor/editor/filemanager/browser/default/frmresourceslist.html changed File cmseditor/editor/filemanager/browser/default/frmupload.html changed +File cmseditor/editor/filemanager/browser/default/connectors/php/commands.php changed File cmseditor/editor/filemanager/browser/default/connectors/php/config.php changed Index: branches/unlabeled/unlabeled-1.3.2/kernel/admin_templates/item_selector/item_selector_toolbar.tpl =================================================================== diff -u -r6820 -r7474 --- branches/unlabeled/unlabeled-1.3.2/kernel/admin_templates/item_selector/item_selector_toolbar.tpl (.../item_selector_toolbar.tpl) (revision 6820) +++ branches/unlabeled/unlabeled-1.3.2/kernel/admin_templates/item_selector/item_selector_toolbar.tpl (.../item_selector_toolbar.tpl) (revision 7474) @@ -31,7 +31,7 @@ set_hidden_field('selected_ids[' + $prefix + ']', Grids[$Catalog.ActivePrefix].GetSelected()); - submit_event('', 'OnProcessSelected'); + submit_event('', 'OnProcessSelected'); } ) ); a_toolbar.AddButton( new ToolBarButton('cancel', '', function() {