Inspection of "scrutinizer" - mambax7/xoopsfaq - Measure and Improve Code Quality continuously with Scrutinizer

Passed

Push — master ( 08c22c...f61562 )

by Michael

created 2020-01-08 12:52 UTC

Status

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

@@ -35,7 +35,7 @@  discard block
 block discarded – undo
                     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 @@  discard block
 block discarded – undo
         $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);
                 }
             }
         }
@@ -204,7 +204,7 @@  discard block
 block discarded – undo
                 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
     }
 
@@ -237,14 +237,14 @@  discard block
 block discarded – undo
         $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
     }
 
@@ -280,9 +280,9 @@  discard block
 block discarded – undo
         $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());
             }
         }
 

Please login to merge, or discard this patch.

class/Common/Breadcrumb.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -68,7 +68,7 @@
 block discarded – undo
         require_once $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;

Please login to merge, or discard this patch.

class/Common/ServerStats.php 1 patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -36,19 +36,19 @@  discard block
 block discarded – undo
         //        $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 @@  discard block
 block discarded – undo
         //    $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>';
 

Please login to merge, or discard this patch.

class/Common/Migrate.php 1 patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

@@ -32,7 +32,7 @@  discard block
 block discarded – undo
      */
     public function __construct()
     {
-        $class = __NAMESPACE__ . '\\' . 'Configurator';
+        $class = __NAMESPACE__.'\\'.'Configurator';
         if (!class_exists($class)) {
             throw new \RuntimeException("Class '$class' not found");
         }
@@ -90,7 +90,7 @@  discard block
 block discarded – undo
                 $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);
             }
         }

Please login to merge, or discard this patch.

class/Common/VersionChecks.php 1 patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

@@ -40,13 +40,13 @@  discard block
 block discarded – undo
         //check for minimum XOOPS version
         $currentVer = mb_substr(XOOPS_VERSION, 6); // get the numeric part of string
         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;
@@ -77,7 +77,7 @@  discard block
 block discarded – undo
 
         if (false !== $reqVer && '' !== $reqVer && !is_array($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;
             }
         }
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
         $moduleDirName      = basename(dirname(dirname(__DIR__)));
         $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";
@@ -115,14 +115,14 @@  discard block
 block discarded – undo
                 if (false === $curlReturn) {
                     trigger_error(curl_error($curlHandle));
                 } elseif (false !== 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);
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
                         $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

Please login to merge, or discard this patch.

class/contents.php 1 patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

@@ -109,7 +109,7 @@  discard block
 block discarded – undo
         $form->addElement(new \XoopsFormHidden('contents_id', $this->getVar('contents_id', 'e')));
 
         // Active
-        $contents_active = new \XoopsFormRadioYN(_AM_XOOPSFAQ_E_CONTENTS_ACTIVE, 'contents_active', $this->getVar('contents_active', 'e'), ' ' . _YES . '', ' ' . _NO . '');
+        $contents_active = new \XoopsFormRadioYN(_AM_XOOPSFAQ_E_CONTENTS_ACTIVE, 'contents_active', $this->getVar('contents_active', 'e'), ' '._YES.'', ' '._NO.'');
         $contents_active->setDescription(_AM_XOOPSFAQ_E_CONTENTS_ACTIVE_DESC);
         $form->addElement($contents_active, false);
 
