mambax7 / extcal

view_calendar-week.php

Spacing +10 added lines, -10 removed lines

@@ -2,11 +2,11 @@ 
 
 use XoopsModules\Extcal;
 
-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+require_once dirname(dirname(__DIR__)).'/mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 $params                                  = ['view' => _EXTCAL_NAV_CALWEEK, 'file' => _EXTCAL_FILE_CALWEEK];
 $GLOBALS['xoopsOption']['template_main'] = "extcal_view_{$params['view']}.tpl";
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 /** @var Extcal\Helper $helper */
 $helper = Extcal\Helper::getInstance();
@@ -22,7 +22,7 @@ 
 $dayTS = mktime(0, 0, 0, $month, $day, $year);
 //$offset = date('w', $dayTS) - $helper->getConfig('week_start_day');
 $offset = date('w', $dayTS) + 7 - $helper->getConfig('week_start_day') < 7 ? date('w', $dayTS) + 7 - $helper->getConfig('week_start_day') : 0;
-$dayTS  -= ($offset * _EXTCAL_TS_DAY);
+$dayTS -= ($offset * _EXTCAL_TS_DAY);
 $year   = date('Y', $dayTS);
 $month  = date('n', $dayTS);
 $day    = date('j', $dayTS);
@@ -52,7 +52,7 @@ 
     'cat'          => $cat,
     'externalKeys' => 'cat_id',
 ];
-$events   = $eventHandler->getEventsOnPeriode($criteres);
+$events = $eventHandler->getEventsOnPeriode($criteres);
 /**********************************************************************/
 //$eventsArray = $events;
 
@@ -141,21 +141,21 @@ 
 // Making navig data
 $navig = [
     'prev' => [
-        'uri'  => 'year=' . $pWeekCalObj->thisYear() . '&amp;month=' . $pWeekCalObj->thisMonth() . '&amp;day=' . $pWeekCalObj->thisDay(),
+        'uri'  => 'year='.$pWeekCalObj->thisYear().'&amp;month='.$pWeekCalObj->thisMonth().'&amp;day='.$pWeekCalObj->thisDay(),
         'name' => $timeHandler->getFormatedDate($helper->getConfig('nav_date_week'), $pWeekCalObj->getTimestamp()),
     ],
     'this' => [
-        'uri'  => 'year=' . $weekCalObj->thisYear() . '&amp;month=' . $weekCalObj->thisMonth() . '&amp;day=' . $weekCalObj->thisDay(),
+        'uri'  => 'year='.$weekCalObj->thisYear().'&amp;month='.$weekCalObj->thisMonth().'&amp;day='.$weekCalObj->thisDay(),
         'name' => $timeHandler->getFormatedDate($helper->getConfig('nav_date_week'), $weekCalObj->getTimestamp()),
     ],
     'next' => [
-        'uri'  => 'year=' . $nWeekCalObj->thisYear() . '&amp;month=' . $nWeekCalObj->thisMonth() . '&amp;day=' . $nWeekCalObj->thisDay(),
+        'uri'  => 'year='.$nWeekCalObj->thisYear().'&amp;month='.$nWeekCalObj->thisMonth().'&amp;day='.$nWeekCalObj->thisDay(),
         'name' => $timeHandler->getFormatedDate($helper->getConfig('nav_date_week'), $nWeekCalObj->getTimestamp()),
     ],
 ];
 
 // Title of the page
-$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name') . ' ' . $navig['this']['name']);
+$xoopsTpl->assign('xoops_pagetitle', $xoopsModule->getVar('name').' '.$navig['this']['name']);
 
 // Assigning navig data to the template
 $xoopsTpl->assign('navig', $navig);
@@ -195,4 +195,4 @@ 
 $xoopsTpl->assign('lang', $lang);
 $xoopsTpl->assign('view', 'calweek');
 
-require_once XOOPS_ROOT_PATH . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/footer.php';

event.php

Spacing +5 added lines, -5 removed lines

@@ -19,15 +19,15 @@ 
 
 use XoopsModules\Extcal;
 
-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+require_once dirname(dirname(__DIR__)).'/mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 $params                                  = ['view' => _EXTCAL_NAV_NEW_EVENT, 'file' => _EXTCAL_FILE_NEW_EVENT];
 $GLOBALS['xoopsOption']['template_main'] = 'extcal_event.tpl';
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 //exit;
 
