Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12414] XoopsModules/xnewsletter/branches/luciorota/ xNewsletter
|
From: <luc...@us...> - 2014-03-28 20:12:27
|
Revision: 12414
http://sourceforge.net/p/xoops/svn/12414
Author: luciorota
Date: 2014-03-28 20:12:18 +0000 (Fri, 28 Mar 2014)
Log Message:
-----------
standardize module (IN PROGRESS)
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/admin_footer.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/admin_header.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/attachment.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh_callback_database.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/cat.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/index.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/maintenance.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/menu.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/sendletter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/subscr.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/task.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/blocks/blocks_letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_accounts.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_attachment.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_bmh.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_cat.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_import.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_protocol.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_subscr.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_task.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/cron.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/docs/changelog.txt
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/footer.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/header.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/common.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/config.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/functions.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/task.inc.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/index.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/help/help.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/language/english/modinfo.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/csv.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/evennews.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/rmbulletin.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/smartpartner.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/subscribers.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/weblinks.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/xoopsuser.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/print.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/sendletter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/subscription.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_index_list_letters.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_letters.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_subscrs.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_protocol.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_subscription_list_subscriptions.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_subscription_result.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php 2014-03-27 14:28:58 UTC (rev 12413)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php 2014-03-28 20:12:18 UTC (rev 12414)
@@ -42,8 +42,8 @@
{
case "check_account":
- $img_ok = "<img src='".XNEWSLETTER_ICON."/xn_ok.png' alt='"._AM_XNEWSLETTER_OK."' title='"._AM_XNEWSLETTER_OK."' /> ";
- $img_failed = "<img src='".XNEWSLETTER_ICON."/xn_failed.png' alt='"._AM_XNEWSLETTER_FAILED."' title='"._AM_XNEWSLETTER_FAILED."' /> ";
+ $img_ok = "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_ok.png' alt='" . _AM_XNEWSLETTER_OK . "' title='"._AM_XNEWSLETTER_OK . "' /> ";
+ $img_failed = "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_failed.png' alt='" . _AM_XNEWSLETTER_FAILED . "' title='" . _AM_XNEWSLETTER_FAILED . "' /> ";
echo $indexAdmin->addNavigation("accounts.php");
$indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
@@ -52,7 +52,7 @@
if ($accounts_id == 0) {
redirect_header("accounts.php", 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
} else {
- $obj_account =& $accountsHandler->get($accounts_id);
+ $obj_account =& $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
}
$mailhost = $obj_account->getVar("accounts_server_in");
@@ -188,11 +188,11 @@
$criteria = new CriteriaCompo();
$criteria->setSort("accounts_id ASC, accounts_type");
$criteria->setOrder("ASC");
- $numrows = $accountsHandler->getCount();
+ $numrows = $xnewsletter->getHandler('xNewsletter_accounts')->getCount();
$start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
$criteria->setStart($start);
$criteria->setLimit($limit);
- $accounts_arr = $accountsHandler->getall($criteria);
+ $accounts_arr = $xnewsletter->getHandler('xNewsletter_accounts')->getall($criteria);
if ( $numrows > $limit ) {
include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
$pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
@@ -236,10 +236,10 @@
echo "<td class='center'>".$verif_accounts_default."</td>";
echo "<td class='center width5'>";
- echo " <a href='accounts.php?op=edit_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICON."/xn_edit.png alt='"._EDIT."' title='"._EDIT."' /></a>";
- echo " <a href='accounts.php?op=delete_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICON."/xn_delete.png alt='"._DELETE."' title='"._DELETE."' /></a>";
+ echo " <a href='accounts.php?op=edit_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_edit.png alt='"._EDIT."' title='"._EDIT."' /></a>";
+ echo " <a href='accounts.php?op=delete_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_delete.png alt='"._DELETE."' title='"._DELETE."' /></a>";
if ($accounts_arr[$i]->getVar("accounts_type") != _AM_ACCOUNTS_TYPE_VAL_PHP_MAIL && $accounts_arr[$i]->getVar("accounts_type") != _AM_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL) {
- echo " <a href='accounts.php?op=check_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICON."/xn_check.png alt='"._AM_ACCOUNTS_TYPE_CHECK."' title='"._AM_ACCOUNTS_TYPE_CHECK."' /></a>";
+ echo " <a href='accounts.php?op=check_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_check.png alt='"._AM_ACCOUNTS_TYPE_CHECK."' title='"._AM_ACCOUNTS_TYPE_CHECK."' /></a>";
}
echo "</td>";
echo "</tr>";
@@ -274,7 +274,7 @@
echo $indexAdmin->addNavigation("accounts.php");
$indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
echo $indexAdmin->renderButton();
- $obj =& $accountsHandler->create();
+ $obj = $xnewsletter->getHandler('xNewsletter_accounts')->create();
$obj = xNewsletter_setPost($obj,$_POST);
$form = $obj->getForm();
$form->display();
@@ -285,19 +285,19 @@
redirect_header("accounts.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- $obj =& $accountsHandler->get($accounts_id);
+ $obj =& $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
$_POST['accounts_id'] = $accounts_id;
$obj = xNewsletter_setPost($obj,$_POST);
$criteria = new CriteriaCompo();
$criteria->add(new Criteria("accounts_default", 1));
- $count_accounts_default = $accountsHandler->getCount($criteria);
+ $count_accounts_default = $xnewsletter->getHandler('xNewsletter_accounts')->getCount($criteria);
if ($count_accounts_default > 0) {
if ($obj->getVar("accounts_default") == 1) {
global $xoopsDB;
$verif_accounts_default = "1";
//reset old accounts_default
- $sql = "UPDATE `".$xoopsDB->prefix("mod_xnewsletter_accounts")."` SET `accounts_default` = '0'";
+ $sql = "UPDATE `{$xoopsDB->prefix("mod_xnewsletter_accounts")}` SET `accounts_default` = '0'";
$result= $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
} else {
$verif_accounts_default = "0";
@@ -307,7 +307,7 @@
}
$obj->setVar("accounts_default", $verif_accounts_default);
if ($obj->getVar("accounts_yourmail") != "" && $obj->getVar("accounts_yourmail") != _AM_ACCOUNTS_TYPE_YOUREMAIL ) {
- if ($accountsHandler->insert($obj)) {
+ if ($xnewsletter->getHandler('xNewsletter_accounts')->insert($obj)) {
if ($save_and_check == 'none') {
redirect_header("accounts.php?op=list", 2, _AM_XNEWSLETTER_FORMOK);
} else {
@@ -328,19 +328,19 @@
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, 'accounts.php?op=new_account', 'add');
$indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
echo $indexAdmin->renderButton();
- $obj = $accountsHandler->get($accounts_id);
+ $obj = $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
if ( !empty($_POST) ) xNewsletter_setPost($obj,$_POST);
$form = $obj->getForm();
$form->display();
break;
case "delete_account":
- $obj =& $accountsHandler->get($accounts_id);
+ $obj = $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
if (isset($_POST["ok"]) && $_POST["ok"] == "1") {
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
redirect_header("accounts.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- if ($accountsHandler->delete($obj)) {
+ if ($xnewsletter->getHandler('xNewsletter_accounts')->delete($obj)) {
redirect_header("accounts.php", 3, _AM_XNEWSLETTER_FORMDELOK);
} else {
echo $obj->getHtmlErrors();
@@ -351,5 +351,3 @@
break;
}
include "admin_footer.php";
-
-?>
\ No newline at end of file
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/admin_footer.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/admin_footer.php 2014-03-27 14:28:58 UTC (rev 12413)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/admin_footer.php 2014-03-28 20:12:18 UTC (rev 12414)
@@ -28,11 +28,11 @@
echo "
<br /><br /><div align='center'><a href='http://www.xoops.org' target='_blank'>
-<img src='" . XNEWSLETTER_ICON . "/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS' /></a>
+<img src='" . XNEWSLETTER_ICONS_URL . "/xoopsmicrobutton.gif' alt='XOOPS' title='XOOPS' /></a>
</div>";
echo "
<div class='center small italic pad5'>
-<strong>" . $xoopsModule->getVar('name') . "</strong> " . _AM_XNEWSLETTER_MAINTAINEDBY . "
+<strong>" . $xnewsletter->getModule()->getVar('name') . "</strong> " . _AM_XNEWSLETTER_MAINTAINEDBY . "
<a href='http://www.xoops.org' title='Visit' class='tooltip' rel='external'>XOOPS Community</a>
</div>";
xoops_cp_footer();
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/admin_header.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/admin_header.php 2014-03-27 14:28:58 UTC (rev 12413)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/admin_header.php 2014-03-28 20:12:18 UTC (rev 12414)
@@ -27,20 +27,29 @@
*/
include_once dirname(dirname(dirname(dirname(__FILE__)))) . '/mainfile.php';
+include_once dirname(dirname(__FILE__)) . '/include/common.php';
+
+// Include xoops admin header
include_once XOOPS_ROOT_PATH . "/include/cp_functions.php";
+/*
+$pathIcon16 = XOOPS_URL . '/' . $xnewsletter->getModule()->getInfo('icons16');
+$pathIcon32 = XOOPS_URL . '/' . $xnewsletter->getModule()->getInfo('icons32');
+$pathModuleAdmin = XOOPS_ROOT_PATH . '/' . $xnewsletter->getModule()->getInfo('dirmoduleadmin');
+require_once $pathModuleAdmin . '/moduleadmin/moduleadmin.php';
+*/
-$dirname = basename(dirname(dirname(__FILE__)));
+//$dirname = basename(dirname(dirname(__FILE__)));
-include_once XOOPS_ROOT_PATH . "/modules/" . $dirname . "/include/functions.php";
-include_once XOOPS_ROOT_PATH . "/modules/" . $dirname . "/include/config.php";
+//include_once XOOPS_ROOT_PATH . "/modules/" . $xnewsletter->getModule()->dirname() . "/include/functions.php";
+//include_once XOOPS_ROOT_PATH . "/modules/" . $xnewsletter->getModule()->dirname() . "/include/config.php";
-$module_handler =& xoops_gethandler('module');
-$xoopsModule = & $module_handler->getByDirname($dirname);
+//$module_handler =& xoops_gethandler('module');
+$xoopsModule = $xnewsletter->getModule();
//Load languages
-xoops_loadLanguage('admin', $dirname);
-xoops_loadLanguage('modinfo', $dirname);
-xoops_loadLanguage('main', $dirname);
+xoops_loadLanguage('admin', $xnewsletter->getModule()->dirname());
+xoops_loadLanguage('modinfo', $xnewsletter->getModule()->dirname());
+xoops_loadLanguage('main', $xnewsletter->getModule()->dirname());
if (!xNewsletter_checkModuleAdmin()) {
xoops_cp_header();
@@ -49,33 +58,15 @@
exit();
}
-$moduleInfo =& $module_handler->get($xoopsModule->getVar('mid'));
//$pathIcon = XOOPS_URL . "/modules/" . $dirname . "/images/icons";
$indexAdmin = new ModuleAdmin();
-global $xoopsModuleConfig;
-if (empty($xoopsModuleConfig)) {
- $config_handler =& xoops_gethandler("config");
- $xoopsModuleConfig =& $config_handler->getConfigsByCat(0, $xoopsModule->mid());
-}
+$myts = MyTextSanitizer::getInstance();
-$accountsHandler =& xoops_getModuleHandler('xNewsletter_accounts', $dirname);
-$catHandler =& xoops_getModuleHandler('xNewsletter_cat', $dirname);
-$subscrHandler =& xoops_getModuleHandler('xNewsletter_subscr', $dirname);
-$catsubscrHandler =& xoops_getModuleHandler('xNewsletter_catsubscr', $dirname);
-$letterHandler =& xoops_getModuleHandler('xNewsletter_letter', $dirname);
-$attachmentHandler =& xoops_getModuleHandler('xNewsletter_attachment', $dirname);
-$protocolHandler =& xoops_getModuleHandler('xNewsletter_protocol', $dirname);
-$mailinglistHandler =& xoops_getModuleHandler('xNewsletter_mailinglist', $dirname);
-$bmhHandler =& xoops_getModuleHandler('xNewsletter_bmh', $dirname);
-$importHandler =& xoops_getModuleHandler('xNewsletter_import', $dirname);
-$taskHandler =& xoops_getModuleHandler('xNewsletter_task', $dirname);
-$myts = MyTextSanitizer::getInstance();
-
if ($xoopsUser) {
$moduleperm_handler =& xoops_gethandler('groupperm');
- if (!$moduleperm_handler->checkRight('module_admin', $xoopsModule->getVar('mid'), $xoopsUser->getGroups())) {
+ if (!$moduleperm_handler->checkRight('module_admin', $xnewsletter->getModule()->mid(), $xoopsUser->getGroups())) {
redirect_header(XOOPS_URL, 1, _NOPERM);
exit();
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/attachment.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/attachment.php 2014-03-27 14:28:58 UTC (rev 12413)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/attachment.php 2014-03-28 20:12:18 UTC (rev 12414)
@@ -44,11 +44,11 @@
$criteria = new CriteriaCompo();
$criteria->setSort("attachment_letter_id DESC, attachment_id");
$criteria->setOrder("DESC");
- $numrows = $attachmentHandler->getCount();
+ $numrows = $xnewsletter->getHandler('xNewsletter_attachment')->getCount();
$start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
$criteria->setStart($start);
$criteria->setLimit($limit);
- $attachment_arr = $attachmentHandler->getall($criteria);
+ $attachment_arr = $xnewsletter->getHandler('xNewsletter_attachment')->getall($criteria);
if ($numrows > $limit) {
include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
$pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
@@ -79,7 +79,7 @@
$class = ($class == "even") ? "odd" : "even";
echo "<td class='center'>".$i."</td>";
- $letter =& $letterHandler->get($attachment_arr[$i]->getVar("attachment_letter_id"));
+ $letter =& $xnewsletter->getHandler('xNewsletter_letter')->get($attachment_arr[$i]->getVar("attachment_letter_id"));
$title_letter = $letter->getVar("letter_title");
echo "<td class='center'>" . $title_letter . "</td>";
echo "<td class='center'>" . $attachment_arr[$i]->getVar("attachment_name") . "</td>";
@@ -89,8 +89,8 @@
echo "
<td class='center width5' nowrap='nowrap'>
- <a href='attachment.php?op=edit_attachment&attachment_id=" . $i . "'><img src=" . XNEWSLETTER_ICON . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>
- <a href='attachment.php?op=delete_attachment&attachment_id=" . $i . "'><img src=" . XNEWSLETTER_ICON . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>
+ <a href='attachment.php?op=edit_attachment&attachment_id=" . $i . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>
+ <a href='attachment.php?op=delete_attachment&attachment_id=" . $i . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>
</td>
";
echo "</tr>";
@@ -119,7 +119,7 @@
$indexAdmin->addItemButton(_AM_XNEWSLETTER_ATTACHMENTLIST, 'attachment.php?op=list', 'list');
echo $indexAdmin->renderButton();
- $obj =& $attachmentHandler->create();
+ $obj =& $xnewsletter->getHandler('xNewsletter_attachment')->create();
$form = $obj->getForm();
$form->display();
break;
@@ -129,7 +129,7 @@
redirect_header("attachment.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- $obj =& $attachmentHandler->get($attachment_id);
+ $obj =& $xnewsletter->getHandler('xNewsletter_attachment')->get($attachment_id);
//Form attachment_letter_id
$obj->setVar("attachment_letter_id", xNewsletter_CleanVars($_REQUEST, "attachment_letter_id", 0, "int"));
//Form attachment_name
@@ -141,7 +141,7 @@
//Form attachment_created
$obj->setVar("attachment_created", xNewsletter_CleanVars($_REQUEST, "attachment_created", time(), "int"));
- if ($attachmentHandler->insert($obj)) {
+ if ($xnewsletter->getHandler('xNewsletter_attachment')->insert($obj)) {
redirect_header("attachment.php?op=list", 2, _AM_XNEWSLETTER_FORMOK);
}
@@ -155,18 +155,18 @@
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWATTACHMENT, 'attachment.php?op=new_attachment', 'add');
$indexAdmin->addItemButton(_AM_XNEWSLETTER_ATTACHMENTLIST, 'attachment.php?op=list', 'list');
echo $indexAdmin->renderButton();
- $obj = $attachmentHandler->get($attachment_id);
+ $obj = $xnewsletter->getHandler('xNewsletter_attachment')->get($attachment_id);
$form = $obj->getForm();
$form->display();
break;
case "delete_attachment" :
- $obj =& $attachmentHandler->get($attachment_id);
+ $obj =& $xnewsletter->getHandler('xNewsletter_attachment')->get($attachment_id);
if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
if (!$GLOBALS["xoopsSecurity"]->check()) {
redirect_header("attachment.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- if ($attachmentHandler->delete($obj)) {
+ if ($xnewsletter->getHandler('xNewsletter_attachment')->delete($obj)) {
redirect_header("attachment.php", 3, _AM_XNEWSLETTER_FORMDELOK);
} else {
echo $obj->getHtmlErrors();
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh.php 2014-03-27 14:28:58 UTC (rev 12413)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh.php 2014-03-28 20:12:18 UTC (rev 12414)
@@ -43,7 +43,7 @@
if ( (isset($_POST["ok"]) && $_POST["ok"] == 1) ) {
$count_err = 0;
- $obj_bmh =& $bmhHandler->get($bmh_id);
+ $obj_bmh =& $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
$bmh_email = $obj_bmh->getVar("bmh_email");
$sql = "SELECT subscr_id FROM " . $xoopsDB->prefix("mod_xnewsletter_subscr") . " WHERE (";
@@ -60,10 +60,10 @@
$xoopsDB->query($sql_upd_measure);
redirect_header("bmh.php?op=list", 5, _AM_XNEWSLETTER_BMH_ERROR_NO_SUBSCRID);
}
- $obj_subscr =& $subscrHandler->get($subscr_id);
+ $obj_subscr =& $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
// delete subscriber
- if (!$subscrHandler->delete($obj_subscr,true)) {
+ if (!$xnewsletter->getHandler('xNewsletter_subscr')->delete($obj_subscr,true)) {
$actionprot_err = $obj_subscr->getHtmlErrors()."<br/><br/><br/>";
$count_err++;
}
@@ -71,15 +71,15 @@
//delete subscription
$crit_catsubscr = new CriteriaCompo();
$crit_catsubscr->add(new Criteria('catsubscr_subscrid', $subscr_id));
- $numrows_catsubscr = $catsubscrHandler->getCount($crit_catsubscr);
+ $numrows_catsubscr = $xnewsletter->getHandler('xNewsletter_catsubscr')->getCount($crit_catsubscr);
if ($numrows_catsubscr > 0) {
- $catsubscr_arr = $catsubscrHandler->getall($crit_catsubscr);
+ $catsubscr_arr = $xnewsletter->getHandler('xNewsletter_catsubscr')->getall($crit_catsubscr);
foreach (array_keys($catsubscr_arr) as $cat) {
- $obj_catsubscr =& $catsubscrHandler->get($catsubscr_arr[$cat]->getVar("catsubscr_id"));
- $obj_cat =& $catHandler->get($catsubscr_arr[$cat]->getVar("catsubscr_catid"));
+ $obj_catsubscr =& $xnewsletter->getHandler('xNewsletter_catsubscr')->get($catsubscr_arr[$cat]->getVar("catsubscr_id"));
+ $obj_cat =& $xnewsletter->getHandler('xNewsletter_cat')->get($catsubscr_arr[$cat]->getVar("catsubscr_catid"));
$cat_mailinglist = $obj_cat->getVar("cat_mailinglist");
- if ($catsubscrHandler->delete($obj_catsubscr, true)) {
+ if ($xnewsletter->getHandler('xNewsletter_catsubscr')->delete($obj_catsubscr, true)) {
//handle mailinglists
if ($cat_mailinglist > 0) {
require_once( XOOPS_ROOT_PATH."/modules/xNewsletter/include/mailinglist.php" );
@@ -106,7 +106,7 @@
if ($bmh_id == 0) redirect_header("bmh.php", 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
if ($bmh_measure == 0) redirect_header("bmh.php", 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
- $obj_bmh =& $bmhHandler->get($bmh_id);
+ $obj_bmh =& $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
if ($obj_bmh->getVar("bmh_measure") == _AM_XNEWSLETTER_BMH_MEASURE_VAL_DELETE ) {
redirect_header("bmh.php?op=list&filter=".$filter."'", 3, _AM_XNEWSLETTER_BMH_MEASURE_ALREADY_DELETED);
@@ -141,11 +141,11 @@
$accounts_crit = new CriteriaCompo();
$accounts_crit->add(new Criteria("accounts_use_bmh", "1"));
- $numrows_acc = $accountsHandler->getCount($accounts_crit);
+ $numrows_acc = $xnewsletter->getHandler('xNewsletter_accounts')->getCount($accounts_crit);
if ($numrows_acc > 0)
{
- $accounts_arr = $accountsHandler->getall($accounts_crit);
+ $accounts_arr = $xnewsletter->getHandler('xNewsletter_accounts')->getall($accounts_crit);
$result_bmh = _AM_XNEWSLETTER_BMH_SUCCESSFUL."<br/>";
foreach (array_keys($accounts_arr) as $acc)
@@ -225,11 +225,11 @@
if ($filter > -1) $criteria->add(new Criteria("bmh_measure", $filter));
$criteria->setSort("bmh_id");
$criteria->setOrder("DESC");
- $numrows = $bmhHandler->getCount($criteria);
+ $numrows = $xnewsletter->getHandler('xNewsletter_bmh')->getCount($criteria);
$start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
$criteria->setStart($start);
$criteria->setLimit($limit);
- $bmh_arr = $bmhHandler->getall($criteria);
+ $bmh_arr = $xnewsletter->getHandler('xNewsletter_bmh')->getall($criteria);
if ( $numrows > $limit ) {
include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
$pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
@@ -300,16 +300,16 @@
echo "<td class='center width20'>
<a href='bmh.php?op=handle_bmh&bmh_id=".$i."&bmh_measure="._AM_XNEWSLETTER_BMH_MEASURE_VAL_NOTHING."&filter=".$filter."'>
- <img src=".XNEWSLETTER_ICON."/xn_nothing.png alt='"._AM_XNEWSLETTER_BMH_MEASURE_NOTHING."' title='"._AM_XNEWSLETTER_BMH_MEASURE_NOTHING."' />
+ <img src=".XNEWSLETTER_ICONS_URL."/xn_nothing.png alt='"._AM_XNEWSLETTER_BMH_MEASURE_NOTHING."' title='"._AM_XNEWSLETTER_BMH_MEASURE_NOTHING."' />
</a>
<a href='bmh.php?op=handle_bmh&bmh_id=".$i."&bmh_measure="._AM_XNEWSLETTER_BMH_MEASURE_VAL_QUIT."&filter=".$filter."'>
- <img src=".XNEWSLETTER_ICON."/xn_catsubscr_temp.png alt='"._AM_XNEWSLETTER_BMH_MEASURE_QUIT."' title='"._AM_XNEWSLETTER_BMH_MEASURE_QUIT."' />
+ <img src=".XNEWSLETTER_ICONS_URL."/xn_catsubscr_temp.png alt='"._AM_XNEWSLETTER_BMH_MEASURE_QUIT."' title='"._AM_XNEWSLETTER_BMH_MEASURE_QUIT."' />
</a>
<a href='bmh.php?op=bmh_delsubscr&bmh_id=".$i."&filter=".$filter."'>
- <img src=".XNEWSLETTER_ICON."/xn_quit.png alt='"._AM_XNEWSLETTER_BMH_MEASURE_DELETE."' title='"._AM_XNEWSLETTER_BMH_MEASURE_DELETE."' />
+ <img src=".XNEWSLETTER_ICONS_URL."/xn_quit.png alt='"._AM_XNEWSLETTER_BMH_MEASURE_DELETE."' title='"._AM_XNEWSLETTER_BMH_MEASURE_DELETE."' />
</a>
- <a href='bmh.php?op=edit_bmh&bmh_id=".$i."'><img src=".XNEWSLETTER_ICON."/xn_edit.png alt='"._AM_XNEWSLETTER_BMH_EDIT."' title='"._AM_XNEWSLETTER_BMH_EDIT."' width='16px' /></a>
- <a href='bmh.php?op=delete_bmh&bmh_id=".$i."'><img src=".XNEWSLETTER_ICON."/xn_delete.png alt='"._AM_XNEWSLETTER_BMH_DELETE."' title='"._AM_XNEWSLETTER_BMH_DELETE."' width='16px' /></a>
+ <a href='bmh.php?op=edit_bmh&bmh_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_edit.png alt='"._AM_XNEWSLETTER_BMH_EDIT."' title='"._AM_XNEWSLETTER_BMH_EDIT."' width='16px' /></a>
+ <a href='bmh.php?op=delete_bmh&bmh_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_delete.png alt='"._AM_XNEWSLETTER_BMH_DELETE."' title='"._AM_XNEWSLETTER_BMH_DELETE."' width='16px' /></a>
</td>";
echo "</tr>";
}
@@ -341,7 +341,7 @@
redirect_header("bmh.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- $obj =& $bmhHandler->get($bmh_id);
+ $obj =& $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
//Form bmh_rule_no
$obj->setVar("bmh_rule_no", xNewsletter_CleanVars( $_REQUEST, "bmh_rule_no", "", "string") );
@@ -362,7 +362,7 @@
//Form bmh_created
$obj->setVar("bmh_created", xNewsletter_CleanVars( $_REQUEST, "bmh_created", 0, "int") );
- if ($bmhHandler->insert($obj)) {
+ if ($xnewsletter->getHandler('xNewsletter_bmh')->insert($obj)) {
redirect_header("bmh.php?op=list", 2, _AM_XNEWSLETTER_FORMOK);
}
echo $obj->getHtmlErrors();
@@ -374,18 +374,18 @@
echo $indexAdmin->addNavigation("bmh.php");
$indexAdmin->addItemButton(_AM_XNEWSLETTER_BMHLIST, 'bmh.php?op=list', 'list');
echo $indexAdmin->renderButton();
- $obj = $bmhHandler->get($bmh_id);
+ $obj = $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
$form = $obj->getForm();
$form->display();
break;
case "delete_bmh":
- $obj =& $bmhHandler->get($bmh_id);
+ $obj =& $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
redirect_header("bmh.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- if ($bmhHandler->delete($obj)) {
+ if ($xnewsletter->getHandler('xNewsletter_bmh')->delete($obj)) {
redirect_header("bmh.php", 3, _AM_XNEWSLETTER_FORMDELOK);
} else {
echo $obj->getHtmlErrors();
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh_callback_database.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh_callback_database.php 2014-03-27 14:28:58 UTC (rev 12413)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh_callback_database.php 2014-03-28 20:12:18 UTC (rev 12414)
@@ -23,9 +23,9 @@
function callbackAction ($msgnum, $bounce_type, $email, $subject, $xheader, $remove, $rule_no = false, $rule_cat = false, $totalFetched = 0) {
if ($rule_no != "0000") {
global $xoopsUser;
- $bmhHandler=& xoops_getModuleHandler('xNewsletter_bmh', 'xNewsletter');
+ $xnewsletter->getHandler('xNewsletter_bmh')=& xoops_getModuleHandler('xNewsletter_bmh', 'xNewsletter');
- $obj =& $bmhHandler->create();
+ $obj =& $xnewsletter->getHandler('xNewsletter_bmh')->create();
//Form bmh_rule_no
$obj->setVar("bmh_rule_no", $rule_no);
@@ -47,7 +47,7 @@
//Form bmh_created
$obj->setVar("bmh_created", time());
- if (!$bmhHandler->insert($obj)) {
+ if (!$xnewsletter->getHandler('xNewsletter_bmh')->insert($obj)) {
echo $obj->getHtmlErrors();
return false;
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/cat.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/cat.php 2014-03-27 14:28:58 UTC (rev 12413)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/cat.php 2014-03-28 20:12:18 UTC (rev 12414)
@@ -29,7 +29,7 @@
include "admin_header.php";
xoops_cp_header();
//global $pathIcon, $indexAdmin;
-global $xoopsModuleConfig;
+
// We recovered the value of the argument op in the URL$
$op = xNewsletter_CleanVars($_REQUEST, 'op', 'list', 'string');
$cat_id = xNewsletter_CleanVars($_REQUEST, 'cat_id', 0, 'int');
@@ -44,11 +44,11 @@
$criteria = new CriteriaCompo();
$criteria->setSort("cat_id ASC, cat_name");
$criteria->setOrder("ASC");
- $numrows = $catHandler->getCount();
+ $numrows = $xnewsletter->getHandler('xNewsletter_cat')->getCount();
$start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
$criteria->setStart($start);
$criteria->setLimit($limit);
- $cat_arr = $catHandler->getall($criteria);
+ $cat_arr = $xnewsletter->getHandler('xNewsletter_cat')->getall($criteria);
if ( $numrows > $limit ) {
include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
$pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
@@ -68,7 +68,7 @@
echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_GPERMS_CREATE . "</th>";
echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_GPERMS_LIST . "</th>";
echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_GPERMS_READ . "</th>";
- if (isset($xoopsModuleConfig['xn_use_mailinglist']) && $xoopsModuleConfig['xn_use_mailinglist'] == 1) {
+ if ($xnewsletter->getConfig('xn_use_mailinglist') == 1) {
echo "<th class='center'>" . _AM_XNEWSLETTER_CAT_MAILINGLIST . "</th>";
}
echo "<th class='center width5'>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
@@ -133,12 +133,12 @@
$cat_gperms_read = substr($cat_gperms_read, 0, -3);
echo "<td class='center'>". $cat_gperms_read . "</td>";
- if (isset($xoopsModuleConfig['xn_use_mailinglist']) && $xoopsModuleConfig['xn_use_mailinglist'] == 1) {
+ if ($xnewsletter->getConfig('xn_use_mailinglist') == 1) {
echo "<td class='center'>" . $cat_arr[$i]->getVar("cat_mailinglist") . "</td>";
}
echo "<td class='center width5' nowrap='nowrap'>";
- echo "<a href='cat.php?op=edit_cat&cat_id=" . $i . "'><img src=".XNEWSLETTER_ICON."/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>";
- echo " <a href='cat.php?op=delete_cat&cat_id=" . $i . "'><img src=" . XNEWSLETTER_ICON . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>";
+ echo "<a href='cat.php?op=edit_cat&cat_id=" . $i . "'><img src=".XNEWSLETTER_ICONS_URL."/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>";
+ echo " <a href='cat.php?op=delete_cat&cat_id=" . $i . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>";
echo "</td>";
echo "</tr>";
}
@@ -166,7 +166,7 @@
$indexAdmin->addItemButton(_AM_XNEWSLETTER_CATLIST, 'cat.php?op=list', 'list');
echo $indexAdmin->renderButton();
- $obj =& $catHandler->create();
+ $obj =& $xnewsletter->getHandler('xNewsletter_cat')->create();
$form = $obj->getForm();
$form->display();
break;
@@ -176,7 +176,7 @@
redirect_header("cat.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- $obj =& $catHandler->get($cat_id);
+ $obj =& $xnewsletter->getHandler('xNewsletter_cat')->get($cat_id);
// Form cat_name
$obj->setVar("cat_name", $_POST["cat_name"] );
@@ -197,7 +197,7 @@
// Form cat_created
$obj->setVar("cat_created", time());
- if ($catHandler->insert($obj)) {
+ if ($xnewsletter->getHandler('xNewsletter_cat')->insert($obj)) {
$cat_id = $obj->getVar("cat_id");
//Form cat_gperms_admin
@@ -313,18 +313,18 @@
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWCAT, 'cat.php?op=new_cat', 'add');
$indexAdmin->addItemButton(_AM_XNEWSLETTER_CATLIST, 'cat.php?op=list', 'list');
echo $indexAdmin->renderButton();
- $obj = $catHandler->get($cat_id);
+ $obj = $xnewsletter->getHandler('xNewsletter_cat')->get($cat_id);
$form = $obj->getForm();
$form->display();
break;
case "delete_cat" :
- $obj =& $catHandler->get($_REQUEST["cat_id"]);
+ $obj =& $xnewsletter->getHandler('xNewsletter_cat')->get($_REQUEST["cat_id"]);
if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
redirect_header("cat.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- if ($catHandler->delete($obj)) {
+ if ($xnewsletter->getHandler('xNewsletter_cat')->delete($obj)) {
redirect_header("cat.php", 3, _AM_XNEWSLETTER_FORMDELOK);
} else {
echo $obj->getHtmlErrors();
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/catsubscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/catsubscr.php 2014-03-27 14:28:58 UTC (rev 12413)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/catsubscr.php 2014-03-28 20:12:18 UTC (rev 12414)
@@ -44,11 +44,11 @@
$criteria = new CriteriaCompo();
$criteria->setSort("cat_id ASC, cat_name");
$criteria->setOrder("ASC");
- $numrows = $catHandler->getCount();
+ $numrows = $xnewsletter->getHandler('xNewsletter_cat')->getCount();
$start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
$criteria->setStart($start);
$criteria->setLimit($limit);
- $cat_arr = $catHandler->getall($criteria);
+ $cat_arr = $xnewsletter->getHandler('xNewsletter_cat')->getall($criteria);
if ( $numrows > $limit ) {
include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
$pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
@@ -83,11 +83,11 @@
$crit_catsubscr = new CriteriaCompo();
$crit_catsubscr->add(new Criteria("catsubscr_catid", $i));
- $numrows = $catsubscrHandler->getCount($crit_catsubscr);
+ $numrows = $xnewsletter->getHandler('xNewsletter_catsubscr')->getCount($crit_catsubscr);
echo "<td class='center'>".$numrows."</td>";
echo "<td class='center width5'>
- <a href='catsubscr.php?op=list_cat&cat_id=".$i."'><img src=".XNEWSLETTER_ICON."/xn_details.png alt='"._AM_XNEWSLETTER_DETAILS."' title='"._AM_XNEWSLETTER_DETAILS."' /></a>
+ <a href='catsubscr.php?op=list_cat&cat_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_details.png alt='"._AM_XNEWSLETTER_DETAILS."' title='"._AM_XNEWSLETTER_DETAILS."' /></a>
</td>";
echo "</tr>";
}
@@ -115,16 +115,16 @@
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWCATSUBSCR, 'catsubscr.php?op=new_catsubscr', 'add');
echo $indexAdmin->renderButton();
- $limit = $xoopsModuleConfig['adminperpage'];
+ $limit = $xnewsletter->getConfig('adminperpage');
$crit_catsubscr = new CriteriaCompo();
$crit_catsubscr->add(new Criteria("catsubscr_catid", $cat_id));
$crit_catsubscr->setSort("catsubscr_id ASC, catsubscr_catid");
$crit_catsubscr->setOrder("ASC");
- $numrows = $catsubscrHandler->getCount($crit_catsubscr);
+ $numrows = $xnewsletter->getHandler('xNewsletter_catsubscr')->getCount($crit_catsubscr);
$start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
$crit_catsubscr->setStart($start);
$crit_catsubscr->setLimit($limit);
- $catsubscr_arr = $catsubscrHandler->getall($crit_catsubscr);
+ $catsubscr_arr = $xnewsletter->getHandler('xNewsletter_catsubscr')->getall($crit_catsubscr);
if ( $numrows > $limit ) {
include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
$pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list_cat&cat_id='.$cat_id);
@@ -155,11 +155,11 @@
$class = ($class == "even") ? "odd" : "even";
echo "<td class='center'>".$i."</td>";
- $cat =& $catHandler->get($cat_id);
+ $cat =& $xnewsletter->getHandler('xNewsletter_cat')->get($cat_id);
$cat_name = $cat->getVar("cat_name");
echo "<td class='center'>".$cat_name."</td>";
$subscr_id = $catsubscr_arr[$i]->getVar("catsubscr_subscrid");
- $subscr =& $subscrHandler->get($subscr_id);
+ $subscr =& $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
$subscr_email = ($subscr) ? $subscr->getVar("subscr_email") : "";
echo "<td class='center'>".$subscr_email."</td>";
if ($catsubscr_arr[$i]->getVar("catsubscr_quited") > 0) {
@@ -172,8 +172,8 @@
echo "<td class='center'>".formatTimeStamp($catsubscr_arr[$i]->getVar("catsubscr_created"),"S")."</td>";
echo "<td class='center width5' nowrap='nowrap'>
- <a href='catsubscr.php?op=edit_catsubscr&catsubscr_id=".$i."&cat_id=".$cat_id."'><img src=".XNEWSLETTER_ICON."/xn_edit.png alt='"._EDIT."' title='"._EDIT."' /></a>
- <a href='catsubscr.php?op=delete_catsubscr&catsubscr_id=".$i."&cat_id=".$cat_id."&cat_name=".$cat_name."&subscr_email=".$subscr_email."&subscr_id=".$subscr_id."'><img src=".XNEWSLETTER_ICON."/xn_delete.png alt='"._DELETE."' title='"._DELETE."'></a>
+ <a href='catsubscr.php?op=edit_catsubscr&catsubscr_id=".$i."&cat_id=".$cat_id."'><img src=".XNEWSLETTER_ICONS_URL."/xn_edit.png alt='"._EDIT."' title='"._EDIT."' /></a>
+ <a href='catsubscr.php?op=delete_catsubscr&catsubscr_id=".$i."&cat_id=".$cat_id."&cat_name=".$cat_name."&subscr_email=".$subscr_email."&subscr_id=".$subscr_id."'><img src=".XNEWSLETTER_ICONS_URL."/xn_delete.png alt='"._DELETE."' title='"._DELETE."'></a>
</td>";
echo "</tr>";
}
@@ -199,7 +199,7 @@
$indexAdmin->addItemButton(_AM_XNEWSLETTER_CATSUBSCRLIST, 'catsubscr.php?op=list', 'list');
echo $indexAdmin->renderButton();
- $obj =& $catsubscrHandler->create();
+ $obj =& $xnewsletter->getHandler('xNewsletter_catsubscr')->create();
$form = $obj->getForm();
$form->display();
break;
@@ -209,9 +209,9 @@
redirect_header("catsubscr.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
if (isset($_REQUEST["catsubscr_id"])) {
- $obj =& $catsubscrHandler->get($_REQUEST["catsubscr_id"]);
+ $obj =& $xnewsletter->getHandler('xNewsletter_catsubscr')->get($_REQUEST["catsubscr_id"]);
} else {
- $obj =& $catsubscrHandler->create();
+ $obj =& $xnewsletter->getHandler('xNewsletter_catsubscr')->create();
}
//Form catsubscr_catid
@@ -231,9 +231,9 @@
//Form catsubscr_created
$obj->setVar("catsubscr_created", $_REQUEST["catsubscr_created"]);
- if ($catsubscrHandler->insert($obj)) {
+ if ($xnewsletter->getHandler('xNewsletter_catsubscr')->insert($obj)) {
//add subscriber to mailinglist
- $obj_cat = $catHandler->get($_REQUEST["catsubscr_catid"]);
+ $obj_cat = $xnewsletter->getHandler('xNewsletter_cat')->get($_REQUEST["catsubscr_catid"]);
if ($obj_cat->getVar("cat_mailinglist") > 0) {
require_once( XOOPS_ROOT_PATH."/modules/xNewsletter/include/mailinglist.php" );
subscribingMLHandler(1, $catsubscr_subscrid, $obj_cat->getVar("cat_mailinglist"));
@@ -254,21 +254,21 @@
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWCATSUBSCR, 'catsubscr.php?op=new_catsubscr', 'add');
echo $indexAdmin->renderButton();
- $obj = $catsubscrHandler->get($_REQUEST["catsubscr_id"]);
+ $obj = $xnewsletter->getHandler('xNewsletter_catsubscr')->get($_REQUEST["catsubscr_id"]);
$form = $obj->getForm();
$form->display();
break;
case "delete_catsubscr":
- $obj =& $catsubscrHandler->get($_REQUEST["catsubscr_id"]);
+ $obj =& $xnewsletter->getHandler('xNewsletter_catsubscr')->get($_REQUEST["catsubscr_id"]);
if (isset($_REQUEST["ok"]) && $_REQUEST["ok"] == 1) {
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
redirect_header("catsubscr.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- if ($catsubscrHandler->delete($obj)) {
+ if ($xnewsletter->getHandler('xNewsletter_catsubscr')->delete($obj)) {
//remove subscriber from mailinglist
$subscr_id = $_REQUEST["subscr_id"];
- $obj_cat =& $catHandler->get($_REQUEST["cat_id"]);
+ $obj_cat =& $xnewsletter->getHandler('xNewsletter_cat')->get($_REQUEST["cat_id"]);
if ($obj_cat->getVar("cat_mailinglist") > 0) {
require_once( XOOPS_ROOT_PATH."/modules/xNewsletter/include/mailinglist.php" );
subscribingMLHandler(0, $subscr_id, $obj_cat->getVar("cat_mailinglist"));
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php 2014-03-27 14:28:58 UTC (rev 12413)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php 2014-03-28 20:12:18 UTC (rev 12414)
@@ -54,15 +54,14 @@
$indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, 'import.php?op=default', 'list');
echo $indexAdmin->renderButton();
- $importHandler =& xoops_getModuleHandler("xNewsletter_import", "xNewsletter");
$crit_import = new CriteriaCompo();
$crit_import->setSort("import_id");
$crit_import->setOrder("ASC");
- $numrows = $importHandler->getCount($crit_import);
+ $numrows = $xnewsletter->getHandler('xNewsletter_import')->getCount($crit_import);
$crit_import->setStart($start);
$crit_import->setLimit($limitcheck);
- $import_arr = $importHandler->getall($crit_import);
+ $import_arr = $xnewsletter->getHandler('xNewsletter_import')->getall($crit_import);
if ($numrows > 0) {
include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
@@ -101,11 +100,10 @@
$counter = 0;
//get data for dropdown with cats
- $catHandler =& xoops_getModuleHandler("xNewsletter_cat", "xNewsletter");
$criteria = new CriteriaCompo();
$criteria->setSort('cat_id ASC, cat_name');
$criteria->setOrder('ASC');
- $cat_arr=$catHandler->getall($criteria);
+ $cat_arr=$xnewsletter->getHandler('xNewsletter_cat')->getall($criteria);
foreach (array_keys($import_arr) as $i) {
$counter++;
@@ -149,12 +147,12 @@
$form .= "<td align=\"center\">";
$subscr_id = $import_arr[$i]->getVar("import_subscr_id");
$form .= "<input type='hidden' name='subscr_id_".$counter."' title='subscr_id' id='subscr_id_".$counter."' value='".$subscr_id."' />";
- if ($subscr_id > 0) $form .= "<img src='".XNEWSLETTER_ICON."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' />";
+ if ($subscr_id > 0) $form .= "<img src='".XNEWSLETTER_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' />";
$form .= "</td>";
$form .= "<td align=\"center\">";
$catsubscr_id = $import_arr[$i]->getVar("import_catsubscr_id");
$form .= "<input type='hidden' name='catsubscr_id_".$counter."' title='catsubscr_id' id='catsubscr_id_".$counter."' value='".$catsubscr_id."' />";
- if ($catsubscr_id > 0) $form .= "<img src='".XNEWSLETTER_ICON."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' />";
+ if ($catsubscr_id > 0) $form .= "<img src='".XNEWSLETTER_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' />";
$form .= "</td>";
$form .= "</td>";
$form .= "<td align=\"center\">";
@@ -229,8 +227,8 @@
$crit_import = new CriteriaCompo();
$crit_import->add(new Criteria('import_status', "1"));
- $numrows_total = $importHandler->getCount();
- $numrows_act = $importHandler->getCount($crit_import);
+ $numrows_total = $xnewsletter->getHandler('xNewsletter_import')->getCount();
+ $numrows_act = $xnewsletter->getHandler('xNewsletter_import')->getCount($crit_import);
if ( $numrows_act > 0 ) {
$sql = "SELECT * FROM ".$xoopsDB->prefix("mod_xnewsletter_import")." WHERE ((import_status)=1)";
$sql .= " ORDER BY `import_id` ASC";
@@ -313,13 +311,13 @@
}
echo "<div style='margin-top:20px;margin-bottom:20px;color:#ff0000;font-weight:bold;font-size:14px'>";
- $img_ok = "<img src='".XNEWSLETTER_ICON."/xn_ok.png' alt='"._AM_XNEWSLETTER_OK."' title='"._AM_XNEWSLETTER_OK."' /> ";
+ $img_ok = "<img src='".XNEWSLETTER_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_OK."' title='"._AM_XNEWSLETTER_OK."' /> ";
$resulttext = str_replace("%p", $numrows_act ,_AM_XNEWSLETTER_IMPORT_FINISHED);
$resulttext = str_replace("%t", $numrows_total ,$resulttext);
echo $img_ok.$resulttext;
echo "</div>";
- $numrows_pend = $importHandler->getCount();
+ $numrows_pend = $xnewsletter->getHandler('xNewsletter_import')->getCount();
if ($numrows_pend > 0) {
$form_continue = "<form id='form_continue' enctype='multipart/form-data' method='post' action='import.php' name='form_continue'>";
$form_continue .= "<input id='submit' class='formButton' type='submit' title='"._AM_XNEWSLETTER_IMPORT_CONTINUE."' value='"._AM_XNEWSLETTER_IMPORT_CONTINUE."' name='submit'>";
@@ -423,7 +421,7 @@
case "default":
default:
//show basic search form
- $objImport =& $importHandler->create();
+ $objImport = $xnewsletter->getHandler('xNewsletter_import')->create();
$form = $objImport->getSearchForm($plugin, $action_after_read, $limitcheck);
$form->display();
break;
@@ -433,9 +431,8 @@
function create_prot ( $prot_text, $success, $submitter) {
global $xoopsDB;
- $sql = "INSERT INTO `".$xoopsDB->prefix('mod_xnewsletter_protocol')."` (`protocol_letter_id`, `protocol_subscriber_id`, `protocol_status`, `protocol_success`, `protocol_submitter`, `protocol_created`) VALUES (0,0,'".$prot_text."',".$success.", ".$submitter.",".time().")";
+ $sql = "INSERT INTO `{$xoopsDB->prefix('mod_xnewsletter_protocol')}` (`protocol_letter_id`, `protocol_subscriber_id`, `protocol_status`, `protocol_success`, `protocol_submitter`, `protocol_created`)";
+ $sql.= " VALUES (0,0,'{$prot_text}', {$success}, {$submitter}, " . time() . ")";
$xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
}
-
-?>
\ No newline at end of file
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/index.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/index.php 2014-03-27 14:28:58 UTC (rev 12413)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/index.php 2014-03-28 20:12:18 UTC (rev 12414)
@@ -30,22 +30,22 @@
xoops_cp_header();
//global $indexAdmin;
-global $xoopsModuleConfig;
//count "total"
-$count_accounts = $accountsHandler->getCount();
-$count_cat = $catHandler->getCount();
-$count_subscr = $subscrHandler->getCount();
-$count_catsubscr = $catsubscrHandler->getCount();
-$count_letter = $letterHandler->getCount();
-$count_protocol = $protocolHandler->getCount();
-$count_attachment = $attachmentHandler->getCount();
-if (isset($xoopsModuleConfig['xn_use_mailinglist']) && $xoopsModuleConfig['xn_use_mailinglist'] == 1) {
- $count_mailinglist = $mailinglistHandler->getCount();
+$count_cat = $xnewsletter->getHandler('xNewsletter_cat')->getCount();
+$count_accounts = $xnewsletter->getHandler('xNewsletter_accounts')->getCount();
+
+$count_subscr = $xnewsletter->getHandler('xNewsletter_subscr')->getCount();
+$count_catsubscr = $xnewsletter->getHandler('xNewsletter_catsubscr')->getCount();
+$count_letter = $xnewsletter->getHandler('xNewsletter_letter')->getCount();
+$count_protocol = $xnewsletter->getHandler('xNewsletter_protocol')->getCount();
+$count_attachment = $xnewsletter->getHandler('xNewsletter_attachment')->getCount();
+if ($xnewsletter->getConfig('xn_use_mailinglist') == 1) {
+ $count_mailinglist = $xnewsletter->getHandler('xNewsletter_mailinglist')->getCount();
}
-$count_bmh = $bmhHandler->getCount();
-if (isset($xoopsModuleConfig['xn_send_in_packages']) && $xoopsModuleConfig['xn_send_in_packages'] > 0) {
- $count_task = $taskHandler->getCount();
+$count_bmh = $xnewsletter->getHandler('xNewsletter_bmh')->getCount();
+if ($xnewsletter->getConfig('xn_send_in_packages') > 0) {
+ $count_task = $xnewsletter->getHandler('xNewsletter_task')->getCount();
}
@@ -62,11 +62,11 @@
$indexAdmin->addInfoBoxLine(_AM_XNEWSLETTER_LETTER,_AM_XNEWSLETTER_THEREARE_ATTACHMENT, $count_attachment, ($count_attachment == 0) ? $r : $g);
$indexAdmin->addInfoBoxLine(_AM_XNEWSLETTER_LETTER,_AM_XNEWSLETTER_THEREARE_PROTOCOL, $count_protocol, ($count_protocol == 0) ? $r : $g);
-if (isset($xoopsModuleConfig['xn_use_mailinglist']) && $xoopsModuleConfig['xn_use_mailinglist'] == 1) {
+if ($xnewsletter->getConfig('xn_use_mailinglist') == 1) {
$indexAdmin->addInfoBoxLine(_AM_XNEWSLETTER_LETTER,_AM_XNEWSLETTER_THEREARE_MAILINGLIST, $count_mailinglist, ($count_mailinglist == 0) ? $r : $g);
}
-if (isset($xoopsModuleConfig['xn_send_in_packages']) && $xoopsModuleConfig['xn_send_in_packages'] > 0) {
+if ($xnewsletter->getConfig('xn_send_in_packages') > 0) {
$indexAdmin->addInfoBoxLine(_AM_XNEWSLETTER_LETTER,_AM_XNEWSLETTER_THEREARE_TASK, $count_task, ($count_task == 0) ? $r : $g);
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/letter.php 2014-03-27 14:28:58 UTC (rev 12413)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/letter.php 2014-03-28 20:12:18 UTC (rev 12414)
@@ -65,16 +65,15 @@
case "delete_attachment":
$attachment_id = xNewsletter_CleanVars($_REQUEST, 'attachment_'.$id_del, 'none', 'string');
if ($attachment_id == 'none') redirect_header("letter.php", 3, _AM_XNEWSLETTER_LETTER_ERROR_INVALID_ATT_ID);
- $attachmentHandler =& xoops_getModuleHandler("xNewsletter_attachment", "xNewsletter");
- $obj_attachment = $attachmentHandler->get($attachment_id);
+ $obj_attachment = $xnewsletter->getHandler('xNewsletter_attachment')->get($attachment_id);
$attachment_name = $obj_attachment->getVar("attachment_name");
- if ($attachmentHandler->delete($obj_attachment, true)) {
+ if ($xnewsletter->getHandler('xNewsletter_attachment')->delete($obj_attachment, true)) {
//delete file
- $uploaddir = XOOPS_UPLOAD_PATH.$xoopsModuleConfig['xn_attachment_path'].$letter_id."/";
- unlink($uploaddir.$attachment_name);
+ $uploaddir = XOOPS_UPLOAD_PATH . $xnewsletter->getConfig('xn_attachment_path') . $letter_id . "/";
+ unlink($uploaddir . $attachment_name);
- $obj_letter =& $letterHandler->get($letter_id);
+ $obj_letter =& $xnewsletter->getHandler('xNewsletter_letter')->get($letter_id);
$obj_letter->setVar("letter_title", $_REQUEST["letter_title"]);
$obj_letter->setVar("letter_content", $_REQUEST["letter_content"]);
$obj_letter->setVar("letter_template", $_REQUEST["letter_template"]);
@@ -101,7 +100,7 @@
$tpl = new XoopsTpl();
- $obj_letter =& $letterHandler->get($letter_id);
+ $obj_letter =& $xnewsletter->getHandler('xNewsletter_letter')->get($letter_id);
$template = $template_path . $obj_letter->getVar("letter_template") . ".html";
$tpl->assign('sex', _AM_XNEWSLETTER_SUBSCR_SEX_MALE);
$tpl->assign('firstname', _AM_XNEWSLETTER_SUBSCR_FIRSTNAME);
@@ -128,11 +127,11 @@
$criteria = new CriteriaCompo();
$criteria->setSort("letter_id");
$criteria->setOrder("DESC");
- $numrows = $letterHandler->getCount();
+ $numrows = $xnewsletter->getHandler('xNewsletter_letter')->getCount();
$start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
$criteria->setStart($start);
$criteria->setLimit($limit);
- $letter_arr = $letterHandler->getall($criteria);
+ $letter_arr = $xnewsletter->getHandler('xNewsletter_letter')->getall($criteria);
if ( $numrows > $limit ) {
include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
$pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
@@ -174,7 +173,7 @@
$cat_arr = explode("|" , $letter_arr[$i]->getVar("letter_cats"));
foreach($cat_arr as $cat) {
$j++;
- $cat_obj = $catHandler->get($cat);
+ $cat_obj = $xnewsletter->getHandler('xNewsletter_cat')->get($cat);
if (count($cat_arr)>1) $letter_cats .= "($j) ";
if (is_object($cat_obj)) {
$letter_cats .= $cat_obj->getVar("cat_name") . "<br/>";
@@ -187,13 +186,13 @@
$crit_att = new CriteriaCompo();
$crit_att->add(new Criteria('attachment_letter_id', $letter_arr[$i]->getVar("letter_id")));
- $num_attachments = $attachmentHandler->getCount($crit_att);
+ $num_attachments = $xnewsletter->getHandler('xNewsletter_attachment')->getCount($crit_att);
echo "<td class='center'>".$num_attachments."</td>";
$crit_accounts = new CriteriaCompo();
$crit_accounts->setSort("accounts_id");
$crit_accounts->setOrder("ASC");
- $obj_account = $accountsHandler->get($letter_arr[$i]->getVar("letter_account"));
+ $obj_account = $xnewsletter->getHandler('xNewsletter_accounts')->get($letter_arr[$i]->getVar("letter_account"));
$letter_account = ( $obj_account ) ? $obj_account->getVar("accounts_name") : _NONE;
echo "<td class='center'>".$letter_account."</td>";
@@ -208,7 +207,7 @@
$criteria->setSort("protocol_id");
$criteria->setOrder("DESC");
$criteria->setLimit(1);
- $protocol_arr = $protocolHandler->getall($criteria);
+ $protocol_arr = $xnewsletter->getHandler('xNewsletter_protocol')->getall($criteria);
$protocol_status = "";
$protocol_letter_id = 0;
foreach($protocol_arr as $protocol) {
@@ -224,25 +223,25 @@
echo "<td class='center width10'>";
echo " <a href='letter.php?op=edit_letter&letter_id=".$i."'>
- <img src=".XNEWSLETTER_ICON."/xn_edit.png alt='"._EDIT."' title='"._EDIT."' style='padding:1px' />
+ <img src=".XNEWSLETTER_ICONS_URL."/xn_edit.png alt='"._EDIT."' title='"._EDIT."' style='padding:1px' />
</a>";
echo " <a href='letter.php?op=clone_letter&letter_id=".$i."'>
- <img src=".XNEWSLETTER_ICON."/xn_clone.png alt='"._CLONE."' title='"._CLONE."' style='padding:1px' />
+ <img src=".XNEWSLETTER_ICONS_URL."/xn_clone.png alt='"._CLONE."' title='"._CLONE."' style='padding:1px' />
</a>";
echo " <a href='letter.php?op=delete_letter&letter_id=".$i."'>
- <img src=".XNEWSLETTER_ICON."/xn_delete.png alt='"._DELETE."' title='"._DELETE."' style='padding:1px' />
+ <img src=".XNEWSLETTER_ICONS_URL."/xn_delete.png alt='"._DELETE."' title='"._DELETE."' style='padding:1px' />
</a>";
echo " <a href='letter.php?op=show_preview&letter_id=".$i."'>
- <img src=".XNEWSLETTER_ICON."/xn_preview.png alt='"._AM_XNEWSLETTER_LETTER_ACTION_PREVIEW."' title='"._AM_XNEWSLETTER_LETTER_ACTION_PREVIEW."' style='padding:1px' />
+ <img src=".XNEWSLETTER_ICONS_URL."/xn_preview.png alt='"._AM_XNEWSLETTER_LETTER_ACTION_PREVIEW."' title='"._AM_XNEWSLETTER_LETTER_ACTION_PREVIEW."' style='padding:1px' />
</a>";
echo " <a href='sendletter.php?op=send_test&letter_id=".$i."'>
- <img src=".XNEWSLETTER_ICON."/xn_sendtest.png alt='"._AM_XNEWSLETTER_LETTER_ACTION_SENDTEST."' title='"._AM_XNEWSLETTER_LETTER_ACTION_SENDTEST."' style='padding:1px' />
+ <img src=".XNEWSLETTER_ICONS_URL."/xn_sendtest...
[truncated message content] |
