ggoffy / wggithub

language/german/main.php

Spacing +1 added lines, -1 removed lines

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

  */

 

-include_once __DIR__ . '/admin.php';

+include_once __DIR__.'/admin.php';

 

 // ---------------- Main ----------------

 \define('_MA_WGGITHUB_INDEX', 'Übersicht');

language/german/admin.php

Spacing +2 added lines, -2 removed lines

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

  */

 

-include_once __DIR__ . '/common.php';

-include_once __DIR__ . '/main.php';

+include_once __DIR__.'/common.php';

+include_once __DIR__.'/main.php';

 

 // ---------------- Admin Index ----------------

 \define('_AM_WGGITHUB_STATISTICS', 'Statistiken');

language/english/admin.php

Spacing +2 added lines, -2 removed lines

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

  */

 

-include_once __DIR__ . '/common.php';

-include_once __DIR__ . '/main.php';

+include_once __DIR__.'/common.php';

+include_once __DIR__.'/main.php';

 

 // ---------------- Admin Index ----------------

 \define('_AM_WGGITHUB_STATISTICS', 'Statistics');

class/Constants.php

Spacing +2 added lines, -2 removed lines

@@ -40,7 +40,7 @@ 
     public const DIRECTORY_TYPE_USER = 1;

     public const DIRECTORY_TYPE_ORG  = 2;

 

-    public const DIRECTORY_CONTENT_ALL  = 0;

+    public const DIRECTORY_CONTENT_ALL = 0;

     public const DIRECTORY_CONTENT_OWN = 1;

 

     // Constants for status

@@ -57,7 +57,7 @@ 
     public const PERM_README_UPDATE = 3;

 

     // Constants for log type

-    public const LOG_TYPE_NONE  = 0;

+    public const LOG_TYPE_NONE = 0;

     public const LOG_TYPE_UPDATE_START = 1;

     public const LOG_TYPE_UPDATE_END   = 2;

     public const LOG_TYPE_REQUEST      = 3;

class/RepositoriesHandler.php

Spacing +1 added lines, -1 removed lines

@@ -140,7 +140,7 @@
         $submitter = isset($GLOBALS['xoopsUser']) && \is_object($GLOBALS['xoopsUser']) ? $GLOBALS['xoopsUser']->getVar('uid') : 0;

         // add/update all items from table repositories

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

-            $fork = (bool)$repo['fork'];

+            $fork = (bool) $repo['fork'];

             if (Constants::DIRECTORY_CONTENT_ALL == $dirContent || false === $fork) {

                 $crRepositories = new \CriteriaCompo();

                 $crRepositories->add(new \Criteria('repo_nodeid', $repo['node_id']));

include/update.php

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

         }

@@ -251,12 +251,12 @@ 
     // update table (add new field)

     $table   = $GLOBALS['xoopsDB']->prefix('wggithub_repositories');

     $field   = 'repo_approved';

