xpressengine / xe-core

modules/tag/tag.class.php

Spacing +16 added lines, -16 removed lines

@@ -15,7 +15,7 @@ 
 		$oModuleController = getController('module');
 		$oDB = &DB::getInstance();
 
-		$oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
+		$oDB->addIndex("tags", "idx_tag", array("document_srl", "tag"));
 		// 2007. 10. 17 document.insertDocument, updateDocument, deleteDocument trigger property for
 		$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
 		$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
@@ -36,15 +36,15 @@ 
 		$oModuleModel = getModel('module');
 		$oDB = &DB::getInstance();
 		// 2007. 10. 17 trigger registration, if registered upset
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) return true;
+		if (!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
+		if (!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
+		if (!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
+		if (!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
+		if (!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) return true;
 		// 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
-		if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) return true;
+		if (!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) return true;
 		// tag in the index column of the table tag
-		if(!$oDB->isIndexExists("tags","idx_tag")) return true;
+		if (!$oDB->isIndexExists("tags", "idx_tag")) return true;
 
 		return false;
 	}
@@ -58,26 +58,26 @@ 
 		$oModuleController = getController('module');
 		$oDB = &DB::getInstance();
 		// 2007. 10. 17 document.insertDocument, updateDocument, deleteDocument trigger property for
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) 
+		if (!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) 
 			$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
 
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) 
+		if (!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) 
 			$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
 
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) 
+		if (!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) 
 			$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
 
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) 
+		if (!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) 
 			$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
 
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) 
+		if (!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) 
 			$oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after');
 		// 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
-		if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after'))
+		if (!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after'))
 			$oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after');
 		// tag in the index column of the table tag
-		if(!$oDB->isIndexExists("tags","idx_tag")) 
-			$oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
+		if (!$oDB->isIndexExists("tags", "idx_tag")) 
+			$oDB->addIndex("tags", "idx_tag", array("document_srl", "tag"));
 
 		return new Object(0, 'success_updated');
 	}

Braces +42 added lines, -21 removed lines

@@ -36,15 +36,29 @@ 
 		$oModuleModel = getModel('module');
 		$oDB = &DB::getInstance();
 		// 2007. 10. 17 trigger registration, if registered upset
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) return true;
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) return true;
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) return true;
+		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) {
+			return true;
+		}
+		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) {
+			return true;
+		}
+		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) {
+			return true;
+		}
+		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) {
+			return true;
+		}
+		if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) {
+			return true;
+		}
 		// 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
-		if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) return true;
+		if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) {
+			return true;
+		}
 		// tag in the index column of the table tag
-		if(!$oDB->isIndexExists("tags","idx_tag")) return true;
+		if(!$oDB->isIndexExists("tags","idx_tag")) {
+			return true;
+		}
 
 		return false;
 	}
@@ -58,26 +72,33 @@ 
 		$oModuleController = getController('module');
 		$oDB = &DB::getInstance();
 		// 2007. 10. 17 document.insertDocument, updateDocument, deleteDocument trigger property for
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) 
-			$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
+		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) {
+					$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
+		}
 
-		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) 
-			$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
+		if(!$oModuleModel->getTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) {
+					$oModuleController->insertTrigger('document.insertDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
+		}
 
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) 
-			$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
+		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before')) {
+					$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerArrangeTag', 'before');
+		}
 
-		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) 
-			$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
+		if(!$oModuleModel->getTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after')) {
+					$oModuleController->insertTrigger('document.updateDocument', 'tag', 'controller', 'triggerInsertTag', 'after');
+		}
 
-		if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) 
-			$oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after');
+		if(!$oModuleModel->getTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after')) {
+					$oModuleController->insertTrigger('document.deleteDocument', 'tag', 'controller', 'triggerDeleteTag', 'after');
+		}
 		// 2007. 10. 17 modules are deleted when you delete all registered triggers that add tag
-		if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after'))
-			$oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after');
+		if(!$oModuleModel->getTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after')) {
+					$oModuleController->insertTrigger('module.deleteModule', 'tag', 'controller', 'triggerDeleteModuleTags', 'after');
+		}
 		// tag in the index column of the table tag
-		if(!$oDB->isIndexExists("tags","idx_tag")) 
-			$oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
+		if(!$oDB->isIndexExists("tags","idx_tag")) {
+					$oDB->addIndex("tags","idx_tag", array("document_srl","tag"));
+		}
 
 		return new Object(0, 'success_updated');
 	}

modules/tag/tag.controller.php

Spacing +14 added lines, -14 removed lines

@@ -19,20 +19,20 @@ 
 	 */
 	function triggerArrangeTag(&$obj)
 	{
-		if(!$obj->tags) return new Object();
+		if (!$obj->tags) return new Object();
 		// tags by variable
 		$tag_list = explode(',', $obj->tags);
 		$tag_count = count($tag_list);
 		$tag_list = array_unique($tag_list);
-		if(!count($tag_list)) return new Object();
+		if (!count($tag_list)) return new Object();
 
-		foreach($tag_list as $tag)
+		foreach ($tag_list as $tag)
 		{
-			if(!trim($tag)) continue;
+			if (!trim($tag)) continue;
 			$arranged_tag_list[] = trim($tag); 
 		}
-		if(!count($arranged_tag_list)) $obj->tags = null;
-		else $obj->tags = implode(',',$arranged_tag_list);
+		if (!count($arranged_tag_list)) $obj->tags = null;
+		else $obj->tags = implode(',', $arranged_tag_list);
 		return new Object();
 	}
 
@@ -45,24 +45,24 @@ 
 		$module_srl = $obj->module_srl;
 		$document_srl = $obj->document_srl;
 		$tags = $obj->tags;
-		if(!$document_srl) return new Object();
+		if (!$document_srl) return new Object();
 		// Remove all tags that article
 		$output = $this->triggerDeleteTag($obj);
-		if(!$output->toBool()) return $output;
+		if (!$output->toBool()) return $output;
 		// Re-enter the tag
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
 		$args->document_srl = $document_srl;
 
