Inspection of "Merge pull request #598 from mambax7/feature/Publi..." - geekwright/XoopsCore - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 2f8aec...b781ca )

by Richard

created 2019-05-16 13:53 UTC

Status

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -21,8 +21,8 @@
 block discarded – undo
  * @author          trabis <[email protected]>
  * @version         $Id$
  */
-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/include/common.php';
+require_once dirname(dirname(__DIR__)).'/mainfile.php';
+require_once __DIR__.'/include/common.php';
 $helper = Helper::getInstance();
 if ('none' !== $helper->getConfig('seo_url_rewrite')) {
     XoopsLoad::loadFile($helper->path('include/seo.inc.php'));

Please login to merge, or discard this patch.

htdocs/modules/publisher/visit.php 1 patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@  discard block
 block discarded – undo
  * @author          The SmartFactory <www.smartfactory.ca>
  * @version         $Id$
  */
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 $helper = Helper::getInstance();
@@ -52,9 +52,9 @@  discard block
 block discarded – undo
 $fileObj->updateCounter();
 
 if (!preg_match("/^ed2k*:\/\//i", $fileObj->getFileUrl())) {
-    header('Location: ' . $fileObj->getFileUrl());
+    header('Location: '.$fileObj->getFileUrl());
 }
 
 $myts = Sanitizer::getInstance();
-echo '<html><head><meta http-equiv="Refresh" content="0; URL=' . $myts->htmlSpecialChars($fileObj->getFileUrl()) . '"></head><body></body></html>';
+echo '<html><head><meta http-equiv="Refresh" content="0; URL='.$myts->htmlSpecialChars($fileObj->getFileUrl()).'"></head><body></body></html>';
 exit();

Please login to merge, or discard this patch.

htdocs/modules/publisher/admin/pw_upload_file.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -21,7 +21,7 @@  discard block
 block discarded – undo
 use XoopsModules\Publisher;
 use XoopsModules\Publisher\Helper;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $xoops = Xoops::getInstance();
 $errors = [];
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
         }
     }
     $allowed_mimetypes = ['text/html', 'text/plain', 'application/xhtml+xml'];
-    $uploader = new XoopsMediaUploader(Publisher\Utils::getUploadDir(true, 'content') . '/', $allowed_mimetypes, $max_size, $max_imgwidth, $max_imgheight);
+    $uploader = new XoopsMediaUploader(Publisher\Utils::getUploadDir(true, 'content').'/', $allowed_mimetypes, $max_size, $max_imgwidth, $max_imgheight);
     if ($uploader->fetchMedia($post_field)) {
         $uploader->setTargetFileName($uploader->getMediaName());
         if ($uploader->upload()) {

Please login to merge, or discard this patch.

htdocs/modules/publisher/admin/pw_delete_file.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -20,11 +20,11 @@
 block discarded – undo
  */
 use XoopsModules\Publisher;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 $xoops = Xoops::getInstance();
 if (isset($_POST['op']) && ('delfileok' === $_POST['op'])) {
     $dir = Publisher\Utils::getUploadDir(true, 'content');
-    @unlink($dir . '/' . $_POST['address']);
+    @unlink($dir.'/'.$_POST['address']);
     $xoops->redirect($_POST['backto'], 2, _AM_PUBLISHER_FDELETED);
 } else {
     $xoops->header();

Please login to merge, or discard this patch.

htdocs/modules/publisher/admin/mimetypes.php 1 patch

Spacing +127 added lines, -127 removed lines patch added patch discarded remove patch

@@ -23,7 +23,7 @@  discard block
 block discarded – undo
  * @author          The SmartFactory <www.smartfactory.ca>
  * @version         $Id$
  */
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $start = $limit = 0;
 if (isset($_REQUEST['limit'])) {
@@ -94,7 +94,7 @@  discard block
 block discarded – undo
 
         //Display any form errors
         if (false === !$mime_errors) {
-            Publisher\Utils::renderErrors($mime_errors, Publisher\Utils::makeURI(PUBLISHER_ADMIN_URL . 'mimetypes.php', ['op' => 'clearAddSession']));
+            Publisher\Utils::renderErrors($mime_errors, Publisher\Utils::makeURI(PUBLISHER_ADMIN_URL.'mimetypes.php', ['op' => 'clearAddSession']));
         }
 
         if (false === $mime_type) {
@@ -114,38 +114,38 @@  discard block
 block discarded – undo
         // Display add form
         echo "<form action='mimetypes.php?op=add' method='post'>";
         echo "<table width='100%' cellspacing='1' class='outer'>";
-        echo "<tr><th colspan='2'>" . _AM_PUBLISHER_MIME_CREATEF . '</th></tr>';
+        echo "<tr><th colspan='2'>"._AM_PUBLISHER_MIME_CREATEF.'</th></tr>';
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_EXTF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_EXTF."</td>
         <td class='even'><input type='text' name='mime_ext' id='mime_ext' value='$mime_ext' size='5'></td>
         </tr>";
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_NAMEF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_NAMEF."</td>
         <td class='even'><input type='text' name='mime_name' id='mime_name' value='$mime_name'></td>
         </tr>";
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_TYPEF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_TYPEF."</td>
         <td class='even'><textarea name='mime_types' id='mime_types' cols='60' rows='5'>$mime_types</textarea></td>
         </tr>";
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_ADMINF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_ADMINF."</td>
         <td class='even'>";
-        echo "<input type='radio' name='mime_admin' value='1' " . (1 == $mime_admin ? "checked" : '') . '>' . XoopsLocale::YES;
-        echo "<input type='radio' name='mime_admin' value='0' " . (0 == $mime_admin ? "checked" : '') . '>' . XoopsLocale::NO . '
+        echo "<input type='radio' name='mime_admin' value='1' ".(1 == $mime_admin ? "checked" : '').'>'.XoopsLocale::YES;
+        echo "<input type='radio' name='mime_admin' value='0' ".(0 == $mime_admin ? "checked" : '').'>'.XoopsLocale::NO.'
         </td>
         </tr>';
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_USERF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_USERF."</td>
         <td class='even'>";
-        echo "<input type='radio' name='mime_user' value='1'" . (1 == $mime_user ? "checked" : '') . '>' . XoopsLocale::YES;
-        echo "<input type='radio' name='mime_user' value='0'" . (0 == $mime_user ? "checked" : '') . '>' . XoopsLocale::NO . '
+        echo "<input type='radio' name='mime_user' value='1'".(1 == $mime_user ? "checked" : '').'>'.XoopsLocale::YES;
+        echo "<input type='radio' name='mime_user' value='0'".(0 == $mime_user ? "checked" : '').'>'.XoopsLocale::NO.'
         </td>
         </tr>';
         echo "<tr valign='top'>
         <td class='head'></td>
         <td class='even'>
-        <input type='submit' name='add_mime' id='add_mime' value='" . _AM_PUBLISHER_BUTTON_SUBMIT . "' class='formButton'>
-        <input type='button' name='cancel' value='" . _AM_PUBLISHER_BUTTON_CANCEL . "' onclick='history.go(-1)' class='formButton'>
+        <input type='submit' name='add_mime' id='add_mime' value='" . _AM_PUBLISHER_BUTTON_SUBMIT."' class='formButton'>
+        <input type='button' name='cancel' value='" . _AM_PUBLISHER_BUTTON_CANCEL."' onclick='history.go(-1)' class='formButton'>
         </td>
         </tr>";
         echo '</table></form>';
@@ -154,10 +154,10 @@  discard block
 block discarded – undo
         // Find new mimetypes table
         echo "<form action='http://www.filext.com' method='post'>";
         echo "<table width='100%' cellspacing='1' class='outer'>";
-        echo "<tr><th colspan='2'>" . _AM_PUBLISHER_MIME_FINDMIMETYPE . '</th></tr>';
+        echo "<tr><th colspan='2'>"._AM_PUBLISHER_MIME_FINDMIMETYPE.'</th></tr>';
 
         echo "<tr class='foot'>
-        <td colspan='2'><input type='submit' name='find_mime' id='find_mime' value='" . _AM_PUBLISHER_MIME_FINDIT . "' class='formButton'></td>
+        <td colspan='2'><input type='submit' name='find_mime' id='find_mime' value='" . _AM_PUBLISHER_MIME_FINDIT."' class='formButton'></td>
         </tr>";
 
         echo '</table></form>';
@@ -200,7 +200,7 @@  discard block
 block discarded – undo
             $mime['mime_user'] = $mime_user;
             $session->set('publisher_addMime', $mime);
             $session->set('publisher_addMimeErr', $error);
-            header('Location: ' . Publisher\Utils::makeURI(PUBLISHER_ADMIN_URL . 'mimetypes.php', ['op' => 'add'], false));
+            header('Location: '.Publisher\Utils::makeURI(PUBLISHER_ADMIN_URL.'mimetypes.php', ['op' => 'add'], false));
         }
 
         $mimetype = $helper->getMimetypeHandler()->create();
@@ -211,10 +211,10 @@  discard block
 block discarded – undo
         $mimetype->setVar('mime_user', $mime_user);
 
         if (!$helper->getMimetypeHandler()->insert($mimetype)) {
-            $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_ADD_MIME_ERROR);
+            $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php?op=manage&limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_ADD_MIME_ERROR);
         } else {
             _clearAddSessionVars();
-            header('Location: ' . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&limit=$limit&start=$start");
+            header('Location: '.PUBLISHER_ADMIN_URL."/mimetypes.php?op=manage&limit=$limit&start=$start");
         }
     }
 }
@@ -225,15 +225,15 @@  discard block
 block discarded – undo
     $xoops = Xoops::getInstance();
     global $start, $limit;
     if (!isset($_REQUEST['id'])) {
-        $xoops->redirect(PUBLISHER_ADMIN_URL . '/mimetypes.php', 3, _AM_PUBLISHER_MESSAGE_NO_ID);
+        $xoops->redirect(PUBLISHER_ADMIN_URL.'/mimetypes.php', 3, _AM_PUBLISHER_MESSAGE_NO_ID);
     }
     $mime_id = (int)$_REQUEST['id'];
 
     $mimetype = $helper->getMimetypeHandler()->get($mime_id); // Retrieve mimetype object
     if (!$helper->getMimetypeHandler()->delete($mimetype, true)) {
-        $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&id=$mime_id&limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR);
+        $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php?op=manage&id=$mime_id&limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR);
     } else {
-        $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&limit=$limit&start=$start", 3, 'Deleted');
+        $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php?op=manage&limit=$limit&start=$start", 3, 'Deleted');
     }
 }
 
@@ -244,7 +244,7 @@  discard block
 block discarded – undo
     global $start, $limit, $oAdminButton;
 
     if (!isset($_REQUEST['id'])) {
-        $xoops->redirect(PUBLISHER_ADMIN_URL . '/mimetypes.php', 3, _AM_PUBLISHER_MESSAGE_NO_ID);
+        $xoops->redirect(PUBLISHER_ADMIN_URL.'/mimetypes.php', 3, _AM_PUBLISHER_MESSAGE_NO_ID);
     }
     $mime_id = (int)$_REQUEST['id'];
 
@@ -263,7 +263,7 @@  discard block
 block discarded – undo
 
         //Display any form errors
         if (false === !$mime_errors) {
-            Publisher\Utils::renderErrors($mime_errors, Publisher\Utils::makeURI(PUBLISHER_ADMIN_URL . '/mimetypes.php', ['op' => 'clearEditSession', 'id' => $mime_id]));
+            Publisher\Utils::renderErrors($mime_errors, Publisher\Utils::makeURI(PUBLISHER_ADMIN_URL.'/mimetypes.php', ['op' => 'clearEditSession', 'id' => $mime_id]));
         }
 
         if (false === $mime_type) {
@@ -281,42 +281,42 @@  discard block
 block discarded – undo
         }
 
         // Display edit form
-        echo "<form action='mimetypes.php?op=edit&amp;id=" . $mime_id . "' method='post'>";
-        echo "<input type='hidden' name='limit' value='" . $limit . "'>";
-        echo "<input type='hidden' name='start' value='" . $start . "'>";
+        echo "<form action='mimetypes.php?op=edit&amp;id=".$mime_id."' method='post'>";
+        echo "<input type='hidden' name='limit' value='".$limit."'>";
+        echo "<input type='hidden' name='start' value='".$start."'>";
         echo "<table width='100%' cellspacing='1' class='outer'>";
-        echo "<tr><th colspan='2'>" . _AM_PUBLISHER_MIME_MODIFYF . '</th></tr>';
+        echo "<tr><th colspan='2'>"._AM_PUBLISHER_MIME_MODIFYF.'</th></tr>';
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_EXTF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_EXTF."</td>
         <td class='even'><input type='text' name='mime_ext' id='mime_ext' value='$mime_ext' size='5'></td>
         </tr>";
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_NAMEF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_NAMEF."</td>
         <td class='even'><input type='text' name='mime_name' id='mime_name' value='$mime_name'></td>
         </tr>";
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_TYPEF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_TYPEF."</td>
         <td class='even'><textarea name='mime_types' id='mime_types' cols='60' rows='5'>$mime_types</textarea></td>
         </tr>";
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_ADMINF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_ADMINF."</td>
         <td class='even'>
-        <input type='radio' name='mime_admin' value='1' " . (1 == $mime_admin ? "checked" : '') . '>' . XoopsLocale::YES . "
-        <input type='radio' name='mime_admin' value='0' " . (0 == $mime_admin ? "checked" : '') . '>' . XoopsLocale::NO . '
+        <input type='radio' name='mime_admin' value='1' " . (1 == $mime_admin ? "checked" : '').'>'.XoopsLocale::YES."
+        <input type='radio' name='mime_admin' value='0' " . (0 == $mime_admin ? "checked" : '').'>'.XoopsLocale::NO.'
         </td>
         </tr>';
         echo "<tr valign='top'>
-        <td class='head'>" . _AM_PUBLISHER_MIME_USERF . "</td>
+        <td class='head'>" . _AM_PUBLISHER_MIME_USERF."</td>
         <td class='even'>
-        <input type='radio' name='mime_user' value='1' " . (1 == $mime_user ? "checked" : '') . '>' . XoopsLocale::YES . "
-        <input type='radio' name='mime_user' value='0' " . (0 == $mime_user ? "checked" : '') . '>' . XoopsLocale::NO . '
+        <input type='radio' name='mime_user' value='1' " . (1 == $mime_user ? "checked" : '').'>'.XoopsLocale::YES."
+        <input type='radio' name='mime_user' value='0' " . (0 == $mime_user ? "checked" : '').'>'.XoopsLocale::NO.'
         </td>
         </tr>';
         echo "<tr valign='top'>
         <td class='head'></td>
         <td class='even'>
-        <input type='submit' name='edit_mime' id='edit_mime' value='" . _AM_PUBLISHER_BUTTON_UPDATE . "' class='formButton'>
-        <input type='button' name='cancel' value='" . _AM_PUBLISHER_BUTTON_CANCEL . "' onclick='history.go(-1)' class='formButton'>
+        <input type='submit' name='edit_mime' id='edit_mime' value='" . _AM_PUBLISHER_BUTTON_UPDATE."' class='formButton'>
+        <input type='button' name='cancel' value='" . _AM_PUBLISHER_BUTTON_CANCEL."' onclick='history.go(-1)' class='formButton'>
         </td>
         </tr>";
         echo '</table></form>';
@@ -359,9 +359,9 @@  discard block
 block discarded – undo
             $mime['mime_types'] = $_POST['mime_types'];
             $mime['mime_admin'] = $mime_admin;
             $mime['mime_user'] = $mime_user;
-            $session->set('publisher_editMime_' . $mime_id, $mime);
-            $session->set('publisher_editMimeErr_' . $mime_id, $error);
-            header('Location: ' . Publisher\Utils::makeURI(PUBLISHER_ADMIN_URL . '/mimetypes.php', ['op' => 'edit', 'id' => $mime_id], false));
+            $session->set('publisher_editMime_'.$mime_id, $mime);
+            $session->set('publisher_editMimeErr_'.$mime_id, $error);
+            header('Location: '.Publisher\Utils::makeURI(PUBLISHER_ADMIN_URL.'/mimetypes.php', ['op' => 'edit', 'id' => $mime_id], false));
         }
 
         $mimetype->setVar('mime_ext', $_POST['mime_ext']);
@@ -371,10 +371,10 @@  discard block
 block discarded – undo
         $mimetype->setVar('mime_user', $mime_user);
 
         if (!$helper->getMimetypeHandler()->insert($mimetype, true)) {
-            $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php?op=edit&id=$mime_id", 3, _AM_PUBLISHER_MESSAGE_EDIT_MIME_ERROR);
+            $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php?op=edit&id=$mime_id", 3, _AM_PUBLISHER_MESSAGE_EDIT_MIME_ERROR);
         } else {
             _clearEditSessionVars($mime_id);
-            header('Location: ' . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage&limit=$limit&start=$start");
+            header('Location: '.PUBLISHER_ADMIN_URL."/mimetypes.php?op=manage&limit=$limit&start=$start");
         }
     }
 }
