ggoffy / wggithub

admin/readmes.php

Spacing +6 added lines, -6 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');

 $rmId  = Request::getInt('rm_id');

@@ -65,7 +65,7 @@ 
                     $in[] = $i;

                 }

             }

-            $crReadmes->add(new Criteria('rm_repoid', '(' . \implode(',', $in) . ')', 'IN'));

+            $crReadmes->add(new Criteria('rm_repoid', '('.\implode(',', $in).')', 'IN'));

         }

         $crReadmes->setStart($start);

         $crReadmes->setLimit($limit);

@@ -83,8 +83,8 @@ 
             }

             // Display Navigation

             if ($readmesCount > $limit) {

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

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

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

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

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

             }

         } else {

@@ -130,7 +130,7 @@ 
         $readmesObj->setVar('rm_submitter', Request::getInt('rm_submitter', 0));

         // Insert Data

         if ($readmesHandler->insert($readmesObj)) {

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

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

         }

         // Get Form

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

@@ -172,4 +172,4 @@ 
         }

         break;

 }

-require __DIR__ . '/footer.php';

+require __DIR__.'/footer.php';

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

admin/releases.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');

 $relId = Request::getInt('rel_id');

@@ -72,8 +72,8 @@ 
             }

             // Display Navigation

             if ($releasesCount > $limit) {

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

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

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

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

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

             }

         } else {

@@ -119,7 +119,7 @@ 
         $releasesObj->setVar('rel_submitter', Request::getInt('rel_submitter', 0));

         // Insert Data

         if ($releasesHandler->insert($releasesObj)) {

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

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

         }

         // Get Form

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

@@ -161,4 +161,4 @@ 
         }

         break;

 }

-require __DIR__ . '/footer.php';

+require __DIR__.'/footer.php';

admin/header.php

Spacing +8 added lines, -8 removed lines

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

  */

 

-include \dirname(__DIR__, 3) . '/include/cp_header.php';

-include_once \dirname(__DIR__) . '/include/common.php';

+include \dirname(__DIR__, 3).'/include/cp_header.php';

+include_once \dirname(__DIR__).'/include/common.php';

 

-$sysPathIcon16   = '../' . $GLOBALS['xoopsModule']->getInfo('sysicons16');

-$sysPathIcon32   = '../' . $GLOBALS['xoopsModule']->getInfo('sysicons32');

+$sysPathIcon16   = '../'.$GLOBALS['xoopsModule']->getInfo('sysicons16');

+$sysPathIcon32   = '../'.$GLOBALS['xoopsModule']->getInfo('sysicons32');

 $pathModuleAdmin = $GLOBALS['xoopsModule']->getInfo('dirmoduleadmin');

-$modPathIcon16   = WGGITHUB_URL . '/' . $GLOBALS['xoopsModule']->getInfo('modicons16') . '/';

-$modPathIcon32   = WGGITHUB_URL . '/' . $GLOBALS['xoopsModule']->getInfo('modicons32') . '/';

+$modPathIcon16   = WGGITHUB_URL.'/'.$GLOBALS['xoopsModule']->getInfo('modicons16').'/';

+$modPathIcon32   = WGGITHUB_URL.'/'.$GLOBALS['xoopsModule']->getInfo('modicons32').'/';

 

 // Get instance of module

 $helper = \XoopsModules\Wggithub\Helper::getInstance();

@@ -40,7 +40,7 @@ 
 $myts = MyTextSanitizer::getInstance();

 // 

 if (!isset($xoopsTpl) || !\is_object($xoopsTpl)) {

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

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

     $xoopsTpl = new \XoopsTpl();

 }

 

@@ -64,4 +64,4 @@ 
 $GLOBALS['xoopsTpl']->assign('modPathIcon32', $modPathIcon32);

 

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

-$style = WGGITHUB_URL . '/assets/css/admin/style.css';

+$style = WGGITHUB_URL.'/assets/css/admin/style.css';

admin/permissions.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 use XoopsModules\Wggithub;

 use XoopsModules\Wggithub\Constants;

 

-require __DIR__ . '/header.php';

+require __DIR__.'/header.php';

 

 // Template Index

 $templateMain = 'wggithub_admin_permissions.tpl';

@@ -33,7 +33,7 @@ 
 $op = Request::getCmd('op', 'global');

 

 // Get Form

