Menu
▾
▴
[Xoops-svn] SF.net SVN: xoops-svn:[12775] XoopsModules/xnewsletter/branches/luciorota/ xnewsletter
|
From: <luc...@us...> - 2014-09-05 20:17:59
|
Revision: 12775
http://sourceforge.net/p/xoops/svn/12775
Author: luciorota
Date: 2014-09-05 20:17:53 +0000 (Fri, 05 Sep 2014)
Log Message:
-----------
standardize: use include_once dirname(__FILE__)
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/about.php
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/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/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/accounts.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/attachment.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/bmh.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/breadcrumb.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/cat.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/catsubscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/class.xnewslettermailer.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/import.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/letter.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/mailinglist.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/protocol.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/session.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/subscr.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/class/template.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/cron.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/header.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/functions.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/include/phpmailer/PHPMailerAutoload.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/index.php
XoopsModules/xnewsletter/branches/luciorota/xnewsletter/language/english/admin.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/xoops_version.php
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/about.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/about.php 2014-09-03 23:15:49 UTC (rev 12774)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/about.php 2014-09-05 20:17:53 UTC (rev 12775)
@@ -26,11 +26,11 @@
* ****************************************************************************
*/
-include "admin_header.php";
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
//global $indexAdmin;
-echo $indexAdmin->addNavigation("about.php");
+echo $indexAdmin->addNavigation('about.php');
echo $indexAdmin->renderAbout('9P3B3FXKF868J', false);
-include "admin_footer.php";
+include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/accounts.php 2014-09-03 23:15:49 UTC (rev 12774)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/accounts.php 2014-09-05 20:17:53 UTC (rev 12775)
@@ -27,7 +27,7 @@
*/
$currentFile = basename(__FILE__);
-include 'admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
// We recovered the value of the argument op in the URL$
@@ -39,7 +39,7 @@
if ($post == '' && $op == 'save_accounts' && $save_and_check =='none') $op = "edit_account";
switch ($op) {
- case 'check_accoun':
+ case 'check_account':
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
@@ -204,7 +204,7 @@
$accountsCriteria->setLimit($limit);
$accountsObjs = $xnewsletter->getHandler('accounts')->getAll($accountsCriteria);
if ($accountsCount > $limit) {
- include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new XoopsPageNav($accountsCount, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
} else {
@@ -246,7 +246,7 @@
echo "<td>";
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>";
- if ($accountsObj->getVar("accounts_type") != _XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL && $accountsObj->getVar("accounts_type") != _XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL) {
+ if ($accountsObj->getVar("accounts_type") != _XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL && $accountsObj->getVar('accounts_type') != _XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL) {
echo " <a href='?op=check_account&accounts_id={$accounts_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_check.png alt='" . _AM_XNEWSLETTER_ACCOUNTS_TYPE_CHECK . "' title='" . _AM_XNEWSLETTER_ACCOUNTS_TYPE_CHECK . "' /></a>";
}
echo "</td>";
@@ -284,24 +284,24 @@
$count_accounts_default = $xnewsletter->getHandler('accounts')->getCount($accountsCriteria);
if ($count_accounts_default > 0) {
if ($accountObj->getVar('accounts_default') == 1) {
- global $xoopsDB;
- $verif_accounts_default = '1';
+ $verif_accounts_default = 1;
//reset old accounts_default
- $sql = "UPDATE `{$xoopsDB->prefix("xnewsletter_accounts")}` SET `accounts_default` = '0'";
- if(!$result = $xoopsDB->query($sql)) die ("MySQL-Error: " . mysql_error());
+ if(!$xnewsletter->getHandler('accounts')->updateAll('accounts_default', 0, null, false)) {
+ exit('MySQL-Error: ' . mysql_error());
+ }
} else {
- $verif_accounts_default = '0';
+ $verif_accounts_default = 0;
}
} else {
- $verif_accounts_default = '1';
+ $verif_accounts_default = 1;
}
$accountObj->setVar('accounts_default', $verif_accounts_default);
if ($accountObj->getVar('accounts_yourmail') != '' && $accountObj->getVar('accounts_yourmail') != _AM_XNEWSLETTER_ACCOUNTS_TYPE_YOUREMAIL ) {
if ($xnewsletter->getHandler('accounts')->insert($accountObj)) {
if ($save_and_check == 'none') {
- redirect_header("?op=list", 3, _AM_XNEWSLETTER_FORMOK);
+ redirect_header('?op=list', 3, _AM_XNEWSLETTER_FORMOK);
} else {
- redirect_header("?op=check_account&accounts_id={$accountObj->getVar("accounts_id")}", 3, _AM_XNEWSLETTER_FORMOK);
+ redirect_header("?op=check_account&accounts_id={$accountObj->getVar('accounts_id')}", 3, _AM_XNEWSLETTER_FORMOK);
}
}
} else {
@@ -343,4 +343,4 @@
}
break;
}
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/attachment.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/attachment.php 2014-09-03 23:15:49 UTC (rev 12774)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/attachment.php 2014-09-05 20:17:53 UTC (rev 12775)
@@ -27,7 +27,7 @@
*/
$currentFile = basename(__FILE__);
-include 'admin_header.php';
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
// We recovered the value of the argument op in the URL$
@@ -50,7 +50,7 @@
$attachmentCriteria->setLimit($limit);
$attachmentObjs = $xnewsletter->getHandler('attachment')->getObjects($attachmentCriteria, true);
if ($attachmentCount > $limit) {
- include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new XoopsPageNav($attachmentCount, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
} else {
@@ -141,4 +141,4 @@
break;
}
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php 2014-09-03 23:15:49 UTC (rev 12774)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh.php 2014-09-05 20:17:53 UTC (rev 12775)
@@ -27,36 +27,36 @@
*/
$currentFile = basename(__FILE__);
-include "admin_header.php";
+include_once dirname(__FILE__) . '/admin_header.php';
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 = 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);
switch ($op) {
- case "bmh_delsubscr":
+ case 'bmh_delsubscr':
if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
$count_err = 0;
$bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
- $bmh_email = $bmhObj->getVar("bmh_email");
+ $bmh_email = $bmhObj->getVar('bmh_email');
- $sql = "SELECT subscr_id FROM " . $xoopsDB->prefix("xnewsletter_subscr") . " WHERE (";
- $sql .= "subscr_email='" . $bmh_email . "'";
- $sql .= ") LIMIT 1;";
+ $sql = "SELECT subscr_id FROM {$xoopsDB->prefix("xnewsletter_subscr")}";
+ $sql .= " WHERE (subscr_email='{$bmh_email}')";
+ $sql .= " LIMIT 1;";
if ( $user = $xoopsDB->query($sql) ) {
$row_user = $xoopsDB->fetchRow($user);
- $subscr_id = intval($row_user[0]);
+ $subscr_id = (int) $row_user[0];
}
if ($subscr_id == 0) {
//set bmh_measure for all entries in bmh with this email
- $sql_upd_measure = "UPDATE " . $xoopsDB->prefix("xnewsletter_bmh") . " SET `bmh_measure` = '" . _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING . "'";
- $sql_upd_measure .=" WHERE ((`" . $xoopsDB->prefix("xnewsletter_bmh") . "`.`bmh_email` ='" . $bmh_email . "') AND (`" . $xoopsDB->prefix("xnewsletter_bmh") . "`.`bmh_measure` ='0'))";
+ $sql_upd_measure = "UPDATE {$xoopsDB->prefix('xnewsletter_bmh')} SET `bmh_measure` = '" . _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING . "'";
+ $sql_upd_measure .=" WHERE ((`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_email` ='{$bmh_email}') AND (`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_measure` ='0'))";
$xoopsDB->query($sql_upd_measure);
- redirect_header("?op=list", 3, _AM_XNEWSLETTER_BMH_ERROR_NO_SUBSCRID);
+ redirect_header('?op=list', 3, _AM_XNEWSLETTER_BMH_ERROR_NO_SUBSCRID);
}
$subscrObj = $xnewsletter->getHandler('subscr')->get($subscr_id);
@@ -73,14 +73,14 @@
if ($catsubscrsCount > 0) {
$catsubscrObjs = $xnewsletter->getHandler('catsubscr')->getAll($catsubscrCriteria);
foreach ($catsubscrObjs as $catsubscr_id => $catsubscrObj) {
- $catsubscrObj = $xnewsletter->getHandler('catsubscr')->get($catsubscrObj->getVar("catsubscr_id"));
- $catObj = $xnewsletter->getHandler('cat')->get($catsubscrObj->getVar("catsubscr_catid"));
- $cat_mailinglist = $catObj->getVar("cat_mailinglist");
+ $catsubscrObj = $xnewsletter->getHandler('catsubscr')->get($catsubscrObj->getVar('catsubscr_id'));
+ $catObj = $xnewsletter->getHandler('cat')->get($catsubscrObj->getVar('catsubscr_catid'));
+ $cat_mailinglist = $catObj->getVar('cat_mailinglist');
if ($xnewsletter->getHandler('catsubscr')->delete($catsubscrObj, true)) {
//handle mailinglists
if ($cat_mailinglist > 0) {
- require_once( XOOPS_ROOT_PATH . "/modules/xnewsletter/include/mailinglist.php" );
+ require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php';
subscribingMLHandler(0, $subscr_id, $cat_mailinglist);
}
} else {
@@ -96,48 +96,45 @@
echo $actionprot_err;
}
} else {
- xoops_confirm(array("ok" => true, "bmh_id" => $bmh_id, "op" => "bmh_delsubscr", "filter" => $filter), $currentFile, sprintf(_AM_XNEWSLETTER_BMH_MEASURE_DELETE_SURE));
+ xoops_confirm(array('ok' => true, 'bmh_id' => $bmh_id, 'op' => 'bmh_delsubscr', 'filter' => $filter), $currentFile, sprintf(_AM_XNEWSLETTER_BMH_MEASURE_DELETE_SURE));
}
break;
- case "handle_bmh":
+ case 'handle_bmh':
if ($bmh_id == 0) redirect_header($currentFile, 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
if ($bmh_measure == 0) redirect_header($currentFile, 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
$bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
- if ($bmhObj->getVar("bmh_measure") == _XNEWSLETTER_BMH_MEASURE_VAL_DELETE ) {
+ if ($bmhObj->getVar('bmh_measure') == _XNEWSLETTER_BMH_MEASURE_VAL_DELETE ) {
redirect_header("?op=list&filter={$filter}'", 3, _AM_XNEWSLETTER_BMH_MEASURE_ALREADY_DELETED);
}
$bmh_email = $bmhObj->getVar("bmh_email");
if ($bmh_measure == _XNEWSLETTER_BMH_MEASURE_VAL_QUIT) {
- $sql = "UPDATE `" . $xoopsDB->prefix("xnewsletter_subscr")."` INNER JOIN `";
- $sql .= $xoopsDB->prefix("xnewsletter_catsubscr") . "` ON `subscr_id` = `catsubscr_subscrid` ";
- $sql .= "SET `catsubscr_quited` = " . time();
- $sql .= " WHERE (((`subscr_email`)='" . $bmh_email . "'))";
- if(!$result = $xoopsDB->queryF($sql)) die ("MySQL-Error: " . mysql_error());
+ $sql = "UPDATE `{$xoopsDB->prefix('xnewsletter_subscr')}` INNER JOIN `{$xoopsDB->prefix('xnewsletter_catsubscr')}` ON `subscr_id` = `catsubscr_subscrid`";
+ $sql .= " SET `catsubscr_quited` = " . time();
+ $sql .= " WHERE (((`subscr_email`)='{$bmh_email}'))";
+ if(!$result = $xoopsDB->queryF($sql)) die ('MySQL-Error: ' . mysql_error());
}
//set bmh_measure for all entries in bmh with this email
- $sql_upd = "UPDATE " . $xoopsDB->prefix("xnewsletter_bmh") . " SET ";
- $sql_upd .="`bmh_measure` = '" . $bmh_measure . "'";
- $sql_upd .=", `bmh_submitter` = '" . $xoopsUser->uid() . "'";
- $sql_upd .=", `bmh_created` = '" . time() . "'";
- $sql_upd .=" WHERE ((`" . $xoopsDB->prefix("xnewsletter_bmh") . "`.`bmh_email` ='" . $bmh_email . "') AND (`" . $xoopsDB->prefix("xnewsletter_bmh") . "`.`bmh_measure` ='0'))";
- if(!$result = $xoopsDB->queryF($sql_upd)) die ("MySQL-Error: " . mysql_error());
+ $sql_upd = "UPDATE {$xoopsDB->prefix('xnewsletter_bmh')}";
+ $sql_upd .= " SET `bmh_measure` = '{$bmh_measure}', `bmh_submitter` = '{$xoopsUser->uid()}', `bmh_created` = '" . time() . "'";
+ $sql_upd .= " WHERE ((`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_email` ='{$bmh_email}') AND (`{$xoopsDB->prefix('xnewsletter_bmh')}`.`bmh_measure` ='0'))";
+ if(!$result = $xoopsDB->queryF($sql_upd)) die ('MySQL-Error: ' . mysql_error());
redirect_header("?op=list&filter={$filter}", 3, _AM_XNEWSLETTER_FORMOK);
echo $bmhObj->getHtmlErrors();
break;
- case "run_bmh":
+ case 'run_bmh':
require_once('bmh_callback_database.php');
require_once(XOOPS_ROOT_PATH . '/modules/xnewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php');
$accountCriteria = new CriteriaCompo();
- $accountCriteria->add(new Criteria("accounts_use_bmh", "1"));
+ $accountCriteria->add(new Criteria('accounts_use_bmh', '1'));
$accountsCount = $xnewsletter->getHandler('accounts')->getCount($accountCriteria);
if ($accountsCount > 0) {
@@ -159,30 +156,30 @@
//$bmh->processMailbox();
// for remote mailbox
- $bmh->mailhost = $accountObj->getVar("accounts_server_in"); // your mail server
- $bmh->mailbox_username = $accountObj->getVar("accounts_username"); // your mailbox username
- $bmh->mailbox_password = $accountObj->getVar("accounts_password"); // your mailbox password
- $bmh->port = $accountObj->getVar("accounts_port_in"); // the port to access your mailbox, default is 143
- if ($accountObj->getVar("accounts_type") == _XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3) {
- $bmh->service = 'pop3'; // the service to use (imap or pop3), default is 'imap'
+ $bmh->mailhost = $accountObj->getVar('accounts_server_in'); // your mail server
+ $bmh->mailbox_username = $accountObj->getVar('accounts_username'); // your mailbox username
+ $bmh->mailbox_password = $accountObj->getVar('accounts_password'); // your mailbox password
+ $bmh->port = $accountObj->getVar('accounts_port_in'); // the port to access your mailbox, default is 143
+ if ($accountObj->getVar('accounts_type') == _XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3) {
+ $bmh->service = 'pop3'; // the service to use (imap or pop3), default is 'imap'
} else {
- $bmh->service = 'imap'; // the service to use (imap or pop3), default is 'imap'
+ $bmh->service = 'imap'; // the service to use (imap or pop3), default is 'imap'
}
- $bmh->service_option = $accountObj->getVar("accounts_securetype_in"); // the service options (none, tls, notls, ssl, etc.), default is 'notls'
- $bmh->boxname = $accountObj->getVar("accounts_inbox"); // the mailbox to access, default is 'INBOX'
- $verif_movehard = $accountObj->getVar("accounts_movehard") == '1' ? true : false;
+ $bmh->service_option = $accountObj->getVar('accounts_securetype_in'); // the service options (none, tls, notls, ssl, etc.), default is 'notls'
+ $bmh->boxname = $accountObj->getVar('accounts_inbox'); // the mailbox to access, default is 'INBOX'
+ $verif_movehard = $accountObj->getVar('accounts_movehard') == '1' ? true : false;
$bmh->moveHard = $verif_movehard; // default is false
- $bmh->hardMailbox = $accountObj->getVar("accounts_hardbox"); // default is 'INBOX.hard' - NOTE: must start with 'INBOX.'
- $verif_movesoft = $accountObj->getVar("accounts_movesoft") == '1' ? true : false;
+ $bmh->hardMailbox = $accountObj->getVar('accounts_hardbox'); // default is 'INBOX.hard' - NOTE: must start with 'INBOX.'
+ $verif_movesoft = $accountObj->getVar('accounts_movesoft') == '1' ? true : false;
$bmh->moveSoft = $verif_movesoft; // default is false
- $bmh->softMailbox = $accountObj->getVar("accounts_softbox"); // default is 'INBOX.soft' - NOTE: must start with 'INBOX.'
+ $bmh->softMailbox = $accountObj->getVar('accounts_softbox'); // default is 'INBOX.soft' - NOTE: must start with 'INBOX.'
//$bmh->deleteMsgDate = '2009-01-05'; // format must be as 'yyyy-mm-dd'
// rest used regardless what type of connection it is
$bmh->openMailbox();
$bmh->processMailbox();
- $result_bmh .= str_replace("%b", $accountObj->getVar("accounts_yourmail"), _AM_XNEWSLETTER_BMH_RSLT);
+ $result_bmh .= str_replace("%b", $accountObj->getVar('accounts_yourmail'), _AM_XNEWSLETTER_BMH_RSLT);
$result_bmh = str_replace("%r", $bmh->result_total, $result_bmh);
$result_bmh = str_replace("%a", $bmh->result_processed, $result_bmh);
$result_bmh = str_replace("%n", $bmh->result_unprocessed, $result_bmh);
@@ -195,7 +192,7 @@
}
break;
- case "list":
+ case 'list':
default:
echo $indexAdmin->addNavigation('bmh.php');
$indexAdmin->addItemButton(_AM_XNEWSLETTER_RUNBMH, '?op=run_bmh', 'add');
@@ -210,16 +207,16 @@
$limit = $xnewsletter->getConfig('adminperpage');
$bhmCriteria = new CriteriaCompo();
- if ($filter > -1) $criteria->add(new Criteria("bmh_measure", $filter));
- $bhmCriteria->setSort("bmh_id");
- $bhmCriteria->setOrder("DESC");
+ if ($filter > -1) $criteria->add(new Criteria('bmh_measure', $filter));
+ $bhmCriteria->setSort('bmh_id');
+ $bhmCriteria->setOrder('DESC');
$bhmCount = $xnewsletter->getHandler('bmh')->getCount($bhmCriteria);
$start = xnewsletterRequest::getInt('start', 0);
$bhmCriteria->setStart($start);
$bhmCriteria->setLimit($limit);
$bhmObjs = $xnewsletter->getHandler('bmh')->getAll($bhmCriteria);
if ($bhmCount > $limit) {
- include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new XoopsPageNav($bhmCount, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
} else {
@@ -230,55 +227,55 @@
echo "<table class='outer width100' cellspacing='1'><tr class='odd'><td>";
echo "<form id='form_filter' enctype='multipart/form-data' method='post' action='{$currentFile}' name='form_filter'>";
- $checked = ($filter == -1) ? "checked='checked'" : "";
- echo "<input id='bmh_measure_all' type='radio' $checked value='-1' title='"._AM_XNEWSLETTER_BMH_MEASURE."' name='bmh_measure_filter' onclick='submit()' />
- <label for='bmh_measure_all' name='bmh_measure_all'>"._AM_XNEWSLETTER_BMH_MEASURE_ALL."</label>";
+ $checked = ($filter == -1) ? "checked='checked'" : '';
+ echo "<input id='bmh_measure_all' type='radio' {$checked} value='-1' title='" . _AM_XNEWSLETTER_BMH_MEASURE . "' name='bmh_measure_filter' onclick='submit()' />
+ <label for='bmh_measure_all' name='bmh_measure_all'>" . _AM_XNEWSLETTER_BMH_MEASURE_ALL . "</label>";
$checked = ($filter == _XNEWSLETTER_BMH_MEASURE_VAL_PENDING) ? "checked='checked'" : "";
- echo "<input id='bmh_measure0' type='radio' $checked value='"._XNEWSLETTER_BMH_MEASURE_VAL_PENDING."' title='"._AM_XNEWSLETTER_BMH_MEASURE."' name='bmh_measure_filter' onclick='submit()' />
- <label for='bmh_measure0' name='bmh_measure0'>"._AM_XNEWSLETTER_BMH_MEASURE_PENDING."</label>";
+ echo "<input id='bmh_measure0' type='radio' {$checked} value='" . _XNEWSLETTER_BMH_MEASURE_VAL_PENDING . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE . "' name='bmh_measure_filter' onclick='submit()' />
+ <label for='bmh_measure0' name='bmh_measure0'>" . _AM_XNEWSLETTER_BMH_MEASURE_PENDING . "</label>";
$checked = ($filter == _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING) ? "checked='checked'" : "";
- echo "<input id='bmh_measure1' type='radio' $checked value='"._XNEWSLETTER_BMH_MEASURE_VAL_NOTHING."' title='"._AM_XNEWSLETTER_BMH_MEASURE."' name='bmh_measure_filter' onclick='submit()' />
- <label for='bmh_measure1' name='bmh_measure1'>"._AM_XNEWSLETTER_BMH_MEASURE_NOTHING."</label>";
+ echo "<input id='bmh_measure1' type='radio' {$checked} value='" . _XNEWSLETTER_BMH_MEASURE_VAL_NOTHING . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE . "' name='bmh_measure_filter' onclick='submit()' />
+ <label for='bmh_measure1' name='bmh_measure1'>" . _AM_XNEWSLETTER_BMH_MEASURE_NOTHING . "</label>";
$checked = ($filter == _XNEWSLETTER_BMH_MEASURE_VAL_QUIT) ? "checked='checked'" : "";
- echo "<input id='bmh_measure2' type='radio' $checked value='"._XNEWSLETTER_BMH_MEASURE_VAL_QUIT."' title='"._AM_XNEWSLETTER_BMH_MEASURE."' name='bmh_measure_filter' onclick='submit()'>
- <label for='bmh_measure2' name='bmh_measure2'>"._AM_XNEWSLETTER_BMH_MEASURE_QUITED."</label>";
+ echo "<input id='bmh_measure2' type='radio' {$checked} value='" . _XNEWSLETTER_BMH_MEASURE_VAL_QUIT . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE . "' name='bmh_measure_filter' onclick='submit()'>
+ <label for='bmh_measure2' name='bmh_measure2'>" . _AM_XNEWSLETTER_BMH_MEASURE_QUITED . "</label>";
$checked = ($filter == _XNEWSLETTER_BMH_MEASURE_VAL_DELETE) ? "checked='checked'" : "";
- echo "<input id='bmh_measure3' type='radio' $checked value='"._XNEWSLETTER_BMH_MEASURE_VAL_DELETE."' title='"._AM_XNEWSLETTER_BMH_MEASURE."' name='bmh_measure_filter' onclick='submit()' />
- <label for='bmh_measure3' name='bmh_measure3'>"._AM_XNEWSLETTER_BMH_MEASURE_DELETED."</label>";
+ echo "<input id='bmh_measure3' type='radio' {$checked} value='" . _XNEWSLETTER_BMH_MEASURE_VAL_DELETE . "' title='" . _AM_XNEWSLETTER_BMH_MEASURE . "' name='bmh_measure_filter' onclick='submit()' />
+ <label for='bmh_measure3' name='bmh_measure3'>" . _AM_XNEWSLETTER_BMH_MEASURE_DELETED . "</label>";
echo "</form>";
echo "</td></tr></table>";
// View Table
echo "<table class='outer width100' cellspacing='1'>
<tr>
- <th class='center width2'>" . _AM_XNEWSLETTER_BMH_ID . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_BMH_RULE_NO . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_BMH_RULE_CAT . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_BMH_BOUNCETYPE . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_BMH_REMOVE . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_BMH_EMAIL . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_BMH_MEASURE . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_BMH_CREATED . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_FORMACTION . "</th>
+ <th>" . _AM_XNEWSLETTER_BMH_ID . "</th>
+ <th>" . _AM_XNEWSLETTER_BMH_RULE_NO . "</th>
+ <th>" . _AM_XNEWSLETTER_BMH_RULE_CAT . "</th>
+ <th>" . _AM_XNEWSLETTER_BMH_BOUNCETYPE . "</th>
+ <th>" . _AM_XNEWSLETTER_BMH_REMOVE . "</th>
+ <th>" . _AM_XNEWSLETTER_BMH_EMAIL . "</th>
+ <th>" . _AM_XNEWSLETTER_BMH_MEASURE . "</th>
+ <th>" . _AM_XNEWSLETTER_BMH_CREATED . "</th>
+ <th>" . _AM_XNEWSLETTER_FORMACTION . "</th>
</tr>";
if ($bhmCount > 0) {
- $class = "odd";
+ $class = 'odd';
foreach ($bhmObjs as $bhm_id => $bhmObj) {
- echo "<tr class='".$class."'>";
- $class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>" . $bhm_id . "</td>";
- echo "<td class='center'>" . $bhmObj->getVar("bmh_rule_no")."</td>";
- echo "<td class='center'>" . $bhmObj->getVar("bmh_rule_cat")."</td>";
- echo "<td class='center'>" . $bhmObj->getVar("bmh_bouncetype")."</td>";
+ echo "<tr class='{$class}'>";
+ $class = ($class == 'even') ? 'odd' : 'even';
+ echo "<td>" . $bhm_id . "</td>";
+ echo "<td>" . $bhmObj->getVar('bmh_rule_no') . "</td>";
+ echo "<td>" . $bhmObj->getVar('bmh_rule_cat') . "</td>";
+ echo "<td>" . $bhmObj->getVar('bmh_bouncetype') . "</td>";
- $verif_bmh_remove = ($bhmObj->getVar("bmh_remove") == "0") ? ' ' : $bhmObj->getVar("bmh_remove");
- echo "<td class='center'>" . $verif_bmh_remove . "</td>";
- echo "<td class='center'>" . $bhmObj->getVar("bmh_email") . "</td>";
+ $verif_bmh_remove = ($bhmObj->getVar('bmh_remove') == '0') ? ' ' : $bhmObj->getVar('bmh_remove');
+ echo "<td>" . $verif_bmh_remove . "</td>";
+ echo "<td>" . $bhmObj->getVar('bmh_email') . "</td>";
echo "<td class='center'>" . $arr_measure_type[$bhmObj->getVar("bmh_measure")] . "</td>";
echo "<td class='center'>" . formatTimeStamp($bhmObj->getVar("bmh_created"),"S") . "</td>";
@@ -303,34 +300,34 @@
echo "<br />";
break;
- case "save_bmh":
- if (!$GLOBALS["xoopsSecurity"]->check()) {
- redirect_header($currentFile, 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ case 'save_bmh':
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS["xoopsSecurity"]->getErrors()));
}
$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', ''));
+ $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', '');
$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_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));
if ($xnewsletter->getHandler('bmh')->insert($bmhObj)) {
- redirect_header("?op=list", 3, _AM_XNEWSLETTER_FORMOK);
+ redirect_header('?op=list', 3, _AM_XNEWSLETTER_FORMOK);
}
echo $bmhObj->getHtmlErrors();
$form = $bmhObj->getForm();
$form->display();
break;
- case "edit_bmh":
+ case 'edit_bmh':
echo $indexAdmin->addNavigation('bmh.php');
$indexAdmin->addItemButton(_AM_XNEWSLETTER_BMHLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
@@ -340,11 +337,11 @@
$form->display();
break;
- case "delete_bmh":
+ case 'delete_bmh':
$bmhObj = $xnewsletter->getHandler('bmh')->get($bmh_id);
if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
- if (!$GLOBALS["xoopsSecurity"]->check()) {
- redirect_header($currentFile, 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ if (!$GLOBALS['xoopsSecurity']->check()) {
+ redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
if ($xnewsletter->getHandler('bmh')->delete($bmhObj)) {
redirect_header($currentFile, 3, _AM_XNEWSLETTER_FORMDELOK);
@@ -352,17 +349,17 @@
echo $bmhObj->getHtmlErrors();
}
} else {
- xoops_confirm(array("ok" => true, "bmh_id" => $bmh_id, "op" => "delete_bmh"), $_SERVER["REQUEST_URI"], sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $bmhObj->getVar("bmh_rule_no")));
+ xoops_confirm(array('ok' => true, 'bmh_id' => $bmh_id, 'op' => 'delete_bmh'), $_SERVER['REQUEST_URI'], sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $bmhObj->getVar('bmh_rule_no')));
}
break;
}
-include "admin_footer.php";
+include_once dirname(__FILE__) . '/admin_footer.php';
/**
* @return float
*/
function microtime_float() {
- list($usec, $sec) = explode(" ", microtime());
+ list($usec, $sec) = explode(' ', microtime());
return ((float) $usec + (float) $sec);
}
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh_callback_database.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh_callback_database.php 2014-09-03 23:15:49 UTC (rev 12774)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/bmh_callback_database.php 2014-09-05 20:17:53 UTC (rev 12775)
@@ -18,7 +18,7 @@
* Version : $Id $
*/
-require_once "admin_header.php";
+include_once dirname(__FILE__) . 'admin_header.php';
/**
* @param $msgnum
@@ -37,28 +37,19 @@
global $xoopsUser;
$xnewsletter = xnewsletterxnewsletter::getInstance();
- if ($rule_no != "0000") {
+ if ($rule_no != '0000') {
$bmhObj = $xnewsletter->getHandler('bmh')->create();
- //Form bmh_rule_no
- $bmhObj->setVar("bmh_rule_no", $rule_no);
- //Form bmh_rule_cat
- $bmhObj->setVar("bmh_rule_cat", $rule_cat);
- //Form bmh_bouncetype
- $bmhObj->setVar("bmh_bouncetype", $bounce_type);
- //Form bmh_remove
- //$verif_bmh_remove = ($remove == true || $remove == '1') ? "1" : "0";
- $bmhObj->setVar("bmh_remove", $remove);
- //Form bmh_email
- $bmhObj->setVar("bmh_email", $email);
- //Form bmh_subject
- $bmhObj->setVar("bmh_subject", $subject);
- //Form bmh_measure
- $bmhObj->setVar("bmh_measure", "0");
- //Form bmh_submitter
- $bmhObj->setVar("bmh_submitter", $xoopsUser->uid());
- //Form bmh_created
- $bmhObj->setVar("bmh_created", time());
-
+ $bmhObj->setVar('bmh_rule_no', $rule_no);
+ $bmhObj->setVar('bmh_rule_cat', $rule_cat);
+ $bmhObj->setVar('bmh_bouncetype', $bounce_type);
+ //$verif_bmh_remove = ($remove == true || $remove == '1') ? '1' : '0';
+ $bmhObj->setVar('bmh_remove', $remove);
+ $bmhObj->setVar('bmh_email', $email);
+ $bmhObj->setVar('bmh_subject', $subject);
+ $bmhObj->setVar('bmh_measure', '0');
+ $bmhObj->setVar('bmh_submitter', $xoopsUser->uid());
+ $bmhObj->setVar('bmh_created', time());
+ //
if (!$xnewsletter->getHandler('bmh')->insert($bmhObj)) {
echo $bmhObj->getHtmlErrors();
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php 2014-09-03 23:15:49 UTC (rev 12774)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/cat.php 2014-09-05 20:17:53 UTC (rev 12775)
@@ -27,15 +27,15 @@
*/
$currentFile = basename(__FILE__);
-include "admin_header.php";
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
// We recovered the value of the argument op in the URL$
-$op = xnewsletterRequest::getString('op', 'list');
+$op = xnewsletterRequest::getString('op', 'list');
$cat_id = xnewsletterRequest::getInt('cat_id', 0);
switch ($op) {
- case "list" :
+ case 'list':
default:
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWCAT, '?op=new_cat', 'add');
@@ -51,7 +51,7 @@
$catCriteria->setLimit($limit);
$catObjs = $xnewsletter->getHandler('cat')->getAll($catCriteria);
if ($catsCount > $limit) {
- include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new XoopsPageNav($catsCount, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
} else {
@@ -61,38 +61,38 @@
// View Table
echo "<table class='outer width100' cellspacing='1'>";
echo "<tr>";
- echo " <th class='center width2'>"._AM_XNEWSLETTER_CAT_ID . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_NAME . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_INFO . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_GPERMS_ADMIN . "</th>";
- 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>";
+ echo " <th>"._AM_XNEWSLETTER_CAT_ID . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_NAME . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_INFO . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_GPERMS_ADMIN . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_GPERMS_CREATE . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_GPERMS_LIST . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_GPERMS_READ . "</th>";
if ($xnewsletter->getConfig('xn_use_mailinglist') == true) {
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_MAILINGLIST . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_MAILINGLIST . "</th>";
}
- echo " <th class='center width5'>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
echo "</tr>";
if (count($catObjs) > 0) {
- $class = "odd";
+ $class = 'odd';
$groupNames = $member_handler->getGroupList();
$gperm_handler = xoops_gethandler('groupperm');
foreach ($catObjs as $cat_id => $catObj) {
echo "<tr class='{$class}'>";
- $class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>{$cat_id}</td>";
- echo "<td class='center'>{$catObj->getVar("cat_name")}</td>";
+ $class = ($class == 'even') ? 'odd' : 'even';
+ echo "<td>{$cat_id}</td>";
+ echo "<td>{$catObj->getVar("cat_name")}</td>";
echo "<td>{$catObj->getVar("cat_info")} </td>";
// cat_gperms_admin
$cat_gperms_admin_groupids = $gperm_handler->getGroupIds('newsletter_admin_cat', $cat_id, $xnewsletter->getModule()->mid());
sort ($cat_gperms_admin_groupids);
$cat_gperms_admin = '';
foreach ($cat_gperms_admin_groupids as $groupid) {
- $cat_gperms_admin .= $groupNames[$groupid] . " | ";
+ $cat_gperms_admin .= $groupNames[$groupid] . ' | ';
}
$cat_gperms_admin = substr($cat_gperms_admin, 0, -3);
- echo "<td class='center'>" . $cat_gperms_admin . "</td>";
+ echo "<td>" . $cat_gperms_admin . "</td>";
// cat_gperms_create
$cat_gperms_create_groupids = $gperm_handler->getGroupIds('newsletter_create_cat', $cat_id, $xnewsletter->getModule()->mid());
@@ -102,7 +102,7 @@
$cat_gperms_create .= $groupNames[$groupid]." | ";
}
$cat_gperms_create = substr($cat_gperms_create, 0, -3);
- echo "<td class='center'>" . $cat_gperms_create . "</td>";
+ echo "<td>" . $cat_gperms_create . "</td>";
// cat_gperms_list
$cat_gperms_list_groupids = $gperm_handler->getGroupIds('newsletter_list_cat', $cat_id, $xnewsletter->getModule()->mid());
@@ -112,7 +112,7 @@
$cat_gperms_list .= $groupNames[$groupid] . " | ";
}
$cat_gperms_list = substr($cat_gperms_list, 0, -3);
- echo "<td class='center'>" . $cat_gperms_list . "</td>";
+ echo "<td>" . $cat_gperms_list . "</td>";
// cat_gperms_read
$cat_gperms_read_groupids = $gperm_handler->getGroupIds('newsletter_read_cat', $cat_id, $xnewsletter->getModule()->mid());
@@ -122,26 +122,26 @@
$cat_gperms_read .= $groupNames[$groupid] . " | ";
}
$cat_gperms_read = substr($cat_gperms_read, 0, -3);
- echo "<td class='center'>" . $cat_gperms_read . "</td>";
+ echo "<td>" . $cat_gperms_read . "</td>";
if ($xnewsletter->getConfig('xn_use_mailinglist') == true) {
- echo "<td class='center'>" . $catObj->getVar("cat_mailinglist") . "</td>";
+ echo "<td>" . $catObj->getVar("cat_mailinglist") . "</td>";
}
- echo "<td class='center width5' nowrap='nowrap'>";
- echo "<a href='?op=edit_cat&cat_id=" . $cat_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>";
+ echo "<td nowrap='nowrap'>";
+ echo "<a href='?op=edit_cat&cat_id={$cat_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>";
echo " ";
- echo "<a href='?op=delete_cat&cat_id=" . $cat_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>";
+ echo "<a href='?op=delete_cat&cat_id={$cat_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>";
echo "</td>";
echo "</tr>";
}
}
echo "</table>";
echo "<br />";
- echo "<div class='center'>" . $pagenav . "</div>";
+ echo "<div>" . $pagenav . "</div>";
echo "<br />";
break;
- case "new_cat" :
+ case 'new_cat':
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_CATLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
@@ -151,7 +151,7 @@
$form->display();
break;
- case "save_cat":
+ case 'save_cat':
if ( !$GLOBALS['xoopsSecurity']->check() ) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
@@ -199,7 +199,7 @@
$gperm_handler->addRight('newsletter_list_cat', $cat_id, $groupid, $xnewsletter->getModule()->mid());
}
//
- redirect_header("?op=list", 3, _AM_XNEWSLETTER_FORMOK);
+ redirect_header('?op=list', 3, _AM_XNEWSLETTER_FORMOK);
}
echo $catObj->getHtmlErrors();
@@ -207,7 +207,7 @@
$form->display();
break;
- case "edit_cat" :
+ case 'edit_cat':
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWCAT, '?op=new_cat', 'add');
$indexAdmin->addItemButton(_AM_XNEWSLETTER_CATLIST, '?op=list', 'list');
@@ -218,10 +218,10 @@
$form->display();
break;
- case "delete_cat" :
+ case 'delete_cat':
$catObj = $xnewsletter->getHandler('cat')->get($_REQUEST['cat_id']);
if (xnewsletterRequest::getBool('ok', false, 'POST') == true) {
- if ( !$GLOBALS['xoopsSecurity']->check() ) {
+ if (!$GLOBALS['xoopsSecurity']->check()) {
redirect_header($currentFile, 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
if ($xnewsletter->getHandler('cat')->delete($catObj)) {
@@ -234,4 +234,4 @@
}
break;
}
-include "admin_footer.php";
+include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php 2014-09-03 23:15:49 UTC (rev 12774)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/catsubscr.php 2014-09-05 20:17:53 UTC (rev 12775)
@@ -27,14 +27,14 @@
*/
$currentFile = basename(__FILE__);
-include "admin_header.php";
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
// We recovered the value of the argument op in the URL$
$op = xnewsletterRequest::getString('op', 'list');
switch ($op) {
- case "list":
+ case 'list':
default:
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWCATSUBSCR, '?op=new_catsubscr', 'add');
@@ -42,15 +42,15 @@
//
$limit = $xnewsletter->getConfig('adminperpage');
$catCriteria = new CriteriaCompo();
- $catCriteria->setSort("cat_id ASC, cat_name");
- $catCriteria->setOrder("ASC");
+ $catCriteria->setSort('cat_id ASC, cat_name');
+ $catCriteria->setOrder('ASC');
$catCount = $xnewsletter->getHandler('cat')->getCount();
$start = xnewsletterRequest::getInt('start', 0);
$catCriteria->setStart($start);
$catCriteria->setLimit($limit);
$catObjs = $xnewsletter->getHandler('cat')->getAll($catCriteria);
if ($catCount > $limit) {
- include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
+ include_once XOOPS_ROOT_PATH . '/class/pagenav.php';
$pagenav = new XoopsPageNav($catCount, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
} else {
@@ -59,23 +59,23 @@
// View Table
echo "<table class='outer' cellspacing='1'>";
echo "<tr>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_ID . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_NAME . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CAT_INFO . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CATSUBSCR_SUBSCRID . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_ID . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_NAME . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CAT_INFO . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CATSUBSCR_SUBSCRID . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
echo "</tr>";
if ($catCount > 0) {
- $class = "odd";
+ $class = 'odd';
foreach ($catObjs as $cat_id => $catObj) {
echo "<tr class='{$class}'>";
$class = ($class == 'even') ? 'odd' : 'even';
- echo "<td class='center'>{$cat_id}</td>";
- echo "<td class='center'><a href='?op=list_cat&cat_id={$cat_id}'>{$catObj->getVar('cat_name')}</a></td>";
- echo "<td>{$catObj->getVar("cat_info")}</td>";
+ echo "<td>{$cat_id}</td>";
+ echo "<td><a href='?op=list_cat&cat_id={$cat_id}'>{$catObj->getVar('cat_name')}</a></td>";
+ echo "<td>{$catObj->getVar('cat_info')}</td>";
$catCount = $xnewsletter->getHandler('catsubscr')->getCount(new Criteria('catsubscr_catid', $cat_id));
- echo "<td class='center'>{$catCount}</td>";
- echo "<td class='center'><a href='?op=list_cat&cat_id={$cat_id}'><img src='" . XNEWSLETTER_ICONS_URL . "/xn_details.png' alt='" . _AM_XNEWSLETTER_DETAILS . "' title='" . _AM_XNEWSLETTER_DETAILS . "'></a></td>";
+ echo "<td>{$catCount}</td>";
+ echo "<td><a href='?op=list_cat&cat_id={$cat_id}'><img src='" . XNEWSLETTER_ICONS_URL . "/xn_details.png' alt='" . _AM_XNEWSLETTER_DETAILS . "' title='" . _AM_XNEWSLETTER_DETAILS . "'></a></td>";
echo "</tr>";
}
}
@@ -85,8 +85,8 @@
echo "<br />";
break;
- case "list_cat":
- $cat_id = isset($_REQUEST["cat_id"]) ? $_REQUEST["cat_id"] : 0;
+ case 'list_cat':
+ $cat_id = xnewsletterRequest::getInt('cat_id', 0);
echo $indexAdmin->addNavigation($currentFile);
$indexAdmin->addItemButton(_AM_XNEWSLETTER_CATLIST, '?op=list', 'list');
@@ -95,9 +95,9 @@
//
$limit = $xnewsletter->getConfig('adminperpage');
$catsubscrCriteria = new CriteriaCompo();
- $catsubscrCriteria->add(new Criteria("catsubscr_catid", $cat_id));
- $catsubscrCriteria->setSort("catsubscr_id ASC, catsubscr_catid");
- $catsubscrCriteria->setOrder("ASC");
+ $catsubscrCriteria->add(new Criteria('catsubscr_catid', $cat_id));
+ $catsubscrCriteria->setSort('catsubscr_id ASC, catsubscr_catid');
+ $catsubscrCriteria->setOrder('ASC');
$catCount = $xnewsletter->getHandler('catsubscr')->getCount($catsubscrCriteria);
$start = xnewsletterRequest::getInt('start', 0);
$catsubscrCriteria->setStart($start);
@@ -114,47 +114,47 @@
// View Table
echo "<table class='outer' cellspacing='1'>";
echo "<tr>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CATSUBSCR_ID . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CATSUBSCR_CATID . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CATSUBSCR_SUBSCRID . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CATSUBSCR_QUITED . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CATSUBSCR_SUBMITTER . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_CATSUBSCR_CREATED . "</th>";
- echo " <th class='center'>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CATSUBSCR_ID . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CATSUBSCR_CATID . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CATSUBSCR_SUBSCRID . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CATSUBSCR_QUITED . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CATSUBSCR_SUBMITTER . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_CATSUBSCR_CREATED . "</th>";
+ echo " <th>" . _AM_XNEWSLETTER_FORMACTION . "</th>";
echo "</tr>";
if ($catCount > 0) {
- $class = "odd";
+ $class = 'odd';
foreach ($catsubscrObjs as $catsubscr_id => $catsubscrObj) {
- echo "<tr class='" . $class . "'>";
- $class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>" . $catsubscr_id . "</td>";
+ echo "<tr class='{$class}'>";
+ $class = ($class == 'even') ? 'odd' : 'even';
+ echo "<td>{$catsubscr_id}</td>";
$cat = $xnewsletter->getHandler('cat')->get($cat_id);
- $cat_name = $cat->getVar("cat_name");
- echo "<td class='center'>" . $cat_name . "</td>";
- $subscr_id = $catsubscrObj->getVar("catsubscr_subscrid");
+ $cat_name = $cat->getVar('cat_name');
+ echo "<td>" . $cat_name . "</td>";
+ $subscr_id = $catsubscrObj->getVar('catsubscr_subscrid');
$subscr = $xnewsletter->getHandler('subscr')->get($subscr_id);
$subscr_email = ($subscr) ? $subscr->getVar("subscr_email") : "";
- echo "<td class='center'>" . $subscr_email . "</td>";
- if ($catsubscrObj->getVar("catsubscr_quited") > 0) {
- $catsubscr_quited = _YES . " (" . formatTimeStamp($catsubscrObj->getVar("catsubscr_quited"), "M") . ")";
+ echo "<td>" . $subscr_email . "</td>";
+ if ($catsubscrObj->getVar('catsubscr_quited') > 0) {
+ $catsubscr_quited = _YES . ' (' . formatTimeStamp($catsubscrObj->getVar('catsubscr_quited'), 'M') . ')';
} else {
$catsubscr_quited = _NO;
}
- echo "<td class='center'>" . $catsubscr_quited . "</td>";
- echo "<td class='center'>" . XoopsUser::getUnameFromId($catsubscrObj->getVar("catsubscr_submitter"), "S") . "</td>";
- echo "<td class='center'>" . formatTimeStamp($catsubscrObj->getVar("catsubscr_created"), "S") . "</td>";
+ echo "<td>" . $catsubscr_quited . "</td>";
+ echo "<td>" . XoopsUser::getUnameFromId($catsubscrObj->getVar('catsubscr_submitter'), 'S') . "</td>";
+ echo "<td>" . formatTimeStamp($catsubscrObj->getVar('catsubscr_created'), 'S') . "</td>";
- echo "<td class='center width5' nowrap='nowrap'>
- <a href='?op=edit_catsubscr&catsubscr_id=" . $catsubscr_id . "&cat_id=" . $cat_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>
- <a href='?op=delete_catsubscr&catsubscr_id=" . $catsubscr_id . "&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>
+ echo "<td nowrap='nowrap'>
+ <a href='?op=edit_catsubscr&catsubscr_id={$catsubscr_id}&cat_id={$cat_id}'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='" . _EDIT . "' /></a>
+ <a href='?op=delete_catsubscr&catsubscr_id={$catsubscr_id}&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>";
}
}
echo "</table>";
echo "<br />";
- echo "<div class='center'>" . $pagenav . "</div>";
+ echo "<div>" . $pagenav . "</div>";
echo "<br />";
break;
@@ -194,7 +194,7 @@
//add subscriber to mailinglist
$catsubscrObj_cat = $xnewsletter->getHandler('cat')->get($_REQUEST['catsubscr_catid']);
if ($catsubscrObj_cat->getVar('cat_mailinglist') > 0) {
- require_once( XOOPS_ROOT_PATH."/modules/xnewsletter/include/mailinglist.php" );
+ require_once XOOPS_ROOT_PATH . '/modules/xnewsletter/include/mailinglist.php';
subscribingMLHandler(1, $catsubscr_subscrid, $catsubscrObj_cat->getVar('cat_mailinglist'));
}
redirect_header('?op=list', 3, _AM_XNEWSLETTER_FORMOK);
@@ -206,10 +206,10 @@
break;
case 'edit_catsubscr':
- $cat_id = isset($_REQUEST['cat_id']) ? $_REQUEST['cat_id'] : 0;
+ $cat_id = xnewsletterRequest::getInt('cat_id', 0);
echo $indexAdmin->addNavigation($currentFile);
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_CATSUBSCRLIST, '?op=list_cat&cat_id=' . $cat_id, 'list');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_CATSUBSCRLIST, "?op=list_cat&cat_id={$cat_id}", 'list');
$indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWCATSUBSCR, '?op=new_catsubscr', 'add');
echo $indexAdmin->renderButton();
//
@@ -244,4 +244,4 @@
}
break;
}
-include 'admin_footer.php';
+include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php 2014-09-03 23:15:49 UTC (rev 12774)
+++ XoopsModules/xnewsletter/branches/luciorota/xnewsletter/admin/import.php 2014-09-05 20:17:53 UTC (rev 12775)
@@ -27,7 +27,7 @@
*/
$currentFile = basename(__FILE__);
-include "admin_header.php";
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
define('XNEWSLETTER_BASIC_LIMIT_IMPORT_CHECKED', 100);
@@ -45,7 +45,7 @@
echo $indexAdmin->addNavigation($currentFile);
switch ($op) {
- case "show_formcheck":
+ case 'show_formcheck':
$indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, $currentFile, 'list');
echo $indexAdmin->renderButton();
//
@@ -75,25 +75,25 @@
$showlimit = str_replace("%n", $importsCount, $showlimit);
$form .= "
- <table width=\"100%\" cellspacing=\"1\" class=\"outer\">
+ <table width='100%' cellspacing='1' class='outer'>
<tr>
- <td align=\"left\" colspan='8'>" . $showlimit . "</td>
+ <td align='left' colspan='8'>" . $showlimit . "</td>
</tr>";
$class = "odd";
$form .= "
<tr>
- <th align=\"center\"> </th>
- <th align=\"center\">" . _AM_XNEWSLETTER_SUBSCR_EMAIL . "</th>
- <th align=\"center\">" . _AM_XNEWSLETTER_SUBSCR_SEX . "</th>
- <th align=\"center\">" . _AM_XNEWSLETTER_SUBSCR_FIRSTNAME . "</th>
- <th align=\"center\">" . _AM_XNEWSLETTER_SUBSCR_LASTNAME . "</th>
- <th align=\"center\">" . _AM_XNEWSLETTER_IMPORT_EMAIL_EXIST . "</th>
- <th align=\"center\"...
[truncated message content] |
