Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12958] XoopsModules/modulepacks/x257basicmodulepack/ branches/zyspec/contact
|
From: <zy...@us...> - 2015-01-31 15:28:35
|
Revision: 12958
http://sourceforge.net/p/xoops/svn/12958
Author: zyspec
Date: 2015-01-31 15:28:27 +0000 (Sat, 31 Jan 2015)
Log Message:
-----------
* fixed syntax error in ./ajax.php (extra apostrophy)
* minor code cleanup for PSRx naming nomenclature
Modified Paths:
--------------
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/admin_header.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/contact.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/index.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/log.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/menu.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/prune.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/ajax.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/blocks/stats.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/docs/changelog.txt
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/header.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/include/functions.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/include/waiting.plugin.php
XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/index.php
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/admin_header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/admin_header.php 2015-01-30 22:30:05 UTC (rev 12957)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/admin_header.php 2015-01-31 15:28:27 UTC (rev 12958)
@@ -22,8 +22,8 @@
* @version $Id$
*/
-$path = dirname(dirname(dirname(__DIR__)));
-require_once $path . '/mainfile.php';
+$xoopsPath = dirname(dirname(dirname(__DIR__)));
+require_once $xoopsPath . '/mainfile.php';
include_once $GLOBALS['xoops']->path('www/include/cp_functions.php');
include_once $GLOBALS['xoops']->path('www/include/cp_header.php');
include_once $GLOBALS['xoops']->path('www/class/pagenav.php');
@@ -31,12 +31,12 @@
xoops_load('XoopsRequest');
-$thisModuleDir = $GLOBALS['xoopsModule']->getVar('dirname');
+$moduleDirname = $GLOBALS['xoopsModule']->getVar('dirname');
// Load language files
-xoops_loadLanguage('admin', $thisModuleDir);
-xoops_loadLanguage('modinfo', $thisModuleDir);
-xoops_loadLanguage('main', $thisModuleDir);
+xoops_loadLanguage('admin', $moduleDirname);
+xoops_loadLanguage('modinfo', $moduleDirname);
+xoops_loadLanguage('main', $moduleDirname);
$pathIcon16 = $GLOBALS['xoops']->url('www/' . $GLOBALS['xoopsModule']->getInfo('icons16'));
$pathIcon32 = $GLOBALS['xoops']->url('www/' . $GLOBALS['xoopsModule']->getInfo('icons32'));
@@ -45,5 +45,5 @@
$admin_class = new ModuleAdmin();
// Contact Module specific pieces
-include_once $GLOBALS['xoops']->path("/modules/{$thisModuleDir}/include/functions.php");
-$contact_handler =& xoops_getModuleHandler('contact', $thisModuleDir);
+include_once $GLOBALS['xoops']->path("/modules/{$moduleDirname}/include/functions.php");
+$contactHandler =& xoops_getModuleHandler('contact', $moduleDirname);
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/contact.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/contact.php 2015-01-30 22:30:05 UTC (rev 12957)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/contact.php 2015-01-31 15:28:27 UTC (rev 12958)
@@ -29,21 +29,22 @@
// Define default value
$op = XoopsRequest::getString('op', 'list');
$contactId = XoopsRequest::getInt('id', '0');
-$level = '';
+$level = '';
// Define scripts
$xoTheme->addScript('browse.php?Frameworks/jquery/jquery.js');
$xoTheme->addScript('browse.php?Frameworks/jquery/plugins/jquery.ui.js');
$xoTheme->addScript($GLOBALS['xoops']->url('www/modules/contact/assets/js/admin.js'));
+
// Add module stylesheet
$xoTheme->addStylesheet($GLOBALS['xoops']->url('www/modules/contact/assets/css/admin.css'));
//add system module stylesheets
-$module_handler =& xoops_gethandler('module');
-$systemModule =& $module_handler->getByDirname('system');
-$config_handler =& xoops_gethandler('config');
+$moduleHandler =& xoops_gethandler('module');
+$systemModule =& $moduleHandler->getByDirname('system');
+$configHandler =& xoops_gethandler('config');
if ($systemModule instanceof XoopsModule) {
- $moduleConfig =& $config_handler->getConfigsByCat(0, $systemModule->getVar('mid'));
+ $moduleConfig =& $configHandler->getConfigsByCat(0, $systemModule->getVar('mid'));
if (isset($moduleConfig['jquery_theme'])) {
$xoTheme->addStylesheet($GLOBALS['xoops']->url("www/modules/system/css/ui/{$moduleConfig['jquery_theme']}/ui.all.css"));
}
@@ -60,8 +61,8 @@
$pageSettingsObj->limit = XoopsRequest::getInt('limit', $pageSettingsObj->perpage);
$pageSettingsObj->start = XoopsRequest::getInt('start', 0);
- $contactCount = $contact_handler->contactGetCount('contact_cid'); //count all contacts
- $contacts = $contact_handler->getAdminList($pageSettingsObj, 'contact_cid');
+ $contactCount = $contactHandler->contactGetCount('contact_cid'); //count all contacts
+ $contacts = $contactHandler->getAdminList($pageSettingsObj, 'contact_cid');
if ($contactCount > $pageSettingsObj->limit) {
$contactPageNavObj = new XoopsPageNav($contactCount, $pageSettingsObj->limit, $pageSettingsObj->start, 'start', 'limit=' . $pageSettingsObj->limit);
@@ -79,14 +80,14 @@
case 'reply':
if ($contactId > 0) {
- $obj = $contact_handler->get($contactId);
+ $obj = $contactHandler->get($contactId);
if (!($obj instanceof contact) || (0 != $obj->getVar('contact_cid'))) {
redirect_header($_SERVER['PHP_SELF'], 3, _AM_CONTACT_REPLY_CANT);
}
$form = $obj->replyForm();
$GLOBALS['xoopsTpl']->assign(array('replyform' => $form->render(),
- 'replylist' => $contact_handler->contactGetReply($contactId),
+ 'replylist' => $contactHandler->contactGetReply($contactId),
'use_depts' => $GLOBALS['xoopsModuleConfig']['form_dept'] ? 1 : 0,
)
);
@@ -97,7 +98,7 @@
break;
case 'doreply':
- $formInput = $contact_handler->infoProcessing('POST');
+ $formInput = $contactHandler->infoProcessing('POST');
$mailObj = (object) $formInput;
unset($formInput);
$deptEmails = array();
@@ -109,23 +110,23 @@
}
// verify valid message body
- $mailObj->contact_message = $contact_handler->replyBodyFormat($mailObj, (bool) $mailObj->inc_orig);
+ $mailObj->contact_message = $contactHandler->replyBodyFormat($mailObj, (bool) $mailObj->inc_orig);
if ($mailObj->contact_message) {
// successfully retrieved message body so insert into dB
if ($saveinfo = true) {
- $contactObj = $contact_handler->create();
+ $contactObj = $contactHandler->create();
$contactObj->prepareToInsert($mailObj);
- if (!$contact_handler->insert($contactObj)) {
+ if (!$contactHandler->insert($contactObj)) {
redirect_header($_SERVER['PHP_SELF'], 3, _AM_CONTACT_MSG_NOTSAVED);
}
- $contact_handler->contactAddReply($contactObj->getVar('contact_cid'));
+ $contactHandler->contactAddReply($contactObj->getVar('contact_cid'));
} else {
$message[] = _AM_CONTACT_MSG_NOTSAVED; // did not save message
}
// send mail can send message if $sendmail = true
if ($sendmail = true) {
- $message[] = $contact_handler->contactReplyMail($mailObj);
+ $message[] = $contactHandler->contactReplyMail($mailObj);
} elseif ($saveinfo = true) {
$message = _MD_CONTACT_MES_SAVEINDB;
} else {
@@ -143,7 +144,7 @@
break;
case 'view':
- $obj = $contact_handler->get($contactId);
+ $obj = $contactHandler->get($contactId);
if (!$obj) {
redirect_header($_SERVER['PHP_SELF'], 3, _AM_CONTACT_MSG_NOTEXIST);
@@ -157,7 +158,7 @@
$GLOBALS['xoopsTpl']->assign(array('use_depts' => $GLOBALS['xoopsModuleConfig']['form_dept'] ? 1 : 0,
'contact' => $contact,
- 'replylist' => $contact_handler->contactGetReply($contactId))
+ 'replylist' => $contactHandler->contactGetReply($contactId))
);
$level = 'view';
@@ -189,7 +190,7 @@
$criteria = new CriteriaCompo ();
$criteria->add(new Criteria ('contact_id', $contactId)); //messages
$criteria->add(new Criteria ('contact_cid', $contactId), 'OR'); //replies
- $msg = (!$contact_handler->deleteAll($criteria)) ? _AM_CONTACT_MSG_DELETEERROR : _AM_CONTACT_MSG_DELETED;
+ $msg = (!$contactHandler->deleteAll($criteria)) ? _AM_CONTACT_MSG_DELETEERROR : _AM_CONTACT_MSG_DELETED;
}
redirect_header($_SERVER['PHP_SELF'], 3, $msg);
break;
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/index.php 2015-01-30 22:30:05 UTC (rev 12957)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/index.php 2015-01-31 15:28:27 UTC (rev 12958)
@@ -34,16 +34,16 @@
$criteria->add(new Criteria('contact_cid', 0));
$criteria->add(new Criteria('contact_reply', 0));
$criteria->add(new Criteria('contact_type', 'Contact'));
-$admin_class->addInfoBoxLine(_AM_CONTACT_INDEX_ADMENU1, _AM_CONTACT_INDEX_NOREPLIES, $contact_handler->getCount($criteria));
+$admin_class->addInfoBoxLine(_AM_CONTACT_INDEX_ADMENU1, _AM_CONTACT_INDEX_NOREPLIES, $contactHandler->getCount($criteria));
// Display total number of messages
-$admin_class->addInfoBoxLine(_AM_CONTACT_INDEX_ADMENU1, _AM_CONTACT_INDEX_TOTAL, $contact_handler->contactGetCount('contact_cid'));
+$admin_class->addInfoBoxLine(_AM_CONTACT_INDEX_ADMENU1, _AM_CONTACT_INDEX_TOTAL, $contactHandler->contactGetCount('contact_cid'));
// Display total number of replies
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('contact_cid', 0, '<>'));
$criteria->add(new Criteria('contact_reply', 0));
-$admin_class->addInfoBoxLine(_AM_CONTACT_INDEX_ADMENU1, _AM_CONTACT_INDEX_REPLIES, $contact_handler->getCount($criteria));
+$admin_class->addInfoBoxLine(_AM_CONTACT_INDEX_ADMENU1, _AM_CONTACT_INDEX_REPLIES, $contactHandler->getCount($criteria));
$GLOBALS['xoopsTpl']->assign('navigation', $admin_class->addNavigation('index.php'));
$GLOBALS['xoopsTpl']->assign('renderindex', $admin_class->renderIndex());
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/log.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/log.php 2015-01-30 22:30:05 UTC (rev 12957)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/log.php 2015-01-31 15:28:27 UTC (rev 12958)
@@ -32,7 +32,7 @@
switch ($op) {
case 'form':
// log manager
- $log_count = $contact_handler->getCount();
+ $log_count = $contactHandler->getCount();
if ($log_count) {
$form = new XoopsThemeForm(_AM_CONTACT_LOGS_FORM, 'logs', 'log.php', 'post', true);
$column = new XoopsFormSelect(_AM_CONTACT_LOGS_COLUMN, 'column', 'contact_mail');
@@ -75,7 +75,7 @@
$valid_column = in_array(trim($column), array('contact_icq', 'contact_mail', 'contact_phone', 'contact_url'));
$column = ($valid_column) ? trim($column) : 'contact_mail';
$timestamp = XoopsRequest::getString('timestamp', formatTimestamp(xoops_getUserTimestamp(time()), 's'), 'POST');
- $log = $contact_handler->contactLogs($column, $timestamp);
+ $log = $contactHandler->contactLogs($column, $timestamp);
if (!$log) {
$log = array(_AM_CONTACT_LOGS_NOTHING_HERE);
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/menu.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/menu.php 2015-01-30 22:30:05 UTC (rev 12957)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/menu.php 2015-01-31 15:28:27 UTC (rev 12958)
@@ -24,35 +24,33 @@
// defined("XOOPS_ROOT_PATH") || exit("Restricted access");
-$module_handler = xoops_gethandler('module');
-$module = $module_handler->getByDirname(basename(dirname(__DIR__)));
-$pathIcon32 = '../../' . $module->getInfo('icons32');
+$moduleHandler = xoops_gethandler('module');
+$module = $moduleHandler->getByDirname(basename(dirname(__DIR__)));
+$pathIcon32 = '../../' . $module->getInfo('icons32');
xoops_loadLanguage('modinfo', $module->dirname());
-$adminmenu = array();
+$adminmenu = array(array('title' => _MI_CONTACT_MENU_HOME,
+ 'link' => "admin/index.php",
+ 'desc' => _MI_CONTACT_MENU_HOME_DESC,
+ 'icon' => "{$pathIcon32}/home.png"),
-$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_PRUNE;
-$adminmenu[$i]["link"] = "admin/prune.php";
-$adminmenu[$i]["desc"] = _MI_CONTACT_MENU_PRUNE_DESC;
-$adminmenu[$i]["icon"] = "{$pathIcon32}/prune.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";
+ array('title' => _MI_CONTACT_MENU_CONTACT,
+ 'link' => "admin/contact.php",
+ 'desc' => _MI_CONTACT_MENU_CONTACT_DESC,
+ 'icon' => "{$pathIcon32}/content.png"),
+
+ array('title' => _MI_CONTACT_MENU_LOGS,
+ 'link' => "admin/log.php",
+ 'desc' => _MI_CONTACT_MENU_LOGS_DESC,
+ 'icon' => "{$pathIcon32}/exec.png"),
+
+ array('title' => _MI_CONTACT_MENU_PRUNE,
+ 'link' => "admin/prune.php",
+ 'desc' => _MI_CONTACT_MENU_PRUNE_DESC,
+ 'icon' => "{$pathIcon32}/prune.png"),
+
+ array('title' => _MI_CONTACT_MENU_ABOUT,
+ 'link' => "admin/about.php",
+ 'desc' => _MI_CONTACT_MENU_ABOUT_DESC,
+ 'icon' => "{$pathIcon32}/about.png")
+);
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/prune.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/prune.php 2015-01-30 22:30:05 UTC (rev 12957)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/admin/prune.php 2015-01-31 15:28:27 UTC (rev 12958)
@@ -35,7 +35,7 @@
default:
// prune manager
// check to see if there are any items in the dB
- $contact_count = $contact_handler->getCount();
+ $contact_count = $contactHandler->getCount();
if ($contact_count) {
$form = new XoopsThemeForm(_AM_CONTACT_PRUNE_PRUNE, 'prune', 'prune.php', 'post', true);
$form->addElement(new XoopsFormTextDateSelect(_AM_CONTACT_PRUNE_BEFORE, 'prune_date', 15, xoops_getUserTimestamp(time())));
@@ -90,9 +90,9 @@
$timeRequest = XoopsRequest::getString('prune_date', 0);
$timestamp = ($timeRequest) ? strtotime($timeRequest) : xoops_getUserTimestamp(time());
$onlyreply = XoopsRequest::getBool('onlyreply', false, 'POST');
-// $timestamp = $contact_handler->contactCleanVars($_POST, 'prune_date', xoops_getUserTimestamp(time()), 'date');
-// $onlyreply = (bool) $contact_handler->contactCleanVars($_POST, 'onlyreply', 0, 'int');
- $count = (int) $contact_handler->deleteBeforeDate($timestamp, $onlyreply);
+// $timestamp = $contactHandler->contactCleanVars($_POST, 'prune_date', xoops_getUserTimestamp(time()), 'date');
+// $onlyreply = (bool) $contactHandler->contactCleanVars($_POST, 'onlyreply', 0, 'int');
+ $count = (int) $contactHandler->deleteBeforeDate($timestamp, $onlyreply);
redirect_header('prune.php', 2, sprintf(_AM_CONTACT_MSG_PRUNE_DELETED, $count));
xoops_cp_footer();
exit ();
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/ajax.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/ajax.php 2015-01-30 22:30:05 UTC (rev 12957)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/ajax.php 2015-01-31 15:28:27 UTC (rev 12958)
@@ -25,13 +25,13 @@
if (!empty($_POST)) {
// Info Processing
- $mailFormContents = $contact_handler->infoProcessing('POST'');
+ $mailFormContents = $contactHandler->infoProcessing('POST');
$mailObj = (object) $mailFormContents;
// Save info
- $contactObj = $contact_handler->create();
+ $contactObj = $contactHandler->create();
$contactObj->prepareToInsert($mailObj);
// $contentObj->setVars($contact);
- $contact_handler->insert($contactObj);
+ $contactHandler->insert($contactObj);
// send mail can send message
- $message = $contact_handler->contactSendMail($mailObj);
+ $message = $contactHandler->contactSendMail($mailObj);
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/blocks/stats.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/blocks/stats.php 2015-01-30 22:30:05 UTC (rev 12957)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/blocks/stats.php 2015-01-31 15:28:27 UTC (rev 12958)
@@ -39,38 +39,30 @@
*/
function b_contact_stats_show($options)
{
- $dirname = basename(dirname(__DIR__));
+ $moduleDirname = basename(dirname(__DIR__));
$block = array();
- $contact_handler =& xoops_getmodulehandler('contact', $dirname);
+ $contactHandler =& xoops_getmodulehandler('contact', $moduleDirname);
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('contact_cid', 0));
$criteria->add(new Criteria('contact_type', 'Contact'));
$criteria->setGroupby('contact_reply');
- $msgCountArray = $contact_handler->getCounts($criteria);
+ $msgCountArray = $contactHandler->getCounts($criteria);
if ((is_array($msgCountArray) && count($msgCountArray) > 0)) {
$block['noreplies'] = (isset($msgCountArray[0])) ? $msgCountArray[0] : 0;
$block[ 'replies'] = (isset($msgCountArray[1])) ? $msgCountArray[1] : 0;
$block[ 'total'] = $block['noreplies'] + $block['replies'];
// if using departments show number of contacts per department
- include_once $GLOBALS['xoops']->path( "modules/{$dirname}/include/functions.php");
-// include_once '../include/functions.php';
+ include_once $GLOBALS['xoops']->path( "modules/{$moduleDirname}/include/functions.php");
$moduleMgr = contactGetModuleManager();
-/*
- $module_handler =& xoops_gethandler('module');
- $module =& $module_handler->getByDirname($dirname);
- $config_handler =& xoops_gethandler('config');
- $contactConfig =& $config_handler->getConfigsByCat(0, $module->getVar('mid'));
- if ($contactConfig['form_dept']) {
-*/
if ($moduleMgr->config['form_dept']) {
$criteria = new CriteriaCompo();
$criteria->add(new Criteria('contact_cid', 0));
$criteria->add(new Criteria('contact_type', 'Contact'));
$criteria->setGroupby('contact_department');
- $depts = $contact_handler->getCounts($criteria);
+ $depts = $contactHandler->getCounts($criteria);
if ((is_array($depts) && count($depts) > 0)) {
$block['depts'] = $depts;
}
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/docs/changelog.txt
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/docs/changelog.txt 2015-01-30 22:30:05 UTC (rev 12957)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/docs/changelog.txt 2015-01-31 15:28:27 UTC (rev 12958)
@@ -8,6 +8,7 @@
- Changed "Submitter" information in admin to be able to email from contact page
- Improved ContactContact->contactSendMail() method to improve anti-spam score
- Removed unnecessary exit() statement after redirect_header() calls
+- minor code cleanup for PSRx naming nomenclature
<u>Version 1.82 Beta 2 from 2014-12-03</u>
- Replaced ContactContactHandler->contactCleanVars function with XoopsRequest
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/header.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/header.php 2015-01-30 22:30:05 UTC (rev 12957)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/header.php 2015-01-31 15:28:27 UTC (rev 12958)
@@ -25,4 +25,4 @@
include $GLOBALS['xoops']->path('www/modules/contact/class/contact.php');
include_once $GLOBALS['xoops']->path('www/class/xoopsformloader.php');
-$contact_handler =& xoops_getModuleHandler('contact', 'contact');
+$contactHandler =& xoops_getModuleHandler('contact', 'contact');
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/include/functions.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/include/functions.php 2015-01-30 22:30:05 UTC (rev 12957)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/include/functions.php 2015-01-31 15:28:27 UTC (rev 12958)
@@ -27,9 +27,9 @@
*
* Get an array of all department names and emails
*
- *@param bool $email_as_key true: use email as array key, false: don't
+ * @param bool $email_as_key true: use email as array key, false: don't
* @uses MyTextSanitizer
- * @uses xoops_gethandler
+ * @uses contactGetModuleManager
* @uses checkEmail
* @return array with 'name' and 'email' keys
*/
@@ -37,20 +37,10 @@
{
$moduleMgr = contactGetModuleManager();
$departments = array();
-/*
- //get the configs for this module
- $module_handler =& xoops_gethandler('module');
- $config_handler =& xoops_gethandler('config');
- $contactModule =& $module_handler->getByDirname('contact');
- $contactConfig =& $config_handler->getConfigsByCat(0, $contactModule->getVar('mid'));
-
- if ($contactConfig['form_dept']) { // using departments
-*/
if ($moduleMgr->config['form_dept']) { // using departments
// show a drop down with the correct departments listed
$myts =& MyTextSanitizer::getInstance();
$depts = $moduleMgr->config['contact_dept'];
-// $depts = explode('|', $contactConfig['contact_dept']);
foreach ($depts as $thisDept) {
list($name, $email) = explode(',', $thisDept, 2); //split the name and email
if (checkEmail($email)) {
@@ -80,15 +70,6 @@
{
$moduleMgr = contactGetModuleManager();
$dept_emails = array();
-/*
- //get the configs for this module
- $module_handler =& xoops_gethandler('module');
- $config_handler =& xoops_gethandler('config');
- $contactModule =& $module_handler->getByDirname('contact');
- $contactConfig =& $config_handler->getConfigsByCat(0, $contactModule->getVar('mid'));
-
- if ($contactConfig['form_dept']) { // using departments
-*/
if ($moduleMgr->config['form_dept']) { // using departments
$departments = contactGetDepartments();
$dept_emails = array();
@@ -112,15 +93,6 @@
{
$moduleMgr = contactGetModuleManager();
$dept_names = array();
-/*
- //get the configs for this module
- $module_handler =& xoops_gethandler('module');
- $config_handler =& xoops_gethandler('config');
- $contactModule =& $module_handler->getByDirname('contact');
- $contactConfig =& $config_handler->getConfigsByCat(0, $contactModule->getVar('mid'));
-
- if ($contactConfig['form_dept']) { // using departments
-*/
if ($moduleMgr->config['form_dept']) {
$departments = contactGetDepartments();
$dept_names = array();
@@ -135,24 +107,26 @@
*
* Get the Module handlers & configs
*
- * @return array module_handler, config_handler, module, config
+ * @return array moduleHandler, configHandler, module, config
* @see XoopsModule
* @see XoopsConfigHandler
* @see XoopsModuleHandler
+ * @uses xoops_gethandler
*
* @return object moduleMgr {@see stdClass}
- * with module_handler, config_handler, module, moduleConfigs properties
+ * with moduleHandler, configHandler, module, moduleConfigs properties
*/
function contactGetModuleManager()
{
static $moduleMgr;
if (!isset($moduleMgr)) {
+ $moduleDirname = basename(dirname(__DIR__));
+
$moduleMgr = new stdClass();
- $moduleMgr->module_handler =& xoops_gethandler('module');
- $moduleMgr->config_handler =& xoops_gethandler('config');
- $moduleMgr->module =& $moduleMgr->module_handler->getByDirname('contact');
- $moduleMgr->config =& $moduleMgr->config_handler->getConfigsByCat(0, $moduleMgr->module->getVar('mid'));
-
+ $moduleMgr->moduleHandler =& xoops_gethandler('module');
+ $moduleMgr->configHandler =& xoops_gethandler('config');
+ $moduleMgr->module =& $moduleMgr->moduleHandler->getByDirname($moduleDirname);
+ $moduleMgr->config =& $moduleMgr->configHandler->getConfigsByCat(0, $moduleMgr->module->getVar('mid'));
}
return $moduleMgr;
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/include/waiting.plugin.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/include/waiting.plugin.php 2015-01-30 22:30:05 UTC (rev 12957)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/include/waiting.plugin.php 2015-01-31 15:28:27 UTC (rev 12958)
@@ -25,21 +25,22 @@
{
// $contactDB =& XoopsDatabaseFactory::getDatabaseConnection();
+ $moduleDirname = basename(dirname(__DIR__));
+
$block = array();
+ $moduleHandler =& xoops_gethandler('module');
+ $contactModule =& $moduleHandler->getByDirname($moduleDirname);
+// $configHandler =& xoops_gethandler('config');
+// $contactModuleConfigs =& $configHandler->getConfigsByCat(0, $contactModule->getVar('mid'));
- $module_handler =&xoops_gethandler('module');
- $contactModule =&$module_handler->getByDirname('contact');
- $config_handler =& xoops_gethandler('config');
- $contactModuleConfigs =& $config_handler->getConfigsByCat(0, $contactModule->getVar('mid'));
-
//check to see if module is active, return if not...
if ($contactModule->isactive()) {
// setup the contact messages
- $contact_handler = & xoops_getModuleHandler('contact', $contactModule->dirname());
+ $contactHandler = & xoops_getModuleHandler('contact', $contactModule->dirname());
$criteria = new CriteriaCompo();
- $criteria->add(new Criteria('contact_cid', 0, '=')); //don't include replies
+ $criteria->add(new Criteria('contact_cid', 0, '=')); //don't include replies
$criteria->add(new Criteria('contact_reply', 0, '=')); // only include messages that haven't had a reply
- $messageCount = $contact_handler->getCount($criteria);
+ $messageCount = $contactHandler->getCount($criteria);
if ($messageCount) {
$block = array('adminlink' => $GLOBALS['xoops']->url("www/modules/" . $contactModule->dirname() . "/admin/contact.php"),
'pendingnum' => $messageCount,
Modified: XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/index.php
===================================================================
--- XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/index.php 2015-01-30 22:30:05 UTC (rev 12957)
+++ XoopsModules/modulepacks/x257basicmodulepack/branches/zyspec/contact/index.php 2015-01-31 15:28:27 UTC (rev 12958)
@@ -30,8 +30,8 @@
$op = XoopsRequest::getCmd('op', 'form', 'POST');
$department = XoopsRequest::getString('contact_department', '', 'GET');
-//$op = $contact_handler->contactCleanVars($_POST, 'op', 'form', 'string');
-//$department = $contact_handler->contactCleanVars($_GET, 'contact_department', '', 'string');
+//$op = $contactHandler->contactCleanVars($_POST, 'op', 'form', 'string');
+//$department = $contactHandler->contactCleanVars($_GET, 'contact_department', '', 'string');
switch ($op) {
case 'save':
@@ -67,14 +67,14 @@
// check email
$input_mail = XoopsRequest::getString('contact_mail', '', 'POST');
$contact_mail = checkEmail($input_mail);
-// $contact_mail = $contact_handler->contactCleanVars($_POST, 'contact_mail', '', 'mail');
+// $contact_mail = $contactHandler->contactCleanVars($_POST, 'contact_mail', '', 'mail');
if (empty($contact_mail)) {
redirect_header($_SERVER['PHP_SELF'], 2, _MD_CONTACT_MES_NOVALIDEMAIL);
// redirect_header("javascript:history.go(-1)", 2, _MD_CONTACT_MES_NOVALIDEMAIL);
} elseif (!$GLOBALS['xoopsUser'] && $GLOBALS['xoopsModuleConfig']['form_req_email2']) {
$input_mail2 = XoopsRequest::getString('contact_mail2', '', 'POST');
$contact_mail2 = checkEmail($input_mail2);
-// $contact_mail2 = $contact_handler->contactCleanVars($_POST, 'contact_mail2', '', 'mail');
+// $contact_mail2 = $contactHandler->contactCleanVars($_POST, 'contact_mail2', '', 'mail');
if (empty($contact_mail2)) {
redirect_header($_SERVER['PHP_SELF'], 2, _MD_CONTACT_MES_NOVALIDEMAIL2);
// redirect_header("javascript:history.go(-1)", 2, _MD_CONTACT_MES_NOVALIDEMAIL);
@@ -85,20 +85,20 @@
}
// Info Processing
- $mailFormResults = $contact_handler->infoProcessing('POST');
+ $mailFormResults = $contactHandler->infoProcessing('POST');
$mailObj = (object) $mailFormResults;
// insert in DB
if ($saveinfo = true) {
- $contactObj = $contact_handler->create();
+ $contactObj = $contactHandler->create();
$contactObj->prepareToInsert($mailObj);
- if (!$contact_handler->insert($contactObj)) {
+ if (!$contactHandler->insert($contactObj)) {
redirect_header('index.php', 3, _MD_CONTACT_MES_NOTSAVE);
}
}
// send mail can send message
if ($sendmail = true) {
- $message = $contact_handler->contactSendMail($mailObj);
+ $message = $contactHandler->contactSendMail($mailObj);
} elseif ($saveinfo = true) {
$message = _MD_CONTACT_MES_SAVEINDB;
} else {
@@ -112,7 +112,7 @@
case 'form';
default:
- $contactObj = $contact_handler->create();
+ $contactObj = $contactHandler->create();
$form = $contactObj->contactForm();
$GLOBALS['xoopsTpl']->assign(array('form' => $form->render(),
'breadcrumb' => '<a href="' . $GLOBALS['xoops']->url('www') . '">' . _YOURHOME . '</a> » ' . $GLOBALS['xoopsModule']->name(),
|
