Menu
▾
▴
xoops-svn
|
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 ...
[truncated message content] |
|
From: <be...@us...> - 2014-09-28 13:36:07
|
Revision: 12800
http://sourceforge.net/p/xoops/svn/12800
Author: beckmi
Date: 2014-09-28 13:35:54 +0000 (Sun, 28 Sep 2014)
Log Message:
-----------
replaced "dirname(__FILE__)" with "__DIR__"
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/about.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/admin_header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/contact.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/log.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/header.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/index.php
XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/xoops_version.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/about.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/about.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/about.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/admin_header.php';
+require __DIR__ . '/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.tpl');
// Call footer
-require dirname(__FILE__) . '/admin_footer.php';
+require __DIR__ . '/admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/admin_header.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/admin_header.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -20,7 +20,7 @@
* @version $Id$
*/
-$path = dirname(dirname(dirname(dirname(__FILE__))));
+$path = dirname(dirname(dirname(__DIR__)));
include_once $path . '/mainfile.php';
include_once XOOPS_ROOT_PATH . '/include/cp_functions.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/contact.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/contact.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/contact.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/admin_header.php';
+require __DIR__ . '/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.tpl');
// Call footer
-require dirname(__FILE__) . '/admin_footer.php';
+require __DIR__ . '/admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/index.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/index.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/admin_header.php';
+require __DIR__ . '/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.tpl');
// Call footer
-require dirname(__FILE__) . '/admin_footer.php';
+require __DIR__ . '/admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/log.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/log.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/log.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/admin_header.php';
+require __DIR__ . '/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.tpl');
// Call footer
-require dirname(__FILE__) . '/admin_footer.php';
+require __DIR__ . '/admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/menu.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/menu.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/menu.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -20,10 +20,10 @@
* @version $Id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
$module_handler = xoops_gethandler('module');
-$module = $module_handler->getByDirname(basename(dirname(dirname(__FILE__))));
+$module = $module_handler->getByDirname(basename(dirname(__DIR__)));
$pathIcon32 = '../../' . $module->getInfo('icons32');
xoops_loadLanguage('modinfo', $module->dirname());
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/tools.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/tools.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/admin/tools.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -21,7 +21,7 @@
*/
// Call header
-require dirname(__FILE__) . '/admin_header.php';
+require __DIR__ . '/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.tpl');
// Call footer
-require dirname(__FILE__) . '/admin_footer.php';
+require __DIR__ . '/admin_footer.php';
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/ajax.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/ajax.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/ajax.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -20,7 +20,7 @@
* @version $Id$
*/
-include 'header.php';
+include __DIR__ . '/header.php';
if (!empty($_POST)) {
// Info Processing
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/class/contact.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/class/contact.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/class/contact.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -20,9 +20,7 @@
* @version $Id$
*/
-if (!defined("XOOPS_ROOT_PATH")) {
- die("XOOPS root path not defined");
-}
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
class contact extends XoopsObject
{
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/header.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/header.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -20,7 +20,7 @@
* @version $Id$
*/
-include '../../mainfile.php';
+include dirname(dirname(__DIR__)) . '/mainfile.php';
include XOOPS_ROOT_PATH . "/modules/contact/class/contact.php";
include_once XOOPS_ROOT_PATH . "/class/xoopsformloader.php";
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/index.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/index.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -20,8 +20,8 @@
* @version $Id$
*/
-include 'header.php';
-$xoopsOption['template_main'] = 'contact_index.html';
+include __DIR__ . '/header.php';
+$xoopsOption['template_main'] = 'contact_index.tpl';
//unset($_SESSION);
include XOOPS_ROOT_PATH . "/header.php";
@@ -44,7 +44,7 @@
|| ($xoopsUser && !$xoopsUserIsAdmin && $xoopsModuleConfig['captchaRegistered'])
) {
// Verify entered code
-
+
xoops_load('XoopsCaptcha');
if (class_exists('XoopsFormCaptcha')) {
$xoopsCaptcha = XoopsCaptcha::getInstance();
Modified: XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/xoops_version.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/xoops_version.php 2014-09-23 20:07:56 UTC (rev 12799)
+++ XoopsModules/modulepacks/x257basicmodulepack/trunk/modules/contact/xoops_version.php 2014-09-28 13:35:54 UTC (rev 12800)
@@ -20,9 +20,9 @@
* @version $Id$
*/
-defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
+// defined('XOOPS_ROOT_PATH') || die('XOOPS root path not defined');
-$moduleDirName = basename(dirname(__FILE__));
+$moduleDirName = basename(__DIR__);
$modversion['name'] = _MI_CONTACT_NAME;
$modversion['version'] = 1.81;
@@ -35,7 +35,7 @@
$modversion['license_url'] = "www.gnu.org/licenses/gpl-2.0.html";
$modversion['official'] = 1;
$modversion['image'] = "assets/images/contact_slogo.png";
-$modversion['dirname'] = basename(dirname(__FILE__));
+$modversion['dirname'] = $moduleDirName;
$modversion['onUpdate'] = 'include/functions_update.php';
$modversion['dirmoduleadmin'] = 'Frameworks/moduleclasses';
$modversion['icons16'] = 'Frameworks/moduleclasses/icons/16';
@@ -46,8 +46,8 @@
$modversion['tables'][0] = "contact";
//about
-$modversion["module_status"] = "Beta 1";
-$modversion["release_date"] = "2014/04/23";
+$modversion["module_status"] = "Beta 2";
+$modversion["release_date"] = "2014/09/23";
$modversion["module_website_url"] = "http://www.xoops.org/";
$modversion["module_website_name"] = "XOOPS";
$modversion["author_website_url"] = "http://www.xoops.org/";
|
Thanks for helping keep SourceForge clean.
X