mambax7 / extcal

comment_delete.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_delete.php';
+require_once dirname(dirname(__DIR__)).'/mainfile.php';
+require_once XOOPS_ROOT_PATH.'/include/comment_delete.php';

admin/upgrade.php

Spacing +20 added lines, -20 removed lines

@@ -5,8 +5,8 @@ 
     $step = $_POST['step'];
 }
 
-require_once  dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-require_once __DIR__   . '/function.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+require_once __DIR__.'/function.php';
 
 // Change this variable if you use a cloned version of eXtGallery
 $localModuleDir = 'extcal';
@@ -16,9 +16,9 @@ 
 $downloadServer = 'http://downloads.sourceforge.net/zoullou/';
 
 $lastVersion       = @file_get_contents($versionFile);
-$lastVersionString = substr($lastVersion, 0, 1) . '.' . substr($lastVersion, 1, 1) . '.' . substr($lastVersion, 2, 1);
-$moduleFileName    = $moduleName . '-' . $lastVersionString . '.tar.gz';
-$langFileName      = $moduleName . '-lang-' . $lastVersionString . '_' . $xoopsConfig['language'] . '.tar.gz';
+$lastVersionString = substr($lastVersion, 0, 1).'.'.substr($lastVersion, 1, 1).'.'.substr($lastVersion, 2, 1);
+$moduleFileName    = $moduleName.'-'.$lastVersionString.'.tar.gz';
+$langFileName      = $moduleName.'-lang-'.$lastVersionString.'_'.$xoopsConfig['language'].'.tar.gz';
 
 switch ($step) {
     case 'download':
@@ -30,12 +30,12 @@ 
             break;
         }
 
