evolution-cms / evolution

index.php

Braces +12 added lines, -6 removed lines

@@ -50,17 +50,23 @@ 
 	include_once($autoloader);
 }
 
-if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
+if(!isset($_SERVER['REQUEST_TIME_FLOAT'])) {
+    $_SERVER['REQUEST_TIME_FLOAT'] = microtime(true);
+}
 
 $base_path = str_replace('\\','/',dirname(__FILE__)) . '/';
-if(is_file($base_path . 'assets/cache/siteManager.php'))
+if(is_file($base_path . 'assets/cache/siteManager.php')) {
     include_once($base_path . 'assets/cache/siteManager.php');
-if(!defined('MGR_DIR') && is_dir("{$base_path}manager"))
+}
+if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
 	define('MGR_DIR', 'manager');
-if(is_file($base_path . 'assets/cache/siteHostnames.php'))
+}
+if(is_file($base_path . 'assets/cache/siteHostnames.php')) {
     include_once($base_path . 'assets/cache/siteHostnames.php');
-if(!defined('MODX_SITE_HOSTNAMES'))
+}
+if(!defined('MODX_SITE_HOSTNAMES')) {
 	define('MODX_SITE_HOSTNAMES', '');
+}
 
 // get start time
 $mstart = memory_get_usage();
@@ -129,7 +135,7 @@ 
     @ini_set("display_errors","0");
 }
 
