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',
@@ -270,8 +270,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,

admin/directories.php

Spacing +14 added lines, -14 removed lines

@@ -27,7 +27,7 @@ 
     Github\GithubClient
 };
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 // It recovered the value of argument op in URL$
 $op    = Request::getCmd('op', 'list');
 $dirId = Request::getInt('dir_id');
@@ -41,8 +41,8 @@ 
     default:
         // Define Stylesheet
         $GLOBALS['xoTheme']->addStylesheet($style, null);
-        $GLOBALS['xoTheme']->addScript(WGGITHUB_URL . '/assets/js/jquery-ui.js');
-        $GLOBALS['xoTheme']->addScript(WGGITHUB_URL . '/assets/js/sortable.js');
+        $GLOBALS['xoTheme']->addScript(WGGITHUB_URL.'/assets/js/jquery-ui.js');
+        $GLOBALS['xoTheme']->addScript(WGGITHUB_URL.'/assets/js/sortable.js');
         $templateMain = 'wggithub_admin_directories.tpl';
         $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation('directories.php'));
         $adminObject->addItemButton(_AM_WGGITHUB_ADD_DIRECTORY, 'directories.php?op=new', 'add');
@@ -52,7 +52,7 @@ 
         $GLOBALS['xoopsTpl']->assign('directories_count', $directoriesCount);
         $GLOBALS['xoopsTpl']->assign('wggithub_url', WGGITHUB_URL);
         $GLOBALS['xoopsTpl']->assign('wggithub_upload_url', WGGITHUB_UPLOAD_URL);
-        $GLOBALS['xoopsTpl']->assign('wggithub_icons_url_16', WGGITHUB_ICONS_URL . '/16');
+        $GLOBALS['xoopsTpl']->assign('wggithub_icons_url_16', WGGITHUB_ICONS_URL.'/16');
         // Table view directories
         if ($directoriesCount > 0) {
             foreach (\array_keys($directoriesAll) as $i) {
@@ -62,8 +62,8 @@ 
             }
             // Display Navigation
             if ($directoriesCount > $limit) {
-                include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-                $pagenav = new \XoopsPageNav($directoriesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
+                include_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+                $pagenav = new \XoopsPageNav($directoriesCount, $limit, $start, 'start', 'op=list&limit='.$limit);
                 $GLOBALS['xoopsTpl']->assign('pagenav', $pagenav->renderNav(4));
             }
         } else {
@@ -103,7 +103,7 @@ 
         $directoriesObj->setVar('dir_submitter', Request::getInt('dir_submitter', 0));
         // Insert Data
         if ($directoriesHandler->insert($directoriesObj)) {
-            \redirect_header('directories.php?op=list&start=' . $start . '&limit=' . $limit, 2, _AM_WGGITHUB_FORM_OK);
+            \redirect_header('directories.php?op=list&start='.$start.'&limit='.$limit, 2, _AM_WGGITHUB_FORM_OK);
         }
         // Get Form
         $GLOBALS['xoopsTpl']->assign('error', $directoriesObj->getHtmlErrors());
@@ -142,7 +142,7 @@ 
                     $crReadmes = new \CriteriaCompo();
                     $crReadmes->add(new \Criteria('rm_repoid', $repoId));
                     if (!$readmesHandler->deleteAll($crReadmes)) {
-                        $errors[] = \_AM_WGGITHUB_ERROR_DELETE_DATA . ' READMES';
+                        $errors[] = \_AM_WGGITHUB_ERROR_DELETE_DATA.' READMES';
                     }
                 }
                 if ($repositoriesAll[$i]->getVar('repo_release') > 0 || $repositoriesAll[$i]->getVar('repo_prerelease') > 0) {
@@ -150,17 +150,17 @@ 
                     $crReleases = new \CriteriaCompo();
                     $crReleases->add(new \Criteria('rel_repoid', $repoId));
                     if (!$releasesHandler->deleteAll($crReleases)) {
-                        $errors[] = \_AM_WGGITHUB_ERROR_DELETE_DATA . ' RELEASES';
+                        $errors[] = \_AM_WGGITHUB_ERROR_DELETE_DATA.' RELEASES';
                     }
                 }
             }
             if (!$repositoriesHandler->deleteAll($crRepositories)) {
-                $errors[] = \_AM_WGGITHUB_ERROR_DELETE_DATA . ' REPOSITORIES';
+                $errors[] = \_AM_WGGITHUB_ERROR_DELETE_DATA.' REPOSITORIES';
             }
             unset($crReadmes, $crReleases, $repositoriesAll);
             //delete directory
             if (!$directoriesHandler->delete($directoriesObj)) {
-                $errors[] = \_AM_WGGITHUB_ERROR_DELETE_DATA . ' DIRECTORIES - ' . $directoriesObj->getHtmlErrors();
+                $errors[] = \_AM_WGGITHUB_ERROR_DELETE_DATA.' DIRECTORIES - '.$directoriesObj->getHtmlErrors();
             }
             if (0 == \count($errors)) {
                 \redirect_header('directories.php', 3, _AM_WGGITHUB_FORM_DELETE_OK);
@@ -181,7 +181,7 @@ 
         $dirName = $directoriesObj->getVar('dir_name');
         $githubClient = GithubClient::getInstance();
         $result = $githubClient->executeUpdate($dirName);
-        $redir = 'directories.php?op=list&start=' . $start . '&limit=' . $limit;
+        $redir = 'directories.php?op=list&start='.$start.'&limit='.$limit;
         if ($result) {
             \redirect_header($redir, 2, \_MA_WGGITHUB_READGH_SUCCESS);
         } else {
@@ -194,7 +194,7 @@ 
             $directoriesObj->setVar(Request::getString('field'), Request::getInt('value', 0));
             // Insert Data
             if ($directoriesHandler->insert($directoriesObj, true)) {
-                \redirect_header('directories.php?op=list&start=' . $start . '&limit=' . $limit, 2, _AM_WGGITHUB_FORM_OK);
+                \redirect_header('directories.php?op=list&start='.$start.'&limit='.$limit, 2, _AM_WGGITHUB_FORM_OK);
             }
         }
         break;
@@ -207,4 +207,4 @@ 
         }
         break;
 }