@@ -385,30 +385,30 @@  discard block
 block discarded – undo
     $helper = Helper::getInstance();
 
     $imagearray = [
-        'editimg' => "<img src='" . $helper->url('images/button_edit.png') . "' alt='" . _AM_PUBLISHER_ICO_EDIT . "' align='middle'>",
-        'deleteimg' => "<img src='" . $helper->url('images/button_delete.png') . "' alt='" . _AM_PUBLISHER_ICO_DELETE . "' align='middle'>",
-        'online' => "<img src='" . $helper->url('images/on.png') . "' alt='" . _AM_PUBLISHER_ICO_ONLINE . "' align='middle'>",
-        'offline' => "<img src='" . $helper->url('images/off.png') . "' alt='" . _AM_PUBLISHER_ICO_OFFLINE . "' align='middle'>",
+        'editimg' => "<img src='".$helper->url('images/button_edit.png')."' alt='"._AM_PUBLISHER_ICO_EDIT."' align='middle'>",
+        'deleteimg' => "<img src='".$helper->url('images/button_delete.png')."' alt='"._AM_PUBLISHER_ICO_DELETE."' align='middle'>",
+        'online' => "<img src='".$helper->url('images/on.png')."' alt='"._AM_PUBLISHER_ICO_ONLINE."' align='middle'>",
+        'offline' => "<img src='".$helper->url('images/off.png')."' alt='"._AM_PUBLISHER_ICO_OFFLINE."' align='middle'>",
     ];
     global $start, $limit, $aSortBy, $aOrderBy, $aLimitBy, $aSearchBy;
 
     if (isset($_POST['deleteMimes'])) {
         $aMimes = $_POST['mimes'];
 
-        $crit = new Criteria('mime_id', '(' . implode(',', $aMimes) . ')', 'IN');
+        $crit = new Criteria('mime_id', '('.implode(',', $aMimes).')', 'IN');
 
         if ($helper->getMimetypeHandler()->deleteAll($crit)) {
-            header('Location: ' . PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start");
+            header('Location: '.PUBLISHER_ADMIN_URL."/mimetypes.php?limit=$limit&start=$start");
         } else {
-            $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR);
+            $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php?limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR);
         }
     }
     if (isset($_POST['add_mime'])) {
-        header('Location: ' . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=add&start=$start&limit=$limit");
+        header('Location: '.PUBLISHER_ADMIN_URL."/mimetypes.php?op=add&start=$start&limit=$limit");
         exit();
     }
     if (isset($_POST['mime_search'])) {
-        header('Location: ' . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=search');
+        header('Location: '.PUBLISHER_ADMIN_URL.'/mimetypes.php?op=search');
         exit();
     }
 
@@ -428,25 +428,25 @@  discard block
 block discarded – undo
 
     echo "<table width='100%' cellspacing='1' class='outer'>";
     echo "<tr><td colspan='6' align='right'>";
-    echo "<form action='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=search' style='margin:0; padding:0;' method='post'>";
+    echo "<form action='".PUBLISHER_ADMIN_URL."/mimetypes.php?op=search' style='margin:0; padding:0;' method='post'>";
     echo '<table>';
     echo '<tr>';
-    echo "<td align='right'>" . _AM_PUBLISHER_TEXT_SEARCH_BY . '</td>';
+    echo "<td align='right'>"._AM_PUBLISHER_TEXT_SEARCH_BY.'</td>';
     echo "<td align='left'><select name='search_by'>";
     foreach ($aSearchBy as $value => $text) {
         ($sort == $value) ? $selected = "selected='selected'" : $selected = '';
         echo "<option value='$value' $selected>$text</option>";
     }
     echo '</select></td>';
-    echo "<td align='right'>" . _AM_PUBLISHER_TEXT_SEARCH_TEXT . '</td>';
+    echo "<td align='right'>"._AM_PUBLISHER_TEXT_SEARCH_TEXT.'</td>';
     echo "<td align='left'><input type='text' name='search_text' id='search_text' value=''></td>";
-    echo "<td><input type='submit' name='mime_search' id='mime_search' value='" . _AM_PUBLISHER_BUTTON_SEARCH . "'></td>";
+    echo "<td><input type='submit' name='mime_search' id='mime_search' value='"._AM_PUBLISHER_BUTTON_SEARCH."'></td>";
     echo '</tr></table></form></td></tr>';
 
     echo "<tr><td colspan='6'>";
-    echo "<form action='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=manage' style='margin:0; padding:0;' method='post'>";
+    echo "<form action='".PUBLISHER_ADMIN_URL."/mimetypes.php?op=manage' style='margin:0; padding:0;' method='post'>";
     echo "<table width='100%'>";
-    echo "<tr><td align='right'>" . _AM_PUBLISHER_TEXT_SORT_BY . "
+    echo "<tr><td align='right'>"._AM_PUBLISHER_TEXT_SORT_BY."
     <select name='sort'>";
     foreach ($aSortBy as $value => $text) {
         ($sort == $value) ? $selected = "selected='selected'" : $selected = '';
@@ -454,7 +454,7 @@  discard block
 block discarded – undo
     }
     echo '</select>
     &nbsp;&nbsp;&nbsp;
-    ' . _AM_PUBLISHER_TEXT_ORDER_BY . "
+    ' . _AM_PUBLISHER_TEXT_ORDER_BY."
     <select name='order'>";
     foreach ($aOrderBy as $value => $text) {
         ($order == $value) ? $selected = "selected='selected'" : $selected = '';
@@ -462,56 +462,56 @@  discard block
 block discarded – undo
     }
     echo '</select>
     &nbsp;&nbsp;&nbsp;
-    ' . _AM_PUBLISHER_TEXT_NUMBER_PER_PAGE . "
+    ' . _AM_PUBLISHER_TEXT_NUMBER_PER_PAGE."
     <select name='limit'>";
     foreach ($aLimitBy as $value => $text) {
         ($limit == $value) ? $selected = "selected='selected'" : $selected = '';
         echo "<option value='$value' $selected>$text</option>";
     }
     echo "</select>
-    <input type='submit' name='mime_sort' id='mime_sort' value='" . _AM_PUBLISHER_BUTTON_SUBMIT . "'>
+    <input type='submit' name='mime_sort' id='mime_sort' value='" . _AM_PUBLISHER_BUTTON_SUBMIT."'>
     </td>
     </tr>";
     echo '</table>';
     echo '</td></tr>';
-    echo "<tr><th colspan='6'>" . _AM_PUBLISHER_MIME_MANAGE_TITLE . '</th></tr>';
+    echo "<tr><th colspan='6'>"._AM_PUBLISHER_MIME_MANAGE_TITLE.'</th></tr>';
     echo "<tr class='head'>
-    <td>" . _AM_PUBLISHER_MIME_ID . '</td>
-    <td>' . _AM_PUBLISHER_MIME_NAME . '</td>
-    <td>' . _AM_PUBLISHER_MIME_EXT . '</td>
-    <td>' . _AM_PUBLISHER_MIME_ADMIN . '</td>
-    <td>' . _AM_PUBLISHER_MIME_USER . '</td>
-    <td>' . _AM_PUBLISHER_MINDEX_ACTION . '</td>
+    <td>" . _AM_PUBLISHER_MIME_ID.'</td>
+    <td>' . _AM_PUBLISHER_MIME_NAME.'</td>
+    <td>' . _AM_PUBLISHER_MIME_EXT.'</td>
+    <td>' . _AM_PUBLISHER_MIME_ADMIN.'</td>
+    <td>' . _AM_PUBLISHER_MIME_USER.'</td>
+    <td>' . _AM_PUBLISHER_MINDEX_ACTION.'</td>
     </tr>';
     foreach ($mimetypes as $mime) {
         echo "<tr class='even'>
-        <td><input type='checkbox' name='mimes[]' value='" . $mime->getVar('mime_id') . "'>" . $mime->getVar('mime_id') . '</td>
-        <td>' . $mime->getVar('mime_name') . '</td>
-        <td>' . $mime->getVar('mime_ext') . "</td>
+        <td><input type='checkbox' name='mimes[]' value='" . $mime->getVar('mime_id')."'>".$mime->getVar('mime_id').'</td>
+        <td>' . $mime->getVar('mime_name').'</td>
+        <td>' . $mime->getVar('mime_ext')."</td>
         <td>
-        <a href='" . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=updateMimeValue&amp;id=' . $mime->getVar('mime_id') . '&amp;mime_admin=' . $mime->getVar('mime_admin') . '&amp;limit=' . $limit . '&amp;start=' . $start . "'>
-        " . ($mime->getVar('mime_admin') ? $imagearray['online'] : $imagearray['offline']) . "</a>
+        <a href='" . PUBLISHER_ADMIN_URL.'/mimetypes.php?op=updateMimeValue&amp;id='.$mime->getVar('mime_id').'&amp;mime_admin='.$mime->getVar('mime_admin').'&amp;limit='.$limit.'&amp;start='.$start."'>
+        " . ($mime->getVar('mime_admin') ? $imagearray['online'] : $imagearray['offline'])."</a>
         </td>
         <td>
-        <a href='" . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=updateMimeValue&amp;id=' . $mime->getVar('mime_id') . '&amp;mime_user=' . $mime->getVar('mime_user') . '&amp;limit=' . $limit . '&amp;start=' . $start . "'>
-        " . ($mime->getVar('mime_user') ? $imagearray['online'] : $imagearray['offline']) . "</a>
+        <a href='" . PUBLISHER_ADMIN_URL.'/mimetypes.php?op=updateMimeValue&amp;id='.$mime->getVar('mime_id').'&amp;mime_user='.$mime->getVar('mime_user').'&amp;limit='.$limit.'&amp;start='.$start."'>
+        " . ($mime->getVar('mime_user') ? $imagearray['online'] : $imagearray['offline'])."</a>
         </td>
         <td>
-        <a href='" . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=edit&amp;id=' . $mime->getVar('mime_id') . '&amp;limit=' . $limit . '&amp;start=' . $start . "'>" . $imagearray['editimg'] . "</a>
-        <a href='" . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=delete&amp;id=' . $mime->getVar('mime_id') . '&amp;limit=' . $limit . '&amp;start=' . $start . "'>" . $imagearray['deleteimg'] . '</a>
+        <a href='" . PUBLISHER_ADMIN_URL.'/mimetypes.php?op=edit&amp;id='.$mime->getVar('mime_id').'&amp;limit='.$limit.'&amp;start='.$start."'>".$imagearray['editimg']."</a>
+        <a href='" . PUBLISHER_ADMIN_URL.'/mimetypes.php?op=delete&amp;id='.$mime->getVar('mime_id').'&amp;limit='.$limit.'&amp;start='.$start."'>".$imagearray['deleteimg'].'</a>
         </td>
         </tr>';
     }
     echo "<tr class='foot'>
     <td colspan='6' valign='top'>
-    <a href='http://www.filext.com' style='float: right' target='_blank'>" . _AM_PUBLISHER_MIME_FINDMIMETYPE . "</a>
+    <a href='http://www.filext.com' style='float: right' target='_blank'>" . _AM_PUBLISHER_MIME_FINDMIMETYPE."</a>
     <input type='checkbox' name='checkAllMimes' value='0' onclick='selectAll(this.form,\"mimes[]\",this.checked);'>
-    <input type='submit' name='deleteMimes' id='deleteMimes' value='" . _AM_PUBLISHER_BUTTON_DELETE . "'>
-    <input type='submit' name='add_mime' id='add_mime' value='" . _AM_PUBLISHER_MIME_CREATEF . "' class='formButton'>
+    <input type='submit' name='deleteMimes' id='deleteMimes' value='" . _AM_PUBLISHER_BUTTON_DELETE."'>
+    <input type='submit' name='add_mime' id='add_mime' value='" . _AM_PUBLISHER_MIME_CREATEF."' class='formButton'>
     </td>
     </tr>";
     echo '</table>';
-    echo "<div id='staff_nav'>" . $nav->renderNav() . '</div>';
+    echo "<div id='staff_nav'>".$nav->renderNav().'</div>';
 
     Publisher\Utils::closeCollapsableBar('mimemanagetable', 'mimemanageicon');
 
@@ -528,16 +528,16 @@  discard block
 block discarded – undo
     if (isset($_POST['deleteMimes'])) {
         $aMimes = $_POST['mimes'];
 
-        $crit = new Criteria('mime_id', '(' . implode(',', $aMimes) . ')', 'IN');
+        $crit = new Criteria('mime_id', '('.implode(',', $aMimes).')', 'IN');
 
         if ($helper->getMimetypeHandler()->deleteAll($crit)) {
-            header('Location: ' . PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start");
+            header('Location: '.PUBLISHER_ADMIN_URL."/mimetypes.php?limit=$limit&start=$start");
         } else {
-            $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR);
+            $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php?limit=$limit&start=$start", 3, _AM_PUBLISHER_MESSAGE_DELETE_MIME_ERROR);
         }
     }
     if (isset($_POST['add_mime'])) {
-        header('Location: ' . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=add&start=$start&limit=$limit");
+        header('Location: '.PUBLISHER_ADMIN_URL."/mimetypes.php?op=add&start=$start&limit=$limit");
         exit();
     }
     $order = $_REQUEST['order'] ?? 'ASC';
@@ -551,8 +551,8 @@  discard block
 block discarded – undo
     if (!isset($_REQUEST['mime_search'])) {
         echo "<form action='mimetypes.php?op=search' method='post'>";
         echo "<table width='100%' cellspacing='1' class='outer'>";
-        echo "<tr><th colspan='2'>" . _AM_PUBLISHER_TEXT_SEARCH_MIME . '</th></tr>';
-        echo "<tr><td class='head' width='20%'>" . _AM_PUBLISHER_TEXT_SEARCH_BY . "</td>
+        echo "<tr><th colspan='2'>"._AM_PUBLISHER_TEXT_SEARCH_MIME.'</th></tr>';
+        echo "<tr><td class='head' width='20%'>"._AM_PUBLISHER_TEXT_SEARCH_BY."</td>
         <td class='even'>
         <select name='search_by'>";
         foreach ($aSortBy as $value => $text) {
@@ -561,14 +561,14 @@  discard block
 block discarded – undo
         echo '</select>
         </td>
         </tr>';
-        echo "<tr><td class='head'>" . _AM_PUBLISHER_TEXT_SEARCH_TEXT . "</td>
+        echo "<tr><td class='head'>"._AM_PUBLISHER_TEXT_SEARCH_TEXT."</td>
         <td class='even'>
         <input type='text' name='search_text' id='search_text' value=''>
         </td>
         </tr>";
         echo "<tr class='foot'>
         <td colspan='2'>
-        <input type='submit' name='mime_search' id='mime_search' value='" . _AM_PUBLISHER_BUTTON_SEARCH . "'>
+        <input type='submit' name='mime_search' id='mime_search' value='" . _AM_PUBLISHER_BUTTON_SEARCH."'>
         </td>
         </tr>";
         echo '</table></form>';
@@ -585,29 +585,29 @@  discard block
 block discarded – undo
         $mimetypes = $helper->getMimetypeHandler()->getObjects($crit);
         $nav = new XoopsPageNav($mime_count, $limit, $start, 'start', "op=search&amp;limit=$limit&amp;order=$order&amp;sort=$sort&amp;mime_search=1&amp;search_by=$search_field&amp;search_text=$search_text");
         // Display results
-        echo '<script type="text/javascript" src="' . PUBLISHER_URL . '/include/functions.js"></script>';
+        echo '<script type="text/javascript" src="'.PUBLISHER_URL.'/include/functions.js"></script>';
 
         echo "<table width='100%' cellspacing='1' class='outer'>";
         echo "<tr><td colspan='6' align='right'>";
-        echo "<form action='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=search' style='margin:0; padding:0;' method='post'>";
+        echo "<form action='".PUBLISHER_ADMIN_URL."/mimetypes.php?op=search' style='margin:0; padding:0;' method='post'>";
         echo '<table>';
         echo '<tr>';
-        echo "<td align='right'>" . _AM_PUBLISHER_TEXT_SEARCH_BY . '</td>';
+        echo "<td align='right'>"._AM_PUBLISHER_TEXT_SEARCH_BY.'</td>';
         echo "<td align='left'><select name='search_by'>";
         foreach ($aSearchBy as $value => $text) {
             ($search_field == $value) ? $selected = "selected='selected'" : $selected = '';
             echo "<option value='$value' $selected>$text</option>";
         }
         echo '</select></td>';
-        echo "<td align='right'>" . _AM_PUBLISHER_TEXT_SEARCH_TEXT . '</td>';
+        echo "<td align='right'>"._AM_PUBLISHER_TEXT_SEARCH_TEXT.'</td>';
         echo "<td align='left'><input type='text' name='search_text' id='search_text' value='$search_text'></td>";
-        echo "<td><input type='submit' name='mime_search' id='mime_search' value='" . _AM_PUBLISHER_BUTTON_SEARCH . "'></td>";
+        echo "<td><input type='submit' name='mime_search' id='mime_search' value='"._AM_PUBLISHER_BUTTON_SEARCH."'></td>";
         echo '</tr></table></form></td></tr>';
 
         echo "<tr><td colspan='6'>";
-        echo "<form action='" . PUBLISHER_ADMIN_URL . "/mimetypes.php?op=search' style='margin:0; padding:0;' method='post'>";
+        echo "<form action='".PUBLISHER_ADMIN_URL."/mimetypes.php?op=search' style='margin:0; padding:0;' method='post'>";
         echo "<table width='100%'>";
-        echo "<tr><td align='right'>" . _AM_PUBLISHER_TEXT_SORT_BY . "
+        echo "<tr><td align='right'>"._AM_PUBLISHER_TEXT_SORT_BY."
         <select name='sort'>";
         foreach ($aSortBy as $value => $text) {
             ($sort == $value) ? $selected = "selected='selected'" : $selected = '';
@@ -615,7 +615,7 @@  discard block
 block discarded – undo
         }
         echo '</select>
         &nbsp;&nbsp;&nbsp;
-        ' . _AM_PUBLISHER_TEXT_ORDER_BY . "
+        ' . _AM_PUBLISHER_TEXT_ORDER_BY."
         <select name='order'>";
         foreach ($aOrderBy as $value => $text) {
             ($order == $value) ? $selected = "selected='selected'" : $selected = '';
@@ -623,14 +623,14 @@  discard block
 block discarded – undo
         }
         echo '</select>
         &nbsp;&nbsp;&nbsp;
-        ' . _AM_PUBLISHER_TEXT_NUMBER_PER_PAGE . "
+        ' . _AM_PUBLISHER_TEXT_NUMBER_PER_PAGE."
         <select name='limit'>";
         foreach ($aLimitBy as $value => $text) {
             ($limit == $value) ? $selected = "selected='selected'" : $selected = '';
             echo "<option value='$value' $selected>$text</option>";
         }
         echo "</select>
-        <input type='submit' name='mime_sort' id='mime_sort' value='" . _AM_PUBLISHER_BUTTON_SUBMIT . "'>
+        <input type='submit' name='mime_sort' id='mime_sort' value='" . _AM_PUBLISHER_BUTTON_SUBMIT."'>
         <input type='hidden' name='mime_search' id='mime_search' value='1'>
         <input type='hidden' name='search_by' id='search_by' value='$search_field'>
         <input type='hidden' name='search_text' id='search_text' value='$search_text'>
@@ -639,50 +639,50 @@  discard block
 block discarded – undo
         echo '</table>';
         echo '</td></tr>';
         if (count($mimetypes) > 0) {
-            echo "<tr><th colspan='6'>" . _AM_PUBLISHER_TEXT_SEARCH_MIME . '</th></tr>';
+            echo "<tr><th colspan='6'>"._AM_PUBLISHER_TEXT_SEARCH_MIME.'</th></tr>';
             echo "<tr class='head'>
-            <td>" . _AM_PUBLISHER_MIME_ID . '</td>
-            <td>' . _AM_PUBLISHER_MIME_NAME . '</td>
-            <td>' . _AM_PUBLISHER_MIME_EXT . '</td>
-            <td>' . _AM_PUBLISHER_MIME_ADMIN . '</td>
-            <td>' . _AM_PUBLISHER_MIME_USER . '</td>
-            <td>' . _AM_PUBLISHER_MINDEX_ACTION . '</td>
+            <td>" . _AM_PUBLISHER_MIME_ID.'</td>
+            <td>' . _AM_PUBLISHER_MIME_NAME.'</td>
+            <td>' . _AM_PUBLISHER_MIME_EXT.'</td>
+            <td>' . _AM_PUBLISHER_MIME_ADMIN.'</td>
+            <td>' . _AM_PUBLISHER_MIME_USER.'</td>
+            <td>' . _AM_PUBLISHER_MINDEX_ACTION.'</td>
             </tr>';
             foreach ($mimetypes as $mime) {
                 echo "<tr class='even'>
-                <td><input type='checkbox' name='mimes[]' value='" . $mime->getVar('mime_id') . "'>" . $mime->getVar('mime_id') . '</td>
-                <td>' . $mime->getVar('mime_name') . '</td>
-                <td>' . $mime->getVar('mime_ext') . "</td>
+                <td><input type='checkbox' name='mimes[]' value='" . $mime->getVar('mime_id')."'>".$mime->getVar('mime_id').'</td>
+                <td>' . $mime->getVar('mime_name').'</td>
+                <td>' . $mime->getVar('mime_ext')."</td>
                 <td>
-                <a href='" . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=updateMimeValue&amp;id=' . $mime->getVar('mime_id') . '&amp;mime_admin=' . $mime->getVar('mime_admin') . '&amp;limit=' . $limit . '&amp;start=' . $start . "'>
-                " . ($mime->getVar('mime_admin') ? $imagearray['online'] : $imagearray['offline']) . "</a>
+                <a href='" . PUBLISHER_ADMIN_URL.'/mimetypes.php?op=updateMimeValue&amp;id='.$mime->getVar('mime_id').'&amp;mime_admin='.$mime->getVar('mime_admin').'&amp;limit='.$limit.'&amp;start='.$start."'>
+                " . ($mime->getVar('mime_admin') ? $imagearray['online'] : $imagearray['offline'])."</a>
                 </td>
                 <td>
-                <a href='" . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=updateMimeValue&amp;id=' . $mime->getVar('mime_id') . '&amp;mime_user=' . $mime->getVar('mime_user') . '&amp;limit=' . $limit . '&amp;start=' . $start . "'>
-                " . ($mime->getVar('mime_user') ? $imagearray['online'] : $imagearray['offline']) . "</a>
+                <a href='" . PUBLISHER_ADMIN_URL.'/mimetypes.php?op=updateMimeValue&amp;id='.$mime->getVar('mime_id').'&amp;mime_user='.$mime->getVar('mime_user').'&amp;limit='.$limit.'&amp;start='.$start."'>
+                " . ($mime->getVar('mime_user') ? $imagearray['online'] : $imagearray['offline'])."</a>
                 </td>
                 <td>
-                <a href='" . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=edit&amp;id=' . $mime->getVar('mime_id') . '&amp;limit=' . $limit . '&amp;start=' . $start . "'>" . $imagearray['editimg'] . "</a>
-                <a href='" . PUBLISHER_ADMIN_URL . '/mimetypes.php?op=delete&amp;id=' . $mime->getVar('mime_id') . '&amp;limit=' . $limit . '&amp;start=' . $start . "'>" . $imagearray['deleteimg'] . '</a>
+                <a href='" . PUBLISHER_ADMIN_URL.'/mimetypes.php?op=edit&amp;id='.$mime->getVar('mime_id').'&amp;limit='.$limit.'&amp;start='.$start."'>".$imagearray['editimg']."</a>
+                <a href='" . PUBLISHER_ADMIN_URL.'/mimetypes.php?op=delete&amp;id='.$mime->getVar('mime_id').'&amp;limit='.$limit.'&amp;start='.$start."'>".$imagearray['deleteimg'].'</a>
                 </td>
                 </tr>';
             }
             echo "<tr class='foot'>
             <td colspan='6' valign='top'>
-            <a href='http://www.filext.com' style='float: right' target='_blank'>" . _AM_PUBLISHER_MIME_FINDMIMETYPE . "</a>
+            <a href='http://www.filext.com' style='float: right' target='_blank'>" . _AM_PUBLISHER_MIME_FINDMIMETYPE."</a>
             <input type='checkbox' name='checkAllMimes' value='0' onclick='selectAll(this.form,\"mimes[]\",this.checked);'>
-            <input type='submit' name='deleteMimes' id='deleteMimes' value='" . _AM_PUBLISHER_BUTTON_DELETE . "'>
-            <input type='submit' name='add_mime' id='add_mime' value='" . _AM_PUBLISHER_MIME_CREATEF . "' class='formButton'>
+            <input type='submit' name='deleteMimes' id='deleteMimes' value='" . _AM_PUBLISHER_BUTTON_DELETE."'>
+            <input type='submit' name='add_mime' id='add_mime' value='" . _AM_PUBLISHER_MIME_CREATEF."' class='formButton'>
             </td>
             </tr>";
         } else {
-            echo '<tr><th>' . _AM_PUBLISHER_TEXT_SEARCH_MIME . '</th></tr>';
+            echo '<tr><th>'._AM_PUBLISHER_TEXT_SEARCH_MIME.'</th></tr>';
             echo "<tr class='even'>
-            <td>" . _AM_PUBLISHER_TEXT_NO_RECORDS . '</td>
+            <td>" . _AM_PUBLISHER_TEXT_NO_RECORDS.'</td>
             </tr>';
         }
         echo '</table>';
-        echo "<div id='pagenav'>" . $nav->renderNav() . '</div>';
+        echo "<div id='pagenav'>".$nav->renderNav().'</div>';
     }
     Publisher\Utils::closeCollapsableBar('mimesearchtable', 'mimesearchicon');
     $xoops->footer();
@@ -702,7 +702,7 @@  discard block
 block discarded – undo
     }
 
     if (!isset($_REQUEST['id'])) {
-        $xoops->redirect(PUBLISHER_ADMIN_URL . '/mimetypes.php', 3, _AM_PUBLISHER_MESSAGE_NO_ID);
+        $xoops->redirect(PUBLISHER_ADMIN_URL.'/mimetypes.php', 3, _AM_PUBLISHER_MESSAGE_NO_ID);
     }
     $mime_id = (int)$_REQUEST['id'];
 
@@ -719,9 +719,9 @@  discard block
 block discarded – undo
         $mimetype->setVar('mime_user', $mime_user);
     }
     if ($helper->getMimetypeHandler()->insert($mimetype, true)) {
-        header('Location: ' . PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start");
+        header('Location: '.PUBLISHER_ADMIN_URL."/mimetypes.php?limit=$limit&start=$start");
     } else {
-        $xoops->redirect(PUBLISHER_ADMIN_URL . "/mimetypes.php?limit=$limit&start=$start", 3);
+        $xoops->redirect(PUBLISHER_ADMIN_URL."/mimetypes.php?limit=$limit&start=$start", 3);
     }
 }
 
@@ -754,7 +754,7 @@  discard block
 block discarded – undo
 function clearAddSession()
 {
     _clearAddSessionVars();
-    header('Location: ' . Publisher\Utils::makeURI(PUBLISHER_ADMIN_URL . '/mimetypes.php', ['op' => 'add'], false));
+    header('Location: '.Publisher\Utils::makeURI(PUBLISHER_ADMIN_URL.'/mimetypes.php', ['op' => 'add'], false));
 }
 
 /**
@@ -775,5 +775,5 @@  discard block
 block discarded – undo
 {
     $mimeid = $_REQUEST['id'];
     _clearEditSessionVars($mimeid);
-    header('Location: ' . Publisher\Utils::makeURI(PUBLISHER_ADMIN_URL . '/mimetypes.php', ['op' => 'edit', 'id' => $mimeid], false));
+    header('Location: '.Publisher\Utils::makeURI(PUBLISHER_ADMIN_URL.'/mimetypes.php', ['op' => 'edit', 'id' => $mimeid], false));
 }

Please login to merge, or discard this patch.

htdocs/modules/publisher/admin/import.php 2 patches

Switch Indentation +71 added lines, -71 removed lines patch added patch discarded remove patch

@@ -34,26 +34,26 @@  discard block
 block discarded – undo
 }
 
 switch ($op) {
-    case 'importExecute':
+        case 'importExecute':
 
-        $importfile = $_POST['importfile'] ?? 'nonselected';
-        $importfile_path = XoopsBaseConfig::get('root-path') . '/modules/' . $helper->getModule()->dirname() . '/admin/import/' . $importfile . '.php';
-        require_once $importfile_path;
-        break;
-    case 'default':
-    default:
+            $importfile = $_POST['importfile'] ?? 'nonselected';
+            $importfile_path = XoopsBaseConfig::get('root-path') . '/modules/' . $helper->getModule()->dirname() . '/admin/import/' . $importfile . '.php';
+            require_once $importfile_path;
+            break;
+        case 'default':
+        default:
 
-        $importfile = 'none';
+            $importfile = 'none';
 
-        Publisher\Utils::cpHeader();
-        //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
+            Publisher\Utils::cpHeader();
+            //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
 
-        Publisher\Utils::openCollapsableBar('import', 'importicon', _AM_PUBLISHER_IMPORT_TITLE, _AM_PUBLISHER_IMPORT_INFO);
+            Publisher\Utils::openCollapsableBar('import', 'importicon', _AM_PUBLISHER_IMPORT_TITLE, _AM_PUBLISHER_IMPORT_INFO);
 
-        $moduleHandler = $xoops->getHandlerModule();
+            $moduleHandler = $xoops->getHandlerModule();
 
-        // WF-Section
-        /*$wfs_version = 0;
+            // WF-Section
+            /*$wfs_version = 0;
         $moduleObj = $moduleHandler->getByDirname('wfsection');
         if ($moduleObj) {
         $from_module_version = round($moduleObj->getVar('version') / 100, 2);
@@ -63,30 +63,30 @@  discard block
 block discarded – undo
         }
         } */
 
-        // News
-        $news_version = 0;
-        $moduleObj = $xoops->getModuleByDirname('news');
-        if ($moduleObj) {
-            $from_module_version = round($moduleObj->getVar('version') / 100, 2);
-            if ($from_module_version >= 1.1) {
-                $importfile_select_array['news'] = 'News ' . $from_module_version;
-                $news_version = $from_module_version;
+            // News
+            $news_version = 0;
+            $moduleObj = $xoops->getModuleByDirname('news');
+            if ($moduleObj) {
+                $from_module_version = round($moduleObj->getVar('version') / 100, 2);
+                if ($from_module_version >= 1.1) {
+                    $importfile_select_array['news'] = 'News ' . $from_module_version;
+                    $news_version = $from_module_version;
+                }
             }
-        }
 
-        // Smartsection
-        $smartsection_version = 0;
-        $moduleObj = $xoops->getModuleByDirname('smartsection');
-        if ($moduleObj) {
-            $from_module_version = round($moduleObj->getVar('version') / 100, 2);
-            if ($from_module_version >= 1.1) {
-                $importfile_select_array['smartsection'] = 'Smartsection ' . $from_module_version;
-                $smartsection_version = $from_module_version;
+            // Smartsection
+            $smartsection_version = 0;
+            $moduleObj = $xoops->getModuleByDirname('smartsection');
+            if ($moduleObj) {
+                $from_module_version = round($moduleObj->getVar('version') / 100, 2);
+                if ($from_module_version >= 1.1) {
+                    $importfile_select_array['smartsection'] = 'Smartsection ' . $from_module_version;
+                    $smartsection_version = $from_module_version;
+                }
             }
-        }
 
-        //  XF-Section
-        /*$xfs_version = 0;
+            //  XF-Section
+            /*$xfs_version = 0;
         $moduleObj = $moduleHandler->getByDirname('xfsection');
         If ($moduleObj) {
         $from_module_version = round($moduleObj->getVar('version') / 100, 2);
@@ -96,47 +96,47 @@  discard block
 block discarded – undo
         }
         } */
 
-        if (isset($importfile_select_array) && count($importfile_select_array) > 0) {
-            $sform = new ThemeForm(_AM_PUBLISHER_IMPORT_SELECTION, 'op', xoops_getenv('PHP_SELF'));
-            $sform->setExtra('enctype="multipart/form-data"');
-
-            // Partners to import
-            $importfile_select = new Select('', 'importfile', $importfile);
-            $importfile_select->addOptionArray($importfile_select_array);
-            $importfile_tray = new ElementTray(_AM_PUBLISHER_IMPORT_SELECT_FILE, '&nbsp;');
-            $importfile_tray->addElement($importfile_select);
-            $importfile_tray->setDescription(_AM_PUBLISHER_IMPORT_SELECT_FILE_DSC);
-            $sform->addElement($importfile_tray);
-
-            // Buttons
-            $buttonTray = new ElementTray('', '');
-            $hidden = new Hidden('op', 'importExecute');
-            $buttonTray->addElement($hidden);
-
-            $buttonImport = new Button('', '', _AM_PUBLISHER_IMPORT, 'submit');
-            $buttonImport->setExtra('onclick="this.form.elements.op.value=\'importExecute\'"');
-            $buttonTray->addElement($buttonImport);
-
-            $buttonCancel = new Button('', '', _AM_PUBLISHER_CANCEL, 'button');
-            $buttonCancel->setExtra('onclick="history.go(-1)"');
-            $buttonTray->addElement($buttonCancel);
-
-            $sform->addElement($buttonTray);
-            /*$sform->addElement(new \Xoops\Form\Hidden('xfs_version', $xfs_version));
+            if (isset($importfile_select_array) && count($importfile_select_array) > 0) {
+                $sform = new ThemeForm(_AM_PUBLISHER_IMPORT_SELECTION, 'op', xoops_getenv('PHP_SELF'));
+                $sform->setExtra('enctype="multipart/form-data"');
+
+                // Partners to import
+                $importfile_select = new Select('', 'importfile', $importfile);
+                $importfile_select->addOptionArray($importfile_select_array);
+                $importfile_tray = new ElementTray(_AM_PUBLISHER_IMPORT_SELECT_FILE, '&nbsp;');
+                $importfile_tray->addElement($importfile_select);
+                $importfile_tray->setDescription(_AM_PUBLISHER_IMPORT_SELECT_FILE_DSC);
+                $sform->addElement($importfile_tray);
+
+                // Buttons
+                $buttonTray = new ElementTray('', '');
+                $hidden = new Hidden('op', 'importExecute');
+                $buttonTray->addElement($hidden);
+
+                $buttonImport = new Button('', '', _AM_PUBLISHER_IMPORT, 'submit');
+                $buttonImport->setExtra('onclick="this.form.elements.op.value=\'importExecute\'"');
+                $buttonTray->addElement($buttonImport);
+
+                $buttonCancel = new Button('', '', _AM_PUBLISHER_CANCEL, 'button');
+                $buttonCancel->setExtra('onclick="history.go(-1)"');
+                $buttonTray->addElement($buttonCancel);
+
+                $sform->addElement($buttonTray);
+                /*$sform->addElement(new \Xoops\Form\Hidden('xfs_version', $xfs_version));
              $sform->addElement(new \Xoops\Form\Hidden('wfs_version', $wfs_version));*/
-            $sform->addElement(new Hidden('news_version', $news_version));
-            $sform->addElement(new Hidden('smartsection_version', $smartsection_version));
-            $sform->display();
-            unset($hidden);
-        } else {
-            echo '<span style="color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; ">' . _AM_PUBLISHER_IMPORT_NO_MODULE . '</span>';
-        }
+                $sform->addElement(new Hidden('news_version', $news_version));
+                $sform->addElement(new Hidden('smartsection_version', $smartsection_version));
+                $sform->display();
+                unset($hidden);
+            } else {
+                echo '<span style="color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; ">' . _AM_PUBLISHER_IMPORT_NO_MODULE . '</span>';
+            }
 
-        // End of collapsable bar
+            // End of collapsable bar
 
-        Publisher\Utils::closeCollapsableBar('import', 'importicon');
+            Publisher\Utils::closeCollapsableBar('import', 'importicon');
 
-        break;
+            break;
 }
 
 $xoops->footer();

Please login to merge, or discard this patch.

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -25,7 +25,7 @@  discard block
 block discarded – undo
 use Xoops\Form\ThemeForm;
 use XoopsModules\Publisher;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 $xoops = Xoops::getInstance();
 
 $op = $_GET['op'] ?? 'none';
@@ -37,7 +37,7 @@  discard block
 block discarded – undo
     case 'importExecute':
 
         $importfile = $_POST['importfile'] ?? 'nonselected';
-        $importfile_path = XoopsBaseConfig::get('root-path') . '/modules/' . $helper->getModule()->dirname() . '/admin/import/' . $importfile . '.php';
+        $importfile_path = XoopsBaseConfig::get('root-path').'/modules/'.$helper->getModule()->dirname().'/admin/import/'.$importfile.'.php';
         require_once $importfile_path;
         break;
     case 'default':
@@ -69,7 +69,7 @@  discard block
 block discarded – undo
         if ($moduleObj) {
             $from_module_version = round($moduleObj->getVar('version') / 100, 2);
             if ($from_module_version >= 1.1) {
-                $importfile_select_array['news'] = 'News ' . $from_module_version;
+                $importfile_select_array['news'] = 'News '.$from_module_version;
                 $news_version = $from_module_version;
             }
         }
@@ -80,7 +80,7 @@  discard block
 block discarded – undo
         if ($moduleObj) {
             $from_module_version = round($moduleObj->getVar('version') / 100, 2);
             if ($from_module_version >= 1.1) {
-                $importfile_select_array['smartsection'] = 'Smartsection ' . $from_module_version;
+                $importfile_select_array['smartsection'] = 'Smartsection '.$from_module_version;
                 $smartsection_version = $from_module_version;
             }
         }
@@ -129,7 +129,7 @@  discard block
 block discarded – undo
             $sform->display();
             unset($hidden);
         } else {
-            echo '<span style="color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; ">' . _AM_PUBLISHER_IMPORT_NO_MODULE . '</span>';
+            echo '<span style="color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; ">'._AM_PUBLISHER_IMPORT_NO_MODULE.'</span>';
         }
 
         // End of collapsable bar

Please login to merge, or discard this patch.

htdocs/modules/publisher/admin/category.php 2 patches

Indentation +40 added lines, -40 removed lines patch added patch discarded remove patch

@@ -364,27 +364,27 @@  discard block
 block discarded – undo
             /* @var Publisher\Category $subcat */
             foreach ($subcatsObj as $subcat) {
                 $modify = "<a href='category.php?op=mod&amp;categoryid="
-                          . $subcat->getVar('categoryid')
-                          . "'><img src='"
-                          . XoopsBaseConfig::get('url')
-                          . '/modules/'
-                          . $helper->getModule()->dirname()
-                          . "/images/links/edit.gif' title='"
-                          . _AM_PUBLISHER_MODIFY
-                          . "' alt='"
-                          . _AM_PUBLISHER_MODIFY
-                          . "'></a>";
+                            . $subcat->getVar('categoryid')
+                            . "'><img src='"
+                            . XoopsBaseConfig::get('url')
+                            . '/modules/'
+                            . $helper->getModule()->dirname()
+                            . "/images/links/edit.gif' title='"
+                            . _AM_PUBLISHER_MODIFY
+                            . "' alt='"
+                            . _AM_PUBLISHER_MODIFY
+                            . "'></a>";
                 $delete = "<a href='category.php?op=del&amp;categoryid="
-                          . $subcat->getVar('categoryid')
-                          . "'><img src='"
-                          . XoopsBaseConfig::get('url')
-                          . '/modules/'
-                          . $helper->getModule()->dirname()
-                          . "/images/links/delete.png' title='"
-                          . _AM_PUBLISHER_DELETE
-                          . "' alt='"
-                          . _AM_PUBLISHER_DELETE
-                          . "'></a>";
+                            . $subcat->getVar('categoryid')
+                            . "'><img src='"
+                            . XoopsBaseConfig::get('url')
+                            . '/modules/'
+                            . $helper->getModule()->dirname()
+                            . "/images/links/delete.png' title='"
+                            . _AM_PUBLISHER_DELETE
+                            . "' alt='"
+                            . _AM_PUBLISHER_DELETE
+                            . "'></a>";
                 echo '<tr>';
                 echo "<td class='head' align='left'>" . $subcat->getVar('categoryid') . '</td>';
                 echo "<td class='even' align='left'><a href='" . XoopsBaseConfig::get('url') . '/modules/' . $helper->getModule()->dirname() . '/category.php?categoryid=' . $subcat->getVar('categoryid') . '&amp;parentid=' . $subcat->getVar('parentid') . "'>" . $subcat->getVar('name') . '</a></td>';
@@ -420,27 +420,27 @@  discard block
 block discarded – undo
             foreach ($itemsObj as $iValue) {
                 $categoryObj = $allcats[$iValue->getVar('categoryid')];
                 $modify = "<a href='item.php?op=mod&amp;itemid="
-                               . $iValue->getVar('itemid')
-                               . "'><img src='"
-                               . XoopsBaseConfig::get('url')
-                               . '/modules/'
-                               . $helper->getModule()->dirname()
-                               . "/images/links/edit.gif' title='"
-                               . _AM_PUBLISHER_EDITITEM
-                               . "' alt='"
-                               . _AM_PUBLISHER_EDITITEM
-                               . "'></a>";
+                                . $iValue->getVar('itemid')
+                                . "'><img src='"
+                                . XoopsBaseConfig::get('url')
+                                . '/modules/'
+                                . $helper->getModule()->dirname()
+                                . "/images/links/edit.gif' title='"
+                                . _AM_PUBLISHER_EDITITEM
+                                . "' alt='"
+                                . _AM_PUBLISHER_EDITITEM
+                                . "'></a>";
                 $delete = "<a href='item.php?op=del&amp;itemid="
-                               . $iValue->getVar('itemid')
-                               . "'><img src='"
-                               . XoopsBaseConfig::get('url')
-                               . '/modules/'
-                               . $helper->getModule()->dirname()
-                               . "/images/links/delete.png' title='"
-                               . _AM_PUBLISHER_DELETEITEM
-                               . "' alt='"
-                               . _AM_PUBLISHER_DELETEITEM
-                               . "'></a>";
+                                . $iValue->getVar('itemid')
+                                . "'><img src='"
+                                . XoopsBaseConfig::get('url')
+                                . '/modules/'
+                                . $helper->getModule()->dirname()
+                                . "/images/links/delete.png' title='"
+                                . _AM_PUBLISHER_DELETEITEM
+                                . "' alt='"
+                                . _AM_PUBLISHER_DELETEITEM
+                                . "'></a>";
                 echo '<tr>';
                 echo "<td class='head' align='center'>" . $iValue->getVar('itemid') . '</td>';
                 echo "<td class='even' align='left'>" . $categoryObj->getVar('name') . '</td>';

Please login to merge, or discard this patch.

Spacing +36 added lines, -36 removed lines patch added patch discarded remove patch

@@ -23,7 +23,7 @@  discard block
 block discarded – undo
  * @author          The SmartFactory <www.smartfactory.ca>
  * @version         $Id$
  */
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $xoops = Xoops::getInstance();
 $op = Request::getCmd('op');
@@ -53,7 +53,7 @@  discard block
 block discarded – undo
             echo $xoops->confirm(
                 ['op' => 'del', 'categoryid' => $categoryObj->getVar('categoryid'), 'confirm' => 1, 'name' => $categoryObj->getVar('name')],
                 'category.php',
-                _AM_PUBLISHER_DELETECOL . " '" . $categoryObj->getVar('name') . "'. <br> <br>" . _AM_PUBLISHER_DELETE_CAT_CONFIRM,
+                _AM_PUBLISHER_DELETECOL." '".$categoryObj->getVar('name')."'. <br> <br>"._AM_PUBLISHER_DELETE_CAT_CONFIRM,
                 _AM_PUBLISHER_DELETE
             );
             $xoops->footer();
@@ -98,7 +98,7 @@  discard block
 block discarded – undo
                 if ($uploader->fetchMedia($filename) && $uploader->upload()) {
                     $categoryObj->setVar('image', $uploader->getSavedFileName());
                 } else {
-                    $xoops->redirect('javascript:history.go(-1)', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR . $uploader->getErrors());
+                    $xoops->redirect('javascript:history.go(-1)', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR.$uploader->getErrors());
                 }
             }
         } else {
@@ -148,7 +148,7 @@  discard block
 block discarded – undo
         }
 
         if (!$categoryObj->store()) {
-            $xoops->redirect('javascript:history.go(-1)', 3, _AM_PUBLISHER_CATEGORY_SAVE_ERROR . Publisher\Utils::formatErrors($categoryObj->getErrors()));
+            $xoops->redirect('javascript:history.go(-1)', 3, _AM_PUBLISHER_CATEGORY_SAVE_ERROR.Publisher\Utils::formatErrors($categoryObj->getErrors()));
         }
         // TODO : put this function in the category class
         Publisher\Utils::saveCategoryPermissions($grpread, $categoryObj->getVar('categoryid'), 'category_read');
@@ -165,7 +165,7 @@  discard block
 block discarded – undo
                 $categoryObj->setVar('parentid', $parentCat);
 
                 if (!$categoryObj->store()) {
-                    $xoops->redirect('javascript:history.go(-1)', 3, _AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR . Publisher\Utils::formatErrors($categoryObj->getErrors()));
+                    $xoops->redirect('javascript:history.go(-1)', 3, _AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR.Publisher\Utils::formatErrors($categoryObj->getErrors()));
                 }
                 // TODO : put this function in the category class
                 Publisher\Utils::saveCategoryPermissions($grpread, $categoryObj->getVar('categoryid'), 'category_read');
@@ -207,7 +207,7 @@  discard block
 block discarded – undo
 
         echo "<br>\n";
         echo '<form><div style="margin-bottom: 12px;">';
-        echo "<input type='button' name='button' onclick=\"location='category.php?op=mod'\" value='" . _AM_PUBLISHER_CATEGORY_CREATE . "'>&nbsp;&nbsp;";
+        echo "<input type='button' name='button' onclick=\"location='category.php?op=mod'\" value='"._AM_PUBLISHER_CATEGORY_CREATE."'>&nbsp;&nbsp;";
         //echo "<input type='button' name='button' onclick=\"location='item.php?op=mod'\" value='" . _AM_PUBLISHER_CREATEITEM . "'>&nbsp;&nbsp;";
         echo '</div></form>';
 
@@ -218,9 +218,9 @@  discard block
 block discarded – undo
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo '<tr>';
-        echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . '</strong></td>';
-        echo "<td width='60' class='bg3' width='65' align='center'><strong>" . _CO_PUBLISHER_WEIGHT . '</strong></td>';
-        echo "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+        echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_ITEMCATEGORYNAME.'</strong></td>';
+        echo "<td width='60' class='bg3' width='65' align='center'><strong>"._CO_PUBLISHER_WEIGHT.'</strong></td>';
+        echo "<td width='60' class='bg3' align='center'><strong>"._AM_PUBLISHER_ACTION.'</strong></td>';
         echo '</tr>';
         $totalCategories = $helper->getCategoryHandler()->getCategoriesCount(0);
         if (count($categoriesObj) > 0) {
@@ -229,13 +229,13 @@  discard block
 block discarded – undo
             }
         } else {
             echo '<tr>';
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOCAT . '</td>';
+            echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOCAT.'</td>';
             echo '</tr>';
             $categoryid = '0';
         }
         echo "</table>\n";
         $pagenav = new XoopsPageNav($totalCategories, $helper->getConfig('idxcat_perpage'), $startcategory, 'startcategory');
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
         echo '<br>';
         Publisher\Utils::closeCollapsableBar('createdcategories', 'createdcategoriesicon');
         echo '<br>';
