mambax7 / contact

include/common.php

Spacing +27 added lines, -27 removed lines

@@ -23,7 +23,7 @@ 
 use Xmf\Module\Admin;
 use XoopsModules\Contact;
 
-require_once dirname(__DIR__) . '/preloads/autoloader.php';
+require_once dirname(__DIR__).'/preloads/autoloader.php';
 
 $moduleDirName      = \basename(\dirname(__DIR__));
 $moduleDirNameUpper = mb_strtoupper($moduleDirName); //$capsDirName
@@ -42,20 +42,20 @@ 
 //$categoryHandler     = new Contact\CategoryHandler($db);
 //$downloadHandler     = new Contact\DownloadHandler($db);
 
-if (!defined($moduleDirNameUpper . '_CONSTANTS_DEFINED')) {
-    define($moduleDirNameUpper . '_DIRNAME', basename(dirname(__DIR__)));
-    define($moduleDirNameUpper . '_ROOT_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_PATH', XOOPS_ROOT_PATH . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_URL', XOOPS_URL . '/modules/' . $moduleDirName . '/');
-    define($moduleDirNameUpper . '_IMAGE_URL', constant($moduleDirNameUpper . '_URL') . '/assets/images/');
-    define($moduleDirNameUpper . '_IMAGE_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/assets/images');
-    define($moduleDirNameUpper . '_ADMIN_URL', constant($moduleDirNameUpper . '_URL') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN_PATH', constant($moduleDirNameUpper . '_ROOT_PATH') . '/admin/');
-    define($moduleDirNameUpper . '_ADMIN', constant($moduleDirNameUpper . '_URL') . '/admin/index.php');
-    define($moduleDirNameUpper . '_AUTHOR_LOGOIMG', constant($moduleDirNameUpper . '_URL') . '/assets/images/logoModule.png');
-    define($moduleDirNameUpper . '_UPLOAD_URL', XOOPS_UPLOAD_URL . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_UPLOAD_PATH', XOOPS_UPLOAD_PATH . '/' . $moduleDirName); // WITHOUT Trailing slash
-    define($moduleDirNameUpper . '_CONSTANTS_DEFINED', 1);
+if (!defined($moduleDirNameUpper.'_CONSTANTS_DEFINED')) {
+    define($moduleDirNameUpper.'_DIRNAME', basename(dirname(__DIR__)));
+    define($moduleDirNameUpper.'_ROOT_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_PATH', XOOPS_ROOT_PATH.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_URL', XOOPS_URL.'/modules/'.$moduleDirName.'/');
+    define($moduleDirNameUpper.'_IMAGE_URL', constant($moduleDirNameUpper.'_URL').'/assets/images/');
+    define($moduleDirNameUpper.'_IMAGE_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/assets/images');
+    define($moduleDirNameUpper.'_ADMIN_URL', constant($moduleDirNameUpper.'_URL').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN_PATH', constant($moduleDirNameUpper.'_ROOT_PATH').'/admin/');
+    define($moduleDirNameUpper.'_ADMIN', constant($moduleDirNameUpper.'_URL').'/admin/index.php');
+    define($moduleDirNameUpper.'_AUTHOR_LOGOIMG', constant($moduleDirNameUpper.'_URL').'/assets/images/logoModule.png');
+    define($moduleDirNameUpper.'_UPLOAD_URL', XOOPS_UPLOAD_URL.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_UPLOAD_PATH', XOOPS_UPLOAD_PATH.'/'.$moduleDirName); // WITHOUT Trailing slash
+    define($moduleDirNameUpper.'_CONSTANTS_DEFINED', 1);
 }
 
 $pathIcon16 = Admin::iconUrl('', 16);
@@ -64,15 +64,15 @@ 
 //$pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
 $icons = [
-    'edit'    => "<img src='" . $pathIcon16 . "/edit.png'  alt=" . _EDIT . "' align='middle'>",
-    'delete'  => "<img src='" . $pathIcon16 . "/delete.png' alt='" . _DELETE . "' align='middle'>",
-    'clone'   => "<img src='" . $pathIcon16 . "/editcopy.png' alt='" . _CLONE . "' align='middle'>",
-    'preview' => "<img src='" . $pathIcon16 . "/view.png' alt='" . _PREVIEW . "' align='middle'>",
-    'print'   => "<img src='" . $pathIcon16 . "/printer.png' alt='" . _CLONE . "' align='middle'>",
-    'pdf'     => "<img src='" . $pathIcon16 . "/pdf.png' alt='" . _CLONE . "' align='middle'>",
-    'add'     => "<img src='" . $pathIcon16 . "/add.png' alt='" . _ADD . "' align='middle'>",
-    '0'       => "<img src='" . $pathIcon16 . "/0.png' alt='" . 0 . "' align='middle'>",
-    '1'       => "<img src='" . $pathIcon16 . "/1.png' alt='" . 1 . "' align='middle'>",
+    'edit'    => "<img src='".$pathIcon16."/edit.png'  alt="._EDIT."' align='middle'>",
+    'delete'  => "<img src='".$pathIcon16."/delete.png' alt='"._DELETE."' align='middle'>",
+    'clone'   => "<img src='".$pathIcon16."/editcopy.png' alt='"._CLONE."' align='middle'>",
+    'preview' => "<img src='".$pathIcon16."/view.png' alt='"._PREVIEW."' align='middle'>",
+    'print'   => "<img src='".$pathIcon16."/printer.png' alt='"._CLONE."' align='middle'>",
+    'pdf'     => "<img src='".$pathIcon16."/pdf.png' alt='"._CLONE."' align='middle'>",
+    'add'     => "<img src='".$pathIcon16."/add.png' alt='"._ADD."' align='middle'>",
+    '0'       => "<img src='".$pathIcon16."/0.png' alt='".0."' align='middle'>",
+    '1'       => "<img src='".$pathIcon16."/1.png' alt='".1."' align='middle'>",
 ];
 
 $debug = false;
@@ -85,15 +85,15 @@ 
     $GLOBALS['xoopsTpl'] = new \XoopsTpl();
 }
 
-$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL . '/modules/' . $moduleDirName);
+$GLOBALS['xoopsTpl']->assign('mod_url', XOOPS_URL.'/modules/'.$moduleDirName);
 // Local icons path
 if (is_object($helper->getModule())) {
     $pathModIcon16 = $helper->getModule()->getInfo('modicons16');
     $pathModIcon32 = $helper->getModule()->getInfo('modicons32');
 
-    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL . '/modules/' . $moduleDirName . '/' . $pathModIcon16);
+    $GLOBALS['xoopsTpl']->assign('pathModIcon16', XOOPS_URL.'/modules/'.$moduleDirName.'/'.$pathModIcon16);
     $GLOBALS['xoopsTpl']->assign('pathModIcon32', $pathModIcon32);
 }
 
 //require_once CONTACT_PATH.'/class/helper.php';
-require_once __DIR__ . '/include/functions.php';
+require_once __DIR__.'/include/functions.php';

admin/admin_header.php

Spacing +4 added lines, -4 removed lines

@@ -27,11 +27,11 @@
 /** @var Admin $adminObject */
 /** @var ContactHandler $contactHandler */
 
-require dirname(__DIR__, 3) . '/include/cp_header.php';
-require dirname(__DIR__) . '/preloads/autoloader.php';
+require dirname(__DIR__, 3).'/include/cp_header.php';
+require dirname(__DIR__).'/preloads/autoloader.php';
 
-require_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+require_once XOOPS_ROOT_PATH.'/class/pagenav.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 global $xoopsModule;
 
 $moduleDirName = $GLOBALS['xoopsModule']->getVar('dirname');

admin/main.php

Spacing +8 added lines, -8 removed lines

@@ -29,7 +29,7 @@ 
 /** @var Admin $adminObject */
 
 // Call header
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 
 // Display Admin header
 xoops_cp_header();
@@ -48,11 +48,11 @@ 
 // Define scripts
 $GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/jquery.js');
 $GLOBALS['xoTheme']->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
-$GLOBALS['xoTheme']->addScript(XOOPS_URL . '/modules/contact/assets/js/admin.js');
+$GLOBALS['xoTheme']->addScript(XOOPS_URL.'/modules/contact/assets/js/admin.js');
 // Add module stylesheet
-$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . '/modules/contact/assets/css/admin.css');
-$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
-$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL.'/modules/contact/assets/css/admin.css');
+$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL.'/modules/system/css/ui/'.xoops_getModuleOption('jquery_theme', 'system').'/ui.all.css');
+$GLOBALS['xoTheme']->addStylesheet(XOOPS_URL.'/modules/system/css/admin.css');
 
 switch ($op) {
     case 'list':
@@ -71,7 +71,7 @@ 
         $contacts        = $contactHandler->contactGetAdminList($contact, 'contact_cid');
 
         if ($contact_numrows > $contact['limit']) {
-            $contact_pagenav = new \XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
+            $contact_pagenav = new \XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit='.$contact['limit']);
             $contact_pagenav = $contact_pagenav->renderNav(4);
         } else {
             $contact_pagenav = '';
@@ -198,6 +198,6 @@ 
 $GLOBALS['xoopsTpl']->assign('level', $level);
 
 // Call template file
-$GLOBALS['xoopsTpl']->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_main.tpl');
+$GLOBALS['xoopsTpl']->display(XOOPS_ROOT_PATH.'/modules/contact/templates/admin/contact_main.tpl');
 // Call footer
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/index.php

Spacing +3 added lines, -3 removed lines

@@ -21,7 +21,7 @@ 
 
 /** @var ContactHandler $contactHandler */
 // Call header
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 // Display Admin header
 xoops_cp_header();
 
@@ -33,6 +33,6 @@ 
 $adminObject->displayIndex();
 
 // Call template file
-$GLOBALS['xoopsTpl']->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_index.tpl');
+$GLOBALS['xoopsTpl']->display(XOOPS_ROOT_PATH.'/modules/contact/templates/admin/contact_index.tpl');
 // Call footer
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/log.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 /** @var Admin $adminObject */
 
 // Call header
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 // Display Admin header
 xoops_cp_header();
 // Define default value
@@ -52,6 +52,6 @@ 
 
 $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation(basename(__FILE__)));
 // Call template file
-$GLOBALS['xoopsTpl']->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_logs.tpl');
+$GLOBALS['xoopsTpl']->display(XOOPS_ROOT_PATH.'/modules/contact/templates/admin/contact_logs.tpl');
 // Call footer
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

admin/tools.php

Spacing +3 added lines, -3 removed lines

@@ -24,7 +24,7 @@ 
 /** @var Admin $adminObject */
 
 // Call header
-require_once __DIR__ . '/admin_header.php';
+require_once __DIR__.'/admin_header.php';
 // Display Admin header
 xoops_cp_header();
 // Define default value
@@ -56,6 +56,6 @@ 
 
 $GLOBALS['xoopsTpl']->assign('navigation', $adminObject->displayNavigation(basename(__FILE__)));
 // Call template file
-$GLOBALS['xoopsTpl']->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_tools.tpl');
+$GLOBALS['xoopsTpl']->display(XOOPS_ROOT_PATH.'/modules/contact/templates/admin/contact_tools.tpl');
 // Call footer
-require_once __DIR__ . '/admin_footer.php';
+require_once __DIR__.'/admin_footer.php';

send.php

Spacing +4 added lines, -4 removed lines

@@ -26,10 +26,10 @@ 
 };
 /** @var ContactHandler $contactHandler */
 
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 $GLOBALS['xoopsOption']['template_main'] = 'contact_index.tpl';
 //unset($_SESSION);
-require_once XOOPS_ROOT_PATH . '/header.php';
+require_once XOOPS_ROOT_PATH.'/header.php';
 
 /** @var Helper $helper */
 $helper = Helper::getInstance();
@@ -47,7 +47,7 @@ 
 if (!$captcha && $helper->getConfig('recaptchause')) {
     redirect_header('index.php', 2, _MD_CONTACT_MES_NOCAPTCHA);
 } else {
-    $response = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret=' . $helper->getConfig('recaptchakey') . '&response=' . $captcha . '&remoteip=' . $_SERVER['REMOTE_ADDR']);
+    $response = file_get_contents('https://www.google.com/recaptcha/api/siteverify?secret='.$helper->getConfig('recaptchakey').'&response='.$captcha.'&remoteip='.$_SERVER['REMOTE_ADDR']);
     if (false === $response && $helper->getConfig('recaptchause')) {
         redirect_header('index.php', 2, _MD_CONTACT_MES_CAPTCHAINCORRECT);
     } else {
@@ -93,4 +93,4 @@ 
     }
 }
 
-require_once XOOPS_ROOT_PATH . '/footer.php';
+require_once XOOPS_ROOT_PATH.'/footer.php';

class/Common/VersionChecks.php

Spacing +7 added lines, -7 removed lines

@@ -40,13 +40,13 @@ 
         //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 @@ 
 
         if (false !== $reqVer && '' !== $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 @@ 
         $moduleDirName      = \basename(\dirname(__DIR__, 2));
         $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 @@ 
                 if (false === $curlReturn) {
                     \trigger_error(\curl_error($curlHandle));
                 } elseif (false !== \mb_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 @@ 
                         $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

ajax.php

Spacing +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  * @author      Trabis <lusopoemas@gmail.com>
  * @author      Hossein Azizabadi (AKA Voltan)
  */
-require_once __DIR__ . '/header.php';
+require_once __DIR__.'/header.php';
 /** @var ContactHandler $contactHandler */
 
 if (!empty($_POST)) {