geekwright / XoopsCore

htdocs/include/common.php

Spacing +16 added lines, -16 removed lines

@@ -28,27 +28,27 @@ 
  * Temporarily try and fix, but set up a (delayed) warning
  */
 if (!class_exists('XoopsLoad', false)) {
-    require_once dirname(__DIR__). '/class/XoopsBaseConfig.php';
+    require_once dirname(__DIR__).'/class/XoopsBaseConfig.php';
     XoopsBaseConfig::bootstrapTransition();
     $delayedWarning = 'Patch mainfile.php for XoopsBaseConfig';
 }
 
 global $xoops;
-$GLOBALS['xoops'] =& $xoops;
+$GLOBALS['xoops'] = & $xoops;
 
 //Legacy support
 global $xoopsDB;
-$GLOBALS['xoopsDB'] =& $xoopsDB;
+$GLOBALS['xoopsDB'] = & $xoopsDB;
 /**
  * YOU SHOULD NEVER USE THE FOLLOWING TO CONSTANTS, THEY WILL BE REMOVED
  */
 defined('DS') or define('DS', DIRECTORY_SEPARATOR);
-defined('NWLINE')or define('NWLINE', "\n");
+defined('NWLINE') or define('NWLINE', "\n");
 
 /**
  * Include files with definitions
  */
-include_once __DIR__ . '/defines.php';
+include_once __DIR__.'/defines.php';
 // include_once __DIR__ . '/version.php';
 
 /**
@@ -64,7 +64,7 @@ 
  */
 $xoops = Xoops::getInstance();
 
-$xoops->option =& $GLOBALS['xoopsOption'];
+$xoops->option = & $GLOBALS['xoopsOption'];
 
 /**
  * Create Instance Xoops\Core\Logger Object, the logger manager
@@ -86,7 +86,7 @@ 
 //$xoops->cache()->delete($key);
 $autoloadPrefixDirList = $xoops->cache()->cacheRead(
     $key,
-    function () use ($xoops) {
+    function() use ($xoops) {
         try {
             $criteria = new CriteriaCompo(new Criteria('isactive', 1));
             $criteria->add(new Criteria('namespace', '', '!='));
@@ -99,7 +99,7 @@ 
         /** @var XoopsObject $almod */
         foreach ($autoloadModules as $almod) {
             $prefix = $almod->getVar('namespace');
-            $base_dir = $xoops->path('modules/' . $almod->getVar('dirname') . '/src');
+            $base_dir = $xoops->path('modules/'.$almod->getVar('dirname').'/src');
             $autoloadPrefixDirList[] = [$prefix, $base_dir];
         }
         return $autoloadPrefixDirList;
@@ -158,7 +158,7 @@ 
  * Requires functions and database loaded
  */
 $xoops->getConfigs();
