Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12491] XoopsModules/xnewsletter/branches/mamba/ xNewsletter
|
From: <be...@us...> - 2014-04-25 13:22:07
|
Revision: 12491
http://sourceforge.net/p/xoops/svn/12491
Author: beckmi
Date: 2014-04-25 13:21:55 +0000 (Fri, 25 Apr 2014)
Log Message:
-----------
XOOPS 2.5.7 Module Pack update (work in progress): xNewsletter
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/about.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/accounts.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/admin_header.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/attachment.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh_callback_database.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/cat.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/import.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/maintenance.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/menu.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/protocol.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/sendletter.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/subscr.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/task.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/blocks/blocks_catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/blocks/blocks_letter.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/blocks/blocks_subscrinfo.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/breadcrumb.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/request.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/session.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_accounts.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_attachment.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_bmh.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_cat.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_import.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_letter.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_protocol.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_subscr.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_task.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xnewsletter.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/cron.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/docs/changelog.txt
XoopsModules/xnewsletter/branches/mamba/xNewsletter/footer.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/common.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/config.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/functions.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/install.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/onupdate.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/phpmailer_bmh/phpmailer-bmh_rules.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/search.inc.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/task.inc.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/index.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/blocks.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/common.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/main.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/modinfo.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/letter.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/plugins/csv.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/plugins/evennews.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/plugins/rmbulletin.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/plugins/smartpartner.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/plugins/subscribers.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/plugins/weblinks.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/plugins/xoopsuser.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/print.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/protocol.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/sendletter.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/subscription.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/xoops_version.php
Added Paths:
-----------
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/css/
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/css/index.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/css/module.css
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/css/style.css
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/bookmarks/
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/bookmarks/index.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/about.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/add.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/alert.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/arrow.gif
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/home.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/index.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/off.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/on.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_accounts.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_attachment.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_attachment_del.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_bmh.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_category.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_category_subscr.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_catsubscr_temp.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_check.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_clone.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_copy.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_delete.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_delete_2.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_details.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_edit.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_edit_2.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_failed.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_import.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_mailinglist.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_maintenance.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_newsletter.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_nothing.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_ok.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_preview.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_protocol.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_quit.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_resend.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_send.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_sendtest.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_subscribers.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_task.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xoopsmicrobutton.gif
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/index.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/letter_template/
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/letter_template/index.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/letter_template/kletterfreaks.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/letter_template/nf_bg_green.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/letter_template/nf_bg_red.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/letter_template/nf_logo.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/letter_template/nf_logo_trans.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/letter_template/xoops-bg.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/letter_template/xoops-logo.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/xNewsletter.png
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/index.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/js/
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/js/index.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/mail_template/info_change.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/templates/basic.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/templates/xoops.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/blocks/xNewsletter_catsubscr_block_day.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/blocks/xNewsletter_catsubscr_block_recent.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/blocks/xNewsletter_letter_block_day.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/blocks/xNewsletter_letter_block_random.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/blocks/xNewsletter_letter_block_recent.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/blocks/xNewsletter_subscrinfo_block.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_common_breadcrumb.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_footer.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_header.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_index.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_index_list_letters.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter_list_letters.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter_list_subscrs.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter_preview.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_print.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_protocol.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_subscription.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_subscription_list_subscriptions.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_subscription_result.tpl
Removed Paths:
-------------
XoopsModules/xnewsletter/branches/mamba/xNewsletter/css/
XoopsModules/xnewsletter/branches/mamba/xNewsletter/images/
XoopsModules/xnewsletter/branches/mamba/xNewsletter/js/
XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/mail_template/info_change.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/templates/basic.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/templates/xoops.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/blocks/xNewsletter_catsubscr_block_day.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/blocks/xNewsletter_catsubscr_block_recent.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/blocks/xNewsletter_letter_block_day.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/blocks/xNewsletter_letter_block_random.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/blocks/xNewsletter_letter_block_recent.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/blocks/xNewsletter_subscrinfo_block.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_common_breadcrumb.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_footer.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_header.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_index.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_index_list_letters.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter_list_letters.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter_list_subscrs.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter_preview.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_print.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_protocol.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_subscription.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_subscription_list_subscriptions.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_subscription_result.html
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/about.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/about.php 2014-04-25 13:14:48 UTC (rev 12490)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/about.php 2014-04-25 13:21:55 UTC (rev 12491)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* ****************************************************************************
* - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/accounts.php 2014-04-25 13:14:48 UTC (rev 12490)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/accounts.php 2014-04-25 13:21:55 UTC (rev 12491)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* ****************************************************************************
* - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
@@ -80,14 +80,14 @@
if ($service_option !='') $command .= '/' . $service_option;
echo "<table class='outer width100' cellspacing='1'>
- <tr>
- <th class='center width5'></th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_INFO."</th>
- </tr>";
-
+ <tr>
+ <th class='center width5'></th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_INFO."</th>
+ </tr>";
+
$mbox = @imap_open("{" . $command . "}", $accounts_username, $accounts_password); // or die ("can't connect: " . imap_last_error());
- if ( $mbox === false ) {
+ if ($mbox === false) {
echo "<tr>";
echo "<td class='center width5'>".$img_failed."</td>";
echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED."</td>";
@@ -202,7 +202,7 @@
$criteria->setStart($start);
$criteria->setLimit($limit);
$accounts_arr = $xnewsletter->getHandler('xNewsletter_accounts')->getall($criteria);
- if ( $numrows > $limit ) {
+ if ($numrows > $limit) {
include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
$pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
@@ -212,66 +212,66 @@
// View Table
if ($numrows > 0) {
- echo "<table class='outer width100' cellspacing='1'>
- <tr>
- <th class='center width2'>"._AM_XNEWSLETTER_ACCOUNTS_ID."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_TYPE."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_NAME."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_YOURNAME."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_YOURMAIL."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_DEFAULT."</th>
- <th class='center width10'>"._AM_XNEWSLETTER_FORMACTION."</th>
- </tr>";
-
+ echo "<table class='outer width100' cellspacing='1'>
+ <tr>
+ <th class='center width2'>"._AM_XNEWSLETTER_ACCOUNTS_ID."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_TYPE."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_NAME."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_YOURNAME."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_YOURMAIL."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_DEFAULT."</th>
+ <th class='center width10'>"._AM_XNEWSLETTER_FORMACTION."</th>
+ </tr>";
+
$class = "odd";
foreach (array_keys($accounts_arr) as $i) {
- echo "<tr class='".$class."'>";
- $class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>".$i."</td>";
- $arr_accounts_type=array(
- _AM_ACCOUNTS_TYPE_VAL_PHP_MAIL=>_AM_ACCOUNTS_TYPE_PHPMAIL,
- _AM_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL=>_AM_ACCOUNTS_TYPE_PHPSENDMAIL,
- _AM_ACCOUNTS_TYPE_VAL_POP3=>_AM_ACCOUNTS_TYPE_POP3,
- _AM_ACCOUNTS_TYPE_VAL_SMTP=>_AM_ACCOUNTS_TYPE_SMTP,
- _AM_ACCOUNTS_TYPE_VAL_GMAIL=>_AM_ACCOUNTS_TYPE_GMAIL);
- echo "<td class='center'>". $arr_accounts_type[$accounts_arr[$i]->getVar("accounts_type")]."</td>";
- echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_name")."</td>";
- echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_yourname")."</td>";
- echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_yourmail")."</td>";
- $verif_accounts_default = ( $accounts_arr[$i]->getVar("accounts_default") == 1 ) ? _YES : _NO;
- echo "<td class='center'>".$verif_accounts_default."</td>";
-
- echo "<td class='center width5'>";
- echo " <a href='accounts.php?op=edit_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_edit.png alt='"._EDIT."' title='"._EDIT."' /></a>";
- echo " <a href='accounts.php?op=delete_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_delete.png alt='"._DELETE."' title='"._DELETE."' /></a>";
- if ($accounts_arr[$i]->getVar("accounts_type") != _AM_ACCOUNTS_TYPE_VAL_PHP_MAIL && $accounts_arr[$i]->getVar("accounts_type") != _AM_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL) {
- echo " <a href='accounts.php?op=check_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_check.png alt='"._AM_ACCOUNTS_TYPE_CHECK."' title='"._AM_ACCOUNTS_TYPE_CHECK."' /></a>";
- }
- echo "</td>";
- echo "</tr>";
+ echo "<tr class='".$class."'>";
+ $class = ($class == "even") ? "odd" : "even";
+ echo "<td class='center'>".$i."</td>";
+ $arr_accounts_type=array(
+ _AM_ACCOUNTS_TYPE_VAL_PHP_MAIL=>_AM_ACCOUNTS_TYPE_PHPMAIL,
+ _AM_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL=>_AM_ACCOUNTS_TYPE_PHPSENDMAIL,
+ _AM_ACCOUNTS_TYPE_VAL_POP3=>_AM_ACCOUNTS_TYPE_POP3,
+ _AM_ACCOUNTS_TYPE_VAL_SMTP=>_AM_ACCOUNTS_TYPE_SMTP,
+ _AM_ACCOUNTS_TYPE_VAL_GMAIL=>_AM_ACCOUNTS_TYPE_GMAIL);
+ echo "<td class='center'>". $arr_accounts_type[$accounts_arr[$i]->getVar("accounts_type")]."</td>";
+ echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_name")."</td>";
+ echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_yourname")."</td>";
+ echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_yourmail")."</td>";
+ $verif_accounts_default = ( $accounts_arr[$i]->getVar("accounts_default") == 1 ) ? _YES : _NO;
+ echo "<td class='center'>".$verif_accounts_default."</td>";
+
+ echo "<td class='center width5'>";
+ echo " <a href='accounts.php?op=edit_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_edit.png alt='"._EDIT."' title='"._EDIT."' /></a>";
+ echo " <a href='accounts.php?op=delete_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_delete.png alt='"._DELETE."' title='"._DELETE."' /></a>";
+ if ($accounts_arr[$i]->getVar("accounts_type") != _AM_ACCOUNTS_TYPE_VAL_PHP_MAIL && $accounts_arr[$i]->getVar("accounts_type") != _AM_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL) {
+ echo " <a href='accounts.php?op=check_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_check.png alt='"._AM_ACCOUNTS_TYPE_CHECK."' title='"._AM_ACCOUNTS_TYPE_CHECK."' /></a>";
+ }
+ echo "</td>";
+ echo "</tr>";
}
echo "</table><br /><br />";
echo "<br /><div class='center'>" . $pagenav . "</div><br />";
} else {
echo "<table class='outer width100' cellspacing='1'>
- <tr>
- <th class='center width2'>"._AM_XNEWSLETTER_ACCOUNTS_ID."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_TYPE."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_NAME."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_YOURNAME."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_YOURMAIL."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_USERNAME."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_PASSWORD."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_SERVER_IN."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_PORT_IN."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_SECURETYPE_IN."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_SERVER_OUT."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_PORT_OUT."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_SECURETYPE_OUT."</th>
- <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_DEFAULT."</th>
- <th class='center width10'>"._AM_XNEWSLETTER_FORMACTION."</th>
- </tr>";
+ <tr>
+ <th class='center width2'>"._AM_XNEWSLETTER_ACCOUNTS_ID."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_TYPE."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_NAME."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_YOURNAME."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_YOURMAIL."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_USERNAME."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_PASSWORD."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_SERVER_IN."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_PORT_IN."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_SECURETYPE_IN."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_SERVER_OUT."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_PORT_OUT."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_SECURETYPE_OUT."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_DEFAULT."</th>
+ <th class='center width10'>"._AM_XNEWSLETTER_FORMACTION."</th>
+ </tr>";
echo "</table><br /><br />";
}
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/admin_header.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/admin_header.php 2014-04-25 13:14:48 UTC (rev 12490)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/admin_header.php 2014-04-25 13:21:55 UTC (rev 12491)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* ****************************************************************************
* - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
@@ -63,7 +63,6 @@
$myts = MyTextSanitizer::getInstance();
-
if ($xoopsUser) {
$moduleperm_handler =& xoops_gethandler('groupperm');
if (!$moduleperm_handler->checkRight('module_admin', $xnewsletter->getModule()->mid(), $xoopsUser->getGroups())) {
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/attachment.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/attachment.php 2014-04-25 13:14:48 UTC (rev 12490)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/attachment.php 2014-04-25 13:21:55 UTC (rev 12491)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* ****************************************************************************
* - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
@@ -18,7 +18,7 @@
* GNU General Public License for more details.
* ---------------------------------------------------------------------------
* @copyright Goffy ( wedega.com )
- * @license GNU General Public License 2.0
+ * @license GNU General Public License 2.0
* @package xNewsletter
* @author Goffy ( web...@we... )
*
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh.php 2014-04-25 13:14:48 UTC (rev 12490)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh.php 2014-04-25 13:21:55 UTC (rev 12491)
@@ -1,4 +1,4 @@
-<?php
+<?php
/**
* ****************************************************************************
* - A Project by Developers TEAM For Xoops - ( http://www.xoops.org )
@@ -18,7 +18,7 @@
* GNU General Public License for more details.
* ---------------------------------------------------------------------------
* @copyright Goffy ( wedega.com )
- * @license GNU General Public License 2.0
+ * @license GNU General Public License 2.0
* @package xNewsletter
* @author Goffy ( web...@we... )
*
@@ -36,20 +36,20 @@
$bmh_measure = xNewsletter_CleanVars($_REQUEST, 'bmh_measure', 0, 'int');
$filter = xNewsletter_CleanVars($_REQUEST, 'bmh_measure_filter', _AM_XNEWSLETTER_BMH_MEASURE_VAL_ALL, 'int');
-switch ($op)
-{
+switch ($op)
+{
case "bmh_delsubscr":
- if ( (isset($_POST["ok"]) && $_POST["ok"] == 1) ) {
+ if ( (isset($_POST["ok"]) && $_POST["ok"] == 1) ) {
$count_err = 0;
-
+
$obj_bmh =& $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
$bmh_email = $obj_bmh->getVar("bmh_email");
-
+
$sql = "SELECT subscr_id FROM " . $xoopsDB->prefix("mod_xnewsletter_subscr") . " WHERE (";
$sql .= "subscr_email='" . $bmh_email . "'";
$sql .= ") LIMIT 1;";
- if ( $user = $xoopsDB->query($sql) ) {
+ if ( $user = $xoopsDB->query($sql) ) {
$row_user = $xoopsDB->fetchRow($user);
$subscr_id = intval($row_user[0]);
}
@@ -66,7 +66,7 @@
if (!$xnewsletter->getHandler('xNewsletter_subscr')->delete($obj_subscr,true)) {
$actionprot_err = $obj_subscr->getHtmlErrors()."<br/><br/><br/>";
$count_err++;
- }
+ }
//delete subscription
$crit_catsubscr = new CriteriaCompo();
@@ -84,43 +84,43 @@
if ($cat_mailinglist > 0) {
require_once( XOOPS_ROOT_PATH."/modules/xNewsletter/include/mailinglist.php" );
subscribingMLHandler(0, $subscr_id, $cat_mailinglist);
- }
+ }
} else {
$actionprot_err .= $obj_catsubscr->getHtmlErrors();
$count_err++;
}
}
}
-
+
if ($count_err == 0) {
redirect_header("bmh.php?op=handle_bmh&bmh_id=".$bmh_id."&bmh_measure="._AM_XNEWSLETTER_BMH_MEASURE_VAL_DELETE."&filter=".$filter, 3, _AM_XNEWSLETTER_FORMDELOK);
} else {
echo $actionprot_err;
- }
- } else {
+ }
+ } else {
xoops_confirm(array("ok" => 1, "bmh_id" => $bmh_id, "op" => "bmh_delsubscr", "filter" => $filter), "bmh.php", sprintf(_AM_XNEWSLETTER_BMH_MEASURE_DELETE_SURE));
- }
- break;
-
- case "handle_bmh":
- if ($bmh_id == 0) redirect_header("bmh.php", 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
- if ($bmh_measure == 0) redirect_header("bmh.php", 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
-
- $obj_bmh =& $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
-
+ }
+ break;
+
+ case "handle_bmh":
+ if ($bmh_id == 0) redirect_header("bmh.php", 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
+ if ($bmh_measure == 0) redirect_header("bmh.php", 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
+
+ $obj_bmh =& $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
+
if ($obj_bmh->getVar("bmh_measure") == _AM_XNEWSLETTER_BMH_MEASURE_VAL_DELETE ) {
redirect_header("bmh.php?op=list&filter=".$filter."'", 3, _AM_XNEWSLETTER_BMH_MEASURE_ALREADY_DELETED);
}
-
+
$bmh_email = $obj_bmh->getVar("bmh_email");
-
- if ($bmh_measure == _AM_XNEWSLETTER_BMH_MEASURE_VAL_QUIT) {
- $sql = "UPDATE `".$xoopsDB->prefix("mod_xnewsletter_subscr")."` INNER JOIN `";
- $sql .= $xoopsDB->prefix("mod_xnewsletter_catsubscr")."` ON `subscr_id` = `catsubscr_subscrid` ";
- $sql .= "SET `catsubscr_quited` = ".time()." WHERE (((`subscr_email`)='";
- $sql .= $bmh_email. "'))";
- $result= $xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
- }
+
+ if ($bmh_measure == _AM_XNEWSLETTER_BMH_MEASURE_VAL_QUIT) {
+ $sql = "UPDATE `".$xoopsDB->prefix("mod_xnewsletter_subscr")."` INNER JOIN `";
+ $sql .= $xoopsDB->prefix("mod_xnewsletter_catsubscr")."` ON `subscr_id` = `catsubscr_subscrid` ";
+ $sql .= "SET `catsubscr_quited` = ".time()." WHERE (((`subscr_email`)='";
+ $sql .= $bmh_email. "'))";
+ $result= $xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
+ }
//set bmh_measure for all entries in bmh with this email
$sql_upd = "UPDATE ".$xoopsDB->prefix("mod_xnewsletter_bmh")." SET ";
$sql_upd .="`bmh_measure` = '".$bmh_measure."'";
@@ -128,196 +128,196 @@
$sql_upd .=", `bmh_created` = '".time()."'";
$sql_upd .=" WHERE ((`".$xoopsDB->prefix("mod_xnewsletter_bmh")."`.`bmh_email` ='".$bmh_email."') AND (`".$xoopsDB->prefix("mod_xnewsletter_bmh")."`.`bmh_measure` ='0'))";
$result= $xoopsDB->queryF($sql_upd) or die ("MySQL-Error: " . mysql_error());
-
+
redirect_header("bmh.php?op=list&filter=".$filter, 3, _AM_XNEWSLETTER_FORMOK);
- echo $obj_bmh->getHtmlErrors();
+ echo $obj_bmh->getHtmlErrors();
break;
-
- case "run_bmh":
- require_once('bmh_callback_database.php');
- require_once(XOOPS_ROOT_PATH . '/modules/xNewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php');
+ case "run_bmh":
- $accounts_crit = new CriteriaCompo();
- $accounts_crit->add(new Criteria("accounts_use_bmh", "1"));
- $numrows_acc = $xnewsletter->getHandler('xNewsletter_accounts')->getCount($accounts_crit);
-
- if ($numrows_acc > 0)
- {
- $accounts_arr = $xnewsletter->getHandler('xNewsletter_accounts')->getall($accounts_crit);
- $result_bmh = _AM_XNEWSLETTER_BMH_SUCCESSFUL."<br/>";
-
- foreach (array_keys($accounts_arr) as $acc)
- {
- $bmh = new BounceMailHandler();
- $bmh->verbose = VERBOSE_SIMPLE; //VERBOSE_REPORT; //VERBOSE_DEBUG; //VERBOSE_QUIET; // default is VERBOSE_SIMPLE
- //$bmh->use_fetchstructure = true; // true is default, no need to speficy
- //$bmh->testmode = true; // false is default, no need to specify
- //$bmh->debug_body_rule = false; // false is default, no need to specify
- //$bmh->debug_dsn_rule = false; // false is default, no need to specify
- //$bmh->purge_unprocessed = false; // false is default, no need to specify
- $bmh->disable_delete = true; // detected mails will be not deleted, default is false
+ require_once('bmh_callback_database.php');
+ require_once(XOOPS_ROOT_PATH . '/modules/xNewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php');
- /*
- * for local mailbox (to process .EML files)
- */
- //$bmh->openLocalDirectory('/home/email/temp/mailbox');
- //$bmh->processMailbox();
+ $accounts_crit = new CriteriaCompo();
+ $accounts_crit->add(new Criteria("accounts_use_bmh", "1"));
+ $numrows_acc = $xnewsletter->getHandler('xNewsletter_accounts')->getCount($accounts_crit);
- /*
- * for remote mailbox
- */
- $bmh->mailhost = $accounts_arr[$acc]->getVar("accounts_server_in"); // your mail server
- $bmh->mailbox_username = $accounts_arr[$acc]->getVar("accounts_username"); // your mailbox username
- $bmh->mailbox_password = $accounts_arr[$acc]->getVar("accounts_password"); // your mailbox password
- $bmh->port = $accounts_arr[$acc]->getVar("accounts_port_in"); // the port to access your mailbox, default is 143
- if ($accounts_arr[$acc]->getVar("accounts_type") == _AM_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_option = $accounts_arr[$acc]->getVar("accounts_securetype_in"); // the service options (none, tls, notls, ssl, etc.), default is 'notls'
- $bmh->boxname = $accounts_arr[$acc]->getVar("accounts_inbox"); // the mailbox to access, default is 'INBOX'
- $verif_movehard = $accounts_arr[$acc]->getVar("accounts_movehard") == '1' ? true : false;
- $bmh->moveHard = $verif_movehard; // default is false
- $bmh->hardMailbox = $accounts_arr[$acc]->getVar("accounts_hardbox"); // default is 'INBOX.hard' - NOTE: must start with 'INBOX.'
- $verif_movesoft = $accounts_arr[$acc]->getVar("accounts_movesoft") == '1' ? true : false;
- $bmh->moveSoft = $verif_movesoft; // default is false
- $bmh->softMailbox = $accounts_arr[$acc]->getVar("accounts_softbox"); // default is 'INBOX.soft' - NOTE: must start with 'INBOX.'
- //$bmh->deleteMsgDate = '2009-01-05'; // format must be as 'yyyy-mm-dd'
+ if ($numrows_acc > 0)
+ {
+ $accounts_arr = $xnewsletter->getHandler('xNewsletter_accounts')->getall($accounts_crit);
+ $result_bmh = _AM_XNEWSLETTER_BMH_SUCCESSFUL."<br/>";
- /*
- * rest used regardless what type of connection it is
- */
+ foreach (array_keys($accounts_arr) as $acc)
+ {
+ $bmh = new BounceMailHandler();
+ $bmh->verbose = VERBOSE_SIMPLE; //VERBOSE_REPORT; //VERBOSE_DEBUG; //VERBOSE_QUIET; // default is VERBOSE_SIMPLE
+ //$bmh->use_fetchstructure = true; // true is default, no need to speficy
+ //$bmh->testmode = true; // false is default, no need to specify
+ //$bmh->debug_body_rule = false; // false is default, no need to specify
+ //$bmh->debug_dsn_rule = false; // false is default, no need to specify
+ //$bmh->purge_unprocessed = false; // false is default, no need to specify
+ $bmh->disable_delete = true; // detected mails will be not deleted, default is false
- $bmh->openMailbox();
- $bmh->processMailbox();
+ /*
+ * for local mailbox (to process .EML files)
+ */
+ //$bmh->openLocalDirectory('/home/email/temp/mailbox');
+ //$bmh->processMailbox();
- $result_bmh .= str_replace("%b", $accounts_arr[$acc]->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);
- $result_bmh = str_replace("%m", $bmh->result_moved, $result_bmh);
- $result_bmh = str_replace("%d", $bmh->result_deleted, $result_bmh);
- }
- redirect_header("bmh.php", 5, $result_bmh);
- } else {
- redirect_header("bmh.php", 3, _AM_XNEWSLETTER_BMH_ERROR_NO_ACTIVE);
- }
- break;
-
- case "list":
- default:
- echo $indexAdmin->addNavigation('bmh.php');
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_RUNBMH, 'bmh.php?op=run_bmh', 'add');
- echo $indexAdmin->renderButton();
-
- $arr_measure_type=array(
+ /*
+ * for remote mailbox
+ */
+ $bmh->mailhost = $accounts_arr[$acc]->getVar("accounts_server_in"); // your mail server
+ $bmh->mailbox_username = $accounts_arr[$acc]->getVar("accounts_username"); // your mailbox username
+ $bmh->mailbox_password = $accounts_arr[$acc]->getVar("accounts_password"); // your mailbox password
+ $bmh->port = $accounts_arr[$acc]->getVar("accounts_port_in"); // the port to access your mailbox, default is 143
+ if ($accounts_arr[$acc]->getVar("accounts_type") == _AM_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_option = $accounts_arr[$acc]->getVar("accounts_securetype_in"); // the service options (none, tls, notls, ssl, etc.), default is 'notls'
+ $bmh->boxname = $accounts_arr[$acc]->getVar("accounts_inbox"); // the mailbox to access, default is 'INBOX'
+ $verif_movehard = $accounts_arr[$acc]->getVar("accounts_movehard") == '1' ? true : false;
+ $bmh->moveHard = $verif_movehard; // default is false
+ $bmh->hardMailbox = $accounts_arr[$acc]->getVar("accounts_hardbox"); // default is 'INBOX.hard' - NOTE: must start with 'INBOX.'
+ $verif_movesoft = $accounts_arr[$acc]->getVar("accounts_movesoft") == '1' ? true : false;
+ $bmh->moveSoft = $verif_movesoft; // default is false
+ $bmh->softMailbox = $accounts_arr[$acc]->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", $accounts_arr[$acc]->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);
+ $result_bmh = str_replace("%m", $bmh->result_moved, $result_bmh);
+ $result_bmh = str_replace("%d", $bmh->result_deleted, $result_bmh);
+ }
+ redirect_header("bmh.php", 5, $result_bmh);
+ } else {
+ redirect_header("bmh.php", 3, _AM_XNEWSLETTER_BMH_ERROR_NO_ACTIVE);
+ }
+ break;
+
+ case "list":
+ default:
+ echo $indexAdmin->addNavigation('bmh.php');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_RUNBMH, 'bmh.php?op=run_bmh', 'add');
+ echo $indexAdmin->renderButton();
+
+ $arr_measure_type=array(
_AM_XNEWSLETTER_BMH_MEASURE_VAL_ALL=>_AM_XNEWSLETTER_BMH_MEASURE_ALL,
_AM_XNEWSLETTER_BMH_MEASURE_VAL_PENDING=>_AM_XNEWSLETTER_BMH_MEASURE_PENDING,
- _AM_XNEWSLETTER_BMH_MEASURE_VAL_NOTHING=>_AM_XNEWSLETTER_BMH_MEASURE_NOTHING,
+ _AM_XNEWSLETTER_BMH_MEASURE_VAL_NOTHING=>_AM_XNEWSLETTER_BMH_MEASURE_NOTHING,
_AM_XNEWSLETTER_BMH_MEASURE_VAL_QUIT=>_AM_XNEWSLETTER_BMH_MEASURE_QUITED,
_AM_XNEWSLETTER_BMH_MEASURE_VAL_DELETE=>_AM_XNEWSLETTER_BMH_MEASURE_DELETED);
-
- $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
- $criteria = new CriteriaCompo();
- if ($filter > -1) $criteria->add(new Criteria("bmh_measure", $filter));
- $criteria->setSort("bmh_id");
- $criteria->setOrder("DESC");
- $numrows = $xnewsletter->getHandler('xNewsletter_bmh')->getCount($criteria);
- $start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
- $criteria->setStart($start);
- $criteria->setLimit($limit);
- $bmh_arr = $xnewsletter->getHandler('xNewsletter_bmh')->getall($criteria);
- if ( $numrows > $limit ) {
- include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
- $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
- $pagenav = $pagenav->renderNav(4);
- } else {
- $pagenav = '';
- }
-
+
+ $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
+ $criteria = new CriteriaCompo();
+ if ($filter > -1) $criteria->add(new Criteria("bmh_measure", $filter));
+ $criteria->setSort("bmh_id");
+ $criteria->setOrder("DESC");
+ $numrows = $xnewsletter->getHandler('xNewsletter_bmh')->getCount($criteria);
+ $start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
+ $bmh_arr = $xnewsletter->getHandler('xNewsletter_bmh')->getall($criteria);
+ if ($numrows > $limit) {
+ include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
+ $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
+ $pagenav = $pagenav->renderNav(4);
+ } else {
+ $pagenav = '';
+ }
+
//form to filter result
echo "<table class='outer width100' cellspacing='1'><tr class='odd'><td>";
echo "<form id='form_filter' enctype='multipart/form-data' method='post' action='bmh.php' 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 == _AM_XNEWSLETTER_BMH_MEASURE_VAL_PENDING) ? "checked='checked'" : "";
echo "<input id='bmh_measure0' type='radio' $checked value='"._AM_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 == _AM_XNEWSLETTER_BMH_MEASURE_VAL_NOTHING) ? "checked='checked'" : "";
echo "<input id='bmh_measure1' type='radio' $checked value='"._AM_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 == _AM_XNEWSLETTER_BMH_MEASURE_VAL_QUIT) ? "checked='checked'" : "";
echo "<input id='bmh_measure2' type='radio' $checked value='"._AM_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 == _AM_XNEWSLETTER_BMH_MEASURE_VAL_DELETE) ? "checked='checked'" : "";
echo "<input id='bmh_measure3' type='radio' $checked value='"._AM_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
- if ($numrows>0)
- {
+
+ // View Table
+ if ($numrows>0)
+ {
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>
- </tr>";
-
- $class = "odd";
-
- foreach (array_keys($bmh_arr) as $i)
- {
- echo "<tr class='".$class."'>";
- $class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>".$i."</td>";
- echo "<td class='center'>".$bmh_arr[$i]->getVar("bmh_rule_no")."</td>";
- echo "<td class='center'>".$bmh_arr[$i]->getVar("bmh_rule_cat")."</td>";
- echo "<td class='center'>".$bmh_arr[$i]->getVar("bmh_bouncetype")."</td>";
-
- $verif_bmh_remove = ( $bmh_arr[$i]->getVar("bmh_remove") == "0" ) ? ' ' : $bmh_arr[$i]->getVar("bmh_remove");
- echo "<td class='center'>".$verif_bmh_remove."</td>";
- echo "<td class='center'>".$bmh_arr[$i]->getVar("bmh_email")."</td>";
-
- echo "<td class='center'>".$arr_measure_type[$bmh_arr[$i]->getVar("bmh_measure")]."</td>";
- echo "<td class='center'>".formatTimeStamp($bmh_arr[$i]->getVar("bmh_created"),"S")."</td>";
-
- echo "<td class='center width20'>
- <a href='bmh.php?op=handle_bmh&bmh_id=".$i."&bmh_measure="._AM_XNEWSLETTER_BMH_MEASURE_VAL_NOTHING."&filter=".$filter."'>
- <img src=".XNEWSLETTER_ICONS_URL."/xn_nothing.png alt='"._AM_XNEWSLETTER_BMH_MEASURE_NOTHING."' title='"._AM_XNEWSLETTER_BMH_MEASURE_NOTHING."' />
- </a>
- <a href='bmh.php?op=handle_bmh&bmh_id=".$i."&bmh_measure="._AM_XNEWSLETTER_BMH_MEASURE_VAL_QUIT."&filter=".$filter."'>
- <img src=".XNEWSLETTER_ICONS_URL."/xn_catsubscr_temp.png alt='"._AM_XNEWSLETTER_BMH_MEASURE_QUIT."' title='"._AM_XNEWSLETTER_BMH_MEASURE_QUIT."' />
- </a>
+ <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>
+ </tr>";
+
+ $class = "odd";
+
+ foreach (array_keys($bmh_arr) as $i)
+ {
+ echo "<tr class='".$class."'>";
+ $class = ($class == "even") ? "odd" : "even";
+ echo "<td class='center'>".$i."</td>";
+ echo "<td class='center'>".$bmh_arr[$i]->getVar("bmh_rule_no")."</td>";
+ echo "<td class='center'>".$bmh_arr[$i]->getVar("bmh_rule_cat")."</td>";
+ echo "<td class='center'>".$bmh_arr[$i]->getVar("bmh_bouncetype")."</td>";
+
+ $verif_bmh_remove = ( $bmh_arr[$i]->getVar("bmh_remove") == "0" ) ? ' ' : $bmh_arr[$i]->getVar("bmh_remove");
+ echo "<td class='center'>".$verif_bmh_remove."</td>";
+ echo "<td class='center'>".$bmh_arr[$i]->getVar("bmh_email")."</td>";
+
+ echo "<td class='center'>".$arr_measure_type[$bmh_arr[$i]->getVar("bmh_measure")]."</td>";
+ echo "<td class='center'>".formatTimeStamp($bmh_arr[$i]->getVar("bmh_created"),"S")."</td>";
+
+ echo "<td class='center width20'>
+ <a href='bmh.php?op=handle_bmh&bmh_id=".$i."&bmh_measure="._AM_XNEWSLETTER_BMH_MEASURE_VAL_NOTHING."&filter=".$filter."'>
+ <img src=".XNEWSLETTER_ICONS_URL."/xn_nothing.png alt='"._AM_XNEWSLETTER_BMH_MEASURE_NOTHING."' title='"._AM_XNEWSLETTER_BMH_MEASURE_NOTHING."' />
+ </a>
+ <a href='bmh.php?op=handle_bmh&bmh_id=".$i."&bmh_measure="._AM_XNEWSLETTER_BMH_MEASURE_VAL_QUIT."&filter=".$filter."'>
+ <img src=".XNEWSLETTER_ICONS_URL."/xn_catsubscr_temp.png alt='"._AM_XNEWSLETTER_BMH_MEASURE_QUIT."' title='"._AM_XNEWSLETTER_BMH_MEASURE_QUIT."' />
+ </a>
<a href='bmh.php?op=bmh_delsubscr&bmh_id=".$i."&filter=".$filter."'>
- <img src=".XNEWSLETTER_ICONS_URL."/xn_quit.png alt='"._AM_XNEWSLETTER_BMH_MEASURE_DELETE."' title='"._AM_XNEWSLETTER_BMH_MEASURE_DELETE."' />
- </a>
- <a href='bmh.php?op=edit_bmh&bmh_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_edit.png alt='"._AM_XNEWSLETTER_BMH_EDIT."' title='"._AM_XNEWSLETTER_BMH_EDIT."' width='16px' /></a>
- <a href='bmh.php?op=delete_bmh&bmh_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_delete.png alt='"._AM_XNEWSLETTER_BMH_DELETE."' title='"._AM_XNEWSLETTER_BMH_DELETE."' width='16px' /></a>
- </td>";
- echo "</tr>";
- }
- echo "</table><br /><br />";
- echo "<br /><div class='center'>" . $pagenav . "</div><br />";
- } else {
- echo "<table class='outer width100' cellspacing='1'>
- <tr>
+ <img src=".XNEWSLETTER_ICONS_URL."/xn_quit.png alt='"._AM_XNEWSLETTER_BMH_MEASURE_DELETE."' title='"._AM_XNEWSLETTER_BMH_MEASURE_DELETE."' />
+ </a>
+ <a href='bmh.php?op=edit_bmh&bmh_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_edit.png alt='"._AM_XNEWSLETTER_BMH_EDIT."' title='"._AM_XNEWSLETTER_BMH_EDIT."' width='16px' /></a>
+ <a href='bmh.php?op=delete_bmh&bmh_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_delete.png alt='"._AM_XNEWSLETTER_BMH_DELETE."' title='"._AM_XNEWSLETTER_BMH_DELETE."' width='16px' /></a>
+ </td>";
+ echo "</tr>";
+ }
+ echo "</table><br /><br />";
+ echo "<br /><div class='center'>" . $pagenav . "</div><br />";
+ } else {
+ 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>
@@ -327,78 +327,78 @@
<th class='center'>"._AM_XNEWSLETTER_BMH_SUBJECT."</th>
<th class='center'>"._AM_XNEWSLETTER_BMH_MEASURE."</th>
<th class='center'>"._AM_XNEWSLETTER_BMH_CREATED."</th>
- <th class='center width5'>"._AM_XNEWSLETTER_FORMACTION."</th>
+ <th class='center width5'>"._AM_XNEWSLETTER_FORMACTION."</th>
</tr>
- <tr>
+ <tr>
<td class='even' colspan='10'>".sprintf(_AM_XNEWSLETTER_BMH_MEASURE_SHOW_NONE,$arr_measure_type[$filter])."</td>
</tr>";
- echo "</table><br />";
- }
- break;
-
- case "save_bmh":
- if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("bmh.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
- }
+ echo "</table><br />";
+ }
+ break;
- $obj =& $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
-
- //Form bmh_rule_no
- $obj->setVar("bmh_rule_no", xNewsletter_CleanVars( $_REQUEST, "bmh_rule_no", "", "string") );
- //Form bmh_rule_cat
- $obj->setVar("bmh_rule_cat", xNewsletter_CleanVars( $_REQUEST, "bmh_rule_cat", "", "string") );
- //Form bmh_bouncetype
- $obj->setVar("bmh_bouncetype", xNewsletter_CleanVars( $_REQUEST, "bmh_bouncetype", "", "string") );
- //Form bmh_remove
- $obj->setVar("bmh_remove", xNewsletter_CleanVars( $_REQUEST, "bmh_remove", "", "string") );
- //Form bmh_email
- $obj->setVar("bmh_email", xNewsletter_CleanVars( $_REQUEST, "bmh_email", "", "email") );
- //Form bmh_subject
- $obj->setVar("bmh_subject", xNewsletter_CleanVars( $_REQUEST, "bmh_subject", "", "string") );
- //Form bmh_measure
- $obj->setVar("bmh_measure", xNewsletter_CleanVars( $_REQUEST, "bmh_measure", 0, "int") );
- //Form bmh_submitter
- $obj->setVar("bmh_submitter", xNewsletter_CleanVars( $_REQUEST, "bmh_submitter", 0, "int") );
- //Form bmh_created
- $obj->setVar("bmh_created", xNewsletter_CleanVars( $_REQUEST, "bmh_created", 0, "int") );
-
- if ($xnewsletter->getHandler('xNewsletter_bmh')->insert($obj)) {
- redirect_header("bmh.php?op=list", 2, _AM_XNEWSLETTER_FORMOK);
- }
- echo $obj->getHtmlErrors();
- $form =& $obj->getForm();
- $form->display();
+ case "save_bmh":
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("bmh.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+
+ $obj =& $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
+
+ //Form bmh_rule_no
+ $obj->setVar("bmh_rule_no", xNewsletter_CleanVars( $_REQUEST, "bmh_rule_no", "", "string") );
+ //Form bmh_rule_cat
+ $obj->setVar("bmh_rule_cat", xNewsletter_CleanVars( $_REQUEST, "bmh_rule_cat", "", "string") );
+ //Form bmh_bouncetype
+ $obj->setVar("bmh_bouncetype", xNewsletter_CleanVars( $_REQUEST, "bmh_bouncetype", "", "string") );
+ //Form bmh_remove
+ $obj->setVar("bmh_remove", xNewsletter_CleanVars( $_REQUEST, "bmh_remove", "", "string") );
+ //Form bmh_email
+ $obj->setVar("bmh_email", xNewsletter_CleanVars( $_REQUEST, "bmh_email", "", "email") );
+ //Form bmh_subject
+ $obj->setVar("bmh_subject", xNewsletter_CleanVars( $_REQUEST, "bmh_subject", "", "string") );
+ //Form bmh_measure
+ $obj->setVar("bmh_measure", xNewsletter_CleanVars( $_REQUEST, "bmh_measure", 0, "int") );
+ //Form bmh_submitter
+ $obj->setVar("bmh_submitter", xNewsletter_CleanVars( $_REQUEST, "bmh_submitter", 0, "int") );
+ //Form bmh_created
+ $obj->setVar("bmh_created", xNewsletter_CleanVars( $_REQUEST, "bmh_created", 0, "int") );
+
+ if ($xnewsletter->getHandler('xNewsletter_bmh')->insert($obj)) {
+ redirect_header("bmh.php?op=list", 2, _AM_XNEWSLETTER_FORMOK);
+ }
+ echo $obj->getHtmlErrors();
+ $form =& $obj->getForm();
+ $form->display();
break;
-
- case "edit_bmh":
- echo $indexAdmin->addNavigation("bmh.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_BMHLIST, 'bmh.php?op=list', 'list');
- echo $indexAdmin->renderButton();
- $obj = $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
- $form = $obj->getForm();
- $form->display();
- break;
-
- case "delete_bmh":
- $obj =& $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
- if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
- if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("bmh.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
- }
- if ($xnewsletter->getHandler('xNewsletter_bmh')->delete($obj)) {
- redirect_header("bmh.php", 3, _AM_XNEWSLETTER_FORMDELOK);
- } else {
- echo $obj->getHtmlErrors();
- }
- } else {
- xoops_confirm(array("ok" => 1, "bmh_id" => $bmh_id, "op" => "delete_bmh"), $_SERVER["REQUEST_URI"], sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $obj->getVar("bmh_rule_no")));
- }
- break;
+
+ case "edit_bmh":
+ echo $indexAdmin->addNavigation("bmh.php");
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_BMHLIST, 'bmh.php?op=list', 'list');
+ echo $indexAdmin->renderButton();
+ $obj = $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
+ $form = $obj->getForm();
+ $form->display();
+ break;
+
+ case "delete_bmh":
+ $obj =& $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
+ if (isset($_POST["ok"]) && $_POST["ok"] == 1) {
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("bmh.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+ if ($xnewsletter->getHandler('xNewsletter_bmh')->delete($obj)) {
+ redirect_header("bmh.php", 3, _AM_XNEWSLETTER_FORMDELOK);
+ } else {
+ echo $obj->getHtmlErrors();
+ }
+ } else {
+ xoops_confirm(array("ok" => 1, "bmh_id" => $bmh_id, "op" => "delete_bmh"), $_SERVER["REQUEST_URI"], sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $obj->getVar("bmh_rule_no")));
+ }
+ break;
}
include "admin_footer.php";
function microtime_float() {
- list($usec, $sec) = explode(" ", microtime());
- return ((float)$usec + (float)$sec);
+ list($usec, $sec) = explode(" ", microtime());
+
+ return ((float) $usec + (float) $sec);
}
-?>
\ No newline at end of file
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh_callback_database.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh_callback_database.php 2014-04-25 13:14:48 UTC (rev 12490)
+++ XoopsModules/xnewsletter/branches/mam...
[truncated message content] |
