reginaldojunior / winners

app/Vendor/PHPExcel/PHPExcel/Writer/Excel2007/Theme.php

Spacing +3 added lines, -3 removed lines

@@ -147,7 +147,7 @@ 
 			}
 
 			// XML header
-			$objWriter->startDocument('1.0','UTF-8','yes');
+			$objWriter->startDocument('1.0', 'UTF-8', 'yes');
 
 			// a:theme
 			$objWriter->startElement('a:theme');
@@ -839,7 +839,7 @@ 
 		$objWriter->writeAttribute('typeface', '');
 		$objWriter->endElement();
 
-		foreach($fontSet as $fontScript => $typeface) {
+		foreach ($fontSet as $fontScript => $typeface) {
 			$objWriter->startElement('a:font');
 				$objWriter->writeAttribute('script', $fontScript);
 				$objWriter->writeAttribute('typeface', $typeface);
@@ -857,7 +857,7 @@ 
 	 */
 	private function _writeColourScheme($objWriter)
 	{
-		foreach(self::$_colourScheme as $colourName => $colourValue) {
+		foreach (self::$_colourScheme as $colourName => $colourValue) {
 			$objWriter->startElement('a:'.$colourName);
 
 				$objWriter->startElement('a:srgbClr');

app/Vendor/PHPExcel/PHPExcel/Writer/Excel2007/Workbook.php

Spacing +29 added lines, -29 removed lines

@@ -54,7 +54,7 @@ 
 		}
 
 		// XML header
-		$objWriter->startDocument('1.0','UTF-8','yes');
+		$objWriter->startDocument('1.0', 'UTF-8', 'yes');
 
 		// workbook
 		$objWriter->startElement('workbook');
@@ -83,7 +83,7 @@ 
 			$this->_writeDefinedNames($objWriter, $pPHPExcel);
 
 			// calcPr
-			$this->_writeCalcPr($objWriter,$recalcRequired);
+			$this->_writeCalcPr($objWriter, $recalcRequired);
 
 		$objWriter->endElement();
 
@@ -167,16 +167,16 @@ 
 	{
 		if ($pPHPExcel->getSecurity()->isSecurityEnabled()) {
 			$objWriter->startElement('workbookProtection');
-			$objWriter->writeAttribute('lockRevision',		($pPHPExcel->getSecurity()->getLockRevision() ? 'true' : 'false'));
-			$objWriter->writeAttribute('lockStructure', 	($pPHPExcel->getSecurity()->getLockStructure() ? 'true' : 'false'));
-			$objWriter->writeAttribute('lockWindows', 		($pPHPExcel->getSecurity()->getLockWindows() ? 'true' : 'false'));
+			$objWriter->writeAttribute('lockRevision', ($pPHPExcel->getSecurity()->getLockRevision() ? 'true' : 'false'));
+			$objWriter->writeAttribute('lockStructure', ($pPHPExcel->getSecurity()->getLockStructure() ? 'true' : 'false'));
+			$objWriter->writeAttribute('lockWindows', ($pPHPExcel->getSecurity()->getLockWindows() ? 'true' : 'false'));
 
 			if ($pPHPExcel->getSecurity()->getRevisionsPassword() != '') {
-				$objWriter->writeAttribute('revisionsPassword',	$pPHPExcel->getSecurity()->getRevisionsPassword());
+				$objWriter->writeAttribute('revisionsPassword', $pPHPExcel->getSecurity()->getRevisionsPassword());
 			}
 
 			if ($pPHPExcel->getSecurity()->getWorkbookPassword() != '') {
-				$objWriter->writeAttribute('workbookPassword',	$pPHPExcel->getSecurity()->getWorkbookPassword());
+				$objWriter->writeAttribute('workbookPassword', $pPHPExcel->getSecurity()->getWorkbookPassword());
 			}
 
 			$objWriter->endElement();
@@ -194,10 +194,10 @@ 
 	{
 		$objWriter->startElement('calcPr');
 
-		$objWriter->writeAttribute('calcId', 			'124519');
-		$objWriter->writeAttribute('calcMode', 			'auto');
+		$objWriter->writeAttribute('calcId', '124519');
+		$objWriter->writeAttribute('calcMode', 'auto');
 		//	fullCalcOnLoad isn't needed if we've recalculating for the save
-		$objWriter->writeAttribute('fullCalcOnLoad', 	($recalcRequired) ? '0' : '1');
+		$objWriter->writeAttribute('fullCalcOnLoad', ($recalcRequired) ? '0' : '1');
 
 		$objWriter->endElement();
 	}
@@ -243,12 +243,12 @@ 
 		if ($pSheetname != '') {
 			// Write sheet
 			$objWriter->startElement('sheet');
-			$objWriter->writeAttribute('name', 		$pSheetname);
-			$objWriter->writeAttribute('sheetId', 	$pSheetId);
+			$objWriter->writeAttribute('name', $pSheetname);
+			$objWriter->writeAttribute('sheetId', $pSheetId);
 			if ($sheetState != 'visible' && $sheetState != '') {
 				$objWriter->writeAttribute('state', $sheetState);
 			}
-			$objWriter->writeAttribute('r:id', 		'rId' . $pRelId);
+			$objWriter->writeAttribute('r:id', 'rId'.$pRelId);
 			$objWriter->endElement();
 		} else {
 			throw new Exception("Invalid parameters passed.");
@@ -316,15 +316,15 @@ 
 	{
 		// definedName for named range
 		$objWriter->startElement('definedName');
-		$objWriter->writeAttribute('name',			$pNamedRange->getName());
+		$objWriter->writeAttribute('name', $pNamedRange->getName());
 		if ($pNamedRange->getLocalOnly()) {
-			$objWriter->writeAttribute('localSheetId',	$pNamedRange->getScope()->getParent()->getIndex($pNamedRange->getScope()));
+			$objWriter->writeAttribute('localSheetId', $pNamedRange->getScope()->getParent()->getIndex($pNamedRange->getScope()));
 		}
 
 		// Create absolute coordinate and write as raw text
 		$range = PHPExcel_Cell::splitRange($pNamedRange->getRange());
 		for ($i = 0; $i < count($range); $i++) {
-			$range[$i][0] = '\'' . str_replace("'", "''", $pNamedRange->getWorksheet()->getTitle()) . '\'!' . PHPExcel_Cell::absoluteReference($range[$i][0]);
+			$range[$i][0] = '\''.str_replace("'", "''", $pNamedRange->getWorksheet()->getTitle()).'\'!'.PHPExcel_Cell::absoluteReference($range[$i][0]);
 			if (isset($range[$i][1])) {
 				$range[$i][1] = PHPExcel_Cell::absoluteReference($range[$i][1]);
 			}
@@ -349,23 +349,23 @@ 
 		// definedName for autoFilter
 		if ($pSheet->getAutoFilter() != '') {
 			$objWriter->startElement('definedName');
-			$objWriter->writeAttribute('name',			'_xlnm._FilterDatabase');
-			$objWriter->writeAttribute('localSheetId',	$pSheetId);
-			$objWriter->writeAttribute('hidden',		'1');
+			$objWriter->writeAttribute('name', '_xlnm._FilterDatabase');
+			$objWriter->writeAttribute('localSheetId', $pSheetId);
+			$objWriter->writeAttribute('hidden', '1');
 
 			// Create absolute coordinate and write as raw text
 			$range = PHPExcel_Cell::splitRange($pSheet->getAutoFilter());
 			$range = $range[0];
 			//	Strip any worksheet ref so we can make the cell ref absolute
-			if (strpos($range[0],'!') !== false) {
-				list($ws,$range[0]) = explode('!',$range[0]);
+			if (strpos($range[0], '!') !== false) {
+				list($ws, $range[0]) = explode('!', $range[0]);
 			}
 
 			$range[0] = PHPExcel_Cell::absoluteCoordinate($range[0]);
 			$range[1] = PHPExcel_Cell::absoluteCoordinate($range[1]);
 			$range = implode(':', $range);
 
-			$objWriter->writeRawData('\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . $range);
+			$objWriter->writeRawData('\''.str_replace("'", "''", $pSheet->getTitle()).'\'!'.$range);
 
 			$objWriter->endElement();
 		}
@@ -384,8 +384,8 @@ 
 		// definedName for PrintTitles
 		if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet() || $pSheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
 			$objWriter->startElement('definedName');
-			$objWriter->writeAttribute('name',			'_xlnm.Print_Titles');
-			$objWriter->writeAttribute('localSheetId',	$pSheetId);
+			$objWriter->writeAttribute('name', '_xlnm.Print_Titles');
+			$objWriter->writeAttribute('localSheetId', $pSheetId);
 
 			// Setting string
 			$settingString = '';
@@ -394,7 +394,7 @@ 
 			if ($pSheet->getPageSetup()->isColumnsToRepeatAtLeftSet()) {
 				$repeat = $pSheet->getPageSetup()->getColumnsToRepeatAtLeft();
 
-				$settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
+				$settingString .= '\''.str_replace("'", "''", $pSheet->getTitle()).'\'!$'.$repeat[0].':$'.$repeat[1];
 			}
 
 			// Rows to repeat
@@ -405,7 +405,7 @@ 
 
 				$repeat = $pSheet->getPageSetup()->getRowsToRepeatAtTop();
 
-				$settingString .= '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!$' . $repeat[0] . ':$' . $repeat[1];
+				$settingString .= '\''.str_replace("'", "''", $pSheet->getTitle()).'\'!$'.$repeat[0].':$'.$repeat[1];
 			}
 
 			$objWriter->writeRawData($settingString);
@@ -427,8 +427,8 @@ 
 		// definedName for PrintArea
 		if ($pSheet->getPageSetup()->isPrintAreaSet()) {
 			$objWriter->startElement('definedName');
-			$objWriter->writeAttribute('name',			'_xlnm.Print_Area');
-			$objWriter->writeAttribute('localSheetId',	$pSheetId);
+			$objWriter->writeAttribute('name', '_xlnm.Print_Area');
+			$objWriter->writeAttribute('localSheetId', $pSheetId);
 
 			// Setting string
 			$settingString = '';
@@ -440,7 +440,7 @@ 
 			foreach ($printArea as $printAreaRect) {
 				$printAreaRect[0] = PHPExcel_Cell::absoluteReference($printAreaRect[0]);
 				$printAreaRect[1] = PHPExcel_Cell::absoluteReference($printAreaRect[1]);
-				$chunks[] = '\'' . str_replace("'", "''", $pSheet->getTitle()) . '\'!' . implode(':', $printAreaRect);
+				$chunks[] = '\''.str_replace("'", "''", $pSheet->getTitle()).'\'!'.implode(':', $printAreaRect);
 			}
 
 			$objWriter->writeRawData(implode(',', $chunks));

app/Vendor/PHPExcel/PHPExcel/Writer/Excel2007/Worksheet.php

Spacing +139 added lines, -139 removed lines

@@ -46,7 +46,7 @@ 
 	 */
 	public function writeWorksheet($pSheet = null, $pStringTable = null, $includeCharts = FALSE)
 	{
-		if (!is_null($pSheet)) {
+		if ( ! is_null($pSheet)) {
 			// Create XML writer
 			$objWriter = null;
 			if ($this->getParentWriter()->getUseDiskCaching()) {
@@ -56,7 +56,7 @@ 
 			}
 
 			// XML header
-			$objWriter->startDocument('1.0','UTF-8','yes');
+			$objWriter->startDocument('1.0', 'UTF-8', 'yes');
 
 			// Worksheet
 			$objWriter->startElement('worksheet');
@@ -152,20 +152,20 @@ 
 			// tabColor
 			if ($pSheet->isTabColorSet()) {
 				$objWriter->startElement('tabColor');
-				$objWriter->writeAttribute('rgb',	$pSheet->getTabColor()->getARGB());
+				$objWriter->writeAttribute('rgb', $pSheet->getTabColor()->getARGB());
 				$objWriter->endElement();
 			}
 
 			// outlinePr
 			$objWriter->startElement('outlinePr');
-			$objWriter->writeAttribute('summaryBelow',	($pSheet->getShowSummaryBelow() ? '1' : '0'));
-			$objWriter->writeAttribute('summaryRight',	($pSheet->getShowSummaryRight() ? '1' : '0'));
+			$objWriter->writeAttribute('summaryBelow', ($pSheet->getShowSummaryBelow() ? '1' : '0'));
+			$objWriter->writeAttribute('summaryRight', ($pSheet->getShowSummaryRight() ? '1' : '0'));
 			$objWriter->endElement();
 
 			// pageSetUpPr
 			if ($pSheet->getPageSetup()->getFitToPage()) {
 				$objWriter->startElement('pageSetUpPr');
-				$objWriter->writeAttribute('fitToPage',	'1');
+				$objWriter->writeAttribute('fitToPage', '1');
 				$objWriter->endElement();
 			}
 
@@ -207,22 +207,22 @@ 
 
 			// sheetView
 			$objWriter->startElement('sheetView');
-			$objWriter->writeAttribute('tabSelected',		$sheetSelected ? '1' : '0');
-			$objWriter->writeAttribute('workbookViewId',	'0');
+			$objWriter->writeAttribute('tabSelected', $sheetSelected ? '1' : '0');
+			$objWriter->writeAttribute('workbookViewId', '0');
 
 				// Zoom scales
 				if ($pSheet->getSheetView()->getZoomScale() != 100) {
-					$objWriter->writeAttribute('zoomScale',	$pSheet->getSheetView()->getZoomScale());
+					$objWriter->writeAttribute('zoomScale', $pSheet->getSheetView()->getZoomScale());
 				}
 				if ($pSheet->getSheetView()->getZoomScaleNormal() != 100) {
-					$objWriter->writeAttribute('zoomScaleNormal',	$pSheet->getSheetView()->getZoomScaleNormal());
+					$objWriter->writeAttribute('zoomScaleNormal', $pSheet->getSheetView()->getZoomScaleNormal());
 				}
 
 				// Gridlines
 				if ($pSheet->getShowGridlines()) {
-					$objWriter->writeAttribute('showGridLines',	'true');
+					$objWriter->writeAttribute('showGridLines', 'true');
 				} else {
-					$objWriter->writeAttribute('showGridLines',	'false');
+					$objWriter->writeAttribute('showGridLines', 'false');
 				}
 
 				// Row and column headers
@@ -234,7 +234,7 @@ 
 
 				// Right-to-left
 				if ($pSheet->getRightToLeft()) {
-					$objWriter->writeAttribute('rightToLeft',	'true');
+					$objWriter->writeAttribute('rightToLeft', 'true');
 				}
 
 				$activeCell = $pSheet->getActiveCell();
@@ -254,20 +254,20 @@ 
 					$pane = 'topRight';
 					$objWriter->startElement('pane');
 					if ($xSplit > 1)
-						$objWriter->writeAttribute('xSplit',	$xSplit - 1);
+						$objWriter->writeAttribute('xSplit', $xSplit - 1);
 					if ($ySplit > 1) {
-						$objWriter->writeAttribute('ySplit',	$ySplit - 1);
+						$objWriter->writeAttribute('ySplit', $ySplit - 1);
 						$pane = ($xSplit > 1) ? 'bottomRight' : 'bottomLeft';
 					}
-					$objWriter->writeAttribute('topLeftCell',	$topLeftCell);
-					$objWriter->writeAttribute('activePane',	$pane);
-					$objWriter->writeAttribute('state',		'frozen');
+					$objWriter->writeAttribute('topLeftCell', $topLeftCell);
+					$objWriter->writeAttribute('activePane', $pane);
+					$objWriter->writeAttribute('state', 'frozen');
 					$objWriter->endElement();
 
 					if (($xSplit > 1) && ($ySplit > 1)) {
 						//	Write additional selections if more than two panes (ie both an X and a Y split)
-						$objWriter->startElement('selection');	$objWriter->writeAttribute('pane', 'topRight');		$objWriter->endElement();
-						$objWriter->startElement('selection');	$objWriter->writeAttribute('pane', 'bottomLeft');	$objWriter->endElement();
+						$objWriter->startElement('selection'); $objWriter->writeAttribute('pane', 'topRight'); $objWriter->endElement();
+						$objWriter->startElement('selection'); $objWriter->writeAttribute('pane', 'bottomLeft'); $objWriter->endElement();
 					}
 				}
 
@@ -303,8 +303,8 @@ 
 
 			// Default row height
 			if ($pSheet->getDefaultRowDimension()->getRowHeight() >= 0) {
-				$objWriter->writeAttribute('customHeight',		'true');
-				$objWriter->writeAttribute('defaultRowHeight',	PHPExcel_Shared_String::FormatNumber($pSheet->getDefaultRowDimension()->getRowHeight()));
+				$objWriter->writeAttribute('customHeight', 'true');
+				$objWriter->writeAttribute('defaultRowHeight', PHPExcel_Shared_String::FormatNumber($pSheet->getDefaultRowDimension()->getRowHeight()));
 			} else {
 				$objWriter->writeAttribute('defaultRowHeight', '14.4');
 			}
@@ -321,7 +321,7 @@ 
 					$outlineLevelRow = $dimension->getOutlineLevel();
 				}
 			}
-			$objWriter->writeAttribute('outlineLevelRow',	(int)$outlineLevelRow);
+			$objWriter->writeAttribute('outlineLevelRow', (int) $outlineLevelRow);
 
 			// Outline level - column
 			$outlineLevelCol = 0;
@@ -330,7 +330,7 @@ 
 					$outlineLevelCol = $dimension->getOutlineLevel();
 				}
 			}
-			$objWriter->writeAttribute('outlineLevelCol',	(int)$outlineLevelCol);
+			$objWriter->writeAttribute('outlineLevelCol', (int) $outlineLevelCol);
 
 		$objWriter->endElement();
 	}
@@ -345,7 +345,7 @@ 
 	private function _writeCols(PHPExcel_Shared_XMLWriter $objWriter = null, PHPExcel_Worksheet $pSheet = null)
 	{
 		// cols
-		if (count($pSheet->getColumnDimensions()) > 0)  {
+		if (count($pSheet->getColumnDimensions()) > 0) {
 			$objWriter->startElement('cols');
 
 				$pSheet->calculateColumnWidths();
@@ -354,40 +354,40 @@ 
 				foreach ($pSheet->getColumnDimensions() as $colDimension) {
 					// col
 					$objWriter->startElement('col');
-					$objWriter->writeAttribute('min',	PHPExcel_Cell::columnIndexFromString($colDimension->getColumnIndex()));
-					$objWriter->writeAttribute('max',	PHPExcel_Cell::columnIndexFromString($colDimension->getColumnIndex()));
+					$objWriter->writeAttribute('min', PHPExcel_Cell::columnIndexFromString($colDimension->getColumnIndex()));
+					$objWriter->writeAttribute('max', PHPExcel_Cell::columnIndexFromString($colDimension->getColumnIndex()));
 
 					if ($colDimension->getWidth() < 0) {
 						// No width set, apply default of 10
-						$objWriter->writeAttribute('width',		'9.10');
+						$objWriter->writeAttribute('width', '9.10');
 					} else {
 						// Width set
-						$objWriter->writeAttribute('width',		PHPExcel_Shared_String::FormatNumber($colDimension->getWidth()));
+						$objWriter->writeAttribute('width', PHPExcel_Shared_String::FormatNumber($colDimension->getWidth()));
 					}
 
 					// Column visibility
 					if ($colDimension->getVisible() == false) {
-						$objWriter->writeAttribute('hidden',		'true');
+						$objWriter->writeAttribute('hidden', 'true');
 					}
 
 					// Auto size?
 					if ($colDimension->getAutoSize()) {
-						$objWriter->writeAttribute('bestFit',		'true');
+						$objWriter->writeAttribute('bestFit', 'true');
 					}
 
 					// Custom width?
 					if ($colDimension->getWidth() != $pSheet->getDefaultColumnDimension()->getWidth()) {
-						$objWriter->writeAttribute('customWidth',	'true');
+						$objWriter->writeAttribute('customWidth', 'true');
 					}
 
 					// Collapsed
 					if ($colDimension->getCollapsed() == true) {
-						$objWriter->writeAttribute('collapsed',		'true');
+						$objWriter->writeAttribute('collapsed', 'true');
 					}
 
 					// Outline level
 					if ($colDimension->getOutlineLevel() > 0) {
-						$objWriter->writeAttribute('outlineLevel',	$colDimension->getOutlineLevel());
+						$objWriter->writeAttribute('outlineLevel', $colDimension->getOutlineLevel());
 					}
 
 					// Style
@@ -413,25 +413,25 @@ 
 		$objWriter->startElement('sheetProtection');
 
 		if ($pSheet->getProtection()->getPassword() != '') {
-			$objWriter->writeAttribute('password',				$pSheet->getProtection()->getPassword());
+			$objWriter->writeAttribute('password', $pSheet->getProtection()->getPassword());
 		}
 
-		$objWriter->writeAttribute('sheet',				($pSheet->getProtection()->getSheet()				? 'true' : 'false'));
-		$objWriter->writeAttribute('objects',				($pSheet->getProtection()->getObjects()			? 'true' : 'false'));
-		$objWriter->writeAttribute('scenarios',			($pSheet->getProtection()->getScenarios()			? 'true' : 'false'));
-		$objWriter->writeAttribute('formatCells',			($pSheet->getProtection()->getFormatCells()		? 'true' : 'false'));
-		$objWriter->writeAttribute('formatColumns',		($pSheet->getProtection()->getFormatColumns()		? 'true' : 'false'));
-		$objWriter->writeAttribute('formatRows',			($pSheet->getProtection()->getFormatRows()			? 'true' : 'false'));
-		$objWriter->writeAttribute('insertColumns',		($pSheet->getProtection()->getInsertColumns()		? 'true' : 'false'));
-		$objWriter->writeAttribute('insertRows',			($pSheet->getProtection()->getInsertRows()			? 'true' : 'false'));
-		$objWriter->writeAttribute('insertHyperlinks',		($pSheet->getProtection()->getInsertHyperlinks()	? 'true' : 'false'));
-		$objWriter->writeAttribute('deleteColumns',		($pSheet->getProtection()->getDeleteColumns()		? 'true' : 'false'));
-		$objWriter->writeAttribute('deleteRows',			($pSheet->getProtection()->getDeleteRows()			? 'true' : 'false'));
-		$objWriter->writeAttribute('selectLockedCells',	($pSheet->getProtection()->getSelectLockedCells()	? 'true' : 'false'));
-		$objWriter->writeAttribute('sort',					($pSheet->getProtection()->getSort()				? 'true' : 'false'));
-		$objWriter->writeAttribute('autoFilter',			($pSheet->getProtection()->getAutoFilter()			? 'true' : 'false'));
-		$objWriter->writeAttribute('pivotTables',			($pSheet->getProtection()->getPivotTables()		? 'true' : 'false'));
-		$objWriter->writeAttribute('selectUnlockedCells',	($pSheet->getProtection()->getSelectUnlockedCells()	? 'true' : 'false'));
+		$objWriter->writeAttribute('sheet', ($pSheet->getProtection()->getSheet() ? 'true' : 'false'));
+		$objWriter->writeAttribute('objects', ($pSheet->getProtection()->getObjects() ? 'true' : 'false'));
+		$objWriter->writeAttribute('scenarios', ($pSheet->getProtection()->getScenarios() ? 'true' : 'false'));
+		$objWriter->writeAttribute('formatCells', ($pSheet->getProtection()->getFormatCells() ? 'true' : 'false'));
+		$objWriter->writeAttribute('formatColumns', ($pSheet->getProtection()->getFormatColumns() ? 'true' : 'false'));
+		$objWriter->writeAttribute('formatRows', ($pSheet->getProtection()->getFormatRows() ? 'true' : 'false'));
+		$objWriter->writeAttribute('insertColumns', ($pSheet->getProtection()->getInsertColumns() ? 'true' : 'false'));
+		$objWriter->writeAttribute('insertRows', ($pSheet->getProtection()->getInsertRows() ? 'true' : 'false'));
+		$objWriter->writeAttribute('insertHyperlinks', ($pSheet->getProtection()->getInsertHyperlinks() ? 'true' : 'false'));
+		$objWriter->writeAttribute('deleteColumns', ($pSheet->getProtection()->getDeleteColumns() ? 'true' : 'false'));
+		$objWriter->writeAttribute('deleteRows', ($pSheet->getProtection()->getDeleteRows() ? 'true' : 'false'));
+		$objWriter->writeAttribute('selectLockedCells', ($pSheet->getProtection()->getSelectLockedCells() ? 'true' : 'false'));
+		$objWriter->writeAttribute('sort', ($pSheet->getProtection()->getSort() ? 'true' : 'false'));
+		$objWriter->writeAttribute('autoFilter', ($pSheet->getProtection()->getAutoFilter() ? 'true' : 'false'));
+		$objWriter->writeAttribute('pivotTables', ($pSheet->getProtection()->getPivotTables() ? 'true' : 'false'));
+		$objWriter->writeAttribute('selectUnlockedCells', ($pSheet->getProtection()->getSelectUnlockedCells() ? 'true' : 'false'));
 		$objWriter->endElement();
 	}
 
@@ -458,48 +458,48 @@ 
 				if ($conditional->getConditionType() != PHPExcel_Style_Conditional::CONDITION_NONE) {
 					// conditionalFormatting
 					$objWriter->startElement('conditionalFormatting');
-					$objWriter->writeAttribute('sqref',	$cellCoordinate);
+					$objWriter->writeAttribute('sqref', $cellCoordinate);
 
 						// cfRule
 						$objWriter->startElement('cfRule');
-						$objWriter->writeAttribute('type',		$conditional->getConditionType());
-						$objWriter->writeAttribute('dxfId',		$this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode( $conditional->getHashCode() ));
-						$objWriter->writeAttribute('priority',	$id++);
+						$objWriter->writeAttribute('type', $conditional->getConditionType());
+						$objWriter->writeAttribute('dxfId', $this->getParentWriter()->getStylesConditionalHashTable()->getIndexForHashCode($conditional->getHashCode()));
+						$objWriter->writeAttribute('priority', $id++);
 
 						if (($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS
 								||
 							 $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT)
 							&& $conditional->getOperatorType() != PHPExcel_Style_Conditional::OPERATOR_NONE) {
-							$objWriter->writeAttribute('operator',	$conditional->getOperatorType());
+							$objWriter->writeAttribute('operator', $conditional->getOperatorType());
 						}
 
 						if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
-							&& !is_null($conditional->getText())) {
-							$objWriter->writeAttribute('text',	$conditional->getText());
+							&& ! is_null($conditional->getText())) {
+							$objWriter->writeAttribute('text', $conditional->getText());
 						}
 
 						if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
 							&& $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_CONTAINSTEXT
-							&& !is_null($conditional->getText())) {
-							$objWriter->writeElement('formula',	'NOT(ISERROR(SEARCH("' . $conditional->getText() . '",' . $cellCoordinate . ')))');
+							&& ! is_null($conditional->getText())) {
+							$objWriter->writeElement('formula', 'NOT(ISERROR(SEARCH("'.$conditional->getText().'",'.$cellCoordinate.')))');
 						} else if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
 							&& $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_BEGINSWITH
-							&& !is_null($conditional->getText())) {
-							$objWriter->writeElement('formula',	'LEFT(' . $cellCoordinate . ',' . strlen($conditional->getText()) . ')="' . $conditional->getText() . '"');
+							&& ! is_null($conditional->getText())) {
+							$objWriter->writeElement('formula', 'LEFT('.$cellCoordinate.','.strlen($conditional->getText()).')="'.$conditional->getText().'"');
 						} else if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
 							&& $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_ENDSWITH
-							&& !is_null($conditional->getText())) {
-							$objWriter->writeElement('formula',	'RIGHT(' . $cellCoordinate . ',' . strlen($conditional->getText()) . ')="' . $conditional->getText() . '"');
+							&& ! is_null($conditional->getText())) {
+							$objWriter->writeElement('formula', 'RIGHT('.$cellCoordinate.','.strlen($conditional->getText()).')="'.$conditional->getText().'"');
 						} else if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
 							&& $conditional->getOperatorType() == PHPExcel_Style_Conditional::OPERATOR_NOTCONTAINS
-							&& !is_null($conditional->getText())) {
-							$objWriter->writeElement('formula',	'ISERROR(SEARCH("' . $conditional->getText() . '",' . $cellCoordinate . '))');
+							&& ! is_null($conditional->getText())) {
+							$objWriter->writeElement('formula', 'ISERROR(SEARCH("'.$conditional->getText().'",'.$cellCoordinate.'))');
 						} else if ($conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CELLIS
 							|| $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_CONTAINSTEXT
 							|| $conditional->getConditionType() == PHPExcel_Style_Conditional::CONDITION_EXPRESSION) {
 							foreach ($conditional->getConditions() as $formula) {
 								// Formula
-								$objWriter->writeElement('formula',	$formula);
+								$objWriter->writeElement('formula', $formula);
 							}
 						}
 
@@ -524,7 +524,7 @@ 
 		$dataValidationCollection = $pSheet->getDataValidationCollection();
 
 		// Write data validations?
-		if (!empty($dataValidationCollection)) {
+		if ( ! empty($dataValidationCollection)) {
 			$objWriter->startElement('dataValidations');
 			$objWriter->writeAttribute('count', count($dataValidationCollection));
 
@@ -543,10 +543,10 @@ 
 					$objWriter->writeAttribute('operator', $dv->getOperator());
 				}
 
-				$objWriter->writeAttribute('allowBlank',		($dv->getAllowBlank()		? '1'  : '0'));
-				$objWriter->writeAttribute('showDropDown',		(!$dv->getShowDropDown()	? '1'  : '0'));
-				$objWriter->writeAttribute('showInputMessage',	($dv->getShowInputMessage()	? '1'  : '0'));
-				$objWriter->writeAttribute('showErrorMessage',	($dv->getShowErrorMessage()	? '1'  : '0'));
+				$objWriter->writeAttribute('allowBlank', ($dv->getAllowBlank() ? '1' : '0'));
+				$objWriter->writeAttribute('showDropDown', ( ! $dv->getShowDropDown() ? '1' : '0'));
+				$objWriter->writeAttribute('showInputMessage', ($dv->getShowInputMessage() ? '1' : '0'));
+				$objWriter->writeAttribute('showErrorMessage', ($dv->getShowErrorMessage() ? '1' : '0'));
 
 				if ($dv->getErrorTitle() !== '') {
 					$objWriter->writeAttribute('errorTitle', $dv->getErrorTitle());
@@ -593,18 +593,18 @@ 
 		$relationId = 1;
 
 		// Write hyperlinks?
-		if (!empty($hyperlinkCollection)) {
+		if ( ! empty($hyperlinkCollection)) {
 			$objWriter->startElement('hyperlinks');
 
 			foreach ($hyperlinkCollection as $coordinate => $hyperlink) {
 				$objWriter->startElement('hyperlink');
 
 				$objWriter->writeAttribute('ref', $coordinate);
-				if (!$hyperlink->isInternal()) {
-					$objWriter->writeAttribute('r:id',	'rId_hyperlink_' . $relationId);
+				if ( ! $hyperlink->isInternal()) {
+					$objWriter->writeAttribute('r:id', 'rId_hyperlink_'.$relationId);
 					++$relationId;
 				} else {
-					$objWriter->writeAttribute('location',	str_replace('sheet://', '', $hyperlink->getUrl()));
+					$objWriter->writeAttribute('location', str_replace('sheet://', '', $hyperlink->getUrl()));
 				}
 
 				if ($hyperlink->getTooltip() != '') {
@@ -635,9 +635,9 @@ 
 				foreach ($pSheet->getProtectedCells() as $protectedCell => $passwordHash) {
 					// protectedRange
 					$objWriter->startElement('protectedRange');
-					$objWriter->writeAttribute('name',		'p' . md5($protectedCell));
-					$objWriter->writeAttribute('sqref',	$protectedCell);
-					$objWriter->writeAttribute('password',	$passwordHash);
+					$objWriter->writeAttribute('name', 'p'.md5($protectedCell));
+					$objWriter->writeAttribute('sqref', $protectedCell);
+					$objWriter->writeAttribute('password', $passwordHash);
 					$objWriter->endElement();
 				}
 
@@ -682,8 +682,8 @@ 
 		// printOptions
 		$objWriter->startElement('printOptions');
 
-		$objWriter->writeAttribute('gridLines',	($pSheet->getPrintGridlines() ? 'true': 'false'));
-		$objWriter->writeAttribute('gridLinesSet',	'true');
+		$objWriter->writeAttribute('gridLines', ($pSheet->getPrintGridlines() ? 'true' : 'false'));
+		$objWriter->writeAttribute('gridLinesSet', 'true');
 
 		if ($pSheet->getPageSetup()->getHorizontalCentered()) {
 			$objWriter->writeAttribute('horizontalCentered', 'true');
@@ -707,12 +707,12 @@ 
 	{
 		// pageMargins
 		$objWriter->startElement('pageMargins');
-		$objWriter->writeAttribute('left',		PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getLeft()));
-		$objWriter->writeAttribute('right',		PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getRight()));
-		$objWriter->writeAttribute('top',		PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getTop()));
-		$objWriter->writeAttribute('bottom',	PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getBottom()));
-		$objWriter->writeAttribute('header',	PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getHeader()));
-		$objWriter->writeAttribute('footer',	PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getFooter()));
+		$objWriter->writeAttribute('left', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getLeft()));
+		$objWriter->writeAttribute('right', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getRight()));
+		$objWriter->writeAttribute('top', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getTop()));
+		$objWriter->writeAttribute('bottom', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getBottom()));
+		$objWriter->writeAttribute('header', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getHeader()));
+		$objWriter->writeAttribute('footer', PHPExcel_Shared_String::FormatNumber($pSheet->getPageMargins()->getFooter()));
 		$objWriter->endElement();
 	}
 
@@ -733,12 +733,12 @@ 
 			$range = PHPExcel_Cell::splitRange($pSheet->getAutoFilter());
 			$range = $range[0];
 			//	Strip any worksheet ref
-			if (strpos($range[0],'!') !== false) {
-				list($ws,$range[0]) = explode('!',$range[0]);
+			if (strpos($range[0], '!') !== false) {
+				list($ws, $range[0]) = explode('!', $range[0]);
 			}
 			$range = implode(':', $range);
 
-			$objWriter->writeAttribute('ref',	str_replace('$','',$range));
+			$objWriter->writeAttribute('ref', str_replace('$', '', $range));
 			$objWriter->endElement();
 		}
 	}
@@ -754,24 +754,24 @@ 
 	{
 		// pageSetup
 		$objWriter->startElement('pageSetup');
-		$objWriter->writeAttribute('paperSize',		$pSheet->getPageSetup()->getPaperSize());
-		$objWriter->writeAttribute('orientation',	$pSheet->getPageSetup()->getOrientation());
+		$objWriter->writeAttribute('paperSize', $pSheet->getPageSetup()->getPaperSize());
+		$objWriter->writeAttribute('orientation', $pSheet->getPageSetup()->getOrientation());
 
-		if (!is_null($pSheet->getPageSetup()->getScale())) {
-			$objWriter->writeAttribute('scale',				 $pSheet->getPageSetup()->getScale());
+		if ( ! is_null($pSheet->getPageSetup()->getScale())) {
+			$objWriter->writeAttribute('scale', $pSheet->getPageSetup()->getScale());
 		}
-		if (!is_null($pSheet->getPageSetup()->getFitToHeight())) {
-			$objWriter->writeAttribute('fitToHeight',		 $pSheet->getPageSetup()->getFitToHeight());
+		if ( ! is_null($pSheet->getPageSetup()->getFitToHeight())) {
+			$objWriter->writeAttribute('fitToHeight', $pSheet->getPageSetup()->getFitToHeight());
 		} else {
-			$objWriter->writeAttribute('fitToHeight',		 '0');
+			$objWriter->writeAttribute('fitToHeight', '0');
 		}
-		if (!is_null($pSheet->getPageSetup()->getFitToWidth())) {
-			$objWriter->writeAttribute('fitToWidth',		 $pSheet->getPageSetup()->getFitToWidth());
+		if ( ! is_null($pSheet->getPageSetup()->getFitToWidth())) {
+			$objWriter->writeAttribute('fitToWidth', $pSheet->getPageSetup()->getFitToWidth());
 		} else {
-			$objWriter->writeAttribute('fitToWidth',		 '0');
+			$objWriter->writeAttribute('fitToWidth', '0');
 		}
-		if (!is_null($pSheet->getPageSetup()->getFirstPageNumber())) {
-			$objWriter->writeAttribute('firstPageNumber',	$pSheet->getPageSetup()->getFirstPageNumber());
+		if ( ! is_null($pSheet->getPageSetup()->getFirstPageNumber())) {
+			$objWriter->writeAttribute('firstPageNumber', $pSheet->getPageSetup()->getFirstPageNumber());
 			$objWriter->writeAttribute('useFirstPageNumber', '1');
 		}
 
@@ -789,17 +789,17 @@ 
 	{
 		// headerFooter
 		$objWriter->startElement('headerFooter');
-		$objWriter->writeAttribute('differentOddEven',	($pSheet->getHeaderFooter()->getDifferentOddEven() ? 'true' : 'false'));
-		$objWriter->writeAttribute('differentFirst',	($pSheet->getHeaderFooter()->getDifferentFirst() ? 'true' : 'false'));
-		$objWriter->writeAttribute('scaleWithDoc',		($pSheet->getHeaderFooter()->getScaleWithDocument() ? 'true' : 'false'));
-		$objWriter->writeAttribute('alignWithMargins',	($pSheet->getHeaderFooter()->getAlignWithMargins() ? 'true' : 'false'));
-
-			$objWriter->writeElement('oddHeader',		$pSheet->getHeaderFooter()->getOddHeader());
-			$objWriter->writeElement('oddFooter',		$pSheet->getHeaderFooter()->getOddFooter());
-			$objWriter->writeElement('evenHeader',		$pSheet->getHeaderFooter()->getEvenHeader());
-			$objWriter->writeElement('evenFooter',		$pSheet->getHeaderFooter()->getEvenFooter());
-			$objWriter->writeElement('firstHeader',	$pSheet->getHeaderFooter()->getFirstHeader());
-			$objWriter->writeElement('firstFooter',	$pSheet->getHeaderFooter()->getFirstFooter());
+		$objWriter->writeAttribute('differentOddEven', ($pSheet->getHeaderFooter()->getDifferentOddEven() ? 'true' : 'false'));
+		$objWriter->writeAttribute('differentFirst', ($pSheet->getHeaderFooter()->getDifferentFirst() ? 'true' : 'false'));
+		$objWriter->writeAttribute('scaleWithDoc', ($pSheet->getHeaderFooter()->getScaleWithDocument() ? 'true' : 'false'));
+		$objWriter->writeAttribute('alignWithMargins', ($pSheet->getHeaderFooter()->getAlignWithMargins() ? 'true' : 'false'));
+
+			$objWriter->writeElement('oddHeader', $pSheet->getHeaderFooter()->getOddHeader());
+			$objWriter->writeElement('oddFooter', $pSheet->getHeaderFooter()->getOddFooter());
+			$objWriter->writeElement('evenHeader', $pSheet->getHeaderFooter()->getEvenHeader());
+			$objWriter->writeElement('evenFooter', $pSheet->getHeaderFooter()->getEvenFooter());
+			$objWriter->writeElement('firstHeader', $pSheet->getHeaderFooter()->getFirstHeader());
+			$objWriter->writeElement('firstFooter', $pSheet->getHeaderFooter()->getFirstFooter());
 		$objWriter->endElement();
 	}
 
@@ -824,17 +824,17 @@ 
 		}
 
 		// rowBreaks
-		if (!empty($aRowBreaks)) {
+		if ( ! empty($aRowBreaks)) {
 			$objWriter->startElement('rowBreaks');
-			$objWriter->writeAttribute('count',			count($aRowBreaks));
-			$objWriter->writeAttribute('manualBreakCount',	count($aRowBreaks));
+			$objWriter->writeAttribute('count', count($aRowBreaks));
+			$objWriter->writeAttribute('manualBreakCount', count($aRowBreaks));
 
 				foreach ($aRowBreaks as $cell) {
 					$coords = PHPExcel_Cell::coordinateFromString($cell);
 
 					$objWriter->startElement('brk');
-					$objWriter->writeAttribute('id',	$coords[1]);
-					$objWriter->writeAttribute('man',	'1');
+					$objWriter->writeAttribute('id', $coords[1]);
+					$objWriter->writeAttribute('man', '1');
 					$objWriter->endElement();
 				}
 
@@ -842,17 +842,17 @@ 
 		}
 
 		// Second, write column breaks
-		if (!empty($aColumnBreaks)) {
+		if ( ! empty($aColumnBreaks)) {
 			$objWriter->startElement('colBreaks');
-			$objWriter->writeAttribute('count',			count($aColumnBreaks));
-			$objWriter->writeAttribute('manualBreakCount',	count($aColumnBreaks));
+			$objWriter->writeAttribute('count', count($aColumnBreaks));
+			$objWriter->writeAttribute('manualBreakCount', count($aColumnBreaks));
 
 				foreach ($aColumnBreaks as $cell) {
 					$coords = PHPExcel_Cell::coordinateFromString($cell);
 
 					$objWriter->startElement('brk');
-					$objWriter->writeAttribute('id',	PHPExcel_Cell::columnIndexFromString($coords[0]) - 1);
-					$objWriter->writeAttribute('man',	'1');
+					$objWriter->writeAttribute('id', PHPExcel_Cell::columnIndexFromString($coords[0]) - 1);
+					$objWriter->writeAttribute('man', '1');
 					$objWriter->endElement();
 				}
 
@@ -891,12 +891,12 @@ 
 				}
 
 				$currentRow = 0;
-				while($currentRow++ < $highestRow) {
+				while ($currentRow++ < $highestRow) {
 					// Get row dimension
 					$rowDimension = $pSheet->getRowDimension($currentRow);
 
 					// Write current row?
-					$writeCurrentRow =	isset($cellsByRow[$currentRow]) ||
+					$writeCurrentRow = isset($cellsByRow[$currentRow]) ||
 										$rowDimension->getRowHeight() >= 0 ||
 										$rowDimension->getVisible() == false ||
 										$rowDimension->getCollapsed() == true ||
@@ -906,39 +906,39 @@ 
 					if ($writeCurrentRow) {
 						// Start a new row
 						$objWriter->startElement('row');
-						$objWriter->writeAttribute('r',	$currentRow);
-						$objWriter->writeAttribute('spans',	'1:' . $colCount);
+						$objWriter->writeAttribute('r', $currentRow);
+						$objWriter->writeAttribute('spans', '1:'.$colCount);
 
 						// Row dimensions
 						if ($rowDimension->getRowHeight() >= 0) {
-							$objWriter->writeAttribute('customHeight',	'1');
-							$objWriter->writeAttribute('ht',			PHPExcel_Shared_String::FormatNumber($rowDimension->getRowHeight()));
+							$objWriter->writeAttribute('customHeight', '1');
+							$objWriter->writeAttribute('ht', PHPExcel_Shared_String::FormatNumber($rowDimension->getRowHeight()));
 						}
 
 						// Row visibility
 						if ($rowDimension->getVisible() == false) {
-							$objWriter->writeAttribute('hidden',		'true');
+							$objWriter->writeAttribute('hidden', 'true');
 						}
 
 						// Collapsed
 						if ($rowDimension->getCollapsed() == true) {
-							$objWriter->writeAttribute('collapsed',		'true');
+							$objWriter->writeAttribute('collapsed', 'true');
 						}
 
 						// Outline level
 						if ($rowDimension->getOutlineLevel() > 0) {
-							$objWriter->writeAttribute('outlineLevel',	$rowDimension->getOutlineLevel());
+							$objWriter->writeAttribute('outlineLevel', $rowDimension->getOutlineLevel());
 						}
 
 						// Style
 						if ($rowDimension->getXfIndex() !== null) {
-							$objWriter->writeAttribute('s',	$rowDimension->getXfIndex());
+							$objWriter->writeAttribute('s', $rowDimension->getXfIndex());
 							$objWriter->writeAttribute('customFormat', '1');
 						}
 
 						// Write cells
 						if (isset($cellsByRow[$currentRow])) {
-							foreach($cellsByRow[$currentRow] as $cellAddress) {
+							foreach ($cellsByRow[$currentRow] as $cellAddress) {
 								// Write cell
 								$this->_writeCell($objWriter, $pSheet, $cellAddress, $pStringTable, $aFlippedStringTable);
 							}
@@ -1009,8 +1009,8 @@ 
 				// Write data depending on its type
 				switch (strtolower($mappedType)) {
 					case 'inlinestr':	// Inline string
-						if (! $cellValue instanceof PHPExcel_RichText) {
-							$objWriter->writeElement('t', PHPExcel_Shared_String::ControlCharacterPHP2OOXML( htmlspecialchars($cellValue) ) );
+						if ( ! $cellValue instanceof PHPExcel_RichText) {
+							$objWriter->writeElement('t', PHPExcel_Shared_String::ControlCharacterPHP2OOXML(htmlspecialchars($cellValue)));
 						} else if ($cellValue instanceof PHPExcel_RichText) {
 							$objWriter->startElement('is');
 							$this->getParentWriter()->getWriterPart('stringtable')->writeRichText($objWriter, $cellValue);
@@ -1019,7 +1019,7 @@ 
 
 						break;
 					case 's':			// String
-						if (! $cellValue instanceof PHPExcel_RichText) {
+						if ( ! $cellValue instanceof PHPExcel_RichText) {
 							if (isset($pFlippedStringTable[$cellValue])) {
 								$objWriter->writeElement('v', $pFlippedStringTable[$cellValue]);
 							}
@@ -1030,7 +1030,7 @@ 
 						break;
 					case 'f':			// Formula
 						$attributes = $pCell->getFormulaAttributes();
-						if($attributes['t'] == 'array') {
+						if ($attributes['t'] == 'array') {
 							$objWriter->startElement('f');
 							$objWriter->writeAttribute('t', 'array');
 							$objWriter->writeAttribute('ref', $pCellAddress);
@@ -1044,7 +1044,7 @@ 
 						if ($this->getParentWriter()->getOffice2003Compatibility() === false) {
 							if ($this->getParentWriter()->getPreCalculateFormulas()) {
 								$calculatedValue = $pCell->getCalculatedValue();
-								if (!is_array($calculatedValue) && substr($calculatedValue, 0, 1) != '#') {
+								if ( ! is_array($calculatedValue) && substr($calculatedValue, 0, 1) != '#') {
 									$objWriter->writeElement('v', PHPExcel_Shared_String::FormatNumber($calculatedValue));
 								} else {
 									$objWriter->writeElement('v', '0');

Braces +6 added lines, -4 removed lines

@@ -201,8 +201,9 @@ 
 
 			// Sheet selected?
 			$sheetSelected = false;
-			if ($this->getParentWriter()->getPHPExcel()->getIndex($pSheet) == $this->getParentWriter()->getPHPExcel()->getActiveSheetIndex())
-				$sheetSelected = true;
+			if ($this->getParentWriter()->getPHPExcel()->getIndex($pSheet) == $this->getParentWriter()->getPHPExcel()->getActiveSheetIndex()) {
+							$sheetSelected = true;
+			}
 
 
 			// sheetView
@@ -253,8 +254,9 @@ 
 					// pane
 					$pane = 'topRight';
 					$objWriter->startElement('pane');
-					if ($xSplit > 1)
-						$objWriter->writeAttribute('xSplit',	$xSplit - 1);
+					if ($xSplit > 1) {
+											$objWriter->writeAttribute('xSplit',	$xSplit - 1);
+					}
 					if ($ySplit > 1) {
 						$objWriter->writeAttribute('ySplit',	$ySplit - 1);
 						$pane = ($xSplit > 1) ? 'bottomRight' : 'bottomLeft';

app/Vendor/PHPExcel/PHPExcel/Writer/Excel2007/WriterPart.php

Spacing +2 added lines, -2 removed lines

@@ -59,7 +59,7 @@ 
 	 * @throws Exception
 	 */
 	public function getParentWriter() {
-		if (!is_null($this->_parentWriter)) {
+		if ( ! is_null($this->_parentWriter)) {
 			return $this->_parentWriter;
 		} else {
 			throw new Exception("No parent PHPExcel_Writer_IWriter assigned.");
@@ -73,7 +73,7 @@ 
 	 * @throws Exception
 	 */
 	public function __construct(PHPExcel_Writer_IWriter $pWriter = null) {
-		if (!is_null($pWriter)) {
+		if ( ! is_null($pWriter)) {
 			$this->_parentWriter = $pWriter;
 		}
 	}

app/Vendor/PHPExcel/PHPExcel/Writer/Excel5.php

Indentation +25 added lines, -25 removed lines

@@ -621,33 +621,33 @@
 		  $dataProp = pack('v', 0x0002);
 		  $dataProp .= pack('v', 0x0000);
 		  // Array of vtHeadingPair
-		    // vtUnalignedString - headingString
-		      // stringType
-		      $dataProp .= pack('v', 0x001E);
-		      // padding
-		      $dataProp .= pack('v', 0x0000);
-		      // UnalignedLpstr
-		        // cch
-		        $dataProp .= pack('v', 0x0013);
-		        $dataProp .= pack('v', 0x0000);
-		        // value
-		        $dataProp .= 'Feuilles de calcul';
-		    // vtUnalignedString - headingParts
-		      // wType : 0x0003 = 32 bit signed integer
-		      $dataProp .= pack('v', 0x0300);
-		      // padding
-		      $dataProp .= pack('v', 0x0000);
-		      // value
-		      $dataProp .= pack('v', 0x0100);
-		      $dataProp .= pack('v', 0x0000);
+			// vtUnalignedString - headingString
+			  // stringType
+			  $dataProp .= pack('v', 0x001E);
+			  // padding
+			  $dataProp .= pack('v', 0x0000);
+			  // UnalignedLpstr
+				// cch
+				$dataProp .= pack('v', 0x0013);
+				$dataProp .= pack('v', 0x0000);
+				// value
+				$dataProp .= 'Feuilles de calcul';
+			// vtUnalignedString - headingParts
+			  // wType : 0x0003 = 32 bit signed integer
+			  $dataProp .= pack('v', 0x0300);
+			  // padding
+			  $dataProp .= pack('v', 0x0000);
+			  // value
+			  $dataProp .= pack('v', 0x0100);
+			  $dataProp .= pack('v', 0x0000);
+			  $dataProp .= pack('v', 0x0000);
 			  $dataProp .= pack('v', 0x0000);
-		      $dataProp .= pack('v', 0x0000);
 
-        $dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
-        					   'offset' => array('pack' => 'V'),
-        					   'type' 	=> array('pack' => 'V', 'data' => 0x100C),
-        					   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
-        $dataSection_NumProps++;
+		$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
+							   'offset' => array('pack' => 'V'),
+							   'type' 	=> array('pack' => 'V', 'data' => 0x100C),
+							   'data'	=> array('data' => $dataProp, 'length' => strlen($dataProp)));
+		$dataSection_NumProps++;
 
 		// 		4 	Section Length
 		//		4 	Property count

Switch Indentation +38 added lines, -38 removed lines

@@ -440,33 +440,33 @@ 
 
 					switch ($imageFormat) {
 
-					case 1: // GIF, not supported by BIFF8, we convert to PNG
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
-						ob_start();
-						imagepng(imagecreatefromgif($filename));
-						$blipData = ob_get_contents();
-						ob_end_clean();
-						break;
-
-					case 2: // JPEG
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
-						$blipData = file_get_contents($filename);
-						break;
-
-					case 3: // PNG
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
-						$blipData = file_get_contents($filename);
-						break;
-
-					case 6: // Windows DIB (BMP), we convert to PNG
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
-						ob_start();
-						imagepng(PHPExcel_Shared_Drawing::imagecreatefrombmp($filename));
-						$blipData = ob_get_contents();
-						ob_end_clean();
-						break;
-
-					default: continue 2;
+						case 1: // GIF, not supported by BIFF8, we convert to PNG
+							$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
+							ob_start();
+							imagepng(imagecreatefromgif($filename));
+							$blipData = ob_get_contents();
+							ob_end_clean();
+							break;
+
+						case 2: // JPEG
+							$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
+							$blipData = file_get_contents($filename);
+							break;
+
+						case 3: // PNG
+							$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
+							$blipData = file_get_contents($filename);
+							break;
+
+						case 6: // Windows DIB (BMP), we convert to PNG
+							$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
+							ob_start();
+							imagepng(PHPExcel_Shared_Drawing::imagecreatefrombmp($filename));
+							$blipData = ob_get_contents();
+							ob_end_clean();
+							break;
+
+						default: continue 2;
 
 					}
 
@@ -483,17 +483,17 @@ 
 
 					switch ($drawing->getRenderingFunction()) {
 
-					case PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG:
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
-						$renderingFunction = 'imagejpeg';
-						break;
-
-					case PHPExcel_Worksheet_MemoryDrawing::RENDERING_GIF:
-					case PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG:
-					case PHPExcel_Worksheet_MemoryDrawing::RENDERING_DEFAULT:
-						$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
-						$renderingFunction = 'imagepng';
-						break;
+						case PHPExcel_Worksheet_MemoryDrawing::RENDERING_JPEG:
+							$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG;
+							$renderingFunction = 'imagejpeg';
+							break;
+
+						case PHPExcel_Worksheet_MemoryDrawing::RENDERING_GIF:
+						case PHPExcel_Worksheet_MemoryDrawing::RENDERING_PNG:
+						case PHPExcel_Worksheet_MemoryDrawing::RENDERING_DEFAULT:
+							$blipType = PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG;
+							$renderingFunction = 'imagepng';
+							break;
 
 					}
 

Spacing +40 added lines, -40 removed lines

@@ -40,7 +40,7 @@ 
 	 *
 	 * @var boolean
 	 */
-	private $_preCalculateFormulas	= true;
+	private $_preCalculateFormulas = true;
 
 	/**
 	 * PHPExcel object
@@ -54,21 +54,21 @@ 
 	 *
 	 * @var int
 	 */
-	private $_str_total		= 0;
+	private $_str_total = 0;
 
 	/**
 	 * Number of unique shared strings in workbook
 	 *
 	 * @var int
 	 */
-	private $_str_unique	= 0;
+	private $_str_unique = 0;
 
 	/**
 	 * Array of unique shared strings in workbook
 	 *
 	 * @var array
 	 */
-	private $_str_table		= array();
+	private $_str_table = array();
 
 	/**
 	 * Color cache. Mapping between RGB value and color index.
@@ -111,9 +111,9 @@ 
 	 * @param	PHPExcel	$phpExcel	PHPExcel object
 	 */
 	public function __construct(PHPExcel $phpExcel) {
-		$this->_phpExcel	= $phpExcel;
+		$this->_phpExcel = $phpExcel;
 
-		$this->_parser		= new PHPExcel_Writer_Excel5_Parser();
+		$this->_parser = new PHPExcel_Writer_Excel5_Parser();
 	}
 
 	/**
@@ -133,7 +133,7 @@ 
 		PHPExcel_Calculation_Functions::setReturnDateType(PHPExcel_Calculation_Functions::RETURNDATE_EXCEL);
 
 		// initialize colors array
-		$this->_colors          = array();
+		$this->_colors = array();
 
 		// Initialise workbook writer
 		$this->_writerWorkbook = new PHPExcel_Writer_Excel5_Workbook($this->_phpExcel,
@@ -196,7 +196,7 @@ 
 		}
 
 		// add binary data for global workbook stream
-		$OLE->append( $this->_writerWorkbook->writeWorkbook($worksheetSizes) );
+		$OLE->append($this->_writerWorkbook->writeWorkbook($worksheetSizes));
 
 		// add binary data for sheet streams
 		for ($i = 0; $i < $countSheets; ++$i) {
@@ -205,26 +205,26 @@ 
 
 		$this->_documentSummaryInformation = $this->_writeDocumentSummaryInformation();
 		// initialize OLE Document Summary Information
-		if(isset($this->_documentSummaryInformation) && !empty($this->_documentSummaryInformation)){
-			$OLE_DocumentSummaryInformation = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs(chr(5) . 'DocumentSummaryInformation'));
+		if (isset($this->_documentSummaryInformation) && ! empty($this->_documentSummaryInformation)) {
+			$OLE_DocumentSummaryInformation = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs(chr(5).'DocumentSummaryInformation'));
 			$OLE_DocumentSummaryInformation->append($this->_documentSummaryInformation);
 		}
 
 		$this->_summaryInformation = $this->_writeSummaryInformation();
 		// initialize OLE Summary Information
-		if(isset($this->_summaryInformation) && !empty($this->_summaryInformation)){
-		  $OLE_SummaryInformation = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs(chr(5) . 'SummaryInformation'));
+		if (isset($this->_summaryInformation) && ! empty($this->_summaryInformation)) {
+		  $OLE_SummaryInformation = new PHPExcel_Shared_OLE_PPS_File(PHPExcel_Shared_OLE::Asc2Ucs(chr(5).'SummaryInformation'));
 		  $OLE_SummaryInformation->append($this->_summaryInformation);
 		}
 
 		// define OLE Parts
 		$arrRootData = array($OLE);
 		// initialize OLE Properties file
-		if(isset($OLE_SummaryInformation)){
+		if (isset($OLE_SummaryInformation)) {
 			$arrRootData[] = $OLE_SummaryInformation;
 		}
 		// initialize OLE Extended Properties file
-		if(isset($OLE_DocumentSummaryInformation)){
+		if (isset($OLE_DocumentSummaryInformation)) {
 			$arrRootData[] = $OLE_DocumentSummaryInformation;
 		}
 
@@ -385,7 +385,7 @@ 
 		}
 
 		// nothing to do if there are no drawings
-		if (!$found) {
+		if ( ! $found) {
 			return;
 		}
 
@@ -522,7 +522,7 @@ 
 	 * Build the OLE Part for DocumentSummary Information
 	 * @return string
 	 */
-	private function _writeDocumentSummaryInformation(){
+	private function _writeDocumentSummaryInformation() {
 
 		// offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
 		$data = pack('v', 0xFFFE);
@@ -556,7 +556,7 @@ 
 		$dataSection_NumProps++;
 
 		// GKPIDDSI_CATEGORY : Category
-		if($this->_phpExcel->getProperties()->getCategory()){
+		if ($this->_phpExcel->getProperties()->getCategory()) {
 			$dataProp = $this->_phpExcel->getProperties()->getCategory();
 			$dataProp = 'Test result file';
 			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x02),
@@ -653,7 +653,7 @@ 
 		//		4 	Property count
 		//		8 * $dataSection_NumProps (8 =  ID (4) + OffSet(4))
 		$dataSection_Content_Offset = 8 + $dataSection_NumProps * 8;
-		foreach ($dataSection as $dataProp){
+		foreach ($dataSection as $dataProp) {
 			// Summary
 			$dataSection_Summary .= pack($dataProp['summary']['pack'], $dataProp['summary']['data']);
 			// Offset
@@ -661,30 +661,30 @@ 
 			// DataType
 			$dataSection_Content .= pack($dataProp['type']['pack'], $dataProp['type']['data']);
 			// Data
-			if($dataProp['type']['data'] == 0x02){ // 2 byte signed integer
+			if ($dataProp['type']['data'] == 0x02) { // 2 byte signed integer
 				$dataSection_Content .= pack('V', $dataProp['data']['data']);
 
 				$dataSection_Content_Offset += 4 + 4;
 			}
-			elseif($dataProp['type']['data'] == 0x03){ // 4 byte signed integer
+			elseif ($dataProp['type']['data'] == 0x03) { // 4 byte signed integer
 				$dataSection_Content .= pack('V', $dataProp['data']['data']);
 
 				$dataSection_Content_Offset += 4 + 4;
 			}
-			elseif($dataProp['type']['data'] == 0x0B){ // Boolean
-				if($dataProp['data']['data'] == false){
+			elseif ($dataProp['type']['data'] == 0x0B) { // Boolean
+				if ($dataProp['data']['data'] == false) {
 					$dataSection_Content .= pack('V', 0x0000);
 				} else {
 					$dataSection_Content .= pack('V', 0x0001);
 				}
 				$dataSection_Content_Offset += 4 + 4;
 			}
-			elseif($dataProp['type']['data'] == 0x1E){ // null-terminated string prepended by dword string length
+			elseif ($dataProp['type']['data'] == 0x1E) { // null-terminated string prepended by dword string length
 				// Null-terminated string
 				$dataProp['data']['data'] .= chr(0);
 				$dataProp['data']['length'] += 1;
 				// Complete the string with null string for being a %4
-				$dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4)==4 ? 0 : (4 - $dataProp['data']['length'] % 4));
+				$dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4) == 4 ? 0 : (4 - $dataProp['data']['length'] % 4));
 				$dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
 
 				$dataSection_Content .= pack('V', $dataProp['data']['length']);
@@ -692,7 +692,7 @@ 
 
 				$dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
 			}
-			elseif($dataProp['type']['data'] == 0x40){ // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+			elseif ($dataProp['type']['data'] == 0x40) { // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
 				$dataSection_Content .= $dataProp['data']['data'];
 
 				$dataSection_Content_Offset += 4 + 8;
@@ -724,7 +724,7 @@ 
 	 * Build the OLE Part for Summary Information
 	 * @return string
 	 */
-	private function _writeSummaryInformation(){
+	private function _writeSummaryInformation() {
 		// offset: 0; size: 2; must be 0xFE 0xFF (UTF-16 LE byte order mark)
 		$data = pack('v', 0xFFFE);
 		// offset: 2; size: 2;
@@ -757,7 +757,7 @@ 
 		$dataSection_NumProps++;
 
 		//	Title
-		if($this->_phpExcel->getProperties()->getTitle()){
+		if ($this->_phpExcel->getProperties()->getTitle()) {
 			$dataProp = $this->_phpExcel->getProperties()->getTitle();
 			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x02),
 								   'offset' => array('pack' => 'V'),
@@ -766,7 +766,7 @@ 
 			$dataSection_NumProps++;
 		}
 		//	Subject
-		if($this->_phpExcel->getProperties()->getSubject()){
+		if ($this->_phpExcel->getProperties()->getSubject()) {
 			$dataProp = $this->_phpExcel->getProperties()->getSubject();
 			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x03),
 								   'offset' => array('pack' => 'V'),
@@ -775,7 +775,7 @@ 
 			$dataSection_NumProps++;
 		}
 		//	Author (Creator)
-		if($this->_phpExcel->getProperties()->getCreator()){
+		if ($this->_phpExcel->getProperties()->getCreator()) {
 			$dataProp = $this->_phpExcel->getProperties()->getCreator();
 			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x04),
 								   'offset' => array('pack' => 'V'),
@@ -784,7 +784,7 @@ 
 			$dataSection_NumProps++;
 		}
 		//	Keywords
-		if($this->_phpExcel->getProperties()->getKeywords()){
+		if ($this->_phpExcel->getProperties()->getKeywords()) {
 			$dataProp = $this->_phpExcel->getProperties()->getKeywords();
 			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x05),
 								   'offset' => array('pack' => 'V'),
@@ -793,7 +793,7 @@ 
 			$dataSection_NumProps++;
 		}
 		//	Comments (Description)
-		if($this->_phpExcel->getProperties()->getDescription()){
+		if ($this->_phpExcel->getProperties()->getDescription()) {
 			$dataProp = $this->_phpExcel->getProperties()->getDescription();
 			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x06),
 								   'offset' => array('pack' => 'V'),
@@ -802,7 +802,7 @@ 
 			$dataSection_NumProps++;
 		}
 		//	Last Saved By (LastModifiedBy)
-		if($this->_phpExcel->getProperties()->getLastModifiedBy()){
+		if ($this->_phpExcel->getProperties()->getLastModifiedBy()) {
 			$dataProp = $this->_phpExcel->getProperties()->getLastModifiedBy();
 			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x08),
 								   'offset' => array('pack' => 'V'),
@@ -811,7 +811,7 @@ 
 			$dataSection_NumProps++;
 		}
 		//	Created Date/Time
-		if($this->_phpExcel->getProperties()->getCreated()){
+		if ($this->_phpExcel->getProperties()->getCreated()) {
 			$dataProp = $this->_phpExcel->getProperties()->getCreated();
 			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0C),
 								   'offset' => array('pack' => 'V'),
@@ -820,7 +820,7 @@ 
 			$dataSection_NumProps++;
 		}
 		//	Modified Date/Time
-		if($this->_phpExcel->getProperties()->getModified()){
+		if ($this->_phpExcel->getProperties()->getModified()) {
 			$dataProp = $this->_phpExcel->getProperties()->getModified();
 			$dataSection[] = array('summary'=> array('pack' => 'V', 'data' => 0x0D),
 								   'offset' => array('pack' => 'V'),
@@ -840,7 +840,7 @@ 
 		//		4 	Property count
 		//		8 * $dataSection_NumProps (8 =  ID (4) + OffSet(4))
 		$dataSection_Content_Offset = 8 + $dataSection_NumProps * 8;
-		foreach ($dataSection as $dataProp){
+		foreach ($dataSection as $dataProp) {
 			// Summary
 			$dataSection_Summary .= pack($dataProp['summary']['pack'], $dataProp['summary']['data']);
 			// Offset
@@ -848,22 +848,22 @@ 
 			// DataType
 			$dataSection_Content .= pack($dataProp['type']['pack'], $dataProp['type']['data']);
 			// Data
-			if($dataProp['type']['data'] == 0x02){ // 2 byte signed integer
+			if ($dataProp['type']['data'] == 0x02) { // 2 byte signed integer
 				$dataSection_Content .= pack('V', $dataProp['data']['data']);
 
 				$dataSection_Content_Offset += 4 + 4;
 			}
-			elseif($dataProp['type']['data'] == 0x03){ // 4 byte signed integer
+			elseif ($dataProp['type']['data'] == 0x03) { // 4 byte signed integer
 				$dataSection_Content .= pack('V', $dataProp['data']['data']);
 
 				$dataSection_Content_Offset += 4 + 4;
 			}
-			elseif($dataProp['type']['data'] == 0x1E){ // null-terminated string prepended by dword string length
+			elseif ($dataProp['type']['data'] == 0x1E) { // null-terminated string prepended by dword string length
 				// Null-terminated string
 				$dataProp['data']['data'] .= chr(0);
 				$dataProp['data']['length'] += 1;
 				// Complete the string with null string for being a %4
-				$dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4)==4 ? 0 : (4 - $dataProp['data']['length'] % 4));
+				$dataProp['data']['length'] = $dataProp['data']['length'] + ((4 - $dataProp['data']['length'] % 4) == 4 ? 0 : (4 - $dataProp['data']['length'] % 4));
 				$dataProp['data']['data'] = str_pad($dataProp['data']['data'], $dataProp['data']['length'], chr(0), STR_PAD_RIGHT);
 
 				$dataSection_Content .= pack('V', $dataProp['data']['length']);
@@ -871,7 +871,7 @@ 
 
 				$dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
 			}
-			elseif($dataProp['type']['data'] == 0x40){ // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+			elseif ($dataProp['type']['data'] == 0x40) { // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
 				$dataSection_Content .= $dataProp['data']['data'];
 
 				$dataSection_Content_Offset += 4 + 8;

Braces +9 added lines, -18 removed lines

@@ -665,21 +665,18 @@ 
 				$dataSection_Content .= pack('V', $dataProp['data']['data']);
 
 				$dataSection_Content_Offset += 4 + 4;
-			}
-			elseif($dataProp['type']['data'] == 0x03){ // 4 byte signed integer
+			} elseif($dataProp['type']['data'] == 0x03){ // 4 byte signed integer
 				$dataSection_Content .= pack('V', $dataProp['data']['data']);
 
 				$dataSection_Content_Offset += 4 + 4;
-			}
-			elseif($dataProp['type']['data'] == 0x0B){ // Boolean
+			} elseif($dataProp['type']['data'] == 0x0B){ // Boolean
 				if($dataProp['data']['data'] == false){
 					$dataSection_Content .= pack('V', 0x0000);
 				} else {
 					$dataSection_Content .= pack('V', 0x0001);
 				}
 				$dataSection_Content_Offset += 4 + 4;
-			}
-			elseif($dataProp['type']['data'] == 0x1E){ // null-terminated string prepended by dword string length
+			} elseif($dataProp['type']['data'] == 0x1E){ // null-terminated string prepended by dword string length
 				// Null-terminated string
 				$dataProp['data']['data'] .= chr(0);
 				$dataProp['data']['length'] += 1;
@@ -691,13 +688,11 @@ 
 				$dataSection_Content .= $dataProp['data']['data'];
 
 				$dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
-			}
-			elseif($dataProp['type']['data'] == 0x40){ // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+			} elseif($dataProp['type']['data'] == 0x40){ // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
 				$dataSection_Content .= $dataProp['data']['data'];
 
 				$dataSection_Content_Offset += 4 + 8;
-			}
-			else {
+			} else {
 				// Data Type Not Used at the moment
 				$dataSection_Content .= $dataProp['data']['data'];
 
@@ -852,13 +847,11 @@ 
 				$dataSection_Content .= pack('V', $dataProp['data']['data']);
 
 				$dataSection_Content_Offset += 4 + 4;
-			}
-			elseif($dataProp['type']['data'] == 0x03){ // 4 byte signed integer
+			} elseif($dataProp['type']['data'] == 0x03){ // 4 byte signed integer
 				$dataSection_Content .= pack('V', $dataProp['data']['data']);
 
 				$dataSection_Content_Offset += 4 + 4;
-			}
-			elseif($dataProp['type']['data'] == 0x1E){ // null-terminated string prepended by dword string length
+			} elseif($dataProp['type']['data'] == 0x1E){ // null-terminated string prepended by dword string length
 				// Null-terminated string
 				$dataProp['data']['data'] .= chr(0);
 				$dataProp['data']['length'] += 1;
@@ -870,13 +863,11 @@ 
 				$dataSection_Content .= $dataProp['data']['data'];
 
 				$dataSection_Content_Offset += 4 + 4 + strlen($dataProp['data']['data']);
-			}
-			elseif($dataProp['type']['data'] == 0x40){ // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
+			} elseif($dataProp['type']['data'] == 0x40){ // Filetime (64-bit value representing the number of 100-nanosecond intervals since January 1, 1601)
 				$dataSection_Content .= $dataProp['data']['data'];
 
 				$dataSection_Content_Offset += 4 + 8;
-			}
-			else {
+			} else {
 				// Data Type Not Used at the moment
 			}
 		}

app/Vendor/PHPExcel/PHPExcel/Writer/Excel5/BIFFwriter.php

Spacing +20 added lines, -20 removed lines

@@ -92,7 +92,7 @@ 
 	 * @var integer
 	 * @see _addContinue()
 	 */
-	public $_limit	= 8224;
+	public $_limit = 8224;
 
 	/**
 	 * Constructor
@@ -112,14 +112,14 @@ 
 	 */
 	public static function getByteOrder()
 	{
-		if (!isset(self::$_byte_order)) {
+		if ( ! isset(self::$_byte_order)) {
 			// Check if "pack" gives the required IEEE 64bit float
 			$teststr = pack("d", 1.2345);
 			$number  = pack("C8", 0x8D, 0x97, 0x6E, 0x12, 0x83, 0xC0, 0xF3, 0x3F);
 			if ($number == $teststr) {
-				$byte_order = 0;    // Little Endian
-			} elseif ($number == strrev($teststr)){
-				$byte_order = 1;    // Big Endian
+				$byte_order = 0; // Little Endian
+			} elseif ($number == strrev($teststr)) {
+				$byte_order = 1; // Big Endian
 			} else {
 				// Give up. I'll fix this in a later version.
 				throw new Exception("Required floating point format not supported on this platform.");
@@ -141,8 +141,8 @@ 
 		if (strlen($data) - 4 > $this->_limit) {
 			$data = $this->_addContinue($data);
 		}
-		$this->_data		.= $data;
-		$this->_datasize	+= strlen($data);
+		$this->_data .= $data;
+		$this->_datasize += strlen($data);
 	}
 
 	/**
@@ -171,20 +171,20 @@ 
 	 */
 	function _storeBof($type)
 	{
-		$record  = 0x0809;			// Record identifier	(BIFF5-BIFF8)
+		$record  = 0x0809; // Record identifier	(BIFF5-BIFF8)
 		$length  = 0x0010;
 
 		// by inspection of real files, MS Office Excel 2007 writes the following
 		$unknown = pack("VV", 0x000100D1, 0x00000406);
 
-		$build   = 0x0DBB;			//	Excel 97
-		$year    = 0x07CC;			//	Excel 97
+		$build   = 0x0DBB; //	Excel 97
+		$year    = 0x07CC; //	Excel 97
 
-		$version = 0x0600;			//	BIFF8
+		$version = 0x0600; //	BIFF8
 
-		$header  = pack("vv",   $record, $length);
+		$header  = pack("vv", $record, $length);
 		$data    = pack("vvvv", $version, $type, $build, $year);
-		$this->_append($header . $data . $unknown);
+		$this->_append($header.$data.$unknown);
 	}
 
 	/**
@@ -194,8 +194,8 @@ 
 	 */
 	function _storeEof()
 	{
-		$record    = 0x000A;   // Record identifier
-		$length    = 0x0000;   // Number of bytes to follow
+		$record    = 0x000A; // Record identifier
+		$length    = 0x0000; // Number of bytes to follow
 
 		$header    = pack("vv", $record, $length);
 		$this->_append($header);
@@ -208,8 +208,8 @@ 
 	 */
 	public function writeEof()
 	{
-		$record    = 0x000A;   // Record identifier
-		$length    = 0x0000;   // Number of bytes to follow
+		$record    = 0x000A; // Record identifier
+		$length    = 0x0000; // Number of bytes to follow
 		$header    = pack("vv", $record, $length);
 		return $this->writeData($header);
 	}
@@ -229,13 +229,13 @@ 
 	function _addContinue($data)
 	{
 		$limit  = $this->_limit;
-		$record = 0x003C;         // Record identifier
+		$record = 0x003C; // Record identifier
 
 		// The first 2080/8224 bytes remain intact. However, we have to change
 		// the length field of the record.
-		$tmp = substr($data, 0, 2) . pack("v", $limit) . substr($data, 4, $limit);
+		$tmp = substr($data, 0, 2).pack("v", $limit).substr($data, 4, $limit);
 
-		$header = pack("vv", $record, $limit);  // Headers for continue records
+		$header = pack("vv", $record, $limit); // Headers for continue records
 
 		// Retrieve chunks of 2080/8224 bytes +4 for the header.
 		$data_length = strlen($data);

app/Vendor/PHPExcel/PHPExcel/Writer/Excel5/Font.php

Spacing +11 added lines, -11 removed lines

@@ -91,9 +91,9 @@ 
 		$bFamily = 0; // Font family
 		$bCharSet = PHPExcel_Shared_Font::getCharsetFromFontName($this->_font->getName()); // Character set
 
-		$record = 0x31;		// Record identifier
-		$reserved = 0x00;	// Reserved
-		$grbit = 0x00;		// Font attributes
+		$record = 0x31; // Record identifier
+		$reserved = 0x00; // Reserved
+		$grbit = 0x00; // Font attributes
 		if ($this->_font->getItalic()) {
 			$grbit |= 0x02;
 		}
@@ -108,11 +108,11 @@ 
 		}
 
 		$data = pack("vvvvvCCCC",
-			$this->_font->getSize() * 20,						//	Fontsize (in twips)
+			$this->_font->getSize() * 20, //	Fontsize (in twips)
 			$grbit,
-			$icv,												//	Colour
-			self::_mapBold($this->_font->getBold()),			//	Font weight
-			$sss,												//	Superscript/Subscript
+			$icv, //	Colour
+			self::_mapBold($this->_font->getBold()), //	Font weight
+			$sss, //	Superscript/Subscript
 			self::_mapUnderline($this->_font->getUnderline()),
 			$bFamily,
 			$bCharSet,
@@ -123,7 +123,7 @@ 
 		$length = strlen($data);
 		$header = pack("vv", $record, $length);
 
-		return($header . $data);
+		return($header.$data);
 	}
 
 	/**
@@ -134,9 +134,9 @@ 
 	 */
 	private static function _mapBold($bold) {
 		if ($bold) {
-			return 0x2BC;	//	700 = Bold font weight
+			return 0x2BC; //	700 = Bold font weight
 		}
-		return 0x190;		//	400 = Normal font weight
+		return 0x190; //	400 = Normal font weight
 	}
 
 	/**
@@ -144,7 +144,7 @@ 
 	 * @static	array of int
 	 *
 	 */
-	private static $_mapUnderline = array(	PHPExcel_Style_Font::UNDERLINE_NONE					=> 0x00,
+	private static $_mapUnderline = array(PHPExcel_Style_Font::UNDERLINE_NONE					=> 0x00,
 											PHPExcel_Style_Font::UNDERLINE_SINGLE				=> 0x01,
 											PHPExcel_Style_Font::UNDERLINE_DOUBLE				=> 0x02,
 											PHPExcel_Style_Font::UNDERLINE_SINGLEACCOUNTING		=> 0x21,

Braces +3 added lines, -2 removed lines

@@ -157,8 +157,9 @@
 	 * @return int
 	 */
 	private static function _mapUnderline($underline) {
-		if (isset(self::$_mapUnderline[$underline]))
-			return self::$_mapUnderline[$underline];
+		if (isset(self::$_mapUnderline[$underline])) {
+					return self::$_mapUnderline[$underline];
+		}
 		return 0x00;
 	}
 

app/Vendor/PHPExcel/PHPExcel/Writer/Excel5/Xf.php

Indentation +4 added lines, -4 removed lines

@@ -70,7 +70,7 @@ 
  */
 class PHPExcel_Writer_Excel5_Xf
 {
-    /**
+	/**
 	 * Style XF or a cell XF ?
 	 *
 	 * @var boolean
@@ -120,9 +120,9 @@ 
 	public $_top_color;
 
 	/**
-	* Color of the left border of the cell.
-	* @var integer
-	*/
+	 * Color of the left border of the cell.
+	 * @var integer
+	 */
 	public $_left_color;
 
 	/**

Spacing +48 added lines, -48 removed lines

@@ -139,10 +139,10 @@ 
 	 */
 	public function __construct(PHPExcel_Style $style = null)
 	{
-		$this->_isStyleXf =     false;
-		$this->_fontIndex      = 0;
+		$this->_isStyleXf = false;
+		$this->_fontIndex = 0;
 
-		$this->_numberFormatIndex     = 0;
+		$this->_numberFormatIndex = 0;
 
 		$this->_text_justlast  = 0;
 
@@ -177,16 +177,16 @@ 
 		}
 
 		// Flags to indicate if attributes have been set.
-		$atr_num     = ($this->_numberFormatIndex != 0)?1:0;
-		$atr_fnt     = ($this->_fontIndex != 0)?1:0;
-		$atr_alc     = ((int) $this->_style->getAlignment()->getWrapText())?1:0;
-		$atr_bdr     = (self::_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle())   ||
-						self::_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())      ||
-						self::_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle())     ||
-						self::_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()))?1:0;
+		$atr_num     = ($this->_numberFormatIndex != 0) ? 1 : 0;
+		$atr_fnt     = ($this->_fontIndex != 0) ? 1 : 0;
+		$atr_alc     = ((int) $this->_style->getAlignment()->getWrapText()) ? 1 : 0;
+		$atr_bdr     = (self::_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) ||
+						self::_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) ||
+						self::_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()) ||
+						self::_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle())) ? 1 : 0;
 		$atr_pat     = (($this->_fg_color != 0x40) ||
 						($this->_bg_color != 0x41) ||
-						self::_mapFillType($this->_style->getFill()->getFillType()))?1:0;
+						self::_mapFillType($this->_style->getFill()->getFillType())) ? 1 : 0;
 		$atr_prot    = self::_mapLocked($this->_style->getProtection()->getLocked())
 						| self::_mapHidden($this->_style->getProtection()->getHidden());
 
@@ -194,7 +194,7 @@ 
 		if (self::_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) == 0) {
 			$this->_bottom_color = 0;
 		}
-		if (self::_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())  == 0) {
+		if (self::_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) == 0) {
 			$this->_top_color = 0;
 		}
 		if (self::_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()) == 0) {
@@ -207,49 +207,49 @@ 
 			$this->_diag_color = 0;
 		}
 
-		$record         = 0x00E0;              // Record identifier
-		$length         = 0x0014;              // Number of bytes to follow
+		$record         = 0x00E0; // Record identifier
+		$length         = 0x0014; // Number of bytes to follow
 
-		$ifnt           = $this->_fontIndex;   // Index to FONT record
-		$ifmt           = $this->_numberFormatIndex;  // Index to FORMAT record
+		$ifnt           = $this->_fontIndex; // Index to FONT record
+		$ifmt           = $this->_numberFormatIndex; // Index to FORMAT record
 
-		$align          = $this->_mapHAlign($this->_style->getAlignment()->getHorizontal());       // Alignment
-		$align         |= (int) $this->_style->getAlignment()->getWrapText()     << 3;
-		$align         |= self::_mapVAlign($this->_style->getAlignment()->getVertical())  << 4;
+		$align          = $this->_mapHAlign($this->_style->getAlignment()->getHorizontal()); // Alignment
+		$align         |= (int) $this->_style->getAlignment()->getWrapText() << 3;
+		$align         |= self::_mapVAlign($this->_style->getAlignment()->getVertical()) << 4;
 		$align         |= $this->_text_justlast << 7;
 
-		$used_attrib    = $atr_num              << 2;
-		$used_attrib   |= $atr_fnt              << 3;
-		$used_attrib   |= $atr_alc              << 4;
-		$used_attrib   |= $atr_bdr              << 5;
-		$used_attrib   |= $atr_pat              << 6;
-		$used_attrib   |= $atr_prot             << 7;
+		$used_attrib    = $atr_num << 2;
+		$used_attrib   |= $atr_fnt << 3;
+		$used_attrib   |= $atr_alc << 4;
+		$used_attrib   |= $atr_bdr << 5;
+		$used_attrib   |= $atr_pat << 6;
+		$used_attrib   |= $atr_prot << 7;
 
-		$icv            = $this->_fg_color;      // fg and bg pattern colors
-		$icv           |= $this->_bg_color      << 7;
+		$icv            = $this->_fg_color; // fg and bg pattern colors
+		$icv           |= $this->_bg_color << 7;
 
-		$border1        = self::_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle());          // Border line style and color
-		$border1       |= self::_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle())         << 4;
-		$border1       |= self::_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle())           << 8;
-		$border1       |= self::_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle())        << 12;
-		$border1       |= $this->_left_color    << 16;
-		$border1       |= $this->_right_color   << 23;
+		$border1        = self::_mapBorderStyle($this->_style->getBorders()->getLeft()->getBorderStyle()); // Border line style and color
+		$border1       |= self::_mapBorderStyle($this->_style->getBorders()->getRight()->getBorderStyle()) << 4;
+		$border1       |= self::_mapBorderStyle($this->_style->getBorders()->getTop()->getBorderStyle()) << 8;
+		$border1       |= self::_mapBorderStyle($this->_style->getBorders()->getBottom()->getBorderStyle()) << 12;
+		$border1       |= $this->_left_color << 16;
+		$border1       |= $this->_right_color << 23;
 
 		$diagonalDirection = $this->_style->getBorders()->getDiagonalDirection();
 		$diag_tl_to_rb = $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_BOTH
 							|| $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_DOWN;
 		$diag_tr_to_lb = $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_BOTH
 							|| $diagonalDirection == PHPExcel_Style_Borders::DIAGONAL_UP;
-		$border1       |= $diag_tl_to_rb        << 30;
-		$border1       |= $diag_tr_to_lb        << 31;
+		$border1       |= $diag_tl_to_rb << 30;
+		$border1       |= $diag_tr_to_lb << 31;
 
-		$border2        = $this->_top_color;    // Border color
-		$border2       |= $this->_bottom_color   << 7;
-		$border2       |= $this->_diag_color     << 14;
-		$border2       |= self::_mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle())           << 21;
-		$border2       |= self::_mapFillType($this->_style->getFill()->getFillType())        << 26;
+		$border2        = $this->_top_color; // Border color
+		$border2       |= $this->_bottom_color << 7;
+		$border2       |= $this->_diag_color << 14;
+		$border2       |= self::_mapBorderStyle($this->_style->getBorders()->getDiagonal()->getBorderStyle()) << 21;
+		$border2       |= self::_mapFillType($this->_style->getFill()->getFillType()) << 26;
 
-		$header      = pack("vv",       $record, $length);
+		$header = pack("vv", $record, $length);
 
 		//BIFF8 options: identation, shrinkToFit and  text direction
 		$biff8_options  = $this->_style->getAlignment()->getIndent();
@@ -263,7 +263,7 @@ 
 			);
 		$data .= pack("VVv", $border1, $border2, $icv);
 
-		return($header . $data);
+		return($header.$data);
 	}
 
 	/**
@@ -381,7 +381,7 @@ 
 	 * @static	array of int
 	 *
 	 */
-	private static $_mapBorderStyle = array	( PHPExcel_Style_Border::BORDER_NONE				=> 0x00,
+	private static $_mapBorderStyle = array(PHPExcel_Style_Border::BORDER_NONE				=> 0x00,
 											  PHPExcel_Style_Border::BORDER_THIN				=> 0x01,
 											  PHPExcel_Style_Border::BORDER_MEDIUM				=> 0x02,
 											  PHPExcel_Style_Border::BORDER_DASHED				=> 0x03,
@@ -414,7 +414,7 @@ 
 	 * @static	array of int
 	 *
 	 */
-	private static $_mapFillType = array( PHPExcel_Style_Fill::FILL_NONE					=> 0x00,
+	private static $_mapFillType = array(PHPExcel_Style_Fill::FILL_NONE					=> 0x00,
 										  PHPExcel_Style_Fill::FILL_SOLID					=> 0x01,
 										  PHPExcel_Style_Fill::FILL_PATTERN_MEDIUMGRAY		=> 0x02,
 										  PHPExcel_Style_Fill::FILL_PATTERN_DARKGRAY		=> 0x03,
@@ -433,8 +433,8 @@ 
 										  PHPExcel_Style_Fill::FILL_PATTERN_LIGHTTRELLIS	=> 0x10,
 										  PHPExcel_Style_Fill::FILL_PATTERN_GRAY125			=> 0x11,
 										  PHPExcel_Style_Fill::FILL_PATTERN_GRAY0625		=> 0x12,
-										  PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR			=> 0x00,	// does not exist in BIFF8
-										  PHPExcel_Style_Fill::FILL_GRADIENT_PATH			=> 0x00,	// does not exist in BIFF8
+										  PHPExcel_Style_Fill::FILL_GRADIENT_LINEAR			=> 0x00, // does not exist in BIFF8
+										  PHPExcel_Style_Fill::FILL_GRADIENT_PATH			=> 0x00, // does not exist in BIFF8
 										);
 	/**
 	 * Map fill type
@@ -453,7 +453,7 @@ 
 	 * @static	array of int
 	 *
 	 */
-	private static $_mapHAlign = array( PHPExcel_Style_Alignment::HORIZONTAL_GENERAL			=> 0,
+	private static $_mapHAlign = array(PHPExcel_Style_Alignment::HORIZONTAL_GENERAL			=> 0,
 										PHPExcel_Style_Alignment::HORIZONTAL_LEFT				=> 1,
 										PHPExcel_Style_Alignment::HORIZONTAL_CENTER				=> 2,
 										PHPExcel_Style_Alignment::HORIZONTAL_RIGHT				=> 3,
@@ -478,7 +478,7 @@ 
 	 * @static	array of int
 	 *
 	 */
-	private static $_mapVAlign = array( PHPExcel_Style_Alignment::VERTICAL_TOP		=> 0,
+	private static $_mapVAlign = array(PHPExcel_Style_Alignment::VERTICAL_TOP		=> 0,
 										PHPExcel_Style_Alignment::VERTICAL_CENTER	=> 1,
 										PHPExcel_Style_Alignment::VERTICAL_BOTTOM	=> 2,
 										PHPExcel_Style_Alignment::VERTICAL_JUSTIFY	=> 3,

Braces +12 added lines, -8 removed lines

@@ -404,8 +404,9 @@ 
 	 * @return int
 	 */
 	private static function _mapBorderStyle($borderStyle) {
-		if (isset(self::$_mapBorderStyle[$borderStyle]))
-			return self::$_mapBorderStyle[$borderStyle];
+		if (isset(self::$_mapBorderStyle[$borderStyle])) {
+					return self::$_mapBorderStyle[$borderStyle];
+		}
 		return 0x00;
 	}
 
@@ -443,8 +444,9 @@ 
 	 * @return int
 	 */
 	private static function _mapFillType($fillType) {
-		if (isset(self::$_mapFillType[$fillType]))
-			return self::$_mapFillType[$fillType];
+		if (isset(self::$_mapFillType[$fillType])) {
+					return self::$_mapFillType[$fillType];
+		}
 		return 0x00;
 	}
 
@@ -468,8 +470,9 @@ 
 	 */
 	private function _mapHAlign($hAlign)
 	{
-		if (isset(self::$_mapHAlign[$hAlign]))
-			return self::$_mapHAlign[$hAlign];
+		if (isset(self::$_mapHAlign[$hAlign])) {
+					return self::$_mapHAlign[$hAlign];
+		}
 		return 0;
 	}
 
@@ -490,8 +493,9 @@ 
 	 * @return int
 	 */
 	private static function _mapVAlign($vAlign) {
-		if (isset(self::$_mapVAlign[$vAlign]))
-			return self::$_mapVAlign[$vAlign];
+		if (isset(self::$_mapVAlign[$vAlign])) {
+					return self::$_mapVAlign[$vAlign];
+		}
 		return 2;
 	}
 

app/Vendor/PHPExcel/PHPExcel/Writer/HTML.php

Spacing +133 added lines, -133 removed lines

@@ -46,7 +46,7 @@ 
 	 *
 	 * @var int
 	 */
-	private $_sheetIndex	= 0;
+	private $_sheetIndex = 0;
 
 	/**
 	 * Pre-calculate formulas
@@ -60,7 +60,7 @@ 
 	 *
 	 * @var string
 	 */
-	private $_imagesRoot	= '.';
+	private $_imagesRoot = '.';
 
 	/**
 	 * Use inline CSS?
@@ -95,28 +95,28 @@ 
 	 *
 	 * @var boolean
 	 */
-	private $_spansAreCalculated	= false;
+	private $_spansAreCalculated = false;
 
 	/**
 	 * Excel cells that should not be written as HTML cells
 	 *
 	 * @var array
 	 */
-	private $_isSpannedCell	= array();
+	private $_isSpannedCell = array();
 
 	/**
 	 * Excel cells that are upper-left corner in a cell merge
 	 *
 	 * @var array
 	 */
-	private $_isBaseCell	= array();
+	private $_isBaseCell = array();
 
 	/**
 	 * Excel rows that should not be written as HTML rows
 	 *
 	 * @var array
 	 */
-	private $_isSpannedRow	= array();
+	private $_isSpannedRow = array();
 
 	/**
 	 * Is the current writer creating PDF?
@@ -158,7 +158,7 @@ 
 		PHPExcel_Calculation::setArrayReturnType(PHPExcel_Calculation::RETURN_ARRAY_AS_VALUE);
 
 		// Build CSS
-		$this->buildCSS(!$this->_useInlineCss);
+		$this->buildCSS( ! $this->_useInlineCss);
 
 		// Open file
 		$fileHandle = fopen($pFilename, 'wb+');
@@ -167,10 +167,10 @@ 
 		}
 
 		// Write headers
-		fwrite($fileHandle, $this->generateHTMLHeader(!$this->_useInlineCss));
+		fwrite($fileHandle, $this->generateHTMLHeader( ! $this->_useInlineCss));
 
 		// Write navigation (tabs)
-		if ((!$this->_isPdf) && ($this->_generateSheetNavigationBlock)) {
+		if (( ! $this->_isPdf) && ($this->_generateSheetNavigationBlock)) {
 			fwrite($fileHandle, $this->generateNavigation());
 		}
 
@@ -310,38 +310,38 @@ 
 
 		// Construct HTML
 		$properties = $this->_phpExcel->getProperties();
-		$html = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">' . PHP_EOL;
-		$html .= '<!-- Generated by PHPExcel - http://www.phpexcel.net -->' . PHP_EOL;
-		$html .= '<html>' . PHP_EOL;
-		$html .= '  <head>' . PHP_EOL;
-		$html .= '	  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">' . PHP_EOL;
+		$html = '<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">'.PHP_EOL;
+		$html .= '<!-- Generated by PHPExcel - http://www.phpexcel.net -->'.PHP_EOL;
+		$html .= '<html>'.PHP_EOL;
+		$html .= '  <head>'.PHP_EOL;
+		$html .= '	  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">'.PHP_EOL;
 		if ($properties->getTitle() > '')
-			$html .= '	  <title>' . htmlspecialchars($properties->getTitle()) . '</title>' . PHP_EOL;
+			$html .= '	  <title>'.htmlspecialchars($properties->getTitle()).'</title>'.PHP_EOL;
 
 		if ($properties->getCreator() > '')
-			$html .= '	  <meta name="author" content="' . htmlspecialchars($properties->getCreator()) . '" />' . PHP_EOL;
+			$html .= '	  <meta name="author" content="'.htmlspecialchars($properties->getCreator()).'" />'.PHP_EOL;
 		if ($properties->getTitle() > '')
-			$html .= '	  <meta name="title" content="' . htmlspecialchars($properties->getTitle()) . '" />' . PHP_EOL;
+			$html .= '	  <meta name="title" content="'.htmlspecialchars($properties->getTitle()).'" />'.PHP_EOL;
 		if ($properties->getDescription() > '')
-			$html .= '	  <meta name="description" content="' . htmlspecialchars($properties->getDescription()) . '" />' . PHP_EOL;
+			$html .= '	  <meta name="description" content="'.htmlspecialchars($properties->getDescription()).'" />'.PHP_EOL;
 		if ($properties->getSubject() > '')
-			$html .= '	  <meta name="subject" content="' . htmlspecialchars($properties->getSubject()) . '" />' . PHP_EOL;
+			$html .= '	  <meta name="subject" content="'.htmlspecialchars($properties->getSubject()).'" />'.PHP_EOL;
 		if ($properties->getKeywords() > '')
-			$html .= '	  <meta name="keywords" content="' . htmlspecialchars($properties->getKeywords()) . '" />' . PHP_EOL;
+			$html .= '	  <meta name="keywords" content="'.htmlspecialchars($properties->getKeywords()).'" />'.PHP_EOL;
 		if ($properties->getCategory() > '')
-			$html .= '	  <meta name="category" content="' . htmlspecialchars($properties->getCategory()) . '" />' . PHP_EOL;
+			$html .= '	  <meta name="category" content="'.htmlspecialchars($properties->getCategory()).'" />'.PHP_EOL;
 		if ($properties->getCompany() > '')
-			$html .= '	  <meta name="company" content="' . htmlspecialchars($properties->getCompany()) . '" />' . PHP_EOL;
+			$html .= '	  <meta name="company" content="'.htmlspecialchars($properties->getCompany()).'" />'.PHP_EOL;
 		if ($properties->getManager() > '')
-			$html .= '	  <meta name="manager" content="' . htmlspecialchars($properties->getManager()) . '" />' . PHP_EOL;
+			$html .= '	  <meta name="manager" content="'.htmlspecialchars($properties->getManager()).'" />'.PHP_EOL;
 
 		if ($pIncludeStyles) {
 			$html .= $this->generateStyles(true);
 		}
 
-		$html .= '  </head>' . PHP_EOL;
-		$html .= '' . PHP_EOL;
-		$html .= '  <body>' . PHP_EOL;
+		$html .= '  </head>'.PHP_EOL;
+		$html .= ''.PHP_EOL;
+		$html .= '  <body>'.PHP_EOL;
 
 		// Return
 		return $html;
@@ -360,7 +360,7 @@ 
 		}
 
 		// Ensure that Spans have been calculated?
-		if (!$this->_spansAreCalculated) {
+		if ( ! $this->_spansAreCalculated) {
 			$this->_calculateSpans();
 		}
 
@@ -395,7 +395,7 @@ 
 			// calculate start of <tbody>, <thead>
 			$tbodyStart = $rowMin;
 			$tbodyEnd   = $rowMax;
-			$theadStart = $theadEnd   = 0; // default: no <thead>	no </thead>
+			$theadStart = $theadEnd = 0; // default: no <thead>	no </thead>
 			if ($sheet->getPageSetup()->isRowsToRepeatAtTopSet()) {
 				$rowsToRepeatAtTop = $sheet->getPageSetup()->getRowsToRepeatAtTop();
 
@@ -408,25 +408,25 @@ 
 			}
 
 			// Loop through cells
-			$row = $rowMin-1;
-			while($row++ < $rowMax) {
+			$row = $rowMin - 1;
+			while ($row++ < $rowMax) {
 				// <thead> ?
 				if ($row == $theadStart) {
-					$html .= '		<thead>' . PHP_EOL;
+					$html .= '		<thead>'.PHP_EOL;
 				}
 
 				// <tbody> ?
 				if ($row == $tbodyStart) {
-					$html .= '		<tbody>' . PHP_EOL;
+					$html .= '		<tbody>'.PHP_EOL;
 				}
 
 				// Write row if there are HTML table cells in it
-				if ( !isset($this->_isSpannedRow[$sheet->getParent()->getIndex($sheet)][$row]) ) {
+				if ( ! isset($this->_isSpannedRow[$sheet->getParent()->getIndex($sheet)][$row])) {
 					// Start a new rowData
 					$rowData = array();
 					// Loop through columns
 					$column = $dimension[0][0] - 1;
-					while($column++ < $dimension[1][0]) {
+					while ($column++ < $dimension[1][0]) {
 						// Cell exists?
 						if ($sheet->cellExistsByColumnAndRow($column, $row)) {
 							$rowData[$column] = $sheet->getCellByColumnAndRow($column, $row);
@@ -439,12 +439,12 @@ 
 
 				// </thead> ?
 				if ($row == $theadEnd) {
-					$html .= '		</thead>' . PHP_EOL;
+					$html .= '		</thead>'.PHP_EOL;
 				}
 
 				// </tbody> ?
 				if ($row == $tbodyEnd) {
-					$html .= '		</tbody>' . PHP_EOL;
+					$html .= '		</tbody>'.PHP_EOL;
 				}
 			}
 
@@ -495,14 +495,14 @@ 
 			// Loop all sheets
 			$sheetId = 0;
 
-			$html .= '<ul class="navigation">' . PHP_EOL;
+			$html .= '<ul class="navigation">'.PHP_EOL;
 
 			foreach ($sheets as $sheet) {
-				$html .= '  <li class="sheet' . $sheetId . '"><a href="#sheet' . $sheetId . '">' . $sheet->getTitle() . '</a></li>' . PHP_EOL;
+				$html .= '  <li class="sheet'.$sheetId.'"><a href="#sheet'.$sheetId.'">'.$sheet->getTitle().'</a></li>'.PHP_EOL;
 				++$sheetId;
 			}
 
-			$html .= '</ul>' . PHP_EOL;
+			$html .= '</ul>'.PHP_EOL;
 		}
 
 		return $html;
@@ -532,7 +532,7 @@ 
 					}
 
 					// Prepend images root
-					$filename = $this->getImagesRoot() . $filename;
+					$filename = $this->getImagesRoot().$filename;
 
 					// Strip off eventual '.'
 					if (substr($filename, 0, 1) == '.' && substr($filename, 0, 2) != './') {
@@ -543,7 +543,7 @@ 
 					$filename = htmlspecialchars($filename);
 
 					$html .= PHP_EOL;
-					$html .= '		<img style="position: relative; left: ' . $drawing->getOffsetX() . 'px; top: ' . $drawing->getOffsetY() . 'px; width: ' . $drawing->getWidth() . 'px; height: ' . $drawing->getHeight() . 'px;" src="' . $filename . '" border="0" width="' . $drawing->getWidth() . '" height="' . $drawing->getHeight() . '" />' . PHP_EOL;
+					$html .= '		<img style="position: relative; left: '.$drawing->getOffsetX().'px; top: '.$drawing->getOffsetY().'px; width: '.$drawing->getWidth().'px; height: '.$drawing->getHeight().'px;" src="'.$filename.'" border="0" width="'.$drawing->getWidth().'" height="'.$drawing->getHeight().'" />'.PHP_EOL;
 				}
 			}
 		}
@@ -573,20 +573,20 @@ 
 
 		// Start styles
 		if ($generateSurroundingHTML) {
-			$html .= '	<style type="text/css">' . PHP_EOL;
-			$html .= '	  html { ' . $this->_assembleCSS($css['html']) . ' }' . PHP_EOL;
+			$html .= '	<style type="text/css">'.PHP_EOL;
+			$html .= '	  html { '.$this->_assembleCSS($css['html']).' }'.PHP_EOL;
 		}
 
 		// Write all other styles
 		foreach ($css as $styleName => $styleDefinition) {
 			if ($styleName != 'html') {
-				$html .= '	  ' . $styleName . ' { ' . $this->_assembleCSS($styleDefinition) . ' }' . PHP_EOL;
+				$html .= '	  '.$styleName.' { '.$this->_assembleCSS($styleDefinition).' }'.PHP_EOL;
 			}
 		}
 
 		// End styles
 		if ($generateSurroundingHTML) {
-			$html .= '	</style>' . PHP_EOL;
+			$html .= '	</style>'.PHP_EOL;
 		}
 
 		// Return
@@ -607,12 +607,12 @@ 
 		}
 
 		// Cached?
-		if (!is_null($this->_cssStyles)) {
+		if ( ! is_null($this->_cssStyles)) {
 			return $this->_cssStyles;
 		}
 
 		// Ensure that spans have been calculated
-		if (!$this->_spansAreCalculated) {
+		if ( ! $this->_spansAreCalculated) {
 			$this->_calculateSpans();
 		}
 
@@ -622,8 +622,8 @@ 
 		// Start styles
 		if ($generateSurroundingHTML) {
 			// html { }
-			$css['html']['font-family']	  = 'Calibri, Arial, Helvetica, sans-serif';
-			$css['html']['font-size']		= '11pt';
+			$css['html']['font-family'] = 'Calibri, Arial, Helvetica, sans-serif';
+			$css['html']['font-size'] = '11pt';
 			$css['html']['background-color'] = 'white';
 		}
 
@@ -655,7 +655,7 @@ 
 
 		// Calculate cell style hashes
 		foreach ($this->_phpExcel->getCellXfCollection() as $index => $style) {
-			$css['td.style' . $index] = $this->_createCSSStyle( $style );
+			$css['td.style'.$index] = $this->_createCSSStyle($style);
 		}
 
 		// Fetch sheets
@@ -678,9 +678,9 @@ 
 			// col elements, initialize
 			$highestColumnIndex = PHPExcel_Cell::columnIndexFromString($sheet->getHighestColumn()) - 1;
 			$column = -1;
-			while($column++ < $highestColumnIndex) {
+			while ($column++ < $highestColumnIndex) {
 				$this->_columnWidths[$sheetIndex][$column] = 42; // approximation
-				$css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = '42pt';
+				$css['table.sheet'.$sheetIndex.' col.col'.$column]['width'] = '42pt';
 			}
 
 			// col elements, loop through columnDimensions and set width
@@ -689,11 +689,11 @@ 
 					$width = PHPExcel_Shared_Drawing::pixelsToPoints($width);
 					$column = PHPExcel_Cell::columnIndexFromString($columnDimension->getColumnIndex()) - 1;
 					$this->_columnWidths[$sheetIndex][$column] = $width;
-					$css['table.sheet' . $sheetIndex . ' col.col' . $column]['width'] = $width . 'pt';
+					$css['table.sheet'.$sheetIndex.' col.col'.$column]['width'] = $width.'pt';
 
 					if ($columnDimension->getVisible() === false) {
-						$css['table.sheet' . $sheetIndex . ' col.col' . $column]['visibility'] = 'collapse';
-						$css['table.sheet' . $sheetIndex . ' col.col' . $column]['*display'] = 'none'; // target IE6+7
+						$css['table.sheet'.$sheetIndex.' col.col'.$column]['visibility'] = 'collapse';
+						$css['table.sheet'.$sheetIndex.' col.col'.$column]['*display'] = 'none'; // target IE6+7
 					}
 				}
 			}
@@ -702,17 +702,17 @@ 
 			$rowDimension = $sheet->getDefaultRowDimension();
 
 			// table.sheetN tr { }
-			$css['table.sheet' . $sheetIndex . ' tr'] = array();
+			$css['table.sheet'.$sheetIndex.' tr'] = array();
 
 			if ($rowDimension->getRowHeight() == -1) {
 				$pt_height = PHPExcel_Shared_Font::getDefaultRowHeightByFont($this->_phpExcel->getDefaultStyle()->getFont());
 			} else {
 				$pt_height = $rowDimension->getRowHeight();
 			}
-			$css['table.sheet' . $sheetIndex . ' tr']['height'] = $pt_height . 'pt';
+			$css['table.sheet'.$sheetIndex.' tr']['height'] = $pt_height.'pt';
 			if ($rowDimension->getVisible() === false) {
-				$css['table.sheet' . $sheetIndex . ' tr']['display']	= 'none';
-				$css['table.sheet' . $sheetIndex . ' tr']['visibility'] = 'hidden';
+				$css['table.sheet'.$sheetIndex.' tr']['display'] = 'none';
+				$css['table.sheet'.$sheetIndex.' tr']['visibility'] = 'hidden';
 			}
 
 			// Calculate row heights
@@ -720,17 +720,17 @@ 
 				$row = $rowDimension->getRowIndex() - 1;
 
 				// table.sheetN tr.rowYYYYYY { }
-				$css['table.sheet' . $sheetIndex . ' tr.row' . $row] = array();
+				$css['table.sheet'.$sheetIndex.' tr.row'.$row] = array();
 
 				if ($rowDimension->getRowHeight() == -1) {
 					$pt_height = PHPExcel_Shared_Font::getDefaultRowHeightByFont($this->_phpExcel->getDefaultStyle()->getFont());
 				} else {
 					$pt_height = $rowDimension->getRowHeight();
 				}
-				$css['table.sheet' . $sheetIndex . ' tr.row' . $row]['height'] = $pt_height . 'pt';
+				$css['table.sheet'.$sheetIndex.' tr.row'.$row]['height'] = $pt_height.'pt';
 				if ($rowDimension->getVisible() === false) {
-					$css['table.sheet' . $sheetIndex . ' tr.row' . $row]['display'] = 'none';
-					$css['table.sheet' . $sheetIndex . ' tr.row' . $row]['visibility'] = 'hidden';
+					$css['table.sheet'.$sheetIndex.' tr.row'.$row]['display'] = 'none';
+					$css['table.sheet'.$sheetIndex.' tr.row'.$row]['visibility'] = 'hidden';
 				}
 			}
 		}
@@ -811,9 +811,9 @@ 
 			$css['font-style'] = 'italic';
 		}
 
-		$css['color']		= '#' . $pStyle->getColor()->getRGB();
-		$css['font-family']	= '\'' . $pStyle->getName() . '\'';
-		$css['font-size']	= $pStyle->getSize() . 'pt';
+		$css['color'] = '#'.$pStyle->getColor()->getRGB();
+		$css['font-family'] = '\''.$pStyle->getName().'\'';
+		$css['font-size'] = $pStyle->getSize().'pt';
 
 		// Return
 		return $css;
@@ -830,8 +830,8 @@ 
 		$css = array();
 
 		// Create CSS
-		$css['border-bottom']	= $this->_createCSSStyleBorder($pStyle->getBottom());
-		$css['border-top']		= $this->_createCSSStyleBorder($pStyle->getTop());
+		$css['border-bottom'] = $this->_createCSSStyleBorder($pStyle->getBottom());
+		$css['border-top'] = $this->_createCSSStyleBorder($pStyle->getTop());
 		$css['border-left']		= $this->_createCSSStyleBorder($pStyle->getLeft());
 		$css['border-right']	= $this->_createCSSStyleBorder($pStyle->getRight());
 
@@ -847,7 +847,7 @@ 
 	 */
 	private function _createCSSStyleBorder(PHPExcel_Style_Border $pStyle) {
 		// Create CSS
-		$css = $this->_mapBorderStyle($pStyle->getBorderStyle()) . ' #' . $pStyle->getColor()->getRGB();
+		$css = $this->_mapBorderStyle($pStyle->getBorderStyle()).' #'.$pStyle->getColor()->getRGB();
 
 		// Return
 		return $css;
@@ -865,7 +865,7 @@ 
 
 		// Create CSS
 		$value = $pStyle->getFillType() == PHPExcel_Style_Fill::FILL_NONE ?
-			'white' : '#' . $pStyle->getStartColor()->getRGB();
+			'white' : '#'.$pStyle->getStartColor()->getRGB();
 		$css['background-color'] = $value;
 
 		// Return
@@ -878,8 +878,8 @@ 
 	public function generateHTMLFooter() {
 		// Construct HTML
 		$html = '';
-		$html .= '  </body>' . PHP_EOL;
-		$html .= '</html>' . PHP_EOL;
+		$html .= '  </body>'.PHP_EOL;
+		$html .= '</html>'.PHP_EOL;
 
 		// Return
 		return $html;
@@ -898,30 +898,30 @@ 
 		// Construct HTML
 		$html = '';
 
-		if (!$this->_useInlineCss) {
+		if ( ! $this->_useInlineCss) {
 			$gridlines = $pSheet->getShowGridLines() ? ' gridlines' : '';
-			$html .= '	<table border="0" cellpadding="0" cellspacing="0" id="sheet' . $sheetIndex . '" class="sheet' . $sheetIndex . $gridlines . '">' . PHP_EOL;
+			$html .= '	<table border="0" cellpadding="0" cellspacing="0" id="sheet'.$sheetIndex.'" class="sheet'.$sheetIndex.$gridlines.'">'.PHP_EOL;
 		} else {
 			$style = isset($this->_cssStyles['table']) ?
 				$this->_assembleCSS($this->_cssStyles['table']) : '';
 
 			if ($this->_isPdf && $pSheet->getShowGridLines()) {
-				$html .= '	<table border="1" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="4" style="' . $style . '">' . PHP_EOL;
+				$html .= '	<table border="1" cellpadding="1" id="sheet'.$sheetIndex.'" cellspacing="4" style="'.$style.'">'.PHP_EOL;
 			} else {
-				$html .= '	<table border="0" cellpadding="1" id="sheet' . $sheetIndex . '" cellspacing="4" style="' . $style . '">' . PHP_EOL;
+				$html .= '	<table border="0" cellpadding="1" id="sheet'.$sheetIndex.'" cellspacing="4" style="'.$style.'">'.PHP_EOL;
 			}
 		}
 
 		// Write <col> elements
 		$highestColumnIndex = PHPExcel_Cell::columnIndexFromString($pSheet->getHighestColumn()) - 1;
 		$i = -1;
-		while($i++ < $highestColumnIndex) {
-			if (!$this->_useInlineCss) {
-				$html .= '		<col class="col' . $i . '">' . PHP_EOL;
+		while ($i++ < $highestColumnIndex) {
+			if ( ! $this->_useInlineCss) {
+				$html .= '		<col class="col'.$i.'">'.PHP_EOL;
 			} else {
-				$style = isset($this->_cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) ?
-					$this->_assembleCSS($this->_cssStyles['table.sheet' . $sheetIndex . ' col.col' . $i]) : '';
-				$html .= '		<col style="' . $style . '">' . PHP_EOL;
+				$style = isset($this->_cssStyles['table.sheet'.$sheetIndex.' col.col'.$i]) ?
+					$this->_assembleCSS($this->_cssStyles['table.sheet'.$sheetIndex.' col.col'.$i]) : '';
+				$html .= '		<col style="'.$style.'">'.PHP_EOL;
 			}
 		}
 
@@ -937,7 +937,7 @@ 
 	private function _generateTableFooter() {
 		// Construct HTML
 		$html = '';
-		$html .= '	</table>' . PHP_EOL;
+		$html .= '	</table>'.PHP_EOL;
 
 		// Return
 		return $html;
@@ -965,7 +965,7 @@ 
 				$breaks = $pSheet->getBreaks();
 
 				// check if a break is needed before this row
-				if (isset($breaks['A' . $pRow])) {
+				if (isset($breaks['A'.$pRow])) {
 					// close table: </table>
 					$html .= $this->_generateTableFooter();
 
@@ -978,27 +978,27 @@ 
 			}
 
 			// Write row start
-			if (!$this->_useInlineCss) {
-				$html .= '		  <tr class="row' . $pRow . '">' . PHP_EOL;
+			if ( ! $this->_useInlineCss) {
+				$html .= '		  <tr class="row'.$pRow.'">'.PHP_EOL;
 			} else {
-				$style = isset($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow])
-					? $this->_assembleCSS($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]) : '';
+				$style = isset($this->_cssStyles['table.sheet'.$sheetIndex.' tr.row'.$pRow])
+					? $this->_assembleCSS($this->_cssStyles['table.sheet'.$sheetIndex.' tr.row'.$pRow]) : '';
 
-				$html .= '		  <tr style="' . $style . '">' . PHP_EOL;
+				$html .= '		  <tr style="'.$style.'">'.PHP_EOL;
 			}
 
 			// Write cells
 			$colNum = 0;
 			foreach ($pValues as $cell) {
-				$coordinate = PHPExcel_Cell::stringFromColumnIndex($colNum) . ($pRow + 1);
+				$coordinate = PHPExcel_Cell::stringFromColumnIndex($colNum).($pRow + 1);
 
-				if (!$this->_useInlineCss) {
+				if ( ! $this->_useInlineCss) {
 					$cssClass = '';
-					$cssClass = 'column' . $colNum;
+					$cssClass = 'column'.$colNum;
 				} else {
 					$cssClass = array();
-					if (isset($this->_cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum])) {
-						$this->_cssStyles['table.sheet' . $sheetIndex . ' td.column' . $colNum];
+					if (isset($this->_cssStyles['table.sheet'.$sheetIndex.' td.column'.$colNum])) {
+						$this->_cssStyles['table.sheet'.$sheetIndex.' td.column'.$colNum];
 					}
 				}
 				$colSpan = 1;
@@ -1019,7 +1019,7 @@ 
 						foreach ($elements as $element) {
 							// Rich text start?
 							if ($element instanceof PHPExcel_RichText_Run) {
-								$cellData .= '<span style="' . $this->_assembleCSS($this->_createCSSStyleFont($element->getFont())) . '">';
+								$cellData .= '<span style="'.$this->_assembleCSS($this->_createCSSStyleFont($element->getFont())).'">';
 
 								if ($element->getFont()->getSuperScript()) {
 									$cellData .= '<sup>';
@@ -1046,19 +1046,19 @@ 
 						if ($this->_preCalculateFormulas) {
 							$cellData = PHPExcel_Style_NumberFormat::toFormattedString(
 								$cell->getCalculatedValue(),
-								$pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getNumberFormat()->getFormatCode(),
+								$pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode(),
 								array($this, 'formatColor')
 							);
 						} else {
 							$cellData = PHPExcel_Style_NumberFormat::ToFormattedString(
 								$cell->getValue(),
-								$pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getNumberFormat()->getFormatCode(),
+								$pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getNumberFormat()->getFormatCode(),
 								array($this, 'formatColor')
 							);
 						}
-						if ($pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getFont()->getSuperScript()) {
+						if ($pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSuperScript()) {
 							$cellData = '<sup>'.$cellData.'</sup>';
-						} elseif ($pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() )->getFont()->getSubScript()) {
+						} elseif ($pSheet->getParent()->getCellXfByIndex($cell->getXfIndex())->getFont()->getSubScript()) {
 							$cellData = '<sub>'.$cellData.'</sub>';
 						}
 					}
@@ -1071,32 +1071,32 @@ 
 					$cellData = nl2br($cellData);
 
 					// Extend CSS class?
-					if (!$this->_useInlineCss) {
-						$cssClass .= ' style' . $cell->getXfIndex();
-						$cssClass .= ' ' . $cell->getDataType();
+					if ( ! $this->_useInlineCss) {
+						$cssClass .= ' style'.$cell->getXfIndex();
+						$cssClass .= ' '.$cell->getDataType();
 					} else {
-						if (isset($this->_cssStyles['td.style' . $cell->getXfIndex()])) {
-							$cssClass = array_merge($cssClass, $this->_cssStyles['td.style' . $cell->getXfIndex()]);
+						if (isset($this->_cssStyles['td.style'.$cell->getXfIndex()])) {
+							$cssClass = array_merge($cssClass, $this->_cssStyles['td.style'.$cell->getXfIndex()]);
 						}
 
 						// General horizontal alignment: Actual horizontal alignment depends on dataType
-						$sharedStyle = $pSheet->getParent()->getCellXfByIndex( $cell->getXfIndex() );
+						$sharedStyle = $pSheet->getParent()->getCellXfByIndex($cell->getXfIndex());
 						if ($sharedStyle->getAlignment()->getHorizontal() == PHPExcel_Style_Alignment::HORIZONTAL_GENERAL
-							&& isset($this->_cssStyles['.' . $cell->getDataType()]['text-align']))
+							&& isset($this->_cssStyles['.'.$cell->getDataType()]['text-align']))
 						{
-							$cssClass['text-align'] = $this->_cssStyles['.' . $cell->getDataType()]['text-align'];
+							$cssClass['text-align'] = $this->_cssStyles['.'.$cell->getDataType()]['text-align'];
 						}
 					}
 				}
 
 				// Hyperlink?
-				if ($pSheet->hyperlinkExists($coordinate) && !$pSheet->getHyperlink($coordinate)->isInternal()) {
-					$cellData = '<a href="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getUrl()) . '" title="' . htmlspecialchars($pSheet->getHyperlink($coordinate)->getTooltip()) . '">' . $cellData . '</a>';
+				if ($pSheet->hyperlinkExists($coordinate) && ! $pSheet->getHyperlink($coordinate)->isInternal()) {
+					$cellData = '<a href="'.htmlspecialchars($pSheet->getHyperlink($coordinate)->getUrl()).'" title="'.htmlspecialchars($pSheet->getHyperlink($coordinate)->getTooltip()).'">'.$cellData.'</a>';
 				}
 
 				// Should the cell be written or is it swallowed by a rowspan or colspan?
-				$writeCell = ! ( isset($this->_isSpannedCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum])
-							&& $this->_isSpannedCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum] );
+				$writeCell = ! (isset($this->_isSpannedCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum])
+							&& $this->_isSpannedCell[$pSheet->getParent()->getIndex($pSheet)][$pRow + 1][$colNum]);
 
 				// Colspan and Rowspan
 				$colspan = 1;
@@ -1111,8 +1111,8 @@ 
 				if ($writeCell) {
 					// Column start
 					$html .= '			<td';
-						if (!$this->_useInlineCss) {
-							$html .= ' class="' . $cssClass . '"';
+						if ( ! $this->_useInlineCss) {
+							$html .= ' class="'.$cssClass.'"';
 						} else {
 							//** Necessary redundant code for the sake of PHPExcel_Writer_PDF **
 							// We must explicitly write the width of the <td> element because TCPDF
@@ -1120,28 +1120,28 @@ 
 							$width = 0;
 							$i = $colNum - 1;
 							$e = $colNum + $colSpan - 1;
-							while($i++ < $e) {
+							while ($i++ < $e) {
 								if (isset($this->_columnWidths[$sheetIndex][$i])) {
 									$width += $this->_columnWidths[$sheetIndex][$i];
 								}
 							}
-							$cssClass['width'] = $width . 'pt';
+							$cssClass['width'] = $width.'pt';
 
 							// We must also explicitly write the height of the <td> element because TCPDF
 							// does not recognize e.g. <tr style="height:50pt">
-							if (isset($this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]['height'])) {
-								$height = $this->_cssStyles['table.sheet' . $sheetIndex . ' tr.row' . $pRow]['height'];
+							if (isset($this->_cssStyles['table.sheet'.$sheetIndex.' tr.row'.$pRow]['height'])) {
+								$height = $this->_cssStyles['table.sheet'.$sheetIndex.' tr.row'.$pRow]['height'];
 								$cssClass['height'] = $height;
 							}
 							//** end of redundant code **
 
-							$html .= ' style="' . $this->_assembleCSS($cssClass) . '"';
+							$html .= ' style="'.$this->_assembleCSS($cssClass).'"';
 						}
 						if ($colSpan > 1) {
-							$html .= ' colspan="' . $colSpan . '"';
+							$html .= ' colspan="'.$colSpan.'"';
 						}
 						if ($rowSpan > 1) {
-							$html .= ' rowspan="' . $rowSpan . '"';
+							$html .= ' rowspan="'.$rowSpan.'"';
 						}
 					$html .= '>';
 
@@ -1152,7 +1152,7 @@ 
 					$html .= $cellData;
 
 					// Column end
-					$html .= '</td>' . PHP_EOL;
+					$html .= '</td>'.PHP_EOL;
 				}
 
 				// Next column
@@ -1160,7 +1160,7 @@ 
 			}
 
 			// Write row end
-			$html .= '		  </tr>' . PHP_EOL;
+			$html .= '		  </tr>'.PHP_EOL;
 
 			// Return
 			return $html;
@@ -1179,7 +1179,7 @@ 
 	{
 		$pairs = array();
 		foreach ($pValue as $property => $value) {
-			$pairs[] = $property . ':' . $value;
+			$pairs[] = $property.':'.$value;
 		}
 		$string = implode('; ', $pairs);
 
@@ -1271,7 +1271,7 @@ 
 
 		// color span tag
 		if ($color !== null) {
-			$value = '<span style="color:' . $color . '">' . $value . '</span>';
+			$value = '<span style="color:'.$color.'">'.$value.'</span>';
 		}
 
 		return $value;
@@ -1291,11 +1291,11 @@ 
 		foreach ($sheetIndexes as $sheetIndex) {
 			$sheet = $this->_phpExcel->getSheet($sheetIndex);
 
-			$candidateSpannedRow  = array();
+			$candidateSpannedRow = array();
 
 			// loop through all Excel merged cells
 			foreach ($sheet->getMergeCells() as $cells) {
-				list($cells, ) = PHPExcel_Cell::splitRange($cells);
+				list($cells,) = PHPExcel_Cell::splitRange($cells);
 				$first = $cells[0];
 				$last  = $cells[1];
 
@@ -1307,13 +1307,13 @@ 
 
 				// loop through the individual cells in the individual merge
 				$r = $fr - 1;
-				while($r++ < $lr) {
+				while ($r++ < $lr) {
 					// also, flag this row as a HTML row that is candidate to be omitted
 					$candidateSpannedRow[$r] = $r;
 
 					$c = $fc - 1;
-					while($c++ < $lc) {
-						if ( !($c == $fc && $r == $fr) ) {
+					while ($c++ < $lc) {
+						if ( ! ($c == $fc && $r == $fr)) {
 							// not the upper-left cell (should not be written in HTML)
 							$this->_isSpannedCell[$sheetIndex][$r][$c] = array(
 								'baseCell' => array($fr, $fc),
@@ -1343,17 +1343,17 @@ 
 			}
 
 			// For each of the omitted rows we found above, the affected rowspans should be subtracted by 1
-			if ( isset($this->_isSpannedRow[$sheetIndex]) ) {
+			if (isset($this->_isSpannedRow[$sheetIndex])) {
 				foreach ($this->_isSpannedRow[$sheetIndex] as $rowIndex) {
 					$adjustedBaseCells = array();
 					$c = -1;
 					$e = $countColumns - 1;
-					while($c++ < $e) {
+					while ($c++ < $e) {
 						$baseCell = $this->_isSpannedCell[$sheetIndex][$rowIndex][$c]['baseCell'];
 
-						if ( !in_array($baseCell, $adjustedBaseCells) ) {
+						if ( ! in_array($baseCell, $adjustedBaseCells)) {
 							// subtract rowspan by 1
-							--$this->_isBaseCell[$sheetIndex][ $baseCell[0] ][ $baseCell[1] ]['rowspan'];
+							--$this->_isBaseCell[$sheetIndex][$baseCell[0]][$baseCell[1]]['rowspan'];
 							$adjustedBaseCells[] = $baseCell;
 						}
 					}

Braces +28 added lines, -19 removed lines

@@ -315,25 +315,34 @@
 		$html .= '<html>' . PHP_EOL;
 		$html .= '  <head>' . PHP_EOL;
 		$html .= '	  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">' . PHP_EOL;
-		if ($properties->getTitle() > '')
-			$html .= '	  <title>' . htmlspecialchars($properties->getTitle()) . '</title>' . PHP_EOL;
-
-		if ($properties->getCreator() > '')
-			$html .= '	  <meta name="author" content="' . htmlspecialchars($properties->getCreator()) . '" />' . PHP_EOL;
-		if ($properties->getTitle() > '')
-			$html .= '	  <meta name="title" content="' . htmlspecialchars($properties->getTitle()) . '" />' . PHP_EOL;
-		if ($properties->getDescription() > '')
-			$html .= '	  <meta name="description" content="' . htmlspecialchars($properties->getDescription()) . '" />' . PHP_EOL;
-		if ($properties->getSubject() > '')
-			$html .= '	  <meta name="subject" content="' . htmlspecialchars($properties->getSubject()) . '" />' . PHP_EOL;
-		if ($properties->getKeywords() > '')
-			$html .= '	  <meta name="keywords" content="' . htmlspecialchars($properties->getKeywords()) . '" />' . PHP_EOL;
-		if ($properties->getCategory() > '')
-			$html .= '	  <meta name="category" content="' . htmlspecialchars($properties->getCategory()) . '" />' . PHP_EOL;
-		if ($properties->getCompany() > '')
-			$html .= '	  <meta name="company" content="' . htmlspecialchars($properties->getCompany()) . '" />' . PHP_EOL;
-		if ($properties->getManager() > '')
-			$html .= '	  <meta name="manager" content="' . htmlspecialchars($properties->getManager()) . '" />' . PHP_EOL;
+		if ($properties->getTitle() > '') {
+					$html .= '	  <title>' . htmlspecialchars($properties->getTitle()) . '</title>' . PHP_EOL;
+		}
+
+		if ($properties->getCreator() > '') {
+					$html .= '	  <meta name="author" content="' . htmlspecialchars($properties->getCreator()) . '" />' . PHP_EOL;
+		}
+		if ($properties->getTitle() > '') {
+					$html .= '	  <meta name="title" content="' . htmlspecialchars($properties->getTitle()) . '" />' . PHP_EOL;
+		}
+		if ($properties->getDescription() > '') {
+					$html .= '	  <meta name="description" content="' . htmlspecialchars($properties->getDescription()) . '" />' . PHP_EOL;
+		}
+		if ($properties->getSubject() > '') {
+					$html .= '	  <meta name="subject" content="' . htmlspecialchars($properties->getSubject()) . '" />' . PHP_EOL;
+		}
+		if ($properties->getKeywords() > '') {
+					$html .= '	  <meta name="keywords" content="' . htmlspecialchars($properties->getKeywords()) . '" />' . PHP_EOL;
+		}
+		if ($properties->getCategory() > '') {
+					$html .= '	  <meta name="category" content="' . htmlspecialchars($properties->getCategory()) . '" />' . PHP_EOL;
+		}
+		if ($properties->getCompany() > '') {
+					$html .= '	  <meta name="company" content="' . htmlspecialchars($properties->getCompany()) . '" />' . PHP_EOL;
+		}
+		if ($properties->getManager() > '') {
+					$html .= '	  <meta name="manager" content="' . htmlspecialchars($properties->getManager()) . '" />' . PHP_EOL;
+		}
 
 		if ($pIncludeStyles) {
 			$html .= $this->generateStyles(true);