-require __DIR__ . '/footer.php';
+require __DIR__.'/footer.php';

include/update.php

Spacing +24 added lines, -24 removed lines

@@ -39,7 +39,7 @@ 
     $ret = wggithub_check_db($module);
 
     //check upload directory
-    include_once __DIR__ . '/install.php';
+    include_once __DIR__.'/install.php';
     $ret = xoops_module_install_wggithub($module);
 
     $errors = $module->getErrors();
@@ -61,7 +61,7 @@ 
 {
     global $xoopsDB;
     $result = $xoopsDB->query(
-        'SELECT t1.tpl_id FROM ' . $xoopsDB->prefix('tplfile') . ' t1, ' . $xoopsDB->prefix('tplfile') . ' t2 WHERE t1.tpl_refid = t2.tpl_refid AND t1.tpl_module = t2.tpl_module AND t1.tpl_tplset=t2.tpl_tplset AND t1.tpl_file = t2.tpl_file AND t1.tpl_type = t2.tpl_type AND t1.tpl_id > t2.tpl_id'
+        'SELECT t1.tpl_id FROM '.$xoopsDB->prefix('tplfile').' t1, '.$xoopsDB->prefix('tplfile').' t2 WHERE t1.tpl_refid = t2.tpl_refid AND t1.tpl_module = t2.tpl_module AND t1.tpl_tplset=t2.tpl_tplset AND t1.tpl_file = t2.tpl_file AND t1.tpl_type = t2.tpl_type AND t1.tpl_id > t2.tpl_id'
     );
     $tplids = [];
     while (false !== (list($tplid) = $xoopsDB->fetchRow($result))) {
@@ -69,7 +69,7 @@ 
     }
     if (\count($tplids) > 0) {
         $tplfileHandler  = \xoops_getHandler('tplfile');
-        $duplicate_files = $tplfileHandler->getObjects(new \Criteria('tpl_id', '(' . \implode(',', $tplids) . ')', 'IN'));
+        $duplicate_files = $tplfileHandler->getObjects(new \Criteria('tpl_id', '('.\implode(',', $tplids).')', 'IN'));
 
         if (\count($duplicate_files) > 0) {
             foreach (\array_keys($duplicate_files) as $i) {
@@ -77,9 +77,9 @@ 
             }
         }
     }
-    $sql = 'SHOW INDEX FROM ' . $xoopsDB->prefix('tplfile') . " WHERE KEY_NAME = 'tpl_refid_module_set_file_type'";
+    $sql = 'SHOW INDEX FROM '.$xoopsDB->prefix('tplfile')." WHERE KEY_NAME = 'tpl_refid_module_set_file_type'";
     if (!$result = $xoopsDB->queryF($sql)) {
-        xoops_error($xoopsDB->error() . '<br>' . $sql);
+        xoops_error($xoopsDB->error().'<br>'.$sql);
 
         return false;
     }
@@ -92,9 +92,9 @@ 
 
         return true;
     }
-    $sql = 'ALTER TABLE ' . $xoopsDB->prefix('tplfile') . ' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )';
+    $sql = 'ALTER TABLE '.$xoopsDB->prefix('tplfile').' ADD UNIQUE tpl_refid_module_set_file_type ( tpl_refid, tpl_module, tpl_tplset, tpl_file, tpl_type )';
     if (!$result = $xoopsDB->queryF($sql)) {
-        xoops_error($xoopsDB->error() . '<br>' . $sql);
+        xoops_error($xoopsDB->error().'<br>'.$sql);
         $module->setErrors("'tpl_refid_module_set_file_type' unique index is not added to 'tplfile' table. Warning: do not use XOOPS until you add this unique index.");
 
         return false;
@@ -118,12 +118,12 @@ 
     // update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_repositories');
     $field   = 'repo_release';
-    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
     if (!$numRows) {
         $sql = "ALTER TABLE `$table` ADD `$field` INT(1) NOT NULL DEFAULT '0' AFTER `repo_htmlurl`;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when adding '$field' to table '$table'.");
             $ret = false;
         }
