alxarafe / alixar

dolibarr/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Reader/Excel2007.php

Switch Indentation +7 added lines, -7 removed lines

@@ -479,13 +479,13 @@
                     $macros = $customUI = NULL;
 					foreach ($relsWorkbook->Relationship as $ele) {
 						switch($ele['Type']){
-						case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet":
-							$worksheets[(string) $ele["Id"]] = $ele["Target"];
-							break;
-						// a vbaProject ? (: some macros)
-						case "http://schemas.microsoft.com/office/2006/relationships/vbaProject":
-							$macros = $ele["Target"];
-							break;
+						    case "http://schemas.openxmlformats.org/officeDocument/2006/relationships/worksheet":
+							    $worksheets[(string) $ele["Id"]] = $ele["Target"];
+							    break;
+						    // a vbaProject ? (: some macros)
+						    case "http://schemas.microsoft.com/office/2006/relationships/vbaProject":
+							    $macros = $ele["Target"];
+							    break;
 						}
 					}
 

dolibarr/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Shared/OLE.php

Switch Indentation +13 added lines, -13 removed lines

@@ -275,19 +275,19 @@
 			$name = str_replace("\x00", "", $nameUtf16);
 			$type = self::_readInt1($fh);
 			switch ($type) {
-			case self::OLE_PPS_TYPE_ROOT:
-				$pps = new PHPExcel_Shared_OLE_PPS_Root(null, null, array());
-				$this->root = $pps;
-				break;
-			case self::OLE_PPS_TYPE_DIR:
-				$pps = new PHPExcel_Shared_OLE_PPS(null, null, null, null, null,
-								   null, null, null, null, array());
-				break;
-			case self::OLE_PPS_TYPE_FILE:
-				$pps = new PHPExcel_Shared_OLE_PPS_File($name);
-				break;
-			default:
-				continue;
+			    case self::OLE_PPS_TYPE_ROOT:
+				    $pps = new PHPExcel_Shared_OLE_PPS_Root(null, null, array());
+				    $this->root = $pps;
+				    break;
+			    case self::OLE_PPS_TYPE_DIR:
+				    $pps = new PHPExcel_Shared_OLE_PPS(null, null, null, null, null,
+								       null, null, null, null, array());
+				    break;
+			    case self::OLE_PPS_TYPE_FILE:
+				    $pps = new PHPExcel_Shared_OLE_PPS_File($name);
+				    break;
+			    default:
+				    continue;
 			}
 			fseek($fh, 1, SEEK_CUR);
 			$pps->Type    = $type;

dolibarr/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5.php

Switch Indentation +38 added lines, -38 removed lines

@@ -478,33 +478,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;
 
 					}
 
@@ -521,17 +521,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;
 
 					}
 

dolibarr/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Writer/Excel5/Escher.php

Switch Indentation +327 added lines, -327 removed lines