-        if (!$handle = @fopen($downloadServer . $moduleFileName, 'r')) {
+        if (!$handle = @fopen($downloadServer.$moduleFileName, 'r')) {
             printf(_AM_EXTCAL_MD_FILE_DONT_EXIST, $downloadServer, $moduleFileName);
             xoops_cp_footer();
             break;
         }
-        $localHandle = @fopen(XOOPS_ROOT_PATH . '/uploads/' . $moduleFileName, 'w+');
+        $localHandle = @fopen(XOOPS_ROOT_PATH.'/uploads/'.$moduleFileName, 'w+');
 
         // Downlad module archive
         if ($handle) {
@@ -49,10 +49,10 @@ 
 
         // English file are included on module package
         if ('english' !== $xoopsConfig['language']) {
-            if (!$handle = @fopen($downloadServer . $langFileName, 'r')) {
+            if (!$handle = @fopen($downloadServer.$langFileName, 'r')) {
                 printf(_AM_EXTCAL_LG_FILE_DONT_EXIST, $downloadServer, $langFileName);
             } else {
-                $localHandle = @fopen(XOOPS_ROOT_PATH . '/uploads/' . $langFileName, 'w+');
+                $localHandle = @fopen(XOOPS_ROOT_PATH.'/uploads/'.$langFileName, 'w+');
                 // Download language archive
                 if ($handle) {
                     while (!feof($handle)) {
@@ -75,35 +75,35 @@ 
         xoops_cp_header();
         adminMenu();
 
-        if (!file_exists(XOOPS_ROOT_PATH . '/uploads/' . $moduleFileName)) {
+        if (!file_exists(XOOPS_ROOT_PATH.'/uploads/'.$moduleFileName)) {
             echo _AM_EXTCAL_MD_FILE_DONT_EXIST_SHORT;
             xoops_cp_footer();
 
             break;
         }
 
-        $gPcltarLibDir = XOOPS_ROOT_PATH . '/modules/' . $localModuleDir . '/class';
-        require_once dirname(__DIR__) . '/class/pcltar.lib.php';
+        $gPcltarLibDir = XOOPS_ROOT_PATH.'/modules/'.$localModuleDir.'/class';
+        require_once dirname(__DIR__).'/class/pcltar.lib.php';
 
         //TrOn(5);
 
         // Extract module files
-        PclTarExtract(XOOPS_ROOT_PATH . '/uploads/' . $moduleFileName, XOOPS_ROOT_PATH . '/modules/' . $localModuleDir . '/', 'modules/' . $moduleName . '/');
+        PclTarExtract(XOOPS_ROOT_PATH.'/uploads/'.$moduleFileName, XOOPS_ROOT_PATH.'/modules/'.$localModuleDir.'/', 'modules/'.$moduleName.'/');
         // Delete downloaded module's files
-        unlink(XOOPS_ROOT_PATH . '/uploads/' . $moduleFileName);
+        unlink(XOOPS_ROOT_PATH.'/uploads/'.$moduleFileName);
 
-        if (file_exists(XOOPS_ROOT_PATH . '/uploads/' . $langFileName)) {
+        if (file_exists(XOOPS_ROOT_PATH.'/uploads/'.$langFileName)) {
             // Extract language files
-            PclTarExtract(XOOPS_ROOT_PATH . '/uploads/' . $langFileName, XOOPS_ROOT_PATH . '/modules/' . $localModuleDir . '/', 'modules/' . $moduleName . '/');
+            PclTarExtract(XOOPS_ROOT_PATH.'/uploads/'.$langFileName, XOOPS_ROOT_PATH.'/modules/'.$localModuleDir.'/', 'modules/'.$moduleName.'/');
             // Delete downloaded module's files
-            unlink(XOOPS_ROOT_PATH . '/uploads/' . $langFileName);
+            unlink(XOOPS_ROOT_PATH.'/uploads/'.$langFileName);
         }
 
         // Delete template_c file
-        if ($handle = opendir(XOOPS_ROOT_PATH . '/templates_c')) {
+        if ($handle = opendir(XOOPS_ROOT_PATH.'/templates_c')) {
             while (false !== ($file = readdir($handle))) {
                 if ('.' !== $file && '..' !== $file && 'index.html' !== $file) {
-                    unlink(XOOPS_ROOT_PATH . '/templates_c/' . $file);
+                    unlink(XOOPS_ROOT_PATH.'/templates_c/'.$file);
                 }
             }
 
@@ -111,7 +111,7 @@ 
         }
         //TrDisplay();
 
-        xoops_confirm(['dirname' => $localModuleDir, 'op' => 'update_ok', 'fct' => 'modulesadmin'], XOOPS_URL . '/modules/system/admin.php', _AM_EXTCAL_INSTALL_DONE, _AM_EXTCAL_UPDATE);
+        xoops_confirm(['dirname' => $localModuleDir, 'op' => 'update_ok', 'fct' => 'modulesadmin'], XOOPS_URL.'/modules/system/admin.php', _AM_EXTCAL_INSTALL_DONE, _AM_EXTCAL_UPDATE);
 
         xoops_cp_footer();
 

admin/permissions.php

Spacing +25 added lines, -25 removed lines

@@ -17,9 +17,9 @@ 
  * @author       XOOPS Development Team,
  */
 
-require_once  dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsform/grouppermform.php';
-require_once __DIR__ . '/admin_header.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsform/grouppermform.php';
+require_once __DIR__.'/admin_header.php';
 
 $step = 'default';
 if (\Xmf\Request::hasVar('step', 'POST')) {
@@ -95,35 +95,35 @@ 
         echo '<fieldset id="defaultBookmark"><legend><a href="#defaultBookmark" style="font-weight:bold; color:#990000;" onClick="toggle(\'default\'); toggleIcon(\'defaultIcon\');"><img id="defaultIcon" src="../assets/images/icons/minus.gif">&nbsp;'
              . _AM_EXTCAL_PUBLIC_PERM_MASK
              . '</a></legend><div id="default">';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
         echo _AM_EXTCAL_PUBLIC_PERM_MASK_INFO;
         echo '</fieldset><br>';
         echo '<table class="outer" style="width:100%;">';
         echo '<form method="post" action="permissions.php">';
         echo '<tr>';
-        echo '<th colspan="8" style="text-align:center;">' . _AM_EXTCAL_PUBLIC_PERM_MASK . '</th>';
+        echo '<th colspan="8" style="text-align:center;">'._AM_EXTCAL_PUBLIC_PERM_MASK.'</th>';
         echo '</tr>';
         echo '<tr>';
-        echo '<td class="head" style="text-align:center;">' . _AM_EXTCAL_GROUP_NAME . '</td>';
-        echo '<td class="head" style="text-align:center;">' . _AM_EXTCAL_CAN_VIEW . '</td>';
-        echo '<td class="head" style="text-align:center;">' . _AM_EXTCAL_CAN_SUBMIT . '</td>';
-        echo '<td class="head" style="text-align:center;">' . _AM_EXTCAL_AUTO_APPROVE . '</td>';
-        echo '<td class="head" style="text-align:center;">' . _AM_EXTCAL_CAN_EDIT . '</td>';
+        echo '<td class="head" style="text-align:center;">'._AM_EXTCAL_GROUP_NAME.'</td>';
+        echo '<td class="head" style="text-align:center;">'._AM_EXTCAL_CAN_VIEW.'</td>';
+        echo '<td class="head" style="text-align:center;">'._AM_EXTCAL_CAN_SUBMIT.'</td>';
+        echo '<td class="head" style="text-align:center;">'._AM_EXTCAL_AUTO_APPROVE.'</td>';
+        echo '<td class="head" style="text-align:center;">'._AM_EXTCAL_CAN_EDIT.'</td>';
         echo '</tr>';
         $i = 0;
         foreach ($glist as $k => $v) {
             $style = (0 == ++$i % 2) ? 'odd' : 'even';
             echo '<tr>';
-            echo '<td class="' . $style . '">' . $v . '</td>';
-            echo '<td class="' . $style . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group][' . $k . '][1]" type="checkbox"' . getChecked($viewGroup, $k) . '></td>';
-            echo '<td class="' . $style . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group][' . $k . '][2]" type="checkbox"' . getChecked($submitGroup, $k) . '></td>';
-            echo '<td class="' . $style . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group][' . $k . '][4]" type="checkbox"' . getChecked($autoApproveGroup, $k) . '></td>';
-            echo '<td class="' . $style . '" style="text-align:center;"><input name="perms[extcal_perm_mask][group][' . $k . '][8]" type="checkbox"' . getChecked($editGroup, $k) . '></td>';
+            echo '<td class="'.$style.'">'.$v.'</td>';
+            echo '<td class="'.$style.'" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['.$k.'][1]" type="checkbox"'.getChecked($viewGroup, $k).'></td>';
+            echo '<td class="'.$style.'" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['.$k.'][2]" type="checkbox"'.getChecked($submitGroup, $k).'></td>';
+            echo '<td class="'.$style.'" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['.$k.'][4]" type="checkbox"'.getChecked($autoApproveGroup, $k).'></td>';
+            echo '<td class="'.$style.'" style="text-align:center;"><input name="perms[extcal_perm_mask][group]['.$k.'][8]" type="checkbox"'.getChecked($editGroup, $k).'></td>';
             echo '</tr>';
         }
         echo '<input type="hidden" name="type" value="public">';
         echo '<input type="hidden" name="step" value="enreg">';
-        echo '<tr><td colspan="8" style="text-align:center;" class="head"><input type="submit" value="' . _SUBMIT . '"></td></tr></form>';
+        echo '<tr><td colspan="8" style="text-align:center;" class="head"><input type="submit" value="'._SUBMIT.'"></td></tr></form>';
         echo '</table><br>';
 
         echo '</div></fieldset><br>';
@@ -158,12 +158,12 @@ 
              . '</a></legend><div id="'
              . $permName
              . '">';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
         echo $permDesc;
         echo '</fieldset>';
 
         if ($catHandler->getCount()) {
-            echo $form->render() . '<br>';
+            echo $form->render().'<br>';
         } else {
             redirect_header('cat.php', 2, _AM_EXTCAL_NOPERMSSET, false);
         }
@@ -196,11 +196,11 @@ 
              . '</a></legend><div id="'
              . $permName
              . '">';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
         echo $permDesc;
         echo '</fieldset>';
         if ($catHandler->getCount()) {
-            echo $form->render() . '<br>';
+            echo $form->render().'<br>';
         } else {
             redirect_header('cat.php', 2, _AM_EXTCAL_NOPERMSSET, false);
         }
@@ -233,11 +233,11 @@ 
              . '</a></legend><div id="'
              . $permName
              . '">';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
         echo $permDesc;
         echo '</fieldset>';
         if ($catHandler->getCount()) {
-            echo $form->render() . '<br>';
+            echo $form->render().'<br>';
         } else {
             redirect_header('cat.php', 2, _AM_EXTCAL_NOPERMSSET, false);
         }
@@ -270,11 +270,11 @@ 
              . '</a></legend><div id="'
              . $permName
              . '">';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
         echo $permDesc;
         echo '</fieldset>';
         if ($catHandler->getCount()) {
-            echo $form->render() . '<br>';
+            echo $form->render().'<br>';
         } else {
             redirect_header('cat.php', 2, _AM_EXTCAL_NOPERMSSET, false);
         }
@@ -291,7 +291,7 @@ 
         echo 'toggle(\'extcal_cat_edit\'); toggleIcon (\'extcal_cat_editIcon\');';
         echo '</script>';
 
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
 
         break;
 

admin/location.php

Indentation +4 added lines, -4 removed lines

@@ -156,10 +156,10 @@
             }
         } else {
             xoops_confirm([
-                              'ok'               => 1,
-                              'location_id' => $_REQUEST['location_id'],
-                              'op'               => 'delete_location',
-                          ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_LOCATION_SURDEL . '<br>');
+                                'ok'               => 1,
+                                'location_id' => $_REQUEST['location_id'],
+                                'op'               => 'delete_location',
+                            ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_LOCATION_SURDEL . '<br>');
         }
         break;
 

Spacing +36 added lines, -36 removed lines

@@ -20,18 +20,18 @@ 
 use XoopsModules\Extcal;
 
 // Include xoops admin header
-require_once  dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
 // require_once  dirname(__DIR__) . '/class/ExtcalPersistableObjectHandler.php';
-require_once  dirname(dirname(dirname(__DIR__))) . '/kernel/module.php';
-require_once  dirname(dirname(dirname(__DIR__))) . '/class/xoopsformloader.php';
-require_once  dirname(dirname(dirname(__DIR__))) . '/class/tree.php';
-require_once  dirname(dirname(dirname(__DIR__))) . '/class/xoopslists.php';
-require_once  dirname(dirname(dirname(__DIR__))) . '/class/pagenav.php';
-require_once  dirname(dirname(dirname(__DIR__))) . '/class/xoopsform/grouppermform.php';
-require_once  dirname(dirname(dirname(__DIR__))) . '/class/uploader.php';
-require_once  dirname(__DIR__) . '/include/constantes.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/kernel/module.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/class/xoopsformloader.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/class/tree.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/class/xoopslists.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/class/pagenav.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/class/xoopsform/grouppermform.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/class/uploader.php';
+require_once  dirname(__DIR__).'/include/constantes.php';
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 //require("functions.php");
 //require("../include/functions.php");
@@ -39,10 +39,10 @@ 
 if ($xoopsUser) {
     $xoopsModule = \XoopsModule::getByDirname('extcal');
     if (!$xoopsUser->isAdmin($xoopsModule->mid())) {
-        redirect_header(XOOPS_URL . '/', 3, _NOPERM);
+        redirect_header(XOOPS_URL.'/', 3, _NOPERM);
     }
 } else {
-    redirect_header(XOOPS_URL . '/', 3, _NOPERM);
+    redirect_header(XOOPS_URL.'/', 3, _NOPERM);
 }
 
 // Include language file
@@ -97,9 +97,9 @@ 
         $criteria->setSort('nom');
         $criteria->setOrder('ASC');
         $location_arr = $locationHandler->getObjects($criteria);
-        $numrows           = $locationHandler->getCount($criteria);
+        $numrows = $locationHandler->getCount($criteria);
         if ($numrows > $limit) {
-            $pagenav = new \XoopsPageNav($numrows, $limit, $start, 'start', 'op=liste&limit=' . $limit);
+            $pagenav = new \XoopsPageNav($numrows, $limit, $start, 'start', 'op=liste&limit='.$limit);
             $pagenav = $pagenav->renderNav(4);
         } else {
             $pagenav = '';
@@ -108,35 +108,35 @@ 
         if ($numrows > 0) {
             echo '<table width="100%" cellspacing="1" class="outer">';
             echo '<tr>';
-            echo '<th align="center">' . _AM_EXTCAL_LOCATION_FORM_NOM . '</th>';
-            echo '<th align="center" width="20%">' . _AM_EXTCAL_LOCATION_FORM_ADRESSE . '</th>';
-            echo '<th align="center" width="20%">' . _AM_EXTCAL_LOCATION_FORM_CITY . '</th>';
-            echo '<th align="center" width="15%">' . _AM_EXTCAL_LOCATION_FORM_TELEPHONE . '</th>';
-            echo '<th align="center" width="15%">' . _AM_EXTCAL_LOCATION_FORM_ACTION . '</th>';
+            echo '<th align="center">'._AM_EXTCAL_LOCATION_FORM_NOM.'</th>';
+            echo '<th align="center" width="20%">'._AM_EXTCAL_LOCATION_FORM_ADRESSE.'</th>';
+            echo '<th align="center" width="20%">'._AM_EXTCAL_LOCATION_FORM_CITY.'</th>';
+            echo '<th align="center" width="15%">'._AM_EXTCAL_LOCATION_FORM_TELEPHONE.'</th>';
+            echo '<th align="center" width="15%">'._AM_EXTCAL_LOCATION_FORM_ACTION.'</th>';
             echo '</tr>';
             $class = 'odd';
             foreach (array_keys($location_arr) as $i) {
-                $class                   = ('even' === $class) ? 'odd' : 'even';
+                $class = ('even' === $class) ? 'odd' : 'even';
                 $location_id        = $location_arr[$i]->getVar('id');
                 $location_nom       = $location_arr[$i]->getVar('nom');
                 $location_adresse   = $location_arr[$i]->getVar('adresse');
                 $location_city      = $location_arr[$i]->getVar('ville');
                 $location_telephone = $location_arr[$i]->getVar('tel_fixe');
-                echo '<tr class="' . $class . '">';
-                echo '<td align="left">' . '<a href="Location.php?op=edit_location&location_id=' . $location_id . '">' . $location_nom . '</a>' . '</td>';
+                echo '<tr class="'.$class.'">';
+                echo '<td align="left">'.'<a href="Location.php?op=edit_location&location_id='.$location_id.'">'.$location_nom.'</a>'.'</td>';
 
-                echo '<td align="center"><b>' . $location_adresse . '</td>';
-                echo '<td align="center"><b>' . $location_city . '</td>';
-                echo '<td align="center"><b>' . $location_telephone . '</td>';
+                echo '<td align="center"><b>'.$location_adresse.'</td>';
+                echo '<td align="center"><b>'.$location_city.'</td>';
+                echo '<td align="center"><b>'.$location_telephone.'</td>';
                 echo '<td align="center" width="15%">';
-                echo '<a href="Location.php?op=edit_location&location_id=' . $location_id . '"><img src=' . $pathIcon16 . '/edit.png alt="' . _AM_EXTCAL_LOCATION_FORM_EDIT . '" title="' . _AM_EXTCAL_LOCATION_FORM_EDIT . '"></a> ';
-                echo '<a href="Location.php?op=delete_location&location_id=' . $location_id . '"><img src=' . $pathIcon16 . '/delete.png alt="' . _AM_EXTCAL_LOCATION_FORM_DELETE . '" title="' . _AM_EXTCAL_LOCATION_FORM_DELETE . '"></a> ';
+                echo '<a href="Location.php?op=edit_location&location_id='.$location_id.'"><img src='.$pathIcon16.'/edit.png alt="'._AM_EXTCAL_LOCATION_FORM_EDIT.'" title="'._AM_EXTCAL_LOCATION_FORM_EDIT.'"></a> ';
+                echo '<a href="Location.php?op=delete_location&location_id='.$location_id.'"><img src='.$pathIcon16.'/delete.png alt="'._AM_EXTCAL_LOCATION_FORM_DELETE.'" title="'._AM_EXTCAL_LOCATION_FORM_DELETE.'"></a> ';
                 echo '</td>';
             }
             echo '</table><br>';
-            echo '<br><div align=right>' . $pagenav . '</div><br>';
+            echo '<br><div align=right>'.$pagenav.'</div><br>';
         } else {
-            echo '<div class="errorMsg" style="text-align: center;">' . _AM_EXTCAL_ERREUR_NO_LOCATION . '</div>';
+            echo '<div class="errorMsg" style="text-align: center;">'._AM_EXTCAL_ERREUR_NO_LOCATION.'</div>';
         }
 
         // Affichage du formulaire
@@ -159,7 +159,7 @@ 
                               'ok'               => 1,
                               'location_id' => $_REQUEST['location_id'],
                               'op'               => 'delete_location',
-                          ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_LOCATION_SURDEL . '<br>');
+                          ], $_SERVER['REQUEST_URI'], _AM_EXTCAL_LOCATION_SURDEL.'<br>');
         }
         break;
 
@@ -201,11 +201,11 @@ 
         $obj->setVar('map', $_REQUEST['map']);
 
         //Logo
-        $uploaddir_location = XOOPS_ROOT_PATH . '/uploads/extcal/location/';
-        $uploadurl_location = XOOPS_URL . '/uploads/extcal/location/';
+        $uploaddir_location = XOOPS_ROOT_PATH.'/uploads/extcal/location/';
+        $uploadurl_location = XOOPS_URL.'/uploads/extcal/location/';
 
         $delimg = @$_REQUEST['delimg'];
-        $delimg = isset($delimg) ? (int)$delimg : 0;
+        $delimg = isset($delimg) ? (int) $delimg : 0;
         if (0 == $delimg && !empty($_REQUEST['xoops_upload_file'][0])) {
             $upload = new \XoopsMediaUploader($uploaddir_location, [
                 'image/gif',
@@ -227,8 +227,8 @@ 
                 $logo = $_REQUEST['file'];
             }
         } else {
-            $logo              = '';
-            $url_location = XOOPS_ROOT_PATH . '/uploads/extcal/location/' . $_REQUEST['file'];
+            $logo = '';
+            $url_location = XOOPS_ROOT_PATH.'/uploads/extcal/location/'.$_REQUEST['file'];
             if (is_file($url_location)) {
                 chmod($url_location, 0777);
                 unlink($url_location);
@@ -248,4 +248,4 @@ 
         break;
 }
 
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/cat.php

Spacing +10 added lines, -10 removed lines

@@ -20,11 +20,11 @@ 
 use Xmf\Request;
 use XoopsModules\Extcal;
 
-require_once  dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-require_once dirname(dirname(dirname(__DIR__))) . '/class/xoopsformloader.php';
-require_once __DIR__ . '/admin_header.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/class/xoopsformloader.php';
+require_once __DIR__.'/admin_header.php';
 // require_once  dirname(__DIR__) . '/class/Utility.php';
-require_once  dirname(__DIR__) . '/include/constantes.php';
+require_once  dirname(__DIR__).'/include/constantes.php';
 
 //$gepeto = array_merge($_GET, $_POST);
 //while (list($key, $value) = each($gepeto)) {
@@ -95,7 +95,7 @@ 
         $form->addElement(new \XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, 0), false);
         $form->addElement(new \XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#FF0000'));
 
-        $file_path =  dirname(__DIR__) . '/assets/css/images';
+        $file_path = dirname(__DIR__).'/assets/css/images';
         $tf        = \XoopsLists::getImgListAsArray($file_path);
         array_unshift($tf, _MD_EXTCAL_NONE);
         //$xfIcones = new \XoopsFormSelect(_AM_EXTCAL_ICONE, "cat_icone", $cat->getVar('cat_icone'), '');
@@ -107,7 +107,7 @@ 
 
         $form->display();
 
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         break;
 
     case 'edit':
@@ -120,15 +120,15 @@ 
             //            $cat = $catHandler->getCat($cat_id, true);
         }
 
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_EDIT_CATEGORY . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._AM_EXTCAL_EDIT_CATEGORY.'</legend>';
 
         $form = new \XoopsThemeForm(_AM_EXTCAL_ADD_CATEGORY, 'add_cat', 'cat.php?op=enreg', 'post', true);
         $form->addElement(new \XoopsFormText(_AM_EXTCAL_NAME, 'cat_name', 30, 255, $cat->getVar('cat_name')), true);
         $form->addElement(new \XoopsFormDhtmlTextArea(_AM_EXTCAL_DESCRIPTION, 'cat_desc', $cat->getVar('cat_desc')), false);
         $form->addElement(new \XoopsFormText(_AM_EXTCAL_WEIGHT, 'cat_weight', 30, 5, $cat->getVar('cat_weight')), false);
-        $form->addElement(new \XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#' . $cat->getVar('cat_color')));
+        $form->addElement(new \XoopsFormColorPicker(_AM_EXTCAL_COLOR, 'cat_color', '#'.$cat->getVar('cat_color')));
 
-        $file_path =  dirname(__DIR__) . '/assets/css/images';
+        $file_path = dirname(__DIR__).'/assets/css/images';
         $tf        = \XoopsLists::getImgListAsArray($file_path);
         array_unshift($tf, _MD_EXTCAL_NONE);
         $xfIcones = new \XoopsFormSelect(_AM_EXTCAL_ICONE, 'cat_icone', $cat->getVar('cat_icone'), '');
@@ -284,6 +284,6 @@ 
         //$xoopsTpl->assign("module_dirname",    $xoopsModule->getVar("dirname") );
 
         $xoopsTpl->display('db:admin/extcal_admin_cat_list.tpl');
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
         break;
 }

admin/main.php

Spacing +29 added lines, -29 removed lines

@@ -2,9 +2,9 @@ 
 
 use XoopsModules\Extcal;
 
-require_once  dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
-require_once dirname(dirname(dirname(__DIR__))) . '/class/xoopsformloader.php';
-require_once __DIR__ . '/admin_header.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
+require_once dirname(dirname(dirname(__DIR__))).'/class/xoopsformloader.php';
+require_once __DIR__.'/admin_header.php';
 
 function extgalleryLastVersion()
 {
@@ -32,7 +32,7 @@ 
         switch ($fct) {
             case 'send':
                 if (!$GLOBALS['xoopsSecurity']->check()) {
-                    redirect_header('index.php', 3, _NOPERM . '<br>' . implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
+                    redirect_header('index.php', 3, _NOPERM.'<br>'.implode('<br>', $GLOBALS['xoopsSecurity']->getErrors()));
                 }
                 xoops_cp_header();
                 adminMenu(1);
@@ -64,7 +64,7 @@ 
                     'EV_TITLE' => $event->getVar('event_title'),
                     'EV_START' => $extcalTime->getFormatedDate($helper->getConfig('date_long'), $event->getVar('event_start')),
                     'EV_END'   => $extcalTime->getFormatedDate($helper->getConfig('date_long'), $event->getVar('event_end')),
-                    'EV_LINK'  => XOOPS_URL . '/modules/extcal/event.php?event=' . $event->getVar('event_id'),
+                    'EV_LINK'  => XOOPS_URL.'/modules/extcal/event.php?event='.$event->getVar('event_id'),
                 ];
                 $xoopsMailer->assign($tag);
                 $xoopsMailer->send(true);
@@ -79,7 +79,7 @@ 
             default:
                 xoops_cp_header();
                 $fromemail      = !empty($xoopsConfig['adminmail']) ? $xoopsConfig['adminmail'] : $xoopsUser->getVar('email', 'E');
-                $subjectCaption = _AM_EXTCAL_SUBJECT . "<br><br><span style='font-size:x-small;font-weight:bold;'>" . _AM_EXTCAL_USEFUL_TAGS . "</span><br><span style='font-size:x-small;font-weight:normal;'>" . _AM_EXTCAL_MAILTAGS6 . '<br>' . _AM_EXTCAL_MAILTAGS2 . '</span>&nbsp;&nbsp;&nbsp;';
+                $subjectCaption = _AM_EXTCAL_SUBJECT."<br><br><span style='font-size:x-small;font-weight:bold;'>"._AM_EXTCAL_USEFUL_TAGS."</span><br><span style='font-size:x-small;font-weight:normal;'>"._AM_EXTCAL_MAILTAGS6.'<br>'._AM_EXTCAL_MAILTAGS2.'</span>&nbsp;&nbsp;&nbsp;';
                 $bodyCaption    = _AM_EXTCAL_BODY
                                   . "<br><br><span style='font-size:x-small;font-weight:bold;'>"
                                   . _AM_EXTCAL_USEFUL_TAGS
@@ -102,12 +102,12 @@ 
                                   . '<br>'
                                   . _AM_EXTCAL_MAILTAGS9
                                   . '</span>&nbsp;&nbsp;&nbsp;';
-                $toCheckBbox    = new \XoopsFormCheckBox(_AM_EXTCAL_SEND_TO, 'mail_send_to', 'mail');
+                $toCheckBbox = new \XoopsFormCheckBox(_AM_EXTCAL_SEND_TO, 'mail_send_to', 'mail');
                 $toCheckBox->addOption('mail', _AM_EXTCAL_EMAIL);
                 $toCheckBox->addOption('pm', _AM_EXTCAL_PM);
 
-                echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_APPROVED_EVENT . '</legend>';
-                echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+                echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._AM_EXTCAL_APPROVED_EVENT.'</legend>';
+                echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
                 echo _AM_EXTCAL_INFO_SEND_NOTIF;
                 echo '</fieldset><br>';
                 $form = new \XoopsThemeForm(_AM_EXTCAL_SEND_NOTIFICATION, 'mailusers', 'index.php?op=notification&amp;fct=send', 'post', true);
@@ -137,13 +137,13 @@ 
         //        $eventHandler = xoops_getModuleHandler(_EXTCAL_CLS_EVENT, _EXTCAL_MODULE);
         $adminObject = \Xmf\Module\Admin::getInstance();
         $adminObject->addInfoBox(_MI_EXTCAL_DASHBOARD);
-        $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_EXTCAL_INDEX_CATEGORIES . '</infolabel>', $catHandler->getCount()), '', 'Green');
-        $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_EXTCAL_INDEX_EVENT . '</infolabel>', $eventHandler->getCount(new \Criteria('event_approved', 1))), '', 'Green');
-        $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_EXTCAL_INDEX_PENDING . '</infolabel>', $eventHandler->getCount(new \Criteria('event_approved', 0))), '', 'Red');
+        $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_EXTCAL_INDEX_CATEGORIES.'</infolabel>', $catHandler->getCount()), '', 'Green');
+        $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_EXTCAL_INDEX_EVENT.'</infolabel>', $eventHandler->getCount(new \Criteria('event_approved', 1))), '', 'Green');
+        $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_EXTCAL_INDEX_PENDING.'</infolabel>', $eventHandler->getCount(new \Criteria('event_approved', 0))), '', 'Red');
         $criteriaCompo = new \CriteriaCompo();
         $criteriaCompo->add(new \Criteria('event_approved', 1));
         $criteriaCompo->add(new \Criteria('event_start', time(), '>='));
