ggoffy / wggithub

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/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';

     }

 }

admin/logs.php

Spacing +5 added lines, -5 removed lines

@@ -25,7 +25,7 @@ 
 use XoopsModules\Wggithub\Constants;

 use XoopsModules\Wggithub\Common;

 

-require __DIR__ . '/header.php';

+require __DIR__.'/header.php';

 // It recovered the value of argument op in URL$

 $op    = Request::getCmd('op', 'list');

 $logId = Request::getInt('log_id');

@@ -58,8 +58,8 @@ 
             }

             // Display Navigation

             if ($logsCount > $limit) {

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

-                $pagenav = new \XoopsPageNav($logsCount, $limit, $start, 'start', 'op=list&limit=' . $limit);

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

+                $pagenav = new \XoopsPageNav($logsCount, $limit, $start, 'start', 'op=list&limit='.$limit);

                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));

             }

         } else {

@@ -95,7 +95,7 @@ 
         $logsObj->setVar('log_submitter', Request::getInt('log_submitter', 0));

         // Insert Data

         if ($logsHandler->insert($logsObj)) {

-            \redirect_header('logs.php?op=list&start=' . $start . '&limit=' . $limit, 2, \_AM_WGGITHUB_FORM_OK);

+            \redirect_header('logs.php?op=list&start='.$start.'&limit='.$limit, 2, \_AM_WGGITHUB_FORM_OK);

         }

         // Get Form

         $GLOBALS['xoopsTpl']->assign('error', $logsObj->getHtmlErrors());

@@ -156,4 +156,4 @@ 
         }

         break;

 }

-require __DIR__ . '/footer.php';

+require __DIR__.'/footer.php';

admin/feedback.php

Spacing +10 added lines, -10 removed lines

@@ -21,7 +21,7 @@ 
 

 use Xmf\Request;

 

-include __DIR__ . '/header.php';

+include __DIR__.'/header.php';

 

 $adminObject = \Xmf\Module\Admin::getInstance();

 

@@ -60,12 +60,12 @@ 
         $fb_content = Request::getText('fb_content', '');

         $fb_content = \str_replace(["\r\n", "\n", "\r"], '<br>', $fb_content); //clean line break from dhtmltextarea

 

-        $title       = \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_FOR') . $GLOBALS['xoopsModule']->getVar('dirname');

-        $body        = \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME') . ': ' . $your_name . '<br>';

-        $body        .= \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL') . ': ' . $your_mail . '<br>';

-        $body        .= \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE') . ': ' . $your_site . '<br>';

-        $body        .= \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE') . ': ' . $fb_type . '<br><br>';

-        $body        .= \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_CONTENT') . ':<br>';

+        $title       = \constant('CO_'.$moduleDirNameUpper.'_'.'FB_SEND_FOR').$GLOBALS['xoopsModule']->getVar('dirname');

+        $body        = \constant('CO_'.$moduleDirNameUpper.'_'.'FB_NAME').': '.$your_name.'<br>';

+        $body        .= \constant('CO_'.$moduleDirNameUpper.'_'.'FB_MAIL').': '.$your_mail.'<br>';

+        $body        .= \constant('CO_'.$moduleDirNameUpper.'_'.'FB_SITE').': '.$your_site.'<br>';

+        $body        .= \constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE').': '.$fb_type.'<br><br>';

+        $body        .= \constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_CONTENT').':<br>';

         $body        .= $fb_content;

         $xoopsMailer = xoops_getMailer();

         $xoopsMailer->useMail();

@@ -77,7 +77,7 @@ 
         $xoopsMailer->setBody($body);

         $ret = $xoopsMailer->send();

         if ($ret) {

-            \redirect_header('index.php', 3, \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_SUCCESS'));

+            \redirect_header('index.php', 3, \constant('CO_'.$moduleDirNameUpper.'_'.'FB_SEND_SUCCESS'));

         }

 

         // show form with content again

@@ -87,11 +87,11 @@ 
         $feedback->type    = $fb_type;

         $feedback->content = $fb_content;

         echo '<div style="text-align:center;width: 80%; padding: 10px; border: 2px solid #ff0000; color: #ff0000; margin-right:auto;margin-left:auto;">

-            <h3>' . \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SEND_ERROR') . '</h3>

+            <h3>' . \constant('CO_'.$moduleDirNameUpper.'_'.'FB_SEND_ERROR').'</h3>

             </div>';

         $form = $feedback->getFormFeedback();

         $form->display();

 

         break;

 }

-require __DIR__ . '/footer.php';

+require __DIR__.'/footer.php';