Index: branches/unlabeled/unlabeled-1.3.2/admin/install/upgrades/inportal_upgrade_v1.2.0.sql =================================================================== diff -u -r5330 -r5332 --- branches/unlabeled/unlabeled-1.3.2/admin/install/upgrades/inportal_upgrade_v1.2.0.sql (.../inportal_upgrade_v1.2.0.sql) (revision 5330) +++ branches/unlabeled/unlabeled-1.3.2/admin/install/upgrades/inportal_upgrade_v1.2.0.sql (.../inportal_upgrade_v1.2.0.sql) (revision 5332) @@ -106,4 +106,7 @@ UPDATE ConfigurationAdmin SET ValueList = 'Name=la_Category_Name,Description=la_Category_Description,CreatedOn=la_Category_Date,EditorsPick=la_Category_Pick,SELECT Prompt AS OptionName, CONCAT("cust_", FieldName) AS OptionValue FROM CustomField WHERE (Type = 1) AND (IsSystem = 0)' WHERE VariableName IN ('Category_Sortfield', 'Category_Sortfield2'); +DELETE FROM ConfigurationAdmin WHERE VariableName = 'RootPassVerify'; +DELETE FROM ConfigurationValues WHERE VariableName = 'RootPassVerify'; + UPDATE Modules SET Version = '1.2.0' WHERE Name = 'In-Portal'; \ No newline at end of file Index: branches/unlabeled/unlabeled-1.105.2/admin/install.php =================================================================== diff -u -r4904 -r5332 --- branches/unlabeled/unlabeled-1.105.2/admin/install.php (.../install.php) (revision 4904) +++ branches/unlabeled/unlabeled-1.105.2/admin/install.php (.../install.php) (revision 5332) @@ -1356,7 +1356,9 @@ else { $pass = md5($pass); - $sql = "UPDATE ".$g_TablePrefix."ConfigurationValues SET VariableValue = '$pass' WHERE VariableName='RootPass' OR VariableName='RootPassVerify'"; + $sql = ' UPDATE '.$g_TablePrefix.'ConfigurationValues + SET VariableValue = '.$ado->qstr($pass).' + WHERE VariableName = "RootPass";'; $ado =& inst_GetADODBConnection(); $ado->Execute($sql); $state="modselect"; Fisheye: Tag 5332 refers to a dead (removed) revision in file `branches/unlabeled/unlabeled-1.1.96/kernel/admin/include/toolbar/configure_users.php'. Fisheye: No comparison available. Pass `N' to diff? Index: branches/unlabeled/unlabeled-1.62.2/admin/install/inportal_data.sql =================================================================== diff -u -r5330 -r5332 --- branches/unlabeled/unlabeled-1.62.2/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 5330) +++ branches/unlabeled/unlabeled-1.62.2/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 5332) @@ -14,7 +14,6 @@ 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', 3, 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', 4, 1); INSERT INTO ConfigurationAdmin VALUES ('RootPass', 'la_Text_General', 'la_prompt_root_pass', 'password', NULL, NULL, 11, 0); -INSERT INTO ConfigurationAdmin VALUES ('RootPassVerify', 'la_Text_General', 'la_prompt_root_pass_verify', 'password', NULL, NULL, 11, 0); INSERT INTO ConfigurationAdmin VALUES ('Users_AllowReset', 'la_Text_General', 'la_prompt_allow_reset', 'text', NULL, NULL, 3, 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', 1, 1); INSERT INTO ConfigurationAdmin VALUES ('User_Password_Auto', 'la_Text_General', 'la_users_password_auto', 'checkbox', '', '', 10, 1); @@ -129,7 +128,6 @@ INSERT INTO ConfigurationValues VALUES (NULL, 'Category_Highlight_CloseTag', '', 'In-Portal', 'in-portal:configure_categories') INSERT INTO ConfigurationValues VALUES (NULL, 'User_GuestGroup', '14', 'In-Portal:Users', 'in-portal:configure_users') INSERT INTO ConfigurationValues VALUES (NULL, 'RootPass', '', 'In-Portal:Users', 'in-portal:configure_users') -INSERT INTO ConfigurationValues VALUES (NULL, 'RootPassVerify', '', 'In-Portal:Users', 'in-portal:configure_users') INSERT INTO ConfigurationValues VALUES (NULL, 'Perpage_Category_Short', '3', 'In-Portal', 'in-portal:configure_categories') INSERT INTO ConfigurationValues VALUES (NULL, 'CookieSessions', '2', 'In-Portal', 'in-portal:configure_general')