ggoffy / wggithub

class/Common/ModuleFeedback.php

Spacing +15 added lines, -15 removed lines

@@ -67,29 +67,29 @@ 
         $moduleDirNameUpper = \mb_strtoupper($moduleDirName);

         // Get Theme Form

         \xoops_load('XoopsFormLoader');

-        $form = new \XoopsThemeForm(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_FORM_TITLE'), 'formfeedback', 'feedback.php', 'post', true);

+        $form = new \XoopsThemeForm(\constant('CO_'.$moduleDirNameUpper.'_'.'FB_FORM_TITLE'), 'formfeedback', 'feedback.php', 'post', true);

         $form->setExtra('enctype="multipart/form-data"');

 

-        $recipient = new \XoopsFormText(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_RECIPIENT'), 'recipient', 50, 255, $GLOBALS['xoopsModule']->getInfo('author_mail'));

+        $recipient = new \XoopsFormText(\constant('CO_'.$moduleDirNameUpper.'_'.'FB_RECIPIENT'), 'recipient', 50, 255, $GLOBALS['xoopsModule']->getInfo('author_mail'));

         $recipient->setExtra('disabled="disabled"');

         $form->addElement($recipient);

-        $your_name = new \XoopsFormText(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME'), 'your_name', 50, 255, $this->name);

-        $your_name->setExtra('placeholder="' . \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_NAME_PLACEHOLER') . '"');

+        $your_name = new \XoopsFormText(\constant('CO_'.$moduleDirNameUpper.'_'.'FB_NAME'), 'your_name', 50, 255, $this->name);

+        $your_name->setExtra('placeholder="'.\constant('CO_'.$moduleDirNameUpper.'_'.'FB_NAME_PLACEHOLER').'"');

         $form->addElement($your_name);

-        $your_site = new \XoopsFormText(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE'), 'your_site', 50, 255, $this->site);

-        $your_site->setExtra('placeholder="' . \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_SITE_PLACEHOLER') . '"');

+        $your_site = new \XoopsFormText(\constant('CO_'.$moduleDirNameUpper.'_'.'FB_SITE'), 'your_site', 50, 255, $this->site);

+        $your_site->setExtra('placeholder="'.\constant('CO_'.$moduleDirNameUpper.'_'.'FB_SITE_PLACEHOLER').'"');

         $form->addElement($your_site);

-        $your_mail = new \XoopsFormText(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL'), 'your_mail', 50, 255, $this->email);

-        $your_mail->setExtra('placeholder="' . \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_MAIL_PLACEHOLER') . '"');

+        $your_mail = new \XoopsFormText(\constant('CO_'.$moduleDirNameUpper.'_'.'FB_MAIL'), 'your_mail', 50, 255, $this->email);

+        $your_mail->setExtra('placeholder="'.\constant('CO_'.$moduleDirNameUpper.'_'.'FB_MAIL_PLACEHOLER').'"');

         $form->addElement($your_mail);

 

-        $fbtypeSelect = new \XoopsFormSelect(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE'), 'fb_type', $this->type);

+        $fbtypeSelect = new \XoopsFormSelect(\constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE'), 'fb_type', $this->type);

         $fbtypeSelect->addOption('', '');

-        $fbtypeSelect->addOption(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_SUGGESTION'), \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_SUGGESTION'));

-        $fbtypeSelect->addOption(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_BUGS'), \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_BUGS'));

-        $fbtypeSelect->addOption(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_TESTIMONIAL'), \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_TESTIMONIAL'));

-        $fbtypeSelect->addOption(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_FEATURES'), \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_FEATURES'));

-        $fbtypeSelect->addOption(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_OTHERS'), \constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_OTHERS'));

+        $fbtypeSelect->addOption(\constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_SUGGESTION'), \constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_SUGGESTION'));

+        $fbtypeSelect->addOption(\constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_BUGS'), \constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_BUGS'));

+        $fbtypeSelect->addOption(\constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_TESTIMONIAL'), \constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_TESTIMONIAL'));

+        $fbtypeSelect->addOption(\constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_FEATURES'), \constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_FEATURES'));

+        $fbtypeSelect->addOption(\constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_OTHERS'), \constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_OTHERS'));

         $form->addElement($fbtypeSelect, true);

 

         $editorConfigs           = [];

@@ -104,7 +104,7 @@ 
         $configHandler           = \xoops_getHandler('config');

         $config                  = &$configHandler->getConfigsByCat(0, $module->getVar('mid'));

         $editorConfigs['editor'] = $config['general_editor'];

