Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12557] XoopsModules/xnewsletter/branches/mamba/ xNewsletter
|
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"}>
+<{include file="db:xNewsletter_header.tpl"}>
<div style='clear:both;'></div>
<div class="outer">
<h2><{$letter.letter_title}></h2>
@@ -8,4 +8,4 @@
<input action="action" type="button" value="<{$smarty.const._BACK}>" onclick="history.go(-1);" />
</div>
<div style='clear:both;'></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_protocol.tpl
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_protocol.tpl 2014-06-01 22:19:51 UTC (rev 12556)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_protocol.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">
@@ -37,4 +37,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_subscription.tpl
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_subscription.tpl 2014-06-01 22:19:51 UTC (rev 12556)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_subscription.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><{$xnewsletter_content}></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_subscription_list_subscriptions.tpl
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_subscription_list_subscriptions.tpl 2014-06-01 22:19:51 UTC (rev 12556)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_subscription_list_subscriptions.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">
<div>
<{if ($subscrCount > 0)}>
@@ -75,4 +75,4 @@
<{/foreach}>
</table>
<{/if}>
-<{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_subscription_result.tpl
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_subscription_result.tpl 2014-06-01 22:19:51 UTC (rev 12556)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/templates/xNewsletter_subscription_result.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">
<p align="center" style="margin-top: 20px; margin-bottom: 20px; font-weight:bold">
<{$subscription_result}>
@@ -17,4 +17,4 @@
</p>
<{/foreach}>
</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/xoops_version.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/xoops_version.php 2014-06-01 22:19:51 UTC (rev 12556)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/xoops_version.php 2014-06-02 04:11:11 UTC (rev 12557)
@@ -58,7 +58,7 @@
$modversion['module_status'] = "Alpha";
$modversion['release_info'] = "";
$modversion['release_file'] = XOOPS_URL . "/modules/" . $modversion['dirname'] . "/docs/changelog.txt";
-$modversion['release_date'] = "2014/04/23";
+$modversion['release_date'] = "2014/05/27";
$modversion['manual'] = "xNewsletter.txt";
$modversion['manual_file'] = XOOPS_URL . "/modules/{$modversion['dirname']}/docs/";
|
