XOOPS / XoopsCore25

htdocs/modules/system/admin/comments/comment_post.php

Spacing +2 added lines, -2 removed lines

@@ -17,5 +17,5 @@
  * @author         XOOPS Development Team
  */
 
-include __DIR__ . '/admin_header.php';
-include XOOPS_ROOT_PATH . '/include/comment_post.php';
+include __DIR__.'/admin_header.php';
+include XOOPS_ROOT_PATH.'/include/comment_post.php';

htdocs/modules/system/admin/comments/comment_edit.php

Spacing +2 added lines, -2 removed lines

@@ -17,6 +17,6 @@
  * @author         XOOPS Development Team
  */
 
-include __DIR__ . '/admin_header.php';
+include __DIR__.'/admin_header.php';
 
-include XOOPS_ROOT_PATH . '/include/comment_edit.php';
+include XOOPS_ROOT_PATH.'/include/comment_edit.php';

htdocs/modules/system/admin/comments/comment_delete.php

Spacing +2 added lines, -2 removed lines

@@ -17,6 +17,6 @@
  * @author         XOOPS Development Team
  */
 
-include __DIR__ . '/admin_header.php';
+include __DIR__.'/admin_header.php';
 
-include XOOPS_ROOT_PATH . '/include/comment_delete.php';
+include XOOPS_ROOT_PATH.'/include/comment_delete.php';

htdocs/modules/system/admin/comments/main.php

Spacing +19 added lines, -19 removed lines

@@ -33,8 +33,8 @@ 
 $GLOBALS['xoopsOption']['template_main'] = 'system_comments.tpl';
 xoops_cp_header();
 // Define Stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/ui/'.xoops_getModuleOption('jquery_theme', 'system').'/ui.all.css');
 // Define scripts
 $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
 $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
@@ -49,9 +49,9 @@ 
 $limit_array     = array(20, 50, 100);
 $status_array    = array(XOOPS_COMMENT_PENDING => _CM_PENDING, XOOPS_COMMENT_ACTIVE => _CM_ACTIVE, XOOPS_COMMENT_HIDDEN => _CM_HIDDEN);
 $status_array2   = array(
-    XOOPS_COMMENT_PENDING => '<span style="text-decoration: none; font-weight: bold; color: #008000;">' . _CM_PENDING . '</span>',
-    XOOPS_COMMENT_ACTIVE  => '<span style="text-decoration: none; font-weight: bold; color: #ff0000;">' . _CM_ACTIVE . '</span>',
-    XOOPS_COMMENT_HIDDEN  => '<span style="text-decoration: none; font-weight: bold; color: #0000ff;">' . _CM_HIDDEN . '</span>');
+    XOOPS_COMMENT_PENDING => '<span style="text-decoration: none; font-weight: bold; color: #008000;">'._CM_PENDING.'</span>',
+    XOOPS_COMMENT_ACTIVE  => '<span style="text-decoration: none; font-weight: bold; color: #ff0000;">'._CM_ACTIVE.'</span>',
+    XOOPS_COMMENT_HIDDEN  => '<span style="text-decoration: none; font-weight: bold; color: #0000ff;">'._CM_HIDDEN.'</span>');
 $start           = 0;
 $status_array[0] = _AM_SYSTEM_COMMENTS_FORM_ALL_STATUS;
 
@@ -77,7 +77,7 @@ 
                 $module_handler = xoops_getHandler('module');
                 $module         = $module_handler->get($comment->getVar('com_modid'));
                 $comment_config = $module->getInfo('comments');
-                header('Location: ' . XOOPS_URL . '/modules/' . $module->getVar('dirname') . '/' . $comment_config['pageName'] . '?' . $comment_config['itemName'] . '=' . $comment->getVar('com_itemid') . '&com_id=' . $comment->getVar('com_id') . '&com_rootid=' . $comment->getVar('com_rootid') . '&com_mode=thread&' . str_replace('&amp;', '&', $comment->getVar('com_exparams')) . '#comment' . $comment->getVar('com_id'));
+                header('Location: '.XOOPS_URL.'/modules/'.$module->getVar('dirname').'/'.$comment_config['pageName'].'?'.$comment_config['itemName'].'='.$comment->getVar('com_itemid').'&com_id='.$comment->getVar('com_id').'&com_rootid='.$comment->getVar('com_rootid').'&com_mode=thread&'.str_replace('&amp;', '&', $comment->getVar('com_exparams')).'#comment'.$comment->getVar('com_id'));
                 exit();
             }
         }
@@ -87,7 +87,7 @@ 
     case 'comments_form_purge':
         //Affichage des coms
         $xoBreadCrumb->addLink(_AM_SYSTEM_COMMENTS_NAV_PURGE);
-        $xoBreadCrumb->addHelp(system_adminVersion('comments', 'help') . '#purge');
+        $xoBreadCrumb->addHelp(system_adminVersion('comments', 'help').'#purge');
         $xoBreadCrumb->addTips(_AM_SYSTEM_COMMENTS_NAV_TIPS);
         $xoBreadCrumb->render();
 
@@ -240,7 +240,7 @@ 
             if ($k == $module) {
                 $sel = ' selected';
             }
-            $form .= '<option value="' . $k . '"' . $sel . '>' . $v . '</option>';
+            $form .= '<option value="'.$k.'"'.$sel.'>'.$v.'</option>';
         }
         $form .= '</select>&nbsp;<select name="comments_status">';
 
@@ -249,7 +249,7 @@ 
             if (isset($status) && $k == $status) {
                 $sel = ' selected';
             }
-            $form .= '<option value="' . $k . '"' . $sel . '>' . $v . '</option>';
+            $form .= '<option value="'.$k.'"'.$sel.'>'.$v.'</option>';
         }
 
         $form .= '</select>&nbsp;<select name="comments_limit">';
@@ -258,12 +258,12 @@ 
             if (isset($limit) && $k == $limit) {
                 $sel = ' selected';
             }
-            $form .= '<option value="' . $k . '"' . $sel . '>' . $k . '</option>';
+            $form .= '<option value="'.$k.'"'.$sel.'>'.$k.'</option>';
         }
-        $form .= '</select>&nbsp;<input type="hidden" name="fct" value="comments" /><input type="submit" value="' . _GO . '" name="selsubmit" /></form>';
+        $form .= '</select>&nbsp;<input type="hidden" name="fct" value="comments" /><input type="submit" value="'._GO.'" name="selsubmit" /></form>';
 
         $xoopsTpl->assign('form_sort', $form);
-        $xoopsTpl->assign('php_selft', XOOPS_URL . '/modules/system/admin.php?fct=comments&op=comments_purge');
+        $xoopsTpl->assign('php_selft', XOOPS_URL.'/modules/system/admin.php?fct=comments&op=comments_purge');
 
         if ($comments_count > 0) {
             foreach (array_keys($comments_arr) as $i) {
@@ -273,18 +273,18 @@ 
                 if ($comments_arr[$i]->getVar('com_uid') > 0) {
                     $poster = $member_handler->getUser($comments_arr[$i]->getVar('com_uid'));
                     if (is_object($poster)) {
-                        $comments_poster_uname = '<a href="' . XOOPS_URL . '/userinfo.php?uid=' . $comments_arr[$i]->getVar('com_uid') . '">' . $poster->getVar('uname') . '</a>';
+                        $comments_poster_uname = '<a href="'.XOOPS_URL.'/userinfo.php?uid='.$comments_arr[$i]->getVar('com_uid').'">'.$poster->getVar('uname').'</a>';
                     }
                 } elseif ($comments_arr[$i]->getVar('com_uid') == 0 && $comments_arr[$i]->getVar('com_user') != '') {
                     if ($comments_arr[$i]->getVar('com_url') != '') {
-                        $comments_poster_uname = '<div class="pad2 marg2"><a href="' . $comments_arr[$i]->getVar('com_url') . '">' . $comments_arr[$i]->getVar('com_user') . '</a> ( <a href="mailto:' . $comments_arr[$i]->getVar('com_email') . '">' . $comments_arr[$i]->getVar('com_email') . '</a> ) ' . '</div>';
+                        $comments_poster_uname = '<div class="pad2 marg2"><a href="'.$comments_arr[$i]->getVar('com_url').'">'.$comments_arr[$i]->getVar('com_user').'</a> ( <a href="mailto:'.$comments_arr[$i]->getVar('com_email').'">'.$comments_arr[$i]->getVar('com_email').'</a> ) '.'</div>';
                     } else {
-                        $comments_poster_uname = '<div class="pad2 marg2">' . $comments_arr[$i]->getVar('com_user') . ' ( <a href="mailto:' . $comments_arr[$i]->getVar('com_email') . '">' . $comments_arr[$i]->getVar('com_email') . '</a> ) ' . '</div>';
+                        $comments_poster_uname = '<div class="pad2 marg2">'.$comments_arr[$i]->getVar('com_user').' ( <a href="mailto:'.$comments_arr[$i]->getVar('com_email').'">'.$comments_arr[$i]->getVar('com_email').'</a> ) '.'</div>';
                     }
                 }
                 // End edit by voltan
-                $comments_icon = ($comments_arr[$i]->getVar('com_icon') == '') ? '/images/icons/no_posticon.gif' : '/images/subject/' . htmlspecialchars($comments_arr[$i]->getVar('com_icon'), ENT_QUOTES);
-                $comments_icon = '<img src="' . XOOPS_URL . $comments_icon . '" alt="" />';
+                $comments_icon = ($comments_arr[$i]->getVar('com_icon') == '') ? '/images/icons/no_posticon.gif' : '/images/subject/'.htmlspecialchars($comments_arr[$i]->getVar('com_icon'), ENT_QUOTES);
+                $comments_icon = '<img src="'.XOOPS_URL.$comments_icon.'" alt="" />';
 
                 $comments['comments_id']           = $com_id;
                 $comments['comments_poster']       = $comments_poster_uname;
@@ -304,8 +304,8 @@ 
             }
 
             if ($comments_count > $comments_limit) {
-                include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-                $nav = new XoopsPageNav($comments_count, $comments_limit, $comments_start, 'comments_start', 'fct=comments&amp;comments_module=' . $comments_module . '&amp;comments_status=' . $comments_status);
+                include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+                $nav = new XoopsPageNav($comments_count, $comments_limit, $comments_start, 'comments_start', 'fct=comments&amp;comments_module='.$comments_module.'&amp;comments_status='.$comments_status);
                 $xoopsTpl->assign('nav', $nav->renderNav());
             }
         }