-$xoopsConfig =& $xoops->config;
+$xoopsConfig = & $xoops->config;
 
 /**
  * Merge file and db configs.
@@ -167,7 +167,7 @@ 
     $xoops->addConfigs(include $file);
     unset($file);
 } else {
-    trigger_error('File Path Error: ' . 'var/configs/system_configs.php' . ' does not exist.');
+    trigger_error('File Path Error: '.'var/configs/system_configs.php'.' does not exist.');
 }
 
 $xoops->events()->triggerEvent('core.include.common.configs.success');
@@ -184,7 +184,7 @@ 
 $xFrameOptions = $xoopsConfig['xFrameOptions'] ?? 'sameorigin';
 $xoops->events()->triggerEvent('core.include.common.xframeoption');
 if (!headers_sent() && !empty($xFrameOptions)) {
-    header('X-Frame-Options: ' .$xFrameOptions);
+    header('X-Frame-Options: '.$xFrameOptions);
 }
 
 /**
@@ -265,7 +265,7 @@ 
     } else {
         if (!$moduleperm_handler->checkRight('module_read', $xoops->module->getVar('mid'), FixedGroups::ANONYMOUS)) {
             $xoops->redirect(
-                $xoops_url . '/user.php?from=' . $xoops->module->getVar('dirname', 'n'),
+                $xoops_url.'/user.php?from='.$xoops->module->getVar('dirname', 'n'),
                 1,
                 XoopsLocale::E_NO_ACCESS_PERMISSION
             );
@@ -291,10 +291,10 @@ 
 
 $xoopsTpl = $xoops->tpl();
 $xoTheme = null;
-$xoopsUser =& $xoops->user;
-$xoopsModule =& $xoops->module;
-$xoopsUserIsAdmin =& $xoops->userIsAdmin;
-$xoopsModuleConfig =& $xoops->moduleConfig;
+$xoopsUser = & $xoops->user;
+$xoopsModule = & $xoops->module;
+$xoopsUserIsAdmin = & $xoops->userIsAdmin;
+$xoopsModuleConfig = & $xoops->moduleConfig;
 
 //Creates 'system_modules_active' cache file if it has been deleted.
 $xoops->getActiveModules();

htdocs/modules/publisher/include/ajax_rating.php

Spacing +8 added lines, -8 removed lines

@@ -34,7 +34,7 @@ 
 use XoopsModules\Publisher;
 use XoopsModules\Publisher\Helper;
 
-require_once dirname(__DIR__) . '/header.php';
+require_once dirname(__DIR__).'/header.php';
 
 $xoops = Xoops::getInstance();
 $xoops->disableErrorReporting();
@@ -56,7 +56,7 @@ 
 
 //Checking permissions
 if (!$helper->getConfig('perm_rating') || !$gpermHandler->checkRight('global', _PUBLISHER_RATE, $groups, $module_id)) {
-    $output = "unit_long$itemid|" . XoopsLocale::E_NO_ACCESS_PERMISSION . "\n";
+    $output = "unit_long$itemid|".XoopsLocale::E_NO_ACCESS_PERMISSION."\n";
     echo $output;
     exit();
 }
@@ -65,7 +65,7 @@ 
 $units = 5;
 
 if ($rating > 5 || $rating < 1) {
-    $output = "unit_long$itemid|" . _MD_PUBLISHER_VOTE_BAD . "\n";
+    $output = "unit_long$itemid|"._MD_PUBLISHER_VOTE_BAD."\n";
     echo $output;
     exit();
 }
@@ -87,7 +87,7 @@ 
 }
 
 if ($voted) {
-    $output = "unit_long$itemid|" . _MD_PUBLISHER_VOTE_ALREADY . "\n";
+    $output = "unit_long$itemid|"._MD_PUBLISHER_VOTE_ALREADY."\n";
     echo $output;
     exit();
 }
@@ -111,8 +111,8 @@ 
 // $new_back is what gets 'drawn' on your page after a successful 'AJAX/Javascript' vote
 $new_back = [];
 
-$new_back[] .= '<div class="publisher_unit-rating" style="width:' . $units * $rating_unitwidth . 'px;">';
-$new_back[] .= '<div class="publisher_current-rating" style="width:' . @number_format($current_rating / $count, 2) * $rating_unitwidth . 'px;">' . _MD_PUBLISHER_VOTE_RATING . '</div>';
+$new_back[] .= '<div class="publisher_unit-rating" style="width:'.$units * $rating_unitwidth.'px;">';
+$new_back[] .= '<div class="publisher_current-rating" style="width:'.@number_format($current_rating / $count, 2) * $rating_unitwidth.'px;">'._MD_PUBLISHER_VOTE_RATING.'</div>';
 $new_back[] .= '<div class="publisher_r1-unit">1</div>';
 $new_back[] .= '<div class="publisher_r2-unit">2</div>';
 $new_back[] .= '<div class="publisher_r3-unit">3</div>';
@@ -124,8 +124,8 @@ 
 $new_back[] .= '<div class="publisher_r9-unit">9</div>';
 $new_back[] .= '<div class="publisher_r10-unit">10</div>';
 $new_back[] .= '</div>';
-$new_back[] .= '<div class="publisher_voted">' . _MD_PUBLISHER_VOTE_RATING . ' <strong>' . @number_format($current_rating / $count, 2) . '</strong>/' . $units . ' (' . $count . ' ' . $tense . ')</div>';
-$new_back[] .= '<div class="publisher_thanks">' . _MD_PUBLISHER_VOTE_THANKS . '</div>';
+$new_back[] .= '<div class="publisher_voted">'._MD_PUBLISHER_VOTE_RATING.' <strong>'.@number_format($current_rating / $count, 2).'</strong>/'.$units.' ('.$count.' '.$tense.')</div>';
+$new_back[] .= '<div class="publisher_thanks">'._MD_PUBLISHER_VOTE_THANKS.'</div>';
 
 $allnewback = implode("\n", $new_back);
 

htdocs/modules/publisher/include/ajax_upload.php

Spacing +4 added lines, -4 removed lines

@@ -29,8 +29,8 @@ 
 use XoopsModules\Publisher;
 use XoopsModules\Publisher\Helper;
 
-include dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
-require_once __DIR__ . '/common.php';
+include dirname(dirname(dirname(__DIR__))).'/mainfile.php';
+require_once __DIR__.'/common.php';
 
 $xoops = Xoops::getInstance();
 $xoops->disableErrorReporting();
@@ -74,7 +74,7 @@ 
 
 $image = null;
 if (false === $error) {
-    $uploader = new XoopsMediaUploader(XoopsBaseConfig::get('uploads-path') . '/images', [
+    $uploader = new XoopsMediaUploader(XoopsBaseConfig::get('uploads-path').'/images', [
         'image/gif',
         'image/jpeg',
         'image/pjpeg',
@@ -107,7 +107,7 @@ 
             }
         }
     } else {
-        $error = sprintf(_CO_PUBLISHER_FAILSAVEIMG, $filename) . '<br>' . implode('<br>', $uploader->getErrors(false));
+        $error = sprintf(_CO_PUBLISHER_FAILSAVEIMG, $filename).'<br>'.implode('<br>', $uploader->getErrors(false));
     }
 }
 

htdocs/modules/publisher/include/common.php

Spacing +5 added lines, -5 removed lines

@@ -24,11 +24,11 @@
 
 $xoops = Xoops::getInstance();
 define('PUBLISHER_DIRNAME', basename(dirname(__DIR__)));
-define('PUBLISHER_URL', $xoops->url('modules/' . PUBLISHER_DIRNAME));
-define('PUBLISHER_ADMIN_URL', PUBLISHER_URL . '/admin');
-define('PUBLISHER_UPLOADS_URL', $xoops->url('uploads/' . PUBLISHER_DIRNAME));
-define('PUBLISHER_ROOT_PATH', $xoops->path('modules/' . PUBLISHER_DIRNAME));
-define('PUBLISHER_UPLOADS_PATH', $xoops->path('uploads/' . PUBLISHER_DIRNAME));
+define('PUBLISHER_URL', $xoops->url('modules/'.PUBLISHER_DIRNAME));
+define('PUBLISHER_ADMIN_URL', PUBLISHER_URL.'/admin');
+define('PUBLISHER_UPLOADS_URL', $xoops->url('uploads/'.PUBLISHER_DIRNAME));
+define('PUBLISHER_ROOT_PATH', $xoops->path('modules/'.PUBLISHER_DIRNAME));
+define('PUBLISHER_UPLOADS_PATH', $xoops->path('uploads/'.PUBLISHER_DIRNAME));
 
 $path = dirname(__DIR__);
 //XoopsLoad::addMap(array(

htdocs/modules/publisher/include/seo.inc.php

Spacing +4 added lines, -4 removed lines

@@ -20,7 +20,7 @@ 
  */
 use XoopsModules\Publisher\Helper;
 
