Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/users_list.tpl =================================================================== diff -u -r7417 -r7472 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/users_list.tpl (.../users_list.tpl) (revision 7417) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/users_list.tpl (.../users_list.tpl) (revision 7472) @@ -1,9 +1,6 @@ - - + - - Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl =================================================================== diff -u -r7405 -r7472 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl (.../admins_list.tpl) (revision 7405) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_list.tpl (.../admins_list.tpl) (revision 7472) @@ -1,9 +1,6 @@ - - + - -
Index: branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php =================================================================== diff -u -r7358 -r7472 --- branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 7358) +++ branches/unlabeled/unlabeled-1.27.2/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 7472) @@ -163,6 +163,38 @@ } + function SectionInfo($params) + { + $section = $params['section']; + if ($section_name == '#session#') { + $section = $this->Application->RecallVar('section'); + } + + $sections_helper =& $this->Application->recallObject('SectionsHelper'); + /* @var $sections_helper kSectionsHelper */ + $section_data =& $sections_helper->getSectionData($section); + + if (isset($params['parent']) && $params['parent']) { + $section_data =& $sections_helper->getSectionData($section_data['parent']); + } + + $info = $params['info']; + switch ($info) { + case 'module_path': + $module = $section_data['icon_module']; + $res = $this->ModulePath(array('module' => $module)); + break; + default: + $res = $section_data[$info]; + } + + if ($info == 'label' || isset($params['as_label'])) { + $res = $this->Application->Phrase($res); + } + return $res; + } + + function PrintSection($params) { $section_name = $params['section_name']; Index: branches/unlabeled/unlabeled-1.2.8/core/kernel/utility/formatters/password_formatter.php =================================================================== diff -u -r6923 -r7472 --- branches/unlabeled/unlabeled-1.2.8/core/kernel/utility/formatters/password_formatter.php (.../password_formatter.php) (revision 6923) +++ branches/unlabeled/unlabeled-1.2.8/core/kernel/utility/formatters/password_formatter.php (.../password_formatter.php) (revision 7472) @@ -17,6 +17,9 @@ if (isset($field_options['salt'])) { $options['salt'] = $field_options['salt']; } + if (isset($field_options['required'])) { + $options['required'] = $field_options['required']; + } $add_fields[ $field_options['verify_field'] ] = $options; $add_fields[$field_name.'_plain'] = Array('type'=>'string', 'error_field'=>$field_name); @@ -55,7 +58,7 @@ $fields = array_reverse($fields); $flip_count++; } - + $salt = isset($object->Fields[$password_field]['salt']) ? $object->Fields[$password_field]['salt'] : ''; if( getArrayValue($object->Fields[$password_field], 'verify_field_set') && getArrayValue($object->Fields[$verify_field], 'master_field_set') ) { Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/user_edit_password.tpl =================================================================== diff -u -r7090 -r7472 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/user_edit_password.tpl (.../user_edit_password.tpl) (revision 7090) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/user_edit_password.tpl (.../user_edit_password.tpl) (revision 7472) @@ -1,10 +1,7 @@ - - + - -
Index: branches/unlabeled/unlabeled-1.32.2/core/units/users/users_config.php =================================================================== diff -u -r7072 -r7472 --- branches/unlabeled/unlabeled-1.32.2/core/units/users/users_config.php (.../users_config.php) (revision 7072) +++ branches/unlabeled/unlabeled-1.32.2/core/units/users/users_config.php (.../users_config.php) (revision 7472) @@ -66,19 +66,20 @@ ), 'TitlePresets' => Array( - 'default' => Array( 'new_status_labels' => Array('u'=>'!la_title_Adding_User!'), - 'edit_status_labels' => Array('u'=>'!la_title_Editing_User!'), - 'new_titlefield' => Array('u'=>'!la_title_New_User!'), - ), + 'default' => Array( + 'new_status_labels' => Array('u'=>'!la_title_Adding_User!'), + 'edit_status_labels' => Array('u'=>'!la_title_Editing_User!'), + 'new_titlefield' => Array('u'=>'!la_title_New_User!'), + ), - 'users_list' => Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#)"), + 'users_list' => Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#)"), - 'users_edit' => Array('prefixes' => Array('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_General!"), + 'users_edit' => Array('prefixes' => Array('u'), 'format' => "#u_status# '#u_titlefield#' - !la_title_General!"), - 'users_select' => Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#) - !la_title_SelectUser!"), + 'users_select' => Array('prefixes' => Array('u_List'), 'format' => "!la_title_Users! (#u_recordcount#) - !la_title_SelectUser!"), - 'tree_users' => Array('format' => '!la_section_overview!'), - ), + 'tree_users' => Array('format' => '!la_section_overview!'), + ), 'PermSection' => Array('main' => 'in-portal:user_list', 'email' => 'in-portal:user_email', 'custom' => 'in-portal:user_custom'), @@ -127,7 +128,7 @@ ( 'PortalUserId' => Array(), 'Login' => Array('type' => 'string', 'unique'=>Array('Login'), 'default' => '','required'=>1, 'error_msgs' => Array('unique'=>'!lu_user_already_exist!')), - 'Password' => Array('type' => 'string', 'formatter' => 'kPasswordFormatter', 'encryption_method' => 'md5', 'verify_field' => 'VerifyPassword', 'skip_empty' => 1, 'default' => md5('') ), + 'Password' => Array('type' => 'string', 'required'=>1, 'formatter' => 'kPasswordFormatter', 'encryption_method' => 'md5', 'verify_field' => 'VerifyPassword', 'skip_empty' => 1, 'default' => md5('') ), 'FirstName' => Array('type' => 'string','default' => ''), 'LastName' => Array('type' => 'string','default' => ''), 'Company' => Array('type' => 'string','not_null' => '1','default' => ''), Index: branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php =================================================================== diff -u -r7461 -r7472 --- branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 7461) +++ branches/unlabeled/unlabeled-1.68.4/core/kernel/db/db_tag_processor.php (.../db_tag_processor.php) (revision 7472) @@ -382,7 +382,7 @@ $block_params['first_col'] = $column_number == 1 ? 1 : 0; $block_params['last_col'] = $column_number == $columns ? 1 : 0; - + $block_params['column_number'] = $column_number; $o.= $this->Application->ParseBlock($block_params, 1); array_push($displayed, $list->GetDBField($id_field)); @@ -1315,7 +1315,12 @@ { $new_value = $this->getInfo( $objects[ $prefix_data['prefix_special'] ], 'titlefield' ); if(!$new_value && getArrayValue($title_info['new_titlefield'],$prefix_data['prefix_special']) ) $new_value = $this->Application->Phrase($title_info['new_titlefield'][ $prefix_data['prefix_special'] ]); - $title = str_replace('#'.$prefix_data['prefix_special'].'_titlefield#', $new_value, $title); + // old format had single quotes in the format + $title = str_replace('\'#'.$prefix_data['prefix_special'].'_titlefield#\'', "'$new_value'", $title); + // new format has no quotes and $new_value should be empty when creating items + if ($new_value) { + $title = str_replace('#'.$prefix_data['prefix_special'].'_titlefield#', "'$new_value'", $title); + } } } } @@ -1333,7 +1338,13 @@ $var_info = explode('_',$replacement_var,2); $object =& $objects[ $var_info[0] ]; $new_value = $this->getInfo($object,$var_info[1]); - $title = str_replace('#'.$replacement_var.'#', $new_value, $title); + $title = str_replace('\'#'.$replacement_var.'#\'', "'$new_value'", $title); + if ($new_value) { + $title = str_replace('#'.$replacement_var.'#', "'$new_value'", $title); + } + else { + $title = str_replace('#'.$replacement_var.'#', $new_value, $title); + } } } @@ -1784,6 +1795,9 @@ $theme_path = $this->Application->BaseURL().substr($this->Application->GetFrontThemePath(), 1); + $bgcolor = $this->Application->GetVar('bgcolor'); + if (!$bgcolor) $bgcolor = '#ffffff'; + include_once(FULL_PATH.'/core/cmseditor/fckeditor.php'); $oFCKeditor = new FCKeditor($name); $oFCKeditor->BasePath = BASE_PATH.'/core/cmseditor/'; @@ -1802,6 +1816,7 @@ // 'Debug' => 1, 'Admin' => 1, 'K4' => 1, + 'newBgColor' => $bgcolor, ); return $oFCKeditor->CreateHtml(); } Index: branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js =================================================================== diff -u -r7428 -r7472 --- branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js (.../script.js) (revision 7428) +++ branches/unlabeled/unlabeled-1.2.2/core/admin_templates/js/script.js (.../script.js) (revision 7472) @@ -438,6 +438,7 @@ var $prev_opener = opener_action('p'); event_bak = get_hidden_field('events[' + $prefix_special + ']') + if (!event_bak) event_bak = ''; submit_event($prefix_special, $event, $t); opener_action($prev_opener); // restore opener in parent window set_hidden_field('events[' + $prefix_special + ']', event_bak); // restore event Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_universal.tpl =================================================================== diff -u -r7071 -r7472 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_universal.tpl (.../config_universal.tpl) (revision 7071) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/config/config_universal.tpl (.../config_universal.tpl) (revision 7472) @@ -1,5 +1,6 @@ + Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/users_edit.tpl =================================================================== diff -u -r7417 -r7472 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/users_edit.tpl (.../users_edit.tpl) (revision 7417) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/users_edit.tpl (.../users_edit.tpl) (revision 7472) @@ -1,10 +1,6 @@ - - - - - +
@@ -55,6 +51,7 @@ +
Index: branches/unlabeled/unlabeled-1.25.2/core/units/categories/categories_event_handler.php =================================================================== diff -u -r7370 -r7472 --- branches/unlabeled/unlabeled-1.25.2/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 7370) +++ branches/unlabeled/unlabeled-1.25.2/core/units/categories/categories_event_handler.php (.../categories_event_handler.php) (revision 7472) @@ -440,6 +440,7 @@ $this->Application->RemoveVar('clipboard'); $clipboard_helper =& $this->Application->recallObject('ClipboardHelper'); $clipboard_helper->setClipboard($event, 'copy', $this->StoreSelectedIDs($event)); + $this->clearSelectedIDs($event); } /** @@ -452,6 +453,7 @@ $this->Application->RemoveVar('clipboard'); $clipboard_helper =& $this->Application->recallObject('ClipboardHelper'); $clipboard_helper->setClipboard($event, 'cut', $this->StoreSelectedIDs($event)); + $this->clearSelectedIDs($event); } /** Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/root_edit_password.tpl =================================================================== diff -u -r7071 -r7472 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/root_edit_password.tpl (.../root_edit_password.tpl) (revision 7071) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/root_edit_password.tpl (.../root_edit_password.tpl) (revision 7472) @@ -1,12 +1,8 @@ - - - + - - Index: branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl =================================================================== diff -u -r7372 -r7472 --- branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl (.../admins_edit.tpl) (revision 7372) +++ branches/unlabeled/unlabeled-1.1.2/core/admin_templates/users/admins_edit.tpl (.../admins_edit.tpl) (revision 7472) @@ -1,10 +1,7 @@ - - + - -
@@ -55,6 +52,7 @@ +