@@ -260,11 +260,11 @@  discard block
 block discarded – undo
     $description = $categoryObj->getVar('description');
     if (!XoopsLocale::isMultiByte()) {
         if (mb_strlen($description) >= 100) {
-            $description = mb_substr($description, 0, 100 - 1) . '...';
+            $description = mb_substr($description, 0, 100 - 1).'...';
         }
     }
-    $modify = "<a href='category.php?op=mod&amp;categoryid=" . $categoryObj->getVar('categoryid') . '&amp;parentid=' . $categoryObj->getVar('parentid') . "'><img src='" . PUBLISHER_URL . "/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITCOL . "' alt='" . _AM_PUBLISHER_EDITCOL . "'></a>";
-    $delete = "<a href='category.php?op=del&amp;categoryid=" . $categoryObj->getVar('categoryid') . "'><img src='" . PUBLISHER_URL . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETECOL . "' alt='" . _AM_PUBLISHER_DELETECOL . "'></a>";
+    $modify = "<a href='category.php?op=mod&amp;categoryid=".$categoryObj->getVar('categoryid').'&amp;parentid='.$categoryObj->getVar('parentid')."'><img src='".PUBLISHER_URL."/images/links/edit.gif' title='"._AM_PUBLISHER_EDITCOL."' alt='"._AM_PUBLISHER_EDITCOL."'></a>";
+    $delete = "<a href='category.php?op=del&amp;categoryid=".$categoryObj->getVar('categoryid')."'><img src='".PUBLISHER_URL."/images/links/delete.png' title='"._AM_PUBLISHER_DELETECOL."' alt='"._AM_PUBLISHER_DELETECOL."'></a>";
 
     $spaces = '';
     for ($j = 0; $j < $level; ++$j) {
@@ -272,8 +272,8 @@  discard block
 block discarded – undo
     }
 
     echo '<tr>';