-		$tag_list = explode(',',$tags);
+		$tag_list = explode(',', $tags);
 		$tag_count = count($tag_list);
-		for($i=0;$i<$tag_count;$i++)
+		for ($i = 0; $i < $tag_count; $i++)
 		{
 			unset($args->tag);
 			$args->tag = trim($tag_list[$i]);
-			if(!$args->tag) continue;
+			if (!$args->tag) continue;
 			$output = executeQuery('tag.insertTag', $args);
-			if(!$output->toBool()) return $output;
+			if (!$output->toBool()) return $output;
 		}
 
 		return new Object();
@@ -75,7 +75,7 @@ 
 	function triggerDeleteTag(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new Object();
+		if (!$document_srl) return new Object();
 
 		$args = new stdClass();
 		$args->document_srl = $document_srl;
@@ -88,7 +88,7 @@ 
 	function triggerDeleteModuleTags(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new Object();
+		if (!$module_srl) return new Object();
 
 		$oTagController = getAdminController('tag');
 		return $oTagController->deleteModuleTags($module_srl);

Braces +32 added lines, -11 removed lines

@@ -19,20 +19,29 @@ 
 	 */
 	function triggerArrangeTag(&$obj)
 	{
-		if(!$obj->tags) return new Object();
+		if(!$obj->tags) {
+			return new Object();
+		}
 		// tags by variable
 		$tag_list = explode(',', $obj->tags);
 		$tag_count = count($tag_list);
 		$tag_list = array_unique($tag_list);
-		if(!count($tag_list)) return new Object();
+		if(!count($tag_list)) {
+			return new Object();
+		}
 
 		foreach($tag_list as $tag)
 		{
-			if(!trim($tag)) continue;
+			if(!trim($tag)) {
+				continue;
+			}
 			$arranged_tag_list[] = trim($tag); 
 		}
-		if(!count($arranged_tag_list)) $obj->tags = null;
-		else $obj->tags = implode(',',$arranged_tag_list);
+		if(!count($arranged_tag_list)) {
+			$obj->tags = null;
+		} else {
+			$obj->tags = implode(',',$arranged_tag_list);
+		}
 		return new Object();
 	}
 
@@ -45,10 +54,14 @@ 
 		$module_srl = $obj->module_srl;
 		$document_srl = $obj->document_srl;
 		$tags = $obj->tags;
-		if(!$document_srl) return new Object();
+		if(!$document_srl) {
+			return new Object();
+		}
 		// Remove all tags that article
 		$output = $this->triggerDeleteTag($obj);
-		if(!$output->toBool()) return $output;
+		if(!$output->toBool()) {
+			return $output;
+		}
 		// Re-enter the tag
 		$args = new stdClass();
 		$args->module_srl = $module_srl;
@@ -60,9 +73,13 @@ 
 		{
 			unset($args->tag);
 			$args->tag = trim($tag_list[$i]);
-			if(!$args->tag) continue;
+			if(!$args->tag) {
+				continue;
+			}
 			$output = executeQuery('tag.insertTag', $args);
-			if(!$output->toBool()) return $output;
+			if(!$output->toBool()) {
+				return $output;
+			}
 		}
 
 		return new Object();
@@ -75,7 +92,9 @@ 
 	function triggerDeleteTag(&$obj)
 	{
 		$document_srl = $obj->document_srl;
-		if(!$document_srl) return new Object();
+		if(!$document_srl) {
+			return new Object();
+		}
 
 		$args = new stdClass();
 		$args->document_srl = $document_srl;
@@ -88,7 +107,9 @@ 
 	function triggerDeleteModuleTags(&$obj)
 	{
 		$module_srl = $obj->module_srl;
-		if(!$module_srl) return new Object();
+		if(!$module_srl) {
+			return new Object();
+		}
 
 		$oTagController = getAdminController('tag');
 		return $oTagController->deleteModuleTags($module_srl);

modules/trash/model/TrashVO.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 	}
 	function getTitle()
 	{
-		if(empty($this->title)) return $lang->untitle;
+		if (empty($this->title)) return $lang->untitle;
 		return htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 	}
 	function setTitle($title)
@@ -33,7 +33,7 @@ 
 	}
 	function getOriginModule()
 	{
-		if(empty($this->originModule)) return 'document';
+		if (empty($this->originModule)) return 'document';
 		return $this->originModule;
 	}
 	function setOriginModule($originModule)
@@ -98,7 +98,7 @@ 
 	}
 	function getRegdate()
 	{
-		if(empty($this->regdate)) return date('YmdHis');
+		if (empty($this->regdate)) return date('YmdHis');
 
 		return $this->regdate;
 	}

Braces +9 added lines, -3 removed lines

@@ -24,7 +24,9 @@ 
 	}
 	function getTitle()
 	{
-		if(empty($this->title)) return $lang->untitle;
+		if(empty($this->title)) {
+			return $lang->untitle;
+		}
 		return htmlspecialchars($this->title, ENT_COMPAT | ENT_HTML401, 'UTF-8', false);
 	}
 	function setTitle($title)
@@ -33,7 +35,9 @@ 
 	}
 	function getOriginModule()
 	{
-		if(empty($this->originModule)) return 'document';
+		if(empty($this->originModule)) {
+			return 'document';
+		}
 		return $this->originModule;
 	}
 	function setOriginModule($originModule)
@@ -98,7 +102,9 @@ 
 	}
 	function getRegdate()
 	{
-		if(empty($this->regdate)) return date('YmdHis');
+		if(empty($this->regdate)) {
+			return date('YmdHis');
+		}
 
 		return $this->regdate;
 	}

modules/trash/trash.admin.view.php

Spacing +11 added lines, -11 removed lines

@@ -17,7 +17,7 @@ 
 	function init()
 	{
 		// 템플릿 경로 지정 (board의 경우 tpl에 관리자용 템플릿 모아놓음)
-		$template_path = sprintf("%stpl/",$this->module_path);
+		$template_path = sprintf("%stpl/", $this->module_path);
 		$this->setTemplatePath($template_path);
 	}
 