-        $editor                  = new \XoopsFormEditor(\constant('CO_' . $moduleDirNameUpper . '_' . 'FB_TYPE_CONTENT'), 'fb_content', $editorConfigs);

+        $editor                  = new \XoopsFormEditor(\constant('CO_'.$moduleDirNameUpper.'_'.'FB_TYPE_CONTENT'), 'fb_content', $editorConfigs);

         $form->addElement($editor, true);

 

         $form->addElement(new \XoopsFormHidden('op', 'send'));

class/Common/FilesManagement.php

Spacing +11 added lines, -11 removed lines

@@ -35,7 +35,7 @@ 
                     throw new \RuntimeException(\sprintf('Unable to create the %s directory', $folder));

                 }

 

-                file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');

+                file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');

             }

         } catch (\Exception $e) {

             echo 'Caught exception: ', $e->getMessage(), '<br>';

@@ -61,14 +61,14 @@ 
         $dir = \opendir($src);

         //        @\mkdir($dst);

         if (!@\mkdir($dst) && !\is_dir($dst)) {

-            throw new \RuntimeException('The directory ' . $dst . ' could not be created.');

+            throw new \RuntimeException('The directory '.$dst.' could not be created.');

         }

         while (false !== ($file = \readdir($dir))) {

             if (('.' !== $file) && ('..' !== $file)) {

-                if (\is_dir($src . '/' . $file)) {

-                    self::recurseCopy($src . '/' . $file, $dst . '/' . $file);

+                if (\is_dir($src.'/'.$file)) {

+                    self::recurseCopy($src.'/'.$file, $dst.'/'.$file);

                 } else {

-                    \copy($src . '/' . $file, $dst . '/' . $file);

+                    \copy($src.'/'.$file, $dst.'/'.$file);

                 }

             }

         }

@@ -207,7 +207,7 @@ 
                 self::rrmdir($fObj->getPathname());

             }

         }

-        $iterator = null;   // clear iterator Obj to close file/directory

+        $iterator = null; // clear iterator Obj to close file/directory

         return \rmdir($src); // remove the directory & return results

     }

 

@@ -240,14 +240,14 @@ 
         $iterator = new \DirectoryIterator($src);

         foreach ($iterator as $fObj) {

             if ($fObj->isFile()) {

-                \rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());

+                \rename($fObj->getPathname(), "{$dest}/".$fObj->getFilename());

             } elseif (!$fObj->isDot() && $fObj->isDir()) {

                 // Try recursively on directory

-                self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());

+                self::rmove($fObj->getPathname(), "{$dest}/".$fObj->getFilename());

                 //                \rmdir($fObj->getPath()); // now delete the directory

             }

         }

-        $iterator = null;   // clear iterator Obj to close file/directory

+        $iterator = null; // clear iterator Obj to close file/directory

         return \rmdir($src); // remove the directory & return results

     }

 

@@ -283,9 +283,9 @@ 
         $iterator = new \DirectoryIterator($src);

         foreach ($iterator as $fObj) {

             if ($fObj->isFile()) {

-                \copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());

+                \copy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());

             } elseif (!$fObj->isDot() && $fObj->isDir()) {

-                self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());

+                self::rcopy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());

             }

         }

 

class/Common/Configurator.php

Spacing +1 added lines, -1 removed lines

@@ -51,7 +51,7 @@
         //        require \dirname(\dirname(__DIR__)) . '/config/config.php';

         //        $config = getConfig();

 

-        $config = include \dirname(__DIR__, 2) . '/config/config.php';

+        $config = include \dirname(__DIR__, 2).'/config/config.php';

 

         $this->name            = $config->name;

         $this->paths           = $config->paths;

class/Common/Migrate.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
                 $this->synchronizeTable($tableName);

                 $updateTable = $GLOBALS['xoopsDB']->prefix($tableName);

                 $joinTable   = $GLOBALS['xoopsDB']->prefix($srcTableName);

-                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n" . "SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n" . '  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';

+                $sql         = "UPDATE `$updateTable` t1 INNER JOIN `$joinTable` t2 ON t1.post_id = t2.post_id \n"."SET t1.dohtml = t2.dohtml,  t1.dosmiley = t2.dosmiley, t1.doxcode = t2.doxcode\n".'  , t1.doimage = t2.doimage, t1.dobr = t2.dobr';

                 $this->tableHandler->addToQueue($sql);

             }

         }

class/Common/VersionChecks.php

Spacing +7 added lines, -7 removed lines

@@ -49,13 +49,13 @@ 
             $currentVer = $versionText;

         }

         if (null === $requiredVer) {

-            $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string

+            $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string

         }

         $success = true;

 

         if (\version_compare($currentVer, $requiredVer, '<')) {

             $success = false;

-            $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));

