ggoffy / wggithub

index.php

Spacing +15 added lines, -15 removed lines

@@ -28,15 +28,15 @@ 
     Github\GithubClient
 };
 
-require __DIR__ . '/header.php';
+require __DIR__.'/header.php';
 $GLOBALS['xoopsOption']['template_main'] = 'wggithub_index.tpl';
-include_once \XOOPS_ROOT_PATH . '/header.php';
+include_once \XOOPS_ROOT_PATH.'/header.php';
 
 // Permissions
 $permGlobalView = $permissionsHandler->getPermGlobalView();
 if (!$permGlobalView) {
     $GLOBALS['xoopsTpl']->assign('error', _NOPERM);
-    require __DIR__ . '/footer.php';
+    require __DIR__.'/footer.php';
 }
 $permGlobalRead   = $permissionsHandler->getPermGlobalRead();
 $permReadmeUpdate = $permissionsHandler->getPermReadmeUpdate();
@@ -50,7 +50,7 @@ 
 
 // Define Stylesheet
 $GLOBALS['xoTheme']->addStylesheet($style, null);
-$GLOBALS['xoTheme']->addStylesheet(WGGITHUB_URL . '/assets/css/tabs.css', null);
+$GLOBALS['xoTheme']->addStylesheet(WGGITHUB_URL.'/assets/css/tabs.css', null);
 $keywords = [];
 // 
 $GLOBALS['xoopsTpl']->assign('xoops_icons32_url', XOOPS_ICONS32_URL);
@@ -127,7 +127,7 @@ 
             foreach (\array_keys($directoriesAll) as $i) {
                 $directories[$i] = $directoriesAll[$i]->getValuesDirectories();
                 $dirName = $directoriesAll[$i]->getVar('dir_name');
-                $dirFilterRelease = (bool)$directoriesAll[$i]->getVar('dir_filterrelease');
+                $dirFilterRelease = (bool) $directoriesAll[$i]->getVar('dir_filterrelease');
                 $repos = [];
                 $crRepositories = new \CriteriaCompo();
                 //first block/parentheses
@@ -202,9 +202,9 @@ 
                 }
                 $directories[$i]['repos'] = $repos;
                 $directories[$i]['previousRepos'] = $start > 0;
-                $directories[$i]['previousOp'] = '&start=' . ($start - $limit) . '&limit=' . $limit . '&release=' . $filterRelease . '&sortby=' . $filterSortby;
+                $directories[$i]['previousOp'] = '&start='.($start - $limit).'&limit='.$limit.'&release='.$filterRelease.'&sortby='.$filterSortby;
                 $directories[$i]['nextRepos'] = ($repositoriesCount - $start) > $limit;
-                $directories[$i]['nextOp'] = '&start=' . ($start + $limit) . '&limit=' . $limit . '&release=' . $filterRelease . '&sortby=' . $filterSortby;
+                $directories[$i]['nextOp'] = '&start='.($start + $limit).'&limit='.$limit.'&release='.$filterRelease.'&sortby='.$filterSortby;
                 $GLOBALS['xoopsTpl']->assign('start', $start);
                 $GLOBALS['xoopsTpl']->assign('limit', $limit);
                 $GLOBALS['xoopsTpl']->assign('menu', $menu);
@@ -214,8 +214,8 @@ 
             unset($crDirectories, $directories);
             // Display Navigation
             if ($directoriesCount > $limit) {
-                require_once \XOOPS_ROOT_PATH . '/class/pagenav.php';
-                $pagenav = new \XoopsPageNav($directoriesCount, $limit, $start, 'start', 'op=list&limit=' . $limit);
+                require_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));
             }
             $GLOBALS['xoopsTpl']->assign('lang_thereare', \sprintf(\_MA_WGGITHUB_INDEX_THEREARE, $directoriesCount));
@@ -228,12 +228,12 @@ 
         // Permissions
         if (!$permGlobalRead) {
             $GLOBALS['xoopsTpl']->assign('error', \_NOPERM);
-            require __DIR__ . '/footer.php';
+            require __DIR__.'/footer.php';
         }
         $dirName = Request::getString('dir_name', '');
         $start   = 0; //reset to default
         $limit   = Request::getInt('limit', $helper->getConfig('userpager'));