-require_once XOOPS_ROOT_PATH . '/include/comment_view.php';
+require_once XOOPS_ROOT_PATH.'/include/comment_view.php';
 
 if (!isset($_GET['event'])) {
     $eventId = 0;
@@ -228,4 +228,4 @@ 
 
 //function XoopsFormDhtmlTextArea($caption, $name, $value = "", $rows = 5, $cols = 50, $hiddentext = "xoopsHiddenText", $options = array());
 
-require_once XOOPS_ROOT_PATH . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/footer.php';

comment_reply.php

Spacing +2 added lines, -2 removed lines

@@ -17,5 +17,5 @@
  * @author       XOOPS Development Team,
  */
 
-require_once dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once XOOPS_ROOT_PATH . '/include/comment_reply.php';
+require_once dirname(dirname(__DIR__)).'/mainfile.php';
+require_once XOOPS_ROOT_PATH.'/include/comment_reply.php';

blocks/random_events.php

Spacing +9 added lines, -9 removed lines

@@ -19,7 +19,7 @@ 
 
 use XoopsModules\Extcal;
 
-require_once  dirname(__DIR__) . '/include/constantes.php';
+require_once  dirname(__DIR__).'/include/constantes.php';
 
 /**
  * @param $options
@@ -66,22 +66,22 @@ 
 
     $cats = $catHandler->getAllCat($xoopsUser, 'extcal_cat_view');
 
-    $form = _MB_EXTCAL_DISPLAY . " \n";
-    $form .= '<input name="options[0]" size="5" maxlength="255" value="' . $options[0] . '" type="text">&nbsp;' . _MB_EXTCAL_EVENT . '<br>';
-    $form .= _MB_EXTCAL_TITLE_LENGTH . ' : <input name="options[1]" size="5" maxlength="255" value="' . $options[1] . '" type="text"><br>';
+    $form = _MB_EXTCAL_DISPLAY."&nbsp;\n";
+    $form .= '<input name="options[0]" size="5" maxlength="255" value="'.$options[0].'" type="text">&nbsp;'._MB_EXTCAL_EVENT.'<br>';
+    $form .= _MB_EXTCAL_TITLE_LENGTH.' : <input name="options[1]" size="5" maxlength="255" value="'.$options[1].'" type="text"><br>';
     array_shift($options);
     array_shift($options);
-    $form .= _MB_EXTCAL_CAT_TO_USE . '<br><select name="options[]" multiple="multiple" size="5">';
+    $form .= _MB_EXTCAL_CAT_TO_USE.'<br><select name="options[]" multiple="multiple" size="5">';
     if (false === array_search(0, $options)) {
-        $form .= '<option value="0">' . _MB_EXTCAL_ALL_CAT . '</option>';
+        $form .= '<option value="0">'._MB_EXTCAL_ALL_CAT.'</option>';
     } else {
-        $form .= '<option value="0" selected="selected">' . _MB_EXTCAL_ALL_CAT . '</option>';
+        $form .= '<option value="0" selected="selected">'._MB_EXTCAL_ALL_CAT.'</option>';
     }
     foreach ($cats as $cat) {
         if (false === array_search($cat->getVar('cat_id'), $options)) {
-            $form .= '<option value="' . $cat->getVar('cat_id') . '">' . $cat->getVar('cat_name') . '</option>';
+            $form .= '<option value="'.$cat->getVar('cat_id').'">'.$cat->getVar('cat_name').'</option>';
         } else {
-            $form .= '<option value="' . $cat->getVar('cat_id') . '" selected="selected">' . $cat->getVar('cat_name') . '</option>';
+            $form .= '<option value="'.$cat->getVar('cat_id').'" selected="selected">'.$cat->getVar('cat_name').'</option>';
         }
     }
     $form .= '</select>';

location.php

Indentation +16 added lines, -16 removed lines

@@ -56,22 +56,22 @@
 $edit_delete = '';
 if (is_object($xoopsUser) && $isAdmin) {
     $edit_delete = '<a href="'
-                   . XOOPS_URL
-                   . '/modules/extcal/admin/Location.php?op=edit_location&location_id='
-                   . $location_id
-                   . '"><img src="'
-                   . $pathIcon16
-                   . '/edit.png" width="16px" height="16px" border="0" title="'
-                   . _MD_EXTCAL_LOCATION_EDIT
-                   . '"></a><a href="'
-                   . XOOPS_URL
-                   . '/modules/extcal/admin/Location.php?op=delete_location&location_id='
-                   . $location_id
-                   . '"><img src="'
-                   . $pathIcon16
-                   . '/delete.png" width="16px" height="16px" border="0" title="'
-                   . _MD_EXTCAL_LOCATION_DELETE
-                   . '"></a>';
+                    . XOOPS_URL
+                    . '/modules/extcal/admin/Location.php?op=edit_location&location_id='
+                    . $location_id
+                    . '"><img src="'
+                    . $pathIcon16
+                    . '/edit.png" width="16px" height="16px" border="0" title="'
+                    . _MD_EXTCAL_LOCATION_EDIT
+                    . '"></a><a href="'
+                    . XOOPS_URL
+                    . '/modules/extcal/admin/Location.php?op=delete_location&location_id='
+                    . $location_id
+                    . '"><img src="'
+                    . $pathIcon16
+                    . '/delete.png" width="16px" height="16px" border="0" title="'
+                    . _MD_EXTCAL_LOCATION_DELETE
+                    . '"></a>';
 }
 $xoopsTpl->assign('edit_delete', $edit_delete);
 

Spacing +7 added lines, -7 removed lines

@@ -19,10 +19,10 @@ 
 
 use XoopsModules\Extcal;
 
-require_once  dirname(dirname(__DIR__)) . '/mainfile.php';
-require_once __DIR__ . '/include/constantes.php';
+require_once  dirname(dirname(__DIR__)).'/mainfile.php';
+require_once __DIR__.'/include/constantes.php';
 $GLOBALS['xoopsOption']['template_main'] = 'extcal_location.tpl';
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 
 $locationHandler = Extcal\Helper::getInstance()->getHandler(_EXTCAL_CLN_LOCATION);
 //require_once XOOPS_ROOT_PATH.'/header.php';
@@ -37,7 +37,7 @@ 
 $location_exist = $locationHandler->getCount($criteria);
 
 if (0 == $location_exist) {
-    redirect_header(XOOPS_URL . '/modules/extcal/index.php', 3, _NOPERM);
+    redirect_header(XOOPS_URL.'/modules/extcal/index.php', 3, _NOPERM);
 }
 
 $view_location = $locationHandler->getLocation($location_id, true);
@@ -79,12 +79,12 @@ 
 
 $date = mktime(0, 0, 0, date('m'), date('d'), date('y'));
 
-$requete = $xoopsDB->query('SELECT event_id, event_title, event_desc, event_picture1, event_start FROM ' . $xoopsDB->prefix('extcal_event') . " WHERE event_location='" . $location_id . "' AND event_start >='" . $date . "'");
+$requete = $xoopsDB->query('SELECT event_id, event_title, event_desc, event_picture1, event_start FROM '.$xoopsDB->prefix('extcal_event')." WHERE event_location='".$location_id."' AND event_start >='".$date."'");
 while (false !== ($donnees = $xoopsDB->fetchArray($requete))) {
     if ($donnees['event_desc'] > 210) {
         $event_desc = $donnees['event_desc'];
     } else {
-        $event_desc = substr($donnees['event_desc'], 0, 210) . '...';
+        $event_desc = substr($donnees['event_desc'], 0, 210).'...';
     }
     $xoopsTpl->append('events', [
         'event_picture1' => $donnees['event_picture1'],
@@ -97,4 +97,4 @@ 
 /** @var xos_opal_Theme $xoTheme */
 $xoTheme->addScript('browse.php?modules/extcal/assets/js/highslide.js');
 $xoTheme->addStylesheet('browse.php?modules/extcal/assets/js/highslide.css');
-require_once XOOPS_ROOT_PATH . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/footer.php';

testdata/index.php

Spacing +9 added lines, -9 removed lines

@@ -18,8 +18,8 @@ 
 use XoopsModules\Extcal;
 use XoopsModules\Extcal\Common;
 
-require dirname(dirname(dirname(__DIR__))) . '/mainfile.php';
-include dirname(__DIR__) . '/preloads/autoloader.php';
+require dirname(dirname(dirname(__DIR__))).'/mainfile.php';
+include dirname(__DIR__).'/preloads/autoloader.php';
 $op = \Xmf\Request::getCmd('op', '');
 
 switch ($op) {
@@ -51,14 +51,14 @@ 
     $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
 
     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);
     }
 
 
     //  ---  COPY test folder files ---------------
