0.3.18

CHANGELOG

@@ -5,6 +5,7 @@ ChangeLog for PatchCableMgr
 ****************************************************
 
 Contents
+	- Changes Introduced In 0.3.18
 	- Changes Introduced In 0.3.17
 	- Changes Introduced In 0.3.16
 	- Changes Introduced In 0.3.15
@@ -36,6 +37,13 @@ Contents
 ****************************************************
 \\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\
 
+**Changes introduced in 0.3.17
+[Fix]		Error when configuring managed cable connector type as ST
+
+**Changes introduced in 0.3.17
+[Fix]		Backup export not converting HTML code to ASCII hyphen
+[Fix]		Import function not reporting line or filename in error messages
+
 **Changes introduced in 0.3.17
 [Enhance]	Increased maximum backup upload size to 10MB
 [Enhance]	Decreased maximum image upload size to 1MB

backend/export-backup.php

@@ -248,8 +248,8 @@ function createCablePaths(&$qls){
 	while($row = $qls->SQL->fetch_assoc($query)) {
 		if($row['cabinet_b_id'] != 0) {
 			$line = array(
-				$qls->App->envTreeArray[$row['cabinet_a_id']]['nameString'],
+				$qls->App->unConvertHyphens($qls->App->envTreeArray[$row['cabinet_a_id']]['nameString']),
-				$qls->App->envTreeArray[$row['cabinet_b_id']]['nameString'],
+				$qls->App->unConvertHyphens($qls->App->envTreeArray[$row['cabinet_b_id']]['nameString']),
 				$row['distance']*.001,
 				$row['notes']
 			);

backend/process_integration-data-upload.php

@@ -1198,7 +1198,7 @@ function validateImportedPaths($importedPathArray, $importedCabinetArray, &$vali
 			// Validate Cabinet Name
 			$cabinetNameArray = explode('.', $cabinetName);
 			foreach($cabinetNameArray as $cabinetNameFragment) {
-				$validate->validateNameText($cabinetNameFragment, ucfirst($column).' name '.$cabinetNameFragment.' on line '.$cabinetLine.' of "'.$cabinetFilename.'".');
+				$validate->validateNameText($cabinetNameFragment, ucfirst($column).' name '.$cabinetNameFragment.' on line '.$csvLineNumber.' of "'.$csvFilename.'".');
 			}
 			
 			// Cabinet Name Must Exist in Imported Cabinet Array
@@ -1209,10 +1209,10 @@ function validateImportedPaths($importedPathArray, $importedCabinetArray, &$vali
 		}
 		
 		// Validate Path Distance
-		$validate->validateDistance($distance, 'Path distance on line '.$cabinetLine.' of '.$cabinetFilename);
+		$validate->validateDistance($distance, 'Path distance on line '.$csvLineNumber.' of '.$csvFilename);
 		
 		// Validate Path Notes
-		$validate->validateText($notes, 'Path notes on line '.$cabinetLine.' of '.$cabinetFilename);
+		$validate->validateText($notes, 'Path notes on line '.$csvLineNumber.' of '.$csvFilename);
 		
 	}
 }
@@ -1229,7 +1229,7 @@ function validateImportedCategories($importedCategoryArray, $existingCategoryArr
 		$csvLineNumber = $category['line'];
 		
 		// Validate Category Name
-		$validate->validateNameText($categoryName, 'Category name on line '.$cabinetLine.' of "'.$cabinetFilename.'".');
+		$validate->validateNameText($categoryName, 'Category name on line '.$csvLineNumber.' of "'.$csvFilename.'".');
 		
 		// Validate Category Color
 		$validate->validateCategoryColor($categoryColor);

includes/App.class.php

@@ -249,7 +249,7 @@ var $qls;
 		$query = $qls->SQL->select('*', 'shared_cable_connectorType');
 		while ($row = $qls->SQL->fetch_assoc($query)) {
 			if(strtolower($row['name']) != 'label') {
-				$this->connectorTypeArray[$row['id']] = $row['name'];
+				$this->connectorTypeArray[$row['value']] = $row['name'];
 				$this->connectorTypeValueArray[$row['value']] = $row;
 			}
 		}

includes/Update.class.php

@@ -108,6 +108,8 @@ var $qls;
 			$this->update_0315_to_0316();
 		} else if($this->currentVersion == '0.3.16') {
 			$this->update_0316_to_0317();
+		} else if($this->currentVersion == '0.3.17') {
+			$this->update_0317_to_0318();
 		} else {
 			return true;
 		}
@@ -116,6 +118,18 @@ var $qls;
 		return false;
 	}
 	
+	/**
+	 * Update from version 0.3.17 to 0.3.18
+	 * @return Boolean
+	 */
+	function update_0317_to_0318() {
+		$incrementalVersion = '0.3.18';
+		
+		// Set app version to 0.3.18
+		$this->qls->SQL->update('app_organization_data', array('version' => $incrementalVersion), array('id' => array('=', 1)));
+		
+	}
+	
 	/**
 	 * Update from version 0.3.16 to 0.3.17
 	 * @return Boolean

includes/definitions.php

@@ -3,7 +3,7 @@
 define('AVAILABLE_CABLE_END_ID_COUNT', 100);
 define('MAX_WALLJACK_PORTID', 100);
 define('DEFAULT_FLOORPLAN_IMG', 'floorplan-default.png');
-define('PCM_VERSION', '0.3.17');
+define('PCM_VERSION', '0.3.18');
 
 define('NEW_OBJECT_PREFIX', 'Object_');
 define('NEW_LOCATION_PREFIX', 'Location_');

install/Install.class.php

@@ -37,7 +37,7 @@ class Install {
  * @var string $system_version - The version of the system
  */
 var $system_version = '3.1.11';
-var $app_version = '0.3.17';
+var $app_version = '0.3.18';
 
 /**
  * @var string $install_error - Contains the installation error