-        $adminObject->addInfoBoxLine(sprintf('<infolabel>' . _AM_EXTCAL_INDEX_APPROVED . '</infolabel><infotext>', $eventHandler->getCount($criteriaCompo) . '</infotext>'), '', 'Green');
+        $adminObject->addInfoBoxLine(sprintf('<infolabel>'._AM_EXTCAL_INDEX_APPROVED.'</infolabel><infotext>', $eventHandler->getCount($criteriaCompo).'</infotext>'), '', 'Green');
 
         $adminObject->addConfigBoxLine();
         $adminObject->addConfigBoxLine(_AM_EXTCAL_PEAR_PATH);
@@ -160,42 +160,42 @@ 
         $pendingEvent = $eventHandler->objectToArray($eventHandler->getPendingEvent(), ['cat_id']);
         $eventHandler->formatEventsDate($pendingEvent, 'd/m/Y');
 
-        echo '<fieldset><legend style="font-weight:bold; color:#990000;">' . _AM_EXTCAL_PENDING_EVENT . '</legend>';
-        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">' . _AM_EXTCAL_INFORMATION . '</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#990000;">'._AM_EXTCAL_PENDING_EVENT.'</legend>';
+        echo '<fieldset><legend style="font-weight:bold; color:#0A3760;">'._AM_EXTCAL_INFORMATION.'</legend>';
         //        echo '<img src="../assets/images/icons/on.png" >&nbsp;&nbsp;'._AM_EXTCAL_INFO_APPROVE_PENDING_EVENT.'<br>';