@@ -138,7 +138,7 @@  discard block
 block discarded – undo
         $options_tray  = new \XoopsFormElementTray(_AM_XOOPSFAQ_E_CONTENTS_CONTENT, '<br>');
         if (class_exists('XoopsFormEditor')) {
             // $editorConfigs = array('editor' => $GLOBALS['xoopsConfig']['general_editor'],
-            $editorConfigs     = [
+            $editorConfigs = [
                 'editor' => $helper->getConfig('use_wysiwyg', 'dhtmltextarea'),
                 'rows'   => 25,
                 'cols'   => '100%',
@@ -201,9 +201,9 @@  discard block
 block discarded – undo
     public function getActiveIcon()
     {
         if ($this->getVar('contents_active') > Xoopsfaq\Constants::INACTIVE) {
-            $icon = '<img src="' . \Xmf\Module\Admin::iconUrl('green.gif', '16') . '" alt="' . _YES . '">';
+            $icon = '<img src="'.\Xmf\Module\Admin::iconUrl('green.gif', '16').'" alt="'._YES.'">';
         } else {
-            $icon = '<img src="' . \Xmf\Module\Admin::iconUrl('red.gif', '16') . '" alt="' . _NO . '">';
+            $icon = '<img src="'.\Xmf\Module\Admin::iconUrl('red.gif', '16').'" alt="'._NO.'">';
         }
         return $icon;
     }

Please login to merge, or discard this patch.

class/utility.php 1 patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

@@ -113,7 +113,7 @@  discard block
 block discarded – undo
         if ($dirInfo->isDir()) {
             $fileList = array_diff(scandir($src), ['..', '.']);
             foreach ($fileList as $k => $v) {
-                $fileInfo = new \SplFileInfo($src . '/' . $v);
+                $fileInfo = new \SplFileInfo($src.'/'.$v);
                 if ($fileInfo->isDir()) {
                     // recursively handle subdirectories
                     if (!$success = static::deleteDirectory($fileInfo->getRealPath())) {
@@ -170,7 +170,7 @@  discard block
 block discarded – undo
                 static::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
     }
 
@@ -203,13 +203,13 @@  discard block
 block discarded – undo
         $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
-                static::rmove($fObj->getPathname(), $dest . '/' . $fObj->getFilename());
+                static::rmove($fObj->getPathname(), $dest.'/'.$fObj->getFilename());
             }
         }
-        $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
     }
 
@@ -245,9 +245,9 @@  discard block
 block discarded – undo
         $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()) {
-                static::rcopy($fObj->getPathname(), $dest . '/' . $fObj->getFilename());
+                static::rcopy($fObj->getPathname(), $dest.'/'.$fObj->getFilename());
             }
         }
         return true;
@@ -276,13 +276,13 @@  discard block
 block discarded – undo
                     $iconName = substr($icon, 0, strlen($icon) - strrchr($icon, '.'));
                     $iconExt  = substr(strrchr($icon, '.'), 1);
                 }
-                $url = (!is_numeric($_op)) ? $_op . '?' . $param . '=' . $value : xoops_getenv('SCRIPT_NAME') . '?op=' . $iconName . '&amp;' . $param . '=' . $value;
+                $url = (!is_numeric($_op)) ? $_op.'?'.$param.'='.$value : xoops_getenv('SCRIPT_NAME').'?op='.$iconName.'&amp;'.$param.'='.$value;
                 if (null !== $extra) {
-                    $url .= ' ' . $extra;
+                    $url .= ' '.$extra;
                 }
-                $title = constant(htmlspecialchars(mb_strtoupper('_XO_LA_' . $iconName), ENT_QUOTES | ENT_HTML5));
-                $img   = '<img src="' . \Xmf\Module\Admin::iconUrl($iconName . '.' . $iconExt, '16') . '"' . ' title ="' . $title . '"' . ' alt = "' . $title . '"' . ' class="bnone middle">';
-                $ret   .= '<a href="' . $url . '"' . $extra . '>' . $img . '</a>';
+                $title = constant(htmlspecialchars(mb_strtoupper('_XO_LA_'.$iconName), ENT_QUOTES | ENT_HTML5));
+                $img   = '<img src="'.\Xmf\Module\Admin::iconUrl($iconName.'.'.$iconExt, '16').'"'.' title ="'.$title.'"'.' alt = "'.$title.'"'.' class="bnone middle">';
+                $ret .= '<a href="'.$url.'"'.$extra.'>'.$img.'</a>';
             }
         }
         return $ret;

Please login to merge, or discard this patch.

