ggoffy / wggithub

include/update.php

Spacing +20 added lines, -20 removed lines

@@ -34,7 +34,7 @@ 
     //wggithub_check_db($module);

 

     //check upload directory

-    include_once __DIR__ . '/install.php';

+    include_once __DIR__.'/install.php';

     xoops_module_install_wggithub($module);

 

     $errors = $module->getErrors();

@@ -59,12 +59,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;

         }

@@ -73,12 +73,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;

         }

@@ -86,12 +86,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;

         }

@@ -100,12 +100,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;

         }

@@ -127,7 +127,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;

         }

@@ -136,12 +136,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;

         }

@@ -150,12 +150,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;

         }

@@ -164,12 +164,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;

         }

@@ -178,12 +178,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;

         }

@@ -192,12 +192,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;

         }

include/functions.php

Spacing +21 added lines, -21 removed lines

@@ -33,7 +33,7 @@ 
         $cat_sql .= current($cats);

         \array_shift($cats);

         foreach ($cats as $cat) {

-            $cat_sql .= ',' . $cat;

+            $cat_sql .= ','.$cat;

         }

     }

     $cat_sql .= ')';

@@ -72,9 +72,9 @@ 
 {

     global $xoopsTpl, $xoTheme;

     $myts = MyTextSanitizer::getInstance();

-    $content= $myts->undoHtmlSpecialChars($myts->displayTarea($content));

-    if(isset($xoTheme) && \is_object($xoTheme)) {

-        $xoTheme->addMeta( 'meta', 'keywords', \strip_tags($content));

+    $content = $myts->undoHtmlSpecialChars($myts->displayTarea($content));

+    if (isset($xoTheme) && \is_object($xoTheme)) {

+        $xoTheme->addMeta('meta', 'keywords', \strip_tags($content));

     } else {    // Compatibility for old Xoops versions

         $xoopsTpl->assign('xoops_meta_keywords', \strip_tags($content));

     }

@@ -91,8 +91,8 @@ 
     global $xoopsTpl, $xoTheme;

     $myts = MyTextSanitizer::getInstance();

     $content = $myts->undoHtmlSpecialChars($myts->displayTarea($content));

-    if(isset($xoTheme) && \is_object($xoTheme)) {

-        $xoTheme->addMeta( 'meta', 'description', \strip_tags($content));

+    if (isset($xoTheme) && \is_object($xoTheme)) {

+        $xoTheme->addMeta('meta', 'description', \strip_tags($content));

     } else {    // Compatibility for old Xoops versions

         $xoopsTpl->assign('xoops_meta_description', \strip_tags($content));

     }

@@ -117,7 +117,7 @@ 
     if (0 != $lenght_id) {

         $id = $array['content_id'];

         while (\strlen($id) < $lenght_id) {

-            $id = '0' . $id;

+            $id = '0'.$id;

         }

     } else {

         $id = $array['content_id'];

@@ -132,23 +132,23 @@ 
     switch ($rewrite_url) {

 

         case 'none':

-            if($topic_name) {

-                 $topic_name = 'topic=' . $topic_name . '&amp;';

+            if ($topic_name) {

+                 $topic_name = 'topic='.$topic_name.'&amp;';

             }

             $rewrite_base = '/modules/';

-            $page = 'page=' . $array['content_alias'];

-            return \XOOPS_URL . $rewrite_base . $module . '/' . $type . '.php?' . $topic_name . 'id=' . $id . '&amp;' . $page . $comment;

+            $page = 'page='.$array['content_alias'];

+            return \XOOPS_URL.$rewrite_base.$module.'/'.$type.'.php?'.$topic_name.'id='.$id.'&amp;'.$page.$comment;

             break;

 

         case 'rewrite':

-            if($topic_name) {

+            if ($topic_name) {

                 $topic_name .= '/';

             }

             $rewrite_base = xoops_getModuleOption('rewrite_mode', $module);

             $rewrite_ext = xoops_getModuleOption('rewrite_ext', $module);

             $module_name = '';

-            if(xoops_getModuleOption('rewrite_name', $module)) {

-                $module_name = xoops_getModuleOption('rewrite_name', $module) . '/';

+            if (xoops_getModuleOption('rewrite_name', $module)) {

+                $module_name = xoops_getModuleOption('rewrite_name', $module).'/';

             }

             $page = $array['content_alias'];

             $type .= '/';

@@ -157,21 +157,21 @@ 
                 $type = '';

             }

             if ('comment-edit/' === $type || 'comment-reply/' === $type || 'comment-delete/' === $type) {

-                return \XOOPS_URL . $rewrite_base . $module_name . $type . $id . '/';

+                return \XOOPS_URL.$rewrite_base.$module_name.$type.$id.'/';

             }

 

-            return \XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name  . $id . $page . $rewrite_ext;

+            return \XOOPS_URL.$rewrite_base.$module_name.$type.$topic_name.$id.$page.$rewrite_ext;

             break;

 

          case 'short':

-            if($topic_name) {

+            if ($topic_name) {

                 $topic_name .= '/';

             }

             $rewrite_base = xoops_getModuleOption('rewrite_mode', $module);

             $rewrite_ext = xoops_getModuleOption('rewrite_ext', $module);

             $module_name = '';

-            if(xoops_getModuleOption('rewrite_name', $module)) {

-                $module_name = xoops_getModuleOption('rewrite_name', $module) . '/';

+            if (xoops_getModuleOption('rewrite_name', $module)) {

+                $module_name = xoops_getModuleOption('rewrite_name', $module).'/';

             }

             $page = $array['content_alias'];

             $type .= '/';

@@ -179,10 +179,10 @@ 
                 $type = '';

             }

             if ('comment-edit/' === $type || 'comment-reply/' === $type || 'comment-delete/' === $type) {

-                return \XOOPS_URL . $rewrite_base . $module_name . $type . $id . '/';

+                return \XOOPS_URL.$rewrite_base.$module_name.$type.$id.'/';

             }

 

-            return \XOOPS_URL . $rewrite_base . $module_name . $type . $topic_name . $page . $rewrite_ext;

+            return \XOOPS_URL.$rewrite_base.$module_name.$type.$topic_name.$page.$rewrite_ext;

             break;

     }

     return null;

class/Github/Http/StreamClient.php

Spacing +5 added lines, -5 removed lines

@@ -47,15 +47,15 @@ 
         $options = [

             'http' => [

                 'method' => $request->getMethod(),

-                'header' => \implode("\r\n", $headerStr) . "\r\n",

-                'follow_location' => 0,  # Github sets the Location header for 201 code too and redirection is not required for us

+                'header' => \implode("\r\n", $headerStr)."\r\n",

+                'follow_location' => 0, # Github sets the Location header for 201 code too and redirection is not required for us

                 'protocol_version' => 1.1,

                 'ignore_errors' => TRUE,

             ],

             'ssl' => [

                 'verify_peer' => TRUE,

-                'cafile' => realpath(__DIR__ . '/../../ca-chain.crt'),

-                'disable_compression' => TRUE,  # Effective since PHP 5.4.13

+                'cafile' => realpath(__DIR__.'/../../ca-chain.crt'),

+                'disable_compression' => TRUE, # Effective since PHP 5.4.13

             ],

         ];

 

@@ -105,7 +105,7 @@ 
         $last = '';

         foreach ($http_response_header as $header) {

             if (\in_array(\substr($header, 0, 1), [' ', "\t"], TRUE)) {

-                $headers[$last] .= ' ' . \trim($header);  # RFC2616, 2.2

+                $headers[$last] .= ' '.\trim($header); # RFC2616, 2.2

             } else {

                 list($name, $value) = \explode(':', $header, 2) + [NULL, NULL];

                 $headers[$last = \trim($name)] = \trim($value);