@@ -79,434 +79,434 @@
 
 		switch (get_class($this->_object)) {
 
-		case 'PHPExcel_Shared_Escher':
-			if ($dggContainer = $this->_object->getDggContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($dggContainer);
-				$this->_data = $writer->close();
-			} else if ($dgContainer = $this->_object->getDgContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($dgContainer);
-				$this->_data = $writer->close();
-				$this->_spOffsets = $writer->getSpOffsets();
-				$this->_spTypes = $writer->getSpTypes();
-			}
-			break;
-
-		case 'PHPExcel_Shared_Escher_DggContainer':
-			// this is a container record
-
-			// initialize
-			$innerData = '';
+		    case 'PHPExcel_Shared_Escher':
+			    if ($dggContainer = $this->_object->getDggContainer()) {
+				    $writer = new PHPExcel_Writer_Excel5_Escher($dggContainer);
+				    $this->_data = $writer->close();
+			    } else if ($dgContainer = $this->_object->getDgContainer()) {
+				    $writer = new PHPExcel_Writer_Excel5_Escher($dgContainer);
+				    $this->_data = $writer->close();
+				    $this->_spOffsets = $writer->getSpOffsets();
+				    $this->_spTypes = $writer->getSpTypes();
+			    }
+			    break;
+
+		    case 'PHPExcel_Shared_Escher_DggContainer':
+			    // this is a container record
+
+			    // initialize
+			    $innerData = '';
+
+			    // write the dgg
+			    $recVer			= 0x0;
+			    $recInstance	= 0x0000;
+			    $recType		= 0xF006;
+
+			    $recVerInstance  = $recVer;
+			    $recVerInstance |= $recInstance << 4;
+
+			    // dgg data
+			    $dggData =
+				    pack('VVVV'
+					    , $this->_object->getSpIdMax() // maximum shape identifier increased by one
+					    , $this->_object->getCDgSaved() + 1 // number of file identifier clusters increased by one
+					    , $this->_object->getCSpSaved()
+					    , $this->_object->getCDgSaved() // count total number of drawings saved
+				    );
+
+			    // add file identifier clusters (one per drawing)
+			    $IDCLs = $this->_object->getIDCLs();
+
+			    foreach ($IDCLs as $dgId => $maxReducedSpId) {
+				    $dggData .= pack('VV', $dgId, $maxReducedSpId + 1);
+			    }
+
+			    $header = pack('vvV', $recVerInstance, $recType, strlen($dggData));
+			    $innerData .= $header . $dggData;
+
+			    // write the bstoreContainer
+			    if ($bstoreContainer = $this->_object->getBstoreContainer()) {
+				    $writer = new PHPExcel_Writer_Excel5_Escher($bstoreContainer);
+				    $innerData .= $writer->close();
+			    }
+
+			    // write the record
+			    $recVer			= 0xF;
+			    $recInstance	= 0x0000;
+			    $recType		= 0xF000;
+			    $length			= strlen($innerData);
+
+			    $recVerInstance  = $recVer;
+			    $recVerInstance |= $recInstance << 4;
+
+			    $header = pack('vvV', $recVerInstance, $recType, $length);
 
-			// write the dgg
-			$recVer			= 0x0;
-			$recInstance	= 0x0000;
-			$recType		= 0xF006;
+			    $this->_data = $header . $innerData;
+			    break;
+
+		    case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer':
+			    // this is a container record
+
+			    // initialize
+			    $innerData = '';
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+			    // treat the inner data
+			    if ($BSECollection = $this->_object->getBSECollection()) {
+				    foreach ($BSECollection as $BSE) {
+					    $writer = new PHPExcel_Writer_Excel5_Escher($BSE);
+					    $innerData .= $writer->close();
+				    }
+			    }
 
-			// dgg data
-			$dggData =
-				pack('VVVV'
-					, $this->_object->getSpIdMax() // maximum shape identifier increased by one
-					, $this->_object->getCDgSaved() + 1 // number of file identifier clusters increased by one
-					, $this->_object->getCSpSaved()
-					, $this->_object->getCDgSaved() // count total number of drawings saved
-				);
+			    // write the record
+			    $recVer			= 0xF;
+			    $recInstance	= count($this->_object->getBSECollection());
+			    $recType		= 0xF001;
+			    $length			= strlen($innerData);
 
-			// add file identifier clusters (one per drawing)
-			$IDCLs = $this->_object->getIDCLs();
+			    $recVerInstance  = $recVer;
+			    $recVerInstance |= $recInstance << 4;
 
-			foreach ($IDCLs as $dgId => $maxReducedSpId) {
-				$dggData .= pack('VV', $dgId, $maxReducedSpId + 1);
-			}
+			    $header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$header = pack('vvV', $recVerInstance, $recType, strlen($dggData));
-			$innerData .= $header . $dggData;
+			    $this->_data = $header . $innerData;
+			    break;
 
-			// write the bstoreContainer
-			if ($bstoreContainer = $this->_object->getBstoreContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($bstoreContainer);
-				$innerData .= $writer->close();
-			}
+		    case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE':
+			    // this is a semi-container record
 
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF000;
-			$length			= strlen($innerData);
+			    // initialize
+			    $innerData = '';
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+			    // here we treat the inner data
+			    if ($blip = $this->_object->getBlip()) {
+				    $writer = new PHPExcel_Writer_Excel5_Escher($blip);
+				    $innerData .= $writer->close();
+			    }
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+			    // initialize
+			    $data = '';
 
-			$this->_data = $header . $innerData;
-			break;
-
-		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer':
-			// this is a container record
+			    $btWin32 = $this->_object->getBlipType();
+			    $btMacOS = $this->_object->getBlipType();
+			    $data .= pack('CC', $btWin32, $btMacOS);
 
-			// initialize
-			$innerData = '';
+			    $rgbUid = pack('VVVV', 0,0,0,0); // todo
+			    $data .= $rgbUid;
 
-			// treat the inner data
-			if ($BSECollection = $this->_object->getBSECollection()) {
-				foreach ($BSECollection as $BSE) {
-					$writer = new PHPExcel_Writer_Excel5_Escher($BSE);
-					$innerData .= $writer->close();
-				}
-			}
+			    $tag = 0;
+			    $size = strlen($innerData);
+			    $cRef = 1;
+			    $foDelay = 0; //todo
+			    $unused1 = 0x0;
+			    $cbName = 0x0;
+			    $unused2 = 0x0;
+			    $unused3 = 0x0;
+			    $data .= pack('vVVVCCCC', $tag, $size, $cRef, $foDelay, $unused1, $cbName, $unused2, $unused3);
 
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= count($this->_object->getBSECollection());
-			$recType		= 0xF001;
-			$length			= strlen($innerData);
+			    $data .= $innerData;
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+			    // write the record
+			    $recVer			= 0x2;
+			    $recInstance	= $this->_object->getBlipType();
+			    $recType		= 0xF007;
+			    $length			= strlen($data);
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+			    $recVerInstance  = $recVer;
+			    $recVerInstance |=	$recInstance << 4;
 
-			$this->_data = $header . $innerData;
-			break;
+			    $header = pack('vvV', $recVerInstance, $recType, $length);
 
-		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE':
-			// this is a semi-container record
+			    $this->_data = $header;
 
-			// initialize
-			$innerData = '';
+			    $this->_data .= $data;
+			    break;
 
-			// here we treat the inner data
-			if ($blip = $this->_object->getBlip()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($blip);
-				$innerData .= $writer->close();
-			}
+		    case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip':
+			    // this is an atom record
 
-			// initialize
-			$data = '';
+			    // write the record
+			    switch ($this->_object->getParent()->getBlipType()) {
 
-			$btWin32 = $this->_object->getBlipType();
-			$btMacOS = $this->_object->getBlipType();
-			$data .= pack('CC', $btWin32, $btMacOS);
+			        case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
+				        // initialize
+				        $innerData = '';
 
-			$rgbUid = pack('VVVV', 0,0,0,0); // todo
-			$data .= $rgbUid;
+				        $rgbUid1 = pack('VVVV', 0,0,0,0); // todo
+				        $innerData .= $rgbUid1;
 
-			$tag = 0;
-			$size = strlen($innerData);
-			$cRef = 1;
-			$foDelay = 0; //todo
-			$unused1 = 0x0;
-			$cbName = 0x0;
-			$unused2 = 0x0;
-			$unused3 = 0x0;
-			$data .= pack('vVVVCCCC', $tag, $size, $cRef, $foDelay, $unused1, $cbName, $unused2, $unused3);
+				        $tag = 0xFF; // todo
+				        $innerData .= pack('C', $tag);
 
-			$data .= $innerData;
+				        $innerData .= $this->_object->getData();
 
-			// write the record
-			$recVer			= 0x2;
-			$recInstance	= $this->_object->getBlipType();
-			$recType		= 0xF007;
-			$length			= strlen($data);
-
-			$recVerInstance  = $recVer;
-			$recVerInstance |=	$recInstance << 4;
-
-			$header = pack('vvV', $recVerInstance, $recType, $length);
-
-			$this->_data = $header;
-
-			$this->_data .= $data;
-			break;
+				        $recVer			= 0x0;
+				        $recInstance	= 0x46A;
+				        $recType		= 0xF01D;
+				        $length			= strlen($innerData);
 
-		case 'PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE_Blip':
-			// this is an atom record
+				        $recVerInstance  = $recVer;
+				        $recVerInstance |=	$recInstance << 4;
 
-			// write the record
-			switch ($this->_object->getParent()->getBlipType()) {
+				        $header = pack('vvV', $recVerInstance, $recType, $length);
 
-			case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_JPEG:
-				// initialize
-				$innerData = '';
+				        $this->_data = $header;
 
-				$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
-				$innerData .= $rgbUid1;
+				        $this->_data .= $innerData;
+				        break;
 
-				$tag = 0xFF; // todo
-				$innerData .= pack('C', $tag);
+			        case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
+				        // initialize
+				        $innerData = '';
 
-				$innerData .= $this->_object->getData();
+				        $rgbUid1 = pack('VVVV', 0,0,0,0); // todo
+				        $innerData .= $rgbUid1;
 
-				$recVer			= 0x0;
-				$recInstance	= 0x46A;
-				$recType		= 0xF01D;
-				$length			= strlen($innerData);
+				        $tag = 0xFF; // todo
+				        $innerData .= pack('C', $tag);
 
-				$recVerInstance  = $recVer;
-				$recVerInstance |=	$recInstance << 4;
+				        $innerData .= $this->_object->getData();
 
-				$header = pack('vvV', $recVerInstance, $recType, $length);
+				        $recVer			= 0x0;
+				        $recInstance	= 0x6E0;
+				        $recType		= 0xF01E;
+				        $length			= strlen($innerData);
 
-				$this->_data = $header;
+				        $recVerInstance  = $recVer;
+				        $recVerInstance |=	$recInstance << 4;
 
-				$this->_data .= $innerData;
-				break;
+				        $header = pack('vvV', $recVerInstance, $recType, $length);
 
-			case PHPExcel_Shared_Escher_DggContainer_BstoreContainer_BSE::BLIPTYPE_PNG:
-				// initialize
-				$innerData = '';
+				        $this->_data = $header;
 
-				$rgbUid1 = pack('VVVV', 0,0,0,0); // todo
-				$innerData .= $rgbUid1;
+				        $this->_data .= $innerData;
+				        break;
 
-				$tag = 0xFF; // todo
-				$innerData .= pack('C', $tag);
-
-				$innerData .= $this->_object->getData();
-
-				$recVer			= 0x0;
-				$recInstance	= 0x6E0;
-				$recType		= 0xF01E;
-				$length			= strlen($innerData);
-
-				$recVerInstance  = $recVer;
-				$recVerInstance |=	$recInstance << 4;
-
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-
-				$this->_data = $header;
-
-				$this->_data .= $innerData;
-				break;
-
-			}
+			    }
 			break;
 
-		case 'PHPExcel_Shared_Escher_DgContainer':
-			// this is a container record
+		    case 'PHPExcel_Shared_Escher_DgContainer':
+			    // this is a container record
 
-			// initialize
-			$innerData = '';
+			    // initialize
+			    $innerData = '';
 
-			// write the dg
-			$recVer			= 0x0;
-			$recInstance	= $this->_object->getDgId();
-			$recType		= 0xF008;
-			$length			= 8;
+			    // write the dg
+			    $recVer			= 0x0;
+			    $recInstance	= $this->_object->getDgId();
+			    $recType		= 0xF008;
+			    $length			= 8;
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+			    $recVerInstance  = $recVer;
+			    $recVerInstance |= $recInstance << 4;
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+			    $header = pack('vvV', $recVerInstance, $recType, $length);
 
-			// number of shapes in this drawing (including group shape)
-			$countShapes = count($this->_object->getSpgrContainer()->getChildren());
-			$innerData .= $header . pack('VV', $countShapes, $this->_object->getLastSpId());
-			//$innerData .= $header . pack('VV', 0, 0);
+			    // number of shapes in this drawing (including group shape)
+			    $countShapes = count($this->_object->getSpgrContainer()->getChildren());
+			    $innerData .= $header . pack('VV', $countShapes, $this->_object->getLastSpId());
+			    //$innerData .= $header . pack('VV', 0, 0);
 
-			// write the spgrContainer
-			if ($spgrContainer = $this->_object->getSpgrContainer()) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($spgrContainer);
-				$innerData .= $writer->close();
+			    // write the spgrContainer
+			    if ($spgrContainer = $this->_object->getSpgrContainer()) {
+				    $writer = new PHPExcel_Writer_Excel5_Escher($spgrContainer);
+				    $innerData .= $writer->close();
 
-				// get the shape offsets relative to the spgrContainer record
-				$spOffsets = $writer->getSpOffsets();
-				$spTypes   = $writer->getSpTypes();
+				    // get the shape offsets relative to the spgrContainer record
+				    $spOffsets = $writer->getSpOffsets();
+				    $spTypes   = $writer->getSpTypes();
 				
-				// save the shape offsets relative to dgContainer
-				foreach ($spOffsets as & $spOffset) {
-					$spOffset += 24; // add length of dgContainer header data (8 bytes) plus dg data (16 bytes)
-				}
+				    // save the shape offsets relative to dgContainer
+				    foreach ($spOffsets as & $spOffset) {
+					    $spOffset += 24; // add length of dgContainer header data (8 bytes) plus dg data (16 bytes)
+				    }
 
-				$this->_spOffsets = $spOffsets;
-				$this->_spTypes = $spTypes;
-			}
+				    $this->_spOffsets = $spOffsets;
+				    $this->_spTypes = $spTypes;
+			    }
 
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF002;
-			$length			= strlen($innerData);
+			    // write the record
+			    $recVer			= 0xF;
+			    $recInstance	= 0x0000;
+			    $recType		= 0xF002;
+			    $length			= strlen($innerData);
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+			    $recVerInstance  = $recVer;
+			    $recVerInstance |= $recInstance << 4;
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+			    $header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$this->_data = $header . $innerData;
-			break;
+			    $this->_data = $header . $innerData;
+			    break;
 