-    echo "<td class='even' align='left'>" . $spaces . "<a href='" . PUBLISHER_URL . '/category.php?categoryid=' . $categoryObj->getVar('categoryid') . "'><img src='" . PUBLISHER_URL . "/images/links/subcat.gif' alt=''>&nbsp;" . $categoryObj->getVar('name') . '</a></td>';
-    echo "<td class='even' align='center'>" . $categoryObj->getVar('weight') . '</td>';
+    echo "<td class='even' align='left'>".$spaces."<a href='".PUBLISHER_URL.'/category.php?categoryid='.$categoryObj->getVar('categoryid')."'><img src='".PUBLISHER_URL."/images/links/subcat.gif' alt=''>&nbsp;".$categoryObj->getVar('name').'</a></td>';
+    echo "<td class='even' align='center'>".$categoryObj->getVar('weight').'</td>';
     echo "<td class='even' align='center'> $modify $delete </td>";
     echo '</tr>';
     $subCategoriesObj = $helper->getCategoryHandler()->getCategories(0, 0, $categoryObj->getVar('categoryid'));
@@ -355,10 +355,10 @@  discard block
 block discarded – undo
 
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo '<tr>';
-        echo "<td width='60' class='bg3' align='left'><strong>" . _AM_PUBLISHER_CATID . '</strong></td>';
-        echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_CATCOLNAME . '</strong></td>';
-        echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_SUBDESCRIPT . '</strong></td>';
-        echo "<td width='60' class='bg3' align='right'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+        echo "<td width='60' class='bg3' align='left'><strong>"._AM_PUBLISHER_CATID.'</strong></td>';
+        echo "<td width='20%' class='bg3' align='left'><strong>"._AM_PUBLISHER_CATCOLNAME.'</strong></td>';
+        echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_SUBDESCRIPT.'</strong></td>';
+        echo "<td width='60' class='bg3' align='right'><strong>"._AM_PUBLISHER_ACTION.'</strong></td>';
         echo '</tr>';
         if ($totalsubs > 0) {
             /* @var Publisher\Category $subcat */
@@ -386,15 +386,15 @@  discard block
 block discarded – undo
                           . _AM_PUBLISHER_DELETE
                           . "'></a>";
                 echo '<tr>';
-                echo "<td class='head' align='left'>" . $subcat->getVar('categoryid') . '</td>';
-                echo "<td class='even' align='left'><a href='" . XoopsBaseConfig::get('url') . '/modules/' . $helper->getModule()->dirname() . '/category.php?categoryid=' . $subcat->getVar('categoryid') . '&amp;parentid=' . $subcat->getVar('parentid') . "'>" . $subcat->getVar('name') . '</a></td>';
-                echo "<td class='even' align='left'>" . $subcat->getVar('description') . '</td>';
+                echo "<td class='head' align='left'>".$subcat->getVar('categoryid').'</td>';
+                echo "<td class='even' align='left'><a href='".XoopsBaseConfig::get('url').'/modules/'.$helper->getModule()->dirname().'/category.php?categoryid='.$subcat->getVar('categoryid').'&amp;parentid='.$subcat->getVar('parentid')."'>".$subcat->getVar('name').'</a></td>';
+                echo "<td class='even' align='left'>".$subcat->getVar('description').'</td>';
                 echo "<td class='even' align='right'> {$modify} {$delete} </td>";
                 echo '</tr>';
             }
         } else {
             echo '<tr>';
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOSUBCAT . '</td>';
+            echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOSUBCAT.'</td>';
             echo '</tr>';
         }
         echo "</table>\n";
