Changeset 15710 for trunk/install

Timestamp:

11/28/11 23:45:01 (6 months ago)

Author:

Alexander Trofimov

Message:

installer fix

File:

• trunk/install/index.php (modified) (6 diffs)

trunk/install/index.php

@@ -744 +744 @@
 
     $sFoldersErr = $sFilesErr = $sErrorMessage = '';
-
-    require_once('../inc/classes/BxDolAdminTools.php');
+    
+    require_once('../studio/classes/BxDolStudioTools.php');
     $oAdmTools = new BxDolAdminTools();
     $oBxDolIO = new BxDolIO();
@@ -781 +781 @@
     $sErrors = printInstallError($sErrorMessage);
 
-    require_once('../inc/classes/BxDolAdminTools.php');
+    require_once('../studio/classes/BxDolStudioTools.php');
     $oAdmTools = new BxDolAdminTools();
     $oBxDolIO = new BxDolIO();
@@ -1061 +1061 @@
     $oBxDolIO = new BxDolIO();
 
-    require_once('../inc/classes/BxDolAdminTools.php');
+    require_once('../studio/classes/BxDolStudioTools.php');
     $oAdmTools = new BxDolAdminTools();
 
@@ -1116 +1116 @@
     $sError = printInstallError($sErrorMessage);
 
-    require_once('../inc/classes/BxDolAdminTools.php');
+    require_once('../studio/classes/BxDolStudioTools.php');
     $oAdmTools = new BxDolAdminTools();
     $oAdmTools->aInstallDirs = array_merge($aTemporalityWritableFolders, $oAdmTools->aInstallDirs);
@@ -1196 +1196 @@
      * Perform admin login. 
      */
-    $sExistedAdminPass = db_value("SELECT `Password` FROM `Profiles` WHERE `ID`='1'");
+    $sExistedAdminPass = db_value("SELECT `password` FROM `sys_accounts` WHERE `id`='1'");
 
     $aUrl = parse_url($GLOBALS['site']['url']);
@@ -1422 +1422 @@
     $sAdminPasswordDB = sha1(md5($sAdminPassword) . $sSaltDB); // encryptUserPwd
     $sAdminQuery = "
-        INSERT INTO `Profiles`
-            (`NickName`, `Email`, `Password`, `Salt`, `Status`, `Role`, `DateReg`)
+        INSERT INTO `sys_accounts`
+            (`email`, `password`, `salt`, `role`, `added`)
         VALUES
-            ('{$sAdminNameDB}', '{$sSiteEmail}', '{$sAdminPasswordDB}', '{$sSaltDB}', 'Active', 3, NOW())
+            ('{$sSiteEmail}', '{$sAdminPasswordDB}', '{$sSaltDB}', 3, NOW())
     ";
     mysql_query($sAdminQuery, $vLink);