@@ -132,12 +132,12 @@ 
     // update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_repositories');
     $field   = 'repo_prerelease';
-    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
     if (!$numRows) {
         $sql = "ALTER TABLE `$table` ADD `$field` INT(1) NOT NULL DEFAULT '0' AFTER `repo_htmlurl`;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when adding '$field' to table '$table'.");
             $ret = false;
         }
@@ -145,12 +145,12 @@ 
     // update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_repositories');
     $field   = 'repo_readme';
-    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
     if (!$numRows) {
         $sql = "ALTER TABLE `$table` ADD `$field` INT(1) NOT NULL DEFAULT '0' AFTER `repo_htmlurl`;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when adding '$field' to table '$table'.");
             $ret = false;
         }
@@ -159,12 +159,12 @@ 
     // update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_directories');
     $field   = 'dir_filterrelease';
-    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
     if (!$numRows) {
         $sql = "ALTER TABLE `$table` ADD `$field` INT(1) NOT NULL DEFAULT '0' AFTER `dir_online`;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when adding '$field' to table '$table'.");
             $ret = false;
         }
@@ -186,7 +186,7 @@ 
               PRIMARY KEY (`log_id`)
                 ) ENGINE=InnoDB;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when creating table '$table'.");
             $ret = false;
         }
@@ -195,12 +195,12 @@ 
     // update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_directories');
     $field   = 'dir_content';
-    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
     if (!$numRows) {
         $sql = "ALTER TABLE `$table` ADD `$field` INT(10) NOT NULL DEFAULT '0' AFTER `dir_type`;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when adding '$field' to table '$table'.");
             $ret = false;
         }
@@ -209,12 +209,12 @@ 
     // update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_directories');
     $field   = 'dir_descr';
-    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
     if (!$numRows) {
         $sql = "ALTER TABLE `$table` ADD `$field` TEXT NOT NULL AFTER `dir_type`;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when adding '$field' to table '$table'.");
             $ret = false;
         }
@@ -223,12 +223,12 @@ 
     // update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_readmes');
     $field   = 'rm_baseurl';
-    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
     if (!$numRows) {
         $sql = "ALTER TABLE `$table` ADD `$field` VARCHAR(255) NOT NULL DEFAULT '' AFTER `rm_downloadurl`;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when adding '$field' to table '$table'.");
             $ret = false;
         }
@@ -237,12 +237,12 @@ 
     // update table (add new field)
     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_directories');
     $field   = 'dir_weight';
-    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `' . $table . "` LIKE '" . $field . "'");
+    $check   = $GLOBALS['xoopsDB']->queryF('SHOW COLUMNS FROM `'.$table."` LIKE '".$field."'");
     $numRows = $GLOBALS['xoopsDB']->getRowsNum($check);
     if (!$numRows) {
         $sql = "ALTER TABLE `$table` ADD `$field` INT(10) NOT NULL DEFAULT '0' AFTER `dir_filterrelease`;";
         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {
-            xoops_error($GLOBALS['xoopsDB']->error() . '<br>' . $sql);
+            xoops_error($GLOBALS['xoopsDB']->error().'<br>'.$sql);
             $module->setErrors("Error when adding '$field' to table '$table'.");
             $ret = false;
         }

class/Directories.php

Spacing +4 added lines, -4 removed lines

@@ -176,10 +176,10 @@
                 break;
         }
         $ret['content_shorttext'] = Utility::truncateHtml($content_text);
-        $ret['autoupdate']        = (int)$this->getVar('dir_autoupdate') > 0 ? _YES : _NO;
-        $ret['online']            = (int)$this->getVar('dir_online') > 0 ? _YES : _NO;
-        $ret['filterrelease']     = (int)$this->getVar('dir_filterrelease') > 0 ? _YES : _NO;
-        $ret['weight']            = (int)$this->getVar('dir_weight');
+        $ret['autoupdate']        = (int) $this->getVar('dir_autoupdate') > 0 ? _YES : _NO;
+        $ret['online']            = (int) $this->getVar('dir_online') > 0 ? _YES : _NO;
+        $ret['filterrelease']     = (int) $this->getVar('dir_filterrelease') > 0 ? _YES : _NO;
+        $ret['weight']            = (int) $this->getVar('dir_weight');
         $ret['datecreated']       = \formatTimestamp($this->getVar('dir_datecreated'), 's');
         $ret['submitter']         = \XoopsUser::getUnameFromId($this->getVar('dir_submitter'));
         return $ret;