@@ -410,11 +410,11 @@  discard block
 block discarded – undo
         $allcats = $helper->getCategoryHandler()->getObjects(null, true);
         echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
         echo '<tr>';
-        echo "<td width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . '</strong></td>';
-        echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCOLNAME . '</strong></td>';
-        echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMDESC . '</strong></td>';
-        echo "<td width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . '</strong></td>';
-        echo "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+        echo "<td width='40' class='bg3' align='center'><strong>"._AM_PUBLISHER_ITEMID.'</strong></td>';
+        echo "<td width='20%' class='bg3' align='left'><strong>"._AM_PUBLISHER_ITEMCOLNAME.'</strong></td>';
+        echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_ITEMDESC.'</strong></td>';
+        echo "<td width='90' class='bg3' align='center'><strong>"._AM_PUBLISHER_CREATED.'</strong></td>';
+        echo "<td width='60' class='bg3' align='center'><strong>"._AM_PUBLISHER_ACTION.'</strong></td>';
         echo '</tr>';
         if ($totalitems > 0) {
             foreach ($itemsObj as $iValue) {
@@ -442,16 +442,16 @@  discard block
 block discarded – undo
                                . _AM_PUBLISHER_DELETEITEM
                                . "'></a>";
                 echo '<tr>';
-                echo "<td class='head' align='center'>" . $iValue->getVar('itemid') . '</td>';
-                echo "<td class='even' align='left'>" . $categoryObj->getVar('name') . '</td>';
-                echo "<td class='even' align='left'>" . $iValue->getitemLink() . '</td>';
-                echo "<td class='even' align='center'>" . $iValue->datesub('s') . '</td>';
+                echo "<td class='head' align='center'>".$iValue->getVar('itemid').'</td>';
+                echo "<td class='even' align='left'>".$categoryObj->getVar('name').'</td>';
+                echo "<td class='even' align='left'>".$iValue->getitemLink().'</td>';
+                echo "<td class='even' align='center'>".$iValue->datesub('s').'</td>';
                 echo "<td class='even' align='center'> $modify $delete </td>";
                 echo '</tr>';
             }
         } else {
             echo '<tr>';
-            echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS . '</td>';
+            echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOITEMS.'</td>';
             echo '</tr>';
         }
         echo "</table>\n";
@@ -459,8 +459,8 @@  discard block
 block discarded – undo
         $parentid = Request::getInt('parentid');
         $pagenav_extra_args = "op=mod&categoryid=$sel_cat&parentid=$parentid";
         $pagenav = new XoopsPageNav($totalitems, $helper->getConfig('idxcat_perpage'), $startitem, 'startitem', $pagenav_extra_args);
-        echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
-        echo "<input type='button' name='button' onclick=\"location='item.php?op=mod&categoryid=" . $sel_cat . "'\" value='" . _AM_PUBLISHER_CREATEITEM . "'>&nbsp;&nbsp;";
+        echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
+        echo "<input type='button' name='button' onclick=\"location='item.php?op=mod&categoryid=".$sel_cat."'\" value='"._AM_PUBLISHER_CREATEITEM."'>&nbsp;&nbsp;";
         echo '</div>';
     }
     //end of fx2024 code

Please login to merge, or discard this patch.

htdocs/modules/publisher/admin/pagewrap.php 1 patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -24,7 +24,7 @@  discard block
 block discarded – undo
 use Xoops\Form\ThemeForm;
 use XoopsModules\Publisher;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 $xoops = Xoops::getInstance();
 Publisher\Utils::cpHeader();
@@ -35,15 +35,15 @@  discard block
 block discarded – undo
 $dir = Publisher\Utils::getUploadDir(true, 'content');
 
 if (false === mb_strpos(decoct(fileperms($dir)), '777')) {
-    echo '<span style="color: FF0000; "><h4>' . _AM_PUBLISHER_PERMERROR . '</h4></span>';
+    echo '<span style="color: FF0000; "><h4>'._AM_PUBLISHER_PERMERROR.'</h4></span>';
 }
 
 // Upload File
 echo "<form name='form_name2' id='form_name2' action='pw_upload_file.php' method='post' enctype='multipart/form-data'>";
 echo "<table cellspacing='1' width='100%' class='outer'>";
-echo "<tr><th colspan='2'>" . _AM_PUBLISHER_UPLOAD_FILE . '</th></tr>';
-echo "<tr valign='top' align='left'><td class='head'>" . _AM_PUBLISHER_SEARCH . "</td><td class='even'><input type='file' name='fileupload' id='fileupload' size='30'></td></tr>";
-echo "<tr valign='top' align='left'><td class='head'><input type='hidden' name='MAX_FILE_SIZE' id='op' value='500000'></td><td class='even'><input type='submit' name='submit' value='" . _AM_PUBLISHER_UPLOAD . "'></td></tr>";
+echo "<tr><th colspan='2'>"._AM_PUBLISHER_UPLOAD_FILE.'</th></tr>';
+echo "<tr valign='top' align='left'><td class='head'>"._AM_PUBLISHER_SEARCH."</td><td class='even'><input type='file' name='fileupload' id='fileupload' size='30'></td></tr>";
+echo "<tr valign='top' align='left'><td class='head'><input type='hidden' name='MAX_FILE_SIZE' id='op' value='500000'></td><td class='even'><input type='submit' name='submit' value='"._AM_PUBLISHER_UPLOAD."'></td></tr>";
 echo '</table>';
 echo '</form>';
 

Please login to merge, or discard this patch.

htdocs/modules/publisher/admin/import/xfsection.php 1 patch

Spacing +31 added lines, -31 removed lines patch added patch discarded remove patch

@@ -26,10 +26,10 @@  discard block
 block discarded – undo
 use Xoops\Form\ThemeForm;
 use XoopsModules\Publisher;
 
-require_once dirname(__DIR__) . '/admin_header.php';
+require_once dirname(__DIR__).'/admin_header.php';
 $myts = Sanitizer::getInstance();
 
-$importFromModuleName = 'XF-Section ' . @$_POST['xfs_version'];
+$importFromModuleName = 'XF-Section '.@$_POST['xfs_version'];
 
 $scriptname = 'xfsection.php';
 
@@ -44,26 +44,26 @@  discard block
 block discarded – undo
     //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
     Publisher\Utils::openCollapsableBar('xfsectionimport', 'xfsectionimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
 
-    $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('xfs_category'));
+    $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('xfs_category'));
     [$totalCat] = $xoopsDB->fetchRow($result);
 
     if (0 == $totalCat) {
-        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_PUBLISHER_IMPORT_NOCATSELECTED . '</span>';
+        echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_PUBLISHER_IMPORT_NOCATSELECTED.'</span>';
     } else {
-        require_once XoopsBaseConfig::get('root-path') . '/class/xoopstree.php';
+        require_once XoopsBaseConfig::get('root-path').'/class/xoopstree.php';
 
-        $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('xfs_article'));
+        $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('xfs_article'));
         [$totalArticles] = $xoopsDB->fetchRow($result);
 
         if (0 == $totalArticles) {
-            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . '</span>';
+            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles).'</span>';
         } else {
-            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . '</span>';
+            echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat).'</span>';
 
-            $form = new ThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
+            $form = new ThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL."/import/$scriptname");
 
             // Categories to be imported
-            $sql = 'SELECT cat.id, cat.pid, cat.title, COUNT(art.articleid) FROM ' . $xoopsDB->prefix('xfs_category') . ' AS cat INNER JOIN ' . $xoopsDB->prefix('xfs_article') . ' AS art ON cat.id=art.categoryid GROUP BY art.categoryid';
+            $sql = 'SELECT cat.id, cat.pid, cat.title, COUNT(art.articleid) FROM '.$xoopsDB->prefix('xfs_category').' AS cat INNER JOIN '.$xoopsDB->prefix('xfs_article').' AS art ON cat.id=art.categoryid GROUP BY art.categoryid';
             $result = $xoopsDB->query($sql);
             $cat_cbox_values = [];
             $cat_cbox_options = [];
@@ -108,7 +108,7 @@  discard block
 block discarded – undo
 
     $parentId = $_POST['parent_category'];
 
-    $sql = 'SELECT * FROM ' . $xoopsDB->prefix('xfs_category') . ' ORDER by orders';
+    $sql = 'SELECT * FROM '.$xoopsDB->prefix('xfs_category').' ORDER by orders';
 
     $resultCat = $xoopsDB->query($sql);
 
@@ -131,13 +131,13 @@  discard block
 block discarded – undo
 
         // Category image
         if (('blank.gif' !== $arrCat['imgurl']) && $arrCat['imgurl']) {
-            if (copy(XoopsBaseConfig::get('root-path') . '/modules/xfsection/images/category/' . $arrCat['imgurl'], PUBLISHER_UPLOADS_PATH . '/images/category/' . $arrCat['imgurl'])) {
+            if (copy(XoopsBaseConfig::get('root-path').'/modules/xfsection/images/category/'.$arrCat['imgurl'], PUBLISHER_UPLOADS_PATH.'/images/category/'.$arrCat['imgurl'])) {
                 $categoryObj->setVar('image', $arrCat['imgurl']);
             }
         }
 
         if (!$categoryObj->store(false)) {
-            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['title']) . '<br>';
+            echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['title']).'<br>';
             continue;
         }
 
@@ -148,9 +148,9 @@  discard block
 block discarded – undo
 
         ++$cnt_imported_cat;
 
-        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->getVar('name')) . "<br\>";
+        echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->getVar('name'))."<br\>";
 
-        $sql = 'SELECT * FROM ' . $xoopsDB->prefix('xfs_article') . ' WHERE categoryid=' . $arrCat['id'] . ' ORDER BY weight';
+        $sql = 'SELECT * FROM '.$xoopsDB->prefix('xfs_article').' WHERE categoryid='.$arrCat['id'].' ORDER BY weight';
         $resultArticles = $xoopsDB->query($sql);
         while (false !== ($arrArticle = $xoopsDB->fetchArray($resultArticles))) {
             // insert article
@@ -178,29 +178,29 @@  discard block
 block discarded – undo
 
             // HTML Wrap
             if ($arrArticle['htmlpage']) {
-                $pagewrap_filename = XoopsBaseConfig::get('root-path') . '/modules/xfsection/html/' . $arrArticle['htmlpage'];
+                $pagewrap_filename = XoopsBaseConfig::get('root-path').'/modules/xfsection/html/'.$arrArticle['htmlpage'];
                 if (XoopsLoad::fileExists($pagewrap_filename)) {
-                    if (copy($pagewrap_filename, PUBLISHER_UPLOADS_PATH . '/content/' . $arrArticle['htmlpage'])) {
-                        $itemObj->setVar('body', '[pagewrap=' . $arrArticle['htmlpage'] . ']');
-                        echo sprintf('&nbsp;&nbsp;&nbsp;&nbsp;' . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . '<br>';
+                    if (copy($pagewrap_filename, PUBLISHER_UPLOADS_PATH.'/content/'.$arrArticle['htmlpage'])) {
+                        $itemObj->setVar('body', '[pagewrap='.$arrArticle['htmlpage'].']');
+                        echo sprintf('&nbsp;&nbsp;&nbsp;&nbsp;'._AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']).'<br>';
                     }
                 }
             }
 
             if (!$itemObj->store()) {
-                echo sprintf('  ' . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . '<br>';
+                echo sprintf('  '._AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']).'<br>';
                 continue;
             }
 
             // Linkes files
 
-            $sql = 'SELECT * FROM ' . $xoopsDB->prefix('xfs_files') . ' WHERE articleid=' . $arrArticle['articleid'];
+            $sql = 'SELECT * FROM '.$xoopsDB->prefix('xfs_files').' WHERE articleid='.$arrArticle['articleid'];
             $resultFiles = $xoopsDB->query($sql);
             $allowed_mimetypes = '';
             while (false !== ($arrFile = $xoopsDB->fetchArray($resultFiles))) {
-                $filename = XoopsBaseConfig::get('root-path') . '/modules/xfsection/cache/uploaded/' . $arrFile['filerealname'];
+                $filename = XoopsBaseConfig::get('root-path').'/modules/xfsection/cache/uploaded/'.$arrFile['filerealname'];
                 if (XoopsLoad::fileExists($filename)) {
-                    if (copy($filename, PUBLISHER_UPLOADS_PATH . '/' . $arrFile['filerealname'])) {
+                    if (copy($filename, PUBLISHER_UPLOADS_PATH.'/'.$arrFile['filerealname'])) {
                         $fileObj = $helper->getFileHandler()->create();
                         $fileObj->setVar('name', $arrFile['fileshowname']);
                         $fileObj->setVar('description', $arrFile['filedescript']);
@@ -213,14 +213,14 @@  discard block
 block discarded – undo
                         $fileObj->setVar('filename', $arrFile['filerealname']);
 
                         if ($fileObj->store($allowed_mimetypes, true, false)) {
-                            echo '&nbsp;&nbsp;&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname']) . '<br>';
+                            echo '&nbsp;&nbsp;&nbsp;&nbsp;'.sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname']).'<br>';
                         }
                     }
                 }
             }
 
             $newArticleArray[$arrArticle['articleid']] = $itemObj->getVar('itemid');
-            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()).'<br>';
             ++$cnt_imported_articles;
         }
         $newCatArray[$newCat['oldid']] = $newCat;
@@ -242,7 +242,7 @@  discard block
 block discarded – undo
     }
 
     // Looping through the comments to link them to the new articles and module
-    echo _AM_PUBLISHER_IMPORT_COMMENTS . '<br>';
+    echo _AM_PUBLISHER_IMPORT_COMMENTS.'<br>';
 
     $moduleHandler = xoops_getHandler('module');
     $moduleObj = $moduleHandler->getByDirname('xfsection');
@@ -259,16 +259,16 @@  discard block
 block discarded – undo
         $comment->setVar('com_modid', $publisher_module_id);
         $comment->setNew();
         if (!$commentHandler->insert($comment)) {
-            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')).'<br>';
         } else {
-            echo '&nbsp;&nbsp;' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . '<br>';
+            echo '&nbsp;&nbsp;'.sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')).'<br>';
         }
     }
 
     echo '<br><br>Done.<br>';
-    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br>';
-    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . '<br>';
-    echo "<br><a href='" . publisher_URL . "'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . '</a><br>';
+    echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat).'<br>';
+    echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles).'<br>';
+    echo "<br><a href='".publisher_URL."'>"._AM_PUBLISHER_IMPORT_GOTOMODULE.'</a><br>';
 
     Publisher\Utils::closeCollapsableBar('xfsectionimportgo', 'xfsectionimportgoicon');
     $xoops->footer();