htdocs/modules/system/admin/mailusers/main.php

Spacing +20 added lines, -20 removed lines

@@ -35,7 +35,7 @@ 
 // Call Header
 xoops_cp_header();
 // Define Stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
 $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
 $xoTheme->addScript('modules/system/js/admin.js');
 
@@ -56,7 +56,7 @@ 
             for ($i = 0; $i < $user_count; ++$i) {
                 $uid_hidden = new XoopsFormHidden('mail_to_user[]', $_POST['memberslist_id'][$i]);
                 $form->addElement($uid_hidden);
-                $display_names .= "<a href='" . XOOPS_URL . '/userinfo.php?uid=' . $_POST['memberslist_id'][$i] . "' rel='external'>" . XoopsUser::getUnameFromId($_POST['memberslist_id'][$i]) . '</a>, ';
+                $display_names .= "<a href='".XOOPS_URL.'/userinfo.php?uid='.$_POST['memberslist_id'][$i]."' rel='external'>".XoopsUser::getUnameFromId($_POST['memberslist_id'][$i]).'</a>, ';
                 unset($uid_hidden);
             }
             $users_label = new XoopsFormLabel(_AM_SYSTEM_MAILUSERS_SENDTOUSERS2, substr($display_names, 0, -2));
@@ -65,40 +65,40 @@ 
         }
         if (!empty($display_criteria)) {
             $selected_groups = array();
-            $group_select    = new XoopsFormSelectGroup('<div class="bold spacer">' . _AM_SYSTEM_MAILUSERS_GROUPIS . '<span class="bold green">*</span></div>', 'mail_to_group', false, $selected_groups, 5, true);
+            $group_select    = new XoopsFormSelectGroup('<div class="bold spacer">'._AM_SYSTEM_MAILUSERS_GROUPIS.'<span class="bold green">*</span></div>', 'mail_to_group', false, $selected_groups, 5, true);
 
-            $lastlog_min = new XoopsFormTextDateSelect(_AM_SYSTEM_MAILUSERS_LASTLOGMIN . '<span class="bold green">*</span>', 'mail_lastlog_min');
+            $lastlog_min = new XoopsFormTextDateSelect(_AM_SYSTEM_MAILUSERS_LASTLOGMIN.'<span class="bold green">*</span>', 'mail_lastlog_min');
             $lastlog_min->setValue('');
-            $lastlog_max = new XoopsFormTextDateSelect(_AM_SYSTEM_MAILUSERS_LASTLOGMAX . '<span class="bold green">*</span>', 'mail_lastlog_max');
+            $lastlog_max = new XoopsFormTextDateSelect(_AM_SYSTEM_MAILUSERS_LASTLOGMAX.'<span class="bold green">*</span>', 'mail_lastlog_max');
             $lastlog_max->setValue('');
 
-            $date = new XoopsFormElementTray('<div class="bold spacer">' . _AM_SYSTEM_MAILUSERS_DATE . '</div>', '');
+            $date = new XoopsFormElementTray('<div class="bold spacer">'._AM_SYSTEM_MAILUSERS_DATE.'</div>', '');
             $date->addElement($lastlog_min);
             $date->addElement($lastlog_max);
 
-            $idle_more = new XoopsFormText(_AM_SYSTEM_MAILUSERS_IDLEMORE . '<span class="bold green">*</span>', 'mail_idle_more', 10, 5);
-            $idle_less = new XoopsFormText(_AM_SYSTEM_MAILUSERS_IDLELESS . '<span class="bold green">*</span>', 'mail_idle_less', 10, 5);
+            $idle_more = new XoopsFormText(_AM_SYSTEM_MAILUSERS_IDLEMORE.'<span class="bold green">*</span>', 'mail_idle_more', 10, 5);
+            $idle_less = new XoopsFormText(_AM_SYSTEM_MAILUSERS_IDLELESS.'<span class="bold green">*</span>', 'mail_idle_less', 10, 5);
 
-            $idle = new XoopsFormElementTray('<div class="bold spacer">' . _AM_SYSTEM_MAILUSERS_DAY . '</div>', '');
+            $idle = new XoopsFormElementTray('<div class="bold spacer">'._AM_SYSTEM_MAILUSERS_DAY.'</div>', '');
             $idle->addElement($idle_more);
             $idle->addElement($idle_less);
 
-            $regd_min = new XoopsFormTextDateSelect(_AM_SYSTEM_MAILUSERS_REGDMIN . '<span class="bold green">*</span>', 'mail_regd_min');
+            $regd_min = new XoopsFormTextDateSelect(_AM_SYSTEM_MAILUSERS_REGDMIN.'<span class="bold green">*</span>', 'mail_regd_min');
             $regd_min->setValue('');
-            $regd_max = new XoopsFormTextDateSelect(_AM_SYSTEM_MAILUSERS_REGDMAX . '<span class="bold green">*</span>', 'mail_regd_max');
+            $regd_max = new XoopsFormTextDateSelect(_AM_SYSTEM_MAILUSERS_REGDMAX.'<span class="bold green">*</span>', 'mail_regd_max');
             $regd_max->setValue('');
 
-            $regdate = new XoopsFormElementTray('<div class="bold spacer">' . _AM_SYSTEM_MAILUSERS_REGDATE . '</div>', '');
+            $regdate = new XoopsFormElementTray('<div class="bold spacer">'._AM_SYSTEM_MAILUSERS_REGDATE.'</div>', '');
             $regdate->addElement($regd_min);
             $regdate->addElement($regd_max);
 
             $mailok_cbox = new XoopsFormCheckBox('', 'mail_mailok');
-            $mailok_cbox->addOption(1, _AM_SYSTEM_MAILUSERS_MAILOK . '<span class="bold green">*</span>');
+            $mailok_cbox->addOption(1, _AM_SYSTEM_MAILUSERS_MAILOK.'<span class="bold green">*</span>');
             $inactive_cbox = new XoopsFormCheckBox('', 'mail_inactive');
-            $inactive_cbox->addOption(1, _AM_SYSTEM_MAILUSERS_INACTIVE . '<span class="bold green">*</span>');
+            $inactive_cbox->addOption(1, _AM_SYSTEM_MAILUSERS_INACTIVE.'<span class="bold green">*</span>');
             $inactive_cbox->setExtra("onclick='javascript:disableElement(\"mail_lastlog_min\");disableElement(\"mail_lastlog_max\");disableElement(\"mail_idle_more\");disableElement(\"mail_idle_less\");disableElement(\"mail_to_group[]\");'");
             $criteria_tray = new XoopsFormElementTray(_AM_SYSTEM_MAILUSERS_SENDTOUSERS, '<br><br>');
-            $criteria_tray->setDescription('<span class="bold green">*</span>' . _AM_SYSTEM_MAILUSERS_OPTIONAL);
+            $criteria_tray->setDescription('<span class="bold green">*</span>'._AM_SYSTEM_MAILUSERS_OPTIONAL);
             $criteria_tray->addElement($group_select);
             //$criteria_tray->addElement($lastlog);
             $criteria_tray->addElement($date);
@@ -116,9 +116,9 @@ 
         $fname_text      = new XoopsFormText(_AM_SYSTEM_MAILUSERS_MAILFNAME, 'mail_fromname', 30, 255, htmlspecialchars($xoopsConfig['sitename'], ENT_QUOTES));
         $fromemail       = !empty($xoopsConfig['adminmail']) ? $xoopsConfig['adminmail'] : $xoopsUser->getVar('email', 'E');
         $femail_text     = new XoopsFormText(_AM_SYSTEM_MAILUSERS_MAILFMAIL, 'mail_fromemail', 30, 255, $fromemail);
-        $subject_caption = _AM_SYSTEM_MAILUSERS_MAILSUBJECT . "<br><br><span style='font-size:x-small;font-weight:bold;'>" . _AM_SYSTEM_MAILUSERS_MAILTAGS . "</span><br><span style='font-size:x-small;font-weight:normal;'>" . _AM_SYSTEM_MAILUSERS_MAILTAGS2 . '</span>';
+        $subject_caption = _AM_SYSTEM_MAILUSERS_MAILSUBJECT."<br><br><span style='font-size:x-small;font-weight:bold;'>"._AM_SYSTEM_MAILUSERS_MAILTAGS."</span><br><span style='font-size:x-small;font-weight:normal;'>"._AM_SYSTEM_MAILUSERS_MAILTAGS2.'</span>';
         $subject_text    = new XoopsFormText($subject_caption, 'mail_subject', 50, 255);
-        $body_caption    = _AM_SYSTEM_MAILUSERS_MAILBODY . "<br><br><span style='font-size:x-small;font-weight:bold;'>" . _AM_SYSTEM_MAILUSERS_MAILTAGS . "</span><br><span style='font-size:x-small;font-weight:normal;'>" . _AM_SYSTEM_MAILUSERS_MAILTAGS1 . '<br>' . _AM_SYSTEM_MAILUSERS_MAILTAGS2 . '<br>' . _AM_SYSTEM_MAILUSERS_MAILTAGS3 . '<br>' . _AM_SYSTEM_MAILUSERS_MAILTAGS4 . '</span>';
+        $body_caption    = _AM_SYSTEM_MAILUSERS_MAILBODY."<br><br><span style='font-size:x-small;font-weight:bold;'>"._AM_SYSTEM_MAILUSERS_MAILTAGS."</span><br><span style='font-size:x-small;font-weight:normal;'>"._AM_SYSTEM_MAILUSERS_MAILTAGS1.'<br>'._AM_SYSTEM_MAILUSERS_MAILTAGS2.'<br>'._AM_SYSTEM_MAILUSERS_MAILTAGS3.'<br>'._AM_SYSTEM_MAILUSERS_MAILTAGS4.'</span>';
         $body_text       = new XoopsFormTextArea($body_caption, 'mail_body', '', 10);
         $to_checkbox     = new XoopsFormCheckBox(_AM_SYSTEM_MAILUSERS_SENDTO, 'mail_send_to', 'mail');
         $to_checkbox->addOption('mail', _AM_SYSTEM_MAILUSERS_EMAIL);
@@ -236,7 +236,7 @@ 
             //openTable();
             if ($added_count > 0) {
                 $myts        = MyTextSanitizer::getInstance();
-                $xoopsMailer =& xoops_getMailer();
+                $xoopsMailer = & xoops_getMailer();
                 for ($i = 0; $i < $added_count; ++$i) {
                     $xoopsMailer->setToUsers($added[$i]);
                 }
@@ -306,10 +306,10 @@ 
                     $form->addElement($submit_button);
                     $form->display();
                 } else {
-                    echo '<h4>' . _AM_SYSTEM_MAILUSERS_SENDCOMP . '</h4>';
+                    echo '<h4>'._AM_SYSTEM_MAILUSERS_SENDCOMP.'</h4>';
                 }
             } else {
-                echo '<h4>' . _AM_SYSTEM_MAILUSERS_NOUSERMATCH . '</h4>';
+                echo '<h4>'._AM_SYSTEM_MAILUSERS_NOUSERMATCH.'</h4>';
             }
         }
         break;

