evolution-cms / evolution

manager/actions/export_site.static.php

Spacing +2 added lines, -2 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('export_static')) {
@@ -36,7 +36,7 @@ 
 		<div class="container container-body">
 			<?php
             if (isset($_POST['export'])) {
-                $rs = include_once(MODX_MANAGER_PATH . 'processors/export_site.processor.php');
+                $rs = include_once(MODX_MANAGER_PATH.'processors/export_site.processor.php');
                 echo $rs;
             } else {
                 ?>

manager/actions/mutate_content.dynamic.php

Spacing +67 added lines, -67 removed lines

@@ -1,13 +1,13 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
 /********************/
-$sd = isset($_REQUEST['dir']) ? '&dir=' . $_REQUEST['dir'] : '&dir=DESC';
-$sb = isset($_REQUEST['sort']) ? '&sort=' . $_REQUEST['sort'] : '&sort=createdon';
-$pg = isset($_REQUEST['page']) ? '&page=' . (int) $_REQUEST['page'] : '';
-$add_path = $sd . $sb . $pg;
+$sd = isset($_REQUEST['dir']) ? '&dir='.$_REQUEST['dir'] : '&dir=DESC';
+$sb = isset($_REQUEST['sort']) ? '&sort='.$_REQUEST['sort'] : '&sort=createdon';
+$pg = isset($_REQUEST['page']) ? '&page='.(int) $_REQUEST['page'] : '';
+$add_path = $sd.$sb.$pg;
 /*******************/
 
 // check permissions
@@ -24,7 +24,7 @@ 
             $modx->webAlertAndQuit($_lang["error_no_privileges"]);
         } elseif (isset($_REQUEST['pid']) && $_REQUEST['pid'] != '0') {
             // check user has permissions for parent
-            include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+            include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php');
             $udperms = new udperms();
             $udperms->user = $modx->getLoginUserID();
             $udperms->document = empty($_REQUEST['pid']) ? 0 : $_REQUEST['pid'];
@@ -38,7 +38,7 @@ 
         $modx->webAlertAndQuit($_lang["error_no_privileges"]);
 }
 
-$id = isset($_REQUEST['id']) ? (int)$_REQUEST['id'] : 0;
+$id = isset($_REQUEST['id']) ? (int) $_REQUEST['id'] : 0;
 
 // Get table names (alphabetical)
 $tbl_categories = $modx->getFullTableName('categories');
@@ -56,7 +56,7 @@ 
 if ($modx->manager->action == 27) {
     //editing an existing document
     // check permissions on the document
-    include_once(MODX_MANAGER_PATH . 'processors/user_documents_permissions.class.php');
+    include_once(MODX_MANAGER_PATH.'processors/user_documents_permissions.class.php');
     $udperms = new udperms();
     $udperms->user = $modx->getLoginUserID();
     $udperms->document = $id;
@@ -136,7 +136,7 @@ 
         $modx->config['auto_menuindex'] = 1;
     }
     if ($modx->config['auto_menuindex']) {
-        $pid = (int)$_REQUEST['pid'];
+        $pid = (int) $_REQUEST['pid'];
         $rs = $modx->db->select('count(*)', $tbl_site_content, "parent='{$pid}'");
         $content['menuindex'] = $modx->db->getValue($rs);
     } else {
@@ -151,7 +151,7 @@ 
 // Add lock-element JS-Script
 $lockElementId = $id;
 $lockElementType = 7;
-require_once(MODX_MANAGER_PATH . 'includes/active_user_locks.inc.php');
+require_once(MODX_MANAGER_PATH.'includes/active_user_locks.inc.php');
 ?>
 	<script type="text/javascript">
 		/* <![CDATA[ */
@@ -181,7 +181,7 @@ 
 			},
 			cancel: function() {
 				documentDirty = false;
-				document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id=' . $id . $add_path) ?>';
+				document.location.href = 'index.php?<?=($id == 0 ? 'a=2' : 'a=3&r=1&id='.$id.$add_path) ?>';
 			},
 			duplicate: function() {
 				if(confirm("<?= $_lang['confirm_resource_duplicate']?>") === true) {
@@ -189,7 +189,7 @@ 
 				}
 			},
 			view: function() {
-				window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'] . 'index.php?id=' . $id ?>', 'previeWin');
+				window.open('<?= ($modx->config['friendly_urls'] == '1') ? $modx->makeUrl($id) : $modx->config['site_url'].'index.php?id='.$id ?>', 'previeWin');
 			}
 		};
 
@@ -577,7 +577,7 @@ 
 
 			<h1>
 				<i class="fa fa-pencil-square-o"></i><?php if (isset($_REQUEST['id'])) {
-            echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']) . (iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '') . '<small>(' . $_REQUEST['id'] . ')</small>';
+            echo iconv_substr($content['pagetitle'], 0, 50, $modx->config['modx_charset']).(iconv_strlen($content['pagetitle'], $modx->config['modx_charset']) > 50 ? '...' : '').'<small>('.$_REQUEST['id'].')</small>';
         } else {
             if ($modx->manager->action == '4') {
                 echo $_lang['add_resource'];
@@ -614,15 +614,15 @@ 
                         $rs = $modx->db->select('id, pagetitle', $tbl_site_content, "id IN ({$parents})", $where);
                         while ($row = $modx->db->getRow($rs)) {
                             $out .= '<li class="breadcrumbs__li">
-                                <a href="index.php?a=27&id=' . $row['id'] . '" class="breadcrumbs__a">' . htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']) . '</a>
+                                <a href="index.php?a=27&id=' . $row['id'].'" class="breadcrumbs__a">'.htmlspecialchars($row['pagetitle'], ENT_QUOTES, $modx->config['modx_charset']).'</a>
                                 <span class="breadcrumbs__sep">&gt;</span>
                             </li>';
                         }
                     }
                 }
 
-                $out .= '<li class="breadcrumbs__li breadcrumbs__li_current">' . $title . '</li>';
-                echo '<ul class="breadcrumbs">' . $out . '</ul>';
+                $out .= '<li class="breadcrumbs__li breadcrumbs__li_current">'.$title.'</li>';
+                echo '<ul class="breadcrumbs">'.$out.'</ul>';
             }
             ?>
 
@@ -751,7 +751,7 @@ 
 
                             $selectedtext = ($row['id'] == $content['template']) ? ' selected="selected"' : '';
 
-                            echo "\t\t\t\t\t" . '<option value="' . $row['id'] . '"' . $selectedtext . '>' . $row['templatename'] . "</option>\n";
+                            echo "\t\t\t\t\t".'<option value="'.$row['id'].'"'.$selectedtext.'>'.$row['templatename']."</option>\n";
                             $currentCategory = $thisCategory;
                         }
                         if ($thisCategory != '') {
@@ -900,7 +900,7 @@ 
                                                     $richtexteditorIds[$modx->config['which_editor']][] = 'ta';
                                                     $richtexteditorOptions[$modx->config['which_editor']]['ta'] = '';
                                                 } else {
-                                                    echo "\t" . '<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>' . "\n";
+                                                    echo "\t".'<div><textarea class="phptextarea" id="ta" name="ta" rows="20" wrap="soft" onchange="documentDirty=true;">', $modx->htmlspecialchars($content['content']), '</textarea></div>'."\n";
                                                 } ?>
 											</div>
 										</td>