class/Helper.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -72,7 +72,7 @@
 block discarded – undo
     {
         $ret = false;
 
-        $class = __NAMESPACE__ . '\\' . ucfirst($name) . 'Handler';
+        $class = __NAMESPACE__.'\\'.ucfirst($name).'Handler';
         if (!class_exists($class)) {
             throw new \RuntimeException("Class '$class' not found");
         }

Please login to merge, or discard this patch.

comment_post.php 1 patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

@@ -21,5 +21,5 @@
 block discarded – undo
  * @license   http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
  */
 
-require dirname(dirname(__DIR__)) . '/mainfile.php';
+require dirname(dirname(__DIR__)).'/mainfile.php';
 require $GLOBALS['xoops']->path('include/comment_post.php');

Please login to merge, or discard this patch.

		@@ -40,13 +40,13 @@ discard block
		block discarded – undo
40	40	//check for minimum XOOPS version
41	41	$currentVer = mb_substr(XOOPS_VERSION, 6); // get the numeric part of string
42	42	if (null === $requiredVer) {
43		- $requiredVer = '' . $module->getInfo('min_xoops'); //making sure it's a string
	43	+ $requiredVer = ''.$module->getInfo('min_xoops'); //making sure it's a string
44	44	}
45	45	$success = true;
46	46
47	47	if (version_compare($currentVer, $requiredVer, '<')) {
48	48	$success = false;
49		- $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
	49	+ $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS'), $requiredVer, $currentVer));
50	50	}
51	51
52	52	return $success;
		@@ -77,7 +77,7 @@ discard block
		block discarded – undo
77	77
78	78	if (false !== $reqVer && '' !== $reqVer && !is_array($reqVer)) {
79	79	if (version_compare($verNum, $reqVer, '<')) {
80		- $module->setErrors(sprintf(constant('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP'), $reqVer, $verNum));
	80	+ $module->setErrors(sprintf(constant('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP'), $reqVer, $verNum));
81	81	$success = false;
82	82	}
83	83	}
		@@ -101,7 +101,7 @@ discard block
		block discarded – undo
101	101	$moduleDirName = basename(dirname(dirname(__DIR__)));
102	102	$moduleDirNameUpper = mb_strtoupper($moduleDirName);
103	103	$update = '';
104		- $repository = 'XoopsModules25x/' . $moduleDirName;
	104	+ $repository = 'XoopsModules25x/'.$moduleDirName;
105	105	// $repository = 'XoopsModules25x/publisher'; //for testing only
106	106	$ret = '';
107	107	$infoReleasesUrl = "https://api.github.com/repos/$repository/releases";
		@@ -115,14 +115,14 @@ discard block
		block discarded – undo
115	115	if (false === $curlReturn) {
116	116	trigger_error(curl_error($curlHandle));
117	117	} elseif (false !== strpos($curlReturn, 'Not Found')) {
118		- trigger_error('Repository Not Found: ' . $infoReleasesUrl);
	118	+ trigger_error('Repository Not Found: '.$infoReleasesUrl);
119	119	} else {
120	120	$file = json_decode($curlReturn, false);
121	121	$latestVersionLink = sprintf("https://github.com/$repository/archive/%s.zip", $file ? reset($file)->tag_name : $default);
122	122	$latestVersion = $file[0]->tag_name;
123	123	$prerelease = $file[0]->prerelease;
124	124	if ('master' !== $latestVersionLink) {
125		- $update = constant('CO_' . $moduleDirNameUpper . '_' . 'NEW_VERSION') . $latestVersion;
	125	+ $update = constant('CO_'.$moduleDirNameUpper.'_'.'NEW_VERSION').$latestVersion;
126	126	}
127	127	//"PHP-standardized" version
128	128	$latestVersion = mb_strtolower($latestVersion);
		@@ -130,7 +130,7 @@ discard block
		block discarded – undo
130	130	$latestVersion = str_replace('_', '', mb_strtolower($latestVersion));
131	131	$latestVersion = str_replace('final', '', mb_strtolower($latestVersion));
132	132	}
133		- $moduleVersion = ($helper->getModule()->getInfo('version') . '_' . $helper->getModule()->getInfo('module_status'));
	133	+ $moduleVersion = ($helper->getModule()->getInfo('version').'_'.$helper->getModule()->getInfo('module_status'));
134	134	//"PHP-standardized" version
135	135	$moduleVersion = str_replace(' ', '', mb_strtolower($moduleVersion));
136	136	// $moduleVersion = '1.0'; //for testing only

		@@ -113,7 +113,7 @@ discard block
		block discarded – undo
113	113	if ($dirInfo->isDir()) {
114	114	$fileList = array_diff(scandir($src), ['..', '.']);
115	115	foreach ($fileList as $k => $v) {
116		- $fileInfo = new \SplFileInfo($src . '/' . $v);
	116	+ $fileInfo = new \SplFileInfo($src.'/'.$v);
117	117	if ($fileInfo->isDir()) {
118	118	// recursively handle subdirectories
119	119	if (!$success = static::deleteDirectory($fileInfo->getRealPath())) {
		@@ -170,7 +170,7 @@ discard block
		block discarded – undo
170	170	static::rrmdir($fObj->getPathname());
171	171	}
172	172	}
173		- $iterator = null; // clear iterator Obj to close file/directory
	173	+ $iterator = null; // clear iterator Obj to close file/directory
174	174	return rmdir($src); // remove the directory & return results
175	175	}
176	176
		@@ -203,13 +203,13 @@ discard block
		block discarded – undo
203	203	$iterator = new \DirectoryIterator($src);
204	204	foreach ($iterator as $fObj) {
205	205	if ($fObj->isFile()) {
206		- rename($fObj->getPathname(), $dest . '/' . $fObj->getFilename());
	206	+ rename($fObj->getPathname(), $dest.'/'.$fObj->getFilename());
207	207	} elseif (!$fObj->isDot() && $fObj->isDir()) {
208	208	// Try recursively on directory
209		- static::rmove($fObj->getPathname(), $dest . '/' . $fObj->getFilename());
	209	+ static::rmove($fObj->getPathname(), $dest.'/'.$fObj->getFilename());
210	210	}
211	211	}
212		- $iterator = null; // clear iterator Obj to close file/directory
	212	+ $iterator = null; // clear iterator Obj to close file/directory
213	213	return rmdir($src); // remove the directory & return results
214	214	}
215	215
		@@ -245,9 +245,9 @@ discard block
		block discarded – undo
245	245	$iterator = new \DirectoryIterator($src);
246	246	foreach ($iterator as $fObj) {
247	247	if ($fObj->isFile()) {
248		- copy($fObj->getPathname(), $dest . '/' . $fObj->getFilename());
	248	+ copy($fObj->getPathname(), $dest.'/'.$fObj->getFilename());
249	249	} elseif (!$fObj->isDot() && $fObj->isDir()) {
250		- static::rcopy($fObj->getPathname(), $dest . '/' . $fObj->getFilename());
	250	+ static::rcopy($fObj->getPathname(), $dest.'/'.$fObj->getFilename());
251	251	}
252	252	}
253	253	return true;
		@@ -276,13 +276,13 @@ discard block
		block discarded – undo
276	276	$iconName = substr($icon, 0, strlen($icon) - strrchr($icon, '.'));
277	277	$iconExt = substr(strrchr($icon, '.'), 1);
278	278	}
279		- $url = (!is_numeric($_op)) ? $_op . '?' . $param . '=' . $value : xoops_getenv('SCRIPT_NAME') . '?op=' . $iconName . '&' . $param . '=' . $value;
	279	+ $url = (!is_numeric($_op)) ? $_op.'?'.$param.'='.$value : xoops_getenv('SCRIPT_NAME').'?op='.$iconName.'&'.$param.'='.$value;
