Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12959] XoopsModules/modulepacks/x257basicmodulepack/ branches/zyspec/contact
|
From: <zy...@us...> - 2015-01-31 18:47:57
|
Revision: 12959
http://sourceforge.net/p/xoops/svn/12959
Author: zyspec
Date: 2015-01-31 18:47:43 +0000 (Sat, 31 Jan 2015)
Log Message:
-----------
* minor code cleanup
* utilize XoopsFilterInput in ContactContact->contactSendMail()
* add missing define(s) _MD_CONTACT_MSG_NOVALIDEMAIL2, _MD_CONTACT_MSG_EMAILMATCHFAILURE
* removed deprecated methods from Contact class (getInsertId, contactCleanVars)
* moved XoopsRequest loading to ./admin/admin_header.php
* changed defines from _MD_CONTACT_MES_xxx to _MD_CONTACT_MSG_xxx for consistency
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/ajax.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/class/contact.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/header.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/include/functions_update.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/index.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/language/english/admin.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/language/english/main.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/language/english/modinfo.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/xoops_version.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/contact.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/contact.php 2015-01-31 15:28:27 UTC (rev 12958)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/contact.php 2015-01-31 18:47:43 UTC (rev 12959)
@@ -26,7 +26,8 @@
require __DIR__ . '/admin_header.php';
// Display Admin header
xoops_cp_header();
-// Define default value
+
+//Get input
$op = XoopsRequest::getString('op', 'list');
$contactId = XoopsRequest::getInt('id', '0');
$level = '';
@@ -66,14 +67,14 @@
if ($contactCount > $pageSettingsObj->limit) {
$contactPageNavObj = new XoopsPageNav($contactCount, $pageSettingsObj->limit, $pageSettingsObj->start, 'start', 'limit=' . $pageSettingsObj->limit);
- $contact_pagenav = $contactPageNavObj->renderNav(4);
+ $contactPagenav = $contactPageNavObj->renderNav(4);
} else {
- $contact_pagenav = '';
+ $contactPagenav = '';
}
$GLOBALS['xoopsTpl']->assign(array('use_depts' => $GLOBALS['xoopsModuleConfig']['form_dept'] ? 1 : 0,
'contacts' => $contacts,
- 'contact_pagenav' => $contact_pagenav)
+ 'contact_pagenav' => $contactPagenav)
);
$level = 'list';
break;
@@ -106,7 +107,7 @@
// 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);
+ redirect_header($_SERVER['PHP_SELF'], 3, _MD_CONTACT_MSG_NOVALIDEMAIL);
}
// verify valid message body
@@ -128,9 +129,9 @@
if ($sendmail = true) {
$message[] = $contactHandler->contactReplyMail($mailObj);
} elseif ($saveinfo = true) {
- $message = _MD_CONTACT_MES_SAVEINDB;
+ $message = _MD_CONTACT_MSG_SAVEINDB;
} else {
- $message[] = _MD_CONTACT_MES_SENDERROR;
+ $message[] = _MD_CONTACT_MSG_SENDERROR;
}
} else {
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/log.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/log.php 2015-01-31 15:28:27 UTC (rev 12958)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/log.php 2015-01-31 18:47:43 UTC (rev 12959)
@@ -26,7 +26,8 @@
require __DIR__ . '/admin_header.php';
// Display Admin header
xoops_cp_header();
-// Define default value
+
+// Get input
$op = XoopsRequest::getCmd('op', 'form');
switch ($op) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/prune.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/prune.php 2015-01-31 15:28:27 UTC (rev 12958)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/prune.php 2015-01-31 18:47:43 UTC (rev 12959)
@@ -27,7 +27,8 @@
require __DIR__ . '/admin_header.php';
// Display Admin header
xoops_cp_header();
-// Define default value
+
+// Get input
$op = XoopsRequest::getCmd('op', 'list');
switch ($op) {
@@ -87,11 +88,9 @@
redirect_header('index.php', 3, _MD_CONTACT_INVALID_SECURITY_TOKEN);
}
- $timeRequest = XoopsRequest::getString('prune_date', 0);
+ $timeRequest = XoopsRequest::getString('prune_date', 0, 'POST');
$timestamp = ($timeRequest) ? strtotime($timeRequest) : xoops_getUserTimestamp(time());
$onlyreply = XoopsRequest::getBool('onlyreply', false, 'POST');
-// $timestamp = $contactHandler->contactCleanVars($_POST, 'prune_date', xoops_getUserTimestamp(time()), 'date');
-// $onlyreply = (bool) $contactHandler->contactCleanVars($_POST, 'onlyreply', 0, 'int');
$count = (int) $contactHandler->deleteBeforeDate($timestamp, $onlyreply);
redirect_header('prune.php', 2, sprintf(_AM_CONTACT_MSG_PRUNE_DELETED, $count));
xoops_cp_footer();
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/ajax.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/ajax.php 2015-01-31 15:28:27 UTC (rev 12958)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/ajax.php 2015-01-31 18:47:43 UTC (rev 12959)
@@ -30,7 +30,6 @@
// Save info
$contactObj = $contactHandler->create();
$contactObj->prepareToInsert($mailObj);
-// $contentObj->setVars($contact);
$contactHandler->insert($contactObj);
// send mail can send message
$message = $contactHandler->contactSendMail($mailObj);
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/class/contact.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/class/contact.php 2015-01-31 15:28:27 UTC (rev 12958)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/class/contact.php 2015-01-31 18:47:43 UTC (rev 12959)
@@ -240,69 +240,7 @@
}
/**
- * Get variables passed by $_GET, $_POST, or unknown ($_REQUEST)
*
- * @deprecated in v1.82 Beta 2
- * @param array $global
- * @param string $key array key to clean (e.g. id)
- * @param mixed $default key's default value if invalid/no input
- * @param string $type type of clean (e.g. int|string|date|array|mail, etc..
- *
- * @return mixed sanitized value
- */
- public function contactCleanVars(&$global, $key, $default = '', $type = 'int')
- {
-
- switch ($type) {
- case 'array':
- $ret = (isset($global[$key]) && is_array($global[$key])) ? $global[$key] : $default;
- break;
- case 'date':
- $ret = (isset($global[$key])) ? strtotime($global[$key]) : $default;
- break;
- case 'string':
- $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_SANITIZE_MAGIC_QUOTES) : $default;
- break;
- case 'mail':
- $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_VALIDATE_EMAIL) : $default;
- break;
- case 'url':
- $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_VALIDATE_URL, FILTER_FLAG_SCHEME_REQUIRED) : $default;
- break;
- case 'ip':
- $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_VALIDATE_IP) : $default;
- break;
- case 'amp':
- $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_FLAG_ENCODE_AMP) : $default;
- break;
- case 'text':
- $ret = (isset($global[$key])) ? htmlentities($global[$key], ENT_QUOTES, 'UTF-8') : $default;
- break;
- case 'platform':
- $ret = (isset($global[$key])) ? $this->contactPlatform($global[$key]) : $this->contactPlatform($default);
- break;
- case 'type':
- $ret = (isset($global[$key])) ? $this->contactType($global[$key]) : $this->contactType($default);
- break;
- case 'int':
- case 'integer':
- default:
- $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_SANITIZE_NUMBER_INT) : $default;
- break;
- case 'float':
- case 'double':
- // Only use the first floating point value
- preg_match('/-?[0-9]+(\.[0-9]+)?/', (string) $source, $matches);
- $ret = @ (float) $matches[0];
- break;
-
- }
-
- return (false === $ret) ? $default : $ret;
- }
-
- /**
- *
* Clean all the incoming Vars from Form(s)
* @param $global global var array (POST, GET, REQUEST)
* @uses {@link XoopsRequest}
@@ -373,6 +311,7 @@
public function contactSendMail(stdClass &$mailObj)
{
include_once $GLOBALS['xoops']->path("modules/contact/include/functions.php");
+ xoops_load('XoopsFilterInput');
$xoopsMailer = xoops_getMailer();
$xoopsMailer->useMail();
$deptEmailAddresses = contactGetDepartmentEmails($mailObj->contact_department);
@@ -382,16 +321,19 @@
} else {
$xoopsMailer->setToEmails($GLOBALS['xoopsConfig']['adminmail']); //just send to admin
}
+/*
if (!in_array($GLOBALS['xoopsConfig']['adminmail'], $deptEmailAddresses)) {
- $xoopsMailer->multimailer->addBCC($GLOBALS['xoopsConfig']['adminmail'], 'TMC Administrator');
+ $xoopsMailer->multimailer->addBCC($GLOBALS['xoopsConfig']['adminmail'], 'Administrator');
}
-
+*/
xoops_loadLanguage('modinfo', 'contact'); // get the language string(s)
$myts =& MyTextSanitizer::getInstance();
// pre-process FromName since it came from input field
- $fromName = stripslashes(strip_tags(html_entity_decode($mailObj->contact_name, ENT_QUOTES, 'UTF-8')));
+ $fromName = XoopsFilterInput::getString($mailObj->contact_name, 'STRING');
+// $fromName = stripslashes(strip_tags(html_entity_decode($mailObj->contact_name, ENT_QUOTES, 'UTF-8')));
// pre-process Subject since it came from input field
- $mailSubject = stripslashes(strip_tags(html_entity_decode($mailObj->contact_subject, ENT_QUOTES, 'UTF-8')));
+ $mailSubject = XoopsFilterInput::getString($mailObj->contact_subject, 'STRING');
+// $mailSubject = stripslashes(strip_tags(html_entity_decode($mailObj->contact_subject, ENT_QUOTES, 'UTF-8')));
$xoopsMailer->setFromName(ucwords($fromName));
$xoopsMailer->setFromEmail($mailObj->contact_mail);
@@ -427,11 +369,10 @@
*/
public function contactReplyMail(stdClass &$mailObj)
{
-
$xoopsMailer = xoops_getMailer();
$xoopsMailer->useMail();
$toEmails = $mailObj->contact_mail;
- include_once "../include/functions.php";
+ include_once $GLOBALS['xoops']->path("modules/contact/include/functions.php");
$deptEmailAddresses = contactGetDepartmentEmails($mailObj->contact_department); //get emails for department (if enabled)
if (!empty($deptEmailAddresses)) { //get emails for department (if enabled)
$xoopsMailer->setFromEmail($deptEmailAddresses[0]); // set to dept email to first one
@@ -449,9 +390,11 @@
}
$xoopsMailer->setFromName($fromName);
- if (!empty($mailObj->contact_mailfrom)) { // use mail addr from ReplyForm
+ if (!empty($mailObj->contact_mailfrom)) {
+ // use mail addr from ReplyForm
$xoopsMailer->setFromName($mailObj->contact_mailfrom);
- } else { // otherwise use default site admin email
+ } else {
+ // otherwise use default site admin email
$xoopsMailer->setFromEmail($GLOBALS['xoopsConfig']['adminmail']);
}
}
@@ -531,7 +474,7 @@
$criteria->setOrder($pgObj->order);
$criteria->setStart($pgObj->start);
$criteria->setLimit($pgObj->limit);
- $contactObjs = $this->getObjects($criteria, false);
+ $contactObjs = $this->getObjects($criteria, false);
$user_timezone = ($GLOBALS['xoopsUser'] instanceof XoopsUser) ? $GLOBALS['xoopsUser']->timezone() : null;
foreach($contactObjs as $thisContact) {
$tab = $thisContact->getValues();
@@ -564,38 +507,6 @@
}
/**
- * Get Insert ID
- *
- * @deprecated
- * @return bool|int false on failure, integer of item Id
- */
- public function getInsertId()
- {
- return $this->db->getInsertId();
- }
-
- /**
- * Contact Prune Count
- * @deprecated
- * @param int $timestamp all items <= this timestamp
- * @param bool $onlyreply true - only include replies, false include everything
- *
- * @param int count of items to be pruned
- */
- public function pruneCount($timestamp=0, $onlyreply=false)
- {
- $criteria = new CriteriaCompo();
- if (!empty($timestamp)) {
- $criteria->add(new Criteria('contact_create', $timestamp, '<='));
- }
- if ($onlyreply) {
- $criteria->add(new Criteria('contact_reply', 1));
- }
-
- return $this->getCount($criteria);
- }
-
- /**
* Contact Delete Before Date
* @param int $timestamp Unix timestamp
* @param bool $onlyreply - true only delete replies, false delete everything
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/header.php 2015-01-31 15:28:27 UTC (rev 12958)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/header.php 2015-01-31 18:47:43 UTC (rev 12959)
@@ -24,5 +24,6 @@
include dirname(dirname(__DIR__)) . '/mainfile.php';
include $GLOBALS['xoops']->path('www/modules/contact/class/contact.php');
include_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
+xoops_load('XoopsRequest');
$contactHandler =& xoops_getModuleHandler('contact', 'contact');
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/include/functions_update.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/include/functions_update.php 2015-01-31 15:28:27 UTC (rev 12958)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/include/functions_update.php 2015-01-31 18:47:43 UTC (rev 12959)
@@ -40,10 +40,10 @@
* - the routine is intentionally limitted for this
* install routine's requirements}
*/
- $moduleDir = basename(dirname(__DIR__));
+ $moduleDirname = basename(dirname(__DIR__));
$dir = preg_replace('/[^a-zA-Z\s\d\_\-\/]/', '', $dir);
$dir = trim($dir, " \t\n\r\0\x0B\/"); //trim leading/trailing spaces and '/'
- $path = $GLOBALS['xoops']->path("www/modules/{$moduleDir}/{$dir}");
+ $path = $GLOBALS['xoops']->path("www/modules/{$moduleDirname}/{$dir}");
$objs = array_diff(scandir($path), array('.','..')); // remove relative dirs
foreach ($objs as $obj) {
if (is_dir("{$path}/{$obj}")) {
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/index.php 2015-01-31 15:28:27 UTC (rev 12958)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/index.php 2015-01-31 18:47:43 UTC (rev 12959)
@@ -23,20 +23,15 @@
include __DIR__ . '/header.php';
$GLOBALS['xoopsOption']['template_main'] = 'contact_index.tpl';
-//unset($_SESSION);
include $GLOBALS['xoops']->path("/header.php");
-xoops_load('XoopsRequest');
$op = XoopsRequest::getCmd('op', 'form', 'POST');
$department = XoopsRequest::getString('contact_department', '', 'GET');
-//$op = $contactHandler->contactCleanVars($_POST, 'op', 'form', 'string');
-//$department = $contactHandler->contactCleanVars($_GET, 'contact_department', '', 'string');
-
switch ($op) {
case 'save':
if (empty($_POST['submit']) ) {
- redirect_header($GLOBALS['xoops']->url('www'), 3, _MD_CONTACT_MES_ERROR);
+ redirect_header($GLOBALS['xoops']->url('www'), 3, _MD_CONTACT_MSG_ERROR);
} else {
// check to make sure this passes form submission security
if ( ($GLOBALS['xoopsSecurity'] instanceof XoopsSecurity) ) {
@@ -67,20 +62,18 @@
// check email
$input_mail = XoopsRequest::getString('contact_mail', '', 'POST');
$contact_mail = checkEmail($input_mail);
-// $contact_mail = $contactHandler->contactCleanVars($_POST, 'contact_mail', '', 'mail');
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);
+ redirect_header($_SERVER['PHP_SELF'], 2, _MD_CONTACT_MSG_NOVALIDEMAIL);
+// redirect_header("javascript:history.go(-1)", 2, _MD_CONTACT_MSG_NOVALIDEMAIL);
} elseif (!$GLOBALS['xoopsUser'] && $GLOBALS['xoopsModuleConfig']['form_req_email2']) {
$input_mail2 = XoopsRequest::getString('contact_mail2', '', 'POST');
$contact_mail2 = checkEmail($input_mail2);
-// $contact_mail2 = $contactHandler->contactCleanVars($_POST, 'contact_mail2', '', 'mail');
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);
+ redirect_header($_SERVER['PHP_SELF'], 2, _MD_CONTACT_MSG_NOVALIDEMAIL2);
+// redirect_header("javascript:history.go(-1)", 2, _MD_CONTACT_MSG_NOVALIDEMAIL);
} 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);
+ redirect_header($_SERVER['PHP_SELF'], 2, _MD_CONTACT_MSG_EMAILMATCHFAILURE);
+// redirect_header("javascript:history.go(-1)", 2, _MD_CONTACT_MSG_EMAILMATCHFAILURE);
}
}
@@ -92,7 +85,7 @@
$contactObj = $contactHandler->create();
$contactObj->prepareToInsert($mailObj);
if (!$contactHandler->insert($contactObj)) {
- redirect_header('index.php', 3, _MD_CONTACT_MES_NOTSAVE);
+ redirect_header('index.php', 3, _MD_CONTACT_MSG_NOTSAVE);
}
}
@@ -100,9 +93,9 @@
if ($sendmail = true) {
$message = $contactHandler->contactSendMail($mailObj);
} elseif ($saveinfo = true) {
- $message = _MD_CONTACT_MES_SAVEINDB;
+ $message = _MD_CONTACT_MSG_SAVEINDB;
} else {
- $message = _MD_CONTACT_MES_SENDERROR;
+ $message = _MD_CONTACT_MSG_SENDERROR;
}
redirect_header($GLOBALS['xoops']->url('www'), 3, $message);
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/language/english/admin.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/language/english/admin.php 2015-01-31 15:28:27 UTC (rev 12958)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/language/english/admin.php 2015-01-31 18:47:43 UTC (rev 12959)
@@ -9,7 +9,7 @@
define('_AM_CONTACT_MAINTAINED_TITLE', "Visit XOOPS Community");
define('_AM_CONTACT_MAINTAINED_TEXT', "XOOPS Community");
// Contact
-define('_AM_CONTACT_ID', "Id");
+//define('_AM_CONTACT_ID', "Id");
define('_AM_CONTACT_SUBJECT', "Subject");
define('_AM_CONTACT_DEPARTMENT', "Department");
define('_AM_CONTACT_SUBMITTER', "Submitter");
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/language/english/main.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/language/english/main.php 2015-01-31 15:28:27 UTC (rev 12958)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/language/english/main.php 2015-01-31 18:47:43 UTC (rev 12959)
@@ -13,10 +13,12 @@
define('_MD_CONTACT_MESSAGE', "Comment");
define('_MD_CONTACT_DEPARTMENT', "Department");
define('_MD_CONTACT_DEFULTDEP', "Contact us");
-define('_MD_CONTACT_MES_SEND', "Thank you for contacting us");
-define('_MD_CONTACT_MES_NOVALIDEMAIL', "Your Email is not Valid");
-define('_MD_CONTACT_MES_NOTSAVE', "Sorry, your Message was not saved in our DB");
-define('_MD_CONTACT_MES_SAVEINDB', "Your Message has been saved in our DB");
-define('_MD_CONTACT_MES_SENDERROR', "Error in sending Message");
-define('_MD_CONTACT_MES_ERROR', "Error");
+define('_MD_CONTACT_MSG_SEND', "Thank you for contacting us");
+define('_MD_CONTACT_MSG_NOVALIDEMAIL', "Your Email is not valid");
+define('_MD_CONTACT_MSG_NOVALIDEMAIL2', "The 2nd Email entered is not valid");
+define('_MD_CONTACT_MSG_EMAILMATCHFAILURE', "Email fields do not match");
+define('_MD_CONTACT_MSG_NOTSAVE', "Sorry, your Message was not saved in our DB");
+define('_MD_CONTACT_MSG_SAVEINDB', "Your Message has been saved in our DB");
+define('_MD_CONTACT_MSG_SENDERROR', "Error in sending Message");
+define('_MD_CONTACT_MSG_ERROR', "Error");
define('_MD_CONTACT_INVALID_SECURITY_TOKEN', "Invalid security token. Please try again.");
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/language/english/modinfo.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/language/english/modinfo.php 2015-01-31 15:28:27 UTC (rev 12958)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/language/english/modinfo.php 2015-01-31 18:47:43 UTC (rev 12959)
@@ -34,8 +34,8 @@
define('_MI_CONTACT_MENU_LOGS_DESC', "Get Logs");
define('_MI_CONTACT_MENU_ABOUT', "About");
define('_MI_CONTACT_MENU_ABOUT_DESC', "About this module");
-define('_MI_CONTACT_MENU_HELP', "Help");
-define('_MI_CONTACT_MENU_HELP_DESC', "Module help");
+//define('_MI_CONTACT_MENU_HELP', "Help");
+//define('_MI_CONTACT_MENU_HELP_DESC', "Module help");
// Module Settings
define('_MI_CONTACT_FORM_URL', "Get URL");
define('_MI_CONTACT_FORM_URL_DESC', "");
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/xoops_version.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/xoops_version.php 2015-01-31 15:28:27 UTC (rev 12958)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/xoops_version.php 2015-01-31 18:47:43 UTC (rev 12959)
@@ -80,7 +80,7 @@
// Blocks
'blocks'=> array(array('file' => "stats.php",
'name' => _MI_CONTACT_BNAME1,
- 'description' => '_MI_STATS_BNAME1_DESC',
+ 'description' => '_MI_CONTACT_BNAME1_DESC',
'show_func' => 'b_contact_stats_show',
// 'edit_func' => 'b_contact_stats_edit',
'template' => 'contact_block_stats.tpl',
|
