evolution-cms / evolution

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, '[%', '%]');
     }
 }

manager/media/rss/extlib/Snoopy.class.inc

Spacing +43 added lines, -43 removed lines

@@ -149,7 +149,7 @@ 
                         // using proxy, send entire URI
                         $this->_httprequest($URI, $fp, $URI, $this->_httpmethod);
                     } else {
-                        $path = $URI_PARTS["path"] . ($URI_PARTS["query"] ? "?" . $URI_PARTS["query"] : "");
+                        $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
                         // no proxy, send only the path
                         $this->_httprequest($path, $fp, $URI, $this->_httpmethod);
                     }
@@ -160,7 +160,7 @@ 
                         /* url was redirected, check if we've hit the max depth */
                         if ($this->maxredirs > $this->_redirectdepth) {
                             // only follow redirect if it's on this site, or offsiteok is true
-                            if (preg_match("|^https?://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
+                            if (preg_match("|^https?://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok) {
                                 /* follow the redirect */
                                 $this->_redirectdepth++;
                                 $this->lastredirectaddr = $this->_redirectaddr;
@@ -188,7 +188,7 @@ 
                 break;
             default:
                 // not a valid protocol
-                $this->error = 'Invalid protocol "' . $URI_PARTS["scheme"] . '"\n';
+                $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
                 return false;
                 break;
         }
@@ -239,7 +239,7 @@ 
                         // using proxy, send entire URI
                         $this->_httprequest($URI, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
                     } else {
-                        $path = $URI_PARTS["path"] . ($URI_PARTS["query"] ? "?" . $URI_PARTS["query"] : "");
+                        $path = $URI_PARTS["path"].($URI_PARTS["query"] ? "?".$URI_PARTS["query"] : "");
                         // no proxy, send only the path
                         $this->_httprequest($path, $fp, $URI, $this->_submit_method, $this->_submit_type, $postdata);
                     }
@@ -249,11 +249,11 @@ 
                     if ($this->_redirectaddr) {
                         /* url was redirected, check if we've hit the max depth */
                         if ($this->maxredirs > $this->_redirectdepth) {
-                            if (!preg_match("|^" . $URI_PARTS["scheme"] . "://|", $this->_redirectaddr))
-                                $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"] . "://" . $URI_PARTS["host"]);
+                            if (!preg_match("|^".$URI_PARTS["scheme"]."://|", $this->_redirectaddr))
+                                $this->_redirectaddr = $this->_expandlinks($this->_redirectaddr, $URI_PARTS["scheme"]."://".$URI_PARTS["host"]);
 
                             // only follow redirect if it's on this site, or offsiteok is true
-                            if (preg_match("|^https?://" . preg_quote($this->host) . "|i", $this->_redirectaddr) || $this->offsiteok) {
+                            if (preg_match("|^https?://".preg_quote($this->host)."|i", $this->_redirectaddr) || $this->offsiteok) {
                                 /* follow the redirect */
                                 $this->_redirectdepth++;
                                 $this->lastredirectaddr = $this->_redirectaddr;
@@ -285,7 +285,7 @@ 
                 break;
             default:
                 // not a valid protocol
-                $this->error = 'Invalid protocol "' . $URI_PARTS["scheme"] . '"\n';
+                $this->error = 'Invalid protocol "'.$URI_PARTS["scheme"].'"\n';
                 return false;
                 break;
         }
@@ -585,9 +585,9 @@ 
         $match = preg_replace("|/$|", "", $match);
         $match_part = parse_url($match);
         $match_root =
-            $match_part["scheme"] . "://" . $match_part["host"];
+            $match_part["scheme"]."://".$match_part["host"];
 
-        $search = array("|^http://" . preg_quote($this->host) . "|i",
+        $search = array("|^http://".preg_quote($this->host)."|i",
             "|^(\/)|i",
             "|^(?!http://)(?!mailto:)|i",
             "|/\./|",
@@ -595,8 +595,8 @@ 
         );
 
         $replace = array("",
-            $match_root . "/",
-            $match . "/",
+            $match_root."/",
+            $match."/",
             "/",
             "/"
         );
@@ -625,17 +625,17 @@ 
         $URI_PARTS = parse_url($URI);
         if (empty($url))
             $url = "/";
-        $headers = $http_method . " " . $url . " " . $this->_httpversion . "\r\n";
+        $headers = $http_method." ".$url." ".$this->_httpversion."\r\n";
         if (!empty($this->host) && !isset($this->rawheaders['Host'])) {
-            $headers .= "Host: " . $this->host;
+            $headers .= "Host: ".$this->host;
             if (!empty($this->port) && $this->port != '80')
-                $headers .= ":" . $this->port;
+                $headers .= ":".$this->port;
             $headers .= "\r\n";
         }
         if (!empty($this->agent))
-            $headers .= "User-Agent: " . $this->agent . "\r\n";
+            $headers .= "User-Agent: ".$this->agent."\r\n";
         if (!empty($this->accept))
-            $headers .= "Accept: " . $this->accept . "\r\n";
+            $headers .= "Accept: ".$this->accept."\r\n";
         if ($this->use_gzip) {
             // make sure PHP was built with --with-zlib
             // and we can handle gzipp'ed data
@@ -643,46 +643,46 @@ 
                 $headers .= "Accept-encoding: gzip\r\n";
             } else {
                 trigger_error(
-                    "use_gzip is on, but PHP was built without zlib support." .
+                    "use_gzip is on, but PHP was built without zlib support.".
                     "  Requesting file(s) without gzip encoding.",
                     E_USER_NOTICE);
             }
         }
         if (!empty($this->referer))
-            $headers .= "Referer: " . $this->referer . "\r\n";
+            $headers .= "Referer: ".$this->referer."\r\n";
         if (!empty($this->cookies)) {
             if (!is_array($this->cookies))
-                $this->cookies = (array)$this->cookies;
+                $this->cookies = (array) $this->cookies;
 
             reset($this->cookies);
             if (count($this->cookies) > 0) {
                 $cookie_headers .= 'Cookie: ';
                 foreach ($this->cookies as $cookieKey => $cookieVal) {
-                    $cookie_headers .= $cookieKey . "=" . urlencode($cookieVal) . "; ";
+                    $cookie_headers .= $cookieKey."=".urlencode($cookieVal)."; ";
                 }
-                $headers .= substr($cookie_headers, 0, -2) . "\r\n";
+                $headers .= substr($cookie_headers, 0, -2)."\r\n";
             }
         }
         if (!empty($this->rawheaders)) {
             if (!is_array($this->rawheaders))
-                $this->rawheaders = (array)$this->rawheaders;
+                $this->rawheaders = (array) $this->rawheaders;
             while (list($headerKey, $headerVal) = each($this->rawheaders))
-                $headers .= $headerKey . ": " . $headerVal . "\r\n";
+                $headers .= $headerKey.": ".$headerVal."\r\n";
         }
         if (!empty($content_type)) {
             $headers .= "Content-type: $content_type";
             if ($content_type == "multipart/form-data")
-                $headers .= "; boundary=" . $this->_mime_boundary;
+                $headers .= "; boundary=".$this->_mime_boundary;
             $headers .= "\r\n";
         }
         if (!empty($body))
-            $headers .= "Content-length: " . strlen($body) . "\r\n";
+            $headers .= "Content-length: ".strlen($body)."\r\n";
         if (!empty($this->user) || !empty($this->pass))
-            $headers .= "Authorization: Basic " . base64_encode($this->user . ":" . $this->pass) . "\r\n";
+            $headers .= "Authorization: Basic ".base64_encode($this->user.":".$this->pass)."\r\n";
 
         //add proxy auth headers
         if (!empty($this->proxy_user))
-            $headers .= 'Proxy-Authorization: ' . 'Basic ' . base64_encode($this->proxy_user . ':' . $this->proxy_pass) . "\r\n";
+            $headers .= 'Proxy-Authorization: '.'Basic '.base64_encode($this->proxy_user.':'.$this->proxy_pass)."\r\n";
 
 
         $headers .= "\r\n";
@@ -692,7 +692,7 @@ 
             socket_set_timeout($fp, $this->read_timeout);
         $this->timed_out = false;
 
-        fwrite($fp, $headers . $body, strlen($headers . $body));
+        fwrite($fp, $headers.$body, strlen($headers.$body));
 
         $this->_redirectaddr = false;
         unset($this->headers);
@@ -716,10 +716,10 @@ 
                 // look for :// in the Location header to see if hostname is included
                 if (!preg_match("|\:\/\/|", $matches[2])) {
                     // no host in the path, so prepend
-                    $this->_redirectaddr = $URI_PARTS["scheme"] . "://" . $this->host . ":" . $this->port;
+                    $this->_redirectaddr = $URI_PARTS["scheme"]."://".$this->host.":".$this->port;
                     // eliminate double slash
                     if (!preg_match("|^/|", $matches[2]))
-                        $this->_redirectaddr .= "/" . $matches[2];
+                        $this->_redirectaddr .= "/".$matches[2];
                     else
                         $this->_redirectaddr .= $matches[2];
                 } else
@@ -771,7 +771,7 @@ 
         if (($this->_framedepth < $this->maxframes) && preg_match_all("'<frame\s+.*src[\s]*=[\'\"]?([^\'\"\>]+)'i", $results, $match)) {
             $this->results[] = $results;
             for ($x = 0; $x < count($match[1]); $x++)
-                $this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"] . "://" . $this->host);
+                $this->_frameurls[] = $this->_expandlinks($match[1][$x], $URI_PARTS["scheme"]."://".$this->host);
         } // have we already fetched framed content?
         elseif (is_array($this->results))
             $this->results[] = $results;
@@ -858,14 +858,14 @@ 
                     $context_opts['ssl']['capath'] = $this->capath;
             }
                     
-            $host = 'ssl://' . $host;
+            $host = 'ssl://'.$host;
         }
 
         $context = stream_context_create($context_opts);
 
         if (version_compare(PHP_VERSION, '5.0.0', '>')) {
-            if($this->scheme == 'http')
-                $host = "tcp://" . $host;
+            if ($this->scheme == 'http')
+                $host = "tcp://".$host;
             $fp = stream_socket_client(
                 "$host:$port",
                 $errno,
@@ -897,7 +897,7 @@ 
                 case -5:
                     $this->error = "connection refused or timed out (-5)";
                 default:
-                    $this->error = "connection failed (" . $errno . ")";
+                    $this->error = "connection failed (".$errno.")";
             }
             return false;
         }
@@ -938,26 +938,26 @@ 
                 while (list($key, $val) = each($formvars)) {
                     if (is_array($val) || is_object($val)) {
                         while (list($cur_key, $cur_val) = each($val)) {
-                            $postdata .= urlencode($key) . "[]=" . urlencode($cur_val) . "&";
+                            $postdata .= urlencode($key)."[]=".urlencode($cur_val)."&";
                         }
                     } else
-                        $postdata .= urlencode($key) . "=" . urlencode($val) . "&";
+                        $postdata .= urlencode($key)."=".urlencode($val)."&";
                 }
                 break;
 
             case "multipart/form-data":
-                $this->_mime_boundary = "Snoopy" . md5(uniqid(microtime()));
+                $this->_mime_boundary = "Snoopy".md5(uniqid(microtime()));
 
                 reset($formvars);
                 while (list($key, $val) = each($formvars)) {
                     if (is_array($val) || is_object($val)) {
                         while (list($cur_key, $cur_val) = each($val)) {
-                            $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                            $postdata .= "--".$this->_mime_boundary."\r\n";
                             $postdata .= "Content-Disposition: form-data; name=\"$key\[\]\"\r\n\r\n";
                             $postdata .= "$cur_val\r\n";
                         }
                     } else {
-                        $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
                         $postdata .= "Content-Disposition: form-data; name=\"$key\"\r\n\r\n";
                         $postdata .= "$val\r\n";
                     }
@@ -974,12 +974,12 @@ 
                         fclose($fp);
                         $base_name = basename($file_name);
 
-                        $postdata .= "--" . $this->_mime_boundary . "\r\n";
+                        $postdata .= "--".$this->_mime_boundary."\r\n";
                         $postdata .= "Content-Disposition: form-data; name=\"$field_name\"; filename=\"$base_name\"\r\n\r\n";
                         $postdata .= "$file_content\r\n";
                     }
                 }
-                $postdata .= "--" . $this->_mime_boundary . "--\r\n";
+                $postdata .= "--".$this->_mime_boundary."--\r\n";
                 break;
         }
 

manager/index.php

Spacing +268 added lines, -268 removed lines

@@ -54,26 +54,26 @@ 
 }
 
 // get start time
-$mtime = microtime(); $mtime = explode(" ",$mtime); $mtime = $mtime[1] + $mtime[0]; $tstart = $mtime;
+$mtime = microtime(); $mtime = explode(" ", $mtime); $mtime = $mtime[1] + $mtime[0]; $tstart = $mtime;
 $mstart = memory_get_usage();
-$self      = str_replace('\\','/',__FILE__);
-$self_dir  = str_replace('/index.php','',$self);
-$mgr_dir   = substr($self_dir,strrpos($self_dir,'/')+1);
-$base_path = str_replace($mgr_dir . '/index.php','',$self);
-$site_mgr_path = $base_path . 'assets/cache/siteManager.php';
-if(is_file($site_mgr_path)) include_once($site_mgr_path);
-$site_hostnames_path = $base_path . 'assets/cache/siteHostnames.php';
-if(is_file($site_hostnames_path)) include_once($site_hostnames_path);
-if(!defined('MGR_DIR') || MGR_DIR!==$mgr_dir) {
+$self      = str_replace('\\', '/', __FILE__);
+$self_dir  = str_replace('/index.php', '', $self);
+$mgr_dir   = substr($self_dir, strrpos($self_dir, '/') + 1);
+$base_path = str_replace($mgr_dir.'/index.php', '', $self);
+$site_mgr_path = $base_path.'assets/cache/siteManager.php';
+if (is_file($site_mgr_path)) include_once($site_mgr_path);
+$site_hostnames_path = $base_path.'assets/cache/siteHostnames.php';
+if (is_file($site_hostnames_path)) include_once($site_hostnames_path);
+if (!defined('MGR_DIR') || MGR_DIR !== $mgr_dir) {
 	$src = "<?php\n";
 	$src .= "define('MGR_DIR', '{$mgr_dir}');\n";
-	$rs = file_put_contents($site_mgr_path,$src);
-	if(!$rs) {
+	$rs = file_put_contents($site_mgr_path, $src);
+	if (!$rs) {
 		echo 'siteManager.php write error';
 		exit;
 	}
 	sleep(1);
-	header('Location:' . $_SERVER['REQUEST_URI']);
+	header('Location:'.$_SERVER['REQUEST_URI']);
 	exit;
 }
 
@@ -88,7 +88,7 @@ 
 
 // send anti caching headers
 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
-header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
+header("Last-Modified: ".gmdate("D, d M Y H:i:s")." GMT");
 header("Cache-Control: no-store, no-cache, must-revalidate");
 header("Cache-Control: post-check=0, pre-check=0", false);
 header("Pragma: no-cache");
@@ -100,29 +100,29 @@ 
 include_once "includes/lang/english.inc.php";
 
 // check PHP version. EVO is compatible with php 5 (5.0.0+)
-$php_ver_comp =  version_compare(phpversion(), "5.0.0");
+$php_ver_comp = version_compare(phpversion(), "5.0.0");
 		// -1 if left is less, 0 if equal, +1 if left is higher
-if($php_ver_comp < 0) {
+if ($php_ver_comp < 0) {
 	echo sprintf($_lang['php_version_check'], phpversion());
 	exit;
 }
 
 // check if iconv is installed
-if(!function_exists('iconv')) {
+if (!function_exists('iconv')) {
 	echo $_lang['iconv_not_available'];
 	exit;
 }
 
 // set some runtime options
-$incPath = str_replace("\\","/",dirname(__FILE__)."/includes/"); // Mod by Raymond
-set_include_path(get_include_path() . PATH_SEPARATOR . $incPath);
+$incPath = str_replace("\\", "/", dirname(__FILE__)."/includes/"); // Mod by Raymond
+set_include_path(get_include_path().PATH_SEPARATOR.$incPath);
 
 if (!defined("ENT_COMPAT")) define("ENT_COMPAT", 2);
 if (!defined("ENT_NOQUOTES")) define("ENT_NOQUOTES", 0);
 if (!defined("ENT_QUOTES")) define("ENT_QUOTES", 3);
 
 // set the document_root :|
-if(!isset($_SERVER["DOCUMENT_ROOT"]) || empty($_SERVER["DOCUMENT_ROOT"])) {
+if (!isset($_SERVER["DOCUMENT_ROOT"]) || empty($_SERVER["DOCUMENT_ROOT"])) {
 	$_SERVER["DOCUMENT_ROOT"] = str_replace($_SERVER["PATH_INFO"], "", preg_replace("/\\\\/", "/", $_SERVER["PATH_TRANSLATED"]))."/";
 }
 
@@ -161,30 +161,30 @@ 
 // Now that session is given get user settings and merge into $modx->config
 $usersettings = $modx->getUserSettings();
 
-$settings =& $modx->config;
+$settings = & $modx->config;
 extract($modx->config, EXTR_OVERWRITE);
 
 // now include_once different language file as english
-if(!isset($manager_language) || !file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
+if (!isset($manager_language) || !file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
 	$manager_language = "english"; // if not set, get the english language file.
 }
 
 // $length_eng_lang = count($_lang); // Not used for now, required for difference-check with other languages than english (i.e. inside installer) 
 
-if($manager_language!="english" && file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
+if ($manager_language != "english" && file_exists(MODX_MANAGER_PATH."includes/lang/".$manager_language.".inc.php")) {
 	include_once "lang/".$manager_language.".inc.php";
 }
 
 // allow custom language overrides not altered by future EVO-updates
-if(file_exists(MODX_MANAGER_PATH."includes/lang/override/".$manager_language.".inc.php")) {
+if (file_exists(MODX_MANAGER_PATH."includes/lang/override/".$manager_language.".inc.php")) {
 	include_once "lang/override/".$manager_language.".inc.php";
 }
 
 $s = array('[+MGR_DIR+]');
 $r = array(MGR_DIR);
-foreach($_lang as $k=>$v)
+foreach ($_lang as $k=>$v)
 {
-	if(strpos($v,'[+')!==false) $_lang[$k] = str_replace($s, $r, $v);
+	if (strpos($v, '[+') !== false) $_lang[$k] = str_replace($s, $r, $v);
 }
 
 // send the charset header
@@ -198,19 +198,19 @@ 
 include_once "accesscontrol.inc.php";
 
 // double check the session
-if(!isset($_SESSION['mgrValidated'])){
+if (!isset($_SESSION['mgrValidated'])) {
 	echo "Not Logged In!";
 	exit;
 }
 
 // include_once the style variables file
-if(isset($manager_theme) && !isset($_style)) {
+if (isset($manager_theme) && !isset($_style)) {
 	$_style = array();
 	include_once "media/style/".$manager_theme."/style.php";
 }
 
 // check if user is allowed to access manager interface
-if(isset($allow_manager_access) && $allow_manager_access==0) {
+if (isset($allow_manager_access) && $allow_manager_access == 0) {
 	include_once "manager.lockout.inc.php";
 }
 
@@ -219,21 +219,21 @@ 
 $SystemAlertMsgQueque = &$_SESSION['SystemAlertMsgQueque'];
 
 // first we check to see if this is a frameset request
-if(!isset($_POST['a']) && !isset($_GET['a']) && !isset($_POST['updateMsgCount'])) {
+if (!isset($_POST['a']) && !isset($_GET['a']) && !isset($_POST['updateMsgCount'])) {
 	// this looks to be a top-level frameset request, so let's serve up a frameset
-	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
+	if (is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/frames/1.php")) {
 		include_once "media/style/".$manager_theme."/frames/1.php";
-	}else{
+	} else {
 		include_once "frames/1.php";
 	}
 	exit;
 }
 
 // OK, let's retrieve the action directive from the request
-$option = array('min_range'=>1,'max_range'=>2000);
-if(isset($_GET['a']) && isset($_POST['a'])) $modx->webAlertAndQuit($_lang['error_double_action']);
-elseif(isset($_GET['a']))  $action = filter_input(INPUT_GET, 'a',FILTER_VALIDATE_INT,$option);
-elseif(isset($_POST['a'])) $action = filter_input(INPUT_POST,'a',FILTER_VALIDATE_INT,$option);
+$option = array('min_range'=>1, 'max_range'=>2000);
+if (isset($_GET['a']) && isset($_POST['a'])) $modx->webAlertAndQuit($_lang['error_double_action']);
+elseif (isset($_GET['a']))  $action = filter_input(INPUT_GET, 'a', FILTER_VALIDATE_INT, $option);
+elseif (isset($_POST['a'])) $action = filter_input(INPUT_POST, 'a', FILTER_VALIDATE_INT, $option);
 else                       $action = null;
 
 if (isset($_POST['updateMsgCount']) && $modx->hasPermission('messages')) {
@@ -264,11 +264,11 @@ 
 $modx->invokeEvent("OnManagerPageInit", array("action" => $action));
 
 // return element filepath
-function includeFileProcessor ($filepath,$manager_theme) {
+function includeFileProcessor($filepath, $manager_theme){
 	$element = "";
-	if(is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
+	if (is_file(MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath)) {
 		$element = MODX_MANAGER_PATH."media/style/".$manager_theme."/".$filepath;
-	}else{
+	} else {
 		$element = $filepath;
 	}
 	return $element;
@@ -281,341 +281,341 @@ 
 /********************************************************************/
 	case 1 :
 		// get the requested frame
-		$frame = preg_replace('/[^a-z0-9]/i','',$_REQUEST['f']);
-		if($frame>9) {
-			$enable_debug=false;    // this is to stop the debug thingy being attached to the framesets
+		$frame = preg_replace('/[^a-z0-9]/i', '', $_REQUEST['f']);
+		if ($frame > 9) {
+			$enable_debug = false; // this is to stop the debug thingy being attached to the framesets
 		}
-		include_once(includeFileProcessor("frames/".$frame.".php",$manager_theme));
+		include_once(includeFileProcessor("frames/".$frame.".php", $manager_theme));
 	break;
 /********************************************************************/
 /* show the homepage                                                */
 /********************************************************************/
 	case 2:
 		// get the home page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/welcome.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/welcome.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* document data                                                    */
 /********************************************************************/
 	case 3:
 		// get the page to show document's data
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/document_data.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/document_data.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* content management                                               */
 /********************************************************************/
 	case 85:
 		// get the mutate page for adding a folder
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_content.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 27:
 		// get the mutate page for changing content
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_content.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 4:
 		// get the mutate page for adding content
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_content.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 5:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_content.processor.php", $manager_theme));
 	break;
 	case 6:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_content.processor.php", $manager_theme));
 	break;
 	case 63:
 		// get the undelete processor
-		include_once(includeFileProcessor("processors/undelete_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/undelete_content.processor.php", $manager_theme));
 	break;
 	case 51:
 		// get the move action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/move_document.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/move_document.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 52:
 		// get the move document processor
-		include_once(includeFileProcessor("processors/move_document.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/move_document.processor.php", $manager_theme));
 	break;
 	case 61:
 		// get the processor for publishing content
-		include_once(includeFileProcessor("processors/publish_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/publish_content.processor.php", $manager_theme));
 	break;
 	case 62:
 		// get the processor for publishing content
-		include_once(includeFileProcessor("processors/unpublish_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/unpublish_content.processor.php", $manager_theme));
 	break;
 	case 56:
 		// get the sort menuindex action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_menuindex_sort.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_menuindex_sort.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 		break;
 /********************************************************************/
 /* show the wait page - gives the tree time to refresh (hopefully)  */
 /********************************************************************/
 	case 7:
 		// get the wait page (so the tree can reload)
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/wait.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/wait.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* let the user log out                                             */
 /********************************************************************/
 	case 8:
 		// get the logout processor
-		include_once(includeFileProcessor("processors/logout.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/logout.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* user management                                                  */
 /********************************************************************/
 	case 87:
 		// get the new web user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 88:
 		// get the edit web user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_web_user.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 89:
 		// get the save web user processor
-		include_once(includeFileProcessor("processors/save_web_user.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_web_user.processor.php", $manager_theme));
 	break;
 	case 90:
 		// get the delete web user page
-		include_once(includeFileProcessor("processors/delete_web_user.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_web_user.processor.php", $manager_theme));
 	break;
 	case 11:
 		// get the new user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_user.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 12:
 		// get the edit user page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_user.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_user.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 32:
 		// get the save user processor
-		include_once(includeFileProcessor("processors/save_user.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_user.processor.php", $manager_theme));
 	break;
 	case 28:
 		// get the change password page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_password.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_password.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 34:
 		// get the save new password page
-		include_once(includeFileProcessor("processors/save_password.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_password.processor.php", $manager_theme));
 	break;
 	case 33:
 		// get the delete user page
-		include_once(includeFileProcessor("processors/delete_user.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_user.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* role management                                                  */
 /********************************************************************/
 	case 38:
 		// get the new role page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_role.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 35:
 		// get the edit role page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_role.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_role.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 36:
 		// get the save role page
-		include_once(includeFileProcessor("processors/save_role.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_role.processor.php", $manager_theme));
 	break;
 	case 37:
 		// get the delete role page
-		include_once(includeFileProcessor("processors/delete_role.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_role.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* category management                                               */
 /********************************************************************/
 	case 120:
 		// get the edit category page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 121:
 		// for ajax-requests
-		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php",$manager_theme));
+		include_once(includeFileProcessor("actions/mutate_categories.dynamic.php", $manager_theme));
 	break;
 /********************************************************************/
 /* template management                                              */
 /********************************************************************/
 	case 16:
 		// get the edit template action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 19:
 		// get the new template action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_templates.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 20:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_template.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_template.processor.php", $manager_theme));
 	break;
 	case 21:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_template.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_template.processor.php", $manager_theme));
 	break;
 	case 96:
 		// get the duplicate template processor
-		include_once(includeFileProcessor("processors/duplicate_template.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_template.processor.php", $manager_theme));
 	break;
 	case 117:
 		// change the tv rank for selected template
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_template_tv_rank.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_template_tv_rank.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 		break;
 /********************************************************************/
 /* snippet management                                               */
 /********************************************************************/
 	case 22:
 		// get the edit snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 23:
 		// get the new snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_snippet.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 24:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_snippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_snippet.processor.php", $manager_theme));
 	break;
 	case 25:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_snippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_snippet.processor.php", $manager_theme));
 	break;
 	case 98:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_snippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_snippet.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* htmlsnippet management                                               */
 /********************************************************************/
 	case 78:
 		// get the edit snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 77:
 		// get the new snippet action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_htmlsnippet.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 79:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_htmlsnippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_htmlsnippet.processor.php", $manager_theme));
 	break;
 	case 80:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_htmlsnippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_htmlsnippet.processor.php", $manager_theme));
 	break;
 	case 97:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_htmlsnippet.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_htmlsnippet.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* show the credits page                                            */
 /********************************************************************/
 	case 18:
 		// get the credits page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/credits.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/credits.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* empty cache & synchronisation                                    */
 /********************************************************************/
 	case 26:
 		// get the cache emptying processor
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/refresh_site.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/refresh_site.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Module management                                                */
 /********************************************************************/
 	case 106:
 		// get module management
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/modules.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/modules.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 107:
 		// get the new module action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_module.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 108:
 		// get the edit module action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_module.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_module.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 109:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_module.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_module.processor.php", $manager_theme));
 	break;
 	case 110:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_module.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_module.processor.php", $manager_theme));
 	break;
 	case 111:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_module.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_module.processor.php", $manager_theme));
 	break;
 	case 112:
 		// execute/run the module
 		//include_once "header.inc.php";
-		include_once(includeFileProcessor("processors/execute_module.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/execute_module.processor.php", $manager_theme));
 		//include_once "footer.inc.php";
 		break;
 	case 113:
 		// get the module resources (dependencies) action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_module_resources.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_module_resources.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* plugin management                                                */
@@ -623,46 +623,46 @@ 
 	case 100:
 		// change the plugin priority
 		//include_once "header.inc.php"; - in action file
-		include_once(includeFileProcessor("actions/mutate_plugin_priority.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("actions/mutate_plugin_priority.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 101:
 		// get the new plugin action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 102:
 		// get the edit plugin action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_plugin.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 103:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_plugin.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_plugin.processor.php", $manager_theme));
 	break;
 	case 104:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_plugin.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_plugin.processor.php", $manager_theme));
 	break;
 	case 105:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_plugin.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_plugin.processor.php", $manager_theme));
 	break;
 	case 119:
 		// get the purge processor
-		include_once(includeFileProcessor("processors/purge_plugin.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/purge_plugin.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* view phpinfo                                                     */
 /********************************************************************/
 	case 200:
 		// show phpInfo
-		if($modx->hasPermission('logs')) {
-			include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-			include_once(includeFileProcessor("actions/phpinfo.static.php",$manager_theme));
-			include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		if ($modx->hasPermission('logs')) {
+			include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+			include_once(includeFileProcessor("actions/phpinfo.static.php", $manager_theme));
+			include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 		}
 	break;
 /********************************************************************/
@@ -670,320 +670,320 @@ 
 /********************************************************************/
 	case 29:
 		// get the error page
-		include_once(includeFileProcessor("actions/error_dialog.static.php",$manager_theme));
+		include_once(includeFileProcessor("actions/error_dialog.static.php", $manager_theme));
 	break;
 /********************************************************************/
 /* file manager                                                     */
 /********************************************************************/
 	case 31:
 		// get the page to manage files
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/files.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/files.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* access permissions                                               */
 /********************************************************************/
 	case 40:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/access_permissions.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/access_permissions.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 91:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/web_access_permissions.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/web_access_permissions.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* access groups processor                                          */
 /********************************************************************/
 	case 41:
-		include_once(includeFileProcessor("processors/access_groups.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/access_groups.processor.php", $manager_theme));
 	break;
 	case 92:
-		include_once(includeFileProcessor("processors/web_access_groups.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/web_access_groups.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* settings editor                                                  */
 /********************************************************************/
 	case 17:
 		// get the settings editor
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_settings.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_settings.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 118:
 		// call settings ajax include
 		ob_clean();
-		include_once(includeFileProcessor("includes/mutate_settings.ajax.php",$manager_theme));
+		include_once(includeFileProcessor("includes/mutate_settings.ajax.php", $manager_theme));
 	break;
 /********************************************************************/
 /* save settings                                                    */
 /********************************************************************/
 	case 30:
 		// get the save settings processor
-		include_once(includeFileProcessor("processors/save_settings.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_settings.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* system information                                               */
 /********************************************************************/
 	case 53:
 		// get the settings editor
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/sysinfo.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/sysinfo.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* optimise table                                               */
 /********************************************************************/
 	case 54:
 		// get the table optimizer/truncate processor
-		include_once(includeFileProcessor("processors/optimize_table.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/optimize_table.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* view logging                                                     */
 /********************************************************************/
 	case 13:
 		// view logging
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/logging.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/logging.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* empty logs                                                       */
 /********************************************************************/
 	case 55:
 		// get the settings editor
-		include_once(includeFileProcessor("processors/empty_table.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/empty_table.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* calls test page                                                      */
 /********************************************************************/
 	case 999:
 		// get the test page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("test_page.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("test_page.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Empty recycle bin                                                */
 /********************************************************************/
 	case 64:
 		// get the Recycle bin emptier
-		include_once(includeFileProcessor("processors/remove_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/remove_content.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Messages                                                     */
 /********************************************************************/
 	case 10:
 		// get the messages page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/messages.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/messages.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Delete a message                                                 */
 /********************************************************************/
 	case 65:
 		// get the message deleter
-		include_once(includeFileProcessor("processors/delete_message.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_message.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Send a message                                                   */
 /********************************************************************/
 	case 66:
 		// get the message deleter
-		include_once(includeFileProcessor("processors/send_message.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/send_message.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Remove locks                                                 */
 /********************************************************************/
 	case 67:
 		// get the lock remover
-		include_once(includeFileProcessor("processors/remove_locks.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/remove_locks.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Site schedule                                                    */
 /********************************************************************/
 	case 70:
 		// get the schedule page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/site_schedule.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/site_schedule.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Search                                                           */
 /********************************************************************/
 	case 71:
 		// get the search page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/search.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/search.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* About                                                            */
 /********************************************************************/
 	case 59:
 		// get the about page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/about.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/about.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Add weblink                                                          */
 /********************************************************************/
 	case 72:
 		// get the weblink page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_content.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_content.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* User management                                                  */
 /********************************************************************/
 	case 75:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/user_management.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/user_management.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 99:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/web_user_management.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/web_user_management.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 86:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/role_management.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/role_management.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* template/ snippet management                                                 */
 /********************************************************************/
 	case 76:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/resources.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/resources.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Export to file                                                   */
 /********************************************************************/
 	case 83:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/export_site.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/export_site.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Resource Selector                                                    */
 /********************************************************************/
 	case 84:
-		include_once(includeFileProcessor("actions/resource_selector.static.php",$manager_theme));
+		include_once(includeFileProcessor("actions/resource_selector.static.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Backup Manager                                                   */
 /********************************************************************/
 	case 93:
 		# header and footer will be handled interally
-		include_once(includeFileProcessor("actions/bkmanager.static.php",$manager_theme));
+		include_once(includeFileProcessor("actions/bkmanager.static.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Duplicate Document                                                   */
 /********************************************************************/
 	case 94:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_content.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_content.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Import Document from file                                        */
 /********************************************************************/
 	case 95:
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/import_site.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/import_site.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Help                                                             */
 /********************************************************************/
 	case 9:
 		// get the help page
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/help.static.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/help.static.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Template Variables - Based on Apodigm's Docvars                  */
 /********************************************************************/
 	case 300:
 		// get the new document variable action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 301:
 		// get the edit document variable action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_tmplvars.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 302:
 		// get the save processor
-		include_once(includeFileProcessor("processors/save_tmplvars.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/save_tmplvars.processor.php", $manager_theme));
 	break;
 	case 303:
 		// get the delete processor
-		include_once(includeFileProcessor("processors/delete_tmplvars.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_tmplvars.processor.php", $manager_theme));
 	break;
 	case 304:
 		// get the duplicate processor
-		include_once(includeFileProcessor("processors/duplicate_tmplvars.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/duplicate_tmplvars.processor.php", $manager_theme));
 	break;
 	case 305:
 		// get the tv-rank action
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/mutate_tv_rank.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/mutate_tv_rank.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 /********************************************************************/
 /* Event viewer: show event message log                             */
 /********************************************************************/
 	case 114:
 		// get event logs
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/eventlog.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/eventlog.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 115:
 		// get event log details viewer
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
-		include_once(includeFileProcessor("actions/eventlog_details.dynamic.php",$manager_theme));
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
+		include_once(includeFileProcessor("actions/eventlog_details.dynamic.php", $manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 	break;
 	case 116:
 		// get the event log delete processor
-		include_once(includeFileProcessor("processors/delete_eventlog.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_eventlog.processor.php", $manager_theme));
 	break;
 
 	case 501:
 		//delete category
-		include_once(includeFileProcessor("processors/delete_category.processor.php",$manager_theme));
+		include_once(includeFileProcessor("processors/delete_category.processor.php", $manager_theme));
 	break;
 /********************************************************************/
 /* default action: show not implemented message                     */
 /********************************************************************/
 	default :
 		// say that what was requested doesn't do anything yet
-		include_once(includeFileProcessor("includes/header.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/header.inc.php", $manager_theme));
 		echo "
 			<div class='sectionHeader'>".$_lang['functionnotimpl']."</div>
 			<div class='sectionBody'>
 				<p>".$_lang['functionnotimpl_message']."</p>
 			</div>
 		";
-		include_once(includeFileProcessor("includes/footer.inc.php",$manager_theme));
+		include_once(includeFileProcessor("includes/footer.inc.php", $manager_theme));
 }
 
 /********************************************************************/
 // log action, unless it's a frame request
-if($action!=1 && $action!=7 && $action!=2) {
+if ($action != 1 && $action != 7 && $action != 2) {
 	include_once "log.class.inc.php";
 	$log = new logHandler;
 	$log->initAndWriteLog();

manager/includes/accesscontrol.inc.php

Spacing +51 added lines, -51 removed lines

@@ -1,14 +1,14 @@ 
 <?php
-if(IN_MANAGER_MODE != "true") {
+if (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(!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
+if (!isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
 	header('HTTP/1.0 404 Not Found');
 	exit;
 }
 
-if(isset($_SESSION['mgrValidated']) && $_SESSION['usertype'] != 'manager') {
+if (isset($_SESSION['mgrValidated']) && $_SESSION['usertype'] != 'manager') {
 	//		if (isset($_COOKIE[session_name()])) {
 	//			setcookie(session_name(), '', 0, MODX_BASE_URL);
 	//		}
@@ -18,16 +18,16 @@ 
 }
 
 // andrazk 20070416 - if installer is running, destroy active sessions
-if(file_exists(MODX_BASE_PATH . 'assets/cache/installProc.inc.php')) {
-	include_once(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
-	if(isset($installStartTime)) {
-		if((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
+if (file_exists(MODX_BASE_PATH.'assets/cache/installProc.inc.php')) {
+	include_once(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
+	if (isset($installStartTime)) {
+		if ((time() - $installStartTime) > 5 * 60) { // if install flag older than 5 minutes, discard
 			unset($installStartTime);
-			@ chmod(MODX_BASE_PATH . 'assets/cache/installProc.inc.php', 0755);
-			unlink(MODX_BASE_PATH . 'assets/cache/installProc.inc.php');
+			@ chmod(MODX_BASE_PATH.'assets/cache/installProc.inc.php', 0755);
+			unlink(MODX_BASE_PATH.'assets/cache/installProc.inc.php');
 		} else {
-			if($_SERVER['REQUEST_METHOD'] != 'POST') {
-				if(isset($_COOKIE[session_name()])) {
+			if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+				if (isset($_COOKIE[session_name()])) {
 					session_unset();
 					@session_destroy();
 					//					setcookie(session_name(), '', 0, MODX_BASE_URL);
@@ -39,37 +39,37 @@ 
 }
 
 // andrazk 20070416 - if session started before install and was not destroyed yet
-if(isset($lastInstallTime)) {
-	if(isset($_SESSION['mgrValidated'])) {
-		if(isset($_SESSION['modx.session.created.time'])) {
-			if($_SESSION['modx.session.created.time'] < $lastInstallTime) {
-				if($_SERVER['REQUEST_METHOD'] != 'POST') {
-					if(isset($_COOKIE[session_name()])) {
+if (isset($lastInstallTime)) {
+	if (isset($_SESSION['mgrValidated'])) {
+		if (isset($_SESSION['modx.session.created.time'])) {
+			if ($_SESSION['modx.session.created.time'] < $lastInstallTime) {
+				if ($_SERVER['REQUEST_METHOD'] != 'POST') {
+					if (isset($_COOKIE[session_name()])) {
 						session_unset();
 						@session_destroy();
 						//						setcookie(session_name(), '', 0, MODX_BASE_URL);
 					}
 					header('HTTP/1.0 307 Redirect');
-					header('Location: ' . MODX_MANAGER_URL . 'index.php?installGoingOn=2');
+					header('Location: '.MODX_MANAGER_URL.'index.php?installGoingOn=2');
 				}
 			}
 		}
 	}
 }
 
-if(!isset($_SESSION['mgrValidated'])) {
-	if(isset($manager_language)) {
+if (!isset($_SESSION['mgrValidated'])) {
+	if (isset($manager_language)) {
 		// establish fallback to English default
 		include_once "lang/english.inc.php";
 		// include localized overrides
-		include_once "lang/" . $manager_language . ".inc.php";
+		include_once "lang/".$manager_language.".inc.php";
 	} else {
 		include_once "lang/english.inc.php";
 	}
 
 	$modx->setPlaceholder('modx_charset', $modx_manager_charset);
 	$modx->setPlaceholder('theme', $manager_theme);
-    $modx->setPlaceholder('favicon', (file_exists(MODX_BASE_PATH . 'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/' . $modx->config['manager_theme'] . '/images/favicon.ico'));
+    $modx->setPlaceholder('favicon', (file_exists(MODX_BASE_PATH.'favicon.ico') ? MODX_SITE_URL . 'favicon.ico' : 'media/style/'.$modx->config['manager_theme'].'/images/favicon.ico'));
 
 	// invoke OnManagerLoginFormPrerender event
 	$evtOut = $modx->invokeEvent('OnManagerLoginFormPrerender');
@@ -80,29 +80,29 @@ 
 	$modx->setPlaceholder('manager_path', MGR_DIR);
 	$modx->setPlaceholder('logo_slogan', $_lang["logo_slogan"]);
 	$modx->setPlaceholder('login_message', $_lang["login_message"]);
-	$modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL . 'media/style/' . $modx->config['manager_theme'] . '/');
+	$modx->setPlaceholder('manager_theme_url', MODX_MANAGER_URL.'media/style/'.$modx->config['manager_theme'].'/');
 	$modx->setPlaceholder('year', date('Y'));
 	$modx->setPlaceholder('manager_theme_style', (isset($_COOKIE['MODX_themeColor']) ? $_COOKIE['MODX_themeColor'] : ''));
 
 	// andrazk 20070416 - notify user of install/update
-	if(isset($_GET['installGoingOn'])) {
+	if (isset($_GET['installGoingOn'])) {
 		$installGoingOn = $_GET['installGoingOn'];
 	}
-	if(isset($installGoingOn)) {
-		switch($installGoingOn) {
+	if (isset($installGoingOn)) {
+		switch ($installGoingOn) {
 			case 1 :
-				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">" . $_lang["login_cancelled_install_in_progress"] . "</p><p>" . $_lang["login_message"] . "</p>");
+				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">".$_lang["login_cancelled_install_in_progress"]."</p><p>".$_lang["login_message"]."</p>");
 				break;
 			case 2 :
-				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">" . $_lang["login_cancelled_site_was_updated"] . "</p><p>" . $_lang["login_message"] . "</p>");
+				$modx->setPlaceholder('login_message', "<p><span class=\"fail\">".$_lang["login_cancelled_site_was_updated"]."</p><p>".$_lang["login_message"]."</p>");
 				break;
 		}
 	}
 
-	if($modx->config['use_captcha'] == 1) {
+	if ($modx->config['use_captcha'] == 1) {
 		$modx->setPlaceholder('login_captcha_message', $_lang["login_captcha_message"]);
-		$modx->setPlaceholder('captcha_image', '<a href="' . MODX_MANAGER_URL . '" class="loginCaptcha"><img id="captcha_image" src="' . MODX_MANAGER_URL . 'includes/veriword.php?rand=' . rand() . '" alt="' . $_lang["login_captcha_message"] . '" /></a>');
-		$modx->setPlaceholder('captcha_input', '<label>' . $_lang["captcha_code"] . '</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
+		$modx->setPlaceholder('captcha_image', '<a href="'.MODX_MANAGER_URL.'" class="loginCaptcha"><img id="captcha_image" src="'.MODX_MANAGER_URL.'includes/veriword.php?rand='.rand().'" alt="'.$_lang["login_captcha_message"].'" /></a>');
+		$modx->setPlaceholder('captcha_input', '<label>'.$_lang["captcha_code"].'</label> <input type="text" name="captcha_code" tabindex="3" value="" />');
 	}
 
 	// login info
@@ -119,7 +119,7 @@ 
 
 	// invoke OnManagerLoginFormRender event
 	$evtOut = $modx->invokeEvent('OnManagerLoginFormRender');
-	$html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">' . implode('', $evtOut) . '</div>' : '';
+	$html = is_array($evtOut) ? '<div id="onManagerLoginFormRender">'.implode('', $evtOut).'</div>' : '';
 	$modx->setPlaceholder('OnManagerLoginFormRender', $html);
 
 	// load template
@@ -128,38 +128,38 @@ 
 	$target = $modx->mergeSettingsContent($target);
 
 	$login_tpl = null;
-	if(substr($target, 0, 1) === '@') {
-		if(substr($target, 0, 6) === '@CHUNK') {
+	if (substr($target, 0, 1) === '@') {
+		if (substr($target, 0, 6) === '@CHUNK') {
 			$target = trim(substr($target, 7));
 			$login_tpl = $modx->getChunk($target);
-		} elseif(substr($target, 0, 5) === '@FILE') {
+		} elseif (substr($target, 0, 5) === '@FILE') {
 			$target = trim(substr($target, 6));
 			$login_tpl = file_get_contents($target);
 		}
 	} else {
-		$theme_path = MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/';
-		if(is_file($theme_path . 'style.php')) {
-			include($theme_path . 'style.php');
+		$theme_path = MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/';
+		if (is_file($theme_path.'style.php')) {
+			include($theme_path.'style.php');
 		}
 		$chunk = $modx->getChunk($target);
-		if($chunk !== false && !empty($chunk)) {
+		if ($chunk !== false && !empty($chunk)) {
 			$login_tpl = $chunk;
-		} elseif(is_file(MODX_BASE_PATH . $target)) {
-			$target = MODX_BASE_PATH . $target;
+		} elseif (is_file(MODX_BASE_PATH.$target)) {
+			$target = MODX_BASE_PATH.$target;
 			$login_tpl = file_get_contents($target);
-		} elseif(is_file($target)) {
+		} elseif (is_file($target)) {
 			$login_tpl = file_get_contents($target);
-		} elseif(is_file($theme_path . 'login.tpl')) {
-			$target = $theme_path . 'login.tpl';
+		} elseif (is_file($theme_path.'login.tpl')) {
+			$target = $theme_path.'login.tpl';
 			$login_tpl = file_get_contents($target);
-		} elseif(is_file($theme_path . 'templates/actions/login.tpl')) {
-			$target = $theme_path . 'templates/actions/login.tpl';
+		} elseif (is_file($theme_path.'templates/actions/login.tpl')) {
+			$target = $theme_path.'templates/actions/login.tpl';
 			$login_tpl = file_get_contents($target);
-		} elseif(is_file($theme_path . 'html/login.html')) { // ClipperCMS compatible
-			$target = $theme_path . 'html/login.html';
+		} elseif (is_file($theme_path.'html/login.html')) { // ClipperCMS compatible
+			$target = $theme_path.'html/login.html';
 			$login_tpl = file_get_contents($target);
 		} else {
-			$target = MODX_MANAGER_PATH . 'media/style/common/login.tpl';
+			$target = MODX_MANAGER_PATH.'media/style/common/login.tpl';
 			$login_tpl = file_get_contents($target);
 		}
 	}
@@ -182,8 +182,8 @@ 
 	$lasthittime = time();
 	$action = isset($_REQUEST['a']) ? (int) $_REQUEST['a'] : 1;
 
-	if($action !== 1) {
-		if(!intval($itemid)) {
+	if ($action !== 1) {
+		if (!intval($itemid)) {
 			$itemid = null;
 		}
 		$sql = sprintf("REPLACE INTO %s (sid, internalKey, username, lasthit, action, id) VALUES ('%s', %d, '%s', %d, '%s', %s)", $modx->getFullTableName('active_users') // Table

manager/includes/tmplvars.format.inc.php

Spacing +78 added lines, -78 removed lines

@@ -5,7 +5,7 @@ 
  */
 
 // Added by Raymond 20-Jan-2005
-function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = '') {
+function getTVDisplayFormat($name, $value, $format, $paramstring = "", $tvtype = "", $docid = "", $sep = ''){
 
 	global $modx;
 
@@ -14,29 +14,29 @@ 
 	$value = ProcessTVCommand($value, $name, $docid);
 
 	$params = array();
-	if($paramstring) {
+	if ($paramstring) {
 		$cp = explode("&", $paramstring);
-		foreach($cp as $p => $v) {
+		foreach ($cp as $p => $v) {
 			$v = trim($v); // trim
 			$ar = explode("=", $v);
-			if(is_array($ar) && count($ar) == 2) {
+			if (is_array($ar) && count($ar) == 2) {
 				$params[$ar[0]] = decodeParamValue($ar[1]);
 			}
 		}
 	}
 
 	$id = "tv$name";
-	switch($format) {
+	switch ($format) {
 		case 'image':
 			$images = parseInput($value, '||', 'array');
 			$o = '';
-			foreach($images as $image) {
-				if(!is_array($image)) {
+			foreach ($images as $image) {
+				if (!is_array($image)) {
 					$image = explode('==', $image);
 				}
 				$src = $image[0];
 
-				if($src) {
+				if ($src) {
 					// We have a valid source
 					$attributes = '';
 					$attr = array(
@@ -46,14 +46,14 @@ 
 						'alt' => $modx->htmlspecialchars($params['alttext']),
 						'style' => $params['style']
 					);
-					if(isset($params['align']) && $params['align'] != 'none') {
+					if (isset($params['align']) && $params['align'] != 'none') {
 						$attr['align'] = $params['align'];
 					}
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-					$attributes .= ' ' . $params['attrib'];
+					foreach ($attr as $k => $v) $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
+					$attributes .= ' '.$params['attrib'];
 
 					// Output the image with attributes
-					$o .= '<img' . rtrim($attributes) . ' />';
+					$o .= '<img'.rtrim($attributes).' />';
 				}
 			}
 			break;
@@ -61,7 +61,7 @@ 
 		case "delim":    // display as delimitted list
 			$value = parseInput($value, "||");
 			$p = $params['format'] ? $params['format'] : " ";
-			if($p == "\\n") {
+			if ($p == "\\n") {
 				$p = "\n";
 			}
 			$o = str_replace("||", $p, $value);
@@ -70,13 +70,13 @@ 
 		case "string":
 			$value = parseInput($value);
 			$format = strtolower($params['format']);
-			if($format == 'upper case') {
+			if ($format == 'upper case') {
 				$o = strtoupper($value);
-			} else if($format == 'lower case') {
+			} else if ($format == 'lower case') {
 				$o = strtolower($value);
-			} else if($format == 'sentence case') {
+			} else if ($format == 'sentence case') {
 				$o = ucfirst($value);
-			} else if($format == 'capitalize') {
+			} else if ($format == 'capitalize') {
 				$o = ucwords($value);
 			} else {
 				$o = $value;
@@ -84,8 +84,8 @@ 
 			break;
 
 		case "date":
-			if($value != '' || $params['default'] == 'Yes') {
-				if(empty($value)) {
+			if ($value != '' || $params['default'] == 'Yes') {
+				if (empty($value)) {
 					$value = 'now';
 				}
 				$timestamp = getUnixtimeFromDateString($value);
@@ -99,13 +99,13 @@ 
 		case "hyperlink":
 			$value = parseInput($value, "||", "array");
 			$o = '';
-			for($i = 0; $i < count($value); $i++) {
+			for ($i = 0; $i < count($value); $i++) {
 				list($name, $url) = is_array($value[$i]) ? $value[$i] : explode("==", $value[$i]);
-				if(!$url) {
+				if (!$url) {
 					$url = $name;
 				}
-				if($url) {
-					if($o) {
+				if ($url) {
+					if ($o) {
 						$o .= '<br />';
 					}
 					$attributes = '';
@@ -117,11 +117,11 @@ 
 						'style' => $params['style'],
 						'target' => $params['target'],
 					);
-					foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-					$attributes .= ' ' . $params['attrib']; // add extra
+					foreach ($attr as $k => $v) $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
+					$attributes .= ' '.$params['attrib']; // add extra
 
 					// Output the link
-					$o .= '<a' . rtrim($attributes) . '>' . ($params['text'] ? $modx->htmlspecialchars($params['text']) : $name) . '</a>';
+					$o .= '<a'.rtrim($attributes).'>'.($params['text'] ? $modx->htmlspecialchars($params['text']) : $name).'</a>';
 				}
 			}
 			break;
@@ -132,9 +132,9 @@ 
 			$tagname = ($params['tagname']) ? $params['tagname'] : 'div';
 			$o = '';
 			// Loop through a list of tags
-			for($i = 0; $i < count($value); $i++) {
+			for ($i = 0; $i < count($value); $i++) {
 				$tagvalue = is_array($value[$i]) ? implode(' ', $value[$i]) : $value[$i];
-				if(!$tagvalue) {
+				if (!$tagvalue) {
 					continue;
 				}
 
@@ -145,11 +145,11 @@ 
 					'class' => $params['class'],
 					'style' => $params['style'],
 				);
-				foreach($attr as $k => $v) $attributes .= ($v ? ' ' . $k . '="' . $v . '"' : '');
-				$attributes .= ' ' . $params['attrib']; // add extra
+				foreach ($attr as $k => $v) $attributes .= ($v ? ' '.$k.'="'.$v.'"' : '');
+				$attributes .= ' '.$params['attrib']; // add extra
 
 				// Output the HTML Tag
-				$o .= '<' . $tagname . rtrim($attributes) . '>' . $tagvalue . '</' . $tagname . '>';
+				$o .= '<'.$tagname.rtrim($attributes).'>'.$tagvalue.'</'.$tagname.'>';
 			}
 			break;
 
@@ -158,12 +158,12 @@ 
 			$w = $params['w'] ? $params['w'] : '100%';
 			$h = $params['h'] ? $params['h'] : '400px';
 			$richtexteditor = $params['edt'] ? $params['edt'] : "";
-			$o = '<div class="MODX_RichTextWidget"><textarea id="' . $id . '" name="' . $id . '" style="width:' . $w . '; height:' . $h . ';">';
+			$o = '<div class="MODX_RichTextWidget"><textarea id="'.$id.'" name="'.$id.'" style="width:'.$w.'; height:'.$h.';">';
 			$o .= $modx->htmlspecialchars($value);
 			$o .= '</textarea></div>';
 			$replace_richtext = array($id);
 			// setup editors
-			if(!empty($replace_richtext) && !empty($richtexteditor)) {
+			if (!empty($replace_richtext) && !empty($richtexteditor)) {
 				// invoke OnRichTextEditorInit event
 				$evtOut = $modx->invokeEvent("OnRichTextEditorInit", array(
 					'editor' => $richtexteditor,
@@ -172,7 +172,7 @@ 
 					'width' => $w,
 					'height' => $h
 				));
-				if(is_array($evtOut)) {
+				if (is_array($evtOut)) {
 					$o .= implode("", $evtOut);
 				}
 			}
@@ -185,8 +185,8 @@ 
 
 		case "viewport":
 			$value = parseInput($value);
-			$id = '_' . time();
-			if(!$params['vpid']) {
+			$id = '_'.time();
+			if (!$params['vpid']) {
 				$params['vpid'] = $id;
 			}
 			$sTag = "<iframe";
@@ -194,42 +194,42 @@ 
 			$autoMode = "0";
 			$w = $params['width'];
 			$h = $params['height'];
-			if($params['stretch'] == 'Yes') {
+			if ($params['stretch'] == 'Yes') {
 				$w = "100%";
 				$h = "100%";
 			}
-			if($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
-				$autoMode = "3";  //both
-			} else if($params['awidth'] == 'Yes') {
+			if ($params['asize'] == 'Yes' || ($params['awidth'] == 'Yes' && $params['aheight'] == 'Yes')) {
+				$autoMode = "3"; //both
+			} else if ($params['awidth'] == 'Yes') {
 				$autoMode = "1"; //width only
-			} else if($params['aheight'] == 'Yes') {
-				$autoMode = "2";    //height only
+			} else if ($params['aheight'] == 'Yes') {
+				$autoMode = "2"; //height only
 			}
 
-			$modx->regClientStartupScript(MODX_MANAGER_URL . "media/script/bin/viewport.js", array(
+			$modx->regClientStartupScript(MODX_MANAGER_URL."media/script/bin/viewport.js", array(
 				'name' => 'viewport',
 				'version' => '0',
 				'plaintext' => false
 			));
-			$o = $sTag . " id='" . $params['vpid'] . "' name='" . $params['vpid'] . "' ";
-			if($params['class']) {
-				$o .= " class='" . $params['class'] . "' ";
+			$o = $sTag." id='".$params['vpid']."' name='".$params['vpid']."' ";
+			if ($params['class']) {
+				$o .= " class='".$params['class']."' ";
 			}
-			if($params['style']) {
-				$o .= " style='" . $params['style'] . "' ";
+			if ($params['style']) {
+				$o .= " style='".$params['style']."' ";
 			}
-			if($params['attrib']) {
-				$o .= $params['attrib'] . " ";
+			if ($params['attrib']) {
+				$o .= $params['attrib']." ";
 			}
-			$o .= "scrolling='" . ($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto")) . "' ";
-			$o .= "src='" . $value . "' frameborder='" . $params['borsize'] . "' ";
-			$o .= "onload=\"window.setTimeout('ResizeViewPort(\\'" . $params['vpid'] . "\\'," . $autoMode . ")',100);\" width='" . $w . "' height='" . $h . "' ";
+			$o .= "scrolling='".($params['sbar'] == 'No' ? "no" : ($params['sbar'] == 'Yes' ? "yes" : "auto"))."' ";
+			$o .= "src='".$value."' frameborder='".$params['borsize']."' ";
+			$o .= "onload=\"window.setTimeout('ResizeViewPort(\\'".$params['vpid']."\\',".$autoMode.")',100);\" width='".$w."' height='".$h."' ";
 			$o .= ">";
 			$o .= $eTag;
 			break;
 
 		case "datagrid":
-			include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+			include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
 			$grd = new DataGrid('', $value);
 
 			$grd->noRecordMsg = $params['egmsg'];
@@ -264,7 +264,7 @@ 
 
 		case 'htmlentities':
 			$value = parseInput($value);
-			if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
+			if ($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
 				// remove delimiter from checkbox and listbox-multiple TVs
 				$value = str_replace('||', '', $value);
 			}
@@ -275,33 +275,33 @@ 
 			$widget_output = '';
 			$o = '';
 			/* If we are loading a file */
-			if(substr($params['output'], 0, 5) == "@FILE") {
-				$file_name = MODX_BASE_PATH . trim(substr($params['output'], 6));
-				if(!file_exists($file_name)) {
-					$widget_output = $file_name . ' does not exist';
+			if (substr($params['output'], 0, 5) == "@FILE") {
+				$file_name = MODX_BASE_PATH.trim(substr($params['output'], 6));
+				if (!file_exists($file_name)) {
+					$widget_output = $file_name.' does not exist';
 				} else {
 					$widget_output = file_get_contents($file_name);
 				}
-			} elseif(substr($params['output'], 0, 8) == '@INCLUDE') {
-				$file_name = MODX_BASE_PATH . trim(substr($params['output'], 9));
-				if(!file_exists($file_name)) {
-					$widget_output = $file_name . ' does not exist';
+			} elseif (substr($params['output'], 0, 8) == '@INCLUDE') {
+				$file_name = MODX_BASE_PATH.trim(substr($params['output'], 9));
+				if (!file_exists($file_name)) {
+					$widget_output = $file_name.' does not exist';
 				} else {
 					/* The included file needs to set $widget_output. Can be string, array, object */
 					include $file_name;
 				}
-			} elseif(substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') {
+			} elseif (substr($params['output'], 0, 6) == '@CHUNK' && $value !== '') {
 				$chunk_name = trim(substr($params['output'], 7));
 				$widget_output = $modx->getChunk($chunk_name);
-			} elseif(substr($params['output'], 0, 5) == '@EVAL' && $value !== '') {
+			} elseif (substr($params['output'], 0, 5) == '@EVAL' && $value !== '') {
 				$eval_str = trim(substr($params['output'], 6));
 				$widget_output = eval($eval_str);
-			} elseif($value !== '') {
+			} elseif ($value !== '') {
 				$widget_output = $params['output'];
 			} else {
 				$widget_output = '';
 			}
-			if(is_string($widget_output)) {
+			if (is_string($widget_output)) {
 				$_ = $modx->config['enable_filter'];
 				$modx->config['enable_filter'] = 1;
 				$widget_output = $modx->parseText($widget_output, array('value' => $value));
@@ -314,7 +314,7 @@ 
 
 		default:
 			$value = parseInput($value);
-			if($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
+			if ($tvtype == 'checkbox' || $tvtype == 'listbox-multiple') {
 				// add separator
 				$value = explode('||', $value);
 				$value = implode($sep, $value);
@@ -325,23 +325,23 @@ 
 	return $o;
 }
 
-function decodeParamValue($s) {
+function decodeParamValue($s){
 	$s = str_replace("%3D", '=', $s); // =
 	$s = str_replace("%26", '&', $s); // &
 	return $s;
 }
 
 // returns an array if a delimiter is present. returns array is a recordset is present
-function parseInput($src, $delim = "||", $type = "string", $columns = true) { // type can be: string, array
+function parseInput($src, $delim = "||", $type = "string", $columns = true){ // type can be: string, array
 	global $modx;
-	if($modx->db->isResult($src)) {
+	if ($modx->db->isResult($src)) {
 		// must be a recordset
 		$rows = array();
-		while($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
+		while ($cols = $modx->db->getRow($src, 'num')) $rows[] = ($columns) ? $cols : implode(" ", $cols);
 		return ($type == "array") ? $rows : implode($delim, $rows);
 	} else {
 		// must be a text
-		if($type == "array") {
+		if ($type == "array") {
 			return explode($delim, $src);
 		} else {
 			return $src;
@@ -349,21 +349,21 @@ 
 	}
 }
 
-function getUnixtimeFromDateString($value) {
+function getUnixtimeFromDateString($value){
 	$timestamp = false;
 	// Check for MySQL or legacy style date
 	$date_match_1 = '/^([0-9]{2})-([0-9]{2})-([0-9]{4})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
 	$date_match_2 = '/^([0-9]{4})-([0-9]{2})-([0-9]{2})\ ([0-9]{2}):([0-9]{2}):([0-9]{2})$/';
 	$matches = array();
-	if(strpos($value, '-') !== false) {
-		if(preg_match($date_match_1, $value, $matches)) {
+	if (strpos($value, '-') !== false) {
+		if (preg_match($date_match_1, $value, $matches)) {
 			$timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[1], $matches[3]);
-		} elseif(preg_match($date_match_2, $value, $matches)) {
+		} elseif (preg_match($date_match_2, $value, $matches)) {
 			$timestamp = mktime($matches[4], $matches[5], $matches[6], $matches[2], $matches[3], $matches[1]);
 		}
 	}
 	// If those didn't work, use strtotime to figure out the date
-	if($timestamp === false || $timestamp === -1) {
+	if ($timestamp === false || $timestamp === -1) {
 		$timestamp = strtotime($value);
 	}
 	return $timestamp;

manager/includes/rss.inc.php

Spacing +16 added lines, -16 removed lines

@@ -29,33 +29,33 @@ 
 // include MagPieRSS
 require_once(MODX_MANAGER_PATH.'media/rss/rss_fetch.inc');
 // Convert relative path into absolute url
-function rel2abs( $rel, $base ) {
+function rel2abs($rel, $base){
 	// parse base URL  and convert to local variables: $scheme, $host,  $path
-	extract( parse_url( $base ) );
-	if ( strpos( $rel,"//" ) === 0 ) {
-		return $scheme . ':' . $rel;
+	extract(parse_url($base));
+	if (strpos($rel, "//") === 0) {
+		return $scheme.':'.$rel;
 	}
 	// return if already absolute URL
-	if ( parse_url( $rel, PHP_URL_SCHEME ) != '' ) {
+	if (parse_url($rel, PHP_URL_SCHEME) != '') {
 		return $rel;
 	}
 	// queries and anchors
-	if ( $rel[0] == '#' || $rel[0] == '?' ) {
-		return $base . $rel;
+	if ($rel[0] == '#' || $rel[0] == '?') {
+		return $base.$rel;
 	}
 	// remove non-directory element from path
-	$path = preg_replace( '#/[^/]*$#', '', $path );
+	$path = preg_replace('#/[^/]*$#', '', $path);
 	// destroy path if relative url points to root
-	if ( $rel[0] ==  '/' ) {
+	if ($rel[0] == '/') {
 		$path = '';
 	}
 	// dirty absolute URL
-	$abs = $host . $path . "/" . $rel;
+	$abs = $host.$path."/".$rel;
 	// replace '//' or  '/./' or '/foo/../' with '/'
-	$abs = preg_replace( "/(\/\.?\/)/", "/", $abs );
-	$abs = preg_replace( "/\/(?!\.\.)[^\/]+\/\.\.\//", "/", $abs );
+	$abs = preg_replace("/(\/\.?\/)/", "/", $abs);
+	$abs = preg_replace("/\/(?!\.\.)[^\/]+\/\.\.\//", "/", $abs);
 	// absolute URL is ready!
-	return $scheme . '://' . $abs;
+	return $scheme.'://'.$abs;
 }
 $feedData = array();
 
@@ -63,15 +63,15 @@ 
 foreach ($urls as $section=>$url) {
 	$output = '';
     $rss = @fetch_rss($url);
-    if( !$rss ){
-    	$feedData[$section] = 'Failed to retrieve ' . $url;
+    if (!$rss) {
+    	$feedData[$section] = 'Failed to retrieve '.$url;
     	continue;
 	}
     $output .= '<ul>';
 
     $items = array_slice($rss->items, 0, $itemsNumber);
     foreach ($items as $item) {
-        $href = rel2abs($item['link'],'https://github.com');
+        $href = rel2abs($item['link'], 'https://github.com');
         $title = $item['title'];
         $pubdate = $item['pubdate'];
         $pubdate = $modx->toDateFormat(strtotime($pubdate));

manager/includes/default_config.php

Spacing +1 added lines, -1 removed lines

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

 

-$c  = &$settings;

+$c = &$settings;

 

 $c['site_name']                = 'My MODX Site';

 $c['site_start']               = 1;