-		case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer':
-			// this is a container record
+		    case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer':
+			    // this is a container record
 
-			// initialize
-			$innerData = '';
+			    // initialize
+			    $innerData = '';
 
-			// initialize spape offsets
-			$totalSize = 8;
-			$spOffsets = array();
-			$spTypes   = array();
+			    // initialize spape offsets
+			    $totalSize = 8;
+			    $spOffsets = array();
+			    $spTypes   = array();
 
-			// treat the inner data
-			foreach ($this->_object->getChildren() as $spContainer) {
-				$writer = new PHPExcel_Writer_Excel5_Escher($spContainer);
-				$spData = $writer->close();
-				$innerData .= $spData;
+			    // treat the inner data
+			    foreach ($this->_object->getChildren() as $spContainer) {
+				    $writer = new PHPExcel_Writer_Excel5_Escher($spContainer);
+				    $spData = $writer->close();
+				    $innerData .= $spData;
 
-				// save the shape offsets (where new shape records begin)
-				$totalSize += strlen($spData);
-				$spOffsets[] = $totalSize;
+				    // save the shape offsets (where new shape records begin)
+				    $totalSize += strlen($spData);
+				    $spOffsets[] = $totalSize;
 				
-				$spTypes = array_merge($spTypes, $writer->getSpTypes());
-			}
+				    $spTypes = array_merge($spTypes, $writer->getSpTypes());
+			    }
 
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF003;
-			$length			= strlen($innerData);
+			    // write the record
+			    $recVer			= 0xF;
+			    $recInstance	= 0x0000;
+			    $recType		= 0xF003;
+			    $length			= strlen($innerData);
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+			    $recVerInstance  = $recVer;
+			    $recVerInstance |= $recInstance << 4;
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+			    $header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$this->_data = $header . $innerData;
-			$this->_spOffsets = $spOffsets;
-			$this->_spTypes = $spTypes;
-			break;
+			    $this->_data = $header . $innerData;
+			    $this->_spOffsets = $spOffsets;
+			    $this->_spTypes = $spTypes;
+			    break;
 
-		case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer':
-			// initialize
-			$data = '';
+		    case 'PHPExcel_Shared_Escher_DgContainer_SpgrContainer_SpContainer':
+			    // initialize
+			    $data = '';
 
-			// build the data
+			    // build the data
 
-			// write group shape record, if necessary?
-			if ($this->_object->getSpgr()) {
-				$recVer			= 0x1;
-				$recInstance	= 0x0000;
-				$recType		= 0xF009;
-				$length			= 0x00000010;
+			    // write group shape record, if necessary?
+			    if ($this->_object->getSpgr()) {
+				    $recVer			= 0x1;
+				    $recInstance	= 0x0000;
+				    $recType		= 0xF009;
+				    $length			= 0x00000010;
 
-				$recVerInstance  = $recVer;
-				$recVerInstance |= $recInstance << 4;
+				    $recVerInstance  = $recVer;
+				    $recVerInstance |= $recInstance << 4;
 
-				$header = pack('vvV', $recVerInstance, $recType, $length);
+				    $header = pack('vvV', $recVerInstance, $recType, $length);
 
-				$data .= $header . pack('VVVV', 0,0,0,0);
-			}
-			$this->_spTypes[] = ($this->_object->getSpType());
+				    $data .= $header . pack('VVVV', 0,0,0,0);
+			    }
+			    $this->_spTypes[] = ($this->_object->getSpType());
 
-			// write the shape record
-			$recVer			= 0x2;
-			$recInstance	= $this->_object->getSpType(); // shape type
-			$recType		= 0xF00A;
-			$length			= 0x00000008;
+			    // write the shape record
+			    $recVer			= 0x2;
+			    $recInstance	= $this->_object->getSpType(); // shape type
+			    $recType		= 0xF00A;
+			    $length			= 0x00000008;
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+			    $recVerInstance  = $recVer;
+			    $recVerInstance |= $recInstance << 4;
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+			    $header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$data .= $header . pack('VV', $this->_object->getSpId(), $this->_object->getSpgr() ? 0x0005 : 0x0A00);
+			    $data .= $header . pack('VV', $this->_object->getSpId(), $this->_object->getSpgr() ? 0x0005 : 0x0A00);
 
 
-			// the options
-			if ($this->_object->getOPTCollection()) {
-				$optData = '';
+			    // the options
+			    if ($this->_object->getOPTCollection()) {
+				    $optData = '';
 
-				$recVer			= 0x3;
-				$recInstance	= count($this->_object->getOPTCollection());
-				$recType		= 0xF00B;
-				foreach ($this->_object->getOPTCollection() as $property => $value) {
-					$optData .= pack('vV', $property, $value);
-				}
-				$length			= strlen($optData);
+				    $recVer			= 0x3;
+				    $recInstance	= count($this->_object->getOPTCollection());
+				    $recType		= 0xF00B;
+				    foreach ($this->_object->getOPTCollection() as $property => $value) {
+					    $optData .= pack('vV', $property, $value);
+				    }
+				    $length			= strlen($optData);
 
-				$recVerInstance  = $recVer;
-				$recVerInstance |= $recInstance << 4;
+				    $recVerInstance  = $recVer;
+				    $recVerInstance |= $recInstance << 4;
 
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $optData;
-			}
+				    $header = pack('vvV', $recVerInstance, $recType, $length);
+				    $data .= $header . $optData;
+			    }
 