-        echo '<img src=' . $pathIcon16 . '/edit.png>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_EDIT_PENDING_EVENT . '<br>';
-        echo '<img src=' . $pathIcon16 . '/delete.png>&nbsp;&nbsp;' . _AM_EXTCAL_INFO_DELETE_PENDING_EVENT . '<br>';
+        echo '<img src='.$pathIcon16.'/edit.png>&nbsp;&nbsp;'._AM_EXTCAL_INFO_EDIT_PENDING_EVENT.'<br>';
+        echo '<img src='.$pathIcon16.'/delete.png>&nbsp;&nbsp;'._AM_EXTCAL_INFO_DELETE_PENDING_EVENT.'<br>';
         echo '</fieldset><br>';
 
         echo '<table class="outer" style="width:100%;">';
         echo '<tr style="text-align:center;">';
-        echo '<th>' . _AM_EXTCAL_CATEGORY . '</th>';
-        echo '<th>' . _AM_EXTCAL_TITLE . '</th>';
-        echo '<th>' . _AM_EXTCAL_START_DATE . '</th>';
-        echo '<th>' . _AM_EXTCAL_ACTION . '</th>';
+        echo '<th>'._AM_EXTCAL_CATEGORY.'</th>';
+        echo '<th>'._AM_EXTCAL_TITLE.'</th>';
+        echo '<th>'._AM_EXTCAL_START_DATE.'</th>';
+        echo '<th>'._AM_EXTCAL_ACTION.'</th>';
         echo '</tr>';
 
         if (count($pendingEvent) > 0) {
             $i = 0;
             foreach ($pendingEvent as $event) {
                 $class = (0 == ++$i % 2) ? 'even' : 'odd';
-                echo '<tr style="text-align:center;" class="' . $class . '">';
-                echo '<td>' . $event['Category']['cat_name'] . '</td>';
-                echo '<td>' . $event['event_title'] . '</td>';
-                echo '<td>' . $event['formated_event_start'] . '</td>';
+                echo '<tr style="text-align:center;" class="'.$class.'">';
+                echo '<td>'.$event['Category']['cat_name'].'</td>';
+                echo '<td>'.$event['event_title'].'</td>';
+                echo '<td>'.$event['formated_event_start'].'</td>';
                 echo '<td style="width:10%; text-align:center;">';
-                echo '<a href="event.php?op=modify&amp;event_id=' . $event['event_id'] . '"><img src=' . $pathIcon16 . '/edit.png></a>&nbsp;&nbsp;';
-                echo '<a href="event.php?op=delete&amp;event_id=' . $event['event_id'] . '"><img src=' . $pathIcon16 . '/delete.png></a>';
+                echo '<a href="event.php?op=modify&amp;event_id='.$event['event_id'].'"><img src='.$pathIcon16.'/edit.png></a>&nbsp;&nbsp;';
+                echo '<a href="event.php?op=delete&amp;event_id='.$event['event_id'].'"><img src='.$pathIcon16.'/delete.png></a>';
                 echo '</td>';
                 echo '</tr>';
             }
         } else {
-            echo '<tr><td colspan="4">' . _AM_EXTCAL_NO_PENDING_EVENT . '</td></tr>';
+            echo '<tr><td colspan="4">'._AM_EXTCAL_NO_PENDING_EVENT.'</td></tr>';
         }
 
         echo '</table></fieldset><br>';
 
