Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12454] XoopsModules/xnewsletter/branches/luciorota/ xNewsletter
|
From: <luc...@us...> - 2014-04-16 16:33:03
|
Revision: 12454
http://sourceforge.net/p/xoops/svn/12454
Author: luciorota
Date: 2014-04-16 16:32:59 +0000 (Wed, 16 Apr 2014)
Log Message:
-----------
delete wrong files
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh_callback_database.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/index.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/menu.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/sendletter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_import.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/class/xNewsletter_letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/footer.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/header.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/include/task.inc.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/index.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/letter.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/csv.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/evennews.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/rmbulletin.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/smartpartner.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/subscribers.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/weblinks.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/plugins/xoopsuser.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/print.php
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/xoops_version.php
Removed Paths:
-------------
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_day.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_catsubscr_block_recent.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_day.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_random.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_letter_block_recent.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/blocks/xnewsletter_subscrinfo_block.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_footer.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_header.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xNewsletter_index.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_common_breadcrumb.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_index_list_letters.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_letters.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_list_subscrs.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_letter_preview.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_print.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_protocol.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_subscription.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_subscription_list_subscriptions.html
XoopsModules/xnewsletter/branches/luciorota/xNewsletter/templates/xnewsletter_subscription_result.html
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php 2014-04-16 16:22:45 UTC (rev 12453)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/accounts.php 2014-04-16 16:32:59 UTC (rev 12454)
@@ -31,179 +31,187 @@
//global $indexAdmin;
// We recovered the value of the argument op in the URL$
-$op = xNewsletter_CleanVars($_REQUEST, 'op', 'list', 'string');
+$op = xNewsletter_CleanVars($_REQUEST, 'op', 'list', 'string');
$save_and_check = xNewsletter_CleanVars($_REQUEST, 'save_and_check', 'none', 'string');
-$accounts_id = xNewsletter_CleanVars($_REQUEST, 'accounts_id', 0, 'int');
-$post = xNewsletter_CleanVars($_REQUEST, 'post', '', 'string');
+$accounts_id = xNewsletter_CleanVars($_REQUEST, 'accounts_id', 0, 'int');
+$post = xNewsletter_CleanVars($_REQUEST, 'post', '', 'string');
-if ( $post == "" && $op == "save_accounts" && $save_and_check =="none" ) $op = "edit_account";
+if ($post == "" && $op == "save_accounts" && $save_and_check =="none" ) $op = "edit_account";
-switch ($op)
-{
- case "check_account":
-
- $img_ok = "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_ok.png' alt='" . _AM_XNEWSLETTER_OK . "' title='"._AM_XNEWSLETTER_OK . "' /> ";
- $img_failed = "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_failed.png' alt='" . _AM_XNEWSLETTER_FAILED . "' title='" . _AM_XNEWSLETTER_FAILED . "' /> ";
+switch ($op) {
+ case "check_account" :
+ $img_ok = "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_ok.png' alt='" . _AM_XNEWSLETTER_OK . "' title='"._AM_XNEWSLETTER_OK . "' /> ";
+ $img_failed = "<img src='" . XNEWSLETTER_ICONS_URL . "/xn_failed.png' alt='" . _AM_XNEWSLETTER_FAILED . "' title='" . _AM_XNEWSLETTER_FAILED . "' /> ";
- echo $indexAdmin->addNavigation("accounts.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
- echo $indexAdmin->renderButton();
-
- if ($accounts_id == 0) {
- redirect_header("accounts.php", 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
- } else {
- $obj_account =& $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
- }
-
- $mailhost = $obj_account->getVar("accounts_server_in");
- $port = $obj_account->getVar("accounts_port_in");
- switch ($obj_account->getVar("accounts_type")) {
- case _AM_ACCOUNTS_TYPE_VAL_POP3:
- $service = "pop3";
- break;
- case _AM_ACCOUNTS_TYPE_VAL_SMTP:
- case _AM_ACCOUNTS_TYPE_VAL_GMAIL:
- $service = "imap";
- break;
- case "default":
- default:
- $service = "";
- break;
- }
- $service_option = $obj_account->getVar("accounts_securetype_in");
- $accounts_password = $obj_account->getVar("accounts_password");
- $accounts_username = $obj_account->getVar("accounts_username");
- $accounts_inbox = $obj_account->getVar("accounts_inbox"); $accounts_inbox_ok = 0;
- $accounts_hardbox = $obj_account->getVar("accounts_hardbox"); $accounts_hardbox_ok = 0;
- $accounts_softbox = $obj_account->getVar("accounts_softbox"); $accounts_softbox_ok = 0;
-
- $command = $mailhost.":".$port;
- if ($service !='') $command .= '/' . $service;
- if ($service_option !='') $command .= '/' . $service_option;
-
- echo "<table class='outer width100' cellspacing='1'>
+ echo $indexAdmin->addNavigation("accounts.php");
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
+ echo $indexAdmin->renderButton();
+
+ if ($accounts_id == 0) {
+ redirect_header("accounts.php", 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
+ } else {
+ $accountObj =& $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
+ }
+
+ $mailhost = $accountObj->getVar("accounts_server_in");
+ $port = $accountObj->getVar("accounts_port_in");
+ switch ($accountObj->getVar("accounts_type")) {
+ case _AM_ACCOUNTS_TYPE_VAL_POP3:
+ $service = "pop3";
+ break;
+ case _AM_ACCOUNTS_TYPE_VAL_SMTP:
+ case _AM_ACCOUNTS_TYPE_VAL_GMAIL:
+ $service = "imap";
+ break;
+ case "default":
+ default:
+ $service = "";
+ break;
+ }
+ $service_option = $accountObj->getVar("accounts_securetype_in");
+ $accounts_password = $accountObj->getVar("accounts_password");
+ $accounts_username = $accountObj->getVar("accounts_username");
+ $accounts_inbox = $accountObj->getVar("accounts_inbox"); $accounts_inbox_ok = 0;
+ $accounts_hardbox = $accountObj->getVar("accounts_hardbox"); $accounts_hardbox_ok = 0;
+ $accounts_softbox = $accountObj->getVar("accounts_softbox"); $accounts_softbox_ok = 0;
+
+ $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>
</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 "</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='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 "</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='left'>";
- if (is_array($folders)) {
- reset ($folders);
- sort($folders);
- $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) {
- $accounts_hardbox_ok = 1;
- } else {
- @imap_createmailbox($mbox, imap_utf7_encode('{'.$command.'}' . $accounts_hardbox));
- $foldercreated = 1;
- }
- if ("{".$command."}".$accounts_softbox == $val) {
- $accounts_softbox_ok = 1;
- } else {
- @imap_createmailbox($mbox, imap_utf7_encode('{'.$command.'}' . $accounts_softbox));
- $foldercreated = 1;
- }
- }
- 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;
- }
- }
- }
-
- echo "</td>";
- echo "</tr>";
- echo "<tr>";
- if ($obj_account->getVar("accounts_use_bmh") == '1') {
- if ($accounts_inbox_ok == 1 && $accounts_hardbox_ok == 1 && $accounts_softbox_ok == 1) {
- echo "<td class='center width5'>".$img_ok."</td>";
- } else {
- echo "<td class='center width5'>".$img_failed."</td>";
- }
- echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH."</td>";
- echo "<td class='left'>";
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_INBOX." ";
- if ($accounts_inbox_ok == 1) {echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK.$img_ok;} else {echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED.$img_failed;}
- echo "<br />";
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX." ";
- if ($accounts_hardbox_ok == 1) {echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK.$img_ok;} else {echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED.$img_failed;}
- echo "<br />";
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_SOFTBOX." ";
- if ($accounts_softbox_ok == 1) {echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK.$img_ok;} else {echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED.$img_failed;}
- echo "<br />";
- echo "</td>";
- } else {
- echo "<td class='center width5'>".$img_ok."</td>";
- echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH._AM_XNEWSLETTER_ACCOUNTS_CHECK_SKIPPED."</td>";
- echo "<td class='center'></td>";
- }
- echo "</tr>";
- }
- imap_close($mbox);
- }
+ $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 "</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='left'></td>";
+ echo "</tr>";
- echo "</table>";
- break;
+ $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 "</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='left'>";
+ if (is_array($folders)) {
+ reset ($folders);
+ sort ($folders);
+ $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) {
+ $accounts_hardbox_ok = 1;
+ } else {
+ @imap_createmailbox($mbox, imap_utf7_encode('{'.$command.'}' . $accounts_hardbox));
+ $foldercreated = 1;
+ }
+ if ("{".$command."}".$accounts_softbox == $val) {
+ $accounts_softbox_ok = 1;
+ } else {
+ @imap_createmailbox($mbox, imap_utf7_encode('{' . $command . '}' . $accounts_softbox));
+ $foldercreated = 1;
+ }
+ }
+ 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;
+ }
+ }
+ }
- case "list":
- default:
- echo $indexAdmin->addNavigation('accounts.php') ;
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, 'accounts.php?op=new_account', 'add');
- echo $indexAdmin->renderButton();
+ echo "</td>";
+ echo "</tr>";
+ echo "<tr>";
+ if ($accountObj->getVar("accounts_use_bmh") == '1') {
+ if ($accounts_inbox_ok == 1 && $accounts_hardbox_ok == 1 && $accounts_softbox_ok == 1) {
+ echo "<td class='center width5'>" . $img_ok . "</td>";
+ } else {
+ echo "<td class='center width5'>" . $img_failed . "</td>";
+ }
+ echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH . "</td>";
+ echo "<td class='left'>";
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_INBOX . " ";
+ if ($accounts_inbox_ok == 1) {
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . $img_ok;
+ } else {
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . $img_failed;
+ }
+ echo "<br />";
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX." ";
+ if ($accounts_hardbox_ok == 1) {
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . $img_ok;
+ } else {
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . $img_failed;
+ }
+ echo "<br />";
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_SOFTBOX . " ";
+ if ($accounts_softbox_ok == 1) {
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . $img_ok;
+ } else {
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . $img_failed;
+ }
+ echo "<br />";
+ echo "</td>";
+ } else {
+ echo "<td class='center width5'>" . $img_ok . "</td>";
+ echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH._AM_XNEWSLETTER_ACCOUNTS_CHECK_SKIPPED . "</td>";
+ echo "<td class='center'></td>";
+ }
+ echo "</tr>";
+ }
+ imap_close($mbox);
+ }
+ echo "</table>";
+ break;
- $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
- $criteria = new CriteriaCompo();
- $criteria->setSort("accounts_id ASC, accounts_type");
- $criteria->setOrder("ASC");
- $numrows = $xnewsletter->getHandler('xNewsletter_accounts')->getCount();
- $start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
- $criteria->setStart($start);
- $criteria->setLimit($limit);
- $accounts_arr = $xnewsletter->getHandler('xNewsletter_accounts')->getall($criteria);
- if ( $numrows > $limit ) {
- include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
+ case "list":
+ default:
+ echo $indexAdmin->addNavigation('accounts.php') ;
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, 'accounts.php?op=new_account', 'add');
+ echo $indexAdmin->renderButton();
+
+ $limit = $GLOBALS['xoopsModuleConfig']['adminperpage'];
+ $criteria = new CriteriaCompo();
+ $criteria->setSort("accounts_id ASC, accounts_type");
+ $criteria->setOrder("ASC");
+ $numrows = $xnewsletter->getHandler('xNewsletter_accounts')->getCount();
+ $start = xNewsletter_CleanVars ( $_REQUEST, 'start', 0, 'int' );
+ $criteria->setStart($start);
+ $criteria->setLimit($limit);
+ $accounts_arr = $xnewsletter->getHandler('xNewsletter_accounts')->getall($criteria);
+ if ( $numrows > $limit ) {
+ include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
$pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
} else {
$pagenav = '';
}
-
- // View Table
- if ($numrows > 0)
- {
+
+ // View Table
+ if ($numrows > 0) {
echo "<table class='outer width100' cellspacing='1'>
<tr>
<th class='center width2'>"._AM_XNEWSLETTER_ACCOUNTS_ID."</th>
@@ -215,10 +223,9 @@
<th class='center width10'>"._AM_XNEWSLETTER_FORMACTION."</th>
</tr>";
- $class = "odd";
-
- foreach (array_keys($accounts_arr) as $i)
- {
+ $class = "odd";
+
+ foreach (array_keys($accounts_arr) as $i) {
echo "<tr class='".$class."'>";
$class = ($class == "even") ? "odd" : "even";
echo "<td class='center'>".$i."</td>";
@@ -229,11 +236,11 @@
_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_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'>".$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>";
@@ -242,13 +249,13 @@
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>
+ 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>
@@ -265,89 +272,91 @@
<th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_DEFAULT."</th>
<th class='center width10'>"._AM_XNEWSLETTER_FORMACTION."</th>
</tr>";
- echo "</table><br /><br />";
- }
-
- break;
+ echo "</table><br /><br />";
+ }
- case "new_account":
- echo $indexAdmin->addNavigation("accounts.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
- echo $indexAdmin->renderButton();
- $obj = $xnewsletter->getHandler('xNewsletter_accounts')->create();
- $obj = xNewsletter_setPost($obj,$_POST);
- $form = $obj->getForm();
- $form->display();
- break;
-
- case "save_accounts":
- if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("accounts.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
- }
-
- $obj =& $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
- $_POST['accounts_id'] = $accounts_id;
- $obj = xNewsletter_setPost($obj,$_POST);
-
- $criteria = new CriteriaCompo();
- $criteria->add(new Criteria("accounts_default", 1));
- $count_accounts_default = $xnewsletter->getHandler('xNewsletter_accounts')->getCount($criteria);
- if ($count_accounts_default > 0) {
- if ($obj->getVar("accounts_default") == 1) {
- global $xoopsDB;
- $verif_accounts_default = "1";
- //reset old accounts_default
- $sql = "UPDATE `{$xoopsDB->prefix("mod_xnewsletter_accounts")}` SET `accounts_default` = '0'";
- $result= $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
- } else {
- $verif_accounts_default = "0";
- }
- } else {
- $verif_accounts_default = "1";
- }
- $obj->setVar("accounts_default", $verif_accounts_default);
- if ($obj->getVar("accounts_yourmail") != "" && $obj->getVar("accounts_yourmail") != _AM_ACCOUNTS_TYPE_YOUREMAIL ) {
- if ($xnewsletter->getHandler('xNewsletter_accounts')->insert($obj)) {
- if ($save_and_check == 'none') {
- redirect_header("accounts.php?op=list", 2, _AM_XNEWSLETTER_FORMOK);
- } else {
- redirect_header("accounts.php?op=check_account&accounts_id=".$obj->getVar("accounts_id"), 2, _AM_XNEWSLETTER_FORMOK);
- }
- }
- } else {
- $obj->setErrors(_MA_XNEWSLETTER_SUBSCRIPTION_ERROR_NOEMAIL);
- }
+ break;
- echo $obj->getHtmlErrors();
- $form =& $obj->getForm();
- $form->display();
- break;
-
- case "edit_account":
- echo $indexAdmin->addNavigation("accounts.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, 'accounts.php?op=new_account', 'add');
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
- echo $indexAdmin->renderButton();
- $obj = $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
- if ( !empty($_POST) ) xNewsletter_setPost($obj,$_POST);
- $form = $obj->getForm();
- $form->display();
+ case "new_account":
+ echo $indexAdmin->addNavigation("accounts.php");
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
+ echo $indexAdmin->renderButton();
+ $accountObj = $xnewsletter->getHandler('xNewsletter_accounts')->create();
+ $accountObj = xNewsletter_setPost($accountObj, $_POST);
+ $form = $accountObj->getForm();
+ $form->display();
+ break;
+
+ case "save_accounts":
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("accounts.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+
+ $accountObj =& $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
+ $_POST['accounts_id'] = $accounts_id;
+ $accountObj = xNewsletter_setPost($accountObj, $_POST);
+
+ $criteria = new CriteriaCompo();
+ $criteria->add(new Criteria("accounts_default", 1));
+ $count_accounts_default = $xnewsletter->getHandler('xNewsletter_accounts')->getCount($criteria);
+ if ($count_accounts_default > 0) {
+ if ($accountObj->getVar("accounts_default") == 1) {
+ global $xoopsDB;
+ $verif_accounts_default = "1";
+ //reset old accounts_default
+ $sql = "UPDATE `{$xoopsDB->prefix("mod_xnewsletter_accounts")}` SET `accounts_default` = '0'";
+ $result= $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
+ } else {
+ $verif_accounts_default = "0";
+ }
+ } else {
+ $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 ($xnewsletter->getHandler('xNewsletter_accounts')->insert($accountObj)) {
+ if ($save_and_check == 'none') {
+ redirect_header("accounts.php?op=list", 2, _AM_XNEWSLETTER_FORMOK);
+ } else {
+ redirect_header("accounts.php?op=check_account&accounts_id={$accountObj->getVar("accounts_id")}", 2, _AM_XNEWSLETTER_FORMOK);
+ }
+ }
+ } else {
+ $accountObj->setErrors(_MA_XNEWSLETTER_SUBSCRIPTION_ERROR_NOEMAIL);
+ }
+
+ echo $obj->getHtmlErrors();
+ $form = $accountObj->getForm();
+ $form->display();
+ break;
+
+ case "edit_account":
+ echo $indexAdmin->addNavigation("accounts.php");
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, 'accounts.php?op=new_account', 'add');
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
+ echo $indexAdmin->renderButton();
+ $accountObj = $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
+ if (!empty($_POST)) {
+ xNewsletter_setPost($accountObj, $_POST);
+ }
+ $form = $accountObj->getForm();
+ $form->display();
break;
-
- case "delete_account":
- $obj = $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
- if (isset($_POST["ok"]) && $_POST["ok"] == "1") {
- if ( !$GLOBALS["xoopsSecurity"]->check() ) {
- redirect_header("accounts.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
- }
- if ($xnewsletter->getHandler('xNewsletter_accounts')->delete($obj)) {
- redirect_header("accounts.php", 3, _AM_XNEWSLETTER_FORMDELOK);
- } else {
- echo $obj->getHtmlErrors();
- }
- } else {
- xoops_confirm(array("ok" => 1, "accounts_id" => $accounts_id, "op" => "delete_account"), "accounts.php", sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $obj->getVar("accounts_name")));
- }
- break;
+
+ case "delete_account":
+ $accountObj = $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
+ if (isset($_POST["ok"]) && $_POST["ok"] == "1") {
+ if ( !$GLOBALS["xoopsSecurity"]->check() ) {
+ redirect_header("accounts.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
+ }
+ if ($xnewsletter->getHandler('xNewsletter_accounts')->delete($accountObj)) {
+ redirect_header("accounts.php", 3, _AM_XNEWSLETTER_FORMDELOK);
+ } else {
+ echo $accountObj->getHtmlErrors();
+ }
+ } else {
+ xoops_confirm(array("ok" => 1, "accounts_id" => $accounts_id, "op" => "delete_account"), "accounts.php", sprintf(_AM_XNEWSLETTER_FORMSUREDEL, $accountObj->getVar("accounts_name")));
+ }
+ break;
}
include "admin_footer.php";
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh_callback_database.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh_callback_database.php 2014-04-16 16:22:45 UTC (rev 12453)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/bmh_callback_database.php 2014-04-16 16:32:59 UTC (rev 12454)
@@ -21,34 +21,33 @@
require_once "admin_header.php";
function callbackAction ($msgnum, $bounce_type, $email, $subject, $xheader, $remove, $rule_no = false, $rule_cat = false, $totalFetched = 0) {
+ global $xoopsUser;
+ $xnewsletter = xNewsletterxNewsletter::getInstance();
+
if ($rule_no != "0000") {
- global $xoopsUser;
- $xnewsletter->getHandler('xNewsletter_bmh')=& xoops_getModuleHandler('xNewsletter_bmh', 'xNewsletter');
-
- $obj =& $xnewsletter->getHandler('xNewsletter_bmh')->create();
-
+ $bmhObj = $xnewsletter->getHandler('xNewsletter_bmh')->create();
//Form bmh_rule_no
- $obj->setVar("bmh_rule_no", $rule_no);
+ $bmhObj->setVar("bmh_rule_no", $rule_no);
//Form bmh_rule_cat
- $obj->setVar("bmh_rule_cat", $rule_cat);
+ $bmhObj->setVar("bmh_rule_cat", $rule_cat);
//Form bmh_bouncetype
- $obj->setVar("bmh_bouncetype", $bounce_type);
+ $bmhObj->setVar("bmh_bouncetype", $bounce_type);
//Form bmh_remove
//$verif_bmh_remove = ($remove == true || $remove == '1') ? "1" : "0";
- $obj->setVar("bmh_remove", $remove);
+ $bmhObj->setVar("bmh_remove", $remove);
//Form bmh_email
- $obj->setVar("bmh_email", $email);
+ $bmhObj->setVar("bmh_email", $email);
//Form bmh_subject
- $obj->setVar("bmh_subject", $subject);
+ $bmhObj->setVar("bmh_subject", $subject);
//Form bmh_measure
- $obj->setVar("bmh_measure", "0");
+ $bmhObj->setVar("bmh_measure", "0");
//Form bmh_submitter
- $obj->setVar("bmh_submitter", $xoopsUser->uid());
+ $bmhObj->setVar("bmh_submitter", $xoopsUser->uid());
//Form bmh_created
- $obj->setVar("bmh_created", time());
+ $bmhObj->setVar("bmh_created", time());
- if (!$xnewsletter->getHandler('xNewsletter_bmh')->insert($obj)) {
- echo $obj->getHtmlErrors();
+ if (!$xnewsletter->getHandler('xNewsletter_bmh')->insert($bmhObj)) {
+ echo $bmhObj->getHtmlErrors();
return false;
}
//echo $msgnum . ': ' . $rule_no . ' | ' . $rule_cat . ' | ' . $bounce_type . ' | ' . $remove . ' | ' . $email . ' | ' . $subject . ' | ' . $xheader . "<br />\n";
Modified: XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php 2014-04-16 16:22:45 UTC (rev 12453)
+++ XoopsModules/xnewsletter/branches/luciorota/xNewsletter/admin/import.php 2014-04-16 16:32:59 UTC (rev 12454)
@@ -34,405 +34,399 @@
$basic_limit_import_checked = 100;
$basic_limit_import_at_once = 10;
-$op = xNewsletter_CleanVars($_REQUEST, 'op', 'default', 'string');
-$plugin = xNewsletter_CleanVars($_REQUEST, 'plugin', 'csv', 'string');
-$cat_id = xNewsletter_CleanVars($_REQUEST, 'cat_id', 0, 'int');
-$action_after_read = xNewsletter_CleanVars($_REQUEST, 'action_after_read', 1, 'int');
-$start = xNewsletter_CleanVars($_REQUEST, 'start', 0, 'int' );
-$limitcheck = xNewsletter_CleanVars($_REQUEST, 'limitcheck', $basic_limit_import_checked, 'int' );
+$op = xNewsletter_CleanVars($_REQUEST, 'op', 'default', 'string');
+$plugin = xNewsletter_CleanVars($_REQUEST, 'plugin', 'csv', 'string');
+$cat_id = xNewsletter_CleanVars($_REQUEST, 'cat_id', 0, 'int');
+$action_after_read = xNewsletter_CleanVars($_REQUEST, 'action_after_read', 1, 'int');
+$start = xNewsletter_CleanVars($_REQUEST, 'start', 0, 'int' );
+$limitcheck = xNewsletter_CleanVars($_REQUEST, 'limitcheck', $basic_limit_import_checked, 'int' );
$skipcatsubscrexist = xNewsletter_CleanVars($_REQUEST, 'skipcatsubscrexist', 1, 'int' );
-$check_import = xNewsletter_CleanVars($_REQUEST, 'check_import', 0, 'int');
+$check_import = xNewsletter_CleanVars($_REQUEST, 'check_import', 0, 'int');
// echo "<br/>op:$op plugin:$plugin cat_id:$cat_id action_after_read:$action_after_read start:$start limitcheck:$limitcheck skipcatsubscrexist:$skipcatsubscrexist<br/><br/>";
echo $indexAdmin->addNavigation("import.php");
-switch ($op)
-{
- case "show_formcheck":
-
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, 'import.php?op=default', 'list');
- echo $indexAdmin->renderButton();
+switch ($op) {
+ case "show_formcheck":
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, 'import.php?op=default', 'list');
+ echo $indexAdmin->renderButton();
- $crit_import = new CriteriaCompo();
- $crit_import->setSort("import_id");
- $crit_import->setOrder("ASC");
- $numrows = $xnewsletter->getHandler('xNewsletter_import')->getCount($crit_import);
+ $crit_import = new CriteriaCompo();
+ $crit_import->setSort("import_id");
+ $crit_import->setOrder("ASC");
+ $numrows = $xnewsletter->getHandler('xNewsletter_import')->getCount($crit_import);
- $crit_import->setStart($start);
- $crit_import->setLimit($limitcheck);
- $import_arr = $xnewsletter->getHandler('xNewsletter_import')->getall($crit_import);
-
- if ($numrows > 0) {
- include_once(XOOPS_ROOT_PATH."/class/xoopsformloader.php");
-
- $action = $_SERVER["REQUEST_URI"];
- $unique_id = uniqid(mt_rand());
- $form = "<br/><form name=\"form_import_".$unique_id."\" id=\"form_import_".$unique_id."\" action=\"import.php\" method=\"post\" enctype=\"multipart/form-data\">";
-
- $showlimit = str_replace("%s", $start+1, _AM_XNEWSLETTER_IMPORT_SHOW);
- if ($limitcheck < $numrows) {
- $showlimit = str_replace("%l", $limitcheck, $showlimit);
- } else {
- $showlimit = str_replace("%l", $numrows, $showlimit);
- }
- $showlimit = str_replace("%n", $numrows, $showlimit);
-
- $form .="<table width=\"100%\" cellspacing=\"1\" class=\"outer\">
- <tr>
- <td align=\"left\" colspan='8'>".$showlimit."</td>
- </tr>";
-
- $class = "odd";
- $form .="
- <tr>
- <th align=\"center\"> </th>
- <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_EMAIL."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_SEX."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_FIRSTNAME."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_LASTNAME."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."</th>
- <th align=\"center\">"._AM_XNEWSLETTER_CAT_NAME."</th>
- </tr>";
-
- $class = "odd";
- $counter = 0;
-
- //get data for dropdown with cats
- $criteria = new CriteriaCompo();
- $criteria->setSort('cat_id ASC, cat_name');
- $criteria->setOrder('ASC');
- $cat_arr=$xnewsletter->getHandler('xNewsletter_cat')->getall($criteria);
-
- foreach (array_keys($import_arr) as $i) {
- $counter++;
- $form .= "<tr class=\"".$class."\">";
- $class = ($class == "even") ? "odd" : "even";
- $form .= "<td align=\"center\">".$counter;
- $form .= "<input type='hidden' name='import_id_".$counter."' title='import_id_".$counter."' id='import_id_".$counter."' value='".$import_arr[$i]->getVar("import_id")."' />";
- $form .= "</td>";
- $form .= "<td align=\"center\">";
- $form .= "<input type='text' disabled=disabled name='email_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_EMAIL."' id='email_".$counter."' value='".$import_arr[$i]->getVar("import_email")."' />";
- $form .= "</td>";
-
- $form .= "<td align=\"center\">";
- $sex = $import_arr[$i]->getVar("import_sex");
- $form .= "<select size=\"1\" name=\"sex_".$counter."\" id=\"sex_".$counter."\" title=\""._AM_XNEWSLETTER_SUBSCR_SEX."\" ";
- $form .= "value=\"".$sex."\">";
- $form .= "<option value=\"\"";
- if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_EMPTY) $form .= " selected=\"selected\"";
- $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_EMPTY."</option>";
- $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_FEMALE."\"";
- if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_FEMALE) $form .= " selected=\"selected\"";
- $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_FEMALE."</option>";
- $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_MALE."\"";
- if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_MALE) $form .= " selected=\"selected\"";
- $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_MALE."</option>";
- $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_COMP."\"";
- if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_COMP) $form .= " selected=\"selected\"";
- $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_COMP."</option>";
- $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_FAMILY."\"";
- if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_FAMILY) $form .= " selected=\"selected\"";
- $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_FAMILY."</option>";
- $form .= "</select>\n";
- $form .= "</td>";
-
- $form .= "<td align=\"center\">";
- $form .= "<input type='text' name='firstname_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_FIRSTNAME."' id='firstname_".$counter."' value='".$import_arr[$i]->getVar("import_firstname")."' />";
- $form .= "</td>";
- $form .= "<td align=\"center\">";
- $form .= "<input type='text' name='lastname_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_LASTNAME."' id='lastname_".$counter."' value='".$import_arr[$i]->getVar("import_lastname")."' />";
- $form .= "</td>";
- $form .= "<td align=\"center\">";
- $subscr_id = $import_arr[$i]->getVar("import_subscr_id");
- $form .= "<input type='hidden' name='subscr_id_".$counter."' title='subscr_id' id='subscr_id_".$counter."' value='".$subscr_id."' />";
- if ($subscr_id > 0) $form .= "<img src='".XNEWSLETTER_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' />";
- $form .= "</td>";
- $form .= "<td align=\"center\">";
- $catsubscr_id = $import_arr[$i]->getVar("import_catsubscr_id");
- $form .= "<input type='hidden' name='catsubscr_id_".$counter."' title='catsubscr_id' id='catsubscr_id_".$counter."' value='".$catsubscr_id."' />";
- if ($catsubscr_id > 0) $form .= "<img src='".XNEWSLETTER_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' />";
- $form .= "</td>";
- $form .= "</td>";
- $form .= "<td align=\"center\">";
-
- $curr_cat_id =$import_arr[$i]->getVar("import_cat_id");
- $form .= "<select size=\"1\" name=\"cat_id_".$counter."\" id=\"cat_id_".$counter."\" title=\"cat\" ";
- $form .= "value=\"".$curr_cat_id."\">";
- $cat_select = "<option value=\"0\"";
- $cat_select .= ">"._AM_XNEWSLETTER_IMPORT_NOIMPORT."</option>";
- foreach (array_keys($cat_arr) as $j)
- {
- $cat_select .= "<option value=\"".$j."\"";
- if ($curr_cat_id == $j) $cat_select .= " selected=\"selected\"";
- $cat_select .= ">".$cat_arr[$j]->getVar("cat_name")."</option>";
- }
-
- $form .= $cat_select;
- $form .= "</select>\n";
-
- $form .= "</td>";
- $form .= "</tr>";
- }
- $form .= "<tr class=\"".$class."\">";
- $class = ($class == "even") ? "odd" : "even";
- $form .= "<td colspan=\"8\"align=\"center\">";
- $form .= "<input type='hidden' name='counter' title='counter' id='counter' value='".$counter."' />";
- $form .= "<input type='hidden' name='limitcheck' title='limitcheck' id='limitcheck' value='".$limitcheck."' />";
- $form .= "<input type='hidden' name='op' title='op' id='op' value='apply_import_form' />";
- $form .= "<input type='submit' class='formButton' name='submit' id='submit' value='"._AM_XNEWSLETTER_IMPORT_EXEC."' title='"._AM_XNEWSLETTER_IMPORT_EXEC."' />";
- $form .= "</td></tr>";
-
- $form .= "</table></form>";
- echo $form;
- }
- break;
+ $crit_import->setStart($start);
+ $crit_import->setLimit($limitcheck);
+ $import_arr = $xnewsletter->getHandler('xNewsletter_import')->getall($crit_import);
- case "apply_import_form":
- //update mod_xnewsletter with settings form_import
- $counter = xNewsletter_CleanVars($_REQUEST, 'counter', 0, 'int');
-
- 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');
- $subscr_sex = xNewsletter_CleanVars($_REQUEST, 'sex_'.$i, '', 'string');
- $cat_id = xNewsletter_CleanVars($_REQUEST, 'cat_id_'.$i, 0, 'int');
-
- if ($cat_id > 0) {
- if ($subscr_id==0) {
- //update sex, firstname, lastname
- $sql = "UPDATE ".$xoopsDB->prefix('mod_xnewsletter_import')." SET `import_sex`='$subscr_sex', `import_firstname`='$subscr_firstname', `import_lastname`='$subscr_lastname' WHERE `import_id`=$import_id";
- $result=$xoopsDB->queryF($sql);
- }
- }
- //update cat_id and import_status
- $sql = "UPDATE ".$xoopsDB->prefix('mod_xnewsletter_import')." SET `import_cat_id`='$cat_id', `import_status`=1 WHERE `import_id`=$import_id";
- $result=$xoopsDB->queryF($sql);
- }
-
- redirect_header("import.php?op=exec_import_final&check_import=1&limitcheck=".$limitcheck, 0, "");
- 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)
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, 'import.php?op=default', 'list');
- echo $indexAdmin->renderButton();
-
- $ip = xoops_getenv("REMOTE_ADDR");
- $submitter = $xoopsUser->uid();
-
- $crit_import = new CriteriaCompo();
- $crit_import->add(new Criteria('import_status', "1"));
- $numrows_total = $xnewsletter->getHandler('xNewsletter_import')->getCount();
- $numrows_act = $xnewsletter->getHandler('xNewsletter_import')->getCount($crit_import);
- if ( $numrows_act > 0 ) {
- $sql = "SELECT * FROM ".$xoopsDB->prefix("mod_xnewsletter_import")." WHERE ((import_status)=1)";
- $sql .= " ORDER BY `import_id` ASC";
- $counter = 0;
- $users_import = $xoopsDB->queryF($sql) or 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"];
- $subscr_firstname = $user_import["import_firstname"];
- $subscr_lastname = $user_import["import_lastname"];
- $subscr_sex = $user_import["import_sex"];
- $cat_id = $user_import["import_cat_id"];
- $subscr_id = $user_import["import_subscr_id"];
- $catsubscr_id = $user_import["import_catsubscr_id"];
- $subscribe = 0;
-
- if ($cat_id == 0) {
- create_prot ( str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_SKIP), 1, $submitter);
- } else {
- //register email
- if ($subscr_id==0) {
- $subscr_uid = 0;
- $sql = "SELECT `uid` FROM ".$xoopsDB->prefix("users")." WHERE (`email`='";
- $sql .= $subscr_email;
- $sql .= "') LIMIT 1";
- if ( $user = $xoopsDB->queryF($sql) ) {
- $row_user = mysql_fetch_array($user);
- $subscr_uid = $row_user[0];
- }
- unset($row_user);
- unset($user);
+ if ($numrows > 0) {
+ include_once(XOOPS_ROOT_PATH . "/class/xoopsformloader.php");
- $sql = "INSERT INTO `".$xoopsDB->prefix('mod_xnewsletter_subscr')."` (`subscr_email`, `subscr_firstname`, `subscr_lastname`, `subscr_uid`, `subscr_sex`, `subscr_submitter`, `subscr_created`, `subscr_ip`, `subscr_activated`, `subscr_actoptions`) VALUES ('".$subscr_email."','".$subscr_firstname."','".$subscr_lastname."',".intval($subscr_uid).",'".$subscr_sex."',".$submitter.",".time().",'".$ip."','1','')";
- if (!$xoopsDB->queryF($sql)) {
- create_prot ( str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED), 0, $submitter);
+ $action = $_SERVER["REQUEST_URI"];
+ $unique_id = uniqid(mt_rand());
+ $form = "<br/><form name=\"form_import_".$unique_id."\" id=\"form_import_".$unique_id."\" action=\"import.php\" method=\"post\" enctype=\"multipart/form-data\">";
+
+ $showlimit = str_replace("%s", $start+1, _AM_XNEWSLETTER_IMPORT_SHOW);
+ if ($limitcheck < $numrows) {
+ $showlimit = str_replace("%l", $limitcheck, $showlimit);
} else {
- //register email successful
- $resulttext = $subscr_email.": "._AM_XNEWSLETTER_IMPORT_RESULT_REG_OK." | ";
- $subscr_id = $xoopsDB->getInsertId();
- $subscribe=1;
+ $showlimit = str_replace("%l", $numrows, $showlimit);
}
-
- } else {
- //email already registered
- $resulttext = $subscr_email.": "._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST." | ";
- $subscribe=1;
- }
- if ($subscribe == 1) {
- if ($catsubscr_id==0) {
- //add subscription of this email
- $sql = "INSERT INTO `".$xoopsDB->prefix('mod_xnewsletter_catsubscr')."` (`catsubscr_catid`, `catsubscr_subscrid`, `catsubscr_submitter`, `catsubscr_created`) VALUES (".$cat_id.",".$subscr_id.",".$submitter.",".time().")";
- if ($xoopsDB->queryF($sql)) {
- create_prot ( $resulttext._AM_XNEWSLETTER_IMPORT_RESULT_SUBSCR_OK, 1, $submitter);
- //handle mailinglists
- $cat_mailinglist = 0;
- $sql = "SELECT `cat_mailinglist` FROM ".$xoopsDB->prefix("mod_xnewsletter_cat")." WHERE (`cat_id`=";
- $sql .= $cat_id;
- $sql .= ") LIMIT 1";
- if ( $cat_mls = $xoopsDB->queryF($sql) ) {
- $cat_ml = mysql_fetch_array($cat_mls);
- $cat_mailinglist = $cat_ml[0];
+ $showlimit = str_replace("%n", $numrows, $showlimit);
+
+ $form .="<table width=\"100%\" cellspacing=\"1\" class=\"outer\">
+ <tr>
+ <td align=\"left\" colspan='8'>".$showlimit."</td>
+ </tr>";
+
+ $class = "odd";
+ $form .="
+ <tr>
+ <th align=\"center\"> </th>
+ <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_EMAIL."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_SEX."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_FIRSTNAME."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_SUBSCR_LASTNAME."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."</th>
+ <th align=\"center\">"._AM_XNEWSLETTER_CAT_NAME."</th>
+ </tr>";
+
+ $class = "odd";
+ $counter = 0;
+
+ //get data for dropdown with cats
+ $criteria = new CriteriaCompo();
+ $criteria->setSort('cat_id ASC, cat_name');
+ $criteria->setOrder('ASC');
+ $cat_arr=$xnewsletter->getHandler('xNewsletter_cat')->getall($criteria);
+
+ foreach (array_keys($import_arr) as $i) {
+ $counter++;
+ $form .= "<tr class=\"".$class."\">";
+ $class = ($class == "even") ? "odd" : "even";
+ $form .= "<td align=\"center\">".$counter;
+ $form .= "<input type='hidden' name='import_id_".$counter."' title='import_id_".$counter."' id='import_id_".$counter."' value='".$import_arr[$i]->getVar("import_id")."' />";
+ $form .= "</td>";
+ $form .= "<td align=\"center\">";
+ $form .= "<input type='text' disabled=disabled name='email_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_EMAIL."' id='email_".$counter."' value='".$import_arr[$i]->getVar("import_email")."' />";
+ $form .= "</td>";
+
+ $form .= "<td align=\"center\">";
+ $sex = $import_arr[$i]->getVar("import_sex");
+ $form .= "<select size=\"1\" name=\"sex_".$counter."\" id=\"sex_".$counter."\" title=\""._AM_XNEWSLETTER_SUBSCR_SEX."\" ";
+ $form .= "value=\"".$sex."\">";
+ $form .= "<option value=\"\"";
+ if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_EMPTY) $form .= " selected=\"selected\"";
+ $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_EMPTY."</option>";
+ $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_FEMALE."\"";
+ if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_FEMALE) $form .= " selected=\"selected\"";
+ $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_FEMALE."</option>";
+ $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_MALE."\"";
+ if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_MALE) $form .= " selected=\"selected\"";
+ $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_MALE."</option>";
+ $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_COMP."\"";
+ if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_COMP) $form .= " selected=\"selected\"";
+ $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_COMP."</option>";
+ $form .= "<option value=\""._AM_XNEWSLETTER_SUBSCR_SEX_FAMILY."\"";
+ if ($sex==_AM_XNEWSLETTER_SUBSCR_SEX_FAMILY) $form .= " selected=\"selected\"";
+ $form .= ">"._AM_XNEWSLETTER_SUBSCR_SEX_FAMILY."</option>";
+ $form .= "</select>\n";
+ $form .= "</td>";
+
+ $form .= "<td align=\"center\">";
+ $form .= "<input type='text' name='firstname_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_FIRSTNAME."' id='firstname_".$counter."' value='".$import_arr[$i]->getVar("import_firstname")."' />";
+ $form .= "</td>";
+ $form .= "<td align=\"center\">";
+ $form .= "<input type='text' name='lastname_".$counter."' title='"._AM_XNEWSLETTER_SUBSCR_LASTNAME."' id='lastname_".$counter."' value='".$import_arr[$i]->getVar("import_lastname")."' />";
+ $form .= "</td>";
+ $form .= "<td align=\"center\">";
+ $subscr_id = $import_arr[$i]->getVar("import_subscr_id");
+ $form .= "<input type='hidden' name='subscr_id_".$counter."' title='subscr_id' id='subscr_id_".$counter."' value='".$subscr_id."' />";
+ if ($subscr_id > 0) $form .= "<img src='".XNEWSLETTER_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_EMAIL_EXIST."' />";
+ $form .= "</td>";
+ $form .= "<td align=\"center\">";
+ $catsubscr_id = $import_arr[$i]->getVar("import_catsubscr_id");
+ $form .= "<input type='hidden' name='catsubscr_id_".$counter."' title='catsubscr_id' id='catsubscr_id_".$counter."' value='".$catsubscr_id."' />";
+ if ($catsubscr_id > 0) $form .= "<img src='".XNEWSLETTER_ICONS_URL."/xn_ok.png' alt='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' title='"._AM_XNEWSLETTER_IMPORT_CATSUBSCR_EXIST."' />";
+ $form .= "</td>";
+ $form .= "</td>";
+ $form .= "<td align=\"center\">";
+
+ $curr_cat_id =$import_arr[$i]->getVar("import_cat_id");
+ $form .= "<select size=\"1\" name=\"cat_id_".$counter."\" id=\"cat_id_".$counter."\" title=\"cat\" ";
+ $form .= "value=\"".$curr_cat_id."\">";
+ $cat_select = "<option value=\"0\"";
+ $cat_select .= ">"._AM_XNEWSLETTER_IMPORT_NOIMPORT."</option>";
+ foreach (array_keys($cat_arr) as $j) {
+ $cat_select .= "<option value=\"".$j."\"";
+ if ($curr_cat_id == $j) $cat_select .= " selected=\"selected\"";
+ $cat_select .= ">".$cat_arr[$j]->getVar("cat_name")."</option>";
}
- unset($cat_ml);
- unset($cat_mls);
- if ($cat_mailinglist > 0) {
- require_once( XOOPS_ROOT_PATH."/modules/xNewsletter/include/mailinglist.php" );
- subscribingMLHandler(1, $subscr_id, $cat_mailinglist);
- }
- } else {
- create_prot ( str_replace("%e", $subscr_email, _AM_XNEWSLETTER_IMPORT_RESULT_FAILED), 0, $submitter);
- }
+ $form .= $cat_select;
+ $form .= "</select>\n";
+
+ $form .= "</td>";
+ $form .= "</tr>";
+ }
+ $form .= "<tr class=\"".$class."\">";
+ $class = ($class == "even") ? "odd" : "even";
+ $form .= "<td colspan=\"8\"align=\"center\">";
+ $form .= "<input type='hidden' name='counter' title='counter' id='counter' value='".$counter."' />";
+ $form .= "<input type='hidden' name='limitcheck' title='limitcheck' id='limitcheck' value='".$limitcheck."' />";
+ $form .= "<input type='hidden' name='op' title='op' id='op' value='apply_import_form' />";
+ $form .= "<input type='submit' class='formButton' name='submit' id='submit' value='"._AM_XNEWSLETTER_IMPORT_EXEC."' title='"._AM_XNEWSLETTER_IMPORT_EXEC."' />";
+ $form .= "</td></tr>";
+
+ $form .= "</table></form>";
+ echo $form;
+ }
+ break;
+
+ case "apply_import_form":
+ //update mod_xnewsletter with settings form_import
+ $counter = xNewsletter_CleanVars($_REQUEST, 'counter', 0, 'int');
+
+ 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');
+ $subscr_sex = xNewsletter_CleanVars($_REQUEST, 'sex_'.$i, '', 'string');
+ $cat_id = xNewsletter_CleanVars($_REQUEST, 'cat_id_'.$i, 0, 'int');
+
+ if ($cat_id > 0) {
+ if ($subscr_id==0) {
+ //update sex, firstname, lastname
+ $sql = "UPDATE ".$xoopsDB->prefix('mod_xnewsletter_import')." SET `import_sex`='$subscr_sex', `import_firstname`='$subscr_firstname', `import_lastname`='$subscr_lastname' WHERE `import_id`=$import_id";
+ $result=$xoopsDB->queryF($sql);
+ }
+ }
+ //update cat_id and import_status
+ $sql = "UPDATE ".$xoopsDB->prefix('mod_xnewsletter_import')." SET `import_cat_id`='$cat_id', `import_status`=1 WHERE `import_id`=$import_id";
+ $result=$xoopsDB->queryF($sql);
+ }
+
+ redirect_header("import.php?op=exec_import_final&check_import=1&limitcheck=".$limitcheck, 0, "");
+ 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)
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, 'import.php?op=default', 'list');
+ echo $indexAdmin->renderButton();
+
+ $ip = xoops_getenv("REMOTE_ADDR");
+ $submitter = $xoopsUser->uid();
+
+ $crit_import = new CriteriaCompo();
+ $crit_import->add(new Criteria('import_status', "1"));
+ $numrows_total = $xnewsletter->getHandler('xNewsletter_import')->getCount();
+ $numrows_act = $xnewsletter->getHandler('xNewsletter_import')->getCount($crit_import);
+ if ( $numrows_act > 0 ) {
+ $sql = "SELECT * FROM ".$xoopsDB->prefix("mod_xnewsletter_import")." WHERE ((import_status)=1)";
+ $sql .= " ORDER BY `import_id` ASC";
+ $counter = 0;
+ $users_import = $xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
+ while ($user_import = mysql_fetch_assoc($users_import)) {
+ $import_id = $user_import["import_id"];
+ ...
[truncated message content] |
