evolution-cms / evolution

manager/media/rss/rss_fetch.inc

Doc Comments +6 added lines

@@ -243,6 +243,9 @@ 
         }
 }
 
+/**
+ * @param integer $lvl
+ */
 function debug ($debugmsg, $lvl=E_USER_NOTICE) {
     trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
 }
@@ -289,6 +292,9 @@ 
     Input:      an HTTP response object (see Snoopy)
     Output:     parsed RSS object (see rss_parse)
 \*=======================================================================*/
+/**
+ * @param Snoopy $resp
+ */
 function _response_to_rss ($resp) {
     $rss = new MagpieRSS( $resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
     

Indentation +1 added lines, -1 removed lines

@@ -166,7 +166,7 @@
         $resp = _fetch_remote_file( $url, $request_headers );
         
         if (isset($resp) and $resp) {
-          if ($resp->status == '304' ) {
+            if ($resp->status == '304' ) {
                 // we have the most current copy
                 if ( MAGPIE_DEBUG > 1) {
                     debug("Got 304 for $url");

Spacing +79 added lines, -79 removed lines

@@ -24,19 +24,19 @@ 
 }
 
 if (!defined('MAGPIE_DIR')) {
-    define('MAGPIE_DIR', dirname(__FILE__) . DIR_SEP);
+    define('MAGPIE_DIR', dirname(__FILE__).DIR_SEP);
 }
 
 if (!defined('MAGPIE_CACHE_DIR')) {
-    define('MAGPIE_CACHE_DIR', MODX_BASE_PATH . 'assets/cache/rss');
+    define('MAGPIE_CACHE_DIR', MODX_BASE_PATH.'assets/cache/rss');
 }
 
-require_once( MAGPIE_DIR . 'rss_parse.inc' );
-require_once( MAGPIE_DIR . 'rss_cache.inc' );
+require_once(MAGPIE_DIR.'rss_parse.inc');
+require_once(MAGPIE_DIR.'rss_cache.inc');
 
 // for including 3rd party libraries
-define('MAGPIE_EXTLIB', MAGPIE_DIR . 'extlib' . DIR_SEP);
-require_once( MAGPIE_EXTLIB . 'Snoopy.class.inc');
+define('MAGPIE_EXTLIB', MAGPIE_DIR.'extlib'.DIR_SEP);
+require_once(MAGPIE_EXTLIB.'Snoopy.class.inc');
 
 
 /*
@@ -89,21 +89,21 @@ 
 
 $MAGPIE_ERROR = "";
 
-function fetch_rss ($url) {
+function fetch_rss($url){
     // initialize constants
     init();
 
-    if ( !isset($url) ) {
+    if (!isset($url)) {
         error("fetch_rss called without a url");
         return false;
     }
 
     // if cache is disabled
-    if ( !MAGPIE_CACHE_ON ) {
+    if (!MAGPIE_CACHE_ON) {
         // fetch file, and parse it
-        $resp = _fetch_remote_file( $url );
-        if ( is_success( $resp->status ) ) {
-            return _response_to_rss( $resp );
+        $resp = _fetch_remote_file($url);
+        if (is_success($resp->status)) {
+            return _response_to_rss($resp);
         }
         else {
             error("Failed to fetch $url and cache is off");
@@ -118,34 +118,34 @@ 
         // 3. if cached obj fails freshness check, fetch remote
         // 4. if remote fails, return stale object, or error
 
-        $cache = new RSSCache( MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE );
+        $cache = new RSSCache(MAGPIE_CACHE_DIR, MAGPIE_CACHE_AGE);
 
         if (MAGPIE_DEBUG and $cache->ERROR) {
             debug($cache->ERROR, E_USER_WARNING);
         }
 
 
-        $cache_status    = 0;       // response of check_cache
+        $cache_status    = 0; // response of check_cache
         $request_headers = array(); // HTTP headers to send with fetch
-        $rss             = 0;       // parsed RSS object
-        $errormsg        = 0;       // errors, if any
+        $rss             = 0; // parsed RSS object
+        $errormsg        = 0; // errors, if any
 
         // store parsed XML by desired output encoding
         // as character munging happens at parse time
-        $cache_key       = $url . MAGPIE_OUTPUT_ENCODING;
+        $cache_key = $url.MAGPIE_OUTPUT_ENCODING;
 
         if (!$cache->ERROR) {
             // return cache HIT, MISS, or STALE
-            $cache_status = $cache->check_cache( $cache_key);
+            $cache_status = $cache->check_cache($cache_key);
         }
 
         // if object cached, and cache is fresh, return cached obj
-        if ( $cache_status == 'HIT' ) {
-            $rss = $cache->get( $cache_key );
-            if ( isset($rss) and $rss ) {
+        if ($cache_status == 'HIT') {
+            $rss = $cache->get($cache_key);
+            if (isset($rss) and $rss) {
                 // should be cache age
                 $rss->from_cache = 1;
-                if ( MAGPIE_DEBUG > 1) {
+                if (MAGPIE_DEBUG > 1) {
                     debug("MagpieRSS: Cache HIT", E_USER_NOTICE);
                 }
                 return $rss;
@@ -155,50 +155,50 @@ 
         // else attempt a conditional get
 
         // setup headers
-        if ( $cache_status == 'STALE' ) {
-            $rss = $cache->get( $cache_key );
-            if ( $rss and $rss->etag and $rss->last_modified ) {
+        if ($cache_status == 'STALE') {
+            $rss = $cache->get($cache_key);
+            if ($rss and $rss->etag and $rss->last_modified) {
                 $request_headers['If-None-Match'] = $rss->etag;
                 $request_headers['If-Last-Modified'] = $rss->last_modified;
             }
         }
 
-        $resp = _fetch_remote_file( $url, $request_headers );
+        $resp = _fetch_remote_file($url, $request_headers);
 
         if (isset($resp) and $resp) {
-          if ($resp->status == '304' ) {
+          if ($resp->status == '304') {
                 // we have the most current copy
-                if ( MAGPIE_DEBUG > 1) {
+                if (MAGPIE_DEBUG > 1) {
                     debug("Got 304 for $url");
                 }
                 // reset cache on 304 (at minutillo insistent prodding)
                 $cache->set($cache_key, $rss);
                 return $rss;
             }
-            elseif ( is_success( $resp->status ) ) {
-                $rss = _response_to_rss( $resp );
-                if ( $rss ) {
+            elseif (is_success($resp->status)) {
+                $rss = _response_to_rss($resp);
+                if ($rss) {
                     if (MAGPIE_DEBUG > 1) {
                         debug("Fetch successful");
                     }
                     // add object to cache
-                    $cache->set( $cache_key, $rss );
+                    $cache->set($cache_key, $rss);
                     return $rss;
                 }
             }
             else {
                 $errormsg = "Failed to fetch $url ";
-                if ( $resp->status == '-100' ) {
-                    $errormsg .= "(Request timed out after " . MAGPIE_FETCH_TIME_OUT . " seconds)";
+                if ($resp->status == '-100') {
+                    $errormsg .= "(Request timed out after ".MAGPIE_FETCH_TIME_OUT." seconds)";
                 }
-                elseif ( $resp->error ) {
+                elseif ($resp->error) {
                     # compensate for Snoopy's annoying habbit to tacking
                     # on '\n'
                     $http_error = substr($resp->error, 0, -2);
                     $errormsg .= "(HTTP Error: $http_error)";
                 }
                 else {
-                    $errormsg .=  "(HTTP Response: " . $resp->response_code .')';
+                    $errormsg .= "(HTTP Response: ".$resp->response_code.')';
                 }
             }
         }
@@ -210,14 +210,14 @@ 
 
         // attempt to return cached object
         if ($rss) {
-            if ( MAGPIE_DEBUG ) {
+            if (MAGPIE_DEBUG) {
                 debug("Returning STALE object for $url");
             }
             return $rss;
         }
 
         // else we totally failed
-        error( $errormsg );
+        error($errormsg);
 
         return false;
 
@@ -229,21 +229,21 @@ 
     Purpose:    set MAGPIE_ERROR, and trigger error
 \*=======================================================================*/
 
-function error ($errormsg, $lvl=E_USER_WARNING) {
+function error($errormsg, $lvl = E_USER_WARNING){
         global $MAGPIE_ERROR;
 
         // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) {
+        if (isset($php_errormsg)) {
             $errormsg .= " ($php_errormsg)";
         }
-        if ( $errormsg ) {
+        if ($errormsg) {
             $errormsg = "MagpieRSS: $errormsg";
             $MAGPIE_ERROR = $errormsg;
-            trigger_error( $errormsg, $lvl);
+            trigger_error($errormsg, $lvl);
         }
 }
 
-function debug ($debugmsg, $lvl=E_USER_NOTICE) {
+function debug($debugmsg, $lvl = E_USER_NOTICE){
     trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
 }
 
@@ -251,10 +251,10 @@ 
     Function:   magpie_error
     Purpose:    accessor for the magpie error variable
 \*=======================================================================*/
-function magpie_error ($errormsg="") {
+function magpie_error($errormsg = ""){
     global $MAGPIE_ERROR;
 
-    if ( isset($errormsg) and $errormsg ) {
+    if (isset($errormsg) and $errormsg) {
         $MAGPIE_ERROR = $errormsg;
     }
 
@@ -268,13 +268,13 @@ 
                 headers to send along with the request (optional)
     Output:     an HTTP response object (see Snoopy.class.inc)
 \*=======================================================================*/
-function _fetch_remote_file ($url, $headers = "" ) {
+function _fetch_remote_file($url, $headers = ""){
     // Snoopy is an HTTP client in PHP
     $client = new Snoopy();
     $client->agent = MAGPIE_USER_AGENT;
     $client->read_timeout = MAGPIE_FETCH_TIME_OUT;
     $client->use_gzip = MAGPIE_USE_GZIP;
-    if (is_array($headers) ) {
+    if (is_array($headers)) {
         $client->rawheaders = $headers;
     }
 
@@ -289,14 +289,14 @@ 
     Input:      an HTTP response object (see Snoopy)
     Output:     parsed RSS object (see rss_parse)
 \*=======================================================================*/
-function _response_to_rss ($resp) {
-    $rss = new MagpieRSS( $resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
+function _response_to_rss($resp){
+    $rss = new MagpieRSS($resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING);
 
     // if RSS parsed successfully
-    if ( $rss and !$rss->ERROR) {
+    if ($rss and !$rss->ERROR) {
 
         // find Etag, and Last-Modified
-        foreach($resp->headers as $h) {
+        foreach ($resp->headers as $h) {
             // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
             if (strpos($h, ": ")) {
                 list($field, $val) = explode(": ", $h, 2);
@@ -306,11 +306,11 @@ 
                 $val = "";
             }
 
-            if ( $field == 'ETag' ) {
+            if ($field == 'ETag') {
                 $rss->etag = $val;
             }
 
-            if ( $field == 'Last-Modified' ) {
+            if ($field == 'Last-Modified') {
                 $rss->last_modified = $val;
             }
         }
@@ -321,7 +321,7 @@ 
         $errormsg = "Failed to parse RSS file.";
 
         if ($rss) {
-            $errormsg .= " (" . $rss->ERROR . ")";
+            $errormsg .= " (".$rss->ERROR.")";
         }
         error($errormsg);
 
@@ -334,67 +334,67 @@ 
     Purpose:    setup constants with default values
                 check for user overrides
 \*=======================================================================*/
-function init () {
-    if ( defined('MAGPIE_INITALIZED') ) {
+function init(){
+    if (defined('MAGPIE_INITALIZED')) {
         return;
     }
     else {
         define('MAGPIE_INITALIZED', true);
     }
 
-    if ( !defined('MAGPIE_CACHE_ON') ) {
+    if (!defined('MAGPIE_CACHE_ON')) {
         define('MAGPIE_CACHE_ON', true);
     }
 
-    if ( !defined('MAGPIE_CACHE_DIR') ) {
+    if (!defined('MAGPIE_CACHE_DIR')) {
         define('MAGPIE_CACHE_DIR', './cache');
     }
 
-    if ( !defined('MAGPIE_CACHE_AGE') ) {
-        define('MAGPIE_CACHE_AGE', 60*60); // one hour
+    if (!defined('MAGPIE_CACHE_AGE')) {
+        define('MAGPIE_CACHE_AGE', 60 * 60); // one hour
     }
 
-    if ( !defined('MAGPIE_CACHE_FRESH_ONLY') ) {
+    if (!defined('MAGPIE_CACHE_FRESH_ONLY')) {
         define('MAGPIE_CACHE_FRESH_ONLY', false);
     }
 
-    if ( !defined('MAGPIE_OUTPUT_ENCODING') ) {
+    if (!defined('MAGPIE_OUTPUT_ENCODING')) {
         global $modx_manager_charset;
-        if(empty($modx_manager_charset)) $modx_manager_charset = 'ISO-8859-1';
+        if (empty($modx_manager_charset)) $modx_manager_charset = 'ISO-8859-1';
         define('MAGPIE_OUTPUT_ENCODING', $modx_manager_charset);
     }
 
-    if ( !defined('MAGPIE_INPUT_ENCODING') ) {
+    if (!defined('MAGPIE_INPUT_ENCODING')) {
         define('MAGPIE_INPUT_ENCODING', null);
     }
 
-    if ( !defined('MAGPIE_DETECT_ENCODING') ) {
+    if (!defined('MAGPIE_DETECT_ENCODING')) {
         define('MAGPIE_DETECT_ENCODING', true);
     }
 
-    if ( !defined('MAGPIE_DEBUG') ) {
+    if (!defined('MAGPIE_DEBUG')) {
         define('MAGPIE_DEBUG', 0);
     }
 
-    if ( !defined('MAGPIE_USER_AGENT') ) {
-        $ua = 'MagpieRSS/'. MAGPIE_VERSION . ' (+http://magpierss.sf.net';
+    if (!defined('MAGPIE_USER_AGENT')) {
+        $ua = 'MagpieRSS/'.MAGPIE_VERSION.' (+http://magpierss.sf.net';
 
-        if ( MAGPIE_CACHE_ON ) {
-            $ua = $ua . ')';
+        if (MAGPIE_CACHE_ON) {
+            $ua = $ua.')';
         }
         else {
-            $ua = $ua . '; No cache)';
+            $ua = $ua.'; No cache)';
         }
 
         define('MAGPIE_USER_AGENT', $ua);
     }
 
-    if ( !defined('MAGPIE_FETCH_TIME_OUT') ) {
+    if (!defined('MAGPIE_FETCH_TIME_OUT')) {
         define('MAGPIE_FETCH_TIME_OUT', 5); // 5 second timeout
     }
 
     // use gzip encoding to fetch rss files if supported?
-    if ( !defined('MAGPIE_USE_GZIP') ) {
+    if (!defined('MAGPIE_USE_GZIP')) {
         define('MAGPIE_USE_GZIP', true);
     }
 }
@@ -417,7 +417,7 @@ 
     Function:   is_info
     Purpose:    return true if Informational status code
 \*=======================================================================*/
-function is_info ($sc) {
+function is_info($sc){
     return $sc >= 100 && $sc < 200;
 }
 
@@ -425,7 +425,7 @@ 
     Function:   is_success
     Purpose:    return true if Successful status code
 \*=======================================================================*/
-function is_success ($sc) {
+function is_success($sc){
     return $sc >= 200 && $sc < 300;
 }
 
@@ -433,7 +433,7 @@ 
     Function:   is_redirect
     Purpose:    return true if Redirection status code
 \*=======================================================================*/
-function is_redirect ($sc) {
+function is_redirect($sc){
     return $sc >= 300 && $sc < 400;
 }
 
@@ -441,7 +441,7 @@ 
     Function:   is_error
     Purpose:    return true if Error status code
 \*=======================================================================*/
-function is_error ($sc) {
+function is_error($sc){
     return $sc >= 400 && $sc < 600;
 }
 
@@ -449,7 +449,7 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a client error
 \*=======================================================================*/
-function is_client_error ($sc) {
+function is_client_error($sc){
     return $sc >= 400 && $sc < 500;
 }
 
@@ -457,6 +457,6 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a server error
 \*=======================================================================*/
-function is_server_error ($sc) {
+function is_server_error($sc){
     return $sc >= 500 && $sc < 600;
 }

Braces +38 added lines, -32 removed lines

@@ -89,7 +89,8 @@ 
 
 $MAGPIE_ERROR = "";
 
-function fetch_rss ($url) {
+function fetch_rss ($url)
+{
     // initialize constants
     init();
 
@@ -104,8 +105,7 @@ 
         $resp = _fetch_remote_file( $url );
         if ( is_success( $resp->status ) ) {
             return _response_to_rss( $resp );
-        }
-        else {
+        } else {
             error("Failed to fetch $url and cache is off");
             return false;
         }
@@ -174,8 +174,7 @@ 
                 // reset cache on 304 (at minutillo insistent prodding)
                 $cache->set($cache_key, $rss);
                 return $rss;
-            }
-            elseif ( is_success( $resp->status ) ) {
+            } elseif ( is_success( $resp->status ) ) {
                 $rss = _response_to_rss( $resp );
                 if ( $rss ) {
                     if (MAGPIE_DEBUG > 1) {
@@ -185,24 +184,20 @@ 
                     $cache->set( $cache_key, $rss );
                     return $rss;
                 }
-            }
-            else {
+            } else {
                 $errormsg = "Failed to fetch $url ";
                 if ( $resp->status == '-100' ) {
                     $errormsg .= "(Request timed out after " . MAGPIE_FETCH_TIME_OUT . " seconds)";
-                }
-                elseif ( $resp->error ) {
+                } elseif ( $resp->error ) {
                     # compensate for Snoopy's annoying habbit to tacking
                     # on '\n'
                     $http_error = substr($resp->error, 0, -2);
                     $errormsg .= "(HTTP Error: $http_error)";
-                }
-                else {
+                } else {
                     $errormsg .=  "(HTTP Response: " . $resp->response_code .')';
                 }
             }
-        }
-        else {
+        } else {
             $errormsg = "Unable to retrieve RSS file for unknown reasons.";
         }
 
@@ -229,7 +224,8 @@ 
     Purpose:    set MAGPIE_ERROR, and trigger error
 \*=======================================================================*/
 
-function error ($errormsg, $lvl=E_USER_WARNING) {
+function error ($errormsg, $lvl=E_USER_WARNING)
+{
         global $MAGPIE_ERROR;
 
         // append PHP's error message if track_errors enabled
@@ -243,7 +239,8 @@ 
         }
 }
 
-function debug ($debugmsg, $lvl=E_USER_NOTICE) {
+function debug ($debugmsg, $lvl=E_USER_NOTICE)
+{
     trigger_error("MagpieRSS [debug] $debugmsg", $lvl);
 }
 
@@ -251,7 +248,8 @@ 
     Function:   magpie_error
     Purpose:    accessor for the magpie error variable
 \*=======================================================================*/
-function magpie_error ($errormsg="") {
+function magpie_error ($errormsg="")
+{
     global $MAGPIE_ERROR;
 
     if ( isset($errormsg) and $errormsg ) {
@@ -268,7 +266,8 @@ 
                 headers to send along with the request (optional)
     Output:     an HTTP response object (see Snoopy.class.inc)
 \*=======================================================================*/
-function _fetch_remote_file ($url, $headers = "" ) {
+function _fetch_remote_file ($url, $headers = "" )
+{
     // Snoopy is an HTTP client in PHP
     $client = new Snoopy();
     $client->agent = MAGPIE_USER_AGENT;
@@ -289,7 +288,8 @@ 
     Input:      an HTTP response object (see Snoopy)
     Output:     parsed RSS object (see rss_parse)
 \*=======================================================================*/
-function _response_to_rss ($resp) {
+function _response_to_rss ($resp)
+{
     $rss = new MagpieRSS( $resp->results, MAGPIE_OUTPUT_ENCODING, MAGPIE_INPUT_ENCODING, MAGPIE_DETECT_ENCODING );
 
     // if RSS parsed successfully
@@ -300,8 +300,7 @@ 
             // 2003-03-02 - Nicola Asuni (www.tecnick.com) - fixed bug "Undefined offset: 1"
             if (strpos($h, ": ")) {
                 list($field, $val) = explode(": ", $h, 2);
-            }
-            else {
+            } else {
                 $field = $h;
                 $val = "";
             }
@@ -334,11 +333,11 @@ 
     Purpose:    setup constants with default values
                 check for user overrides
 \*=======================================================================*/
-function init () {
+function init ()
+{
     if ( defined('MAGPIE_INITALIZED') ) {
         return;
-    }
-    else {
+    } else {
         define('MAGPIE_INITALIZED', true);
     }
 
@@ -360,7 +359,9 @@ 
 
     if ( !defined('MAGPIE_OUTPUT_ENCODING') ) {
         global $modx_manager_charset;
-        if(empty($modx_manager_charset)) $modx_manager_charset = 'ISO-8859-1';
+        if(empty($modx_manager_charset)) {
+            $modx_manager_charset = 'ISO-8859-1';
+        }
         define('MAGPIE_OUTPUT_ENCODING', $modx_manager_charset);
     }
 
@@ -381,8 +382,7 @@ 
 
         if ( MAGPIE_CACHE_ON ) {
             $ua = $ua . ')';
-        }
-        else {
+        } else {
             $ua = $ua . '; No cache)';
         }
 
@@ -417,7 +417,8 @@ 
     Function:   is_info
     Purpose:    return true if Informational status code
 \*=======================================================================*/
-function is_info ($sc) {
+function is_info ($sc)
+{
     return $sc >= 100 && $sc < 200;
 }
 
@@ -425,7 +426,8 @@ 
     Function:   is_success
     Purpose:    return true if Successful status code
 \*=======================================================================*/
-function is_success ($sc) {
+function is_success ($sc)
+{
     return $sc >= 200 && $sc < 300;
 }
 
@@ -433,7 +435,8 @@ 
     Function:   is_redirect
     Purpose:    return true if Redirection status code
 \*=======================================================================*/
-function is_redirect ($sc) {
+function is_redirect ($sc)
+{
     return $sc >= 300 && $sc < 400;
 }
 
@@ -441,7 +444,8 @@ 
     Function:   is_error
     Purpose:    return true if Error status code
 \*=======================================================================*/
-function is_error ($sc) {
+function is_error ($sc)
+{
     return $sc >= 400 && $sc < 600;
 }
 
@@ -449,7 +453,8 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a client error
 \*=======================================================================*/
-function is_client_error ($sc) {
+function is_client_error ($sc)
+{
     return $sc >= 400 && $sc < 500;
 }
 
@@ -457,6 +462,7 @@ 
     Function:   is_client_error
     Purpose:    return true if Error status code, and its a server error
 \*=======================================================================*/
-function is_server_error ($sc) {
+function is_server_error ($sc)
+{
     return $sc >= 500 && $sc < 600;
 }

install/setup.info.php

Upper-Lower-Casing +1 added lines, -1 removed lines

@@ -36,7 +36,7 @@
                 $params['modx_category'],
                 $params['lock_template'],
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false,
-                isset($params['save_sql_id_as']) ? $params['save_sql_id_as'] : NULL // Nessecary to fix template-ID for demo-site
+                isset($params['save_sql_id_as']) ? $params['save_sql_id_as'] : null // Nessecary to fix template-ID for demo-site
             );
         }
     }

Braces +23 added lines, -15 removed lines

@@ -4,7 +4,9 @@ 
 if (is_file($base_path . 'assets/cache/siteManager.php')) {
     include_once($base_path . 'assets/cache/siteManager.php');
 }
-if(!defined('MGR_DIR')) define('MGR_DIR', 'manager');
+if(!defined('MGR_DIR')) {
+    define('MGR_DIR', 'manager');
+}
 
 require_once('../'.MGR_DIR.'/includes/version.inc.php');
 
@@ -19,12 +21,12 @@ 
 $mt = &$moduleTemplates;
 if(is_dir($templatePath) && is_readable($templatePath)) {
     $d = dir($templatePath);
-    while (false !== ($tplfile = $d->read()))
-    {
-        if(substr($tplfile, -4) != '.tpl') continue;
+    while (false !== ($tplfile = $d->read())) {
+        if(substr($tplfile, -4) != '.tpl') {
+            continue;
+        }
         $params = parse_docblock($templatePath, $tplfile);
-        if(is_array($params) && (count($params)>0))
-        {
+        if(is_array($params) && (count($params)>0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mt[] = array
             (
@@ -48,7 +50,9 @@ 
 if(is_dir($tvPath) && is_readable($tvPath)) {
     $d = dir($tvPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') continue;
+        if(substr($tplfile, -4) != '.tpl') {
+            continue;
+        }
         $params = parse_docblock($tvPath, $tplfile);
         if(is_array($params) && (count($params)>0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
@@ -241,7 +245,8 @@ 
 // setup callback function
 $callBackFnc = "clean_up";
 
-function clean_up($sqlParser) {
+function clean_up($sqlParser)
+{
     $ids = array();
 
     // secure web documents - privateweb
@@ -254,9 +259,10 @@ 
     $ds = mysqli_query($sqlParser->conn,$sql);
     if(!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
-    }
-    else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
+    } else {
+        while($r = mysqli_fetch_assoc($ds)) {
+            $ids[]=$r["id"];
+        }
         if(count($ids)>0) {
             mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",$ids).")");
             unset($ids);
@@ -273,9 +279,10 @@ 
     $ds = mysqli_query($sqlParser->conn,$sql);
     if(!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
-    }
-    else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
+    } else {
+        while($r = mysqli_fetch_assoc($ds)) {
+            $ids[]=$r["id"];
+        }
         if(count($ids)>0) {
             mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",$ids).")");
             unset($ids);
@@ -283,7 +290,8 @@ 
     }
 }
 
-function parse_docblock($element_dir, $filename) {
+function parse_docblock($element_dir, $filename)
+{
     $params = array();
     $fullpath = $element_dir . '/' . $filename;
     if(is_readable($fullpath)) {

Indentation +64 added lines, -64 removed lines

@@ -170,70 +170,70 @@
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
-		if ((int)$params['shareparams'] || !empty($params['dependencies'])) {
-			$dependencies = explode(',', $params['dependencies']);
-			foreach ($dependencies as $dependency) {
-				$dependency = explode(':', $dependency);
-				switch (trim($dependency[0])) {
-					case 'template':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'templates',
-							'column' => 'templatename',
-							'type' => 50,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'tv':
-					case 'tmplvar':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'tmplvars',
-							'column' => 'name',
-							'type' => 60,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'chunk':
-					case 'htmlsnippet':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'htmlsnippets',
-							'column' => 'name',
-							'type' => 10,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'snippet':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'snippets',
-							'column' => 'name',
-							'type' => 40,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'plugin':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'plugins',
-							'column' => 'name',
-							'type' => 30,
-							'name' => trim($dependency[1])
-						);
-						break;
-					case 'resource':
-						$mdp[] = array(
-							'module' => $params['name'],
-							'table' => 'content',
-							'column' => 'pagetitle',
-							'type' => 20,
-							'name' => trim($dependency[1])
-						);
-						break;
-				}
-			}
-		}
+        if ((int)$params['shareparams'] || !empty($params['dependencies'])) {
+            $dependencies = explode(',', $params['dependencies']);
+            foreach ($dependencies as $dependency) {
+                $dependency = explode(':', $dependency);
+                switch (trim($dependency[0])) {
+                    case 'template':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'templates',
+                            'column' => 'templatename',
+                            'type' => 50,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'tv':
+                    case 'tmplvar':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'tmplvars',
+                            'column' => 'name',
+                            'type' => 60,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'chunk':
+                    case 'htmlsnippet':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'htmlsnippets',
+                            'column' => 'name',
+                            'type' => 10,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'snippet':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'snippets',
+                            'column' => 'name',
+                            'type' => 40,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'plugin':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'plugins',
+                            'column' => 'name',
+                            'type' => 30,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                    case 'resource':
+                        $mdp[] = array(
+                            'module' => $params['name'],
+                            'table' => 'content',
+                            'column' => 'pagetitle',
+                            'type' => 20,
+                            'name' => trim($dependency[1])
+                        );
+                        break;
+                }
+            }
+        }
     }
     $d->close();
 }

Spacing +65 added lines, -66 removed lines

@@ -1,33 +1,32 @@ 
 <?php
 //:: EVO Installer Setup file
 //:::::::::::::::::::::::::::::::::::::::::
-if (is_file($base_path . 'assets/cache/siteManager.php')) {
-    include_once($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')) define('MGR_DIR', 'manager');
+if (!defined('MGR_DIR')) define('MGR_DIR', 'manager');
 
 require_once('../'.MGR_DIR.'/includes/version.inc.php');
 
-$chunkPath    = $base_path .'install/assets/chunks';
-$snippetPath  = $base_path .'install/assets/snippets';
-$pluginPath   = $base_path .'install/assets/plugins';
-$modulePath   = $base_path .'install/assets/modules';
-$templatePath = $base_path .'install/assets/templates';
-$tvPath = $base_path .'install/assets/tvs';
+$chunkPath    = $base_path.'install/assets/chunks';
+$snippetPath  = $base_path.'install/assets/snippets';
+$pluginPath   = $base_path.'install/assets/plugins';
+$modulePath   = $base_path.'install/assets/modules';
+$templatePath = $base_path.'install/assets/templates';
+$tvPath = $base_path.'install/assets/tvs';
 
 // setup Template template files - array : name, description, type - 0:file or 1:content, parameters, category
 $mt = &$moduleTemplates;
-if(is_dir($templatePath) && is_readable($templatePath)) {
+if (is_dir($templatePath) && is_readable($templatePath)) {
     $d = dir($templatePath);
     while (false !== ($tplfile = $d->read()))
     {
-        if(substr($tplfile, -4) != '.tpl') continue;
+        if (substr($tplfile, -4) != '.tpl') continue;
         $params = parse_docblock($templatePath, $tplfile);
-        if(is_array($params) && (count($params)>0))
+        if (is_array($params) && (count($params) > 0))
         {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
-            $mt[] = array
-            (
+            $mt[] = array(
                 $params['name'],
                 $description,
                 // Don't think this is gonna be used ... but adding it just in case 'type'
@@ -45,12 +44,12 @@ 
 
 // setup Template Variable template files
 $mtv = &$moduleTVs;
-if(is_dir($tvPath) && is_readable($tvPath)) {
+if (is_dir($tvPath) && is_readable($tvPath)) {
     $d = dir($tvPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') continue;
+        if (substr($tplfile, -4) != '.tpl') continue;
         $params = parse_docblock($tvPath, $tplfile);
-        if(is_array($params) && (count($params)>0)) {
+        if (is_array($params) && (count($params) > 0)) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mtv[] = array(
                 $params['name'],
@@ -62,9 +61,9 @@ 
                 $params['output_widget'],
                 $params['output_widget_params'],
                 "$templatePath/{$params['filename']}", /* not currently used */
-                $params['template_assignments']!="*"?$params['template_assignments']:implode(",",array_map(create_function('$v','return $v[0];'),$mt)), /* comma-separated list of template names */
+                $params['template_assignments'] != "*" ? $params['template_assignments'] : implode(",", array_map(create_function('$v', 'return $v[0];'), $mt)), /* comma-separated list of template names */
                 $params['modx_category'],
-                $params['lock_tv'],  /* value should be 1 or 0 */
+                $params['lock_tv'], /* value should be 1 or 0 */
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
@@ -74,14 +73,14 @@ 
 
 // setup chunks template files - array : name, description, type - 0:file or 1:content, file or content
 $mc = &$moduleChunks;
-if(is_dir($chunkPath) && is_readable($chunkPath)) {
+if (is_dir($chunkPath) && is_readable($chunkPath)) {
     $d = dir($chunkPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($chunkPath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $mc[] = array(
                 $params['name'],
                 $params['description'],
@@ -97,14 +96,14 @@ 
 
 // setup snippets template files - array : name, description, type - 0:file or 1:content, file or content,properties
 $ms = &$moduleSnippets;
-if(is_dir($snippetPath) && is_readable($snippetPath)) {
+if (is_dir($snippetPath) && is_readable($snippetPath)) {
     $d = dir($snippetPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($snippetPath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $ms[] = array(
                 $params['name'],
@@ -121,14 +120,14 @@ 
 
 // setup plugins template files - array : name, description, type - 0:file or 1:content, file or content,properties
 $mp = &$modulePlugins;
-if(is_dir($pluginPath) && is_readable($pluginPath)) {
+if (is_dir($pluginPath) && is_readable($pluginPath)) {
     $d = dir($pluginPath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($pluginPath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mp[] = array(
                 $params['name'],
@@ -140,7 +139,7 @@ 
                 $params['modx_category'],
                 $params['legacy_names'],
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false,
-                (int)$params['disabled']
+                (int) $params['disabled']
             );
         }
     }
@@ -150,14 +149,14 @@ 
 // setup modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid,enable_sharedparams
 $mm = &$moduleModules;
 $mdp = &$moduleDependencies;
-if(is_dir($modulePath) && is_readable($modulePath)) {
+if (is_dir($modulePath) && is_readable($modulePath)) {
     $d = dir($modulePath);
     while (false !== ($tplfile = $d->read())) {
-        if(substr($tplfile, -4) != '.tpl') {
+        if (substr($tplfile, -4) != '.tpl') {
             continue;
         }
         $params = parse_docblock($modulePath, $tplfile);
-        if(is_array($params) && count($params) > 0) {
+        if (is_array($params) && count($params) > 0) {
             $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}";
             $mm[] = array(
                 $params['name'],
@@ -165,12 +164,12 @@ 
                 "$modulePath/{$params['filename']}",
                 $params['properties'],
                 $params['guid'],
-                (int)$params['shareparams'],
+                (int) $params['shareparams'],
                 $params['modx_category'],
                 array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false
             );
         }
-		if ((int)$params['shareparams'] || !empty($params['dependencies'])) {
+		if ((int) $params['shareparams'] || !empty($params['dependencies'])) {
 			$dependencies = explode(',', $params['dependencies']);
 			foreach ($dependencies as $dependency) {
 				$dependency = explode(':', $dependency);
@@ -241,103 +240,103 @@ 
 // setup callback function
 $callBackFnc = "clean_up";
 
-function clean_up($sqlParser) {
+function clean_up($sqlParser){
     $ids = array();
 
     // secure web documents - privateweb
-    mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1");
-    $sql =  "SELECT DISTINCT sc.id
+    mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1");
+    $sql = "SELECT DISTINCT sc.id
              FROM `".$sqlParser->prefix."site_content` sc
              LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id
              LEFT JOIN `".$sqlParser->prefix."webgroup_access` wga ON wga.documentgroup = dg.document_group
              WHERE wga.id>0";
-    $ds = mysqli_query($sqlParser->conn,$sql);
-    if(!$ds) {
+    $ds = mysqli_query($sqlParser->conn, $sql);
+    if (!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
     }
     else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
-        if(count($ids)>0) {
-            mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",$ids).")");
+        while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"];
+        if (count($ids) > 0) {
+            mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ", $ids).")");
             unset($ids);
         }
     }
 
     // secure manager documents privatemgr
-    mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1");
-    $sql =  "SELECT DISTINCT sc.id
+    mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1");
+    $sql = "SELECT DISTINCT sc.id
              FROM `".$sqlParser->prefix."site_content` sc
              LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id
              LEFT JOIN `".$sqlParser->prefix."membergroup_access` mga ON mga.documentgroup = dg.document_group
              WHERE mga.id>0";
-    $ds = mysqli_query($sqlParser->conn,$sql);
-    if(!$ds) {
+    $ds = mysqli_query($sqlParser->conn, $sql);
+    if (!$ds) {
         echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn);
     }
     else {
-        while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"];
-        if(count($ids)>0) {
-            mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",$ids).")");
+        while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"];
+        if (count($ids) > 0) {
+            mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ", $ids).")");
             unset($ids);
         }
     }
 }
 
-function parse_docblock($element_dir, $filename) {
+function parse_docblock($element_dir, $filename){
     $params = array();
-    $fullpath = $element_dir . '/' . $filename;
-    if(is_readable($fullpath)) {
+    $fullpath = $element_dir.'/'.$filename;
+    if (is_readable($fullpath)) {
         $tpl = @fopen($fullpath, "r");
-        if($tpl) {
+        if ($tpl) {
             $params['filename'] = $filename;
             $docblock_start_found = false;
             $name_found = false;
             $description_found = false;
 
-            while(!feof($tpl)) {
+            while (!feof($tpl)) {
                 $line = fgets($tpl);
-                if(!$docblock_start_found) {
+                if (!$docblock_start_found) {
                     // find docblock start
-                    if(strpos($line, '/**') !== false) {
+                    if (strpos($line, '/**') !== false) {
                         $docblock_start_found = true;
                     }
                     continue;
-                } elseif(!$name_found) {
+                } elseif (!$name_found) {
                     // find name
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
                         $params['name'] = trim($ma[1]);
                         $name_found = !empty($params['name']);
                     }
                     continue;
-                } elseif(!$description_found) {
+                } elseif (!$description_found) {
                     // find description
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) {
                         $params['description'] = trim($ma[1]);
                         $description_found = !empty($params['description']);
                     }
                     continue;
                 } else {
                     $ma = null;
-                    if(preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) {
+                    if (preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) {
                         $param = trim($ma[1]);
                         $val = trim($ma[2]);
-                        if(!empty($param) && !empty($val)) {
-                            if($param == 'internal') {
+                        if (!empty($param) && !empty($val)) {
+                            if ($param == 'internal') {
                                 $ma = null;
-                                if(preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) {
+                                if (preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) {
                                     $param = trim($ma[1]);
                                     $val = trim($ma[2]);
                                 }
                                 //if($val !== '0' && (empty($param) || empty($val))) {
-                                if(empty($param)) {
+                                if (empty($param)) {
                                     continue;
                                 }
                             }
                             $params[$param] = $val;
                         }
-                    } elseif(preg_match("/^\s*\*\/\s*$/", $line)) {
+                    } elseif (preg_match("/^\s*\*\/\s*$/", $line)) {
                         break;
                     }
                 }

install/actions/action_install.php

Indentation +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
 <form name="install" id="install_form" action="index.php?action=options" method="post">
 <?php
 if ($errors == 0) {
-	// check if install folder is removeable
+    // check if install folder is removeable
     if (is_writable("../install")) { ?>
 <span id="removeinstall" style="float:left;cursor:pointer;color:#505050;line-height:18px;" onclick="var chk=document.install.rminstaller; if(chk) chk.checked=!chk.checked;"><input type="checkbox" name="rminstaller" onclick="event.cancelBubble=true;" <?php echo (empty ($errors) ? 'checked="checked"' : '') ?> style="cursor:default;" /><?php echo $_lang['remove_install_folder_auto'] ?></span>
 <?php 

Spacing +2 added lines, -2 removed lines

@@ -43,10 +43,10 @@
 	var chk = document.install.rminstaller;
 	if(chk && chk.checked) {
 		// remove install folder and files
-		window.location.href = "../<?php echo MGR_DIR;?>/processors/remove_installer.processor.php?rminstall=1";
+		window.location.href = "../<?php echo MGR_DIR; ?>/processors/remove_installer.processor.php?rminstall=1";
 	}
 	else {
-		window.location.href = "../<?php echo MGR_DIR;?>/";
+		window.location.href = "../<?php echo MGR_DIR; ?>/";
 	}
 }
 /* ]]> */

install/connection.databasetest.php

Indentation +2 added lines, -2 removed lines

@@ -8,10 +8,10 @@
 $self = 'install/connection.databasetest.php';
 $base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
-	include_once("{$base_path}assets/cache/siteManager.php");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR','manager');
+    define('MGR_DIR','manager');
 }
 require_once("lang.php");
 

Spacing +4 added lines, -4 removed lines

@@ -6,12 +6,12 @@ 
 $installMode = $_POST['installMode'];
 
 $self = 'install/connection.databasetest.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 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")) {
-	define('MGR_DIR','manager');
+if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
+	define('MGR_DIR', 'manager');
 }
 require_once("lang.php");
 
@@ -31,7 +31,7 @@ 
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $query = "CREATE DATABASE `".$database_name."` CHARACTER SET ".$database_charset." COLLATE ".$database_collation.";";
 
-        if (! mysqli_query($conn, $query)){
+        if (!mysqli_query($conn, $query)) {
             $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_could_not_create_database'].'</span>';
         }
         else {

Braces +6 added lines, -11 removed lines

@@ -18,8 +18,7 @@ 
 $output = $_lang["status_checking_database"];
 if (!$conn = mysqli_connect($host, $uid, $pwd)) {
     $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed'].'</span>';
-}
-else {
+} else {
     $database_name = mysqli_real_escape_string($conn, $_POST['database_name']);
     $database_name = str_replace("`", "", $database_name);
     $tableprefix = mysqli_real_escape_string($conn, $_POST['tableprefix']);
@@ -31,20 +30,16 @@ 
         $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
         $query = "CREATE DATABASE `".$database_name."` CHARACTER SET ".$database_charset." COLLATE ".$database_collation.";";
 
-        if (! mysqli_query($conn, $query)){
+        if (! mysqli_query($conn, $query)) {
             $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_could_not_create_database'].'</span>';
-        }
-        else {
+        } else {
             $output .= '<span id="database_pass" style="color:#80c000;">'.$_lang['status_passed_database_created'].'</span>';
         }
-    }
-    elseif (($installMode == 0) && (mysqli_query($conn, "SELECT COUNT(*) FROM {$database_name}.`{$tableprefix}site_content`"))) {
+    } elseif (($installMode == 0) && (mysqli_query($conn, "SELECT COUNT(*) FROM {$database_name}.`{$tableprefix}site_content`"))) {
         $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_table_prefix_already_in_use'].'</span>';
-    }
-    elseif (($database_connection_method != 'SET NAMES') && ($rs = mysqli_query($conn, "show variables like 'collation_database'")) && ($row = mysqli_fetch_row($rs)) && ($row[1] != $database_collation)) {
+    } elseif (($database_connection_method != 'SET NAMES') && ($rs = mysqli_query($conn, "show variables like 'collation_database'")) && ($row = mysqli_fetch_row($rs)) && ($row[1] != $database_collation)) {
         $output .= '<span id="database_fail" style="color:#FF0000;">'.sprintf($_lang['status_failed_database_collation_does_not_match'], $row[1]).'</span>';
-    }
-    else {
+    } else {
         $output .= '<span id="database_pass" style="color:#80c000;">'.$_lang['status_passed'].'</span>';
     }
 }

install/index.php

Indentation +2 added lines, -2 removed lines

@@ -16,10 +16,10 @@
 error_reporting(E_ALL & ~E_NOTICE & ~E_STRICT & ~E_DEPRECATED);
 
 if (is_file("{$base_path}assets/cache/siteManager.php")) {
-	include_once("{$base_path}assets/cache/siteManager.php");
+    include_once("{$base_path}assets/cache/siteManager.php");
 }
 if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) {
-	define('MGR_DIR', 'manager');
+    define('MGR_DIR', 'manager');
 }
 
 

Spacing +13 added lines, -13 removed lines

@@ -9,7 +9,7 @@ 
 }
 
 $self = 'install/index.php';
-$base_path = str_replace($self,'',str_replace('\\','/', __FILE__));
+$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__));
 require_once("{$base_path}install/functions.php");
 
 // set error reporting
@@ -18,7 +18,7 @@ 
 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');
 }
 
@@ -38,26 +38,26 @@ 
 $moduleSQLDataFile = "setup.data.sql";
 $moduleSQLResetFile = "setup.data.reset.sql";
 
-$moduleChunks = array (); // chunks - array : name, description, type - 0:file or 1:content, file or content
-$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content
-$moduleSnippets = array (); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties
-$modulePlugins = array (); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid
-$moduleModules = array (); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid
-$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content,properties
-$moduleTVs = array (); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties
+$moduleChunks = array(); // chunks - array : name, description, type - 0:file or 1:content, file or content
+$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content
+$moduleSnippets = array(); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties
+$modulePlugins = array(); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid
+$moduleModules = array(); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid
+$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content,properties
+$moduleTVs = array(); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties
 $moduleDependencies = array(); // module depedencies - array : module, table, column, type, name
 
-$errors= 0;
+$errors = 0;
 
 // get post back status
 $isPostBack = (count($_POST));
 
 $ph = ph();
-$ph = array_merge($ph,$_lang);
+$ph = array_merge($ph, $_lang);
 $ph['install_language'] = $install_language;
 
 ob_start();
-$action= isset ($_GET['action']) ? trim(strip_tags($_GET['action'])) : 'language';
+$action = isset ($_GET['action']) ? trim(strip_tags($_GET['action'])) : 'language';
 if (!@include_once("actions/action_{$action}.php")) {
     die ("Invalid install action attempted. [action={$action}]");
 }
@@ -65,5 +65,5 @@ 
 ob_end_clean();
 
 $tpl = file_get_contents("{$base_path}install/template.tpl");
-echo parse($tpl,$ph);
+echo parse($tpl, $ph);
 

install/instprocessor.php

Upper-Lower-Casing +9 added lines, -9 removed lines

@@ -238,7 +238,7 @@ 
 }
 
 // write $somecontent to our opened file.
-if (@ fwrite($handle, $configString) === FALSE) {
+if (@ fwrite($handle, $configString) === false) {
     $configFileFailed = true;
 }
 @ fclose($handle);
@@ -326,7 +326,7 @@ 
                 $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name'");
 
                 if (mysqli_num_rows($rs)) {
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked'  WHERE templatename='$name' LIMIT 1;")) {
+                    if (!mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked'  WHERE templatename='$name' LIMIT 1;")) {
                         $errors += 1;
                         echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
                         return;
@@ -382,7 +382,7 @@ 
             if (mysqli_num_rows($rs)) {
                 $insert = true;
                 while($row = mysqli_fetch_assoc($rs)) {
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};")) {
+                    if (!mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};")) {
                         echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
                         return;
                     }
@@ -458,7 +458,7 @@ 
                 }
                 $update = $count_original_name > 0 && $overwrite == 'true';
                 if ($update) {
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) {
+                    if (!mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) {
                         $errors += 1;
                         echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
                         return;
@@ -508,7 +508,7 @@ 
                 if (mysqli_num_rows($rs)) {
                     $row = mysqli_fetch_assoc($rs);
                     $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) {
+                    if (!mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) {
                         echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
                         return;
                     }
@@ -552,7 +552,7 @@ 
 
                 // disable legacy versions based on legacy_names provided
                 if(!empty($leg_names)) {
-                    $update_query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);";
+                    $update_query = "update $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);";
                     $rs = mysqli_query($sqlParser->conn, $update_query);
                 }
 
@@ -568,13 +568,13 @@ 
                     while($row = mysqli_fetch_assoc($rs)) {
                         $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
                         if($row['description'] == $desc){
-                            if (! mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
+                            if (! mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
                                 echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
                                 return;
                             }
                             $insert = false;
                         } else {
-                            if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) {
+                            if (!mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) {
                                 echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                                 return;
                             }
@@ -639,7 +639,7 @@ 
                 if (mysqli_num_rows($rs)) {
                     $row = mysqli_fetch_assoc($rs);
                     $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) {
+                    if (!mysqli_query($sqlParser->conn, "update $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) {
                         echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
                         return;
                     }

Indentation +64 added lines, -64 removed lines

@@ -85,7 +85,7 @@ 
     echo "<span class=\"notok\" style='color:#707070'>".$_lang['setup_database_selection_failed']."</span>".$_lang['setup_database_selection_failed_note']."</p>";
     $create = true;
 } else {
-	if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_charset);
+    if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_charset);
     mysqli_query($conn, "{$database_connection_method} {$database_connection_charset}");
     echo '<span class="ok">'.$_lang['ok']."</span></p>";
 }
@@ -280,23 +280,23 @@ 
 
 // Reset database for installation of demo-site
 if ($installData && $moduleSQLDataFile && $moduleSQLResetFile) {
-	echo "<p>" . $_lang['resetting_database'];
-	$sqlParser->process($moduleSQLResetFile);
-	// display database results
-	if ($sqlParser->installFailed == true) {
-		$errors += 1;
-		echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>";
-		echo "<p>" . $_lang['setup_couldnt_install'] . "</p>";
-		echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />";
-		for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
-			echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />";
-		}
-		echo "</p>";
-		echo "<p>" . $_lang['some_tables_not_updated'] . "</p>";
-		return;
-	} else {
-		echo '<span class="ok">'.$_lang['ok']."</span></p>";
-	}
+    echo "<p>" . $_lang['resetting_database'];
+    $sqlParser->process($moduleSQLResetFile);
+    // display database results
+    if ($sqlParser->installFailed == true) {
+        $errors += 1;
+        echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>";
+        echo "<p>" . $_lang['setup_couldnt_install'] . "</p>";
+        echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />";
+        for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
+            echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />";
+        }
+        echo "</p>";
+        echo "<p>" . $_lang['some_tables_not_updated'] . "</p>";
+        return;
+    } else {
+        echo '<span class="ok">'.$_lang['ok']."</span></p>";
+    }
 }
 
 // Install Templates
@@ -418,7 +418,7 @@ 
                         $tRow = mysqli_fetch_assoc($ts);
                         $templateId = $tRow['id'];
                         mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)");
-                   }
+                    }
                 }
             }
         }
@@ -687,51 +687,51 @@ 
 
 // Install Dependencies
 foreach ($moduleDependencies as $dependency) {
-	$ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_modules` WHERE name="' . $dependency['module'] . '"');
-	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
-		return;
-	} else {
-		$row = mysqli_fetch_assoc($ds);
-		$moduleId = $row["id"];
-		$moduleGuid = $row["guid"];
-	}
-	// get extra id
-	$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE ' . $dependency['column'] . '="' . $dependency['name'] . '"');
-	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
-		return;
-	} else {
-		$row = mysqli_fetch_assoc($ds);
-		$extraId = $row["id"];
-	}
-	// setup extra as module dependency
-	$ds = mysqli_query($sqlParser->conn, 'SELECT module FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type'] . ' LIMIT 1');
-	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
-		return;
-	} else {
-		if (mysqli_num_rows($ds) === 0) {
-			mysqli_query($sqlParser->conn, 'INSERT INTO ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` (module, resource, type) VALUES(' . $moduleId . ',' . $extraId . ',' . $dependency['type'] . ')');
-			echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_create'] . '</span></p>';
-		} else {
-			mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` SET module = ' . $moduleId . ', resource = ' . $extraId . ', type = ' . $dependency['type'] . ' WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type']);
-			echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_update'] . '</span></p>';
-		}
-		if ($dependency['type'] == 30 || $dependency['type'] == 40) {
-			// set extra guid for plugins and snippets
-			$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE id=' . $extraId . ' LIMIT 1');
-			if (!$ds) {
-				echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
-				return;
-			} else {
-				if (mysqli_num_rows($ds) != 0) {
-					mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` SET moduleguid = ' . $moduleGuid . ' WHERE id=' . $extraId);
-					echo '<p>&nbsp;&nbsp;' . $dependency['name'] . ': <span class="ok">' . $_lang['guid_set'] . '</span></p>';
-				}
-			}
-		}
-	}
+    $ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_modules` WHERE name="' . $dependency['module'] . '"');
+    if (!$ds) {
+        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+        return;
+    } else {
+        $row = mysqli_fetch_assoc($ds);
+        $moduleId = $row["id"];
+        $moduleGuid = $row["guid"];
+    }
+    // get extra id
+    $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE ' . $dependency['column'] . '="' . $dependency['name'] . '"');
+    if (!$ds) {
+        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+        return;
+    } else {
+        $row = mysqli_fetch_assoc($ds);
+        $extraId = $row["id"];
+    }
+    // setup extra as module dependency
+    $ds = mysqli_query($sqlParser->conn, 'SELECT module FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type'] . ' LIMIT 1');
+    if (!$ds) {
+        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+        return;
+    } else {
+        if (mysqli_num_rows($ds) === 0) {
+            mysqli_query($sqlParser->conn, 'INSERT INTO ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` (module, resource, type) VALUES(' . $moduleId . ',' . $extraId . ',' . $dependency['type'] . ')');
+            echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_create'] . '</span></p>';
+        } else {
+            mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` SET module = ' . $moduleId . ', resource = ' . $extraId . ', type = ' . $dependency['type'] . ' WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type']);
+            echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_update'] . '</span></p>';
+        }
+        if ($dependency['type'] == 30 || $dependency['type'] == 40) {
+            // set extra guid for plugins and snippets
+            $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE id=' . $extraId . ' LIMIT 1');
+            if (!$ds) {
+                echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                return;
+            } else {
+                if (mysqli_num_rows($ds) != 0) {
+                    mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` SET moduleguid = ' . $moduleGuid . ' WHERE id=' . $extraId);
+                    echo '<p>&nbsp;&nbsp;' . $dependency['name'] . ': <span class="ok">' . $_lang['guid_set'] . '</span></p>';
+                }
+            }
+        }
+    }
 }
 
 // call back function

Braces +61 added lines, -38 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 if (file_exists(dirname(__FILE__)."/../assets/cache/siteManager.php")) {
     include_once(dirname(__FILE__)."/../assets/cache/siteManager.php");
-}else{
+} else {
     define('MGR_DIR', 'manager');
 }
 
@@ -58,13 +58,15 @@ 
 
 // get base path and url
 $a = explode("install", str_replace("\\", "/", dirname($_SERVER["PHP_SELF"])));
-if (count($a) > 1)
+if (count($a) > 1) {
     array_pop($a);
+}
 $url = implode("install", $a);
 reset($a);
 $a = explode("install", str_replace("\\", "/", realpath(dirname(__FILE__))));
-if (count($a) > 1)
+if (count($a) > 1) {
     array_pop($a);
+}
 $pth = implode("install", $a);
 unset ($a);
 $base_url = $url . (substr($url, -1) != "/" ? "/" : "");
@@ -85,7 +87,9 @@ 
     echo "<span class=\"notok\" style='color:#707070'>".$_lang['setup_database_selection_failed']."</span>".$_lang['setup_database_selection_failed_note']."</p>";
     $create = true;
 } else {
-	if (function_exists('mysqli_set_charset')) mysqli_set_charset($conn, $database_charset);
+	if (function_exists('mysqli_set_charset')) {
+	    mysqli_set_charset($conn, $database_charset);
+	}
     mysqli_query($conn, "{$database_connection_method} {$database_connection_charset}");
     echo '<span class="ok">'.$_lang['ok']."</span></p>";
 }
@@ -127,7 +131,8 @@ 
 if(!function_exists('parseProperties')) {
     // parses a resource property string and returns the result as an array
     // duplicate of method in documentParser class
-    function parseProperties($propertyString) {
+    function parseProperties($propertyString)
+    {
         $parameter= array ();
         if (!empty ($propertyString)) {
             $tmpParams= explode("&", $propertyString);
@@ -135,11 +140,14 @@ 
                 if (strpos($tmpParams[$x], '=', 0)) {
                     $pTmp= explode("=", $tmpParams[$x]);
                     $pvTmp= explode(";", trim($pTmp[1]));
-                    if ($pvTmp[1] == 'list' && $pvTmp[3] != "")
-                        $parameter[trim($pTmp[0])]= $pvTmp[3]; //list default
+                    if ($pvTmp[1] == 'list' && $pvTmp[3] != "") {
+                                            $parameter[trim($pTmp[0])]= $pvTmp[3];
+                    }
+                    //list default
                     else
-                        if ($pvTmp[1] != 'list' && $pvTmp[2] != "")
-                            $parameter[trim($pTmp[0])]= $pvTmp[2];
+                        if ($pvTmp[1] != 'list' && $pvTmp[2] != "") {
+                                                    $parameter[trim($pTmp[0])]= $pvTmp[2];
+                        }
                 }
             }
         }
@@ -210,7 +218,7 @@ 
 // custom or not
 if (file_exists(dirname(__FILE__)."/../../assets/cache/siteManager.php")) {
     $mgrdir = 'include_once(dirname(__FILE__)."/../../assets/cache/siteManager.php");';
-}else{
+} else {
     $mgrdir = 'define(\'MGR_DIR\', \'manager\');';
 }
 
@@ -346,7 +354,9 @@ 
                         echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
                         return;
                     }
-                    if(!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
+                    if(!is_null($save_sql_id_as)) {
+                        $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
+                    }
                     echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
                 }
             }
@@ -440,9 +450,9 @@ 
             $overwrite = mysqli_real_escape_string($conn, $moduleChunk[4]);
             $filecontent = $moduleChunk[2];
 
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // Create the category if it does not already exist
                 $category_id = getCreateDbCategory($category, $sqlParser);
@@ -494,9 +504,9 @@ 
             $guid = mysqli_real_escape_string($conn, $moduleModule[4]);
             $shared = mysqli_real_escape_string($conn, $moduleModule[5]);
             $category = mysqli_real_escape_string($conn, $moduleModule[6]);
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // Create the category if it does not already exist
                 $category = getCreateDbCategory($category, $sqlParser);
@@ -546,9 +556,9 @@ 
                 // parse comma-separated legacy names and prepare them for sql IN clause
                 $leg_names = "'" . implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7]))) . "'";
             }
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // disable legacy versions based on legacy_names provided
                 if(!empty($leg_names)) {
@@ -567,7 +577,7 @@ 
                     $insert = true;
                     while($row = mysqli_fetch_assoc($rs)) {
                         $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                        if($row['description'] == $desc){
+                        if($row['description'] == $desc) {
                             if (! mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
                                 echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
                                 return;
@@ -625,9 +635,9 @@ 
             $filecontent = $moduleSnippet[2];
             $properties = $moduleSnippet[3];
             $category = mysqli_real_escape_string($conn, $moduleSnippet[4]);
-            if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
-            else {
+            if (!file_exists($filecontent)) {
+                            echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+            } else {
 
                 // Create the category if it does not already exist
                 $category = getCreateDbCategory($category, $sqlParser);
@@ -735,13 +745,16 @@ 
 }
 
 // call back function
-if ($callBackFnc != "")
+if ($callBackFnc != "") {
     $callBackFnc ($sqlParser);
+}
 
 // Setup the MODX API -- needed for the cache processor
 define('MODX_API_MODE', true);
 define('MODX_BASE_PATH', $base_path);
-if (!defined('MODX_MANAGER_PATH')) define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/');
+if (!defined('MODX_MANAGER_PATH')) {
+    define('MODX_MANAGER_PATH', $base_path.MGR_DIR.'/');
+}
 $database_type = 'mysqli';
 // initiate a new document parser
 include_once('../'.MGR_DIR.'/includes/document.parser.class.inc.php');
@@ -780,11 +793,12 @@ 
 }
 
 // Property Update function
-function propUpdate($new,$old){
+function propUpdate($new,$old)
+{
     $newArr = parseProperties($new);
     $oldArr = parseProperties($old);
-    foreach ($oldArr as $k => $v){
-        if (isset($v['0']['options'])){
+    foreach ($oldArr as $k => $v) {
+        if (isset($v['0']['options'])) {
             $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options'];
         }
     }
@@ -794,12 +808,17 @@ 
     return $return;
 }
 
-function parseProperties($propertyString, $json=false) {
+function parseProperties($propertyString, $json=false)
+{
     $propertyString = str_replace('{}', '', $propertyString );
     $propertyString = str_replace('} {', ',', $propertyString );
 
-    if(empty($propertyString)) return array();
-    if($propertyString=='{}' || $propertyString=='[]') return array();
+    if(empty($propertyString)) {
+        return array();
+    }
+    if($propertyString=='{}' || $propertyString=='[]') {
+        return array();
+    }
 
     $jsonFormat = isJson($propertyString, true);
     $property = array();
@@ -841,7 +860,7 @@ 
 
         }
     // new json-format
-    } else if(!empty($jsonFormat)){
+    } else if(!empty($jsonFormat)) {
         $property = $jsonFormat;
     }
     if ($json) {
@@ -851,12 +870,14 @@ 
     return $property;
 }
 
-function isJson($string, $returnData=false) {
+function isJson($string, $returnData=false)
+{
     $data = json_decode($string, true);
     return (json_last_error() == JSON_ERROR_NONE) ? ($returnData ? $data : true) : false;
 }
 
-function getCreateDbCategory($category, $sqlParser) {
+function getCreateDbCategory($category, $sqlParser)
+{
     $dbase = $sqlParser->dbname;
     $dbase = '`' . trim($dbase,'`') . '`';
     $table_prefix = $sqlParser->prefix;
@@ -878,7 +899,8 @@ 
 }
 
 // Remove installer Docblock only from components using plugin FileSource / fileBinding
-function removeDocblock($code, $type) {
+function removeDocblock($code, $type)
+{
 
     $cleaned = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', $code, 1);
 
@@ -899,8 +921,9 @@ 
         default:
             return $cleaned;
     };
-    if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/')
-        return $cleaned;
+    if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/') {
+            return $cleaned;
+    }
 
     // fileBinding not found - return code incl docblock
     return $code;

Spacing +183 added lines, -183 removed lines

@@ -1,7 +1,7 @@ 
 <?php
 if (file_exists(dirname(__FILE__)."/../assets/cache/siteManager.php")) {
     include_once(dirname(__FILE__)."/../assets/cache/siteManager.php");
-}else{
+} else {
     define('MGR_DIR', 'manager');
 }
 
@@ -28,7 +28,7 @@ 
 
 echo "<p>{$_lang['setup_database']}</p>\n";
 
-$installMode= (int)$_POST['installmode'];
+$installMode = (int) $_POST['installmode'];
 $installData = $_POST['installdata'] == "1" ? 1 : 0;
 
 //if ($installMode == 1) {
@@ -42,7 +42,7 @@ 
 $database_charset = substr($database_collation, 0, strpos($database_collation, '_'));
 $database_connection_charset = $_POST['database_connection_charset'];
 $database_connection_method = $_POST['database_connection_method'];
-$dbase = "`" . $_POST['database_name'] . "`";
+$dbase = "`".$_POST['database_name']."`";
 $table_prefix = $_POST['tableprefix'];
 $adminname = $_POST['cmsadmin'];
 $adminemail = $_POST['cmsadminemail'];
@@ -53,7 +53,7 @@ 
 
 // set session name variable
 if (!isset ($site_sessionname)) {
-    $site_sessionname = 'SN' . uniqid('');
+    $site_sessionname = 'SN'.uniqid('');
 }
 
 // get base path and url
@@ -67,11 +67,11 @@ 
     array_pop($a);
 $pth = implode("install", $a);
 unset ($a);
-$base_url = $url . (substr($url, -1) != "/" ? "/" : "");
-$base_path = $pth . (substr($pth, -1) != "/" ? "/" : "");
+$base_url = $url.(substr($url, -1) != "/" ? "/" : "");
+$base_path = $pth.(substr($pth, -1) != "/" ? "/" : "");
 
 // connect to the database
-echo "<p>". $_lang['setup_database_create_connection'];
+echo "<p>".$_lang['setup_database_create_connection'];
 if (!$conn = mysqli_connect($database_server, $database_user, $database_password)) {
     echo '<span class="notok">'.$_lang["setup_database_create_connection_failed"]."</span></p><p>".$_lang['setup_database_create_connection_failed_note']."</p>";
     return;
@@ -80,7 +80,7 @@ 
 }
 
 // select database
-echo "<p>".$_lang['setup_database_selection']. str_replace("`", "", $dbase) . "`: ";
+echo "<p>".$_lang['setup_database_selection'].str_replace("`", "", $dbase)."`: ";
 if (!mysqli_select_db($conn, str_replace("`", "", $dbase))) {
     echo "<span class=\"notok\" style='color:#707070'>".$_lang['setup_database_selection_failed']."</span>".$_lang['setup_database_selection_failed_note']."</p>";
     $create = true;
@@ -92,9 +92,9 @@ 
 
 // try to create the database
 if ($create) {
-    echo "<p>".$_lang['setup_database_creation']. str_replace("`", "", $dbase) . "`: ";
+    echo "<p>".$_lang['setup_database_creation'].str_replace("`", "", $dbase)."`: ";
     //	if(!@mysqli_create_db(str_replace("`","",$dbase), $conn)) {
-    if (! mysqli_query($conn, "CREATE DATABASE $dbase DEFAULT CHARACTER SET $database_charset COLLATE $database_collation")) {
+    if (!mysqli_query($conn, "CREATE DATABASE $dbase DEFAULT CHARACTER SET $database_charset COLLATE $database_collation")) {
         echo '<span class="notok">'.$_lang['setup_database_creation_failed']."</span>".$_lang['setup_database_creation_failed_note']."</p>";
         $errors += 1;
 ?>
@@ -113,33 +113,33 @@ 
 
 // check table prefix
 if ($installMode == 0) {
-    echo "<p>" . $_lang['checking_table_prefix'] . $table_prefix . "`: ";
-    if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) {
-        echo '<span class="notok">' . $_lang['failed'] . "</span>" . $_lang['table_prefix_already_inuse'] . "</p>";
+    echo "<p>".$_lang['checking_table_prefix'].$table_prefix."`: ";
+    if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) {
+        echo '<span class="notok">'.$_lang['failed']."</span>".$_lang['table_prefix_already_inuse']."</p>";
         $errors += 1;
-        echo "<p>" . $_lang['table_prefix_already_inuse_note'] . "</p>";
+        echo "<p>".$_lang['table_prefix_already_inuse_note']."</p>";
         return;
     } else {
         echo '<span class="ok">'.$_lang['ok']."</span></p>";
     }
 }
 
-if(!function_exists('parseProperties')) {
+if (!function_exists('parseProperties')) {
     // parses a resource property string and returns the result as an array
     // duplicate of method in documentParser class
-    function parseProperties($propertyString) {
-        $parameter= array ();
+    function parseProperties($propertyString){
+        $parameter = array();
         if (!empty ($propertyString)) {
-            $tmpParams= explode("&", $propertyString);
-            for ($x= 0; $x < count($tmpParams); $x++) {
+            $tmpParams = explode("&", $propertyString);
+            for ($x = 0; $x < count($tmpParams); $x++) {
                 if (strpos($tmpParams[$x], '=', 0)) {
-                    $pTmp= explode("=", $tmpParams[$x]);
-                    $pvTmp= explode(";", trim($pTmp[1]));
+                    $pTmp = explode("=", $tmpParams[$x]);
+                    $pvTmp = explode(";", trim($pTmp[1]));
                     if ($pvTmp[1] == 'list' && $pvTmp[3] != "")
-                        $parameter[trim($pTmp[0])]= $pvTmp[3]; //list default
+                        $parameter[trim($pTmp[0])] = $pvTmp[3]; //list default
                     else
                         if ($pvTmp[1] != 'list' && $pvTmp[2] != "")
-                            $parameter[trim($pTmp[0])]= $pvTmp[2];
+                            $parameter[trim($pTmp[0])] = $pvTmp[2];
                 }
             }
         }
@@ -150,20 +150,20 @@ 
 // check status of Inherit Parent Template plugin
 $auto_template_logic = 'parent';
 if ($installMode != 0) {
-    $rs = mysqli_query($conn, "SELECT properties, disabled FROM $dbase.`" . $table_prefix . "site_plugins` WHERE name='Inherit Parent Template'");
+    $rs = mysqli_query($conn, "SELECT properties, disabled FROM $dbase.`".$table_prefix."site_plugins` WHERE name='Inherit Parent Template'");
     $row = mysqli_fetch_row($rs);
-    if(!$row) {
+    if (!$row) {
         // not installed
         $auto_template_logic = 'system';
     } else {
-        if($row[1] == 1) {
+        if ($row[1] == 1) {
             // installed but disabled
             $auto_template_logic = 'system';
         } else {
             // installed, enabled .. see how it's configured
             $properties = parseProperties($row[0]);
-            if(isset($properties['inheritTemplate'])) {
-                if($properties['inheritTemplate'] == 'From First Sibling') {
+            if (isset($properties['inheritTemplate'])) {
+                if ($properties['inheritTemplate'] == 'From First Sibling') {
                     $auto_template_logic = 'sibling';
                 }
             }
@@ -187,20 +187,20 @@ 
 $sqlParser->connect();
 
 // install/update database
-echo "<p>" . $_lang['setup_database_creating_tables'];
+echo "<p>".$_lang['setup_database_creating_tables'];
 if ($moduleSQLBaseFile) {
     $sqlParser->process($moduleSQLBaseFile);
     // display database results
     if ($sqlParser->installFailed == true) {
         $errors += 1;
-        echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>";
-        echo "<p>" . $_lang['setup_couldnt_install'] . "</p>";
-        echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />";
+        echo "<span class=\"notok\"><b>".$_lang['database_alerts']."</span></p>";
+        echo "<p>".$_lang['setup_couldnt_install']."</p>";
+        echo "<p>".$_lang['installation_error_occured']."<br /><br />";
         for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
-            echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />";
+            echo "<em>".$sqlParser->mysqlErrors[$i]["error"]."</em>".$_lang['during_execution_of_sql']."<span class='mono'>".strip_tags($sqlParser->mysqlErrors[$i]["sql"])."</span>.<hr />";
         }
         echo "</p>";
-        echo "<p>" . $_lang['some_tables_not_updated'] . "</p>";
+        echo "<p>".$_lang['some_tables_not_updated']."</p>";
         return;
     } else {
         echo '<span class="ok">'.$_lang['ok']."</span></p>";
@@ -210,12 +210,12 @@ 
 // custom or not
 if (file_exists(dirname(__FILE__)."/../../assets/cache/siteManager.php")) {
     $mgrdir = 'include_once(dirname(__FILE__)."/../../assets/cache/siteManager.php");';
-}else{
+} else {
     $mgrdir = 'define(\'MGR_DIR\', \'manager\');';
 }
 
 // write the config.inc.php file if new installation
-echo "<p>" . $_lang['writing_config_file'];
+echo "<p>".$_lang['writing_config_file'];
 
 $confph = array();
 $confph['database_server']    = $database_server;
@@ -247,7 +247,7 @@ 
 $chmodSuccess = @chmod($filename, 0404);
 
 if ($configFileFailed == true) {
-    echo '<span class="notok">' . $_lang['failed'] . "</span></p>";
+    echo '<span class="notok">'.$_lang['failed']."</span></p>";
     $errors += 1;
 ?>
     <p><?php echo $_lang['cant_write_config_file']?><span class="mono"><?php echo MGR_DIR; ?>/includes/config.inc.php</span></p>
@@ -264,35 +264,35 @@ 
 // generate new site_id and set manager theme to default
 if ($installMode == 0) {
     $siteid = uniqid('');
-    mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`" . $table_prefix . "system_settings` (setting_name,setting_value) VALUES('site_id','$siteid'),('manager_theme','default')");
+    mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid'),('manager_theme','default')");
 } else {
     // update site_id if missing
-    $ds = mysqli_query($sqlParser->conn, "SELECT setting_name,setting_value FROM $dbase.`" . $table_prefix . "system_settings` WHERE setting_name='site_id'");
+    $ds = mysqli_query($sqlParser->conn, "SELECT setting_name,setting_value FROM $dbase.`".$table_prefix."system_settings` WHERE setting_name='site_id'");
     if ($ds) {
         $r = mysqli_fetch_assoc($ds);
         $siteid = $r['setting_value'];
         if ($siteid == '' || $siteid = 'MzGeQ2faT4Dw06+U49x3') {
             $siteid = uniqid('');
-            mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`" . $table_prefix . "system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')");
+            mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')");
         }
     }
 }
 
 // Reset database for installation of demo-site
 if ($installData && $moduleSQLDataFile && $moduleSQLResetFile) {
-	echo "<p>" . $_lang['resetting_database'];
+	echo "<p>".$_lang['resetting_database'];
 	$sqlParser->process($moduleSQLResetFile);
 	// display database results
 	if ($sqlParser->installFailed == true) {
 		$errors += 1;
-		echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>";
-		echo "<p>" . $_lang['setup_couldnt_install'] . "</p>";
-		echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />";
+		echo "<span class=\"notok\"><b>".$_lang['database_alerts']."</span></p>";
+		echo "<p>".$_lang['setup_couldnt_install']."</p>";
+		echo "<p>".$_lang['installation_error_occured']."<br /><br />";
 		for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
-			echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />";
+			echo "<em>".$sqlParser->mysqlErrors[$i]["error"]."</em>".$_lang['during_execution_of_sql']."<span class='mono'>".strip_tags($sqlParser->mysqlErrors[$i]["sql"])."</span>.<hr />";
 		}
 		echo "</p>";
-		echo "<p>" . $_lang['some_tables_not_updated'] . "</p>";
+		echo "<p>".$_lang['some_tables_not_updated']."</p>";
 		return;
 	} else {
 		echo '<span class="ok">'.$_lang['ok']."</span></p>";
@@ -301,11 +301,11 @@ 
 
 // Install Templates
 if (isset ($_POST['template']) || $installData) {
-    echo "<h3>" . $_lang['templates'] . ":</h3> ";
+    echo "<h3>".$_lang['templates'].":</h3> ";
     $selTemplates = $_POST['template'];
     foreach ($moduleTemplates as $k=>$moduleTemplate) {
         $installSample = in_array('sample', $moduleTemplate[6]) && $installData == 1;
-        if($installSample || in_array($k, $selTemplates)) {
+        if ($installSample || in_array($k, $selTemplates)) {
             $name = mysqli_real_escape_string($conn, $moduleTemplate[0]);
             $desc = mysqli_real_escape_string($conn, $moduleTemplate[1]);
             $category = mysqli_real_escape_string($conn, $moduleTemplate[4]);
@@ -313,7 +313,7 @@ 
             $filecontent = $moduleTemplate[3];
             $save_sql_id_as = $moduleTemplate[7]; // Nessecary for demo-site
             if (!file_exists($filecontent)) {
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_template'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">".$_lang['unable_install_template']." '$filecontent' ".$_lang['not_found'].".</span></p>";
             } else {
                 // Create the category if it does not already exist
                 $category_id = getCreateDbCategory($category, $sqlParser);
@@ -323,31 +323,31 @@ 
                 $template = mysqli_real_escape_string($conn, $template);
 
                 // See if the template already exists
-                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name'");
+                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$name'");
 
                 if (mysqli_num_rows($rs)) {
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked'  WHERE templatename='$name' LIMIT 1;")) {
+                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked'  WHERE templatename='$name' LIMIT 1;")) {
                         $errors += 1;
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    if(!is_null($save_sql_id_as)) {
+                    if (!is_null($save_sql_id_as)) {
                         $sql_id = @mysqli_insert_id($sqlParser->conn);
-                        if(!$sql_id) {
-                            $idQuery = mysqli_fetch_assoc(mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name' LIMIT 1;"));
+                        if (!$sql_id) {
+                            $idQuery = mysqli_fetch_assoc(mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$name' LIMIT 1;"));
                             $sql_id = $idQuery['id'];
                         }
                         $custom_placeholders[$save_sql_id_as] = $sql_id;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
                 } else {
-                    if (!@ mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');")) {
+                    if (!@ mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');")) {
                         $errors += 1;
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    if(!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                    if (!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn);
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
                 }
             }
         }
@@ -356,11 +356,11 @@ 
 
 // Install Template Variables
 if (isset ($_POST['tv']) || $installData) {
-    echo "<h3>" . $_lang['tvs'] . ":</h3> ";
+    echo "<h3>".$_lang['tvs'].":</h3> ";
     $selTVs = $_POST['tv'];
     foreach ($moduleTVs as $k=>$moduleTV) {
         $installSample = in_array('sample', $moduleTV[12]) && $installData == 1;
-        if($installSample || in_array($k, $selTVs)) {
+        if ($installSample || in_array($k, $selTVs)) {
             $name = mysqli_real_escape_string($conn, $moduleTV[0]);
             $caption = mysqli_real_escape_string($conn, $moduleTV[1]);
             $desc = mysqli_real_escape_string($conn, $moduleTV[2]);
@@ -378,25 +378,25 @@ 
             // Create the category if it does not already exist
             $category = getCreateDbCategory($category, $sqlParser);
 
-            $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_tmplvars` WHERE name='$name'");
+            $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name'");
             if (mysqli_num_rows($rs)) {
                 $insert = true;
-                while($row = mysqli_fetch_assoc($rs)) {
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                while ($row = mysqli_fetch_assoc($rs)) {
+                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
                     $insert = false;
                 }
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
             } else {
                 //$q = "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',(SELECT (CASE COUNT(*) WHEN 0 THEN 0 ELSE `id` END) `id` FROM $dbase.`" . $table_prefix . "categories` WHERE `category` = '$category'),$locked,'$input_options','$output_widget','$output_widget_params','$input_default');";
-                $q = "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',$category,$locked,'$input_options','$output_widget','$output_widget_params','$input_default');";
+                $q = "INSERT INTO $dbase.`".$table_prefix."site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',$category,$locked,'$input_options','$output_widget','$output_widget_params','$input_default');";
                 if (!mysqli_query($sqlParser->conn, $q)) {
-                    echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                     return;
                 }
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
             }
 
             // add template assignments
@@ -405,10 +405,10 @@ 
             if (count($assignments) > 0) {
 
                 // remove existing tv -> template assignments
-                $ds=mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name' AND description='$desc';");
+                $ds = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name' AND description='$desc';");
                 $row = mysqli_fetch_assoc($ds);
                 $id = $row["id"];
-                mysqli_query($sqlParser->conn, 'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_tmplvar_templates` WHERE tmplvarid = \'' . $id . '\'');
+                mysqli_query($sqlParser->conn, 'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_tmplvar_templates` WHERE tmplvarid = \''.$id.'\'');
 
                 // add tv -> template assignments
                 foreach ($assignments as $assignment) {
@@ -417,7 +417,7 @@ 
                     if ($ds && $ts) {
                         $tRow = mysqli_fetch_assoc($ts);
                         $templateId = $tRow['id'];
-                        mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)");
+                        mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)");
                    }
                 }
             }
@@ -427,12 +427,12 @@ 
 
 // Install Chunks
 if (isset ($_POST['chunk']) || $installData) {
-    echo "<h3>" . $_lang['chunks'] . ":</h3> ";
+    echo "<h3>".$_lang['chunks'].":</h3> ";
     $selChunks = $_POST['chunk'];
     foreach ($moduleChunks as $k=>$moduleChunk) {
         $installSample = in_array('sample', $moduleChunk[5]) && $installData == 1;
         $count_new_name = 0;
-        if($installSample || in_array($k, $selChunks)) {
+        if ($installSample || in_array($k, $selChunks)) {
 
             $name = mysqli_real_escape_string($conn, $moduleChunk[0]);
             $desc = mysqli_real_escape_string($conn, $moduleChunk[1]);
@@ -441,7 +441,7 @@ 
             $filecontent = $moduleChunk[2];
 
             if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">".$_lang['unable_install_chunk']." '$filecontent' ".$_lang['not_found'].".</span></p>";
             else {
 
                 // Create the category if it does not already exist
@@ -449,31 +449,31 @@ 
 
                 $chunk = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', file_get_contents($filecontent), 1);
                 $chunk = mysqli_real_escape_string($conn, $chunk);
-                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$name'");
+                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_htmlsnippets` WHERE name='$name'");
                 $count_original_name = mysqli_num_rows($rs);
-                if($overwrite == 'false') {
-                    $newname = $name . '-' . str_replace('.', '_', $modx_version);
-                    $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$newname'");
+                if ($overwrite == 'false') {
+                    $newname = $name.'-'.str_replace('.', '_', $modx_version);
+                    $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_htmlsnippets` WHERE name='$newname'");
                     $count_new_name = mysqli_num_rows($rs);
                 }
                 $update = $count_original_name > 0 && $overwrite == 'true';
                 if ($update) {
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) {
+                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) {
                         $errors += 1;
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
-                } elseif($count_new_name == 0) {
-                    if($count_original_name > 0 && $overwrite == 'false') {
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
+                } elseif ($count_new_name == 0) {
+                    if ($count_original_name > 0 && $overwrite == 'false') {
                         $name = $newname;
                     }
-                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);")) {
+                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);")) {
                         $errors += 1;
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
                 }
             }
         }
@@ -482,11 +482,11 @@ 
 
 // Install Modules
 if (isset ($_POST['module']) || $installData) {
-    echo "<h3>" . $_lang['modules'] . ":</h3> ";
+    echo "<h3>".$_lang['modules'].":</h3> ";
     $selModules = $_POST['module'];
     foreach ($moduleModules as $k=>$moduleModule) {
         $installSample = in_array('sample', $moduleModule[7]) && $installData == 1;
-        if($installSample || in_array($k, $selModules)) {
+        if ($installSample || in_array($k, $selModules)) {
             $name = mysqli_real_escape_string($conn, $moduleModule[0]);
             $desc = mysqli_real_escape_string($conn, $moduleModule[1]);
             $filecontent = $moduleModule[2];
@@ -495,7 +495,7 @@ 
             $shared = mysqli_real_escape_string($conn, $moduleModule[5]);
             $category = mysqli_real_escape_string($conn, $moduleModule[6]);
             if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">".$_lang['unable_install_module']." '$filecontent' ".$_lang['not_found'].".</span></p>";
             else {
 
                 // Create the category if it does not already exist
@@ -504,22 +504,22 @@ 
                 $module = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent), 2));
                 // $module = removeDocblock($module, 'module'); // Modules have no fileBinding, keep docblock for info-tab
                 $module = mysqli_real_escape_string($conn, $module);
-                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_modules` WHERE name='$name'");
+                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_modules` WHERE name='$name'");
                 if (mysqli_num_rows($rs)) {
                     $row = mysqli_fetch_assoc($rs);
-                    $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
+                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
                 } else {
                     $properties = mysqli_real_escape_string($conn, parseProperties($properties, true));
-                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_modules` (name,description,modulecode,properties,guid,enable_sharedparams,category) VALUES('$name','$desc','$module','$properties','$guid','$shared', $category);")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_modules` (name,description,modulecode,properties,guid,enable_sharedparams,category) VALUES('$name','$desc','$module','$properties','$guid','$shared', $category);")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
                 }
             }
         }
@@ -528,11 +528,11 @@ 
 
 // Install Plugins
 if (isset ($_POST['plugin']) || $installData) {
-    echo "<h3>" . $_lang['plugins'] . ":</h3> ";
+    echo "<h3>".$_lang['plugins'].":</h3> ";
     $selPlugs = $_POST['plugin'];
     foreach ($modulePlugins as $k=>$modulePlugin) {
         $installSample = in_array('sample', $modulePlugin[8]) && $installData == 1;
-        if($installSample || in_array($k, $selPlugs)) {
+        if ($installSample || in_array($k, $selPlugs)) {
             $name = mysqli_real_escape_string($conn, $modulePlugin[0]);
             $desc = mysqli_real_escape_string($conn, $modulePlugin[1]);
             $filecontent = $modulePlugin[2];
@@ -542,17 +542,17 @@ 
             $category = mysqli_real_escape_string($conn, $modulePlugin[6]);
             $leg_names = '';
             $disabled = $modulePlugin[9];
-            if(array_key_exists(7, $modulePlugin)) {
+            if (array_key_exists(7, $modulePlugin)) {
                 // parse comma-separated legacy names and prepare them for sql IN clause
-                $leg_names = "'" . implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7]))) . "'";
+                $leg_names = "'".implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7])))."'";
             }
             if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">".$_lang['unable_install_plugin']." '$filecontent' ".$_lang['not_found'].".</span></p>";
             else {
 
                 // disable legacy versions based on legacy_names provided
-                if(!empty($leg_names)) {
-                    $update_query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);";
+                if (!empty($leg_names)) {
+                    $update_query = "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE name IN ($leg_names);";
                     $rs = mysqli_query($sqlParser->conn, $update_query);
                 }
 
@@ -562,50 +562,50 @@ 
                 $plugin = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent), 2));
                 $plugin = removeDocblock($plugin, 'plugin');
                 $plugin = mysqli_real_escape_string($conn, $plugin);
-                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_plugins` WHERE name='$name'");
+                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name'");
                 if (mysqli_num_rows($rs)) {
                     $insert = true;
-                    while($row = mysqli_fetch_assoc($rs)) {
-                        $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                        if($row['description'] == $desc){
-                            if (! mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
-                                echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    while ($row = mysqli_fetch_assoc($rs)) {
+                        $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
+                        if ($row['description'] == $desc) {
+                            if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) {
+                                echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                                 return;
                             }
                             $insert = false;
                         } else {
-                            if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) {
+                            if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE id={$row['id']};")) {
                                 echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                                 return;
                             }
                         }
                     }
-                    if($insert === true) {
-                        $properties = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                        if(!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$guid','0',$category);")) {
+                    if ($insert === true) {
+                        $properties = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
+                        if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$guid','0',$category);")) {
                             echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                             return;
                         }
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
                 } else {
                     $properties = mysqli_real_escape_string($conn, parseProperties($properties, true));
-                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_plugins` (name,description,plugincode,properties,moduleguid,category,disabled) VALUES('$name','$desc','$plugin','$properties','$guid',$category,$disabled);")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,category,disabled) VALUES('$name','$desc','$plugin','$properties','$guid',$category,$disabled);")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
                 }
                 // add system events
                 if (count($events) > 0) {
-                    $ds=mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name' AND description='$desc';");
+                    $ds = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name' AND description='$desc';");
                     if ($ds) {
                         $row = mysqli_fetch_assoc($ds);
                         $id = $row["id"];
                         // remove existing events
-                        mysqli_query($sqlParser->conn, 'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_plugin_events` WHERE pluginid = \'' . $id . '\'');
+                        mysqli_query($sqlParser->conn, 'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_plugin_events` WHERE pluginid = \''.$id.'\'');
                         // add new events
-                        mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_plugin_events` (pluginid, evtid) SELECT '$id' as 'pluginid',se.id as 'evtid' FROM $dbase.`" . $table_prefix . "system_eventnames` se WHERE name IN ('" . implode("','", $events) . "')");
+                        mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugin_events` (pluginid, evtid) SELECT '$id' as 'pluginid',se.id as 'evtid' FROM $dbase.`".$table_prefix."system_eventnames` se WHERE name IN ('".implode("','", $events)."')");
                     }
                 }
             }
@@ -615,18 +615,18 @@ 
 
 // Install Snippets
 if (isset ($_POST['snippet']) || $installData) {
-    echo "<h3>" . $_lang['snippets'] . ":</h3> ";
+    echo "<h3>".$_lang['snippets'].":</h3> ";
     $selSnips = $_POST['snippet'];
     foreach ($moduleSnippets as $k=>$moduleSnippet) {
         $installSample = in_array('sample', $moduleSnippet[5]) && $installData == 1;
-        if($installSample || in_array($k, $selSnips)) {
+        if ($installSample || in_array($k, $selSnips)) {
             $name = mysqli_real_escape_string($conn, $moduleSnippet[0]);
             $desc = mysqli_real_escape_string($conn, $moduleSnippet[1]);
             $filecontent = $moduleSnippet[2];
             $properties = $moduleSnippet[3];
             $category = mysqli_real_escape_string($conn, $moduleSnippet[4]);
             if (!file_exists($filecontent))
-                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">" . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>";
+                echo "<p>&nbsp;&nbsp;$name: <span class=\"notok\">".$_lang['unable_install_snippet']." '$filecontent' ".$_lang['not_found'].".</span></p>";
             else {
 
                 // Create the category if it does not already exist
@@ -635,22 +635,22 @@ 
                 $snippet = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent)));
                 $snippet = removeDocblock($snippet, 'snippet');
                 $snippet = mysqli_real_escape_string($conn, $snippet);
-                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_snippets` WHERE name='$name'");
+                $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_snippets` WHERE name='$name'");
                 if (mysqli_num_rows($rs)) {
                     $row = mysqli_fetch_assoc($rs);
-                    $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties']));
-                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties']));
+                    if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['upgraded']."</span></p>";
                 } else {
                     $properties = mysqli_real_escape_string($conn, parseProperties($properties, true));
-                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) {
-                        echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+                    if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) {
+                        echo "<p>".mysqli_error($sqlParser->conn)."</p>";
                         return;
                     }
-                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>";
+                    echo "<p>&nbsp;&nbsp;$name: <span class=\"ok\">".$_lang['installed']."</span></p>";
                 }
             }
         }
@@ -659,24 +659,24 @@ 
 
 // Install demo-site
 if ($installData && $moduleSQLDataFile) {
-    echo "<p>" . $_lang['installing_demo_site'];
+    echo "<p>".$_lang['installing_demo_site'];
     $sqlParser->process($moduleSQLDataFile);
     // display database results
     if ($sqlParser->installFailed == true) {
         $errors += 1;
-        echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>";
-        echo "<p>" . $_lang['setup_couldnt_install'] . "</p>";
-        echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />";
+        echo "<span class=\"notok\"><b>".$_lang['database_alerts']."</span></p>";
+        echo "<p>".$_lang['setup_couldnt_install']."</p>";
+        echo "<p>".$_lang['installation_error_occured']."<br /><br />";
         for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) {
-            echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />";
+            echo "<em>".$sqlParser->mysqlErrors[$i]["error"]."</em>".$_lang['during_execution_of_sql']."<span class='mono'>".strip_tags($sqlParser->mysqlErrors[$i]["sql"])."</span>.<hr />";
         }
         echo "</p>";
-        echo "<p>" . $_lang['some_tables_not_updated'] . "</p>";
+        echo "<p>".$_lang['some_tables_not_updated']."</p>";
         return;
     } else {
         $sql = sprintf("SELECT id FROM `%ssite_templates` WHERE templatename='EVO startup - Bootstrap'", $sqlParser->prefix);
         $rs = mysqli_query($sqlParser->conn, $sql);
-        if(mysqli_num_rows($rs)) {
+        if (mysqli_num_rows($rs)) {
             $row = mysqli_fetch_assoc($rs);
             $sql = sprintf('UPDATE `%ssite_content` SET template=%s WHERE template=4', $sqlParser->prefix, $row['id']);
             mysqli_query($sqlParser->conn, $sql);
@@ -687,9 +687,9 @@ 
 
 // Install Dependencies
 foreach ($moduleDependencies as $dependency) {
-	$ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_modules` WHERE name="' . $dependency['module'] . '"');
+	$ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM '.$dbase.'`'.$sqlParser->prefix.'site_modules` WHERE name="'.$dependency['module'].'"');
 	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+		echo "<p>".mysqli_error($sqlParser->conn)."</p>";
 		return;
 	} else {
 		$row = mysqli_fetch_assoc($ds);
@@ -697,37 +697,37 @@ 
 		$moduleGuid = $row["guid"];
 	}
 	// get extra id
-	$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE ' . $dependency['column'] . '="' . $dependency['name'] . '"');
+	$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE '.$dependency['column'].'="'.$dependency['name'].'"');
 	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+		echo "<p>".mysqli_error($sqlParser->conn)."</p>";
 		return;
 	} else {
 		$row = mysqli_fetch_assoc($ds);
 		$extraId = $row["id"];
 	}
 	// setup extra as module dependency
-	$ds = mysqli_query($sqlParser->conn, 'SELECT module FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type'] . ' LIMIT 1');
+	$ds = mysqli_query($sqlParser->conn, 'SELECT module FROM '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` WHERE module='.$moduleId.' AND resource='.$extraId.' AND type='.$dependency['type'].' LIMIT 1');
 	if (!$ds) {
-		echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+		echo "<p>".mysqli_error($sqlParser->conn)."</p>";
 		return;
 	} else {
 		if (mysqli_num_rows($ds) === 0) {
-			mysqli_query($sqlParser->conn, 'INSERT INTO ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` (module, resource, type) VALUES(' . $moduleId . ',' . $extraId . ',' . $dependency['type'] . ')');
-			echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_create'] . '</span></p>';
+			mysqli_query($sqlParser->conn, 'INSERT INTO '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` (module, resource, type) VALUES('.$moduleId.','.$extraId.','.$dependency['type'].')');
+			echo '<p>&nbsp;&nbsp;'.$dependency['module'].' Module: <span class="ok">'.$_lang['depedency_create'].'</span></p>';
 		} else {
-			mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` SET module = ' . $moduleId . ', resource = ' . $extraId . ', type = ' . $dependency['type'] . ' WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type']);
-			echo '<p>&nbsp;&nbsp;' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_update'] . '</span></p>';
+			mysqli_query($sqlParser->conn, 'UPDATE '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` SET module = '.$moduleId.', resource = '.$extraId.', type = '.$dependency['type'].' WHERE module='.$moduleId.' AND resource='.$extraId.' AND type='.$dependency['type']);
+			echo '<p>&nbsp;&nbsp;'.$dependency['module'].' Module: <span class="ok">'.$_lang['depedency_update'].'</span></p>';
 		}
 		if ($dependency['type'] == 30 || $dependency['type'] == 40) {
 			// set extra guid for plugins and snippets
-			$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE id=' . $extraId . ' LIMIT 1');
+			$ds = mysqli_query($sqlParser->conn, 'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE id='.$extraId.' LIMIT 1');
 			if (!$ds) {
-				echo "<p>" . mysqli_error($sqlParser->conn) . "</p>";
+				echo "<p>".mysqli_error($sqlParser->conn)."</p>";
 				return;
 			} else {
 				if (mysqli_num_rows($ds) != 0) {
-					mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` SET moduleguid = ' . $moduleGuid . ' WHERE id=' . $extraId);
-					echo '<p>&nbsp;&nbsp;' . $dependency['name'] . ': <span class="ok">' . $_lang['guid_set'] . '</span></p>';
+					mysqli_query($sqlParser->conn, 'UPDATE '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` SET moduleguid = '.$moduleGuid.' WHERE id='.$extraId);
+					echo '<p>&nbsp;&nbsp;'.$dependency['name'].': <span class="ok">'.$_lang['guid_set'].'</span></p>';
 				}
 			}
 		}
@@ -736,7 +736,7 @@ 
 
 // call back function
 if ($callBackFnc != "")
-    $callBackFnc ($sqlParser);
+    $callBackFnc($sqlParser);
 
 // Setup the MODX API -- needed for the cache processor
 define('MODX_API_MODE', true);
@@ -771,20 +771,20 @@ 
 }
 
 // setup completed!
-echo "<p><b>" . $_lang['installation_successful'] . "</b></p>";
-echo "<p>" . $_lang['to_log_into_content_manager'] . "</p>";
+echo "<p><b>".$_lang['installation_successful']."</b></p>";
+echo "<p>".$_lang['to_log_into_content_manager']."</p>";
 if ($installMode == 0) {
-    echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />" . $_lang['installation_note'] . "</p>";
+    echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />".$_lang['installation_note']."</p>";
 } else {
-    echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />" . $_lang['upgrade_note'] . "</p>";
+    echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />".$_lang['upgrade_note']."</p>";
 }
 
 // Property Update function
-function propUpdate($new,$old){
+function propUpdate($new, $old){
     $newArr = parseProperties($new);
     $oldArr = parseProperties($old);
-    foreach ($oldArr as $k => $v){
-        if (isset($v['0']['options'])){
+    foreach ($oldArr as $k => $v) {
+        if (isset($v['0']['options'])) {
             $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options'];
         }
     }
@@ -794,30 +794,30 @@ 
     return $return;
 }
 
-function parseProperties($propertyString, $json=false) {
-    $propertyString = str_replace('{}', '', $propertyString );
-    $propertyString = str_replace('} {', ',', $propertyString );
+function parseProperties($propertyString, $json = false){
+    $propertyString = str_replace('{}', '', $propertyString);
+    $propertyString = str_replace('} {', ',', $propertyString);
 
-    if(empty($propertyString)) return array();
-    if($propertyString=='{}' || $propertyString=='[]') return array();
+    if (empty($propertyString)) return array();
+    if ($propertyString == '{}' || $propertyString == '[]') return array();
 
     $jsonFormat = isJson($propertyString, true);
     $property = array();
     // old format
-    if ( $jsonFormat === false) {
-        $props= explode('&', $propertyString);
+    if ($jsonFormat === false) {
+        $props = explode('&', $propertyString);
         foreach ($props as $prop) {
             $prop = trim($prop);
-            if($prop === '') {
+            if ($prop === '') {
                 continue;
             }
 
             $arr = explode(';', $prop);
-            if( ! is_array($arr)) {
+            if (!is_array($arr)) {
                 $arr = array();
             }
             $key = explode('=', isset($arr[0]) ? $arr[0] : '');
-            if( ! is_array($key) || empty($key[0])) {
+            if (!is_array($key) || empty($key[0])) {
                 continue;
             }
 
@@ -841,7 +841,7 @@ 
 
         }
     // new json-format
-    } else if(!empty($jsonFormat)){
+    } else if (!empty($jsonFormat)) {
         $property = $jsonFormat;
     }
     if ($json) {
@@ -851,25 +851,25 @@ 
     return $property;
 }
 
-function isJson($string, $returnData=false) {
+function isJson($string, $returnData = false){
     $data = json_decode($string, true);
     return (json_last_error() == JSON_ERROR_NONE) ? ($returnData ? $data : true) : false;
 }
 
-function getCreateDbCategory($category, $sqlParser) {
+function getCreateDbCategory($category, $sqlParser){
     $dbase = $sqlParser->dbname;
-    $dbase = '`' . trim($dbase,'`') . '`';
+    $dbase = '`'.trim($dbase, '`').'`';
     $table_prefix = $sqlParser->prefix;
     $category_id = 0;
-    if(!empty($category)) {
+    if (!empty($category)) {
         $category = mysqli_real_escape_string($sqlParser->conn, $category);
         $rs = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."categories` WHERE category = '".$category."'");
-        if(mysqli_num_rows($rs) && ($row = mysqli_fetch_assoc($rs))) {
+        if (mysqli_num_rows($rs) && ($row = mysqli_fetch_assoc($rs))) {
             $category_id = $row['id'];
         } else {
             $q = "INSERT INTO $dbase.`".$table_prefix."categories` (`category`) VALUES ('{$category}');";
             $rs = mysqli_query($sqlParser->conn, $q);
-            if($rs) {
+            if ($rs) {
                 $category_id = mysqli_insert_id($sqlParser->conn);
             }
         }
@@ -878,12 +878,12 @@ 
 }
 
 // Remove installer Docblock only from components using plugin FileSource / fileBinding
-function removeDocblock($code, $type) {
+function removeDocblock($code, $type){
 
     $cleaned = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', $code, 1);
 
     // Procedure taken from plugin.filesource.php
-    switch($type) {
+    switch ($type) {
         case 'snippet':
             $elm_name = 'snippets';
             $include = 'return require';
@@ -899,7 +899,7 @@ 
         default:
             return $cleaned;
     };
-    if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/')
+    if (substr(trim($cleaned), 0, $count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/')
         return $cleaned;
 
     // fileBinding not found - return code incl docblock

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>
@@ -1356,7 +1358,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(
@@ -1418,7 +1422,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 @@ 
 	}
 }
 
-function getDefaultTemplate() {
+function getDefaultTemplate()
+{
 	global $modx;
 
 	switch($modx->config['auto_template_logic']) {

Indentation +415 added lines, -415 removed lines

@@ -1,6 +1,6 @@ 
 <?php
 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.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 /********************/
@@ -12,30 +12,30 @@ 
 
 // check permissions
 switch($modx->manager->action) {
-	case 27:
-		if(!$modx->hasPermission('edit_document')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		}
-		break;
-	case 85:
-	case 72:
-	case 4:
-		if(!$modx->hasPermission('new_document')) {
-			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		} elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
-			// check user has permissions for parent
-			include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
-			$udperms = new udperms();
-			$udperms->user = $modx->getLoginUserID();
-			$udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid'];
-			$udperms->role = $_SESSION['mgrRole'];
-			if(!$udperms->checkPermissions()) {
-				$modx->webAlertAndQuit($_lang["access_permission_denied"]);
-			}
-		}
-		break;
-	default:
-		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
+    case 27:
+        if(!$modx->hasPermission('edit_document')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        }
+        break;
+    case 85:
+    case 72:
+    case 4:
+        if(!$modx->hasPermission('new_document')) {
+            $modx->webAlertAndQuit($_lang["error_no_privileges"]);
+        } elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
+            // check user has permissions for parent
+            include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+            $udperms = new udperms();
+            $udperms->user = $modx->getLoginUserID();
+            $udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid'];
+            $udperms->role = $_SESSION['mgrRole'];
+            if(!$udperms->checkPermissions()) {
+                $modx->webAlertAndQuit($_lang["access_permission_denied"]);
+            }
+        }
+        break;
+    default:
+        $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
 $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
@@ -54,22 +54,22 @@ 
 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');
 
 if($modx->manager->action == 27) {
-	//editing an existing document
-	// check permissions on the document
-	include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
-	$udperms = new udperms();
-	$udperms->user = $modx->getLoginUserID();
-	$udperms->document = $id;
-	$udperms->role = $_SESSION['mgrRole'];
-
-	if(!$udperms->checkPermissions()) {
-		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
-	}
+    //editing an existing document
+    // check permissions on the document
+    include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+    $udperms = new udperms();
+    $udperms->user = $modx->getLoginUserID();
+    $udperms->document = $id;
+    $udperms->role = $_SESSION['mgrRole'];
+
+    if(!$udperms->checkPermissions()) {
+        $modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    }
 }
 
 // check to see if resource isn't locked
 if($lockedEl = $modx->elementIsLocked(7, $id)) {
-	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource']));
+    $modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource']));
 }
 // end check for lock
 
@@ -78,74 +78,74 @@ 
 
 // get document groups for current user
 if($_SESSION['mgrDocgroups']) {
-	$docgrp = implode(',', $_SESSION['mgrDocgroups']);
+    $docgrp = implode(',', $_SESSION['mgrDocgroups']);
 }
 
 if(!empty ($id)) {
-	$access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']);
-	if($docgrp) {
-		$access .= " OR dg.document_group IN ({$docgrp})";
-	}
-	$rs = $modx->db->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})");
-	$content = array();
-	$content = $modx->db->getRow($rs);
-	$modx->documentObject = &$content;
-	if(!$content) {
-		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
-	}
-	$_SESSION['itemname'] = $content['pagetitle'];
+    $access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']);
+    if($docgrp) {
+        $access .= " OR dg.document_group IN ({$docgrp})";
+    }
+    $rs = $modx->db->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})");
+    $content = array();
+    $content = $modx->db->getRow($rs);
+    $modx->documentObject = &$content;
+    if(!$content) {
+        $modx->webAlertAndQuit($_lang["access_permission_denied"]);
+    }
+    $_SESSION['itemname'] = $content['pagetitle'];
 } else {
-	$content = array();
+    $content = array();
 
-	if(isset($_REQUEST['newtemplate'])) {
-		$content['template'] = $_REQUEST['newtemplate'];
-	} else {
-		$content['template'] = getDefaultTemplate();
-	}
+    if(isset($_REQUEST['newtemplate'])) {
+        $content['template'] = $_REQUEST['newtemplate'];
+    } else {
+        $content['template'] = getDefaultTemplate();
+    }
 
-	$_SESSION['itemname'] = $_lang["new_resource"];
+    $_SESSION['itemname'] = $_lang["new_resource"];
 }
 
 // restore saved form
 $formRestored = $modx->manager->loadFormValues();
 if(isset($_REQUEST['newtemplate'])) {
-	$formRestored = true;
+    $formRestored = true;
 }
 
 // retain form values if template was changed
 // edited to convert pub_date and unpub_date
 // sottwell 02-09-2006
 if($formRestored == true) {
-	$content = array_merge($content, $_POST);
-	$content['content'] = $_POST['ta'];
-	if(empty ($content['pub_date'])) {
-		unset ($content['pub_date']);
-	} else {
-		$content['pub_date'] = $modx->toTimeStamp($content['pub_date']);
-	}
-	if(empty ($content['unpub_date'])) {
-		unset ($content['unpub_date']);
-	} else {
-		$content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']);
-	}
+    $content = array_merge($content, $_POST);
+    $content['content'] = $_POST['ta'];
+    if(empty ($content['pub_date'])) {
+        unset ($content['pub_date']);
+    } else {
+        $content['pub_date'] = $modx->toTimeStamp($content['pub_date']);
+    }
+    if(empty ($content['unpub_date'])) {
+        unset ($content['unpub_date']);
+    } else {
+        $content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']);
+    }
 }
 
 // increase menu index if this is a new document
 if(!isset ($_REQUEST['id'])) {
-	if(!isset ($modx->config['auto_menuindex'])) {
-		$modx->config['auto_menuindex'] = 1;
-	}
-	if($modx->config['auto_menuindex']) {
-		$pid = (int)$_REQUEST['pid'];
-		$rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'");
-		$content['menuindex'] = $modx->db->getValue($rs);
-	} else {
-		$content['menuindex'] = 0;
-	}
+    if(!isset ($modx->config['auto_menuindex'])) {
+        $modx->config['auto_menuindex'] = 1;
+    }
+    if($modx->config['auto_menuindex']) {
+        $pid = (int)$_REQUEST['pid'];
+        $rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'");
+        $content['menuindex'] = $modx->db->getValue($rs);
+    } else {
+        $content['menuindex'] = 0;
+    }
 }
 
 if(isset ($_POST['which_editor'])) {
-	$modx->config['which_editor'] = $_POST['which_editor'];
+    $modx->config['which_editor'] = $_POST['which_editor'];
 }
 
 // Add lock-element JS-Script
@@ -545,23 +545,23 @@ 
 
 	<form name="mutate" id="mutate" class="content" method="post" enctype="multipart/form-data" action="index.php" onsubmit="documentDirty=false;">
 		<?php
-		// invoke OnDocFormPrerender event
-		$evtOut = $modx->invokeEvent('OnDocFormPrerender', array(
-			'id' => $id,
-			'template' => $content['template']
-		));
-
-		if(is_array($evtOut)) {
-			echo implode('', $evtOut);
-		}
-
-		/*************************/
-		$dir = isset($_REQUEST['dir']) ? $_REQUEST['dir'] : '';
-		$sort = isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'createdon';
-		$page = isset($_REQUEST['page']) ? (int) $_REQUEST['page'] : '';
-		/*************************/
-
-		?>
+        // invoke OnDocFormPrerender event
+        $evtOut = $modx->invokeEvent('OnDocFormPrerender', array(
+            'id' => $id,
+            'template' => $content['template']
+        ));
+
+        if(is_array($evtOut)) {
+            echo implode('', $evtOut);
+        }
+
+        /*************************/
+        $dir = isset($_REQUEST['dir']) ? $_REQUEST['dir'] : '';
+        $sort = isset($_REQUEST['sort']) ? $_REQUEST['sort'] : 'createdon';
+        $page = isset($_REQUEST['page']) ? (int) $_REQUEST['page'] : '';
+        /*************************/
+
+        ?>
 		<input type="hidden" name="a" value="5" />
 		<input type="hidden" name="id" value="<?= $content['id'] ?>" />
 		<input type="hidden" name="mode" value="<?= $modx->manager->action ?>" />
@@ -576,54 +576,54 @@ 
 
 			<h1>
 				<i class="fa fa-pencil-square-o"></i><?php if(isset($_REQUEST['id'])) {
-					echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>';
-				} else {
-				    if ($modx->manager->action == '4') {
+                    echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>';
+                } else {
+                    if ($modx->manager->action == '4') {
                         echo $_lang['add_resource'];
                     } else if ($modx->manager->action == '72') {
                         echo $_lang['add_weblink'];
                     } else {
                         echo $_lang['create_resource_title'];
                     }
-				} ?>
+                } ?>
 			</h1>
 
 			<?= $_style['actionbuttons']['dynamic']['document'] ?>
 
 			<?php
-			// breadcrumbs
-			if($modx->config['use_breadcrumbs']) {
-				$temp = array();
-				$title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title'];
-
-				if(isset($_REQUEST['id']) && $content['parent'] != 0) {
-					$bID = (int) $_REQUEST['id'];
-					$temp = $modx->getParentIds($bID);
-				} else if(isset($_REQUEST['pid'])) {
-					$bID = (int) $_REQUEST['pid'];
-					$temp = $modx->getParentIds($bID);
-					array_unshift($temp, $bID);
-				}
-
-				if($temp) {
-					$parents = implode(',', $temp);
-
-					if(!empty($parents)) {
-						$where = "FIND_IN_SET(id,'{$parents}') DESC";
-						$rs = $modx->db->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
-						while($row = $modx->db->getRow($rs)) {
-							$out .= '<li class="breadcrumbs__li">
+            // breadcrumbs
+            if($modx->config['use_breadcrumbs']) {
+                $temp = array();
+                $title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title'];
+
+                if(isset($_REQUEST['id']) && $content['parent'] != 0) {
+                    $bID = (int) $_REQUEST['id'];
+                    $temp = $modx->getParentIds($bID);
+                } else if(isset($_REQUEST['pid'])) {
+                    $bID = (int) $_REQUEST['pid'];
+                    $temp = $modx->getParentIds($bID);
+                    array_unshift($temp, $bID);
+                }
+
+                if($temp) {
+                    $parents = implode(',', $temp);
+
+                    if(!empty($parents)) {
+                        $where = "FIND_IN_SET(id,'{$parents}') DESC";
+                        $rs = $modx->db->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
+                        while($row = $modx->db->getRow($rs)) {
+                            $out .= '<li class="breadcrumbs__li">
                                 <a href="index.php?a=27&id=' . $row['id'] . '" class="breadcrumbs__a">' . htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']) . '</a>
                                 <span class="breadcrumbs__sep">&gt;</span>
                             </li>';
-						}
-					}
-				}
+                        }
+                    }
+                }
 
-				$out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>';
-				echo '<ul class="breadcrumbs">' . $out . '</ul>';
-			}
-			?>
+                $out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>';
+                echo '<ul class="breadcrumbs">' . $out . '</ul>';
+            }
+            ?>
 
 			<!-- start main wrapper -->
 			<div class="sectionBody">
@@ -635,13 +635,13 @@ 
 
 					<!-- General -->
 					<?php
-					$evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array(
-						'id' => $id
-					));
-					if(is_array($evtOut)) {
-						echo implode('', $evtOut);
-					} else {
-						?>
+                    $evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array(
+                        'id' => $id
+                    ));
+                    if(is_array($evtOut)) {
+                        echo implode('', $evtOut);
+                    } else {
+                        ?>
 						<div class="tab-page" id="tabGeneral">
 							<h2 class="tab"><?= $_lang['settings_general'] ?></h2>
 							<script type="text/javascript">tpSettings.addTabPage(document.getElementById("tabGeneral"));</script>
@@ -726,36 +726,36 @@ 
 										<select id="template" name="template" class="inputBox" onchange="templateWarning();">
 											<option value="0">(blank)</option>
 											<?php
-											$field = "t.templatename, t.selectable, t.id, c.category";
-											$from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id";
-											$rs = $modx->db->select($field, $from, '', 'c.category, t.templatename ASC');
-											$currentCategory = '';
-											while($row = $modx->db->getRow($rs)) {
-												if($row['selectable'] != 1 && $row['id'] != $content['template']) {
-													continue;
-												};
-												// Skip if not selectable but show if selected!
-												$thisCategory = $row['category'];
-												if($thisCategory == null) {
-													$thisCategory = $_lang["no_category"];
-												}
-												if($thisCategory != $currentCategory) {
-													if($closeOptGroup) {
-														echo "\t\t\t\t\t</optgroup>\n";
-													}
-													echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";
-													$closeOptGroup = true;
-												}
+                                            $field = "t.templatename, t.selectable, t.id, c.category";
+                                            $from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id";
+                                            $rs = $modx->db->select($field, $from, '', 'c.category, t.templatename ASC');
+                                            $currentCategory = '';
+                                            while($row = $modx->db->getRow($rs)) {
+                                                if($row['selectable'] != 1 && $row['id'] != $content['template']) {
+                                                    continue;
+                                                };
+                                                // Skip if not selectable but show if selected!
+                                                $thisCategory = $row['category'];
+                                                if($thisCategory == null) {
+                                                    $thisCategory = $_lang["no_category"];
+                                                }
+                                                if($thisCategory != $currentCategory) {
+                                                    if($closeOptGroup) {
+                                                        echo "\t\t\t\t\t</optgroup>\n";
+                                                    }
+                                                    echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";
+                                                    $closeOptGroup = true;
+                                                }
 
-												$selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : '';
+                                                $selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : '';
 
-												echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";
-												$currentCategory = $thisCategory;
-											}
-											if($thisCategory != '') {
-												echo "\t\t\t\t\t</optgroup>\n";
-											}
-											?>
+                                                echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";
+                                                $currentCategory = $thisCategory;
+                                            }
+                                            if($thisCategory != '') {
+                                                echo "\t\t\t\t\t</optgroup>\n";
+                                            }
+                                            ?>
 										</select>
 									</td>
 								</tr>
@@ -795,37 +795,37 @@ 
 									</td>
 									<td valign="top">
 										<?php
-										$parentlookup = false;
-										if(isset ($_REQUEST['id'])) {
-											if($content['parent'] == 0) {
-												$parentname = $site_name;
-											} else {
-												$parentlookup = $content['parent'];
-											}
-										} elseif(isset ($_REQUEST['pid'])) {
-											if($_REQUEST['pid'] == 0) {
-												$parentname = $site_name;
-											} else {
-												$parentlookup = $_REQUEST['pid'];
-											}
-										} elseif(isset($_POST['parent'])) {
-											if($_POST['parent'] == 0) {
-												$parentname = $site_name;
-											} else {
-												$parentlookup = $_POST['parent'];
-											}
-										} else {
-											$parentname = $site_name;
-											$content['parent'] = 0;
-										}
-										if($parentlookup !== false && is_numeric($parentlookup)) {
-											$rs = $modx->db->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
-											$parentname = $modx->db->getValue($rs);
-											if(!$parentname) {
-												$modx->webAlertAndQuit($_lang["error_no_parent"]);
-											}
-										}
-										?>
+                                        $parentlookup = false;
+                                        if(isset ($_REQUEST['id'])) {
+                                            if($content['parent'] == 0) {
+                                                $parentname = $site_name;
+                                            } else {
+                                                $parentlookup = $content['parent'];
+                                            }
+                                        } elseif(isset ($_REQUEST['pid'])) {
+                                            if($_REQUEST['pid'] == 0) {
+                                                $parentname = $site_name;
+                                            } else {
+                                                $parentlookup = $_REQUEST['pid'];
+                                            }
+                                        } elseif(isset($_POST['parent'])) {
+                                            if($_POST['parent'] == 0) {
+                                                $parentname = $site_name;
+                                            } else {
+                                                $parentlookup = $_POST['parent'];
+                                            }
+                                        } else {
+                                            $parentname = $site_name;
+                                            $content['parent'] = 0;
+                                        }
+                                        if($parentlookup !== false && is_numeric($parentlookup)) {
+                                            $rs = $modx->db->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
+                                            $parentname = $modx->db->getValue($rs);
+                                            if(!$parentname) {
+                                                $modx->webAlertAndQuit($_lang["error_no_parent"]);
+                                            }
+                                        }
+                                        ?>
 										<i id="plock" class="<?= $_style["actions_folder"] ?>" onclick="enableParentSelection(!allowParentSelection);"></i>
 										<b><span id="parentName"><?= (isset($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']) ?> (<?= $parentname ?>)</span></b>
 										<input type="hidden" name="parent" value="<?= (isset($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']) ?>" onchange="documentDirty=true;" />
@@ -833,7 +833,7 @@ 
 								</tr>
 								<tr></tr>
 								<?php
-								/*
+                                /*
 								if($content['type'] == 'reference' || $modx->manager->action == '72') {
 									?>
 									<tr>
@@ -861,7 +861,7 @@ 
 									</tr>
 									<?php
 								}*/
-								?>
+                                ?>
 
 								<?php if($content['type'] == 'document' || $modx->manager->action == '4') { ?>
 									<tr>
@@ -874,36 +874,36 @@ 
 													<select id="which_editor" class="form-control form-control-sm" size="1" name="which_editor" onchange="changeRTE();">
 													<option value="none"><?= $_lang['none'] ?></option>
 														<?php
-														// invoke OnRichTextEditorRegister event
-														$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
-														if(is_array($evtOut)) {
-															for($i = 0; $i < count($evtOut); $i++) {
-																$editor = $evtOut[$i];
-																echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n";
-															}
-														}
-														?>
+                                                        // invoke OnRichTextEditorRegister event
+                                                        $evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
+                                                        if(is_array($evtOut)) {
+                                                            for($i = 0; $i < count($evtOut); $i++) {
+                                                                $editor = $evtOut[$i];
+                                                                echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n";
+                                                            }
+                                                        }
+                                                        ?>
 													</select>
 												</label>
 											</div>
 											<div id="content_body">
 												<?php
-												if(($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) {
-													$htmlContent = $content['content'];
-													?>
+                                                if(($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) {
+                                                    $htmlContent = $content['content'];
+                                                    ?>
 													<div class="section-editor clearfix">
 														<textarea id="ta" name="ta" onchange="documentDirty=true;"><?= $modx->htmlspecialchars($htmlContent) ?></textarea>
 													</div>
 													<?php
-													// Richtext-[*content*]
-													$richtexteditorIds = array();
-													$richtexteditorOptions = array();
-													$richtexteditorIds[$modx->config['which_editor']][] = 'ta';
-													$richtexteditorOptions[$modx->config['which_editor']]['ta'] = '';
-												} else {
-													echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
-												}
-												?>
+                                                    // Richtext-[*content*]
+                                                    $richtexteditorIds = array();
+                                                    $richtexteditorOptions = array();
+                                                    $richtexteditorIds[$modx->config['which_editor']][] = 'ta';
+                                                    $richtexteditorOptions[$modx->config['which_editor']]['ta'] = '';
+                                                } else {
+                                                    echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
+                                                }
+                                                ?>
 											</div>
 										</td>
 									</tr>
@@ -1190,8 +1190,8 @@ 
 
 								<?php
 
-								if($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
-									?>
+                                if($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
+                                    ?>
 									<tr>
 										<td>
 											<span class="warning"><?= $_lang['resource_type'] ?></span>
@@ -1213,15 +1213,15 @@ 
 										<td>
 											<select name="contentType" class="inputBox" onchange="documentDirty=true;">
 												<?php
-												if(!$content['contentType']) {
-													$content['contentType'] = 'text/html';
-												}
-												$custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml");
-												$ct = explode(",", $custom_contenttype);
-												for($i = 0; $i < count($ct); $i++) {
-													echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n";
-												}
-												?>
+                                                if(!$content['contentType']) {
+                                                    $content['contentType'] = 'text/html';
+                                                }
+                                                $custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml");
+                                                $ct = explode(",", $custom_contenttype);
+                                                for($i = 0; $i < count($ct); $i++) {
+                                                    echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n";
+                                                }
+                                                ?>
 											</select>
 										</td>
 									</tr>
@@ -1244,23 +1244,23 @@ 
 										</td>
 									</tr>
 									<?php
-								} else {
-									if($content['type'] != 'reference' && $modx->manager->action != '72') {
-										// non-admin managers creating or editing a document resource
-										?>
+                                } else {
+                                    if($content['type'] != 'reference' && $modx->manager->action != '72') {
+                                        // non-admin managers creating or editing a document resource
+                                        ?>
 										<input type="hidden" name="contentType" value="<?= (isset($content['contentType']) ? $content['contentType'] : "text/html") ?>" />
 										<input type="hidden" name="type" value="document" />
 										<input type="hidden" name="content_dispo" value="<?= (isset($content['content_dispo']) ? $content['content_dispo'] : '0') ?>" />
 										<?php
-									} else {
-										// non-admin managers creating or editing a reference (weblink) resource
-										?>
+                                    } else {
+                                        // non-admin managers creating or editing a reference (weblink) resource
+                                        ?>
 										<input type="hidden" name="type" value="reference" />
 										<input type="hidden" name="contentType" value="text/html" />
 										<?php
-									}
-								}//if mgrRole
-								?>
+                                    }
+                                }//if mgrRole
+                                ?>
 
 								<tr>
 									<td>
@@ -1343,112 +1343,112 @@ 
                     ?>
 
 						<?php
-					/*******************************
+                    /*******************************
 					 * Document Access Permissions */
-					if($use_udperms == 1) {
-						$groupsarray = array();
-						$sql = '';
-
-						$documentId = ($modx->manager->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']));
-						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'];
-
-							// Load up the current permissions and names
-							$vs = array(
-								$tbl_document_group_names,
-								$tbl_document_groups,
-								$documentId
-							);
-							$from = vsprintf("%s AS dgn LEFT JOIN %s AS groups ON groups.document_group=dgn.id AND groups.document='%s'", $vs);
-							$rs = $modx->db->select('dgn.*, groups.id AS link_id', $from, '', 'name');
-						} else {
-							// Just load up the names, we're starting clean
-							$rs = $modx->db->select('*, NULL AS link_id', $tbl_document_group_names, '', 'name');
-						}
-
-						// retain selected doc groups between post
-						if(isset($_POST['docgroups'])) {
-							$groupsarray = array_merge($groupsarray, $_POST['docgroups']);
-						}
+                    if($use_udperms == 1) {
+                        $groupsarray = array();
+                        $sql = '';
+
+                        $documentId = ($modx->manager->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']));
+                        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'];
+
+                            // Load up the current permissions and names
+                            $vs = array(
+                                $tbl_document_group_names,
+                                $tbl_document_groups,
+                                $documentId
+                            );
+                            $from = vsprintf("%s AS dgn LEFT JOIN %s AS groups ON groups.document_group=dgn.id AND groups.document='%s'", $vs);
+                            $rs = $modx->db->select('dgn.*, groups.id AS link_id', $from, '', 'name');
+                        } else {
+                            // Just load up the names, we're starting clean
+                            $rs = $modx->db->select('*, NULL AS link_id', $tbl_document_group_names, '', 'name');
+                        }
+
+                        // retain selected doc groups between post
+                        if(isset($_POST['docgroups'])) {
+                            $groupsarray = array_merge($groupsarray, $_POST['docgroups']);
+                        }
+
+                        $isManager = $modx->hasPermission('access_permissions');
+                        $isWeb = $modx->hasPermission('web_access_permissions');
+
+                        // Setup Basic attributes for each Input box
+                        $inputAttributes = array(
+                            'type' => 'checkbox',
+                            'class' => 'checkbox',
+                            'name' => 'docgroups[]',
+                            'onclick' => 'makePublic(false);',
+                        );
+                        $permissions = array(); // New Permissions array list (this contains the HTML)
+                        $permissions_yes = 0; // count permissions the current mgr user has
+                        $permissions_no = 0; // count permissions the current mgr user doesn't have
+
+                        // Loop through the permissions list
+                        while($row = $modx->db->getRow($rs)) {
+
+                            // Create an inputValue pair (group ID and group link (if it exists))
+                            $inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new');
+                            $inputId = 'group-' . $row['id'];
+
+                            $checked = in_array($inputValue, $groupsarray);
+                            if($checked) {
+                                $notPublic = true;
+                            } // Mark as private access (either web or manager)
+
+                            // Skip the access permission if the user doesn't have access...
+                            if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
+                                continue;
+                            }
 
-						$isManager = $modx->hasPermission('access_permissions');
-						$isWeb = $modx->hasPermission('web_access_permissions');
-
-						// Setup Basic attributes for each Input box
-						$inputAttributes = array(
-							'type' => 'checkbox',
-							'class' => 'checkbox',
-							'name' => 'docgroups[]',
-							'onclick' => 'makePublic(false);',
-						);
-						$permissions = array(); // New Permissions array list (this contains the HTML)
-						$permissions_yes = 0; // count permissions the current mgr user has
-						$permissions_no = 0; // count permissions the current mgr user doesn't have
-
-						// Loop through the permissions list
-						while($row = $modx->db->getRow($rs)) {
-
-							// Create an inputValue pair (group ID and group link (if it exists))
-							$inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new');
-							$inputId = 'group-' . $row['id'];
-
-							$checked = in_array($inputValue, $groupsarray);
-							if($checked) {
-								$notPublic = true;
-							} // Mark as private access (either web or manager)
-
-							// Skip the access permission if the user doesn't have access...
-							if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
-								continue;
-							}
-
-							// Setup attributes for this Input box
-							$inputAttributes['id'] = $inputId;
-							$inputAttributes['value'] = $inputValue;
-							if($checked) {
-								$inputAttributes['checked'] = 'checked';
-							} else {
-								unset($inputAttributes['checked']);
-							}
-
-							// Create attribute string list
-							$inputString = array();
-							foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
-
-							// Make the <input> HTML
-							$inputHTML = '<input ' . implode(' ', $inputString) . ' />';
-
-							// does user have this permission?
-							$from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg";
-							$vs = array(
-								$row['id'],
-								$_SESSION['mgrInternalKey']
-							);
-							$where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs);
-							$rsp = $modx->db->select('COUNT(mg.id)', $from, $where);
-							$count = $modx->db->getValue($rsp);
-							if($count > 0) {
-								++$permissions_yes;
-							} else {
-								++$permissions_no;
-							}
-							$permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>';
-						}
-						// if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public
-						if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
-							$permissions = array();
-						}
+                            // Setup attributes for this Input box
+                            $inputAttributes['id'] = $inputId;
+                            $inputAttributes['value'] = $inputValue;
+                            if($checked) {
+                                $inputAttributes['checked'] = 'checked';
+                            } else {
+                                unset($inputAttributes['checked']);
+                            }
 
-						// See if the Access Permissions section is worth displaying...
-						if(!empty($permissions)) {
-							// Add the "All Document Groups" item if we have rights in both contexts
-							if($isManager && $isWeb) {
-								array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>');
-							}
-							// Output the permissions list...
-							?>
+                            // Create attribute string list
+                            $inputString = array();
+                            foreach($inputAttributes as $k => $v) $inputString[] = $k . '="' . $v . '"';
+
+                            // Make the <input> HTML
+                            $inputHTML = '<input ' . implode(' ', $inputString) . ' />';
+
+                            // does user have this permission?
+                            $from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg";
+                            $vs = array(
+                                $row['id'],
+                                $_SESSION['mgrInternalKey']
+                            );
+                            $where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs);
+                            $rsp = $modx->db->select('COUNT(mg.id)', $from, $where);
+                            $count = $modx->db->getValue($rsp);
+                            if($count > 0) {
+                                ++$permissions_yes;
+                            } else {
+                                ++$permissions_no;
+                            }
+                            $permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>';
+                        }
+                        // if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public
+                        if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
+                            $permissions = array();
+                        }
+
+                        // See if the Access Permissions section is worth displaying...
+                        if(!empty($permissions)) {
+                            // Add the "All Document Groups" item if we have rights in both contexts
+                            if($isManager && $isWeb) {
+                                array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>');
+                            }
+                            // Output the permissions list...
+                            ?>
 							<!-- Access Permissions -->
 							<div class="tab-page" id="tabAccess">
 								<h2 class="tab" id="tab_access_header"><?= $_lang['access_permissions'] ?></h2>
@@ -1482,31 +1482,31 @@ 
 								</ul>
 							</div><!--div class="tab-page" id="tabAccess"-->
 							<?php
-						} // !empty($permissions)
-						elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
-							?>
+                        } // !empty($permissions)
+                        elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
+                            ?>
 							<p><?= $_lang["access_permissions_docs_collision"] ?></p>
 							<?php
 
-						}
-					}
-					/* End Document Access Permissions *
+                        }
+                    }
+                    /* End Document Access Permissions *
 					 ***********************************/
-					?>
+                    ?>
 
 					<input type="submit" name="save" style="display:none" />
 					<?php
 
-					// invoke OnDocFormRender event
-					$evtOut = $modx->invokeEvent('OnDocFormRender', array(
-						'id' => $id,
-						'template' => $content['template']
-					));
+                    // invoke OnDocFormRender event
+                    $evtOut = $modx->invokeEvent('OnDocFormRender', array(
+                        'id' => $id,
+                        'template' => $content['template']
+                    ));
 
-					if(is_array($evtOut)) {
-						echo implode('', $evtOut);
-					}
-					?>
+                    if(is_array($evtOut)) {
+                        echo implode('', $evtOut);
+                    }
+                    ?>
 				</div><!--div class="tab-pane" id="documentPane"-->
 			</div><!--div class="sectionBody"-->
 		</fieldset>
@@ -1517,62 +1517,62 @@ 
 	</script>
 <?php
 if(($content['richtext'] == 1 || $modx->manager->action == '4' || $modx->manager->action == '72') && $use_editor == 1) {
-	if(is_array($richtexteditorIds)) {
-		foreach($richtexteditorIds as $editor => $elements) {
-			// invoke OnRichTextEditorInit event
-			$evtOut = $modx->invokeEvent('OnRichTextEditorInit', array(
-				'editor' => $editor,
-				'elements' => $elements,
-				'options' => $richtexteditorOptions[$editor]
-			));
-			if(is_array($evtOut)) {
-				echo implode('', $evtOut);
-			}
-		}
-	}
+    if(is_array($richtexteditorIds)) {
+        foreach($richtexteditorIds as $editor => $elements) {
+            // invoke OnRichTextEditorInit event
+            $evtOut = $modx->invokeEvent('OnRichTextEditorInit', array(
+                'editor' => $editor,
+                'elements' => $elements,
+                'options' => $richtexteditorOptions[$editor]
+            ));
+            if(is_array($evtOut)) {
+                echo implode('', $evtOut);
+            }
+        }
+    }
 }
 
 function getDefaultTemplate() {
-	global $modx;
-
-	switch($modx->config['auto_template_logic']) {
-		case 'sibling':
-			if(!isset($_GET['pid']) || empty($_GET['pid'])) {
-				$site_start = $modx->config['site_start'];
-				$where = "sc.isfolder=0 AND sc.id!='{$site_start}'";
-				$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', $where, 'menuindex', 'ASC', 1);
-				if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
-					$default_template = $sibl[0]['template'];
-				}
-			} else {
-				$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
-				if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
-					$default_template = $sibl[0]['template'];
-				} else {
-					$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 0, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
-					if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
-						$default_template = $sibl[0]['template'];
-					}
-				}
-			}
-			if(isset($default_template)) {
-				break;
-			} // If $default_template could not be determined, fall back / through to "parent"-mode
-		case 'parent':
-			if(isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) {
-				$parent = $modx->getPageInfo($_REQUEST['pid'], 0, 'template');
-				if(isset($parent['template'])) {
-					$default_template = $parent['template'];
-				}
-			}
-			break;
-		case 'system':
-		default: // default_template is already set
-			$default_template = $modx->config['default_template'];
-	}
-	if(!isset($default_template)) {
-		$default_template = $modx->config['default_template'];
-	} // default_template is already set
-
-	return $default_template;
+    global $modx;
+
+    switch($modx->config['auto_template_logic']) {
+        case 'sibling':
+            if(!isset($_GET['pid']) || empty($_GET['pid'])) {
+                $site_start = $modx->config['site_start'];
+                $where = "sc.isfolder=0 AND sc.id!='{$site_start}'";
+                $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', $where, 'menuindex', 'ASC', 1);
+                if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                    $default_template = $sibl[0]['template'];
+                }
+            } else {
+                $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
+                if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                    $default_template = $sibl[0]['template'];
+                } else {
+                    $sibl = $modx->getDocumentChildren($_REQUEST['pid'], 0, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
+                    if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+                        $default_template = $sibl[0]['template'];
+                    }
+                }
+            }
+            if(isset($default_template)) {
+                break;
+            } // If $default_template could not be determined, fall back / through to "parent"-mode
+        case 'parent':
+            if(isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) {
+                $parent = $modx->getPageInfo($_REQUEST['pid'], 0, 'template');
+                if(isset($parent['template'])) {
+                    $default_template = $parent['template'];
+                }
+            }
+            break;
+        case 'system':
+        default: // default_template is already set
+            $default_template = $modx->config['default_template'];
+    }
+    if(!isset($default_template)) {
+        $default_template = $modx->config['default_template'];
+    } // default_template is already set
+
+    return $default_template;
 }

Spacing +146 added lines, -146 removed lines

@@ -1,35 +1,35 @@ 
 <?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.");
 }
 
 /********************/
-$sd = isset($_REQUEST['dir']) ? '&dir=' . $_REQUEST['dir'] : '&dir=DESC';
-$sb = isset($_REQUEST['sort']) ? '&sort=' . $_REQUEST['sort'] : '&sort=createdon';
-$pg = isset($_REQUEST['page']) ? '&page=' . (int) $_REQUEST['page'] : '';
-$add_path = $sd . $sb . $pg;
+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
+$add_path = $sd.$sb.$pg;
 /*******************/
 
 // check permissions
-switch($modx->manager->action) {
+switch ($modx->manager->action) {
 	case 27:
-		if(!$modx->hasPermission('edit_document')) {
+		if (!$modx->hasPermission('edit_document')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 		}
 		break;
 	case 85:
 	case 72:
 	case 4:
-		if(!$modx->hasPermission('new_document')) {
+		if (!$modx->hasPermission('new_document')) {
 			$modx->webAlertAndQuit($_lang["error_no_privileges"]);
-		} elseif(isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
+		} elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
 			// check user has permissions for parent
-			include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+			include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php');
 			$udperms = new udperms();
 			$udperms->user = $modx->getLoginUserID();
 			$udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid'];
 			$udperms->role = $_SESSION['mgrRole'];
-			if(!$udperms->checkPermissions()) {
+			if (!$udperms->checkPermissions()) {
 				$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 			}
 		}
@@ -38,7 +38,7 @@ 
 		$modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 // Get table names (alphabetical)
 $tbl_categories = $modx->getFullTableName('categories');
@@ -53,22 +53,22 @@ 
 $tbl_site_tmplvar_templates = $modx->getFullTableName('site_tmplvar_templates');
 $tbl_site_tmplvars = $modx->getFullTableName('site_tmplvars');
 
-if($modx->manager->action == 27) {
+if ($modx->manager->action == 27) {
 	//editing an existing document
 	// check permissions on the document
-	include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+	include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php');
 	$udperms = new udperms();
 	$udperms->user = $modx->getLoginUserID();
 	$udperms->document = $id;
 	$udperms->role = $_SESSION['mgrRole'];
 
-	if(!$udperms->checkPermissions()) {
+	if (!$udperms->checkPermissions()) {
 		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 	}
 }
 
 // check to see if resource isn't locked
-if($lockedEl = $modx->elementIsLocked(7, $id)) {
+if ($lockedEl = $modx->elementIsLocked(7, $id)) {
 	$modx->webAlertAndQuit(sprintf($_lang['lock_msg'], $lockedEl['username'], $_lang['resource']));
 }
 // end check for lock
@@ -77,27 +77,27 @@ 
 $modx->lockElement(7, $id);
 
 // get document groups for current user
-if($_SESSION['mgrDocgroups']) {
+if ($_SESSION['mgrDocgroups']) {
 	$docgrp = implode(',', $_SESSION['mgrDocgroups']);
 }
 
-if(!empty ($id)) {
+if (!empty ($id)) {
 	$access = sprintf("1='%s' OR sc.privatemgr=0", $_SESSION['mgrRole']);
-	if($docgrp) {
+	if ($docgrp) {
 		$access .= " OR dg.document_group IN ({$docgrp})";
 	}
 	$rs = $modx->db->select('sc.*', "{$tbl_site_content} AS sc LEFT JOIN {$tbl_document_groups} AS dg ON dg.document=sc.id", "sc.id='{$id}' AND ({$access})");
 	$content = array();
 	$content = $modx->db->getRow($rs);
 	$modx->documentObject = &$content;
-	if(!$content) {
+	if (!$content) {
 		$modx->webAlertAndQuit($_lang["access_permission_denied"]);
 	}
 	$_SESSION['itemname'] = $content['pagetitle'];
 } else {
 	$content = array();
 
-	if(isset($_REQUEST['newtemplate'])) {
+	if (isset($_REQUEST['newtemplate'])) {
 		$content['template'] = $_REQUEST['newtemplate'];
 	} else {
 		$content['template'] = getDefaultTemplate();
@@ -108,22 +108,22 @@ 
 
 // restore saved form
 $formRestored = $modx->manager->loadFormValues();
-if(isset($_REQUEST['newtemplate'])) {
+if (isset($_REQUEST['newtemplate'])) {
 	$formRestored = true;
 }
 
 // retain form values if template was changed
 // edited to convert pub_date and unpub_date
 // sottwell 02-09-2006
-if($formRestored == true) {
+if ($formRestored == true) {
 	$content = array_merge($content, $_POST);
 	$content['content'] = $_POST['ta'];
-	if(empty ($content['pub_date'])) {
+	if (empty ($content['pub_date'])) {
 		unset ($content['pub_date']);
 	} else {
 		$content['pub_date'] = $modx->toTimeStamp($content['pub_date']);
 	}
-	if(empty ($content['unpub_date'])) {
+	if (empty ($content['unpub_date'])) {
 		unset ($content['unpub_date']);
 	} else {
 		$content['unpub_date'] = $modx->toTimeStamp($content['unpub_date']);
@@ -131,12 +131,12 @@ 
 }
 
 // increase menu index if this is a new document
-if(!isset ($_REQUEST['id'])) {
-	if(!isset ($modx->config['auto_menuindex'])) {
+if (!isset ($_REQUEST['id'])) {
+	if (!isset ($modx->config['auto_menuindex'])) {
 		$modx->config['auto_menuindex'] = 1;
 	}
-	if($modx->config['auto_menuindex']) {
-		$pid = (int)$_REQUEST['pid'];
+	if ($modx->config['auto_menuindex']) {
+		$pid = (int) $_REQUEST['pid'];
 		$rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'");
 		$content['menuindex'] = $modx->db->getValue($rs);
 	} else {
@@ -144,14 +144,14 @@ 
 	}
 }
 
-if(isset ($_POST['which_editor'])) {
+if (isset ($_POST['which_editor'])) {
 	$modx->config['which_editor'] = $_POST['which_editor'];
 }
 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 7;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 ?>
 	<script type="text/javascript">
 		/* <![CDATA[ */
@@ -181,7 +181,7 @@ 
 			},
 			cancel: function() {
 				documentDirty = false;
-				document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id=' . $id . $add_path) ?>';
+				document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id='.$id.$add_path) ?>';
 			},
 			duplicate: function() {
 				if(confirm("<?= $_lang['confirm_resource_duplicate']?>") === true) {
@@ -189,7 +189,7 @@ 
 				}
 			},
 			view: function() {
-				window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'] . 'index.php?id=' . $id ?>', 'previeWin');
+				window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'].'index.php?id='.$id ?>', 'previeWin');
 			}
 		};
 
@@ -551,7 +551,7 @@ 
 			'template' => $content['template']
 		));
 
-		if(is_array($evtOut)) {
+		if (is_array($evtOut)) {
 			echo implode('', $evtOut);
 		}
 
@@ -575,8 +575,8 @@ 
 		<fieldset id="create_edit">
 
 			<h1>
-				<i class="fa fa-pencil-square-o"></i><?php if(isset($_REQUEST['id'])) {
-					echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>';
+				<i class="fa fa-pencil-square-o"></i><?php if (isset($_REQUEST['id'])) {
+					echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']).(iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '').'<small>('.$_REQUEST['id'].')</small>';
 				} else {
 				    if ($modx->manager->action == '4') {
                         echo $_lang['add_resource'];
@@ -592,36 +592,36 @@ 
 
 			<?php
 			// breadcrumbs
-			if($modx->config['use_breadcrumbs']) {
+			if ($modx->config['use_breadcrumbs']) {
 				$temp = array();
 				$title = isset($content['pagetitle']) ? $content['pagetitle'] : $_lang['create_resource_title'];
 
-				if(isset($_REQUEST['id']) && $content['parent'] != 0) {
+				if (isset($_REQUEST['id']) && $content['parent'] != 0) {
 					$bID = (int) $_REQUEST['id'];
 					$temp = $modx->getParentIds($bID);
-				} else if(isset($_REQUEST['pid'])) {
+				} else if (isset($_REQUEST['pid'])) {
 					$bID = (int) $_REQUEST['pid'];
 					$temp = $modx->getParentIds($bID);
 					array_unshift($temp, $bID);
 				}
 
-				if($temp) {
+				if ($temp) {
 					$parents = implode(',', $temp);
 
-					if(!empty($parents)) {
+					if (!empty($parents)) {
 						$where = "FIND_IN_SET(id,'{$parents}') DESC";
 						$rs = $modx->db->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
-						while($row = $modx->db->getRow($rs)) {
+						while ($row = $modx->db->getRow($rs)) {
 							$out .= '<li class="breadcrumbs__li">
-                                <a href="index.php?a=27&id=' . $row['id'] . '" class="breadcrumbs__a">' . htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']) . '</a>
+                                <a href="index.php?a=27&id=' . $row['id'].'" class="breadcrumbs__a">'.htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']).'</a>
                                 <span class="breadcrumbs__sep">&gt;</span>
                             </li>';
 						}
 					}
 				}
 
-				$out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>';
-				echo '<ul class="breadcrumbs">' . $out . '</ul>';
+				$out .= '<li class="breadcrumbs__li breadcrumbs__li_current">'.$title.'</li>';
+				echo '<ul class="breadcrumbs">'.$out.'</ul>';
 			}
 			?>
 
@@ -638,7 +638,7 @@ 
 					$evtOut = $modx->invokeEvent('OnDocFormTemplateRender', array(
 						'id' => $id
 					));
-					if(is_array($evtOut)) {
+					if (is_array($evtOut)) {
 						echo implode('', $evtOut);
 					} else {
 						?>
@@ -694,7 +694,7 @@ 
 									</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>
@@ -730,17 +730,17 @@ 
 											$from = "{$tbl_site_templates} AS t LEFT JOIN {$tbl_categories} AS c ON t.category = c.id";
 											$rs = $modx->db->select($field, $from, '', 'c.category, t.templatename ASC');
 											$currentCategory = '';
-											while($row = $modx->db->getRow($rs)) {
-												if($row['selectable'] != 1 && $row['id'] != $content['template']) {
+											while ($row = $modx->db->getRow($rs)) {
+												if ($row['selectable'] != 1 && $row['id'] != $content['template']) {
 													continue;
 												};
 												// Skip if not selectable but show if selected!
 												$thisCategory = $row['category'];
-												if($thisCategory == null) {
+												if ($thisCategory == null) {
 													$thisCategory = $_lang["no_category"];
 												}
-												if($thisCategory != $currentCategory) {
-													if($closeOptGroup) {
+												if ($thisCategory != $currentCategory) {
+													if ($closeOptGroup) {
 														echo "\t\t\t\t\t</optgroup>\n";
 													}
 													echo "\t\t\t\t\t<optgroup label=\"$thisCategory\">\n";
@@ -749,10 +749,10 @@ 
 
 												$selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : '';
 
-												echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";
+												echo "\t\t\t\t\t".'<option value="'.$row['id'].'"'.$selectedtext.'>'.$row['templatename']."</option>\n";
 												$currentCategory = $thisCategory;
 											}
-											if($thisCategory != '') {
+											if ($thisCategory != '') {
 												echo "\t\t\t\t\t</optgroup>\n";
 											}
 											?>
@@ -796,20 +796,20 @@ 
 									<td valign="top">
 										<?php
 										$parentlookup = false;
-										if(isset ($_REQUEST['id'])) {
-											if($content['parent'] == 0) {
+										if (isset ($_REQUEST['id'])) {
+											if ($content['parent'] == 0) {
 												$parentname = $site_name;
 											} else {
 												$parentlookup = $content['parent'];
 											}
-										} elseif(isset ($_REQUEST['pid'])) {
-											if($_REQUEST['pid'] == 0) {
+										} elseif (isset ($_REQUEST['pid'])) {
+											if ($_REQUEST['pid'] == 0) {
 												$parentname = $site_name;
 											} else {
 												$parentlookup = $_REQUEST['pid'];
 											}
-										} elseif(isset($_POST['parent'])) {
-											if($_POST['parent'] == 0) {
+										} elseif (isset($_POST['parent'])) {
+											if ($_POST['parent'] == 0) {
 												$parentname = $site_name;
 											} else {
 												$parentlookup = $_POST['parent'];
@@ -818,10 +818,10 @@ 
 											$parentname = $site_name;
 											$content['parent'] = 0;
 										}
-										if($parentlookup !== false && is_numeric($parentlookup)) {
+										if ($parentlookup !== false && is_numeric($parentlookup)) {
 											$rs = $modx->db->select('pagetitle', $tbl_site_content, "id='{$parentlookup}'");
 											$parentname = $modx->db->getValue($rs);
-											if(!$parentname) {
+											if (!$parentname) {
 												$modx->webAlertAndQuit($_lang["error_no_parent"]);
 											}
 										}
@@ -863,7 +863,7 @@ 
 								}*/
 								?>
 
-								<?php if($content['type'] == 'document' || $modx->manager->action == '4') { ?>
+								<?php if ($content['type'] == 'document' || $modx->manager->action == '4') { ?>
 									<tr>
 										<td colspan="2">
 											<hr>
@@ -876,8 +876,8 @@ 
 														<?php
 														// invoke OnRichTextEditorRegister event
 														$evtOut = $modx->invokeEvent("OnRichTextEditorRegister");
-														if(is_array($evtOut)) {
-															for($i = 0; $i < count($evtOut); $i++) {
+														if (is_array($evtOut)) {
+															for ($i = 0; $i < count($evtOut); $i++) {
 																$editor = $evtOut[$i];
 																echo "\t\t\t", '<option value="', $editor, '"', ($modx->config['which_editor'] == $editor ? ' selected="selected"' : ''), '>', $editor, "</option>\n";
 															}
@@ -888,7 +888,7 @@ 
 											</div>
 											<div id="content_body">
 												<?php
-												if(($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) {
+												if (($content['richtext'] == 1 || $modx->manager->action == '4') && $use_editor == 1) {
 													$htmlContent = $content['content'];
 													?>
 													<div class="section-editor clearfix">
@@ -901,7 +901,7 @@ 
 													$richtexteditorIds[$modx->config['which_editor']][] = 'ta';
 													$richtexteditorOptions[$modx->config['which_editor']]['ta'] = '';
 												} else {
-													echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
+													echo "\t".'<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>'."\n";
 												}
 												?>
 											</div>
@@ -917,7 +917,7 @@ 
 
                             if (($content['type'] == 'document' || $modx->manager->action == '4') || ($content['type'] == 'reference' || $modx->manager->action == 72)) {
                                 $template = $default_template;
-                                $group_tvs = empty($modx->config['group_tvs']) ? 0 : (int)$modx->config['group_tvs'];
+                                $group_tvs = empty($modx->config['group_tvs']) ? 0 : (int) $modx->config['group_tvs'];
                                 if (isset ($_REQUEST['newtemplate'])) {
                                     $template = $_REQUEST['newtemplate'];
                                 } else {
@@ -945,10 +945,10 @@ 
                                 );
                                 $sort = 'tvtpl.rank,tv.rank, tv.id';
                                 if ($group_tvs) {
-                                    $field .= ', IFNULL(tv.category,0) as category_id, IFNULL(cat.category,"' . $_lang['no_category'] . '") AS category, IFNULL(cat.rank,0) AS category_rank';
+                                    $field .= ', IFNULL(tv.category,0) as category_id, IFNULL(cat.category,"'.$_lang['no_category'].'") AS category, IFNULL(cat.rank,0) AS category_rank';
                                     $from .= '
-                                    LEFT JOIN ' . $tbl_categories . ' AS cat ON cat.id=tv.category';
-                                    $sort = 'cat.rank,cat.id,' . $sort;
+                                    LEFT JOIN ' . $tbl_categories.' AS cat ON cat.id=tv.category';
+                                    $sort = 'cat.rank,cat.id,'.$sort;
                                 }
                                 $where = vsprintf("tvtpl.templateid='%s' AND (1='%s' OR ISNULL(tva.documentgroup) %s)", $vs);
                                 $rs = $modx->db->select($field, $from, $where, $sort);
@@ -957,37 +957,37 @@ 
                         <!-- Template Variables -->' . "\n";
                                     if (!$group_tvs) {
                                         $templateVariables .= '
-                                    <div class="sectionHeader" id="tv_header">' . $_lang['settings_templvars'] . '</div>
+                                    <div class="sectionHeader" id="tv_header">' . $_lang['settings_templvars'].'</div>
                                         <div class="sectionBody tmplvars">
                                             <table>';
                                     } else if ($group_tvs == 2) {
                                         $templateVariables .= '
                     <div class="tab-section">
-                        <div class="tab-header" id="tv_header">' . $_lang['settings_templvars'] . '</div>
+                        <div class="tab-header" id="tv_header">' . $_lang['settings_templvars'].'</div>
                         <div class="tab-pane" id="paneTemplateVariables">
                             <script type="text/javascript">
-                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');
+                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').');
                             </script>';
                                     } else if ($group_tvs == 3) {
                                         $templateVariables .= '
                         <div id="templateVariables" class="tab-page tmplvars">
-                            <h2 class="tab">' . $_lang['settings_templvars'] . '</h2>
+                            <h2 class="tab">' . $_lang['settings_templvars'].'</h2>
                             <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'templateVariables\'));</script>';
                                     } else if ($group_tvs == 4) {
                                         $templateVariables .= '
                     <div id="templateVariables" class="tab-page tmplvars">
-                        <h2 class="tab">' . $_lang['settings_templvars'] . '</h2>
+                        <h2 class="tab">' . $_lang['settings_templvars'].'</h2>
                         <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'templateVariables\'));</script>
                         
                         <div class="tab-pane" id="paneTemplateVariables">
                             <script type="text/javascript">
-                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');
+                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').');
                             </script>';
                                     }
 
                                     $tvsArray = $modx->db->makeArray($rs, 'name');
-                                    require_once(MODX_MANAGER_PATH . 'includes/tmplvars.inc.php');
-                                    require_once(MODX_MANAGER_PATH . 'includes/tmplvars.commands.inc.php');
+                                    require_once(MODX_MANAGER_PATH.'includes/tmplvars.inc.php');
+                                    require_once(MODX_MANAGER_PATH.'includes/tmplvars.commands.inc.php');
                                     $i = 0;
                                     $tab = '';
                                     foreach ($tvsArray as $row) {
@@ -995,8 +995,8 @@ 
                                             if ($group_tvs == 1 || $group_tvs == 3) {
                                                 if ($i === 0) {
                                                     $templateVariables .= '
-                            <div class="tab-section" id="tabTV_' . $row['category_id'] . '">
-                                <div class="tab-header">' . $row['category'] . '</div>
+                            <div class="tab-section" id="tabTV_' . $row['category_id'].'">
+                                <div class="tab-header">' . $row['category'].'</div>
                                 <div class="tab-body tmplvars">
                                     <table>' . "\n";
                                                 } else {
@@ -1005,17 +1005,17 @@ 
                                 </div>
                             </div>
                             
-                            <div class="tab-section" id="tabTV_' . $row['category_id'] . '">
-                                <div class="tab-header">' . $row['category'] . '</div>
+                            <div class="tab-section" id="tabTV_' . $row['category_id'].'">
+                                <div class="tab-header">' . $row['category'].'</div>
                                 <div class="tab-body tmplvars">
                                     <table>';
                                                 }
                                             } else if ($group_tvs == 2 || $group_tvs == 4) {
                                                 if ($i === 0) {
                                                     $templateVariables .= '
-                            <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
-                                <h2 class="tab">' . $row['category'] . '</h2>
-                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
+                            <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
+                                <h2 class="tab">' . $row['category'].'</h2>
+                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
                                 
                                 <div class="tab-body tmplvars">
                                     <table>';
@@ -1025,9 +1025,9 @@ 
                                 </div>
                             </div>
                             
-                            <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
-                                <h2 class="tab">' . $row['category'] . '</h2>
-                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
+                            <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
+                                <h2 class="tab">' . $row['category'].'</h2>
+                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
                                 
                                 <div class="tab-body tmplvars">
                                     <table>';
@@ -1035,18 +1035,18 @@ 
                                             } else if ($group_tvs == 5) {
                                                 if ($i === 0) {
                                                     $templateVariables .= '
-                                <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
-                                    <h2 class="tab">' . $row['category'] . '</h2>
-                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
+                                <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
+                                    <h2 class="tab">' . $row['category'].'</h2>
+                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
                                     <table>';
                                                 } else {
                                                     $templateVariables .= '
                                     </table>
                                 </div>
                                 
-                                <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
-                                    <h2 class="tab">' . $row['category'] . '</h2>
-                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
+                                <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
+                                    <h2 class="tab">' . $row['category'].'</h2>
+                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
                                     
                                     <table>';
                                                 }
@@ -1064,8 +1064,8 @@ 
                                                 $editor = isset($tvOptions['editor']) ? $tvOptions['editor'] : $modx->config['which_editor'];
                                             };
                                             // Add richtext editor to the list
-                                            $richtexteditorIds[$editor][] = "tv" . $row['id'];
-                                            $richtexteditorOptions[$editor]["tv" . $row['id']] = $tvOptions;
+                                            $richtexteditorIds[$editor][] = "tv".$row['id'];
+                                            $richtexteditorOptions[$editor]["tv".$row['id']] = $tvOptions;
                                         }
                                         // splitter
                                         if ($group_tvs) {
@@ -1079,24 +1079,24 @@ 
                                         }
 
                                         // post back value
-                                        if (array_key_exists('tv' . $row['id'], $_POST)) {
-                                            if (is_array($_POST['tv' . $row['id']])) {
-                                                $tvPBV = implode('||', $_POST['tv' . $row['id']]);
+                                        if (array_key_exists('tv'.$row['id'], $_POST)) {
+                                            if (is_array($_POST['tv'.$row['id']])) {
+                                                $tvPBV = implode('||', $_POST['tv'.$row['id']]);
                                             } else {
-                                                $tvPBV = $_POST['tv' . $row['id']];
+                                                $tvPBV = $_POST['tv'.$row['id']];
                                             }
                                         } else {
                                             $tvPBV = $row['value'];
                                         }
 
-                                        $tvDescription = (!empty($row['description'])) ? '<br /><span class="comment">' . $row['description'] . '</span>' : '';
-                                        $tvInherited = (substr($tvPBV, 0, 8) == '@INHERIT') ? '<br /><span class="comment inherited">(' . $_lang['tmplvars_inherited'] . ')</span>' : '';
-                                        $tvName = $modx->hasPermission('edit_template') ? '<br/><small class="protectedNode">[*' . $row['name'] . '*]</small>' : '';
+                                        $tvDescription = (!empty($row['description'])) ? '<br /><span class="comment">'.$row['description'].'</span>' : '';
+                                        $tvInherited = (substr($tvPBV, 0, 8) == '@INHERIT') ? '<br /><span class="comment inherited">('.$_lang['tmplvars_inherited'].')</span>' : '';
+                                        $tvName = $modx->hasPermission('edit_template') ? '<br/><small class="protectedNode">[*'.$row['name'].'*]</small>' : '';
 
                                         $templateVariables .= '
                                         <tr>
-                                            <td><span class="warning">' . $row['caption'] . $tvName . '</span>' . $tvDescription . $tvInherited . '</td>
-                                            <td><div style="position:relative;' . ($row['type'] == 'date' ? '' : '') . '">' . renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row, $tvsArray) . '</div></td>
+                                            <td><span class="warning">' . $row['caption'].$tvName.'</span>'.$tvDescription.$tvInherited.'</td>
+                                            <td><div style="position:relative;' . ($row['type'] == 'date' ? '' : '').'">'.renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row, $tvsArray).'</div></td>
                                         </tr>';
 
                                         $tab = $row['category_id'];
@@ -1190,7 +1190,7 @@ 
 
 								<?php
 
-								if($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
+								if ($_SESSION['mgrRole'] == 1 || $modx->manager->action != '27' || $_SESSION['mgrInternalKey'] == $content['createdby'] || $modx->hasPermission('change_resourcetype')) {
 									?>
 									<tr>
 										<td>
@@ -1213,13 +1213,13 @@ 
 										<td>
 											<select name="contentType" class="inputBox" onchange="documentDirty=true;">
 												<?php
-												if(!$content['contentType']) {
+												if (!$content['contentType']) {
 													$content['contentType'] = 'text/html';
 												}
 												$custom_contenttype = (isset ($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml");
 												$ct = explode(",", $custom_contenttype);
-												for($i = 0; $i < count($ct); $i++) {
-													echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n";
+												for ($i = 0; $i < count($ct); $i++) {
+													echo "\t\t\t\t\t".'<option value="'.$ct[$i].'"'.($content['contentType'] == $ct[$i] ? ' selected="selected"' : '').'>'.$ct[$i]."</option>\n";
 												}
 												?>
 											</select>
@@ -1245,7 +1245,7 @@ 
 									</tr>
 									<?php
 								} else {
-									if($content['type'] != 'reference' && $modx->manager->action != '72') {
+									if ($content['type'] != 'reference' && $modx->manager->action != '72') {
 										// non-admin managers creating or editing a document resource
 										?>
 										<input type="hidden" name="contentType" value="<?= (isset($content['contentType']) ? $content['contentType'] : "text/html") ?>" />
@@ -1345,15 +1345,15 @@ 
 						<?php
 					/*******************************
 					 * Document Access Permissions */
-					if($use_udperms == 1) {
+					if ($use_udperms == 1) {
 						$groupsarray = array();
 						$sql = '';
 
 						$documentId = ($modx->manager->action == '27' ? $id : (!empty($_REQUEST['pid']) ? $_REQUEST['pid'] : $content['parent']));
-						if($documentId > 0) {
+						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(
@@ -1369,7 +1369,7 @@ 
 						}
 
 						// retain selected doc groups between post
-						if(isset($_POST['docgroups'])) {
+						if (isset($_POST['docgroups'])) {
 							$groupsarray = array_merge($groupsarray, $_POST['docgroups']);
 						}
 
@@ -1388,26 +1388,26 @@ 
 						$permissions_no = 0; // count permissions the current mgr user doesn't have
 
 						// Loop through the permissions list
-						while($row = $modx->db->getRow($rs)) {
+						while ($row = $modx->db->getRow($rs)) {
 
 							// Create an inputValue pair (group ID and group link (if it exists))
-							$inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new');
-							$inputId = 'group-' . $row['id'];
+							$inputValue = $row['id'].','.($row['link_id'] ? $row['link_id'] : 'new');
+							$inputId = 'group-'.$row['id'];
 
 							$checked = in_array($inputValue, $groupsarray);
-							if($checked) {
+							if ($checked) {
 								$notPublic = true;
 							} // Mark as private access (either web or manager)
 
 							// Skip the access permission if the user doesn't have access...
-							if((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
+							if ((!$isManager && $row['private_memgroup'] == '1') || (!$isWeb && $row['private_webgroup'] == '1')) {
 								continue;
 							}
 
 							// Setup attributes for this Input box
 							$inputAttributes['id'] = $inputId;
 							$inputAttributes['value'] = $inputValue;
-							if($checked) {
+							if ($checked) {
 								$inputAttributes['checked'] = 'checked';
 							} else {
 								unset($inputAttributes['checked']);
@@ -1415,10 +1415,10 @@ 
 
 							// 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) . ' />';
+							$inputHTML = '<input '.implode(' ', $inputString).' />';
 
 							// does user have this permission?
 							$from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg";
@@ -1429,23 +1429,23 @@ 
 							$where = vsprintf("mga.membergroup=mg.user_group AND mga.documentgroup=%s AND mg.member=%s", $vs);
 							$rsp = $modx->db->select('COUNT(mg.id)', $from, $where);
 							$count = $modx->db->getValue($rsp);
-							if($count > 0) {
+							if ($count > 0) {
 								++$permissions_yes;
 							} else {
 								++$permissions_no;
 							}
-							$permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>';
+							$permissions[] = "\t\t".'<li>'.$inputHTML.'<label for="'.$inputId.'">'.$row['name'].'</label></li>';
 						}
 						// if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public
-						if($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
+						if ($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
 							$permissions = array();
 						}
 
 						// See if the Access Permissions section is worth displaying...
-						if(!empty($permissions)) {
+						if (!empty($permissions)) {
 							// Add the "All Document Groups" item if we have rights in both contexts
-							if($isManager && $isWeb) {
-								array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>');
+							if ($isManager && $isWeb) {
+								array_unshift($permissions, "\t\t".'<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"'.(!$notPublic ? ' checked="checked"' : '').' onclick="makePublic(true);" /><label for="groupall" class="warning">'.$_lang['all_doc_groups'].'</label></li>');
 							}
 							// Output the permissions list...
 							?>
@@ -1478,12 +1478,12 @@ 
 								</script>
 								<p><?= $_lang['access_permissions_docs_message'] ?></p>
 								<ul>
-									<?= implode("\n", $permissions) . "\n" ?>
+									<?= implode("\n", $permissions)."\n" ?>
 								</ul>
 							</div><!--div class="tab-page" id="tabAccess"-->
 							<?php
 						} // !empty($permissions)
-						elseif($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
+						elseif ($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0) && ($_SESSION['mgrPermissions']['access_permissions'] == 1 || $_SESSION['mgrPermissions']['web_access_permissions'] == 1)) {
 							?>
 							<p><?= $_lang["access_permissions_docs_collision"] ?></p>
 							<?php
@@ -1503,7 +1503,7 @@ 
 						'template' => $content['template']
 					));
 
-					if(is_array($evtOut)) {
+					if (is_array($evtOut)) {
 						echo implode('', $evtOut);
 					}
 					?>
@@ -1516,52 +1516,52 @@ 
 		storeCurTemplate();
 	</script>
 <?php
-if(($content['richtext'] == 1 || $modx->manager->action == '4' || $modx->manager->action == '72') && $use_editor == 1) {
-	if(is_array($richtexteditorIds)) {
-		foreach($richtexteditorIds as $editor => $elements) {
+if (($content['richtext'] == 1 || $modx->manager->action == '4' || $modx->manager->action == '72') && $use_editor == 1) {
+	if (is_array($richtexteditorIds)) {
+		foreach ($richtexteditorIds as $editor => $elements) {
 			// invoke OnRichTextEditorInit event
 			$evtOut = $modx->invokeEvent('OnRichTextEditorInit', array(
 				'editor' => $editor,
 				'elements' => $elements,
 				'options' => $richtexteditorOptions[$editor]
 			));
-			if(is_array($evtOut)) {
+			if (is_array($evtOut)) {
 				echo implode('', $evtOut);
 			}
 		}
 	}
 }
 
-function getDefaultTemplate() {
+function getDefaultTemplate(){
 	global $modx;
 
-	switch($modx->config['auto_template_logic']) {
+	switch ($modx->config['auto_template_logic']) {
 		case 'sibling':
-			if(!isset($_GET['pid']) || empty($_GET['pid'])) {
+			if (!isset($_GET['pid']) || empty($_GET['pid'])) {
 				$site_start = $modx->config['site_start'];
 				$where = "sc.isfolder=0 AND sc.id!='{$site_start}'";
 				$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', $where, 'menuindex', 'ASC', 1);
-				if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+				if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
 					$default_template = $sibl[0]['template'];
 				}
 			} else {
 				$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 1, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
-				if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+				if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
 					$default_template = $sibl[0]['template'];
 				} else {
 					$sibl = $modx->getDocumentChildren($_REQUEST['pid'], 0, 0, 'template', 'isfolder=0', 'menuindex', 'ASC', 1);
-					if(isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
+					if (isset($sibl[0]['template']) && $sibl[0]['template'] !== '') {
 						$default_template = $sibl[0]['template'];
 					}
 				}
 			}
-			if(isset($default_template)) {
+			if (isset($default_template)) {
 				break;
 			} // If $default_template could not be determined, fall back / through to "parent"-mode
 		case 'parent':
-			if(isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) {
+			if (isset($_REQUEST['pid']) && !empty($_REQUEST['pid'])) {
 				$parent = $modx->getPageInfo($_REQUEST['pid'], 0, 'template');
-				if(isset($parent['template'])) {
+				if (isset($parent['template'])) {
 					$default_template = $parent['template'];
 				}
 			}
@@ -1570,7 +1570,7 @@ 
 		default: // default_template is already set
 			$default_template = $modx->config['default_template'];
 	}
-	if(!isset($default_template)) {
+	if (!isset($default_template)) {
 		$default_template = $modx->config['default_template'];
 	} // default_template is already set
 

manager/actions/resources.static.php

Braces +6 added lines, -2 removed lines

@@ -28,7 +28,9 @@ 
 	'type7' => $_lang["lock_element_type_7"],
 	'type8' => $_lang["lock_element_type_8"]
 );
-foreach($unlockTranslations as $key => $value) $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+foreach($unlockTranslations as $key => $value) {
+    $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+}
 
 // Prepare lang-strings for mgrResAction()
 $mraTranslations = array(
@@ -44,7 +46,9 @@ 
 	'confirm_delete_plugin' => $_lang["confirm_delete_plugin"],
 	'confirm_delete_module' => $_lang["confirm_delete_module"],
 );
-foreach($mraTranslations as $key => $value) $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+foreach($mraTranslations as $key => $value) {
+    $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+}
 ?>
 <script>var trans = <?php echo json_encode($unlockTranslations); ?>;</script>
 <script>var mraTrans = <?php echo json_encode($mraTranslations); ?>;</script>

Indentation +59 added lines, -59 removed lines

@@ -1,48 +1,48 @@ 
 <?php
 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.");
+    die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/functions.inc.php')) {
-	include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/functions.inc.php');
+    include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/functions.inc.php');
 } else {
-	include_once(MODX_MANAGER_PATH . 'actions/resources/functions.inc.php');
+    include_once(MODX_MANAGER_PATH . 'actions/resources/functions.inc.php');
 }
 if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/mgrResources.class.php')) {
-	include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/mgrResources.class.php');
+    include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/mgrResources.class.php');
 } else {
-	include_once(MODX_MANAGER_PATH . 'actions/resources/mgrResources.class.php');
+    include_once(MODX_MANAGER_PATH . 'actions/resources/mgrResources.class.php');
 }
 
 $resources = new mgrResources();
 
 // Prepare lang-strings for "Lock Elements"
 $unlockTranslations = array(
-	'msg' => $_lang["unlock_element_id_warning"],
-	'type1' => $_lang["lock_element_type_1"],
-	'type2' => $_lang["lock_element_type_2"],
-	'type3' => $_lang["lock_element_type_3"],
-	'type4' => $_lang["lock_element_type_4"],
-	'type5' => $_lang["lock_element_type_5"],
-	'type6' => $_lang["lock_element_type_6"],
-	'type7' => $_lang["lock_element_type_7"],
-	'type8' => $_lang["lock_element_type_8"]
+    'msg' => $_lang["unlock_element_id_warning"],
+    'type1' => $_lang["lock_element_type_1"],
+    'type2' => $_lang["lock_element_type_2"],
+    'type3' => $_lang["lock_element_type_3"],
+    'type4' => $_lang["lock_element_type_4"],
+    'type5' => $_lang["lock_element_type_5"],
+    'type6' => $_lang["lock_element_type_6"],
+    'type7' => $_lang["lock_element_type_7"],
+    'type8' => $_lang["lock_element_type_8"]
 );
 foreach($unlockTranslations as $key => $value) $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
 
 // Prepare lang-strings for mgrResAction()
 $mraTranslations = array(
-	'create_new' => $_lang["create_new"],
-	'edit' => $_lang["edit"],
-	'duplicate' => $_lang["duplicate"],
-	'remove' => $_lang["remove"],
-	'confirm_duplicate_record' => $_lang["confirm_duplicate_record"],
-	'confirm_delete_template' => $_lang["confirm_delete_template"],
-	'confirm_delete_tmplvars' => $_lang["confirm_delete_tmplvars"],
-	'confirm_delete_htmlsnippet' => $_lang["confirm_delete_htmlsnippet"],
-	'confirm_delete_snippet' => $_lang["confirm_delete_htmlsnippet"],
-	'confirm_delete_plugin' => $_lang["confirm_delete_plugin"],
-	'confirm_delete_module' => $_lang["confirm_delete_module"],
+    'create_new' => $_lang["create_new"],
+    'edit' => $_lang["edit"],
+    'duplicate' => $_lang["duplicate"],
+    'remove' => $_lang["remove"],
+    'confirm_duplicate_record' => $_lang["confirm_duplicate_record"],
+    'confirm_delete_template' => $_lang["confirm_delete_template"],
+    'confirm_delete_tmplvars' => $_lang["confirm_delete_tmplvars"],
+    'confirm_delete_htmlsnippet' => $_lang["confirm_delete_htmlsnippet"],
+    'confirm_delete_snippet' => $_lang["confirm_delete_htmlsnippet"],
+    'confirm_delete_plugin' => $_lang["confirm_delete_plugin"],
+    'confirm_delete_module' => $_lang["confirm_delete_module"],
 );
 foreach($mraTranslations as $key => $value) $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
 ?>
@@ -65,46 +65,46 @@ 
 		</script>
 
 		<?php
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php');
-		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab1_templates.inc.php');
-		}
+        if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php')) {
+            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php');
+        } else {
+            include_once(MODX_MANAGER_PATH . '/actions/resources/tab1_templates.inc.php');
+        }
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php');
-		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab2_templatevars.inc.php');
-		}
+        if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php')) {
+            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php');
+        } else {
+            include_once(MODX_MANAGER_PATH . '/actions/resources/tab2_templatevars.inc.php');
+        }
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php');
-		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab3_chunks.inc.php');
-		}
+        if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php')) {
+            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php');
+        } else {
+            include_once(MODX_MANAGER_PATH . '/actions/resources/tab3_chunks.inc.php');
+        }
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php');
-		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab4_snippets.inc.php');
-		}
+        if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php')) {
+            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php');
+        } else {
+            include_once(MODX_MANAGER_PATH . '/actions/resources/tab4_snippets.inc.php');
+        }
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php');
-		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab5_plugins.inc.php');
-		}
+        if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php')) {
+            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php');
+        } else {
+            include_once(MODX_MANAGER_PATH . '/actions/resources/tab5_plugins.inc.php');
+        }
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php');
-		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab6_categoryview.inc.php');
-		}
+        if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php')) {
+            include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php');
+        } else {
+            include_once(MODX_MANAGER_PATH . '/actions/resources/tab6_categoryview.inc.php');
+        }
 
 
-		if(is_numeric($_GET['tab'])) {
-			echo '<script type="text/javascript"> tpResources.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';
-		}
-		?>
+        if(is_numeric($_GET['tab'])) {
+            echo '<script type="text/javascript"> tpResources.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';
+        }
+        ?>
 	</div>
 </div>

Spacing +29 added lines, -29 removed lines

@@ -1,17 +1,17 @@ 
 <?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.");
 }
 
-if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/functions.inc.php')) {
-	include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/functions.inc.php');
+if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/functions.inc.php')) {
+	include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/functions.inc.php');
 } else {
-	include_once(MODX_MANAGER_PATH . 'actions/resources/functions.inc.php');
+	include_once(MODX_MANAGER_PATH.'actions/resources/functions.inc.php');
 }
-if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/mgrResources.class.php')) {
-	include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/mgrResources.class.php');
+if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/mgrResources.class.php')) {
+	include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/mgrResources.class.php');
 } else {
-	include_once(MODX_MANAGER_PATH . 'actions/resources/mgrResources.class.php');
+	include_once(MODX_MANAGER_PATH.'actions/resources/mgrResources.class.php');
 }
 
 $resources = new mgrResources();
@@ -28,7 +28,7 @@ 
 	'type7' => $_lang["lock_element_type_7"],
 	'type8' => $_lang["lock_element_type_8"]
 );
-foreach($unlockTranslations as $key => $value) $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+foreach ($unlockTranslations as $key => $value) $unlockTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
 
 // Prepare lang-strings for mgrResAction()
 $mraTranslations = array(
@@ -44,7 +44,7 @@ 
 	'confirm_delete_plugin' => $_lang["confirm_delete_plugin"],
 	'confirm_delete_module' => $_lang["confirm_delete_module"],
 );
-foreach($mraTranslations as $key => $value) $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
+foreach ($mraTranslations as $key => $value) $mraTranslations[$key] = iconv($modx->config["modx_charset"], "utf-8", $value);
 ?>
 <script>var trans = <?php echo json_encode($unlockTranslations); ?>;</script>
 <script>var mraTrans = <?php echo json_encode($mraTranslations); ?>;</script>
@@ -65,45 +65,45 @@ 
 		</script>
 
 		<?php
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab1_templates.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab1_templates.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab1_templates.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab1_templates.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab1_templates.inc.php');
 		}
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab2_templatevars.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab2_templatevars.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab2_templatevars.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab2_templatevars.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab2_templatevars.inc.php');
 		}
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab3_chunks.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab3_chunks.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab3_chunks.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab3_chunks.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab3_chunks.inc.php');
 		}
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab4_snippets.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab4_snippets.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab4_snippets.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab4_snippets.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab4_snippets.inc.php');
 		}
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab5_plugins.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab5_plugins.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab5_plugins.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab5_plugins.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab5_plugins.inc.php');
 		}
 
-		if(file_exists(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php')) {
-			include_once(MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/actions/resources/tab6_categoryview.inc.php');
+		if (file_exists(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab6_categoryview.inc.php')) {
+			include_once(MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/actions/resources/tab6_categoryview.inc.php');
 		} else {
-			include_once(MODX_MANAGER_PATH . '/actions/resources/tab6_categoryview.inc.php');
+			include_once(MODX_MANAGER_PATH.'/actions/resources/tab6_categoryview.inc.php');
 		}
 
 
-		if(is_numeric($_GET['tab'])) {
-			echo '<script type="text/javascript"> tpResources.setSelectedIndex( ' . $_GET['tab'] . ' );</script>';
+		if (is_numeric($_GET['tab'])) {
+			echo '<script type="text/javascript"> tpResources.setSelectedIndex( '.$_GET['tab'].' );</script>';
 		}
 		?>
 	</div>

manager/actions/mutate_settings/tab5_security_settings.inc.php

Indentation +3 added lines, -3 removed lines

@@ -177,9 +177,9 @@
     <td colspan="2"><div class="split"></div></td>

   </tr>

   <?php

-      // Check for GD before allowing captcha to be enabled

-      $gdAvailable = extension_loaded('gd');

-  ?>

+        // Check for GD before allowing captcha to be enabled

+        $gdAvailable = extension_loaded('gd');

+    ?>

 <?php

 $gdAvailable = extension_loaded('gd');

 if(!$gdAvailable) $use_captcha = 0;

Spacing +41 added lines, -41 removed lines

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

     $MODX_SITE_HOSTNAMES = MODX_SITE_HOSTNAMES; // Fix for PHP 5.4

-    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) $valid_hostnames = $_SERVER['HTTP_HOST'];

+    if (empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) $valid_hostnames = $_SERVER['HTTP_HOST'];

 ?>

 <!-- Interface & editor settings -->

 <div class="tab-page" id="tabPageSecurity">

@@ -11,10 +11,10 @@ 
 <tr>

 <th><?php echo $_lang['allow_eval_title']; ?><br><small>[(allow_eval)]</small></th>

 <td>

-<?php echo wrap_label($_lang['allow_eval_with_scan']         , form_radio('allow_eval','with_scan'));?><br />

-<?php echo wrap_label($_lang['allow_eval_with_scan_at_post'] , form_radio('allow_eval','with_scan_at_post'));?><br />

-<?php echo wrap_label($_lang['allow_eval_everytime_eval']    , form_radio('allow_eval','everytime_eval'));?><br />

-<?php echo wrap_label($_lang['allow_eval_dont_eval']         , form_radio('allow_eval','dont_eval'));?>

+<?php echo wrap_label($_lang['allow_eval_with_scan'], form_radio('allow_eval', 'with_scan')); ?><br />

+<?php echo wrap_label($_lang['allow_eval_with_scan_at_post'], form_radio('allow_eval', 'with_scan_at_post')); ?><br />

+<?php echo wrap_label($_lang['allow_eval_everytime_eval'], form_radio('allow_eval', 'everytime_eval')); ?><br />

+<?php echo wrap_label($_lang['allow_eval_dont_eval'], form_radio('allow_eval', 'dont_eval')); ?>

     <div class="comment">

         <?php echo $_lang['allow_eval_msg'] ?>

     </div>

@@ -39,7 +39,7 @@ 
 <tr>

     <th><?php echo $_lang['check_files_onlogin_title'] ?><br><small>[(check_files_onlogin)]</small></th>

     <td>

-      <textarea name="check_files_onlogin"><?php echo $check_files_onlogin;?></textarea><br />

+      <textarea name="check_files_onlogin"><?php echo $check_files_onlogin; ?></textarea><br />

         

 </td>

 </tr>

@@ -49,8 +49,8 @@ 
     <tr>

       <td nowrap class="warning"><?php echo $_lang['validate_referer_title'] ?><br><small>[(validate_referer)]</small></td>

       <td>

-        <?php echo wrap_label($_lang['yes'],form_radio('validate_referer', 1));?><br />

-        <?php echo wrap_label($_lang['no'], form_radio('validate_referer', 0));?>

+        <?php echo wrap_label($_lang['yes'], form_radio('validate_referer', 1)); ?><br />

+        <?php echo wrap_label($_lang['no'], form_radio('validate_referer', 0)); ?>

       </td>

     </tr>

     <tr>

@@ -85,25 +85,25 @@ 
   <tr>

 <th><?php echo $_lang['a17_error_reporting_title']; ?><br><small>[(error_reporting)]</small></th>

 <td>

-<?php echo wrap_label($_lang['a17_error_reporting_opt0'], form_radio('error_reporting','0'));?><br />

-<?php echo wrap_label($_lang['a17_error_reporting_opt1'], form_radio('error_reporting','1'));?><br />

-<?php echo wrap_label($_lang['a17_error_reporting_opt2'], form_radio('error_reporting','2'));?><br />

-<?php echo wrap_label($_lang['a17_error_reporting_opt99'],form_radio('error_reporting','99'));?>

+<?php echo wrap_label($_lang['a17_error_reporting_opt0'], form_radio('error_reporting', '0')); ?><br />

+<?php echo wrap_label($_lang['a17_error_reporting_opt1'], form_radio('error_reporting', '1')); ?><br />

+<?php echo wrap_label($_lang['a17_error_reporting_opt2'], form_radio('error_reporting', '2')); ?><br />

+<?php echo wrap_label($_lang['a17_error_reporting_opt99'], form_radio('error_reporting', '99')); ?>

 </td>

 </tr>

 <tr>

     <td width="200">&nbsp;</td>

-    <td class="comment"> <?php echo $_lang['a17_error_reporting_msg'];?></td>

+    <td class="comment"> <?php echo $_lang['a17_error_reporting_msg']; ?></td>

 </tr>

 <tr><td colspan="2"><div class="split"></div></td></tr>

 <tr>

 <th><?php echo $_lang['mutate_settings.dynamic.php6']; ?><br><small>[(send_errormail)]</small></th>

 <td>

-<?php echo wrap_label($_lang['mutate_settings.dynamic.php7'],form_radio('send_errormail','0'));?><br />

-<?php echo wrap_label('error',form_radio('send_errormail','3'));?><br />

-<?php echo wrap_label('error + warning',form_radio('send_errormail','2'));?><br />

-<?php echo wrap_label('error + warning + information',form_radio('send_errormail','1'));?><br />

-<?php echo parseText($_lang['mutate_settings.dynamic.php8'],array('emailsender'=>$modx->config['emailsender']));?></td>

+<?php echo wrap_label($_lang['mutate_settings.dynamic.php7'], form_radio('send_errormail', '0')); ?><br />

+<?php echo wrap_label('error', form_radio('send_errormail', '3')); ?><br />

+<?php echo wrap_label('error + warning', form_radio('send_errormail', '2')); ?><br />

+<?php echo wrap_label('error + warning + information', form_radio('send_errormail', '1')); ?><br />

+<?php echo parseText($_lang['mutate_settings.dynamic.php8'], array('emailsender'=>$modx->config['emailsender'])); ?></td>

 </tr>

    <tr>

     <td colspan="2"><div class="split"></div></td>

@@ -111,8 +111,8 @@ 
 <tr>

 <th><?php echo $_lang['enable_bindings_title'] ?><br><small>[(enable_bindings)]</small></th>

 <td>

-<?php echo wrap_label($_lang['yes'],form_radio('enable_bindings','1'));?><br />

-<?php echo wrap_label($_lang['no'], form_radio('enable_bindings','0'));?>

+<?php echo wrap_label($_lang['yes'], form_radio('enable_bindings', '1')); ?><br />

+<?php echo wrap_label($_lang['no'], form_radio('enable_bindings', '0')); ?>

 

 </td>

 </tr>

@@ -153,20 +153,20 @@ 
 <th><?php echo $_lang['pwd_hash_algo_title'] ?><br><small>[(pwd_hash_algo)]</small></th>

 <td>

 <?php

-if(empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1;

-$phm['e']['BLOWFISH_Y'] = $modx->manager->checkHashAlgorithm('BLOWFISH_Y') ? 0:1;

-$phm['e']['BLOWFISH_A'] = $modx->manager->checkHashAlgorithm('BLOWFISH_A') ? 0:1;

-$phm['e']['SHA512']     = $modx->manager->checkHashAlgorithm('SHA512') ? 0:1;

-$phm['e']['SHA256']     = $modx->manager->checkHashAlgorithm('SHA256') ? 0:1;

-$phm['e']['MD5']        = $modx->manager->checkHashAlgorithm('MD5') ? 0:1;

-$phm['e']['UNCRYPT']    = $modx->manager->checkHashAlgorithm('UNCRYPT') ? 0:1;

+if (empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1;

+$phm['e']['BLOWFISH_Y'] = $modx->manager->checkHashAlgorithm('BLOWFISH_Y') ? 0 : 1;

+$phm['e']['BLOWFISH_A'] = $modx->manager->checkHashAlgorithm('BLOWFISH_A') ? 0 : 1;

+$phm['e']['SHA512']     = $modx->manager->checkHashAlgorithm('SHA512') ? 0 : 1;

+$phm['e']['SHA256']     = $modx->manager->checkHashAlgorithm('SHA256') ? 0 : 1;

+$phm['e']['MD5']        = $modx->manager->checkHashAlgorithm('MD5') ? 0 : 1;

+$phm['e']['UNCRYPT']    = $modx->manager->checkHashAlgorithm('UNCRYPT') ? 0 : 1;

 ?>

-<?php echo wrap_label('CRYPT_BLOWFISH_Y (salt &amp; stretch)',form_radio('pwd_hash_algo','BLOWFISH_Y', '', $phm['e']['BLOWFISH_Y']));?><br />

-<?php echo wrap_label('CRYPT_BLOWFISH_A (salt &amp; stretch)',form_radio('pwd_hash_algo','BLOWFISH_A', '', $phm['e']['BLOWFISH_A']));?><br />

-<?php echo wrap_label('CRYPT_SHA512 (salt &amp; stretch)'    ,form_radio('pwd_hash_algo','SHA512'    , '', $phm['e']['SHA512']));?><br />

-<?php echo wrap_label('CRYPT_SHA256 (salt &amp; stretch)'    ,form_radio('pwd_hash_algo','SHA256'    , '', $phm['e']['SHA256']));?><br />

-<?php echo wrap_label('CRYPT_MD5 (salt &amp; stretch)'       ,form_radio('pwd_hash_algo','MD5'       , '', $phm['e']['MD5']));?><br />

-<?php echo wrap_label('UNCRYPT(32 chars salt + SHA-1 hash)'  ,form_radio('pwd_hash_algo','UNCRYPT'  , '', $phm['e']['UNCRYPT']));?>

+<?php echo wrap_label('CRYPT_BLOWFISH_Y (salt &amp; stretch)', form_radio('pwd_hash_algo', 'BLOWFISH_Y', '', $phm['e']['BLOWFISH_Y'])); ?><br />

+<?php echo wrap_label('CRYPT_BLOWFISH_A (salt &amp; stretch)', form_radio('pwd_hash_algo', 'BLOWFISH_A', '', $phm['e']['BLOWFISH_A'])); ?><br />

+<?php echo wrap_label('CRYPT_SHA512 (salt &amp; stretch)', form_radio('pwd_hash_algo', 'SHA512', '', $phm['e']['SHA512'])); ?><br />

+<?php echo wrap_label('CRYPT_SHA256 (salt &amp; stretch)', form_radio('pwd_hash_algo', 'SHA256', '', $phm['e']['SHA256'])); ?><br />

+<?php echo wrap_label('CRYPT_MD5 (salt &amp; stretch)', form_radio('pwd_hash_algo', 'MD5', '', $phm['e']['MD5'])); ?><br />

+<?php echo wrap_label('UNCRYPT(32 chars salt + SHA-1 hash)', form_radio('pwd_hash_algo', 'UNCRYPT', '', $phm['e']['UNCRYPT'])); ?>

 </td>

 </tr>

 <tr>

@@ -182,13 +182,13 @@ 
   ?>

 <?php

 $gdAvailable = extension_loaded('gd');

-if(!$gdAvailable) $use_captcha = 0;

+if (!$gdAvailable) $use_captcha = 0;

 ?>

   <tr>

     <td nowrap class="warning"><?php echo $_lang['captcha_title'] ?><br><small>[(use_captcha)]</small></td>

-    <td> <label><input type="radio" id="captchaOn" name="use_captcha" value="1" <?php echo ($use_captcha==1) ? 'checked="checked"' : "" ; echo (!$gdAvailable)? ' readonly="readonly"' : ''; ?> />

+    <td> <label><input type="radio" id="captchaOn" name="use_captcha" value="1" <?php echo ($use_captcha == 1) ? 'checked="checked"' : ""; echo (!$gdAvailable) ? ' readonly="readonly"' : ''; ?> />

       <?php echo $_lang['yes']?></label><br />

-      <label><input type="radio" id="captchaOff" name="use_captcha" value="0" <?php echo ($use_captcha==0) ? 'checked="checked"' : "" ; echo (!$gdAvailable)? ' readonly="readonly"' : '';?> />

+      <label><input type="radio" id="captchaOff" name="use_captcha" value="0" <?php echo ($use_captcha == 0) ? 'checked="checked"' : ""; echo (!$gdAvailable) ? ' readonly="readonly"' : ''; ?> />

       <?php echo $_lang['no']?></label> </td>

   </tr>

   <tr>

@@ -198,23 +198,23 @@ 
   <tr>

     <td colspan="2"><div class="split"></div></td>

   </tr>

-  <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>>

+  <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>>

     <td nowrap class="warning"><?php echo $_lang['captcha_words_title'] ?><br><small>[(captcha_words)]</small>

       <br />

       <p><?php echo $_lang['update_settings_from_language']; ?></p>

       <select name="reload_captcha_words" id="reload_captcha_words_select" onchange="confirmLangChange(this, 'captcha_words_default', 'captcha_words_input');">

-<?php echo get_lang_options('captcha_words_default');?>

+<?php echo get_lang_options('captcha_words_default'); ?>

       </select>

     </td>

     <td><input type="text" id="captcha_words_input" name="captcha_words" style="width:250px" value="<?php echo $captcha_words; ?>" />

-        <input type="hidden" name="captcha_words_default" id="captcha_words_default_hidden" value="<?php echo addslashes($_lang['captcha_words_default']);?>" />

+        <input type="hidden" name="captcha_words_default" id="captcha_words_default_hidden" value="<?php echo addslashes($_lang['captcha_words_default']); ?>" />

     </td>

   </tr>

-  <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>>

+  <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>>

     <td width="200">&nbsp;</td>

     <td class="comment"><?php echo $_lang['captcha_words_message'] ?></td>

   </tr>

-  <tr class="captchaRow" <?php echo showHide($use_captcha==1);?>>

+  <tr class="captchaRow" <?php echo showHide($use_captcha == 1); ?>>

     <td colspan="2"><div class="split"></div></td>

   </tr>

 </table>

Braces +10 added lines, -4 removed lines

@@ -1,7 +1,9 @@ 
 <?php

     $MODX_SITE_HOSTNAMES = MODX_SITE_HOSTNAMES; // Fix for PHP 5.4

-    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) $valid_hostnames = $_SERVER['HTTP_HOST'];

-?>

+    if(empty($valid_hostnames) && empty($MODX_SITE_HOSTNAMES)) {
+        $valid_hostnames = $_SERVER['HTTP_HOST'];
+    }
+    ?>

 <!-- Interface & editor settings -->

 <div class="tab-page" id="tabPageSecurity">

 <h2 class="tab"><?php echo $_lang['settings_security'] ?></h2>

@@ -153,7 +155,9 @@ 
 <th><?php echo $_lang['pwd_hash_algo_title'] ?><br><small>[(pwd_hash_algo)]</small></th>

 <td>

 <?php

-if(empty($pwd_hash_algo)) $phm['sel']['UNCRYPT'] = 1;

+if(empty($pwd_hash_algo)) {
+    $phm['sel']['UNCRYPT'] = 1;
+}
 $phm['e']['BLOWFISH_Y'] = $modx->manager->checkHashAlgorithm('BLOWFISH_Y') ? 0:1;

 $phm['e']['BLOWFISH_A'] = $modx->manager->checkHashAlgorithm('BLOWFISH_A') ? 0:1;

 $phm['e']['SHA512']     = $modx->manager->checkHashAlgorithm('SHA512') ? 0:1;

@@ -182,7 +186,9 @@ 
   ?>

 <?php

 $gdAvailable = extension_loaded('gd');

-if(!$gdAvailable) $use_captcha = 0;

+if(!$gdAvailable) {
+    $use_captcha = 0;
+}
 ?>

   <tr>

     <td nowrap class="warning"><?php echo $_lang['captcha_title'] ?><br><small>[(use_captcha)]</small></td>