htdocs/modules/system/admin/tplsets/jquery.php

Spacing +25 added lines, -25 removed lines

@@ -22,7 +22,7 @@ 
 /* @var $xoopsModule XoopsModule */
 /* @var $xoopsConfig XoopsConfigItem */
 
-include dirname(dirname(__DIR__)) . '/header.php';
+include dirname(dirname(__DIR__)).'/header.php';
 
 // defined('XOOPS_ROOT_PATH') || exit('XOOPS root path not defined');
 
@@ -33,10 +33,10 @@ 
 error_reporting(0);
 $GLOBALS['xoopsLogger']->activated = false;
 
-if (file_exists(__DIR__ . '/../../language/' . $xoopsConfig['language'] . '"/admin/tplsets.php')) {
-    include_once __DIR__ . '/../../language/' . $xoopsConfig['language'] . '/admin/tplsets.php';
+if (file_exists(__DIR__.'/../../language/'.$xoopsConfig['language'].'"/admin/tplsets.php')) {
+    include_once __DIR__.'/../../language/'.$xoopsConfig['language'].'/admin/tplsets.php';
 } else {
-    include_once __DIR__ . '/../../language/english/admin/tplsets.php';
+    include_once __DIR__.'/../../language/english/admin/tplsets.php';
 }
 
 XoopsLoad::load('XoopsRequest');
@@ -49,32 +49,32 @@ 
     case 'tpls_display_folder':
         $_REQUEST['dir'] = urldecode($_REQUEST['dir']);
         $root            = XOOPS_THEME_PATH;
-        if (file_exists($root . $_REQUEST['dir'])) {
-            $files = scandir($root . $_REQUEST['dir']);
+        if (file_exists($root.$_REQUEST['dir'])) {
+            $files = scandir($root.$_REQUEST['dir']);
             natcasesort($files);
             if (count($files) > 2) { /* The 2 accounts for . and .. */
                 echo "<ul class=\"jqueryFileTree\" style=\"display: none;\">";
                 // All dirs
                 foreach ($files as $file) {
-                    if (file_exists($root . $_REQUEST['dir'] . $file) && $file !== '.' && $file !== '..' && is_dir($root . $_REQUEST['dir'] . $file)) {
+                    if (file_exists($root.$_REQUEST['dir'].$file) && $file !== '.' && $file !== '..' && is_dir($root.$_REQUEST['dir'].$file)) {
                         //retirer .svn
                         $file_no_valid = array('.svn', 'icons', 'img', 'images', 'language');
 
                         if (!in_array($file, $file_no_valid)) {
-                            echo "<li class=\"directory collapsed\"><a href=\"#\" rel=\"" . htmlentities($_REQUEST['dir'] . $file) . "/\">" . htmlentities($file) . '</a></li>';
+                            echo "<li class=\"directory collapsed\"><a href=\"#\" rel=\"".htmlentities($_REQUEST['dir'].$file)."/\">".htmlentities($file).'</a></li>';
                         }
                     }
                 }
                 // All files
                 foreach ($files as $file) {
-                    if (file_exists($root . $_REQUEST['dir'] . $file) && $file !== '.' && $file !== '..' && !is_dir($root . $_REQUEST['dir'] . $file) && $file !== 'index.html') {
+                    if (file_exists($root.$_REQUEST['dir'].$file) && $file !== '.' && $file !== '..' && !is_dir($root.$_REQUEST['dir'].$file) && $file !== 'index.html') {
                         $ext = preg_replace('/^.*\./', '', $file);
 
                         $extensions      = array('.html', '.htm', '.css', '.tpl');
                         $extension_verif = strrchr($file, '.');
 
                         if (in_array($extension_verif, $extensions)) {
-                            echo "<li class=\"file ext_$ext\"><a href=\"#\" onclick=\"tpls_edit_file('" . htmlentities($_REQUEST['dir'] . $file) . "', '" . htmlentities($_REQUEST['dir']) . "', '" . htmlentities($file) . "', '" . $ext . "');\" rel=\"tpls_edit_file('" . htmlentities($_REQUEST['dir'] . $file) . "', '" . htmlentities($_REQUEST['dir']) . "', '" . htmlentities($file) . "', '" . $ext . "');\">" . htmlentities($file) . '</a></li>';
+                            echo "<li class=\"file ext_$ext\"><a href=\"#\" onclick=\"tpls_edit_file('".htmlentities($_REQUEST['dir'].$file)."', '".htmlentities($_REQUEST['dir'])."', '".htmlentities($file)."', '".$ext."');\" rel=\"tpls_edit_file('".htmlentities($_REQUEST['dir'].$file)."', '".htmlentities($_REQUEST['dir'])."', '".htmlentities($file)."', '".$ext."');\">".htmlentities($file).'</a></li>';
                         } else {
                             //echo "<li class=\"file ext_$ext\">" . htmlentities($file) . "</li>";
                         }
@@ -92,9 +92,9 @@ 
         $check_path = realpath(XOOPS_ROOT_PATH.'/themes');
         try {
             Assert::startsWith($path_file, $check_path, _AM_SYSTEM_TEMPLATES_ERROR);
-        } catch(\InvalidArgumentException $e) {
+        } catch (\InvalidArgumentException $e) {
             // handle the exception
-            redirect_header(XOOPS_URL . '/modules/system/admin.php?fct=tplsets', 2, $e->getMessage());
+            redirect_header(XOOPS_URL.'/modules/system/admin.php?fct=tplsets', 2, $e->getMessage());
             exit;
         }
 
@@ -102,9 +102,9 @@ 
 
         //Button restore
         $restore = '';
-        if (file_exists($path_file . '.back')) {
-            $restore = '<button class="ui-corner-all tooltip" type="button" onclick="tpls_restore(\'' . $path_file . '\')" value="' . _AM_SYSTEM_TEMPLATES_RESTORE . '" title="' . _AM_SYSTEM_TEMPLATES_RESTORE . '">
-                            <img src="' . system_AdminIcons('revert.png') . '" alt="' . _AM_SYSTEM_TEMPLATES_RESTORE . '" />
+        if (file_exists($path_file.'.back')) {
+            $restore = '<button class="ui-corner-all tooltip" type="button" onclick="tpls_restore(\''.$path_file.'\')" value="'._AM_SYSTEM_TEMPLATES_RESTORE.'" title="'._AM_SYSTEM_TEMPLATES_RESTORE.'">
+                            <img src="' . system_AdminIcons('revert.png').'" alt="'._AM_SYSTEM_TEMPLATES_RESTORE.'" />
                         </button>';
         }
         xoops_load('XoopsFile');
@@ -123,12 +123,12 @@ 
                     <td>
                           <div class="xo-btn-actions">
                               <div class="xo-buttons">
-                                  <button class="ui-corner-all tooltip" type="submit" value="' . _AM_SYSTEM_TEMPLATES_SAVE . '" title="' . _AM_SYSTEM_TEMPLATES_SAVE . '">
-                                      <img src="' . system_AdminIcons('save.png') . '" alt="' . _AM_SYSTEM_TEMPLATES_SAVE . '" />
+                                  <button class="ui-corner-all tooltip" type="submit" value="' . _AM_SYSTEM_TEMPLATES_SAVE.'" title="'._AM_SYSTEM_TEMPLATES_SAVE.'">
+                                      <img src="' . system_AdminIcons('save.png').'" alt="'._AM_SYSTEM_TEMPLATES_SAVE.'" />
                                   </button>
-                                  ' . $restore . '
-                                  <button class="ui-corner-all tooltip" type="button" onclick="$(\'#display_contenu\').hide();$(\'#display_form\').fadeIn(\'fast\');" title="' . _AM_SYSTEM_TEMPLATES_CANCEL . '">
-                                      <img src="' . system_AdminIcons('cancel.png') . '" alt="' . _AM_SYSTEM_TEMPLATES_CANCEL . '" />
+                                  ' . $restore.'
+                                  <button class="ui-corner-all tooltip" type="button" onclick="$(\'#display_contenu\').hide();$(\'#display_form\').fadeIn(\'fast\');" title="' . _AM_SYSTEM_TEMPLATES_CANCEL.'">
+                                      <img src="' . system_AdminIcons('cancel.png').'" alt="'._AM_SYSTEM_TEMPLATES_CANCEL.'" />
                                   </button>
                                   <div class="clear"></div>
                              </div>
@@ -144,9 +144,9 @@ 
         XoopsLoad::load('XoopsFormHiddenToken');
         $xoopsToken = new XoopsFormHiddenToken();
         echo $xoopsToken->render();
-        echo '<input type="hidden" name="path_file" value="' . htmlentities($clean_path_file, ENT_QUOTES)
-            .'"><input type="hidden" name="file" value="' . htmlentities(trim($clean_file), ENT_QUOTES)
-            .'"><input type="hidden" name="ext" value="' . htmlentities($ext, ENT_QUOTES) . '"></form>';
+        echo '<input type="hidden" name="path_file" value="'.htmlentities($clean_path_file, ENT_QUOTES)
+            .'"><input type="hidden" name="file" value="'.htmlentities(trim($clean_file), ENT_QUOTES)
+            .'"><input type="hidden" name="ext" value="'.htmlentities($ext, ENT_QUOTES).'"></form>';
         break;
 
     // Restore backup file
@@ -154,9 +154,9 @@ 
         $extensions = array('.html', '.htm', '.css', '.tpl');
 
         //check if the file is inside themes directory
-        $valid_dir = stristr(realpath($_REQUEST['path_file']), realpath(XOOPS_ROOT_PATH . '/themes'));
+        $valid_dir = stristr(realpath($_REQUEST['path_file']), realpath(XOOPS_ROOT_PATH.'/themes'));
 
-        $old_file = $_REQUEST['path_file'] . '.back';
+        $old_file = $_REQUEST['path_file'].'.back';
         $new_file = $_REQUEST['path_file'];
 
         $extension_verif = strrchr($new_file, '.');

htdocs/modules/system/admin/tplsets/main.php

Spacing +51 added lines, -51 removed lines

@@ -38,8 +38,8 @@ 
 $xoTheme->addScript('modules/system/js/templates.js');
 $xoTheme->addScript('modules/system/js/code_mirror/codemirror.js');
 // Define Stylesheet
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/code_mirror/docs.css');
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/code_mirror/docs.css');
 // Define Breadcrumb and tips
 $xoBreadCrumb->addLink(_AM_SYSTEM_TEMPLATES_NAV_MAIN, system_adminVersion('tplsets', 'adminpath'));
 
@@ -89,7 +89,7 @@ 
             redirect_header('admin.php?fct=tplsets', 3, implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
         }
         // Assign Breadcrumb menu
-        $xoBreadCrumb->addHelp(system_adminVersion('tplsets', 'help') . '#override');
+        $xoBreadCrumb->addHelp(system_adminVersion('tplsets', 'help').'#override');
         $xoBreadCrumb->addLink(_AM_SYSTEM_TEMPLATES_NAV_FILE_GENERATED);
         $xoBreadCrumb->render();
 
@@ -97,8 +97,8 @@ 
             //Generate modules
             if (isset($_REQUEST['select_theme']) && isset($_REQUEST['force_generated'])) {
                 //on verifie si le dossier module existe
-                $theme_surcharge = XOOPS_THEME_PATH . '/' . $_REQUEST['select_theme'] . '/modules';
-                $indexFile       = XOOPS_ROOT_PATH . '/modules/system/include/index.html';
+                $theme_surcharge = XOOPS_THEME_PATH.'/'.$_REQUEST['select_theme'].'/modules';
+                $indexFile       = XOOPS_ROOT_PATH.'/modules/system/include/index.html';
                 $verif_write     = false;
                 $text            = '';
 
@@ -109,7 +109,7 @@ 
                         mkdir($theme_surcharge, 0777);
                     }
                     chmod($theme_surcharge, 0777);
-                    copy($indexFile, $theme_surcharge . '/index.html');
+                    copy($indexFile, $theme_surcharge.'/index.html');
                 }
 
                 $tplset = system_CleanVars($POST, 'tplset', 'default', 'string');
@@ -141,23 +141,23 @@ 
                                 $module = $module_handler->getByDirname($moddir);
                                 if (is_object($module)) {
                                     // create module folder
-                                    if (!is_dir($theme_surcharge . '/' . $module->getVar('dirname'))) {
-                                        mkdir($theme_surcharge . '/' . $module->getVar('dirname'), 0777);
-                                        chmod($theme_surcharge . '/' . $module->getVar('dirname'), 0777);
-                                        copy($indexFile, $theme_surcharge . '/' . $module->getVar('dirname') . '/index.html');
+                                    if (!is_dir($theme_surcharge.'/'.$module->getVar('dirname'))) {
+                                        mkdir($theme_surcharge.'/'.$module->getVar('dirname'), 0777);
+                                        chmod($theme_surcharge.'/'.$module->getVar('dirname'), 0777);
+                                        copy($indexFile, $theme_surcharge.'/'.$module->getVar('dirname').'/index.html');
                                     }
 
                                     // create block folder
-                                    if (!is_dir($theme_surcharge . '/' . $module->getVar('dirname') . '/blocks')) {
-                                        if (!is_dir($theme_surcharge . '/' . $module->getVar('dirname') . '/blocks')) {
-                                            mkdir($theme_surcharge . '/' . $module->getVar('dirname') . '/blocks', 0777);
+                                    if (!is_dir($theme_surcharge.'/'.$module->getVar('dirname').'/blocks')) {
+                                        if (!is_dir($theme_surcharge.'/'.$module->getVar('dirname').'/blocks')) {
+                                            mkdir($theme_surcharge.'/'.$module->getVar('dirname').'/blocks', 0777);
                                         }
-                                        chmod($theme_surcharge . '/' . $module->getVar('dirname') . '/blocks', 0777);
-                                        copy($indexFile, $theme_surcharge . '/' . $module->getVar('dirname') . '/blocks' . '/index.html');
+                                        chmod($theme_surcharge.'/'.$module->getVar('dirname').'/blocks', 0777);
+                                        copy($indexFile, $theme_surcharge.'/'.$module->getVar('dirname').'/blocks'.'/index.html');
                                     }
 
                                     $class = 'odd';
-                                    $text .= '<table cellspacing="1" class="outer"><tr><th colspan="3" align="center">' . _AM_SYSTEM_TEMPLATES_MODULES . ucfirst($module->getVar('dirname')) . '</th></tr><tr><th align="center">' . _AM_SYSTEM_TEMPLATES_TYPES . '</th><th  align="center">' . _AM_SYSTEM_TEMPLATES_FILES . '</th><th>' . _AM_SYSTEM_TEMPLATES_STATUS . '</th></tr>';
+                                    $text .= '<table cellspacing="1" class="outer"><tr><th colspan="3" align="center">'._AM_SYSTEM_TEMPLATES_MODULES.ucfirst($module->getVar('dirname')).'</th></tr><tr><th align="center">'._AM_SYSTEM_TEMPLATES_TYPES.'</th><th  align="center">'._AM_SYSTEM_TEMPLATES_FILES.'</th><th>'._AM_SYSTEM_TEMPLATES_STATUS.'</th></tr>';
 
                                     // create template
                                     $templates      = $tpltpl_handler->find($tplsetname, 'module', null, $moddir);
@@ -165,19 +165,19 @@ 
                                     for ($j = 0; $j < $templatesCount; ++$j) {
                                         $filename = $templates[$j]->getVar('tpl_file');
                                         if ($tplsetname == $tplset) {
-                                            $physical_file = XOOPS_THEME_PATH . '/' . $_REQUEST['select_theme'] . '/modules/' . $moddir . '/' . $filename;
+                                            $physical_file = XOOPS_THEME_PATH.'/'.$_REQUEST['select_theme'].'/modules/'.$moddir.'/'.$filename;
 
                                             $tplfile = $tpltpl_handler->get($templates[$j]->getVar('tpl_id'), true);
 
                                             if (is_object($tplfile)) {
                                                 if (!file_exists($physical_file) || $_REQUEST['force_generated'] == 1) {
-                                                    $open = fopen('' . $physical_file . '', 'w+');
-                                                    if (fwrite($open, '' . $tplfile->getVar('tpl_source', 'n'))) {
-                                                        $text .= '<tr class="' . $class . '"><td align="center">' . _AM_SYSTEM_TEMPLATES_TEMPLATES . '</td><td>' . $physical_file . '</td><td align="center">';
+                                                    $open = fopen(''.$physical_file.'', 'w+');
+                                                    if (fwrite($open, ''.$tplfile->getVar('tpl_source', 'n'))) {
+                                                        $text .= '<tr class="'.$class.'"><td align="center">'._AM_SYSTEM_TEMPLATES_TEMPLATES.'</td><td>'.$physical_file.'</td><td align="center">';
                                                         if (file_exists($physical_file)) {
-                                                            $text .= '<img width="16" src="' . system_AdminIcons('success.png') . '" /></td></tr>';
+                                                            $text .= '<img width="16" src="'.system_AdminIcons('success.png').'" /></td></tr>';
                                                         } else {
-                                                            $text .= '<img width="16" src="' . system_AdminIcons('cancel.png') . '" /></td></tr>';
+                                                            $text .= '<img width="16" src="'.system_AdminIcons('cancel.png').'" /></td></tr>';
                                                         }
                                                         $verif_write = true;
                                                     }
@@ -194,18 +194,18 @@ 
                                     for ($k = 0; $k < $btemplatesCount; ++$k) {
                                         $filename = $btemplates[$k]->getVar('tpl_file');
                                         if ($tplsetname == $tplset) {
-                                            $physical_file = XOOPS_THEME_PATH . '/' . $_REQUEST['select_theme'] . '/modules/' . $moddir . '/blocks/' . $filename;
+                                            $physical_file = XOOPS_THEME_PATH.'/'.$_REQUEST['select_theme'].'/modules/'.$moddir.'/blocks/'.$filename;
                                             $btplfile      = $tpltpl_handler->get($btemplates[$k]->getVar('tpl_id'), true);
 
                                             if (is_object($btplfile)) {
                                                 if (!file_exists($physical_file) || $_REQUEST['force_generated'] == 1) {
                                                     $open = fopen($physical_file, 'w+');
                                                     if (fwrite($open, $btplfile->getVar('tpl_source', 'n'))) {
-                                                        $text .= '<tr class="' . $class . '"><td align="center">' . _AM_SYSTEM_TEMPLATES_BLOCKS . '</td><td>' . $physical_file . '</td><td align="center">';
+                                                        $text .= '<tr class="'.$class.'"><td align="center">'._AM_SYSTEM_TEMPLATES_BLOCKS.'</td><td>'.$physical_file.'</td><td align="center">';
                                                         if (file_exists($physical_file)) {
-                                                            $text .= '<img width="16" src="' . system_AdminIcons('success.png') . '" /></td></tr>';
+                                                            $text .= '<img width="16" src="'.system_AdminIcons('success.png').'" /></td></tr>';
                                                         } else {
-                                                            $text .= '<img width="16" src="' . system_AdminIcons('cancel.png') . '" /></td></tr>';
+                                                            $text .= '<img width="16" src="'.system_AdminIcons('cancel.png').'" /></td></tr>';
                                                         }
                                                         $verif_write = true;
                                                     }
@@ -231,23 +231,23 @@ 
                             $module = $module_handler->getByDirname($moddir);
                             if (is_object($module)) {
                                 // create module folder
-                                if (!is_dir($theme_surcharge . '/' . $module->getVar('dirname'))) {
-                                    mkdir($theme_surcharge . '/' . $module->getVar('dirname'), 0777);
-                                    chmod($theme_surcharge . '/' . $module->getVar('dirname'), 0777);
-                                    copy($indexFile, $theme_surcharge . '/' . $module->getVar('dirname') . '/index.html');
+                                if (!is_dir($theme_surcharge.'/'.$module->getVar('dirname'))) {
+                                    mkdir($theme_surcharge.'/'.$module->getVar('dirname'), 0777);
+                                    chmod($theme_surcharge.'/'.$module->getVar('dirname'), 0777);
+                                    copy($indexFile, $theme_surcharge.'/'.$module->getVar('dirname').'/index.html');
                                 }
 
                                 // create block folder
-                                if (!is_dir($theme_surcharge . '/' . $module->getVar('dirname') . '/blocks')) {
-                                    if (!is_dir($theme_surcharge . '/' . $module->getVar('dirname') . '/blocks')) {
-                                        mkdir($theme_surcharge . '/' . $module->getVar('dirname') . '/blocks', 0777);
+                                if (!is_dir($theme_surcharge.'/'.$module->getVar('dirname').'/blocks')) {
+                                    if (!is_dir($theme_surcharge.'/'.$module->getVar('dirname').'/blocks')) {
+                                        mkdir($theme_surcharge.'/'.$module->getVar('dirname').'/blocks', 0777);
                                     }
-                                    chmod($theme_surcharge . '/' . $module->getVar('dirname') . '/blocks', 0777);
-                                    copy($indexFile, $theme_surcharge . '/' . $module->getVar('dirname') . '/blocks' . '/index.html');
+                                    chmod($theme_surcharge.'/'.$module->getVar('dirname').'/blocks', 0777);
+                                    copy($indexFile, $theme_surcharge.'/'.$module->getVar('dirname').'/blocks'.'/index.html');
                                 }
 
                                 $class = 'odd';
-                                $text .= '<table cellspacing="1" class="outer"><tr><th colspan="3" align="center">' . _AM_SYSTEM_TEMPLATES_MODULES . ucfirst($module->getVar('dirname')) . '</th></tr><tr><th align="center">' . _AM_SYSTEM_TEMPLATES_TYPES . '</th><th  align="center">' . _AM_SYSTEM_TEMPLATES_FILES . '</th><th>' . _AM_SYSTEM_TEMPLATES_STATUS . '</th></tr>';
+                                $text .= '<table cellspacing="1" class="outer"><tr><th colspan="3" align="center">'._AM_SYSTEM_TEMPLATES_MODULES.ucfirst($module->getVar('dirname')).'</th></tr><tr><th align="center">'._AM_SYSTEM_TEMPLATES_TYPES.'</th><th  align="center">'._AM_SYSTEM_TEMPLATES_FILES.'</th><th>'._AM_SYSTEM_TEMPLATES_STATUS.'</th></tr>';
                                 $select_templates_modules = $_REQUEST['select_templates_modules'];
                                 $tempCount                = count($_REQUEST['select_templates_modules']);
                                 for ($l = 0; $l < $tempCount; ++$l) {
@@ -257,20 +257,20 @@ 
                                     for ($j = 0; $j < $templatesCount; ++$j) {
                                         $filename = $templates[$j]->getVar('tpl_file');
                                         if ($tplsetname == $tplset) {
-                                            $physical_file = XOOPS_THEME_PATH . '/' . $_REQUEST['select_theme'] . '/modules/' . $moddir . '/' . $filename;
+                                            $physical_file = XOOPS_THEME_PATH.'/'.$_REQUEST['select_theme'].'/modules/'.$moddir.'/'.$filename;
 
                                             $tplfile = $tpltpl_handler->get($templates[$j]->getVar('tpl_id'), true);
 
                                             if (is_object($tplfile)) {
                                                 if (!file_exists($physical_file) || $_REQUEST['force_generated'] == 1) {
                                                     if ($select_templates_modules[$l] == $filename) {
-                                                        $open = fopen('' . $physical_file . '', 'w+');
-                                                        if (fwrite($open, '' . $tplfile->getVar('tpl_source', 'n'))) {
-                                                            $text .= '<tr class="' . $class . '"><td align="center">' . _AM_SYSTEM_TEMPLATES_TEMPLATES . '</td><td>' . $physical_file . '</td><td align="center">';
+                                                        $open = fopen(''.$physical_file.'', 'w+');
+                                                        if (fwrite($open, ''.$tplfile->getVar('tpl_source', 'n'))) {
+                                                            $text .= '<tr class="'.$class.'"><td align="center">'._AM_SYSTEM_TEMPLATES_TEMPLATES.'</td><td>'.$physical_file.'</td><td align="center">';
                                                             if (file_exists($physical_file)) {
-                                                                $text .= '<img width="16" src="' . system_AdminIcons('success.png') . '" /></td></tr>';
+                                                                $text .= '<img width="16" src="'.system_AdminIcons('success.png').'" /></td></tr>';
                                                             } else {
-                                                                $text .= '<img width="16" src="' . system_AdminIcons('cancel.png') . '" /></td></tr>';
+                                                                $text .= '<img width="16" src="'.system_AdminIcons('cancel.png').'" /></td></tr>';
                                                             }
                                                             $verif_write = true;
                                                         }
@@ -288,19 +288,19 @@ 
                                     for ($k = 0; $k < $btemplatesCount; ++$k) {
                                         $filename = $btemplates[$k]->getVar('tpl_file');
                                         if ($tplsetname == $tplset) {
-                                            $physical_file = XOOPS_THEME_PATH . '/' . $_REQUEST['select_theme'] . '/modules/' . $moddir . '/blocks/' . $filename;
+                                            $physical_file = XOOPS_THEME_PATH.'/'.$_REQUEST['select_theme'].'/modules/'.$moddir.'/blocks/'.$filename;
                                             $btplfile      = $tpltpl_handler->get($btemplates[$k]->getVar('tpl_id'), true);
 
                                             if (is_object($btplfile)) {
                                                 if (!file_exists($physical_file) || $_REQUEST['force_generated'] == 1) {
                                                     if ($select_templates_modules[$l] == $filename) {
-                                                        $open = fopen('' . $physical_file . '', 'w+');
-                                                        if (fwrite($open, '' . $btplfile->getVar('tpl_source', 'n') . '')) {
-                                                            $text .= '<tr class="' . $class . '"><td align="center">' . _AM_SYSTEM_TEMPLATES_BLOCKS . '</td><td>' . $physical_file . '</td><td align="center">';
+                                                        $open = fopen(''.$physical_file.'', 'w+');
+                                                        if (fwrite($open, ''.$btplfile->getVar('tpl_source', 'n').'')) {
+                                                            $text .= '<tr class="'.$class.'"><td align="center">'._AM_SYSTEM_TEMPLATES_BLOCKS.'</td><td>'.$physical_file.'</td><td align="center">';
                                                             if (file_exists($physical_file)) {
-                                                                $text .= '<img width="16" src="' . system_AdminIcons('success.png') . '" /></td></tr>';
+                                                                $text .= '<img width="16" src="'.system_AdminIcons('success.png').'" /></td></tr>';
                                                             } else {
-                                                                $text .= '<img width="16" src="' . system_AdminIcons('cancel.png') . '" /></td></tr>';
+                                                                $text .= '<img width="16" src="'.system_AdminIcons('cancel.png').'" /></td></tr>';
                                                             }
                                                             $verif_write = true;
                                                         }
@@ -360,18 +360,18 @@ 
         $clean_path_file = XoopsRequest::getString('path_file', '');
         if (!empty($clean_path_file)) {
             $path_file = realpath(XOOPS_ROOT_PATH.'/themes'.trim($clean_path_file));
-            $path_file = str_replace('\\','/',$path_file);
+            $path_file = str_replace('\\', '/', $path_file);
             $pathInfo = pathinfo($path_file);
             if (!in_array($pathInfo['extension'], array('css', 'html', 'tpl'))) {
                 redirect_header('admin.php?fct=tplsets', 2, _AM_SYSTEM_TEMPLATES_ERROR);
                 exit;
             }
             // copy file
-            $copy_file = $path_file . '.back';
+            $copy_file = $path_file.'.back';
             copy($path_file, $copy_file);
             // Save modif
             if (isset($_REQUEST['templates'])) {
-                $open = fopen('' . $path_file . '', 'w+');
+                $open = fopen(''.$path_file.'', 'w+');
                 if (!fwrite($open, utf8_encode(stripslashes($_REQUEST['templates'])))) {
                     redirect_header('admin.php?fct=tplsets', 2, _AM_SYSTEM_TEMPLATES_ERROR);
                 }

htdocs/modules/system/admin/avatars/main.php

Spacing +23 added lines, -23 removed lines

@@ -37,7 +37,7 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
         $xoTheme->addScript('modules/system/js/admin.js');
         // Define Breadcrumb and tips
@@ -79,14 +79,14 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define scripts
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
         $xoTheme->addScript('modules/system/js/admin.js');
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_AVATAR_MANAGER, system_adminVersion('avatars', 'adminpath'));
         $xoBreadCrumb->addLink(($type === 's' ? _AM_SYSTEM_AVATAR_SYSTEM : _AM_SYSTEM_AVATAR_CUSTOM));
-        $xoBreadCrumb->addHelp(system_adminVersion('avatars', 'help') . '#' . $type);
+        $xoBreadCrumb->addHelp(system_adminVersion('avatars', 'help').'#'.$type);
         $xoBreadCrumb->addTips(_AM_SYSTEM_AVATAR_TIPS);
         $xoBreadCrumb->render();
         // Get avatar handler
@@ -123,7 +123,7 @@ 
         $xoopsTpl->assign('avatars_list', $avatar_list);
         // Display Page Navigation
         if ($avtcount > xoops_getModuleOption('avatars_pager')) {
-            $nav = new XoopsPageNav($avtcount, xoops_getModuleOption('avatars_pager', 'system'), $start, 'start', 'fct=avatars&type=' . $type . '&op=listavt');
+            $nav = new XoopsPageNav($avtcount, xoops_getModuleOption('avatars_pager', 'system'), $start, 'start', 'fct=avatars&type='.$type.'&op=listavt');
             $xoopsTpl->assign('nav_menu', $nav->renderNav(4));
         }
         // Call Footer
@@ -136,11 +136,11 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_AVATAR_MANAGER, system_adminVersion('avatars', 'adminpath'));
         $xoBreadCrumb->addLink(_AM_SYSTEM_AVATAR_EDIT);
-        $xoBreadCrumb->addHelp(system_adminVersion('avatars', 'help') . '#edit');
+        $xoBreadCrumb->addHelp(system_adminVersion('avatars', 'help').'#edit');
         $xoBreadCrumb->addTips(_AM_SYSTEM_AVATAR_TIPS);
         $xoBreadCrumb->render();
         // User language
@@ -172,7 +172,7 @@ 
         // Upload class
         include_once $GLOBALS['xoops']->path('/class/uploader.php');
 
-        $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH . '/avatars', array(
+        $uploader = new XoopsMediaUploader(XOOPS_UPLOAD_PATH.'/avatars', array(
             'image/gif',
             'image/jpeg',
             'image/pjpeg',
@@ -192,23 +192,23 @@ 
             if ($uploader->fetchMedia('avatar_file')) {
                 $uploader->setPrefix('savt');
                 if (!$uploader->upload()) {
-                    $err[] =& $uploader->getErrors();
+                    $err[] = & $uploader->getErrors();
                 } else {
                     $avatar->setVars($_POST);
-                    $avatar->setVar('avatar_file', 'avatars/' . $uploader->getSavedFileName());
+                    $avatar->setVar('avatar_file', 'avatars/'.$uploader->getSavedFileName());
                     $avatar->setVar('avatar_mimetype', $uploader->getMediaType());
                     $avatar->setVar('avatar_type', 's');
                     if (!$avt_handler->insert($avatar)) {
                         $err[] = sprintf(_FAILSAVEIMG, $avatar->getVar('avatar_name'));
                     }
                 }
-            }else{
+            } else {
                 $err[] = $uploader->getErrors();
             }
         } else {
             $file = system_CleanVars($_REQUEST, 'avatar_file', 'blank.gif', 'string');
             $avatar->setVars($_REQUEST);
-            $avatar->setVar('avatar_file', 'avatars/' . $file);
+            $avatar->setVar('avatar_file', 'avatars/'.$file);
             if (!$avt_handler->insert($avatar)) {
                 $err[] = sprintf(_FAILSAVEIMG, $avatar->getVar('avatar_name'));
             }
@@ -219,7 +219,7 @@ 
             // Call header
             xoops_cp_header();
             // Define Stylesheet
-            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+            $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
             // Define Breadcrumb and tips
             $xoBreadCrumb->addLink(_AM_SYSTEM_AVATAR_MANAGER, system_adminVersion('avatars', 'adminpath'));
             $xoBreadCrumb->addLink(_AM_SYSTEM_AVATAR_ERROR);
@@ -256,11 +256,11 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_AVATAR_MANAGER, system_adminVersion('avatars', 'adminpath'));
         $xoBreadCrumb->addLink(_AM_SYSTEM_AVATAR_DELETE);
-        $xoBreadCrumb->addHelp(system_adminVersion('avatars', 'help') . '#delete');
+        $xoBreadCrumb->addHelp(system_adminVersion('avatars', 'help').'#delete');
         $xoBreadCrumb->render();
         // Get variables
         $user_id   = system_CleanVars($_REQUEST, 'user_id', 0, 'int');
@@ -269,7 +269,7 @@ 
         $avt_handler = xoops_getHandler('avatar');
         if ($avatar_id > 0) {
             $avatar = $avt_handler->get($avatar_id);
-            $msg    = '<div class="spacer"><img src="' . XOOPS_UPLOAD_URL . '/' . $avatar->getVar('avatar_file', 's') . '" alt="" /></div><div class="txtcenter bold">' . $avatar->getVar('avatar_name', 's') . '</div>' . _AM_SYSTEM_AVATAR_SUREDEL;
+            $msg    = '<div class="spacer"><img src="'.XOOPS_UPLOAD_URL.'/'.$avatar->getVar('avatar_file', 's').'" alt="" /></div><div class="txtcenter bold">'.$avatar->getVar('avatar_name', 's').'</div>'._AM_SYSTEM_AVATAR_SUREDEL;
             // Display message
             xoops_confirm(array('op' => 'delfileok', 'avatar_id' => $avatar_id, 'fct' => 'avatars', 'user_id' => $user_id), 'admin.php', $msg);
         } else {
@@ -303,12 +303,12 @@ 
         }
         $file = $avatar->getVar('avatar_file');
         // Delete file
-        @unlink(XOOPS_UPLOAD_PATH . '/' . $file);
+        @unlink(XOOPS_UPLOAD_PATH.'/'.$file);
         // Update member profil
         if (isset($user_id) && $avatar->getVar('avatar_type') === 'C') {
-            $xoopsDB->query('UPDATE ' . $xoopsDB->prefix('users') . " SET user_avatar='blank.gif' WHERE uid=" . (int)$user_id);
+            $xoopsDB->query('UPDATE '.$xoopsDB->prefix('users')." SET user_avatar='blank.gif' WHERE uid=".(int)$user_id);
         } else {
-            $xoopsDB->query('UPDATE ' . $xoopsDB->prefix('users') . " SET user_avatar='blank.gif' WHERE user_avatar='" . $file . "'");
+            $xoopsDB->query('UPDATE '.$xoopsDB->prefix('users')." SET user_avatar='blank.gif' WHERE user_avatar='".$file."'");
         }
         redirect_header('admin.php?fct=avatars', 2, _AM_SYSTEM_DBUPDATED);
         break;
@@ -320,10 +320,10 @@ 
         // Call Header
         xoops_cp_header();
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/media/fine-uploader/fine-uploader-new.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/media/fine-uploader/ManuallyTriggerUploads.css');
-        $xoTheme->addStylesheet(XOOPS_URL . '/media/font-awesome/css/font-awesome.min.css');        
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/media/fine-uploader/fine-uploader-new.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/media/fine-uploader/ManuallyTriggerUploads.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/media/font-awesome/css/font-awesome.min.css');        
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define scripts
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
         $xoTheme->addScript('modules/system/js/admin.js');
@@ -347,7 +347,7 @@ 
             'handler' => 'fineavataruploadhandler',
             'moddir' => 'system',
         );
-        $jwt = \Xmf\Jwt\TokenFactory::build('fineuploader', $payload, 60*30); // token good for 30 minutes
+        $jwt = \Xmf\Jwt\TokenFactory::build('fineuploader', $payload, 60 * 30); // token good for 30 minutes
         $xoopsTpl->assign('jwt', $jwt);
         $fineup_debug = 'false';
         if (($xoopsUser instanceof \XoopsUser ? $xoopsUser->isAdmin() : false)

Braces +1 added lines, -1 removed lines

@@ -202,7 +202,7 @@
                         $err[] = sprintf(_FAILSAVEIMG, $avatar->getVar('avatar_name'));
                     }
                 }
-            }else{
+            } else{
                 $err[] = $uploader->getErrors();
             }
         } else {

htdocs/modules/system/admin/smilies/main.php

Indentation +3 added lines, -3 removed lines

@@ -207,9 +207,9 @@
             $xoBreadCrumb->render();
             $smilies_img = $obj->getVar('smile_url') ?: 'blank.gif';
             xoops_confirm(array(
-                              'ok' => 1,
-                              'smilies_id' => $_REQUEST['smilies_id'],
-                              'op' => 'smilies_delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_SYSTEM_SMILIES_SUREDEL) . '<br \><img src="' . XOOPS_UPLOAD_URL . '/' . $smilies_img . '" alt="" /><br \>');
+                                'ok' => 1,
+                                'smilies_id' => $_REQUEST['smilies_id'],
+                                'op' => 'smilies_delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_SYSTEM_SMILIES_SUREDEL) . '<br \><img src="' . XOOPS_UPLOAD_URL . '/' . $smilies_img . '" alt="" /><br \>');
         }
         break;
 

Spacing +23 added lines, -23 removed lines

@@ -47,7 +47,7 @@ 
     case 'list':
     default:
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         $xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
         $xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.tablesorter.js');
         $xoTheme->addScript('modules/system/js/admin.js');
@@ -76,11 +76,11 @@ 
                 $smilies['emotion']     = $smilies_arr[$i]->getVar('emotion');
                 $smilies['display']     = $smilies_arr[$i]->getVar('display');
                 $smilies_img            = $smilies_arr[$i]->getVar('smile_url') ?: 'blank.gif';
-                $smilies['image']       = '<img src="' . XOOPS_UPLOAD_URL . '/' . $smilies_img . '" alt="" />';
-                $smilies['edit_delete'] = '<a href="admin.php?fct=smilies&amp;op=edit_smilie&amp;smilies_id=' . $smilies_id . '">
-                                           <img src="./images/icons/edit.png" border="0" alt="' . _AM_SYSTEM_SMILIES_EDIT . '" title="' . _AM_SYSTEM_SMILIES_EDIT . '"></a>
-                                           <a href="admin.php?fct=smilies&amp;op=smilies_delete&amp;smilies_id=' . $smilies_id . '">
-                                           <img src="./images/icons/delete.png" border="0" alt="' . _AM_SYSTEM_SMILIES_DELETE . '" title="' . _AM_SYSTEM_SMILIES_DELETE . '"></a>';
+                $smilies['image']       = '<img src="'.XOOPS_UPLOAD_URL.'/'.$smilies_img.'" alt="" />';
+                $smilies['edit_delete'] = '<a href="admin.php?fct=smilies&amp;op=edit_smilie&amp;smilies_id='.$smilies_id.'">
+                                           <img src="./images/icons/edit.png" border="0" alt="' . _AM_SYSTEM_SMILIES_EDIT.'" title="'._AM_SYSTEM_SMILIES_EDIT.'"></a>
+                                           <a href="admin.php?fct=smilies&amp;op=smilies_delete&amp;smilies_id=' . $smilies_id.'">
+                                           <img src="./images/icons/delete.png" border="0" alt="' . _AM_SYSTEM_SMILIES_DELETE.'" title="'._AM_SYSTEM_SMILIES_DELETE.'"></a>';
                 $xoopsTpl->append_by_ref('smilies', $smilies);
                 unset($smilies);
             }
@@ -95,11 +95,11 @@ 
     // New smilie
     case 'new_smilie':
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_SMILIES_NAV_ADD);
-        $xoBreadCrumb->addHelp(system_adminVersion('smilies', 'help') . '#new');
-        $xoBreadCrumb->addTips(sprintf(_AM_SYSTEM_SMILIES_NAV_TIPS_FORM1, implode(', ', $mimetypes)) . sprintf(_AM_SYSTEM_SMILIES_NAV_TIPS_FORM2, $upload_size / 1000));
+        $xoBreadCrumb->addHelp(system_adminVersion('smilies', 'help').'#new');
+        $xoBreadCrumb->addTips(sprintf(_AM_SYSTEM_SMILIES_NAV_TIPS_FORM1, implode(', ', $mimetypes)).sprintf(_AM_SYSTEM_SMILIES_NAV_TIPS_FORM2, $upload_size / 1000));
         $xoBreadCrumb->render();
         // Create form
         $obj  = $smilies_Handler->create();
@@ -111,11 +111,11 @@ 
     // Edit smilie
     case 'edit_smilie':
         // Define Stylesheet
-        $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+        $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_SMILIES_NAV_EDIT);
-        $xoBreadCrumb->addHelp(system_adminVersion('smilies', 'help') . '#edit');
-        $xoBreadCrumb->addTips(sprintf(_AM_SYSTEM_SMILIES_NAV_TIPS_FORM1, implode(', ', $mimetypes)) . sprintf(_AM_SYSTEM_SMILIES_NAV_TIPS_FORM2, $upload_size / 1000));
+        $xoBreadCrumb->addHelp(system_adminVersion('smilies', 'help').'#edit');
+        $xoBreadCrumb->addTips(sprintf(_AM_SYSTEM_SMILIES_NAV_TIPS_FORM1, implode(', ', $mimetypes)).sprintf(_AM_SYSTEM_SMILIES_NAV_TIPS_FORM2, $upload_size / 1000));
         $xoBreadCrumb->render();
         // Create form
         $obj  = $smilies_Handler->get(system_CleanVars($_REQUEST, 'smilies_id', 0, 'int'));
@@ -131,7 +131,7 @@ 
         }
         // Define Breadcrumb and tips
         $xoBreadCrumb->addLink(_AM_SYSTEM_SMILIES_NAV_ADD);
-        $xoBreadCrumb->addTips(sprintf(_AM_SYSTEM_SMILIES_NAV_TIPS_FORM1, implode(', ', $mimetypes)) . sprintf(_AM_SYSTEM_SMILIES_NAV_TIPS_FORM2, $upload_size / 1000));
+        $xoBreadCrumb->addTips(sprintf(_AM_SYSTEM_SMILIES_NAV_TIPS_FORM1, implode(', ', $mimetypes)).sprintf(_AM_SYSTEM_SMILIES_NAV_TIPS_FORM2, $upload_size / 1000));
         $xoBreadCrumb->render();
 
         if (isset($_POST['smilies_id'])) {
@@ -145,16 +145,16 @@ 
         $display = ($_POST['display'] == 1) ? '1' : '0';
         $obj->setVar('display', $display);
 
-        include_once XOOPS_ROOT_PATH . '/class/uploader.php';
-        $uploader_smilies_img = new XoopsMediaUploader(XOOPS_UPLOAD_PATH . '/smilies', $mimetypes, $upload_size, null, null);
+        include_once XOOPS_ROOT_PATH.'/class/uploader.php';
+        $uploader_smilies_img = new XoopsMediaUploader(XOOPS_UPLOAD_PATH.'/smilies', $mimetypes, $upload_size, null, null);
         if ($_FILES['smile_url']['error'] != UPLOAD_ERR_NO_FILE) {
             if ($uploader_smilies_img->fetchMedia('smile_url')) {
                 $uploader_smilies_img->setPrefix('smil');
                 $uploader_smilies_img->fetchMedia('smile_url');
                 if (!$uploader_smilies_img->upload()) {
-                    $err[] =& $uploader_smilies_img->getErrors();
+                    $err[] = & $uploader_smilies_img->getErrors();
                 } else {
-                    $obj->setVar('smile_url', 'smilies/' . $uploader_smilies_img->getSavedFileName());
+                    $obj->setVar('smile_url', 'smilies/'.$uploader_smilies_img->getSavedFileName());
                     if (!$smilies_Handler->insert($obj)) {
                         $err[] = sprintf(_FAILSAVEIMG, $obj->getVar('code'));
                     }
@@ -163,14 +163,14 @@ 
                 $err[] = $uploader_smilies_img->getErrors();
             }
         } else {
-            $obj->setVar('smile_url', 'smilies/' . $_POST['smile_url']);
+            $obj->setVar('smile_url', 'smilies/'.$_POST['smile_url']);
             if (!$smilies_Handler->insert($obj)) {
                 $err[] = sprintf(_FAILSAVEIMG, $obj->getVar('code'));
             }
         }
         if (count($err) > 0) {
             // Define Stylesheet
-            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+            $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
             // Display errors
             xoops_error($err);
             // Call Footer
@@ -189,7 +189,7 @@ 
                 redirect_header('admin.php?fct=smilies', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
             }
             if ($smilies_Handler->delete($obj)) {
-                $urlfile = XOOPS_UPLOAD_PATH . '/' . $obj->getVar('smile_url');
+                $urlfile = XOOPS_UPLOAD_PATH.'/'.$obj->getVar('smile_url');
                 if (is_file($urlfile)) {
                     chmod($urlfile, 0777);
                     unlink($urlfile);
@@ -200,16 +200,16 @@ 
             }
         } else {
             // Define Stylesheet
-            $xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+            $xoTheme->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
             // Define Breadcrumb and tips
             $xoBreadCrumb->addLink(_AM_SYSTEM_SMILIES_NAV_DELETE);
-            $xoBreadCrumb->addHelp(system_adminVersion('smilies', 'help') . '#delete');
+            $xoBreadCrumb->addHelp(system_adminVersion('smilies', 'help').'#delete');
             $xoBreadCrumb->render();
             $smilies_img = $obj->getVar('smile_url') ?: 'blank.gif';
             xoops_confirm(array(
                               'ok' => 1,
                               'smilies_id' => $_REQUEST['smilies_id'],
-                              'op' => 'smilies_delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_SYSTEM_SMILIES_SUREDEL) . '<br \><img src="' . XOOPS_UPLOAD_URL . '/' . $smilies_img . '" alt="" /><br \>');
+                              'op' => 'smilies_delete'), $_SERVER['REQUEST_URI'], sprintf(_AM_SYSTEM_SMILIES_SUREDEL).'<br \><img src="'.XOOPS_UPLOAD_URL.'/'.$smilies_img.'" alt="" /><br \>');
         }
         break;