mambax7 / contact

contact/class/contact.php

Doc Comments +1 added lines

@@ -106,6 +106,7 @@
     /**
      * Get variables passed by GET or POST method
      *
+     * @param string $key
      */
     public function Contact_CleanVars(&$global, $key, $default = '', $type = 'int')
     {

Spacing +24 added lines, -24 removed lines

@@ -60,20 +60,20 @@ 
         global $xoopsConfig;
         $form = new XoopsThemeForm(_AM_CONTACT_REPLY, 'doreply', 'contact.php', 'post', true);
         $form->setExtra('enctype="multipart/form-data"');
-        $form->addElement(new XoopsFormHidden ('op', 'doreply'));
-        $form->addElement(new XoopsFormHidden ('contact_id', $this->getVar('contact_id', 'e')));
-        $form->addElement(new XoopsFormHidden ('contact_uid', $this->getVar('contact_uid', 'e')));
+        $form->addElement(new XoopsFormHidden('op', 'doreply'));
+        $form->addElement(new XoopsFormHidden('contact_id', $this->getVar('contact_id', 'e')));
+        $form->addElement(new XoopsFormHidden('contact_uid', $this->getVar('contact_uid', 'e')));
         $form->addElement(new XoopsFormLabel(_AM_CONTACT_FROM, '', ''));
         $form->addElement(
-            new XoopsFormText (_AM_CONTACT_NAMEFROM, 'contact_name', 50, 255, XoopsUser::getUnameFromId($GLOBALS['xoopsUser']->uid())),
+            new XoopsFormText(_AM_CONTACT_NAMEFROM, 'contact_name', 50, 255, XoopsUser::getUnameFromId($GLOBALS['xoopsUser']->uid())),
             true
         );
-        $form->addElement(new XoopsFormText (_AM_CONTACT_MAILFROM, 'contact_mail', 50, 255, $GLOBALS['xoopsUser']->getVar('email')), true);
+        $form->addElement(new XoopsFormText(_AM_CONTACT_MAILFROM, 'contact_mail', 50, 255, $GLOBALS['xoopsUser']->getVar('email')), true);
         $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 XoopsFormTextArea (_AM_CONTACT_MESSAGE, 'contact_message', '', 5, 60), true);
+        $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 XoopsFormTextArea(_AM_CONTACT_MESSAGE, 'contact_message', '', 5, 60), true);
         $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
 
         return $form;
