silverstripe / silverstripe-documentconverter

code/DocumentImportInnerField.php

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

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');