Merge branch 'migrationChanges' into 'master'

In migration script hard coded user model with id 1

See merge request !113

modules/Migration/schema/650_to_660.php

@@ -9,82 +9,77 @@
  *********************************************************************************/
 
 if(defined('VTIGER_UPGRADE')) {
-global $adb; $db = $adb;
+	global $adb, $current_user;
 
-// Migration for - #141 - Separating Create/Edit into 2 separate Role/Profile permissions
-$actionMappingResult = $adb->pquery('SELECT 1 FROM vtiger_actionmapping WHERE actionname=?', array('CreateView'));
-if (!$adb->num_rows($actionMappingResult)) {
-	$adb->pquery('INSERT INTO vtiger_actionmapping VALUES(?, ?, ?)', array(7, 'CreateView', 0));
-}
-
-$createActionResult = $adb->pquery('SELECT * FROM vtiger_profile2standardpermissions WHERE operation=?', array(1));
-$query = 'INSERT INTO vtiger_profile2standardpermissions VALUES';
-while($rowData = $adb->fetch_array($createActionResult)) {
-	$tabId			= $rowData['tabid'];
-	$profileId		= $rowData['profileid'];
-	$permissions	= $rowData['permissions'];
-	$query .= "('$profileId', '$tabId', '7', '$permissions'),";
-}
-$adb->pquery(trim($query, ','), array());
+	// Migration for - #141 - Separating Create/Edit into 2 separate Role/Profile permissions
+	$actionMappingResult = $adb->pquery('SELECT 1 FROM vtiger_actionmapping WHERE actionname=?', array('CreateView'));
+	if (!$adb->num_rows($actionMappingResult)) {
+		$adb->pquery('INSERT INTO vtiger_actionmapping VALUES(?, ?, ?)', array(7, 'CreateView', 0));
+	}
 
-require_once 'modules/Users/CreateUserPrivilegeFile.php';
-$usersResult = $adb->pquery('SELECT id FROM vtiger_users', array());
-$numOfRows = $adb->num_rows($usersResult);
-$userIdsList = array();
-for($i=0; $i<$numOfRows; $i++) {
-	$userId = $adb->query_result($usersResult, $i, 'id');
-	createUserPrivilegesfile($userId);
-}
+	$createActionResult = $adb->pquery('SELECT * FROM vtiger_profile2standardpermissions WHERE operation=?', array(1));
+	$query = 'INSERT INTO vtiger_profile2standardpermissions VALUES';
+	while($rowData = $adb->fetch_array($createActionResult)) {
+		$tabId			= $rowData['tabid'];
+		$profileId		= $rowData['profileid'];
+		$permissions	= $rowData['permissions'];
+		$query .= "('$profileId', '$tabId', '7', '$permissions'),";
+	}
+	$adb->pquery(trim($query, ','), array());
 
-echo '<br>#141 - Successfully updated create and edit permissions<br>';
+	require_once 'modules/Users/CreateUserPrivilegeFile.php';
+	$usersResult = $adb->pquery('SELECT id FROM vtiger_users', array());
+	$numOfRows = $adb->num_rows($usersResult);
+	$userIdsList = array();
+	for($i=0; $i<$numOfRows; $i++) {
+		$userId = $adb->query_result($usersResult, $i, 'id');
+		createUserPrivilegesfile($userId);
+	}
 
-// Migration for - #117 - Convert lead field mapping NULL values and redundant rows
-$phoneFieldId = getFieldid(getTabid('Leads'), 'phone');
-$db->pquery('UPDATE vtiger_convertleadmapping SET editable=? WHERE leadfid=?', array(1, $phoneFieldId));
-
-// Migration for #261 - vtiger_portalinfo doesn't update contact
-$current_user = Users_Record_Model::getInstanceFromPreferenceFile(1);
-
-$result = $db->pquery('SELECT workflow_id FROM com_vtiger_workflows WHERE test LIKE ? AND module_name=? AND defaultworkflow=?', array('%portal%', 'Contacts', 1));
-if ($db->num_rows($result) == 1) {
-	$workflowId = $db->query_result($result, 0, 'workflow_id');
-	$workflowModel = Settings_Workflows_Record_Model::getInstance($workflowId);
-	$workflowModel->set('execution_condition', 3);
-	$conditions = array(
-		array(
-			'fieldname' => 'portal',
-			'operation' => 'is',
-			'value' => '1',
-			'valuetype' => 'rawtext',
-			'joincondition' => 'and',
-			'groupjoin' => 'and',
-			'groupid' => '0'
-		),
-		array(
-			'fieldname' => 'email',
-			'operation' => 'has changed',
-			'value' => '',
-			'valuetype' => 'rawtext',
-			'joincondition' => 'and',
-			'groupjoin' => 'and',
-			'groupid' => '0',
-		),
-		array(
-			'fieldname' => 'email',
-			'operation' => 'is not empty',
-			'value' => '',
-			'valuetype' => 'rawtext',
-			'joincondition' => '',
-			'groupjoin' => 'and',
-			'groupid' => '0'
-		)
-	);
-	$workflowModel->set('conditions', $conditions);
-	$workflowModel->set('filtersavedinnew', 6);
-	$workflowModel->save();
-	echo '<b>"#261 - vtiger_portalinfo doesnt update contact"</b> fixed';
-}
-$current_user = null;
+	echo '<br>#141 - Successfully updated create and edit permissions<br>';
 
+	// Migration for - #117 - Convert lead field mapping NULL values and redundant rows
+	$phoneFieldId = getFieldid(getTabid('Leads'), 'phone');
+	$adb->pquery('UPDATE vtiger_convertleadmapping SET editable=? WHERE leadfid=?', array(1, $phoneFieldId));
 
+	// Migration for #261 - vtiger_portalinfo doesn't update contact
+	$result = $adb->pquery('SELECT workflow_id FROM com_vtiger_workflows WHERE test LIKE ? AND module_name=? AND defaultworkflow=?', array('%portal%', 'Contacts', 1));
+	if ($adb->num_rows($result) == 1) {
+		$workflowId = $adb->query_result($result, 0, 'workflow_id');
+		$workflowModel = Settings_Workflows_Record_Model::getInstance($workflowId);
+		$workflowModel->set('execution_condition', 3);
+		$conditions = array(
+			array(
+				'fieldname' => 'portal',
+				'operation' => 'is',
+				'value' => '1',
+				'valuetype' => 'rawtext',
+				'joincondition' => 'and',
+				'groupjoin' => 'and',
+				'groupid' => '0'
+			),
+			array(
+				'fieldname' => 'email',
+				'operation' => 'has changed',
+				'value' => '',
+				'valuetype' => 'rawtext',
+				'joincondition' => 'and',
+				'groupjoin' => 'and',
+				'groupid' => '0',
+			),
+			array(
+				'fieldname' => 'email',
+				'operation' => 'is not empty',
+				'value' => '',
+				'valuetype' => 'rawtext',
+				'joincondition' => '',
+				'groupjoin' => 'and',
+				'groupid' => '0'
+			)
+		);
+		$workflowModel->set('conditions', $conditions);
+		$workflowModel->set('filtersavedinnew', 6);
+		$workflowModel->save();
+		echo '<b>"#261 - vtiger_portalinfo doesnt update contact"</b> fixed';
+	}
 }