Menu
▾
▴
xoops-svn
|
From: <be...@us...> - 2014-06-13 13:47:33
|
Revision: 12580
http://sourceforge.net/p/xoops/svn/12580
Author: beckmi
Date: 2014-06-13 13:47:07 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/about.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/accounts.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/admin_footer.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/admin_header.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/attachment.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/bmh_callback_database.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/cat.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/import.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/index.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/maintenance.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/menu.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/protocol.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/sendletter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/subscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/task.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/assets/css/module.css
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/assets/css/style.css
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/blocks/blocks_catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/blocks/blocks_letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/blocks/blocks_subscrinfo.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/breadcrumb.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/request.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/session.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/xnewsletter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/cron.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/docs/changelog.txt
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/docs/readme.txt
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/footer.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/header.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/include/common.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/include/config.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/include/constants.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/include/functions.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/include/install.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/include/mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/include/module.css
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/include/onupdate.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/include/phpmailer_bmh/class.phpmailer-bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/include/search.inc.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/include/task.inc.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/index.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/language/english/admin.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/language/english/blocks.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/language/english/common.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/language/english/help/help.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/language/english/help/help2.html
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/language/english/main.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/language/english/modinfo.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/language/english/templates/xoops.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/plugins/csv.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/plugins/evennews.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/plugins/rmbulletin.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/plugins/smartpartner.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/plugins/subscribers.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/plugins/weblinks.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/plugins/xoopsuser.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/print.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/protocol.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/sendletter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/sql/mysql.sql
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/subscription.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/blocks/xNewsletter_catsubscr_block_day.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/blocks/xNewsletter_catsubscr_block_recent.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/blocks/xNewsletter_letter_block_day.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/blocks/xNewsletter_letter_block_random.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/blocks/xNewsletter_letter_block_recent.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/blocks/xNewsletter_subscrinfo_block.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/xNewsletter_common_breadcrumb.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/xNewsletter_index.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/xNewsletter_index_list_letters.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/xNewsletter_letter.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/xNewsletter_letter_list_letters.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/xNewsletter_letter_list_subscrs.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/xNewsletter_letter_preview.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/xNewsletter_print.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/xNewsletter_protocol.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/xNewsletter_subscription.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/xNewsletter_subscription_list_subscriptions.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/templates/xNewsletter_subscription_result.tpl
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/xoops_version.php
Added Paths:
-----------
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/assets/images/logo.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/accounts.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/attachment.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/cat.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/import.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/protocol.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/subscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/task.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/template.php
Removed Paths:
-------------
XoopsModules/xnewsletter/branches/mamba/xNewsletter/
XoopsModules/xnewsletter/branches/mamba/xnewsletter/
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/assets/images/xNewsletter.png
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/xNewsletter_accounts.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/xNewsletter_attachment.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/xNewsletter_bmh.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/xNewsletter_cat.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/xNewsletter_catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/xNewsletter_import.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/xNewsletter_letter.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/xNewsletter_mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/xNewsletter_protocol.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/xNewsletter_subscr.php
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/class/xNewsletter_task.php
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/about.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/about.php 2014-06-02 08:21:11 UTC (rev 12560)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/about.php 2014-06-13 13:47:07 UTC (rev 12580)
@@ -19,18 +19,18 @@
* ---------------------------------------------------------------------------
* @copyright Goffy ( wedega.com )
* @license GPL 2.0
- * @package xNewsletter
+ * @package xnewsletter
* @author Goffy ( web...@we... )
*
* Version : $Id $
* ****************************************************************************
*/
-include "admin_header.php";
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
//global $indexAdmin;
echo $indexAdmin->addNavigation("about.php");
echo $indexAdmin->renderabout('9P3B3FXKF868J', false);
-include "admin_footer.php";
+include_once dirname(__FILE__) . '/admin_footer.php';
Modified: XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xnewsletter/admin/accounts.php 2014-06-02 08:21:11 UTC (rev 12560)
+++ XoopsModules/xnewsletter/branches/mamba/xnewsletter2/admin/accounts.php 2014-06-13 13:47:07 UTC (rev 12580)
@@ -19,38 +19,35 @@
* ---------------------------------------------------------------------------
* @copyright Goffy ( wedega.com )
* @license GPL 2.0
- * @package xNewsletter
+ * @package xnewsletter
* @author Goffy ( web...@we... )
*
* Version : $Id $
* ****************************************************************************
*/
-include "admin_header.php";
+$currentFile = basename(__FILE__);
+include_once dirname(__FILE__) . '/admin_header.php';
xoops_cp_header();
-//global $indexAdmin;
// We recovered the value of the argument op in the URL$
-$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');
+$op = XnewsletterRequest::getString('op', 'list');
+$save_and_check = XnewsletterRequest::getString('save_and_check', 'none');
+$accounts_id = XnewsletterRequest::getInt('accounts_id', 0);
+$post = XnewsletterRequest::getString('post', '');
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 . "' /> ";
-
- echo $indexAdmin->addNavigation("accounts.php");
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, 'accounts.php?op=list', 'list');
+ echo $indexAdmin->addNavigation($currentFile);
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_ACCOUNTSLIST, '?op=list', 'list');
echo $indexAdmin->renderButton();
-
+ //
if ($accounts_id == 0) {
- redirect_header("accounts.php", 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
+ redirect_header($currentFile, 3, _AM_XNEWSLETTER_ERROR_NO_VALID_ID);
} else {
- $accountObj =& $xnewsletter->getHandler('xNewsletter_accounts')->get($accounts_id);
+ $accountObj = $xnewsletter->getHandler('accounts')->get($accounts_id);
}
$mailhost = $accountObj->getVar("accounts_server_in");
@@ -75,42 +72,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'>" . XNEWSLETTER_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'>" . XNEWSLETTER_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."}", "*");
+ $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'>" . XNEWSLETTER_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'>" . XNEWSLETTER_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 +115,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));
$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 +133,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;
}
}
}
@@ -147,36 +144,36 @@
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>";
+ echo "<td class='center width5'>" . XNEWSLETTER_IMG_OK . "</td>";
} else {
- echo "<td class='center width5'>" . $img_failed . "</td>";
+ echo "<td class='center width5'>" . XNEWSLETTER_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;
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . XNEWSLETTER_IMG_OK;
} else {
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . $img_failed;
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . XNEWSLETTER_IMG_FAILED;
}
echo "<br />";
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX." ";
if ($accounts_hardbox_ok == 1) {
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . $img_ok;
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . XNEWSLETTER_IMG_OK;
} else {
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . $img_failed;
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . XNEWSLETTER_IMG_FAILED;
}
echo "<br />";
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_SOFTBOX . " ";
if ($accounts_softbox_ok == 1) {
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . $img_ok;
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . XNEWSLETTER_IMG_OK;
} else {
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . $img_failed;
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . XNEWSLETTER_IMG_FAILED;
}
echo "<br />";
echo "</td>";
} else {
- echo "<td class='center width5'>" . $img_ok . "</td>";
+ echo "<td class='center width5'>" . XNEWSLETTER_IMG_OK . "</td>";
echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH._AM_XNEWSLETTER_ACCOUNTS_CHECK_SKIPPED . "</td>";
echo "<td class='center'></td>";
}
@@ -189,64 +186,64 @@
case "list":
default:
- echo $indexAdmin->addNavigation('accounts.php') ;
- $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, 'accounts.php?op=new_account', 'add');
+ echo $indexAdmin->addNavigation($currentFile) ;
+ $indexAdmin->addItemButton(_AM_XNEWSLETTER_NEWACCOUNTS, '?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) {
+ //
+ $limit = $xnewsletter->getConfig('adminperpage');
+ $accountsCriteria = new CriteriaCompo();
+ $accountsCriteria->setSort("accounts_id ASC, accounts_type");
+ $accountsCriteria->setOrder("ASC");
+ $accountsCount = $xnewsletter->getHandler('accounts')->getCount();
+ $start = XnewsletterRequest::getInt('start', 0);
+ $accountsCriteria->setStart($start);
+ $accountsCriteria->setLimit($limit);
+ $accountsObjs = $xnewsletter->getHandler('accounts')->getAll($accountsCriteria);
+ if ($accountsCount > $limit) {
include_once XOOPS_ROOT_PATH . "/class/pagenav.php";
- $pagenav = new XoopsPageNav($numrows, $limit, $start, 'start', 'op=list');
+ $pagenav = new XoopsPageNav($accountsCount, $limit, $start, 'start', 'op=list');
$pagenav = $pagenav->renderNav(4);
} else {
$pagenav = '';
}
// View Table
- if ($numrows > 0) {
+ if ($accountsCount > 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) {
+ foreach ($accountsObjs as $accounts_id => $accountsObj) {
echo "<tr class='".$class."'>";
$class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>".$i."</td>";
+ echo "<td class='center'>" . $accounts_id . "</td>";
$arr_accounts_type=array(
- _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>";
+ _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[$accountsObj->getVar("accounts_type")] . "</td>";
+ echo "<td class='center'>" . $accountsObj->getVar("accounts_name") . "</td>";
+ echo "<td class='center'>" . $accountsObj->getVar("accounts_yourname") . "</td>";
+ echo "<td class='center'>" . $accountsObj->getVar("accounts_yourmail") . "</td>";
+ $verif_accounts_default = ($accountsObj->getVar("accounts_default") == 1) ? _YES : _NO;
+ echo "<td class='center'>" . $verif_accounts_default . "</td>";
echo "<td class='center 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_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 " <a href='?op=edit_account&accounts_id=" . $accounts_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_edit.png alt='" . _EDIT . "' title='"._EDIT . "' /></a>";
+ echo " <a href='?op=delete_account&accounts_id=" . $accounts_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_delete.png alt='" . _DELETE . "' title='" . _DELETE . "' /></a>";
+ if ($accountsObj->getVar("accounts_type") != _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL && $accountsObj->getVar("accounts_type") != _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL) {
+ echo " <a href='?op=check_account&accounts_id=". $accounts_id . "'><img src=" . XNEWSLETTER_ICONS_URL . "/xn_check.png alt='" . _AM_XNEWSLETTER_ACCOUNTS_TYPE_CHECK . "' title='" . _AM_XNEWSLETTER_ACCOUNTS_TYPE_CHECK . "' /></a>";
}
echo "</td>";
echo "</tr>";
@@ -256,21 +253,21 @@
} 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>
- ...
[truncated message content] |
|
From: <be...@us...> - 2014-06-13 14:03:22
|
Revision: 12581
http://sourceforge.net/p/xoops/svn/12581
Author: beckmi
Date: 2014-06-13 14:03:12 +0000 (Fri, 13 Jun 2014)
Log Message:
-----------
Renaming the directory
Added Paths:
-----------
XoopsModules/xnewsletter/branches/mamba/xnewsletter/
Removed Paths:
-------------
XoopsModules/xnewsletter/branches/mamba/xnewsletter2/
|
Thanks for helping keep SourceForge clean.
X