280	280	if (null !== $extra) {
281		- $url .= ' ' . $extra;
	281	+ $url .= ' '.$extra;
282	282	}
283		- $title = constant(htmlspecialchars(mb_strtoupper('_XO_LA_' . $iconName), ENT_QUOTES \| ENT_HTML5));
284		- $img = '<img src="' . \Xmf\Module\Admin::iconUrl($iconName . '.' . $iconExt, '16') . '"' . ' title ="' . $title . '"' . ' alt = "' . $title . '"' . ' class="bnone middle">';
285		- $ret .= '<a href="' . $url . '"' . $extra . '>' . $img . '</a>';
	283	+ $title = constant(htmlspecialchars(mb_strtoupper('_XO_LA_'.$iconName), ENT_QUOTES \| ENT_HTML5));
	284	+ $img = '<img src="'.\Xmf\Module\Admin::iconUrl($iconName.'.'.$iconExt, '16').'"'.' title ="'.$title.'"'.' alt = "'.$title.'"'.' class="bnone middle">';
	285	+ $ret .= '<a href="'.$url.'"'.$extra.'>'.$img.'</a>';
286	286	}
287	287	}
288	288	return $ret;

		@@ -35,7 +35,7 @@ discard block
		block discarded – undo
35	35	throw new \RuntimeException(sprintf('Unable to create the %s directory', $folder));
36	36	}
37	37
38		- file_put_contents($folder . '/index.html', '<script>history.go(-1);</script>');
	38	+ file_put_contents($folder.'/index.html', '<script>history.go(-1);</script>');
