|
From: <be...@us...> - 2012-12-23 00:59:23
|
Revision: 10494
http://sourceforge.net/p/xoops/svn/10494
Author: beckmi
Date: 2012-12-23 00:59:19 +0000 (Sun, 23 Dec 2012)
Log Message:
-----------
Updating to 1.80 Final (rewritten by Voltan to add DB)
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/admin/about.php
XoopsModules/contact/trunk/contact/admin/index.php
XoopsModules/contact/trunk/contact/admin/menu.php
XoopsModules/contact/trunk/contact/docs/changelog.txt
XoopsModules/contact/trunk/contact/docs/lang_diff.txt
XoopsModules/contact/trunk/contact/header.php
XoopsModules/contact/trunk/contact/index.php
XoopsModules/contact/trunk/contact/language/english/admin.php
XoopsModules/contact/trunk/contact/language/english/index.html
XoopsModules/contact/trunk/contact/language/english/main.php
XoopsModules/contact/trunk/contact/language/english/modinfo.php
XoopsModules/contact/trunk/contact/xoops_version.php
Added Paths:
-----------
XoopsModules/contact/trunk/contact/admin/contact.php
XoopsModules/contact/trunk/contact/admin/footer.php
XoopsModules/contact/trunk/contact/admin/header.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/css/
XoopsModules/contact/trunk/contact/css/admin.css
XoopsModules/contact/trunk/contact/css/index.html
XoopsModules/contact/trunk/contact/docs/ajax.html
XoopsModules/contact/trunk/contact/images/icons/
XoopsModules/contact/trunk/contact/images/icons/view.png
XoopsModules/contact/trunk/contact/include/
XoopsModules/contact/trunk/contact/include/functions.php
XoopsModules/contact/trunk/contact/include/functions_update.php
XoopsModules/contact/trunk/contact/include/index.html
XoopsModules/contact/trunk/contact/js/
XoopsModules/contact/trunk/contact/js/admin.js
XoopsModules/contact/trunk/contact/js/index.html
XoopsModules/contact/trunk/contact/readme.html
XoopsModules/contact/trunk/contact/sql/
XoopsModules/contact/trunk/contact/sql/index.html
XoopsModules/contact/trunk/contact/sql/mysql.sql
XoopsModules/contact/trunk/contact/templates/admin/
XoopsModules/contact/trunk/contact/templates/admin/contact_about.html
XoopsModules/contact/trunk/contact/templates/admin/contact_contact.html
XoopsModules/contact/trunk/contact/templates/admin/contact_index.html
XoopsModules/contact/trunk/contact/templates/admin/contact_tools.html
XoopsModules/contact/trunk/contact/templates/admin/index.html
XoopsModules/contact/trunk/contact/templates/contact_index.html
Removed Paths:
-------------
XoopsModules/contact/trunk/contact/admin/admin_footer.php
XoopsModules/contact/trunk/contact/admin/admin_header.php
XoopsModules/contact/trunk/contact/class/contactclass.php
XoopsModules/contact/trunk/contact/docs/readme.html
XoopsModules/contact/trunk/contact/getgfx.php
XoopsModules/contact/trunk/contact/images/code_bg.jpg
XoopsModules/contact/trunk/contact/images/no-spam.jpg
XoopsModules/contact/trunk/contact/language/french/
XoopsModules/contact/trunk/contact/templates/contact_contactusform.html
Modified: XoopsModules/contact/trunk/contact/admin/about.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/about.php 2012-12-23 00:54:40 UTC (rev 10493)
+++ XoopsModules/contact/trunk/contact/admin/about.php 2012-12-23 00:59:19 UTC (rev 10494)
@@ -1,28 +1,35 @@
-<?php
-/**
- * Contact module
- *
- * 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.
- *
- * @copyright The XOOPS Project (http://www.xoops.org)
- * @license GNU GPL (http://www.gnu.org/licenses/gpl-2.0.html/)
- * @package Contact
- * @since 2.5.0
- * @author Mage, Mamba
- * @version $Id $
- **/
-
-include_once dirname(__FILE__) . '/admin_header.php';
-
-xoops_cp_header();
-
-$aboutAdmin = new ModuleAdmin();
-echo $aboutAdmin->addNavigation('about.php');
-echo $aboutAdmin->renderabout('6KJ7RW5DR3VTJ', false);
-
-include 'admin_footer.php';
\ No newline at end of file
+<?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$
+ */
+
+// Call header
+require dirname(__FILE__) . '/header.php';
+// Display Admin header
+xoops_cp_header();
+
+$xoopsTpl->assign('navigation', $admin_class->addNavigation('about.php'));
+$xoopsTpl->assign('renderabout', $admin_class->renderabout('6KJ7RW5DR3VTJ', false));
+
+// Call template file
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_about.html');
+// Call footer
+require dirname(__FILE__) . '/footer.php';
+?>
\ No newline at end of file
Deleted: XoopsModules/contact/trunk/contact/admin/admin_footer.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/admin_footer.php 2012-12-23 00:54:40 UTC (rev 10493)
+++ XoopsModules/contact/trunk/contact/admin/admin_footer.php 2012-12-23 00:59:19 UTC (rev 10494)
@@ -1,28 +0,0 @@
-<?php
-
-/**
- * Contact module
- *
- * 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.
- *
- * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
- * @license http://www.fsf.org/copyleft/gpl.html GNU public license
- * @package Contact
- * @since 2.5.0
- * @author Mamba (www.xoops.org)
- * @version $Id $
-**/
-
-echo "<div class='adminfooter'>\n"
- ." <div style='text-align: center;'>\n"
- ." <a href='http://www.xoops.org' rel='external'><img src='{$pathIcon32}/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS'></a>\n"
- ." </div>\n"
- ." " . _AM_MODULEADMIN_ADMIN_FOOTER . "\n"
- ."</div>";
-
-xoops_cp_footer();
\ No newline at end of file
Deleted: XoopsModules/contact/trunk/contact/admin/admin_header.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/admin_header.php 2012-12-23 00:54:40 UTC (rev 10493)
+++ XoopsModules/contact/trunk/contact/admin/admin_header.php 2012-12-23 00:59:19 UTC (rev 10494)
@@ -1,50 +0,0 @@
-<?php
-// $Id: admin_header.php 8478 2011-12-13 09:12:46Z beckmi $
-// ------------------------------------------------------------------------ //
-// XOOPS - PHP Content Management System //
-// Copyright (c) 2000 XOOPS.org //
-// <http://www.xoops.org/> //
-// ------------------------------------------------------------------------ //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// 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. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-
-$path = dirname(dirname(dirname(dirname(__FILE__))));
-include_once $path . '/mainfile.php';
-include_once $path . '/include/cp_functions.php';
-require_once $path . '/include/cp_header.php';
-
-global $xoopsModule;
-
-$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
-
-// Load language files
-xoops_loadLanguage('admin', $thisModuleDir);
-xoops_loadLanguage('modinfo', $thisModuleDir);
-xoops_loadLanguage('main', $thisModuleDir);
-
-$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
-$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
-$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-
-if ( file_exists($GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php'))){
- include_once $GLOBALS['xoops']->path($pathModuleAdmin.'/moduleadmin.php');
- }else{
- redirect_header("../../../admin.php", 5, _AM_CONTACT_MODULEADMIN_MISSING, false);
- }
\ No newline at end of file
Added: XoopsModules/contact/trunk/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/contact.php (rev 0)
+++ XoopsModules/contact/trunk/contact/admin/contact.php 2012-12-23 00:59:19 UTC (rev 10494)
@@ -0,0 +1,208 @@
+<?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$
+ */
+
+// Call header
+require dirname(__FILE__) . '/header.php';
+// Display Admin header
+xoops_cp_header();
+// Define default value
+$op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string');
+$contact_id = $contact_handler->Contact_CleanVars($_REQUEST, 'id', '0', 'int');
+
+// Define scripts
+$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
+$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
+$xoTheme->addScript(XOOPS_URL . '/modules/contact/js/admin.js');
+// Add module stylesheet
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/contact/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
+
+switch ($op)
+{
+ case 'list':
+ $contact = array();
+ $contact['perpage'] = xoops_getModuleOption('admin_perpage','contact');
+ $contact['order'] = 'DESC';
+ $contact['sort'] = 'contact_id';
+
+ // get limited information
+ if (isset($_REQUEST['limit'])) {
+ $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int');
+ } else {
+ $contact['limit'] = $contact['perpage'];
+ }
+
+ // get start information
+ if (isset($_REQUEST['start'])) {
+ $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int');
+ } else {
+ $contact['start'] = 0;
+ }
+
+ $contact_numrows = $contact_handler->Contact_GetCount('contact_cid');
+ $contacts = $contact_handler->Contact_GetAdminList($contact , 'contact_cid');
+
+ if ($contact_numrows > $contact['limit']) {
+ $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
+ $contact_pagenav = $contact_pagenav->renderNav(4);
+ } else {
+ $contact_pagenav = '';
+ }
+
+ $xoopsTpl->assign('contacts', $contacts);
+ $xoopsTpl->assign('contact_pagenav', $contact_pagenav);
+ $level = 'list';
+ break;
+
+ case 'reply':
+ if ($contact_id > 0) {
+ $obj = $contact_handler->get($contact_id);
+ if($obj->getVar('contact_cid') != 0) {
+ redirect_header ( 'contact.php', 3, _AM_CONTACT_CANTREPLY);
+ }
+ $form = $obj->Contact_ReplyForm();
+ $xoopsTpl->assign('replyform', $form->render());
+ $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
+ } else {
+ redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
+ }
+ $level = 'reply';
+ break;
+
+ case 'doreply':
+
+ // check email
+ if ( !$contact_handler->Contact_CleanVars($_POST, 'contact_mailto', '', 'mail') ) {
+ redirect_header ( "contact.php", 3, _MD_CONTACT_MES_NOVALIDEMAIL );
+ exit();
+ }
+
+ // Info Processing
+ $contact = $contact_handler->Contact_InfoProcessing($_POST);
+
+ // insert in DB
+ if($saveinfo = true) {
+ $obj = $contact_handler->create();
+ $obj->setVars ( $contact );
+
+ if(!$contact_handler->insert ( $obj )) {
+ redirect_header ( "contact.php", 3, '4' );
+ exit();
+ }
+
+ $contact_handler->Contact_AddReply( $contact['contact_cid'] );
+
+ }
+
+ // send mail can seet message
+ if($sendmail = true) {
+ $message = $contact_handler->Contact_ReplyMail($contact);
+ } else if ($saveinfo = true) {
+ $message = _MD_CONTACT_MES_SAVEINDB;
+ } else {
+ $message = _MD_CONTACT_MES_SENDERROR;
+ }
+
+ redirect_header ( "contact.php", 3, $message );
+
+ $level = 'doreply';
+ break;
+
+ case 'view':
+
+ $obj = $contact_handler->get ( $contact_id );
+
+ if(!$obj) {
+ redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
+ exit ();
+ }
+
+ $contact = array ();
+ $contact = $obj->toArray ();
+ $contact['contact_id'] = $obj->getVar('contact_id');
+ $contact['contact_uid'] = $obj->getVar('contact_uid');
+ $contact['contact_name'] = $obj->getVar('contact_name');
+ $contact['contact_owner'] = XoopsUser::getUnameFromId ( $obj->getVar('contact_uid') );
+ $contact['contact_subject'] = $obj->getVar('contact_subject');
+ $contact['contact_mail'] = $obj->getVar('contact_mail');
+ $contact['contact_url'] = $obj->getVar('contact_url');
+ $contact['contact_create'] = formatTimestamp ( $obj->getVar('contact_create'), _MEDIUMDATESTRING );
+ $contact['contact_icq'] = $obj->getVar('contact_icq');
+ $contact['contact_company'] = $obj->getVar('contact_company');
+ $contact['contact_location'] = $obj->getVar('contact_location');
+ $contact['contact_phone'] = $obj->getVar('contact_phone');
+ $contact['contact_department'] = $obj->getVar('contact_department');
+ $contact['contact_ip'] = $obj->getVar('contact_ip');
+ $contact['contact_message'] = $obj->getVar('contact_message');
+ $contact['contact_address'] = $obj->getVar('contact_address');
+
+ $xoopsTpl->assign('contact', $contact);
+ $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
+
+ $level = 'view';
+ break;
+
+ case 'delete':
+
+ if ($contact_id > 0) {
+ // Prompt message
+ xoops_confirm(array("id" => $contact_id), 'contact.php?op=dodelete', _AM_CONTACT_MSG_DELETE);
+ } else {
+ redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
+ }
+
+ $level = 'delete';
+ break;
+
+ case 'dodelete':
+
+ if (!$contact_id > 0) {
+ redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
+ xoops_cp_footer ();
+ exit ();
+ }
+
+ $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 );
+ xoops_cp_footer ();
+ exit ();
+ }
+
+ redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETED );
+ xoops_cp_footer ();
+ exit ();
+ break;
+}
+
+$xoopsTpl->assign('navigation', $admin_class->addNavigation('contact.php'));
+$xoopsTpl->assign('level', $level);
+
+// Call template file
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html');
+// Call footer
+require dirname(__FILE__) . '/footer.php';
+?>
\ No newline at end of file
Added: XoopsModules/contact/trunk/contact/admin/footer.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/footer.php (rev 0)
+++ XoopsModules/contact/trunk/contact/admin/footer.php 2012-12-23 00:59:19 UTC (rev 10494)
@@ -0,0 +1,24 @@
+<?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$
+ */
+
+xoops_cp_footer();
+?>
\ No newline at end of file
Added: XoopsModules/contact/trunk/contact/admin/header.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/header.php (rev 0)
+++ XoopsModules/contact/trunk/contact/admin/header.php 2012-12-23 00:59:19 UTC (rev 10494)
@@ -0,0 +1,53 @@
+<?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$
+ */
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+
+include_once $path . '/mainfile.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
+include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+global $xoopsModule;
+
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = '../'.$xoopsModule->getInfo('icons16');
+$pathIcon32 = '../'.$xoopsModule->getInfo('icons32');
+$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
+
+// Contact Handler
+$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);
+}
+
+$admin_class = new ModuleAdmin();
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/admin/index.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/index.php 2012-12-23 00:54:40 UTC (rev 10493)
+++ XoopsModules/contact/trunk/contact/admin/index.php 2012-12-23 00:59:19 UTC (rev 10494)
@@ -1,38 +1,38 @@
-<?php
-// $Id: index.php 8478 2011-12-13 09:12:46Z beckmi $
-// ------------------------------------------------------------------------ //
-// XOOPS - PHP Content Management System //
-// Copyright (c) 2000 XOOPS.org //
-// <http://www.xoops.org/> //
-// ------------------------------------------------------------------------ //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// 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. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
-
-require_once dirname(dirname(dirname(dirname(__FILE__)))) . '/include/cp_header.php';
-include_once dirname(__FILE__) . '/admin_header.php';
-
-xoops_cp_header();
-
- $indexAdmin = new ModuleAdmin();
-
- echo $indexAdmin->addNavigation('index.php');
- echo $indexAdmin->renderIndex();
-
-include "admin_footer.php";
\ No newline at end of file
+<?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$
+ */
+
+// Call header
+require dirname(__FILE__) . '/header.php';
+// Display Admin header
+xoops_cp_header();
+
+// Display Admin menu class
+$admin_class->addInfoBox(_AM_CONTACT_INDEX_ADMENU1);
+$admin_class->addInfoBoxLine(_AM_CONTACT_INDEX_ADMENU1, _AM_CONTACT_INDEX_TOTAL, $contact_handler->Contact_GetCount('contact_cid'));
+$xoopsTpl->assign('navigation', $admin_class->addNavigation('index.php'));
+$xoopsTpl->assign('renderindex', $admin_class->renderIndex());
+
+// Call template file
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_index.html');
+// Call footer
+require dirname(__FILE__) . '/footer.php';
+?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/admin/menu.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/menu.php 2012-12-23 00:54:40 UTC (rev 10493)
+++ XoopsModules/contact/trunk/contact/admin/menu.php 2012-12-23 00:59:19 UTC (rev 10494)
@@ -1,29 +1,25 @@
<?php
-// ------------------------------------------------------------------------ //
-// XOOPS - PHP Content Management System //
-// Copyright (c) 2000 XOOPS.org //
-// <http://www.xoops.org/> //
-// ------------------------------------------------------------------------- //
-// This program is free software; you can redistribute it and/or modify //
-// it under the terms of the GNU General Public License as published by //
-// the Free Software Foundation; either version 2 of the License, or //
-// (at your option) any later version. //
-// //
-// 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. See the //
-// GNU General Public License for more details. //
-// //
-// You should have received a copy of the GNU General Public License //
-// along with this program; if not, write to the Free Software //
-// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA //
-// ------------------------------------------------------------------------ //
+/*
+ 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__)));
@@ -36,13 +32,24 @@
$adminmenu = array();
$i = 1;
-$adminmenu[$i]["title"] = _MI_CONTACT_MENU_00;
+$adminmenu[$i]["title"] = _MI_CONTACT_MENU_HOME;
$adminmenu[$i]["link"] = "admin/index.php";
-$adminmenu[$i]["desc"] = _MI_CONTACT_ADMIN_HOME_DESC;
+$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_HOME_DESC;
$adminmenu[$i]["icon"] = $pathIcon32.'/home.png';
$i++;
-$adminmenu[$i]["title"] = _MI_CONTACT_ADMIN_ABOUT;
+$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_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_ADMIN_ABOUT_DESC;
+$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_ABOUT_DESC;
$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
+?>
\ No newline at end of file
Added: XoopsModules/contact/trunk/contact/admin/tools.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/tools.php (rev 0)
+++ XoopsModules/contact/trunk/contact/admin/tools.php 2012-12-23 00:...
[truncated message content] |
|
From: <vo...@us...> - 2013-02-24 07:07:49
|
Revision: 11088
http://sourceforge.net/p/xoops/svn/11088
Author: voltan1
Date: 2013-02-24 07:07:43 +0000 (Sun, 24 Feb 2013)
Log Message:
-----------
Update to new version
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/admin/contact.php
XoopsModules/contact/trunk/contact/admin/menu.php
XoopsModules/contact/trunk/contact/class/contact.php
XoopsModules/contact/trunk/contact/docs/changelog.txt
XoopsModules/contact/trunk/contact/docs/install.txt
XoopsModules/contact/trunk/contact/docs/readme.txt
XoopsModules/contact/trunk/contact/include/functions_update.php
XoopsModules/contact/trunk/contact/language/english/admin.php
XoopsModules/contact/trunk/contact/language/english/modinfo.php
XoopsModules/contact/trunk/contact/sql/mysql.sql
XoopsModules/contact/trunk/contact/templates/admin/contact_contact.html
XoopsModules/contact/trunk/contact/xoops_version.php
Added Paths:
-----------
XoopsModules/contact/trunk/contact/admin/log.php
XoopsModules/contact/trunk/contact/docs/readme.html
XoopsModules/contact/trunk/contact/language/persian/
XoopsModules/contact/trunk/contact/language/persian/admin.php
XoopsModules/contact/trunk/contact/language/persian/index.html
XoopsModules/contact/trunk/contact/language/persian/main.php
XoopsModules/contact/trunk/contact/language/persian/modinfo.php
XoopsModules/contact/trunk/contact/templates/admin/contact_logs.html
Removed Paths:
-------------
XoopsModules/contact/trunk/contact/readme.html
Modified: XoopsModules/contact/trunk/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/contact.php 2013-02-24 06:58:04 UTC (rev 11087)
+++ XoopsModules/contact/trunk/contact/admin/contact.php 2013-02-24 07:07:43 UTC (rev 11088)
@@ -192,7 +192,7 @@
exit ();
}
- redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETED );
+ redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETEDO );
xoops_cp_footer ();
exit ();
break;
Added: XoopsModules/contact/trunk/contact/admin/log.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/log.php (rev 0)
+++ XoopsModules/contact/trunk/contact/admin/log.php 2013-02-24 07:07:43 UTC (rev 11088)
@@ -0,0 +1,57 @@
+<?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$
+ */
+
+// Call header
+require dirname(__FILE__) . '/header.php';
+// Display Admin header
+xoops_cp_header();
+// Define default value
+$op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'form', 'string');
+
+switch ($op)
+{
+ case 'form':
+ // prune manager
+ $form = new XoopsThemeForm(_AM_CONTACT_LOGS_FORM, 'logs', 'log.php', 'post');
+ $column = new XoopsFormSelect(_AM_CONTACT_LOGS_COLUME, 'column','contact_phone');
+ $column->addOption("contact_phone", _AM_CONTACT_LOGS_COLUME_PHONE);
+ $column->addOption("contact_url", _AM_CONTACT_LOGS_COLUME_URL);
+ $column->addOption("contact_mail", _AM_CONTACT_LOGS_COLUME_MAIL);
+ $form->addElement($column);
+ $form->addElement(new XoopsFormHidden('op', 'getlog'));
+ $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
+ $xoopsTpl->assign('form', $form->render());
+ break;
+
+ case 'getlog':
+ $column = $contact_handler->Contact_CleanVars($_REQUEST, 'column', '', 'string');
+ $log = $contact_handler->Contact_Logs($column);
+ $xoopsTpl->assign('logs', $log);
+ break;
+}
+
+$xoopsTpl->assign('navigation', $admin_class->addNavigation('log.php'));
+// Call template file
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_logs.html');
+// Call footer
+require dirname(__FILE__) . '/footer.php';
+?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/admin/menu.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/menu.php 2013-02-24 06:58:04 UTC (rev 11087)
+++ XoopsModules/contact/trunk/contact/admin/menu.php 2013-02-24 07:07:43 UTC (rev 11088)
@@ -42,6 +42,11 @@
$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;
Modified: XoopsModules/contact/trunk/contact/class/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/class/contact.php 2013-02-24 06:58:04 UTC (rev 11087)
+++ XoopsModules/contact/trunk/contact/class/contact.php 2013-02-24 07:07:43 UTC (rev 11088)
@@ -21,374 +21,453 @@
*/
if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
+ die("XOOPS root path not defined");
}
class contact extends XoopsObject
{
-
- function __construct()
- {
- $this->XoopsObject();
- $this->initVar("contact_id", XOBJ_DTYPE_INT, null, false, 11);
- $this->initVar("contact_uid", XOBJ_DTYPE_INT, null, false, 11);
- $this->initVar("contact_cid", XOBJ_DTYPE_INT, null, false, 11);
- $this->initVar("contact_name", XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_subject", XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_mail", XOBJ_DTYPE_EMAIL, null, false);
- $this->initVar("contact_url", XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_create", XOBJ_DTYPE_INT, null, false);
- $this->initVar("contact_icq", XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_company", XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_location", XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_phone", XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_department", XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_ip", XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_message", XOBJ_DTYPE_TXTAREA, null, false);
- $this->initVar("contact_address", XOBJ_DTYPE_TXTAREA, null, false);
- $this->initVar("contact_reply", XOBJ_DTYPE_INT, null, false, 1);
-
- $this->db = $GLOBALS ['xoopsDB'];
- $this->table = $this->db->prefix('contact');
- }
-
- function Contact_ContactForm($department)
- {
-
- global $xoopsConfig, $xoopsOption, $xoopsUser;
-
- if ($this->isNew()) {
- if (!empty($xoopsUser)) {
- $contact_uid = $xoopsUser->getVar('uid');
- $contact_name = $xoopsUser->getVar('uname');
- $contact_mail = $xoopsUser->getVar('email');
- $contact_url = $xoopsUser->getVar('url');
- $contact_icq = $xoopsUser->getVar('user_icq');
- $contact_location = $xoopsUser->getVar('user_from');
-
- } else {
- $contact_uid = 0;
- $contact_name = '';
- $contact_mail = '';
- $contact_url = '';
- $contact_icq = '';
- $contact_location = '';
- }
- } else {
- $contact_uid = $this->getVar('contact_uid');
- $contact_name = $this->getVar('contact_name');
- $contact_mail = $this->getVar('contact_mail');
- $contact_url = $this->getVar('contact_url');
- $contact_icq = $this->getVar('contact_icq');
- $contact_location = $this->getVar('contact_location');
+
+ public function __construct()
+ {
+ $this->XoopsObject();
+ $this->initVar("contact_id",XOBJ_DTYPE_INT,null,false,11);
+ $this->initVar("contact_uid",XOBJ_DTYPE_INT,null,false,11);
+ $this->initVar("contact_cid",XOBJ_DTYPE_INT,null,false,11);
+ $this->initVar("contact_name",XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_subject",XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_mail",XOBJ_DTYPE_EMAIL, null, false);
+ $this->initVar("contact_url",XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_create", XOBJ_DTYPE_INT, null, false);
+ $this->initVar("contact_icq",XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_company",XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_location",XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_phone",XOBJ_DTYPE_TXTBOX,null,false);
+ $this->initVar("contact_department",XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_ip",XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_message",XOBJ_DTYPE_TXTAREA, null, false);
+ $this->initVar("contact_address",XOBJ_DTYPE_TXTAREA, null, false);
+ $this->initVar("contact_reply",XOBJ_DTYPE_INT,null,false,1);
+ $this->initVar("contact_platform",XOBJ_DTYPE_ENUM,null,false,'','',array('Android','Ios','Web'));
+ $this->initVar("contact_type",XOBJ_DTYPE_ENUM,null,false,'','',array('Contact','Phone','Mail'));
+
+ $this->db = $GLOBALS ['xoopsDB'];
+ $this->table = $this->db->prefix ( 'contact' );
+ }
+
+ public function Contact_ContactForm($department)
+ {
+ global $xoopsConfig, $xoopsOption, $xoopsUser;
+ if($this->isNew()) {
+ if(!empty($xoopsUser)) {
+ $contact_uid = $xoopsUser->getVar('uid');
+ $contact_name = $xoopsUser->getVar('uname');
+ $contact_mail = $xoopsUser->getVar('email');
+ $contact_url = $xoopsUser->getVar('url');
+ $contact_icq = $xoopsUser->getVar('user_icq');
+ $contact_location = $xoopsUser->getVar('user_from');
+
+ } else {
+ $contact_uid = 0;
+ $contact_name = '';
+ $contact_mail = '';
+ $contact_url = '';
+ $contact_icq = '';
+ $contact_location = '';
+ }
+ } else {
+ $contact_uid = $this->getVar ( 'contact_uid');
+ $contact_name = $this->getVar ( 'contact_name');
+ $contact_mail = $this->getVar ( 'contact_mail');
+ $contact_url = $this->getVar ( 'contact_url');
+ $contact_icq = $this->getVar ( 'contact_icq');
+ $contact_location = $this->getVar ( 'contact_location');
+ }
+
+ $form = new XoopsThemeForm(_MD_CONTACT_FORM, 'save', 'index.php', 'post', true);
+ $form->setExtra ( 'enctype="multipart/form-data"' );
+ $form->addElement ( new XoopsFormHidden ( 'op', 'save' ) );
+ $form->addElement ( new XoopsFormHidden ( 'contact_id', $this->getVar ( 'contact_id', 'e' ) ) );
+ $form->addElement ( new XoopsFormHidden ( 'contact_uid', $contact_uid ) );
+ $form->addElement ( new XoopsFormText ( _MD_CONTACT_NAME, 'contact_name', 50, 255, $contact_name), true );
+ $form->addElement ( new XoopsFormText ( _MD_CONTACT_MAIL, 'contact_mail', 50, 255, $contact_mail), true );
+
+ if(xoops_getModuleOption('form_url','contact')) {
+ $form->addElement ( new XoopsFormText ( _MD_CONTACT_URL, 'contact_url', 50, 255, $contact_url), false );
+ }
+ if(xoops_getModuleOption('form_icq','contact')) {
+ $form->addElement ( new XoopsFormText ( _MD_CONTACT_ICQ, 'contact_icq', 50, 255, $contact_icq), false );
+ }
+ if(xoops_getModuleOption('form_company','contact')) {
+ $form->addElement ( new XoopsFormText ( _MD_CONTACT_COMPANY, 'contact_company', 50, 255, $this->getVar ( 'contact_company')), false );
+ }
+ if(xoops_getModuleOption('form_location','contact')) {
+ $form->addElement ( new XoopsFormText ( _MD_CONTACT_LOCATION, 'contact_location', 50, 255, $contact_location), false );
+ }
+ if(xoops_getModuleOption('form_phone','contact')) {
+ $form->addElement ( new XoopsFormText ( _MD_CONTACT_PHONE, 'contact_phone', 50, 255, $this->getVar ( 'contact_phone')), false );
+ }
+ if(xoops_getModuleOption('form_address','contact')) {
+ $form->addElement ( new XoopsFormTextArea ( _MD_CONTACT_ADDRESS, 'contact_address', $this->getVar ( 'contact_address', 'e' ), 3, 60 ), false );
+ }
+ if(xoops_getModuleOption('form_dept','contact')) {
+ // show a drop down with the correct departments listed
+ $departmentlist = new XoopsFormSelect( _MD_CONTACT_DEPARTMENT, 'contact_department' );
+ $departments = xoops_getModuleOption('contact_dept','contact');
+ foreach( $departments as $val ) {
+ $valexplode = explode( ',', $val );
+ $departmentlist->addOption($valexplode[0]);
}
-
- $form = new XoopsThemeForm(_MD_CONTACT_FORM, 'save', 'index.php', 'post', true);
- $form->setExtra('enctype="multipart/form-data"');
- $form->addElement(new XoopsFormHidden ('op', 'save'));
- $form->addElement(new XoopsFormHidden ('contact_id', $this->getVar('contact_id', 'e')));
- $form->addElement(new XoopsFormHidden ('contact_uid', $contact_uid));
- $form->addElement(new XoopsFormText (_MD_CONTACT_NAME, 'contact_name', 50, 255, $contact_name), true);
- $form->addElement(new XoopsFormText (_MD_CONTACT_MAIL, 'contact_mail', 50, 255, $contact_mail), true);
-
- if (xoops_getModuleOption('form_url', 'contact')) {
- $form->addElement(new XoopsFormText (_MD_CONTACT_URL, 'contact_url', 50, 255, $contact_url), false);
- }
- if (xoops_getModuleOption('form_icq', 'contact')) {
- $form->addElement(new XoopsFormText (_MD_CONTACT_ICQ, 'contact_icq', 50, 255, $contact_icq), false);
- }
- if (xoops_getModuleOption('form_company', 'contact')) {
- $form->addElement(new XoopsFormText (_MD_CONTACT_COMPANY, 'contact_company', 50, 255, $this->getVar('contact_company')), false);
- }
- if (xoops_getModuleOption('form_location', 'contact')) {
- $form->addElement(new XoopsFormText (_MD_CONTACT_LOCATION, 'contact_location', 50, 255, $contact_location), false);
- }
- if (xoops_getModuleOption('form_phone', 'contact')) {
- $form->addElement(new XoopsFormText (_MD_CONTACT_PHONE, 'contact_phone', 50, 255, $this->getVar('contact_phone')), false);
- }
- if (xoops_getModuleOption('form_address', 'contact')) {
- $form->addElement(new XoopsFormTextArea (_MD_CONTACT_ADDRESS, 'contact_address', $this->getVar('contact_address', 'e'), 3, 60), false);
- }
- if (xoops_getModuleOption('form_dept', 'contact')) {
- // show a drop down with the correct departments listed
- $departmentlist = new XoopsFormSelect(_MD_CONTACT_DEPARTMENT, 'contact_department');
- $departments = xoops_getModuleOption('contact_dept', 'contact');
- foreach ($departments as $val) {
- $valexplode = explode(',', $val);
- $departmentlist->addOption($valexplode[0]);
- }
- $form->addElement($departmentlist);
- }
-
- $form->addElement(new XoopsFormText (_MD_CONTACT_SUBJECT, 'contact_subject', 50, 255, $this->getVar('contact_subject')), true);
- $form->addElement(new XoopsFormTextArea (_MD_CONTACT_MESSAGE, 'contact_message', $this->getVar('contact_message', 'e'), 5, 60), true);
-
- xoops_load('XoopsFormCaptcha');
- $form->addElement(new XoopsFormCaptcha(), true);
-
- $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
- return $form;
- }
-
- function Contact_ReplyForm()
- {
- 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 XoopsFormLabel(_AM_CONTACT_FROM, '', ''));
- $form->addElement(new XoopsFormText (_AM_CONTACT_NAMEFROM, 'contact_name', 50, 255, XoopsUser::getUnameFromId($this->getVar('contact_uid'))), true);
- $form->addElement(new XoopsFormText (_AM_CONTACT_MAILFROM, 'contact_mail', 50, 255, $xoopsConfig['adminmail']), 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 XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
- return $form;
- }
-
- /**
- * Returns an array representation of the object
- *
- * @return array
- **/
- function toArray()
- {
- $ret = array();
- $vars = $this->getVars();
- foreach (array_keys($vars) as $i) {
- $ret [$i] = $this->getVar($i);
- }
- return $ret;
- }
+ $form->addElement( $departmentlist );
+ }
+
+ $form->addElement ( new XoopsFormText ( _MD_CONTACT_SUBJECT, 'contact_subject', 50, 255, $this->getVar ( 'contact_subject' )), true );
+ $form->addElement(new XoopsFormTextArea ( _MD_CONTACT_MESSAGE, 'contact_message', $this->getVar ( 'contact_message', 'e' ), 5, 60 ), true );
+
+ xoops_load('XoopsFormCaptcha');
+ $form->addElement(new XoopsFormCaptcha(), true);
+
+ $form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+ return $form;
+ }
+
+ public function Contact_ReplyForm()
+ {
+ 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 XoopsFormLabel( _AM_CONTACT_FROM, '',''));
+ $form->addElement ( new XoopsFormText ( _AM_CONTACT_NAMEFROM, 'contact_name', 50, 255, XoopsUser::getUnameFromId ( $this->getVar ( 'contact_uid' ) )), true );
+ $form->addElement ( new XoopsFormText ( _AM_CONTACT_MAILFROM, 'contact_mail', 50, 255, $xoopsConfig['adminmail']), 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 XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+ return $form;
+ }
+
+ /**
+ * Returns an array representation of the object
+ *
+ * @return array
+ **/
+ public function toArray()
+ {
+ $ret = array ();
+ $vars = $this->getVars ();
+ foreach ( array_keys ( $vars ) as $i ) {
+ $ret [$i] = $this->getVar ( $i );
+ }
+ return $ret;
+ }
}
class ContactContactHandler extends XoopsPersistableObjectHandler
{
- function __construct(&$db)
- {
- parent::__construct($db, "contact", 'contact', 'contact_id', 'contact_mail');
- }
+ public function __construct(&$db)
+ {
+ parent::__construct($db, "contact", 'contact', 'contact_id', 'contact_mail');
+ }
+
+ /**
+ * Get variables passed by GET or POST method
+ *
+ */
+ public function Contact_CleanVars(&$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->Contact_Platform($global[$key]) : $this->Contact_Platform($default);
+ break;
+ case 'type':
+ $ret = (isset($global[$key])) ? $this->Contact_Type($global[$key]) : $this->Contact_Type($default);
+ break;
+ case 'int': default:
+ $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_SANITIZE_NUMBER_INT) : $default;
+ break;
+
+ }
+ if ($ret === false) {
+ return $default;
+ }
+ return $ret;
+ }
+
+ public function Contact_InfoProcessing($global)
+ {
+ $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_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_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');
+ $contact['contact_ip'] = getenv ( "REMOTE_ADDR" );
+ $contact['contact_message'] = $this->Contact_CleanVars($_POST, 'contact_message', '', 'text');
+ $contact['contact_address'] = $this->Contact_CleanVars($_POST, 'contact_address', '', 'text');
+ $contact['contact_platform'] = $this->Contact_CleanVars($_POST, 'contact_platform', 'Web', 'platform');
+ $contact['contact_type'] = $this->Contact_CleanVars($_POST, 'contact_type', 'Contact', 'type');
+ return $contact;
+ }
+
+ public function Contact_SendMail($contact)
+ {
+ $xoopsMailer = xoops_getMailer();
+ $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->setBody($contact['contact_message']);
+ if($xoopsMailer->send()) {
+ $message = _MD_CONTACT_MES_SEND;
+ } else {
+ $message = $xoopsMailer->getErrors();
+ }
+ return $message;
+ }
+
+ public function Contact_ReplyMail($contact)
+ {
+ $xoopsMailer = xoops_getMailer();
+ $xoopsMailer->useMail();
+ $xoopsMailer->setToEmails($contact['contact_mailto']);
+ $xoopsMailer->setFromEmail($contact['contact_mail']);
+ $xoopsMailer->setFromName($contact['contact_name']);
+ $xoopsMailer->setSubject($contact['contact_subject']);
+ $xoopsMailer->setBody($contact['contact_message']);
+ if($xoopsMailer->send()) {
+ $message = _MD_CONTACT_MES_SEND;
+ } else {
+ $message = $xoopsMailer->getErrors();
+ }
+ return $message;
+ }
- /**
- * Get variables passed by GET or POST method
- *
- */
- function Contact_CleanVars(&$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 'int':
- default:
- $ret = (isset($global[$key])) ? filter_var($global[$key], FILTER_SANITIZE_NUMBER_INT) : $default;
- break;
- }
- if ($ret === false) {
- return $default;
- }
- return $ret;
- }
-
- function Contact_InfoProcessing($global)
- {
- $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_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_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');
- $contact['contact_ip'] = getenv("REMOTE_ADDR");
- $contact['contact_message'] = $this->Contact_CleanVars($_POST, 'contact_message', '', 'text');
- $contact['contact_address'] = $this->Contact_CleanVars($_POST, 'contact_address', '', 'text');
- return $contact;
- }
-
- function Contact_SendMail($contact)
- {
- $xoopsMailer = xoops_getMailer();
- $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->setBody($contact['contact_message']);
- if ($xoopsMailer->send()) {
- $message = _MD_CONTACT_MES_SEND;
- } else {
- $message = $xoopsMailer->getErrors();
- }
- return $message;
...
[truncated message content] |
|
From: <ce...@us...> - 2013-10-07 13:07:17
|
Revision: 12155
http://sourceforge.net/p/xoops/svn/12155
Author: cesag
Date: 2013-10-07 13:07:14 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
Language corrections, typos (cesag)
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/admin/contact.php
XoopsModules/contact/trunk/contact/language/english/main.php
XoopsModules/contact/trunk/contact/language/english/modinfo.php
Modified: XoopsModules/contact/trunk/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/contact.php 2013-10-06 23:36:44 UTC (rev 12154)
+++ XoopsModules/contact/trunk/contact/admin/contact.php 2013-10-07 13:07:14 UTC (rev 12155)
@@ -192,7 +192,7 @@
exit ();
}
- redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETEDO );
+ redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETED );
xoops_cp_footer ();
exit ();
break;
Modified: XoopsModules/contact/trunk/contact/language/english/main.php
===================================================================
--- XoopsModules/contact/trunk/contact/language/english/main.php 2013-10-06 23:36:44 UTC (rev 12154)
+++ XoopsModules/contact/trunk/contact/language/english/main.php 2013-10-07 13:07:14 UTC (rev 12155)
@@ -11,9 +11,9 @@
define("_MD_CONTACT_SUBJECT","Subject");
define("_MD_CONTACT_MESSAGE","Comment");
define("_MD_CONTACT_DEPARTMENT","Department");
-define("_MD_CONTACT_DEFULTDEP","Contact Us");
+define("_MD_CONTACT_DEFULTDEP","Contact us");
-define("_MD_CONTACT_MES_SEND","Thank you for Contacting 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");
Modified: XoopsModules/contact/trunk/contact/language/english/modinfo.php
===================================================================
--- XoopsModules/contact/trunk/contact/language/english/modinfo.php 2013-10-06 23:36:44 UTC (rev 12154)
+++ XoopsModules/contact/trunk/contact/language/english/modinfo.php 2013-10-07 13:07:14 UTC (rev 12155)
@@ -3,14 +3,14 @@
// Module Info
// The name of this module
-define("_MI_CONTACT_NAME","Contact Us");
-define("_MI_CONTACT_DESC","Contact module with email and DB storage");
+define("_MI_CONTACT_NAME","Contact us");
+define("_MI_CONTACT_DESC","Contact module with email and database storage");
// Admin menu
define('_MI_CONTACT_MENU_HOME',"Home");
-define("_MI_CONTACT_MENU_HOME_DESC","Go back to Home");
+define("_MI_CONTACT_MENU_HOME_DESC","Go back to homepage");
define('_MI_CONTACT_MENU_CONTACT',"Messages");
-define("_MI_CONTACT_MENU_CONTACT_DESC","List of Messages");
+define("_MI_CONTACT_MENU_CONTACT_DESC","List of messages");
define('_MI_CONTACT_MENU_TOOLS',"Purge");
define("_MI_CONTACT_MENU_TOOLS_DESC","Purge Tools");
define('_MI_CONTACT_MENU_LOGS',"Logs");
|
|
From: <ce...@us...> - 2013-10-07 13:58:17
|
Revision: 12157
http://sourceforge.net/p/xoops/svn/12157
Author: cesag
Date: 2013-10-07 13:58:13 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
Replacing colume with column (cesag)
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/admin/log.php
XoopsModules/contact/trunk/contact/language/english/admin.php
Modified: XoopsModules/contact/trunk/contact/admin/log.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/log.php 2013-10-07 13:16:45 UTC (rev 12156)
+++ XoopsModules/contact/trunk/contact/admin/log.php 2013-10-07 13:58:13 UTC (rev 12157)
@@ -32,10 +32,10 @@
case 'form':
// prune manager
$form = new XoopsThemeForm(_AM_CONTACT_LOGS_FORM, 'logs', 'log.php', 'post');
- $column = new XoopsFormSelect(_AM_CONTACT_LOGS_COLUME, 'column','contact_phone');
- $column->addOption("contact_phone", _AM_CONTACT_LOGS_COLUME_PHONE);
- $column->addOption("contact_url", _AM_CONTACT_LOGS_COLUME_URL);
- $column->addOption("contact_mail", _AM_CONTACT_LOGS_COLUME_MAIL);
+ $column = new XoopsFormSelect(_AM_CONTACT_LOGS_COLUMN, 'column','contact_phone');
+ $column->addOption("contact_phone", _AM_CONTACT_LOGS_COLUMN_PHONE);
+ $column->addOption("contact_url", _AM_CONTACT_LOGS_COLUMN_URL);
+ $column->addOption("contact_mail", _AM_CONTACT_LOGS_COLUMN_MAIL);
$form->addElement($column);
$form->addElement(new XoopsFormHidden('op', 'getlog'));
$form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
Modified: XoopsModules/contact/trunk/contact/language/english/admin.php
===================================================================
--- XoopsModules/contact/trunk/contact/language/english/admin.php 2013-10-07 13:16:45 UTC (rev 12156)
+++ XoopsModules/contact/trunk/contact/language/english/admin.php 2013-10-07 13:58:13 UTC (rev 12157)
@@ -40,8 +40,8 @@
define('_AM_CONTACT_TOOLS_PRUNE_BEFORE', "Delete messages that were published before");
define('_AM_CONTACT_TOOLS_PRUNE_REPLYONLY', "Delete only messages with replies");
define('_AM_CONTACT_LOGS_FORM', "Log form");
-define('_AM_CONTACT_LOGS_COLUME', "Select Colume");
-define('_AM_CONTACT_LOGS_COLUME_PHONE', "Phone");
-define('_AM_CONTACT_LOGS_COLUME_URL', "URL");
-define('_AM_CONTACT_LOGS_COLUME_MAIL', "Email");
+define('_AM_CONTACT_LOGS_COLUMN', "Select the required column");
+define('_AM_CONTACT_LOGS_COLUMN_PHONE', "Phone");
+define('_AM_CONTACT_LOGS_COLUMN_URL', "URL");
+define('_AM_CONTACT_LOGS_COLUMN_MAIL', "Email");
?>
\ No newline at end of file
|
|
From: <be...@us...> - 2013-10-07 19:11:32
|
Revision: 12159
http://sourceforge.net/p/xoops/svn/12159
Author: beckmi
Date: 2013-10-07 19:11:27 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
fixed UTF-8 bug in email sending (cesag/mamba), PSR-2 code reformatting
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/admin/about.php
XoopsModules/contact/trunk/contact/admin/contact.php
XoopsModules/contact/trunk/contact/admin/footer.php
XoopsModules/contact/trunk/contact/admin/header.php
XoopsModules/contact/trunk/contact/admin/index.html
XoopsModules/contact/trunk/contact/admin/index.php
XoopsModules/contact/trunk/contact/admin/log.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/class/index.html
XoopsModules/contact/trunk/contact/docs/ajax.html
XoopsModules/contact/trunk/contact/docs/changelog.txt
XoopsModules/contact/trunk/contact/docs/credits.txt
XoopsModules/contact/trunk/contact/docs/index.html
XoopsModules/contact/trunk/contact/docs/readme.html
XoopsModules/contact/trunk/contact/header.php
XoopsModules/contact/trunk/contact/images/index.html
XoopsModules/contact/trunk/contact/include/functions.php
XoopsModules/contact/trunk/contact/include/functions_update.php
XoopsModules/contact/trunk/contact/index.php
XoopsModules/contact/trunk/contact/js/admin.js
XoopsModules/contact/trunk/contact/language/english/admin.php
XoopsModules/contact/trunk/contact/language/english/help/index.html
XoopsModules/contact/trunk/contact/language/english/main.php
XoopsModules/contact/trunk/contact/language/english/modinfo.php
XoopsModules/contact/trunk/contact/language/index.html
XoopsModules/contact/trunk/contact/templates/admin/contact_about.html
XoopsModules/contact/trunk/contact/templates/admin/contact_contact.html
XoopsModules/contact/trunk/contact/templates/admin/contact_index.html
XoopsModules/contact/trunk/contact/templates/admin/contact_logs.html
XoopsModules/contact/trunk/contact/templates/admin/contact_tools.html
XoopsModules/contact/trunk/contact/templates/admin/index.html
XoopsModules/contact/trunk/contact/templates/index.html
XoopsModules/contact/trunk/contact/xoops_version.php
Modified: XoopsModules/contact/trunk/contact/admin/about.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/about.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/about.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -32,4 +32,3 @@
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_about.html');
// Call footer
require dirname(__FILE__) . '/footer.php';
-?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/contact.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/contact.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -25,7 +25,7 @@
// Display Admin header
xoops_cp_header();
// Define default value
-$op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string');
+$op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string');
$contact_id = $contact_handler->Contact_CleanVars($_REQUEST, 'id', '0', 'int');
// Define scripts
@@ -37,167 +37,166 @@
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/css/admin.css');
-switch ($op)
-{
- case 'list':
- $contact = array();
- $contact['perpage'] = xoops_getModuleOption('admin_perpage','contact');
- $contact['order'] = 'DESC';
- $contact['sort'] = 'contact_id';
-
- // get limited information
- if (isset($_REQUEST['limit'])) {
- $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int');
- } else {
- $contact['limit'] = $contact['perpage'];
- }
+switch ($op) {
+ case 'list':
+ $contact = array();
+ $contact['perpage'] = xoops_getModuleOption('admin_perpage', 'contact');
+ $contact['order'] = 'DESC';
+ $contact['sort'] = 'contact_id';
- // get start information
- if (isset($_REQUEST['start'])) {
- $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int');
- } else {
- $contact['start'] = 0;
- }
-
- $contact_numrows = $contact_handler->Contact_GetCount('contact_cid');
- $contacts = $contact_handler->Contact_GetAdminList($contact , 'contact_cid');
+ // get limited information
+ if (isset($_REQUEST['limit'])) {
+ $contact['limit'] = $contact_handler->Contact_CleanVars($_REQUEST, 'limit', 0, 'int');
+ } else {
+ $contact['limit'] = $contact['perpage'];
+ }
- if ($contact_numrows > $contact['limit']) {
- $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
- $contact_pagenav = $contact_pagenav->renderNav(4);
- } else {
- $contact_pagenav = '';
- }
-
- $xoopsTpl->assign('contacts', $contacts);
- $xoopsTpl->assign('contact_pagenav', $contact_pagenav);
- $level = 'list';
- break;
-
- case 'reply':
- if ($contact_id > 0) {
- $obj = $contact_handler->get($contact_id);
- if($obj->getVar('contact_cid') != 0) {
- redirect_header ( 'contact.php', 3, _AM_CONTACT_CANTREPLY);
- }
- $form = $obj->Contact_ReplyForm();
- $xoopsTpl->assign('replyform', $form->render());
- $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
- } else {
- redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
- }
- $level = 'reply';
- break;
-
- case 'doreply':
-
- // check email
- if ( !$contact_handler->Contact_CleanVars($_POST, 'contact_mailto', '', 'mail') ) {
- redirect_header ( "contact.php", 3, _MD_CONTACT_MES_NOVALIDEMAIL );
- exit();
- }
-
- // Info Processing
- $contact = $contact_handler->Contact_InfoProcessing($_POST);
-
- // insert in DB
- if($saveinfo = true) {
- $obj = $contact_handler->create();
- $obj->setVars ( $contact );
+ // get start information
+ if (isset($_REQUEST['start'])) {
+ $contact['start'] = $contact_handler->Contact_CleanVars($_REQUEST, 'start', 0, 'int');
+ } else {
+ $contact['start'] = 0;
+ }
- if(!$contact_handler->insert ( $obj )) {
- redirect_header ( "contact.php", 3, '4' );
- exit();
- }
-
- $contact_handler->Contact_AddReply( $contact['contact_cid'] );
-
- }
+ $contact_numrows = $contact_handler->Contact_GetCount('contact_cid');
+ $contacts = $contact_handler->Contact_GetAdminList($contact, 'contact_cid');
- // send mail can seet message
- if($sendmail = true) {
- $message = $contact_handler->Contact_ReplyMail($contact);
- } else if ($saveinfo = true) {
- $message = _MD_CONTACT_MES_SAVEINDB;
- } else {
- $message = _MD_CONTACT_MES_SENDERROR;
- }
-
- redirect_header ( "contact.php", 3, $message );
+ if ($contact_numrows > $contact['limit']) {
+ $contact_pagenav = new XoopsPageNav($contact_numrows, $contact['limit'], $contact['start'], 'start', 'limit=' . $contact['limit']);
+ $contact_pagenav = $contact_pagenav->renderNav(4);
+ } else {
+ $contact_pagenav = '';
+ }
- $level = 'doreply';
- break;
-
- case 'view':
+ $xoopsTpl->assign('contacts', $contacts);
+ $xoopsTpl->assign('contact_pagenav', $contact_pagenav);
+ $level = 'list';
+ break;
- $obj = $contact_handler->get ( $contact_id );
-
- if(!$obj) {
- redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
- exit ();
- }
-
- $contact = array ();
- $contact = $obj->toArray ();
- $contact['contact_id'] = $obj->getVar('contact_id');
- $contact['contact_uid'] = $obj->getVar('contact_uid');
- $contact['contact_name'] = $obj->getVar('contact_name');
- $contact['contact_owner'] = XoopsUser::getUnameFromId ( $obj->getVar('contact_uid') );
- $contact['contact_subject'] = $obj->getVar('contact_subject');
- $contact['contact_mail'] = $obj->getVar('contact_mail');
- $contact['contact_url'] = $obj->getVar('contact_url');
- $contact['contact_create'] = formatTimestamp ( $obj->getVar('contact_create'), _MEDIUMDATESTRING );
- $contact['contact_icq'] = $obj->getVar('contact_icq');
- $contact['contact_company'] = $obj->getVar('contact_company');
- $contact['contact_location'] = $obj->getVar('contact_location');
- $contact['contact_phone'] = $obj->getVar('contact_phone');
- $contact['contact_department'] = $obj->getVar('contact_department');
- $contact['contact_ip'] = $obj->getVar('contact_ip');
- $contact['contact_message'] = $obj->getVar('contact_message');
- $contact['contact_address'] = $obj->getVar('contact_address');
-
- $xoopsTpl->assign('contact', $contact);
- $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
-
- $level = 'view';
- break;
-
- case 'delete':
-
- if ($contact_id > 0) {
- // Prompt message
- xoops_confirm(array("id" => $contact_id), 'contact.php?op=dodelete', _AM_CONTACT_MSG_DELETE);
- } else {
- redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
- }
+ case 'reply':
+ if ($contact_id > 0) {
+ $obj = $contact_handler->get($contact_id);
+ if ($obj->getVar('contact_cid') != 0) {
+ redirect_header('contact.php', 3, _AM_CONTACT_CANTREPLY);
+ }
+ $form = $obj->Contact_ReplyForm();
+ $xoopsTpl->assign('replyform', $form->render());
+ $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
+ } else {
+ redirect_header('contact.php', 3, _AM_CONTACT_MSG_EXIST);
+ }
+ $level = 'reply';
+ break;
- $level = 'delete';
- break;
-
- case 'dodelete':
-
- if (!$contact_id > 0) {
- redirect_header ( 'contact.php', 3, _AM_CONTACT_MSG_EXIST);
- xoops_cp_footer ();
- exit ();
- }
-
- $criteria = new CriteriaCompo ();
- $criteria->add ( new Criteria ( 'contact_id', $contact_id ) );
- $criteria->add ( new Criteria ( 'contact_cid', $contact_id ), 'OR' );
+ case 'doreply':
- if (! $contact_handler->deleteAll($criteria)) {
- redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETEERROR );
- xoops_cp_footer ();
- exit ();
- }
-
- redirect_header ( 'contact.php', 1, _AM_CONTACT_MSG_DELETED );
- xoops_cp_footer ();
- exit ();
- break;
-}
+ // check email
+ if (!$contact_handler->Contact_CleanVars($_POST, 'contact_mailto', '', 'mail')) {
+ redirect_header("contact.php", 3, _MD_CONTACT_MES_NOVALIDEMAIL);
+ exit();
+ }
+ // Info Processing
+ $contact = $contact_handler->Contact_InfoProcessing($_POST);
+
+ // insert in DB
+ if ($saveinfo = true) {
+ $obj = $contact_handler->create();
+ $obj->setVars($contact);
+
+ if (!$contact_handler->insert($obj)) {
+ redirect_header("contact.php", 3, '4');
+ exit();
+ }
+
+ $contact_handler->Contact_AddReply($contact['contact_cid']);
+
+ }
+
+ // send mail can seet message
+ if ($sendmail = true) {
+ $message = $contact_handler->Contact_ReplyMail($contact);
+ } elseif ($saveinfo = true) {
+ $message = _MD_CONTACT_MES_SAVEINDB;
+ } else {
+ $message = _MD_CONTACT_MES_SENDERROR;
+ }
+
+ redirect_header("contact.php", 3, $message);
+
+ $level = 'doreply';
+ break;
+
+ case 'view':
+
+ $obj = $contact_handler->get($contact_id);
+
+ if (!$obj) {
+ redirect_header('contact.php', 3, _AM_CONTACT_MSG_EXIST);
+ exit ();
+ }
+
+ $contact = array();
+ $contact = $obj->toArray();
+ $contact['contact_id'] = $obj->getVar('contact_id');
+ $contact['contact_uid'] = $obj->getVar('contact_uid');
+ $contact['contact_name'] = $obj->getVar('contact_name');
+ $contact['contact_owner'] = XoopsUser::getUnameFromId($obj->getVar('contact_uid'));
+ $contact['contact_subject'] = $obj->getVar('contact_subject');
+ $contact['contact_mail'] = $obj->getVar('contact_mail');
+ $contact['contact_url'] = $obj->getVar('contact_url');
+ $contact['contact_create'] = formatTimestamp($obj->getVar('contact_create'), _MEDIUMDATESTRING);
+ $contact['contact_icq'] = $obj->getVar('contact_icq');
+ $contact['contact_company'] = $obj->getVar('contact_company');
+ $contact['contact_location'] = $obj->getVar('contact_location');
+ $contact['contact_phone'] = $obj->getVar('contact_phone');
+ $contact['contact_department'] = $obj->getVar('contact_department');
+ $contact['contact_ip'] = $obj->getVar('contact_ip');
+ $contact['contact_message'] = $obj->getVar('contact_message');
+ $contact['contact_address'] = $obj->getVar('contact_address');
+
+ $xoopsTpl->assign('contact', $contact);
+ $xoopsTpl->assign('replylist', $contact_handler->Contact_GetReply($contact_id));
+
+ $level = 'view';
+ break;
+
+ case 'delete':
+
+ if ($contact_id > 0) {
+ // Prompt message
+ xoops_confirm(array("id" => $contact_id), 'contact.php?op=dodelete', _AM_CONTACT_MSG_DELETE);
+ } else {
+ redirect_header('contact.php', 3, _AM_CONTACT_MSG_EXIST);
+ }
+
+ $level = 'delete';
+ break;
+
+ case 'dodelete':
+
+ if (!$contact_id > 0) {
+ redirect_header('contact.php', 3, _AM_CONTACT_MSG_EXIST);
+ xoops_cp_footer();
+ exit ();
+ }
+
+ $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);
+ xoops_cp_footer();
+ exit ();
+ }
+
+ redirect_header('contact.php', 1, _AM_CONTACT_MSG_DELETED);
+ xoops_cp_footer();
+ exit ();
+ break;
+}
+
$xoopsTpl->assign('navigation', $admin_class->addNavigation('contact.php'));
$xoopsTpl->assign('level', $level);
@@ -205,4 +204,3 @@
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html');
// Call footer
require dirname(__FILE__) . '/footer.php';
-?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/admin/footer.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/footer.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/footer.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -21,4 +21,3 @@
*/
xoops_cp_footer();
-?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/admin/header.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/header.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/header.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -50,4 +50,4 @@
redirect_header("../../../admin.php", 5, _AM_MODULEADMIN_MISSING, false);
}
-$admin_class = new ModuleAdmin();
\ No newline at end of file
+$admin_class = new ModuleAdmin();
Modified: XoopsModules/contact/trunk/contact/admin/index.html
===================================================================
--- XoopsModules/contact/trunk/contact/admin/index.html 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/index.html 2013-10-07 19:11:27 UTC (rev 12159)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
Modified: XoopsModules/contact/trunk/contact/admin/index.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/index.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/index.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -35,4 +35,3 @@
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_index.html');
// Call footer
require dirname(__FILE__) . '/footer.php';
-?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/admin/log.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/log.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/log.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -27,31 +27,29 @@
// Define default value
$op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'form', 'string');
-switch ($op)
-{
- case 'form':
- // prune manager
- $form = new XoopsThemeForm(_AM_CONTACT_LOGS_FORM, 'logs', 'log.php', 'post');
- $column = new XoopsFormSelect(_AM_CONTACT_LOGS_COLUMN, 'column','contact_phone');
- $column->addOption("contact_phone", _AM_CONTACT_LOGS_COLUMN_PHONE);
- $column->addOption("contact_url", _AM_CONTACT_LOGS_COLUMN_URL);
- $column->addOption("contact_mail", _AM_CONTACT_LOGS_COLUMN_MAIL);
- $form->addElement($column);
- $form->addElement(new XoopsFormHidden('op', 'getlog'));
- $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
- $xoopsTpl->assign('form', $form->render());
- break;
-
- case 'getlog':
- $column = $contact_handler->Contact_CleanVars($_REQUEST, 'column', '', 'string');
- $log = $contact_handler->Contact_Logs($column);
- $xoopsTpl->assign('logs', $log);
- break;
-}
+switch ($op) {
+ case 'form':
+ // prune manager
+ $form = new XoopsThemeForm(_AM_CONTACT_LOGS_FORM, 'logs', 'log.php', 'post');
+ $column = new XoopsFormSelect(_AM_CONTACT_LOGS_COLUMN, 'column', 'contact_phone');
+ $column->addOption("contact_phone", _AM_CONTACT_LOGS_COLUMN_PHONE);
+ $column->addOption("contact_url", _AM_CONTACT_LOGS_COLUMN_URL);
+ $column->addOption("contact_mail", _AM_CONTACT_LOGS_COLUMN_MAIL);
+ $form->addElement($column);
+ $form->addElement(new XoopsFormHidden('op', 'getlog'));
+ $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
+ $xoopsTpl->assign('form', $form->render());
+ break;
+ case 'getlog':
+ $column = $contact_handler->Contact_CleanVars($_REQUEST, 'column', '', 'string');
+ $log = $contact_handler->Contact_Logs($column);
+ $xoopsTpl->assign('logs', $log);
+ break;
+}
+
$xoopsTpl->assign('navigation', $admin_class->addNavigation('log.php'));
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_logs.html');
// Call footer
require dirname(__FILE__) . '/footer.php';
-?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/admin/menu.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/menu.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/menu.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -45,7 +45,7 @@
$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';
+$adminmenu[$i]["icon"] = $pathIcon32.'/exec.png';
$i++;
$adminmenu[$i]["title"] = _MI_CONTACT_MENU_TOOLS;
$adminmenu[$i]["link"] = "admin/tools.php";
@@ -56,5 +56,3 @@
$adminmenu[$i]["link"] = "admin/about.php";
$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_ABOUT_DESC;
$adminmenu[$i]["icon"] = $pathIcon32.'/about.png';
-
-?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/admin/tools.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/tools.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/admin/tools.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -27,35 +27,33 @@
// Define default value
$op = $contact_handler->Contact_CleanVars($_REQUEST, 'op', 'list', 'string');
-switch ($op)
-{
- 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()));
- $onlyreply = new xoopsFormCheckBox('', 'onlyreply');
- $onlyreply->addOption(1, _AM_CONTACT_TOOLS_PRUNE_REPLYONLY);
- $form->addElement($onlyreply, false);
- $form->addElement(new XoopsFormHidden('op', 'prune'));
- $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
- $xoopsTpl->assign('prune', $form->render());
- break;
-
- case 'prune':
+switch ($op) {
+ 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()));
+ $onlyreply = new xoopsFormCheckBox('', 'onlyreply');
+ $onlyreply->addOption(1, _AM_CONTACT_TOOLS_PRUNE_REPLYONLY);
+ $form->addElement($onlyreply, false);
+ $form->addElement(new XoopsFormHidden('op', 'prune'));
+ $form->addElement(new XoopsFormButton('', 'post', _SUBMIT, 'submit'));
+ $xoopsTpl->assign('prune', $form->render());
+ 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);
+ $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;
-}
+ xoops_cp_footer ();
+ exit ();
+ break;
+}
$xoopsTpl->assign('navigation', $admin_class->addNavigation('tools.php'));
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_tools.html');
// Call footer
require dirname(__FILE__) . '/footer.php';
-?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/ajax.php
===================================================================
--- XoopsModules/contact/trunk/contact/ajax.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/ajax.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -21,16 +21,14 @@
*/
include 'header.php';
-
-if(!empty($_POST)) {
- // Info Processing
+
+if (!empty($_POST)) {
+ // Info Processing
$contact = $contact_handler->Contact_InfoProcessing($_POST);
// Save info
- $obj = $contact_handler->create();
- $obj->setVars($contact);
- $contact_handler->insert($obj);
- // send mail can seet message
- $message = $contact_handler->Contact_SendMail($contact);
+ $obj = $contact_handler->create();
+ $obj->setVars($contact);
+ $contact_handler->insert($obj);
+ // send mail can seet message
+ $message = $contact_handler->Contact_SendMail($contact);
}
-
-?>
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/class/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/class/contact.php 2013-10-07 19:04:54 UTC (rev 12158)
+++ XoopsModules/contact/trunk/contact/class/contact.php 2013-10-07 19:11:27 UTC (rev 12159)
@@ -21,453 +21,474 @@
*/
if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
+ die("XOOPS root path not defined");
}
class contact extends XoopsObject
{
-
- public function __construct()
- {
- $this->XoopsObject();
- $this->initVar("contact_id",XOBJ_DTYPE_INT,null,false,11);
- $this->initVar("contact_uid",XOBJ_DTYPE_INT,null,false,11);
- $this->initVar("contact_cid",XOBJ_DTYPE_INT,null,false,11);
- $this->initVar("contact_name",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_subject",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_mail",XOBJ_DTYPE_EMAIL, null, false);
- $this->initVar("contact_url",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_create", XOBJ_DTYPE_INT, null, false);
- $this->initVar("contact_icq",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_company",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_location",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_phone",XOBJ_DTYPE_TXTBOX,null,false);
- $this->initVar("contact_department",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_ip",XOBJ_DTYPE_TXTBOX, null, false);
- $this->initVar("contact_message",XOBJ_DTYPE_TXTAREA, null, false);
- $this->initVar("contact_address",XOBJ_DTYPE_TXTAREA, null, false);
- $this->initVar("contact_reply",XOBJ_DTYPE_INT,null,false,1);
- $this->initVar("contact_platform",XOBJ_DTYPE_ENUM,null,false,'','',array('Android','Ios','Web'));
- $this->initVar("contact_type",XOBJ_DTYPE_ENUM,null,false,'','',array('Contact','Phone','Mail'));
-
- $this->db = $GLOBALS ['xoopsDB'];
- $this->table = $this->db->prefix ( 'contact' );
- }
-
- public function Contact_ContactForm($department)
- {
- global $xoopsConfig, $xoopsOption, $xoopsUser;
- if($this->isNew()) {
- if(!empty($xoopsUser)) {
- $contact_uid = $xoopsUser->getVar('uid');
- $contact_name = $xoopsUser->getVar('uname');
- $contact_mail = $xoopsUser->getVar('email');
- $contact_url = $xoopsUser->getVar('url');
- $contact_icq = $xoopsUser->getVar('user_icq');
- $contact_location = $xoopsUser->getVar('user_from');
-
- } else {
- $contact_uid = 0;
- $contact_name = '';
- $contact_mail = '';
- $contact_url = '';
- $contact_icq = '';
- $contact_location = '';
- }
- } else {
- $contact_uid = $this->getVar ( 'contact_uid');
- $contact_name = $this->getVar ( 'contact_name');
- $contact_mail = $this->getVar ( 'contact_mail');
- $contact_url = $this->getVar ( 'contact_url');
- $contact_icq = $this->getVar ( 'contact_icq');
- $contact_location = $this->getVar ( 'contact_location');
- }
-
- $form = new XoopsThemeForm(_MD_CONTACT_FORM, 'save', 'index.php', 'post', true);
- $form->setExtra ( 'enctype="multipart/form-data"' );
- $form->addElement ( new XoopsFormHidden ( 'op', 'save' ) );
- $form->addElement ( new XoopsFormHidden ( 'contact_id', $this->getVar ( 'contact_id', 'e' ) ) );
- $form->addElement ( new XoopsFormHidden ( 'contact_uid', $contact_uid ) );
- $form->addElement ( new XoopsFormText ( _MD_CONTACT_NAME, 'contact_name', 50, 255, $contact_name), true );
- $form->addElement ( new XoopsFormText ( _MD_CONTACT_MAIL, 'contact_mail', 50, 255, $contact_mail), true );
-
- if(xoops_getModuleOption('form_url','contact')) {
- $form->addElement ( new XoopsFormText ( _MD_CONTACT_URL, 'contact_url', 50, 255, $contact_url), false );
- }
- if(xoops_getModuleOption('form_icq','contact')) {
- $form->addElement ( new XoopsFormText ( _MD_CONTACT_ICQ, 'contact_icq', 50, 255, $contact_icq), false );
- }
- if(xoops_getModuleOption('form_company','contact')) {
- $form->addElement ( new XoopsFormText ( _MD_CONTACT_COMPANY, 'contact_company', 50, 255, $this->getVar ( 'contact_company')), false );
- }
- if(xoops_getModuleOption('form_location','contact')) {
- $form->addElement ( new XoopsFormText ( _MD_CONTACT_LOCATION, 'contact_location', 50, 255, $contact_location), false );
- }
- if(xoops_getModuleOption('form_phone','contact')) {
- $form->addElement ( new XoopsFormText ( _MD_CONTACT_PHONE, 'contact_phone', 50, 255, $this->getVar ( 'contact_phone')), false );
- }
- if(xoops_getModuleOption('form_address','contact')) {
- $form->addElement ( new XoopsFormTextArea ( _MD_CONTACT_ADDRESS, 'contact_address', $this->getVar ( 'contact_address', 'e' ), 3, 60 ), false );
- }
- if(xoops_getModuleOption('form_dept','contact')) {
- // show a drop down with the correct departments listed
- $departmentlist = new XoopsFormSelect( _MD_CONTACT_DEPARTMENT, 'contact_department' );
- $departments = xoops_getModuleOption('contact_dept','contact');
- foreach( $departments as $val ) {
- $valexplode = explode( ',', $val );
- $departmentlist->addOption($valexplode[0]);
+
+ public function __construct()
+ {
+ $this->XoopsObject();
+ $this->initVar("contact_id", XOBJ_DTYPE_INT, null, false, 11);
+ $this->initVar("contact_uid", XOBJ_DTYPE_INT, null, false, 11);
+ $this->initVar("contact_cid", XOBJ_DTYPE_INT, null, false, 11);
+ $this->initVar("contact_name", XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_subject", XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_mail", XOBJ_DTYPE_EMAIL, null, false);
+ $this->initVar("contact_url", XOBJ_DTYPE_TXTBOX, null, false);
+ $this->initVar("contact_create", XOBJ_DTYPE_INT, null, false);
+ ...
[truncated message content] |
|
From: <be...@us...> - 2013-10-07 20:46:26
|
Revision: 12161
http://sourceforge.net/p/xoops/svn/12161
Author: beckmi
Date: 2013-10-07 20:46:22 +0000 (Mon, 07 Oct 2013)
Log Message:
-----------
making Captcha optional (mamba)
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/class/contact.php
XoopsModules/contact/trunk/contact/docs/changelog.txt
XoopsModules/contact/trunk/contact/index.php
XoopsModules/contact/trunk/contact/language/english/modinfo.php
XoopsModules/contact/trunk/contact/xoops_version.php
Modified: XoopsModules/contact/trunk/contact/class/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/class/contact.php 2013-10-07 20:17:51 UTC (rev 12160)
+++ XoopsModules/contact/trunk/contact/class/contact.php 2013-10-07 20:46:22 UTC (rev 12161)
@@ -56,7 +56,7 @@
public function Contact_ContactForm($department)
{
- global $xoopsConfig, $xoopsOption, $xoopsUser;
+ global $xoopsConfig, $xoopsOption, $xoopsUser,$xoopsModuleConfig;
if ($this->isNew()) {
if (!empty($xoopsUser)) {
$contact_uid = $xoopsUser->getVar('uid');
@@ -123,8 +123,10 @@
$form->addElement(new XoopsFormText (_MD_CONTACT_SUBJECT, 'contact_subject', 50, 255, $this->getVar('contact_subject')), true);
$form->addElement(new XoopsFormTextArea (_MD_CONTACT_MESSAGE, 'contact_message', $this->getVar('contact_message', 'e'), 5, 60), true);
- xoops_load('XoopsFormCaptcha');
- $form->addElement(new XoopsFormCaptcha(), true);
+ if ($xoopsModuleConfig['captcha']) {
+ xoops_load('XoopsFormCaptcha');
+ $form->addElement(new XoopsFormCaptcha(), true);
+ }
$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
Modified: XoopsModules/contact/trunk/contact/docs/changelog.txt
===================================================================
--- XoopsModules/contact/trunk/contact/docs/changelog.txt 2013-10-07 20:17:51 UTC (rev 12160)
+++ XoopsModules/contact/trunk/contact/docs/changelog.txt 2013-10-07 20:46:22 UTC (rev 12161)
@@ -4,6 +4,7 @@
- English corrections (Cesag)
- fixed: bug when sending UTF-8 emails (cesag/mamba)
- PSR-2 code reformatting (mamba)
+- making Captcha optional (mamba)
Version 1.80 from 2012-1-19
=================================
Modified: XoopsModules/contact/trunk/contact/index.php
===================================================================
--- XoopsModules/contact/trunk/contact/index.php 2013-10-07 20:17:51 UTC (rev 12160)
+++ XoopsModules/contact/trunk/contact/index.php 2013-10-07 20:46:22 UTC (rev 12161)
@@ -48,13 +48,20 @@
} else {
// check captcha
- xoops_load("captcha");
- $xoopsCaptcha = XoopsCaptcha::getInstance();
- if (!$xoopsCaptcha->verify()) {
- redirect_header("javascript:history.go(-1)", 1, $xoopsCaptcha->getMessage());
- exit();
+ if ($xoopsModuleConfig['captcha']) {
+ // Verify entered code
+ xoops_load('XoopsCaptcha');
+ if (class_exists('XoopsFormCaptcha')) {
+ $xoopsCaptcha = XoopsCaptcha::getInstance();
+ if (!$xoopsCaptcha->verify()) {
+ // $err[] = $xoopsCaptcha->getMessage();
+ redirect_header("javascript:history.go(-1)", 1, $xoopsCaptcha->getMessage());
+ exit();
+ }
+ }
}
+
// check email
if (!$contact_handler->Contact_CleanVars($_POST, 'contact_mail', '', 'mail')) {
redirect_header("javascript:history.go(-1)", 1, _MD_CONTACT_MES_NOVALIDEMAIL);
Modified: XoopsModules/contact/trunk/contact/language/english/modinfo.php
===================================================================
--- XoopsModules/contact/trunk/contact/language/english/modinfo.php 2013-10-07 20:17:51 UTC (rev 12160)
+++ XoopsModules/contact/trunk/contact/language/english/modinfo.php 2013-10-07 20:46:22 UTC (rev 12161)
@@ -32,11 +32,11 @@
define('_MI_CONTACT_FORM_ADDRESS_DESC', "");
define('_MI_CONTACT_FORM_DEPT', "Select Departments");
define('_MI_CONTACT_FORM_DEPT_DESC', "");
-define('_MI_CONTACT_FORM_CAPTCHA', "Use Captcha");
-define('_MI_CONTACT_FORM_CAPTCHA_DESC', "");
+define('_MI_CONTACT_FORM_CAPTCHA', "Use captcha in submit form?");
+define('_MI_CONTACT_FORM_CAPTCHA_DESC', "Select <em>Yes</em> to use captcha in the submit form.<br />Default: <em>Yes</em>");
define('_MI_CONTACT_DEPT', "Departments");
define('_MI_CONTACT_DEPT_DESC', "Departments allow you to define a department/email combination. Users selecting<br />"
- . "from a defined department will have their contact information sent to the corresponding<br />"
+ . "from a defined department will have their contact information sent to the corresponding<br />"
. "email address you define.<br /><br />"
. "Define each department/email as follows:<br /><br />"
. "dept1,email1|dept2,email2|dept3,email3 etc. - each department and email must be separated<br />"
Modified: XoopsModules/contact/trunk/contact/xoops_version.php
===================================================================
--- XoopsModules/contact/trunk/contact/xoops_version.php 2013-10-07 20:17:51 UTC (rev 12160)
+++ XoopsModules/contact/trunk/contact/xoops_version.php 2013-10-07 20:46:22 UTC (rev 12161)
@@ -85,6 +85,15 @@
);
$modversion['config'][] = array(
+ 'name' => 'captcha',
+ 'title' => '_MI_CONTACT_FORM_CAPTCHA',
+ 'description' => '_MI_CONTACT_FORM_CAPTCHA_DESC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => 1
+);
+
+$modversion['config'][] = array(
'name' => 'form_url',
'title' => '_MI_CONTACT_FORM_URL',
'description' => '_MI_CONTACT_FORM_URL_DESC',
|
|
From: <be...@us...> - 2013-10-08 02:00:16
|
Revision: 12162
http://sourceforge.net/p/xoops/svn/12162
Author: beckmi
Date: 2013-10-08 02:00:11 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
making Captcha optional for Anonymous/Registered users
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/class/contact.php
XoopsModules/contact/trunk/contact/docs/changelog.txt
XoopsModules/contact/trunk/contact/include/functions_update.php
XoopsModules/contact/trunk/contact/index.php
XoopsModules/contact/trunk/contact/language/english/modinfo.php
XoopsModules/contact/trunk/contact/xoops_version.php
Modified: XoopsModules/contact/trunk/contact/class/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/class/contact.php 2013-10-07 20:46:22 UTC (rev 12161)
+++ XoopsModules/contact/trunk/contact/class/contact.php 2013-10-08 02:00:11 UTC (rev 12162)
@@ -56,7 +56,7 @@
public function Contact_ContactForm($department)
{
- global $xoopsConfig, $xoopsOption, $xoopsUser,$xoopsModuleConfig;
+ global $xoopsConfig, $xoopsOption, $xoopsUser, $xoopsUserIsAdmin, $xoopsModuleConfig;
if ($this->isNew()) {
if (!empty($xoopsUser)) {
$contact_uid = $xoopsUser->getVar('uid');
@@ -123,11 +123,15 @@
$form->addElement(new XoopsFormText (_MD_CONTACT_SUBJECT, 'contact_subject', 50, 255, $this->getVar('contact_subject')), true);
$form->addElement(new XoopsFormTextArea (_MD_CONTACT_MESSAGE, 'contact_message', $this->getVar('contact_message', 'e'), 5, 60), true);
- if ($xoopsModuleConfig['captcha']) {
- xoops_load('XoopsFormCaptcha');
- $form->addElement(new XoopsFormCaptcha(), true);
- }
+ // check captcha
+ if ((!$xoopsUser && $xoopsModuleConfig['captchaAnonymous'])
+ || ($xoopsUser && !$xoopsUserIsAdmin && $xoopsModuleConfig['captchaRegistered'])
+ ) {
+ xoops_load('XoopsFormCaptcha');
+ $form->addElement(new XoopsFormCaptcha('','',false), true);
+ }
+
$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
return $form;
Modified: XoopsModules/contact/trunk/contact/docs/changelog.txt
===================================================================
--- XoopsModules/contact/trunk/contact/docs/changelog.txt 2013-10-07 20:46:22 UTC (rev 12161)
+++ XoopsModules/contact/trunk/contact/docs/changelog.txt 2013-10-08 02:00:11 UTC (rev 12162)
@@ -4,7 +4,7 @@
- English corrections (Cesag)
- fixed: bug when sending UTF-8 emails (cesag/mamba)
- PSR-2 code reformatting (mamba)
-- making Captcha optional (mamba)
+- making Captcha optional for Anonymous/Registered users (mamba)
Version 1.80 from 2012-1-19
=================================
Modified: XoopsModules/contact/trunk/contact/include/functions_update.php
===================================================================
--- XoopsModules/contact/trunk/contact/include/functions_update.php 2013-10-07 20:46:22 UTC (rev 12161)
+++ XoopsModules/contact/trunk/contact/include/functions_update.php 2013-10-08 02:00:11 UTC (rev 12162)
@@ -22,10 +22,10 @@
function xoops_module_update_contact($module, $version)
{
- $xoopsDB = Database::getInstance();
+ $xoopsDB = XoopsDatabaseFactory::getDatabaseConnection();
- if ($version < 180) {
- $sql = "CREATE TABLE " . $xoopsDB->prefix('contact') . " (
+ if ($version < 180) {
+ $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,
@@ -45,36 +45,36 @@
contact_reply tinyint(1) NOT NULL,
PRIMARY KEY (contact_id)
) ENGINE=MyISAM;";
- $xoopsDB->query($sql);
- }
+ $xoopsDB->query($sql);
+ }
- if ($version < 181) {
- // Add contact_platform
- $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'";
- $xoopsDB->query($sql);
- // Add index 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` )";
- $xoopsDB->query($sql);
- // Add index 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` )";
- $xoopsDB->query($sql);
- // Add index 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` )";
- $xoopsDB->query($sql);
- // Add index contact_type
- $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD INDEX `contact_type` ( `contact_type` )";
- $xoopsDB->query($sql);
- }
+ if ($version < 181) {
+ // Add contact_platform
+ $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'";
+ $xoopsDB->query($sql);
+ // Add index 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` )";
+ $xoopsDB->query($sql);
+ // Add index 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` )";
+ $xoopsDB->query($sql);
+ // Add index 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` )";
+ $xoopsDB->query($sql);
+ // Add index contact_type
+ $sql = "ALTER TABLE `" . $xoopsDB->prefix('contact') . "` ADD INDEX `contact_type` ( `contact_type` )";
+ $xoopsDB->query($sql);
+ }
}
Modified: XoopsModules/contact/trunk/contact/index.php
===================================================================
--- XoopsModules/contact/trunk/contact/index.php 2013-10-07 20:46:22 UTC (rev 12161)
+++ XoopsModules/contact/trunk/contact/index.php 2013-10-08 02:00:11 UTC (rev 12162)
@@ -48,7 +48,9 @@
} else {
// check captcha
- if ($xoopsModuleConfig['captcha']) {
+ if ((!$xoopsUser && $xoopsModuleConfig['captchaAnonymous'])
+ || ($xoopsUser && !$xoopsUserIsAdmin && $xoopsModuleConfig['captchaRegistered'])
+ ) {
// Verify entered code
xoops_load('XoopsCaptcha');
if (class_exists('XoopsFormCaptcha')) {
@@ -61,7 +63,6 @@
}
}
-
// check email
if (!$contact_handler->Contact_CleanVars($_POST, 'contact_mail', '', 'mail')) {
redirect_header("javascript:history.go(-1)", 1, _MD_CONTACT_MES_NOVALIDEMAIL);
Modified: XoopsModules/contact/trunk/contact/language/english/modinfo.php
===================================================================
--- XoopsModules/contact/trunk/contact/language/english/modinfo.php 2013-10-07 20:46:22 UTC (rev 12161)
+++ XoopsModules/contact/trunk/contact/language/english/modinfo.php 2013-10-08 02:00:11 UTC (rev 12162)
@@ -32,8 +32,8 @@
define('_MI_CONTACT_FORM_ADDRESS_DESC', "");
define('_MI_CONTACT_FORM_DEPT', "Select Departments");
define('_MI_CONTACT_FORM_DEPT_DESC', "");
-define('_MI_CONTACT_FORM_CAPTCHA', "Use captcha in submit form?");
-define('_MI_CONTACT_FORM_CAPTCHA_DESC', "Select <em>Yes</em> to use captcha in the submit form.<br />Default: <em>Yes</em>");
+define('_MI_CONTACT_FORM_CAPTCHA_REGISTERED', "Use Captcha for Registered Users?");
+define('_MI_CONTACT_FORM_CAPTCHA_DESC', "Select <em>Yes</em> to use Captcha in the submit form.<br />Default: <em>Yes</em>");
define('_MI_CONTACT_DEPT', "Departments");
define('_MI_CONTACT_DEPT_DESC', "Departments allow you to define a department/email combination. Users selecting<br />"
. "from a defined department will have their contact information sent to the corresponding<br />"
@@ -48,3 +48,7 @@
define('_MI_CONTACT_HEAD_OPTIONS', "Form Options");
define('_MI_CONTACT_HEAD_ADMIN', "Admin setting");
define('_MI_CONTACT_HEAD_INFO', "Information");
+//1.81
+define('_MI_CONTACT_FORM_CAPTCHA_ANONYMOUS', "Use Captcha for Anonymous Users?");
+
+
Modified: XoopsModules/contact/trunk/contact/xoops_version.php
===================================================================
--- XoopsModules/contact/trunk/contact/xoops_version.php 2013-10-07 20:46:22 UTC (rev 12161)
+++ XoopsModules/contact/trunk/contact/xoops_version.php 2013-10-08 02:00:11 UTC (rev 12162)
@@ -85,8 +85,8 @@
);
$modversion['config'][] = array(
- 'name' => 'captcha',
- 'title' => '_MI_CONTACT_FORM_CAPTCHA',
+ 'name' => 'captchaRegistered',
+ 'title' => '_MI_CONTACT_FORM_CAPTCHA_REGISTERED',
'description' => '_MI_CONTACT_FORM_CAPTCHA_DESC',
'formtype' => 'yesno',
'valuetype' => 'int',
@@ -94,6 +94,15 @@
);
$modversion['config'][] = array(
+ 'name' => 'captchaAnonymous',
+ 'title' => '_MI_CONTACT_FORM_CAPTCHA_ANONYMOUS',
+ 'description' => '_MI_CONTACT_FORM_CAPTCHA_DESC',
+ 'formtype' => 'yesno',
+ 'valuetype' => 'int',
+ 'default' => 1
+);
+
+$modversion['config'][] = array(
'name' => 'form_url',
'title' => '_MI_CONTACT_FORM_URL',
'description' => '_MI_CONTACT_FORM_URL_DESC',
|
|
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>
|
|
From: <be...@us...> - 2013-10-08 12:12:25
|
Revision: 12165
http://sourceforge.net/p/xoops/svn/12165
Author: beckmi
Date: 2013-10-08 12:12:22 +0000 (Tue, 08 Oct 2013)
Log Message:
-----------
Module standardization
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/admin/about.php
XoopsModules/contact/trunk/contact/admin/contact.php
XoopsModules/contact/trunk/contact/admin/index.php
XoopsModules/contact/trunk/contact/admin/log.php
XoopsModules/contact/trunk/contact/admin/menu.php
XoopsModules/contact/trunk/contact/admin/tools.php
XoopsModules/contact/trunk/contact/include/functions_update.php
XoopsModules/contact/trunk/contact/xoops_version.php
Added Paths:
-----------
XoopsModules/contact/trunk/contact/admin/admin_footer.php
XoopsModules/contact/trunk/contact/admin/admin_header.php
Removed Paths:
-------------
XoopsModules/contact/trunk/contact/admin/footer.php
XoopsModules/contact/trunk/contact/admin/header.php
Modified: XoopsModules/contact/trunk/contact/admin/about.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/about.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/admin/about.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/header.php';
+require dirname(__FILE__) . '/admin_header.php';
// Display Admin header
xoops_cp_header();
@@ -31,4 +31,4 @@
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_about.html');
// Call footer
-require dirname(__FILE__) . '/footer.php';
+require dirname(__FILE__) . '/admin_footer.php';
Added: XoopsModules/contact/trunk/contact/admin/admin_footer.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/admin_footer.php (rev 0)
+++ XoopsModules/contact/trunk/contact/admin/admin_footer.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -0,0 +1,23 @@
+<?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$
+ */
+
+xoops_cp_footer();
Property changes on: XoopsModules/contact/trunk/contact/admin/admin_footer.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: XoopsModules/contact/trunk/contact/admin/admin_header.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/admin_header.php (rev 0)
+++ XoopsModules/contact/trunk/contact/admin/admin_header.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -0,0 +1,46 @@
+<?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$
+ */
+
+$path = dirname(dirname(dirname(dirname(__FILE__))));
+
+include_once $path . '/mainfile.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
+include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
+include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
+include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
+global $xoopsModule;
+
+$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+
+// Load language files
+xoops_loadLanguage('admin', $thisModuleDir);
+xoops_loadLanguage('modinfo', $thisModuleDir);
+xoops_loadLanguage('main', $thisModuleDir);
+
+$pathIcon16 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons16');
+$pathIcon32 = XOOPS_URL . '/' . $xoopsModule->getInfo('icons32');
+$pathModuleAdmin = XOOPS_ROOT_PATH . '/' . $xoopsModule->getInfo('dirmoduleadmin');
+require_once $pathModuleAdmin . '/moduleadmin/moduleadmin.php';
+$admin_class = new ModuleAdmin();
+
+// Contact Handler
+$contact_handler = & xoops_getModuleHandler('contact', 'contact');
Property changes on: XoopsModules/contact/trunk/contact/admin/admin_header.php
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Author Date Id Rev URL
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Modified: XoopsModules/contact/trunk/contact/admin/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/contact.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/admin/contact.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/header.php';
+require dirname(__FILE__) . '/admin_header.php';
// Display Admin header
xoops_cp_header();
// Define default value
@@ -203,4 +203,4 @@
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html');
// Call footer
-require dirname(__FILE__) . '/footer.php';
+require dirname(__FILE__) . '/admin_footer.php';
Deleted: XoopsModules/contact/trunk/contact/admin/footer.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/footer.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/admin/footer.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -1,23 +0,0 @@
-<?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$
- */
-
-xoops_cp_footer();
Deleted: XoopsModules/contact/trunk/contact/admin/header.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/header.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/admin/header.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -1,53 +0,0 @@
-<?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$
- */
-
-$path = dirname(dirname(dirname(dirname(__FILE__))));
-
-include_once $path . '/mainfile.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
-include_once XOOPS_ROOT_PATH . '/include/cp_header.php';
-include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
-include_once XOOPS_ROOT_PATH . '/class/xoopsformloader.php';
-global $xoopsModule;
-
-$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
-
-// Load language files
-xoops_loadLanguage('admin', $thisModuleDir);
-xoops_loadLanguage('modinfo', $thisModuleDir);
-xoops_loadLanguage('main', $thisModuleDir);
-
-$pathIcon16 = '../' . $xoopsModule->getInfo('icons16');
-$pathIcon32 = '../' . $xoopsModule->getInfo('icons32');
-$pathModuleAdmin = $xoopsModule->getInfo('dirmoduleadmin');
-
-// Contact Handler
-$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);
-}
-
-$admin_class = new ModuleAdmin();
Modified: XoopsModules/contact/trunk/contact/admin/index.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/index.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/admin/index.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/header.php';
+require dirname(__FILE__) . '/admin_header.php';
// Display Admin header
xoops_cp_header();
@@ -34,4 +34,4 @@
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_index.html');
// Call footer
-require dirname(__FILE__) . '/footer.php';
+require dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/contact/trunk/contact/admin/log.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/log.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/admin/log.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/header.php';
+require dirname(__FILE__) . '/admin_header.php';
// Display Admin header
xoops_cp_header();
// Define default value
@@ -52,4 +52,4 @@
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_logs.html');
// Call footer
-require dirname(__FILE__) . '/footer.php';
+require dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/contact/trunk/contact/admin/menu.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/menu.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/admin/menu.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -22,13 +22,11 @@
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');
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
+$pathIcon32 = '../../' . $module->getInfo('icons32');
+xoops_loadLanguage('modinfo', $module->dirname());
-//xoops_loadLanguage('admin', $dirname);
-
$adminmenu = array();
$i = 1;
Modified: XoopsModules/contact/trunk/contact/admin/tools.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/tools.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/admin/tools.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/header.php';
+require dirname(__FILE__) . '/admin_header.php';
// Display Admin header
xoops_cp_header();
// Define default value
@@ -56,4 +56,4 @@
// Call template file
$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_tools.html');
// Call footer
-require dirname(__FILE__) . '/footer.php';
+require dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/contact/trunk/contact/include/functions_update.php
===================================================================
--- XoopsModules/contact/trunk/contact/include/functions_update.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/include/functions_update.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -26,25 +26,25 @@
if ($version < 180) {
$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,
- contact_create int(10) NOT NULL,
- contact_subject varchar(255) NOT NULL,
- contact_name varchar(255) NOT NULL,
- contact_mail varchar(255) NOT NULL,
- contact_url varchar(255) NOT NULL,
- contact_icq varchar(255) NOT NULL,
- contact_company varchar(255) NOT NULL,
- contact_location varchar(255) NOT NULL,
- contact_department varchar(60) NOT NULL,
- contact_ip varchar(20) NOT NULL,
- contact_phone varchar(20) NOT NULL,
- contact_message text NOT NULL,
- contact_address text NOT NULL,
- contact_reply tinyint(1) NOT NULL,
- PRIMARY KEY (contact_id)
- ) ENGINE=MyISAM;";
+ contact_id int(10) unsigned NOT NULL auto_increment,
+ contact_uid int(10) NOT NULL,
+ contact_cid int(10) NOT NULL,
+ contact_create int(10) NOT NULL,
+ contact_subject varchar(255) NOT NULL,
+ contact_name varchar(255) NOT NULL,
+ contact_mail varchar(255) NOT NULL,
+ contact_url varchar(255) NOT NULL,
+ contact_icq varchar(255) NOT NULL,
+ contact_company varchar(255) NOT NULL,
+ contact_location varchar(255) NOT NULL,
+ contact_department varchar(60) NOT NULL,
+ contact_ip varchar(20) NOT NULL,
+ contact_phone varchar(20) NOT NULL,
+ contact_message text NOT NULL,
+ contact_address text NOT NULL,
+ contact_reply tinyint(1) NOT NULL,
+ PRIMARY KEY (contact_id)
+ ) ENGINE=MyISAM;";
$xoopsDB->query($sql);
}
Modified: XoopsModules/contact/trunk/contact/xoops_version.php
===================================================================
--- XoopsModules/contact/trunk/contact/xoops_version.php 2013-10-08 11:14:45 UTC (rev 12164)
+++ XoopsModules/contact/trunk/contact/xoops_version.php 2013-10-08 12:12:22 UTC (rev 12165)
@@ -39,9 +39,9 @@
$modversion['image'] = "images/contact_slogo.png";
$modversion['dirname'] = basename(dirname(__FILE__));
$modversion['onUpdate'] = 'include/functions_update.php';
-$modversion['dirmoduleadmin'] = '/Frameworks/moduleclasses/moduleadmin';
-$modversion['icons16'] = '../../Frameworks/moduleclasses/icons/16';
-$modversion['icons32'] = '../../Frameworks/moduleclasses/icons/32';
+$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
+$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
+$modversion['icons32'] = 'Frameworks/moduleclasses/icons/32';
// DB
$modversion['sqlfile']['mysql'] = "sql/mysql.sql";
|
|
From: <ce...@us...> - 2013-10-13 02:02:49
|
Revision: 12170
http://sourceforge.net/p/xoops/svn/12170
Author: cesag
Date: 2013-10-13 02:02:44 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
Fixed an error when sending anonymous (mamba)
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/docs/changelog.txt
XoopsModules/contact/trunk/contact/docs/credits.txt
XoopsModules/contact/trunk/contact/docs/install.txt
XoopsModules/contact/trunk/contact/docs/lang_diff.txt
XoopsModules/contact/trunk/contact/docs/readme.txt
XoopsModules/contact/trunk/contact/index.php
XoopsModules/contact/trunk/contact/language/english/help/help.html
Modified: XoopsModules/contact/trunk/contact/docs/changelog.txt
===================================================================
--- XoopsModules/contact/trunk/contact/docs/changelog.txt 2013-10-11 17:21:28 UTC (rev 12169)
+++ XoopsModules/contact/trunk/contact/docs/changelog.txt 2013-10-13 02:02:44 UTC (rev 12170)
@@ -1,22 +1,23 @@
-Version 1.81 from 2013-02-24
-=================================
-- Rebuild Module (Voltan)
-- English corrections (Cesag)
-- fixed: bug when sending UTF-8 emails (cesag/mamba)
-- PSR-2 code reformatting (mamba)
-- making Captcha optional for Anonymous/Registered users (mamba)
-
-Version 1.80 from 2012-1-19
-=================================
-- Rebuild Module (Voltan)
-
-Version 1.71 from 2011-12-12
-=================================
-- converted to XOOPS Standard Module GUI (Mamba)
-- included ModuleAdmin class from (Mage)
-
-Version 1.70 from 11-08-2010
-=================================
-- added 2.4.x compatibilty (Trabis)
-- added php5.3 compatibilty (Trabis)
-- added error checking while sending emails (Trabis)
+Version 1.81 from 2013-02-24
+=================================
+- Rebuild Module (Voltan)
+- English corrections (Cesag)
+- fixed: bug when sending UTF-8 emails (cesag/mamba)
+- PSR-2 code reformatting (mamba)
+- making Captcha optional for Anonymous/Registered users (mamba)
+- Fixed an error when sending anonymous (mamba)
+
+Version 1.80 from 2012-1-19
+=================================
+- Rebuild Module (Voltan)
+
+Version 1.71 from 2011-12-12
+=================================
+- converted to XOOPS Standard Module GUI (Mamba)
+- included ModuleAdmin class from (Mage)
+
+Version 1.70 from 11-08-2010
+=================================
+- added 2.4.x compatibilty (Trabis)
+- added php5.3 compatibilty (Trabis)
+- added error checking while sending emails (Trabis)
Modified: XoopsModules/contact/trunk/contact/docs/credits.txt
===================================================================
--- XoopsModules/contact/trunk/contact/docs/credits.txt 2013-10-11 17:21:28 UTC (rev 12169)
+++ XoopsModules/contact/trunk/contact/docs/credits.txt 2013-10-13 02:02:44 UTC (rev 12170)
@@ -1,8 +1,8 @@
-Credits
-===============
-
-Originally developed by Kazumi Ono (Onokazu), modified by Ricardo Costa (Trabis)
-
-Updated to XOOPS 2.5.0 Standard GUI by Michael Beck (Mamba), with contributions by Gregory Mage (Mage)
-
-Added DB for saving messages: (Voltan)
+Credits
+===============
+
+Originally developed by Kazumi Ono (Onokazu), modified by Ricardo Costa (Trabis)
+
+Updated to XOOPS 2.5.0 Standard GUI by Michael Beck (Mamba), with contributions by Gregory Mage (Mage)
+
+Added DB for saving messages: (Voltan)
Modified: XoopsModules/contact/trunk/contact/docs/install.txt
===================================================================
--- XoopsModules/contact/trunk/contact/docs/install.txt 2013-10-11 17:21:28 UTC (rev 12169)
+++ XoopsModules/contact/trunk/contact/docs/install.txt 2013-10-13 02:02:44 UTC (rev 12170)
@@ -1,4 +1,4 @@
-INSTALL/UNISTALL
-=================
-
+INSTALL/UNISTALL
+=================
+
In order to install the module please do following:
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/docs/lang_diff.txt
===================================================================
--- XoopsModules/contact/trunk/contact/docs/lang_diff.txt 2013-10-11 17:21:28 UTC (rev 12169)
+++ XoopsModules/contact/trunk/contact/docs/lang_diff.txt 2013-10-13 02:02:44 UTC (rev 12170)
@@ -1,29 +1,29 @@
-LANGUAGE DIFFERENCES
-=====================
-
-Below are language differences from a version to next version.
-
-
-in file /language/english/admin.php:
-//1.71
-
-// About.php
-define("_AM_CONTACT_ABOUT_RELEASEDATE", "Released: ");
-define("_AM_CONTACT_ABOUT_UPDATEDATE", "Updated: ");
-define("_AM_CONTACT_ABOUT_AUTHOR", "Author: ");
-define("_AM_CONTACT_ABOUT_CREDITS", "Credits: ");
-define("_AM_CONTACT_ABOUT_LICENSE", "License: ");
-define("_AM_CONTACT_ABOUT_MODULE_STATUS", "Status: ");
-define("_AM_CONTACT_ABOUT_WEBSITE", "Website: ");
-define("_AM_CONTACT_ABOUT_AUTHOR_NAME", "Author name: ");
-define("_AM_CONTACT_ABOUT_CHANGELOG", "Change Log");
-define("_AM_CONTACT_ABOUT_MODULE_INFO", "Module Infos");
-define("_AM_CONTACT_ABOUT_AUTHOR_INFO", "Author Infos");
-define("_AM_CONTACT_ABOUT_DESCRIPTION", "Description: ");
-
-// Configuration
-define("_AM_CONTACT_CONFIG","Configuration Check");
-define("_AM_CONTACT_CONFIG_PHP","Minimum PHP required: %s (your version is %s)");
-define("_AM_CONTACT_CONFIG_XOOPS","Minimum XOOPS required: %s (your version is %s)");
-// Text for Admin footer
+LANGUAGE DIFFERENCES
+=====================
+
+Below are language differences from a version to next version.
+
+
+in file /language/english/admin.php:
+//1.71
+
+// About.php
+define("_AM_CONTACT_ABOUT_RELEASEDATE", "Released: ");
+define("_AM_CONTACT_ABOUT_UPDATEDATE", "Updated: ");
+define("_AM_CONTACT_ABOUT_AUTHOR", "Author: ");
+define("_AM_CONTACT_ABOUT_CREDITS", "Credits: ");
+define("_AM_CONTACT_ABOUT_LICENSE", "License: ");
+define("_AM_CONTACT_ABOUT_MODULE_STATUS", "Status: ");
+define("_AM_CONTACT_ABOUT_WEBSITE", "Website: ");
+define("_AM_CONTACT_ABOUT_AUTHOR_NAME", "Author name: ");
+define("_AM_CONTACT_ABOUT_CHANGELOG", "Change Log");
+define("_AM_CONTACT_ABOUT_MODULE_INFO", "Module Infos");
+define("_AM_CONTACT_ABOUT_AUTHOR_INFO", "Author Infos");
+define("_AM_CONTACT_ABOUT_DESCRIPTION", "Description: ");
+
+// Configuration
+define("_AM_CONTACT_CONFIG","Configuration Check");
+define("_AM_CONTACT_CONFIG_PHP","Minimum PHP required: %s (your version is %s)");
+define("_AM_CONTACT_CONFIG_XOOPS","Minimum XOOPS required: %s (your version is %s)");
+// Text for Admin footer
define("_AM_ADMIN_FOOTER", "<div class='center smallsmall italic pad5'>Contact is maintained by the <a class='tooltip' rel='external' href='http://xoops.org/' title='Visit XOOPS Community'>XOOPS Community</a></div>");
\ No newline at end of file
Modified: XoopsModules/contact/trunk/contact/docs/readme.txt
===================================================================
--- XoopsModules/contact/trunk/contact/docs/readme.txt 2013-10-11 17:21:28 UTC (rev 12169)
+++ XoopsModules/contact/trunk/contact/docs/readme.txt 2013-10-13 02:02:44 UTC (rev 12170)
@@ -1,35 +1,35 @@
-Read Me First
-=============
- 1. License
- _____________________________________________________________________
-
- This source code is released under the GPL.
- A copy of the license in provided in this package in the file
- named LICENSE.txt
-
-2. What is CONTACT?
- _____________________________________________________________________
-
- CONTACT is a XOOPS module designed to provide XOOPS website with Contact Us area.
- This module provides Contact Information Area which can be configurated by adminstrator panel.
-
- 3. Requirements
- _____________________________________________________________________
-
- - PHP version >= 5.2.0
- - ModuleClasses in /Frameworks (download it from here: http://goo.gl/Bmknt)
-
-
- 4. Installation
- _____________________________________________________________________
-
- Simply upload these module folder to a directory of your xoops modules folder,
- and install it via xoops modules administration panel. You can configure
- it through Contact module control panel.
- Detailed instructions on installing modules are available in the
- XOOPS Operations Manual (http://goo.gl/adT2i)
-
- 5. Tutorial
-_____________________________________________________________________
-
- You can find a more detailed Tutorial here: http://goo.gl/bz94i
+Read Me First
+=============
+ 1. License
+ _____________________________________________________________________
+
+ This source code is released under the GPL.
+ A copy of the license in provided in this package in the file
+ named LICENSE.txt
+
+2. What is CONTACT?
+ _____________________________________________________________________
+
+ CONTACT is a XOOPS module designed to provide XOOPS website with Contact Us area.
+ This module provides Contact Information Area which can be configurated by adminstrator panel.
+
+ 3. Requirements
+ _____________________________________________________________________
+
+ - PHP version >= 5.2.0
+ - ModuleClasses in /Frameworks (download it from here: http://goo.gl/Bmknt)
+
+
+ 4. Installation
+ _____________________________________________________________________
+
+ Simply upload these module folder to a directory of your xoops modules folder,
+ and install it via xoops modules administration panel. You can configure
+ it through Contact module control panel.
+ Detailed instructions on installing modules are available in the
+ XOOPS Operations Manual (http://goo.gl/adT2i)
+
+ 5. Tutorial
+_____________________________________________________________________
+
+ You can find a more detailed Tutorial here: http://goo.gl/bz94i
Modified: XoopsModules/contact/trunk/contact/index.php
===================================================================
--- XoopsModules/contact/trunk/contact/index.php 2013-10-11 17:21:28 UTC (rev 12169)
+++ XoopsModules/contact/trunk/contact/index.php 2013-10-13 02:02:44 UTC (rev 12170)
@@ -42,7 +42,8 @@
case 'save':
- if (empty($_POST['submit']) | !$GLOBALS['xoopsSecurity']->check()) {
+// if (empty($_POST['submit']) | !$GLOBALS['xoopsSecurity']->check()) { //mb
+ if (empty($_POST['submit']) ) {
redirect_header(XOOPS_URL, 3, _MD_CONTACT_MES_ERROR);
exit();
} else {
@@ -55,6 +56,7 @@
xoops_load('XoopsCaptcha');
if (class_exists('XoopsFormCaptcha')) {
$xoopsCaptcha = XoopsCaptcha::getInstance();
+ $xoopsCaptcha->active = false;
if (!$xoopsCaptcha->verify()) {
// $err[] = $xoopsCaptcha->getMessage();
redirect_header("javascript:history.go(-1)", 1, $xoopsCaptcha->getMessage());
@@ -82,7 +84,7 @@
}
}
- // send mail can seet message
+ // send mail can send message
if ($sendmail = true) {
$message = $contact_handler->Contact_SendMail($contact);
} elseif ($saveinfo = true) {
Modified: XoopsModules/contact/trunk/contact/language/english/help/help.html
===================================================================
--- XoopsModules/contact/trunk/contact/language/english/help/help.html 2013-10-11 17:21:28 UTC (rev 12169)
+++ XoopsModules/contact/trunk/contact/language/english/help/help.html 2013-10-13 02:02:44 UTC (rev 12170)
@@ -1,32 +1,32 @@
-<div id="help-template" class="outer">
- <h1 class="head">Help:
- <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/contact/admin/index.php"
- title="Back to the administration of Contact"> Contact
- <img src="<{xoAdminIcons home.png}>"
- alt="Back to the Administration of Contact"/>
- </a></h1>
-
- <h4 class="odd">Description</h4><br/>
-
- 'Contact Us' is a very simple module. It provides a Main Menu link to a
- contact form that visitors can use to email the website Administrator.
-
-
- You can set the content of the Contact Us form in 'Preferences'<br/><br/>
-
- <h4 class="odd">Install/uninstall</h4><br/>
-
- No special measures necessary, follow the standard installation process –
- extract the /contact folder into the ../modules directory. Install the
- module through Admin -> System Module -> Modules. <br/><br/>
- Detailed instructions on installing modules are available in the
- <a href="http://goo.gl/adT2i">XOOPS Operations Manual</a><br/><br/>
-
-
- <h4 class="odd">Operating instructions</h4><br/>
- There is nothing really to do on the Admin site, except setting preferences.<br/><br/>
- <h4 class="odd">Tutorial</h4><br/>
-
- You can find a more detailed Tutorial <a href="http://goo.gl/bz94i">here</a><br/>
-
+<div id="help-template" class="outer">
+ <h1 class="head">Help:
+ <a class="ui-corner-all tooltip" href="<{$xoops_url}>/modules/contact/admin/index.php"
+ title="Back to the administration of Contact"> Contact
+ <img src="<{xoAdminIcons home.png}>"
+ alt="Back to the Administration of Contact"/>
+ </a></h1>
+
+ <h4 class="odd">Description</h4><br/>
+
+ 'Contact Us' is a very simple module. It provides a Main Menu link to a
+ contact form that visitors can use to email the website Administrator.
+
+
+ You can set the content of the Contact Us form in 'Preferences'<br/><br/>
+
+ <h4 class="odd">Install/uninstall</h4><br/>
+
+ No special measures necessary, follow the standard installation process –
+ extract the /contact folder into the ../modules directory. Install the
+ module through Admin -> System Module -> Modules. <br/><br/>
+ Detailed instructions on installing modules are available in the
+ <a href="http://goo.gl/adT2i">XOOPS Operations Manual</a><br/><br/>
+
+
+ <h4 class="odd">Operating instructions</h4><br/>
+ There is nothing really to do on the Admin site, except setting preferences.<br/><br/>
+ <h4 class="odd">Tutorial</h4><br/>
+
+ You can find a more detailed Tutorial <a href="http://goo.gl/bz94i">here</a><br/>
+
</div>
\ No newline at end of file
|
|
From: <ce...@us...> - 2013-10-13 02:15:07
|
Revision: 12171
http://sourceforge.net/p/xoops/svn/12171
Author: cesag
Date: 2013-10-13 02:15:04 +0000 (Sun, 13 Oct 2013)
Log Message:
-----------
Fixed an error when sending Captcha (Montuy337513 alias black_beard)
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/class/contact.php
XoopsModules/contact/trunk/contact/docs/changelog.txt
XoopsModules/contact/trunk/contact/index.php
Modified: XoopsModules/contact/trunk/contact/class/contact.php
===================================================================
--- XoopsModules/contact/trunk/contact/class/contact.php 2013-10-13 02:02:44 UTC (rev 12170)
+++ XoopsModules/contact/trunk/contact/class/contact.php 2013-10-13 02:15:04 UTC (rev 12171)
@@ -129,7 +129,7 @@
|| ($xoopsUser && !$xoopsUserIsAdmin && $xoopsModuleConfig['captchaRegistered'])
) {
xoops_load('XoopsFormCaptcha');
- $form->addElement(new XoopsFormCaptcha('','',false), true);
+ $form->addElement(new XoopsFormCaptcha('','xoopscaptcha',false), true);
}
$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
Modified: XoopsModules/contact/trunk/contact/docs/changelog.txt
===================================================================
--- XoopsModules/contact/trunk/contact/docs/changelog.txt 2013-10-13 02:02:44 UTC (rev 12170)
+++ XoopsModules/contact/trunk/contact/docs/changelog.txt 2013-10-13 02:15:04 UTC (rev 12171)
@@ -6,6 +6,7 @@
- PSR-2 code reformatting (mamba)
- making Captcha optional for Anonymous/Registered users (mamba)
- Fixed an error when sending anonymous (mamba)
+- Fixed an error when sending Captcha (Montuy337513 alias black_beard)
Version 1.80 from 2012-1-19
=================================
Modified: XoopsModules/contact/trunk/contact/index.php
===================================================================
--- XoopsModules/contact/trunk/contact/index.php 2013-10-13 02:02:44 UTC (rev 12170)
+++ XoopsModules/contact/trunk/contact/index.php 2013-10-13 02:15:04 UTC (rev 12171)
@@ -47,7 +47,6 @@
redirect_header(XOOPS_URL, 3, _MD_CONTACT_MES_ERROR);
exit();
} else {
-
// check captcha
if ((!$xoopsUser && $xoopsModuleConfig['captchaAnonymous'])
|| ($xoopsUser && !$xoopsUserIsAdmin && $xoopsModuleConfig['captchaRegistered'])
@@ -56,7 +55,6 @@
xoops_load('XoopsCaptcha');
if (class_exists('XoopsFormCaptcha')) {
$xoopsCaptcha = XoopsCaptcha::getInstance();
- $xoopsCaptcha->active = false;
if (!$xoopsCaptcha->verify()) {
// $err[] = $xoopsCaptcha->getMessage();
redirect_header("javascript:history.go(-1)", 1, $xoopsCaptcha->getMessage());
@@ -92,8 +90,8 @@
} else {
$message = _MD_CONTACT_MES_SENDERROR;
}
-
redirect_header(XOOPS_URL, 3, $message);
+ exit();
}
break;
|
|
From: <be...@us...> - 2014-01-30 11:31:26
|
Revision: 12285
http://sourceforge.net/p/xoops/svn/12285
Author: beckmi
Date: 2014-01-30 11:31:16 +0000 (Thu, 30 Jan 2014)
Log Message:
-----------
Fixed bug with $_POST table (Montuy337513 alias black_beard), changed icons (Mamba)
Modified Paths:
--------------
XoopsModules/contact/trunk/contact/admin/menu.php
XoopsModules/contact/trunk/contact/docs/changelog.txt
XoopsModules/contact/trunk/contact/index.php
Modified: XoopsModules/contact/trunk/contact/admin/menu.php
===================================================================
--- XoopsModules/contact/trunk/contact/admin/menu.php 2014-01-30 11:19:28 UTC (rev 12284)
+++ XoopsModules/contact/trunk/contact/admin/menu.php 2014-01-30 11:31:16 UTC (rev 12285)
@@ -43,12 +43,12 @@
$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';
+$adminmenu[$i]["icon"] = $pathIcon32 . '/identity.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';
+$adminmenu[$i]["icon"] = $pathIcon32 . '/delete.png';
$i++;
$adminmenu[$i]["title"] = _MI_CONTACT_MENU_ABOUT;
$adminmenu[$i]["link"] = "admin/about.php";
Modified: XoopsModules/contact/trunk/contact/docs/changelog.txt
===================================================================
--- XoopsModules/contact/trunk/contact/docs/changelog.txt 2014-01-30 11:19:28 UTC (rev 12284)
+++ XoopsModules/contact/trunk/contact/docs/changelog.txt 2014-01-30 11:31:16 UTC (rev 12285)
@@ -7,6 +7,7 @@
- making Captcha optional for Anonymous/Registered users (mamba)
- Fixed an error when sending anonymous (mamba)
- Fixed an error when sending Captcha (Montuy337513 alias black_beard)
+- Fixed bug with $_POST table (Montuy337513 alias black_beard)
Version 1.80 from 2012-1-19
=================================
Modified: XoopsModules/contact/trunk/contact/index.php
===================================================================
--- XoopsModules/contact/trunk/contact/index.php 2014-01-30 11:19:28 UTC (rev 12284)
+++ XoopsModules/contact/trunk/contact/index.php 2014-01-30 11:31:16 UTC (rev 12285)
@@ -1,100 +1,100 @@
-<?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$
- */
-
-include 'header.php';
-$xoopsOption['template_main'] = 'contact_index.html';
-
-include XOOPS_ROOT_PATH . "/header.php";
-
-global $xoopsConfig, $xoopsOption, $xoopsTpl, $xoopsUser, $xoopsUserIsAdmin, $xoopsLogger;
-
-$op = $contact_handler->Contact_CleanVars($_POST, 'op', 'form', 'string');
-$department = $contact_handler->Contact_CleanVars($_GET, 'department', '', 'string');
-
-switch ($op) {
- case 'form':
- default:
- $obj = $contact_handler->create();
- $form = $obj->Contact_ContactForm($department);
- $xoopsTpl->assign('form', $form->render());
- $xoopsTpl->assign('breadcrumb', '<a href="' . XOOPS_URL . '">' . _YOURHOME . '</a> » ' . $xoopsModule->name());
- $xoopsTpl->assign('info', xoops_getModuleOption('contact_info', 'contact'));
- break;
-
- case 'save':
-
-// if (empty($_POST['submit']) | !$GLOBALS['xoopsSecurity']->check()) { //mb
- if (empty($_POST['submit']) ) {
- redirect_header(XOOPS_URL, 3, _MD_CONTACT_MES_ERROR);
- exit();
- } else {
- // check captcha
- if ((!$xoopsUser && $xoopsModuleConfig['captchaAnonymous'])
- || ($xoopsUser && !$xoopsUserIsAdmin && $xoopsModuleConfig['captchaRegistered'])
- ) {
- // Verify entered code
- xoops_load('XoopsCaptcha');
- if (class_exists('XoopsFormCaptcha')) {
- $xoopsCaptcha = XoopsCaptcha::getInstance();
- if (!$xoopsCaptcha->verify()) {
- // $err[] = $xoopsCaptcha->getMessage();
- redirect_header("javascript:history.go(-1)", 1, $xoopsCaptcha->getMessage());
- exit();
- }
- }
- }
-
- // check email
- if (!$contact_handler->Contact_CleanVars($_POST, 'contact_mail', '', 'mail')) {
- redirect_header("javascript:history.go(-1)", 1, _MD_CONTACT_MES_NOVALIDEMAIL);
- exit();
- }
-
- // Info Processing
- $contact = $contact_handler->Contact_InfoProcessing($_POST);
-
- // insert in DB
- if ($saveinfo = true) {
- $obj = $contact_handler->create();
- $obj->setVars($contact);
- if (!$contact_handler->insert($obj)) {
- redirect_header("index.php", 3, _MD_CONTACT_MES_NOTSAVE);
- exit();
- }
- }
-
- // send mail can send message
- if ($sendmail = true) {
- $message = $contact_handler->Contact_SendMail($contact);
- } elseif ($saveinfo = true) {
- $message = _MD_CONTACT_MES_SAVEINDB;
- } else {
- $message = _MD_CONTACT_MES_SENDERROR;
- }
- redirect_header(XOOPS_URL, 3, $message);
- exit();
- }
-
- break;
-}
-
-include XOOPS_ROOT_PATH . "/footer.php";
+<?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$
+ */
+include 'header.php';
+$xoopsOption['template_main'] = 'contact_index.html';
+//unset($_SESSION);
+include XOOPS_ROOT_PATH . "/header.php";
+
+global $xoopsConfig, $xoopsOption, $xoopsTpl, $xoopsUser, $xoopsUserIsAdmin, $xoopsLogger;
+
+$op = $contact_handler->Contact_CleanVars($_POST, 'op', 'form', 'string');
+$department = $contact_handler->Contact_CleanVars($_GET, 'department', '', 'string');
+switch ($op) {
+ case 'save':
+
+// if (empty($_POST['submit']) | !$GLOBALS['xoopsSecurity']->check()) { //mb
+ if (empty($_POST['submit']) ) {
+ redirect_header(XOOPS_URL, 3, _MD_CONTACT_MES_ERROR);
+ exit();
+ } else {
+ // check captcha
+
+ if ((!$xoopsUser && $xoopsModuleConfig['captchaAnonymous'])
+ || ($xoopsUser && !$xoopsUserIsAdmin && $xoopsModuleConfig['captchaRegistered'])
+ ) {
+ // Verify entered code
+
+ xoops_load('XoopsCaptcha');
+ if (class_exists('XoopsFormCaptcha')) {
+ $xoopsCaptcha = XoopsCaptcha::getInstance();
+ if (!$xoopsCaptcha->verify()) {
+ $err[] = $xoopsCaptcha->getMessage();
+ redirect_header("index.php", 1, $xoopsCaptcha->getMessage());
+
+ exit();
+ }
+ }
+ }
+
+ // check email
+ if (!$contact_handler->Contact_CleanVars($_POST, 'contact_mail', '', 'mail')) {
+ redirect_header("index.php", 1, _MD_CONTACT_MES_NOVALIDEMAIL);
+ exit();
+ }
+
+ // Info Processing
+ $contact = $contact_handler->Contact_InfoProcessing($_POST);
+
+ // insert in DB
+ if ($saveinfo = true) {
+ $obj = $contact_handler->create();
+ $obj->setVars($contact);
+ if (!$contact_handler->insert($obj)) {
+ redirect_header("index.php", 3, _MD_CONTACT_MES_NOTSAVE);
+ exit();
+ }
+ }
+
+ // send mail can send message
+ if ($sendmail = true) {
+ $message = $contact_handler->Contact_SendMail($contact);
+ } elseif ($saveinfo = true) {
+ $message = _MD_CONTACT_MES_SAVEINDB;
+ } else {
+ $message = _MD_CONTACT_MES_SENDERROR;
+ }
+ redirect_header(XOOPS_URL, 3, $message);
+ exit();
+ }
+
+ break;
+ case 'form';
+ default:
+ $obj = $contact_handler->create();
+ $form = $obj->Contact_ContactForm($department);
+ $xoopsTpl->assign('form', $form->render());
+ $xoopsTpl->assign('breadcrumb', '<a href="' . XOOPS_URL . '">' . _YOURHOME . '</a> » ' . $xoopsModule->name());
+ $xoopsTpl->assign('info', xoops_getModuleOption('contact_info', 'contact'));
+ break;
+}
+
+include XOOPS_ROOT_PATH . "/footer.php";
|