Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12907] XoopsModules/xnewsletter/branches/luciorota/ xnewsletter
|
From: <luc...@us...> - 2014-12-16 22:28:21
|
Revision: 12907
http://sourceforge.net/p/xoops/svn/12907
Author: luciorota
Date: 2014-12-16 22:28:16 +0000 (Tue, 16 Dec 2014)
Log Message:
-----------
min req xoops 2.5.7.1
use XoopsRequest class
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/accounts.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/attachment.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.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/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/admin/template.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/attachment.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/session.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/cron.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/common.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.task.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/index.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/language/english/admin.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/language/english/modinfo.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/letter.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/admin/xnewsletter_admin_attachments_list.tpl
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/templates/admin/xnewsletter_admin_letters_list.tpl
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/templates/admin/xnewsletter_admin_protocols_list.tpl
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/templates/admin/xnewsletter_admin_tasks_list.tpl
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/templates/xnewsletter_empty.tpl
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/xoops_version.php
Removed Paths:
-------------
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/breadcrumb.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/request.php
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/accounts.php 2014-12-14 11:04:17 UTC (rev 12906)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/accounts.php 2014-12-16 22:28:16 UTC (rev 12907)
@@ -29,13 +29,13 @@
$currentFile = basename(__FILE__);
include_once __DIR__ . '/admin_header.php';
-xoops_cp_header();
// We recovered the value of the argument op in the URL$
-$op = xnewsletterRequest::getString('op', 'list');
-$save_and_check = xnewsletterRequest::getString('save_and_check', 'none');
-$accounts_id = xnewsletterRequest::getInt('accounts_id', 0);
-$post = xnewsletterRequest::getString('post', '');
+$op = XoopsRequest::getString('op', 'list');
+$accounts_id = XoopsRequest::getInt('accounts_id', 0);
+$save_and_check = XoopsRequest::getString('save_and_check', 'none');
+$accounts_id = XoopsRequest::getInt('accounts_id', 0);
+$post = XoopsRequest::getString('post', '');
if ($post == '' && $op == 'save_accounts' && $save_and_check == 'none') {
$op = "edit_account";
@@ -43,6 +43,9 @@
switch ($op) {
case 'check_account':
+ // render start here
+ xoops_cp_header();
+ // render submenu
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
@@ -54,7 +57,7 @@
}
$mailhost = $accountObj->getVar('accounts_server_in');
- $port = $accountObj->getVar('accounts_port_in');
+ $port = $accountObj->getVar('accounts_port_in');
switch ($accountObj->getVar('accounts_type')) {
case _XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3:
$service = 'pop3';
@@ -92,8 +95,7 @@
echo " <th>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK . "</th>";
echo " <th>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_INFO . "</th>";
echo "</tr>";
-
- $mbox = @imap_open("{" . $command . "}", $accounts_username, $accounts_password); // or die ("can't connect: " . imap_last_error());
+ $mbox = @imap_open('{' . $command . '}', $accounts_username, $accounts_password); // or die ("can't connect: " . imap_last_error());
if ($mbox === false) {
echo "<tr>";
echo "<td>" . XNEWSLETTER_IMG_FAILED . "</td>";
@@ -107,7 +109,7 @@
echo "<td></td>";
echo "</tr>";
- $folders = imap_listmailbox($mbox, "{" . $command . "}", "*");
+ $folders = imap_listmailbox($mbox, '{' . $command . '}', '*');
if ($folders == false) {
echo "<tr>";
echo "<td>" . XNEWSLETTER_IMG_FAILED . "</td>";
@@ -125,17 +127,17 @@
$foldercreated = 0;
while (list($key, $val) = each($folders)) {
echo "($key) ";
- echo imap_utf7_decode(str_replace("{" . $command . "}", '', $val)) . "<br>\n";
- if ("{" . $command . "}" . $accounts_inbox == $val) {
+ echo imap_utf7_decode(str_replace('{' . $command . '}', '', $val)) . "<br>\n";
+ if ('{' . $command . '}' . $accounts_inbox == $val) {
$accounts_inbox_ok = true;
}
- if ("{" . $command . "}" . $accounts_hardbox == $val) {
+ if ('{' . $command . '}' . $accounts_hardbox == $val) {
$accounts_hardbox_ok = true;
} else {
@imap_createmailbox($mbox, imap_utf7_encode('{' . $command . '}' . $accounts_hardbox));
$foldercreated = 1;
}
- if ("{" . $command . "}" . $accounts_softbox == $val) {
+ if ('{' . $command . '}' . $accounts_softbox == $val) {
$accounts_softbox_ok = true;
} else {
@imap_createmailbox($mbox, imap_utf7_encode('{' . $command . '}' . $accounts_softbox));
@@ -143,12 +145,12 @@
}
}
if ($foldercreated == 1) {
- $folders_recheck = imap_listmailbox($mbox, "{" . $command . "}", "*");
+ $folders_recheck = imap_listmailbox($mbox, '{' . $command . '}', '*');
while (list($key, $val) = each($folders_recheck)) {
- if ("{" . $command . "}" . $accounts_hardbox == $val) {
+ if ('{' . $command . '}' . $accounts_hardbox == $val) {
$accounts_hardbox_ok = true;
}
- if ("{" . $command . "}" . $accounts_softbox == $val) {
+ if ('{' . $command . '}' . $accounts_softbox == $val) {
$accounts_softbox_ok = true;
}
}
@@ -203,18 +205,23 @@
case 'list':
case 'list_accounts':
default:
+ // render start here
+ xoops_cp_header();
+ // render submenu
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, '?op=new_account', 'add');
echo $indexAdmin->renderButton();
//
- $limit = $xnewsletter->getConfig('adminperpage');
$accountsCriteria = new CriteriaCompo();
- $accountsCriteria->setSort("accounts_id ASC, accounts_type");
- $accountsCriteria->setOrder("ASC");
+ $accountsCriteria->setSort('accounts_id ASC, accounts_type');
+ $accountsCriteria->setOrder('ASC');
$accountsCount = $xnewsletter->getHandler('accounts')->getCount();
- $start = xnewsletterRequest::getInt('start', 0);
+ //
+ $start = XoopsRequest::getInt('start', 0);
+ $limit = $xnewsletter->getConfig('adminperpage');
$accountsCriteria->setStart($start);
$accountsCriteria->setLimit($limit);
+ //
$accountsObjs = $xnewsletter->getHandler('accounts')->getAll($accountsCriteria);
if ($accountsCount > $limit) {
include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
@@ -223,7 +230,6 @@
} else {
$pagenav = '';
}
-
// View Table
echo "<table class='outer width100' cellspacing='1'>";
echo "<tr>";
@@ -235,7 +241,6 @@
echo " <th>" . _AM_XNEWSLETTER_ACCOUNTS_DEFAULT . "</th>";
echo " <th>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
echo "</tr>";
-
if ($accountsCount > 0) {
$class = 'odd';
foreach ($accountsObjs as $accounts_id => $accountsObj) {
@@ -255,7 +260,6 @@
echo "<td>{$accountsObj->getVar('accounts_yourmail')}</td>";
$verif_accounts_default = ($accountsObj->getVar('accounts_default') == 1) ? _YES : _NO;
echo "<td class='center'>{$verif_accounts_default}</td>";
-
echo "<td class='center'>";
echo " <a href='?op=edit_account&accounts_id={$accounts_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>";
echo " <a href='?op=delete_account&accounts_id={$accounts_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>";
@@ -271,28 +275,41 @@
echo "<br />";
echo "<div>{$pagenav}</div>";
echo "<br />";
+ include_once __DIR__ . '/admin_footer.php';
break;
case 'new_account':
+ case 'edit_account':
+ // render start here
+ xoops_cp_header();
+ // render submenu
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
//
- $accountObj = $xnewsletter->getHandler('accounts')->create();
- $accountObj = xnewsletter_setPost($accountObj, $_POST);
- $form = $accountObj->getForm();
+ if ($accounts_id == 0) {
+ $accountObj = $xnewsletter->getHandler('accounts')->create();
+ $accountObj = xnewsletter_setPost($accountObj, $_POST);
+ } else {
+ $accountObj = $xnewsletter->getHandler('accounts')->get($accounts_id);
+ if (!empty($_POST)) {
+ xnewsletter_setPost($accountObj, $_POST);
+ }
+ }
+ //
+ $form = $accountObj->getForm();
$form->display();
+ include_once __DIR__ . '/admin_footer.php';
break;
case 'save_accounts':
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
-
- $accountObj = $xnewsletter->getHandler('accounts')->get($accounts_id);
+ $accountObj = $xnewsletter->getHandler('accounts')->get($accounts_id);
$_POST['accounts_id'] = $accounts_id;
- $accountObj = xnewsletter_setPost($accountObj, $_POST);
-
+ $accountObj = xnewsletter_setPost($accountObj, $_POST);
+ //
$accountsCriteria = new CriteriaCompo();
$accountsCriteria->add(new Criteria('accounts_default', 1));
$count_accounts_default = $xnewsletter->getHandler('accounts')->getCount($accountsCriteria);
@@ -321,29 +338,22 @@
} else {
$accountObj->setErrors(_MA_XNEWSLETTER_SUBSCRIPTION_ERROR_NOEMAIL);
}
-
- echo $accountObj->getHtmlErrors();
- $form = $accountObj->getForm();
- $form->display();
- break;
-
- case 'edit_account':
+ // render start here
+ xoops_cp_header();
+ // render submenu
echo $indexAdmin->addNavigation($currentFile);
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, '?op=new_account', 'add');
$indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
//
- $accountObj = $xnewsletter->getHandler('accounts')->get($accounts_id);
- if (!empty($_POST)) {
- xnewsletter_setPost($accountObj, $_POST);
- }
+ echo $accountObj->getHtmlErrors();
$form = $accountObj->getForm();
$form->display();
+ include_once __DIR__ . '/admin_footer.php';
break;
case 'delete_account':
$accountObj = $xnewsletter->getHandler('accounts')->get($accounts_id);
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
@@ -353,8 +363,15 @@
echo $accountObj->getHtmlErrors();
}
} else {
- xoops_confirm(array('ok' => true, 'accounts_id' => $accounts_id, 'op' => 'delete_account'), $currentFile, sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $accountObj->getVar('accounts_name')));
+ // render start here
+ xoops_cp_header();
+ // render submenu
+ xoops_confirm(
+ array('ok' => true, 'accounts_id' => $accounts_id, 'op' => 'delete_account'),
+ $currentFile,
+ sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $accountObj->getVar('accounts_name'))
+ );
+ include_once __DIR__ . '/admin_footer.php';
}
break;
}
-include_once __DIR__ . '/admin_footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/attachment.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/attachment.php 2014-12-14 11:04:17 UTC (rev 12906)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/attachment.php 2014-12-16 22:28:16 UTC (rev 12907)
@@ -32,8 +32,8 @@
xoops_cp_header();
// We recovered the value of the argument op in the URL$
-$op = xnewsletterRequest::getString('op', 'list');
-$attachment_id = xnewsletterRequest::getInt('attachment_id', 0);
+$op = XoopsRequest::getString('op', 'list');
+$attachment_id = XoopsRequest::getInt('attachment_id', 0);
switch ($op) {
case 'list':
@@ -50,7 +50,7 @@
$attachmentCriteria->setSort('attachment_letter_id DESC, attachment_id');
$attachmentCriteria->setOrder('DESC');
//
- $start = xnewsletterRequest::getInt('start', 0);
+ $start = XoopsRequest::getInt('start', 0);
$limit = $xnewsletter->getConfig('adminperpage');
$attachmentCriteria->setStart($start);
$attachmentCriteria->setLimit($limit);
@@ -66,14 +66,13 @@
//
$attachmentObjs = $xnewsletter->getHandler('attachment')->getObjects($attachmentCriteria, true);
$attachments = $xnewsletter->getHandler('attachment')->getObjects($attachmentCriteria, true, false); // as array
+ $GLOBALS['xoopsTpl']->assign('attachments', array());
foreach ($attachments as $attachment_id => $attachment) {
$letterObj = $xnewsletter->getHandler('letter')->get($attachment['attachment_letter_id']);
$attachment['attachment_letter_title'] = $letterObj->getVar('letter_title');
-// IN PROGRESS
-// IN PROGRESS
-// IN PROGRESS
+ $attachment['attachment_size1024'] = xnewsletter_bytesToSize1024($attachment['attachment_size']);
$attachment['attachment_submitter_uname'] = XoopsUser::getUnameFromId($attachment['attachment_submitter'], 'S');
- $attachment['attachment_created_formatted'] = formatTimestamp($template['attachment_created'], $xnewsletter->getConfig('dateformat'));
+ $attachment['attachment_created_formatted'] = formatTimestamp($attachment['attachment_created'], $xnewsletter->getConfig('dateformat'));
$GLOBALS['xoopsTpl']->append('attachments', $attachment);
}
//
@@ -101,7 +100,7 @@
}
//
$attachmentObj = $xnewsletter->getHandler('attachment')->get($attachment_id);
- $attachmentObj->setVar('attachment_mode', xnewsletterRequest::getInt('attachment_mode', _XNEWSLETTER_ATTACHMENTS_MODE_ASATTACHMENT));
+ $attachmentObj->setVar('attachment_mode', XoopsRequest::getInt('attachment_mode', _XNEWSLETTER_ATTACHMENTS_MODE_ASATTACHMENT));
//
if ($xnewsletter->getHandler('attachment')->insert($attachmentObj)) {
redirect_header('?op=list', 3, _AM_XNEWSLETTER_FORMOK);
@@ -116,7 +115,7 @@
case 'delete_attachment':
$attachmentObj = $xnewsletter->getHandler('attachment')->get($attachment_id);
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php 2014-12-14 11:04:17 UTC (rev 12906)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php 2014-12-16 22:28:16 UTC (rev 12907)
@@ -32,14 +32,14 @@
xoops_cp_header();
// We recovered the value of the argument op in the URL$
-$op = xnewsletterRequest::getString('op', 'list');
-$bmh_id = xnewsletterRequest::getInt('bmh_id', 0);
-$bmh_measure = xnewsletterRequest::getInt('bmh_measure', 0);
-$filter = xnewsletterRequest::getInt('bmh_measure_filter', _XNEWSLETTER_BMH_MEASURE_VAL_ALL);
+$op = XoopsRequest::getString('op', 'list');
+$bmh_id = XoopsRequest::getInt('bmh_id', 0);
+$bmh_measure = XoopsRequest::getInt('bmh_measure', 0);
+$filter = XoopsRequest::getInt('bmh_measure_filter', _XNEWSLETTER_BMH_MEASURE_VAL_ALL);
switch ($op) {
case 'bmh_delsubscr':
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
$count_err = 0;
$bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
@@ -223,7 +223,7 @@
$bhmCriteria->setSort('bmh_id');
$bhmCriteria->setOrder('DESC');
$bhmCount = $xnewsletter->getHandler('bmh')->getCount($bhmCriteria);
- $start = xnewsletterRequest::getInt('start', 0);
+ $start = XoopsRequest::getInt('start', 0);
$bhmCriteria->setStart($start);
$bhmCriteria->setLimit($limit);
$bhmObjs = $xnewsletter->getHandler('bmh')->getAll($bhmCriteria);
@@ -323,18 +323,18 @@
}
$bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
- $bmhObj->setVar('bmh_rule_no', xnewsletterRequest::getString('bmh_rule_no', ''));
- $bmhObj->setVar('bmh_rule_cat', xnewsletterRequest::getString('bmh_rule_cat', ''));
- $bmhObj->setVar('bmh_bouncetype', xnewsletterRequest::getString('bmh_bouncetype', ''));
- $bmhObj->setVar('bmh_remove', xnewsletterRequest::getString('bmh_remove', ''));
- $bmh_email = xnewsletterRequest::getString('bmh_email', '');
+ $bmhObj->setVar('bmh_rule_no', XoopsRequest::getString('bmh_rule_no', ''));
+ $bmhObj->setVar('bmh_rule_cat', XoopsRequest::getString('bmh_rule_cat', ''));
+ $bmhObj->setVar('bmh_bouncetype', XoopsRequest::getString('bmh_bouncetype', ''));
+ $bmhObj->setVar('bmh_remove', XoopsRequest::getString('bmh_remove', ''));
+ $bmh_email = XoopsRequest::getString('bmh_email', '');
$bmh_email = filter_var($bmh_email, FILTER_SANITIZE_EMAIL);
$bmh_email = xnewsletter_checkEmail($bmh_email);
$bmhObj->setVar('bmh_email', $bmh_email);
- $bmhObj->setVar('bmh_subject', xnewsletterRequest::getString('bmh_subject', ''));
- $bmhObj->setVar('bmh_measure', xnewsletterRequest::getInt('bmh_measure', 0));
- $bmhObj->setVar('bmh_submitter', xnewsletterRequest::getInt('bmh_submitter', 0));
- $bmhObj->setVar('bmh_created', xnewsletterRequest::getInt('bmh_created', 0));
+ $bmhObj->setVar('bmh_subject', XoopsRequest::getString('bmh_subject', ''));
+ $bmhObj->setVar('bmh_measure', XoopsRequest::getInt('bmh_measure', 0));
+ $bmhObj->setVar('bmh_submitter', XoopsRequest::getInt('bmh_submitter', 0));
+ $bmhObj->setVar('bmh_created', XoopsRequest::getInt('bmh_created', 0));
if ($xnewsletter->getHandler('bmh')->insert($bmhObj)) {
redirect_header('?op=list', 3, _AM_XNEWSLETTER_FORMOK);
@@ -356,7 +356,7 @@
case 'delete_bmh':
$bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php 2014-12-14 11:04:17 UTC (rev 12906)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php 2014-12-16 22:28:16 UTC (rev 12907)
@@ -32,8 +32,8 @@
xoops_cp_header();
// We recovered the value of the argument op in the URL$
-$op = xnewsletterRequest::getString('op', 'list');
-$cat_id = xnewsletterRequest::getInt('cat_id', 0);
+$op = XoopsRequest::getString('op', 'list');
+$cat_id = XoopsRequest::getInt('cat_id', 0);
switch ($op) {
case 'list':
@@ -51,7 +51,7 @@
$catCriteria->setSort('cat_id ASC, cat_name');
$catCriteria->setOrder('ASC');
//
- $start = xnewsletterRequest::getInt('start', 0);
+ $start = XoopsRequest::getInt('start', 0);
$limit = $xnewsletter->getConfig('adminperpage');
$catCriteria->setStart($start);
$catCriteria->setLimit($limit);
@@ -139,9 +139,9 @@
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
$catObj = $xnewsletter->getHandler('cat')->get($cat_id);
- $catObj->setVar('cat_name', xnewsletterRequest::getString('cat_name', ''));
+ $catObj->setVar('cat_name', XoopsRequest::getString('cat_name', ''));
$catObj->setVar('cat_info', $_REQUEST['cat_info']);
- $catObj->setVar('cat_mailinglist', xnewsletterRequest::getInt('cat_mailinglist', 0));
+ $catObj->setVar('cat_mailinglist', XoopsRequest::getInt('cat_mailinglist', 0));
$catObj->setVar('cat_submitter', $GLOBALS['xoopsUser']->uid());
$catObj->setVar('cat_created', time());
$catObj->setVar('dohtml', isset($_REQUEST['dohtml']));
@@ -156,28 +156,28 @@
// Form cat_gperms_read
$gperm_handler->deleteByModule($xnewsletter->getModule()->mid(), 'newsletter_read_cat', $cat_id);
$gperm_handler->addRight('newsletter_read_cat', $cat_id, XOOPS_GROUP_ADMIN, $xnewsletter->getModule()->mid());
- $cat_gperms_read_groupids = xnewsletterRequest::getArray('cat_gperms_read', array());
+ $cat_gperms_read_groupids = XoopsRequest::getArray('cat_gperms_read', array());
foreach ($cat_gperms_read_groupids as $groupid) {
$gperm_handler->addRight('newsletter_read_cat', $cat_id, $groupid, $xnewsletter->getModule()->mid());
}
// Form cat_gperms_admin
$gperm_handler->deleteByModule($xnewsletter->getModule()->mid(), 'newsletter_admin_cat', $cat_id);
$gperm_handler->addRight('newsletter_admin_cat', $cat_id, XOOPS_GROUP_ADMIN, $xnewsletter->getModule()->mid());
- $cat_gperms_admin_groupids = xnewsletterRequest::getArray('cat_gperms_admin', array());
+ $cat_gperms_admin_groupids = XoopsRequest::getArray('cat_gperms_admin', array());
foreach ($cat_gperms_admin_groupids as $groupid) {
$gperm_handler->addRight('newsletter_admin_cat', $cat_id, $groupid, $xnewsletter->getModule()->mid());
}
// Form cat_gperms_create
$gperm_handler->deleteByModule($xnewsletter->getModule()->mid(), 'newsletter_create_cat', $cat_id);
$gperm_handler->addRight('newsletter_create_cat', $cat_id, XOOPS_GROUP_ADMIN, $xnewsletter->getModule()->mid());
- $cat_gperms_create_groupids = xnewsletterRequest::getArray('cat_gperms_create', array());
+ $cat_gperms_create_groupids = XoopsRequest::getArray('cat_gperms_create', array());
foreach ($cat_gperms_create_groupids as $groupid) {
$gperm_handler->addRight('newsletter_create_cat', $cat_id, $groupid, $xnewsletter->getModule()->mid());
}
// Form cat_gperms_list
$gperm_handler->deleteByModule($xnewsletter->getModule()->mid(), 'newsletter_list_cat', $cat_id);
$gperm_handler->addRight('newsletter_list_cat', $cat_id, XOOPS_GROUP_ADMIN, $xnewsletter->getModule()->mid());
- $cat_gperms_list_groupids = xnewsletterRequest::getArray('cat_gperms_list', array());
+ $cat_gperms_list_groupids = XoopsRequest::getArray('cat_gperms_list', array());
foreach ($cat_gperms_list_groupids as $groupid) {
$gperm_handler->addRight('newsletter_list_cat', $cat_id, $groupid, $xnewsletter->getModule()->mid());
}
@@ -205,7 +205,7 @@
case 'delete_cat':
$catObj = $xnewsletter->getHandler('cat')->get($_REQUEST['cat_id']);
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php 2014-12-14 11:04:17 UTC (rev 12906)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php 2014-12-16 22:28:16 UTC (rev 12907)
@@ -32,7 +32,7 @@
xoops_cp_header();
// We recovered the value of the argument op in the URL$
-$op = xnewsletterRequest::getString('op', 'list');
+$op = XoopsRequest::getString('op', 'list');
switch ($op) {
case 'list':
@@ -46,7 +46,7 @@
$catCriteria->setSort('cat_id ASC, cat_name');
$catCriteria->setOrder('ASC');
$catCount = $xnewsletter->getHandler('cat')->getCount();
- $start = xnewsletterRequest::getInt('start', 0);
+ $start = XoopsRequest::getInt('start', 0);
$catCriteria->setStart($start);
$catCriteria->setLimit($limit);
$catObjs = $xnewsletter->getHandler('cat')->getAll($catCriteria);
@@ -88,7 +88,7 @@
break;
case 'list_cat':
- $cat_id = xnewsletterRequest::getInt('cat_id', 0);
+ $cat_id = XoopsRequest::getInt('cat_id', 0);
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_CATLIST, '?op=list', 'list');
@@ -101,7 +101,7 @@
$catsubscrCriteria->setSort('catsubscr_id ASC, catsubscr_catid');
$catsubscrCriteria->setOrder('ASC');
$catCount = $xnewsletter->getHandler('catsubscr')->getCount($catsubscrCriteria);
- $start = xnewsletterRequest::getInt('start', 0);
+ $start = XoopsRequest::getInt('start', 0);
$catsubscrCriteria->setStart($start);
$catsubscrCriteria->setLimit($limit);
$catsubscrObjs = $xnewsletter->getHandler('catsubscr')->getAll($catsubscrCriteria);
@@ -184,7 +184,7 @@
$catsubscrObj->setVar('catsubscr_catid', $_REQUEST['catsubscr_catid']);
$catsubscr_subscrid = $_REQUEST['catsubscr_subscrid'];
$catsubscrObj->setVar('catsubscr_subscrid', $catsubscr_subscrid);
- $catsubscr_quit_now = xnewsletterRequest::getInt('catsubscr_quit_now', _XNEWSLETTER_CATSUBSCR_QUIT_NO_VAL_NONE);
+ $catsubscr_quit_now = XoopsRequest::getInt('catsubscr_quit_now', _XNEWSLETTER_CATSUBSCR_QUIT_NO_VAL_NONE);
if ($catsubscr_quit_now == _XNEWSLETTER_CATSUBSCR_QUIT_NO_VAL_NOW) {
$catsubscrObj->setVar('catsubscr_quited', time());
} elseif ($catsubscr_quit_now == _XNEWSLETTER_CATSUBSCR_QUIT_NO_VAL_REMOVE) {
@@ -209,7 +209,7 @@
break;
case 'edit_catsubscr':
- $cat_id = xnewsletterRequest::getInt('cat_id', 0);
+ $cat_id = XoopsRequest::getInt('cat_id', 0);
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_CATSUBSCRLIST, "?op=list_cat&cat_id={$cat_id}", 'list');
@@ -223,7 +223,7 @@
case 'delete_catsubscr':
$catsubscrObj = $xnewsletter->getHandler('catsubscr')->get($_REQUEST['catsubscr_id']);
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header('catsubscr.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php 2014-12-14 11:04:17 UTC (rev 12906)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php 2014-12-16 22:28:16 UTC (rev 12907)
@@ -34,17 +34,17 @@
define('XNEWSLETTER_BASIC_LIMIT_IMPORT_CHECKED', 100);
define('XNEWSLETTER_BASIC_LIMIT_IMPORT_AT_ONCE', 10);
-$plugin = xnewsletterRequest::getString('plugin', 'csv');
-$cat_id = xnewsletterRequest::getInt('cat_id', 0, 'int');
-$start = xnewsletterRequest::getInt('start', 0);
-$checkSubscrsAfterRead = xnewsletterRequest::getBool('checkSubscrsAfterRead', true);
-$checkLimit = xnewsletterRequest::getInt('checkLimit', XNEWSLETTER_BASIC_LIMIT_IMPORT_CHECKED);
-$skipcatsubscrexist = xnewsletterRequest::getInt('skipcatsubscrexist', 1);
-$checkImport = xnewsletterRequest::getInt('checkImport', 0);
+$plugin = XoopsRequest::getString('plugin', 'csv');
+$cat_id = XoopsRequest::getInt('cat_id', 0, 'int');
+$start = XoopsRequest::getInt('start', 0);
+$checkSubscrsAfterRead = XoopsRequest::getBool('checkSubscrsAfterRead', true);
+$checkLimit = XoopsRequest::getInt('checkLimit', XNEWSLETTER_BASIC_LIMIT_IMPORT_CHECKED);
+$skipcatsubscrexist = XoopsRequest::getInt('skipcatsubscrexist', 1);
+$checkImport = XoopsRequest::getInt('checkImport', 0);
echo $indexAdmin->addNavigation($currentFile);
-$op = xnewsletterRequest::getString('op', 'default');
+$op = XoopsRequest::getString('op', 'default');
switch ($op) {
case 'show_formcheck':
$indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, $currentFile, 'list');
@@ -190,13 +190,13 @@
case 'apply_import_form':
//update xnewsletter with settings form_import
- $counter = xnewsletterRequest::getInt('counter', 0);
+ $counter = XoopsRequest::getInt('counter', 0);
for ($i = 1; $i < ($counter + 1); ++$i) {
- $import_id = xnewsletterRequest::getString("import_id_{$i}", 'default');
- $subscr_firstname = xnewsletterRequest::getString("firstname_{$i}", '');
- $subscr_lastname = xnewsletterRequest::getString("lastname_{$i}", '');
- $subscr_sex = xnewsletterRequest::getString("sex_{$i}", '');
- $cat_id = xnewsletterRequest::getInt("cat_id_{$i}", 0);
+ $import_id = XoopsRequest::getString("import_id_{$i}", 'default');
+ $subscr_firstname = XoopsRequest::getString("firstname_{$i}", '');
+ $subscr_lastname = XoopsRequest::getString("lastname_{$i}", '');
+ $subscr_sex = XoopsRequest::getString("sex_{$i}", '');
+ $cat_id = XoopsRequest::getInt("cat_id_{$i}", 0);
if ($cat_id > 0) {
if ($subscr_id == 0) {
//update sex, firstname, lastname
@@ -405,8 +405,8 @@
//import data into xnewsletter_import with plugin
if ($plugin == 'csv') {
$csv_file = $_FILES['csv_file']['tmp_name'];
- $csvSkipHeader = xnewsletterRequest::getBool('csvSkipHeader', false);
- $csvDelimiter = xnewsletterRequest::getString('csvDelimiter', ',');
+ $csvSkipHeader = XoopsRequest::getBool('csvSkipHeader', false);
+ $csvDelimiter = XoopsRequest::getString('csvDelimiter', ',');
//$numData = $function($cat_id, $checkSubscrsAfterRead, $checkLimit, $skipcatsubscrexist, $csv_file, $csvDelimiter, $csvSkipHeader);
$numData = call_user_func($function, $cat_id, $checkSubscrsAfterRead, $checkLimit, $skipcatsubscrexist, $csv_file, $csvDelimiter, $csvSkipHeader);
} else {
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php 2014-12-14 11:04:17 UTC (rev 12906)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/letter.php 2014-12-16 22:28:16 UTC (rev 12907)
@@ -31,8 +31,8 @@
include_once __DIR__ . '/admin_header.php';
// We recovered the value of the argument op in the URL$
-$op = xnewsletterRequest::getString('op', 'list');
-$letter_id = xnewsletterRequest::getInt('letter_id', 0);
+$op = XoopsRequest::getString('op', 'list');
+$letter_id = XoopsRequest::getInt('letter_id', 0);
switch ($op) {
case 'show_preview':
@@ -65,6 +65,7 @@
$attachmentAslinkCriteria->setSort('attachment_id');
$attachmentAslinkCriteria->setOrder('ASC');
$attachmentObjs = $xnewsletter->getHandler('attachment')->getObjects($attachmentAslinkCriteria, true);
+ $letterTpl->assign('attachments', array());
foreach ($attachmentObjs as $attachment_id => $attachmentObj) {
$attachment_array = $attachmentObj->toArray();
$attachment_array['attachment_url'] = XNEWSLETTER_URL . "/attachment.php?attachment_id={$attachment_id}";
@@ -120,7 +121,7 @@
$GLOBALS['xoopsTpl']->assign('letterCount', $letterCount);
if ($letterCount > 0) {
$limit = $xnewsletter->getConfig('adminperpage');
- $start = xnewsletterRequest::getInt('start', 0);
+ $start = XoopsRequest::getInt('start', 0);
$letterCriteria->setStart($start);
$letterCriteria->setLimit($limit);
//
@@ -267,14 +268,14 @@
echo $indexAdmin->renderButton();
//
// update existing_attachments
- $existing_attachments_mode = xnewsletterRequest::getArray('existing_attachments_mode', array());
+ $existing_attachments_mode = XoopsRequest::getArray('existing_attachments_mode', array());
foreach ($existing_attachments_mode as $existing_attachment_id => $existing_attachment_mode) {
$attachmentObj = $xnewsletter->getHandler('attachment')->get($existing_attachment_id);
$attachmentObj->setVar('attachment_mode', $existing_attachment_mode);
$xnewsletter->getHandler('attachment')->insert($attachmentObj);
}
//
- $attachment_id = xnewsletterRequest::getInt('deleted_attachment_id', 0, 'POST');
+ $attachment_id = XoopsRequest::getInt('deleted_attachment_id', 0, 'POST');
if ($attachment_id == 0) {
redirect_header($currentFile, 3, _AM_XNEWSLETTER_LETTER_ERROR_INVALID_ATT_ID);
exit();
@@ -285,10 +286,10 @@
if ($xnewsletter->getHandler('attachment')->delete($attachmentObj, true)) {
//
$letterObj = $xnewsletter->getHandler('letter')->get($letter_id);
- $letterObj->setVar('letter_title', xnewsletterRequest::getString('letter_title', ''));
+ $letterObj->setVar('letter_title', XoopsRequest::getString('letter_title', ''));
$letterObj->setVar('letter_content', $_REQUEST['letter_content']);
$letterObj->setVar('letter_template', $_REQUEST['letter_template']);
- $letterObj->setVar('letter_cats', implode('|', xnewsletterRequest::getArray('letter_cats', array())));
+ $letterObj->setVar('letter_cats', implode('|', XoopsRequest::getArray('letter_cats', array())));
$letterObj->setVar('letter_account', $_REQUEST['letter_account']);
$letterObj->setVar('letter_email_test', $_REQUEST['letter_email_test']);
//
@@ -305,19 +306,19 @@
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
$letterObj = $xnewsletter->getHandler('letter')->get($letter_id); // create if doesn't exist
- $letterObj->setVar('letter_title', xnewsletterRequest::getString('letter_title', ''));
+ $letterObj->setVar('letter_title', XoopsRequest::getString('letter_title', ''));
$letterObj->setVar('letter_content', $_REQUEST['letter_content']);
$letterObj->setVar('letter_template', $_REQUEST['letter_template']);
- $letterObj->setVar('letter_cats', implode('|', xnewsletterRequest::getArray('letter_cats', array())));
+ $letterObj->setVar('letter_cats', implode('|', XoopsRequest::getArray('letter_cats', array())));
$letterObj->setVar('letter_account', $_REQUEST['letter_account']);
$letterObj->setVar('letter_email_test', $_REQUEST['letter_email_test']);
- $letterObj->setVar('letter_submitter', xnewsletterRequest::getInt('letter_submitter', 0));
- $letterObj->setVar('letter_created', xnewsletterRequest::getInt('letter_created', time()));
+ $letterObj->setVar('letter_submitter', XoopsRequest::getInt('letter_submitter', 0));
+ $letterObj->setVar('letter_created', XoopsRequest::getInt('letter_created', time()));
//
if ($xnewsletter->getHandler('letter')->insert($letterObj)) {
$letter_id = $letterObj->getVar('letter_id');
// update existing_attachments
- $existing_attachments_mode = xnewsletterRequest::getArray('existing_attachments_mode', array());
+ $existing_attachments_mode = XoopsRequest::getArray('existing_attachments_mode', array());
foreach ($existing_attachments_mode as $attachment_id => $attachment_mode) {
$attachmentObj = $xnewsletter->getHandler('attachment')->get($attachment_id);
$attachmentObj->setVar('attachment_mode', $attachment_mode);
@@ -334,18 +335,19 @@
chmod($uploaddir, 0777);
copy($indexFile, $uploaddir . "index.html");
}
- $new_attachments_mode = xnewsletterRequest::getArray('new_attachments_mode', array());
+ $new_attachments_mode = XoopsRequest::getArray('new_attachments_mode', array());
for ($upl = 0; $upl < $xnewsletter->getConfig('xn_maxattachments'); ++$upl) {
$uploader = new XoopsMediaUploader($uploaddir, $xnewsletter->getConfig('xn_mimetypes'), $xnewsletter->getConfig('xn_maxsize'), null, null);
if ($uploader->fetchMedia(@$_POST['xoops_upload_file'][$upl])) {
//$uploader->setPrefix("xn_") ; keep original name
$uploader->fetchMedia($_POST['xoops_upload_file'][$upl]);
if (!$uploader->upload()) {
- $errors = $uploader->getErrors();
- redirect_header('javascript:history.go(-1)', 3, $errors);
+ // ERROR
+ echo $uploader->getErrors();
+ exit();
} else {
preg_match('/ne\w_attachment_index=([0-9]+)/', $_POST['xoops_upload_file'][$upl], $matches);
- $index = $matches[1];
+ $index = $matches[1];
$uploadedFiles[] = array(
'name' => $uploader->getSavedFileName(),
'type' => $uploader->getMediaType(),
@@ -368,7 +370,7 @@
//
$xnewsletter->getHandler('attachment')->insert($attachmentObj);
}
- $action = xnewsletterRequest::getInt('letter_action', _XNEWSLETTER_LETTER_ACTION_VAL_NO);
+ $action = XoopsRequest::getInt('letter_action', _XNEWSLETTER_LETTER_ACTION_VAL_NO);
switch ($action) {
case _XNEWSLETTER_LETTER_ACTION_VAL_PREVIEW:
$redirectUrl = "?op=show_preview&letter_id={$letter_id}";
@@ -430,7 +432,7 @@
case 'delete_letter':
$letterObj = $xnewsletter->getHandler('letter')->get($letter_id);
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/mailinglist.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/mailinglist.php 2014-12-14 11:04:17 UTC (rev 12906)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/mailinglist.php 2014-12-16 22:28:16 UTC (rev 12907)
@@ -32,7 +32,7 @@
xoops_cp_header();
// We recovered the value of the argument op in the URL$
-$op = xnewsletterRequest::getString('op', 'list');
+$op = XoopsRequest::getString('op', 'list');
switch ($op) {
case 'list':
@@ -45,7 +45,7 @@
$mailinglistCriteria->setSort('mailinglist_id ASC, mailinglist_email');
$mailinglistCriteria->setOrder('ASC');
$mailinglistCount = $xnewsletter->getHandler('mailinglist')->getCount();
- $start = xnewsletterRequest::getInt('start', 0);
+ $start = XoopsRequest::getInt('start', 0);
$mailinglistCriteria->setStart($start);
$mailinglistCriteria->setLimit($limit);
$mailinglistObjs = $xnewsletter->getHandler('mailinglist')->getAll($mailinglistCriteria);
@@ -146,7 +146,7 @@
case 'delete_mailinglist':
$mailinglistObj = $xnewsletter->getHandler('mailinglist')->get($_REQUEST['mailinglist_id']);
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/maintenance.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/maintenance.php 2014-12-14 11:04:17 UTC (rev 12906)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/maintenance.php 2014-12-16 22:28:16 UTC (rev 12907)
@@ -32,7 +32,7 @@
xoops_cp_header();
// We recovered the value of the argument op in the URL$
-$op = xnewsletterRequest::getString('op', 'list');
+$op = XoopsRequest::getString('op', 'list');
switch ($op) {
case 'list':
@@ -149,7 +149,7 @@
break;
case 'del_import':
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
$result = $GLOBALS['xoopsDB']->queryF("TRUNCATE TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}`");
$result = $GLOBALS['xoopsDB']->queryF("REPAIR TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}`");
$result = $GLOBALS['xoopsDB']->queryF("OPTIMIZE TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_import')}`");
@@ -188,7 +188,7 @@
$subscrCount = $xnewsletter->getHandler('subscr')->getCount($subscrCriteria);
}
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
$deleted = 0;
$errors = array();
$subscrArrays = $xnewsletter->getHandler('subscr')->getAll($subscrCriteria, array('subscr_id'), false, false);
@@ -255,7 +255,7 @@
break;
case 'del_oldprotocol':
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
$result = $GLOBALS['xoopsDB']->queryF("TRUNCATE TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_protocol')}`");
$result = $GLOBALS['xoopsDB']->queryF("REPAIR TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_protocol')}`");
$result = $GLOBALS['xoopsDB']->queryF("OPTIMIZE TABLE `{$GLOBALS['xoopsDB']->prefix('xnewsletter_protocol')}`");
@@ -282,7 +282,7 @@
case 'del_invalid_catsubscr':
//delete data in table catsubscr, if catsubscr_subscrid is no more existing in table subscr
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
$number_ids = 0;
$deleted = 0;
$errors = array();
@@ -342,7 +342,7 @@
break;
case 'del_invalid_ml':
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
$use_mailinglist = $GLOBALS['xoopsModuleConfig']['xn_use_mailinglist'];
$number_ids = 0;
$update = 0;
@@ -423,7 +423,7 @@
case 'del_invalid_cat':
//remove cat from letter_cats, if cat is missing (if someone deleted cat after creating letter)
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
$update = 0;
$errors = array();
$number_ids = 0;
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/menu.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/menu.php 2014-12-14 11:04:17 UTC (rev 12906)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/menu.php 2014-12-16 22:28:16 UTC (rev 12907)
@@ -64,12 +64,15 @@
$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU8;
$adminmenu[$i]['link'] = 'admin/protocol.php';
$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_protocol.png';
+++$i;
if ($xnewsletter->getConfig('xn_send_in_packages') > 0) {
- ++$i;
$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU13;
- $adminmenu[$i]['link'] = 'admin/task.php';
- $adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_task.png';
+} else {
+ $adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU13;
}
+$adminmenu[$i]['link'] = 'admin/task.php';
+$adminmenu[$i]['icon'] = $pathImageAdmin . '/xn_task.png';
+
if ($xnewsletter->getConfig('xn_use_mailinglist') == 1) {
++$i;
$adminmenu[$i]['title'] = _MI_XNEWSLETTER_ADMENU9;
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php 2014-12-14 11:04:17 UTC (rev 12906)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/protocol.php 2014-12-16 22:28:16 UTC (rev 12907)
@@ -31,12 +31,12 @@
include_once __DIR__ . '/admin_header.php';
// We recovered the value of the argument op in the URL$
-$op = xnewsletterRequest::getString('op', 'list_protocols');
+$op = XoopsRequest::getString('op', 'list_protocols');
switch ($op) {
case 'list':
case 'list_protocols':
default:
- $apply_filter = xnewsletterRequest::getBool('apply_filter', false);
+ $apply_filter = XoopsRequest::getBool('apply_filter', false);
// render start here
xoops_cp_header();
// render submenu
@@ -56,17 +56,15 @@
if ($protocolCount > 0) {
$protocolCriteria = new CriteriaCompo();
// get filter parameters
- $filter_protocol_letter_ids = xnewsletterRequest::getArray('filter_protocol_letter_ids', array());
+ $filter_protocol_letter_ids = XoopsRequest::getArray('filter_protocol_letter_ids', array());
//
- $filter_protocol_success = xnewsletterRequest::getInt('filter_protocol_success', 2); // all
+ $filter_protocol_success = XoopsRequest::getInt('filter_protocol_success', 2); // all
//
if (isset($_REQUEST['filter_protocol_created_from']['date'])) {
$dateTimeObj = DateTime::createFromFormat(_SHORTDATESTRING, $_REQUEST['filter_protocol_created_from']['date']);
$dateTimeObj->setTime(0, 0, 0);
$filter_protocol_created_from = (int) ($dateTimeObj->getTimestamp() + $_REQUEST['filter_protocol_created_from']['time']);
unset($dateTimeObj);
- } elseif (isset($_REQUEST['filter_protocol_created_from'])) {
- $filter_protocol_created_from = $_REQUEST['filter_protocol_created_from'];
} else {
$filter_protocol_created_from = 3600;
}
@@ -75,8 +73,6 @@
$dateTimeObj->setTime(0, 0, 0);
$filter_protocol_created_to = (int) ($dateTimeObj->getTimestamp() + $_REQUEST['filter_protocol_created_to']['time']);
unset($dateTimeObj);
- } elseif (isset($_REQUEST['filter_protocol_created_to'])) {
- $filter_protocol_created_to = $_REQUEST['filter_protocol_created_to'];
} else {
$filter_protocol_created_to = time();
}
@@ -101,10 +97,10 @@
$protocolFilterCount = $xnewsletter->getHandler('protocol')->getCount($protocolCriteria);
$GLOBALS['xoopsTpl']->assign('protocolFilterCount', $protocolFilterCount);
//
- $protocolCriteria->setSort('protocol_created');
+ $protocolCriteria->setSort('protocol_id');
$protocolCriteria->setOrder('DESC');
//
- $start = xnewsletterRequest::getInt('start', 0);
+ $start = XoopsRequest::getInt('start', 0);
$limit = $xnewsletter->getConfig('adminperpage');
$protocolCriteria->setStart($start);
$protocolCriteria->setLimit($limit);
@@ -125,8 +121,10 @@
$linklist .= "&filter_protocol_letter_ids[]={$filter_protocol_letter_id}";
}
$linklist .= "&filter_protocol_success={$filter_protocol_success}";
- $linklist .= "&filter_protocol_created_from={$filter_protocol_created_from}";
- $linklist .= "&filter_protocol_created_to={$filter_protocol_created_to}";
+ $linklist .= "&filter_protocol_created_from[date]={$_REQUEST['filter_protocol_created_from']['date']}";
+ $linklist .= "&filter_protocol_created_from[time]={$_REQUEST['filter_protocol_created_from']['time']}";
+ $linklist .= "&filter_protocol_created_to[date]={$_REQUEST['filter_protocol_created_to']['date']}";
+ $linklist .= "&filter_protocol_created_to[time]={$_REQUEST['filter_protocol_created_to']['time']}";
$pagenav = new XoopsPageNav($protocolFilterCount, $limit, $start, 'start', $linklist);
$pagenav = $pagenav->renderNav(4);
} else {
@@ -180,12 +178,12 @@
break;
case 'apply_actions':
- $action = xnewsletterRequest::getString('actions_action');
- $protocol_ids = xnewsletterRequest::getArray('protocol_ids', unserialize(xnewsletterRequest::getString('serialize_protocol_ids')));
+ $action = XoopsRequest::getString('actions_action');
+ $protocol_ids = XoopsRequest::getArray('protocol_ids', unserialize(XoopsRequest::getString('serialize_protocol_ids')));
$protocolCriteria = new Criteria('protocol_id', '(' . implode(',', $protocol_ids) . ')', 'IN');
switch ($action) {
case 'delete':
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
// delete subscriber (subscr), subscriptions (catsubscrs) and mailinglist
if ($xnewsletter->getHandler('protocol')->deleteAll($protocolCriteria, true, true)) {
redirect_header($currentFile, 3, _AM_XNEWSLETTER_FORMDELOK);
@@ -211,9 +209,9 @@
break;
case 'delete_protocol':
- $protocol_id = xnewsletterRequest::getInt('protocol_id', 0);
+ $protocol_id = XoopsRequest::getInt('protocol_id', 0);
$protocolObj = $xnewsletter->getHandler('protocol')->get($protocol_id);
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
@@ -236,8 +234,8 @@
break;
case 'delete_protocols':
- $field = xnewsletterRequest::getString('field', '');
- $value = xnewsletterRequest::getInt('value', 0);
+ $field = XoopsRequest::getString('field', '');
+ $value = XoopsRequest::getInt('value', 0);
switch ($field) {
case 'letter_id':
case 'protocol_letter_id':
@@ -261,7 +259,7 @@
$title = _AM_XNEWSLETTER_PROTOCOL_DELETE_ALL;
break;
}
- if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
+ if (XoopsRequest::getBool('ok', false, 'POST') == true) {
if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/sendletter.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/sendletter.php 2014-12-14 11:04:17 UTC (rev 12906)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/sendletter.php 2014-12-16 22:28:16 UTC (rev 12907)
@@ -29,8 +29,8 @@
include_once __DIR__ . '/admin_header.php';
-$op = xnewsletterRequest::getString('op', 'list');
-$letter_id = xnewsletterRequest::getInt('letter_id', 0);
+$op = XoopsRequest::getString('op', 'list');
+$letter_id = XoopsRequest::getInt('letter_id', 0);
$xn_send_in_packages = $xnewsletter->getConfig('xn_send_in_packages');
if ($xn_send_in_packages > 0 && $op != 'send_test') {
$xn_send_in_packages_time = $xnewsletter->getConfig('xn_send_in_packages_time');
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/subscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/subscr.php 2014-12-14 11:04:17 UTC (rev 12906)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/subscr.php 2014-12-16 22:28:16 UTC (rev 12907)
@@ -31,17 +31,17 @@
include_once __DIR__ . '/admin_header.php';
// We recovered the value of the argument op in the URL$
-$op = xnewsletterRequest::getString('op', 'list_subscrs');
+$op = XoopsRequest::getString('op', 'list_subscrs');
switch ($op) {
case 'show_catsubscr':
- $subscr_id = xnewsletterRequest::getInt('subscr_id', 0);
+ $subscr_id = XoopsRequest::getInt('subscr_id', 0);
// render start here
xoops_cp_header();
// render submenu
$subscrAdmin = new ModuleAdmin();
echo $subscrAdmin->addNavigation($currentFile);
//
- $prev_op = xnewsletterRequest::getString('prev_op', 'list_subscrs');
+ $prev_op = XoopsRequest::getString('prev_op', 'list_subscrs');
$linklist = "?op=$prev_op&filter_subscr={$filter_subscr}";
$linklist .= "&filter_subscr_firstname={$filter_subscr_firstname}";
$linklist .= "&filter_subscr_lastname={$filter_subscr_lastname}";
@@ -86,7 +86,7 @@
case 'list':
case 'list_subscrs':
default:
- $apply_filter = xnewsletterRequest::getBool('apply_filter', false);
+ $apply_filter = XoopsRequest::getBool('apply_filter', false);
// render start here
xoops_cp_header();
// render submenu
@@ -104,10 +104,10 @@
$subscrCriteria = new CriteriaCompo();
// get filtered subscrs criteria
// get filter parameters
- $filter_subscr = xnewsletterRequest::getString('filter_subscr', '=');
- $filter_subscr_firstname = xnewsletterRequest::getString('filter_subscr_firstname', '');
- $filter_subscr_lastname = xnewsletterRequest::getString('filter_subscr_lastname', '');
- $filter_subscr_email = xnewsletterRequest::getString('filter_subscr_email', '');
+ $filter_subscr = XoopsRequest::getString('filter_subscr', '=');
+ $filter_subscr_firstname = XoopsRequest::getString('filter_subscr_firstname', '');
+ $filter_subscr_lastname = XoopsRequest::getString('filter_subscr_lastname', '');
+ $filter_subscr_email = XoopsRequest::getString('filter_subscr_email', '');
if ($filter_subscr == 'LIKE' && !$filter_subscr_firstname == '') {
$filter_subscr_firstname = "%{$filter_subscr_firstname}%";
}
@@ -139,7 +139,7 @@
$subscrCriteria->setSort('subscr_id');
$subscrCriteria->setOrder('DESC');
//
- $start = xnewsletterRequest::getInt('start', 0);
+ $start = XoopsRequest::getInt('start', 0);
$limit = $xnewsletter->getConfig('adminperpage');
$subscrCriteria->setStart($start);
...
[truncated message content] |
