ggoffy / wggithub

xoops_version.php

Spacing +4 added lines, -4 removed lines

@@ -37,10 +37,10 @@ 
     'license_url'         => 'http://www.gnu.org/licenses/gpl-3.0.en.html',

     'help'                => 'page=help',

     'release_info'        => 'release_info',

-    'release_file'        => \XOOPS_URL . '/modules/wggithub/docs/release_info file',

+    'release_file'        => \XOOPS_URL.'/modules/wggithub/docs/release_info file',

     'release_date'        => '2021/01/13',

     'manual'              => 'link to manual file',

-    'manual_file'         => \XOOPS_URL . '/modules/wggithub/docs/install.txt',

+    'manual_file'         => \XOOPS_URL.'/modules/wggithub/docs/install.txt',

     'min_php'             => '7.2',

     'min_xoops'           => '2.5.11',

     'min_admin'           => '1.2',

@@ -279,8 +279,8 @@ 
 // Make Sample button visible?

 $modversion['config'][] = [

     'name'        => 'displaySampleButton',

-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON',

-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC',

+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON',

+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON_DESC',

     'formtype'    => 'yesno',

     'valuetype'   => 'int',

     'default'     => 1,

include/xoops_version.inc.php

Spacing +3 added lines, -3 removed lines

@@ -27,13 +27,13 @@
     switch (mb_substr($val, -1)) {

         case 'K':

         case 'k':

-            return (int)$val * 1024;

+            return (int) $val * 1024;

         case 'M':

         case 'm':

-            return (int)$val * 1048576;

+            return (int) $val * 1048576;

         case 'G':

         case 'g':

-            return (int)$val * 1073741824;

+            return (int) $val * 1073741824;

         default:

             return $val;

     }

include/functions.php

Indentation +2 added lines, -2 removed lines

@@ -133,7 +133,7 @@ 
 

         case 'none':

             if($topic_name) {

-                 $topic_name = 'topic=' . $topic_name . '&';

+                    $topic_name = 'topic=' . $topic_name . '&';

             }

             $rewrite_base = '/modules/';

             $page = 'page=' . $array['content_alias'];

@@ -163,7 +163,7 @@ 
             return \XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name  . $id . $page . $rewrite_ext;

             break;

 

-         case 'short':

+            case 'short':

             if($topic_name) {

                 $topic_name .= '/';

             }

Spacing +22 added lines, -22 removed lines

@@ -33,7 +33,7 @@ 
         $cat_sql .= current($cats);

         array_shift($cats);

         foreach ($cats as $cat) {

-            $cat_sql .= ',' . $cat;

+            $cat_sql .= ','.$cat;

         }

     }

     $cat_sql .= ')';

