xpressengine / xe-core

modules/rss/rss.admin.view.php

Braces +11 added lines, -4 removed lines

@@ -44,9 +44,14 @@ 
 					$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 					$columnList = array('sites.domain');
 					$site = $oModuleModel->getSiteInfo($module_info->site_srl, $columnList);
-					if(!strpos($site->domain, '.')) $vid = $site->domain;
-					else $site = null;
-					if($site) $feed_config[$module_srl]['url'] = $oRssModel->getModuleFeedUrl($vid, $module_info->mid, 'rss');
+					if(!strpos($site->domain, '.')) {
+						$vid = $site->domain;
+					} else {
+						$site = null;
+					}
+					if($site) {
+						$feed_config[$module_srl]['url'] = $oRssModel->getModuleFeedUrl($vid, $module_info->mid, 'rss');
+					}
 					$feed_config[$module_srl]['mid'] = $module_info->mid;
 					$feed_config[$module_srl]['open_feed'] = $config->open_rss;
 					$feed_config[$module_srl]['open_total_feed'] = $config->open_total_feed;
@@ -54,7 +59,9 @@ 
 				}
 			}
 		}
-		if(!$total_config->feed_document_count) $total_config->feed_document_count = 15;
+		if(!$total_config->feed_document_count) {
+			$total_config->feed_document_count = 15;
+		}
 		$total_config->url = $oRssModel->getModuleFeedUrl(NULL, '', 'rss', true);
 
 		Context::set('feed_config', $feed_config);

Spacing +8 added lines, -8 removed lines

@@ -28,25 +28,25 @@ 
 		$oModuleModel = getModel('module');
 		$rss_config = $oModuleModel->getModulePartConfigs('rss');
 		$total_config = $oModuleModel->getModuleConfig('rss');
-		if(!$total_config)
+		if (!$total_config)
 		{
 			$total_config = new stdClass();
 		}
 		$oRssModel = getModel('rss');
 
-		if($rss_config)
+		if ($rss_config)
 		{
 			$feed_config = array();
-			foreach($rss_config as $module_srl => $config)
+			foreach ($rss_config as $module_srl => $config)
 			{
-				if($config)
+				if ($config)
 				{
 					$module_info = $oModuleModel->getModuleInfoByModuleSrl($module_srl);
 					$columnList = array('sites.domain');
 					$site = $oModuleModel->getSiteInfo($module_info->site_srl, $columnList);
-					if(!strpos($site->domain, '.')) $vid = $site->domain;
+					if (!strpos($site->domain, '.')) $vid = $site->domain;
 					else $site = null;
-					if($site) $feed_config[$module_srl]['url'] = $oRssModel->getModuleFeedUrl($vid, $module_info->mid, 'rss');
+					if ($site) $feed_config[$module_srl]['url'] = $oRssModel->getModuleFeedUrl($vid, $module_info->mid, 'rss');
 					$feed_config[$module_srl]['mid'] = $module_info->mid;
 					$feed_config[$module_srl]['open_feed'] = $config->open_rss;
 					$feed_config[$module_srl]['open_total_feed'] = $config->open_total_feed;
@@ -54,14 +54,14 @@ 
 				}
 			}
 		}
-		if(!$total_config->feed_document_count) $total_config->feed_document_count = 15;
+		if (!$total_config->feed_document_count) $total_config->feed_document_count = 15;
 		$total_config->url = $oRssModel->getModuleFeedUrl(NULL, '', 'rss', true);
 
 		Context::set('feed_config', $feed_config);
 		Context::set('total_config', $total_config);
 
 		$security = new Security();
-		$security->encodeHTML('feed_config..mid','feed_config..url');
+		$security->encodeHTML('feed_config..mid', 'feed_config..url');
 		$security->encodeHTML('total_config..');
 
 		$this->setTemplatePath($this->module_path.'tpl');

modules/rss/rss.model.php

Spacing +4 added lines, -4 removed lines

@@ -18,13 +18,13 @@ 
 	 */
 	function getModuleFeedUrl($vid, $mid, $format = 'rss', $absolute_url = false)
 	{
-		if($absolute_url)
+		if ($absolute_url)
 		{
-			return getFullUrl('','vid',$vid, 'mid',$mid, 'act',$format);
+			return getFullUrl('', 'vid', $vid, 'mid', $mid, 'act', $format);
 		}
 		else
 		{
-			return getUrl('','vid',$vid, 'mid',$mid, 'act',$format);
+			return getUrl('', 'vid', $vid, 'mid', $mid, 'act', $format);
 		}
 	}
 
@@ -39,7 +39,7 @@ 
 		// Get the configurations of the rss module
 		$oModuleModel = getModel('module');
 		$module_rss_config = $oModuleModel->getModulePartConfig('rss', $module_srl);
-		if(!$module_rss_config)
+		if (!$module_rss_config)
 		{
 			$module_rss_config = new stdClass();
 			$module_rss_config->open_rss = 'N';

Braces +1 added lines, -2 removed lines

@@ -21,8 +21,7 @@
 		if($absolute_url)
 		{
 			return getFullUrl('','vid',$vid, 'mid',$mid, 'act',$format);
-		}
-		else
+		} else
 		{
 			return getUrl('','vid',$vid, 'mid',$mid, 'act',$format);
 		}

modules/session/session.admin.controller.php

Spacing +1 added lines, -1 removed lines

