Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12957] XoopsModules/modulepacks/x257basicmodulepack/ branches/zyspec/contact
|
From: <zy...@us...> - 2015-01-30 22:30:07
|
Revision: 12957
http://sourceforge.net/p/xoops/svn/12957
Author: zyspec
Date: 2015-01-30 22:30:05 +0000 (Fri, 30 Jan 2015)
Log Message:
-----------
removed unnecessary exit() statement after redirect_header() calls
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/contact.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/log.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/prune.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/index.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/contact.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/contact.php 2015-01-30 20:58:24 UTC (rev 12956)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/contact.php 2015-01-30 22:30:05 UTC (rev 12957)
@@ -106,7 +106,6 @@
// verfiy we're sending to a valid email
if ((!$mailObj->contact_mail || !(checkEmail($mailObj->contact_mail))) && !$GLOBALS['xoopsModuleConfig']['form_dept']) {
redirect_header($_SERVER['PHP_SELF'], 3, _MD_CONTACT_MES_NOVALIDEMAIL);
- exit();
}
// verify valid message body
@@ -118,7 +117,6 @@
$contactObj->prepareToInsert($mailObj);
if (!$contact_handler->insert($contactObj)) {
redirect_header($_SERVER['PHP_SELF'], 3, _AM_CONTACT_MSG_NOTSAVED);
- exit();
}
$contact_handler->contactAddReply($contactObj->getVar('contact_cid'));
} else {
@@ -168,7 +166,6 @@
case 'delete':
if (!$contactId) {
redirect_header($_SERVER['PHP_SELF'], 3, _AM_CONTACT_MSG_NOTEXIST);
- exit();
}
// Prompt message
xoops_confirm(array('id' => $contactId, 'op' => 'dodelete'), $_SERVER['PHP_SELF'], _AM_CONTACT_MSG_DELETE);
@@ -181,7 +178,6 @@
if ( !$GLOBALS['xoopsSecurity']->check() ) {
// failed xoops security check
redirect_header('index.php', 3, $GLOBALS['xoopsSecurity']->getErrors(true));
- exit();
}
} else {
redirect_header('index.php', 3, _MD_CONTACT_INVALID_SECURITY_TOKEN);
@@ -196,8 +192,6 @@
$msg = (!$contact_handler->deleteAll($criteria)) ? _AM_CONTACT_MSG_DELETEERROR : _AM_CONTACT_MSG_DELETED;
}
redirect_header($_SERVER['PHP_SELF'], 3, $msg);
-// xoops_cp_footer();
- exit();
break;
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/log.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/log.php 2015-01-30 20:58:24 UTC (rev 12956)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/log.php 2015-01-30 22:30:05 UTC (rev 12957)
@@ -66,7 +66,6 @@
if ( !$GLOBALS['xoopsSecurity']->check() ) {
// failed xoops security check
redirect_header('index.php', 3, $GLOBALS['xoopsSecurity']->getErrors(true));
- exit();
}
} else {
xoops_loadLanguage('main', 'contact');
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/prune.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/prune.php 2015-01-30 20:58:24 UTC (rev 12956)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/prune.php 2015-01-30 22:30:05 UTC (rev 12957)
@@ -58,7 +58,6 @@
if (!$GLOBALS['xoopsSecurity']->check()) {
// failed xoops security check
redirect_header('index.php', 3, $GLOBALS['xoopsSecurity']->getErrors(true));
- exit();
}
} else {
xoops_loadLanguage('main', 'contact');
@@ -82,7 +81,6 @@
if (!$GLOBALS['xoopsSecurity']->check()) {
// failed xoops security check
redirect_header('index.php', 3, $GLOBALS['xoopsSecurity']->getErrors(true));
- exit();
}
} else {
xoops_loadLanguage('main', 'contact');
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/docs/changelog.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/docs/changelog.txt 2015-01-30 20:58:24 UTC (rev 12956)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/docs/changelog.txt 2015-01-30 22:30:05 UTC (rev 12957)
@@ -1,12 +1,13 @@
<u>Version 1.82 Beta 3 from 2015-1-28</u>
- Improved module update script to add some error reporting on failure(s)
- Fixed bug in subdirectory removal script on update
-- added KEY(s) to dB table to improve search performance
-- changed ContactContactHandler->infoProcessing() to use XoopsRequest
-- sort departments alphabetically when displayed on contact form
+- Added KEY(s) to dB table to improve search performance
+- Changed ContactContactHandler->infoProcessing() to use XoopsRequest
+- Sort departments alphabetically when displayed on contact form
- Replaced "Reply" text in admin (./admin/contact.php) with icons
- Changed "Submitter" information in admin to be able to email from contact page
- Improved ContactContact->contactSendMail() method to improve anti-spam score
+- Removed unnecessary exit() statement after redirect_header() calls
<u>Version 1.82 Beta 2 from 2014-12-03</u>
- Replaced ContactContactHandler->contactCleanVars function with XoopsRequest
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/index.php 2015-01-30 20:58:24 UTC (rev 12956)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/index.php 2015-01-30 22:30:05 UTC (rev 12957)
@@ -37,14 +37,12 @@
case 'save':
if (empty($_POST['submit']) ) {
redirect_header($GLOBALS['xoops']->url('www'), 3, _MD_CONTACT_MES_ERROR);
- exit();
} else {
// check to make sure this passes form submission security
if ( ($GLOBALS['xoopsSecurity'] instanceof XoopsSecurity) ) {
if ( !$GLOBALS['xoopsSecurity']->check() ) {
// failed xoops security check
redirect_header('index.php', 2, $GLOBALS['xoopsSecurity']->getErrors(true));
- exit();
}
} else {
redirect_header('index.php', 3, _MD_CONTACT_INVALID_SECURITY_TOKEN);
@@ -62,8 +60,6 @@
if (!$xoopsCaptcha->verify()) {
$err[] = $xoopsCaptcha->getMessage();
redirect_header("index.php", 2, $xoopsCaptcha->getMessage());
-
- exit();
}
}
}
@@ -75,7 +71,6 @@
if (empty($contact_mail)) {
redirect_header($_SERVER['PHP_SELF'], 2, _MD_CONTACT_MES_NOVALIDEMAIL);
// redirect_header("javascript:history.go(-1)", 2, _MD_CONTACT_MES_NOVALIDEMAIL);
- exit();
} elseif (!$GLOBALS['xoopsUser'] && $GLOBALS['xoopsModuleConfig']['form_req_email2']) {
$input_mail2 = XoopsRequest::getString('contact_mail2', '', 'POST');
$contact_mail2 = checkEmail($input_mail2);
@@ -83,11 +78,9 @@
if (empty($contact_mail2)) {
redirect_header($_SERVER['PHP_SELF'], 2, _MD_CONTACT_MES_NOVALIDEMAIL2);
// redirect_header("javascript:history.go(-1)", 2, _MD_CONTACT_MES_NOVALIDEMAIL);
- exit();
} elseif (($contact_mail != $contact_mail2)) {
redirect_header($_SERVER['PHP_SELF'], 2, _MD_CONTACT_MES_EMAILMATCHFAILURE);
// redirect_header("javascript:history.go(-1)", 2, _MD_CONTACT_MES_EMAILMATCHFAILURE);
- exit();
}
}
@@ -100,7 +93,6 @@
$contactObj->prepareToInsert($mailObj);
if (!$contact_handler->insert($contactObj)) {
redirect_header('index.php', 3, _MD_CONTACT_MES_NOTSAVE);
- exit();
}
}
@@ -114,7 +106,6 @@
}
redirect_header($GLOBALS['xoops']->url('www'), 3, $message);
- exit();
}
break;
|