-        require_once __DIR__ . '/admin_footer.php';
+        require_once __DIR__.'/admin_footer.php';
 
         break;
 }

admin/admin_header.php

Spacing +4 added lines, -4 removed lines

@@ -19,11 +19,11 @@ 
 
 use XoopsModules\Extcal;
 
-require_once  dirname(dirname(dirname(__DIR__))) . '/include/cp_header.php';
+require_once  dirname(dirname(dirname(__DIR__))).'/include/cp_header.php';
 require_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
-require_once  dirname(__DIR__) . '/include/constantes.php';
+require_once  dirname(__DIR__).'/include/constantes.php';
 
-require_once dirname(__DIR__) . '/preloads/autoloader.php';
+require_once dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName = basename(dirname(__DIR__));
 
@@ -34,7 +34,7 @@ 
 $utility     = new Extcal\Utility();
 
 // require_once  dirname(__DIR__) . '/class/Utility.php';
-require_once  dirname(__DIR__) . '/include/common.php';
+require_once  dirname(__DIR__).'/include/common.php';
 
 $adminObject = \Xmf\Module\Admin::getInstance();
 

admin/index.php

Spacing +5 added lines, -5 removed lines

@@ -20,7 +20,7 @@ 
 use XoopsModules\Extcal;
 use XoopsModules\Extcal\Common;
 
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 // Display Admin header
 xoops_cp_header();
 /** @var Extcal\Utility $utility */