-require_once dirname(__DIR__) . '/include/common.php';
+require_once dirname(__DIR__).'/include/common.php';
 
 $helper = Helper::getInstance();
 
@@ -53,21 +53,21 @@ 
     // per their requirements.
 
     $url_arr = explode('/modules/', $_SERVER['PHP_SELF']);
-    $newUrl = $url_arr[0] . '/modules/' . PUBLISHER_DIRNAME . '/' . $seoMap[$seoOp];
+    $newUrl = $url_arr[0].'/modules/'.PUBLISHER_DIRNAME.'/'.$seoMap[$seoOp];
 
     $_ENV['PHP_SELF'] = $newUrl;
     $_SERVER['SCRIPT_NAME'] = $newUrl;
     $_SERVER['PHP_SELF'] = $newUrl;
     switch ($seoOp) {
         case 'category':
-            $_SERVER['REQUEST_URI'] = $newUrl . '?categoryid=' . $seoArg;
+            $_SERVER['REQUEST_URI'] = $newUrl.'?categoryid='.$seoArg;
             $_GET['categoryid'] = $seoArg;
             $_REQUEST['categoryid'] = $seoArg;
             break;
         case 'item':
         case 'print':
         default:
-            $_SERVER['REQUEST_URI'] = $newUrl . '?itemid=' . $seoArg;
+            $_SERVER['REQUEST_URI'] = $newUrl.'?itemid='.$seoArg;
             $_GET['itemid'] = $seoArg;
             $_REQUEST['itemid'] = $seoArg;
     }

htdocs/modules/publisher/include/plugin.tag.php