-			// the client anchor
-			if ($this->_object->getStartCoordinates()) {
-				$clientAnchorData = '';
+			    // the client anchor
+			    if ($this->_object->getStartCoordinates()) {
+				    $clientAnchorData = '';
 
-				$recVer			= 0x0;
-				$recInstance	= 0x0;
-				$recType		= 0xF010;
+				    $recVer			= 0x0;
+				    $recInstance	= 0x0;
+				    $recType		= 0xF010;
 
-				// start coordinates
-				list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getStartCoordinates());
-				$c1 = PHPExcel_Cell::columnIndexFromString($column) - 1;
-				$r1 = $row - 1;
+				    // start coordinates
+				    list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getStartCoordinates());
+				    $c1 = PHPExcel_Cell::columnIndexFromString($column) - 1;
+				    $r1 = $row - 1;
 
-				// start offsetX
-				$startOffsetX = $this->_object->getStartOffsetX();
+				    // start offsetX
+				    $startOffsetX = $this->_object->getStartOffsetX();
 
-				// start offsetY
-				$startOffsetY = $this->_object->getStartOffsetY();
+				    // start offsetY
+				    $startOffsetY = $this->_object->getStartOffsetY();
 
-				// end coordinates
-				list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getEndCoordinates());
-				$c2 = PHPExcel_Cell::columnIndexFromString($column) - 1;
-				$r2 = $row - 1;
+				    // end coordinates
+				    list($column, $row) = PHPExcel_Cell::coordinateFromString($this->_object->getEndCoordinates());
+				    $c2 = PHPExcel_Cell::columnIndexFromString($column) - 1;
+				    $r2 = $row - 1;
 
-				// end offsetX
-				$endOffsetX = $this->_object->getEndOffsetX();
+				    // end offsetX
+				    $endOffsetX = $this->_object->getEndOffsetX();
 
-				// end offsetY
-				$endOffsetY = $this->_object->getEndOffsetY();
+				    // end offsetY
+				    $endOffsetY = $this->_object->getEndOffsetY();
 
-				$clientAnchorData = pack('vvvvvvvvv', $this->_object->getSpFlag(),
-					$c1, $startOffsetX, $r1, $startOffsetY,
-					$c2, $endOffsetX, $r2, $endOffsetY);
+				    $clientAnchorData = pack('vvvvvvvvv', $this->_object->getSpFlag(),
+					    $c1, $startOffsetX, $r1, $startOffsetY,
+					    $c2, $endOffsetX, $r2, $endOffsetY);
 				
-				$length			= strlen($clientAnchorData);
+				    $length			= strlen($clientAnchorData);
 
-				$recVerInstance  = $recVer;
-				$recVerInstance |= $recInstance << 4;
+				    $recVerInstance  = $recVer;
+				    $recVerInstance |= $recInstance << 4;
 
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $clientAnchorData;
-			}
+				    $header = pack('vvV', $recVerInstance, $recType, $length);
+				    $data .= $header . $clientAnchorData;
+			    }
 
-			// the client data, just empty for now
-			if (!$this->_object->getSpgr()) {
-				$clientDataData = '';
+			    // the client data, just empty for now
+			    if (!$this->_object->getSpgr()) {
+				    $clientDataData = '';
 
-				$recVer			= 0x0;
-				$recInstance	= 0x0;
-				$recType		= 0xF011;
+				    $recVer			= 0x0;
+				    $recInstance	= 0x0;
+				    $recType		= 0xF011;
 
-				$length = strlen($clientDataData);
+				    $length = strlen($clientDataData);
 
-				$recVerInstance  = $recVer;
-				$recVerInstance |= $recInstance << 4;
+				    $recVerInstance  = $recVer;
+				    $recVerInstance |= $recInstance << 4;
 
-				$header = pack('vvV', $recVerInstance, $recType, $length);
-				$data .= $header . $clientDataData;
-			}
+				    $header = pack('vvV', $recVerInstance, $recType, $length);
+				    $data .= $header . $clientDataData;
+			    }
 
-			// write the record
-			$recVer			= 0xF;
-			$recInstance	= 0x0000;
-			$recType		= 0xF004;
-			$length			= strlen($data);
+			    // write the record
+			    $recVer			= 0xF;
+			    $recInstance	= 0x0000;
+			    $recType		= 0xF004;
+			    $length			= strlen($data);
 
-			$recVerInstance  = $recVer;
-			$recVerInstance |= $recInstance << 4;
+			    $recVerInstance  = $recVer;
+			    $recVerInstance |= $recInstance << 4;
 
-			$header = pack('vvV', $recVerInstance, $recType, $length);
+			    $header = pack('vvV', $recVerInstance, $recType, $length);
 
-			$this->_data = $header . $data;
-			break;
+			    $this->_data = $header . $data;
+			    break;
 
 		}
 

dolibarr/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel/Style/Border.php

Switch Indentation +20 added lines, -20 removed lines

@@ -150,26 +150,26 @@
 	public function getStyleArray($array)
 	{
 		switch ($this->_parentPropertyName) {
-		case '_allBorders':
-				$key = 'allborders';	break;
-		case '_bottom':
-				$key = 'bottom';		break;
-		case '_diagonal':
-				$key = 'diagonal';		break;
-		case '_horizontal':
-				$key = 'horizontal';	break;
-		case '_inside':
-				$key = 'inside';		break;
-		case '_left':
-				$key = 'left';			break;
-		case '_outline':
-				$key = 'outline';		break;
-		case '_right':
-				$key = 'right';			break;
-		case '_top':
-				$key = 'top';			break;
-		case '_vertical':
-				$key = 'vertical';		break;
+		    case '_allBorders':
+				    $key = 'allborders';	break;
+		    case '_bottom':
+				    $key = 'bottom';		break;
+		    case '_diagonal':
+				    $key = 'diagonal';		break;
+		    case '_horizontal':
+				    $key = 'horizontal';	break;
+		    case '_inside':
+				    $key = 'inside';		break;
+		    case '_left':
+				    $key = 'left';			break;
+		    case '_outline':
+				    $key = 'outline';		break;
+		    case '_right':
+				    $key = 'right';			break;
+		    case '_top':
+				    $key = 'top';			break;
+		    case '_vertical':
+				    $key = 'vertical';		break;
 		}
 		return $this->_parent->getStyleArray(array($key => $array));
 	}

dolibarr/htdocs/includes/phpoffice/phpexcel/Classes/PHPExcel.php

Switch Indentation +25 added lines, -25 removed lines