@@ -72,9 +72,9 @@ 
 {

     global $xoopsTpl, $xoTheme;

     $myts = MyTextSanitizer::getInstance();

-    $content= $myts->undoHtmlSpecialChars($myts->displayTarea($content));

-    if(isset($xoTheme) && \is_object($xoTheme)) {

-        $xoTheme->addMeta( 'meta', 'keywords', \strip_tags($content));

+    $content = $myts->undoHtmlSpecialChars($myts->displayTarea($content));

+    if (isset($xoTheme) && \is_object($xoTheme)) {

+        $xoTheme->addMeta('meta', 'keywords', \strip_tags($content));

     } else {    // Compatibility for old Xoops versions

         $xoopsTpl->assign('xoops_meta_keywords', \strip_tags($content));

     }

@@ -91,8 +91,8 @@ 
     global $xoopsTpl, $xoTheme;

     $myts = MyTextSanitizer::getInstance();

     $content = $myts->undoHtmlSpecialChars($myts->displayTarea($content));

-    if(isset($xoTheme) && \is_object($xoTheme)) {

-        $xoTheme->addMeta( 'meta', 'description', \strip_tags($content));

+    if (isset($xoTheme) && \is_object($xoTheme)) {

+        $xoTheme->addMeta('meta', 'description', \strip_tags($content));

     } else {    // Compatibility for old Xoops versions

         $xoopsTpl->assign('xoops_meta_description', \strip_tags($content));

     }

@@ -117,7 +117,7 @@ 
     if (0 != $lenght_id) {

         $id = $array['content_id'];

         while (\strlen($id) < $lenght_id) {

-            $id = '0' . $id;

+            $id = '0'.$id;

         }

     } else {

         $id = $array['content_id'];

@@ -132,23 +132,23 @@ 
     switch ($rewrite_url) {

 

         case 'none':

-            if($topic_name) {

-                 $topic_name = 'topic=' . $topic_name . '&amp;';

+            if ($topic_name) {

+                 $topic_name = 'topic='.$topic_name.'&amp;';

             }

             $rewrite_base = '/modules/';

-            $page = 'page=' . $array['content_alias'];

-            return \XOOPS_URL . $rewrite_base . $module . '/' . $type . '.php?' . $topic_name . 'id=' . $id . '&amp;' . $page . $comment;

+            $page = 'page='.$array['content_alias'];

+            return \XOOPS_URL.$rewrite_base.$module.'/'.$type.'.php?'.$topic_name.'id='.$id.'&amp;'.$page.$comment;

             break;

 

         case 'rewrite':

-            if($topic_name) {

+            if ($topic_name) {

                 $topic_name .= '/';

             }

             $rewrite_base = xoops_getModuleOption('rewrite_mode', $module);

             $rewrite_ext = xoops_getModuleOption('rewrite_ext', $module);

             $module_name = '';

-            if(xoops_getModuleOption('rewrite_name', $module)) {

-                $module_name = xoops_getModuleOption('rewrite_name', $module) . '/';

+            if (xoops_getModuleOption('rewrite_name', $module)) {

+                $module_name = xoops_getModuleOption('rewrite_name', $module).'/';

             }

             $page = $array['content_alias'];

             $type .= '/';

@@ -157,21 +157,21 @@ 
                 $type = '';

             }

             if ('comment-edit/' === $type || 'comment-reply/' === $type || 'comment-delete/' === $type) {

-                return \XOOPS_URL . $rewrite_base . $module_name . $type . $id . '/';

+                return \XOOPS_URL.$rewrite_base.$module_name.$type.$id.'/';

             }

 

-            return \XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name  . $id . $page . $rewrite_ext;

+            return \XOOPS_URL.$rewrite_base.$module_name.$type.$topic_name.$id.$page.$rewrite_ext;

             break;

 

          case 'short':

-            if($topic_name) {

+            if ($topic_name) {

                 $topic_name .= '/';

             }

             $rewrite_base = xoops_getModuleOption('rewrite_mode', $module);

             $rewrite_ext = xoops_getModuleOption('rewrite_ext', $module);

             $module_name = '';

-            if(xoops_getModuleOption('rewrite_name', $module)) {

-                $module_name = xoops_getModuleOption('rewrite_name', $module) . '/';

+            if (xoops_getModuleOption('rewrite_name', $module)) {

+                $module_name = xoops_getModuleOption('rewrite_name', $module).'/';

             }

             $page = $array['content_alias'];

             $type .= '/';

@@ -179,10 +179,10 @@ 
                 $type = '';

             }

             if ('comment-edit/' === $type || 'comment-reply/' === $type || 'comment-delete/' === $type) {

-                return \XOOPS_URL . $rewrite_base . $module_name . $type . $id . '/';

+                return \XOOPS_URL.$rewrite_base.$module_name.$type.$id.'/';

             }

 

-            return \XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name . $page . $rewrite_ext;

+            return \XOOPS_URL.$rewrite_base.$module_name.$type.$topic_name.$page.$rewrite_ext;

             break;

     }

     return null;

@@ -207,6 +207,6 @@ 
     $url .= htmlentities($url, ENT_COMPAT, 'utf-8');

     $url .= \preg_replace('`&([a-z])(acute|uml|circ|grave|ring|cedil|slash|tilde|caron|lig);`i', "\1", $url);

     $url .= \preg_replace(array($regular_expression, '`[-]+`'), '-', $url);

-    $url = ($url == '') ? $type : strtolower(    rim($url, '-'));

+    $url = ($url == '') ? $type : strtolower(rim($url, '-'));

     return $url;

 }
\ No newline at end of file

include/common.php

Spacing +21 added lines, -21 removed lines

@@ -20,29 +20,29 @@
  * @author         Goffy - XOOPS Development Team - Email:<goffy@wedega.com> - Website:<https://wedega.com>

  */

 if (!\defined('XOOPS_ICONS32_PATH')) {

-    \define('XOOPS_ICONS32_PATH', \XOOPS_ROOT_PATH . '/Frameworks/moduleclasses/icons/32');

+    \define('XOOPS_ICONS32_PATH', \XOOPS_ROOT_PATH.'/Frameworks/moduleclasses/icons/32');

 }

 if (!\defined('XOOPS_ICONS32_URL')) {

-    \define('XOOPS_ICONS32_URL', \XOOPS_URL . '/Frameworks/moduleclasses/icons/32');

+    \define('XOOPS_ICONS32_URL', \XOOPS_URL.'/Frameworks/moduleclasses/icons/32');

 }

 \define('WGGITHUB_DIRNAME', 'wggithub');

-\define('WGGITHUB_PATH', \XOOPS_ROOT_PATH . '/modules/' . WGGITHUB_DIRNAME);

-\define('WGGITHUB_URL', \XOOPS_URL . '/modules/' . WGGITHUB_DIRNAME);

-\define('WGGITHUB_ICONS_PATH', WGGITHUB_PATH . '/assets/icons');

-\define('WGGITHUB_ICONS_URL', WGGITHUB_URL . '/assets/icons');

-\define('WGGITHUB_IMAGE_PATH', WGGITHUB_PATH . '/assets/images');

-\define('WGGITHUB_IMAGE_URL', WGGITHUB_URL . '/assets/images');

-\define('WGGITHUB_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . WGGITHUB_DIRNAME);

-\define('WGGITHUB_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . WGGITHUB_DIRNAME);

-\define('WGGITHUB_UPLOAD_FILES_PATH', WGGITHUB_UPLOAD_PATH . '/files');

-\define('WGGITHUB_UPLOAD_FILES_URL', WGGITHUB_UPLOAD_URL . '/files');

-\define('WGGITHUB_UPLOAD_IMAGE_PATH', WGGITHUB_UPLOAD_PATH . '/images');

-\define('WGGITHUB_UPLOAD_IMAGE_URL', WGGITHUB_UPLOAD_URL . '/images');

-\define('WGGITHUB_UPLOAD_SHOTS_PATH', WGGITHUB_UPLOAD_PATH . '/images/shots');

-\define('WGGITHUB_UPLOAD_SHOTS_URL', WGGITHUB_UPLOAD_URL . '/images/shots');

-\define('WGGITHUB_ADMIN', WGGITHUB_URL . '/admin/index.php');

-$localLogo = WGGITHUB_IMAGE_URL . '/tdmxoops_logo.png';

+\define('WGGITHUB_PATH', \XOOPS_ROOT_PATH.'/modules/'.WGGITHUB_DIRNAME);

+\define('WGGITHUB_URL', \XOOPS_URL.'/modules/'.WGGITHUB_DIRNAME);

+\define('WGGITHUB_ICONS_PATH', WGGITHUB_PATH.'/assets/icons');

+\define('WGGITHUB_ICONS_URL', WGGITHUB_URL.'/assets/icons');

+\define('WGGITHUB_IMAGE_PATH', WGGITHUB_PATH.'/assets/images');

+\define('WGGITHUB_IMAGE_URL', WGGITHUB_URL.'/assets/images');

+\define('WGGITHUB_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.WGGITHUB_DIRNAME);

+\define('WGGITHUB_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.WGGITHUB_DIRNAME);

+\define('WGGITHUB_UPLOAD_FILES_PATH', WGGITHUB_UPLOAD_PATH.'/files');

+\define('WGGITHUB_UPLOAD_FILES_URL', WGGITHUB_UPLOAD_URL.'/files');

+\define('WGGITHUB_UPLOAD_IMAGE_PATH', WGGITHUB_UPLOAD_PATH.'/images');

+\define('WGGITHUB_UPLOAD_IMAGE_URL', WGGITHUB_UPLOAD_URL.'/images');

+\define('WGGITHUB_UPLOAD_SHOTS_PATH', WGGITHUB_UPLOAD_PATH.'/images/shots');

+\define('WGGITHUB_UPLOAD_SHOTS_URL', WGGITHUB_UPLOAD_URL.'/images/shots');

+\define('WGGITHUB_ADMIN', WGGITHUB_URL.'/admin/index.php');

+$localLogo = WGGITHUB_IMAGE_URL.'/tdmxoops_logo.png';

 // Module Information

-$copyright = "<a href='https://wedega.com' title='XOOPS on Wedega' target='_blank'><img src='" . $localLogo . "' alt='XOOPS on Wedega' /></a>";

-include_once \XOOPS_ROOT_PATH . '/class/xoopsrequest.php';

-include_once WGGITHUB_PATH . '/include/functions.php';

+$copyright = "<a href='https://wedega.com' title='XOOPS on Wedega' target='_blank'><img src='".$localLogo."' alt='XOOPS on Wedega' /></a>";

+include_once \XOOPS_ROOT_PATH.'/class/xoopsrequest.php';

+include_once WGGITHUB_PATH.'/include/functions.php';

include/install.php

Spacing +7 added lines, -7 removed lines

@@ -29,7 +29,7 @@ 
  */

 function xoops_module_pre_install_wggithub(\XoopsModule $module)

 {

-    require \dirname(__DIR__) . '/preloads/autoloader.php';

+    require \dirname(__DIR__).'/preloads/autoloader.php';

 

     $utility = new Wggithub\Utility();

 

@@ -42,7 +42,7 @@ 
     if ($xoopsSuccess && $phpSuccess) {

         $moduleTables = &$module->getInfo('tables');

         foreach ($moduleTables as $table) {

-            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');

+            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';');

         }

     }

 

@@ -55,7 +55,7 @@ 
  */

 function xoops_module_install_wggithub(\XoopsModule $module)

 {

-    require \dirname(__DIR__) . '/preloads/autoloader.php';

+    require \dirname(__DIR__).'/preloads/autoloader.php';

 

     /** @var Wggithub\Helper $helper */ 

     /** @var Wggithub\Utility $utility */

@@ -80,14 +80,14 @@ 
 

     //  ---  COPY blank.gif FILES ---------------

     if ($configurator->copyBlankFiles && \is_array($configurator->copyBlankFiles)) {

-        $file = \dirname(__DIR__) . '/assets/images/blank.gif';

+        $file = \dirname(__DIR__).'/assets/images/blank.gif';

         foreach (\array_keys($configurator->copyBlankFiles) as $i) {

-            $dest = $configurator->copyBlankFiles[$i] . '/blank.gif';

+            $dest = $configurator->copyBlankFiles[$i].'/blank.gif';

             $utility::copyFile($file, $dest);

         }

-        $file = \dirname(__DIR__) . '/assets/images/blank.png';

+        $file = \dirname(__DIR__).'/assets/images/blank.png';

         foreach (\array_keys($configurator->copyBlankFiles) as $i) {

-            $dest = $configurator->copyBlankFiles[$i] . '/blank.png';

+            $dest = $configurator->copyBlankFiles[$i].'/blank.png';

             $utility::copyFile($file, $dest);

         }

     }

include/uninstall.php

Spacing +1 added lines, -1 removed lines

@@ -52,7 +52,7 @@
         if ($dirInfo->isDir()) {

             // The directory exists so delete it

             if (!$utility::rrmdir($old_dir)) {

-                $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH'), $old_dir));

+                $module->setErrors(\sprintf(\constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH'), $old_dir));

                 $success = false;

             }

         }

include/search.inc.php

Spacing +3 added lines, -3 removed lines

@@ -47,7 +47,7 @@ 
     }

     if ($elementCount > 0) {

         $crKeywords = new \CriteriaCompo();

-        for ($i = 0; $i  <  $elementCount; $i++) {

+        for ($i = 0; $i < $elementCount; $i++) {

             $crKeyword = new \CriteriaCompo();

             unset($crKeyword);

         }

@@ -56,7 +56,7 @@ 
     if ($userid && \is_array($userid)) {

         $userid = array_map('intval', $userid);

         $crUser = new \CriteriaCompo();

-        $crUser->add(new \Criteria('repo_submitter', '(' . \implode(',', $userid) . ')', 'IN'), 'OR');

+        $crUser->add(new \Criteria('repo_submitter', '('.\implode(',', $userid).')', 'IN'), 'OR');

     } elseif (is_numeric($userid) && $userid > 0) {

         $crUser = new \CriteriaCompo();

         $crUser->add(new \Criteria('repo_submitter', $userid), 'OR');

@@ -76,7 +76,7 @@ 
     foreach (\array_keys($repositoriesAll) as $i) {

         $ret[] = [

             'image'  => 'assets/icons/16/repositories.png',

-            'link'   => 'repositories.php?op=show&amp;repo_id=' . $repositoriesAll[$i]->getVar('repo_id'),

+            'link'   => 'repositories.php?op=show&amp;repo_id='.$repositoriesAll[$i]->getVar('repo_id'),

             'title'  => $repositoriesAll[$i]->getVar('repo_name'),

             'time'   => $repositoriesAll[$i]->getVar('repo_datecreated')

         ];

include/notification.inc.php

Spacing +3 added lines, -3 removed lines

@@ -32,7 +32,7 @@ 
     global $xoopsDB;

 

     if (!\defined('WGGITHUB_URL')) {

-        \define('WGGITHUB_URL', \XOOPS_URL . '/modules/wggithub');

+        \define('WGGITHUB_URL', \XOOPS_URL.'/modules/wggithub');

     }

 

     switch ($category) {

@@ -42,11 +42,11 @@ 
             return $item;

             break;

         case 'repositories':

-            $sql          = 'SELECT repo_name FROM ' . $xoopsDB->prefix('wggithub_repositories') . ' WHERE repo_id = '. $item_id;

+            $sql          = 'SELECT repo_name FROM '.$xoopsDB->prefix('wggithub_repositories').' WHERE repo_id = '.$item_id;

             $result       = $xoopsDB->query($sql);

             $result_array = $xoopsDB->fetchArray($result);

             $item['name'] = $result_array['repo_name'];

-            $item['url']  = WGGITHUB_URL . '/repositories.php?repo_id=' . $item_id;

+            $item['url']  = WGGITHUB_URL.'/repositories.php?repo_id='.$item_id;

             return $item;

             break;

     }

preloads/core.php

Spacing +1 added lines, -1 removed lines

@@ -28,6 +28,6 @@
      */

     public static function eventCoreIncludeCommonEnd($args)

     {

-        include __DIR__ . '/autoloader.php';

+        include __DIR__.'/autoloader.php';

     }

 }