mambax7 / xoopsfaq

admin/category.php

Spacing +2 added lines, -2 removed lines

@@ -27,7 +27,7 @@ 
 use Xmf\Request;
 use XoopsModules\Xoopsfaq;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 /** @var Xoopsfaq\CategoryHandler $categoryHandler */
@@ -121,4 +121,4 @@ 
         $categoryHandler->displayAdminListing('order');
         break;
 }
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/menu.php

Spacing +1 added lines, -1 removed lines

@@ -26,7 +26,7 @@
 use Xmf\Module\Admin;
 use XoopsModules\Xoopsfaq;
 
-require dirname(__DIR__) . '/preloads/autoloader.php';
+require dirname(__DIR__).'/preloads/autoloader.php';
 
 /** @var \XoopsModules\Xoopsfaq\Helper $helper */
 $helper = Xoopsfaq\Helper::getInstance();

admin/index.php

Spacing +12 added lines, -12 removed lines

@@ -24,7 +24,7 @@ 
 
 use XoopsModules\Xoopsfaq;
 
-require __DIR__ . '/admin_header.php';
+require __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 /** @var Xoopsfaq\CategoryHandler $categoryHandler */
@@ -53,10 +53,10 @@ 
 $totalNonpublishedFaqs = $totalFaqs - $totalPublishedFaqs;
 
 $adminObject->addInfoBox(_AM_XOOPSFAQ_FAQ_CONF);
-$adminObject->addInfoBoxLine(sprintf('<span class="infolabel">' . _AM_XOOPSFAQ_TOTAL_CATEGORIES . '</span>', '<span class="infotext green bold">' . $totalCats . '</span>'));
-$adminObject->addInfoBoxLine(sprintf('<span class="infolabel">' . _AM_XOOPSFAQ_TOTAL_PUBLISHED . '</span>', '<span class="infotext green bold">' . $totalPublishedFaqs . '</span>'));
-$adminObject->addInfoBoxLine(sprintf('<span class="infolabel">' . _AM_XOOPSFAQ_TOTAL_INACTIVE . '</span>', '<span class="infotext red bold">' . $totalNonpublishedFaqs . '</span>'));
-$adminObject->addInfoBoxLine(sprintf('<span class="infolabel">' . _AM_XOOPSFAQ_TOTAL_FAQS . '</span>', '<span class="infotext green bold">' . $totalFaqs . '</span>'));
+$adminObject->addInfoBoxLine(sprintf('<span class="infolabel">'._AM_XOOPSFAQ_TOTAL_CATEGORIES.'</span>', '<span class="infotext green bold">'.$totalCats.'</span>'));
+$adminObject->addInfoBoxLine(sprintf('<span class="infolabel">'._AM_XOOPSFAQ_TOTAL_PUBLISHED.'</span>', '<span class="infotext green bold">'.$totalPublishedFaqs.'</span>'));
+$adminObject->addInfoBoxLine(sprintf('<span class="infolabel">'._AM_XOOPSFAQ_TOTAL_INACTIVE.'</span>', '<span class="infotext red bold">'.$totalNonpublishedFaqs.'</span>'));
+$adminObject->addInfoBoxLine(sprintf('<span class="infolabel">'._AM_XOOPSFAQ_TOTAL_FAQS.'</span>', '<span class="infotext green bold">'.$totalFaqs.'</span>'));
 
 $adminObject->displayNavigation(basename(__FILE__));
 
@@ -69,20 +69,20 @@ 
 //------------- Test Data ----------------------------
 
 if ($helper->getConfig('displaySampleButton')) {
-    $yamlFile            = dirname(__DIR__) . '/config/admin.yml';
+    $yamlFile            = dirname(__DIR__).'/config/admin.yml';
     $config              = loadAdminConfig($yamlFile);
     $displaySampleButton = $config['displaySampleButton'];
 
     if (1 == $displaySampleButton) {
         xoops_loadLanguage('admin/modulesadmin', 'system');
-        require dirname(__DIR__) . '/testdata/index.php';
+        require dirname(__DIR__).'/testdata/index.php';
 
-        $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA'), './../testdata/index.php?op=load', 'add');
-        $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), './../testdata/index.php?op=save', 'add');
+        $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'ADD_SAMPLEDATA'), './../testdata/index.php?op=load', 'add');
+        $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA'), './../testdata/index.php?op=save', 'add');
         //    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), './../testdata/index.php?op=exportschema', 'add');
-        $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
+        $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'HIDE_SAMPLEDATA_BUTTONS'), '?op=hide_buttons', 'delete');
     } else {
-        $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
+        $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLEDATA_BUTTONS'), '?op=show_buttons', 'add');
         $displaySampleButton = $config['displaySampleButton'];
     }
     $adminObject->displayButton('left', '');