@@ -244,15 +244,15 @@ 
 		$ReturnData=NULL;
 		$What=strtolower($What);
 		switch($What){
-		case 'all':
-			$ReturnData=$this->_ribbonXMLData;
-			break;
-		case 'target':
-		case 'data':
-			if(is_array($this->_ribbonXMLData) && array_key_exists($What,$this->_ribbonXMLData)){
-				$ReturnData=$this->_ribbonXMLData[$What];
-			}//else $ReturnData stay at null
-			break;
+		    case 'all':
+			    $ReturnData=$this->_ribbonXMLData;
+			    break;
+		    case 'target':
+		    case 'data':
+			    if(is_array($this->_ribbonXMLData) && array_key_exists($What,$this->_ribbonXMLData)){
+				    $ReturnData=$this->_ribbonXMLData[$What];
+			    }//else $ReturnData stay at null
+			    break;
 		}//default: $ReturnData at null
 		return $ReturnData;
 	}
@@ -284,22 +284,22 @@ 
 		$ReturnData=NULL;
 		$What=strtolower($What);
 		switch($What){
-		case 'all':
-			return $this->_ribbonBinObjects;
-			break;
-		case 'names':
-		case 'data':
-			if(is_array($this->_ribbonBinObjects) && array_key_exists($What, $this->_ribbonBinObjects)){
-				$ReturnData=$this->_ribbonBinObjects[$What];
-			}
-			break;
-		case 'types':
-			if(is_array($this->_ribbonBinObjects) && array_key_exists('data', $this->_ribbonBinObjects) && is_array($this->_ribbonBinObjects['data'])){
-				$tmpTypes=array_keys($this->_ribbonBinObjects['data']);
-				$ReturnData=array_unique(array_map(array($this,'_getExtensionOnly'), $tmpTypes));
-			}else
-				$ReturnData=array();//the caller want an array... not null if empty
-			break;
+		    case 'all':
+			    return $this->_ribbonBinObjects;
+			    break;
+		    case 'names':
+		    case 'data':
+			    if(is_array($this->_ribbonBinObjects) && array_key_exists($What, $this->_ribbonBinObjects)){
+				    $ReturnData=$this->_ribbonBinObjects[$What];
+			    }
+			    break;
+		    case 'types':
+			    if(is_array($this->_ribbonBinObjects) && array_key_exists('data', $this->_ribbonBinObjects) && is_array($this->_ribbonBinObjects['data'])){
+				    $tmpTypes=array_keys($this->_ribbonBinObjects['data']);
+				    $ReturnData=array_unique(array_map(array($this,'_getExtensionOnly'), $tmpTypes));
+			    }else
+				    $ReturnData=array();//the caller want an array... not null if empty
+			    break;
 		}
 		return $ReturnData;
 	}

dolibarr/htdocs/includes/nusoap/lib/Mail/mime.php

Switch Indentation +109 added lines, -109 removed lines

@@ -885,61 +885,61 @@ 
         $text        = !$html && strlen($this->_txtbody);
 
         switch (true) {
-        case $text && !$attachments:
-            $message =& $this->_addTextPart($null, $this->_txtbody);
-            break;
-
-        case !$text && !$html && $attachments:
-            $message =& $this->_addMixedPart();
-            for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-            }
-            break;
-
-        case $text && $attachments:
-            $message =& $this->_addMixedPart();
-            $this->_addTextPart($message, $this->_txtbody);
-            for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-            }
-            break;
+            case $text && !$attachments:
+                $message =& $this->_addTextPart($null, $this->_txtbody);
+                break;
+
+            case !$text && !$html && $attachments:
+                $message =& $this->_addMixedPart();
+                for ($i = 0; $i < count($this->_parts); $i++) {
+                    $this->_addAttachmentPart($message, $this->_parts[$i]);
+                }
+                break;
 