@@ -51,20 +51,20 @@ 
 		$oModuleModel = getModel('module');
 		$module_list = array();
 		$mod_srls = array();
-		foreach($output->data as $oTrashVO)
+		foreach ($output->data as $oTrashVO)
 		{
 			$mod_srls[] = $oTrashVO->unserializedObject['module_srl'];
 		}
 		$mod_srls = array_unique($mod_srls);
 		// Module List
 		$mod_srls_count = count($mod_srls);
-		if($mod_srls_count)
+		if ($mod_srls_count)
 		{
 			$columnList = array('module_srl', 'mid', 'browser_title');
 			$module_output = $oModuleModel->getModulesInfo($mod_srls, $columnList);
-			if($module_output && is_array($module_output))
+			if ($module_output && is_array($module_output))
 			{
-				foreach($module_output as $module)
+				foreach ($module_output as $module)
 				{
 					$module_list[$module->module_srl] = $module;
 				}
@@ -86,13 +86,13 @@ 
 
 		$oTrashModel = getModel('trash');
 		$output = $oTrashModel->getTrash($trash_srl);
-		if(!$output->data->getTrashSrl()) return new Object(-1, 'msg_invalid_request');
+		if (!$output->data->getTrashSrl()) return new Object(-1, 'msg_invalid_request');
 
 		$originObject = unserialize($output->data->getSerializedObject());
-		if(is_array($originObject)) $originObject = (object)$originObject;
+		if (is_array($originObject)) $originObject = (object) $originObject;
 
-		Context::set('oTrashVO',$output->data);
-		Context::set('oOrigin',$originObject);
+		Context::set('oTrashVO', $output->data);
+		Context::set('oOrigin', $originObject);
 
 		$oMemberModel = &getModel('member');
 		$remover_info = $oMemberModel->getMemberInfoByMemberSrl($output->data->getRemoverSrl());
@@ -102,11 +102,11 @@ 
 		$module_info = $oModuleModel->getModuleInfoByModuleSrl($originObject->module_srl);
 		Context::set('module_info', $module_info);
 
-		if($originObject) {
+		if ($originObject) {
 			$args_extra->module_srl = $originObject->module_srl;
 			$args_extra->document_srl = $originObject->document_srl;
 			$output_extra = executeQueryArray('trash.getDocumentExtraVars', $args_extra);				
-			Context::set('oOriginExtraVars',$output_extra->data);
+			Context::set('oOriginExtraVars', $output_extra->data);
 		}
 		$this->setTemplateFile('trash_view');
 	}

Braces +6 added lines, -2 removed lines

@@ -86,10 +86,14 @@
 
 		$oTrashModel = getModel('trash');
 		$output = $oTrashModel->getTrash($trash_srl);
-		if(!$output->data->getTrashSrl()) return new Object(-1, 'msg_invalid_request');
+		if(!$output->data->getTrashSrl()) {
+			return new Object(-1, 'msg_invalid_request');
+		}
 
 		$originObject = unserialize($output->data->getSerializedObject());
-		if(is_array($originObject)) $originObject = (object)$originObject;
+		if(is_array($originObject)) {
+			$originObject = (object)$originObject;
+		}
 
 		Context::set('oTrashVO',$output->data);
 		Context::set('oOrigin',$originObject);

modules/trash/trash.model.php

Spacing +5 added lines, -5 removed lines

@@ -19,7 +19,7 @@ 
 	function getTrash($trashSrl, $columnList = array())
 	{
 		$oTrashVO = new TrashVO();
-		if(!$trashSrl) return $oTrashVO;
+		if (!$trashSrl) return $oTrashVO;
 
 		$args = new stdClass();
 		$args->trashSrl = $trashSrl;
@@ -41,9 +41,9 @@ 
 	{
 		$output = executeQueryArray('trash.getTrashList', $args, $columnList);
 
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
-			foreach($output->data AS $key=>$value)
+			foreach ($output->data AS $key=>$value)
 			{
 				$oTrashVO = new TrashVO();
 				$this->_setTrashObject($oTrashVO, $value);
@@ -63,9 +63,9 @@ 
 	{
 		$output = executeQueryArray('trash.getTrashAllList', $args, $columnList);
 
-		if(is_array($output->data))
+		if (is_array($output->data))
 		{
-			foreach($output->data AS $key=>$value)
+			foreach ($output->data AS $key=>$value)
 			{
 				$oTrashVO = new TrashVO();
 				$this->_setTrashObject($oTrashVO, $value);

Braces +3 added lines, -1 removed lines

@@ -19,7 +19,9 @@
 	function getTrash($trashSrl, $columnList = array())
 	{
 		$oTrashVO = new TrashVO();
-		if(!$trashSrl) return $oTrashVO;
+		if(!$trashSrl) {
+			return $oTrashVO;
+		}
 
 		$args = new stdClass();
 		$args->trashSrl = $trashSrl;

modules/widget/widget.admin.view.php

Braces +4 added lines, -3 removed lines

@@ -32,8 +32,7 @@ 
 			if($widget->widget)
 			{
 				$widget_list[$no]->description = nl2br(trim($widget->description));
-			}
-			else
+			} else
 			{
 				unset($widget_list[$no]);
 			}
@@ -59,7 +58,9 @@ 
 	function dispWidgetAdminAddContent()
 	{
 		$module_srl = Context::get('module_srl');
-		if(!$module_srl) return $this->stop("msg_invalid_request");
+		if(!$module_srl) {
+			return $this->stop("msg_invalid_request");
+		}
 
 		$document_srl = Context::get('document_srl');
 		$oDocumentModel = getModel('document');

Spacing +4 added lines, -4 removed lines

@@ -27,9 +27,9 @@ 
 		$security = new Security($widget_list);
 		$widget_list = $security->encodeHTML('..', '..author..');
 
-		foreach($widget_list as $no => $widget)
+		foreach ($widget_list as $no => $widget)
 		{
-			if($widget->widget)
+			if ($widget->widget)
 			{
 				$widget_list[$no]->description = nl2br(trim($widget->description));
 			}
@@ -59,7 +59,7 @@ 
 	function dispWidgetAdminAddContent()
 	{
 		$module_srl = Context::get('module_srl');
-		if(!$module_srl) return $this->stop("msg_invalid_request");
+		if (!$module_srl) return $this->stop("msg_invalid_request");
 
 		$document_srl = Context::get('document_srl');
 		$oDocumentModel = getModel('document');
@@ -72,7 +72,7 @@ 
 		Context::set('module_info', $module_info);
 		// Editors settings of the module by calling getEditor
 		$oEditorModel = getModel('editor');
-		$editor = $oEditorModel->getModuleEditor('document',$module_srl, $module_srl,'module_srl','content');
+		$editor = $oEditorModel->getModuleEditor('document', $module_srl, $module_srl, 'module_srl', 'content');
 		Context::set('editor', $editor);
 
 		$security = new Security();

modules/widget/widget.class.php

Spacing +2 added lines, -2 removed lines

@@ -29,7 +29,7 @@ 
 	{
 		$oModuleModel = getModel('module');
 		// widget compile display.after trigger for further (04/14/2009)
-		if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
+		if (!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
 
 		return false;
 	}
@@ -42,7 +42,7 @@ 
 		$oModuleModel = getModel('module');
 		$oModuleController = getController('module');
 		// widget compile display.after trigger for further (04/14/2009)
-		if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before'))
+		if (!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before'))
 		{
 			$oModuleController->insertTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before');
 		}

Braces +3 added lines, -1 removed lines

@@ -29,7 +29,9 @@
 	{
 		$oModuleModel = getModel('module');
 		// widget compile display.after trigger for further (04/14/2009)
-		if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) return true;
+		if(!$oModuleModel->getTrigger('display', 'widget', 'controller', 'triggerWidgetCompile', 'before')) {
+			return true;
+		}
 
 		return false;
 	}

modules/widget/widget.model.php

Braces +74 added lines, -27 removed lines

@@ -21,7 +21,9 @@ 
 	function getWidgetPath($widget_name)
 	{
 		$path = sprintf('./widgets/%s/', $widget_name);
-		if(is_dir($path)) return $path;
+		if(is_dir($path)) {
+			return $path;
+		}
 
 		return "";
 	}
@@ -32,7 +34,9 @@ 
 	function getWidgetStylePath($widgetStyle_name)
 	{
 		$path = sprintf('./widgetstyles/%s/', $widgetStyle_name);
-		if(is_dir($path)) return $path;
+		if(is_dir($path)) {
+			return $path;
+		}
 
 		return "";
 	}
@@ -58,7 +62,9 @@ 
 		// 've Downloaded the widget and the widget's list of installed Wanted
 		$searched_list = FileHandler::readDir('./widgets');
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if(!$searched_count) {
+			return;
+		}
 		sort($searched_list);
 		// D which pertain to the list of widgets loop spins return statement review the information you need
 		for($i=0;$i<$searched_count;$i++)
@@ -101,7 +107,9 @@ 
 		// 've Downloaded the widget and the widget's list of installed Wanted
 		$searched_list = FileHandler::readDir('./widgetstyles');
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if(!$searched_count) {
+			return;
+		}
 		sort($searched_list);
 		// D which pertain to the list of widgets loop spins return statement review the information you need
 		for($i=0;$i<$searched_count;$i++)
@@ -124,10 +132,14 @@ 
 	{
 		// Get a path of the requested module. Return if not exists.
 		$widget_path = $this->getWidgetPath($widget);
-		if(!$widget_path) return;
+		if(!$widget_path) {
+			return;
+		}
 		// Read the xml file for module skin information
 		$xml_file = sprintf("%sconf/info.xml", $widget_path);
-		if(!file_exists($xml_file)) return;
+		if(!file_exists($xml_file)) {
+			return;
+		}
 		// If the problem by comparing the cache file and include the return variable $widget_info
 		$cache_file = sprintf(_XE_PATH_ . 'files/cache/widget/%s.%s.cache.php', $widget, Context::getLangType());
 
@@ -140,7 +152,9 @@ 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 		$xml_obj = $tmp_xml_obj->widget;
-		if(!$xml_obj) return;
+		if(!$xml_obj) {
+			return;
+		}
 
 		$buff = '$widget_info = new stdClass;';
 
@@ -161,8 +175,11 @@ 
 			$buff .= sprintf('$widget_info->widget_srl = $widget_srl;');
 			$buff .= sprintf('$widget_info->widget_title = $widget_title;');
 			// Author information
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-			else $author_list = $xml_obj->author;
+			if(!is_array($xml_obj->author)) {
+				$author_list[] = $xml_obj->author;
+			} else {
+				$author_list = $xml_obj->author;
+			}
 
 			for($i=0; $i < count($author_list); $i++)
 			{
@@ -171,8 +188,7 @@ 
 				$buff .= sprintf('$widget_info->author['.$i.']->email_address = "%s";', $author_list[$i]->attrs->email_address);
 				$buff .= sprintf('$widget_info->author['.$i.']->homepage = "%s";', $author_list[$i]->attrs->link);
 			}
-		}
-		else
+		} else
 		{
 			// Title of the widget, version
 			$buff .= sprintf('$widget_info->widget = "%s";', $widget);
@@ -193,12 +209,18 @@ 
 		}
 		// Extra vars (user defined variables to use in a template)
 		$extra_var_groups = $xml_obj->extra_vars->group;
-		if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-		if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+		if(!$extra_var_groups) {
+			$extra_var_groups = $xml_obj->extra_vars;
+		}
+		if(!is_array($extra_var_groups)) {
+			$extra_var_groups = array($extra_var_groups);
+		}
 		foreach($extra_var_groups as $group)
 		{
 			$extra_vars = $group->var;
-			if(!is_array($group->var)) $extra_vars = array($group->var);
+			if(!is_array($group->var)) {
+				$extra_vars = array($group->var);
+			}
 
 			if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name)
 			{
@@ -228,9 +250,13 @@ 
 					$buff .= sprintf('$widget_info->extra_var->%s->description = "%s";', $id, str_replace('"','\"',$var->description->body));
 
 					$options = $var->options;
-					if(!$options) continue;
+					if(!$options) {
+						continue;
+					}
 
-					if(!is_array($options)) $options = array($options);
+					if(!is_array($options)) {
+						$options = array($options);
+					}
 					$options_count = count($options);
 					for($j=0;$j<$options_count;$j++)
 					{
@@ -253,7 +279,9 @@ 
 		$buff = '<?php if(!defined("__XE__")) exit(); '.$buff.' ?>';
 		FileHandler::writeFile($cache_file, $buff);
 
-		if(file_exists($cache_file)) @include($cache_file);
+		if(file_exists($cache_file)) {
+			@include($cache_file);
+		}
 		return $widget_info;
 	}
 
@@ -264,9 +292,13 @@ 
 	function getWidgetStyleInfo($widgetStyle)
 	{
 		$widgetStyle_path = $this->getWidgetStylePath($widgetStyle);
-		if(!$widgetStyle_path) return;
+		if(!$widgetStyle_path) {
+			return;
+		}
 		$xml_file = sprintf("%sskin.xml", $widgetStyle_path);
-		if(!file_exists($xml_file)) return;
+		if(!file_exists($xml_file)) {
+			return;
+		}
 		// If the problem by comparing the cache file and include the return variable $widgetStyle_info
 		$cache_file = sprintf(_XE_PATH_ . 'files/cache/widgetstyles/%s.%s.cache.php', $widgetStyle, Context::getLangType());
 
@@ -279,7 +311,9 @@ 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 		$xml_obj = $tmp_xml_obj->widgetstyle;
-		if(!$xml_obj) return;
+		if(!$xml_obj) {
+			return;
+		}
 
 		$buff = array();
 		$buff[] = '<?php if(!defined("__XE__")) exit();';
@@ -299,13 +333,20 @@ 
 		$buff[] = sprintf('$widgetStyle_info->license_link = "%s";', $xml_obj->license->attrs->link);
 
 		// preview
-		if(!$xml_obj->preview->body) $xml_obj->preview->body = 'preview.jpg';
+		if(!$xml_obj->preview->body) {
+			$xml_obj->preview->body = 'preview.jpg';
+		}
 		$preview_file = sprintf("%s%s", $widgetStyle_path,$xml_obj->preview->body);
-		if(file_exists($preview_file)) $buff[] = sprintf('$widgetStyle_info->preview = "%s";', $preview_file);
+		if(file_exists($preview_file)) {
+			$buff[] = sprintf('$widgetStyle_info->preview = "%s";', $preview_file);
+		}
 
 		// Author information
-		if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
-		else $author_list = $xml_obj->author;
+		if(!is_array($xml_obj->author)) {
+			$author_list[] = $xml_obj->author;
+		} else {
+			$author_list = $xml_obj->author;
+		}
 
 		foreach($author_list as $idx => $author)
 		{
@@ -317,8 +358,12 @@ 
 
 		// Extra vars (user defined variables to use in a template)
 		$extra_var_groups = $xml_obj->extra_vars->group;
-		if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-		if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+		if(!$extra_var_groups) {
+			$extra_var_groups = $xml_obj->extra_vars;
+		}
+		if(!is_array($extra_var_groups)) {
+			$extra_var_groups = array($extra_var_groups);
+		}
 
 		$extra_var_count = 0;
 		$buff[] = sprintf('$widgetStyle_info->extra_var = new stdClass();', $extra_var_count);
@@ -362,7 +407,9 @@ 
 
 		FileHandler::writeFile($cache_file, implode(PHP_EOL, $buff));
 
-		if(file_exists($cache_file)) @include($cache_file);
+		if(file_exists($cache_file)) {
+			@include($cache_file);
+		}
 
 		return $widgetStyle_info;
 	}

Spacing +52 added lines, -52 removed lines

@@ -21,7 +21,7 @@ 
 	function getWidgetPath($widget_name)
 	{
 		$path = sprintf('./widgets/%s/', $widget_name);
-		if(is_dir($path)) return $path;
+		if (is_dir($path)) return $path;
 
 		return "";
 	}
@@ -32,7 +32,7 @@ 
 	function getWidgetStylePath($widgetStyle_name)
 	{
 		$path = sprintf('./widgetstyles/%s/', $widgetStyle_name);
-		if(is_dir($path)) return $path;
+		if (is_dir($path)) return $path;
 
 		return "";
 	}
@@ -58,17 +58,17 @@ 
 		// 've Downloaded the widget and the widget's list of installed Wanted
 		$searched_list = FileHandler::readDir('./widgets');
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if (!$searched_count) return;
 		sort($searched_list);
 		// D which pertain to the list of widgets loop spins return statement review the information you need
-		for($i=0;$i<$searched_count;$i++)
+		for ($i = 0; $i < $searched_count; $i++)
 		{
 			// The name of the widget
 			$widget = $searched_list[$i];
 			// Wanted information on the Widget
 			$widget_info = $this->getWidgetInfo($widget);
 
-			if(!$widget_info)
+			if (!$widget_info)
 			{
 				$widget_info = new stdClass();
 			}
@@ -101,10 +101,10 @@ 
 		// 've Downloaded the widget and the widget's list of installed Wanted
 		$searched_list = FileHandler::readDir('./widgetstyles');
 		$searched_count = count($searched_list);
-		if(!$searched_count) return;
+		if (!$searched_count) return;
 		sort($searched_list);
 		// D which pertain to the list of widgets loop spins return statement review the information you need
-		for($i=0;$i<$searched_count;$i++)
+		for ($i = 0; $i < $searched_count; $i++)
 		{
 			// The name of the widget
 			$widgetStyle = $searched_list[$i];
@@ -124,14 +124,14 @@ 
 	{
 		// Get a path of the requested module. Return if not exists.
 		$widget_path = $this->getWidgetPath($widget);
-		if(!$widget_path) return;
+		if (!$widget_path) return;
 		// Read the xml file for module skin information
 		$xml_file = sprintf("%sconf/info.xml", $widget_path);
-		if(!file_exists($xml_file)) return;
+		if (!file_exists($xml_file)) return;
 		// If the problem by comparing the cache file and include the return variable $widget_info
-		$cache_file = sprintf(_XE_PATH_ . 'files/cache/widget/%s.%s.cache.php', $widget, Context::getLangType());
+		$cache_file = sprintf(_XE_PATH_.'files/cache/widget/%s.%s.cache.php', $widget, Context::getLangType());
 
-		if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file))
+		if (file_exists($cache_file) && filemtime($cache_file) > filemtime($xml_file))
 		{
 			@include($cache_file);
 			return $widget_info;
@@ -140,11 +140,11 @@ 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 		$xml_obj = $tmp_xml_obj->widget;
-		if(!$xml_obj) return;
+		if (!$xml_obj) return;
 
 		$buff = '$widget_info = new stdClass;';
 
-		if($xml_obj->version && $xml_obj->attrs->version == '0.2')
+		if ($xml_obj->version && $xml_obj->attrs->version == '0.2')
 		{
 			// Title of the widget, version
 			$buff .= sprintf('$widget_info->widget = "%s";', $widget);
@@ -161,10 +161,10 @@ 
 			$buff .= sprintf('$widget_info->widget_srl = $widget_srl;');
 			$buff .= sprintf('$widget_info->widget_title = $widget_title;');
 			// Author information
-			if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+			if (!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
 			else $author_list = $xml_obj->author;
 
-			for($i=0; $i < count($author_list); $i++)
+			for ($i = 0; $i < count($author_list); $i++)
 			{
 				$buff .= '$widget_info->author['.$i.'] = new stdClass;';
 				$buff .= sprintf('$widget_info->author['.$i.']->name = "%s";', $author_list[$i]->name->body);
@@ -193,29 +193,29 @@ 
 		}
 		// Extra vars (user defined variables to use in a template)
 		$extra_var_groups = $xml_obj->extra_vars->group;
-		if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-		if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
-		foreach($extra_var_groups as $group)
+		if (!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+		if (!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+		foreach ($extra_var_groups as $group)
 		{
 			$extra_vars = $group->var;
-			if(!is_array($group->var)) $extra_vars = array($group->var);
+			if (!is_array($group->var)) $extra_vars = array($group->var);
 
-			if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name)
+			if ($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name)
 			{
 				$extra_var_count = count($extra_vars);
 
 				$buff .= sprintf('$widget_info->extra_var_count = "%s";', $extra_var_count);
-				for($i=0;$i<$extra_var_count;$i++)
+				for ($i = 0; $i < $extra_var_count; $i++)
 				{
 					unset($var);
 					unset($options);
 					$var = $extra_vars[$i];
 
-					$id = $var->attrs->id?$var->attrs->id:$var->attrs->name;
-					$name = $var->name->body?$var->name->body:$var->title->body;
-					$type = $var->attrs->type?$var->attrs->type:$var->type->body;
+					$id = $var->attrs->id ? $var->attrs->id : $var->attrs->name;
+					$name = $var->name->body ? $var->name->body : $var->title->body;
+					$type = $var->attrs->type ? $var->attrs->type : $var->type->body;
 					$buff .= sprintf('$widget_info->extra_var->%s = new stdClass;', $id);
-					if($type =='filebox')
+					if ($type == 'filebox')
 					{
 						$buff .= sprintf('$widget_info->extra_var->%s->filter = "%s";', $id, $var->type->attrs->filter);
 						$buff .= sprintf('$widget_info->extra_var->%s->allow_multiple = "%s";', $id, $var->type->attrs->allow_multiple);
@@ -225,23 +225,23 @@ 
 					$buff .= sprintf('$widget_info->extra_var->%s->name = "%s";', $id, $name);
 					$buff .= sprintf('$widget_info->extra_var->%s->type = "%s";', $id, $type);
 					$buff .= sprintf('$widget_info->extra_var->%s->value = $vars->%s;', $id, $id);
-					$buff .= sprintf('$widget_info->extra_var->%s->description = "%s";', $id, str_replace('"','\"',$var->description->body));
+					$buff .= sprintf('$widget_info->extra_var->%s->description = "%s";', $id, str_replace('"', '\"', $var->description->body));
 
 					$options = $var->options;
-					if(!$options) continue;
+					if (!$options) continue;
 
-					if(!is_array($options)) $options = array($options);
+					if (!is_array($options)) $options = array($options);
 					$options_count = count($options);
-					for($j=0;$j<$options_count;$j++)
+					for ($j = 0; $j < $options_count; $j++)
 					{
 						$buff .= sprintf('$widget_info->extra_var->%s->options["%s"] = "%s";', $id, $options[$j]->value->body, $options[$j]->name->body);
 
-						if($options[$j]->attrs->default && $options[$j]->attrs->default=='true')
+						if ($options[$j]->attrs->default && $options[$j]->attrs->default == 'true')
 						{
 							$buff .= sprintf('$widget_info->extra_var->%s->default_options["%s"] = true;', $id, $options[$j]->value->body);
 						}
 
-						if($options[$j]->attrs->init && $options[$j]->attrs->init=='true')
+						if ($options[$j]->attrs->init && $options[$j]->attrs->init == 'true')
 						{
 							$buff .= sprintf('$widget_info->extra_var->%s->init_options["%s"] = true;', $id, $options[$j]->value->body);
 						}
@@ -253,7 +253,7 @@ 
 		$buff = '<?php if(!defined("__XE__")) exit(); '.$buff.' ?>';
 		FileHandler::writeFile($cache_file, $buff);
 
-		if(file_exists($cache_file)) @include($cache_file);
+		if (file_exists($cache_file)) @include($cache_file);
 		return $widget_info;
 	}
 
@@ -264,13 +264,13 @@ 
 	function getWidgetStyleInfo($widgetStyle)
 	{
 		$widgetStyle_path = $this->getWidgetStylePath($widgetStyle);
-		if(!$widgetStyle_path) return;
+		if (!$widgetStyle_path) return;
 		$xml_file = sprintf("%sskin.xml", $widgetStyle_path);
-		if(!file_exists($xml_file)) return;
+		if (!file_exists($xml_file)) return;
 		// If the problem by comparing the cache file and include the return variable $widgetStyle_info
-		$cache_file = sprintf(_XE_PATH_ . 'files/cache/widgetstyles/%s.%s.cache.php', $widgetStyle, Context::getLangType());
+		$cache_file = sprintf(_XE_PATH_.'files/cache/widgetstyles/%s.%s.cache.php', $widgetStyle, Context::getLangType());
 
-		if(file_exists($cache_file)&&filemtime($cache_file)>filemtime($xml_file))
+		if (file_exists($cache_file) && filemtime($cache_file) > filemtime($xml_file))
 		{
 			@include($cache_file);
 			return $widgetStyle_info;
@@ -279,7 +279,7 @@ 
 		$oXmlParser = new XmlParser();
 		$tmp_xml_obj = $oXmlParser->loadXmlFile($xml_file);
 		$xml_obj = $tmp_xml_obj->widgetstyle;
-		if(!$xml_obj) return;
+		if (!$xml_obj) return;
 
 		$buff = array();
 		$buff[] = '<?php if(!defined("__XE__")) exit();';
@@ -299,15 +299,15 @@ 
 		$buff[] = sprintf('$widgetStyle_info->license_link = "%s";', $xml_obj->license->attrs->link);
 
 		// preview
-		if(!$xml_obj->preview->body) $xml_obj->preview->body = 'preview.jpg';
-		$preview_file = sprintf("%s%s", $widgetStyle_path,$xml_obj->preview->body);
-		if(file_exists($preview_file)) $buff[] = sprintf('$widgetStyle_info->preview = "%s";', $preview_file);
+		if (!$xml_obj->preview->body) $xml_obj->preview->body = 'preview.jpg';
+		$preview_file = sprintf("%s%s", $widgetStyle_path, $xml_obj->preview->body);
+		if (file_exists($preview_file)) $buff[] = sprintf('$widgetStyle_info->preview = "%s";', $preview_file);
 
 		// Author information
-		if(!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
+		if (!is_array($xml_obj->author)) $author_list[] = $xml_obj->author;
 		else $author_list = $xml_obj->author;
 
-		foreach($author_list as $idx => $author)
+		foreach ($author_list as $idx => $author)
 		{
 			$buff[] = sprintf('$widgetStyle_info->author[%d] = new stdClass();', $idx);
 			$buff[] = sprintf('$widgetStyle_info->author[%d]->name = "%s";', $idx, $author->name->body);
@@ -317,18 +317,18 @@ 
 
 		// Extra vars (user defined variables to use in a template)
 		$extra_var_groups = $xml_obj->extra_vars->group;
-		if(!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
-		if(!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
+		if (!$extra_var_groups) $extra_var_groups = $xml_obj->extra_vars;
+		if (!is_array($extra_var_groups)) $extra_var_groups = array($extra_var_groups);
 
 		$extra_var_count = 0;
 		$buff[] = sprintf('$widgetStyle_info->extra_var = new stdClass();', $extra_var_count);
-		foreach($extra_var_groups as $group)
+		foreach ($extra_var_groups as $group)
 		{
 			$extra_vars = (!is_array($group->var)) ? array($group->var) : $group->var;
 
-			if($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name)
+			if ($extra_vars[0]->attrs->id || $extra_vars[0]->attrs->name)
 			{
-				foreach($extra_vars as $var)
+				foreach ($extra_vars as $var)
 				{
 					$extra_var_count++;
 					$id = ($var->attrs->id) ? $var->attrs->id : $var->attrs->name;
@@ -339,18 +339,18 @@ 
 					$buff[] = sprintf('$widgetStyle_info->extra_var->%s->group = "%s";', $id, $group->title->body);
 					$buff[] = sprintf('$widgetStyle_info->extra_var->%s->name = "%s";', $id, $name);
 					$buff[] = sprintf('$widgetStyle_info->extra_var->%s->type = "%s";', $id, $type);
-					if($type =='filebox')
+					if ($type == 'filebox')
 					{
 						$buff[] = sprintf('$widgetStyle_info->extra_var->%s->filter = "%s";', $id, $var->attrs->filter);
 						$buff[] = sprintf('$widgetStyle_info->extra_var->%s->allow_multiple = "%s";', $id, $var->attrs->allow_multiple);
 					}
 					$buff[] = sprintf('$widgetStyle_info->extra_var->%s->value = $vars->%s;', $id, $id);
-					$buff[] = sprintf('$widgetStyle_info->extra_var->%s->description = "%s";', $id, str_replace('"','\"',$var->description->body));
+					$buff[] = sprintf('$widgetStyle_info->extra_var->%s->description = "%s";', $id, str_replace('"', '\"', $var->description->body));
 
-					if($var->options)
+					if ($var->options)
 					{
 						$var_options = (!is_array($var->options)) ? array($var->options) : $var->options;
-						foreach($var_options as $option_item)
+						foreach ($var_options as $option_item)
 						{
 							$buff[] = sprintf('$widgetStyle_info->extra_var->%s->options["%s"] = "%s";', $id, $option_item->value->body, $option_item->name->body);
 						}
@@ -362,7 +362,7 @@ 
 
 		FileHandler::writeFile($cache_file, implode(PHP_EOL, $buff));
 
-		if(file_exists($cache_file)) @include($cache_file);
+		if (file_exists($cache_file)) @include($cache_file);
 
 		return $widgetStyle_info;
 	}

modules/widget/widget.view.php

Braces +10 added lines, -5 removed lines

@@ -21,7 +21,9 @@ 
 	function dispWidgetInfo()
 	{
 		// If people have skin widget widget output as a function of the skin More Details
-		if(Context::get('skin')) return $this->dispWidgetSkinInfo();
+		if(Context::get('skin')) {
+			return $this->dispWidgetSkinInfo();
+		}
 		// Wanted widget is selected information
 		$oWidgetModel = getModel('widget');
 		$widget_info = $oWidgetModel->getWidgetInfo(Context::get('selected_widget'));
@@ -62,7 +64,9 @@ 
 
 		$widget_list = $oWidgetModel->getDownloadedWidgetList();
 		$selected_widget = Context::get('selected_widget');
-		if(!$selected_widget) $selected_widget = $widget_list[0]->widget;
+		if(!$selected_widget) {
+			$selected_widget = $widget_list[0]->widget;
+		}
 
 		$widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
 		Context::set('widget_info', $widget_info);
@@ -89,8 +93,7 @@ 
 			foreach($mid_list as $module_srl => $module) {
 				$module_categories[$module->module_category_srl]->list[$module_srl] = $module;
 			}
-		}
-		else
+		} else
 		{
 			$module_categories[0] = new stdClass();
 			$module_categories[0]->list = $mid_list;
@@ -118,7 +121,9 @@ 
 		$widget_list = $oWidgetModel->getDownloadedWidgetList();
 		Context::set('widget_list',$widget_list);
 		// When there is no widget is selected in the first widget
-		if(!Context::get('selected_widget')) Context::set('selected_widget',$widget_list[0]->widget);
+		if(!Context::get('selected_widget')) {
+			Context::set('selected_widget',$widget_list[0]->widget);
+		}
 
 		$this->dispWidgetGenerateCode();
 		$this->setLayoutFile('default_layout');

Spacing +12 added lines, -12 removed lines

@@ -21,7 +21,7 @@ 
 	function dispWidgetInfo()
 	{
 		// If people have skin widget widget output as a function of the skin More Details
-		if(Context::get('skin')) return $this->dispWidgetSkinInfo();
+		if (Context::get('skin')) return $this->dispWidgetSkinInfo();
 		// Wanted widget is selected information
 		$oWidgetModel = getModel('widget');
 		$widget_info = $oWidgetModel->getWidgetInfo(Context::get('selected_widget'));
@@ -45,7 +45,7 @@ 
 		$oModuleModel = getModel('module');
 		$skin_info = $oModuleModel->loadSkinInfo($path, $skin);
 
-		Context::set('skin_info',$skin_info);
+		Context::set('skin_info', $skin_info);
 		// Specifies the widget to pop up
 		$this->setLayoutFile('popup_layout');
 		// Set a template file
@@ -62,7 +62,7 @@ 
 
 		$widget_list = $oWidgetModel->getDownloadedWidgetList();
 		$selected_widget = Context::get('selected_widget');
-		if(!$selected_widget) $selected_widget = $widget_list[0]->widget;
+		if (!$selected_widget) $selected_widget = $widget_list[0]->widget;
 
 		$widget_info = $oWidgetModel->getWidgetInfo($selected_widget);
 		Context::set('widget_info', $widget_info);
@@ -84,9 +84,9 @@ 
 		$group_list = $oMemberModel->getGroups($site_module_info->site_srl);
 		Context::set('group_list', $group_list);
 		// module_category and module combination
-		if($module_categories)
+		if ($module_categories)
 		{
-			foreach($mid_list as $module_srl => $module) {
+			foreach ($mid_list as $module_srl => $module) {
 				$module_categories[$module->module_category_srl]->list[$module_srl] = $module;
 			}
 		}
@@ -96,10 +96,10 @@ 
 			$module_categories[0]->list = $mid_list;
 		}
 
-		Context::set('mid_list',$module_categories);
+		Context::set('mid_list', $module_categories);
 		// Menu Get a list
 		$output = executeQueryArray('menu.getMenus');
-		Context::set('menu_list',$output->data);
+		Context::set('menu_list', $output->data);
 		// Wanted information on skin
 		$skin_list = $oModuleModel->getSkins($widget_info->path);
 		Context::set('skin_list', $skin_list);
@@ -116,9 +116,9 @@ 
 	{
 		$oWidgetModel = getModel('widget');
 		$widget_list = $oWidgetModel->getDownloadedWidgetList();
-		Context::set('widget_list',$widget_list);
+		Context::set('widget_list', $widget_list);
 		// When there is no widget is selected in the first widget
-		if(!Context::get('selected_widget')) Context::set('selected_widget',$widget_list[0]->widget);
+		if (!Context::get('selected_widget')) Context::set('selected_widget', $widget_list[0]->widget);
 
 		$this->dispWidgetGenerateCode();
 		$this->setLayoutFile('default_layout');
@@ -133,13 +133,13 @@ 
 		// Widget-style list
 		$oWidgetModel = getModel('widget');
 		$widgetStyle_list = $oWidgetModel->getDownloadedWidgetStyleList();
-		Context::set('widgetStyle_list',$widgetStyle_list);
+		Context::set('widgetStyle_list', $widgetStyle_list);
 		// Selected list of widget styles
 		$widgetstyle = Context::get('widgetstyle');
 		$widgetstyle_info = $oWidgetModel->getWidgetStyleInfo($widgetstyle);
-		if($widgetstyle && $widgetstyle_info)
+		if ($widgetstyle && $widgetstyle_info)
 		{
-			Context::set('widgetstyle_info',$widgetstyle_info);
+			Context::set('widgetstyle_info', $widgetstyle_info);
 		}
 
 		$this->dispWidgetGenerateCode();