-        $redir   = 'index.php?op=list_afterupdate&start=' . $start . '&limit=' . $limit . '&release=' . $filterRelease . '&sortby=' . $filterSortby;
+        $redir   = 'index.php?op=list_afterupdate&start='.$start.'&limit='.$limit.'&release='.$filterRelease.'&sortby='.$filterSortby;
         $githubClient = GithubClient::getInstance();
         $result = $githubClient->executeUpdate($dirName);
         if ($result) {
@@ -247,14 +247,14 @@ 
         // Permissions
         if (!$permReadmeUpdate) {
             $GLOBALS['xoopsTpl']->assign('error', \_NOPERM);
-            require __DIR__ . '/footer.php';
+            require __DIR__.'/footer.php';
         }
         $start    = 0; //reset to default
         $limit    = Request::getInt('limit', $helper->getConfig('userpager'));
         $repoId   = Request::getInt('repo_id', 0);
         $repoUser = Request::getString('repo_user', 'none');
         $repoName = Request::getString('repo_name', 'none');
-        $redir    = 'index.php?op=list_afterupdate&start=' . $start . '&limit=' . $limit . '&release=' . $filterRelease . '&sortby=' . $filterSortby;
+        $redir    = 'index.php?op=list_afterupdate&start='.$start.'&limit='.$limit.'&release='.$filterRelease.'&sortby='.$filterSortby;
         $result = $helper->getHandler('Readmes')->updateReadmes($repoId, $repoUser, $repoName);
         if ($result) {
             \redirect_header($redir, 2, \_MA_WGGITHUB_READGH_SUCCESS);
@@ -268,11 +268,11 @@ 
 // Breadcrumbs
 $xoBreadcrumbs[] = ['title' => \_MA_WGGITHUB_INDEX];
 // Keywords
-wggithubMetaKeywords($helper->getConfig('keywords') . ', ' . \implode(',', $keywords));
+wggithubMetaKeywords($helper->getConfig('keywords').', '.\implode(',', $keywords));
 unset($keywords);
 // Description
 wggithubMetaDescription(\_MA_WGGITHUB_INDEX_DESC);
 $GLOBALS['xoopsTpl']->assign('xoops_mpageurl', WGGITHUB_URL.'/index.php');
 $GLOBALS['xoopsTpl']->assign('xoops_icons32_url', XOOPS_ICONS32_URL);
 $GLOBALS['xoopsTpl']->assign('wggithub_upload_url', WGGITHUB_UPLOAD_URL);
-require __DIR__ . '/footer.php';
+require __DIR__.'/footer.php';

include/update.php

Spacing +22 added lines, -22 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;
         }

class/ReadmesHandler.php

Spacing +6 added lines, -6 removed lines

@@ -170,7 +170,7 @@ 
                     $readmesObj->setVar('rm_content', $readme['content']);
                     $readmesObj->setVar('rm_encoding', $readme['encoding']);
                     $readmesObj->setVar('rm_downloadurl', $readme['download_url']);
-                    $readmesObj->setVar('rm_datecreated',time());
+                    $readmesObj->setVar('rm_datecreated', time());
                     $readmesObj->setVar('rm_submitter', $submitter);
                     // Insert Data
                     if (!$readmesHandler->insert($readmesObj)) {
@@ -232,7 +232,7 @@ 
             $readmesObj->setVar('rm_downloadurl', $readme['download_url']);
             $baseurl = \substr($readme['html_url'], 0, \strrpos($readme['html_url'], '/') + 1);
             $readmesObj->setVar('rm_baseurl', $baseurl);
-            $readmesObj->setVar('rm_datecreated',time());
+            $readmesObj->setVar('rm_datecreated', time());
             $readmesObj->setVar('rm_submitter', $submitter);
             // Insert Data
             if (!$readmesHandler->insert($readmesObj)) {
@@ -266,10 +266,10 @@ 
     public function updateRepoReadme()
     {
         // update repo_readme
-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . ' INNER JOIN ' . $GLOBALS['xoopsDB']->prefix('wggithub_readmes');
-        $sql .= ' ON ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . '.repo_id = ' . $GLOBALS['xoopsDB']->prefix('wggithub_readmes') . '.rm_repoid ';
-        $sql .= 'SET ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . '.repo_readme = 1 ';
-        $sql .= 'WHERE (((' . $GLOBALS['xoopsDB']->prefix('wggithub_readmes') . '.rm_id)>0));';
+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').' INNER JOIN '.$GLOBALS['xoopsDB']->prefix('wggithub_readmes');
+        $sql .= ' ON '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').'.repo_id = '.$GLOBALS['xoopsDB']->prefix('wggithub_readmes').'.rm_repoid ';
+        $sql .= 'SET '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').'.repo_readme = 1 ';
+        $sql .= 'WHERE ((('.$GLOBALS['xoopsDB']->prefix('wggithub_readmes').'.rm_id)>0));';
         $GLOBALS['xoopsDB']->queryF($sql);
 
         return true;

class/Readmes.php

Spacing +8 added lines, -8 removed lines

@@ -137,7 +137,7 @@ 
         $helper  = \XoopsModules\Wggithub\Helper::getInstance();
         $utility = new \XoopsModules\Wggithub\Utility();
         $ret = $this->getValues($keys, $format, $maxDepth);
-        $ret['id']            = $this->getVar('rm_id');
+        $ret['id'] = $this->getVar('rm_id');
         $repositoriesHandler = $helper->getHandler('Repositories');
         $repositoriesObj = $repositoriesHandler->get($this->getVar('rm_repoid'));
         $repoName = '*****missing repo_name*****';
@@ -166,12 +166,12 @@ 
                 "src='assets/"
             ];
             $arrReplace = [
-                'src="' . $baseUrl . '.gitbook/assets/',
-                "src='" . $baseUrl . '.gitbook/assets/',
-                'src="' . $baseUrl . 'en/assets/',
-                "src='" . $baseUrl . 'en/assets/',
-                'src="' . $baseUrl . 'assets/',
-                "src='" . $baseUrl . 'assets/'
+                'src="'.$baseUrl.'.gitbook/assets/',
+                "src='".$baseUrl.'.gitbook/assets/',
+                'src="'.$baseUrl.'en/assets/',
+                "src='".$baseUrl.'en/assets/',
+                'src="'.$baseUrl.'assets/',
+                "src='".$baseUrl.'assets/'
             ];
             $contentClean = str_replace($arrSearch, $arrReplace, $contentEncoded);
         } else {
@@ -186,7 +186,7 @@ 
         $ret['submitter']     = \XoopsUser::getUnameFromId($this->getVar('rm_submitter'));
         $ret['gitbook_link']  = '';
         if (strpos($ret['downloadurl'], 'XoopsDoc') > 0) {
-            $ret['gitbook_link']  = 'https://xoops.gitbook.io/' . $repoName . '/';
+            $ret['gitbook_link'] = 'https://xoops.gitbook.io/'.$repoName.'/';
         }
         return $ret;
     }