-if(MODX_CLI){
+if(MODX_CLI) {
     @set_time_limit(0);
     @ini_set('max_execution_time',0);
 }

manager/actions/import_site.static.php

Braces +14 added lines, -7 removed lines

@@ -104,7 +104,8 @@ 
 /**
  * @return string
  */
-function run() {
+function run()
+{
 	$modx = evolutionCMS(); global $_lang;
 
 	$tbl_site_content = $modx->getFullTableName('site_content');
@@ -171,7 +172,8 @@ 
  * @param array $files
  * @param string $mode
  */
-function importFiles($parent, $filedir, $files, $mode) {
+function importFiles($parent, $filedir, $files, $mode)
+{
 	$modx = evolutionCMS();
 	global $_lang, $allowedfiles;
 	global $search_default, $cache_default, $publish_default;
@@ -318,7 +320,8 @@ 
  * @param int $count
  * @return array
  */
-function getFiles($directory, $listing = array(), $count = 0) {
+function getFiles($directory, $listing = array(), $count = 0)
+{
 	global $_lang;
 	global $filesfound;
 	$dummy = $count;
@@ -346,7 +349,8 @@ 
  * @param string $filepath
  * @return bool|string
  */
-function getFileContent($filepath) {
+function getFileContent($filepath)
+{
 	global $_lang;
 	// get the file
 	if(!$buffer = file_get_contents($filepath)) {
@@ -360,7 +364,8 @@ 
  * @param array $array
  * @return array
  */
-function pop_index($array) {
+function pop_index($array)
+{
 	$new_array = array();
 	foreach($array as $k => $v) {
 		if($v !== 'index.html' && $v !== 'index.htm') {
@@ -383,7 +388,8 @@ 
  * @param string $alias
  * @return array
  */
-function treatContent($src, $filename, $alias) {
+function treatContent($src, $filename, $alias)
+{
 	$modx = evolutionCMS();
 
 	$src = mb_convert_encoding($src, $modx->config['modx_charset'], 'UTF-8,SJIS-win,eucJP-win,SJIS,EUC-JP,ASCII');
@@ -427,7 +433,8 @@ 
 /**
  * @return void
  */
-function convertLink() {
+function convertLink()
+{
 	$modx = evolutionCMS();
 	$tbl_site_content = $modx->getFullTableName('site_content');
 

manager/actions/mutate_content.dynamic.php

Braces +12 added lines, -5 removed lines

@@ -478,7 +478,8 @@ 
 			return s;
 		}
 
-		<?php if ($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?>
+		<?php if ($content['type'] == 'reference' || $modx->manager->action == '72') {
+// Web Link specific ?>
 		var lastImageCtrl;
 		var lastFileCtrl;
 
@@ -694,7 +695,8 @@ 
 									</td>
 								</tr>
 
-								<?php if($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific ?>
+								<?php if($content['type'] == 'reference' || $modx->manager->action == '72') {
+// Web Link specific ?>
 
 									<tr>
 										<td><span class="warning"><?= $_lang['weblink'] ?></span>
@@ -1353,7 +1355,9 @@ 
 						if($documentId > 0) {
 							// Load up, the permissions from the parent (if new document) or existing document
 							$rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
-							while($currentgroup = $modx->db->getRow($rs)) $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+							while($currentgroup = $modx->db->getRow($rs)) {
+							    $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+							}
 
 							// Load up the current permissions and names
 							$vs = array(
@@ -1415,7 +1419,9 @@ 
 
 							// Create attribute string list
 							$inputString = array();
-							foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
+							foreach($inputAttributes as $k => $v) {
+							    $inputString[] = $k . '="' . $v . '"';
+							}
 
 							// Make the <input> HTML
 							$inputHTML = '<input ' . implode(' ', $inputString) . ' />';
@@ -1535,7 +1541,8 @@ 
 /**
  * @return string
  */
-function getDefaultTemplate() {
+function getDefaultTemplate()
+{
 	$modx = evolutionCMS();
 
     $default_template = '';

manager/actions/resources/functions.inc.php

Braces +32 added lines, -27 removed lines

@@ -1,5 +1,5 @@ 
 <?php

-if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {

+if( ! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
 	die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 

@@ -16,7 +16,8 @@ 
  * @param array $ph

  * @return string

  */

-function parsePh($tpl, $ph) {

+function parsePh($tpl, $ph)
+{
 	$modx = evolutionCMS(); global $_lang;

 	$tpl = $modx->parseText($tpl, $_lang, '[%', '%]');

 	return $modx->parseText($tpl, $ph);

@@ -26,7 +27,8 @@ 
  * @param string|int $cssId

  * @return string

  */

-function renderViewSwitchButtons($cssId) {

+function renderViewSwitchButtons($cssId)
+{
 	$modx = evolutionCMS(); global $_lang, $tpl;

 

 	return parsePh($tpl['viewForm'], array(

@@ -39,19 +41,20 @@ 
  * @param mgrResources $resources

  * @return string

  */

-function createResourceList($resourceTable, $resources) {

+function createResourceList($resourceTable, $resources)
+{
 	$modx = evolutionCMS(); global $_lang, $_style, $modx_textdir, $tpl;

 

 	$items = isset($resources->items[$resourceTable]) ? $resources->items[$resourceTable] : false;

 

-	if( ! is_array($items) || empty($items)) {

+	if( ! is_array($items) || empty($items)) {
 		return $_lang['no_results'];

 	}

 

 	// Prepare elements- and categories-list

 	$elements = array();

 	$categories = array();

-	foreach($items as $row) {

+	foreach($items as $row) {
 		$catid = $row['catid'] ? $row['catid'] : 0;

 		$categories[$catid] = array('name' => stripslashes($row['category']));

 		$elements[$catid][] = prepareElementRowPh($row, $resourceTable, $resources);

@@ -59,7 +62,7 @@ 
 

 	// Now render categories / panel-collapse

 	$panelGroup = '';

-	foreach($elements as $catid => $elList) {

+	foreach($elements as $catid => $elList) {
 		// Add panel-heading / category-collapse to output

 		$panelGroup .= parsePh($tpl['panelHeading'], array(

 			'tab' => $resourceTable,

@@ -70,7 +73,7 @@ 
 

 		// Prepare content for panel-collapse

 		$panelCollapse = '';

-		foreach($elList as $el) {

+		foreach($elList as $el) {
 			$panelCollapse .= parsePh($tpl['elementsRow'], $el);

 		}

 

@@ -92,14 +95,15 @@ 
  * @param mgrResources $resources

  * @return string

  */

-function createCombinedView($resources) {

+function createCombinedView($resources)
+{
 	$modx = evolutionCMS(); global $_lang, $_style, $modx_textdir;

 

 	$itemsPerCategory = isset($resources->itemsPerCategory) ? $resources->itemsPerCategory : false;

 	$types = isset($resources->types) ? $resources->types : false;

 	$categories = isset($resources->categories) ? $resources->categories : false;

 

-	if(!$itemsPerCategory) {

+	if(!$itemsPerCategory) {
 		return $_lang['no_results'];

 	}

 

@@ -112,10 +116,10 @@ 
 

 	// Easily loop through $itemsPerCategory-Array

 	$panelGroup = '';

-	foreach($categories as $catid => $category) {

+	foreach($categories as $catid => $category) {
 		// Prepare collapse content / elements-list

 		$panelCollapse = '';

-		foreach($itemsPerCategory[$catid] as $el) {

+		foreach($itemsPerCategory[$catid] as $el) {
 			$resourceTable = $el['type'];

 			$ph = prepareElementRowPh($el, $resourceTable, $resources);

 			$panelCollapse .= parsePh($tpl['elementsRow'], $ph);

@@ -149,14 +153,15 @@ 
  * @param mgrResources $resources

  * @return array

  */

-function prepareElementRowPh($row, $resourceTable, $resources) {

+function prepareElementRowPh($row, $resourceTable, $resources)
+{
 	$modx = evolutionCMS(); global $modx_textdir, $_style, $_lang;

 

 	$types = isset($resources->types[$resourceTable]) ? $resources->types[$resourceTable] : false;

 

 	$_lang["confirm_delete"] = $_lang["delete"];

 

-	switch($resourceTable){

+	switch($resourceTable) {
         case 'site_templates':

             $class = $row['selectable'] ? '' : 'disabledPlugin';

             $lockElementType = 1;

@@ -193,56 +198,56 @@ 
 	// Prepare displaying user-locks

 	$lockedByUser = '';

 	$rowLock = $modx->elementIsLocked($lockElementType, $row['id'], true);

-	if($rowLock && $modx->hasPermission('display_locks')) {

-		if($rowLock['sid'] == $modx->sid) {

+	if($rowLock && $modx->hasPermission('display_locks')) {
+		if($rowLock['sid'] == $modx->sid) {
 			$title = $modx->parseText($_lang["lock_element_editing"], array(

 				'element_type' => $_lang["lock_element_type_" . $lockElementType],

 				'lasthit_df' => $rowLock['lasthit_df']

 			));

 			$lockedByUser = '<span title="' . $title . '" class="editResource" style="cursor:context-menu;">' . $_style['tree_preview_resource'] . '</span>&nbsp;';

-		} else {

+		} else {
 			$title = $modx->parseText($_lang["lock_element_locked_by"], array(

 				'element_type' => $_lang["lock_element_type_" . $lockElementType],

 				'username' => $rowLock['username'],

 				'lasthit_df' => $rowLock['lasthit_df']

 			));

-			if($modx->hasPermission('remove_locks')) {

+			if($modx->hasPermission('remove_locks')) {
 				$lockedByUser = '<a href="javascript:;" onclick="unlockElement(' . $lockElementType . ', ' . $row['id'] . ', this);return false;" title="' . $title . '" class="lockedResource"><i class="' . $_style['icons_secured'] . '"></i></a>';

-			} else {

+			} else {
 				$lockedByUser = '<span title="' . $title . '" class="lockedResource" style="cursor:context-menu;"><i class="' . $_style['icons_secured'] . '"></i></span>';

 			}

 		}

 	}

-	if($lockedByUser) {

+	if($lockedByUser) {
 		$lockedByUser = '<div class="lockCell">' . $lockedByUser . '</div>';

 	}

 

 	// Caption

-	if($resourceTable == 'site_tmplvars') {

+	if($resourceTable == 'site_tmplvars') {
 		$caption = !empty($row['description']) ? ' ' . $row['caption'] . ' &nbsp; <small>(' . $row['description'] . ')</small>' : ' ' . $row['caption'];

-	} else {

+	} else {
 		$caption = !empty($row['description']) ? ' ' . $row['description'] : '';

 	}

 

 	// Special marks

 	$tplInfo = array();

-	if($row['locked']) {

+	if($row['locked']) {
 		$tplInfo[] = $_lang['locked'];

 	}

-	if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {

+	if($row['id'] == $modx->config['default_template'] && $resourceTable == 'site_templates') {
 		$tplInfo[] = $_lang['defaulttemplate_title'];

 	}

 	$marks = !empty($tplInfo) ? ' <em>(' . implode(', ', $tplInfo) . ')</em>' : '';

 

 	/* row buttons */

 	$buttons = '';

-	if($modx->hasPermission($types['actions']['edit'][1])) {

+	if($modx->hasPermission($types['actions']['edit'][1])) {
 		$buttons .= '<li><a title="' . $_lang["edit_resource"] . '" href="index.php?a=' . $types['actions']['edit'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-edit fa-fw"></i></a></li>';

 	}

-	if($modx->hasPermission($types['actions']['duplicate'][1])) {

+	if($modx->hasPermission($types['actions']['duplicate'][1])) {
 		$buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_duplicate_record"] . '\')" title="' . $_lang["resource_duplicate"] . '" href="index.php?a=' . $types['actions']['duplicate'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-clone fa-fw"></i></a></li>';

 	}

-	if($modx->hasPermission($types['actions']['remove'][1])) {

+	if($modx->hasPermission($types['actions']['remove'][1])) {
 		$buttons .= '<li><a onclick="return confirm(\'' . $_lang["confirm_delete"] . '\')" title="' . $_lang["delete"] . '" href="index.php?a=' . $types['actions']['remove'][0] . '&amp;id=' . $row['id'] . '"><i class="fa fa-trash fa-fw"></i></a></li>';

 	}

 	$buttons = $buttons ? '<div class="btnCell"><ul class="elements_buttonbar">' . $buttons . '</ul></div>' : '';

manager/actions/resources/mgrResources.class.php

Braces +23 added lines, -12 removed lines

@@ -3,7 +3,8 @@ 
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
-class mgrResources {
+class mgrResources
+{
     /**
      * @var array
      */
@@ -24,7 +25,8 @@ 
     /**
      * mgrResources constructor.
      */
-    public function __construct() {
+    public function __construct()
+    {
 		$this->setTypes();
 		$this->queryItemsFromDB();
 		$this->prepareCategoryArrays();
@@ -33,7 +35,8 @@ 
     /**
      * @return void
      */
-    public function setTypes() {
+    public function setTypes()
+    {
 		global $_lang;
 		$this->types['site_templates']    = array(
 			'title'=>$_lang["manage_templates"],
@@ -71,7 +74,8 @@ 
     /**
      * @return void
      */
-    public function queryItemsFromDB() {
+    public function queryItemsFromDB()
+    {
 		foreach($this->types as $resourceTable=>$type) {
 			if($this->hasAnyPermissions($type['permissions'])) {
 				$nameField = isset($type['name']) ? $type['name'] : 'name';
@@ -84,11 +88,13 @@ 
      * @param array $permissions
      * @return bool
      */
-    public function hasAnyPermissions($permissions) {
+    public function hasAnyPermissions($permissions)
+    {
 		$modx = evolutionCMS();
 
-		foreach($permissions as $p)
-			if($modx->hasPermission($p)) return true;
+		foreach($permissions as $p) {
+					if($modx->hasPermission($p)) return true;
+		}
 
 		return false;
 	}
@@ -98,7 +104,8 @@ 
      * @param string $nameField
      * @return array|bool
      */
-    public function queryResources($resourceTable, $nameField = 'name') {
+    public function queryResources($resourceTable, $nameField = 'name')
+    {
 		$modx = evolutionCMS(); global $_lang;
 
         $allowed = array(
@@ -115,8 +122,9 @@ 
 			$tvsql    = 'site_tmplvars.caption, ';
 			$tvjoin   = sprintf('LEFT JOIN %s AS stt ON site_tmplvars.id=stt.tmplvarid GROUP BY site_tmplvars.id,reltpl', $modx->getFullTableName('site_tmplvar_templates'));
 			$sttfield = 'IF(stt.templateid,1,0) AS reltpl,';
+		} else {
+		    $sttfield = '';
 		}
-		else $sttfield = '';
 
 		$selectableTemplates = $resourceTable === 'site_templates' ? "{$resourceTable}.selectable, " : "";
 
@@ -129,7 +137,9 @@ 
 		);
 		$limit = $modx->db->getRecordCount($rs);
 
-		if($limit < 1) return false;
+		if($limit < 1) {
+		    return false;
+		}
 
 		$result = array();
 		while ($row = $modx->db->getRow($rs)) {
@@ -141,7 +151,8 @@ 
     /**
      * @return void
      */
-    public function prepareCategoryArrays() {
+    public function prepareCategoryArrays()
+    {
 		foreach($this->items as $type=>$items) {
 			foreach((array)$items as $item) {
 				$catid = $item['catid'] ? $item['catid'] : 0;
@@ -157,7 +168,7 @@ 
 
 		// Now sort by name
 		foreach($this->itemsPerCategory as $catid=>$items) {
-			usort($this->itemsPerCategory[$catid], function ($a, $b) {
+			usort($this->itemsPerCategory[$catid], function ($a, $b){
 				return strcasecmp($a['name'], $b['name']);
 			});
 		}

manager/actions/mutate_role.dynamic.php

Braces +2 added lines, -1 removed lines

@@ -299,7 +299,8 @@
  * @param string $status
  * @return string
  */
-function render_form($name, $label, $status = '') {
+function render_form($name, $label, $status = '')
+{
 	$modx = evolutionCMS(); global $roledata;
 
 	$tpl = '<label class="d-block" for="[+name+]check">

manager/actions/files.dynamic.php

Braces +3 added lines, -1 removed lines

@@ -893,7 +893,9 @@
     $modx = evolutionCMS(); global $_lang, $startpath, $filemanager_path, $uploadablefiles, $new_file_permissions;
     $msg = '';
     foreach ($_FILES['userfile']['name'] as $i => $name) {
-        if (empty($_FILES['userfile']['tmp_name'][$i])) continue;
+        if (empty($_FILES['userfile']['tmp_name'][$i])) {
+            continue;
+        }
         $userfile= array();
 
         $userfile['tmp_name'] = $_FILES['userfile']['tmp_name'][$i];

manager/includes/tmplvars.inc.php

Braces +7 added lines, -3 removed lines

@@ -12,7 +12,8 @@ 
  * @param array $tvsArray
  * @return string
  */
-function renderFormElement($field_type, $field_id, $default_text = '', $field_elements = '', $field_value = '', $field_style = '', $row = array(), $tvsArray = array()) {
+function renderFormElement($field_type, $field_id, $default_text = '', $field_elements = '', $field_value = '', $field_style = '', $row = array(), $tvsArray = array())
+{
     $modx = evolutionCMS();
 	global $_style;
 	global $_lang;
@@ -384,13 +385,16 @@ 
  * @param string|array|mysqli_result $v
  * @return array
  */
-function ParseIntputOptions($v) {
+function ParseIntputOptions($v)
+{
     $modx = evolutionCMS();
 	$a = array();
 	if(is_array($v)) {
 		return $v;
 	} else if($modx->db->isResult($v)) {
-		while($cols = $modx->db->getRow($v, 'num')) $a[] = $cols;
+		while($cols = $modx->db->getRow($v, 'num')) {
+		    $a[] = $cols;
+		}
 	} else {
 		$a = explode("||", $v);
 	}

manager/includes/veriword.php

Braces +16 added lines, -8 removed lines

@@ -41,7 +41,8 @@ 
 ## see sample.php for test and usage
 ## sample URL: http://www.program-ruti.org/veriword/
 ####
-class VeriWord {
+class VeriWord
+{
 
     /* path to font directory*/
     public $dir_font   = "ttf/";
@@ -52,7 +53,8 @@ 
     public $im_height  = 0;
     public $im;
 
-    public function __construct($w=200, $h=80) {
+    public function __construct($w=200, $h=80)
+    {
         /* create session to set word for verification */
         $this->set_veriword();
         $this->dir_font = dirname(__FILE__) . '/' . $this->dir_font;
@@ -60,21 +62,24 @@ 
         $this->im_height        = $h;
     }
 
-    public function set_veriword() {
+    public function set_veriword()
+    {
         /* create session variable for verification,
            you may change the session variable name */
         $this->word             = $this->pick_word();
         $_SESSION['veriword']   = $this->word;
     }
 
-    public function output_image() {
+    public function output_image()
+    {
         /* output the image as jpeg */
         $this->draw_image();
         header("Content-type: image/jpeg");
         imagejpeg($this->im);
     }
 
-    public function pick_word() {
+    public function pick_word()
+    {
         $modx = evolutionCMS();
         // set default words
         $words="MODX,Access,Better,BitCode,Chunk,Cache,Desc,Design,Excell,Enjoy,URLs,TechView,Gerald,Griff,Humphrey,Holiday,Intel,Integration,Joystick,Join(),Oscope,Genetic,Light,Likeness,Marit,Maaike,Niche,Netherlands,Ordinance,Oscillo,Parser,Phusion,Query,Question,Regalia,Righteous,Snippet,Sentinel,Template,Thespian,Unity,Enterprise,Verily,Veri,Website,WideWeb,Yap,Yellow,Zebra,Zygote";
@@ -85,7 +90,8 @@ 
         return (string) $arr_words[array_rand($arr_words)].rand(10,999);
     }
 
-    public function draw_text() {
+    public function draw_text()
+    {
         $dir = dir($this->dir_font);
         $fontstmp = array();
         while (false !== ($file = $dir->read())) {
@@ -140,7 +146,8 @@ 
     }
 
 
-    public function draw_image() {
+    public function draw_image()
+    {
 
         /* pick one background image randomly from image directory */
         $img_file       = $this->dir_noise."noise".rand(1,4).".jpg";
@@ -171,7 +178,8 @@ 
         return $this->im;
     }
 
-    public function destroy_image() {
+    public function destroy_image()
+    {
 
         imagedestroy($this->im);