@@ -254,9 +254,9 @@ 
     public function Contact_GetReply($contact_id)
     {
 
-        $criteria = new CriteriaCompo ();
-        $criteria->add(new Criteria ('contact_cid', $contact_id));
-        $criteria->add(new Criteria ('contact_type', 'Contact'));
+        $criteria = new CriteriaCompo();
+        $criteria->add(new Criteria('contact_cid', $contact_id));
+        $criteria->add(new Criteria('contact_type', 'Contact'));
         $contacts = $this->getObjects($criteria, false);
         if ($contacts) {
             $ret = array();
@@ -277,9 +277,9 @@ 
     public function Contact_GetAdminList($contact, $id)
     {
         $ret      = array();
-        $criteria = new CriteriaCompo ();
-        $criteria->add(new Criteria ($id, '0'));
-        $criteria->add(new Criteria ('contact_type', 'Contact'));
+        $criteria = new CriteriaCompo();
+        $criteria->add(new Criteria($id, '0'));
+        $criteria->add(new Criteria('contact_type', 'Contact'));
         $criteria->setSort($contact['sort']);
         $criteria->setOrder($contact['order']);
         $criteria->setStart($contact['start']);
@@ -303,9 +303,9 @@ 
      */
     public function Contact_GetCount($id)
     {
-        $criteria = new CriteriaCompo ();
-        $criteria->add(new Criteria ($id, '0'));
-        $criteria->add(new Criteria ('contact_type', 'Contact'));
+        $criteria = new CriteriaCompo();
+        $criteria->add(new Criteria($id, '0'));
+        $criteria->add(new Criteria('contact_type', 'Contact'));
 
         return $this->getCount($criteria);
     }
@@ -323,10 +323,10 @@ 
      */
     public function Contact_PruneCount($timestamp, $onlyreply)
     {
-        $criteria = new CriteriaCompo ();
-        $criteria->add(new Criteria ('contact_create', $timestamp, '<='));
+        $criteria = new CriteriaCompo();
+        $criteria->add(new Criteria('contact_create', $timestamp, '<='));
         if ($onlyreply) {
-            $criteria->add(new Criteria ('contact_reply', 1));
+            $criteria->add(new Criteria('contact_reply', 1));
         }
 
         return $this->getCount($criteria);
@@ -337,10 +337,10 @@ 
      */
     public function Contact_DeleteBeforeDate($timestamp, $onlyreply)
     {
-        $criteria = new CriteriaCompo ();
-        $criteria->add(new Criteria ('contact_create', $timestamp, '<='));
+        $criteria = new CriteriaCompo();
+        $criteria->add(new Criteria('contact_create', $timestamp, '<='));
         if ($onlyreply) {
-            $criteria->add(new Criteria ('contact_reply', 1));
+            $criteria->add(new Criteria('contact_reply', 1));
         }
         $this->deleteAll($criteria);
     }

contact/send.php

Indentation +1 added lines, -1 removed lines

@@ -67,7 +67,7 @@
                     if (!$contact_handler->insert($obj)) {
                         redirect_header("index.php", 3, _MD_CONTACT_MES_NOTSAVE);
                         exit();
-                       }
+                        }
                 }
             
                 // send mail can send message

Spacing +8 added lines, -8 removed lines

@@ -28,25 +28,25 @@
 /** reCaptcha by google **/
 global $xoopsConfig;
 
-if(isset($_POST['g-recaptcha-response'])){
-    $captcha=$_POST['g-recaptcha-response'];
+if (isset($_POST['g-recaptcha-response'])) {
+    $captcha = $_POST['g-recaptcha-response'];
 }
 
-if(!$captcha && $xoopsModuleConfig['useCaptcha']){
+if (!$captcha && $xoopsModuleConfig['useCaptcha']) {
     redirect_header("index.php", 2, _MD_CONTACT_MES_NOCAPTCHA);
 }
 else {
-    $response=file_get_contents("https://www.google.com/recaptcha/api/siteverify?secret=".$xoopsModuleConfig['captchaSecretKey']."&response=".$captcha."&remoteip=".$_SERVER['REMOTE_ADDR']);
-    if($response.success==false && $xoopsModuleConfig['useCaptcha'])
+    $response = file_get_contents("https://www.google.com/recaptcha/api/siteverify?secret=" . $xoopsModuleConfig['captchaSecretKey'] . "&response=" . $captcha . "&remoteip=" . $_SERVER['REMOTE_ADDR']);
+    if ($response . success == false && $xoopsModuleConfig['useCaptcha'])
     {
         redirect_header("index.php", 2, _MD_CONTACT_MES_CAPTCHAINCORRECT);
-    }else{
+    } else {
 
     global $xoopsConfig, $xoopsOption, $xoopsTpl, $xoopsUser, $xoopsUserIsAdmin, $xoopsLogger;
         $op         = $contact_handler->Contact_CleanVars($_POST, 'op', 'form', 'string');
         $department = $contact_handler->Contact_CleanVars($_GET, 'department', '', 'string');
-        if($op == "save") {
-            if (empty($_POST['submit']) ) {
+        if ($op == "save") {
+            if (empty($_POST['submit'])) {
                 redirect_header(XOOPS_URL, 3, _MD_CONTACT_MES_ERROR);
                 exit();
             } else {

Braces +2 added lines, -3 removed lines

@@ -34,13 +34,12 @@
 
 if(!$captcha && $xoopsModuleConfig['useCaptcha']){
     redirect_header("index.php", 2, _MD_CONTACT_MES_NOCAPTCHA);
-}
-else {
+} else {
     $response=file_get_contents("https://www.google.com/recaptcha/api/siteverify?secret=".$xoopsModuleConfig['captchaSecretKey']."&response=".$captcha."&remoteip=".$_SERVER['REMOTE_ADDR']);
     if($response.success==false && $xoopsModuleConfig['useCaptcha'])
     {
         redirect_header("index.php", 2, _MD_CONTACT_MES_CAPTCHAINCORRECT);
-    }else{
+    } else{
 
     global $xoopsConfig, $xoopsOption, $xoopsTpl, $xoopsUser, $xoopsUserIsAdmin, $xoopsLogger;
         $op         = $contact_handler->Contact_CleanVars($_POST, 'op', 'form', 'string');

contact/admin/contact.php

Spacing +3 added lines, -3 removed lines

@@ -181,9 +181,9 @@
             exit ();
         }
 
-        $criteria = new CriteriaCompo ();
-        $criteria->add(new Criteria ('contact_id', $contact_id));
-        $criteria->add(new Criteria ('contact_cid', $contact_id), 'OR');
+        $criteria = new CriteriaCompo();
+        $criteria->add(new Criteria('contact_id', $contact_id));
+        $criteria->add(new Criteria('contact_cid', $contact_id), 'OR');
 
         if (!$contact_handler->deleteAll($criteria)) {
             redirect_header('contact.php', 1, _AM_CONTACT_MSG_DELETEERROR);

contact/index.php

Spacing +2 added lines, -2 removed lines

@@ -28,7 +28,7 @@ 
 global $xoopsConfig, $xoopsOption, $xoopsTpl, $xoopsUser, $xoopsUserIsAdmin, $xoopsLogger;
 
     $department = $contact_handler->Contact_CleanVars($_GET, 'department', '', 'string');
-    $obj  = $contact_handler->create();
+    $obj = $contact_handler->create();
     
     /*Modules Options*/
     if ($xoopsModuleConfig['form_dept'] == 1) {
@@ -56,7 +56,7 @@ 
     
     $xoopsTpl->assign('map', $xoopsModuleConfig['embed_maps']);
     /*end Modules options*/
-    $xoopsTpl->assign('breadcrumb', '<li><a href="' . XOOPS_URL . '">' . _YOURHOME . '</a></li> <li class="active">' . $xoopsModule->name().'</li>');
+    $xoopsTpl->assign('breadcrumb', '<li><a href="' . XOOPS_URL . '">' . _YOURHOME . '</a></li> <li class="active">' . $xoopsModule->name() . '</li>');
     $xoopsTpl->assign('info', xoops_getModuleOption('contact_info', 'contact'));
     
     /* added by goffy */