-    if (is_array ($configurator->copyTestFolders) && count($configurator->copyTestFolders) > 0) {
+    if (is_array($configurator->copyTestFolders) && count($configurator->copyTestFolders) > 0) {
         //        $file = __DIR__ . '/../testdata/images/';
         foreach (array_keys($configurator->copyTestFolders) as $i) {
             $src  = $configurator->copyTestFolders[$i][0];
@@ -67,7 +67,7 @@ 
         }
     }
 
-    redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS'));
+    redirect_header('../admin/index.php', 1, constant('CO_'.$moduleDirNameUpper.'_'.'SAMPLEDATA_SUCCESS'));
 }
 
 function saveSampleData()
@@ -78,10 +78,10 @@ 
     $tables = \Xmf\Module\Helper::getHelper($moduleDirName)->getModule()->getInfo('tables');
 
     foreach ($tables as $table) {
-        \Xmf\Database\TableLoad::saveTableToYamlFile($table, $table . '_' . date("Y-m-d H-i-s") . '.yml');
+        \Xmf\Database\TableLoad::saveTableToYamlFile($table, $table.'_'.date("Y-m-d H-i-s").'.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()
@@ -93,8 +93,8 @@ 
         $migrate = new  \Xmf\Database\Migrate($moduleDirName);
         $migrate->saveCurrentSchema();
 
-        redirect_header('../admin/index.php', 1, constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS'));
+        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'));
     }
 }

language/english/common.php

Spacing +76 added lines, -76 removed lines

@@ -21,63 +21,63 @@ 
 $moduleDirName      = basename(dirname(dirname(__DIR__)));
 $moduleDirNameUpper = strtoupper($moduleDirName);
 
-define('CO_' . $moduleDirNameUpper . '_GDLIBSTATUS', 'GD library support: ');
-define('CO_' . $moduleDirNameUpper . '_GDLIBVERSION', 'GD Library version: ');
-define('CO_' . $moduleDirNameUpper . '_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
-define('CO_' . $moduleDirNameUpper . '_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
-define('CO_' . $moduleDirNameUpper . '_IMAGEINFO', 'Server status');
-define('CO_' . $moduleDirNameUpper . '_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
-define('CO_' . $moduleDirNameUpper . '_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
-define('CO_' . $moduleDirNameUpper . '_OFF', "<span style='font-weight: bold;'>OFF</span>");
-define('CO_' . $moduleDirNameUpper . '_ON', "<span style='font-weight: bold;'>ON</span>");
-define('CO_' . $moduleDirNameUpper . '_SERVERPATH', 'Server path to XOOPS root: ');
-define('CO_' . $moduleDirNameUpper . '_SERVERUPLOADSTATUS', 'Server uploads status: ');
-define('CO_' . $moduleDirNameUpper . '_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
-define('CO_' . $moduleDirNameUpper . '_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
-
-define('CO_' . $moduleDirNameUpper . '_PRINT', "<span style='font-weight: bold;'>Print</span>");
-define('CO_' . $moduleDirNameUpper . '_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
-
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED1', "Update failed - couldn't add new fields");
-define('CO_' . $moduleDirNameUpper . '_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
-define('CO_' . $moduleDirNameUpper . '_ERROR_COLUMN', 'Could not create column in database : %s');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
-define('CO_' . $moduleDirNameUpper . '_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
-
-define('CO_' . $moduleDirNameUpper . '_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
+define('CO_'.$moduleDirNameUpper.'_GDLIBSTATUS', 'GD library support: ');
+define('CO_'.$moduleDirNameUpper.'_GDLIBVERSION', 'GD Library version: ');
+define('CO_'.$moduleDirNameUpper.'_GDOFF', "<span style='font-weight: bold;'>Disabled</span> (No thumbnails available)");
+define('CO_'.$moduleDirNameUpper.'_GDON', "<span style='font-weight: bold;'>Enabled</span> (Thumbsnails available)");
+define('CO_'.$moduleDirNameUpper.'_IMAGEINFO', 'Server status');
+define('CO_'.$moduleDirNameUpper.'_MAXPOSTSIZE', 'Max post size permitted (post_max_size directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_MAXUPLOADSIZE', 'Max upload size permitted (upload_max_filesize directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_MEMORYLIMIT', 'Memory limit (memory_limit directive in php.ini): ');
+define('CO_'.$moduleDirNameUpper.'_METAVERSION', "<span style='font-weight: bold;'>Downloads meta version:</span> ");
+define('CO_'.$moduleDirNameUpper.'_OFF', "<span style='font-weight: bold;'>OFF</span>");
+define('CO_'.$moduleDirNameUpper.'_ON', "<span style='font-weight: bold;'>ON</span>");
+define('CO_'.$moduleDirNameUpper.'_SERVERPATH', 'Server path to XOOPS root: ');
+define('CO_'.$moduleDirNameUpper.'_SERVERUPLOADSTATUS', 'Server uploads status: ');
+define('CO_'.$moduleDirNameUpper.'_SPHPINI', "<span style='font-weight: bold;'>Information taken from PHP ini file:</span>");
+define('CO_'.$moduleDirNameUpper.'_UPLOADPATHDSC', 'Note. Upload path *MUST* contain the full server path of your upload folder.');
+
+define('CO_'.$moduleDirNameUpper.'_PRINT', "<span style='font-weight: bold;'>Print</span>");
+define('CO_'.$moduleDirNameUpper.'_PDF', "<span style='font-weight: bold;'>Create PDF</span>");
+
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED0', "Update failed - couldn't rename field '%s'");
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED1', "Update failed - couldn't add new fields");
+define('CO_'.$moduleDirNameUpper.'_UPGRADEFAILED2', "Update failed - couldn't rename table '%s'");
+define('CO_'.$moduleDirNameUpper.'_ERROR_COLUMN', 'Could not create column in database : %s');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_XOOPS', 'This module requires XOOPS %s+ (%s installed)');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_PHP', 'This module requires PHP version %s+ (%s installed)');
+define('CO_'.$moduleDirNameUpper.'_ERROR_TAG_REMOVAL', 'Could not remove tags from Tag Module');
+
+define('CO_'.$moduleDirNameUpper.'_FOLDERS_DELETED_OK', 'Upload Folders have been deleted');
 
 // Error Msgs
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
-define('CO_' . $moduleDirNameUpper . '_ERROR_BAD_REMOVE', 'Could not delete %s');
-define('CO_' . $moduleDirNameUpper . '_ERROR_NO_PLUGIN', 'Could not load plugin');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_DEL_PATH', 'Could not delete %s directory');
+define('CO_'.$moduleDirNameUpper.'_ERROR_BAD_REMOVE', 'Could not delete %s');
+define('CO_'.$moduleDirNameUpper.'_ERROR_NO_PLUGIN', 'Could not load plugin');
 
 //Help
-define('CO_' . $moduleDirNameUpper . '_DIRNAME', basename(dirname(dirname(__DIR__))));
-define('CO_' . $moduleDirNameUpper . '_HELP_HEADER', __DIR__ . '/help/helpheader.tpl');
-define('CO_' . $moduleDirNameUpper . '_BACK_2_ADMIN', 'Back to Administration of ');
-define('CO_' . $moduleDirNameUpper . '_OVERVIEW', 'Overview');
+define('CO_'.$moduleDirNameUpper.'_DIRNAME', basename(dirname(dirname(__DIR__))));
+define('CO_'.$moduleDirNameUpper.'_HELP_HEADER', __DIR__.'/help/helpheader.tpl');
+define('CO_'.$moduleDirNameUpper.'_BACK_2_ADMIN', 'Back to Administration of ');
+define('CO_'.$moduleDirNameUpper.'_OVERVIEW', 'Overview');
 
 //define('CO_' . $moduleDirNameUpper . '_HELP_DIR', __DIR__);
 
 //help multi-page
-define('CO_' . $moduleDirNameUpper . '_DISCLAIMER', 'Disclaimer');
-define('CO_' . $moduleDirNameUpper . '_LICENSE', 'License');
-define('CO_' . $moduleDirNameUpper . '_SUPPORT', 'Support');
+define('CO_'.$moduleDirNameUpper.'_DISCLAIMER', 'Disclaimer');
+define('CO_'.$moduleDirNameUpper.'_LICENSE', 'License');
+define('CO_'.$moduleDirNameUpper.'_SUPPORT', 'Support');
 
 
 //Sample Data
-define('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA', 'Import Sample Data (will delete ALL current data)');
-define('CO_' . $moduleDirNameUpper . '_' . 'SAMPLEDATA_SUCCESS', 'Sample Date uploaded successfully');
-define('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA', 'Export Tables to YAML');
-define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON', 'Show Sample Button?');
-define('CO_' . $moduleDirNameUpper . '_' . 'SHOW_SAMPLE_BUTTON_DESC', 'If yes, the "Add Sample Data" button will be visible to the Admin. It is Yes as a default for first installation.');
-define('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA', 'Export DB Schema to YAML');
-define('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_SUCCESS', 'Export DB Schema to YAML was a success');
-define('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA_ERROR', 'ERROR: Export of DB Schema to YAML failed');
+define('CO_'.$moduleDirNameUpper.'_'.'ADD_SAMPLEDATA', 'Import Sample Data (will delete ALL current data)');
+define('CO_'.$moduleDirNameUpper.'_'.'SAMPLEDATA_SUCCESS', 'Sample Date uploaded successfully');
+define('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA', 'Export Tables to YAML');
+define('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON', 'Show Sample Button?');
+define('CO_'.$moduleDirNameUpper.'_'.'SHOW_SAMPLE_BUTTON_DESC', 'If yes, the "Add Sample Data" button will be visible to the Admin. It is Yes as a default for first installation.');
+define('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA', 'Export DB Schema to YAML');
+define('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_SUCCESS', 'Export DB Schema to YAML was a success');
+define('CO_'.$moduleDirNameUpper.'_'.'EXPORT_SCHEMA_ERROR', 'ERROR: Export of DB Schema to YAML failed');
 
 //letter choice
 define('CO_'.$moduleDirNameUpper.'_'.'BROWSETOTOPIC', "<span style='font-weight: bold;'>Browse items alphabetically</span>");
@@ -85,39 +85,39 @@ 
 define('CO_'.$moduleDirNameUpper.'_'.'ALL', 'All');
 
 // block defines
-define('CO_' . $moduleDirNameUpper . '_' . 'ACCESSRIGHTS', 'Access Rights');
-define('CO_' . $moduleDirNameUpper . '_' . 'ACTION', 'Action');
-define('CO_' . $moduleDirNameUpper . '_' . 'ACTIVERIGHTS', 'Active Rights');
-define('CO_' . $moduleDirNameUpper . '_' . 'BADMIN', 'Block Administration');
-define('CO_' . $moduleDirNameUpper . '_' . 'BLKDESC', 'Description');
-define('CO_' . $moduleDirNameUpper . '_' . 'CBCENTER', 'Center Middle');
-define('CO_' . $moduleDirNameUpper . '_' . 'CBLEFT', 'Center Left');
-define('CO_' . $moduleDirNameUpper . '_' . 'CBRIGHT', 'Center Right');
-define('CO_' . $moduleDirNameUpper . '_' . 'SBLEFT', 'Left');
-define('CO_' . $moduleDirNameUpper . '_' . 'SBRIGHT', 'Right');
-define('CO_' . $moduleDirNameUpper . '_' . 'SIDE', 'Alignment');
-define('CO_' . $moduleDirNameUpper . '_' . 'TITLE', 'Title');
-define('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE', 'Visible');
-define('CO_' . $moduleDirNameUpper . '_' . 'VISIBLEIN', 'Visible In');
-define('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT', 'Weight');
-
-define('CO_' . $moduleDirNameUpper . '_' . 'PERMISSIONS', 'Permissions');
-define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS', 'Blocks Admin');
-define('CO_' . $moduleDirNameUpper . '_' . 'BLOCKS_DESC', 'Blocks/Group Admin');
-
-define('CO_' . $moduleDirNameUpper . '_' .'BLOCKS_MANAGMENT', 'Manage');
-define('CO_' . $moduleDirNameUpper . '_' .'BLOCKS_ADDBLOCK', 'Add a new block');
-define('CO_' . $moduleDirNameUpper . '_' .'BLOCKS_EDITBLOCK', 'Edit a block');
-define('CO_' . $moduleDirNameUpper . '_' .'BLOCKS_CLONEBLOCK', 'Clone a block');
+define('CO_'.$moduleDirNameUpper.'_'.'ACCESSRIGHTS', 'Access Rights');
+define('CO_'.$moduleDirNameUpper.'_'.'ACTION', 'Action');
+define('CO_'.$moduleDirNameUpper.'_'.'ACTIVERIGHTS', 'Active Rights');
+define('CO_'.$moduleDirNameUpper.'_'.'BADMIN', 'Block Administration');
+define('CO_'.$moduleDirNameUpper.'_'.'BLKDESC', 'Description');
+define('CO_'.$moduleDirNameUpper.'_'.'CBCENTER', 'Center Middle');
+define('CO_'.$moduleDirNameUpper.'_'.'CBLEFT', 'Center Left');
+define('CO_'.$moduleDirNameUpper.'_'.'CBRIGHT', 'Center Right');
+define('CO_'.$moduleDirNameUpper.'_'.'SBLEFT', 'Left');
+define('CO_'.$moduleDirNameUpper.'_'.'SBRIGHT', 'Right');
+define('CO_'.$moduleDirNameUpper.'_'.'SIDE', 'Alignment');
+define('CO_'.$moduleDirNameUpper.'_'.'TITLE', 'Title');
+define('CO_'.$moduleDirNameUpper.'_'.'VISIBLE', 'Visible');
+define('CO_'.$moduleDirNameUpper.'_'.'VISIBLEIN', 'Visible In');
+define('CO_'.$moduleDirNameUpper.'_'.'WEIGHT', 'Weight');
+
+define('CO_'.$moduleDirNameUpper.'_'.'PERMISSIONS', 'Permissions');
+define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS', 'Blocks Admin');
+define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_DESC', 'Blocks/Group Admin');
+
+define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_MANAGMENT', 'Manage');
+define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_ADDBLOCK', 'Add a new block');
+define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_EDITBLOCK', 'Edit a block');
+define('CO_'.$moduleDirNameUpper.'_'.'BLOCKS_CLONEBLOCK', 'Clone a block');
 
 //myblocksadmin
-define('CO_' . $moduleDirNameUpper . '_' . 'AGDS', 'Admin Groups');
-define('CO_' . $moduleDirNameUpper . '_' . 'BCACHETIME', 'Cache Time');
+define('CO_'.$moduleDirNameUpper.'_'.'AGDS', 'Admin Groups');
+define('CO_'.$moduleDirNameUpper.'_'.'BCACHETIME', 'Cache Time');
 
 //Template Admin
-define('CO_' . $moduleDirNameUpper . '_' . 'TPLSETS', 'Template Management');
-define('CO_' . $moduleDirNameUpper . '_' . 'GENERATE', 'Generate');
-define('CO_' . $moduleDirNameUpper . '_' . 'FILENAME', 'File Name');
+define('CO_'.$moduleDirNameUpper.'_'.'TPLSETS', 'Template Management');
+define('CO_'.$moduleDirNameUpper.'_'.'GENERATE', 'Generate');
+define('CO_'.$moduleDirNameUpper.'_'.'FILENAME', 'File Name');
 
 //Menu
-define('CO_' . $moduleDirNameUpper . '_' . 'ADMENU_MIGRATE', 'Migrate');
+define('CO_'.$moduleDirNameUpper.'_'.'ADMENU_MIGRATE', 'Migrate');

admin/blockform.php

Indentation +26 added lines, -26 removed lines

@@ -27,15 +27,15 @@ 
 }
 $side_select = new \XoopsFormSelect(_AM_SYSTEM_BLOCKS_TYPE, 'bside', $block['side']);
 $side_select->addOptionArray([
-                                 0 => _AM_SYSTEM_BLOCKS_SBLEFT,
-                                 1 => _AM_SYSTEM_BLOCKS_SBRIGHT,
-                                 3 => _AM_SYSTEM_BLOCKS_CBLEFT,
-                                 4 => _AM_SYSTEM_BLOCKS_CBRIGHT,
-                                 5 => _AM_SYSTEM_BLOCKS_CBCENTER,
-                                 7 => _AM_SYSTEM_BLOCKS_CBBOTTOMLEFT,
-                                 8 => _AM_SYSTEM_BLOCKS_CBBOTTOMRIGHT,
-                                 9 => _AM_SYSTEM_BLOCKS_CBBOTTOM
-                             ]);
+                                    0 => _AM_SYSTEM_BLOCKS_SBLEFT,
+                                    1 => _AM_SYSTEM_BLOCKS_SBRIGHT,
+                                    3 => _AM_SYSTEM_BLOCKS_CBLEFT,
+                                    4 => _AM_SYSTEM_BLOCKS_CBRIGHT,
+                                    5 => _AM_SYSTEM_BLOCKS_CBCENTER,
+                                    7 => _AM_SYSTEM_BLOCKS_CBBOTTOMLEFT,
+                                    8 => _AM_SYSTEM_BLOCKS_CBBOTTOMRIGHT,
+                                    9 => _AM_SYSTEM_BLOCKS_CBBOTTOM
+                                ]);
 $form->addElement($side_select);
 $form->addElement(new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT'), 'bweight', 2, 5, $block['weight']));
 $form->addElement(new \XoopsFormRadioYN(constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE'), 'bvisible', $block['visible']));
@@ -57,11 +57,11 @@ 
     $form->addElement($textarea, true);
     $ctype_select = new \XoopsFormSelect(_AM_SYSTEM_BLOCKS_CTYPE, 'bctype', $block['ctype']);
     $ctype_select->addOptionArray([
-                                      'H' => _AM_SYSTEM_BLOCKS_HTML,
-                                      'P' => _AM_SYSTEM_BLOCKS_PHP,
-                                      'S' => _AM_SYSTEM_BLOCKS_AFWSMILE,
-                                      'T' => _AM_SYSTEM_BLOCKS_AFNOSMILE
-                                  ]);
+                                        'H' => _AM_SYSTEM_BLOCKS_HTML,
+                                        'P' => _AM_SYSTEM_BLOCKS_PHP,
+                                        'S' => _AM_SYSTEM_BLOCKS_AFWSMILE,
+                                        'T' => _AM_SYSTEM_BLOCKS_AFNOSMILE
+                                    ]);
     $form->addElement($ctype_select);
 } else {
     if ('' !== $block['template']) {
@@ -82,18 +82,18 @@ 
 }
 $cache_select = new \XoopsFormSelect(_AM_SYSTEM_BLOCKS_BCACHETIME, 'bcachetime', $block['bcachetime']);
 $cache_select->addOptionArray([
-                                  '0'       => _NOCACHE,
-                                  '30'      => sprintf(_SECONDS, 30),
-                                  '60'      => _MINUTE,
-                                  '300'     => sprintf(_MINUTES, 5),
-                                  '1800'    => sprintf(_MINUTES, 30),
-                                  '3600'    => _HOUR,
-                                  '18000'   => sprintf(_HOURS, 5),
-                                  '86400'   => _DAY,
-                                  '259200'  => sprintf(_DAYS, 3),
-                                  '604800'  => _WEEK,
-                                  '2592000' => _MONTH
-                              ]);
+                                    '0'       => _NOCACHE,
+                                    '30'      => sprintf(_SECONDS, 30),
+                                    '60'      => _MINUTE,
+                                    '300'     => sprintf(_MINUTES, 5),
+                                    '1800'    => sprintf(_MINUTES, 30),
+                                    '3600'    => _HOUR,
+                                    '18000'   => sprintf(_HOURS, 5),
+                                    '86400'   => _DAY,
+                                    '259200'  => sprintf(_DAYS, 3),
+                                    '604800'  => _WEEK,
+                                    '2592000' => _MONTH
+                                ]);
 $form->addElement($cache_select);
 
 $grouppermHandler = xoops_getHandler('groupperm');

Spacing +9 added lines, -9 removed lines

@@ -16,10 +16,10 @@ 
 
 
 
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 $moduleDirName = basename(dirname(__DIR__));
-$moduleDirNameUpper   = strtoupper($moduleDirName); //$capsDirName
+$moduleDirNameUpper = strtoupper($moduleDirName); //$capsDirName
 
 $form = new \XoopsThemeForm($block['form_title'], 'blockform', 'blocksadmin.php', 'post', true);
 if (isset($block['name'])) {
@@ -37,9 +37,9 @@ 
                                  9 => _AM_SYSTEM_BLOCKS_CBBOTTOM
                              ]);
 $form->addElement($side_select);
-$form->addElement(new \XoopsFormText(constant('CO_' . $moduleDirNameUpper . '_' . 'WEIGHT'), 'bweight', 2, 5, $block['weight']));
-$form->addElement(new \XoopsFormRadioYN(constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLE'), 'bvisible', $block['visible']));
-$mod_select = new \XoopsFormSelect(constant('CO_' . $moduleDirNameUpper . '_' . 'VISIBLEIN'), 'bmodule', $block['modules'], 5, true);
+$form->addElement(new \XoopsFormText(constant('CO_'.$moduleDirNameUpper.'_'.'WEIGHT'), 'bweight', 2, 5, $block['weight']));
+$form->addElement(new \XoopsFormRadioYN(constant('CO_'.$moduleDirNameUpper.'_'.'VISIBLE'), 'bvisible', $block['visible']));
+$mod_select = new \XoopsFormSelect(constant('CO_'.$moduleDirNameUpper.'_'.'VISIBLEIN'), 'bmodule', $block['modules'], 5, true);
 /** @var XoopsModuleHandler $moduleHandler */
 $moduleHandler = xoops_getHandler('module');
 $criteria      = new \CriteriaCompo(new \Criteria('hasmain', 1));
@@ -53,7 +53,7 @@ 
 $form->addElement(new \XoopsFormText(_AM_TITLE, 'btitle', 50, 255, $block['title']), false);
 if ($block['is_custom']) {
     $textarea = new \XoopsFormDhtmlTextArea(_AM_SYSTEM_BLOCKS_CONTENT, 'bcontent', $block['content'], 15, 70);
-    $textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">' . _AM_SYSTEM_BLOCKS_USEFULTAGS . '</span><br><span style="font-size:x-small;font-weight:normal;">' . sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL . '/') . '</span>');
+    $textarea->setDescription('<span style="font-size:x-small;font-weight:bold;">'._AM_SYSTEM_BLOCKS_USEFULTAGS.'</span><br><span style="font-size:x-small;font-weight:normal;">'.sprintf(_AM_BLOCKTAG1, '{X_SITEURL}', XOOPS_URL.'/').'</span>');
     $form->addElement($textarea, true);
     $ctype_select = new \XoopsFormSelect(_AM_SYSTEM_BLOCKS_CTYPE, 'bctype', $block['ctype']);
     $ctype_select->addOptionArray([
@@ -68,11 +68,11 @@ 
         $tplfileHandler = xoops_getHandler('tplfile');
         $btemplate      = $tplfileHandler->find($GLOBALS['xoopsConfig']['template_set'], 'block', $block['bid']);
         if (count($btemplate) > 0) {
-            $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate[0]->getVar('tpl_id') . '">' . _AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+            $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="'.XOOPS_URL.'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='.$btemplate[0]->getVar('tpl_id').'">'._AM_SYSTEM_BLOCKS_EDITTPL.'</a>'));
         } else {
             $btemplate2 = $tplfileHandler->find('default', 'block', $block['bid']);
             if (count($btemplate2) > 0) {
-                $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="' . XOOPS_URL . '/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id=' . $btemplate2[0]->getVar('tpl_id') . '" target="_blank">' . _AM_SYSTEM_BLOCKS_EDITTPL . '</a>'));
+                $form->addElement(new \XoopsFormLabel(_AM_SYSTEM_BLOCKS_CONTENT, '<a href="'.XOOPS_URL.'/modules/system/admin.php?fct=tplsets&amp;op=edittpl&amp;id='.$btemplate2[0]->getVar('tpl_id').'" target="_blank">'._AM_SYSTEM_BLOCKS_EDITTPL.'</a>'));
             }
         }
     }
@@ -97,7 +97,7 @@ 
 $form->addElement($cache_select);
 
 $grouppermHandler = xoops_getHandler('groupperm');
-$groups          = $grouppermHandler->getGroupIds('block_read', $block['bid']);
+$groups = $grouppermHandler->getGroupIds('block_read', $block['bid']);
 
 $form->addElement(new \XoopsFormSelectGroup(_AM_SYSTEM_BLOCKS_GROUP, 'groups', true, $groups, 5, true));
 

admin/migrate.php

Spacing +3 added lines, -3 removed lines

@@ -33,7 +33,7 @@ 
 use XoopsModules\Extcal;
 use XoopsModules\Extcal\Common;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 xoops_cp_header();
 
 $adminObject->displayNavigation(basename(__FILE__));
@@ -76,7 +76,7 @@ 
         if (!empty($queue)) {
             echo "<pre>\n";
             foreach ($queue as $line) {
-                echo $line . ";\n";
+                echo $line.";\n";
             }
             echo "</pre>\n";
         }
@@ -98,4 +98,4 @@ 
 
 echo "<div>$message</div>";
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';