Index: trunk/kernel/units/custom_fields/custom_fields_event_handler.php =================================================================== diff -u -N -r4029 -r4330 --- trunk/kernel/units/custom_fields/custom_fields_event_handler.php (.../custom_fields_event_handler.php) (revision 4029) +++ trunk/kernel/units/custom_fields/custom_fields_event_handler.php (.../custom_fields_event_handler.php) (revision 4330) @@ -25,6 +25,8 @@ if ($item_type) { $object->addFilter('itemtype_filter', '%1$s.Type = '.$item_type); } + + $object->addFilter('user_filter', '%1$s.IsSystem = 0'); } /** Index: trunk/core/units/custom_fields/custom_fields_event_handler.php =================================================================== diff -u -N -r4029 -r4330 --- trunk/core/units/custom_fields/custom_fields_event_handler.php (.../custom_fields_event_handler.php) (revision 4029) +++ trunk/core/units/custom_fields/custom_fields_event_handler.php (.../custom_fields_event_handler.php) (revision 4330) @@ -25,6 +25,8 @@ if ($item_type) { $object->addFilter('itemtype_filter', '%1$s.Type = '.$item_type); } + + $object->addFilter('user_filter', '%1$s.IsSystem = 0'); } /** Index: trunk/kernel/admin/include/toolbar/advanced_view.php =================================================================== diff -u -N -r2308 -r4330 --- trunk/kernel/admin/include/toolbar/advanced_view.php (.../advanced_view.php) (revision 2308) +++ trunk/kernel/admin/include/toolbar/advanced_view.php (.../advanced_view.php) (revision 4330) @@ -237,7 +237,7 @@ } if (k4_action != '') { - \$form_prefix = queryTabRegistry('prefix_special', prefix_special, 'tab_id'); + \$form_name = queryTabRegistry('prefix_special', prefix_special, 'tab_id') + '_form'; eval(k4_action); } else alert(action+' not implemented'); Index: trunk/kernel/admin_templates/incs/header_mini.tpl =================================================================== diff -u -N -r4329 -r4330 --- trunk/kernel/admin_templates/incs/header_mini.tpl (.../header_mini.tpl) (revision 4329) +++ trunk/kernel/admin_templates/incs/header_mini.tpl (.../header_mini.tpl) (revision 4330) @@ -22,4 +22,4 @@ - + Index: trunk/kernel/admin_templates/incs/script.js =================================================================== diff -u -N -r4287 -r4330 --- trunk/kernel/admin_templates/incs/script.js (.../script.js) (revision 4287) +++ trunk/kernel/admin_templates/incs/script.js (.../script.js) (revision 4330) @@ -3,7 +3,8 @@ var Toolbars = new Array(); var $Menus = new Array(); var $ViewMenus = new Array(); - var $form_prefix = 'kernel'; // results usage of kernel_form + + var $form_name = 'kernel_form'; if(!$fw_menus) var $fw_menus = new Array(); var $env = ''; @@ -105,17 +106,17 @@ { var old_env = ''; if ( !form_action.match(/\?/) ) { - document.getElementById($form_prefix+'_form').action.match(/.*(\?.*)/); + document.getElementById($form_name).action.match(/.*(\?.*)/); old_env = RegExp.$1; } - document.getElementById($form_prefix+'_form').action = form_action+old_env; + document.getElementById($form_name).action = form_action+old_env; } submit_kernel_form(); } function show_form_data() { - var $kf = document.getElementById($form_prefix+'_form'); + var $kf = document.getElementById($form_name); $ret = ''; for(var i in $kf.elements) { @@ -131,7 +132,7 @@ return; } submitted = true; - var $form = document.getElementById($form_prefix+'_form'); + var $form = document.getElementById($form_name); processHooks('SubmitKF', hBEFORE); if (typeof $form.onsubmit == "function") { @@ -308,7 +309,7 @@ function openSelector($prefix, $url, $dst_field, $window_size, $event) { - var $kf = document.getElementById($form_prefix + '_form'); + var $kf = document.getElementById($form_name); var $regex = new RegExp('(.*)\?env=' + document.getElementById('sid').value + '-(.*?):(.*)'); var $t = $regex.exec($url)[2]; var $window_name = 'select_'+$t.replace(/(\/|-)/g, '_'); @@ -386,9 +387,9 @@ // if the field does not exist - creates it function set_hidden_field($field_id, $value) { -// alert('form: '+$form_prefix+'_form'); +// alert('form: '+$form_name); - var $kf = document.getElementById($form_prefix+'_form'); + var $kf = document.getElementById($form_name); var $field = $kf.elements[$field_id]; if($field) { @@ -408,7 +409,7 @@ function get_hidden_field($field) { - var $kf = document.getElementById($form_prefix+'_form'); + var $kf = document.getElementById($form_name); return $kf.elements[$field] ? $kf.elements[$field].value : false; } @@ -540,7 +541,7 @@ function update_checkbox_options($cb_mask, $hidden_id) { - var $kf = document.getElementById($form_prefix+'_form'); + var $kf = document.getElementById($form_name); var $tmp = ''; for (var i = 0; i < $kf.elements.length; i++) { @@ -849,4 +850,4 @@ $i++; } return $ret; - } + } \ No newline at end of file Index: trunk/admin/include/mainscript.js =================================================================== diff -u -N -r3543 -r4330 --- trunk/admin/include/mainscript.js (.../mainscript.js) (revision 3543) +++ trunk/admin/include/mainscript.js (.../mainscript.js) (revision 4330) @@ -158,9 +158,9 @@ // if the field does not exist - creates it function set_hidden_field(\$field_id, \$value) { -// alert('form: '+\$form_prefix+'_form'); +// alert('form: '+\$form_name); - var \$kf = document.getElementById(\$form_prefix+'_form'); + var \$kf = document.getElementById(\$form_name); var \$field = \$kf.elements[\$field_id]; if(\$field) { Index: trunk/admin/index4_direct.php =================================================================== diff -u -N -r4329 -r4330 --- trunk/admin/index4_direct.php (.../index4_direct.php) (revision 4329) +++ trunk/admin/index4_direct.php (.../index4_direct.php) (revision 4330) @@ -31,6 +31,9 @@ $item_id = $db->GetOne('SELECT '.$id_field.' FROM '.$table_name, (int)$application->GetVar('en')); $application->SetVar($prefix.'_id', $item_id); + $object =& $application->recallObject($prefix, null, Array('skip_autoload' => true)); + $object->Load($item_id); + $template = $application->GetVar('t'); include_once FULL_PATH.'/admin/'.$template.'.php'; Index: trunk/core/kernel/parser/tags.php =================================================================== diff -u -N -r4029 -r4330 --- trunk/core/kernel/parser/tags.php (.../tags.php) (revision 4029) +++ trunk/core/kernel/parser/tags.php (.../tags.php) (revision 4330) @@ -346,7 +346,7 @@ case 'endif': $code[] = ' }'; return $code; - + case 'else': $code[] = ' }'; $code[] = ' else {'; Index: trunk/kernel/action.php =================================================================== diff -u -N -r4325 -r4330 --- trunk/kernel/action.php (.../action.php) (revision 4325) +++ trunk/kernel/action.php (.../action.php) (revision 4330) @@ -832,7 +832,16 @@ saveCustomFields($main_prefix, $resource_id, $_POST['CustomType']); break; + + case 'm_save_custom_data': + $main_prefix = $application->GetVar('prefix'); + $application->SetVar($main_prefix.'_mode', 't'); + $event = new kEvent($main_prefix.':OnUpdate'); + $application->HandleEvent($event); + break; + + case "m_SearchConfig_Edit": if($ro_perm) break; $SimpleValues = $_POST["simple"]; Index: trunk/kernel/admin_templates/incs/blocks.tpl =================================================================== diff -u -N -r2308 -r4330 --- trunk/kernel/admin_templates/incs/blocks.tpl (.../blocks.tpl) (revision 2308) +++ trunk/kernel/admin_templates/incs/blocks.tpl (.../blocks.tpl) (revision 4330) @@ -1,10 +1,11 @@ - - + + - + -
_form" name="_form" enctype="multipart/form-data" method="post" action=""> + + " name="_form" enctype="multipart/form-data" method="post" action=""> " /> Index: trunk/kernel/admin/include/toolbar/editcategory_relationselect.php =================================================================== diff -u -N -r3069 -r4330 --- trunk/kernel/admin/include/toolbar/editcategory_relationselect.php (.../editcategory_relationselect.php) (revision 3069) +++ trunk/kernel/admin/include/toolbar/editcategory_relationselect.php (.../editcategory_relationselect.php) (revision 4330) @@ -261,7 +261,7 @@ if (k4_action != '') { - \$form_prefix = queryTabRegistry('prefix_special', prefix_special, 'tab_id'); + \$form_name = queryTabRegistry('prefix_special', prefix_special, 'tab_id') + '_form'; eval(k4_action); } else alert(action+' not implemented'); Index: trunk/admin/category/category_items.php =================================================================== diff -u -N -r4329 -r4330 --- trunk/admin/category/category_items.php (.../category_items.php) (revision 4329) +++ trunk/admin/category/category_items.php (.../category_items.php) (revision 4330) @@ -20,10 +20,9 @@ $en_next = ($en + 1 == $itemcount) ? -1 : $en + 1; $en_prev = ($en == 0) ? -1 : $en - 1; } - - $action = 'm_dummy'; - $TitleVerb = prompt_language('la_Text_Editing'); + $TitleVerb = prompt_language('la_Text_Editing'); + $envar = 'env='.BuildEnv().'&en='.$en; $section = 'in-portal:editcategory_items'; @@ -49,15 +48,4 @@ } int_header($objCatToolBar,NULL,$title); -?> - - - - - - - - -
- -
\ No newline at end of file +?> \ No newline at end of file Index: trunk/admin/install/inportal_schema.sql =================================================================== diff -u -N -r4243 -r4330 --- trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 4243) +++ trunk/admin/install/inportal_schema.sql (.../inportal_schema.sql) (revision 4330) @@ -113,6 +113,7 @@ ValueList varchar(255) default NULL, DisplayOrder int(11) NOT NULL default '0', OnGeneralTab tinyint(4) NOT NULL default '0', + IsSystem tinyint(3) unsigned NOT NULL default '0', PRIMARY KEY (CustomFieldId), KEY Type (Type) ) Index: trunk/core/units/custom_fields/custom_fields_config.php =================================================================== diff -u -N -r4029 -r4330 --- trunk/core/units/custom_fields/custom_fields_config.php (.../custom_fields_config.php) (revision 4029) +++ trunk/core/units/custom_fields/custom_fields_config.php (.../custom_fields_config.php) (revision 4330) @@ -83,6 +83,7 @@ 'ValueList' => Array('type' => 'string','default' => ''), 'DisplayOrder' => Array('type' => 'int','not_null' => '1','default' => '0'), 'OnGeneralTab' => Array('type' => 'int','not_null' => '1','default' => '0'), + 'IsSystem' => Array('type' => 'int', 'not_null' => '1', 'default' => '0'), ), 'VirtualFields' => Array( 'Value' => Array('type' => 'string', 'default' => ''), Index: trunk/kernel/units/custom_fields/custom_fields_config.php =================================================================== diff -u -N -r4029 -r4330 --- trunk/kernel/units/custom_fields/custom_fields_config.php (.../custom_fields_config.php) (revision 4029) +++ trunk/kernel/units/custom_fields/custom_fields_config.php (.../custom_fields_config.php) (revision 4330) @@ -83,6 +83,7 @@ 'ValueList' => Array('type' => 'string','default' => ''), 'DisplayOrder' => Array('type' => 'int','not_null' => '1','default' => '0'), 'OnGeneralTab' => Array('type' => 'int','not_null' => '1','default' => '0'), + 'IsSystem' => Array('type' => 'int', 'not_null' => '1', 'default' => '0'), ), 'VirtualFields' => Array( 'Value' => Array('type' => 'string', 'default' => ''), Index: trunk/admin/install/upgrades/inportal_upgrade_v1.1.9.sql =================================================================== diff -u -N -r4298 -r4330 --- trunk/admin/install/upgrades/inportal_upgrade_v1.1.9.sql (.../inportal_upgrade_v1.1.9.sql) (revision 4298) +++ trunk/admin/install/upgrades/inportal_upgrade_v1.1.9.sql (.../inportal_upgrade_v1.1.9.sql) (revision 4330) @@ -1,3 +1,4 @@ INSERT INTO Events (Event, Enabled, FromUserId, Module, Description, Type) VALUES ('COMMON.FOOTER', 1, 0, 'In-Portal', 'la_event_common.footer', 1); +ALTER TABLE CustomField ADD IsSystem TINYINT UNSIGNED NOT NULL; UPDATE Modules SET Version = '1.1.9' WHERE Name = 'In-Portal'; \ No newline at end of file Index: trunk/kernel/admin/include/toolbar/browse.php =================================================================== diff -u -N -r3736 -r4330 --- trunk/kernel/admin/include/toolbar/browse.php (.../browse.php) (revision 3736) +++ trunk/kernel/admin/include/toolbar/browse.php (.../browse.php) (revision 4330) @@ -304,7 +304,7 @@ if (k4_action != '') { - \$form_prefix = queryTabRegistry('prefix_special', prefix_special, 'tab_id'); + \$form_name = queryTabRegistry('prefix_special', prefix_special, 'tab_id') + '_form'; eval(k4_action); } else alert(action+' not implemented'); @@ -612,7 +612,7 @@ } } result = result.replace(/(.*),\$/, '\$1'); - if (activeTab) \$form_prefix = activeTab.id; + if (activeTab) \$form_name = activeTab.id + '_form'; set_hidden_field(field_name, result); } Index: trunk/kernel/include/customfield.php =================================================================== diff -u -N -r4077 -r4330 --- trunk/kernel/include/customfield.php (.../customfield.php) (revision 4077) +++ trunk/kernel/include/customfield.php (.../customfield.php) (revision 4330) @@ -67,22 +67,28 @@ { var $Type; - function clsCustomFieldList($type=-1,$table="CustomField") + function clsCustomFieldList($type = -1, $table = 'CustomField') { $this->clsItemCollection(); - $this->Type=$type; - $this->classname = "clsCustomField"; - if($table=="CustomField") - $table = GetTablePrefix().$table; + $this->Type = $type; + $this->classname = 'clsCustomField'; + if ($table == 'CustomField') { + $table = GetTablePrefix().$table; + } + $this->SourceTable = $table; - if($this->Type>0) - $this->LoadFields(); + if ($this->Type > 0) { + $this->LoadFields(); + } } function LoadFields() { $this->Clear(); - $sql = "SELECT * FROM ".$this->SourceTable." WHERE Type=".$this->Type." ORDER BY DisplayOrder DESC, CustomFieldId ASC"; + $sql = 'SELECT * + FROM '.$this->SourceTable.' + WHERE Type = '.$this->Type.' AND IsSystem = 0 + ORDER BY DisplayOrder DESC, CustomFieldId ASC'; if($this->debuglevel > 1) echo $sql."
\n"; $rs = $this->adodbConnection->Execute($sql); @@ -125,20 +131,17 @@ function GetFieldUIList($GeneralTab=FALSE) { - $ret = new clsConfigAdmin(); - - if($this->NumItems()>0) - { - foreach($this->Items as $field) - { - if($GeneralTab==TRUE && $field->Get("OnGeneralTab")==1 || !$GeneralTab) - { - $ui = $field->GetAdminUI(); - array_push($ret->Items,$ui); - } - } - } - return $ret; + $ret = new clsConfigAdmin(); + + if ($this->NumItems() > 0) { + foreach ($this->Items as $field) { + if ($GeneralTab == true && $field->Get('OnGeneralTab') == 1 || !$GeneralTab) { + $ui = $field->GetAdminUI(); + array_push($ret->Items,$ui); + } + } + } + return $ret; } function GetFieldNames() Index: trunk/kernel/admin_templates/category/category_items.tpl =================================================================== diff -u -N -r4329 -r4330 --- trunk/kernel/admin_templates/category/category_items.tpl (.../category_items.tpl) (revision 4329) +++ trunk/kernel/admin_templates/category/category_items.tpl (.../category_items.tpl) (revision 4330) @@ -1,5 +1,11 @@ - + + + + + + +
- - \ No newline at end of file