-include_once \XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';

+include_once \XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php';

 \xoops_load('XoopsFormLoader');

 

 $formTitle = \_AM_WGGITHUB_PERMISSIONS_GLOBAL;

@@ -61,4 +61,4 @@ 
     exit();

 }

 

-require __DIR__ . '/footer.php';

+require __DIR__.'/footer.php';

tests/test.php

Spacing +3 added lines, -3 removed lines

@@ -28,9 +28,9 @@ 
     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';

 // Define Stylesheet

 $GLOBALS['xoTheme']->addStylesheet($style, null);

 $keywords = [];

@@ -166,4 +166,4 @@ 
 var_dump($result);

 */

 

-require __DIR__ . '/footer.php';

+require __DIR__.'/footer.php';

tests/github-api.php

Spacing +25 added lines, -25 removed lines

@@ -30,7 +30,7 @@ 
 use XoopsModules\Wggithub;

 use XoopsModules\Wggithub\Github;

 

-require __DIR__ . '/header.php';

+require __DIR__.'/header.php';

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

 

 /*

@@ -45,46 +45,46 @@ 
 

 $data = [];

 $url = '/orgs/XoopsModules25x/repos?per_page=100&page=1';

-echo "<br>Test read org repo:" . $url;

+echo "<br>Test read org repo:".$url;

 $api = new XoopsModules\Wggithub\Github\GithubClient();

 $data = $api->testMilo($url);

 $count = 0;

 foreach ($data as $key => $repo) {

-    echo "<br>key:" . $key . ' repo:' . $repo['name'];

+    echo "<br>key:".$key.' repo:'.$repo['name'];

     $count++;

-    if ($count>5) {break;}

+    if ($count > 5) {break; }

 }

 

 

 $data = [];

 $url = '/users/ggoffy/repos?per_page=100&page=1';

-echo "<br><br>Test read user repo:" . $url;

+echo "<br><br>Test read user repo:".$url;

 $api = new XoopsModules\Wggithub\Github\GithubClient();

 $data = $api->testMilo($url);

 $count = 0;

 foreach ($data as $key => $repo) {

-    echo "<br>key:" . $key . ' repo:' . $repo['name'];

+    echo "<br>key:".$key.' repo:'.$repo['name'];

     $count++;

-    if ($count>5) {break;}

+    if ($count > 5) {break; }

 }

 

 

 $data = [];

 $url = '/repos/XoopsModules25x/smallworld/readme';

-echo "<br><br>test read readme orgs:" . $url;

+echo "<br><br>test read readme orgs:".$url;

 $api = new XoopsModules\Wggithub\Github\GithubClient();

 $data = $api->testMilo($url);

-echo '<br>name:' . $data['name'];

-echo '<br>download_url:' . $data['download_url'];

+echo '<br>name:'.$data['name'];

+echo '<br>download_url:'.$data['download_url'];

 

 

 $data = [];

 $url = '/repos/ggoffy/wggithub/readme';

-echo "<br><br>test read readme user:" . $url;

+echo "<br><br>test read readme user:".$url;

 $api = new XoopsModules\Wggithub\Github\GithubClient();

 $data = $api->testMilo($url);

-echo '<br>name:' . $data['name'];

-echo '<br>download_url:' . $data['download_url'];

+echo '<br>name:'.$data['name'];

+echo '<br>download_url:'.$data['download_url'];

 

 

 echo "<br><br><br>-----------------------------------";

@@ -93,45 +93,45 @@ 
 

 $data = [];

 $url = '/orgs/XoopsModules25x/repos?per_page=100&page=1';

-echo "<br>Test read org repo:" . $url;

+echo "<br>Test read org repo:".$url;

 $api = new XoopsModules\Wggithub\Github\GithubClient();

 $data = $api->testMilo2($url);

 $count = 0;

 foreach ($data as $key => $repo) {

-    echo "<br>key:" . $key . ' repo:' . $repo['name'];

+    echo "<br>key:".$key.' repo:'.$repo['name'];

     $count++;

-    if ($count>5) {break;}

+    if ($count > 5) {break; }

 }

 

 

 $data = [];

 $url = '/users/ggoffy/repos?per_page=100&page=1';

-echo "<br><br>Test read user repo:" . $url;

+echo "<br><br>Test read user repo:".$url;

 $api = new XoopsModules\Wggithub\Github\GithubClient();

 $data = $api->testMilo2($url);

 $count = 0;

 foreach ($data as $key => $repo) {

-    echo "<br>key:" . $key . ' repo:' . $repo['name'];

+    echo "<br>key:".$key.' repo:'.$repo['name'];

     $count++;

-    if ($count>5) {break;}

+    if ($count > 5) {break; }

 }

 

 

 $data = [];

 $url = '/repos/XoopsModules25x/smallworld/readme';

-echo "<br><br>test read readme orgs:" . $url;

+echo "<br><br>test read readme orgs:".$url;

 $api = new XoopsModules\Wggithub\Github\GithubClient();

 $data = $api->testMilo2($url);

-echo '<br>name:' . $data['name'];

-echo '<br>download_url:' . $data['download_url'];

+echo '<br>name:'.$data['name'];

+echo '<br>download_url:'.$data['download_url'];

 

 

 $data = [];

 $url = '/repos/ggoffy/wggithub/readme';

-echo "<br><br>test read readme user:" . $url;

+echo "<br><br>test read readme user:".$url;

 $api = new XoopsModules\Wggithub\Github\GithubClient();

 $data = $api->testMilo2($url);

-echo '<br>name:' . $data['name'];

-echo '<br>download_url:' . $data['download_url'];

+echo '<br>name:'.$data['name'];

+echo '<br>download_url:'.$data['download_url'];

 

 

config/paths.php

Spacing +10 added lines, -10 removed lines

@@ -5,20 +5,20 @@
     $moduleDirName      = \basename(\dirname(__DIR__));

     $moduleDirNameUpper = \mb_strtoupper($moduleDirName);

 

-    return (object)[

-        'name'          => \mb_strtoupper($moduleDirName) . ' PathConfigurator',

+    return (object) [

+        'name'          => \mb_strtoupper($moduleDirName).' PathConfigurator',

         'paths'         => [

             'dirname'    => $moduleDirName,

-            'admin'      => \XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',

-            'modPath'    => \XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,

-            'modUrl'     => \XOOPS_URL . '/modules/' . $moduleDirName,

-            'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,

-            'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,

+            'admin'      => \XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',

+            'modPath'    => \XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,

+            'modUrl'     => \XOOPS_URL.'/modules/'.$moduleDirName,

+            'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,

+            'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,

         ],

         'uploadFolders' => [

-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,

-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',

-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',

+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName,

+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',

+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',

             //XOOPS_UPLOAD_PATH . '/flags'

         ],

     ];

config/config.php

Spacing +13 added lines, -13 removed lines

@@ -24,26 +24,26 @@ 
  * return object

  */

 

