Menu
▾
▴
xoops-svn
|
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) {
...
[truncated message content] |
|
From: <be...@us...> - 2014-06-02 04:11:17
|
Revision: 12557
http://sourceforge.net/p/xoops/svn/12557
Author: beckmi
Date: 2014-06-02 04:11:11 +0000 (Mon, 02 Jun 2014)
Log Message:
-----------
Adding changes from Luciorota
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/accounts.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/menu.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/common.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/templates/xoops.tpl
XoopsModules/xnewsletter/branches/mamba/xNewsletter/subscription.php
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_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
XoopsModules/xnewsletter/branches/mamba/xNewsletter/xoops_version.php
Added Paths:
-----------
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
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/accounts.php 2014-06-01 22:19:51 UTC (rev 12556)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/accounts.php 2014-06-02 04:11:11 UTC (rev 12557)
@@ -75,42 +75,42 @@
$accounts_hardbox = $accountObj->getVar("accounts_hardbox"); $accounts_hardbox_ok = 0;
$accounts_softbox = $accountObj->getVar("accounts_softbox"); $accounts_softbox_ok = 0;
- $command = $mailhost.":".$port;
+ $command = $mailhost . ":" . $port;
if ($service !='') $command .= '/' . $service;
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>
+ <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) {
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>";
- echo "<td class='left'>".imap_last_error()."</td>";
+ echo "<td class='center width5'>" . $img_failed . "</td>";
+ echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . "</td>";
+ echo "<td class='left'>" . imap_last_error() . "</td>";
echo "</tr>";
} else {
echo "<tr>";
- echo "<td class='center width5'>".$img_ok."</td>";
- echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK."</td>";
+ echo "<td class='center width5'>" . $img_ok . "</td>";
+ echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . "</td>";
echo "<td class='left'></td>";
echo "</tr>";
$folders = imap_listmailbox($mbox, "{".$command."}", "*");
if ($folders == false) {
echo "<tr>";
- echo "<td class='center width5'>".$img_failed."</td>";
- echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED."</td>";
- echo "<td class='left'>".imap_last_error()."</td>";
+ echo "<td class='center width5'>" . $img_failed . "</td>";
+ echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . "</td>";
+ echo "<td class='left'>" . imap_last_error() . "</td>";
echo "</tr>";
} else {
echo "<tr>";
- echo "<td class='center width5'>".$img_ok."</td>";
- echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK."</td>";
+ echo "<td class='center width5'>" . $img_ok . "</td>";
+ echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . "</td>";
echo "<td class='left'>";
if (is_array($folders)) {
reset ($folders);
@@ -118,15 +118,15 @@
$foldercreated = 0;
while (list( $key, $val) = each ($folders)) {
echo "($key) ";
- echo imap_utf7_decode (str_replace("{".$command."}","",$val)) . "<br>\n";
- if ("{".$command."}".$accounts_inbox == $val) $accounts_inbox_ok = 1;
- if ("{".$command."}".$accounts_hardbox == $val) {
+ echo imap_utf7_decode (str_replace("{" . $command . "}", "", $val)) . "<br>\n";
+ if ("{" . $command . "}" . $accounts_inbox == $val) $accounts_inbox_ok = 1;
+ if ("{" . $command . "}" . $accounts_hardbox == $val) {
$accounts_hardbox_ok = 1;
} else {
- @imap_createmailbox($mbox, imap_utf7_encode('{'.$command.'}' . $accounts_hardbox));
+ @imap_createmailbox($mbox, imap_utf7_encode('{' .$command . '}' . $accounts_hardbox));
$foldercreated = 1;
}
- if ("{".$command."}".$accounts_softbox == $val) {
+ if ("{" . $command . "}" . $accounts_softbox == $val) {
$accounts_softbox_ok = 1;
} else {
@imap_createmailbox($mbox, imap_utf7_encode('{' . $command . '}' . $accounts_softbox));
@@ -136,8 +136,8 @@
if ($foldercreated == 1) {
$folders_recheck = imap_listmailbox($mbox, "{" . $command . "}", "*");
while (list( $key, $val) = each ($folders_recheck)) {
- if ("{".$command."}".$accounts_hardbox == $val) $accounts_hardbox_ok = 1;
- if ("{".$command."}".$accounts_softbox == $val) $accounts_softbox_ok = 1;
+ if ("{" . $command . "}" . $accounts_hardbox == $val) $accounts_hardbox_ok = 1;
+ if ("{" . $command . "}" . $accounts_softbox == $val) $accounts_softbox_ok = 1;
}
}
}
@@ -160,7 +160,7 @@
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . $img_failed;
}
echo "<br />";
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX." ";
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX . " ";
if ($accounts_hardbox_ok == 1) {
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . $img_ok;
} else {
@@ -214,39 +214,39 @@
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>
+ <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."'>";
+ echo "<tr class='" . $class . "'>";
$class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>".$i."</td>";
+ 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'>" . $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>";
+ 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 " <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>";
@@ -325,7 +325,7 @@
$accountObj->setErrors(_MA_XNEWSLETTER_SUBSCRIPTION_ERROR_NOEMAIL);
}
- echo $obj->getHtmlErrors();
+ echo $accountObj->getHtmlErrors();
$form = $accountObj->getForm();
$form->display();
break;
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/menu.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/menu.php 2014-06-01 22:19:51 UTC (rev 12556)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/menu.php 2014-06-02 04:11:11 UTC (rev 12557)
@@ -28,7 +28,7 @@
include_once dirname(dirname(__FILE__)) . '/include/common.php';
$xnewsletter = xNewsletterxNewsletter::getInstance();
-$pathImageAdmin = 'images/icons';
+$pathImageAdmin = 'assets/images/icons';
$adminmenu = array();
$i = 1;
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/common.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/common.php 2014-06-01 22:19:51 UTC (rev 12556)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/common.php 2014-06-02 04:11:11 UTC (rev 12557)
@@ -24,9 +24,9 @@
define("XNEWSLETTER_DIRNAME", basename(dirname(dirname(__FILE__))));
define("XNEWSLETTER_URL", XOOPS_URL . '/modules/' . XNEWSLETTER_DIRNAME);
define("XNEWSLETTER_ROOT_PATH", XOOPS_ROOT_PATH . '/modules/' . XNEWSLETTER_DIRNAME);
-define("XNEWSLETTER_IMAGES_URL", XNEWSLETTER_URL . '/images');
+define("XNEWSLETTER_IMAGES_URL", XNEWSLETTER_URL . '/assets/images');
define("XNEWSLETTER_ADMIN_URL", XNEWSLETTER_URL . '/admin');
-define("XNEWSLETTER_ICONS_URL", XNEWSLETTER_URL . '/images/icons');
+define("XNEWSLETTER_ICONS_URL", XNEWSLETTER_URL . '/assets/images/icons');
xoops_loadLanguage('common', XNEWSLETTER_DIRNAME);
Added: XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/mail_template/info_change.html
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/mail_template/info_change.html (rev 0)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/mail_template/info_change.html 2014-06-02 04:11:11 UTC (rev 12557)
@@ -0,0 +1,10 @@
+<p>Dear {SEX} {FIRSTNAME} {LASTNAME}</p>
+
+<p>Your subscription to email-address {EMAIL} have been changed by <a href="{USERLINK}">{USERNAME}</a> with IP-address {IP}.</p>
+
+<p>For further information please click on following link:<br />{ACTLINK}</p>
+
+<p>-----------------------<br />
+{X_SITENAME}<br />
+({X_SITEURL})<br />
+Webmaster {X_ADMINMAIL}</p>
Added: XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/templates/basic.html
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/templates/basic.html (rev 0)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/templates/basic.html 2014-06-02 04:11:11 UTC (rev 12557)
@@ -0,0 +1,9 @@
+<div class="letter-body" style="width: 640px; font-family: Arial, Helvetica, sans-serif; font-size: 11px;">
+ Dear <{$sex}> <{$firstname}> <{$lastname}><br />
+ <br />
+ <{$content}>
+ <br />
+</div>
+<div class="letter_footer" style="width: 100%; font-family: Arial, Helvetica, sans-serif; font-size: 11px;padding-top:50px">
+ If you want to unsubscribe please click <a href="<{$unsubscribe_link}>" target="_blank">here</a>
+</div>
Added: XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/templates/xoops.html
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/templates/xoops.html (rev 0)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/templates/xoops.html 2014-06-02 04:11:11 UTC (rev 12557)
@@ -0,0 +1,16 @@
+<div class="xn_letter" style="width:100%">
+ <div class="letter_header" style="background-image: url(<{$xoops_url}>/modules/xNewsletter/images/letter_template/xoops-bg.png); background-repeat: repeat-x; height: 80px; width:100%">
+ <div style="background-image: url(<{$xoops_url}>/modules/xNewsletter/images/letter_template/xoops-logo.png); background-repeat: no-repeat; height: 80px;" > </div>
+ </div>
+ <div class="letter-body" style="width: 100%;font-family: Arial,Helvetica,sans-serif; font-size: 11px; margin-top: 30px;">
+ Dear <{$sex}> <{$firstname}> <{$lastname}><br>
+ <br />
+ <{$content}>
+ <br />
+ </div>
+
+ <div class="letter_footer" style="width: 100%; font-family: Arial,Helvetica,sans-serif; font-size: 11px; padding-top: 50px;">
+ <div style="border-top:1px solid #37449a"> </div>
+ <p style="margin-top:10px;margin-bottom:20px;">If you want to unsubscribe please click <a href="<{$unsubscribe_link}>" target="_blank">here</a></p>
+ </div>
+</div>
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/templates/xoops.tpl
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/templates/xoops.tpl 2014-06-01 22:19:51 UTC (rev 12556)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/templates/xoops.tpl 2014-06-02 04:11:11 UTC (rev 12557)
@@ -1,6 +1,6 @@
<div class="xn_letter" style="width:100%">
- <div class="letter_header" style="background-image: url(<{$xoops_url}>/modules/xNewsletter/images/letter_template/xoops-bg.png); background-repeat: repeat-x; height: 80px; width:100%">
- <div style="background-image: url(<{$xoops_url}>/modules/xNewsletter/images/letter_template/xoops-logo.png); background-repeat: no-repeat; height: 80px;" > </div>
+ <div class="letter_header" style="background-image: url(<{$xoops_url}>/modules/xNewsletter/assets/images/letter_template/xoops-bg.png); background-repeat: repeat-x; height: 80px; width:100%">
+ <div style="background-image: url(<{$xoops_url}>/modules/xNewsletter/assets/images/letter_template/xoops-logo.png); background-repeat: no-repeat; height: 80px;" > </div>
</div>
<div class="letter-body" style="width: 100%;font-family: Arial,Helvetica,sans-serif; font-size: 11px; margin-top: 30px;">
Dear <{$sex}> <{$firstname}> <{$lastname}><br>
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/subscription.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/subscription.php 2014-06-01 22:19:51 UTC (rev 12556)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/subscription.php 2014-06-02 04:11:11 UTC (rev 12557)
@@ -598,25 +598,33 @@
$isValid = false;
if ($activationKey) {
$activationKey_array = explode('||', base64_decode($activationKey));
- if ($activationKey_array[0] == XOOPS_URL) {
- // from here
- if ((int) $activationKey_array[1] > 0) {
- // user is ok
- if (trim($activationKey_array[2]) != '')
- // code ok
- $isValid = true;
- }
- }
- if ($isValid) {
- $subscr_id = (int) $activationKey_array[1];
- $code = trim($activationKey_array[2]);
- $subscr_email = trim($activationKey_array[3]);
- }
+ $subscr_id = (int) $activationKey_array[1];
+ $subscr_actkey = trim($activationKey_array[2]);
+ $subscr_email = trim($activationKey_array[3]);
+ // check activation key
+ if (($activationKey_array[0] == XOOPS_URL) && ((int) $activationKey_array[1] > 0) && (trim($activationKey_array[2]) != ''))
+ $isValid = true;
} elseif ($allowedWithoutActivationKey) {
$isValid = true;
+ } else {
+ $isValid = false;
}
if ($isValid) {
+ $criteria_subscr = new CriteriaCompo();
+ $criteria_subscr->add(new Criteria('subscr_email', $subscr_email));
+ $criteria_subscr->add(new Criteria('subscr_id', $subscr_id));
+ if ($activationKey)
+ $criteria_subscr->add(new Criteria('subscr_actkey', $subscr_actkey));
+ $criteria_subscr->setLimit(1);
+ $subscrCount = $xnewsletter->getHandler('xNewsletter_subscr')->getCount($criteria_subscr);
+
+ if ($subscrCount != 1) {
+ redirect_header($currentFile, 2, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR);
+ }
+
+ $subscrObj = $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
+/*
$sql = "SELECT subscr_id";
$sql.= " FROM {$xoopsDB->prefix("mod_xnewsletter_subscr")}";
$sql.= " WHERE (subscr_email='{$subscr_email}' AND subscr_id={$subscr_id}";
@@ -631,19 +639,17 @@
if ($subscr_id != $subscr_id_test) {
redirect_header($currentFile, 2, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR);
}
- $subscrObj =& $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
-
+ $subscrObj = $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
+*/
// delete subscriber
- if (!$xnewsletter->getHandler('xNewsletter_subscr')->delete($subscrObj,true)) {
+ if (!$xnewsletter->getHandler('xNewsletter_subscr')->delete($subscrObj, true)) {
$actionProts_error = $subscrObj->getHtmlErrors() . "<br/><br/><br/>";
$count_err++;
}
-
//delete subscription
$criteria_catsubscr = new CriteriaCompo();
$criteria_catsubscr->add(new Criteria('catsubscr_subscrid', $subscr_id));
$catsubscrCount = $xnewsletter->getHandler('xNewsletter_catsubscr')->getCount($criteria_catsubscr);
-
if ($catsubscrCount > 0) {
$catsubscrObjs = $xnewsletter->getHandler('xNewsletter_catsubscr')->getall($criteria_catsubscr);
foreach (array_keys($catsubscrObjs) as $cat) {
@@ -678,8 +684,9 @@
redirect_header('subscr.php', 3, implode(',', $GLOBALS['xoopsSecurity']->getErrors()));
}
- $subscrObj =& $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
- $subscrObj->setVar('subscr_actkey', xoops_makepass());
+ $subscrObj = $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
+ $subscr_actkey = xoops_makepass();
+ $subscrObj->setVar('subscr_actkey', $subscr_actkey);
if (!$xnewsletter->getHandler('xNewsletter_subscr')->insert($subscrObj)) {
redirect_header($currentFile, 2, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR);
}
@@ -706,10 +713,10 @@
redirect_header($currentFile, 10, _MA_XNEWSLETTER_SUBSCRIPTION_ERROR . "<br />" . $xoopsMailer->getErrors());
}
}
- redirect_header($currentFile, 3, _MA_XNEWSLETTER_SENDMAIL_UNREG_OK);
+ redirect_header('index.php', 3, _MA_XNEWSLETTER_SENDMAIL_UNREG_OK);
}
} else {
- $subscrObj =& $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
+ $subscrObj = $xnewsletter->getHandler('xNewsletter_subscr')->get($subscr_id);
xoops_confirm(array('ok' => true, 'subscr_id' => $subscr_id, 'subscr_email' => $subscr_email, 'op' => 'delete_subscription'), $currentFile, sprintf(_MA_XNEWSLETTER_SUBSCRIPTION_DELETE_SURE));
}
break;
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_index.tpl
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_index.tpl 2014-06-01 22:19:51 UTC (rev 12556)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_index.tpl 2014-06-02 04:11:11 UTC (rev 12557)
@@ -1,5 +1,5 @@
-<{include file="db:xnewsletter_header.html"}>
+<{include file="db:xNewsletter_header.tpl"}>
<div class="outer">
<div><{$welcome_message}></div>
</div>
-<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
+<{include file="db:xNewsletter_footer.tpl"}>
\ No newline at end of file
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_index_list_letters.tpl
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_index_list_letters.tpl 2014-06-01 22:19:51 UTC (rev 12556)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_index_list_letters.tpl 2014-06-02 04:11:11 UTC (rev 12557)
@@ -1,4 +1,4 @@
-<{include file="db:xnewsletter_header.html"}>
+<{include file="db:xNewsletter_header.tpl"}>
<div class="outer">
<table cellpadding="0" cellspacing="0" class="item" width="100%">
<tr class="itemHead">
@@ -33,4 +33,4 @@
<{/foreach}>
</table>
</div>
-<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
+<{include file="db:xNewsletter_footer.tpl"}>
\ No newline at end of file
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter.tpl
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter.tpl 2014-06-01 22:19:51 UTC (rev 12556)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter.tpl 2014-06-02 04:11:11 UTC (rev 12557)
@@ -1,5 +1,5 @@
-<{include file="db:xnewsletter_header.html"}>
+<{include file="db:xNewsletter_header.tpl"}>
<div class="outer">
<{$content}>
</div>
-<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
+<{include file="db:xNewsletter_footer.tpl"}>
\ No newline at end of file
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter_list_letters.tpl
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter_list_letters.tpl 2014-06-01 22:19:51 UTC (rev 12556)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter_list_letters.tpl 2014-06-02 04:11:11 UTC (rev 12557)
@@ -1,4 +1,4 @@
-<{include file="db:xnewsletter_header.html"}>
+<{include file="db:xNewsletter_header.tpl"}>
<div class="outer">
<table class='outer width100' cellspacing='1'>
<tr>
@@ -95,4 +95,4 @@
<div class='center'><{$pagenav}></div>
<br />
</div>
-<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
+<{include file="db:xNewsletter_footer.tpl"}>
\ No newline at end of file
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter_list_subscrs.tpl
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter_list_subscrs.tpl 2014-06-01 22:19:51 UTC (rev 12556)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter_list_subscrs.tpl 2014-06-02 04:11:11 UTC (rev 12557)
@@ -1,4 +1,4 @@
-<{include file="db:xnewsletter_header.html"}>
+<{include file="db:xNewsletter_header.tpl"}>
<div class="outer">
<{$searchSubscriberForm}>
<br />
@@ -68,4 +68,4 @@
<br />
<{/if}>
</div>
-<{include file="db:xnewsletter_footer.html"}>
\ No newline at end of file
+<{include file="db:xNewsletter_footer.tpl"}>
\ No newline at end of file
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter_preview.tpl
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter_preview.tpl 2014-06-01 22:19:51 UTC (rev 12556)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_letter_preview.tpl 2014-06-02 04:11:11 UTC (rev 12557)
@@ -1,4 +1,4 @@
-<{include file="db:xnewsletter_header.html"}>
+<{inc...
[truncated message content] |
|
From: <be...@us...> - 2014-06-02 08:10:45
|
Revision: 12559
http://sourceforge.net/p/xoops/svn/12559
Author: beckmi
Date: 2014-06-02 08:10:39 +0000 (Mon, 02 Jun 2014)
Log Message:
-----------
reversed "mod_" prefix on tables, normalized prefixes for language constants to XNEWSLETTER (needed for cloning)
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/accounts.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/admin_header.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/import.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/maintenance.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/protocol.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/subscr.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/docs/changelog.txt
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/common.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/config.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/constants.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/functions.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/html2text/epl-v10.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/html2text/html2text.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/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/admin.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/help/help.html
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/sql/mysql.sql
XoopsModules/xnewsletter/branches/mamba/xNewsletter/subscription.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/xoops_version.php
Added Paths:
-----------
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_search.png
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/accounts.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/accounts.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -56,11 +56,11 @@
$mailhost = $accountObj->getVar("accounts_server_in");
$port = $accountObj->getVar("accounts_port_in");
switch ($accountObj->getVar("accounts_type")) {
- case _AM_ACCOUNTS_TYPE_VAL_POP3:
+ case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3:
$service = "pop3";
break;
- case _AM_ACCOUNTS_TYPE_VAL_SMTP:
- case _AM_ACCOUNTS_TYPE_VAL_GMAIL:
+ case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_SMTP:
+ case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_GMAIL:
$service = "imap";
break;
case "default":
@@ -75,42 +75,42 @@
$accounts_hardbox = $accountObj->getVar("accounts_hardbox"); $accounts_hardbox_ok = 0;
$accounts_softbox = $accountObj->getVar("accounts_softbox"); $accounts_softbox_ok = 0;
- $command = $mailhost . ":" . $port;
+ $command = $mailhost.":".$port;
if ($service !='') $command .= '/' . $service;
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>
+ <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) {
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>";
- echo "<td class='left'>" . imap_last_error() . "</td>";
+ echo "<td class='center width5'>".$img_failed."</td>";
+ echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED."</td>";
+ echo "<td class='left'>".imap_last_error()."</td>";
echo "</tr>";
} else {
echo "<tr>";
- echo "<td class='center width5'>" . $img_ok . "</td>";
- echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . "</td>";
+ echo "<td class='center width5'>".$img_ok."</td>";
+ echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK."</td>";
echo "<td class='left'></td>";
echo "</tr>";
$folders = imap_listmailbox($mbox, "{".$command."}", "*");
if ($folders == false) {
echo "<tr>";
- echo "<td class='center width5'>" . $img_failed . "</td>";
- echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . "</td>";
- echo "<td class='left'>" . imap_last_error() . "</td>";
+ echo "<td class='center width5'>".$img_failed."</td>";
+ echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED."</td>";
+ echo "<td class='left'>".imap_last_error()."</td>";
echo "</tr>";
} else {
echo "<tr>";
- echo "<td class='center width5'>" . $img_ok . "</td>";
- echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . "</td>";
+ echo "<td class='center width5'>".$img_ok."</td>";
+ echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK."</td>";
echo "<td class='left'>";
if (is_array($folders)) {
reset ($folders);
@@ -118,15 +118,15 @@
$foldercreated = 0;
while (list( $key, $val) = each ($folders)) {
echo "($key) ";
- echo imap_utf7_decode (str_replace("{" . $command . "}", "", $val)) . "<br>\n";
- if ("{" . $command . "}" . $accounts_inbox == $val) $accounts_inbox_ok = 1;
- if ("{" . $command . "}" . $accounts_hardbox == $val) {
+ echo imap_utf7_decode (str_replace("{".$command."}","",$val)) . "<br>\n";
+ if ("{".$command."}".$accounts_inbox == $val) $accounts_inbox_ok = 1;
+ if ("{".$command."}".$accounts_hardbox == $val) {
$accounts_hardbox_ok = 1;
} else {
- @imap_createmailbox($mbox, imap_utf7_encode('{' .$command . '}' . $accounts_hardbox));
+ @imap_createmailbox($mbox, imap_utf7_encode('{'.$command.'}' . $accounts_hardbox));
$foldercreated = 1;
}
- if ("{" . $command . "}" . $accounts_softbox == $val) {
+ if ("{".$command."}".$accounts_softbox == $val) {
$accounts_softbox_ok = 1;
} else {
@imap_createmailbox($mbox, imap_utf7_encode('{' . $command . '}' . $accounts_softbox));
@@ -136,8 +136,8 @@
if ($foldercreated == 1) {
$folders_recheck = imap_listmailbox($mbox, "{" . $command . "}", "*");
while (list( $key, $val) = each ($folders_recheck)) {
- if ("{" . $command . "}" . $accounts_hardbox == $val) $accounts_hardbox_ok = 1;
- if ("{" . $command . "}" . $accounts_softbox == $val) $accounts_softbox_ok = 1;
+ if ("{".$command."}".$accounts_hardbox == $val) $accounts_hardbox_ok = 1;
+ if ("{".$command."}".$accounts_softbox == $val) $accounts_softbox_ok = 1;
}
}
}
@@ -160,7 +160,7 @@
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . $img_failed;
}
echo "<br />";
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX . " ";
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX." ";
if ($accounts_hardbox_ok == 1) {
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . $img_ok;
} else {
@@ -214,39 +214,39 @@
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>
+ <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 . "'>";
+ echo "<tr class='".$class."'>";
$class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>" . $i . "</td>";
+ 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>";
+ _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL=>_AM_XNEWSLETTER_ACCOUNTS_TYPE_PHPMAIL,
+ _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL=>_AM_XNEWSLETTER_ACCOUNTS_TYPE_PHPSENDMAIL,
+ _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3=>_AM_XNEWSLETTER_ACCOUNTS_TYPE_POP3,
+ _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_SMTP=>_AM_XNEWSLETTER_ACCOUNTS_TYPE_SMTP,
+ _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_GMAIL=>_AM_XNEWSLETTER_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 " <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_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL && $accounts_arr[$i]->getVar("accounts_type") != _AM_XNEWSLETTER_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_XNEWSLETTER_ACCOUNTS_TYPE_CHECK."' title='"._AM_XNEWSLETTER_ACCOUNTS_TYPE_CHECK."' /></a>";
}
echo "</td>";
echo "</tr>";
@@ -304,8 +304,8 @@
global $xoopsDB;
$verif_accounts_default = "1";
//reset old accounts_default
- $sql = "UPDATE `{$xoopsDB->prefix("mod_xnewsletter_accounts")}` SET `accounts_default` = '0'";
- $result= $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
+ $sql = "UPDATE `{$xoopsDB->prefix("xnewsletter_accounts")}` SET `accounts_default` = '0'";
+ $result= $xoopsDB->query($sql) || die ("MySQL-Error: " . mysql_error());
} else {
$verif_accounts_default = "0";
}
@@ -313,7 +313,7 @@
$verif_accounts_default = "1";
}
$accountObj->setVar("accounts_default", $verif_accounts_default);
- if ($accountObj->getVar("accounts_yourmail") != "" && $accountObj->getVar("accounts_yourmail") != _AM_ACCOUNTS_TYPE_YOUREMAIL ) {
+ if ($accountObj->getVar("accounts_yourmail") != "" && $accountObj->getVar("accounts_yourmail") != _AM_XNEWSLETTER_ACCOUNTS_TYPE_YOUREMAIL ) {
if ($xnewsletter->getHandler('xNewsletter_accounts')->insert($accountObj)) {
if ($save_and_check == 'none') {
redirect_header("accounts.php?op=list", 2, _AM_XNEWSLETTER_FORMOK);
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/admin_header.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/admin_header.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/admin_header.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -58,7 +58,7 @@
exit();
}
-//$pathIcon = XOOPS_URL . "/modules/" . $dirname . "/images/icons";
+//$pathIcon = XOOPS_URL . "/modules/" . $dirname . "/assets/images/icons";
$indexAdmin = new ModuleAdmin();
$myts = MyTextSanitizer::getInstance();
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -46,7 +46,7 @@
$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 = "SELECT subscr_id FROM " . $xoopsDB->prefix("xnewsletter_subscr") . " WHERE (";
$sql .= "subscr_email='" . $bmh_email . "'";
$sql .= ") LIMIT 1;";
if ( $user = $xoopsDB->query($sql) ) {
@@ -55,8 +55,8 @@
}
if ($subscr_id == 0) {
//set bmh_measure for all entries in bmh with this email
- $sql_upd_measure = "UPDATE ".$xoopsDB->prefix("mod_xnewsletter_bmh")." SET `bmh_measure` = '"._AM_XNEWSLETTER_BMH_MEASURE_VAL_NOTHING."'";
- $sql_upd_measure .=" WHERE ((`".$xoopsDB->prefix("mod_xnewsletter_bmh")."`.`bmh_email` ='".$bmh_email."') AND (`".$xoopsDB->prefix("mod_xnewsletter_bmh")."`.`bmh_measure` ='0'))";
+ $sql_upd_measure = "UPDATE ".$xoopsDB->prefix("xnewsletter_bmh")." SET `bmh_measure` = '"._AM_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("bmh.php?op=list", 5, _AM_XNEWSLETTER_BMH_ERROR_NO_SUBSCRID);
}
@@ -65,7 +65,7 @@
// delete subscriber
if (!$xnewsletter->getHandler('xNewsletter_subscr')->delete($obj_subscr,true)) {
$actionprot_err = $obj_subscr->getHtmlErrors()."<br/><br/><br/>";
- $count_err++;
+ ++$count_err;
}
//delete subscription
@@ -87,7 +87,7 @@
}
} else {
$actionprot_err .= $obj_catsubscr->getHtmlErrors();
- $count_err++;
+ ++$count_err;
}
}
}
@@ -115,19 +115,19 @@
$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 = "UPDATE `".$xoopsDB->prefix("xnewsletter_subscr")."` INNER JOIN `";
+ $sql .= $xoopsDB->prefix("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());
+ $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("mod_xnewsletter_bmh")." SET ";
+ $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("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());
+ $sql_upd .=" WHERE ((`".$xoopsDB->prefix("xnewsletter_bmh")."`.`bmh_email` ='".$bmh_email."') AND (`".$xoopsDB->prefix("xnewsletter_bmh")."`.`bmh_measure` ='0'))";
+ $result= $xoopsDB->queryF($sql_upd) || die ("MySQL-Error: " . mysql_error());
redirect_header("bmh.php?op=list&filter=".$filter, 3, _AM_XNEWSLETTER_FORMOK);
@@ -172,7 +172,7 @@
$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) {
+ if ($accounts_arr[$acc]->getVar("accounts_type") == _AM_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'
@@ -397,6 +397,9 @@
}
include "admin_footer.php";
+/**
+ * @return float
+ */
function microtime_float() {
list($usec, $sec) = explode(" ", microtime());
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh_callback_database.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh_callback_database.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh_callback_database.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -20,6 +20,19 @@
require_once "admin_header.php";
+/**
+ * @param $msgnum
+ * @param $bounce_type
+ * @param $email
+ * @param $subject
+ * @param $xheader
+ * @param $remove
+ * @param bool $rule_no
+ * @param bool $rule_cat
+ * @param int $totalFetched
+ *
+ * @return bool
+ */
function callbackAction ($msgnum, $bounce_type, $email, $subject, $xheader, $remove, $rule_no = false, $rule_cat = false, $totalFetched = 0) {
global $xoopsUser;
$xnewsletter = xNewsletterxNewsletter::getInstance();
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/import.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/import.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -104,7 +104,7 @@
$cat_arr=$xnewsletter->getHandler('xNewsletter_cat')->getall($criteria);
foreach (array_keys($import_arr) as $i) {
- $counter++;
+ ++$counter;
$form .= "<tr class=\"" . $class . "\">";
$class = ($class == "even") ? "odd" : "even";
$form .= "<td align=\"center\">".$counter;
@@ -194,10 +194,10 @@
break;
case "apply_import_form":
- //update mod_xnewsletter with settings form_import
+ //update xnewsletter with settings form_import
$counter = xNewsletter_CleanVars($_REQUEST, 'counter', 0, 'int');
- for ($i=1; $i < ($counter + 1); $i++) {
+ for ($i=1; $i < ($counter + 1); ++$i) {
$import_id = xNewsletter_CleanVars($_REQUEST, 'import_id_'.$i, 'default', 'string');
$subscr_firstname = xNewsletter_CleanVars($_REQUEST, 'firstname_'.$i, '', 'string');
$subscr_lastname = xNewsletter_CleanVars($_REQUEST, 'lastname_'.$i, '', 'string');
@@ -207,14 +207,14 @@
if ($cat_id > 0) {
if ($subscr_id == 0) {
//update sex, firstname, lastname
- $sql = "UPDATE {$xoopsDB->prefix('mod_xnewsletter_import')}";
+ $sql = "UPDATE {$xoopsDB->prefix('xnewsletter_import')}";
$sql .= " SET `import_sex`='{$subscr_sex}', `import_firstname`='{$subscr_firstname}', `import_lastname`='{$subscr_lastname}'";
$sql .= " WHERE `import_id`={$import_id}";
$result=$xoopsDB->queryF($sql);
}
}
//update cat_id and import_status
- $sql = "UPDATE {$xoopsDB->prefix('mod_xnewsletter_import')}";
+ $sql = "UPDATE {$xoopsDB->prefix('xnewsletter_import')}";
$sql .= " SET `import_cat_id`='{$cat_id}', `import_status`=1";
$sql.= " WHERE `import_id`={$import_id}";
$result=$xoopsDB->queryF($sql);
@@ -224,8 +224,8 @@
break;
case "exec_import_final":
- //execute final import of all data from mod_xnewsletter_import, where import_status = 1
- //delete data from mod_xnewsletter_import, when imported (successful or not)
+ //execute final import of all data from xnewsletter_import, where import_status = 1
+ //delete data from xnewsletter_import, when imported (successful or not)
$indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, $currentFile, 'list');
echo $indexAdmin->renderButton();
@@ -238,11 +238,11 @@
$numrows_act = $xnewsletter->getHandler('xNewsletter_import')->getCount($import_criteria);
if ($numrows_act > 0) {
$sql = "SELECT *";
- $sql .= " FROM {$xoopsDB->prefix("mod_xnewsletter_import")}";
+ $sql .= " FROM {$xoopsDB->prefix("xnewsletter_import")}";
$sql .= " WHERE ((import_status)=1)";
$sql .= " ORDER BY `import_id` ASC";
$counter = 0;
- $users_import = $xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
+ $users_import = $xoopsDB->queryF($sql) || die ("MySQL-Error: " . mysql_error());
while ($user_import = mysql_fetch_assoc($users_import)) {
$import_id = $user_import["import_id"];
$subscr_email = $user_import["import_email"];
@@ -271,7 +271,7 @@
unset($user);
$sql = "INSERT";
- $sql .= " INTO `{$xoopsDB->prefix('mod_xnewsletter_subscr')}`";
+ $sql .= " INTO `{$xoopsDB->prefix('xnewsletter_subscr')}`";
$sql .= " (`subscr_email`, `subscr_firstname`, `subscr_lastname`, `subscr_uid`, `subscr_sex`, `subscr_submitter`, `subscr_created`, `subscr_ip`, `subscr_activated`, `subscr_actoptions`)";
$sql .= " VALUES ('{$subscr_email}', '{$subscr_firstname}', '{$subscr_lastname}', " . intval($subscr_uid) . ", '{$subscr_sex}', {$submitter}, " . time() . ",'{$ip}', '1', '')";
if (!$xoopsDB->queryF($sql)) {
@@ -291,7 +291,7 @@
if ($catsubscr_id==0) {
//add subscription of this email
$sql = "INSERT";
- $sql .= " INTO `{$xoopsDB->prefix('mod_xnewsletter_catsubscr')}`";
+ $sql .= " INTO `{$xoopsDB->prefix('...
[truncated message content] |
Thanks for helping keep SourceForge clean.
X