@@ -138,4 +138,4 @@ 
 echo $utility::getServerStats();
 
 //codeDump(__FILE__);
-require __DIR__ . '/admin_footer.php';
+require __DIR__.'/admin_footer.php';

admin/admin_footer.php

Spacing +2 added lines, -2 removed lines

@@ -27,8 +27,8 @@
 echo "<div class='adminfooter'>
 " . "  <div style='text-align: center;'>
 " . "    <a href='https://xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>
-" . '  </div>' . '
-' . '  ' . _AM_MODULEADMIN_ADMIN_FOOTER . '
+".'  </div>'.'
+' . '  '._AM_MODULEADMIN_ADMIN_FOOTER.'
 ' . '</div>';
 
 xoops_cp_footer();

testdata/index.php

Spacing +14 added lines, -14 removed lines

@@ -18,8 +18,8 @@ 
 use XoopsModules\Xoopsfaq\Common;
 use XoopsModules\Xoopsfaq\Utility;
 
-require_once dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-require dirname(__DIR__) . '/preloads/autoloader.php';
+require_once dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+require dirname(__DIR__).'/preloads/autoloader.php';
 
 $op = \Xmf\Request::getCmd('op', '');
 
@@ -39,7 +39,7 @@ 
             loadSampleData();
         } else {
             xoops_cp_header();
-            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', sprintf(constant('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA_OK')), constant('CO_' . $moduleDirNameUpper . '_' . 'CONFIRM'), true);
+            xoops_confirm(['ok' => 1, 'op' => 'load'], 'index.php', sprintf(constant('CO_'.$moduleDirNameUpper.'_'.'ADD_SAMPLEDATA_OK')), constant('CO_'.$moduleDirNameUpper.'_'.'CONFIRM'), true);
             xoops_cp_footer();
         }
         break;
@@ -63,12 +63,12 @@ 
     $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
 
     $language = 'english/';
-    if (is_dir(__DIR__ . '/' . $xoopsConfig['language'])) {
-        $language = $xoopsConfig['language'] . '/';
+    if (is_dir(__DIR__.'/'.$xoopsConfig['language'])) {
+        $language = $xoopsConfig['language'].'/';
     }
 
     foreach ($tables as $table) {
-        $tabledata = \Xmf\Yaml::readWrapped($table . '.yml');
+        $tabledata = \Xmf\Yaml::readWrapped($table.'.yml');
         \Xmf\Database\TableLoad::truncateTable($table);
         \Xmf\Database\TableLoad::loadTableFromArray($table, $tabledata);
     }
@@ -82,7 +82,7 @@ 
             $utility::rcopy($src, $dest);
         }
     }
-    redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS'));
+    redirect_header('../admin/index.php', 1, constant('CO_'.$moduleDirNameUpper.'_'.'SAMPLEDATA_SUCCESS'));
 }
 
 function saveSampleData()
@@ -94,18 +94,18 @@ 
 
     $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
 
-    $languageFolder = __DIR__ . '/' . $xoopsConfig['language'];
-    if (!file_exists($languageFolder . '/')) {
-        Utility::createFolder($languageFolder . '/');
+    $languageFolder = __DIR__.'/'.$xoopsConfig['language'];
+    if (!file_exists($languageFolder.'/')) {
+        Utility::createFolder($languageFolder.'/');
     }
-    $exportFolder = $languageFolder . '/Exports-' . date('Y-m-d-H-i-s') . '/';
+    $exportFolder = $languageFolder.'/Exports-'.date('Y-m-d-H-i-s').'/';
     Utility::createFolder($exportFolder);
 
     foreach ($tables as $table) {
-        \Xmf\Database\TableLoad::saveTableToYamlFile($table, $exportFolder . $table . '.yml');
+        \Xmf\Database\TableLoad::saveTableToYamlFile($table, $exportFolder.$table.'.yml');
     }
 
-    redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS'));
+    redirect_header('../admin/index.php', 1, constant('CO_'.$moduleDirNameUpper.'_'.'SAMPLEDATA_SUCCESS'));
 }
 
 function exportSchema()
@@ -120,6 +120,6 @@ 
         //
         //        redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
     } catch (\Exception $e) {
-        exit(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR'));
+        exit(constant('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_ERROR'));
     }
 }

comment_new.php

Spacing +1 added lines, -1 removed lines

@@ -21,5 +21,5 @@
  * @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_new.php');

config/imageconfig.php

Spacing +9 added lines, -9 removed lines

