XOOPS / XoopsCore

htdocs/modules/publisher/makepdf.php

Spacing +2 added lines, -2 removed lines

@@ -25,7 +25,7 @@ 
  * @author          trabis <lusopoemas@gmail.com>
  * @author          Sina Asghari (AKA stranger) <stranger@impresscms.ir>
  */
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 $xoops->disableErrorReporting();
 
@@ -73,6 +73,6 @@ 
 $xoops->service('htmltopdf')->setKeywords($itemObj->getVar('meta_keywords'));
 $xoops->service('htmltopdf')->setSubject($categoryObj->getVar('name'));
 $xoops->service('htmltopdf')->addHtml($content);
-$name = $itemObj->getVar('short_url') . '.pdf';
+$name = $itemObj->getVar('short_url').'.pdf';
 $xoops->service('htmltopdf')->outputPdfInline($name);
 exit();

htdocs/modules/publisher/search.php

Spacing +29 added lines, -29 removed lines

@@ -24,7 +24,7 @@ 
  * @author          Taiwen Jiang <phppp@users.sourceforge.net>
  * @version         $Id$
  */
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 
 $helper = Helper::getInstance();
@@ -34,7 +34,7 @@ 
 //Checking general permissions
 $xoopsConfigSearch = $xoops->getConfigs();
 if (empty($xoopsConfigSearch['enable_search'])) {
-    $xoops->redirect(PUBLISHER_URL . '/index.php', 2, XoopsLocale::E_NO_ACCESS_PERMISSION);
+    $xoops->redirect(PUBLISHER_URL.'/index.php', 2, XoopsLocale::E_NO_ACCESS_PERMISSION);
 }
 
 $groups = $xoops->getUserGroups();