@@ -22,7 +22,7 @@
 		$oSessionController = getController('session');
 		$oSessionController->gc(0);
 
-		$this->add('result',Context::getLang('session_cleared'));
+		$this->add('result', Context::getLang('session_cleared'));
 	}
 }
 /* End of file session.admin.controller.php */

modules/session/session.controller.php

Spacing +7 added lines, -7 removed lines

@@ -26,7 +26,7 @@ 
 
 	function write($session_key, $val)
 	{
-		if(!$session_key || !$this->session_started) return;
+		if (!$session_key || !$this->session_started) return;
 
 		$args = new stdClass;
 		$args->session_key = $session_key;
@@ -35,7 +35,7 @@ 
 		$session_info = $output->data;
 
 		//if ip has changed delete the session from db
-		if($session_info->session_key == $session_key && $session_info->ipaddress != $_SERVER['REMOTE_ADDR'])
+		if ($session_info->session_key == $session_key && $session_info->ipaddress != $_SERVER['REMOTE_ADDR'])
 		{
 			executeQuery('session.deleteSession', $args);
 
@@ -46,13 +46,13 @@ 
 		$args->val = $val;
 		$args->cur_mid = Context::get('mid');
 
-		if(!$args->cur_mid)
+		if (!$args->cur_mid)
 		{
 			$module_info = Context::get('current_module_info');
 			$args->cur_mid = $module_info->mid;
 		}
 
-		if(Context::get('is_logged'))
+		if (Context::get('is_logged'))
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
@@ -65,7 +65,7 @@ 
 		$args->last_update = date("YmdHis", $_SERVER['REQUEST_TIME']);
 
 		//put session into db
-		if($session_info->session_key)
+		if ($session_info->session_key)
 		{
 			$output = executeQuery('session.updateSession', $args);
 		}
@@ -79,7 +79,7 @@ 
 
 	function destroy($session_key)
 	{
-		if(!$session_key || !$this->session_started) return;
+		if (!$session_key || !$this->session_started) return;
 
 		//remove session from db
 		$args = new stdClass();
@@ -91,7 +91,7 @@ 
 
 	function gc($maxlifetime)
 	{
-		if(!$this->session_started) return;
+		if (!$this->session_started) return;
 
 		executeQuery('session.gcSession');
 		return true;

Braces +11 added lines, -7 removed lines

@@ -26,7 +26,9 @@ 
 
 	function write($session_key, $val)
 	{
-		if(!$session_key || !$this->session_started) return;
+		if(!$session_key || !$this->session_started) {
+			return;
+		}
 
 		$args = new stdClass;
 		$args->session_key = $session_key;
@@ -56,8 +58,7 @@ 
 		{
 			$logged_info = Context::get('logged_info');
 			$args->member_srl = $logged_info->member_srl;
-		}
-		else
+		} else
 		{
 			$args->member_srl = 0;
 		}
@@ -68,8 +69,7 @@ 
 		if($session_info->session_key)
 		{
 			$output = executeQuery('session.updateSession', $args);
-		}
-		else
+		} else
 		{
 			$output = executeQuery('session.insertSession', $args);
 		}
@@ -79,7 +79,9 @@ 
 
 	function destroy($session_key)
 	{
-		if(!$session_key || !$this->session_started) return;
+		if(!$session_key || !$this->session_started) {
+			return;
+		}
 
 		//remove session from db
 		$args = new stdClass();
@@ -91,7 +93,9 @@ 
 
 	function gc($maxlifetime)
 	{
-		if(!$this->session_started) return;
+		if(!$this->session_started) {
+			return;
+		}
 
 		executeQuery('session.gcSession');
 		return true;

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.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.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();

widgets/counter_status/counter_status.class.php

Spacing +5 added lines, -5 removed lines

@@ -19,13 +19,13 @@
 		$oCounterModel = getModel('counter');
 
 		$site_module_info = Context::get('site_module_info');
-		$output = $oCounterModel->getStatus(array('00000000', date('Ymd', $_SERVER['REQUEST_TIME']-60*60*24), date('Ymd')), $site_module_info->site_srl);
-		if(count($output))
+		$output = $oCounterModel->getStatus(array('00000000', date('Ymd', $_SERVER['REQUEST_TIME'] - 60 * 60 * 24), date('Ymd')), $site_module_info->site_srl);
+		if (count($output))
 		{
-			foreach($output as $key => $val) 
+			foreach ($output as $key => $val) 
 			{
-				if(!$key) Context::set('total_counter', $val);
-				elseif($key == date("Ymd")) Context::set('today_counter', $val);
+				if (!$key) Context::set('total_counter', $val);
+				elseif ($key == date("Ymd")) Context::set('today_counter', $val);
 				else Context::set('yesterday_counter', $val);
 			}
 		}

Braces +7 added lines, -3 removed lines

@@ -24,9 +24,13 @@
 		{
 			foreach($output as $key => $val) 
 			{
-				if(!$key) Context::set('total_counter', $val);
-				elseif($key == date("Ymd")) Context::set('today_counter', $val);
-				else Context::set('yesterday_counter', $val);
+				if(!$key) {
+					Context::set('total_counter', $val);
+				} elseif($key == date("Ymd")) {
+					Context::set('today_counter', $val);
+				} else {
+					Context::set('yesterday_counter', $val);
+				}
 			}
 		}
 		// Set a path of the template skin (values of skin, colorset settings)