-        case $html && !$attachments && !$html_images:
-            if (isset($this->_txtbody)) {
-                $message =& $this->_addAlternativePart($null);
-                $this->_addTextPart($message, $this->_txtbody);
-                $this->_addHtmlPart($message);
-            } else {
-                $message =& $this->_addHtmlPart($null);
-            }
-            break;
-
-        case $html && !$attachments && $html_images:
-            // * Content-Type: multipart/alternative;
-            //    * text
-            //    * Content-Type: multipart/related;
-            //       * html
-            //       * image...
-            if (isset($this->_txtbody)) {
-                $message =& $this->_addAlternativePart($null);
+            case $text && $attachments:
+                $message =& $this->_addMixedPart();
                 $this->_addTextPart($message, $this->_txtbody);
+                for ($i = 0; $i < count($this->_parts); $i++) {
+                    $this->_addAttachmentPart($message, $this->_parts[$i]);
+                }
+                break;
 
-                $ht =& $this->_addRelatedPart($message);
-                $this->_addHtmlPart($ht);
-                for ($i = 0; $i < count($this->_html_images); $i++) {
-                    $this->_addHtmlImagePart($ht, $this->_html_images[$i]);
+            case $html && !$attachments && !$html_images:
+                if (isset($this->_txtbody)) {
+                    $message =& $this->_addAlternativePart($null);
+                    $this->_addTextPart($message, $this->_txtbody);
+                    $this->_addHtmlPart($message);
+                } else {
+                    $message =& $this->_addHtmlPart($null);
                 }
-            } else {
-                // * Content-Type: multipart/related;
-                //    * html
-                //    * image...
-                $message =& $this->_addRelatedPart($null);
-                $this->_addHtmlPart($message);
-                for ($i = 0; $i < count($this->_html_images); $i++) {
-                    $this->_addHtmlImagePart($message, $this->_html_images[$i]);
+                break;
+
+            case $html && !$attachments && $html_images:
+                // * Content-Type: multipart/alternative;
+                //    * text
+                //    * Content-Type: multipart/related;
+                //       * html
+                //       * image...
+                if (isset($this->_txtbody)) {
+                    $message =& $this->_addAlternativePart($null);
+                    $this->_addTextPart($message, $this->_txtbody);
+
+                    $ht =& $this->_addRelatedPart($message);
+                    $this->_addHtmlPart($ht);
+                    for ($i = 0; $i < count($this->_html_images); $i++) {
+                        $this->_addHtmlImagePart($ht, $this->_html_images[$i]);
+                    }
+                } else {
+                    // * Content-Type: multipart/related;
+                    //    * html
+                    //    * image...
+                    $message =& $this->_addRelatedPart($null);
+                    $this->_addHtmlPart($message);
+                    for ($i = 0; $i < count($this->_html_images); $i++) {
+                        $this->_addHtmlImagePart($message, $this->_html_images[$i]);
+                    }
                 }
-            }
-            /*
+                /*
             // #13444, #9725: the code below was a non-RFC compliant hack
             // * Content-Type: multipart/related;
             //    * Content-Type: multipart/alternative;
@@ -958,39 +958,39 @@ 
                 $this->_addHtmlImagePart($message, $this->_html_images[$i]);
             }
             */
-            break;
-
-        case $html && $attachments && !$html_images:
-            $message =& $this->_addMixedPart();
-            if (isset($this->_txtbody)) {
-                $alt =& $this->_addAlternativePart($message);
-                $this->_addTextPart($alt, $this->_txtbody);
-                $this->_addHtmlPart($alt);
-            } else {
-                $this->_addHtmlPart($message);
-            }
-            for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-            }
-            break;
-
-        case $html && $attachments && $html_images:
-            $message =& $this->_addMixedPart();
-            if (isset($this->_txtbody)) {
-                $alt =& $this->_addAlternativePart($message);
-                $this->_addTextPart($alt, $this->_txtbody);
-                $rel =& $this->_addRelatedPart($alt);
-            } else {
-                $rel =& $this->_addRelatedPart($message);
-            }
-            $this->_addHtmlPart($rel);
-            for ($i = 0; $i < count($this->_html_images); $i++) {
-                $this->_addHtmlImagePart($rel, $this->_html_images[$i]);
-            }
-            for ($i = 0; $i < count($this->_parts); $i++) {
-                $this->_addAttachmentPart($message, $this->_parts[$i]);
-            }
-            break;
+                break;
+
+            case $html && $attachments && !$html_images:
+                $message =& $this->_addMixedPart();
+                if (isset($this->_txtbody)) {
+                    $alt =& $this->_addAlternativePart($message);
+                    $this->_addTextPart($alt, $this->_txtbody);
+                    $this->_addHtmlPart($alt);
+                } else {
+                    $this->_addHtmlPart($message);
+                }
+                for ($i = 0; $i < count($this->_parts); $i++) {
+                    $this->_addAttachmentPart($message, $this->_parts[$i]);
+                }
+                break;
+
+            case $html && $attachments && $html_images:
+                $message =& $this->_addMixedPart();
+                if (isset($this->_txtbody)) {
+                    $alt =& $this->_addAlternativePart($message);
+                    $this->_addTextPart($alt, $this->_txtbody);
+                    $rel =& $this->_addRelatedPart($alt);
+                } else {
+                    $rel =& $this->_addRelatedPart($message);
+                }
+                $this->_addHtmlPart($rel);
+                for ($i = 0; $i < count($this->_html_images); $i++) {
+                    $this->_addHtmlImagePart($rel, $this->_html_images[$i]);
+                }
+                for ($i = 0; $i < count($this->_parts); $i++) {
+                    $this->_addAttachmentPart($message, $this->_parts[$i]);
+                }
+                break;
         }
 
         if (!isset($message)) {
@@ -1352,32 +1352,32 @@ 
 
         // See get()
         switch (true) {
-        case $text && !$attachments:
-            $headers['Content-Type'] = 'text/plain';
-            break;
-
-        case !$text && !$html && $attachments:
-        case $text && $attachments:
-        case $html && $attachments && !$html_images:
-        case $html && $attachments && $html_images:
-            $headers['Content-Type'] = 'multipart/mixed';
-            break;
-
-        case $html && !$attachments && !$html_images && isset($this->_txtbody):
-        case $html && !$attachments && $html_images && isset($this->_txtbody):
-            $headers['Content-Type'] = 'multipart/alternative';
-            break;
-
-        case $html && !$attachments && !$html_images && !isset($this->_txtbody):
-            $headers['Content-Type'] = 'text/html';
-            break;
-
-        case $html && !$attachments && $html_images && !isset($this->_txtbody):
-            $headers['Content-Type'] = 'multipart/related';
-            break;
-
-        default:
-            return $headers;
+            case $text && !$attachments:
+                $headers['Content-Type'] = 'text/plain';
+                break;
+
+            case !$text && !$html && $attachments:
+            case $text && $attachments:
+            case $html && $attachments && !$html_images:
+            case $html && $attachments && $html_images:
+                $headers['Content-Type'] = 'multipart/mixed';
+                break;
+
+            case $html && !$attachments && !$html_images && isset($this->_txtbody):
+            case $html && !$attachments && $html_images && isset($this->_txtbody):
+                $headers['Content-Type'] = 'multipart/alternative';
+                break;
+
+            case $html && !$attachments && !$html_images && !isset($this->_txtbody):
+                $headers['Content-Type'] = 'text/html';
+                break;
+
+            case $html && !$attachments && $html_images && !isset($this->_txtbody):
+                $headers['Content-Type'] = 'multipart/related';
+                break;
+
+            default:
+                return $headers;
         }
 
         $this->_checkParams();

dolibarr/htdocs/includes/nusoap/lib/Mail/mimePart.php

Switch Indentation +69 added lines, -69 removed lines

@@ -177,27 +177,27 @@ 
 
         foreach ($params as $key => $value) {
             switch ($key) {
-            case 'encoding':
-                $this->_encoding = $value;
-                $headers['Content-Transfer-Encoding'] = $value;
-                break;
-
-            case 'cid':
-                $headers['Content-ID'] = '<' . $value . '>';
-                break;
-
-            case 'location':
-                $headers['Content-Location'] = $value;
-                break;
-
-            case 'body_file':
-                $this->_body_file = $value;
-                break;
-
-            // for backward compatibility
-            case 'dfilename':
-                $params['filename'] = $value;
-                break;
+                case 'encoding':
+                    $this->_encoding = $value;
+                    $headers['Content-Transfer-Encoding'] = $value;
+                    break;
+
+                case 'cid':
+                    $headers['Content-ID'] = '<' . $value . '>';
+                    break;
+
+                case 'location':
+                    $headers['Content-Location'] = $value;
+                    break;
+
+                case 'body_file':
+                    $this->_body_file = $value;
+                    break;
+
+                // for backward compatibility
+                case 'dfilename':
+                    $params['filename'] = $value;
+                    break;
             }
         }
 
@@ -481,18 +481,18 @@ 
     function _getEncodedData($data, $encoding)
     {
         switch ($encoding) {
-        case 'quoted-printable':
-            return $this->_quotedPrintableEncode($data);
-            break;
+            case 'quoted-printable':
+                return $this->_quotedPrintableEncode($data);
+                break;
 
-        case 'base64':
-            return rtrim(chunk_split(base64_encode($data), 76, $this->_eol));
-            break;
+            case 'base64':
+                return rtrim(chunk_split(base64_encode($data), 76, $this->_eol));
+                break;
 
-        case '8bit':
-        case '7bit':
-        default:
-            return $data;
+            case '8bit':
+            case '7bit':
+            default:
+                return $data;
         }
     }
 
@@ -523,48 +523,48 @@ 
         $data = '';
 
         switch ($encoding) {
-        case 'quoted-printable':
-            while (!feof($fd)) {
-                $buffer = $this->_quotedPrintableEncode(fgets($fd));
-                if ($fh) {
-                    fwrite($fh, $buffer);
-                } else {
-                    $data .= $buffer;
-                }
-            }
-            break;
-
-        case 'base64':
-            while (!feof($fd)) {
-                // Should read in a multiple of 57 bytes so that
-                // the output is 76 bytes per line. Don't use big chunks
-                // because base64 encoding is memory expensive
-                $buffer = fread($fd, 57 * 9198); // ca. 0.5 MB
-                $buffer = base64_encode($buffer);
-                $buffer = chunk_split($buffer, 76, $this->_eol);
-                if (feof($fd)) {
-                    $buffer = rtrim($buffer);
+            case 'quoted-printable':
+                while (!feof($fd)) {
+                    $buffer = $this->_quotedPrintableEncode(fgets($fd));
+                    if ($fh) {
+                        fwrite($fh, $buffer);
+                    } else {
+                        $data .= $buffer;
+                    }
                 }
+                break;
 
-                if ($fh) {
-                    fwrite($fh, $buffer);
-                } else {
-                    $data .= $buffer;
+            case 'base64':
+                while (!feof($fd)) {
+                    // Should read in a multiple of 57 bytes so that
+                    // the output is 76 bytes per line. Don't use big chunks
+                    // because base64 encoding is memory expensive
+                    $buffer = fread($fd, 57 * 9198); // ca. 0.5 MB
+                    $buffer = base64_encode($buffer);
+                    $buffer = chunk_split($buffer, 76, $this->_eol);
+                    if (feof($fd)) {
+                        $buffer = rtrim($buffer);
+                    }
+
+                    if ($fh) {
+                        fwrite($fh, $buffer);
+                    } else {
+                        $data .= $buffer;
+                    }
                 }
-            }
-            break;
-
-        case '8bit':
-        case '7bit':
-        default:
-            while (!feof($fd)) {
-                $buffer = fread($fd, 1048576); // 1 MB
-                if ($fh) {
-                    fwrite($fh, $buffer);
-                } else {
-                    $data .= $buffer;
+                break;
+
+            case '8bit':
+            case '7bit':
+            default:
+                while (!feof($fd)) {
+                    $buffer = fread($fd, 1048576); // 1 MB
+                    if ($fh) {
+                        fwrite($fh, $buffer);
+                    } else {
+                        $data .= $buffer;
+                    }
                 }
-            }
         }
 
         fclose($fd);

dolibarr/htdocs/includes/adodbtime/adodb-time.inc.php

Switch Indentation +162 added lines, -162 removed lines

@@ -1106,119 +1106,119 @@ 
 	*/
 	for ($i=0; $i < $max; $i++) {
 		switch($fmt[$i]) {
-		case 'e':
-			$dates .= date('e');
-			break;
-		case 'T':
-			if ($ADODB_DATETIME_CLASS) {
-				$dt = new DateTime();
-				$dt->SetDate($year,$month,$day);
-				$dates .= $dt->Format('T');
-			} else
-				$dates .= date('T');
-			break;
-		// YEAR
-		case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
-		case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
-
-			// 4.3.11 uses '04 Jun 2004'
-			// 4.3.8 uses  ' 4 Jun 2004'
-			$dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '
-				. ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
-
-			if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour;
-
-			if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min;
-
-			if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
-
-			$gmt = adodb_get_gmt_diff($year,$month,$day);
-
-			$dates .= ' '.adodb_tz_offset($gmt,$isphp5);
-			break;
-
-		case 'Y': $dates .= $year; break;
-		case 'y': $dates .= substr($year,strlen($year)-2,2); break;
-		// MONTH
-		case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= $month; break;
-		case 'Q': $dates .= ($month+3)>>2; break;
-		case 'n': $dates .= $month; break;
-		case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); break;
-		case 'F': $dates .= date('F',mktime(0,0,0,$month,2,1971)); break;
-		// DAY
-		case 't': $dates .= $arr['ndays']; break;
-		case 'z': $dates .= $arr['yday']; break;
-		case 'w': $dates .= adodb_dow($year,$month,$day); break;
-		case 'l': $dates .= gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break;
-		case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;
-		case 'j': $dates .= $day; break;
-		case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break;
-		case 'S':
-			$d10 = $day % 10;
-			if ($d10 == 1) $dates .= 'st';
-			else if ($d10 == 2 && $day != 12) $dates .= 'nd';
-			else if ($d10 == 3) $dates .= 'rd';
-			else $dates .= 'th';
-			break;
-
-		// HOUR
-		case 'Z':
-			$dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff($year,$month,$day); break;
-		case 'O':
-			$gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$month,$day);
-
-			$dates .= adodb_tz_offset($gmt,$isphp5);
-			break;
-
-		case 'H':
-			if ($hour < 10) $dates .= '0'.$hour;
-			else $dates .= $hour;
-			break;
-		case 'h':
-			if ($hour > 12) $hh = $hour - 12;
-			else {
-				if ($hour == 0) $hh = '12';
-				else $hh = $hour;
-			}
-
-			if ($hh < 10) $dates .= '0'.$hh;
-			else $dates .= $hh;
-			break;
-
-		case 'G':
-			$dates .= $hour;
-			break;
-
-		case 'g':
-			if ($hour > 12) $hh = $hour - 12;
-			else {
-				if ($hour == 0) $hh = '12';
-				else $hh = $hour;
-			}
-			$dates .= $hh;
-			break;
-		// MINUTES
-		case 'i': if ($min < 10) $dates .= '0'.$min; else $dates .= $min; break;
-		// SECONDS
-		case 'U': $dates .= $d; break;
-		case 's': if ($secs < 10) $dates .= '0'.$secs; else $dates .= $secs; break;
-		// AM/PM
-		// Note 00:00 to 11:59 is AM, while 12:00 to 23:59 is PM
-		case 'a':
-			if ($hour>=12) $dates .= 'pm';
-			else $dates .= 'am';
-			break;
-		case 'A':
-			if ($hour>=12) $dates .= 'PM';
-			else $dates .= 'AM';
-			break;
-		default:
-			$dates .= $fmt[$i]; break;
-		// ESCAPE
-		case "\\":
-			$i++;
-			if ($i < $max) $dates .= $fmt[$i];
-			break;
+		    case 'e':
+			    $dates .= date('e');
+			    break;
+		    case 'T':
+			    if ($ADODB_DATETIME_CLASS) {
+				    $dt = new DateTime();
+				    $dt->SetDate($year,$month,$day);
+				    $dates .= $dt->Format('T');
+			    } else
+				    $dates .= date('T');
+			    break;
+		    // YEAR
+		    case 'L': $dates .= $arr['leap'] ? '1' : '0'; break;
+		    case 'r': // Thu, 21 Dec 2000 16:01:07 +0200
+
+			    // 4.3.11 uses '04 Jun 2004'
+			    // 4.3.8 uses  ' 4 Jun 2004'
+			    $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))).', '
+				    . ($day<10?'0'.$day:$day) . ' '.date('M',mktime(0,0,0,$month,2,1971)).' '.$year.' ';
+
+			    if ($hour < 10) $dates .= '0'.$hour; else $dates .= $hour;
+
+			    if ($min < 10) $dates .= ':0'.$min; else $dates .= ':'.$min;
+
+			    if ($secs < 10) $dates .= ':0'.$secs; else $dates .= ':'.$secs;
+
+			    $gmt = adodb_get_gmt_diff($year,$month,$day);
+
+			    $dates .= ' '.adodb_tz_offset($gmt,$isphp5);
+			    break;
+
+		    case 'Y': $dates .= $year; break;
+		    case 'y': $dates .= substr($year,strlen($year)-2,2); break;
+		    // MONTH
+		    case 'm': if ($month<10) $dates .= '0'.$month; else $dates .= $month; break;
+		    case 'Q': $dates .= ($month+3)>>2; break;
+		    case 'n': $dates .= $month; break;
+		    case 'M': $dates .= date('M',mktime(0,0,0,$month,2,1971)); break;
+		    case 'F': $dates .= date('F',mktime(0,0,0,$month,2,1971)); break;
+		    // DAY
+		    case 't': $dates .= $arr['ndays']; break;
+		    case 'z': $dates .= $arr['yday']; break;
+		    case 'w': $dates .= adodb_dow($year,$month,$day); break;
+		    case 'l': $dates .= gmdate('l',$_day_power*(3+adodb_dow($year,$month,$day))); break;
+		    case 'D': $dates .= gmdate('D',$_day_power*(3+adodb_dow($year,$month,$day))); break;
+		    case 'j': $dates .= $day; break;
+		    case 'd': if ($day<10) $dates .= '0'.$day; else $dates .= $day; break;
+		    case 'S':
+			    $d10 = $day % 10;
+			    if ($d10 == 1) $dates .= 'st';
+			    else if ($d10 == 2 && $day != 12) $dates .= 'nd';
+			    else if ($d10 == 3) $dates .= 'rd';
+			    else $dates .= 'th';
+			    break;
+
+		    // HOUR
+		    case 'Z':
+			    $dates .= ($is_gmt) ? 0 : -adodb_get_gmt_diff($year,$month,$day); break;
+		    case 'O':
+			    $gmt = ($is_gmt) ? 0 : adodb_get_gmt_diff($year,$month,$day);
+
+			    $dates .= adodb_tz_offset($gmt,$isphp5);
+			    break;
+
+		    case 'H':
+			    if ($hour < 10) $dates .= '0'.$hour;
+			    else $dates .= $hour;
+			    break;
+		    case 'h':
+			    if ($hour > 12) $hh = $hour - 12;
+			    else {
+				    if ($hour == 0) $hh = '12';
+				    else $hh = $hour;
+			    }
+
+			    if ($hh < 10) $dates .= '0'.$hh;
+			    else $dates .= $hh;
+			    break;
+
+		    case 'G':
+			    $dates .= $hour;
+			    break;
+
+		    case 'g':
+			    if ($hour > 12) $hh = $hour - 12;
+			    else {
+				    if ($hour == 0) $hh = '12';
+				    else $hh = $hour;
+			    }
+			    $dates .= $hh;
+			    break;
+		    // MINUTES
+		    case 'i': if ($min < 10) $dates .= '0'.$min; else $dates .= $min; break;
+		    // SECONDS
+		    case 'U': $dates .= $d; break;
+		    case 's': if ($secs < 10) $dates .= '0'.$secs; else $dates .= $secs; break;
+		    // AM/PM
+		    // Note 00:00 to 11:59 is AM, while 12:00 to 23:59 is PM
+		    case 'a':
+			    if ($hour>=12) $dates .= 'pm';
+			    else $dates .= 'am';
+			    break;
+		    case 'A':
+			    if ($hour>=12) $dates .= 'PM';
+			    else $dates .= 'AM';
+			    break;
+		    default:
+			    $dates .= $fmt[$i]; break;
+		    // ESCAPE
+		    case "\\":
+			    $i++;
+			    if ($i < $max) $dates .= $fmt[$i];
+			    break;
 		}
 	}
 	return $dates;