@@ -10,8 +10,8 @@ 
 // extra module configs
 $modversion['config'][] = [
     'name'        => 'imageConfigs',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_CONFIG_DSC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_CONFIG',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_CONFIG_DSC',
     'formtype'    => 'line_break',
     'valuetype'   => 'textbox',
     'default'     => 'head',
@@ -19,8 +19,8 @@ 
 
 $modversion['config'][] = [
     'name'        => 'imageWidth',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_WIDTH_DSC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_WIDTH',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_WIDTH_DSC',
     'formtype'    => 'textbox',
     'valuetype'   => 'int',
     'default'     => 1200,
@@ -28,8 +28,8 @@ 
 
 $modversion['config'][] = [
     'name'        => 'imageHeight',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_HEIGHT_DSC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_HEIGHT',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_HEIGHT_DSC',
     'formtype'    => 'textbox',
     'valuetype'   => 'int',
     'default'     => 800,
@@ -37,10 +37,10 @@ 
 
 $modversion['config'][] = [
     'name'        => 'imageUploadPath',
-    'title'       => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH',
-    'description' => 'CO_' . $moduleDirNameUpper . '_' . 'IMAGE_UPLOAD_PATH_DSC',
+    'title'       => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_UPLOAD_PATH',
+    'description' => 'CO_'.$moduleDirNameUpper.'_'.'IMAGE_UPLOAD_PATH_DSC',
     'formtype'    => 'textbox',
     'valuetype'   => 'text',
-    'default'     => 'uploads/' . $modversion['dirname'] . '/images',
+    'default'     => 'uploads/'.$modversion['dirname'].'/images',
 ];
 

config/config.php

Spacing +15 added lines, -15 removed lines

@@ -21,32 +21,32 @@ 
 $moduleDirNameUpper = mb_strtoupper($moduleDirName);
 
 return (object)[
-    'name'           => mb_strtoupper($moduleDirName) . ' ModuleConfigurator',
+    'name'           => mb_strtoupper($moduleDirName).' ModuleConfigurator',
     'paths'          => [
         'dirname'    => $moduleDirName,
-        'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-        'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-        'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-        'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+        'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+        'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+        'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+        'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
     ],
     'uploadFolders'  => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
         //XOOPS_UPLOAD_PATH . '/flags'
     ],
     'copyBlankFiles' => [
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-        XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+        XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
         //XOOPS_UPLOAD_PATH . '/flags'
     ],
 
     'copyTestFolders' => [
         [
-            XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/uploads',
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
+            XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/testdata/uploads',
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
         ],
         //            [
         //                XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/testdata/thumbs',
@@ -83,6 +83,6 @@ 
         //            'totalsubmitted'  => $helper->getHandler('Item')->getItemsCount(-1, [Constants::PUBLISHER_STATUS_SUBMITTED]),
     ],
     'modCopyright' => "<a href='https://xoops.org' title='XOOPS Project' target='_blank'>
-                     <img src='" . constant($moduleDirNameUpper . '_AUTHOR_LOGOIMG') . "' alt='XOOPS Project'></a>",
+                     <img src='" . constant($moduleDirNameUpper.'_AUTHOR_LOGOIMG')."' alt='XOOPS Project'></a>",
 ];
 

config/paths.php

Spacing +9 added lines, -9 removed lines

@@ -9,19 +9,19 @@
     $moduleDirNameUpper = mb_strtoupper($moduleDirName);
 
     return (object)[
-        'name'          => mb_strtoupper($moduleDirName) . ' PathConfigurator',
+        'name'          => mb_strtoupper($moduleDirName).' PathConfigurator',
         'paths'         => [
             'dirname'    => $moduleDirName,
-            'admin'      => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/admin',
-            'modPath'    => XOOPS_ROOT_PATH . '/modules/' . $moduleDirName,
-            'modUrl'     => XOOPS_URL . '/modules/' . $moduleDirName,
-            'uploadPath' => XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-            'uploadUrl'  => XOOPS_UPLOAD_URL . '/' . $moduleDirName,
+            'admin'      => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/admin',
+            'modPath'    => XOOPS_ROOT_PATH.'/modules/'.$moduleDirName,
+            'modUrl'     => XOOPS_URL.'/modules/'.$moduleDirName,
+            'uploadPath' => XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+            'uploadUrl'  => XOOPS_UPLOAD_URL.'/'.$moduleDirName,
         ],
         'uploadFolders' => [
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName,
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/category',
-            XOOPS_UPLOAD_PATH . '/' . $moduleDirName . '/screenshots',
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName,
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/category',
+            XOOPS_UPLOAD_PATH.'/'.$moduleDirName.'/screenshots',
             //XOOPS_UPLOAD_PATH . '/flags'
         ],
     ];