Spacing +1 added lines, -1 removed lines

@@ -39,7 +39,7 @@
         }
     }
     $itemHandler = $helper->getItemHandler();
-    $criteria = new Criteria('itemid', '(' . implode(', ', $items_id) . ')', 'IN');
+    $criteria = new Criteria('itemid', '('.implode(', ', $items_id).')', 'IN');
     $items_obj = $itemHandler->getItemObjects($criteria, 'itemid');
 
     /* @var Publisher\Item $item_obj */

htdocs/modules/publisher/include/search.inc.php

Spacing +4 added lines, -4 removed lines

@@ -40,7 +40,7 @@ 
         $hightlight_key = '';
     } else {
         $keywords = implode('+', $queryarray);
-        $hightlight_key = '&keywords=' . $keywords;
+        $hightlight_key = '&keywords='.$keywords;
     }
     $itemsObjs = $helper->getItemHandler()->getItemsFromSearch($queryarray, $andor, $limit, $offset, $userid, $categories, $sortby, $searchin, $extra);
     $withCategoryPath = $helper->getConfig('search_cat_path');
@@ -50,9 +50,9 @@ 
     foreach ($itemsObjs as $obj) {
         $item['image'] = 'images/item_icon.gif';
         $item['link'] = $obj->getItemUrl();
-        $item['link'] .= (!empty($hightlight_key) && (false === mb_strpos($item['link'], '.php?'))) ? '?' . ltrim($hightlight_key, '&') : $hightlight_key;
+        $item['link'] .= (!empty($hightlight_key) && (false === mb_strpos($item['link'], '.php?'))) ? '?'.ltrim($hightlight_key, '&') : $hightlight_key;
         if ($withCategoryPath) {
-            $item['title'] = $obj->getCategoryPath(false) . ' > ' . $obj->title();
+            $item['title'] = $obj->getCategoryPath(false).' > '.$obj->title();
         } else {
             $item['title'] = $obj->title();
         }
@@ -70,7 +70,7 @@ 
             $start = max($pos - 100, 0);
             $length = mb_strlen($query) + 200; //xoops_local("strlen", $query) + 200;
             $context = $obj->highlight(XoopsLocale::substr($text, $start, $length, ' [...]'), $query);
-            $sanitized_text .= '<p>[...] ' . $context . '</p>';
+            $sanitized_text .= '<p>[...] '.$context.'</p>';
         }
 
         //End of highlight

htdocs/modules/publisher/backend.php

Spacing +5 added lines, -5 removed lines

@@ -22,7 +22,7 @@ 
 use Xoops\Core\XoopsTpl;
 use XoopsModules\Publisher;
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $xoops = Xoops::getInstance();
 $xoops->disableErrorReporting();
 
@@ -37,7 +37,7 @@ 
     $categoryObj = $helper->getCategoryHandler()->get($categoryid);
 }
 
-header('Content-Type:text/xml; charset=' . XoopsLocale::getCharset());
+header('Content-Type:text/xml; charset='.XoopsLocale::getCharset());
 $tpl = new XoopsTpl();
 $tpl->caching = 2;
 $tpl->cache_lifetime = 0;
@@ -54,14 +54,14 @@ 
     $tpl->assign('channel_editor', $xoops->getConfig('adminmail'));
 
     if (-1 != $categoryid) {
-        $channel_category .= ' > ' . $categoryObj->getVar('name');
+        $channel_category .= ' > '.$categoryObj->getVar('name');
     }
 
     $tpl->assign('channel_category', htmlspecialchars($channel_category));
     $tpl->assign('channel_generator', $helper->getModule()->getVar('name'));
     $tpl->assign('channel_language', XoopsLocale::getLangCode());
-    $tpl->assign('image_url', XoopsBaseConfig::get('url') . '/images/logo.gif');
-    $dimention = getimagesize(XoopsBaseConfig::get('root-path') . '/images/logo.gif');
+    $tpl->assign('image_url', XoopsBaseConfig::get('url').'/images/logo.gif');
+    $dimention = getimagesize(XoopsBaseConfig::get('root-path').'/images/logo.gif');
     if (empty($dimention[0])) {
         $width = 140;
         $height = 140;

htdocs/modules/publisher/pop.php

Spacing +1 added lines, -1 removed lines

@@ -23,4 +23,4 @@
 $doNotStartPrint = true;
 $noTitle         = true;
 $smartPopup      = true;
-require_once __DIR__ . '/print.php';
+require_once __DIR__.'/print.php';