silverstripe / silverstripe-documentconverter

code/DocumentImportInnerField.php

Spacing +56 added lines, -56 removed lines

@@ -34,11 +34,11 @@ 
 	 * Process the document immediately upon upload.
 	 */
 	public function upload(SS_HTTPRequest $request) {
-		if($this->isDisabled() || $this->isReadonly()) return $this->httpError(403);
+		if ($this->isDisabled() || $this->isReadonly()) return $this->httpError(403);
 
 		// Protect against CSRF on destructive action
 		$token = $this->getForm()->getSecurityToken();
-		if(!$token->checkRequest($request)) return $this->httpError(400);
+		if (!$token->checkRequest($request)) return $this->httpError(400);
 
 		$name = $this->getName();
 		$tmpfile = $request->postVar($name);
@@ -57,11 +57,11 @@ 
 
 		if (!$return['error']) {
 			// Get options for this import.
-			$splitHeader = (int)$request->postVar('SplitHeader');
-			$keepSource = (bool)$request->postVar('KeepSource');
-			$chosenFolderID = (int)$request->postVar('ChosenFolderID');
-			$publishPages = (bool)$request->postVar('PublishPages');
-			$includeTOC = (bool)$request->postVar('IncludeTOC');
+			$splitHeader = (int) $request->postVar('SplitHeader');
+			$keepSource = (bool) $request->postVar('KeepSource');
+			$chosenFolderID = (int) $request->postVar('ChosenFolderID');
+			$publishPages = (bool) $request->postVar('PublishPages');
+			$includeTOC = (bool) $request->postVar('IncludeTOC');
 
 			// Process the document and write the page.
 			$preservedDocument = null;
@@ -110,42 +110,42 @@ 
 		$page = $this->form->getRecord();
 		$content = '<ul>';
 
-		if($page) {
-			if($page->Children()->Count() > 0) {
-				foreach($page->Children() as $child) {
-					$content .= '<li><a href="' . $child->Link() . '">' . $child->Title . '</a></li>';
+		if ($page) {
+			if ($page->Children()->Count() > 0) {
+				foreach ($page->Children() as $child) {
+					$content .= '<li><a href="'.$child->Link().'">'.$child->Title.'</a></li>';
 				}
-				$page->Content = $content . '</ul>';
-			}  else {
+				$page->Content = $content.'</ul>';
+			} else {
 				$doc = new DOMDocument();
 				$doc->loadHTML($page->Content);
 				$body = $doc->getElementsByTagName('body')->item(0);
 				$node = $body->firstChild;
 				$h1 = $h2 = 1;
-				while($node) {
-					if($node instanceof DOMElement && $node->tagName == 'h1') {
-						$content .= '<li><a href="#h1.' . $h1 . '">'. trim(preg_replace('/\n|\r/', '', Convert::html2raw($node->textContent))) . '</a></li>';
+				while ($node) {
+					if ($node instanceof DOMElement && $node->tagName == 'h1') {
+						$content .= '<li><a href="#h1.'.$h1.'">'.trim(preg_replace('/\n|\r/', '', Convert::html2raw($node->textContent))).'</a></li>';
 						$node->setAttributeNode(new DOMAttr("id", "h1.".$h1));
 						$h1++;
-					} elseif($node instanceof DOMElement && $node->tagName == 'h2') {
-						$content .= '<li class="menu-h2"><a href="#h2.' . $h2 . '">'. trim(preg_replace('/\n|\r/', '', Convert::html2raw($node->textContent))) . '</a></li>';
+					} elseif ($node instanceof DOMElement && $node->tagName == 'h2') {
+						$content .= '<li class="menu-h2"><a href="#h2.'.$h2.'">'.trim(preg_replace('/\n|\r/', '', Convert::html2raw($node->textContent))).'</a></li>';
 						$node->setAttributeNode(new DOMAttr("id", "h2.".$h2));
 						$h2++;
 					}
 					$node = $node->nextSibling;
 				}
-				$page->Content = $content . '</ul>' . $doc->saveHTML();
+				$page->Content = $content.'</ul>'.$doc->saveHTML();
 			}
 
 			// Add in the link to the original document, if provided.
-			if($preservedDocument) {
-				$page->Content = '<a href="' . $preservedDocument->Link() . '" title="download original document">download original document (' .
-									$preservedDocument->getSize() . ')</a>' . $page->Content;
+			if ($preservedDocument) {
+				$page->Content = '<a href="'.$preservedDocument->Link().'" title="download original document">download original document ('.
+									$preservedDocument->getSize().')</a>'.$page->Content;
 			}
 
 			// Store the result
 			$page->write();
-			if($publishPages) $page->doPublish();
+			if ($publishPages) $page->doPublish();
 		}
 	}
 
@@ -179,28 +179,28 @@ 
 	protected function writeContent($subtitle, $subdoc, $subnode, $sort = null, $publishPages = false) {
 		$record = $this->form->getRecord();
 
-		if($subtitle) {
+		if ($subtitle) {
 			// Write the chapter page to a subpage.
 			$page = DataObject::get_one('Page', sprintf('"Title" = \'%s\' AND "ParentID" = %d', $subtitle, $record->ID));
-			if(!$page) {
+			if (!$page) {
 				$page = new Page();
 				$page->ParentID = $record->ID;
 				$page->Title = $subtitle;
 			}
 
 			unset($this->unusedChildren[$page->ID]);
-			file_put_contents(ASSETS_PATH . '/index-' . $sort . '.html', $this->getBodyText($subdoc, $subnode));
+			file_put_contents(ASSETS_PATH.'/index-'.$sort.'.html', $this->getBodyText($subdoc, $subnode));
 
 			if ($sort) $page->Sort = $sort;
 			$page->Content = $this->getBodyText($subdoc, $subnode);
 			$page->write();
-			if($publishPages) $page->doPublish();
+			if ($publishPages) $page->doPublish();
 		} else {
 			// Write to the master page.
 			$record->Content = $this->getBodyText($subdoc, $subnode);
 			$record->write();
 
-			if($publishPages) $record->doPublish();
+			if ($publishPages) $record->doPublish();
 		}
 
 	}
@@ -237,7 +237,7 @@ 
 		$tidy->cleanRepair();
 
 		$fragment = [];
-		foreach($tidy->body()->child as $child) {
+		foreach ($tidy->body()->child as $child) {
 			$fragment[] = $child->value;
 		}
 
@@ -254,13 +254,13 @@ 
 		// make sure any images are added as Image records with a relative link to assets
 		$folderName = ($chosenFolderID) ? DataObject::get_by_id('Folder', $chosenFolderID)->Name : '';
 		$imgs = $xpath->query('//img');
-		for($i = 0; $i < $imgs->length; $i++) {
+		for ($i = 0; $i < $imgs->length; $i++) {
 			$img = $imgs->item($i);
-			$originalPath = 'assets/' . $folderName . '/' . $img->getAttribute('src');
+			$originalPath = 'assets/'.$folderName.'/'.$img->getAttribute('src');
 			$name = FileNameFilter::create()->filter(basename($originalPath));
 
 			$image = Image::get()->filter(array('Name' => $name, 'ParentID' => (int) $chosenFolderID))->first();
-			if(!($image && $image->exists())) {
+			if (!($image && $image->exists())) {
 				$image = new Image();
 				$image->ParentID = (int) $chosenFolderID;
 				$image->Name = $name;
@@ -279,24 +279,24 @@ 
 			'//font' // Remove any font tags
 		);
 
-		foreach($remove_rules as $rule => $parenttag) {
-			if(is_numeric($rule)) {
+		foreach ($remove_rules as $rule => $parenttag) {
+			if (is_numeric($rule)) {
 				$rule = $parenttag;
 				$parenttag = null;
 			}
 
 			$nodes = array();
-			foreach($xpath->query($rule) as $node) $nodes[] = $node;
+			foreach ($xpath->query($rule) as $node) $nodes[] = $node;
 
-			foreach($nodes as $node) {
+			foreach ($nodes as $node) {
 				$parent = $node->parentNode;
 
-				if($parenttag) {
+				if ($parenttag) {
 					$parent = $doc->createElement($parenttag);
 					$node->nextSibling ? $node->parentNode->insertBefore($parent, $node->nextSibling) : $node->parentNode->appendChild($parent);
 				}
 
-				while($node->firstChild) $parent->appendChild($node->firstChild);
+				while ($node->firstChild) $parent->appendChild($node->firstChild);
 				$node->parentNode->removeChild($node);
 			}
 		}
@@ -320,11 +320,11 @@ 
 			'//br' // BR tags
 		);
 
-		foreach($clean as $query) {
+		foreach ($clean as $query) {
 			// First get all the nodes. Need to build array, as they'll disappear from the nodelist while we're deleteing them, causing the indexing
 			// to screw up.
 			$nodes = array();
-			foreach($xpath->query($query) as $node) $nodes[] = $node;
+			foreach ($xpath->query($query) as $node) $nodes[] = $node;
 
 			// Then remove them all
 			foreach ($nodes as $node) { if ($node->parentNode) $node->parentNode->removeChild($node); }
@@ -334,7 +334,7 @@ 
 		$body = $doc->getElementsByTagName('body')->item(0);
 
 		$this->unusedChildren = array();
-		foreach($sourcePage->Children() as $child) {
+		foreach ($sourcePage->Children() as $child) {
 			$this->unusedChildren[$child->ID] = $child;
 		}
 
@@ -346,10 +346,10 @@ 
 		$subnode = $subdoc->createElement('body');
 		$node = $body->firstChild;
 		$sort = 1;
-		if($splitHeader == 1 || $splitHeader == 2) {
-			while($node && !$DocumentImportInnerfield_error) {
-				if($node instanceof DOMElement && $node->tagName == 'h' . $splitHeader) {
-					if($subnode->hasChildNodes()) {
+		if ($splitHeader == 1 || $splitHeader == 2) {
+			while ($node && !$DocumentImportInnerfield_error) {
+				if ($node instanceof DOMElement && $node->tagName == 'h'.$splitHeader) {
+					if ($subnode->hasChildNodes()) {
 						$this->writeContent($subtitle, $subdoc, $subnode, $sort, $publishPages);
 						$sort++;
 					}
@@ -367,7 +367,7 @@ 
 			$this->writeContent($subtitle, $subdoc, $body, null, $publishPages);
 		}
 
-		if($subnode->hasChildNodes() && !$DocumentImportInnerfield_error) {
+		if ($subnode->hasChildNodes() && !$DocumentImportInnerfield_error) {
 			$this->writeContent($subtitle, $subdoc, $subnode, null, $publishPages);
 		}
 
@@ -376,7 +376,7 @@ 
 			return array('error' => $DocumentImportInnerfield_error);
 		}
 
-		foreach($this->unusedChildren as $child) {
+		foreach ($this->unusedChildren as $child) {
 			$origStage = Versioned::current_stage();
 
 			Versioned::reading_stage('Stage');
@@ -415,7 +415,7 @@ 
 
 	protected static $docvert_url;
 
-	public static function set_docvert_username($username = null)  {
+	public static function set_docvert_username($username = null) {
 		self::$docvert_username = $username;
 	}
 
@@ -448,14 +448,14 @@ 
 		$ch = curl_init();
 
 		// PHP 5.5+ introduced CURLFile which makes the '@/path/to/file' syntax deprecated.
-		if(class_exists('CURLFile')) {
+		if (class_exists('CURLFile')) {
 			$file = new CURLFile(
 				$this->fileDescriptor['path'],
 				$this->fileDescriptor['mimeType'],
 				$this->fileDescriptor['name']
 			);
 		} else {
-			$file = '@' . $this->fileDescriptor['path'];
+			$file = '@'.$this->fileDescriptor['path'];
 		}
 
 		curl_setopt_array($ch, array(
@@ -469,7 +469,7 @@ 
 
 		$folderName = ($this->chosenFolderID) ? '/'.DataObject::get_by_id('Folder', $this->chosenFolderID)->Name : '';
 		$outname = tempnam(ASSETS_PATH, 'convert');
-		$outzip = $outname . '.zip';
+		$outzip = $outname.'.zip';
 
 		$out = fopen($outzip, 'w');
 		curl_setopt($ch, CURLOPT_FILE, $out);
@@ -491,15 +491,15 @@ 
 		// you need php zip, i.e. port install php5-zip
 		$zip = new ZipArchive();
 
-		if($zip->open($outzip)) {
-			$zip->extractTo(ASSETS_PATH .$folderName);
+		if ($zip->open($outzip)) {
+			$zip->extractTo(ASSETS_PATH.$folderName);
 		}
 
 		// remove temporary files
 		unlink($outname);
 		unlink($outzip);
 
-		if (!file_exists(ASSETS_PATH . $folderName . '/index.html')) {
+		if (!file_exists(ASSETS_PATH.$folderName.'/index.html')) {
 			return array('error' =>  _t(
 				'DocumentConverter.PROCESSFAILED',
 				'Could not process document, please double-check you uploaded a .doc or .docx format.',
@@ -507,9 +507,9 @@ 
 			));
 		}
 
-		$content = file_get_contents(ASSETS_PATH . $folderName . '/index.html');
+		$content = file_get_contents(ASSETS_PATH.$folderName.'/index.html');
 
-		unlink(ASSETS_PATH . $folderName . '/index.html');
+		unlink(ASSETS_PATH.$folderName.'/index.html');
 
 		return $content;
 	}

Braces +35 added lines, -12 removed lines

@@ -34,11 +34,15 @@ 
 	 * Process the document immediately upon upload.
 	 */
 	public function upload(SS_HTTPRequest $request) {
-		if($this->isDisabled() || $this->isReadonly()) return $this->httpError(403);
+		if($this->isDisabled() || $this->isReadonly()) {
+			return $this->httpError(403);
+		}
 
 		// Protect against CSRF on destructive action
 		$token = $this->getForm()->getSecurityToken();
-		if(!$token->checkRequest($request)) return $this->httpError(400);
+		if(!$token->checkRequest($request)) {
+			return $this->httpError(400);
+		}
 
 		$name = $this->getName();
 		$tmpfile = $request->postVar($name);
@@ -65,7 +69,9 @@ 
 
 			// Process the document and write the page.
 			$preservedDocument = null;
-			if ($keepSource) $preservedDocument = $this->preserveSourceDocument($tmpfile, $chosenFolderID);
+			if ($keepSource) {
+				$preservedDocument = $this->preserveSourceDocument($tmpfile, $chosenFolderID);
+			}
 
 			$importResult = $this->importFromPOST($tmpfile, $splitHeader, $publishPages, $chosenFolderID);
 			if (is_array($importResult) && isset($importResult['error'])) {
@@ -116,7 +122,7 @@ 
 					$content .= '<li><a href="' . $child->Link() . '">' . $child->Title . '</a></li>';
 				}
 				$page->Content = $content . '</ul>';
-			}  else {
+			} else {
 				$doc = new DOMDocument();
 				$doc->loadHTML($page->Content);
 				$body = $doc->getElementsByTagName('body')->item(0);
@@ -145,7 +151,9 @@ 
 
 			// Store the result
 			$page->write();
-			if($publishPages) $page->doPublish();
+			if($publishPages) {
+				$page->doPublish();
+			}
 		}
 	}
 
@@ -191,16 +199,22 @@ 
 			unset($this->unusedChildren[$page->ID]);
 			file_put_contents(ASSETS_PATH . '/index-' . $sort . '.html', $this->getBodyText($subdoc, $subnode));
 
-			if ($sort) $page->Sort = $sort;
+			if ($sort) {
+				$page->Sort = $sort;
+			}
 			$page->Content = $this->getBodyText($subdoc, $subnode);
 			$page->write();
-			if($publishPages) $page->doPublish();
+			if($publishPages) {
+				$page->doPublish();
+			}
 		} else {
 			// Write to the master page.
 			$record->Content = $this->getBodyText($subdoc, $subnode);
 			$record->write();
 
-			if($publishPages) $record->doPublish();
+			if($publishPages) {
+				$record->doPublish();
+			}
 		}
 
 	}
@@ -286,7 +300,9 @@ 
 			}
 
 			$nodes = array();
-			foreach($xpath->query($rule) as $node) $nodes[] = $node;
+			foreach($xpath->query($rule) as $node) {
+				$nodes[] = $node;
+			}
 
 			foreach($nodes as $node) {
 				$parent = $node->parentNode;
@@ -296,7 +312,9 @@ 
 					$node->nextSibling ? $node->parentNode->insertBefore($parent, $node->nextSibling) : $node->parentNode->appendChild($parent);
 				}
 
-				while($node->firstChild) $parent->appendChild($node->firstChild);
+				while($node->firstChild) {
+					$parent->appendChild($node->firstChild);
+				}
 				$node->parentNode->removeChild($node);
 			}
 		}
@@ -324,10 +342,15 @@ 
 			// First get all the nodes. Need to build array, as they'll disappear from the nodelist while we're deleteing them, causing the indexing
 			// to screw up.
 			$nodes = array();
-			foreach($xpath->query($query) as $node) $nodes[] = $node;
+			foreach($xpath->query($query) as $node) {
+				$nodes[] = $node;
+			}
 
 			// Then remove them all
-			foreach ($nodes as $node) { if ($node->parentNode) $node->parentNode->removeChild($node); }
+			foreach ($nodes as $node) { if ($node->parentNode) {
+				$node->parentNode->removeChild($node);
+			}
+			}
 		}
 
 		// Now split the document into portions by H1

code/DocumentImportField.php

Spacing +4 added lines, -4 removed lines

@@ -38,9 +38,9 @@ 
 					'Split document into pages'
 				), 
 				array(
-					0 => _t('DocumentImportField.No','no'), 
-					1 => _t('DocumentImportField.EachH1','for each heading 1'), 
-					2 => _t('DocumentImportField.EachH2','for each heading 2')
+					0 => _t('DocumentImportField.No', 'no'), 
+					1 => _t('DocumentImportField.EachH1', 'for each heading 1'), 
+					2 => _t('DocumentImportField.EachH2', 'for each heading 2')
 				)
 			),
 			$keepSource = new CheckboxField(
@@ -68,7 +68,7 @@ 
 			),
 			$this->innerField = new DocumentImportInnerField(
 				'ImportedFromFile', 
-				_t('DocumentImportField.ImportedFromFile','Import content from a word document')
+				_t('DocumentImportField.ImportedFromFile', 'Import content from a word document')
 			),
 		));
 

Braces +6 added lines, -2 removed lines

@@ -16,8 +16,12 @@
 	 * @param $children FieldSet/array Any additional children.
 	 */
 	public function __construct($children = null) {
-		if (is_string($children)) throw new InvalidArgumentException('DocumentImportField::__construct does not accept a name as its parameter, it defaults to "ImportedFromFile" instead. Use DocumentImportField::getInnerField()->setName() if you want to change it.');
-		if ($children) throw new InvalidArgumentException('DocumentImportField::__construct provides its own fields and does not accept additional children.');
+		if (is_string($children)) {
+			throw new InvalidArgumentException('DocumentImportField::__construct does not accept a name as its parameter, it defaults to "ImportedFromFile" instead. Use DocumentImportField::getInnerField()->setName() if you want to change it.');
+		}
+		if ($children) {
+			throw new InvalidArgumentException('DocumentImportField::__construct provides its own fields and does not accept additional children.');
+		}
 
 		// Add JS specific to this field.
 		Requirements::javascript('documentconverter/javascript/DocumentImportField.js');