+            $module->setErrors(\sprintf(\constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));

         }

 

         return $success;

@@ -84,7 +84,7 @@ 
 

         if (false !== $reqVer && '' !== $reqVer) {

             if (\version_compare($verNum, $reqVer, '<')) {

-                $module->setErrors(\sprintf(\constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));

+                $module->setErrors(\sprintf(\constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP'), $reqVer, $verNum));

                 $success = false;

             }

         }

@@ -106,7 +106,7 @@ 
         $moduleDirName      = \basename(\dirname(__DIR__, 2));

         $moduleDirNameUpper = \mb_strtoupper($moduleDirName);

         $update             = '';

-        $repository         = 'XoopsModules25x/' . $moduleDirName;

+        $repository         = 'XoopsModules25x/'.$moduleDirName;

         //        $repository         = 'XoopsModules25x/publisher'; //for testing only

         $ret             = '';

         $infoReleasesUrl = "https://api.github.com/repos/$repository/releases";

@@ -120,14 +120,14 @@ 
                 if (false === $curlReturn) {

                     \trigger_error(\curl_error($curlHandle));

                 } elseif (mb_strpos($curlReturn, 'Not Found')) {

-                    \trigger_error('Repository Not Found: ' . $infoReleasesUrl);

+                    \trigger_error('Repository Not Found: '.$infoReleasesUrl);

                 } else {

                     $file              = \json_decode($curlReturn, false);

                     $latestVersionLink = \sprintf("https://github.com/$repository/archive/%s.zip", $file ? reset($file)->tag_name : $default);

                     $latestVersion     = $file[0]->tag_name;

                     $prerelease        = $file[0]->prerelease;

                     if ('master' !== $latestVersionLink) {

-                        $update = \constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion;

+                        $update = \constant('CO_'.$moduleDirNameUpper.'_'.'NEW_VERSION').$latestVersion;

                     }

                     //"PHP-standardized" version

                     $latestVersion = \mb_strtolower($latestVersion);

@@ -135,7 +135,7 @@ 
                         $latestVersion = \str_replace('_', '', \mb_strtolower($latestVersion));

                         $latestVersion = \str_replace('final', '', \mb_strtolower($latestVersion));

                     }

-                    $moduleVersion = ($helper->getModule()->getInfo('version') . '_' . $helper->getModule()->getInfo('module_status'));

+                    $moduleVersion = ($helper->getModule()->getInfo('version').'_'.$helper->getModule()->getInfo('module_status'));

                     //"PHP-standardized" version

                     $moduleVersion = \str_replace(' ', '', \mb_strtolower($moduleVersion));

                     //                    $moduleVersion = '1.0'; //for testing only

class/Common/Breadcrumb.php

Spacing +1 added lines, -1 removed lines

@@ -73,7 +73,7 @@
         require $GLOBALS['xoops']->path('class/template.php');

         $breadcrumbTpl = new \XoopsTpl();

         $breadcrumbTpl->assign('breadcrumb', $this->bread);

-        $html = $breadcrumbTpl->fetch('db:' . $this->dirname . '_common_breadcrumb.tpl');

+        $html = $breadcrumbTpl->fetch('db:'.$this->dirname.'_common_breadcrumb.tpl');

         unset($breadcrumbTpl);

 

         return $html;

class/Common/ServerStats.php

Spacing +12 added lines, -12 removed lines

@@ -36,19 +36,19 @@ 
         //        $query = $GLOBALS['xoopsDB']->query($sql);

         //        list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);

         $html .= '<fieldset>';

-        $html .= "<legend style='font-weight: bold; color: #900;'>" . \constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . '</legend>';

+        $html .= "<legend style='font-weight: bold; color: #900;'>".\constant('CO_'.$moduleDirNameUpper.'_IMAGEINFO').'</legend>';

         $html .= "<div style='padding: 8px;'>";

         //        $html .= '<div>' . \constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>";

         //        $html .= "<br>";

         //        $html .= "<br>";

-        $html .= '<div>' . \constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . '</div>';

+        $html .= '<div>'.\constant('CO_'.$moduleDirNameUpper.'_SPHPINI').'</div>';

         $html .= '<ul>';

 

-        $gdlib = \function_exists('gd_info') ? '<span style="color: #008000;">' . \constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: #ff0000;">' . \constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';

-        $html  .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;

+        $gdlib = \function_exists('gd_info') ? '<span style="color: #008000;">'.\constant('CO_'.$moduleDirNameUpper.'_GDON').'</span>' : '<span style="color: #ff0000;">'.\constant('CO_'.$moduleDirNameUpper.'_GDOFF').'</span>';

+        $html .= '<li>'.\constant('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS').$gdlib;

         if (\function_exists('gd_info')) {

             if (true === ($gdlib = gd_info())) {

-                $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';

+                $html .= '<li>'.\constant('CO_'.$moduleDirNameUpper.'_GDLIBVERSION').'<b>'.$gdlib['GD Version'].'</b>';

             }

         }

 

@@ -58,18 +58,18 @@ 
         //    $registerglobals = (!\ini_get('register_globals')) ? "<span style=\"color: #008000;\">" . \constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: #ff0000;\">" . \constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';

         //    $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;

 

-        $downloads = \ini_get('file_uploads') ? '<span style="color: #008000;">' . \constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: #ff0000;">' . \constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';

-        $html      .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;

+        $downloads = \ini_get('file_uploads') ? '<span style="color: #008000;">'.\constant('CO_'.$moduleDirNameUpper.'_ON').'</span>' : '<span style="color: #ff0000;">'.\constant('CO_'.$moduleDirNameUpper.'_OFF').'</span>';

+        $html .= '<li>'.\constant('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS').$downloads;

 

-        $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: #0000ff;">' . \ini_get('upload_max_filesize') . '</span></b>';

-        $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: #0000ff;">' . \ini_get('post_max_size') . '</span></b>';

-        $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: #0000ff;">' . \ini_get('memory_limit') . '</span></b>';

+        $html .= '<li>'.\constant('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE').' <b><span style="color: #0000ff;">'.\ini_get('upload_max_filesize').'</span></b>';

+        $html .= '<li>'.\constant('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE').' <b><span style="color: #0000ff;">'.\ini_get('post_max_size').'</span></b>';

+        $html .= '<li>'.\constant('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT').' <b><span style="color: #0000ff;">'.\ini_get('memory_limit').'</span></b>';

         $html .= '</ul>';

         $html .= '<ul>';

-        $html .= '<li>' . \constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . \XOOPS_ROOT_PATH . '</b>';

+        $html .= '<li>'.\constant('CO_'.$moduleDirNameUpper.'_SERVERPATH').' <b>'.\XOOPS_ROOT_PATH.'</b>';

         $html .= '</ul>';

         $html .= '<br>';

-        $html .= \constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . '';

+        $html .= \constant('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC').'';

         $html .= '</div>';

         $html .= '</fieldset><br>';

 

class/SettingsHandler.php

Spacing +2 added lines, -2 removed lines

@@ -148,7 +148,7 @@ 
      */

     public function setPrimarySetting($setId)

     {

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

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

         $settingsObj = null;

         $settingsHandler = $helper->getHandler('Settings');

         if (isset($setId)) {

@@ -158,7 +158,7 @@ 
         }

 

         // reset all

-        $strSQL = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('wggithub_settings') . ' SET ' . $GLOBALS['xoopsDB']->prefix('wggithub_settings') . '.set_primary = 0';

+        $strSQL = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('wggithub_settings').' SET '.$GLOBALS['xoopsDB']->prefix('wggithub_settings').'.set_primary = 0';

         $GLOBALS['xoopsDB']->queryF($strSQL);

         // Set Vars

         $settingsObj->setVar('set_primary', 1);

class/Releases.php

Spacing +3 added lines, -3 removed lines

@@ -136,9 +136,9 @@ 
      */

     public function getValuesReleases($keys = null, $format = null, $maxDepth = null)

     {

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

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

         $ret = $this->getValues($keys, $format, $maxDepth);

-        $ret['id']          = $this->getVar('rel_id');

+        $ret['id'] = $this->getVar('rel_id');

         $repositoriesHandler = $helper->getHandler('Repositories');

         $repositoriesObj = $repositoriesHandler->get($this->getVar('rel_repoid'));

         if (\is_object($repositoriesObj)) {

@@ -148,7 +148,7 @@ 
         }

         $ret['type']        = $this->getVar('rel_type');

         $ret['name']        = $this->getVar('rel_name');

-        $ret['prerelease']  = (int)$this->getVar('rel_prerelease') > 0 ? _YES : _NO;

+        $ret['prerelease']  = (int) $this->getVar('rel_prerelease') > 0 ? _YES : _NO;

         $ret['publishedat'] = \formatTimestamp($this->getVar('rel_publishedat'), 'm');

         $ret['tarballurl']  = $this->getVar('rel_tarballurl');

         $ret['zipballurl']  = $this->getVar('rel_zipballurl');