39	39	}
40	40	} catch (\Exception $e) {
41	41	echo 'Caught exception: ', $e->getMessage(), '<br>';
		@@ -61,14 +61,14 @@ discard block
		block discarded – undo
61	61	$dir = opendir($src);
62	62	// @mkdir($dst);
63	63	if (!@mkdir($dst) && !is_dir($dst)) {
64		- throw new \RuntimeException('The directory ' . $dst . ' could not be created.');
	64	+ throw new \RuntimeException('The directory '.$dst.' could not be created.');
65	65	}
66	66	while (false !== ($file = readdir($dir))) {
67	67	if (('.' !== $file) && ('..' !== $file)) {
68		- if (is_dir($src . '/' . $file)) {
69		- self::recurseCopy($src . '/' . $file, $dst . '/' . $file);
	68	+ if (is_dir($src.'/'.$file)) {
	69	+ self::recurseCopy($src.'/'.$file, $dst.'/'.$file);
70	70	} else {
71		- copy($src . '/' . $file, $dst . '/' . $file);
	71	+ copy($src.'/'.$file, $dst.'/'.$file);
72	72	}
73	73	}
74	74	}
		@@ -204,7 +204,7 @@ discard block
		block discarded – undo
204	204	self::rrmdir($fObj->getPathname());
205	205	}
206	206	}
207		- $iterator = null; // clear iterator Obj to close file/directory
	207	+ $iterator = null; // clear iterator Obj to close file/directory
208	208	return rmdir($src); // remove the directory & return results
209	209	}
210	210
		@@ -237,14 +237,14 @@ discard block
		block discarded – undo