@@ -39,11 +39,11 @@ 
 
 if ($helper->getConfig('displaySampleButton')) {
     xoops_loadLanguage('admin/modulesadmin', 'system');
-    require_once  dirname(__DIR__) . '/testdata/index.php';
+    require_once  dirname(__DIR__).'/testdata/index.php';
 
-    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
+    $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'ADD_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=load', 'add');
 
-    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
+    $adminObject->addItemButton(constant('CO_'.$moduleDirNameUpper.'_'.'SAVE_SAMPLEDATA'), '__DIR__ . /../../testdata/index.php?op=save', 'add');
 
     //    $adminObject->addItemButton(constant('CO_' . $moduleDirNameUpper . '_' . 'EXPORT_SCHEMA'), '__DIR__ . /../../testdata/index.php?op=exportschema', 'add');
 
@@ -57,4 +57,4 @@ 
 echo $utility::getServerStats();
 
 //codeDump(__FILE__);
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/menu.php

Spacing +8 added lines, -8 removed lines

@@ -22,11 +22,11 @@ 
 // require_once  dirname(__DIR__) . '/class/Helper.php';
 //require_once  dirname(__DIR__) . '/include/common.php';
 
-require_once dirname(__DIR__) . '/preloads/autoloader.php';
+require_once dirname(__DIR__).'/preloads/autoloader.php';
 
 $helper = Extcal\Helper::getInstance();
 