Please login to merge, or discard this patch.

		@@ -21,8 +21,8 @@
		block discarded – undo
21	21	* @author trabis <[email protected]>
22	22	* @version $Id$
23	23	*/
24		-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
25		-require_once __DIR__ . '/include/common.php';
	24	+require_once dirname(dirname(__DIR__)).'/mainfile.php';
	25	+require_once __DIR__.'/include/common.php';
26	26	$helper = Helper::getInstance();
27	27	if ('none' !== $helper->getConfig('seo_url_rewrite')) {
28	28	XoopsLoad::loadFile($helper->path('include/seo.inc.php'));

		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25	* @author The SmartFactory <www.smartfactory.ca>
26	26	* @version $Id$
27	27	*/
28		-require_once __DIR__ . '/header.php';
	28	+require_once __DIR__.'/header.php';
29	29
30	30	$xoops = Xoops::getInstance();
31	31	$helper = Helper::getInstance();
		@@ -52,9 +52,9 @@ discard block
		block discarded – undo
52	52	$fileObj->updateCounter();
53	53
54	54	if (!preg_match("/^ed2k*:\/\//i", $fileObj->getFileUrl())) {
55		- header('Location: ' . $fileObj->getFileUrl());
	55	+ header('Location: '.$fileObj->getFileUrl());
56	56	}
57	57
58	58	$myts = Sanitizer::getInstance();
59		-echo '<html><head><meta http-equiv="Refresh" content="0; URL=' . $myts->htmlSpecialChars($fileObj->getFileUrl()) . '"></head><body></body></html>';
	59	+echo '<html><head><meta http-equiv="Refresh" content="0; URL='.$myts->htmlSpecialChars($fileObj->getFileUrl()).'"></head><body></body></html>';
60	60	exit();

		@@ -21,7 +21,7 @@ discard block
		block discarded – undo
21	21	use XoopsModules\Publisher;
22	22	use XoopsModules\Publisher\Helper;
23	23
24		-require_once __DIR__ . '/admin_header.php';
	24	+require_once __DIR__.'/admin_header.php';
25	25
26	26	$xoops = Xoops::getInstance();
27	27	$errors = [];
		@@ -53,7 +53,7 @@ discard block
		block discarded – undo
53	53	}
54	54	}
55	55	$allowed_mimetypes = ['text/html', 'text/plain', 'application/xhtml+xml'];
56		- $uploader = new XoopsMediaUploader(Publisher\Utils::getUploadDir(true, 'content') . '/', $allowed_mimetypes, $max_size, $max_imgwidth, $max_imgheight);
	56	+ $uploader = new XoopsMediaUploader(Publisher\Utils::getUploadDir(true, 'content').'/', $allowed_mimetypes, $max_size, $max_imgwidth, $max_imgheight);
