Index: branches/RC/core/install/install_schema.sql =================================================================== diff -u -N -r10516 -r10517 --- branches/RC/core/install/install_schema.sql (.../install_schema.sql) (revision 10516) +++ branches/RC/core/install/install_schema.sql (.../install_schema.sql) (revision 10517) @@ -195,11 +195,12 @@ GroupId int(11) NOT NULL auto_increment, Name varchar(255) NOT NULL default '', Description varchar(255) default NULL, - CreatedOn INT UNSIGNED NULL DEFAULT NULL, + CreatedOn int(10) unsigned default NULL, System tinyint(4) NOT NULL default '0', Personal tinyint(4) NOT NULL default '0', Enabled tinyint(4) NOT NULL default '1', ResourceId int(11) NOT NULL default '0', + FrontRegistration tinyint(3) unsigned NOT NULL default '0', PRIMARY KEY (GroupId), UNIQUE KEY Name (Name), UNIQUE KEY ResourceId (ResourceId), Index: branches/RC/core/units/users/users_config.php =================================================================== diff -u -N -r10433 -r10517 --- branches/RC/core/units/users/users_config.php (.../users_config.php) (revision 10433) +++ branches/RC/core/units/users/users_config.php (.../users_config.php) (revision 10517) @@ -226,6 +226,11 @@ 'RootPassword' => Array('type' => 'string', 'formatter' => 'kPasswordFormatter', 'encryption_method' => 'md5', 'verify_field' => 'VerifyRootPassword', 'skip_empty' => 1, 'default' => md5('') ), 'FullName' => Array ('type' => 'string', 'default' => ''), + 'UserGroup' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options_sql' => 'SELECT %1$s FROM ' . TABLE_PREFIX . 'PortalGroup WHERE Enabled = 1 AND FrontRegistration = 1', 'option_key_field' => 'GroupId', 'option_title_field' => 'Name', + 'not_null' => 1, 'default' => 0, + ), ), 'Grids' => Array( Index: branches/RC/core/install/upgrades.sql =================================================================== diff -u -N -r10516 -r10517 --- branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 10516) +++ branches/RC/core/install/upgrades.sql (.../upgrades.sql) (revision 10517) @@ -249,6 +249,9 @@ INSERT INTO ConfigurationAdmin VALUES ('RememberLastAdminTemplate', 'la_Text_General', 'la_config_RememberLastAdminTemplate', 'checkbox', '', '', 10.13, 0, 0); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'RememberLastAdminTemplate', '', 'In-Portal:Users', 'in-portal:configure_users'); +INSERT INTO ConfigurationAdmin VALUES ('AllowSelectGroupOnFront', 'la_Text_General', 'la_config_AllowSelectGroupOnFront', 'checkbox', NULL, NULL, 10.13, 0, 0); +INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AllowSelectGroupOnFront', '0', 'In-Portal:Users', 'in-portal:configure_users'); + CREATE TABLE StatisticsCapture ( StatisticsId int(10) unsigned NOT NULL auto_increment, TemplateName varchar(255) NOT NULL default '', @@ -295,4 +298,7 @@ KEY TimeAvg (TimeAvg), KEY TimeMax (TimeMax), KEY QueryCrc (QueryCrc) -); \ No newline at end of file +); + +ALTER TABLE PortalGroup ADD FrontRegistration TINYINT UNSIGNED NOT NULL; +UPDATE PortalGroup SET FrontRegistration = 1 WHERE GroupId = 13; \ No newline at end of file Index: branches/RC/themes/default2007/platform/login/register.tpl =================================================================== diff -u -N -r9664 -r10517 --- branches/RC/themes/default2007/platform/login/register.tpl (.../register.tpl) (revision 9664) +++ branches/RC/themes/default2007/platform/login/register.tpl (.../register.tpl) (revision 10517) @@ -56,6 +56,11 @@ + + + + + Index: branches/RC/core/units/groups/groups_config.php =================================================================== diff -u -N -r10005 -r10517 --- branches/RC/core/units/groups/groups_config.php (.../groups_config.php) (revision 10005) +++ branches/RC/core/units/groups/groups_config.php (.../groups_config.php) (revision 10517) @@ -1,128 +1,129 @@ 'g', + $config = Array ( + 'Prefix' => 'g', - 'ItemClass' => Array('class' => 'GroupsItem', 'file' => 'groups_item.php', 'build_event' => 'OnItemBuild'), - 'ListClass' => Array('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), - 'EventHandlerClass' => Array('class' => 'GroupsEventHandler', 'file' => 'groups_event_handler.php','build_event'=>'OnBuild'), - 'TagProcessorClass' => Array('class' => 'kDBTagProcessor', 'file' => '','build_event'=>'OnBuild'), + 'ItemClass' => Array ('class' => 'GroupsItem', 'file' => 'groups_item.php', 'build_event' => 'OnItemBuild'), + 'ListClass' => Array ('class' => 'kDBList', 'file' => '', 'build_event' => 'OnListBuild'), + 'EventHandlerClass' => Array ('class' => 'GroupsEventHandler', 'file' => 'groups_event_handler.php', 'build_event' => 'OnBuild'), + 'TagProcessorClass' => Array ('class' => 'kDBTagProcessor', 'file' => '', 'build_event' => 'OnBuild'), - 'AutoLoad' => true, + 'AutoLoad' => true, - 'QueryString' => Array( - 1 => 'id', - 2 => 'page', - 3 => 'event', - 4 => 'mode', - ), + 'QueryString' => Array ( + 1 => 'id', + 2 => 'page', + 3 => 'event', + 4 => 'mode', + ), - 'IDField' => 'GroupId', + 'IDField' => 'GroupId', + 'StatusField' => Array ('Enabled'), + 'TitleField' => 'Name', - 'StatusField' => Array('Enabled'), + 'SubItems' => Array ('g-perm', 'g-ug'), - 'TitleField' => 'Name', + 'TitlePresets' => Array ( + 'default' => Array ( + 'new_status_labels' => Array('g' => '!la_title_Adding_Group!'), + 'edit_status_labels' => Array('g' => '!la_title_Editing_Group!'), + 'new_titlefield' => Array('g' => ''), + ), - 'TitlePresets' => Array( - 'default' => Array( 'new_status_labels' => Array('g' => '!la_title_Adding_Group!'), - 'edit_status_labels' => Array('g' => '!la_title_Editing_Group!'), - 'new_titlefield' => Array('g' => ''), - ), + 'groups_list' => Array ('prefixes' => Array ('g.total_List'), 'format' => "!la_title_Groups! (#g.total_recordcount#)"), + 'groups_edit' => Array ('prefixes' => Array ('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_General!"), + 'groups_edit_users' => Array ('prefixes' => Array ('g', 'g-ug_List'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Users! (#g-ug_recordcount#)" ), + 'groups_edit_permissions' => Array ('prefixes' => Array ('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Permissions!" ), + 'groups_edit_additional_permissions' => Array ('prefixes' => Array ('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_AdditionalPermissions!" ), + 'select_group' => Array('prefixes' => Array ('g.user_List'), 'format' => "!la_title_Groups! (#g.user_recordcount#) - !la_title_SelectGroup!"), + ), - 'groups_list' => Array('prefixes' => Array('g.total_List'), 'format' => "!la_title_Groups! (#g.total_recordcount#)"), + 'PermSection' => Array ('main' => 'in-portal:user_groups'), - 'groups_edit' => Array('prefixes' => Array('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_General!"), + 'TableName' => TABLE_PREFIX.'PortalGroup', - 'groups_edit_users' => Array('prefixes' => Array('g', 'g-ug_List'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Users! (#g-ug_recordcount#)" ), + 'ListSQLs' => Array ( + '' => 'SELECT %1$s.* %2$s FROM %1$s', + 'total' => 'SELECT %1$s.* %2$s + FROM %1$s + LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON ug.GroupId = %1$s.GroupId', + ), - 'groups_edit_permissions' => Array('prefixes' => Array('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_Permissions!" ), + 'ItemSQLs' => Array ( + '' => ' SELECT %1$s.* %2$s + FROM %1$s + LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON ug.GroupId = %1$s.GroupId' + ), - 'groups_edit_additional_permissions' => Array('prefixes' => Array('g'), 'format' => "#g_status# '#g_titlefield#' - !la_title_AdditionalPermissions!" ), + 'ListSortings' => Array ( + '' => Array ( + 'Sorting' => Array ('Name' => 'asc'), + ), + ), - 'select_group' => Array('prefixes' => Array('g.user_List'), 'format' => "!la_title_Groups! (#g.user_recordcount#) - !la_title_SelectGroup!"), - ), + 'CalculatedFields' => Array ( + 'total' => Array ( + 'UserCount' => 'COUNT(ug.PortalUserId)', + ), + ), - 'PermSection' => Array('main' => 'in-portal:user_groups'), + 'Fields' => Array ( + 'GroupId' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Name' => Array ('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''), + 'Description' => Array ('type' => 'string', 'default' => null), + 'CreatedOn' => Array ('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), + 'System' => Array ('type' => 'int', 'not_null' => 1, 'default' => 0), + 'Personal' => Array ('type' => 'int','not_null' => 1, 'default' => 0), + 'Enabled' => Array ('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), + 'ResourceId' => Array ('type' => 'int','not_null' => 1, 'default' => 0), + 'FrontRegistration' => Array ( + 'type' => 'int', + 'formatter' => 'kOptionsFormatter', 'options' => Array (1 => 'la_Yes', 0 => 'la_No'), 'use_phrases' => 1, + 'not_null' => 1, 'default' => 0 + ), + ), - 'TableName' => TABLE_PREFIX.'PortalGroup', + 'VirtualFields' => Array ( + 'UserCount' => Array ('type' => 'int', 'default' => 0), + ), - 'ListSQLs' => Array( - '' => 'SELECT %1$s.* %2$s FROM %1$s', - 'total' => 'SELECT %1$s.* %2$s - FROM %1$s - LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON ug.GroupId = %1$s.GroupId', - ), + 'Grids' => Array ( + 'Default' => Array ( + 'Icons' => Array (1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), + 'Fields' => Array ( + 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), + 'Name' => Array ('title' => 'la_col_GroupName'), + 'UserCount' => Array ('title' => 'la_col_UserCount', 'filter_block' => 'grid_range_filter'), + 'FrontRegistration' => Array ('title' => 'la_col_FrontRegistration', 'filter_block' => 'grid_options_filter'), + ), + ), - 'ItemSQLs' => Array('' => ' SELECT %1$s.* %2$s - FROM %1$s - LEFT JOIN '.TABLE_PREFIX.'UserGroup ug ON ug.GroupId = %1$s.GroupId'), + 'UserGroups' => Array ( + 'Icons' => Array (1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), + 'Fields' => Array ( + 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), + 'Name' => Array ('title' => 'la_col_GroupName'), + ), + ), - 'ListSortings' => Array( - '' => Array( - 'Sorting' => Array('Name' => 'asc'), - ) - ), - - 'SubItems' => Array('g-perm', 'g-ug'), - 'CalculatedFields' => Array( - 'total' => Array( - 'UserCount' => 'COUNT(ug.PortalUserId)', - ), - ), - - 'Fields' => Array ( - 'GroupId' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'Name' => Array('type' => 'string', 'not_null' => 1, 'required' => 1, 'default' => ''), - 'Description' => Array('type' => 'string', 'default' => null), - 'CreatedOn' => Array('type' => 'int', 'formatter' => 'kDateFormatter', 'default' => '#NOW#'), - 'System' => Array('type' => 'int', 'not_null' => 1, 'default' => 0), - 'Personal' => Array('type' => 'int','not_null' => 1, 'default' => 0), - 'Enabled' => Array('type' => 'int', 'formatter' => 'kOptionsFormatter', 'options' => Array(1 => 'la_Enabled', 0 => 'la_Disabled'), 'use_phrases' => 1, 'not_null' => 1, 'default' => 1), - 'ResourceId' => Array('type' => 'int','not_null' => 1, 'default' => 0), - ), - - 'VirtualFields' => Array( - 'UserCount' => Array('type' => 'int', 'default' => 0), - ), - - 'Grids' => Array( - 'Default' => Array( - 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), - 'Fields' => Array( - 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'Name' => Array('title' => 'la_col_GroupName'), - 'UserCount' => Array('title' => 'la_col_UserCount', 'filter_block' => 'grid_range_filter'), - ), - ), - - 'UserGroups' => Array ( - 'Icons' => Array (1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), - 'Fields' => Array ( - 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'Name' => Array('title' => 'la_col_GroupName'), - ), - ), - - 'Radio' => Array ( - 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), - 'Fields' => Array( - 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter'), - 'Name' => Array('title' => 'la_col_GroupName'), - 'Description' => Array('title' => 'la_col_Description'), - ), - ), - - 'GroupSelector' => Array ( - 'Icons' => Array(1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), - 'Fields' => Array( - 'GroupId' => Array('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), - 'Name' => Array('title' => 'la_col_GroupName'), - 'Description' => Array('title' => 'la_col_Description'), - ), - ), + 'Radio' => Array ( + 'Icons' => Array (1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), + 'Fields' => Array ( + 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_radio_td', 'filter_block' => 'grid_range_filter'), + 'Name' => Array ('title' => 'la_col_GroupName'), + 'Description' => Array ('title' => 'la_col_Description'), ), + ), - + 'GroupSelector' => Array ( + 'Icons' => Array (1 => 'icon16_group.gif', 0 => 'icon16_group_disabled.gif'), + 'Fields' => Array ( + 'GroupId' => Array ('title' => 'la_col_Id', 'data_block' => 'grid_checkbox_td', 'filter_block' => 'grid_range_filter'), + 'Name' => Array ('title' => 'la_col_GroupName'), + 'Description' => Array ('title' => 'la_col_Description'), + ), + ), + ), ); ?> \ No newline at end of file Index: branches/RC/core/install/install_data.sql =================================================================== diff -u -N -r10480 -r10517 --- branches/RC/core/install/install_data.sql (.../install_data.sql) (revision 10480) +++ branches/RC/core/install/install_data.sql (.../install_data.sql) (revision 10517) @@ -14,6 +14,7 @@ INSERT INTO ConfigurationAdmin VALUES ('User_NewGroup', 'la_Text_General', 'la_users_new_group', 'select', NULL, '0=lu_none,SELECT GroupId as OptionValue, Name as OptionName FROM PortalGroup WHERE Enabled=1 AND Personal=0', 10.08, 0, 1); INSERT INTO ConfigurationAdmin VALUES ('User_GuestGroup', 'la_Text_General', 'la_users_guest_group', 'select', NULL, '0=lu_none,SELECT GroupId as OptionValue, Name as OptionName FROM PortalGroup WHERE Enabled=1 AND Personal=0', 10.1, 0, 1); INSERT INTO ConfigurationAdmin VALUES ('RootPass', 'la_Text_General', 'la_prompt_root_pass', 'password', NULL, NULL, 10.12, 0, 0); +INSERT INTO ConfigurationAdmin VALUES ('AllowSelectGroupOnFront', 'la_Text_General', 'la_config_AllowSelectGroupOnFront', 'checkbox', NULL, NULL, 10.13, 0, 0); INSERT INTO ConfigurationAdmin VALUES ('Users_AllowReset', 'la_Text_General', 'la_prompt_allow_reset', 'text', NULL, NULL, 10.05, 0, 0); INSERT INTO ConfigurationAdmin VALUES ('User_Allow_New', 'la_Text_General', 'la_users_allow_new', 'radio', '', '1=la_User_Instant,2=la_User_Not_Allowed,3=la_User_Upon_Approval', 10.01, 0, 1); INSERT INTO ConfigurationAdmin VALUES ('User_Password_Auto', 'la_Text_General', 'la_users_password_auto', 'checkbox', '', '', 10.06, 0, 1); @@ -151,6 +152,7 @@ INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Category_Highlight_CloseTag', '', 'In-Portal', 'in-portal:configure_categories'); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'User_GuestGroup', '14', 'In-Portal:Users', 'in-portal:configure_users'); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'RootPass', '', 'In-Portal:Users', 'in-portal:configure_users'); +INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AllowSelectGroupOnFront', '0', 'In-Portal:Users', 'in-portal:configure_users'); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'Perpage_Category_Short', '3', 'In-Portal', 'in-portal:configure_categories'); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'CookieSessions', '2', 'In-Portal', 'in-portal:configure_general'); Index: branches/RC/core/admin_templates/groups/groups_edit.tpl =================================================================== diff -u -N -r9853 -r10517 --- branches/RC/core/admin_templates/groups/groups_edit.tpl (.../groups_edit.tpl) (revision 9853) +++ branches/RC/core/admin_templates/groups/groups_edit.tpl (.../groups_edit.tpl) (revision 10517) @@ -61,6 +61,7 @@ + Index: branches/RC/core/units/users/users_event_handler.php =================================================================== diff -u -N -r10442 -r10517 --- branches/RC/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 10442) +++ branches/RC/core/units/users/users_event_handler.php (.../users_event_handler.php) (revision 10517) @@ -496,7 +496,20 @@ $group_id = $this->Application->GetVar('user_group'); } else { - $group_id = $this->Application->ConfigValue('User_NewGroup'); + $group_id = $object->GetDBField('UserGroup'); + + if ($group_id) { + // check, that group is allowed for Front-End + $sql = 'SELECT GroupId + FROM ' . TABLE_PREFIX . 'PortalGroup + WHERE GroupId = ' . (int)$group_id . ' AND FrontRegistration = 1'; + $group_id = $this->Conn->GetOne($sql); + } + + if (!$group_id) { + // when group not selected -> use default group + $group_id = $this->Application->ConfigValue('User_NewGroup'); + } } $sql = 'REPLACE INTO '.$ug_table.'(PortalUserId,GroupId,PrimaryGroup) VALUES (%s,%s,1)'; @@ -1472,6 +1485,7 @@ { parent::OnAfterConfigRead($event); + // 1. arrange user registration countries $first_country = $this->Application->ConfigValue('User_Default_Registration_Country'); if ($first_country) { // update user country dropdown sql @@ -1480,6 +1494,12 @@ $this->Application->setUnitOption($event->Prefix, 'Fields', $fields); } + // 2. set default user registration group + $virtual_fields = $this->Application->getUnitOption($event->Prefix, 'VirtualFields'); + $virtual_fields['UserGroup']['default'] = $this->Application->ConfigValue('User_NewGroup'); + $this->Application->setUnitOption($event->Prefix, 'VirtualFields', $virtual_fields); + + // 3. allow avatar upload on Front-End $file_helper =& $this->Application->recallObject('FileHelper'); /* @var $file_helper FileHelper */ Index: branches/RC/kernel/admin_templates/groups/groups_edit.tpl =================================================================== diff -u -N -r9853 -r10517 --- branches/RC/kernel/admin_templates/groups/groups_edit.tpl (.../groups_edit.tpl) (revision 9853) +++ branches/RC/kernel/admin_templates/groups/groups_edit.tpl (.../groups_edit.tpl) (revision 10517) @@ -61,6 +61,7 @@ + Index: branches/RC/admin/install/upgrades/inportal_upgrade_v4.3.1.sql =================================================================== diff -u -N -r10516 -r10517 --- branches/RC/admin/install/upgrades/inportal_upgrade_v4.3.1.sql (.../inportal_upgrade_v4.3.1.sql) (revision 10516) +++ branches/RC/admin/install/upgrades/inportal_upgrade_v4.3.1.sql (.../inportal_upgrade_v4.3.1.sql) (revision 10517) @@ -4,10 +4,16 @@ INSERT INTO ConfigurationAdmin VALUES ('RememberLastAdminTemplate', 'la_Text_General', 'la_config_RememberLastAdminTemplate', 'checkbox', '', '', 10.13, 0, 0); INSERT INTO ConfigurationValues VALUES (DEFAULT, 'RememberLastAdminTemplate', '', 'In-Portal:Users', 'in-portal:configure_users'); +INSERT INTO ConfigurationAdmin VALUES ('AllowSelectGroupOnFront', 'la_Text_General', 'la_config_AllowSelectGroupOnFront', 'checkbox', NULL, NULL, 10.13, 0, 0); +INSERT INTO ConfigurationValues VALUES (DEFAULT, 'AllowSelectGroupOnFront', '0', 'In-Portal:Users', 'in-portal:configure_users'); + CREATE TABLE StatisticsCapture (StatisticsId int(10) unsigned NOT NULL auto_increment, TemplateName varchar(255) NOT NULL default '', Hits int(10) unsigned NOT NULL default '0', LastHit int(11) NOT NULL default '0', ScriptTimeMin decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', ScriptTimeAvg decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', ScriptTimeMax decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', SqlTimeMin decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', SqlTimeAvg decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', SqlTimeMax decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', SqlCountMin decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', SqlCountAvg decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', SqlCountMax decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', PRIMARY KEY (StatisticsId), KEY TemplateName (TemplateName), KEY Hits (Hits), KEY LastHit (LastHit), KEY ScriptTimeMin (ScriptTimeMin), KEY ScriptTimeAvg (ScriptTimeAvg), KEY ScriptTimeMax (ScriptTimeMax), KEY SqlTimeMin (SqlTimeMin), KEY SqlTimeAvg (SqlTimeAvg), KEY SqlTimeMax (SqlTimeMax), KEY SqlCountMin (SqlCountMin), KEY SqlCountAvg (SqlCountAvg), KEY SqlCountMax (SqlCountMax)); CREATE TABLE SlowSqlCapture (CaptureId int(10) unsigned NOT NULL auto_increment, TemplateNames text, Hits int(10) unsigned NOT NULL default '0', LastHit int(11) NOT NULL default '0', SqlQuery text, TimeMin decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', TimeAvg decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', TimeMax decimal(40,20) unsigned NOT NULL default '0.00000000000000000000', QueryCrc int(11) NOT NULL default '0', PRIMARY KEY (CaptureId), KEY Hits (Hits), KEY LastHit (LastHit), KEY TimeMin (TimeMin), KEY TimeAvg (TimeAvg), KEY TimeMax (TimeMax), KEY QueryCrc (QueryCrc)); +ALTER TABLE PortalGroup ADD FrontRegistration TINYINT UNSIGNED NOT NULL; +UPDATE PortalGroup SET FrontRegistration = 1 WHERE GroupId = 13; + DELETE FROM Cache WHERE VarName = 'sections_parsed'; DELETE FROM Cache WHERE VarName LIKE 'mod_rw_%';