Changeset 13154 for trunk/modules/boonex/data_migration/classes/BxDataMigrationProfiles.php

Timestamp:

11/06/09 01:23:33 (3 years ago)

Author:

Alexander Ermashev

Message:

• ticket #1442;

File:

• trunk/modules/boonex/data_migration/classes/BxDataMigrationProfiles.php (modified) (4 diffs)

trunk/modules/boonex/data_migration/classes/BxDataMigrationProfiles.php

@@ -97 +97 @@
                      ";
 
-
                      $iResult = (int) $this -> oMigrationModule -> _oDb -> query($sQuery);
                      if($iResult <= 0) {
@@ -107 +106 @@
                      $this -> oMigrationModule -> _oDb -> query("UPDATE `Profiles` SET `Password` = SHA1(CONCAT(`Password`, `Salt`)) WHERE `ID` = '{$aRow['ID']}'");
 
-                     $iProfileId = $this -> oMigrationModule -> _oDb -> lastId();
-                     createUserDataFile($iProfileId);
+                     createUserDataFile($aRow['ID']);
 
                      // migrate profile's picture;
                      if($aRow['Picture'] && $this -> bAvatarInstalled) {
-                         $this -> _exportAvatar($aRow['ID'], $iProfileId, $aRow['PrimPhoto']);
+                         $this -> _exportAvatar($aRow['ID'], $aRow['PrimPhoto']);
                      }
 
@@ -211 +209 @@
          *  Function export profile's avatar;
          *  
-         * @param  : $iOldProfileId (integer);
-         * @param  : $iNewProfileId (integer); 
+         * @param  : $iProfileId (integer);
          * @param  : $sAvatarName (integer) - avatar's id;
          * @return : void;
          */
-        function _exportAvatar($iOldProfileId, $iNewProfileId, $iAvatarId)
+        function _exportAvatar($iProfileId, $iAvatarId)
         {
             //define the old avatar's name;
@@ -224 +221 @@
                 //define old avatar's path;
                 $sOldAvatarPath = $this -> oMigrationModule -> _oDb -> getExtraParam('config_profileImage')
-                            .  $iOldProfileId . '/photo_' . $sOldAvatarName;
+                            .  $iProfileId . '/photo_' . $sOldAvatarName;
 
                 require_once(BX_DIRECTORY_PATH_MODULES . 'boonex/avatar/classes/BxAvaModule.php');
                 $oAvatar = BxDolModule::getInstance('BxAvaModule');
-                $oAvatar -> _iProfileId = $iNewProfileId;
+                $oAvatar -> _iProfileId = $iProfileId;
  
                 // resize image;
-                $sNewImagePath = BX_AVA_DIR_TMP . '_' . $iNewProfileId . BX_AVA_EXT;
+                $sNewImagePath = BX_AVA_DIR_TMP . '_' . $iProfileId . BX_AVA_EXT;
 
                 $o =& BxDolImageResize::instance(BX_AVA_W, BX_AVA_W);