Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12164] XoopsModules/contact/trunk/contact
|
From: <be...@us...> - 2013-10-08 11:14:49
|
Revision: 12164
http://sourceforge.net/p/xoops/svn/12164
Author: beckmi
Date: 2013-10-08 11:14:45 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
Fixing few more issues with Apostrophes in the title of the sent email
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/admin/footer.php
XoopsModules/contact/trunk/contact/admin/header.php
XoopsModules/contact/trunk/contact/admin/menu.php
XoopsModules/contact/trunk/contact/admin/tools.php
XoopsModules/contact/trunk/contact/ajax.php
XoopsModules/contact/trunk/contact/class/contact.php
XoopsModules/contact/trunk/contact/header.php
XoopsModules/contact/trunk/contact/templates/contact_index.html
Modified: XoopsModules/contact/trunk/contact/admin/footer.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/footer.php 2013-10-08 02:33:07 UTC (rev 12163)
+++ XoopsModules/contact/trunk/contact/admin/footer.php 2013-10-08 11:14:45 UTC (rev 12164)
@@ -19,5 +19,5 @@
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
*/
-
+
xoops_cp_footer();
Modified: XoopsModules/contact/trunk/contact/admin/header.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/header.php 2013-10-08 02:33:07 UTC (rev 12163)
+++ XoopsModules/contact/trunk/contact/admin/header.php 2013-10-08 11:14:45 UTC (rev 12164)
@@ -19,7 +19,7 @@
* @author Hossein Azizabadi (AKA Voltan)
* @version $Id$
*/
-
+
$path = dirname(dirname(dirname(dirname(__FILE__))));
include_once $path . '/mainfile.php';
@@ -36,18 +36,18 @@
xoops_loadLanguage('modinfo', $thisModuleDir);
xoops_loadLanguage('main', $thisModuleDir);
-$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
// Contact Handler
-$contact_handler = & xoops_getModuleHandler ( 'contact', 'contact' );
+$contact_handler = & xoops_getModuleHandler('contact', 'contact');
// Locad admin menu class
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
-}else{
- redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
+if (file_exists($GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php'))) {
+ include_once $GLOBALS['xoops']->path($pathModuleAdmin . '/moduleadmin.php');
+} else {
+ redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
}
$admin_class = new ModuleAdmin();
Modified: XoopsModules/contact/trunk/contact/admin/menu.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/menu.php 2013-10-08 02:33:07 UTC (rev 12163)
+++ XoopsModules/contact/trunk/contact/admin/menu.php 2013-10-08 11:14:45 UTC (rev 12164)
@@ -1,58 +1,58 @@
-<?php
-/*
- You may not change or alter any portion of this comment or credits
- of supporting developers from this source code or any supporting source code
- which is considered copyrighted (c) material of the original comment or credit authors.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-*/
-
-/**
- * Contact module
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @author Kazumi Ono (aka Onokazu)
- * @author Trabis <lus...@gm...>
- * @author Hossein Azizabadi (AKA Voltan)
- * @version $Id$
- */
-
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
-
-$dirname = basename(dirname(dirname(__FILE__)));
-$module_handler = xoops_gethandler('module');
-$module = $module_handler->getByDirname($dirname);
-$pathIcon32 = $module->getInfo('icons32');
-
-//xoops_loadLanguage('admin', $dirname);
-
-$adminmenu = array();
-
-$i = 1;
-$adminmenu[$i]["title"] = _MI_CONTACT_MENU_HOME;
-$adminmenu[$i]["link"] = "admin/index.php";
-$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_HOME_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
-$i++;
-$adminmenu[$i]["title"] = _MI_CONTACT_MENU_CONTACT;
-$adminmenu[$i]["link"] = "admin/contact.php";
-$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_CONTACT_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/content.png';
-$i++;
-$adminmenu[$i]["title"] = _MI_CONTACT_MENU_LOGS;
-$adminmenu[$i]["link"] = "admin/log.php";
-$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_LOGS_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/exec.png';
-$i++;
-$adminmenu[$i]["title"] = _MI_CONTACT_MENU_TOOLS;
-$adminmenu[$i]["link"] = "admin/tools.php";
-$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_TOOLS_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/exec.png';
-$i++;
-$adminmenu[$i]["title"] = _MI_CONTACT_MENU_ABOUT;
-$adminmenu[$i]["link"] = "admin/about.php";
-$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_ABOUT_DESC;
-$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
+<?php
+/*
+ You may not change or alter any portion of this comment or credits
+ of supporting developers from this source code or any supporting source code
+ which is considered copyrighted (c) material of the original comment or credit authors.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+*/
+
+/**
+ * Contact module
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @author Kazumi Ono (aka Onokazu)
+ * @author Trabis <lus...@gm...>
+ * @author Hossein Azizabadi (AKA Voltan)
+ * @version $Id$
+ */
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$dirname = basename(dirname(dirname(__FILE__)));
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname($dirname);
+$pathIcon32 = $module->getInfo('icons32');
+
+//xoops_loadLanguage('admin', $dirname);
+
+$adminmenu = array();
+
+$i = 1;
+$adminmenu[$i]["title"] = _MI_CONTACT_MENU_HOME;
+$adminmenu[$i]["link"] = "admin/index.php";
+$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_HOME_DESC;
+$adminmenu[$i]["icon"] = $pathIcon32 . '/home.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_CONTACT_MENU_CONTACT;
+$adminmenu[$i]["link"] = "admin/contact.php";
+$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_CONTACT_DESC;
+$adminmenu[$i]["icon"] = $pathIcon32 . '/content.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_CONTACT_MENU_LOGS;
+$adminmenu[$i]["link"] = "admin/log.php";
+$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_LOGS_DESC;
+$adminmenu[$i]["icon"] = $pathIcon32 . '/exec.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_CONTACT_MENU_TOOLS;
+$adminmenu[$i]["link"] = "admin/tools.php";
+$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_TOOLS_DESC;
+$adminmenu[$i]["icon"] = $pathIcon32 . '/exec.png';
+$i++;
+$adminmenu[$i]["title"] = _MI_CONTACT_MENU_ABOUT;
+$adminmenu[$i]["link"] = "admin/about.php";
+$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_ABOUT_DESC;
+$adminmenu[$i]["icon"] = $pathIcon32 . '/about.png';
Modified: XoopsModules/contact/trunk/contact/admin/tools.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/tools.php 2013-10-08 02:33:07 UTC (rev 12163)
+++ XoopsModules/contact/trunk/contact/admin/tools.php 2013-10-08 11:14:45 UTC (rev 12164)
@@ -31,7 +31,7 @@
case 'list':
// prune manager
$form = new XoopsThemeForm(_AM_CONTACT_TOOLS_PRUNE, 'tools', 'tools.php', 'post');
- $form->addElement(new XoopsFormTextDateSelect(_AM_CONTACT_TOOLS_PRUNE_BEFORE, 'prune_date', 15, time()));
+ $form->addElement(new XoopsFormTextDateSelect(_AM_CONTACT_TOOLS_PRUNE_BEFORE, 'prune_date', 15, time()));
$onlyreply = new xoopsFormCheckBox('', 'onlyreply');
$onlyreply->addOption(1, _AM_CONTACT_TOOLS_PRUNE_REPLYONLY);
$form->addElement($onlyreply, false);
@@ -41,15 +41,15 @@
break;
case 'prune':
- $timestamp = $contact_handler->Contact_CleanVars( $_REQUEST, 'prune_date', '', 'int' );
- $onlyreply = $contact_handler->Contact_CleanVars( $_REQUEST, 'onlyreply', 0, 'int' );
- $timestamp = strtotime($timestamp);
- $count = $contact_handler->Contact_PruneCount($timestamp,$onlyreply);
- $contact_handler->Contact_DeleteBeforeDate($timestamp,$onlyreply);
- redirect_header ( 'tools.php', 1, sprintf(_AM_CONTACT_MSG_PRUNE_DELETED,$count) );
- xoops_cp_footer ();
- exit ();
- break;
+ $timestamp = $contact_handler->Contact_CleanVars($_REQUEST, 'prune_date', '', 'int');
+ $onlyreply = $contact_handler->Contact_CleanVars($_REQUEST, 'onlyreply', 0, 'int');
+ $timestamp = strtotime($timestamp);
+ $count = $contact_handler->Contact_PruneCount($timestamp, $onlyreply);
+ $contact_handler->Contact_DeleteBeforeDate($timestamp, $onlyreply);
+ redirect_header('tools.php', 1, sprintf(_AM_CONTACT_MSG_PRUNE_DELETED, $count));
+ xoops_cp_footer();
+ exit ();
+ break;
}
$xoopsTpl->assign('navigation', $admin_class->addNavigation('tools.php'));
Modified: XoopsModules/contact/trunk/contact/ajax.php
===================================================================
--- XoopsModules/contact/trunk/contact/ajax.php 2013-10-08 02:33:07 UTC (rev 12163)
+++ XoopsModules/contact/trunk/contact/ajax.php 2013-10-08 11:14:45 UTC (rev 12164)
@@ -24,8 +24,8 @@
if (!empty($_POST)) {
// Info Processing
- $contact = $contact_handler->Contact_InfoProcessing($_POST);
- // Save info
+ $contact = $contact_handler->Contact_InfoProcessing($_POST);
+ // Save info
$obj = $contact_handler->create();
$obj->setVars($contact);
$contact_handler->insert($obj);
Modified: XoopsModules/contact/trunk/contact/class/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/class/contact.php 2013-10-08 02:33:07 UTC (rev 12163)
+++ XoopsModules/contact/trunk/contact/class/contact.php 2013-10-08 11:14:45 UTC (rev 12164)
@@ -241,15 +241,15 @@
$contact = array();
$contact['contact_cid'] = $this->Contact_CleanVars($_POST, 'contact_id', '', 'int');
$contact['contact_uid'] = $this->Contact_CleanVars($_POST, 'contact_uid', '', 'int');
- $contact['contact_name'] = $this->Contact_CleanVars($_POST, 'contact_name', '', 'string');
- $contact['contact_nameto'] = $this->Contact_CleanVars($_POST, 'contact_nameto', '', 'string');
- $contact['contact_subject'] = $this->Contact_CleanVars($_POST, 'contact_subject', '', 'string');
+ $contact['contact_name'] = $this->Contact_CleanVars($_POST, 'contact_name', '', 'text'); //mb changed from string to text
+ $contact['contact_nameto'] = $this->Contact_CleanVars($_POST, 'contact_nameto', '', 'text'); //mb changed from string to text
+ $contact['contact_subject'] = $this->Contact_CleanVars($_POST, 'contact_subject', '', 'text'); //mb changed from string to text
$contact['contact_mail'] = $this->Contact_CleanVars($_POST, 'contact_mail', '', 'mail');
$contact['contact_mailto'] = $this->Contact_CleanVars($_POST, 'contact_mailto', '', 'mail');
$contact['contact_url'] = $this->Contact_CleanVars($_POST, 'contact_url', '', 'url');
$contact['contact_create'] = time();
- $contact['contact_icq'] = $this->Contact_CleanVars($_POST, 'contact_icq', '', 'string');
- $contact['contact_company'] = $this->Contact_CleanVars($_POST, 'contact_company', '', 'string');
+ $contact['contact_icq'] = $this->Contact_CleanVars($_POST, 'contact_icq', '', 'text'); //mb changed from string to text
+ $contact['contact_company'] = $this->Contact_CleanVars($_POST, 'contact_company', '', 'text'); //mb changed from string to text
$contact['contact_location'] = $this->Contact_CleanVars($_POST, 'contact_location', '', 'text');
$contact['contact_phone'] = $this->Contact_CleanVars($_POST, 'contact_phone', '', 'int');
$contact['contact_department'] = $this->Contact_CleanVars($_POST, 'contact_department', _MD_CONTACT_DEFULTDEP, 'string');
@@ -268,8 +268,8 @@
$xoopsMailer->useMail();
$xoopsMailer->setToEmails($this->Contact_ToEmails($contact['contact_department']));
$xoopsMailer->setFromEmail($contact['contact_mail']);
- $xoopsMailer->setFromName($contact['contact_name']);
- $xoopsMailer->setSubject($contact['contact_subject']);
+ $xoopsMailer->setFromName(html_entity_decode($contact['contact_name'], ENT_QUOTES, 'UTF-8'));
+ $xoopsMailer->setSubject(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;
Modified: XoopsModules/contact/trunk/contact/header.php
===================================================================
--- XoopsModules/contact/trunk/contact/header.php 2013-10-08 02:33:07 UTC (rev 12163)
+++ XoopsModules/contact/trunk/contact/header.php 2013-10-08 11:14:45 UTC (rev 12164)
@@ -21,7 +21,7 @@
*/
include '../../mainfile.php';
-include XOOPS_ROOT_PATH."/modules/contact/class/contact.php";
-include_once XOOPS_ROOT_PATH."/class/xoopsformloader.php";
+include XOOPS_ROOT_PATH . "/modules/contact/class/contact.php";
+include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
-$contact_handler = & xoops_getModuleHandler ( 'contact', 'contact' );
+$contact_handler = & xoops_getModuleHandler('contact', 'contact');
Modified: XoopsModules/contact/trunk/contact/templates/contact_index.html
===================================================================
--- XoopsModules/contact/trunk/contact/templates/contact_index.html 2013-10-08 02:33:07 UTC (rev 12163)
+++ XoopsModules/contact/trunk/contact/templates/contact_index.html 2013-10-08 11:14:45 UTC (rev 12164)
@@ -1,5 +1,5 @@
<div class="contact">
- <div class="breadcrumb"><{$breadcrumb}></div>
- <div class="contact_info"><{$info}></div>
- <div class="contact_form"><{$form}></div>
-</div>
+ <div class="breadcrumb"><{$breadcrumb}></div>
+ <div class="contact_info"><{$info}></div>
+ <div class="contact_form"><{$form}></div>
+</div>
|