57	57	if ($uploader->fetchMedia($post_field)) {
58	58	$uploader->setTargetFileName($uploader->getMediaName());
59	59	if ($uploader->upload()) {

		@@ -20,11 +20,11 @@
		block discarded – undo
20	20	*/
21	21	use XoopsModules\Publisher;
22	22
23		-require_once __DIR__ . '/admin_header.php';
	23	+require_once __DIR__.'/admin_header.php';
24	24	$xoops = Xoops::getInstance();
25	25	if (isset($_POST['op']) && ('delfileok' === $_POST['op'])) {
26	26	$dir = Publisher\Utils::getUploadDir(true, 'content');
27		- @unlink($dir . '/' . $_POST['address']);
	27	+ @unlink($dir.'/'.$_POST['address']);
28	28	$xoops->redirect($_POST['backto'], 2, _AM_PUBLISHER_FDELETED);
29	29	} else {
30	30	$xoops->header();

		@@ -34,26 +34,26 @@ discard block
		block discarded – undo
34	34	}
35	35
36	36	switch ($op) {
37		- case 'importExecute':
	37	+ case 'importExecute':
38	38
39		- $importfile = $_POST['importfile'] ?? 'nonselected';
40		- $importfile_path = XoopsBaseConfig::get('root-path') . '/modules/' . $helper->getModule()->dirname() . '/admin/import/' . $importfile . '.php';
41		- require_once $importfile_path;
42		- break;
43		- case 'default':
44		- default:
	39	+ $importfile = $_POST['importfile'] ?? 'nonselected';
	40	+ $importfile_path = XoopsBaseConfig::get('root-path') . '/modules/' . $helper->getModule()->dirname() . '/admin/import/' . $importfile . '.php';
	41	+ require_once $importfile_path;
	42	+ break;
	43	+ case 'default':
	44	+ default:
45	45
46		- $importfile = 'none';
	46	+ $importfile = 'none';
47	47
48		- Publisher\Utils::cpHeader();
49		- //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
	48	+ Publisher\Utils::cpHeader();
	49	+ //publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
50	50
51		- Publisher\Utils::openCollapsableBar('import', 'importicon', _AM_PUBLISHER_IMPORT_TITLE, _AM_PUBLISHER_IMPORT_INFO);
	51	+ Publisher\Utils::openCollapsableBar('import', 'importicon', _AM_PUBLISHER_IMPORT_TITLE, _AM_PUBLISHER_IMPORT_INFO);
52	52
53		- $moduleHandler = $xoops->getHandlerModule();
	53	+ $moduleHandler = $xoops->getHandlerModule();
54	54
55		- // WF-Section
56		- /*$wfs_version = 0;
	55	+ // WF-Section
	56	+ /*$wfs_version = 0;
57	57	$moduleObj = $moduleHandler->getByDirname('wfsection');
58	58	if ($moduleObj) {
59	59	$from_module_version = round($moduleObj->getVar('version') / 100, 2);
		@@ -63,30 +63,30 @@ discard block
		block discarded – undo
63	63	}
64	64	} */
65	65
66		- // News
67		- $news_version = 0;
68		- $moduleObj = $xoops->getModuleByDirname('news');
69		- if ($moduleObj) {
70		- $from_module_version = round($moduleObj->getVar('version') / 100, 2);
71		- if ($from_module_version >= 1.1) {
72		- $importfile_select_array['news'] = 'News ' . $from_module_version;
73		- $news_version = $from_module_version;
	66	+ // News
	67	+ $news_version = 0;
	68	+ $moduleObj = $xoops->getModuleByDirname('news');
	69	+ if ($moduleObj) {
	70	+ $from_module_version = round($moduleObj->getVar('version') / 100, 2);
	71	+ if ($from_module_version >= 1.1) {
	72	+ $importfile_select_array['news'] = 'News ' . $from_module_version;
	73	+ $news_version = $from_module_version;
	74	+ }
74	75	}
75		- }
76	76
77		- // Smartsection
78		- $smartsection_version = 0;
79		- $moduleObj = $xoops->getModuleByDirname('smartsection');
80		- if ($moduleObj) {
81		- $from_module_version = round($moduleObj->getVar('version') / 100, 2);
82		- if ($from_module_version >= 1.1) {
83		- $importfile_select_array['smartsection'] = 'Smartsection ' . $from_module_version;
84		- $smartsection_version = $from_module_version;
	77	+ // Smartsection
	78	+ $smartsection_version = 0;
	79	+ $moduleObj = $xoops->getModuleByDirname('smartsection');
	80	+ if ($moduleObj) {
	81	+ $from_module_version = round($moduleObj->getVar('version') / 100, 2);
	82	+ if ($from_module_version >= 1.1) {
	83	+ $importfile_select_array['smartsection'] = 'Smartsection ' . $from_module_version;
	84	+ $smartsection_version = $from_module_version;
	85	+ }
85	86	}
86		- }
87	87
88		- // XF-Section
89		- /*$xfs_version = 0;
	88	+ // XF-Section
	89	+ /*$xfs_version = 0;
90	90	$moduleObj = $moduleHandler->getByDirname('xfsection');
91	91	If ($moduleObj) {
92	92	$from_module_version = round($moduleObj->getVar('version') / 100, 2);
		@@ -96,47 +96,47 @@ discard block
		block discarded – undo
96	96	}
97	97	} */
98	98
99		- if (isset($importfile_select_array) && count($importfile_select_array) > 0) {
100		- $sform = new ThemeForm(_AM_PUBLISHER_IMPORT_SELECTION, 'op', xoops_getenv('PHP_SELF'));
101		- $sform->setExtra('enctype="multipart/form-data"');
102		-
103		- // Partners to import
104		- $importfile_select = new Select('', 'importfile', $importfile);
105		- $importfile_select->addOptionArray($importfile_select_array);
106		- $importfile_tray = new ElementTray(_AM_PUBLISHER_IMPORT_SELECT_FILE, ' ');
107		- $importfile_tray->addElement($importfile_select);
108		- $importfile_tray->setDescription(_AM_PUBLISHER_IMPORT_SELECT_FILE_DSC);
109		- $sform->addElement($importfile_tray);
110		-
111		- // Buttons
112		- $buttonTray = new ElementTray('', '');
113		- $hidden = new Hidden('op', 'importExecute');
114		- $buttonTray->addElement($hidden);
115		-
116		- $buttonImport = new Button('', '', _AM_PUBLISHER_IMPORT, 'submit');
117		- $buttonImport->setExtra('onclick="this.form.elements.op.value=\'importExecute\'"');
118		- $buttonTray->addElement($buttonImport);
119		-
120		- $buttonCancel = new Button('', '', _AM_PUBLISHER_CANCEL, 'button');
121		- $buttonCancel->setExtra('onclick="history.go(-1)"');
122		- $buttonTray->addElement($buttonCancel);
123		-
124		- $sform->addElement($buttonTray);
125		- /*$sform->addElement(new \Xoops\Form\Hidden('xfs_version', $xfs_version));
	99	+ if (isset($importfile_select_array) && count($importfile_select_array) > 0) {
	100	+ $sform = new ThemeForm(_AM_PUBLISHER_IMPORT_SELECTION, 'op', xoops_getenv('PHP_SELF'));
	101	+ $sform->setExtra('enctype="multipart/form-data"');
	102	+
	103	+ // Partners to import
	104	+ $importfile_select = new Select('', 'importfile', $importfile);
	105	+ $importfile_select->addOptionArray($importfile_select_array);
	106	+ $importfile_tray = new ElementTray(_AM_PUBLISHER_IMPORT_SELECT_FILE, ' ');
	107	+ $importfile_tray->addElement($importfile_select);
	108	+ $importfile_tray->setDescription(_AM_PUBLISHER_IMPORT_SELECT_FILE_DSC);
	109	+ $sform->addElement($importfile_tray);
	110	+
	111	+ // Buttons
	112	+ $buttonTray = new ElementTray('', '');
	113	+ $hidden = new Hidden('op', 'importExecute');
	114	+ $buttonTray->addElement($hidden);
	115	+
	116	+ $buttonImport = new Button('', '', _AM_PUBLISHER_IMPORT, 'submit');
	117	+ $buttonImport->setExtra('onclick="this.form.elements.op.value=\'importExecute\'"');
	118	+ $buttonTray->addElement($buttonImport);
	119	+
	120	+ $buttonCancel = new Button('', '', _AM_PUBLISHER_CANCEL, 'button');
	121	+ $buttonCancel->setExtra('onclick="history.go(-1)"');
	122	+ $buttonTray->addElement($buttonCancel);
	123	+
	124	+ $sform->addElement($buttonTray);
	125	+ /*$sform->addElement(new \Xoops\Form\Hidden('xfs_version', $xfs_version));
126	126	$sform->addElement(new \Xoops\Form\Hidden('wfs_version', $wfs_version));*/
127		- $sform->addElement(new Hidden('news_version', $news_version));
128		- $sform->addElement(new Hidden('smartsection_version', $smartsection_version));
129		- $sform->display();
130		- unset($hidden);
131		- } else {
132		- echo '<span style="color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; ">' . _AM_PUBLISHER_IMPORT_NO_MODULE . '</span>';
133		- }
	127	+ $sform->addElement(new Hidden('news_version', $news_version));
	128	+ $sform->addElement(new Hidden('smartsection_version', $smartsection_version));
	129	+ $sform->display();
	130	+ unset($hidden);
	131	+ } else {
	132	+ echo '<span style="color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; ">' . _AM_PUBLISHER_IMPORT_NO_MODULE . '</span>';
	133	+ }
134	134
135		- // End of collapsable bar
	135	+ // End of collapsable bar
136	136
137		- Publisher\Utils::closeCollapsableBar('import', 'importicon');
	137	+ Publisher\Utils::closeCollapsableBar('import', 'importicon');
138	138
139		- break;
	139	+ break;
140	140	}
141	141
142	142	$xoops->footer();

		@@ -25,7 +25,7 @@ discard block
		block discarded – undo
25	25	use Xoops\Form\ThemeForm;
26	26	use XoopsModules\Publisher;
27	27
28		-require_once __DIR__ . '/admin_header.php';
	28	+require_once __DIR__.'/admin_header.php';
29	29	$xoops = Xoops::getInstance();
30	30
31	31	$op = $_GET['op'] ?? 'none';
		@@ -37,7 +37,7 @@ discard block
		block discarded – undo
37	37	case 'importExecute':
38	38
39	39	$importfile = $_POST['importfile'] ?? 'nonselected';
40		- $importfile_path = XoopsBaseConfig::get('root-path') . '/modules/' . $helper->getModule()->dirname() . '/admin/import/' . $importfile . '.php';
	40	+ $importfile_path = XoopsBaseConfig::get('root-path').'/modules/'.$helper->getModule()->dirname().'/admin/import/'.$importfile.'.php';
41	41	require_once $importfile_path;
42	42	break;
43	43	case 'default':
		@@ -69,7 +69,7 @@ discard block
		block discarded – undo
69	69	if ($moduleObj) {
70	70	$from_module_version = round($moduleObj->getVar('version') / 100, 2);
71	71	if ($from_module_version >= 1.1) {
72		- $importfile_select_array['news'] = 'News ' . $from_module_version;
	72	+ $importfile_select_array['news'] = 'News '.$from_module_version;
73	73	$news_version = $from_module_version;
74	74	}
75	75	}
		@@ -80,7 +80,7 @@ discard block
		block discarded – undo
80	80	if ($moduleObj) {
81	81	$from_module_version = round($moduleObj->getVar('version') / 100, 2);
82	82	if ($from_module_version >= 1.1) {
83		- $importfile_select_array['smartsection'] = 'Smartsection ' . $from_module_version;
	83	+ $importfile_select_array['smartsection'] = 'Smartsection '.$from_module_version;
84	84	$smartsection_version = $from_module_version;
85	85	}
86	86	}
		@@ -129,7 +129,7 @@ discard block
		block discarded – undo
129	129	$sform->display();
130	130	unset($hidden);
131	131	} else {
132		- echo '<span style="color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; ">' . _AM_PUBLISHER_IMPORT_NO_MODULE . '</span>';
	132	+ echo '<span style="color: #567; margin: 3px 0 12px 0; font-weight: bold; font-size: small; display: block; ">'._AM_PUBLISHER_IMPORT_NO_MODULE.'</span>';
133	133	}
134	134
135	135	// End of collapsable bar

		@@ -364,27 +364,27 @@ discard block
		block discarded – undo
364	364	/* @var Publisher\Category $subcat */
365	365	foreach ($subcatsObj as $subcat) {
366	366	$modify = "<a href='category.php?op=mod&categoryid="
367		- . $subcat->getVar('categoryid')
368		- . "'><img src='"
369		- . XoopsBaseConfig::get('url')
370		- . '/modules/'
371		- . $helper->getModule()->dirname()
372		- . "/images/links/edit.gif' title='"
373		- . _AM_PUBLISHER_MODIFY
374		- . "' alt='"
375		- . _AM_PUBLISHER_MODIFY
376		- . "'></a>";
	367	+ . $subcat->getVar('categoryid')
	368	+ . "'><img src='"
	369	+ . XoopsBaseConfig::get('url')
	370	+ . '/modules/'
	371	+ . $helper->getModule()->dirname()
	372	+ . "/images/links/edit.gif' title='"
	373	+ . _AM_PUBLISHER_MODIFY
	374	+ . "' alt='"
	375	+ . _AM_PUBLISHER_MODIFY
	376	+ . "'></a>";
377	377	$delete = "<a href='category.php?op=del&categoryid="
378		- . $subcat->getVar('categoryid')
379		- . "'><img src='"
380		- . XoopsBaseConfig::get('url')
381		- . '/modules/'
382		- . $helper->getModule()->dirname()
383		- . "/images/links/delete.png' title='"
384		- . _AM_PUBLISHER_DELETE
385		- . "' alt='"
386		- . _AM_PUBLISHER_DELETE
387		- . "'></a>";
	378	+ . $subcat->getVar('categoryid')
	379	+ . "'><img src='"
	380	+ . XoopsBaseConfig::get('url')
	381	+ . '/modules/'
	382	+ . $helper->getModule()->dirname()
	383	+ . "/images/links/delete.png' title='"
	384	+ . _AM_PUBLISHER_DELETE
	385	+ . "' alt='"
	386	+ . _AM_PUBLISHER_DELETE
	387	+ . "'></a>";
388	388	echo '<tr>';
389	389	echo "<td class='head' align='left'>" . $subcat->getVar('categoryid') . '</td>';
390	390	echo "<td class='even' align='left'><a href='" . XoopsBaseConfig::get('url') . '/modules/' . $helper->getModule()->dirname() . '/category.php?categoryid=' . $subcat->getVar('categoryid') . '&parentid=' . $subcat->getVar('parentid') . "'>" . $subcat->getVar('name') . '</a></td>';
		@@ -420,27 +420,27 @@ discard block
		block discarded – undo
420	420	foreach ($itemsObj as $iValue) {
421	421	$categoryObj = $allcats[$iValue->getVar('categoryid')];
422	422	$modify = "<a href='item.php?op=mod&itemid="
423		- . $iValue->getVar('itemid')
424		- . "'><img src='"
425		- . XoopsBaseConfig::get('url')
426		- . '/modules/'
427		- . $helper->getModule()->dirname()
428		- . "/images/links/edit.gif' title='"
429		- . _AM_PUBLISHER_EDITITEM
430		- . "' alt='"
431		- . _AM_PUBLISHER_EDITITEM
432		- . "'></a>";
	423	+ . $iValue->getVar('itemid')
	424	+ . "'><img src='"
	425	+ . XoopsBaseConfig::get('url')
	426	+ . '/modules/'
	427	+ . $helper->getModule()->dirname()
	428	+ . "/images/links/edit.gif' title='"
	429	+ . _AM_PUBLISHER_EDITITEM
	430	+ . "' alt='"
	431	+ . _AM_PUBLISHER_EDITITEM
	432	+ . "'></a>";
433	433	$delete = "<a href='item.php?op=del&itemid="
434		- . $iValue->getVar('itemid')
435		- . "'><img src='"
436		- . XoopsBaseConfig::get('url')
437		- . '/modules/'
438		- . $helper->getModule()->dirname()
439		- . "/images/links/delete.png' title='"
440		- . _AM_PUBLISHER_DELETEITEM
441		- . "' alt='"
442		- . _AM_PUBLISHER_DELETEITEM
443		- . "'></a>";
	434	+ . $iValue->getVar('itemid')
	435	+ . "'><img src='"
	436	+ . XoopsBaseConfig::get('url')
	437	+ . '/modules/'
	438	+ . $helper->getModule()->dirname()
	439	+ . "/images/links/delete.png' title='"
	440	+ . _AM_PUBLISHER_DELETEITEM
	441	+ . "' alt='"
	442	+ . _AM_PUBLISHER_DELETEITEM
	443	+ . "'></a>";
444	444	echo '<tr>';
445	445	echo "<td class='head' align='center'>" . $iValue->getVar('itemid') . '</td>';
446	446	echo "<td class='even' align='left'>" . $categoryObj->getVar('name') . '</td>';

		@@ -23,7 +23,7 @@ discard block
		block discarded – undo
23	23	* @author The SmartFactory <www.smartfactory.ca>
24	24	* @version $Id$
25	25	*/
26		-require_once __DIR__ . '/admin_header.php';
	26	+require_once __DIR__.'/admin_header.php';
27	27
28	28	$xoops = Xoops::getInstance();
29	29	$op = Request::getCmd('op');
		@@ -53,7 +53,7 @@ discard block
		block discarded – undo
53	53	echo $xoops->confirm(
54	54	['op' => 'del', 'categoryid' => $categoryObj->getVar('categoryid'), 'confirm' => 1, 'name' => $categoryObj->getVar('name')],
55	55	'category.php',
56		- _AM_PUBLISHER_DELETECOL . " '" . $categoryObj->getVar('name') . "'. <br> <br>" . _AM_PUBLISHER_DELETE_CAT_CONFIRM,
	56	+ _AM_PUBLISHER_DELETECOL." '".$categoryObj->getVar('name')."'. <br> <br>"._AM_PUBLISHER_DELETE_CAT_CONFIRM,
57	57	_AM_PUBLISHER_DELETE
58	58	);
59	59	$xoops->footer();
		@@ -98,7 +98,7 @@ discard block
		block discarded – undo
98	98	if ($uploader->fetchMedia($filename) && $uploader->upload()) {
99	99	$categoryObj->setVar('image', $uploader->getSavedFileName());
100	100	} else {
101		- $xoops->redirect('javascript:history.go(-1)', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR . $uploader->getErrors());
	101	+ $xoops->redirect('javascript:history.go(-1)', 2, _AM_PUBLISHER_FILEUPLOAD_ERROR.$uploader->getErrors());
102	102	}
103	103	}
104	104	} else {
		@@ -148,7 +148,7 @@ discard block
		block discarded – undo
148	148	}
149	149
150	150	if (!$categoryObj->store()) {
151		- $xoops->redirect('javascript:history.go(-1)', 3, _AM_PUBLISHER_CATEGORY_SAVE_ERROR . Publisher\Utils::formatErrors($categoryObj->getErrors()));
	151	+ $xoops->redirect('javascript:history.go(-1)', 3, _AM_PUBLISHER_CATEGORY_SAVE_ERROR.Publisher\Utils::formatErrors($categoryObj->getErrors()));
152	152	}
153	153	// TODO : put this function in the category class
154	154	Publisher\Utils::saveCategoryPermissions($grpread, $categoryObj->getVar('categoryid'), 'category_read');
		@@ -165,7 +165,7 @@ discard block
		block discarded – undo
165	165	$categoryObj->setVar('parentid', $parentCat);
166	166
167	167	if (!$categoryObj->store()) {
168		- $xoops->redirect('javascript:history.go(-1)', 3, _AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR . Publisher\Utils::formatErrors($categoryObj->getErrors()));
	168	+ $xoops->redirect('javascript:history.go(-1)', 3, _AM_PUBLISHER_SUBCATEGORY_SAVE_ERROR.Publisher\Utils::formatErrors($categoryObj->getErrors()));
169	169	}
170	170	// TODO : put this function in the category class
171	171	Publisher\Utils::saveCategoryPermissions($grpread, $categoryObj->getVar('categoryid'), 'category_read');
		@@ -207,7 +207,7 @@ discard block
		block discarded – undo
207	207
208	208	echo "<br>\n";
209	209	echo '<form><div style="margin-bottom: 12px;">';
210		- echo "<input type='button' name='button' onclick=\"location='category.php?op=mod'\" value='" . _AM_PUBLISHER_CATEGORY_CREATE . "'>  ";
	210	+ echo "<input type='button' name='button' onclick=\"location='category.php?op=mod'\" value='"._AM_PUBLISHER_CATEGORY_CREATE."'>  ";
211	211	//echo "<input type='button' name='button' onclick=\"location='item.php?op=mod'\" value='" . _AM_PUBLISHER_CREATEITEM . "'>  ";
212	212	echo '</div></form>';
213	213
		@@ -218,9 +218,9 @@ discard block
		block discarded – undo
218	218
219	219	echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
220	220	echo '<tr>';
221		- echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCATEGORYNAME . '</strong></td>';
222		- echo "<td width='60' class='bg3' width='65' align='center'><strong>" . _CO_PUBLISHER_WEIGHT . '</strong></td>';
223		- echo "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
	221	+ echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_ITEMCATEGORYNAME.'</strong></td>';
	222	+ echo "<td width='60' class='bg3' width='65' align='center'><strong>"._CO_PUBLISHER_WEIGHT.'</strong></td>';
	223	+ echo "<td width='60' class='bg3' align='center'><strong>"._AM_PUBLISHER_ACTION.'</strong></td>';
224	224	echo '</tr>';
225	225	$totalCategories = $helper->getCategoryHandler()->getCategoriesCount(0);
226	226	if (count($categoriesObj) > 0) {
		@@ -229,13 +229,13 @@ discard block
		block discarded – undo
229	229	}
230	230	} else {
231	231	echo '<tr>';
232		- echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOCAT . '</td>';
	232	+ echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOCAT.'</td>';
233	233	echo '</tr>';
234	234	$categoryid = '0';
235	235	}
236	236	echo "</table>\n";
237	237	$pagenav = new XoopsPageNav($totalCategories, $helper->getConfig('idxcat_perpage'), $startcategory, 'startcategory');
238		- echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
	238	+ echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
239	239	echo '<br>';
240	240	Publisher\Utils::closeCollapsableBar('createdcategories', 'createdcategoriesicon');
241	241	echo '<br>';
		@@ -260,11 +260,11 @@ discard block
		block discarded – undo
260	260	$description = $categoryObj->getVar('description');
261	261	if (!XoopsLocale::isMultiByte()) {
262	262	if (mb_strlen($description) >= 100) {
263		- $description = mb_substr($description, 0, 100 - 1) . '...';
	263	+ $description = mb_substr($description, 0, 100 - 1).'...';
264	264	}
265	265	}
266		- $modify = "<a href='category.php?op=mod&categoryid=" . $categoryObj->getVar('categoryid') . '&parentid=' . $categoryObj->getVar('parentid') . "'><img src='" . PUBLISHER_URL . "/images/links/edit.gif' title='" . _AM_PUBLISHER_EDITCOL . "' alt='" . _AM_PUBLISHER_EDITCOL . "'></a>";
267		- $delete = "<a href='category.php?op=del&categoryid=" . $categoryObj->getVar('categoryid') . "'><img src='" . PUBLISHER_URL . "/images/links/delete.png' title='" . _AM_PUBLISHER_DELETECOL . "' alt='" . _AM_PUBLISHER_DELETECOL . "'></a>";
	266	+ $modify = "<a href='category.php?op=mod&categoryid=".$categoryObj->getVar('categoryid').'&parentid='.$categoryObj->getVar('parentid')."'><img src='".PUBLISHER_URL."/images/links/edit.gif' title='"._AM_PUBLISHER_EDITCOL."' alt='"._AM_PUBLISHER_EDITCOL."'></a>";
	267	+ $delete = "<a href='category.php?op=del&categoryid=".$categoryObj->getVar('categoryid')."'><img src='".PUBLISHER_URL."/images/links/delete.png' title='"._AM_PUBLISHER_DELETECOL."' alt='"._AM_PUBLISHER_DELETECOL."'></a>";
268	268
269	269	$spaces = '';
270	270	for ($j = 0; $j < $level; ++$j) {
		@@ -272,8 +272,8 @@ discard block
		block discarded – undo
272	272	}
273	273
274	274	echo '<tr>';
275		- echo "<td class='even' align='left'>" . $spaces . "<a href='" . PUBLISHER_URL . '/category.php?categoryid=' . $categoryObj->getVar('categoryid') . "'><img src='" . PUBLISHER_URL . "/images/links/subcat.gif' alt=''> " . $categoryObj->getVar('name') . '</a></td>';
276		- echo "<td class='even' align='center'>" . $categoryObj->getVar('weight') . '</td>';
	275	+ echo "<td class='even' align='left'>".$spaces."<a href='".PUBLISHER_URL.'/category.php?categoryid='.$categoryObj->getVar('categoryid')."'><img src='".PUBLISHER_URL."/images/links/subcat.gif' alt=''> ".$categoryObj->getVar('name').'</a></td>';
	276	+ echo "<td class='even' align='center'>".$categoryObj->getVar('weight').'</td>';
277	277	echo "<td class='even' align='center'> $modify $delete </td>";
278	278	echo '</tr>';
279	279	$subCategoriesObj = $helper->getCategoryHandler()->getCategories(0, 0, $categoryObj->getVar('categoryid'));
		@@ -355,10 +355,10 @@ discard block
		block discarded – undo
355	355
356	356	echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
357	357	echo '<tr>';
358		- echo "<td width='60' class='bg3' align='left'><strong>" . _AM_PUBLISHER_CATID . '</strong></td>';
359		- echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_CATCOLNAME . '</strong></td>';
360		- echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_SUBDESCRIPT . '</strong></td>';
361		- echo "<td width='60' class='bg3' align='right'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
	358	+ echo "<td width='60' class='bg3' align='left'><strong>"._AM_PUBLISHER_CATID.'</strong></td>';
	359	+ echo "<td width='20%' class='bg3' align='left'><strong>"._AM_PUBLISHER_CATCOLNAME.'</strong></td>';
	360	+ echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_SUBDESCRIPT.'</strong></td>';
	361	+ echo "<td width='60' class='bg3' align='right'><strong>"._AM_PUBLISHER_ACTION.'</strong></td>';
362	362	echo '</tr>';
363	363	if ($totalsubs > 0) {
364	364	/* @var Publisher\Category $subcat */
		@@ -386,15 +386,15 @@ discard block
		block discarded – undo
386	386	. _AM_PUBLISHER_DELETE
387	387	. "'></a>";
388	388	echo '<tr>';
389		- echo "<td class='head' align='left'>" . $subcat->getVar('categoryid') . '</td>';
390		- echo "<td class='even' align='left'><a href='" . XoopsBaseConfig::get('url') . '/modules/' . $helper->getModule()->dirname() . '/category.php?categoryid=' . $subcat->getVar('categoryid') . '&parentid=' . $subcat->getVar('parentid') . "'>" . $subcat->getVar('name') . '</a></td>';
391		- echo "<td class='even' align='left'>" . $subcat->getVar('description') . '</td>';
	389	+ echo "<td class='head' align='left'>".$subcat->getVar('categoryid').'</td>';
	390	+ echo "<td class='even' align='left'><a href='".XoopsBaseConfig::get('url').'/modules/'.$helper->getModule()->dirname().'/category.php?categoryid='.$subcat->getVar('categoryid').'&parentid='.$subcat->getVar('parentid')."'>".$subcat->getVar('name').'</a></td>';
	391	+ echo "<td class='even' align='left'>".$subcat->getVar('description').'</td>';
392	392	echo "<td class='even' align='right'> {$modify} {$delete} </td>";
393	393	echo '</tr>';
394	394	}
395	395	} else {
396	396	echo '<tr>';
397		- echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOSUBCAT . '</td>';
	397	+ echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOSUBCAT.'</td>';
398	398	echo '</tr>';
399	399	}
400	400	echo "</table>\n";
		@@ -410,11 +410,11 @@ discard block
		block discarded – undo
410	410	$allcats = $helper->getCategoryHandler()->getObjects(null, true);
411	411	echo "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
412	412	echo '<tr>';
413		- echo "<td width='40' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ITEMID . '</strong></td>';
414		- echo "<td width='20%' class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMCOLNAME . '</strong></td>';
415		- echo "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_ITEMDESC . '</strong></td>';
416		- echo "<td width='90' class='bg3' align='center'><strong>" . _AM_PUBLISHER_CREATED . '</strong></td>';
417		- echo "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
	413	+ echo "<td width='40' class='bg3' align='center'><strong>"._AM_PUBLISHER_ITEMID.'</strong></td>';
	414	+ echo "<td width='20%' class='bg3' align='left'><strong>"._AM_PUBLISHER_ITEMCOLNAME.'</strong></td>';
	415	+ echo "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_ITEMDESC.'</strong></td>';
	416	+ echo "<td width='90' class='bg3' align='center'><strong>"._AM_PUBLISHER_CREATED.'</strong></td>';
	417	+ echo "<td width='60' class='bg3' align='center'><strong>"._AM_PUBLISHER_ACTION.'</strong></td>';
