Index: trunk/admin/install.php =================================================================== diff -u -r92 -r103 --- trunk/admin/install.php (.../install.php) (revision 92) +++ trunk/admin/install.php (.../install.php) (revision 103) @@ -1479,6 +1479,8 @@ $ado->Execute($sql); $sql = "UPDATE ".$g_TablePrefix."ConfigurationValues SET VariableValue = '$g_Domain' WHERE VariableName='Server_Name'"; $ado->Execute($sql); + $sql = "UPDATE ".$g_TablePrefix."ConfigurationValues SET VariableValue = '".$_SERVER['DOCUMENT_ROOT'].$sitepath."admin/backupdata' WHERE VariableName='Backup_Path'"; + $ado->Execute($sql); $Modules = inst_GetModuleList(); $include_file = "install/modselect.php"; } @@ -1501,9 +1503,9 @@ $modules_str = substr($modules_str, 0, strlen($modules_str) - 1); $rfile = @fopen(GET_LICENSE_URL."?url=".base64_encode($_SERVER['SERVER_NAME'].$_POST['Site_Path'])."&modules=".base64_encode($modules_str)."&domain=".md5($_SERVER['SERVER_NAME']), "r"); if (!$rfile) { - $get_license_error = "Unable to connect to the Intechnic server! Please try again later!"; - $state = "postconfig_1"; - $include_file = "install/postconfig.php"; + //$get_license_error = "Unable to connect to the Intechnic server! Please try again later!"; + //$state = "postconfig_1"; + //$include_file = "install/postconfig.php"; } else { $rcontents = ''; Index: trunk/admin/install/restore_select.php =================================================================== diff -u -r41 -r103 --- trunk/admin/install/restore_select.php (.../restore_select.php) (revision 41) +++ trunk/admin/install/restore_select.php (.../restore_select.php) (revision 103) @@ -1,7 +1,15 @@ Execute($sql); + + $filepath = $rs->fields['VariableValue']; + if (!strlen($filepath)) { + $filepath = $pathtoroot.$admin.$path_char.'backupdata'; + } +} function getRestoreDirList($dirName) { Index: trunk/globals.php =================================================================== diff -u -r89 -r103 --- trunk/globals.php (.../globals.php) (revision 89) +++ trunk/globals.php (.../globals.php) (revision 103) @@ -102,6 +102,8 @@ flush(); die(); } + $g_adodbConnection->Execute('SET SQL_BIG_SELECTS=1'); + return $g_adodbConnection; } Index: trunk/admin/install/inportal_data.sql =================================================================== diff -u -r13 -r103 --- trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 13) +++ trunk/admin/install/inportal_data.sql (.../inportal_data.sql) (revision 103) @@ -1,5 +1,6 @@ INSERT INTO ConfigurationAdmin VALUES ('Site_Name', 'la_Text_Website', 'la_config_website_name', 'text', '', '', 7, 1); INSERT INTO ConfigurationAdmin VALUES ('Site_Path', 'la_Text_Website', 'la_config_web_address', 'text', '', '', 6, 1); +INSERT INTO ConfigurationAdmin VALUES ('Backup_Path', 'la_Text_BackupPath', 'la_config_backup_path', 'text', '', '', 6, 1); INSERT INTO ConfigurationAdmin VALUES ('Domain_Detect', 'la_Text_Website', 'la_config_detect_domain', 'text', '', '', 8, 1); INSERT INTO ConfigurationAdmin VALUES ('Category_Sortfield', 'la_Text_General', 'la_category_sortfield_prompt', 'select', '', 'Name=la_Category_Name,Description=la_Category_Description,CreatedOn=la_Category_Date,EditorsPick=la_Category_Pick,Pop=la_Category_Pop,SELECT FieldLabel as OptionName, FieldName as OptionValue FROM CustomField WHERE Type=0', 1, 1); INSERT INTO ConfigurationAdmin VALUES ('Category_Sortorder', 'la_Text_General', 'la_category_sortfield_prompt', 'select', '', 'asc=la_common_ascending,desc=la_common_descending', 2, 1); @@ -82,15 +83,15 @@ INSERT INTO ConfigurationValues VALUES ('User_Password_Auto', '0', 'In-Portal:Users', 'in-portal:configure_users') INSERT INTO ConfigurationValues VALUES ('User_Votes_Deny', '5', 'In-Portal:Users', 'in-portal:configure_users') INSERT INTO ConfigurationValues VALUES ('User_Review_Deny', '5', 'In-Portal:Users', 'in-portal:configure_users') -INSERT INTO ConfigurationValues VALUES ('Config_Name', 'Zhenya', 'In-Portal', 'in-portal:configure_general') -INSERT INTO ConfigurationValues VALUES ('Config_Company', 'Hohlov', 'In-Portal', 'in-portal:configure_general') +INSERT INTO ConfigurationValues VALUES ('Config_Name', '', 'In-Portal', 'in-portal:configure_general') +INSERT INTO ConfigurationValues VALUES ('Config_Company', '', 'In-Portal', 'in-portal:configure_general') INSERT INTO ConfigurationValues VALUES ('Config_Reg_Number', '', 'In-Portal', 'in-portal:configure_general') INSERT INTO ConfigurationValues VALUES ('Config_Website_Name', '', 'In-Portal', 'in-portal:configure_general') INSERT INTO ConfigurationValues VALUES ('Config_Web_Address', '', 'In-Portal', 'in-portal:configure_general') INSERT INTO ConfigurationValues VALUES ('Config_Server_Time', '14', 'In-Portal', 'in-portal:configure_general') INSERT INTO ConfigurationValues VALUES ('Config_Site_Time', '14', 'In-Portal', 'in-portal:configure_general') INSERT INTO ConfigurationValues VALUES ('Site_Name', 'In-Portal', 'In-Portal', 'in-portal:configure_general') -INSERT INTO ConfigurationValues VALUES ('Backup_Path', '', 'In-Portal', '') +INSERT INTO ConfigurationValues VALUES ('Backup_Path', '', 'In-Portal', 'in-portal:configure_general') INSERT INTO ConfigurationValues VALUES ('Perpage_Items', '20', 'In-Portal', '') INSERT INTO ConfigurationValues VALUES ('GuestSessions', '1', 'In-Portal', '') INSERT INTO ConfigurationValues VALUES ('Smtp_Server', NULL, 'In-Portal', 'in-portal:configure_general')