Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12476] XoopsModules/modulepacks/x257basicmodulepack/ trunk/modules/contact
|
From: <be...@us...> - 2014-04-25 11:37:39
|
Revision: 12476
http://sourceforge.net/p/xoops/svn/12476
Author: beckmi
Date: 2014-04-25 11:37:34 +0000 (Fri, 25 Apr 2014)
Log Message:
-----------
XOOPS 2.5.7 Module Pack update (work in progress): Contact
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/about.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/contact.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/menu.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/tools.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/ajax.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/class/contact.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/class/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/docs/ajax.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/docs/credits.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/docs/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/docs/install.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/docs/readme.txt
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/include/functions.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/include/functions_update.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/language/english/admin.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/language/english/help/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/language/english/main.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/language/english/modinfo.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/language/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/sql/mysql.sql
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/templates/admin/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/templates/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/xoops_version.php
Added Paths:
-----------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/admin_footer.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/admin_header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/log.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/css/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/css/admin.css
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/css/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/contact_slogo.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/icons/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/icons/view.png
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/js/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/js/admin.js
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/js/index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/docs/readme.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/templates/admin/contact_about.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/templates/admin/contact_contact.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/templates/admin/contact_index.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/templates/admin/contact_logs.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/templates/admin/contact_tools.tpl
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/templates/contact_index.tpl
Removed Paths:
-------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/footer.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/css/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/images/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/js/
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/readme.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/templates/admin/contact_about.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/templates/admin/contact_contact.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/templates/admin/contact_index.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/templates/admin/contact_tools.html
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/templates/contact_index.html
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/about.php 2014-04-25 11:35:52 UTC (rev 12475)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/about.php 2014-04-25 11:37:34 UTC (rev 12476)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/header.php';
+require dirname(__FILE__) . '/admin_header.php';
// Display Admin header
xoops_cp_header();
@@ -29,7 +29,6 @@
$xoopsTpl->assign('renderabout', $admin_class->renderabout('6KJ7RW5DR3VTJ', false));
// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_about.html');
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_about.tpl');
// Call footer
-require dirname(__FILE__) . '/footer.php';
-?>
\ No newline at end of file
+require dirname(__FILE__) . '/admin_footer.php';
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/admin_footer.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/admin_footer.php (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/admin_footer.php 2014-04-25 11:37:34 UTC (rev 12476)
@@ -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/modulepacks/x257basicmodulepack/trunk/modules/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/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/admin_header.php (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/admin_header.php 2014-04-25 11:37:34 UTC (rev 12476)
@@ -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/modulepacks/x257basicmodulepack/trunk/modules/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/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/contact.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/contact.php 2014-04-25 11:35:52 UTC (rev 12475)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/contact.php 2014-04-25 11:37:34 UTC (rev 12476)
@@ -21,188 +21,186 @@
*/
// Call header
-require dirname(__FILE__) . '/header.php';
+require dirname(__FILE__) . '/admin_header.php';
// 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
$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');
+$xoTheme->addScript(XOOPS_URL . '/modules/contact/assets/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');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/contact/assets/css/admin.css');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/assets/css/ui/' . xoops_getModuleOption('jquery_theme', 'system') . '/ui.all.css');
+$xoTheme->addStylesheet(XOOPS_URL . '/modules/system/assets/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);
// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.html');
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_contact.tpl');
// Call footer
-require dirname(__FILE__) . '/footer.php';
-?>
\ No newline at end of file
+require dirname(__FILE__) . '/admin_footer.php';
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/footer.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/footer.php 2014-04-25 11:35:52 UTC (rev 12475)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/footer.php 2014-04-25 11:37:34 UTC (rev 12476)
@@ -1,24 +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();
-?>
\ No newline at end of file
Deleted: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/header.php 2014-04-25 11:35:52 UTC (rev 12475)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/header.php 2014-04-25 11:37:34 UTC (rev 12476)
@@ -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();
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/index.html 2014-04-25 11:35:52 UTC (rev 12475)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/index.html 2014-04-25 11:37:34 UTC (rev 12476)
@@ -1 +1 @@
- <script>history.go(-1);</script>
\ No newline at end of file
+<script>history.go(-1);</script>
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/index.php 2014-04-25 11:35:52 UTC (rev 12475)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/index.php 2014-04-25 11:37:34 UTC (rev 12476)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/header.php';
+require dirname(__FILE__) . '/admin_header.php';
// Display Admin header
xoops_cp_header();
@@ -32,7 +32,6 @@
$xoopsTpl->assign('renderindex', $admin_class->renderIndex());
// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_index.html');
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_index.tpl');
// Call footer
-require dirname(__FILE__) . '/footer.php';
-?>
\ No newline at end of file
+require dirname(__FILE__) . '/admin_footer.php';
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/log.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/log.php (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/log.php 2014-04-25 11:37:34 UTC (rev 12476)
@@ -0,0 +1,55 @@
+<?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__) . '/admin_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_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.tpl');
+// Call footer
+require dirname(__FILE__) . '/admin_footer.php';
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/log.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/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/menu.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/menu.php 2014-04-25 11:35:52 UTC (rev 12475)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/menu.php 2014-04-25 11:37:34 UTC (rev 12476)
@@ -1,55 +1,56 @@
-<?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_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';
-
-?>
\ 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$
+ */
+
+defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+
+$module_handler = xoops_gethandler('module');
+$module = $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
+$pathIcon32 = '../../' . $module->getInfo('icons32');
+xoops_loadLanguage('modinfo', $module->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/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/tools.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/tools.php 2014-04-25 11:35:52 UTC (rev 12475)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/tools.php 2014-04-25 11:37:34 UTC (rev 12476)
@@ -21,41 +21,39 @@
*/
// Call header
-require dirname(__FILE__) . '/header.php';
+require dirname(__FILE__) . '/admin_header.php';
// Display Admin header
xoops_cp_header();
// 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':
- $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;
-}
+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);
+ $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'));
// Call template file
-$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_tools.html');
+$xoopsTpl->display(XOOPS_ROOT_PATH . '/modules/contact/templates/admin/contact_tools.tpl');
// Call footer
-require dirname(__FILE__) . '/footer.php';
-?>
\ No newline at end of file
+require dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/ajax.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/ajax.php 2014-04-25 11:35:52 UTC (rev 12475)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/ajax.php 2014-04-25 11:37:34 UTC (rev 12476)
@@ -21,16 +21,14 @@
*/
include 'header.php';
-
-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);
+
+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);
}
-
-?>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/css/admin.css
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/css/admin.css (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/css/admin.css 2014-04-25 11:37:34 UTC (rev 12476)
@@ -0,0 +1 @@
+
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/css/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/css/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/css/index.html 2014-04-25 11:37:34 UTC (rev 12476)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/contact_slogo.png
===================================================================
(Binary files differ)
Index: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/contact_slogo.png
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/contact_slogo.png 2014-04-25 11:35:52 UTC (rev 12475)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/contact_slogo.png 2014-04-25 11:37:34 UTC (rev 12476)
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/contact_slogo.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/icons/view.png
===================================================================
(Binary files differ)
Index: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/icons/view.png
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/icons/view.png 2014-04-25 11:35:52 UTC (rev 12475)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/icons/view.png 2014-04-25 11:37:34 UTC (rev 12476)
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/icons/view.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/images/index.html 2014-04-25 11:37:34 UTC (rev 12476)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/index.html 2014-04-25 11:37:34 UTC (rev 12476)
@@ -0,0 +1 @@
+ <script>history.go(-1);</script>
\ No newline at end of file
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/js/admin.js
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/js/admin.js (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/js/admin.js 2014-04-25 11:37:34 UTC (rev 12476)
@@ -0,0 +1,29 @@
+/**
+ * Administration function
+ *
+ * LICENSE
+ *
+ * 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.
+ *
+ * @copyright The XOOPS Project http://sourceforge.net/projects/xoops/
+ * @license http://www.fsf.org/copyleft/gpl.html GNU public license
+ * @package system
+ * @version $Id$
+ */
+
+function display_dialog(id, bgiframe, modal, hide, show, height, width) {
+ $(document).ready(function () {
+ $("#dialog" + id).dialog({
+ bgiframe: bgiframe,
+ modal: modal,
+ hide: hide,
+ show: show,
+ height: height,
+ width: width,
+ autoOpen: false
+ });
+ $("#dialog" + id).dialog("open");
+ });
+}
Property changes on: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/js/admin.js
___________________________________________________________________
Added: svn:keywords
## -0,0 +1 ##
+Id
\ No newline at end of property
Added: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/js/index.html
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/js/index.html (rev 0)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/assets/js/index.html 2014-04-25 11:37:34 UTC (rev 12476)
@@ -0,0 +1 @@
+<script>history.go(-1);</script>
\ No newline at end of file
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/class/contact.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/class/contact.php 2014-04-25 11:35:52 UTC (rev 12475)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/class/contact.php 2014-04-25 11:37:34 UTC (rev 12476)
@@ -27,7 +27,7 @@
class contact extends XoopsObject
{
- function __construct()
+ public function __construct()
{
$this->XoopsObject();
$this->initVar("contact_id", XOBJ_DTYPE_INT, null, false, 11);
@@ -47,16 +47,16 @@
$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');
}
- function Contact_ContactForm($department)
+ public function Contact_ContactForm($department)
{
-
- global $xoopsConfig, $xoopsOption, $xoopsUser;
-
+ global $xoopsConfig, $xoopsOption, $xoopsUser, $xoopsUserIsAdmin, $xoopsModuleConfig;
if ($this->isNew()) {
if (!empty($xoopsUser)) {
$contact_uid = $xoopsUser->getVar('uid');
@@ -123,14 +123,20 @@
$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);
+ // check captcha
+ if ((!$xoopsUser && $xoopsModuleConfig['captchaAnonymous'])
+ || ($xoopsUser && !$xoopsUserIsAdmin && $xoopsModuleConfig['captchaRegistered'])
+ ) {
+ xoops_load('XoopsFormCaptcha');
+ $form->addElement(new XoopsFormCaptcha('','xoopscaptcha',false), true);
+ }
$form->addElement(new XoopsFormButton('', 'submit', _SUBMIT, 'submit'));
+
return $form;
}
- function Contact_ReplyForm()
+ public function Contact_ReplyForm()
{
global $xoopsConfig;
$form = new XoopsThemeForm(_AM_CONTACT_REPLY, 'doreply', 'contact.php', 'post', true);
@@ -139,17 +145,18 @@
$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_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 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;
}
@@ -158,20 +165,21 @@
*
* @return array
**/
- function toArray()
+ 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)
+ public function __construct(&$db)
{
parent::__construct($db, "contact", 'contact', 'contact_id', 'contact_mail');
}
@@ -180,7 +188,7 @@
* Get variables passed by GET or POST method
*
*/
- function Contact_CleanVars(&$global, $key, $default = '', $type = 'int')
+ public function Contact_CleanVars(&$global, $key, $default = '', $type = 'int')
{
switch ($type) {
@@ -208,58 +216,70 @@
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;
}
- function Contact_InfoProcessing($global)
+ 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_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');
$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;
}
- function Contact_SendMail($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']);
+ $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;
} else {
$message = $xoopsMailer->getErrors();
}
+
return $message;
}
- function Contact_ReplyMail($contact)
+ public function Contact_ReplyMail($contact)
{
$xoopsMailer = xoops_getMailer();
$xoopsMailer->useMail();
@@ -273,10 +293,11 @@
} else {
$message = $xoopsMailer->getErrors();
}
+
return $message;
}
- function Contact_ToEmails($department = null)
+ public function Contact_ToEmails($department = null)
{
global $xoopsConfig;
$department_mail[] = $xoopsConfig['adminmail'];
@@ -289,24 +310,27 @@
}
}
}
+
return $department_mail;
}
- function Contact_AddReply($contact_id)
+ public function Contact_AddReply($contact_id)
{
$obj = $this->get($contact_id);
$obj->setVar('contact_reply', 1);
if (!$this->insert($obj)) {
return false;
}
+
return true;
}
- function Contact_GetReply($contact_id)
+ public function Contact_GetReply($contact_id)
{
$criteria = new CriteriaCompo ();
$criteria->add(new Criteria ('contact_cid', $contact_id));
+ $criteria->add(new Criteria ('contact_type', 'Contact'));
$contacts = $this->getObjects($criteria, false);
if ($contacts) {
$ret = array();
@@ -317,17 +341,19 @@
$tab['contact_create'] = formatTimestamp($root->getVar('contact_create'), _MEDIUMDATESTRING);
$ret [] = $tab;
}
+
return $ret;
} else {
return false;
}
}
- function Contact_GetAdminList($contact, $id)
+ public function Contact_GetAdminList($contact, $id)
{
$ret = array();
$criteria = new CriteriaCompo ();
$criteria->add(new Criteria ($id, '0'));
+ $criteria->add(new Criteria ('contact_type', 'Contact'));
$criteria->setSort($contact['sort']);
$criteria->setOrder($contact['order']);
$criteria->setStart($contact['start']);
@@ -342,23 +368,26 @@
$ret [] = $tab;
}
}
+
return $ret;
}
/**
* Get file Count
*/
- function Contact_GetCount($id)
+ public function Contact_GetCount($id)
{
$criteria = new CriteriaCompo ();
$criteria->add(new Criteria ($id, '0'));
+ $criteria->add(new Criteria ('contact_type', 'Contact'));
+
return $this->getCount($criteria);
}
/**
* Get Insert ID
*/
- function getInsertId()
+ public function getInsertId()
{
return $this->db->getInsertId();
}
@@ -366,20 +395,21 @@
/**
* Contact Prune Count
*/
- function Contact_PruneCount($timestamp, $onlyreply)
+ public ...
[truncated message content] |
