mambax7 / contact

include/onupdate.php

Spacing +23 added lines, -23 removed lines

@@ -24,7 +24,7 @@ 
 if ((!defined('XOOPS_ROOT_PATH')) || !($GLOBALS['xoopsUser'] instanceof XoopsUser)
     || !$GLOBALS['xoopsUser']->IsAdmin()
 ) {
-    exit('Restricted access' . PHP_EOL);
+    exit('Restricted access'.PHP_EOL);
 }
 
 /**
@@ -50,7 +50,7 @@ 
 {
     $moduleDirName = basename(dirname(__DIR__));
     /** @var ContactUtility $utilityClass */
-    $utilityClass = ucfirst($moduleDirName) . 'Utility';
+    $utilityClass = ucfirst($moduleDirName).'Utility';
     if (!class_exists($utilityClass)) {
         xoops_load('utility', $moduleDirName);
     }
@@ -77,7 +77,7 @@ 
     $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
 
     if ($previousVersion < 180) {
-        $sql = 'CREATE TABLE ' . $xoopsDB->prefix('contact') . ' (
+        $sql = 'CREATE TABLE '.$xoopsDB->prefix('contact').' (
         contact_id int(10) unsigned NOT NULL auto_increment,
         contact_uid int(10) NOT NULL,
         contact_cid int(10) NOT NULL,
@@ -102,39 +102,39 @@ 
 
     if ($previousVersion < 181) {
         // Add contact_platform
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . "` ADD `contact_platform` ENUM('Android','Ios','Web') NOT NULL DEFAULT 'Web'";
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact')."` ADD `contact_platform` ENUM('Android','Ios','Web') NOT NULL DEFAULT 'Web'";
         $xoopsDB->query($sql);
         // Add contact_type
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . "` ADD `contact_type` ENUM('Contact','Phone','Mail') NOT NULL DEFAULT 'Contact'";
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact')."` ADD `contact_type` ENUM('Contact','Phone','Mail') NOT NULL DEFAULT 'Contact'";
         $xoopsDB->query($sql);
         // Add index contact_uid
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . '` ADD INDEX `contact_uid` ( `contact_uid` )';
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact').'` ADD INDEX `contact_uid` ( `contact_uid` )';
         $xoopsDB->query($sql);
         // Add index contact_cid
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . '` ADD INDEX `contact_cid` ( `contact_cid` )';
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact').'` ADD INDEX `contact_cid` ( `contact_cid` )';
         $xoopsDB->query($sql);
         // Add index contact_create
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . '` ADD INDEX `contact_create` ( `contact_create` )';
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact').'` ADD INDEX `contact_create` ( `contact_create` )';
         $xoopsDB->query($sql);
         // Add index contact_mail
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . '` ADD INDEX `contact_mail` ( `contact_mail` )';
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact').'` ADD INDEX `contact_mail` ( `contact_mail` )';
         $xoopsDB->query($sql);
         // Add index contact_phone
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . '` ADD INDEX `contact_phone` ( `contact_phone` )';
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact').'` ADD INDEX `contact_phone` ( `contact_phone` )';
         $xoopsDB->query($sql);
         // Add index contact_platform
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . '` ADD INDEX `contact_platform` ( `contact_platform` )';
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact').'` ADD INDEX `contact_platform` ( `contact_platform` )';
         $xoopsDB->query($sql);
         // Add index contact_type
-        $sql = 'ALTER TABLE `' . $xoopsDB->prefix('contact') . '` ADD INDEX `contact_type` ( `contact_type` )';
+        $sql = 'ALTER TABLE `'.$xoopsDB->prefix('contact').'` ADD INDEX `contact_type` ( `contact_type` )';
         $xoopsDB->query($sql);
     }
 
     if ($previousVersion < 226) {
-        require_once __DIR__ . '/config.php';
+        require_once __DIR__.'/config.php';
         $configurator = new ContactConfigurator();
         /** @var ContactUtility $utilityClass */
-        $utilityClass    = ucfirst($moduleDirName) . 'Utility';
+        $utilityClass = ucfirst($moduleDirName).'Utility';
         if (!class_exists($utilityClass)) {
             xoops_load('utility', $moduleDirName);
         }
@@ -142,14 +142,14 @@ 
         //delete old HTML templates
         if (count($configurator->templateFolders) > 0) {
             foreach ($configurator->templateFolders as $folder) {
-                $templateFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $folder);
+                $templateFolder = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$folder);
                 if (is_dir($templateFolder)) {
                     $templateList = array_diff(scandir($templateFolder, SCANDIR_SORT_NONE), ['..', '.']);
                     foreach ($templateList as $k => $v) {
-                        $fileInfo = new SplFileInfo($templateFolder . $v);
+                        $fileInfo = new SplFileInfo($templateFolder.$v);
                         if ($fileInfo->getExtension() === 'html' && $fileInfo->getFilename() !== 'index.html') {
-                            if (file_exists($templateFolder . $v)) {
-                                unlink($templateFolder . $v);
+                            if (file_exists($templateFolder.$v)) {
+                                unlink($templateFolder.$v);
                             }
                         }
                     }
@@ -161,7 +161,7 @@ 
         if (count($configurator->oldFiles) > 0) {
             //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
             foreach (array_keys($configurator->oldFiles) as $i) {
-                $tempFile = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFiles[$i]);
+                $tempFile = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$configurator->oldFiles[$i]);
                 if (is_file($tempFile)) {
                     unlink($tempFile);
                 }
@@ -173,7 +173,7 @@ 
         if (count($configurator->oldFolders) > 0) {
             //    foreach (array_keys($GLOBALS['uploadFolders']) as $i) {
             foreach (array_keys($configurator->oldFolders) as $i) {
-                $tempFolder = $GLOBALS['xoops']->path('modules/' . $moduleDirName . $configurator->oldFolders[$i]);
+                $tempFolder = $GLOBALS['xoops']->path('modules/'.$moduleDirName.$configurator->oldFolders[$i]);
                 /* @var $folderHandler XoopsObjectHandler */
                 $folderHandler = XoopsFile::getHandler('folder', $tempFolder);
                 $folderHandler->delete($tempFolder);
@@ -190,15 +190,15 @@ 
 
         //  ---  COPY blank.png FILES ---------------
         if (count($configurator->blankFiles) > 0) {
-            $file = __DIR__ . '/../assets/images/blank.png';
+            $file = __DIR__.'/../assets/images/blank.png';
             foreach (array_keys($configurator->blankFiles) as $i) {
-                $dest = $configurator->blankFiles[$i] . '/blank.png';
+                $dest = $configurator->blankFiles[$i].'/blank.png';
                 $utilityClass::copyFile($file, $dest);
             }
         }
 
         //delete .html entries from the tpl table
-        $sql = 'DELETE FROM ' . $GLOBALS['xoopsDB']->prefix('tplfile') . " WHERE `tpl_module` = '" . $module->getVar('dirname', 'n') . '\' AND `tpl_file` LIKE \'%.html%\'';
+        $sql = 'DELETE FROM '.$GLOBALS['xoopsDB']->prefix('tplfile')." WHERE `tpl_module` = '".$module->getVar('dirname', 'n').'\' AND `tpl_file` LIKE \'%.html%\'';
         $GLOBALS['xoopsDB']->queryF($sql);
 
         /** @var XoopsGroupPermHandler $gpermHandler */

include/oninstall.php

Spacing +14 added lines, -14 removed lines

@@ -30,7 +30,7 @@ 
 {
     $moduleDirName = basename(dirname(__DIR__));
     /** @var ContactUtility $utilityClass */
-    $utilityClass    = ucfirst($moduleDirName) . 'Utility';
+    $utilityClass = ucfirst($moduleDirName).'Utility';
     if (!class_exists($utilityClass)) {
         xoops_load('utility', $moduleDirName);
     }
@@ -38,10 +38,10 @@ 
     $xoopsSuccess = $utilityClass::checkVerXoops($module);
     $phpSuccess   = $utilityClass::checkVerPhp($module);
 
-    if (false !== $xoopsSuccess && false !==  $phpSuccess) {
-        $mod_tables =& $module->getInfo('tables');
+    if (false !== $xoopsSuccess && false !== $phpSuccess) {
+        $mod_tables = & $module->getInfo('tables');
         foreach ($mod_tables as $table) {
-            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS ' . $GLOBALS['xoopsDB']->prefix($table) . ';');
+            $GLOBALS['xoopsDB']->queryF('DROP TABLE IF EXISTS '.$GLOBALS['xoopsDB']->prefix($table).';');
         }
     }
     return $xoopsSuccess && $phpSuccess;
@@ -56,8 +56,8 @@ 
  */
 function xoops_module_install_contact(XoopsModule $module)
 {
-    require_once  __DIR__ . '/../../../mainfile.php';
-    require_once  __DIR__ . '/../include/config.php';
+    require_once  __DIR__.'/../../../mainfile.php';
+    require_once  __DIR__.'/../include/config.php';
 
     $moduleDirName = basename(dirname(__DIR__));
 
@@ -73,7 +73,7 @@ 
 
     $configurator = new ContactConfigurator();
     /** @var ContactUtility $utilityClass */
-    $utilityClass    = ucfirst($moduleDirName) . 'Utility';
+    $utilityClass = ucfirst($moduleDirName).'Utility';
     if (!class_exists($utilityClass)) {
         xoops_load('utility', $moduleDirName);
     }
@@ -85,11 +85,11 @@ 
     /** @var \XoopsGroupPermHandler $gpermHandler */
     $gpermHandler = xoops_getHandler('groupperm');
     // access rights ------------------------------------------
-    $gpermHandler->addRight($moduleDirName . '_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $gpermHandler->addRight($moduleDirName . '_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $gpermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
-    $gpermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_USERS, $moduleId);
-    $gpermHandler->addRight($moduleDirName . '_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
+    $gpermHandler->addRight($moduleDirName.'_approve', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $gpermHandler->addRight($moduleDirName.'_submit', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $gpermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ADMIN, $moduleId);
+    $gpermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_USERS, $moduleId);
+    $gpermHandler->addRight($moduleDirName.'_view', 1, XOOPS_GROUP_ANONYMOUS, $moduleId);
 
     //  ---  CREATE FOLDERS ---------------
     if (count($configurator->uploadFolders) > 0) {
@@ -101,9 +101,9 @@ 
 
     //  ---  COPY blank.png FILES ---------------
     if (count($configurator->blankFiles) > 0) {
-        $file = __DIR__ . '/../assets/images/blank.png';
+        $file = __DIR__.'/../assets/images/blank.png';
         foreach (array_keys($configurator->blankFiles) as $i) {
-            $dest = $configurator->blankFiles[$i] . '/blank.png';
+            $dest = $configurator->blankFiles[$i].'/blank.png';
             $utilityClass::copyFile($file, $dest);
         }
     }

admin/menu.php

Spacing +5 added lines, -5 removed lines

@@ -29,34 +29,34 @@
 $adminmenu[] = [
     'title' => _MI_CONTACT_MENU_HOME,
     'desc'  => _MI_CONTACT_MENU_HOME_DESC,
-    'icon'  => $pathIcon32 . '/home.png',
+    'icon'  => $pathIcon32.'/home.png',
     'link'  => 'admin/index.php'
 ];
 
 $adminmenu[] = [
     'title' => _MI_CONTACT_MENU_CONTACT,
     'desc'  => _MI_CONTACT_MENU_CONTACT_DESC,
-    'icon'  => $pathIcon32 . '/content.png',
+    'icon'  => $pathIcon32.'/content.png',
     'link'  => 'admin/main.php'
 ];
 
 $adminmenu[] = [
     'title' => _MI_CONTACT_MENU_LOGS,
     'desc'  => _MI_CONTACT_MENU_LOGS_DESC,
-    'icon'  => $pathIcon32 . '/identity.png',
+    'icon'  => $pathIcon32.'/identity.png',
     'link'  => 'admin/log.php'
 ];
 
 $adminmenu[] = [
     'title' => _MI_CONTACT_MENU_TOOLS,
     'desc'  => _MI_CONTACT_MENU_TOOLS_DESC,
-    'icon'  => $pathIcon32 . '/delete.png',
+    'icon'  => $pathIcon32.'/delete.png',
     'link'  => 'admin/tools.php'
 ];
 
 $adminmenu[] = [
     'title' => _MI_CONTACT_MENU_ABOUT,
     'desc'  => _MI_CONTACT_MENU_ABOUT_DESC,
-    'icon'  => $pathIcon32 . '/about.png',
+    'icon'  => $pathIcon32.'/about.png',
     'link'  => 'admin/about.php'
 ];

class/contact.php

Spacing +7 added lines, -7 removed lines

@@ -79,7 +79,7 @@ 
         $form->addElement(new XoopsFormLabel(_AM_CONTACT_TO, '', ''));
         $form->addElement(new XoopsFormText(_AM_CONTACT_NAMETO, 'contact_nameto', 50, 255, $this->getVar('contact_name')), true);
         $form->addElement(new XoopsFormText(_AM_CONTACT_MAILTO, 'contact_mailto', 50, 255, $this->getVar('contact_mail')), true);
-        $form->addElement(new XoopsFormText(_AM_CONTACT_SUBJECT, 'contact_subject', 50, 255, _RE . $this->getVar('contact_subject')), true);
+        $form->addElement(new XoopsFormText(_AM_CONTACT_SUBJECT, 'contact_subject', 50, 255, _RE.$this->getVar('contact_subject')), true);
         $form->addElement(new XoopsFormTextArea(_AM_CONTACT_MESSAGE, 'contact_message', '', 5, 60), true);
         $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
 
@@ -94,7 +94,7 @@ 
     public function toArray()
     {
         $ret  = [];
-        $vars =& $this->getVars();
+        $vars = & $this->getVars();
         foreach (array_keys($vars) as $i) {
             $ret [$i] = $this->getVar($i);
         }
@@ -216,9 +216,9 @@ 
 
         $subjectPrefix = '';
         if ($GLOBALS['xoopsModuleConfig']['form_dept'] && $GLOBALS['xoopsModuleConfig']['subject_prefix'] && $GLOBALS['xoopsModuleConfig']['contact_dept']) {
-            $subjectPrefix = '[' . $GLOBALS['xoopsModuleConfig']['prefix_text'] . ' ' . $contact['contact_department'] . ']: ';
+            $subjectPrefix = '['.$GLOBALS['xoopsModuleConfig']['prefix_text'].' '.$contact['contact_department'].']: ';
         }
-        $xoopsMailer->setSubject($subjectPrefix . html_entity_decode($contact['contact_subject'], ENT_QUOTES, 'UTF-8'));
+        $xoopsMailer->setSubject($subjectPrefix.html_entity_decode($contact['contact_subject'], ENT_QUOTES, 'UTF-8'));
         $xoopsMailer->setBody(html_entity_decode($contact['contact_message'], ENT_QUOTES, 'UTF-8'));
         if ($xoopsMailer->send()) {
             $message = _MD_CONTACT_MES_SEND;
@@ -324,7 +324,7 @@ 
         $criteria = new CriteriaCompo();
         $criteria->add(new Criteria('contact_cid', $contact_id));
         $criteria->add(new Criteria('contact_type', 'Contact'));
-        $contacts =& $this->getObjects($criteria, false);
+        $contacts = & $this->getObjects($criteria, false);
         if ($contacts) {
             $ret = [];
             /** @var Contact $root */
@@ -355,7 +355,7 @@ 
         $criteria->setOrder($contact['order']);
         $criteria->setStart($contact['start']);
         $criteria->setLimit($contact['limit']);
-        $contacts =& $this->getObjects($criteria, false);
+        $contacts = & $this->getObjects($criteria, false);
         if ($contacts) {
             /** @var Contact $root */
             foreach ($contacts as $root) {
@@ -495,7 +495,7 @@ 
         }
         $criteria->setSort('contact_create');
         $criteria->setOrder('DESC');
-        $contacts =& $this->getObjects($criteria, false);
+        $contacts = & $this->getObjects($criteria, false);
         if ($contacts) {
             /** @var Contact $root */
             foreach ($contacts as $root) {

index.php

Indentation +1 added lines, -1 removed lines

@@ -18,7 +18,7 @@
  * @author      Trabis <lusopoemas@gmail.com>
  * @author      Hossein Azizabadi (AKA Voltan)
  * @author      Mirza (AKA Bleekk)
-  */
+ */
 
 require __DIR__ . '/../../mainfile.php';
 require_once  __DIR__ . '/header.php';

Spacing +5 added lines, -5 removed lines

@@ -20,11 +20,11 @@ 
  * @author      Mirza (AKA Bleekk)
   */
 
-require __DIR__ . '/../../mainfile.php';
-require_once  __DIR__ . '/header.php';
+require __DIR__.'/../../mainfile.php';
+require_once  __DIR__.'/header.php';
 $GLOBALS['xoopsOption']['template_main'] = 'contact_index.tpl';
 //unset($_SESSION);
-include XOOPS_ROOT_PATH . '/header.php';
+include XOOPS_ROOT_PATH.'/header.php';
 global $xoopsModuleConfig, $xoopsModule;
 /*Modules Options*/
 if ($xoopsModuleConfig['form_dept'] == 1) {
@@ -51,7 +51,7 @@ 
 $GLOBALS['xoopsTpl']->assign('map', $xoopsModuleConfig['embed_maps']);
 /*end Modules options*/
 
-$GLOBALS['xoopsTpl']->assign('breadcrumb', '<li><a href="' . XOOPS_URL . '">' . _YOURHOME . '</a></li> <li class="active">' . $xoopsModule->name().'</li>');
+$GLOBALS['xoopsTpl']->assign('breadcrumb', '<li><a href="'.XOOPS_URL.'">'._YOURHOME.'</a></li> <li class="active">'.$xoopsModule->name().'</li>');
 $GLOBALS['xoopsTpl']->assign('info', xoops_getModuleOption('contact_info', 'contact'));
 $GLOBALS['xoopsTpl']->assign('contact_default', xoops_getModuleOption('contact_default', 'contact'));
 
@@ -82,4 +82,4 @@ 
 $GLOBALS['xoopsTpl']->assign('lng_subject_info', _MD_CONTACT_SUBJECT_INFO);
 $GLOBALS['xoopsTpl']->assign('lng_message_info', _MD_CONTACT_MESSAGE_INFO);
                
-include XOOPS_ROOT_PATH . '/footer.php';
+include XOOPS_ROOT_PATH.'/footer.php';

header.php

Spacing +3 added lines, -3 removed lines

@@ -20,9 +20,9 @@
  */
 
 $moduleDirName = basename(__DIR__);
-include __DIR__ . '/../../mainfile.php';
-include __DIR__ . '/class/contact.php';
-require_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+include __DIR__.'/../../mainfile.php';
+include __DIR__.'/class/contact.php';
+require_once XOOPS_ROOT_PATH.'/class/xoopsformloader.php';
 
 /** @var ContactContactHandler $contactHandler*/
 $contactHandler = xoops_getModuleHandler('contact', $moduleDirName);

xoops_version.php

Spacing +13 added lines, -13 removed lines

@@ -43,10 +43,10 @@ 
     'help'                => 'page=help',
     // ------------------- Folders & Files -------------------
     'release_info'        => 'Changelog',
-    'release_file'        => XOOPS_URL . "/modules/$moduleDirName/docs/changelog.txt",
+    'release_file'        => XOOPS_URL."/modules/$moduleDirName/docs/changelog.txt",
     //
     'manual'              => 'link to manual file',
-    'manual_file'         => XOOPS_URL . "/modules/$moduleDirName/docs/install.txt",
+    'manual_file'         => XOOPS_URL."/modules/$moduleDirName/docs/install.txt",
     // images
     'image'               => 'assets/images/logoModule.png',
     'dirname'             => $moduleDirName,
@@ -79,7 +79,7 @@ 
     // -------------------  PayPal ---------------------------
     'paypal'              => [
         'business'      => 'foundation@xoops.org',
-        'item_name'     => 'Donation : ' . _MI_CONTACT_NAME,
+        'item_name'     => 'Donation : '._MI_CONTACT_NAME,
         'amount'        => 0,
         'currency_code' => 'USD'
     ],
@@ -100,35 +100,35 @@ 
 // Templates
 $modversion['templates'] = [
     [
-        'file'        => $moduleDirName . '_index.tpl',
+        'file'        => $moduleDirName.'_index.tpl',
         'description' => '_MI_CONTACT_TEMPLATES'
     ],
 ];
 
 // Blocks
 $modversion['blocks'][] = [
-    'file'        => 'block_' . $moduleDirName . '_form_map.php',
+    'file'        => 'block_'.$moduleDirName.'_form_map.php',
     'name'        => _MI_B_CONTACT_FORM,
     'description' => _MI_B_CONTACT_FORM_DESC,
-    'show_func'   => 'block_' . $moduleDirName . '_form_show',
+    'show_func'   => 'block_'.$moduleDirName.'_form_show',
     'options'     => '',
-    'template'    => 'block_' . $moduleDirName . '_form.tpl'
+    'template'    => 'block_'.$moduleDirName.'_form.tpl'
 ];
 $modversion['blocks'][] = [
-    'file'        => 'block_' . $moduleDirName . '_form_map.php',
+    'file'        => 'block_'.$moduleDirName.'_form_map.php',
     'name'        => _MI_B_CONTACT_MAP,
     'description' => _MI_B_CONTACT_MAP_DESC,
-    'show_func'   => 'block_' . $moduleDirName . '_map_show',
+    'show_func'   => 'block_'.$moduleDirName.'_map_show',
     'options'     => '',
-    'template'    => 'block_' . $moduleDirName . '_map.tpl'
+    'template'    => 'block_'.$moduleDirName.'_map.tpl'
 ];
 $modversion['blocks'][] = [
-    'file'        => 'block_' . $moduleDirName . '_form_map.php',
+    'file'        => 'block_'.$moduleDirName.'_form_map.php',
     'name'        => _MI_B_CONTACT_FORM_MAP,
     'description' => _MI_B_CONTACT_FORM_MAP_DESC,
-    'show_func'   => 'block_' . $moduleDirName . '_form_map_show',
+    'show_func'   => 'block_'.$moduleDirName.'_form_map_show',
     'options'     => '',
-    'template'    => 'block_' . $moduleDirName . '_form_map.tpl'
+    'template'    => 'block_'.$moduleDirName.'_form_map.tpl'
 ];
 
 // Settings