-$moduleDirName  = \basename(\dirname(__DIR__));

-$moduleDirNameUpper  = \mb_strtoupper($moduleDirName);

-return (object)[

-    'name'           => \mb_strtoupper($moduleDirName) . ' Module Configurator',

+$moduleDirName = \basename(\dirname(__DIR__));

+$moduleDirNameUpper = \mb_strtoupper($moduleDirName);

+return (object) [

+    'name'           => \mb_strtoupper($moduleDirName).' Module Configurator',

     'paths'          => [

         'dirname'    => $moduleDirName,

-        'admin'      => \XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',

-        'modPath'    => \XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,

-        'modUrl'     => \XOOPS_URL . '/modules/' . $moduleDirName,

-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,

-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,

+        'admin'      => \XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',

+        'modPath'    => \XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,

+        'modUrl'     => \XOOPS_URL.'/modules/'.$moduleDirName,

+        'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,

+        'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,

     ],

     'uploadFolders'  => [

-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,

+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,

     ],

     'copyBlankFiles'  => [

     ],

     'copyTestFolders'  => [

-        [\XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',

-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName],

+        [\XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/uploads',

+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName],

     ],

     'templateFolders'  => [

         '/templates/',

@@ -56,5 +56,5 @@ 
     ],

     'moduleStats'  => [

     ],

-    'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'><img src='" . \XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . "/assets/images/logo/logoModule.png' alt='XOOPS Project'></a>",

+    'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'><img src='".\XOOPS_ROOT_PATH.'/modules/'.$moduleDirName."/assets/images/logo/logoModule.png' alt='XOOPS Project'></a>",

 ];