-$pathIcon32    = \Xmf\Module\Admin::menuIconPath('');
+$pathIcon32 = \Xmf\Module\Admin::menuIconPath('');
 if (is_object($helper->getModule())) {
     $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 }
@@ -34,33 +34,33 @@ 
 $adminmenu[] = [
     'title' => _MI_EXTCAL_INDEX,
     'link'  => 'admin/index.php',
-    'icon'  => $pathIcon32 . '/home.png'
+    'icon'  => $pathIcon32.'/home.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_EXTCAL_CATEGORY,
     'link'  => 'admin/cat.php',
-    'icon'  => $pathIcon32 . '/category.png'
+    'icon'  => $pathIcon32.'/category.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_EXTCAL_EVENT,
     'link'  => 'admin/event.php',
-    'icon'  => $pathIcon32 . '/event.png'
+    'icon'  => $pathIcon32.'/event.png'
 ];
 $adminmenu[] = [
     'title' => _MI_EXTCAL_LOCATIONS,
     'link'  => 'admin/location.php',
-    'icon'  => $pathModIcon32 . '/location.png'
+    'icon'  => $pathModIcon32.'/location.png'
 ];
 $adminmenu[] = [
     'title' => _MI_EXTCAL_PERMISSIONS,
     'link'  => 'admin/permissions.php',
-    'icon'  => $pathIcon32 . '/permissions.png'
+    'icon'  => $pathIcon32.'/permissions.png'
 ];
 
 $adminmenu[] = [
     'title' => _MI_EXTCAL_ABOUT,
     'link'  => 'admin/about.php',
-    'icon'  => $pathIcon32 . '/about.png'
+    'icon'  => $pathIcon32.'/about.png'
 ];