@@ -93,12 +93,12 @@ 
             }
         }
         if (0 == count($queries)) {
-            $xoops->redirect(PUBLISHER_URL . '/search.php', 2, sprintf(XoopsLocale::EF_KEYWORDS_MUST_BE_GREATER_THAN, $xoopsConfigSearch['keyword_min']));
+            $xoops->redirect(PUBLISHER_URL.'/search.php', 2, sprintf(XoopsLocale::EF_KEYWORDS_MUST_BE_GREATER_THAN, $xoopsConfigSearch['keyword_min']));
             exit();
         }
     } else {
         if (mb_strlen($query) < $xoopsConfigSearch['keyword_min']) {
-            $xoops->redirect(PUBLISHER_URL . '/search.php', 2, sprintf(XoopsLocale::EF_KEYWORDS_MUST_BE_GREATER_THAN, $xoopsConfigSearch['keyword_min']));
+            $xoops->redirect(PUBLISHER_URL.'/search.php', 2, sprintf(XoopsLocale::EF_KEYWORDS_MUST_BE_GREATER_THAN, $xoopsConfigSearch['keyword_min']));
             exit();
         }
         $queries = [$query];
@@ -110,8 +110,8 @@ 
     if (!empty($search_username)) {
         $uname_required = true;
         $search_username = $search_username;
-        if (!$result = $xoopsDB->query('SELECT uid FROM ' . $xoopsDB->prefix('users') . ' WHERE uname LIKE ' . $xoopsDB->quoteString("%$search_username%"))) {
-            $xoops->redirect(PUBLISHER_URL . '/search.php', 1, _CO_PUBLISHER_ERROR);
+        if (!$result = $xoopsDB->query('SELECT uid FROM '.$xoopsDB->prefix('users').' WHERE uname LIKE '.$xoopsDB->quoteString("%$search_username%"))) {
+            $xoops->redirect(PUBLISHER_URL.'/search.php', 1, _CO_PUBLISHER_ERROR);
             exit();
         }
         $uid = [];
@@ -156,29 +156,29 @@ 
         unset($next_search);
         unset($items);
     }
-    $search_url = $helper->url('search.php?' . $paras);
+    $search_url = $helper->url('search.php?'.$paras);
 
     if (count($results)) {
         $next = $start + $limit;
         $queries = implode(',', $queries);
-        $search_url_next = $search_url . "&start={$next}";
-        $search_next = '<a href="' . htmlspecialchars($search_url_next) . '">' . XoopsLocale::NEXT . '</a>';
+        $search_url_next = $search_url."&start={$next}";
+        $search_next = '<a href="'.htmlspecialchars($search_url_next).'">'.XoopsLocale::NEXT.'</a>';
         $xoopsTpl->assign('search_next', $search_next);
     }
     if ($start > 0) {
         $prev = $start - $limit;
-        $search_url_prev = $search_url . "&start={$prev}";
-        $search_prev = '<a href="' . htmlspecialchars($search_url_prev) . '">' . XoopsLocale::PREVIOUS . '</a>';
+        $search_url_prev = $search_url."&start={$prev}";
+        $search_prev = '<a href="'.htmlspecialchars($search_url_prev).'">'.XoopsLocale::PREVIOUS.'</a>';
         $xoopsTpl->assign('search_prev', $search_prev);
     }
 
     unset($results);
-    $search_info = XoopsLocale::KEYWORDS . ': ' . $myts->htmlSpecialChars($term);
+    $search_info = XoopsLocale::KEYWORDS.': '.$myts->htmlSpecialChars($term);
     if ($uname_required) {
         if ($search_info) {
             $search_info .= '<br>';
         }
-        $search_info .= _CO_PUBLISHER_UID . ': ' . $myts->htmlSpecialChars($search_username);
+        $search_info .= _CO_PUBLISHER_UID.': '.$myts->htmlSpecialChars($search_username);
     }
     $xoopsTpl->assign('search_info', $search_info);
 }
@@ -189,17 +189,17 @@ 
 if ('OR' === $andor) {
     $type_select .= ' selected="selected"';
 }
-$type_select .= '>' . XoopsLocale::ANY_OR . '</option>';
+$type_select .= '>'.XoopsLocale::ANY_OR.'</option>';
 $type_select .= '<option value="AND"';
 if ('AND' === $andor) {
     $type_select .= ' selected="selected"';
 }
-$type_select .= '>' . XoopsLocale::ALL . '</option>';
+$type_select .= '>'.XoopsLocale::ALL.'</option>';
 $type_select .= '<option value="EXACT"';
 if ('EXACT' === $andor) {
     $type_select .= ' selected="selected"';
 }
-$type_select .= '>' . XoopsLocale::EXACT_MATCH . '</option>';
+$type_select .= '>'.XoopsLocale::EXACT_MATCH.'</option>';
 $type_select .= '</select>';
 
 /* category */
@@ -210,13 +210,13 @@ 
 if (empty($category) || 0 == count($category)) {
     $select_category .= 'selected="selected"';
 }
-$select_category .= '>' . XoopsLocale::ALL . '</option>';
+$select_category .= '>'.XoopsLocale::ALL.'</option>';
 foreach ($categories as $id => $cat) {
-    $select_category .= '<option value="' . $id . '"';
+    $select_category .= '<option value="'.$id.'"';
     if (in_array($id, $category)) {
         $select_category .= 'selected="selected"';
     }
-    $select_category .= '>' . $cat . '</option>';
+    $select_category .= '>'.$cat.'</option>';
 }
 $select_category .= '</select>';
 
@@ -226,32 +226,32 @@ 
 if (in_array('title', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . _CO_PUBLISHER_TITLE . '&nbsp;&nbsp;';
+$searchin_select .= '>'._CO_PUBLISHER_TITLE.'&nbsp;&nbsp;';
 $searchin_select .= '<input type="checkbox" name="searchin[]" value="subtitle"';
 if (in_array('subtitle', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . _CO_PUBLISHER_SUBTITLE . '&nbsp;&nbsp;';
+$searchin_select .= '>'._CO_PUBLISHER_SUBTITLE.'&nbsp;&nbsp;';
 $searchin_select .= '<input type="checkbox" name="searchin[]" value="summary"';
 if (in_array('summary', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . _CO_PUBLISHER_SUMMARY . '&nbsp;&nbsp;';
+$searchin_select .= '>'._CO_PUBLISHER_SUMMARY.'&nbsp;&nbsp;';
 $searchin_select .= '<input type="checkbox" name="searchin[]" value="text"';
 if (in_array('body', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . _CO_PUBLISHER_BODY . '&nbsp;&nbsp;';
+$searchin_select .= '>'._CO_PUBLISHER_BODY.'&nbsp;&nbsp;';
 $searchin_select .= '<input type="checkbox" name="searchin[]" value="keywords"';
 if (in_array('meta_keywords', $searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . _CO_PUBLISHER_ITEM_META_KEYWORDS . '&nbsp;&nbsp;';
+$searchin_select .= '>'._CO_PUBLISHER_ITEM_META_KEYWORDS.'&nbsp;&nbsp;';
 $searchin_select .= '<input type="checkbox" name="searchin[]" value="all"';
 if (in_array('all', $searchin) || empty($searchin)) {
     $searchin_select .= ' checked';
 }
-$searchin_select .= '>' . XoopsLocale::ALL . '&nbsp;&nbsp;';
+$searchin_select .= '>'.XoopsLocale::ALL.'&nbsp;&nbsp;';
 
 /* sortby */
 $sortby_select = '<select name="sortby">';
@@ -259,22 +259,22 @@ 
 if ('itemid' === $sortby || empty($sortby)) {
     $sortby_select .= ' selected="selected"';
 }
-$sortby_select .= '>' . XoopsLocale::NONE . '</option>';
+$sortby_select .= '>'.XoopsLocale::NONE.'</option>';
 $sortby_select .= '<option value="datesub"';
 if ('datesub' === $sortby) {
     $sortby_select .= ' selected="selected"';
 }
-$sortby_select .= '>' . _CO_PUBLISHER_DATESUB . '</option>';
+$sortby_select .= '>'._CO_PUBLISHER_DATESUB.'</option>';
 $sortby_select .= '<option value="title"';
 if ('title' === $sortby) {
     $sortby_select .= ' selected="selected"';
 }
-$sortby_select .= '>' . _CO_PUBLISHER_TITLE . '</option>';
+$sortby_select .= '>'._CO_PUBLISHER_TITLE.'</option>';
 $sortby_select .= '<option value="categoryid"';
 if ('categoryid' === $sortby) {
     $sortby_select .= ' selected="selected"';
 }
-$sortby_select .= '>' . _CO_PUBLISHER_CATEGORY . '</option>';
+$sortby_select .= '>'._CO_PUBLISHER_CATEGORY.'</option>';
 $sortby_select .= '</select>';
 
 $xoopsTpl->assign('type_select', $type_select);

htdocs/modules/publisher/rate.php

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
  * @author          trabis <lusopoemas@gmail.com>
  * @version         $Id$
  */
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $xoops = Xoops::getInstance();
 
@@ -36,11 +36,11 @@ 
 //Checking permissions
 if (!$helper->getConfig('perm_rating')
     || !$gpermHandler->checkRight('global', _PUBLISHER_RATE, $groups, $module_id)) {
-    $xoops->redirect(PUBLISHER_URL . '/item.php?itemid=' . $itemid, 2, XoopsLocale::E_NO_ACCESS_PERMISSION);
+    $xoops->redirect(PUBLISHER_URL.'/item.php?itemid='.$itemid, 2, XoopsLocale::E_NO_ACCESS_PERMISSION);
 }
 
 if ($rating > 5 || $rating < 1) {
-    $xoops->redirect(PUBLISHER_URL . '/item.php?itemid=' . $itemid, 2, _MD_PUBLISHER_VOTE_BAD);
+    $xoops->redirect(PUBLISHER_URL.'/item.php?itemid='.$itemid, 2, _MD_PUBLISHER_VOTE_BAD);
 }
 
 $criteria = new Criteria('itemid', $itemid);
@@ -61,7 +61,7 @@ 
 }
 
 if ($voted) {
-    $xoops->redirect(PUBLISHER_URL . '/item.php?itemid=' . $itemid, 2, _MD_PUBLISHER_VOTE_ALREADY);
+    $xoops->redirect(PUBLISHER_URL.'/item.php?itemid='.$itemid, 2, _MD_PUBLISHER_VOTE_ALREADY);
 }
 
 $newRatingObj = $helper->getRatingHandler()->create();
@@ -78,4 +78,4 @@ 
 $helper->getItemHandler()->updateAll('rating', number_format($current_rating / $count, 4), $criteria, true);
 $helper->getItemHandler()->updateAll('votes', $count, $criteria, true);
 
-$xoops->redirect(PUBLISHER_URL . '/item.php?itemid=' . $itemid, 2, _MD_PUBLISHER_VOTE_THANKS);
+$xoops->redirect(PUBLISHER_URL.'/item.php?itemid='.$itemid, 2, _MD_PUBLISHER_VOTE_THANKS);

htdocs/modules/publisher/footer.php

Spacing +4 added lines, -4 removed lines

@@ -23,17 +23,17 @@
  * @author          The SmartFactory <www.smartfactory.ca>
  * @version         $Id$
  */
-require_once __DIR__ . '/include/common.php';
+require_once __DIR__.'/include/common.php';
 
 $helper = Helper::getInstance();
 
 $xoops = Xoops::getInstance();
-$xoops->theme()->addStylesheet(PUBLISHER_URL . '/css/publisher.css');
+$xoops->theme()->addStylesheet(PUBLISHER_URL.'/css/publisher.css');
 
 $xoopsTpl = $xoops->tpl();
-$xoopsTpl->assign('xoops_module_header', '<link rel="alternate" type="application/rss+xml" title="' . $helper->getModule()->getVar('name') . '" href="' . $helper->url('backend.php') . '">' . @$xoopsTpl->getTemplateVars('xoops_module_header'));
+$xoopsTpl->assign('xoops_module_header', '<link rel="alternate" type="application/rss+xml" title="'.$helper->getModule()->getVar('name').'" href="'.$helper->url('backend.php').'">'.@$xoopsTpl->getTemplateVars('xoops_module_header'));
 
-$xoopsTpl->assign('publisher_adminpage', "<a href='" . $helper->url('admin/index.php') . "'>" . _MD_PUBLISHER_ADMIN_PAGE . '</a>');
+$xoopsTpl->assign('publisher_adminpage', "<a href='".$helper->url('admin/index.php')."'>"._MD_PUBLISHER_ADMIN_PAGE.'</a>');
 $xoopsTpl->assign('isAdmin', Publisher\Utils::IsUserAdmin());
 $xoopsTpl->assign('publisher_url', $helper->url());
 $xoopsTpl->assign('publisher_images_url', $helper->url('images'));

htdocs/modules/publisher/print.php

Spacing +3 added lines, -3 removed lines

@@ -22,7 +22,7 @@ 
  * @author          trabis <lusopoemas@gmail.com>
  * @author          The SmartFactory <www.smartfactory.ca>
  */
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 $xoops->disableErrorReporting();
 
@@ -58,10 +58,10 @@ 
 
 $mainImage = $itemObj->getMainImage();
 if ('' != $mainImage['image_path']) {
-    $item['image'] = '<img src="' . $mainImage['image_path'] . '" alt="' . $myts->undoHtmlSpecialChars($mainImage['image_name']) . '">';
+    $item['image'] = '<img src="'.$mainImage['image_path'].'" alt="'.$myts->undoHtmlSpecialChars($mainImage['image_name']).'">';
 }
 $xoopsTpl->assign('item', $item);
-$xoopsTpl->assign('printtitle', $xoops->getConfig('sitename') . ' - ' . Publisher\Utils::html2text($categoryObj->getCategoryPath()) . ' > ' . $myts->displayTarea($itemObj->title()));
+$xoopsTpl->assign('printtitle', $xoops->getConfig('sitename').' - '.Publisher\Utils::html2text($categoryObj->getCategoryPath()).' > '.$myts->displayTarea($itemObj->title()));
 $xoopsTpl->assign('printlogourl', $helper->getConfig('print_logourl'));
 $xoopsTpl->assign('printheader', $myts->displayTarea($helper->getConfig('print_header'), 1));
 $xoopsTpl->assign('lang_category', _CO_PUBLISHER_CATEGORY);

htdocs/modules/publisher/src/Item.php

Spacing +24 added lines, -24 removed lines

@@ -37,7 +37,7 @@ 
  * @author          The SmartFactory <www.smartfactory.ca>
  * @version         $Id$
  */
-require_once \dirname(__DIR__) . '/include/common.php';
+require_once \dirname(__DIR__).'/include/common.php';
 
 /**
  * Class Item
@@ -203,7 +203,7 @@ 
     public function wrappage($file_name): string
     {
         $content = '';
-        $page = Publisher\Utils::getUploadDir(true, 'content') . $file_name;
+        $page = Publisher\Utils::getUploadDir(true, 'content').$file_name;
         if (XoopsLoad::fileExists($page)) {
             // this page uses smarty template
             \ob_start();
@@ -257,7 +257,7 @@ 
         if ($this->helper->getConfig('item_disp_blocks_summary')) {
             $summary = $this->summary($maxLength, $format, $stripTags);
             if ($summary) {
-                $ret = $this->summary() . '<br><br>' . $ret;
+                $ret = $this->summary().'<br><br>'.$ret;
             }
         }
         if (!empty($stripTags)) {
@@ -388,7 +388,7 @@ 
 
     public function getCategoryImagePath(): string
     {
-        return Publisher\Utils::getImageDir('category', false) . $this->category()->image();
+        return Publisher\Utils::getImageDir('category', false).$this->category()->image();
     }
 
     /**
@@ -407,35 +407,35 @@ 
             if (Publisher\Utils::IsUserAdmin() || Publisher\Utils::IsUserAuthor($this) || Publisher\Utils::IsUserModerator($this)) {
                 if ($this->helper->getConfig('perm_edit') || Publisher\Utils::IsUserModerator($this) || Publisher\Utils::IsUserAdmin()) {
                     // Edit button
-                    $adminLinks .= "<a href='" . \PUBLISHER_URL . '/submit.php?itemid=' . $this->getVar('itemid') . "'><img src='" . \PUBLISHER_URL . "/images/links/edit.gif'" . " title='" . _CO_PUBLISHER_EDIT . "' alt='" . _CO_PUBLISHER_EDIT . "'></a>";
+                    $adminLinks .= "<a href='".\PUBLISHER_URL.'/submit.php?itemid='.$this->getVar('itemid')."'><img src='".\PUBLISHER_URL."/images/links/edit.gif'"." title='"._CO_PUBLISHER_EDIT."' alt='"._CO_PUBLISHER_EDIT."'></a>";
                     $adminLinks .= ' ';
                 }
                 if ($this->helper->getConfig('perm_delete') || Publisher\Utils::IsUserModerator($this) || Publisher\Utils::IsUserAdmin()) {
                     // Delete button
-                    $adminLinks .= "<a href='" . \PUBLISHER_URL . '/submit.php?op=del&amp;itemid=' . $this->getVar('itemid') . "'><img src='" . \PUBLISHER_URL . "/images/links/delete.png'" . " title='" . _CO_PUBLISHER_DELETE . "' alt='" . _CO_PUBLISHER_DELETE . "'></a>";
+                    $adminLinks .= "<a href='".\PUBLISHER_URL.'/submit.php?op=del&amp;itemid='.$this->getVar('itemid')."'><img src='".\PUBLISHER_URL."/images/links/delete.png'"." title='"._CO_PUBLISHER_DELETE."' alt='"._CO_PUBLISHER_DELETE."'></a>";
                     $adminLinks .= ' ';
                 }
             }
             if ($this->helper->getConfig('perm_clone') || Publisher\Utils::IsUserModerator($this) || Publisher\Utils::IsUserAdmin()) {
                 // Duplicate button
-                $adminLinks .= "<a href='" . \PUBLISHER_URL . '/submit.php?op=clone&amp;itemid=' . $this->getVar('itemid') . "'><img src='" . \PUBLISHER_URL . "/images/links/clone.gif'" . " title='" . _CO_PUBLISHER_CLONE . "' alt='" . _CO_PUBLISHER_CLONE . "'></a>";
+                $adminLinks .= "<a href='".\PUBLISHER_URL.'/submit.php?op=clone&amp;itemid='.$this->getVar('itemid')."'><img src='".\PUBLISHER_URL."/images/links/clone.gif'"." title='"._CO_PUBLISHER_CLONE."' alt='"._CO_PUBLISHER_CLONE."'></a>";
                 $adminLinks .= ' ';
             }
         }
         // PDF button
         if ($xoops->service('htmltopdf')->isAvailable()) {
-            $adminLinks .= "<a href='" . \PUBLISHER_URL . '/makepdf.php?itemid=' . $this->getVar('itemid') . "' rel='nofollow' target='_blank'><img src='" . \PUBLISHER_URL . "/images/links/pdf.gif' title='" . _CO_PUBLISHER_PDF . "' alt='" . _CO_PUBLISHER_PDF . "'></a>";
+            $adminLinks .= "<a href='".\PUBLISHER_URL.'/makepdf.php?itemid='.$this->getVar('itemid')."' rel='nofollow' target='_blank'><img src='".\PUBLISHER_URL."/images/links/pdf.gif' title='"._CO_PUBLISHER_PDF."' alt='"._CO_PUBLISHER_PDF."'></a>";
             $adminLinks .= ' ';
         }
         // Print button
-        $adminLinks .= "<a href='" . Publisher\Utils::seoGenUrl('print', $this->getVar('itemid'), $this->getVar('short_url')) . "' rel='nofollow' target='_blank'><img src='" . \PUBLISHER_URL . "/images/links/print.gif' title='" . _CO_PUBLISHER_PRINT . "' alt='" . _CO_PUBLISHER_PRINT . "'></a>";
+        $adminLinks .= "<a href='".Publisher\Utils::seoGenUrl('print', $this->getVar('itemid'), $this->getVar('short_url'))."' rel='nofollow' target='_blank'><img src='".\PUBLISHER_URL."/images/links/print.gif' title='"._CO_PUBLISHER_PRINT."' alt='"._CO_PUBLISHER_PRINT."'></a>";
         $adminLinks .= ' ';
         // Email button
         if ($xoops->isActiveModule('tellafriend')) {
             $subject = \sprintf(_CO_PUBLISHER_INTITEMFOUND, $xoops->getConfig('sitename'));
             $subject = $this->_convert_for_japanese($subject);
             $maillink = Publisher\Utils::tellafriend($subject);
-            $adminLinks .= '<a href="' . $maillink . '"><img src="' . \PUBLISHER_URL . '/images/links/friend.gif" title="' . _CO_PUBLISHER_MAIL . '" alt="' . _CO_PUBLISHER_MAIL . '"></a>';
+            $adminLinks .= '<a href="'.$maillink.'"><img src="'.\PUBLISHER_URL.'/images/links/friend.gif" title="'._CO_PUBLISHER_MAIL.'" alt="'._CO_PUBLISHER_MAIL.'"></a>';
             $adminLinks .= ' ';
         }
 
@@ -454,19 +454,19 @@ 
             $tags['MODULE_NAME'] = $this->helper->getModule()->getVar('name');
             $tags['ITEM_NAME'] = $this->title();
             $tags['CATEGORY_NAME'] = $this->getCategoryName();
-            $tags['CATEGORY_URL'] = \PUBLISHER_URL . '/category.php?categoryid=' . $this->getVar('categoryid');
+            $tags['CATEGORY_URL'] = \PUBLISHER_URL.'/category.php?categoryid='.$this->getVar('categoryid');
             $tags['ITEM_BODY'] = $this->body();
             $tags['DATESUB'] = $this->datesub();
             foreach ($notifications as $notification) {
                 switch ($notification) {
                     case \_PUBLISHER_NOT_ITEM_PUBLISHED:
-                        $tags['ITEM_URL'] = \PUBLISHER_URL . '/item.php?itemid=' . $this->getVar('itemid');
+                        $tags['ITEM_URL'] = \PUBLISHER_URL.'/item.php?itemid='.$this->getVar('itemid');
                         $notificationHandler->triggerEvent('global', 0, 'published', $tags, [], $this->helper->getModule()->getVar('mid'));
                         $notificationHandler->triggerEvent('category', $this->getVar('categoryid'), 'published', $tags, [], $this->helper->getModule()->getVar('mid'));
                         $notificationHandler->triggerEvent('item', $this->getVar('itemid'), 'approved', $tags, [], $this->helper->getModule()->getVar('mid'));
                         break;
                     case \_PUBLISHER_NOT_ITEM_SUBMITTED:
-                        $tags['WAITINGFILES_URL'] = \PUBLISHER_URL . '/admin/item.php?itemid=' . $this->getVar('itemid');
+                        $tags['WAITINGFILES_URL'] = \PUBLISHER_URL.'/admin/item.php?itemid='.$this->getVar('itemid');
                         $notificationHandler->triggerEvent('global', 0, 'submitted', $tags, [], $this->helper->getModule()->getVar('mid'));
                         $notificationHandler->triggerEvent('category', $this->getVar('categoryid'), 'submitted', $tags, [], $this->helper->getModule()->getVar('mid'));
                         break;
@@ -500,10 +500,10 @@ 
     public function getItemLink($class = false, $maxsize = 0): ?string
     {
         if ($class) {
-            return '<a class=' . $class . ' href="' . $this->getItemUrl() . '">' . $this->title($maxsize) . '</a>';
+            return '<a class='.$class.' href="'.$this->getItemUrl().'">'.$this->title($maxsize).'</a>';
         }
 
-        return '<a href="' . $this->getItemUrl() . '">' . $this->title($maxsize) . '</a>';
+        return '<a href="'.$this->getItemUrl().'">'.$this->title($maxsize).'</a>';
     }
 
     public function getWhoAndWhen(): string
@@ -583,7 +583,7 @@ 
             $imageObjs = [];
             if (\count($images_ids) > 0) {
                 $imageHandler = Images::getInstance()->getHandlerImages();
-                $criteria = new CriteriaCompo(new Criteria('image_id', '(' . \implode(',', $images_ids) . ')', 'IN'));
+                $criteria = new CriteriaCompo(new Criteria('image_id', '('.\implode(',', $images_ids).')', 'IN'));
                 $imageObjs = $imageHandler->getObjects($criteria, true);
                 unset($criteria);
             }
@@ -698,12 +698,12 @@ 
         if (\is_object($images['main'])) {
             /* @var \ImagesImage $image */
             $image = $images['main'];
-            $dimensions = \getimagesize(XoopsBaseConfig::get('root-path') . '/uploads/' . $image->getVar('image_name'));
+            $dimensions = \getimagesize(XoopsBaseConfig::get('root-path').'/uploads/'.$image->getVar('image_name'));
             $item['image_width'] = $dimensions[0];
             $item['image_height'] = $dimensions[1];
-            $item['image_path'] = XoopsBaseConfig::get('url') . '/uploads/' . $image->getVar('image_name');
+            $item['image_path'] = XoopsBaseConfig::get('url').'/uploads/'.$image->getVar('image_name');
             // pass this on since some consumers build custom thumbnails
-            $item['image_vpath'] = 'uploads/' . $image->getVar('image_name');
+            $item['image_vpath'] = 'uploads/'.$image->getVar('image_name');
             $item['image_thumb'] = Xoops::getInstance()->service('thumbnail')->getImgUrl($item['image_vpath'], 0, 180)->getValue();
             $item['image_name'] = $image->getVar('image_nicename');
         }
@@ -722,11 +722,11 @@ 
         $i = 0;
         /* @var \ImagesImage $image */
         foreach ($images['others'] as $image) {
-            $dimensions = \getimagesize(XoopsBaseConfig::get('root-path') . '/uploads/' . $image->getVar('image_name'));
+            $dimensions = \getimagesize(XoopsBaseConfig::get('root-path').'/uploads/'.$image->getVar('image_name'));
             $item['images'][$i]['width'] = $dimensions[0];
             $item['images'][$i]['height'] = $dimensions[1];
-            $item['images'][$i]['path'] = XoopsBaseConfig::get('url') . '/uploads/' . $image->getVar('image_name');
-            $item['images'][$i]['thumb'] = $thumbService->getImgUrl('uploads/' . $image->getVar('image_name'), 240, 0)->getValue();
+            $item['images'][$i]['path'] = XoopsBaseConfig::get('url').'/uploads/'.$image->getVar('image_name');
+            $item['images'][$i]['thumb'] = $thumbService->getImgUrl('uploads/'.$image->getVar('image_name'), 240, 0)->getValue();
             $item['images'][$i]['name'] = $image->getVar('image_nicename');
             ++$i;
         }
@@ -744,9 +744,9 @@ 
     {
         $color = $this->helper->getConfig('format_highlight_color');
         if (0 !== \mb_strpos($color, '#')) {
-            $color = '#' . $color;
+            $color = '#'.$color;
         }
-        $pre = '<span style="font-weight: bolder; background-color: ' . $color . ';">';
+        $pre = '<span style="font-weight: bolder; background-color: '.$color.';">';
         $post = '</span>';
 
         return Highlighter::apply($keywords, $content, $pre, $post);

htdocs/modules/publisher/src/Form/CategoryForm.php

Spacing +4 added lines, -4 removed lines

@@ -43,7 +43,7 @@ 
  * @author          trabis <lusopoemas@gmail.com>
  * @version         $Id$
  */
-require_once \dirname(\dirname(__DIR__)) . '/include/common.php';
+require_once \dirname(\dirname(__DIR__)).'/include/common.php';
 
 /**
  * Class CategoryForm
@@ -129,10 +129,10 @@ 
         // IMAGE
         $image_select = new Select('', 'image', $obj->image());
         ImageFile::setOptionsArray($image_select, Publisher\Utils::getImageDir('category'));
-        $image_select->setExtra("onchange='showImgSelected(\"image3\", \"image\", \"" . 'uploads/' . \PUBLISHER_DIRNAME . '/images/category/' . '", "", "' . XoopsBaseConfig::get('url') . "\")'");
+        $image_select->setExtra("onchange='showImgSelected(\"image3\", \"image\", \"".'uploads/'.\PUBLISHER_DIRNAME.'/images/category/'.'", "", "'.XoopsBaseConfig::get('url')."\")'");
         $image_tray = new ElementTray(_AM_PUBLISHER_IMAGE, '&nbsp;');
         $image_tray->addElement($image_select);
-        $image_tray->addElement(new Label('', "<br><br><img src='" . Publisher\Utils::getImageDir('category', false) . $obj->image() . "' name='image3' id='image3' alt=''>"));
+        $image_tray->addElement(new Label('', "<br><br><img src='".Publisher\Utils::getImageDir('category', false).$obj->image()."' name='image3' id='image3' alt=''>"));
         $image_tray->setDescription(_AM_PUBLISHER_IMAGE_DSC);
         $this->addElement($image_tray);
 
@@ -199,7 +199,7 @@ 
             } else {
                 $subname = '';
             }
-            $cat_tray->addElement(new Text('', 'scname[' . $i . ']', 50, 255, $subname));
+            $cat_tray->addElement(new Text('', 'scname['.$i.']', 50, 255, $subname));
         }
         $t = new Text('', 'nb_subcats', 3, 2);
         $l = new Label('', \sprintf(_AM_PUBLISHER_ADD_OPT, $t->render()));

htdocs/modules/publisher/src/Form/FileForm.php

Spacing +1 added lines, -1 removed lines

@@ -34,7 +34,7 @@
 use XoopsModules\Publisher;
 use XoopsModules\Publisher\Helper;
 
-require_once \dirname(\dirname(__DIR__)) . '/include/common.php';
+require_once \dirname(\dirname(__DIR__)).'/include/common.php';
 
 /**
  * Class FileForm

htdocs/modules/publisher/src/Form/ItemForm.php

Indentation +6 added lines, -6 removed lines

@@ -591,12 +591,12 @@
             $imagesTab->addElement($image_select3);
 
             $imgTag = new Img([
-                                         'src' => $xoops->url('uploads/' . $imageforpath),
-                                         'width' => 500,
-                                         'name' => 'image_display',
-                                         'id' => 'image_display',
-                                         'alt' => '',
-                                     ]);
+                                            'src' => $xoops->url('uploads/' . $imageforpath),
+                                            'width' => 500,
+                                            'name' => 'image_display',
+                                            'id' => 'image_display',
+                                            'alt' => '',
+                                        ]);
             $image_preview = new Label(_CO_PUBLISHER_IMAGE_PREVIEW, $imgTag->render());
             $imagesTab->addElement($image_preview);
         }

Spacing +28 added lines, -28 removed lines

@@ -40,7 +40,7 @@ 
 use XoopsModules\Publisher;
 use XoopsModules\Publisher\Helper;
 
-require_once \dirname(\dirname(__DIR__)) . '/include/common.php';
+require_once \dirname(\dirname(__DIR__)).'/include/common.php';
 
 $helper = Helper::getInstance();
 
@@ -206,7 +206,7 @@ 
             $wrap_pages = XoopsLists::getHtmlListAsArray(Publisher\Utils::getUploadDir(true, 'content'));
             $available_wrap_pages_text = [];
             foreach ($wrap_pages as $page) {
-                $available_wrap_pages_text[] = "<span onclick='publisherPageWrap(\"body\", \"[pagewrap=$page] \");'" . " onmouseover='style.cursor=\"pointer\"'>$page</span>";
+                $available_wrap_pages_text[] = "<span onclick='publisherPageWrap(\"body\", \"[pagewrap=$page] \");'"." onmouseover='style.cursor=\"pointer\"'>$page</span>";
             }
             $available_wrap_pages = new Label(_CO_PUBLISHER_AVAILABLE_PAGE_WRAP, \implode(', ', $available_wrap_pages_text));
             $available_wrap_pages->setDescription(_CO_PUBLISHER_AVAILABLE_PAGE_WRAP_DSC);
@@ -397,28 +397,28 @@ 
                     $table .= "<table width='100%' cellspacing=1 cellpadding=3 border=0 class = outer>";
                     $table .= '<tr>';
                     $table .= "<td width='50' class='bg3' align='center'><strong>ID</strong></td>";
-                    $table .= "<td width='150' class='bg3' align='left'><strong>" . _AM_PUBLISHER_FILENAME . '</strong></td>';
-                    $table .= "<td class='bg3' align='left'><strong>" . _AM_PUBLISHER_DESCRIPTION . '</strong></td>';
-                    $table .= "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_HITS . '</strong></td>';
-                    $table .= "<td width='100' class='bg3' align='center'><strong>" . _AM_PUBLISHER_UPLOADED_DATE . '</strong></td>';
-                    $table .= "<td width='60' class='bg3' align='center'><strong>" . _AM_PUBLISHER_ACTION . '</strong></td>';
+                    $table .= "<td width='150' class='bg3' align='left'><strong>"._AM_PUBLISHER_FILENAME.'</strong></td>';
+                    $table .= "<td class='bg3' align='left'><strong>"._AM_PUBLISHER_DESCRIPTION.'</strong></td>';
+                    $table .= "<td width='60' class='bg3' align='center'><strong>"._AM_PUBLISHER_HITS.'</strong></td>';
+                    $table .= "<td width='100' class='bg3' align='center'><strong>"._AM_PUBLISHER_UPLOADED_DATE.'</strong></td>';
+                    $table .= "<td width='60' class='bg3' align='center'><strong>"._AM_PUBLISHER_ACTION.'</strong></td>';
                     $table .= '</tr>';
 
                     /* @var Publisher\File $fileObj */
                     foreach ($filesObj as $fileObj) {
-                        $modify = "<a href='file.php?op=mod&fileid=" . $fileObj->getVar('fileid') . "'><img src='" . \PUBLISHER_URL . "/images/links/edit.gif' title='" . _CO_PUBLISHER_EDITFILE . "' alt='" . _CO_PUBLISHER_EDITFILE . "'></a>";
-                        $delete = "<a href='file.php?op=del&fileid=" . $fileObj->getVar('fileid') . "'><img src='" . \PUBLISHER_URL . "/images/links/delete.png' title='" . _CO_PUBLISHER_DELETEFILE . "' alt='" . _CO_PUBLISHER_DELETEFILE . "'></a>";
+                        $modify = "<a href='file.php?op=mod&fileid=".$fileObj->getVar('fileid')."'><img src='".\PUBLISHER_URL."/images/links/edit.gif' title='"._CO_PUBLISHER_EDITFILE."' alt='"._CO_PUBLISHER_EDITFILE."'></a>";
+                        $delete = "<a href='file.php?op=del&fileid=".$fileObj->getVar('fileid')."'><img src='".\PUBLISHER_URL."/images/links/delete.png' title='"._CO_PUBLISHER_DELETEFILE."' alt='"._CO_PUBLISHER_DELETEFILE."'></a>";
                         if (0 == $fileObj->getVar('status')) {
-                            $notVisible = "<img src='" . \PUBLISHER_URL . "/images/no.gif'>";
+                            $notVisible = "<img src='".\PUBLISHER_URL."/images/no.gif'>";
                         } else {
                             $notVisible = '';
                         }
                         $table .= '<tr>';
-                        $table .= "<td class='head' align='center'>" . $fileObj->getVar('fileid') . '</td>';
-                        $table .= "<td class='odd' align='left'>" . $notVisible . $fileObj->getFileLink() . '</td>';
-                        $table .= "<td class='even' align='left'>" . $fileObj->getVar('description') . '</td>';
-                        $table .= "<td class='even' align='center'>" . $fileObj->getVar('counter') . '';
-                        $table .= "<td class='even' align='center'>" . $fileObj->datesub() . '</td>';
+                        $table .= "<td class='head' align='center'>".$fileObj->getVar('fileid').'</td>';
+                        $table .= "<td class='odd' align='left'>".$notVisible.$fileObj->getFileLink().'</td>';
+                        $table .= "<td class='even' align='left'>".$fileObj->getVar('description').'</td>';
+                        $table .= "<td class='even' align='center'>".$fileObj->getVar('counter').'';
+                        $table .= "<td class='even' align='center'>".$fileObj->datesub().'</td>';
                         $table .= "<td class='even' align='center'> {$modify} {$delete} </td>";
                         $table .= '</tr>';
                     }
@@ -462,7 +462,7 @@ 
 
             $imageObjs = [];
             if (!empty($catids)) {
-                $criteria = new CriteriaCompo(new Criteria('imgcat_id', '(' . \implode(',', $catids) . ')', 'IN'));
+                $criteria = new CriteriaCompo(new Criteria('imgcat_id', '('.\implode(',', $catids).')', 'IN'));
                 $criteria->add(new Criteria('image_display', 1));
                 $criteria->setSort('image_nicename');
                 $criteria->setOrder('ASC');
@@ -478,38 +478,38 @@ 
 
             $image_select = new Select('', 'image_notused', '', 5);
             $image_select->addOptionArray($image_array);
-            $image_select->set('onchange', 'showImgSelected("image_display", "image_notused", "uploads/", "", "' . XoopsBaseConfig::get('url') . '")');
+            $image_select->set('onchange', 'showImgSelected("image_display", "image_notused", "uploads/", "", "'.XoopsBaseConfig::get('url').'")');
             unset($image_array);
 
             $image_select2 = new Select('', 'image_item', '', 5, true);
             $image_select2->addOptionArray($objimage_array);
-            $image_select2->set('onchange', 'publisher_updateSelectOption("image_item", "image_featured"), ' . 'showImgSelected("image_display", "image_item", "uploads/", "", "' . XoopsBaseConfig::get('url') . '");');
+            $image_select2->set('onchange', 'publisher_updateSelectOption("image_item", "image_featured"), '.'showImgSelected("image_display", "image_item", "uploads/", "", "'.XoopsBaseConfig::get('url').'");');
 
             $buttonadd = new Button('', 'buttonadd', _CO_PUBLISHER_ADD);
-            $buttonadd->set('onclick', 'publisher_appendSelectOption("image_notused", "image_item"), ' . 'publisher_updateSelectOption("image_item", "image_featured");');
+            $buttonadd->set('onclick', 'publisher_appendSelectOption("image_notused", "image_item"), '.'publisher_updateSelectOption("image_item", "image_featured");');
 
             $buttonremove = new Button('', 'buttonremove', _CO_PUBLISHER_REMOVE);
-            $buttonremove->set('onclick', 'publisher_appendSelectOption("image_item", "image_notused"), ' . 'publisher_updateSelectOption("image_item", "image_featured");');
+            $buttonremove->set('onclick', 'publisher_appendSelectOption("image_item", "image_notused"), '.'publisher_updateSelectOption("image_item", "image_featured");');
 
             $opentable = new Label('', '<table><tr><td>');
             $addcol = new Label('', '</td><td>');
             $addbreak = new Label('', '<br>');
             $closetable = new Label('', '</td></tr></table>');
 
-            $xoops->theme()->addScript(\PUBLISHER_URL . '/js/ajaxupload.3.9.js');
+            $xoops->theme()->addScript(\PUBLISHER_URL.'/js/ajaxupload.3.9.js');
             //todo, find replacement for error class
             $js_data = new Label('', '
 <script type= "text/javascript">/*<![CDATA[*/
 $(document).ready(function(){
     var button = $("#publisher_upload_button"), interval;
     new AjaxUpload(button,{
-        action: "' . \PUBLISHER_URL . '/include/ajax_upload.php", // I disabled uploads in this example for security reasons
+        action: "' . \PUBLISHER_URL.'/include/ajax_upload.php", // I disabled uploads in this example for security reasons
         responseType: "text/html",
         name: "publisher_upload_file",
         onSubmit : function(file, ext){
             // change button text, when user selects file
             $("#publisher_upload_message").html(" ");
-            button.html("<img src=\'' . \PUBLISHER_URL . '/images/loadingbar.gif\'>"); this.setData({
+            button.html("<img src=\'' . \PUBLISHER_URL.'/images/loadingbar.gif\'>"); this.setData({
                 "image_nicename": $("#image_nicename").val(),
                 "imgcat_id" : $("#imgcat_id").val()
             });
@@ -520,7 +520,7 @@ 
             }, 200);
         },
         onComplete: function(file, response){
-            button.text("' . _CO_PUBLISHER_IMAGE_UPLOAD_NEW . '");
+            button.text("' . _CO_PUBLISHER_IMAGE_UPLOAD_NEW.'");
             window.clearInterval(interval);
             // enable upload button
             this.enable();
@@ -529,7 +529,7 @@ 
             if (result[0] == "success") {
                  $("#image_item").append("<option value=\'" + result[1] + "\' selected=\'selected\'>" + result[2] + "</option>");
                  publisher_updateSelectOption(\'image_item\', \'image_featured\');
-                 showImgSelected(\'image_display\', \'image_item\', \'uploads/\', \'\', \'' . XoopsBaseConfig::get('url') . '\')
+                 showImgSelected(\'image_display\', \'image_item\', \'uploads/\', \'\', \'' . XoopsBaseConfig::get('url').'\')
             } else {
                  $("#publisher_upload_message").html("<div class=\'errorMsg\'>" + result[1] + "</div>");
             }
@@ -539,7 +539,7 @@ 
 /*]]>*/</script>
 ');
             $messages = new Label('', "<div id='publisher_upload_message'></div>");
-            $button = new Label('', "<div id='publisher_upload_button'>" . _CO_PUBLISHER_IMAGE_UPLOAD_NEW . '</div>');
+            $button = new Label('', "<div id='publisher_upload_button'>"._CO_PUBLISHER_IMAGE_UPLOAD_NEW.'</div>');
             $nicename = new Text('', 'image_nicename', 30, 30, \_CO_PUBLISHER_IMAGE_NICENAME);
 
             $catlist = $imgcatHandler->getListByPermission($group, 'imgcat_read', 1);
@@ -586,12 +586,12 @@ 
 
             $image_select3 = new Select(_CO_PUBLISHER_IMAGE_ITEM, 'image_featured', $imagename, 1);
             $image_select3->addOptionArray($objimage_array);
-            $image_select3->set('onchange', 'showImgSelected("image_display", "image_featured", "uploads/", "", "' . XoopsBaseConfig::get('url') . '");');
+            $image_select3->set('onchange', 'showImgSelected("image_display", "image_featured", "uploads/", "", "'.XoopsBaseConfig::get('url').'");');
             $image_select3->setDescription(_CO_PUBLISHER_IMAGE_ITEM_DSC);
             $imagesTab->addElement($image_select3);
 
             $imgTag = new Img([
-                                         'src' => $xoops->url('uploads/' . $imageforpath),
+                                         'src' => $xoops->url('uploads/'.$imageforpath),
                                          'width' => 500,
                                          'name' => 'image_display',
                                          'id' => 'image_display',