237	237	$iterator = new \DirectoryIterator($src);
238	238	foreach ($iterator as $fObj) {
239	239	if ($fObj->isFile()) {
240		- rename($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
	240	+ rename($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
241	241	} elseif (!$fObj->isDot() && $fObj->isDir()) {
242	242	// Try recursively on directory
243		- self::rmove($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
	243	+ self::rmove($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
244	244	// rmdir($fObj->getPath()); // now delete the directory
245	245	}
246	246	}
247		- $iterator = null; // clear iterator Obj to close file/directory
	247	+ $iterator = null; // clear iterator Obj to close file/directory
248	248	return rmdir($src); // remove the directory & return results
249	249	}
250	250
		@@ -280,9 +280,9 @@ discard block
		block discarded – undo
280	280	$iterator = new \DirectoryIterator($src);
281	281	foreach ($iterator as $fObj) {
282	282	if ($fObj->isFile()) {
283		- copy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
	283	+ copy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
284	284	} elseif (!$fObj->isDot() && $fObj->isDir()) {
285		- self::rcopy($fObj->getPathname(), "{$dest}/" . $fObj->getFilename());
	285	+ self::rcopy($fObj->getPathname(), "{$dest}/".$fObj->getFilename());
286	286	}
287	287	}
288	288

		@@ -68,7 +68,7 @@
		block discarded – undo
68	68	require_once $GLOBALS['xoops']->path('class/template.php');
69	69	$breadcrumbTpl = new \XoopsTpl();
70	70	$breadcrumbTpl->assign('breadcrumb', $this->bread);
71		- $html = $breadcrumbTpl->fetch('db:' . $this->dirname . '_common_breadcrumb.tpl');
	71	+ $html = $breadcrumbTpl->fetch('db:'.$this->dirname.'_common_breadcrumb.tpl');
72	72	unset($breadcrumbTpl);
73	73
74	74	return $html;

		@@ -36,19 +36,19 @@ discard block
		block discarded – undo
36	36	// $query = $GLOBALS['xoopsDB']->query($sql);
37	37	// list($meta) = $GLOBALS['xoopsDB']->fetchRow($query);
38	38	$html .= '<fieldset>';
39		- $html .= "<legend style='font-weight: bold; color: #900;'>" . constant('CO_' . $moduleDirNameUpper . '_IMAGEINFO') . '</legend>';
	39	+ $html .= "<legend style='font-weight: bold; color: #900;'>".constant('CO_'.$moduleDirNameUpper.'_IMAGEINFO').'</legend>';
40	40	$html .= "<div style='padding: 8px;'>";
41	41	// $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_METAVERSION') . $meta . "</div>";
42	42	// $html .= "<br>";
43	43	// $html .= "<br>";
44		- $html .= '<div>' . constant('CO_' . $moduleDirNameUpper . '_SPHPINI') . '</div>';
	44	+ $html .= '<div>'.constant('CO_'.$moduleDirNameUpper.'_SPHPINI').'</div>';
45	45	$html .= '<ul>';
46	46
47		- $gdlib = function_exists('gd_info') ? '<span style="color: #008000;">' . constant('CO_' . $moduleDirNameUpper . '_GDON') . '</span>' : '<span style="color: #ff0000;">' . constant('CO_' . $moduleDirNameUpper . '_GDOFF') . '</span>';
48		- $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS') . $gdlib;
	47	+ $gdlib = function_exists('gd_info') ? '<span style="color: #008000;">'.constant('CO_'.$moduleDirNameUpper.'_GDON').'</span>' : '<span style="color: #ff0000;">'.constant('CO_'.$moduleDirNameUpper.'_GDOFF').'</span>';
	48	+ $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS').$gdlib;
49	49	if (function_exists('gd_info')) {
50	50	if (true === ($gdlib = gd_info())) {
51		- $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_GDLIBVERSION') . '<b>' . $gdlib['GD Version'] . '</b>';
	51	+ $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_GDLIBVERSION').'<b>'.$gdlib['GD Version'].'</b>';
52	52	}
53	53	}
54	54
		@@ -58,18 +58,18 @@ discard block
		block discarded – undo
58	58	// $registerglobals = (!ini_get('register_globals')) ? "<span style=\"color: #008000;\">" . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>' : "<span style=\"color: #ff0000;\">" . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>';
59	59	// $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_REGISTERGLOBALS . $registerglobals;
60	60
61		- $downloads = ini_get('file_uploads') ? '<span style="color: #008000;">' . constant('CO_' . $moduleDirNameUpper . '_ON') . '</span>' : '<span style="color: #ff0000;">' . constant('CO_' . $moduleDirNameUpper . '_OFF') . '</span>';
62		- $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS') . $downloads;
	61	+ $downloads = ini_get('file_uploads') ? '<span style="color: #008000;">'.constant('CO_'.$moduleDirNameUpper.'_ON').'</span>' : '<span style="color: #ff0000;">'.constant('CO_'.$moduleDirNameUpper.'_OFF').'</span>';
	62	+ $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS').$downloads;
63	63
64		- $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE') . ' <b><span style="color: #0000ff;">' . ini_get('upload_max_filesize') . '</span></b>';
65		- $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE') . ' <b><span style="color: #0000ff;">' . ini_get('post_max_size') . '</span></b>';
66		- $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT') . ' <b><span style="color: #0000ff;">' . ini_get('memory_limit') . '</span></b>';
	64	+ $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE').' <b><span style="color: #0000ff;">'.ini_get('upload_max_filesize').'</span></b>';
	65	+ $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE').' <b><span style="color: #0000ff;">'.ini_get('post_max_size').'</span></b>';
	66	+ $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT').' <b><span style="color: #0000ff;">'.ini_get('memory_limit').'</span></b>';
67	67	$html .= '</ul>';
68	68	$html .= '<ul>';
69		- $html .= '<li>' . constant('CO_' . $moduleDirNameUpper . '_SERVERPATH') . ' <b>' . XOOPS_ROOT_PATH . '</b>';
	69	+ $html .= '<li>'.constant('CO_'.$moduleDirNameUpper.'_SERVERPATH').' <b>'.XOOPS_ROOT_PATH.'</b>';
70	70	$html .= '</ul>';
71	71	$html .= '<br>';
72		- $html .= constant('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC') . '';
	72	+ $html .= constant('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC').'';
73	73	$html .= '</div>';
74	74	$html .= '</fieldset><br>';
75	75

		@@ -32,7 +32,7 @@ discard block
		block discarded – undo
32	32	*/
33	33	public function __construct()
34	34	{
35		- $class = __NAMESPACE__ . '\\' . 'Configurator';
	35	+ $class = __NAMESPACE__.'\\'.'Configurator';
36	36	if (!class_exists($class)) {
37	37	throw new \RuntimeException("Class '$class' not found");
38	38	}
		@@ -90,7 +90,7 @@ discard block
		block discarded – undo
90	90	$this->synchronizeTable($tableName);
91	91	$updateTable = $GLOBALS['xoopsDB']->prefix($tableName);
92	92	$joinTable = $GLOBALS['xoopsDB']->prefix($srcTableName);
93		- $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';
	93	+ $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';
94	94	$this->tableHandler->addToQueue($sql);
95	95	}
96	96	}

		@@ -109,7 +109,7 @@ discard block
		block discarded – undo
109	109	$form->addElement(new \XoopsFormHidden('contents_id', $this->getVar('contents_id', 'e')));
110	110
111	111	// Active
112		- $contents_active = new \XoopsFormRadioYN(_AM_XOOPSFAQ_E_CONTENTS_ACTIVE, 'contents_active', $this->getVar('contents_active', 'e'), ' ' . _YES . '', ' ' . _NO . '');
	112	+ $contents_active = new \XoopsFormRadioYN(_AM_XOOPSFAQ_E_CONTENTS_ACTIVE, 'contents_active', $this->getVar('contents_active', 'e'), ' '._YES.'', ' '._NO.'');
113	113	$contents_active->setDescription(_AM_XOOPSFAQ_E_CONTENTS_ACTIVE_DESC);
114	114	$form->addElement($contents_active, false);
115	115
		@@ -138,7 +138,7 @@ discard block
		block discarded – undo
138	138	$options_tray = new \XoopsFormElementTray(_AM_XOOPSFAQ_E_CONTENTS_CONTENT, '<br>');
139	139	if (class_exists('XoopsFormEditor')) {
140	140	// $editorConfigs = array('editor' => $GLOBALS['xoopsConfig']['general_editor'],
141		- $editorConfigs = [
	141	+ $editorConfigs = [
142	142	'editor' => $helper->getConfig('use_wysiwyg', 'dhtmltextarea'),
143	143	'rows' => 25,
144	144	'cols' => '100%',
		@@ -201,9 +201,9 @@ discard block
		block discarded – undo
201	201	public function getActiveIcon()
202	202	{
203	203	if ($this->getVar('contents_active') > Xoopsfaq\Constants::INACTIVE) {
204		- $icon = '<img src="' . \Xmf\Module\Admin::iconUrl('green.gif', '16') . '" alt="' . _YES . '">';
	204	+ $icon = '<img src="'.\Xmf\Module\Admin::iconUrl('green.gif', '16').'" alt="'._YES.'">';
205	205	} else {
206		- $icon = '<img src="' . \Xmf\Module\Admin::iconUrl('red.gif', '16') . '" alt="' . _NO . '">';
	206	+ $icon = '<img src="'.\Xmf\Module\Admin::iconUrl('red.gif', '16').'" alt="'._NO.'">';
207	207	}
208	208	return $icon;
209	209	}

		@@ -72,7 +72,7 @@
		block discarded – undo
72	72	{
73	73	$ret = false;
74	74
75		- $class = __NAMESPACE__ . '\\' . ucfirst($name) . 'Handler';
	75	+ $class = __NAMESPACE__.'\\'.ucfirst($name).'Handler';
76	76	if (!class_exists($class)) {
77	77	throw new \RuntimeException("Class '$class' not found");
78	78	}

		@@ -21,5 +21,5 @@
		block discarded – undo
21	21	* @license http://www.gnu.org/licenses/gpl-2.0.html GNU Public License
22	22	*/
23	23
24		-require dirname(dirname(__DIR__)) . '/mainfile.php';
	24	+require dirname(dirname(__DIR__)).'/mainfile.php';
25	25	require $GLOBALS['xoops']->path('include/comment_post.php');

mambax7 / xoopsfaq

Push — master ( 08c22c...f61562 )

Status

Category

Spacing +11 added lines, -11 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +2 added lines, -2 removed lines patch added patch discarded remove patch

Spacing +7 added lines, -7 removed lines patch added patch discarded remove patch

Spacing +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +12 added lines, -12 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch

Spacing +1 added lines, -1 removed lines patch added patch discarded remove patch