418	418	echo '</tr>';
419	419	if ($totalitems > 0) {
420	420	foreach ($itemsObj as $iValue) {
		@@ -442,16 +442,16 @@ discard block
		block discarded – undo
442	442	. _AM_PUBLISHER_DELETEITEM
443	443	. "'></a>";
444	444	echo '<tr>';
445		- echo "<td class='head' align='center'>" . $iValue->getVar('itemid') . '</td>';
446		- echo "<td class='even' align='left'>" . $categoryObj->getVar('name') . '</td>';
447		- echo "<td class='even' align='left'>" . $iValue->getitemLink() . '</td>';
448		- echo "<td class='even' align='center'>" . $iValue->datesub('s') . '</td>';
	445	+ echo "<td class='head' align='center'>".$iValue->getVar('itemid').'</td>';
	446	+ echo "<td class='even' align='left'>".$categoryObj->getVar('name').'</td>';
	447	+ echo "<td class='even' align='left'>".$iValue->getitemLink().'</td>';
	448	+ echo "<td class='even' align='center'>".$iValue->datesub('s').'</td>';
449	449	echo "<td class='even' align='center'> $modify $delete </td>";
450	450	echo '</tr>';
451	451	}
452	452	} else {
453	453	echo '<tr>';
454		- echo "<td class='head' align='center' colspan= '7'>" . _AM_PUBLISHER_NOITEMS . '</td>';
	454	+ echo "<td class='head' align='center' colspan= '7'>"._AM_PUBLISHER_NOITEMS.'</td>';
455	455	echo '</tr>';
456	456	}
457	457	echo "</table>\n";
		@@ -459,8 +459,8 @@ discard block
		block discarded – undo
459	459	$parentid = Request::getInt('parentid');
460	460	$pagenav_extra_args = "op=mod&categoryid=$sel_cat&parentid=$parentid";
461	461	$pagenav = new XoopsPageNav($totalitems, $helper->getConfig('idxcat_perpage'), $startitem, 'startitem', $pagenav_extra_args);
462		- echo '<div style="text-align:right;">' . $pagenav->renderNav() . '</div>';
463		- echo "<input type='button' name='button' onclick=\"location='item.php?op=mod&categoryid=" . $sel_cat . "'\" value='" . _AM_PUBLISHER_CREATEITEM . "'>  ";
	462	+ echo '<div style="text-align:right;">'.$pagenav->renderNav().'</div>';
	463	+ echo "<input type='button' name='button' onclick=\"location='item.php?op=mod&categoryid=".$sel_cat."'\" value='"._AM_PUBLISHER_CREATEITEM."'>  ";
464	464	echo '</div>';
465	465	}
466	466	//end of fx2024 code

		@@ -24,7 +24,7 @@ discard block
		block discarded – undo
24	24	use Xoops\Form\ThemeForm;
25	25	use XoopsModules\Publisher;
26	26
27		-require_once __DIR__ . '/admin_header.php';
	27	+require_once __DIR__.'/admin_header.php';
28	28
29	29	$xoops = Xoops::getInstance();
30	30	Publisher\Utils::cpHeader();
		@@ -35,15 +35,15 @@ discard block
		block discarded – undo
35	35	$dir = Publisher\Utils::getUploadDir(true, 'content');
36	36
37	37	if (false === mb_strpos(decoct(fileperms($dir)), '777')) {
38		- echo '<span style="color: FF0000; "><h4>' . _AM_PUBLISHER_PERMERROR . '</h4></span>';
	38	+ echo '<span style="color: FF0000; "><h4>'._AM_PUBLISHER_PERMERROR.'</h4></span>';
39	39	}
40	40
41	41	// Upload File
42	42	echo "<form name='form_name2' id='form_name2' action='pw_upload_file.php' method='post' enctype='multipart/form-data'>";
43	43	echo "<table cellspacing='1' width='100%' class='outer'>";
44		-echo "<tr><th colspan='2'>" . _AM_PUBLISHER_UPLOAD_FILE . '</th></tr>';
45		-echo "<tr valign='top' align='left'><td class='head'>" . _AM_PUBLISHER_SEARCH . "</td><td class='even'><input type='file' name='fileupload' id='fileupload' size='30'></td></tr>";
46		-echo "<tr valign='top' align='left'><td class='head'><input type='hidden' name='MAX_FILE_SIZE' id='op' value='500000'></td><td class='even'><input type='submit' name='submit' value='" . _AM_PUBLISHER_UPLOAD . "'></td></tr>";
	44	+echo "<tr><th colspan='2'>"._AM_PUBLISHER_UPLOAD_FILE.'</th></tr>';
	45	+echo "<tr valign='top' align='left'><td class='head'>"._AM_PUBLISHER_SEARCH."</td><td class='even'><input type='file' name='fileupload' id='fileupload' size='30'></td></tr>";
	46	+echo "<tr valign='top' align='left'><td class='head'><input type='hidden' name='MAX_FILE_SIZE' id='op' value='500000'></td><td class='even'><input type='submit' name='submit' value='"._AM_PUBLISHER_UPLOAD."'></td></tr>";
47	47	echo '</table>';
48	48	echo '</form>';
49	49

		@@ -26,10 +26,10 @@ discard block
		block discarded – undo
26	26	use Xoops\Form\ThemeForm;
27	27	use XoopsModules\Publisher;
28	28
29		-require_once dirname(__DIR__) . '/admin_header.php';
	29	+require_once dirname(__DIR__).'/admin_header.php';
30	30	$myts = Sanitizer::getInstance();
31	31
32		-$importFromModuleName = 'XF-Section ' . @$_POST['xfs_version'];
	32	+$importFromModuleName = 'XF-Section '.@$_POST['xfs_version'];
33	33
34	34	$scriptname = 'xfsection.php';
35	35
		@@ -44,26 +44,26 @@ discard block
		block discarded – undo
44	44	//publisher_adminMenu(-1, _AM_PUBLISHER_IMPORT);
45	45	Publisher\Utils::openCollapsableBar('xfsectionimport', 'xfsectionimporticon', sprintf(_AM_PUBLISHER_IMPORT_FROM, $importFromModuleName), _AM_PUBLISHER_IMPORT_INFO);
46	46
47		- $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('xfs_category'));
	47	+ $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('xfs_category'));
48	48	[$totalCat] = $xoopsDB->fetchRow($result);
49	49
50	50	if (0 == $totalCat) {
51		- echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . _AM_PUBLISHER_IMPORT_NOCATSELECTED . '</span>';
	51	+ echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'._AM_PUBLISHER_IMPORT_NOCATSELECTED.'</span>';
52	52	} else {
53		- require_once XoopsBaseConfig::get('root-path') . '/class/xoopstree.php';
	53	+ require_once XoopsBaseConfig::get('root-path').'/class/xoopstree.php';
54	54
55		- $result = $xoopsDB->query('SELECT COUNT(*) FROM ' . $xoopsDB->prefix('xfs_article'));
	55	+ $result = $xoopsDB->query('SELECT COUNT(*) FROM '.$xoopsDB->prefix('xfs_article'));
56	56	[$totalArticles] = $xoopsDB->fetchRow($result);
57	57
58	58	if (0 == $totalArticles) {
59		- echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles) . '</span>';
	59	+ echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND_NO_ITEMS, $importFromModuleName, $totalArticles).'</span>';
60	60	} else {
61		- echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">' . sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat) . '</span>';
	61	+ echo '<span style="color: #567; margin: 3px 0 12px 0; font-size: small; display: block; ">'.sprintf(_AM_PUBLISHER_IMPORT_MODULE_FOUND, $importFromModuleName, $totalArticles, $totalCat).'</span>';
62	62
63		- $form = new ThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL . "/import/$scriptname");
	63	+ $form = new ThemeForm(_AM_PUBLISHER_IMPORT_SETTINGS, 'import_form', PUBLISHER_ADMIN_URL."/import/$scriptname");
64	64
65	65	// Categories to be imported
66		- $sql = 'SELECT cat.id, cat.pid, cat.title, COUNT(art.articleid) FROM ' . $xoopsDB->prefix('xfs_category') . ' AS cat INNER JOIN ' . $xoopsDB->prefix('xfs_article') . ' AS art ON cat.id=art.categoryid GROUP BY art.categoryid';
	66	+ $sql = 'SELECT cat.id, cat.pid, cat.title, COUNT(art.articleid) FROM '.$xoopsDB->prefix('xfs_category').' AS cat INNER JOIN '.$xoopsDB->prefix('xfs_article').' AS art ON cat.id=art.categoryid GROUP BY art.categoryid';
67	67	$result = $xoopsDB->query($sql);
68	68	$cat_cbox_values = [];
69	69	$cat_cbox_options = [];
		@@ -108,7 +108,7 @@ discard block
		block discarded – undo
108	108
109	109	$parentId = $_POST['parent_category'];
110	110
111		- $sql = 'SELECT * FROM ' . $xoopsDB->prefix('xfs_category') . ' ORDER by orders';
	111	+ $sql = 'SELECT * FROM '.$xoopsDB->prefix('xfs_category').' ORDER by orders';
112	112
113	113	$resultCat = $xoopsDB->query($sql);
114	114
		@@ -131,13 +131,13 @@ discard block
		block discarded – undo
131	131
132	132	// Category image
133	133	if (('blank.gif' !== $arrCat['imgurl']) && $arrCat['imgurl']) {
134		- if (copy(XoopsBaseConfig::get('root-path') . '/modules/xfsection/images/category/' . $arrCat['imgurl'], PUBLISHER_UPLOADS_PATH . '/images/category/' . $arrCat['imgurl'])) {
	134	+ if (copy(XoopsBaseConfig::get('root-path').'/modules/xfsection/images/category/'.$arrCat['imgurl'], PUBLISHER_UPLOADS_PATH.'/images/category/'.$arrCat['imgurl'])) {
135	135	$categoryObj->setVar('image', $arrCat['imgurl']);
136	136	}
137	137	}
138	138
139	139	if (!$categoryObj->store(false)) {
140		- echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['title']) . '<br>';
	140	+ echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_ERROR, $arrCat['title']).'<br>';
141	141	continue;
142	142	}
143	143
		@@ -148,9 +148,9 @@ discard block
		block discarded – undo
148	148
149	149	++$cnt_imported_cat;
150	150
151		- echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->getVar('name')) . "<br\>";
	151	+ echo sprintf(_AM_PUBLISHER_IMPORT_CATEGORY_SUCCESS, $categoryObj->getVar('name'))."<br\>";
152	152
153		- $sql = 'SELECT * FROM ' . $xoopsDB->prefix('xfs_article') . ' WHERE categoryid=' . $arrCat['id'] . ' ORDER BY weight';
	153	+ $sql = 'SELECT * FROM '.$xoopsDB->prefix('xfs_article').' WHERE categoryid='.$arrCat['id'].' ORDER BY weight';
154	154	$resultArticles = $xoopsDB->query($sql);
155	155	while (false !== ($arrArticle = $xoopsDB->fetchArray($resultArticles))) {
156	156	// insert article
		@@ -178,29 +178,29 @@ discard block
		block discarded – undo
178	178
179	179	// HTML Wrap
180	180	if ($arrArticle['htmlpage']) {
181		- $pagewrap_filename = XoopsBaseConfig::get('root-path') . '/modules/xfsection/html/' . $arrArticle['htmlpage'];
	181	+ $pagewrap_filename = XoopsBaseConfig::get('root-path').'/modules/xfsection/html/'.$arrArticle['htmlpage'];
182	182	if (XoopsLoad::fileExists($pagewrap_filename)) {
183		- if (copy($pagewrap_filename, PUBLISHER_UPLOADS_PATH . '/content/' . $arrArticle['htmlpage'])) {
184		- $itemObj->setVar('body', '[pagewrap=' . $arrArticle['htmlpage'] . ']');
185		- echo sprintf('    ' . _AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']) . '<br>';
	183	+ if (copy($pagewrap_filename, PUBLISHER_UPLOADS_PATH.'/content/'.$arrArticle['htmlpage'])) {
	184	+ $itemObj->setVar('body', '[pagewrap='.$arrArticle['htmlpage'].']');
	185	+ echo sprintf('    '._AM_PUBLISHER_IMPORT_ARTICLE_WRAP, $arrArticle['htmlpage']).'<br>';
186	186	}
187	187	}
188	188	}
189	189
190	190	if (!$itemObj->store()) {
191		- echo sprintf(' ' . _AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']) . '<br>';
	191	+ echo sprintf(' '._AM_PUBLISHER_IMPORT_ARTICLE_ERROR, $arrArticle['title']).'<br>';
192	192	continue;
193	193	}
194	194
195	195	// Linkes files
196	196
197		- $sql = 'SELECT * FROM ' . $xoopsDB->prefix('xfs_files') . ' WHERE articleid=' . $arrArticle['articleid'];
	197	+ $sql = 'SELECT * FROM '.$xoopsDB->prefix('xfs_files').' WHERE articleid='.$arrArticle['articleid'];
198	198	$resultFiles = $xoopsDB->query($sql);
199	199	$allowed_mimetypes = '';
200	200	while (false !== ($arrFile = $xoopsDB->fetchArray($resultFiles))) {
201		- $filename = XoopsBaseConfig::get('root-path') . '/modules/xfsection/cache/uploaded/' . $arrFile['filerealname'];
	201	+ $filename = XoopsBaseConfig::get('root-path').'/modules/xfsection/cache/uploaded/'.$arrFile['filerealname'];
202	202	if (XoopsLoad::fileExists($filename)) {
203		- if (copy($filename, PUBLISHER_UPLOADS_PATH . '/' . $arrFile['filerealname'])) {
	203	+ if (copy($filename, PUBLISHER_UPLOADS_PATH.'/'.$arrFile['filerealname'])) {
204	204	$fileObj = $helper->getFileHandler()->create();
205	205	$fileObj->setVar('name', $arrFile['fileshowname']);
206	206	$fileObj->setVar('description', $arrFile['filedescript']);
		@@ -213,14 +213,14 @@ discard block
		block discarded – undo
213	213	$fileObj->setVar('filename', $arrFile['filerealname']);
214	214
215	215	if ($fileObj->store($allowed_mimetypes, true, false)) {
216		- echo '    ' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname']) . '<br>';
	216	+ echo '    '.sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE_FILE, $arrFile['filerealname']).'<br>';
217	217	}
218	218	}
219	219	}
220	220	}
221	221
222	222	$newArticleArray[$arrArticle['articleid']] = $itemObj->getVar('itemid');
223		- echo '  ' . sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()) . '<br>';
	223	+ echo '  '.sprintf(_AM_PUBLISHER_IMPORTED_ARTICLE, $itemObj->title()).'<br>';
224	224	++$cnt_imported_articles;
225	225	}
226	226	$newCatArray[$newCat['oldid']] = $newCat;
		@@ -242,7 +242,7 @@ discard block
		block discarded – undo
242	242	}
243	243
244	244	// Looping through the comments to link them to the new articles and module
245		- echo _AM_PUBLISHER_IMPORT_COMMENTS . '<br>';
	245	+ echo _AM_PUBLISHER_IMPORT_COMMENTS.'<br>';
246	246
247	247	$moduleHandler = xoops_getHandler('module');
248	248	$moduleObj = $moduleHandler->getByDirname('xfsection');
		@@ -259,16 +259,16 @@ discard block
		block discarded – undo
259	259	$comment->setVar('com_modid', $publisher_module_id);
260	260	$comment->setNew();
261	261	if (!$commentHandler->insert($comment)) {
262		- echo '  ' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')) . '<br>';
	262	+ echo '  '.sprintf(_AM_PUBLISHER_IMPORTED_COMMENT_ERROR, $comment->getVar('com_title')).'<br>';
263	263	} else {
264		- echo '  ' . sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')) . '<br>';
	264	+ echo '  '.sprintf(_AM_PUBLISHER_IMPORTED_COMMENT, $comment->getVar('com_title')).'<br>';
265	265	}
266	266	}
267	267
268	268	echo '<br><br>Done.<br>';
269		- echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat) . '<br>';
270		- echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles) . '<br>';
271		- echo "<br><a href='" . publisher_URL . "'>" . _AM_PUBLISHER_IMPORT_GOTOMODULE . '</a><br>';
	269	+ echo sprintf(_AM_PUBLISHER_IMPORTED_CATEGORIES, $cnt_imported_cat).'<br>';
	270	+ echo sprintf(_AM_PUBLISHER_IMPORTED_ARTICLES, $cnt_imported_articles).'<br>';
	271	+ echo "<br><a href='".publisher_URL."'>"._AM_PUBLISHER_IMPORT_GOTOMODULE.'</a><br>';
272	272
273	273	Publisher\Utils::closeCollapsableBar('xfsectionimportgo', 'xfsectionimportgoicon');
274	274	$xoops->footer();

geekwright / XoopsCore

Push — master ( 2f8aec...b781ca )

Status

Category

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +127 added lines, -127 removed lines patch added patch discarded remove patch

Switch Indentation +71 added lines, -71 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Indentation +40 added lines, -40 removed lines patch added patch discarded remove patch

Spacing +36 added lines, -36 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +31 added lines, -31 removed lines patch added patch discarded remove patch