-    $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_release`;";

         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/Repositories.php

Spacing +1 added lines, -1 removed lines

@@ -164,7 +164,7 @@
         $ret['readme']      = $this->getVar('repo_readme');

         $ret['prerelease']  = $this->getVar('repo_prerelease');

         $ret['release']     = $this->getVar('repo_release');

-        $ret['approved']    = (int)$this->getVar('repo_approved') > 0 ? \_YES : \_NO;

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

         $status             = $this->getVar('repo_status');

         $ret['status']      = $status;

         switch ($status) {

class/ReleasesHandler.php

Spacing +16 added lines, -16 removed lines

@@ -149,7 +149,7 @@ 
                 if (Constants::STATUS_NEW === $repoStatus || Constants::STATUS_UPDATED === $repoStatus || 0 == $releasesCount) {

                     $ghReleases = $githubClient->getReleases($repositoriesAll[$i]->getVar('repo_user'), $repositoriesAll[$i]->getVar('repo_name'));

                     if ($releasesCount > 0) {

-                        $sql = 'DELETE FROM `' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '` WHERE `rel_repoid` = ' . $repoId;

+                        $sql = 'DELETE FROM `'.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'` WHERE `rel_repoid` = '.$repoId;

                         if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {

                             return false;

                         }

@@ -159,13 +159,13 @@ 
                 $first = true;

                 $final = false;

                 foreach ($ghReleases as $ghRelease) {

-                    if ($first || (!$final && !(bool)$ghRelease['prerelease'])) {

+                    if ($first || (!$final && !(bool) $ghRelease['prerelease'])) {

                         // save first in any case and save first final version

                         $releasesObj = $releasesHandler->create();

                         $releasesObj->setVar('rel_repoid', $repoId);

                         $releasesObj->setVar('rel_type', $ghRelease['type']);

                         $releasesObj->setVar('rel_name', $ghRelease['name']);

-                        $releasesObj->setVar('rel_prerelease', (true == (bool)$ghRelease['prerelease']));

+                        $releasesObj->setVar('rel_prerelease', (true == (bool) $ghRelease['prerelease']));

                         $releasesObj->setVar('rel_publishedat', \strtotime($ghRelease['published_at']));

                         $releasesObj->setVar('rel_tarballurl', $ghRelease['tarball_url']);

                         $releasesObj->setVar('rel_zipballurl', $ghRelease['zipball_url']);

@@ -177,7 +177,7 @@ 
                         }

                     }

                     $first = false;

-                    if (false === (bool)$ghRelease['prerelease']) {

+                    if (false === (bool) $ghRelease['prerelease']) {

                         $final = true;

                     }

                 }

@@ -215,7 +215,7 @@ 
                 // must return true otherwise releases will not be loaded

                 return true;

             }

-            $sql = 'DELETE FROM `' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '` WHERE `rel_repoid` = ' . $repoId;

+            $sql = 'DELETE FROM `'.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'` WHERE `rel_repoid` = '.$repoId;

             if (!$result = $GLOBALS['xoopsDB']->queryF($sql)) {

                 return false;

             }

@@ -224,13 +224,13 @@ 
             $first = true;

             $final = false;

             foreach ($ghReleases as $ghRelease) {

-                if ($first || (!$final && !(bool)$ghRelease['prerelease'])) {

+                if ($first || (!$final && !(bool) $ghRelease['prerelease'])) {

                     // save first in any case and save first final version

                     $releasesObj = $releasesHandler->create();

                     $releasesObj->setVar('rel_repoid', $repoId);

                     //$releasesObj->setVar('rel_type', $ghRelease['type']);

                     $releasesObj->setVar('rel_name', $ghRelease['name']);

-                    $releasesObj->setVar('rel_prerelease', (true == (bool)$ghRelease['prerelease']));

+                    $releasesObj->setVar('rel_prerelease', (true == (bool) $ghRelease['prerelease']));

                     $releasesObj->setVar('rel_publishedat', \strtotime($ghRelease['published_at']));

                     $releasesObj->setVar('rel_tarballurl', $ghRelease['tarball_url']);

                     $releasesObj->setVar('rel_zipballurl', $ghRelease['zipball_url']);

@@ -242,7 +242,7 @@ 
                     }

                 }

                 $first = false;

-                if (false === (bool)$ghRelease['prerelease']) {

+                if (false === (bool) $ghRelease['prerelease']) {

                     $final = true;

                 }

             }

@@ -259,17 +259,17 @@ 
     public function updateRepoReleases()

     {

         // update repo_prerelease

-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . ' INNER JOIN ' . $GLOBALS['xoopsDB']->prefix('wggithub_releases');

-        $sql .= ' ON ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . '.repo_id = ' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '.rel_repoid ';

-        $sql .= 'SET ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . '.repo_prerelease = 1 ';

-        $sql .= 'WHERE (((' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '.rel_prerelease)=1));';

+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').' INNER JOIN '.$GLOBALS['xoopsDB']->prefix('wggithub_releases');

+        $sql .= ' ON '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').'.repo_id = '.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'.rel_repoid ';

+        $sql .= 'SET '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').'.repo_prerelease = 1 ';

+        $sql .= 'WHERE ((('.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'.rel_prerelease)=1));';

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

 

         // update repo_release

-        $sql = 'UPDATE ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . ' INNER JOIN ' . $GLOBALS['xoopsDB']->prefix('wggithub_releases');

-        $sql .= ' ON ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . '.repo_id = ' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '.rel_repoid ';

-        $sql .= 'SET ' . $GLOBALS['xoopsDB']->prefix('wggithub_repositories') . '.repo_release = 1 ';

-        $sql .= 'WHERE (((' . $GLOBALS['xoopsDB']->prefix('wggithub_releases') . '.rel_prerelease)=0));';

+        $sql = 'UPDATE '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').' INNER JOIN '.$GLOBALS['xoopsDB']->prefix('wggithub_releases');

+        $sql .= ' ON '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').'.repo_id = '.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'.rel_repoid ';

+        $sql .= 'SET '.$GLOBALS['xoopsDB']->prefix('wggithub_repositories').'.repo_release = 1 ';

+        $sql .= 'WHERE ((('.$GLOBALS['xoopsDB']->prefix('wggithub_releases').'.rel_prerelease)=0));';

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

 

         return true;

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;

     }