@@ -916,7 +916,7 @@ 
 
                         if (($content['type'] == 'document' || $modx->manager->action == '4') || ($content['type'] == 'reference' || $modx->manager->action == 72)) {
                             $template = $default_template;
-                            $group_tvs = empty($modx->config['group_tvs']) ? 0 : (int)$modx->config['group_tvs'];
+                            $group_tvs = empty($modx->config['group_tvs']) ? 0 : (int) $modx->config['group_tvs'];
                             if (isset($_REQUEST['newtemplate'])) {
                                 $template = $_REQUEST['newtemplate'];
                             } else {
@@ -944,17 +944,17 @@ 
                                 );
                             $sort = 'tvtpl.rank,tv.rank, tv.id';
                             if ($group_tvs) {
-                                $field .= ', IFNULL(tv.category,0) as category_id, IFNULL(cat.category,"' . $_lang['no_category'] . '") AS category, IFNULL(cat.rank,0) AS category_rank';
+                                $field .= ', IFNULL(tv.category,0) as category_id, IFNULL(cat.category,"'.$_lang['no_category'].'") AS category, IFNULL(cat.rank,0) AS category_rank';
                                 $from .= '
-                                    LEFT JOIN ' . $tbl_categories . ' AS cat ON cat.id=tv.category';
-                                $sort = 'cat.rank,cat.id,' . $sort;
+                                    LEFT JOIN ' . $tbl_categories.' AS cat ON cat.id=tv.category';
+                                $sort = 'cat.rank,cat.id,'.$sort;
                             }
                             $where = vsprintf("tvtpl.templateid='%s' AND (1='%s' OR ISNULL(tva.documentgroup) %s)", $vs);
                             $rs = $modx->db->select($field, $from, $where, $sort);
                             if ($modx->db->getRecordCount($rs)) {
                                 $tvsArray = $modx->db->makeArray($rs, 'name');
-                                require_once(MODX_MANAGER_PATH . 'includes/tmplvars.inc.php');
-                                require_once(MODX_MANAGER_PATH . 'includes/tmplvars.commands.inc.php');
+                                require_once(MODX_MANAGER_PATH.'includes/tmplvars.inc.php');
+                                require_once(MODX_MANAGER_PATH.'includes/tmplvars.commands.inc.php');
 
                                 $templateVariablesOutput = '';
                                 $templateVariablesGeneral = '';
@@ -968,8 +968,8 @@ 
                                             if ($group_tvs == 1 || $group_tvs == 3) {
                                                 if ($i === 0) {
                                                     $templateVariablesOutput .= '
-                            <div class="tab-section" id="tabTV_' . $row['category_id'] . '">
-                                <div class="tab-header">' . $row['category'] . '</div>
+                            <div class="tab-section" id="tabTV_' . $row['category_id'].'">
+                                <div class="tab-header">' . $row['category'].'</div>
                                 <div class="tab-body tmplvars">
                                     <table>' . "\n";
                                                 } else {
@@ -978,17 +978,17 @@ 
                                 </div>
                             </div>
                             
-                            <div class="tab-section" id="tabTV_' . $row['category_id'] . '">
-                                <div class="tab-header">' . $row['category'] . '</div>
+                            <div class="tab-section" id="tabTV_' . $row['category_id'].'">
+                                <div class="tab-header">' . $row['category'].'</div>
                                 <div class="tab-body tmplvars">
                                     <table>';
                                                 }
                                             } elseif ($group_tvs == 2 || $group_tvs == 4) {
                                                 if ($i === 0) {
                                                     $templateVariablesOutput .= '
-                            <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
-                                <h2 class="tab">' . $row['category'] . '</h2>
-                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
+                            <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
+                                <h2 class="tab">' . $row['category'].'</h2>
+                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
                                 
                                 <div class="tab-body tmplvars">
                                     <table>';
@@ -998,9 +998,9 @@ 
                                 </div>
                             </div>
                             
-                            <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
-                                <h2 class="tab">' . $row['category'] . '</h2>
-                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
+                            <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
+                                <h2 class="tab">' . $row['category'].'</h2>
+                                <script type="text/javascript">tpTemplateVariables.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
                                 
                                 <div class="tab-body tmplvars">
                                     <table>';
@@ -1008,18 +1008,18 @@ 
                                             } elseif ($group_tvs == 5) {
                                                 if ($i === 0) {
                                                     $templateVariablesOutput .= '
-                                <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
-                                    <h2 class="tab">' . $row['category'] . '</h2>
-                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
+                                <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
+                                    <h2 class="tab">' . $row['category'].'</h2>
+                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
                                     <table>';
                                                 } else {
                                                     $templateVariablesOutput .= '
                                     </table>
                                 </div>
                                 
-                                <div id="tabTV_' . $row['category_id'] . '" class="tab-page tmplvars">
-                                    <h2 class="tab">' . $row['category'] . '</h2>
-                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'] . '\'));</script>
+                                <div id="tabTV_' . $row['category_id'].'" class="tab-page tmplvars">
+                                    <h2 class="tab">' . $row['category'].'</h2>
+                                    <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'tabTV_' . $row['category_id'].'\'));</script>
                                     
                                     <table>';
                                                 }
@@ -1039,8 +1039,8 @@ 
                                             $editor = isset($tvOptions['editor']) ? $tvOptions['editor'] : $modx->config['which_editor'];
                                         };
                                         // Add richtext editor to the list
-                                        $richtexteditorIds[$editor][] = "tv" . $row['id'];
-                                        $richtexteditorOptions[$editor]["tv" . $row['id']] = $tvOptions;
+                                        $richtexteditorIds[$editor][] = "tv".$row['id'];
+                                        $richtexteditorOptions[$editor]["tv".$row['id']] = $tvOptions;
                                     }
 
                                     $templateVariablesTmp = '';
@@ -1057,24 +1057,24 @@ 
                                     }
 
                                     // post back value
-                                    if (array_key_exists('tv' . $row['id'], $_POST)) {
-                                        if (is_array($_POST['tv' . $row['id']])) {
-                                            $tvPBV = implode('||', $_POST['tv' . $row['id']]);
+                                    if (array_key_exists('tv'.$row['id'], $_POST)) {
+                                        if (is_array($_POST['tv'.$row['id']])) {
+                                            $tvPBV = implode('||', $_POST['tv'.$row['id']]);
                                         } else {
-                                            $tvPBV = $_POST['tv' . $row['id']];
+                                            $tvPBV = $_POST['tv'.$row['id']];
                                         }
                                     } else {
                                         $tvPBV = $row['value'];
                                     }
 
-                                    $tvDescription = (!empty($row['description'])) ? '<br /><span class="comment">' . $row['description'] . '</span>' : '';
-                                    $tvInherited = (substr($tvPBV, 0, 8) == '@INHERIT') ? '<br /><span class="comment inherited">(' . $_lang['tmplvars_inherited'] . ')</span>' : '';
-                                    $tvName = $modx->hasPermission('edit_template') ? '<br/><small class="protectedNode">[*' . $row['name'] . '*]</small>' : '';
+                                    $tvDescription = (!empty($row['description'])) ? '<br /><span class="comment">'.$row['description'].'</span>' : '';
+                                    $tvInherited = (substr($tvPBV, 0, 8) == '@INHERIT') ? '<br /><span class="comment inherited">('.$_lang['tmplvars_inherited'].')</span>' : '';
+                                    $tvName = $modx->hasPermission('edit_template') ? '<br/><small class="protectedNode">[*'.$row['name'].'*]</small>' : '';
 
                                     $templateVariablesTmp .= '
                                         <tr>
-                                            <td><span class="warning">' . $row['caption'] . $tvName . '</span>' . $tvDescription . $tvInherited . '</td>
-                                            <td><div style="position:relative;' . ($row['type'] == 'date' ? '' : '') . '">' . renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row, $tvsArray) . '</div></td>
+                                            <td><span class="warning">' . $row['caption'].$tvName.'</span>'.$tvDescription.$tvInherited.'</td>
+                                            <td><div style="position:relative;' . ($row['type'] == 'date' ? '' : '').'">'.renderFormElement($row['type'], $row['id'], $row['default_text'], $row['elements'], $tvPBV, '', $row, $tvsArray).'</div></td>
                                         </tr>';
 
                                     if ($group_tvs && $row['category_id'] == 0) {
@@ -1088,38 +1088,38 @@ 
                                 }
 
                                 if ($templateVariablesGeneral) {
-                                    echo '<table id="tabTV_0" class="tmplvars"><tbody>' . $templateVariablesGeneral . '</tbody></table>';
+                                    echo '<table id="tabTV_0" class="tmplvars"><tbody>'.$templateVariablesGeneral.'</tbody></table>';
                                 }
 
                                 $templateVariables .= '
                         <!-- Template Variables -->' . "\n";
                                 if (!$group_tvs) {
                                     $templateVariables .= '
-                                    <div class="sectionHeader" id="tv_header">' . $_lang['settings_templvars'] . '</div>
+                                    <div class="sectionHeader" id="tv_header">' . $_lang['settings_templvars'].'</div>
                                         <div class="sectionBody tmplvars">
                                             <table>';
                                 } elseif ($group_tvs == 2) {
                                     $templateVariables .= '
                     <div class="tab-section">
-                        <div class="tab-header" id="tv_header">' . $_lang['settings_templvars'] . '</div>
+                        <div class="tab-header" id="tv_header">' . $_lang['settings_templvars'].'</div>
                         <div class="tab-pane" id="paneTemplateVariables">
                             <script type="text/javascript">
-                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');
+                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').');
                             </script>';
                                 } elseif ($group_tvs == 3) {
                                     $templateVariables .= '
                         <div id="templateVariables" class="tab-page tmplvars">
-                            <h2 class="tab">' . $_lang['settings_templvars'] . '</h2>
+                            <h2 class="tab">' . $_lang['settings_templvars'].'</h2>
                             <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'templateVariables\'));</script>';
                                 } elseif ($group_tvs == 4) {
                                     $templateVariables .= '
                     <div id="templateVariables" class="tab-page tmplvars">
-                        <h2 class="tab">' . $_lang['settings_templvars'] . '</h2>
+                        <h2 class="tab">' . $_lang['settings_templvars'].'</h2>
                         <script type="text/javascript">tpSettings.addTabPage(document.getElementById(\'templateVariables\'));</script>
                         
                         <div class="tab-pane" id="paneTemplateVariables">
                             <script type="text/javascript">
-                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false') . ');
+                                tpTemplateVariables = new WebFXTabPane(document.getElementById(\'paneTemplateVariables\'), ' . ($modx->config['remember_last_tab'] == 1 ? 'true' : 'false').');
                             </script>';
                                 }
                                 $templateVariables .= $templateVariablesOutput;
@@ -1239,7 +1239,7 @@ 
                                     $custom_contenttype = (isset($custom_contenttype) ? $custom_contenttype : "text/html,text/plain,text/xml");
                                     $ct = explode(",", $custom_contenttype);
                                     for ($i = 0; $i < count($ct); $i++) {
-                                        echo "\t\t\t\t\t" . '<option value="' . $ct[$i] . '"' . ($content['contentType'] == $ct[$i] ? ' selected="selected"' : '') . '>' . $ct[$i] . "</option>\n";
+                                        echo "\t\t\t\t\t".'<option value="'.$ct[$i].'"'.($content['contentType'] == $ct[$i] ? ' selected="selected"' : '').'>'.$ct[$i]."</option>\n";
                                     } ?>
 											</select>
 										</td>
@@ -1374,7 +1374,7 @@ 
                             // Load up, the permissions from the parent (if new document) or existing document
                             $rs = $modx->db->select('id, document_group', $tbl_document_groups, "document='{$documentId}'");
                             while ($currentgroup = $modx->db->getRow($rs)) {
-                                $groupsarray[] = $currentgroup['document_group'] . ',' . $currentgroup['id'];
+                                $groupsarray[] = $currentgroup['document_group'].','.$currentgroup['id'];
                             }
 
                             // Load up the current permissions and names
@@ -1413,8 +1413,8 @@ 
                         while ($row = $modx->db->getRow($rs)) {
 
                             // Create an inputValue pair (group ID and group link (if it exists))
-                            $inputValue = $row['id'] . ',' . ($row['link_id'] ? $row['link_id'] : 'new');
-                            $inputId = 'group-' . $row['id'];
+                            $inputValue = $row['id'].','.($row['link_id'] ? $row['link_id'] : 'new');
+                            $inputId = 'group-'.$row['id'];
 
                             $checked = in_array($inputValue, $groupsarray);
                             if ($checked) {
@@ -1438,11 +1438,11 @@ 
                             // Create attribute string list
                             $inputString = array();
                             foreach ($inputAttributes as $k => $v) {
-                                $inputString[] = $k . '="' . $v . '"';
+                                $inputString[] = $k.'="'.$v.'"';
                             }
 
                             // Make the <input> HTML
-                            $inputHTML = '<input ' . implode(' ', $inputString) . ' />';
+                            $inputHTML = '<input '.implode(' ', $inputString).' />';
 
                             // does user have this permission?
                             $from = "{$tbl_membergroup_access} AS mga, {$tbl_member_groups} AS mg";
@@ -1458,7 +1458,7 @@ 
                             } else {
                                 ++$permissions_no;
                             }
-                            $permissions[] = "\t\t" . '<li>' . $inputHTML . '<label for="' . $inputId . '">' . $row['name'] . '</label></li>';
+                            $permissions[] = "\t\t".'<li>'.$inputHTML.'<label for="'.$inputId.'">'.$row['name'].'</label></li>';
                         }
                         // if mgr user doesn't have access to any of the displayable permissions, forget about them and make doc public
                         if ($_SESSION['mgrRole'] != 1 && ($permissions_yes == 0 && $permissions_no > 0)) {
@@ -1469,7 +1469,7 @@ 
                         if (!empty($permissions)) {
                             // Add the "All Document Groups" item if we have rights in both contexts
                             if ($isManager && $isWeb) {
-                                array_unshift($permissions, "\t\t" . '<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"' . (!$notPublic ? ' checked="checked"' : '') . ' onclick="makePublic(true);" /><label for="groupall" class="warning">' . $_lang['all_doc_groups'] . '</label></li>');
+                                array_unshift($permissions, "\t\t".'<li><input type="checkbox" class="checkbox" name="chkalldocs" id="groupall"'.(!$notPublic ? ' checked="checked"' : '').' onclick="makePublic(true);" /><label for="groupall" class="warning">'.$_lang['all_doc_groups'].'</label></li>');
                             }
                             // Output the permissions list...
                             ?>
@@ -1502,7 +1502,7 @@ 
 								</script>
 								<p><?= $_lang['access_permissions_docs_message'] ?></p>
 								<ul>
-									<?= implode("\n", $permissions) . "\n" ?>
+									<?= implode("\n", $permissions)."\n" ?>
 								</ul>
 							</div><!--div class="tab-page" id="tabAccess"-->
 							<?php

Braces +4 added lines, -2 removed lines

@@ -478,7 +478,8 @@ 
 			return s;
 		}
 
-		<?php if ($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific?>
+		<?php if ($content['type'] == 'reference' || $modx->manager->action == '72') {
+// Web Link specific?>
 		var lastImageCtrl;
 		var lastFileCtrl;
 
@@ -695,7 +696,8 @@ 
 									</td>
 								</tr>
 
-								<?php if ($content['type'] == 'reference' || $modx->manager->action == '72') { // Web Link specific?>
+								<?php if ($content['type'] == 'reference' || $modx->manager->action == '72') {
+// Web Link specific?>
 
 									<tr>
 										<td><span class="warning"><?= $_lang['weblink'] ?></span>

manager/actions/site_schedule.static.php

Spacing +3 added lines, -3 removed lines

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

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

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

     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");

 }

 if (!$modx->hasPermission('view_eventlog')) {

@@ -17,7 +17,7 @@ 
 		<div class="form-group" id="lyr1">

 			<b><?= $_lang["publish_events"] ?></b>

 			<?php

-            $rs = $modx->db->select('id, pagetitle, pub_date', $modx->getFullTableName('site_content'), "pub_date > " . time() . "", 'pub_date ASC');

+            $rs = $modx->db->select('id, pagetitle, pub_date', $modx->getFullTableName('site_content'), "pub_date > ".time()."", 'pub_date ASC');

             $limit = $modx->db->getRecordCount($rs);

             if ($limit < 1) {

                 ?>

@@ -55,7 +55,7 @@ 
 		<div class="form-group" id="lyr2">

 			<b><?= $_lang["unpublish_events"] ?></b>

 			<?php

-            $rs = $modx->db->select('id, pagetitle, unpub_date', $modx->getFullTableName('site_content'), "unpub_date > " . time() . "", 'unpub_date ASC');

+            $rs = $modx->db->select('id, pagetitle, unpub_date', $modx->getFullTableName('site_content'), "unpub_date > ".time()."", 'unpub_date ASC');

             $limit = $modx->db->getRecordCount($rs);

             if ($limit < 1) {

                 ?>

Braces +11 added lines, -11 removed lines

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

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

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

 }

-if (!$modx->hasPermission('view_eventlog')) {

+if (!$modx->hasPermission('view_eventlog')) {
     $modx->webAlertAndQuit($_lang["error_no_privileges"]);

 }

 ?>

@@ -19,11 +19,11 @@ 
 			<?php

             $rs = $modx->db->select('id, pagetitle, pub_date', $modx->getFullTableName('site_content'), "pub_date > " . time() . "", 'pub_date ASC');

             $limit = $modx->db->getRecordCount($rs);

-            if ($limit < 1) {

+            if ($limit < 1) {
                 ?>

 				<p><?= $_lang["no_docs_pending_publishing"] ?></p>

 				<?php

-            } else {

+            } else {
                 ?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-1">

@@ -36,7 +36,7 @@ 
 						</thead>

 						<tbody>

 						<?php

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

+                        while ($row = $modx->db->getRow($rs)) {
                             ?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

@@ -57,11 +57,11 @@ 
 			<?php

             $rs = $modx->db->select('id, pagetitle, unpub_date', $modx->getFullTableName('site_content'), "unpub_date > " . time() . "", 'unpub_date ASC');

             $limit = $modx->db->getRecordCount($rs);

-            if ($limit < 1) {

+            if ($limit < 1) {
                 ?>

 				<p><?= $_lang["no_docs_pending_unpublishing"] ?></p>

 				<?php

-            } else {

+            } else {
                 ?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-2">

@@ -74,7 +74,7 @@ 
 						</thead>

 						<tbody>

 						<?php

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

+                        while ($row = $modx->db->getRow($rs)) {
                             ?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

@@ -95,11 +95,11 @@ 
 			<?php

             $rs = $modx->db->select('id, pagetitle, pub_date, unpub_date', $modx->getFullTableName('site_content'), "pub_date > 0 OR unpub_date > 0", "pub_date DESC");

             $limit = $modx->db->getRecordCount($rs);

-            if ($limit < 1) {

+            if ($limit < 1) {
                 ?>

 				<p><?= $_lang["no_docs_pending_pubunpub"] ?></p>

 				<?php

-            } else {

+            } else {
                 ?>

 				<div class="table-responsive">

 					<table class="grid sortabletable" id="table-3">

@@ -113,7 +113,7 @@ 
 						</thead>

 						<tbody>

 						<?php

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

+                        while ($row = $modx->db->getRow($rs)) {
                             ?>

 							<tr>

 								<td class="text-right"><?= $row['id'] ?></td>

manager/actions/welcome.static.php

Spacing +18 added lines, -18 removed lines

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

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

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

     die('<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.');

 }

 

@@ -17,15 +17,15 @@ 
 

 // setup message info

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

-    include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');

+    include_once(MODX_MANAGER_PATH.'includes/messageCount.inc.php');

     $_SESSION['nrtotalmessages'] = $nrtotalmessages;

     $_SESSION['nrnewmessages'] = $nrnewmessages;

 

     $msg = array();

     $msg[] = sprintf('<a href="index.php?a=10" target="main"><img src="%s" /></a>', $_style['icons_mail_large']);

-    $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">' . $_SESSION['nrnewmessages'] . '</span>)' : '';

+    $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? ' (<span style="color:red">'.$_SESSION['nrnewmessages'].'</span>)' : '';

     $msg[] = sprintf('<span style="color:#909090;font-size:15px;font-weight:bold">&nbsp;<a class="wm_messages_inbox_link" href="index.php?a=10" target="main">[%%inbox%%]</a>%s</span><br />', $nrnewmessages);

-    $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">' . $_SESSION['nrnewmessages'] . '</span>' : '0';

+    $nrnewmessages = $_SESSION['nrnewmessages'] > 0 ? '<span style="color:red;">'.$_SESSION['nrnewmessages'].'</span>' : '0';

     $welcome_messages = sprintf($_lang['welcome_messages'], $_SESSION['nrtotalmessages'], $nrnewmessages);

     $msg[] = sprintf('<span class="comment">%s</span>', $welcome_messages);

     $ph['MessageInfo'] = implode("\n", $msg);

@@ -80,7 +80,7 @@ 
 

 // do some config checks

 if (($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {

-    include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');

+    include_once(MODX_MANAGER_PATH.'includes/config_check.inc.php');

     if ($config_check_results != $_lang['configcheck_ok']) {

         $ph['config_check_results'] = $config_check_results;

         $ph['config_display'] = 'block';

@@ -147,7 +147,7 @@ 
 	</tr>

 </table>';

 

-$nrnewmessages = '<span class="text-danger">' . $_SESSION['nrnewmessages'] . '</span>';

+$nrnewmessages = '<span class="text-danger">'.$_SESSION['nrnewmessages'].'</span>';

 

 $ph['UserInfo'] = $modx->parseText($tpl, array(

     'username' => $modx->getLoginUserName(),

@@ -165,7 +165,7 @@ 
 if ($modx->db->getRecordCount($rs) < 1) {

     $html = '<p>[%no_active_users_found%]</p>';

 } else {

-    include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');

+    include_once(MODX_MANAGER_PATH.'includes/actionlist.inc.php');

     $now = $_SERVER['REQUEST_TIME'] + $server_offset_time;

     $ph['now'] = strftime('%H:%M:%S', $now);

     $timetocheck = ($now - (60 * 20)); //+$server_offset_time;

@@ -210,7 +210,7 @@ 
     }

     foreach ($userList as $params) {

         $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';

-        $html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

+        $html .= "\n\t\t".vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

     }

 

     $html .= '

@@ -222,7 +222,7 @@ 
 $ph['OnlineInfo'] = $html;

 

 // include rss feeds for important forum topics

-include_once(MODX_MANAGER_PATH . 'includes/rss.inc.php');

+include_once(MODX_MANAGER_PATH.'includes/rss.inc.php');

 $ph['modx_security_notices_content'] = $feedData['modx_security_notices_content'];

 $ph['modx_news_content'] = $feedData['modx_news_content'];

 

@@ -391,7 +391,7 @@ 
     $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets;

 }

 

-usort($widgets, function ($a, $b) {

+usort($widgets, function($a, $b){

     return $a['menuindex'] - $b['menuindex'];

 });

 

@@ -406,7 +406,7 @@ 
 

 // load template

 if (!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {

-    $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';

+    $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH.'media/style/common/welcome.tpl';

 }

 

 $target = $modx->config['manager_welcome_tpl'];

@@ -425,15 +425,15 @@ 
     $chunk = $modx->getChunk($target);

     if ($chunk !== false && !empty($chunk)) {

         $content = $chunk;

-    } elseif (is_file(MODX_BASE_PATH . $target)) {

-        $content = file_get_contents(MODX_BASE_PATH . $target);

-    } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {

-        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');

-    } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) { // ClipperCMS compatible
+    } elseif (is_file(MODX_BASE_PATH.$target)) {

+        $content = file_get_contents(MODX_BASE_PATH.$target);

+    } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl')) {

+        $content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/welcome.tpl');

+    } elseif (is_file(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html')) { // ClipperCMS compatible
 

-        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');

+        $content = file_get_contents(MODX_MANAGER_PATH.'media/style/'.$modx->config['manager_theme'].'/html/welcome.html');

     } else {

-        $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');

+        $content = file_get_contents(MODX_MANAGER_PATH.'media/style/common/welcome.tpl');

     }

 }

 

Braces +79 added lines, -76 removed lines

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

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

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

 }

 

 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes

 

-if ($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {

+if ($modx->hasPermission('settings') && (!isset($settings_version) || $settings_version != $modx->getVersionData('version'))) {
     // seems to be a new install - send the user to the configuration page

     exit('<script type="text/javascript">document.location.href="index.php?a=17";</script>');

 }

@@ -16,7 +16,7 @@ 
 $_SESSION['nrnewmessages'] = 0;

 

 // setup message info

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

+if ($modx->hasPermission('messages')) {
     include_once(MODX_MANAGER_PATH . 'includes/messageCount.inc.php');

     $_SESSION['nrtotalmessages'] = $nrtotalmessages;

     $_SESSION['nrnewmessages'] = $nrnewmessages;

@@ -32,46 +32,46 @@ 
 }

 

 // setup icons

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

+if ($modx->hasPermission('new_user') || $modx->hasPermission('edit_user')) {
     $icon = '<i class="[&icons_security_large&]" alt="[%user_management_title%]"> </i>[%user_management_title%]';

     $ph['SecurityIcon'] = wrapIcon($icon, 75);

 }

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

+if ($modx->hasPermission('new_web_user') || $modx->hasPermission('edit_web_user')) {
     $icon = '<i class="[&icons_webusers_large&]" alt="[%web_user_management_title%]"> </i>[%web_user_management_title%]';

     $ph['WebUserIcon'] = wrapIcon($icon, 99);

 }

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

+if ($modx->hasPermission('new_module') || $modx->hasPermission('edit_module')) {
     $icon = '<i class="[&icons_modules_large&]" alt="[%manage_modules%]"> </i>[%modules%]';

     $ph['ModulesIcon'] = wrapIcon($icon, 106);

 }

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

+if ($modx->hasPermission('new_template') || $modx->hasPermission('edit_template') || $modx->hasPermission('new_snippet') || $modx->hasPermission('edit_snippet') || $modx->hasPermission('new_plugin') || $modx->hasPermission('edit_plugin') || $modx->hasPermission('manage_metatags')) {
     $icon = '<i class="[&icons_resources_large&]" alt="[%element_management%]"> </i>[%elements%]';

     $ph['ResourcesIcon'] = wrapIcon($icon, 76);

 }

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

+if ($modx->hasPermission('bk_manager')) {
     $icon = '<i class="[&icons_backup_large&]" alt="[%bk_manager%]"> </i>[%backup%]';

     $ph['BackupIcon'] = wrapIcon($icon, 93);

 }

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

+if ($modx->hasPermission('help')) {
     $icon = '<i class="[&icons_help_large&]" alt="[%help%]" /> </i>[%help%]';

     $ph['HelpIcon'] = wrapIcon($icon, 9);

 }

 

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

+if ($modx->hasPermission('new_document')) {
     $icon = '<i class="[&icons_resource_large&]"></i>[%add_resource%]';

     $ph['ResourceIcon'] = wrapIcon($icon, 4);

     $icon = '<i class="[&icons_weblink_large&]"></i>[%add_weblink%]';

     $ph['WeblinkIcon'] = wrapIcon($icon, 72);

 }

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

+if ($modx->hasPermission('assets_images')) {
     $icon = '<i class="[&icons_images_large&]"></i>[%images_management%]';

     $ph['ImagesIcon'] = wrapIcon($icon, 72);

 }

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

+if ($modx->hasPermission('assets_files')) {
     $icon = '<i class="[&icons_files_large&]"></i>[%files_management%]';

     $ph['FilesIcon'] = wrapIcon($icon, 72);

 }

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

+if ($modx->hasPermission('change_password')) {
     $icon = '<i class="[&icons_password_large&]"></i>[%change_password%]';

     $ph['PasswordIcon'] = wrapIcon($icon, 28);

 }

@@ -79,21 +79,21 @@ 
 $ph['LogoutIcon'] = wrapIcon($icon, 8);

 

 // do some config checks

-if (($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {

+if (($modx->config['warning_visibility'] == 0 && $_SESSION['mgrRole'] == 1) || $modx->config['warning_visibility'] == 1) {
     include_once(MODX_MANAGER_PATH . 'includes/config_check.inc.php');

-    if ($config_check_results != $_lang['configcheck_ok']) {

+    if ($config_check_results != $_lang['configcheck_ok']) {
         $ph['config_check_results'] = $config_check_results;

         $ph['config_display'] = 'block';

-    } else {

+    } else {
         $ph['config_display'] = 'none';

     }

-} else {

+} else {
     $ph['config_display'] = 'none';

 }

 

 // Check logout-reminder

-if (isset($_SESSION['show_logout_reminder'])) {

-    switch ($_SESSION['show_logout_reminder']['type']) {

+if (isset($_SESSION['show_logout_reminder'])) {
+    switch ($_SESSION['show_logout_reminder']['type']) {
         case 'logout_reminder':

             $date = $modx->toDateFormat($_SESSION['show_logout_reminder']['lastHit'], 'dateOnly');

             $ph['logout_reminder_msg'] = str_replace('[+date+]', $date, $_lang['logout_reminder_msg']);

@@ -101,7 +101,7 @@ 
     }

     $ph['show_logout_reminder'] = 'block';

     unset($_SESSION['show_logout_reminder']);

-} else {

+} else {
     $ph['show_logout_reminder'] = 'none';

 }

 

@@ -162,9 +162,9 @@ 
 $from[] = " us LEFT JOIN [+prefix+]active_users au ON au.sid=us.sid WHERE au.action <> '8'";

 $rs = $modx->db->select('*', $from, '', 'username ASC, au.sid ASC');

 

-if ($modx->db->getRecordCount($rs) < 1) {

+if ($modx->db->getRecordCount($rs) < 1) {
     $html = '<p>[%no_active_users_found%]</p>';

-} else {

+} else {
     include_once(MODX_MANAGER_PATH . 'includes/actionlist.inc.php');

     $now = $_SERVER['REQUEST_TIME'] + $server_offset_time;

     $ph['now'] = strftime('%H:%M:%S', $now);

@@ -190,7 +190,7 @@ 
     $userList = array();

     $userCount = array();

     // Create userlist with session-count first before output

-    while ($activeusers = $modx->db->getRow($rs)) {

+    while ($activeusers = $modx->db->getRow($rs)) {
         $userCount[$activeusers['internalKey']] = isset($userCount[$activeusers['internalKey']]) ? $userCount[$activeusers['internalKey']] + 1 : 1;

 

         $idle = $activeusers['lasthit'] < $timetocheck ? ' class="userIdle"' : '';

@@ -208,7 +208,7 @@ 
             $currentaction

         );

     }

-    foreach ($userList as $params) {

+    foreach ($userList as $params) {
         $params[1] = $userCount[$params[4]] > 1 ? ' class="userMultipleSessions"' : '';

         $html .= "\n\t\t" . vsprintf('<tr%s><td><strong%s>%s</strong></td><td>%s%s</td><td>%s</td><td>%s</td><td>%s</td></tr>', $params);

     }

@@ -253,7 +253,7 @@ 
 

 // invoke event OnManagerWelcomePrerender

 $evtOut = $modx->invokeEvent('OnManagerWelcomePrerender');

-if (is_array($evtOut)) {

+if (is_array($evtOut)) {
     $output = implode('', $evtOut);

     $ph['OnManagerWelcomePrerender'] = $output;

 }

@@ -358,7 +358,7 @@ 
     'body' => '<div class="widget-stage">[+RecentInfo+]</div>',

     'hide'=>'0'

 );

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

+if ($modx->config['rss_url_news']) {
     $widgets['news'] = array(

         'menuindex' => '40',

         'id' => 'news',

@@ -369,7 +369,7 @@ 
         'hide'=>'0'

     );

 }

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

+if ($modx->config['rss_url_security']) {
     $widgets['security'] = array(

         'menuindex' => '50',

         'id' => 'security',

@@ -383,29 +383,29 @@ 
 

 // invoke OnManagerWelcomeHome event

 $sitewidgets = $modx->invokeEvent("OnManagerWelcomeHome", array('widgets' => $widgets));

-if (is_array($sitewidgets)) {

+if (is_array($sitewidgets)) {
     $newwidgets = array();

-    foreach ($sitewidgets as $widget) {

+    foreach ($sitewidgets as $widget) {
         $newwidgets = array_merge($newwidgets, unserialize($widget));

     }

     $widgets = (count($newwidgets) > 0) ? $newwidgets : $widgets;

 }

 

-usort($widgets, function ($a, $b) {

+usort($widgets, function ($a, $b){
     return $a['menuindex'] - $b['menuindex'];

 });

 

 $tpl = getTplWidget();

 $output = '';

-foreach ($widgets as $widget) {

-    if ($widget['hide'] != '1') {

+foreach ($widgets as $widget) {
+    if ($widget['hide'] != '1') {
         $output .= $modx->parseText($tpl, $widget);

     }

 }

 $ph['widgets'] = $output;

 

 // load template

-if (!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {

+if (!isset($modx->config['manager_welcome_tpl']) || empty($modx->config['manager_welcome_tpl'])) {
     $modx->config['manager_welcome_tpl'] = MODX_MANAGER_PATH . 'media/style/common/welcome.tpl';

 }

 

@@ -413,26 +413,27 @@ 
 $target = str_replace('[+base_path+]', MODX_BASE_PATH, $target);

 $target = $modx->mergeSettingsContent($target);

 

-if (substr($target, 0, 1) === '@') {

-    if (substr($target, 0, 6) === '@CHUNK') {

+if (substr($target, 0, 1) === '@') {
+    if (substr($target, 0, 6) === '@CHUNK') {
         $content = $modx->getChunk(trim(substr($target, 7)));

-    } elseif (substr($target, 0, 5) === '@FILE') {

+    } elseif (substr($target, 0, 5) === '@FILE') {
         $content = file_get_contents(trim(substr($target, 6)));

-    } else {

+    } else {
         $content = '';

     }

-} else {

+} else {
     $chunk = $modx->getChunk($target);

-    if ($chunk !== false && !empty($chunk)) {

+    if ($chunk !== false && !empty($chunk)) {
         $content = $chunk;

-    } elseif (is_file(MODX_BASE_PATH . $target)) {

+    } elseif (is_file(MODX_BASE_PATH . $target)) {
         $content = file_get_contents(MODX_BASE_PATH . $target);

-    } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {

+    } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl')) {
         $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/welcome.tpl');

-    } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) { // ClipperCMS compatible
+    } elseif (is_file(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html')) {
+// ClipperCMS compatible
 

         $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/' . $modx->config['manager_theme'] . '/html/welcome.html');

-    } else {

+    } else {
         $content = file_get_contents(MODX_MANAGER_PATH . 'media/style/common/welcome.tpl');

     }

 }

@@ -441,7 +442,7 @@ 
 $content = $modx->mergeConditionalTagsContent($content);

 $content = $modx->mergeSettingsContent($content);

 $content = $modx->parseText($content, $ph);

-if (strpos($content, '[+') !== false) {

+if (strpos($content, '[+') !== false) {
     $modx->toPlaceholders($ph);

     $content = $modx->mergePlaceholderContent($content);

 }

@@ -450,7 +451,7 @@ 
 $content = $modx->parseText($content, $_style, '[&', '&]');

 $content = $modx->cleanUpMODXTags($content); //cleanup

 

-if ($js = $modx->getRegisteredClientScripts()) {

+if ($js = $modx->getRegisteredClientScripts()) {
     $content .= $js;

 }

 

@@ -460,8 +461,9 @@ 
 //	<a href="javascript:;" class="setting"><i class="fa fa-cog"></i></a>

 //  <a href="javascript:;" class="closed"><i class="fa fa-close"></i></a>

 //</span>

-function getTplWidget()

-{ // recent document info

+function getTplWidget()
+{
+// recent document info

     return '

 		<div class="[+cols+]" id="[+id+]">

 			<div class="card"[+cardAttr+]>

@@ -472,8 +474,9 @@ 
 ';

 }

 

-function getRecentInfo()

-{ // recent document info

+function getRecentInfo()
+{
+// recent document info

     $modx = evolutionCMS();

 

     $modx->addSnippet('recentInfoList', 'getRecentInfoList');

@@ -499,13 +502,13 @@ 
     return $html;

 }

 

-function getRecentInfoList()

-{

+function getRecentInfoList()
+{
     $modx = evolutionCMS();

 

     $rs = $modx->db->select('*', '[+prefix+]site_content', '', 'editedon DESC', 10);

 

-    if ($modx->db->getRecordCount($rs) < 1) {

+    if ($modx->db->getRecordCount($rs) < 1) {
         return '<tr><td>[%no_activity_message%]</td></tr>';

     }

 

@@ -515,22 +518,22 @@ 
     $btntpl['preview_btn'] = '<a [+preview_disabled+]" title="[%preview_resource%]" target="_blank" href="../index.php?&amp;id=[+id+]"><i class="fa fa-eye fa-fw"></i></a> ';

 

     $output = array();

-    while ($ph = $modx->db->getRow($rs)) {

+    while ($ph = $modx->db->getRow($rs)) {
         $docid = $ph['id'];

         $_ = $modx->getUserInfo($ph['editedby']);

         $ph['username'] = $_['username'];

 

-        if ($ph['deleted'] == 1) {

+        if ($ph['deleted'] == 1) {
             $ph['status'] = 'deleted text-danger';

-        } elseif ($ph['published'] == 0) {

+        } elseif ($ph['published'] == 0) {
             $ph['status'] = 'unpublished font-italic text-muted';

-        } else {

+        } else {
             $ph['status'] = 'published';

         }

 

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

+        if ($modx->hasPermission('edit_document')) {
             $ph['edit_btn'] = str_replace('[+id+]', $docid, $btntpl['edit']);

-        } else {

+        } else {
             $ph['edit_btn'] = '';

         }

 

@@ -543,40 +546,40 @@ 
             $preview_disabled

         ), $btntpl['preview_btn']);

 

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

-            if ($ph['deleted'] == 0) {

+        if ($modx->hasPermission('delete_document')) {
+            if ($ph['deleted'] == 0) {
                 $delete_btn = '<a onclick="return confirm(\'[%confirm_delete_record%]\')" title="[%delete_resource%]" href="index.php?a=6&amp;id=[+id+]" target="main"><i class="fa fa-trash fa-fw"></i></a> ';

-            } else {

+            } else {
                 $delete_btn = '<a onclick="return confirm(\'[%confirm_undelete%]\')" title="[%undelete_resource%]" href="index.php?a=63&amp;id=[+id+]" target="main"><i class="fa fa-arrow-circle-o-up fa-fw"></i></a> ';

             }

             $ph['delete_btn'] = str_replace('[+id+]', $docid, $delete_btn);

-        } else {

+        } else {
             $ph['delete_btn'] = '';

         }

 

-        if ($ph['deleted'] == 1 && $ph['published'] == 0) {

+        if ($ph['deleted'] == 1 && $ph['published'] == 0) {
             $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-        } elseif ($ph['deleted'] == 1 && $ph['published'] == 1) {

+        } elseif ($ph['deleted'] == 1 && $ph['published'] == 1) {
             $publish_btn = '<a class="disabled" title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

-        } elseif ($ph['deleted'] == 0 && $ph['published'] == 0) {

+        } elseif ($ph['deleted'] == 0 && $ph['published'] == 0) {
             $publish_btn = '<a title="[%publish_resource%]" href="index.php?a=61&amp;id=[+id+]" target="main"><i class="fa fa-arrow-up fa-fw"></i></a> ';

-        } else {

+        } else {
             $publish_btn = '<a title="[%unpublish_resource%]" href="index.php?a=62&amp;id=[+id+]" target="main"><i class="fa fa-arrow-down fa-fw"></i></a> ';

         }

         $ph['publish_btn'] = str_replace('[+id+]', $docid, $publish_btn);

 

         $ph['info_btn'] = str_replace('[+id+]', $docid, '<a title="[%resource_overview%]" data-toggle="collapse" data-target=".collapse[+id+]"><i class="fa fa-info fa-fw"></i></a>');

 

-        if ($ph['longtitle'] == '') {

+        if ($ph['longtitle'] == '') {
             $ph['longtitle'] = '(<i>[%not_set%]</i>)';

         }

-        if ($ph['description'] == '') {

+        if ($ph['description'] == '') {
             $ph['description'] = '(<i>[%not_set%]</i>)';

         }

-        if ($ph['introtext'] == '') {

+        if ($ph['introtext'] == '') {
             $ph['introtext'] = '(<i>[%not_set%]</i>)';

         }

-        if ($ph['alias'] == '') {

+        if ($ph['alias'] == '') {
             $ph['alias'] = '(<i>[%not_set%]</i>)';

         }

 

@@ -585,8 +588,8 @@ 
     return implode("\n", $output);

 }

 

-function getRecentInfoRowTpl()

-{

+function getRecentInfoRowTpl()
+{
     $tpl = '

 						<tr>

 							<td data-toggle="collapse" data-target=".collapse[+id+]" class="text-right"><span class="label label-info">[+id+]</span></td>

@@ -615,13 +618,13 @@ 
 }

 

 // setup icons

-function wrapIcon($i, $action)

-{

+function wrapIcon($i, $action)
+{
     return sprintf('<a href="index.php?a=%s" target="main"><span class="wm_button" style="border:0">%s</span></a>', $action, $i);

 }

 

-function getStartUpScript()

-{

+function getStartUpScript()
+{
     $script = '

         <script type="text/javascript">

         function hideConfigCheckWarning(key) {

manager/actions/search.static.php

Spacing +73 added lines, -73 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     exit();
 }
 unset($_SESSION['itemname']); // clear this, because it's only set for logging purposes
@@ -41,9 +41,9 @@ 
                         <?php
                         $rs = $modx->db->select('*', $modx->getFullTableName('site_templates'));
                         $option[] = '<option value="">No selected</option>';
-                        $templateid = (isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '') ? (int)$_REQUEST['templateid'] : '';
+                        $templateid = (isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '') ? (int) $_REQUEST['templateid'] : '';
                         $selected = $templateid === 0 ? ' selected="selected"' : '';
-                        $option[] = '<option value="0"' . $selected . '>(blank)</option>';
+                        $option[] = '<option value="0"'.$selected.'>(blank)</option>';
                         while ($row = $modx->db->getRow($rs)) {
                             $templatename = htmlspecialchars($row['templatename'], ENT_QUOTES, $modx->config['modx_charset']);
                             $selected = $row['id'] == $templateid ? ' selected="selected"' : '';
@@ -86,7 +86,7 @@ 
     $searchfields = htmlentities(trim($_POST['searchfields']), ENT_QUOTES, $modx_manager_charset);
     $searchlongtitle = $modx->db->escape(trim($_REQUEST['searchfields']));
     $search_alias = $modx->db->escape(trim($_REQUEST['searchfields']));
-    $templateid = isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '' ? (int)$_REQUEST['templateid'] : '';
+    $templateid = isset($_REQUEST['templateid']) && $_REQUEST['templateid'] !== '' ? (int) $_REQUEST['templateid'] : '';
     $searchcontent = $modx->db->escape($_REQUEST['content']);
 
     $fields = 'DISTINCT sc.id, contenttype, pagetitle, longtitle, description, introtext, menutitle, deleted, published, isfolder, type';
@@ -100,12 +100,12 @@ 
         $friendly_url_suffix = $modx->config['friendly_url_suffix'];
         $base_url = $modx->config['base_url'];
         $site_url = $modx->config['site_url'];
-        $url = preg_replace('@' . $friendly_url_suffix . '$@', '', $url);
+        $url = preg_replace('@'.$friendly_url_suffix.'$@', '', $url);
         if ($url[0] === '/') {
-            $url = preg_replace('@^' . $base_url . '@', '', $url);
+            $url = preg_replace('@^'.$base_url.'@', '', $url);
         }
         if (substr($url, 0, 4) === 'http') {
-            $url = preg_replace('@^' . $site_url . '@', '', $url);
+            $url = preg_replace('@^'.$site_url.'@', '', $url);
         }
         $idFromAlias = $modx->getIdFromAlias($url);
     }
@@ -118,13 +118,13 @@ 
         $articul_query = "SELECT `contentid` FROM {$tbl_site_tmplvar_contentvalues} WHERE `value` LIKE '%{$searchfields}%'";
         $articul_result = $modx->db->query($articul_query);
         $articul_id_array = $modx->db->makeArray($articul_result);
-        if (count($articul_id_array)>0) {
+        if (count($articul_id_array) > 0) {
             $articul_id = '';
             $i = 1;
             foreach ($articul_id_array as $articul) {
-                $articul_id.=$articul['contentid'];
+                $articul_id .= $articul['contentid'];
                 if ($i !== count($articul_id_array)) {
-                    $articul_id.=',';
+                    $articul_id .= ',';
                 }
                 $i++;
             }
@@ -137,7 +137,7 @@ 
         if (ctype_digit($searchfields)) {
             $sqladd .= "sc.id='{$searchfields}'";
             if (strlen($searchfields) > 3) {
-                $sqladd .= $articul_id_query;//search by TV
+                $sqladd .= $articul_id_query; //search by TV
                 $sqladd .= " OR sc.pagetitle LIKE '%{$searchfields}%'";
             }
         }
@@ -156,7 +156,7 @@ 
             $sqladd .= " OR sc.introtext LIKE '%{$searchlongtitle}%'";
             $sqladd .= " OR sc.menutitle LIKE '%{$searchlongtitle}%'";
             $sqladd .= " OR sc.alias LIKE '%{$search_alias}%'";
-            $sqladd .= $articul_id_query;//search by TV
+            $sqladd .= $articul_id_query; //search by TV
             $sqladd .= ")";
         }
     } elseif ($idFromAlias) {
@@ -180,8 +180,8 @@ 
         $docgrp = (isset($_SESSION['mgrDocgroups']) && is_array($_SESSION['mgrDocgroups'])) ? implode(',', $_SESSION['mgrDocgroups']) : '';
         $mgrRole = (isset($_SESSION['mgrRole']) && $_SESSION['mgrRole'] == 1) ? 1 : 0;
         $docgrp_cond = $docgrp ? " OR dg.document_group IN ({$docgrp})" : '';
-        $fields .= ', MAX(IF(1=' . $mgrRole . ' OR sc.privatemgr=0' . $docgrp_cond . ',1,0)) AS hasAccess';
-        $sqladd = '(' . $sqladd . ") AND (1={$mgrRole} OR sc.privatemgr=0" . (!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
+        $fields .= ', MAX(IF(1='.$mgrRole.' OR sc.privatemgr=0'.$docgrp_cond.',1,0)) AS hasAccess';
+        $sqladd = '('.$sqladd.") AND (1={$mgrRole} OR sc.privatemgr=0".(!$docgrp ? ')' : " OR dg.document_group IN ({$docgrp}))");
     }
 
     if ($sqladd) {
@@ -191,7 +191,7 @@ 
     $where = $sqladd;
 
     if ($where) {
-        $rs = $modx->db->select($fields, $tbl_site_content . ' AS sc LEFT JOIN ' . $tbldg . ' AS dg ON dg.document=sc.id', $where, 'sc.id');
+        $rs = $modx->db->select($fields, $tbl_site_content.' AS sc LEFT JOIN '.$tbldg.' AS dg ON dg.document=sc.id', $where, 'sc.id');
         $limit = $modx->db->getRecordCount($rs);
     } else {
         $limit = 0;
@@ -207,7 +207,7 @@ 
                 if ($limit < 1) {
                     echo $_lang['search_empty'];
                 } else {
-                    printf('<p>' . $_lang['search_results_returned_msg'] . '</p>', $limit); ?>
+                    printf('<p>'.$_lang['search_results_returned_msg'].'</p>', $limit); ?>
                     <script type="text/javascript" src="media/script/tablesort.js"></script>
                     <table class="grid sortabletable sortable-onload-2 rowstyle-even" id="table-1">
                         <thead>
@@ -265,14 +265,14 @@ 
                                 if (function_exists('mb_strlen') && function_exists('mb_substr')) {
                                     ?>
                                     <td<?= $tdClass ?>>
-                                        <a href="index.php?a=27&id=<?= $row['id'] ?>"><?= mb_strlen($row['pagetitle'], $modx_manager_charset) > 70 ? mb_substr($row['pagetitle'], 0, 70, $modx_manager_charset) . "..." : $row['pagetitle'] ?></a>
+                                        <a href="index.php?a=27&id=<?= $row['id'] ?>"><?= mb_strlen($row['pagetitle'], $modx_manager_charset) > 70 ? mb_substr($row['pagetitle'], 0, 70, $modx_manager_charset)."..." : $row['pagetitle'] ?></a>
                                     </td>
-                                    <td<?= $tdClass ?>><?= mb_strlen($row['description'], $modx_manager_charset) > 70 ? mb_substr($row['description'], 0, 70, $modx_manager_charset) . "..." : $row['description'] ?></td>
+                                    <td<?= $tdClass ?>><?= mb_strlen($row['description'], $modx_manager_charset) > 70 ? mb_substr($row['description'], 0, 70, $modx_manager_charset)."..." : $row['description'] ?></td>
                                     <?php
                                 } else {
                                     ?>
-                                    <td<?= $tdClass ?>><?= strlen($row['pagetitle']) > 20 ? substr($row['pagetitle'], 0, 20) . '...' : $row['pagetitle'] ?></td>
-                                    <td<?= $tdClass ?>><?= strlen($row['description']) > 35 ? substr($row['description'], 0, 35) . '...' : $row['description'] ?></td>
+                                    <td<?= $tdClass ?>><?= strlen($row['pagetitle']) > 20 ? substr($row['pagetitle'], 0, 20).'...' : $row['pagetitle'] ?></td>
+                                    <td<?= $tdClass ?>><?= strlen($row['description']) > 35 ? substr($row['description'], 0, 35).'...' : $row['description'] ?></td>
                                     <?php
                                 } ?>
                             </tr>
@@ -289,115 +289,115 @@ 
                 if ($modx->hasPermission('new_document') && $modx->hasPermission('edit_document') && $modx->hasPermission('save_document')) {
                     $docscounts = $modx->db->getRecordCount($rs);
                     if ($docscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-sitemap"></i> ' . $_lang["manage_documents"] . ' (' . $docscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-sitemap"></i> '.$_lang["manage_documents"].' ('.$docscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList('', !$row['published'], $row['deleted']) . '><a href="index.php?a=27&id=' . $row['id'] . '" id="content_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['pagetitle'] . ' <small>(' . $row['id'] . ')</small>', $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList('', !$row['published'], $row['deleted']).'><a href="index.php?a=27&id='.$row['id'].'" id="content_'.$row['id'].'" target="main">'.highlightingCoincidence($row['pagetitle'].' <small>('.$row['id'].')</small>', $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //templates
                 if ($modx->hasPermission('edit_template')) {
-                    $rs = $modx->db->select("id,templatename,locked", $modx->getFullTableName('site_templates'), "`id` like '%" . $searchfields . "%' 
-					OR `templatename` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `content` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,templatename,locked", $modx->getFullTableName('site_templates'), "`id` like '%".$searchfields."%' 
+					OR `templatename` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `content` like '%" . $searchfields."%'");
                     $templatecounts = $modx->db->getRecordCount($rs);
                     if ($templatecounts > 0) {
-                        $output .= '<li><b><i class="fa fa-newspaper-o"></i> ' . $_lang["manage_templates"] . ' (' . $templatecounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-newspaper-o"></i> '.$_lang["manage_templates"].' ('.$templatecounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked']) . '><a href="index.php?a=16&id=' . $row['id'] . '" id="templates_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['templatename'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked']).'><a href="index.php?a=16&id='.$row['id'].'" id="templates_'.$row['id'].'" target="main">'.highlightingCoincidence($row['templatename'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //tvs
                 if ($modx->hasPermission('edit_template') && $modx->hasPermission('edit_snippet') && $modx->hasPermission('edit_chunk') && $modx->hasPermission('edit_plugin')) {
-                    $rs = $modx->db->select("id,name,locked", $modx->getFullTableName('site_tmplvars'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `type` like '%" . $searchfields . "%' 
-					OR `elements` like '%" . $searchfields . "%' 
-					OR `display` like '%" . $searchfields . "%' 
-					OR `display_params` like '%" . $searchfields . "%' 
-					OR `default_text` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked", $modx->getFullTableName('site_tmplvars'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `type` like '%" . $searchfields."%' 
+					OR `elements` like '%" . $searchfields."%' 
+					OR `display` like '%" . $searchfields."%' 
+					OR `display_params` like '%" . $searchfields."%' 
+					OR `default_text` like '%" . $searchfields."%'");
                     $tvscounts = $modx->db->getRecordCount($rs);
                     if ($tvscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-list-alt"></i> ' . $_lang["settings_templvars"] . ' (' . $tvscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-list-alt"></i> '.$_lang["settings_templvars"].' ('.$tvscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked']) . '><a href="index.php?a=301&id=' . $row['id'] . '" id="tmplvars_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked']).'><a href="index.php?a=301&id='.$row['id'].'" id="tmplvars_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //Chunks
                 if ($modx->hasPermission('edit_chunk')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_htmlsnippets'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%'     
-					OR `snippet` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_htmlsnippets'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%'     
+					OR `snippet` like '%" . $searchfields."%'");
                     $chunkscounts = $modx->db->getRecordCount($rs);
                     if ($chunkscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-th-large"></i> ' . $_lang["manage_htmlsnippets"] . ' (' . $chunkscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-th-large"></i> '.$_lang["manage_htmlsnippets"].' ('.$chunkscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=78&id=' . $row['id'] . '" id="htmlsnippets_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=78&id='.$row['id'].'" id="htmlsnippets_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //Snippets
                 if ($modx->hasPermission('edit_snippet')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_snippets'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `snippet` like '%" . $searchfields . "%'  
-					OR `properties` like '%" . $searchfields . "%'      
-					OR `moduleguid` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_snippets'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `snippet` like '%" . $searchfields."%'  
+					OR `properties` like '%" . $searchfields."%'      
+					OR `moduleguid` like '%" . $searchfields."%'");
                     $snippetscounts = $modx->db->getRecordCount($rs);
                     if ($snippetscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-code"></i> ' . $_lang["manage_snippets"] . ' (' . $snippetscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-code"></i> '.$_lang["manage_snippets"].' ('.$snippetscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=22&id=' . $row['id'] . '" id="snippets_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=22&id='.$row['id'].'" id="snippets_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //plugins
                 if ($modx->hasPermission('edit_plugin')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_plugins'), "`id` like '%" . $searchfields . "%' 
-					OR `name` like '%" . $searchfields . "%' 
-					OR `description` like '%" . $searchfields . "%' 
-					OR `plugincode` like '%" . $searchfields . "%'  
-					OR `properties` like '%" . $searchfields . "%'      
-					OR `moduleguid` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_plugins'), "`id` like '%".$searchfields."%' 
+					OR `name` like '%" . $searchfields."%' 
+					OR `description` like '%" . $searchfields."%' 
+					OR `plugincode` like '%" . $searchfields."%'  
+					OR `properties` like '%" . $searchfields."%'      
+					OR `moduleguid` like '%" . $searchfields."%'");
                     $pluginscounts = $modx->db->getRecordCount($rs);
                     if ($pluginscounts > 0) {
-                        $output .= '<li><b><i class="fa fa-plug"></i> ' . $_lang["manage_plugins"] . ' (' . $pluginscounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-plug"></i> '.$_lang["manage_plugins"].' ('.$pluginscounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=102&id=' . $row['id'] . '" id="plugins_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=102&id='.$row['id'].'" id="plugins_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
                 //modules
                 if ($modx->hasPermission('edit_module')) {
-                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_modules'), "`id` like '%" . $searchfields . "%' 
-                    OR `name` like '%" . $searchfields . "%' 
-                    OR `description` like '%" . $searchfields . "%' 
-                    OR `modulecode` like '%" . $searchfields . "%'  
-                    OR `properties` like '%" . $searchfields . "%'  
-                    OR `guid` like '%" . $searchfields . "%'      
-                    OR `resourcefile` like '%" . $searchfields . "%'");
+                    $rs = $modx->db->select("id,name,locked,disabled", $modx->getFullTableName('site_modules'), "`id` like '%".$searchfields."%' 
+                    OR `name` like '%" . $searchfields."%' 
+                    OR `description` like '%" . $searchfields."%' 
+                    OR `modulecode` like '%" . $searchfields."%'  
+                    OR `properties` like '%" . $searchfields."%'  
+                    OR `guid` like '%" . $searchfields."%'      
+                    OR `resourcefile` like '%" . $searchfields."%'");
                     $modulescounts = $modx->db->getRecordCount($rs);
                     if ($modulescounts > 0) {
-                        $output .= '<li><b><i class="fa fa-cogs"></i> ' . $_lang["modules"] . ' (' . $modulescounts . ')</b></li>';
+                        $output .= '<li><b><i class="fa fa-cogs"></i> '.$_lang["modules"].' ('.$modulescounts.')</b></li>';
                         while ($row = $modx->db->getRow($rs)) {
-                            $output .= '<li' . addClassForItemList($row['locked'], $row['disabled']) . '><a href="index.php?a=108&id=' . $row['id'] . '" id="modules_' . $row['id'] . '" target="main">' . highlightingCoincidence($row['name'], $_REQUEST['searchfields']) . $_style['icons_external_link'] . '</a></li>';
+                            $output .= '<li'.addClassForItemList($row['locked'], $row['disabled']).'><a href="index.php?a=108&id='.$row['id'].'" id="modules_'.$row['id'].'" target="main">'.highlightingCoincidence($row['name'], $_REQUEST['searchfields']).$_style['icons_external_link'].'</a></li>';
                         }
                     }
                 }
 
-                echo $output ? '<div class="ajaxSearchResults"><ul>' . $output . '</ul></div>' : '1';
+                echo $output ? '<div class="ajaxSearchResults"><ul>'.$output.'</ul></div>' : '1';
             } ?>
         </div>
     </div>
@@ -411,13 +411,13 @@ 
  */
 function highlightingCoincidence($text, $search)
 {
-    $regexp = '!(' . str_replace(array(
+    $regexp = '!('.str_replace(array(
             '(',
             ')'
         ), array(
             '\(',
             '\)'
-        ), trim($search)) . ')!isu';
+        ), trim($search)).')!isu';
     return preg_replace($regexp, '<span class="text-danger">$1</span>', $text);
 }
 
@@ -440,7 +440,7 @@ 
         $class .= ' deleted';
     }
     if ($class) {
-        $class = ' class="' . trim($class) . '"';
+        $class = ' class="'.trim($class).'"';
     }
     return $class;
 }

manager/actions/resource_selector.static.php

Spacing +6 added lines, -6 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('edit_module')) {
@@ -63,7 +63,7 @@ 
 
 }
 
-include_once MODX_MANAGER_PATH . "includes/header.inc.php";
+include_once MODX_MANAGER_PATH."includes/header.inc.php";
 ?>
 <script language="JavaScript" type="text/javascript">
     function saveSelection()
@@ -138,7 +138,7 @@ 
 </script>
 
 <h1>
-    <?= $title . " - " . $_lang['element_selector_title'] ?><i class="fa fa-question-circle help"></i>
+    <?= $title." - ".$_lang['element_selector_title'] ?><i class="fa fa-question-circle help"></i>
 </h1>
 
 <div id="actions">
@@ -177,15 +177,15 @@ 
             <div class="row">
                 <div class="table-responsive">
                     <?php
-                    include_once MODX_MANAGER_PATH . "includes/controls/datagrid.class.php";
+                    include_once MODX_MANAGER_PATH."includes/controls/datagrid.class.php";
                     $grd = new DataGrid('', $ds, $number_of_results); // set page size to 0 t show all items
                     $grd->noRecordMsg = $_lang["no_records_found"];
                     $grd->cssClass = "table data nowrap";
                     $grd->columnHeaderClass = "tableHeader";
                     $grd->itemClass = "tableItem";
                     $grd->altItemClass = "tableAltItem";
-                    $grd->columns = $_lang["name"] . " ," . $_lang["description"];
-                    $grd->colTypes = "template:<input type='" . ($sm == 'm' ? 'checkbox' : 'radio') . "' name='id[]' value='[+id+]' onclick='setCheckbox(this);'> [+value+]";
+                    $grd->columns = $_lang["name"]." ,".$_lang["description"];
+                    $grd->colTypes = "template:<input type='".($sm == 'm' ? 'checkbox' : 'radio')."' name='id[]' value='[+id+]' onclick='setCheckbox(this);'> [+value+]";
                     $grd->colWidths = "45%";
                     $grd->fields = "name,description";
                     if ($_REQUEST['listmode'] == '1') {

manager/processors/save_password.processor.php

Spacing +4 added lines, -4 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 if (!$modx->hasPermission('save_password')) {
@@ -10,11 +10,11 @@ 
 $pass1 = $_POST['pass1'];
 $pass2 = $_POST['pass2'];
 
-if ($pass1!=$pass2) {
+if ($pass1 != $pass2) {
     $modx->webAlertAndQuit("Passwords don't match!");
 }
 
-if (strlen($pass1)<6) {
+if (strlen($pass1) < 6) {
     $modx->webAlertAndQuit("Password is too short. Please specify a password of at least 6 characters.");
 }
 
@@ -32,5 +32,5 @@ 
         'userpassword' => $pass1
     ));
 
-$header="Location: index.php?a=2";
+$header = "Location: index.php?a=2";
 header($header);

manager/processors/remove_locks.processor.php

Spacing +3 added lines, -3 removed lines

@@ -1,5 +1,5 @@ 
 <?php
-if (! defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
+if (!defined('IN_MANAGER_MODE') || IN_MANAGER_MODE !== true) {
     die("<b>INCLUDE_ORDERING_ERROR</b><br /><br />Please use the EVO Content Manager instead of accessing this file directly.");
 }
 
@@ -15,8 +15,8 @@ 
     header($header);
 } else {
     // Remove single locks via AJAX / window.onbeforeunload
-    $type = (int)$_GET['type'];
-    $id = (int)$_GET['id'];
+    $type = (int) $_GET['type'];
+    $id = (int) $_GET['id'];
     $includeAllUsers = $modx->hasPermission('remove_locks'); // Enables usage of "unlock"-ajax-button
     if ($type && $id) {
         $modx->unlockElement($type, $id, $includeAllUsers);

manager/processors/save_content.processor.php

Switch Indentation +11 added lines, -11 removed lines

@@ -276,19 +276,19 @@
 
             // invoke OnBeforeDocFormSave event
             switch ($modx->config['docid_incrmnt_method']) {
-            case '1':
-                $from = "{$tbl_site_content} AS T0 LEFT JOIN {$tbl_site_content} AS T1 ON T0.id + 1 = T1.id";
-                $where = "T1.id IS NULL";
-                $rs = $modx->db->select('MIN(T0.id)+1', $from, "T1.id IS NULL");
-                $id = $modx->db->getValue($rs);
+                case '1':
+                    $from = "{$tbl_site_content} AS T0 LEFT JOIN {$tbl_site_content} AS T1 ON T0.id + 1 = T1.id";
+                    $where = "T1.id IS NULL";
+                    $rs = $modx->db->select('MIN(T0.id)+1', $from, "T1.id IS NULL");
+                    $id = $modx->db->getValue($rs);
+                    break;
+                case '2':
+                    $rs = $modx->db->select('MAX(id)+1', $tbl_site_content);
+                    $id = $modx->db->getValue($rs);
                 break;
-            case '2':
-                $rs = $modx->db->select('MAX(id)+1', $tbl_site_content);
-                $id = $modx->db->getValue($rs);
-            break;
 
-            default:
-                $id = '';
+                default:
+                    $id = '';
             }
 
         $modx->invokeEvent("OnBeforeDocFormSave", array(

Spacing +30 added lines, -30 removed lines

@@ -36,10 +36,10 @@ 
 $aliasvisible = $_POST['alias_visible'];
 
 /************* webber ********/
-$sd = isset($_POST['dir']) ? '&dir=' . $_POST['dir'] : '&dir=DESC';
-$sb = isset($_POST['sort']) ? '&sort=' . $_POST['sort'] : '&sort=pub_date';
-$pg = isset($_POST['page']) ? '&page=' . (int) $_POST['page'] : '';
-$add_path = $sd . $sb . $pg;
+$sd = isset($_POST['dir']) ? '&dir='.$_POST['dir'] : '&dir=DESC';
+$sb = isset($_POST['sort']) ? '&sort='.$_POST['sort'] : '&sort=pub_date';
+$pg = isset($_POST['page']) ? '&page='.(int) $_POST['page'] : '';
+$add_path = $sd.$sb.$pg;
 
 
 
@@ -193,15 +193,15 @@ 
         INNER JOIN {$tbl_site_tmplvar_templates} AS tvtpl ON tvtpl.tmplvarid = tv.id
         LEFT JOIN {$tbl_site_tmplvar_contentvalues} AS tvc ON tvc.tmplvarid=tv.id AND tvc.contentid = '{$id}'
         LEFT JOIN {$tbl_site_tmplvar_access} AS tva ON tva.tmplvarid=tv.id",
-    "tvtpl.templateid = '{$template}' AND (1='{$_SESSION['mgrRole']}' OR ISNULL(tva.documentgroup)" . ((!$docgrp) ? "" : " OR tva.documentgroup IN ($docgrp)") . ")",
+    "tvtpl.templateid = '{$template}' AND (1='{$_SESSION['mgrRole']}' OR ISNULL(tva.documentgroup)".((!$docgrp) ? "" : " OR tva.documentgroup IN ($docgrp)").")",
     "tv.rank"
     );
 while ($row = $modx->db->getRow($rs)) {
     $tmplvar = '';
     switch ($row['type']) {
         case 'url':
-            $tmplvar = $_POST["tv" . $row['id']];
-            if ($_POST["tv" . $row['id'] . '_prefix'] != '--') {
+            $tmplvar = $_POST["tv".$row['id']];
+            if ($_POST["tv".$row['id'].'_prefix'] != '--') {
                 $tmplvar = str_replace(array(
                     "feed://",
                     "ftp://",
@@ -209,23 +209,23 @@ 
                     "https://",
                     "mailto:"
                 ), "", $tmplvar);
-                $tmplvar = $_POST["tv" . $row['id'] . '_prefix'] . $tmplvar;
+                $tmplvar = $_POST["tv".$row['id'].'_prefix'].$tmplvar;
             }
         break;
         case 'file':
-            $tmplvar = $_POST["tv" . $row['id']];
+            $tmplvar = $_POST["tv".$row['id']];
         break;
         default:
-            if (is_array($_POST["tv" . $row['id']])) {
+            if (is_array($_POST["tv".$row['id']])) {
                 // handles checkboxes & multiple selects elements
                 $feature_insert = array();
-                $lst = $_POST["tv" . $row['id']];
+                $lst = $_POST["tv".$row['id']];
                 while (list($featureValue, $feature_item) = each($lst)) {
                     $feature_insert[count($feature_insert)] = $feature_item;
                 }
                 $tmplvar = implode("||", $feature_insert);
             } else {
-                $tmplvar = $_POST["tv" . $row['id']];
+                $tmplvar = $_POST["tv".$row['id']];
             }
         break;
     }
@@ -253,7 +253,7 @@ 
 // check to see if the user is allowed to save the document in the place he wants to save it in
 if ($use_udperms == 1) {
     if ($existingDocument['parent'] != $parent) {
-        include_once MODX_MANAGER_PATH . "processors/user_documents_permissions.class.php";
+        include_once MODX_MANAGER_PATH."processors/user_documents_permissions.class.php";
         $udperms = new udperms();
         $udperms->user = $modx->getLoginUserID();
         $udperms->document = $parent;
@@ -369,11 +369,11 @@ 
             foreach ($document_groups as $value_pair) {
                 // first, split the pair (this is a new document, so ignore the second value
                 list($group) = explode(',', $value_pair); // @see actions/mutate_content.dynamic.php @ line 1138 (permissions list)
-                $new_groups[] = '(' . (int) $group . ',' . $key . ')';
+                $new_groups[] = '('.(int) $group.','.$key.')';
             }
             $saved = true;
             if (!empty($new_groups)) {
-                $modx->db->query("INSERT INTO {$tbl_document_groups} (document_group, document) VALUES " . implode(',', $new_groups));
+                $modx->db->query("INSERT INTO {$tbl_document_groups} (document_group, document) VALUES ".implode(',', $new_groups));
             }
         } else {
             $isManager = $modx->hasPermission('access_permissions');
@@ -403,11 +403,11 @@ 
         ));
 
         // secure web documents - flag as private
-        include MODX_MANAGER_PATH . "includes/secure_web_documents.inc.php";
+        include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
         secureWebDocument($key);
 
         // secure manager documents - flag as private
-        include MODX_MANAGER_PATH . "includes/secure_mgr_documents.inc.php";
+        include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php";
         secureMgrDocument($key);
 
         // Set the item name for logger
@@ -428,7 +428,7 @@ 
             if ($_POST['mode'] == "4") {
                 $a = ($_POST['stay'] == '2') ? "27&id=$key" : "4&pid=$parent";
             }
-            $header = "Location: index.php?a=" . $a . "&r=1&stay=" . $_POST['stay'];
+            $header = "Location: index.php?a=".$a."&r=1&stay=".$_POST['stay'];
         } else {
             $header = "Location: index.php?a=3&id=$key&r=1";
         }
@@ -488,7 +488,7 @@ 
             if (!$was_published && $published) {
                 $publishedon = $currentdate;
                 $publishedby = $modx->getLoginUserID();
-            } elseif ((!empty($pub_date)&& $pub_date<=$currentdate && $published)) {
+            } elseif ((!empty($pub_date) && $pub_date <= $currentdate && $published)) {
                 $publishedon = $pub_date;
                 $publishedby = $modx->getLoginUserID();
             } elseif ($was_published && !$published) {
@@ -525,7 +525,7 @@ 
                 . "menuindex={$menuindex}, "
                 . "searchable={$searchable}, "
                 . "cacheable={$cacheable}, "
-                . "editedby=" . $modx->getLoginUserID() . ", "
+                . "editedby=".$modx->getLoginUserID().", "
                 . "editedon={$currentdate}, "
                 . "publishedon={$publishedon}, "
                 . "publishedby={$publishedby}, "
@@ -562,7 +562,7 @@ 
             }
 
             if (!empty($tvDeletions)) {
-                $modx->db->delete($tbl_site_tmplvar_contentvalues, 'id IN(' . implode(',', $tvDeletions) . ')');
+                $modx->db->delete($tbl_site_tmplvar_contentvalues, 'id IN('.implode(',', $tvDeletions).')');
             }
 
             if (!empty($tvAdded)) {
@@ -593,7 +593,7 @@ 
                     'groups.id, groups.document_group',
                     "{$tbl_document_groups} AS groups
                     LEFT JOIN {$tbl_documentgroup_names} AS dgn ON dgn.id = groups.document_group",
-                    "((1=" . (int)$isManager . " AND dgn.private_memgroup) OR (1=" . (int)$isWeb . " AND dgn.private_webgroup)) AND groups.document = '{$id}'"
+                    "((1=".(int) $isManager." AND dgn.private_memgroup) OR (1=".(int) $isWeb." AND dgn.private_webgroup)) AND groups.document = '{$id}'"
                     );
                 $old_groups = array();
                 while ($row = $modx->db->getRow($rs)) {
@@ -607,14 +607,14 @@ 
                         unset($old_groups[$group]);
                         continue;
                     } elseif ($link_id == 'new') {
-                        $insertions[] = '(' . (int)$group . ',' . $id . ')';
+                        $insertions[] = '('.(int) $group.','.$id.')';
                     }
                 }
                 if (!empty($insertions)) {
-                    $modx->db->query("INSERT INTO {$tbl_document_groups} (document_group, document) VALUES " . implode(',', $insertions));
+                    $modx->db->query("INSERT INTO {$tbl_document_groups} (document_group, document) VALUES ".implode(',', $insertions));
                 }
                 if (!empty($old_groups)) {
-                    $modx->db->delete($tbl_document_groups, "id IN (" . implode(',', $old_groups) . ")");
+                    $modx->db->delete($tbl_document_groups, "id IN (".implode(',', $old_groups).")");
                 }
                 // necessary to remove all permissions as document is public
                 if ((isset($_POST['chkalldocs']) && $_POST['chkalldocs'] == 'on')) {
@@ -645,11 +645,11 @@ 
             ));
 
             // secure web documents - flag as private
-            include MODX_MANAGER_PATH . "includes/secure_web_documents.inc.php";
+            include MODX_MANAGER_PATH."includes/secure_web_documents.inc.php";
             secureWebDocument($id);
 
             // secure manager documents - flag as private
-            include MODX_MANAGER_PATH . "includes/secure_mgr_documents.inc.php";
+            include MODX_MANAGER_PATH."includes/secure_mgr_documents.inc.php";
             secureMgrDocument($id);
 
             // Set the item name for logger
@@ -661,7 +661,7 @@ 
             }
 
             if ($_POST['refresh_preview'] == '1') {
-                $header = "Location: " . MODX_SITE_URL . "index.php?id=$id&z=manprev";
+                $header = "Location: ".MODX_SITE_URL."index.php?id=$id&z=manprev";
             } else {
                 if ($_POST['stay'] != '2' && $id > 0) {
                     $modx->unlockElement(7, $id);
@@ -675,9 +675,9 @@ 
                         // document
                         $a = ($_POST['stay'] == '2') ? "27&id=$id" : "4&pid=$parent";
                     }
-                    $header = "Location: index.php?a=" . $a . "&r=1&stay=" . $_POST['stay'] . $add_path;
+                    $header = "Location: index.php?a=".$a."&r=1&stay=".$_POST['stay'].$add_path;
                 } else {
-                    $header = "Location: index.php?a=3&id=$id&r=1" . $add_path;
+                    $header = "Location: index.php?a=3&id=$id&r=1".$add_path;
                 }
             }
             if (headers_sent()) {