@@ -1396,55 +1396,55 @@ 
 
 			$inpct = false;
 			switch($ch) {
-			case '0':
-			case '1':
-			case '2':
-			case '3':
-			case '4':
-			case '5':
-			case '6':
-			case '7':
-			case '8':
-			case '9':
-			case 'E':
-			case 'O':
-				/* ignore format modifiers */
-				$inpct = true;
-				break;
-
-			case 'a': $fmtdate .= 'D'; break;
-			case 'A': $fmtdate .= 'l'; break;
-			case 'h':
-			case 'b': $fmtdate .= 'M'; break;
-			case 'B': $fmtdate .= 'F'; break;
-			case 'c': $fmtdate .= $ADODB_DATE_LOCALE[0].$ADODB_DATE_LOCALE[1]; break;
-			case 'C': $fmtdate .= '\C?'; break; // century
-			case 'd': $fmtdate .= 'd'; break;
-			case 'D': $fmtdate .= 'm/d/y'; break;
-			case 'e': $fmtdate .= 'j'; break;
-			case 'g': $fmtdate .= '\g?'; break; //?
-			case 'G': $fmtdate .= '\G?'; break; //?
-			case 'H': $fmtdate .= 'H'; break;
-			case 'I': $fmtdate .= 'h'; break;
-			case 'j': $fmtdate .= '?z'; $parsej = true; break; // wrong as j=1-based, z=0-basd
-			case 'm': $fmtdate .= 'm'; break;
-			case 'M': $fmtdate .= 'i'; break;
-			case 'n': $fmtdate .= "\n"; break;
-			case 'p': $fmtdate .= 'a'; break;
-			case 'r': $fmtdate .= 'h:i:s a'; break;
-			case 'R': $fmtdate .= 'H:i:s'; break;
-			case 'S': $fmtdate .= 's'; break;
-			case 't': $fmtdate .= "\t"; break;
-			case 'T': $fmtdate .= 'H:i:s'; break;
-			case 'u': $fmtdate .= '?u'; $parseu = true; break; // wrong strftime=1-based, date=0-based
-			case 'U': $fmtdate .= '?U'; $parseU = true; break;// wrong strftime=1-based, date=0-based
-			case 'x': $fmtdate .= $ADODB_DATE_LOCALE[0]; break;
-			case 'X': $fmtdate .= $ADODB_DATE_LOCALE[1]; break;
-			case 'w': $fmtdate .= '?w'; $parseu = true; break; // wrong strftime=1-based, date=0-based
-			case 'W': $fmtdate .= '?W'; $parseU = true; break;// wrong strftime=1-based, date=0-based
-			case 'y': $fmtdate .= 'y'; break;
-			case 'Y': $fmtdate .= 'Y'; break;
-			case 'Z': $fmtdate .= 'T'; break;
+			    case '0':
+			    case '1':
+			    case '2':
+			    case '3':
+			    case '4':
+			    case '5':
+			    case '6':
+			    case '7':
+			    case '8':
+			    case '9':
+			    case 'E':
+			    case 'O':
+				    /* ignore format modifiers */
+				    $inpct = true;
+				    break;
+
+			    case 'a': $fmtdate .= 'D'; break;
+			    case 'A': $fmtdate .= 'l'; break;
+			    case 'h':
+			    case 'b': $fmtdate .= 'M'; break;
+			    case 'B': $fmtdate .= 'F'; break;
+			    case 'c': $fmtdate .= $ADODB_DATE_LOCALE[0].$ADODB_DATE_LOCALE[1]; break;
+			    case 'C': $fmtdate .= '\C?'; break; // century
+			    case 'd': $fmtdate .= 'd'; break;
+			    case 'D': $fmtdate .= 'm/d/y'; break;
+			    case 'e': $fmtdate .= 'j'; break;
+			    case 'g': $fmtdate .= '\g?'; break; //?
+			    case 'G': $fmtdate .= '\G?'; break; //?
+			    case 'H': $fmtdate .= 'H'; break;
+			    case 'I': $fmtdate .= 'h'; break;
+			    case 'j': $fmtdate .= '?z'; $parsej = true; break; // wrong as j=1-based, z=0-basd
+			    case 'm': $fmtdate .= 'm'; break;
+			    case 'M': $fmtdate .= 'i'; break;
+			    case 'n': $fmtdate .= "\n"; break;
+			    case 'p': $fmtdate .= 'a'; break;
+			    case 'r': $fmtdate .= 'h:i:s a'; break;
+			    case 'R': $fmtdate .= 'H:i:s'; break;
+			    case 'S': $fmtdate .= 's'; break;
+			    case 't': $fmtdate .= "\t"; break;
+			    case 'T': $fmtdate .= 'H:i:s'; break;
+			    case 'u': $fmtdate .= '?u'; $parseu = true; break; // wrong strftime=1-based, date=0-based
+			    case 'U': $fmtdate .= '?U'; $parseU = true; break;// wrong strftime=1-based, date=0-based
+			    case 'x': $fmtdate .= $ADODB_DATE_LOCALE[0]; break;
+			    case 'X': $fmtdate .= $ADODB_DATE_LOCALE[1]; break;
+			    case 'w': $fmtdate .= '?w'; $parseu = true; break; // wrong strftime=1-based, date=0-based
+			    case 'W': $fmtdate .= '?W'; $parseU = true; break;// wrong strftime=1-based, date=0-based
+			    case 'y': $fmtdate .= 'y'; break;
+			    case 'Y': $fmtdate .= 'Y'; break;
+			    case 'Z': $fmtdate .= 'T'; break;
 			}
 		} else if (('A' <= ($ch) && ($ch) <= 'Z' ) || ('a' <= ($ch) && ($ch) <= 'z' ))
 			$fmtdate .= "\\".$ch;