evolution-cms / evolution

manager/includes/extenders/export.class.inc.php

Braces +4 added lines, -2 removed lines

@@ -279,7 +279,8 @@ 
             $row['count'] = $this->count;
             $row['url'] = $modx->makeUrl($row['id']);
 
-            if (!$row['wasNull']) { // needs writing a document
+            if (!$row['wasNull']) {
+// needs writing a document
                 $docname = $this->getFileName($row['id'], $row['alias'], $prefix, $suffix);
                 $filename = $dirpath . $docname;
                 if (!is_file($filename)) {
@@ -307,7 +308,8 @@ 
                 $this->output[] = $this->parsePlaceholder($_lang['export_site_exporting_document'], $row);
             }
             if ($row['isfolder'] === '1' && ($modx->config['suffix_mode'] !== '1' || strpos($row['alias'],
-                        '.') === false)) { // needs making a folder
+                        '.') === false)) {
+// needs making a folder
                 $end_dir = ($row['alias'] !== '') ? $row['alias'] : $row['id'];
                 $dir_path = $dirpath . $end_dir;
                 if (strpos($dir_path, MODX_BASE_PATH) === false) {

manager/includes/extenders/dbapi.mysqli.class.inc.php

Braces +3 added lines, -2 removed lines

@@ -373,7 +373,8 @@ 
      * @return bool|mixed|mysqli_result
      */
     public function save($fields, $table, $where = '')
-    { // This is similar to "replace into table".
+    {
+// This is similar to "replace into table".
 
         if ($where === '') {
             $mode = 'insert';
@@ -490,7 +491,7 @@ 
     {
         $out = false;
         if ($ds instanceof mysqli_result) {
-            switch($mode){
+            switch($mode) {
                 case 'assoc':
                     $out = $ds->fetch_assoc();
                     break;

manager/includes/extenders/maketable.class.php

Braces +2 added lines, -1 removed lines

@@ -457,7 +457,8 @@
             if ($this->formElementType) {
                 $table = "\n" . '<form id="' . $this->formName . '" name="' . $this->formName . '" action="' . $this->formAction . '" method="POST">' . $table;
             }
-            if (strlen($this->pageNav) > 1) {//changed to display the pagination if exists.
+            if (strlen($this->pageNav) > 1) {
+//changed to display the pagination if exists.
                 /* commented this part because of cookie
                 $table .= '<div id="max-display-records" ><select style="display:inline" onchange="javascript:updatePageSize(this[this.selectedIndex].value);">';
                 $pageSizes= array (10, 25, 50, 100, 250);

manager/includes/accesscontrol.inc.php

Braces +4 added lines, -2 removed lines

@@ -21,7 +21,8 @@ 
 if (file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) {
     include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
     if (isset($installStartTime)) {
-        if ((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
+        if ((time() - $installStartTime) > 5 * 60) {
+// if install flag older than 5 minutes, discard
             unset($installStartTime);
             @ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755);
             unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
@@ -163,7 +164,8 @@ 
         } elseif (is_file($theme_path . 'templates/actions/login.tpl')) {
             $target = $theme_path . 'templates/actions/login.tpl';
             $login_tpl = file_get_contents($target);
-        } elseif (is_file($theme_path . 'html/login.html')) { // ClipperCMS compatible
+        } elseif (is_file($theme_path . 'html/login.html')) {
+// ClipperCMS compatible
             $target = $theme_path . 'html/login.html';
             $login_tpl = file_get_contents($target);
         } else {

manager/processors/duplicate_module.processor.php

Braces +7 added lines, -3 removed lines

@@ -16,7 +16,8 @@ 
  *
  * @return string
  */
-function createGUID(){
+function createGUID()
+{
 	srand((double)microtime()*1000000);
 	$r = rand() ;
 	$u = uniqid(getmypid() . $r . (double)microtime()*1000000,1);
@@ -27,8 +28,11 @@ 
 // count duplicates
 $name = $modx->db->getValue($modx->db->select('name', $modx->getFullTableName('site_modules'), "id='{$id}'"));
 $count = $modx->db->getRecordCount($modx->db->select('name', $modx->getFullTableName('site_modules'), "name LIKE '{$name} {$_lang['duplicated_el_suffix']}%'"));
-if($count>=1) $count = ' '.($count+1);
-else $count = '';
+if($count>=1) {
+    $count = ' '.($count+1);
+} else {
+    $count = '';
+}
 
 // duplicate module
 $newid = $modx->db->insert(

manager/processors/remove_installer.processor.php

Braces +9 added lines, -5 removed lines

@@ -17,10 +17,14 @@ 
 $pth = str_replace("\\","/",$pth);
 if(isset($_GET["rminstall"])) {
 	if(is_dir($pth)) {
-		if(!rmdirRecursive($pth)) $msg="An error occured while attempting to remove the install folder";
+		if(!rmdirRecursive($pth)) {
+		    $msg="An error occured while attempting to remove the install folder";
+		}
 	}
 }
-if($msg) echo "<script>alert('".addslashes($msg)."');</script>";
+if($msg) {
+    echo "<script>alert('".addslashes($msg)."');</script>";
+}
 echo "<script>window.location='../index.php?a=2';</script>";
 
 /**
@@ -30,13 +34,13 @@ 
  * @param bool $followLinks
  * @return bool
  */
-function rmdirRecursive($path, $followLinks=false) {
+function rmdirRecursive($path, $followLinks=false)
+{
    $dir = opendir($path) ;
    while ($entry = readdir($dir)) {
 	   if (is_file("$path/$entry") || ((!$followLinks) && is_link("$path/$entry"))) {
 		   @unlink( "$path/$entry" );
-	   }
-	   elseif (is_dir("$path/$entry") && $entry!='.' && $entry!='..') {
+	   } elseif (is_dir("$path/$entry") && $entry!='.' && $entry!='..') {
 		   rmdirRecursive("$path/$entry"); // recursive
 	   }
    }

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