evolution-cms / evolution

manager/media/browser/mcpuk/lib/class_image_gd.php

Spacing +26 added lines, -26 removed lines

@@ -12,12 +12,12 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class image_gd extends image {
+class image_gd extends image{
 
 
     // ABSTRACT PUBLIC METHODS
 
-    public function resize($width, $height) {
+    public function resize($width, $height){
         if (!$width) $width = 1;
         if (!$height) $height = 1;
         return (
@@ -29,7 +29,7 @@ 
         );
     }
 
-    public function resizeFit($width, $height, $background=false) {
+    public function resizeFit($width, $height, $background = false){
         if ((!$width && !$height) || (($width == $this->width) && ($height == $this->height)))
             return true;
         if (!$width || (($height / $width) < ($this->height / $this->width))) {
@@ -67,7 +67,7 @@ 
         }
     }
 
-    public function resizeCrop($width, $height, $offset=false) {
+    public function resizeCrop($width, $height, $offset = false){
 
         if (($this->width / $this->height) > ($width / $height)) {
             $h = $height;
@@ -117,7 +117,7 @@ 
         return $return;
     }
 
-    public function rotate($angle, $background="#000000") {
+    public function rotate($angle, $background = "#000000"){
         $angle = -$angle;
         $img = @imagerotate($this->image, $angle, $this->gdColor($background));
         if ($img === false)
@@ -128,7 +128,7 @@ 
         return true;
     }
 
-    public function flipHorizontal() {
+    public function flipHorizontal(){
         $img = imagecreatetruecolor($this->width, $this->height);
             imagealphablending($img, false);
             imagesavealpha($img, true);
@@ -139,7 +139,7 @@ 
         return true;
     }
 
-    public function flipVertical() {
+    public function flipVertical(){
         $img = imagecreatetruecolor($this->width, $this->height);
             imagealphablending($img, false);
             imagesavealpha($img, true);
@@ -150,7 +150,7 @@ 
         return true;
     }
 
-    public function watermark($file, $left=false, $top=false) {
+    public function watermark($file, $left = false, $top = false){
         $info = getimagesize($file);
         list($w, $h, $t) = $info;
         if (!in_array($t, array(IMAGETYPE_PNG, IMAGETYPE_GIF)))
@@ -187,7 +187,7 @@ 
         return true;
     }
 
-    public function output($type='jpeg', array $options=array()) {
+    public function output($type = 'jpeg', array $options = array()){
         $method = "output_$type";
         if (!method_exists($this, $method))
             return false;
@@ -197,7 +197,7 @@ 
 
     // ABSTRACT PROTECTED METHODS
 
-    protected function getBlankImage($width, $height) {
+    protected function getBlankImage($width, $height){
         $img = @imagecreatetruecolor($width, $height);
 //        imagealphablending($img, false);
 //        imagesavealpha($img, true);
@@ -207,7 +207,7 @@ 
         return $img;
     }
 
-    protected function getImage($image, &$width, &$height) {
+    protected function getImage($image, &$width, &$height){
 
         if (is_resource($image) && (get_resource_type($image) == "gd")) {
             $width = @imagesx($image);
@@ -218,11 +218,11 @@ 
             (false !== (list($width, $height, $t) = @getimagesize($image)))
         ) {
             $image =
-                ($t == IMAGETYPE_GIF)  ? @imagecreatefromgif($image)  : (
+                ($t == IMAGETYPE_GIF) ? @imagecreatefromgif($image) : (
                 ($t == IMAGETYPE_WBMP) ? @imagecreatefromwbmp($image) : (
                 ($t == IMAGETYPE_JPEG) ? @imagecreatefromjpeg($image) : (
-                ($t == IMAGETYPE_PNG)  ? @imagecreatefrompng($image)  : (
-                ($t == IMAGETYPE_XBM)  ? @imagecreatefromxbm($image)  : false
+                ($t == IMAGETYPE_PNG) ? @imagecreatefrompng($image) : (
+                ($t == IMAGETYPE_XBM) ? @imagecreatefromxbm($image) : false
             ))));
 
             return $image;
@@ -234,22 +234,22 @@ 
 
     // PSEUDO-ABSTRACT STATIC METHODS
 
-    static function available() {
+    static function available(){
         return function_exists("imagecreatefromjpeg");
     }
 
-    static function checkImage($file) {
+    static function checkImage($file){
         if (!is_string($file) ||
             ((false === (list($width, $height, $t) = @getimagesize($file))))
         )
             return false;
 
         $img =
-            ($t == IMAGETYPE_GIF)  ? @imagecreatefromgif($file)  : (
+            ($t == IMAGETYPE_GIF) ? @imagecreatefromgif($file) : (
             ($t == IMAGETYPE_WBMP) ? @imagecreatefromwbmp($file) : (
             ($t == IMAGETYPE_JPEG) ? @imagecreatefromjpeg($file) : (
-            ($t == IMAGETYPE_PNG)  ? @imagecreatefrompng($file)  : (
-            ($t == IMAGETYPE_XBM)  ? @imagecreatefromxbm($file)  : false
+            ($t == IMAGETYPE_PNG) ? @imagecreatefrompng($file) : (
+            ($t == IMAGETYPE_XBM) ? @imagecreatefromxbm($file) : false
         ))));
 
         return ($img !== false);
@@ -258,7 +258,7 @@ 
 
     // OWN METHODS
 
-    protected function output_png(array $options=array()) {
+    protected function output_png(array $options = array()){
         $file = isset($options['file']) ? $options['file'] : null;
         $quality = isset($options['quality']) ? $options['quality'] : null;
         $filters = isset($options['filters']) ? $options['filters'] : null;
@@ -268,7 +268,7 @@ 
         return imagepng($this->image, $file, $quality, $filters);
     }
 
-    protected function output_jpeg(array $options=array()) {
+    protected function output_jpeg(array $options = array()){
         $file = isset($options['file']) ? $options['file'] : null;
         $quality = isset($options['quality'])
             ? $options['quality']
@@ -278,14 +278,14 @@ 
         return imagejpeg($this->image, $file, $quality);
     }
 
-    protected function output_gif(array $options=array()) {
+    protected function output_gif(array $options = array()){
         $file = isset($options['file']) ? $options['file'] : null;
         if (isset($options['file']) && !headers_sent())
             header("Content-Type: image/gif");
         return imagegif($this->image, $file);
     }
 
-    protected function gdColor() {
+    protected function gdColor(){
         $args = func_get_args();
 
         $exprRGB = '/^rgb\(\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\,\s*(\d{1,3})\s*\)$/i';
@@ -327,15 +327,15 @@ 
         return imagecolorallocate($this->image, $r, $g, $b);
     }
 
-    protected function imageFilledRectangle($x1, $y1, $x2, $y2, $color) {
+    protected function imageFilledRectangle($x1, $y1, $x2, $y2, $color){
         $color = $this->gdColor($color);
         if ($color === false) return false;
         return imageFilledRectangle($this->image, $x1, $y1, $x2, $y2, $color);
     }
 
     protected function imageCopyResampled(
-        $src, $dstX=0, $dstY=0, $srcX=0, $srcY=0, $dstW=null, $dstH=null, $srcW=null, $srcH=null
-    ) {
+        $src, $dstX = 0, $dstY = 0, $srcX = 0, $srcY = 0, $dstW = null, $dstH = null, $srcW = null, $srcH = null
+    ){
         $imageDetails = $this->buildImage($src);
 
         if ($imageDetails === false)

manager/media/browser/mcpuk/lib/helper_text.php

Spacing +6 added lines, -6 removed lines

@@ -12,13 +12,13 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class text {
+class text{
 
   /** Replace repeated white spaces to single space
     * @param string $string
     * @return string */
 
-    static function clearWhitespaces($string) {
+    static function clearWhitespaces($string){
         return trim(preg_replace('/\s+/s', " ", $string));
     }
 
@@ -26,7 +26,7 @@ 
     * @param string $string
     * @return string */
 
-    static function htmlValue($string) {
+    static function htmlValue($string){
         return
             str_replace('"', """,
             str_replace("'", ''',
@@ -39,7 +39,7 @@ 
     * @param string $string
     * @return string */
 
-    static function jsValue($string) {
+    static function jsValue($string){
         return
             preg_replace('/\r?\n/', "\\n",
             str_replace('"', "\\\"",
@@ -52,7 +52,7 @@ 
     * @param string $string
     * @param bool $cdata */
 
-    static function xmlData($string, $cdata=false) {
+    static function xmlData($string, $cdata = false){
         $string = str_replace("]]>", "]]]]><![CDATA[>", $string);
         if (!$cdata)
             $string = "<![CDATA[$string]]>";
@@ -63,7 +63,7 @@ 
     * @param string $code
     * @return string */
 
-    static function compressCSS($code) {
+    static function compressCSS($code){
         $code = self::clearWhitespaces($code);
         $code = preg_replace('/ ?\{ ?/', "{", $code);
         $code = preg_replace('/ ?\} ?/', "}", $code);

manager/media/browser/mcpuk/lib/class_zipFolder.php

Spacing +3 added lines, -3 removed lines

@@ -13,12 +13,12 @@ 
   *      @link http://kcfinder.sunhater.com
   */
 
-class zipFolder {
+class zipFolder{
     protected $zip;
     protected $root;
     protected $ignored;
 
-    function __construct($file, $folder, $ignored=null) {
+    function __construct($file, $folder, $ignored = null){
         $this->zip = new ZipArchive();
 
         $this->ignored = is_array($ignored)
@@ -39,7 +39,7 @@ 
         $this->zip->close();
     }
 
-    function zip($folder, $parent=null) {
+    function zip($folder, $parent = null){
         $full_path = "{$this->root}$parent$folder";
         $zip_path = "$parent$folder";
         $this->zip->addEmptyDir($zip_path);

manager/media/browser/mcpuk/config.php

Spacing +12 added lines, -12 removed lines

@@ -26,12 +26,12 @@ 
 	
     'theme' => "evo",
 
-    'uploadURL' => rtrim($modx->config['rb_base_url'],'/'),
-    'uploadDir' => rtrim($modx->config['rb_base_dir'],'/'),
+    'uploadURL' => rtrim($modx->config['rb_base_url'], '/'),
+    'uploadDir' => rtrim($modx->config['rb_base_dir'], '/'),
     'siteURL' => $modx->config['site_url'],
-    'assetsURL' => rtrim($modx->config['rb_base_url'],'/'),
-    'dirPerms' => intval($modx->config['new_folder_permissions'],8),
-    'filePerms' => intval($modx->config['new_file_permissions'],8),
+    'assetsURL' => rtrim($modx->config['rb_base_url'], '/'),
+    'dirPerms' => intval($modx->config['new_folder_permissions'], 8),
+    'filePerms' => intval($modx->config['new_file_permissions'], 8),
     'maxfilesize' => $settings['upload_maxsize'],
     'denyUpdateCheck' => true,
 
@@ -58,14 +58,14 @@ 
     'types' => array(
 
         // CKEditor & FCKEditor types
-        'files'   =>  str_replace(',',' ',$modx->config['upload_files']),
-        'flash'   =>  str_replace(',',' ',$modx->config['upload_flash']),
-        'images'  =>  str_replace(',',' ',$modx->config['upload_images']),
+        'files'   =>  str_replace(',', ' ', $modx->config['upload_files']),
+        'flash'   =>  str_replace(',', ' ', $modx->config['upload_flash']),
+        'images'  =>  str_replace(',', ' ', $modx->config['upload_images']),
 
         // TinyMCE types
-        'file'    =>  str_replace(',',' ',$modx->config['upload_files']),
-        'media'   =>  str_replace(',',' ',$modx->config['upload_media']),
-        'image'   =>  str_replace(',',' ',$modx->config['upload_images']),
+        'file'    =>  str_replace(',', ' ', $modx->config['upload_files']),
+        'media'   =>  str_replace(',', ' ', $modx->config['upload_media']),
+        'image'   =>  str_replace(',', ' ', $modx->config['upload_images']),
     ),
     'dirnameChangeChars' => array(
         ' ' => "_",
@@ -89,7 +89,7 @@ 
 
     // THE FOLLOWING SETTINGS CANNOT BE OVERRIDED WITH SESSION CONFIGURATION
     '_check4htaccess' => false,
-    '_tinyMCEPath' => MODX_BASE_URL . "assets/plugins/tinymce/tiny_mce",
+    '_tinyMCEPath' => MODX_BASE_URL."assets/plugins/tinymce/tiny_mce",
 
     '_sessionVar' => &$_SESSION['KCFINDER'],
     //'_sessionLifetime' => 30,

manager/media/browser/mcpuk/browse.php

Spacing +3 added lines, -3 removed lines

@@ -14,14 +14,14 @@
 
 require "core/autoload.php"; // Init MODX
 
-function returnNoPermissionsMessage($role) {
+function returnNoPermissionsMessage($role){
 	global $_lang;
 	echo sprintf($_lang['files_management_no_permission'], $role);
 	exit;
 }
 
-if( $_GET['type'] == 'images' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_images')) returnNoPermissionsMessage('assets_images');
-if( $_GET['type'] == 'files'  && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_files'))  returnNoPermissionsMessage('assets_files');
+if ($_GET['type'] == 'images' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_images')) returnNoPermissionsMessage('assets_images');
+if ($_GET['type'] == 'files' && !$modx->hasPermission('file_manager') && !$modx->hasPermission('assets_files'))  returnNoPermissionsMessage('assets_files');
 
 $browser = new browser($modx);
 $browser->action();

manager/media/style/default/welcome.php

Spacing +5 added lines, -5 removed lines

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

 $modx->config['enable_filter'] = 1;

 

-$modx->addSnippet('hasPermission','return $modx->hasPermission($key);');

+$modx->addSnippet('hasPermission', 'return $modx->hasPermission($key);');

 

-if($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags'))

+if ($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags'))

     $hasAnyPermission = 1;

 else $hasAnyPermission = 0;

-$modx->addSnippet('hasAnyPermission','global $hasAnyPermission; return $hasAnyPermission;');

-$modx->addSnippet('getLoginUserName','return $modx->getLoginUserName();');

+$modx->addSnippet('hasAnyPermission', 'global $hasAnyPermission; return $hasAnyPermission;');

+$modx->addSnippet('getLoginUserName', 'return $modx->getLoginUserName();');

 $code = 'global $_lang;return $_SESSION["nrtotalmessages"] ? sprintf($_lang["welcome_messages"], $_SESSION["nrtotalmessages"], \'<span style="color:red;">\' . $_SESSION["nrnewmessages"] . "</span>") : $_lang["messages_no_messages"];';

-$modx->addSnippet('getMessageCount',$code);

+$modx->addSnippet('getMessageCount', $code);

 

 // Large Icons

 $_style['icons_backup_large']       = 'fa fa-database fa-fw fa-2x';

manager/media/style/default/ajax.php

Spacing +98 added lines, -98 removed lines

@@ -19,11 +19,11 @@ 
 $modx->loadExtension("ManagerAPI");

 

 $_lang = array();

-include_once MODX_MANAGER_PATH . '/includes/lang/english.inc.php';

+include_once MODX_MANAGER_PATH.'/includes/lang/english.inc.php';

 if ($modx->config['manager_language'] != 'english') {

-    include_once MODX_MANAGER_PATH . '/includes/lang/' . $modx->config['manager_language'] . '.inc.php';

+    include_once MODX_MANAGER_PATH.'/includes/lang/'.$modx->config['manager_language'].'.inc.php';

 }

-include_once MODX_MANAGER_PATH . '/media/style/' . $modx->config['manager_theme'] . '/style.php';

+include_once MODX_MANAGER_PATH.'/media/style/'.$modx->config['manager_theme'].'/style.php';

 

 $action = isset($_REQUEST['a']) ? $_REQUEST['a'] : '';

 $frame = isset($_REQUEST['f']) ? $_REQUEST['f'] : '';

@@ -40,7 +40,7 @@ 
 

             switch ($frame) {

                 case 'nodes':

-                    include_once MODX_MANAGER_PATH . '/frames/nodes.php';

+                    include_once MODX_MANAGER_PATH.'/frames/nodes.php';

 

                     break;

             }

@@ -58,21 +58,21 @@ 
                 $sql = '';

                 $a = '';

                 $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '%*_') : '';

-                $sqlLike = $filter ? 'WHERE t1.name LIKE "' . $modx->db->escape($filter) . '%"' : '';

-                $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;

+                $sqlLike = $filter ? 'WHERE t1.name LIKE "'.$modx->db->escape($filter).'%"' : '';

+                $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit;

 

                 switch ($elements) {

                     case 'element_templates':

                         $a = 16;

-                        $sqlLike = $filter ? 'WHERE t1.templatename LIKE "' . $modx->db->escape($filter) . '%"' : '';

+                        $sqlLike = $filter ? 'WHERE t1.templatename LIKE "'.$modx->db->escape($filter).'%"' : '';

                         $sql = $modx->db->query('SELECT t1.*, t1.templatename AS name

-                        FROM ' . $modx->getFullTableName('site_templates') . ' AS t1

-                        ' . $sqlLike . '

+                        FROM ' . $modx->getFullTableName('site_templates').' AS t1

+                        ' . $sqlLike.'

                         ORDER BY t1.templatename ASC

                         ' . $sqlLimit);

 

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

-                            $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>' . $_lang['new_template'] . '</a></li>';

+                            $output .= '<li><a id="a_19" href="index.php?a=19" target="main"><i class="fa fa-plus"></i>'.$_lang['new_template'].'</a></li>';

                         }

 

                         break;

@@ -80,15 +80,15 @@ 
                     case 'element_tplvars':

                         $a = 301;

                         $sql = $modx->db->query('SELECT t1.*, IF(t2.templateid,0,1) AS disabled

-                        FROM ' . $modx->getFullTableName('site_tmplvars') . ' AS t1

-                        LEFT JOIN ' . $modx->getFullTableName('site_tmplvar_templates') . ' AS t2 ON t1.id=t2.tmplvarid

-                        ' . $sqlLike . '

+                        FROM ' . $modx->getFullTableName('site_tmplvars').' AS t1

+                        LEFT JOIN ' . $modx->getFullTableName('site_tmplvar_templates').' AS t2 ON t1.id=t2.tmplvarid

+                        ' . $sqlLike.'

                         GROUP BY t1.id

                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

                         if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {

-                            $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>' . $_lang['new_tmplvars'] . '</a></li>';

+                            $output .= '<li><a id="a_300" href="index.php?a=300" target="main"><i class="fa fa-plus"></i>'.$_lang['new_tmplvars'].'</a></li>';

                         }

 

                         break;

@@ -96,13 +96,13 @@ 
                     case 'element_htmlsnippets':

                         $a = 78;

                         $sql = $modx->db->query('SELECT t1.*

-                        FROM ' . $modx->getFullTableName('site_htmlsnippets') . ' AS t1

-                        ' . $sqlLike . '

+                        FROM ' . $modx->getFullTableName('site_htmlsnippets').' AS t1

+                        ' . $sqlLike.'

                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

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

-                            $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>' . $_lang['new_htmlsnippet'] . '</a></li>';

+                            $output .= '<li><a id="a_77" href="index.php?a=77" target="main"><i class="fa fa-plus"></i>'.$_lang['new_htmlsnippet'].'</a></li>';

                         }

 

                         break;

@@ -110,13 +110,13 @@ 
                     case 'element_snippets':

                         $a = 22;

                         $sql = $modx->db->query('SELECT t1.*

-                        FROM ' . $modx->getFullTableName('site_snippets') . ' AS t1

-                        ' . $sqlLike . '

+                        FROM ' . $modx->getFullTableName('site_snippets').' AS t1

+                        ' . $sqlLike.'

                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

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

-                            $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>' . $_lang['new_snippet'] . '</a></li>';

+                            $output .= '<li><a id="a_23" href="index.php?a=23" target="main"><i class="fa fa-plus"></i>'.$_lang['new_snippet'].'</a></li>';

                         }

 

                         break;

@@ -124,13 +124,13 @@ 
                     case 'element_plugins':

                         $a = 102;

                         $sql = $modx->db->query('SELECT t1.*

-                        FROM ' . $modx->getFullTableName('site_plugins') . ' AS t1

-                        ' . $sqlLike . '

+                        FROM ' . $modx->getFullTableName('site_plugins').' AS t1

+                        ' . $sqlLike.'

                         ORDER BY t1.name ASC

                         ' . $sqlLimit);

 

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

-                            $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>' . $_lang['new_plugin'] . '</a></li>';

+                            $output .= '<li><a id="a_101" href="index.php?a=101" target="main"><i class="fa fa-plus"></i>'.$_lang['new_plugin'].'</a></li>';

                         }

 

                         break;

@@ -145,7 +145,7 @@ 
                             continue;

                         }

 

-                        $items .= '<li class="item ' . ($row['disabled'] ? 'disabled' : '') . ($row['locked'] ? ' locked' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main" data-parent-id="a_76__elements_' . $elements . '">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>' . "\n";

+                        $items .= '<li class="item '.($row['disabled'] ? 'disabled' : '').($row['locked'] ? ' locked' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main" data-parent-id="a_76__elements_'.$elements.'">'.$row['name'].' <small>('.$row['id'].')</small></a></li>'."\n";

                     }

                 }

 

@@ -166,18 +166,18 @@ 
             $output = '';

             $items = '';

             $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '\%*_') : '';

-            $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->db->escape($filter) . '%"' : '';

-            $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;

+            $sqlLike = $filter ? 'WHERE t1.username LIKE "'.$modx->db->escape($filter).'%"' : '';

+            $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit;

 

             $sql = $modx->db->query('SELECT t1.*, t1.username AS name, t2.blocked

-				FROM ' . $modx->getFullTableName('manager_users') . ' AS t1

-				LEFT JOIN ' . $modx->getFullTableName('user_attributes') . ' AS t2 ON t1.id=t2.internalKey

-				' . $sqlLike . '

+				FROM ' . $modx->getFullTableName('manager_users').' AS t1

+				LEFT JOIN ' . $modx->getFullTableName('user_attributes').' AS t2 ON t1.id=t2.internalKey

+				' . $sqlLike.'

 				ORDER BY t1.username ASC

 				' . $sqlLimit);

 

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

-                $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>' . $_lang['new_user'] . '</a></li>';

+                $output .= '<li><a id="a_11" href="index.php?a=11" target="main"><i class="fa fa-plus"></i>'.$_lang['new_user'].'</a></li>';

             }

 

             if ($count = $modx->db->getRecordCount($sql)) {

@@ -185,7 +185,7 @@ 
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                 }

                 while ($row = $modx->db->getRow($sql)) {

-                    $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';

+                    $items .= '<li class="item '.($row['blocked'] ? 'disabled' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main">'.$row['name'].' <small>('.$row['id'].')</small></a></li>';

                 }

             }

 

@@ -205,18 +205,18 @@ 
             $output = '';

             $items = '';

             $filter = !empty($_REQUEST['filter']) && is_scalar($_REQUEST['filter']) ? addcslashes(trim($_REQUEST['filter']), '\%*_') : '';

-            $sqlLike = $filter ? 'WHERE t1.username LIKE "' . $modx->db->escape($filter) . '%"' : '';

-            $sqlLimit = $sqlLike ? '' : 'LIMIT ' . $limit;

+            $sqlLike = $filter ? 'WHERE t1.username LIKE "'.$modx->db->escape($filter).'%"' : '';

+            $sqlLimit = $sqlLike ? '' : 'LIMIT '.$limit;

 

             $sql = $modx->db->query('SELECT t1.*, t1.username AS name, t2.blocked

-				FROM ' . $modx->getFullTableName('web_users') . ' AS t1

-				LEFT JOIN ' . $modx->getFullTableName('web_user_attributes') . ' AS t2 ON t1.id=t2.internalKey

-				' . $sqlLike . '

+				FROM ' . $modx->getFullTableName('web_users').' AS t1

+				LEFT JOIN ' . $modx->getFullTableName('web_user_attributes').' AS t2 ON t1.id=t2.internalKey

+				' . $sqlLike.'

 				ORDER BY t1.username ASC

 				' . $sqlLimit);

 

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

-                $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>' . $_lang['new_web_user'] . '</a></li>';

+                $output .= '<li><a id="a_87" href="index.php?a=87" target="main"><i class="fa fa-plus"></i>'.$_lang['new_web_user'].'</a></li>';

             }

 

             if ($count = $modx->db->getRecordCount($sql)) {

@@ -224,7 +224,7 @@ 
                     $output .= '<li class="item-input"><input type="text" name="filter" class="dropdown-item form-control form-control-sm" autocomplete="off" /></li>';

                 }

                 while ($row = $modx->db->getRow($sql)) {

-                    $items .= '<li class="item ' . ($row['blocked'] ? 'disabled' : '') . '"><a id="a_' . $a . '__id_' . $row['id'] . '" href="index.php?a=' . $a . '&id=' . $row['id'] . '" target="main">' . $row['name'] . ' <small>(' . $row['id'] . ')</small></a></li>';

+                    $items .= '<li class="item '.($row['blocked'] ? 'disabled' : '').'"><a id="a_'.$a.'__id_'.$row['id'].'" href="index.php?a='.$a.'&id='.$row['id'].'" target="main">'.$row['name'].' <small>('.$row['id'].')</small></a></li>';

                 }

             }

 

@@ -250,35 +250,35 @@ 
                     case 'SnippetNoCache': {

 

                         $sql = $modx->db->query('SELECT *

-						FROM ' . $modx->getFullTableName('site_snippets') . '

-						WHERE name="' . $name . '"

+						FROM ' . $modx->getFullTableName('site_snippets').'

+						WHERE name="' . $name.'"

 						LIMIT 1');

 

                         if ($modx->db->getRecordCount($sql)) {

                             $row = $modx->db->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-code"></i> ' . $row['name']

+                                    'innerHTML' => '<i class="fa fa-code"></i> '.$row['name']

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],

-                                    'url' => "index.php?a=22&id=" . $row['id']

+                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],

+                                    'url' => "index.php?a=22&id=".$row['id']

                                 )

                             );

                             if (!empty($row['description'])) {

                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

-                                    'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

+                                    'innerHTML' => '<i class="fa fa-info"></i> '.$row['description']

                                 );

                             }

                         } else {

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-code"></i> ' . $name

+                                    'innerHTML' => '<i class="fa fa-code"></i> '.$name

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_snippet'],

-                                    'url' => "index.php?a=23&itemname=" . $name

+                                    'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_snippet'],

+                                    'url' => "index.php?a=23&itemname=".$name

                                 )

                             );

                         }

@@ -288,35 +288,35 @@ 
                     case 'Chunk' : {

 

                         $sql = $modx->db->query('SELECT *

-						FROM ' . $modx->getFullTableName('site_htmlsnippets') . '

-						WHERE name="' . $name . '"

+						FROM ' . $modx->getFullTableName('site_htmlsnippets').'

+						WHERE name="' . $name.'"

 						LIMIT 1');

 

                         if ($modx->db->getRecordCount($sql)) {

                             $row = $modx->db->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-th-large"></i> ' . $row['name']

+                                    'innerHTML' => '<i class="fa fa-th-large"></i> '.$row['name']

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],

-                                    'url' => "index.php?a=78&id=" . $row['id']

+                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],

+                                    'url' => "index.php?a=78&id=".$row['id']

                                 )

                             );

                             if (!empty($row['description'])) {

                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

-                                    'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

+                                    'innerHTML' => '<i class="fa fa-info"></i> '.$row['description']

                                 );

                             }

                         } else {

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-th-large"></i> ' . $name

+                                    'innerHTML' => '<i class="fa fa-th-large"></i> '.$name

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_htmlsnippet'],

-                                    'url' => "index.php?a=77&itemname=" . $name

+                                    'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_htmlsnippet'],

+                                    'url' => "index.php?a=77&itemname=".$name

                                 )

                             );

                         }

@@ -325,8 +325,8 @@ 
                     }

                     case 'AttributeValue': {

                         $sql = $modx->db->query('SELECT *

-						FROM ' . $modx->getFullTableName('site_htmlsnippets') . '

-						WHERE name="' . $name . '"

+						FROM ' . $modx->getFullTableName('site_htmlsnippets').'

+						WHERE name="' . $name.'"

 						LIMIT 1');

 

                         if ($modx->db->getRecordCount($sql)) {

@@ -336,52 +336,52 @@ 
                                     'innerText' => $row['name']

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],

-                                    'url' => "index.php?a=78&id=" . $row['id']

+                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],

+                                    'url' => "index.php?a=78&id=".$row['id']

                                 )

                             );

                             if (!empty($row['description'])) {

                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

-                                    'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

+                                    'innerHTML' => '<i class="fa fa-info"></i> '.$row['description']

                                 );

                             }

                         } else {

 

                             $sql = $modx->db->query('SELECT *

-							FROM ' . $modx->getFullTableName('site_snippets') . '

-							WHERE name="' . $name . '"

+							FROM ' . $modx->getFullTableName('site_snippets').'

+							WHERE name="' . $name.'"

 							LIMIT 1');

 

                             if ($modx->db->getRecordCount($sql)) {

                                 $row = $modx->db->getRow($sql);

                                 $contextmenu = array(

                                     'header' => array(

-                                        'innerHTML' => '<i class="fa fa-code"></i> ' . $row['name']

+                                        'innerHTML' => '<i class="fa fa-code"></i> '.$row['name']

                                     ),

                                     'item' => array(

-                                        'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],

-                                        'url' => "index.php?a=22&id=" . $row['id']

+                                        'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],

+                                        'url' => "index.php?a=22&id=".$row['id']

                                     )

                                 );

                                 if (!empty($row['description'])) {

                                     $contextmenu['seperator'] = '';

                                     $contextmenu['description'] = array(

-                                        'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

+                                        'innerHTML' => '<i class="fa fa-info"></i> '.$row['description']

                                     );

                                 }

                             } else {

                                 $contextmenu = array(

                                     'header' => array(

-                                        'innerHTML' => '<i class="fa fa-code"></i> ' . $name

+                                        'innerHTML' => '<i class="fa fa-code"></i> '.$name

                                     ),

                                     'item' => array(

-                                        'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_htmlsnippet'],

-                                        'url' => "index.php?a=77&itemname=" . $name

+                                        'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_htmlsnippet'],

+                                        'url' => "index.php?a=77&itemname=".$name

                                     ),

                                     'item2' => array(

-                                        'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_snippet'],

-                                        'url' => "index.php?a=23&itemname=" . $name

+                                        'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_snippet'],

+                                        'url' => "index.php?a=23&itemname=".$name

                                     )

                                 );

                             }

@@ -437,35 +437,35 @@ 
                         }

 

                         $sql = $modx->db->query('SELECT *

-						FROM ' . $modx->getFullTableName('site_tmplvars') . '

-						WHERE name="' . $name . '"

+						FROM ' . $modx->getFullTableName('site_tmplvars').'

+						WHERE name="' . $name.'"

 						LIMIT 1');

 

                         if ($modx->db->getRecordCount($sql)) {

                             $row = $modx->db->getRow($sql);

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $row['name']

+                                    'innerHTML' => '<i class="fa fa-list-alt"></i> '.$row['name']

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> ' . $_lang['edit'],

-                                    'url' => "index.php?a=301&id=" . $row['id']

+                                    'innerHTML' => '<i class="fa fa-pencil-square-o"></i> '.$_lang['edit'],

+                                    'url' => "index.php?a=301&id=".$row['id']

                                 )

                             );

                             if (!empty($row['description'])) {

                                 $contextmenu['seperator'] = '';

                                 $contextmenu['description'] = array(

-                                    'innerHTML' => '<i class="fa fa-info"></i> ' . $row['description']

+                                    'innerHTML' => '<i class="fa fa-info"></i> '.$row['description']

                                 );

                             }

                         } else {

                             $contextmenu = array(

                                 'header' => array(

-                                    'innerHTML' => '<i class="fa fa-list-alt"></i> ' . $name

+                                    'innerHTML' => '<i class="fa fa-list-alt"></i> '.$name

                                 ),

                                 'item' => array(

-                                    'innerHTML' => '<i class="fa fa-plus"></i> ' . $_lang['new_tmplvars'],

-                                    'url' => "index.php?a=300&itemname=" . $name

+                                    'innerHTML' => '<i class="fa fa-plus"></i> '.$_lang['new_tmplvars'],

+                                    'url' => "index.php?a=300&itemname=".$name

                                 )

                             );

                         }

@@ -484,15 +484,15 @@ 
             $json = array();

 

             if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {

-                $id = !empty($_REQUEST['id']) ? (int)$_REQUEST['id'] : '';

-                $parent = isset($_REQUEST['parent']) ? (int)$_REQUEST['parent'] : 0;

+                $id = !empty($_REQUEST['id']) ? (int) $_REQUEST['id'] : '';

+                $parent = isset($_REQUEST['parent']) ? (int) $_REQUEST['parent'] : 0;

                 $menuindex = isset($_REQUEST['menuindex']) && is_scalar($_REQUEST['menuindex']) ? $_REQUEST['menuindex'] : 0;

 

                 // set parent

                 if ($id && $parent >= 0) {

 

                     // find older parent

-                    $parentOld = $modx->db->getValue($modx->db->select('parent', $modx->getFullTableName('site_content'), 'id=' . $id));

+                    $parentOld = $modx->db->getValue($modx->db->select('parent', $modx->getFullTableName('site_content'), 'id='.$id));

 

                     $eventOut = $modx->invokeEvent('onBeforeMoveDocument', [

                         'id_document' => $id,

@@ -513,7 +513,7 @@ 
                     if (empty($json['errors'])) {

                         // check privileges user for move docs

                         if (!empty($modx->config['tree_show_protected']) && $role != 1) {

-                            $sql = $modx->db->select('*', $modx->getFullTableName('document_groups'), 'document IN(' . $id . ',' . $parent . ',' . $parentOld . ')');

+                            $sql = $modx->db->select('*', $modx->getFullTableName('document_groups'), 'document IN('.$id.','.$parent.','.$parentOld.')');

                             if ($modx->db->getRecordCount($sql)) {

                                 $document_groups = array();

                                 while ($row = $modx->db->getRow($sql)) {

@@ -538,22 +538,22 @@ 
                             // set new parent

                             $modx->db->update(array(

                                 'parent' => $parent

-                            ), $modx->getFullTableName('site_content'), 'id=' . $id);

+                            ), $modx->getFullTableName('site_content'), 'id='.$id);

                             // set parent isfolder = 1

                             $modx->db->update(array(

                                 'isfolder' => 1

-                            ), $modx->getFullTableName('site_content'), 'id=' . $parent);

+                            ), $modx->getFullTableName('site_content'), 'id='.$parent);

 

                             if ($parent != $parentOld) {

                                 // check children docs and set parent isfolder

-                                if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent=' . $parentOld))) {

+                                if ($modx->db->getRecordCount($modx->db->select('id', $modx->getFullTableName('site_content'), 'parent='.$parentOld))) {

                                     $modx->db->update(array(

                                         'isfolder' => 1

-                                    ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);

+                                    ), $modx->getFullTableName('site_content'), 'id='.$parentOld);

                                 } else {

                                     $modx->db->update(array(

                                         'isfolder' => 0

-                                    ), $modx->getFullTableName('site_content'), 'id=' . $parentOld);

+                                    ), $modx->getFullTableName('site_content'), 'id='.$parentOld);

                                 }

                             }

 

@@ -561,7 +561,7 @@ 
                             if (!empty($menuindex)) {

                                 $menuindex = explode(',', $menuindex);

                                 foreach ($menuindex as $key => $value) {

-                                    $modx->db->query('UPDATE ' . $modx->getFullTableName('site_content') . ' SET menuindex=' . $key . ' WHERE id=' . $value);

+                                    $modx->db->query('UPDATE '.$modx->getFullTableName('site_content').' SET menuindex='.$key.' WHERE id='.$value);

                                 }

                             } else {

                                 // TODO: max(*) menuindex

@@ -590,19 +590,19 @@ 
         }

 

         case 'getLockedElements': {

-            $type = isset($_REQUEST['type']) ? (int)$_REQUEST['type'] : 0;

-            $id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;

+            $type = isset($_REQUEST['type']) ? (int) $_REQUEST['type'] : 0;

+            $id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;

 

             $output = !!$modx->elementIsLocked($type, $id, true);

 

             if (!$output) {

                 $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';

-                $docgrp_cond = $docgrp ? ' OR dg.document_group IN (' . $docgrp . ')' : '';

+                $docgrp_cond = $docgrp ? ' OR dg.document_group IN ('.$docgrp.')' : '';

                 $sql = '

-                    SELECT MAX(IF(1=' . $role . ' OR sc.privatemgr=0' . $docgrp_cond . ', 0, 1)) AS locked

-                    FROM ' . $modx->getFullTableName('site_content') . ' AS sc 

-                    LEFT JOIN ' . $modx->getFullTableName('document_groups') . ' dg ON dg.document=sc.id

-                    WHERE sc.id=' . $id . ' GROUP BY sc.id';

+                    SELECT MAX(IF(1=' . $role.' OR sc.privatemgr=0'.$docgrp_cond.', 0, 1)) AS locked

+                    FROM ' . $modx->getFullTableName('site_content').' AS sc 

+                    LEFT JOIN ' . $modx->getFullTableName('document_groups').' dg ON dg.document=sc.id

+                    WHERE sc.id=' . $id.' GROUP BY sc.id';

                 $sql = $modx->db->query($sql);

                 if ($modx->db->getRecordCount($sql)) {

                     $row = $modx->db->getRow($sql);

manager/media/style/default/style.php

Spacing +75 added lines, -75 removed lines

@@ -8,19 +8,19 @@ 
  * Version:        1.1

  * MODX version:   1.0.3

  */

-$style_path = 'media/style/' . $modx->config['manager_theme'] . '/images/';

+$style_path = 'media/style/'.$modx->config['manager_theme'].'/images/';

 $modx->config['mgr_date_picker_path'] = 'media/calendar/datepicker.inc.php';

-if(!$modx->config['lang_code']) {

+if (!$modx->config['lang_code']) {

 	global $modx_lang_attribute;

 	$modx->config['lang_code'] = !$modx_lang_attribute ? 'en' : $modx_lang_attribute;

 }

 

-if($_GET['a'] == 2) {

+if ($_GET['a'] == 2) {

 	include_once('welcome.php');

 }

 

 // Favicon

-$_style['favicon']                  = (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico');

+$_style['favicon']                  = (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.$modx->config['manager_theme'].'/images/favicon.ico');

 

 //Main Menu

 $_style['menu_search']              = '<i class="fa fa-search"></i>';

@@ -99,10 +99,10 @@ 
 $_style['tree_page_word']           = "<i class='fa fa-file-word-o'></i>";

 $_style['tree_page_excel']          = "<i class='fa fa-file-excel-o'></i>";

 

-$_style['tree_minusnode']           = "<i class='fa fa-angle-down'></i>";//$style_path.'tree/angle-down.png';

-$_style['tree_plusnode']            = "<i class='fa fa-angle-right'></i>";//$style_path.'tree/angle-right.png';

+$_style['tree_minusnode']           = "<i class='fa fa-angle-down'></i>"; //$style_path.'tree/angle-down.png';

+$_style['tree_plusnode']            = "<i class='fa fa-angle-right'></i>"; //$style_path.'tree/angle-right.png';

 $_style['tree_weblink']             = $style_path.'tree/link.png';

-$_style['tree_preview_resource']    = "<i class='fa fa-eye'></i>";//$style_path.'icons/eye.png';

+$_style['tree_preview_resource']    = "<i class='fa fa-eye'></i>"; //$style_path.'icons/eye.png';

 

 $_style['tree_showtree']            = '<i class="fa fa-sitemap"></i>';

 $_style['tree_working']             = '<i class="fa fa-warning"></i>';

@@ -137,8 +137,8 @@ 
 $_style['icons_edit_document']      = $style_path.'icons/save.png';

 $_style['icons_delete_document']    = $style_path.'icons/trash.png';

 //locks

-$_style['icons_preview_resource']   = $style_path.'icons/eye.png';//$style_path.'icons/eye.png';

-$_style['icons_secured']            = "<i class='fa fa-lock'></i>";//$style_path.'icons/lock.png';

+$_style['icons_preview_resource']   = $style_path.'icons/eye.png'; //$style_path.'icons/eye.png';

+$_style['icons_secured']            = "<i class='fa fa-lock'></i>"; //$style_path.'icons/lock.png';

 

 //file manager icons

 $_style['files_save']               = 'fa fa-floppy-o';

@@ -213,7 +213,7 @@ 
 $_style['icons_set_parent']         = $style_path.'icons/folder-open.png';

 

 //modules

-$_style['icons_module']            = 'fa fa-cube';

+$_style['icons_module'] = 'fa fa-cube';

 $_style['icons_modules']            = 'fa fa-cubes'; //$style_path.'icons/modules.png';

 $_style['icons_run']                = $style_path.'icons/play.png';

 

@@ -273,57 +273,57 @@ 
 $stay = isset($_REQUEST['stay']) ? $_REQUEST['stay'] : '';

 $addnew = 0;

 $run = 0;

-switch($action) {

+switch ($action) {

 	case '3':

 	case '4':

 	case '27':

 	case '72':

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

+		if ($modx->hasPermission('new_document')) {

 			$addnew = 1;

 		}

 		break;

 	case '16':

 	case '19':

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

+		if ($modx->hasPermission('new_template')) {

 			$addnew = 1;

 		}

 		break;

 	case '300':

 	case '301':

-		if($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {

+		if ($modx->hasPermission('new_snippet') && $modx->hasPermission('new_chunk') && $modx->hasPermission('new_plugin')) {

 			$addnew = 1;

 		}

 		break;

 	case '77':

 	case '78':

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

+		if ($modx->hasPermission('new_chunk')) {

 			$addnew = 1;

 		}

 		break;

 	case '22':

 	case '23':

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

+		if ($modx->hasPermission('new_snippet')) {

 			$addnew = 1;

 		}

 		break;

 	case '101':

 	case '102':

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

+		if ($modx->hasPermission('new_plugin')) {

 			$addnew = 1;

 		}

 		break;

 	case '106':

 	case '107':

 	case '108':

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

+		if ($modx->hasPermission('new_module')) {

 			$addnew = 1;

 		}

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

+		if ($modx->hasPermission('exec_module')) {

 			$run = 1;

 		}

 		break;

 	case '88':

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

+		if ($modx->hasPermission('new_web_user')) {

 			$addnew = 1;

 		}

 		break;

@@ -337,30 +337,30 @@ 
 			<div class="btn-group">

 				<div class="btn-group">

 					<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

-						<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

+						<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>

 					</a>

 					<span class="btn btn-success plus dropdown-toggle"></span>

 					<select id="stay" name="stay">

 						' . ($addnew ? '

-							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option>

-						' : '') . '

-						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option>

-						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>

+							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option>

+						' : '').'

+						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option>

+						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option>

 					</select>

 				</div>' .

 					($addnew ? '

-					<a id="Button6" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.duplicate();">

-						<i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span>

+					<a id="Button6" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.duplicate();">

+						<i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span>

 					</a>

-					' : '') . '

-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+					' : '').'

+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 				<a id="Button4" class="btn btn-secondary" href="javascript:;" onclick="actions.view();">

-					<i class="' . $_style["actions_preview"] . '"></i><span>' . $_lang['preview'] . '</span>

+					<i class="' . $_style["actions_preview"].'"></i><span>'.$_lang['preview'].'</span>

 				</a>

 			</div>

 		</div>',

@@ -368,22 +368,22 @@ 
 			<div class="btn-group">

 				<div class="btn-group">

 					<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

-						<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

+						<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>

 					</a>

 					<span class="btn btn-success plus dropdown-toggle"></span>

 					<select id="stay" name="stay">

 						' . ($addnew ? '

-							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option>

-						' : '') . '

-						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option>

-						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>

+							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option>

+						' : '').'

+						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option>

+						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option>

 					</select>

 				</div>

-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

@@ -391,86 +391,86 @@ 
 			<div class="btn-group">

 				<div class="btn-group">

 					<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

-						<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

+						<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>

 					</a>

 					<span class="btn btn-success plus dropdown-toggle"></span>

 					<select id="stay" name="stay">

 						' . ($addnew ? '

-							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '') . '>' . $_lang['stay_new'] . '</option>

-						' : '') . '

-						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '') . '>' . $_lang['stay'] . '</option>

-						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '') . '>' . $_lang['close'] . '</option>

+							<option id="stay1" value="1" ' . ($stay == '1' ? ' selected="selected"' : '').'>'.$_lang['stay_new'].'</option>

+						' : '').'

+						<option id="stay2" value="2" ' . ($stay == '2' ? ' selected="selected"' : '').'>'.$_lang['stay'].'</option>

+						<option id="stay3" value="" ' . ($stay == '' ? ' selected="selected"' : '').'>'.$_lang['close'].'</option>

 					</select>

 				</div>

 				' . ($addnew ? '

-				<a id="Button6" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.duplicate();">

-					<i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span>

+				<a id="Button6" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.duplicate();">

+					<i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span>

 				</a>

-				' : '') . '

-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+				' : '').'

+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 				' . ($run ? '

-				<a id="Button4" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.run();">

-					<i class="' . $_style["actions_run"] . '"></i><span>' . $_lang['run_module'] . '</span>

+				<a id="Button4" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.run();">

+					<i class="' . $_style["actions_run"].'"></i><span>'.$_lang['run_module'].'</span>

 				</a>

-				' : '') . '

+				' : '').'

 			</div>

 		</div>',

 		'newmodule' => ($addnew ? '<div id="actions">

 			<div class="btn-group">

 				<a id="newModule" class="btn btn-secondary" href="javascript:;" onclick="actions.new();">

-					<i class="' . $_style["actions_new"] . '"></i><span>' . $_lang['new_module'] . '</span>

+					<i class="' . $_style["actions_new"].'"></i><span>'.$_lang['new_module'].'</span>

 				</a>

 			</div>

 		</div>' : ''),

 		'close' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.close();">

-					<i class="' . $_style["actions_close"] . '"></i><span>' . $_lang['close'] . '</span>

+					<i class="' . $_style["actions_close"].'"></i><span>'.$_lang['close'].'</span>

 				</a>

 			</div>

 		</div>',

 		'save' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

-					<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

+					<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

 		'savedelete' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.save();">

-					<i class="' . $_style["actions_save"] . '"></i><span>' . $_lang['save'] . '</span>

+					<i class="' . $_style["actions_save"].'"></i><span>'.$_lang['save'].'</span>

 				</a>

-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

 		'cancel' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

 		'canceldelete' => '<div id="actions">

 			<div class="btn-group">

-				<a id="Button3" class="btn btn-secondary' . $disabled . '" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+				<a id="Button3" class="btn btn-secondary' . $disabled.'" href="javascript:;" onclick="actions.delete();">

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

@@ -480,33 +480,33 @@ 
 			<div class="btn-group">' .

 				($addnew ? '

 					<a class="btn btn-secondary" href="javascript:;" onclick="actions.new();">

-						<i class="' . $_style["icons_new_document"] . '"></i><span>' . $_lang['create_resource_here'] . '</span>

+						<i class="' . $_style["icons_new_document"].'"></i><span>'.$_lang['create_resource_here'].'</span>

 					</a>

 					<a class="btn btn-secondary" href="javascript:;" onclick="actions.newlink();">

-						<i class="' . $_style["icons_new_weblink"] . '"></i><span>' . $_lang['create_weblink_here'] . '</span>

+						<i class="' . $_style["icons_new_weblink"].'"></i><span>'.$_lang['create_weblink_here'].'</span>

 					</a>

-				' : '') . '

+				' : '').'

 				<a id="Button1" class="btn btn-success" href="javascript:;" onclick="actions.edit();">

-					<i class="' . $_style["actions_edit"] . '"></i><span>' . $_lang['edit'] . '</span>

+					<i class="' . $_style["actions_edit"].'"></i><span>'.$_lang['edit'].'</span>

 				</a>

 				<a id="Button2" class="btn btn-secondary" href="javascript:;" onclick="actions.move();">

-					<i class="' . $_style["actions_move"] . '"></i><span>' . $_lang['move'] . '</span>

+					<i class="' . $_style["actions_move"].'"></i><span>'.$_lang['move'].'</span>

 				</a>

 				<a id="Button6" class="btn btn-secondary" href="javascript:;" onclick="actions.duplicate();">

-					<i class="' . $_style["actions_duplicate"] . '"></i><span>' . $_lang['duplicate'] . '</span>

+					<i class="' . $_style["actions_duplicate"].'"></i><span>'.$_lang['duplicate'].'</span>

 				</a>

 				<a id="Button3" class="btn btn-secondary" href="javascript:;" onclick="actions.delete();">

-					<i class="' . $_style["actions_delete"] . '"></i><span>' . $_lang['delete'] . '</span>

+					<i class="' . $_style["actions_delete"].'"></i><span>'.$_lang['delete'].'</span>

 				</a>

 				<a id="Button4" class="btn btn-secondary" href="javascript:;" onclick="actions.view();">

-					<i class="' . $_style["actions_preview"] . '"></i><span>' . $_lang['preview'] . '</span>

+					<i class="' . $_style["actions_preview"].'"></i><span>'.$_lang['preview'].'</span>

 				</a>

 			</div>

 		</div>',

 		'cancel' => '<div id="actions">

 			<div class="btn-group">

 				<a id="Button5" class="btn btn-secondary" href="javascript:;" onclick="actions.cancel();">

-					<i class="' . $_style["actions_cancel"] . '"></i><span>' . $_lang['cancel'] . '</span>

+					<i class="' . $_style["actions_cancel"].'"></i><span>'.$_lang['cancel'].'</span>

 				</a>

 			</div>

 		</div>',

manager/media/style/common/moo-datepicker/datepicker.inc.php

Spacing +5 added lines, -5 removed lines

@@ -1,11 +1,11 @@
 <?php
-class DATEPICKER {
-    function __construct() {
+class DATEPICKER{
+    function __construct(){
     }
-    function getDP() {
-        global $modx,$_lang;
+    function getDP(){
+        global $modx, $_lang;
         
         $tpl = file_get_contents(dirname(__FILE__).'/datepicker.tpl');
-        return $modx->parseText($tpl,$_lang,'[%','%]');
+        return $modx->parseText($tpl, $_lang, '[%', '%]');
     }
 }