Menu
▾
▴
[xoops-svn] SF.net SVN: xoops-svn:[12559] XoopsModules/xnewsletter/branches/mamba/ xNewsletter
|
From: <be...@us...> - 2014-06-02 08:10:45
|
Revision: 12559
http://sourceforge.net/p/xoops/svn/12559
Author: beckmi
Date: 2014-06-02 08:10:39 +0000 (Mon, 02 Jun 2014)
Log Message:
-----------
reversed "mod_" prefix on tables, normalized prefixes for language constants to XNEWSLETTER (needed for cloning)
Modified Paths:
--------------
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/accounts.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/admin_header.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh_callback_database.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/import.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/letter.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/maintenance.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/protocol.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/subscr.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/blocks/blocks_catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/blocks/blocks_letter.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/blocks/blocks_subscrinfo.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/breadcrumb.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/request.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/session.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_accounts.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_attachment.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_bmh.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_cat.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_catsubscr.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_import.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_letter.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_protocol.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_subscr.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_task.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xnewsletter.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/docs/changelog.txt
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/common.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/config.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/constants.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/functions.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/html2text/epl-v10.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/html2text/html2text.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/mailinglist.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/onupdate.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/phpmailer_bmh/class.phpmailer-bmh.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/search.inc.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/include/task.inc.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/index.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/admin.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/language/english/help/help.html
XoopsModules/xnewsletter/branches/mamba/xNewsletter/letter.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/plugins/csv.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/plugins/evennews.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/plugins/rmbulletin.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/plugins/smartpartner.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/plugins/subscribers.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/plugins/weblinks.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/plugins/xoopsuser.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/print.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/sql/mysql.sql
XoopsModules/xnewsletter/branches/mamba/xNewsletter/subscription.php
XoopsModules/xnewsletter/branches/mamba/xNewsletter/xoops_version.php
Added Paths:
-----------
XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_search.png
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/accounts.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/accounts.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -56,11 +56,11 @@
$mailhost = $accountObj->getVar("accounts_server_in");
$port = $accountObj->getVar("accounts_port_in");
switch ($accountObj->getVar("accounts_type")) {
- case _AM_ACCOUNTS_TYPE_VAL_POP3:
+ case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3:
$service = "pop3";
break;
- case _AM_ACCOUNTS_TYPE_VAL_SMTP:
- case _AM_ACCOUNTS_TYPE_VAL_GMAIL:
+ case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_SMTP:
+ case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_GMAIL:
$service = "imap";
break;
case "default":
@@ -75,42 +75,42 @@
$accounts_hardbox = $accountObj->getVar("accounts_hardbox"); $accounts_hardbox_ok = 0;
$accounts_softbox = $accountObj->getVar("accounts_softbox"); $accounts_softbox_ok = 0;
- $command = $mailhost . ":" . $port;
+ $command = $mailhost.":".$port;
if ($service !='') $command .= '/' . $service;
if ($service_option !='') $command .= '/' . $service_option;
echo "<table class='outer width100' cellspacing='1'>
<tr>
<th class='center width5'></th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_INFO . "</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_INFO."</th>
</tr>";
$mbox = @imap_open("{" . $command . "}", $accounts_username, $accounts_password); // or die ("can't connect: " . imap_last_error());
if ($mbox === false) {
echo "<tr>";
- echo "<td class='center width5'>" . $img_failed . "</td>";
- echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . "</td>";
- echo "<td class='left'>" . imap_last_error() . "</td>";
+ echo "<td class='center width5'>".$img_failed."</td>";
+ echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED."</td>";
+ echo "<td class='left'>".imap_last_error()."</td>";
echo "</tr>";
} else {
echo "<tr>";
- echo "<td class='center width5'>" . $img_ok . "</td>";
- echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . "</td>";
+ echo "<td class='center width5'>".$img_ok."</td>";
+ echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_MAILBOX._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK."</td>";
echo "<td class='left'></td>";
echo "</tr>";
$folders = imap_listmailbox($mbox, "{".$command."}", "*");
if ($folders == false) {
echo "<tr>";
- echo "<td class='center width5'>" . $img_failed . "</td>";
- echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . "</td>";
- echo "<td class='left'>" . imap_last_error() . "</td>";
+ echo "<td class='center width5'>".$img_failed."</td>";
+ echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED."</td>";
+ echo "<td class='left'>".imap_last_error()."</td>";
echo "</tr>";
} else {
echo "<tr>";
- echo "<td class='center width5'>" . $img_ok . "</td>";
- echo "<td class='left'>" . _AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . "</td>";
+ echo "<td class='center width5'>".$img_ok."</td>";
+ echo "<td class='left'>"._AM_XNEWSLETTER_ACCOUNTS_CHECK_OPEN_FOLDERS._AM_XNEWSLETTER_ACCOUNTS_CHECK_OK."</td>";
echo "<td class='left'>";
if (is_array($folders)) {
reset ($folders);
@@ -118,15 +118,15 @@
$foldercreated = 0;
while (list( $key, $val) = each ($folders)) {
echo "($key) ";
- echo imap_utf7_decode (str_replace("{" . $command . "}", "", $val)) . "<br>\n";
- if ("{" . $command . "}" . $accounts_inbox == $val) $accounts_inbox_ok = 1;
- if ("{" . $command . "}" . $accounts_hardbox == $val) {
+ echo imap_utf7_decode (str_replace("{".$command."}","",$val)) . "<br>\n";
+ if ("{".$command."}".$accounts_inbox == $val) $accounts_inbox_ok = 1;
+ if ("{".$command."}".$accounts_hardbox == $val) {
$accounts_hardbox_ok = 1;
} else {
- @imap_createmailbox($mbox, imap_utf7_encode('{' .$command . '}' . $accounts_hardbox));
+ @imap_createmailbox($mbox, imap_utf7_encode('{'.$command.'}' . $accounts_hardbox));
$foldercreated = 1;
}
- if ("{" . $command . "}" . $accounts_softbox == $val) {
+ if ("{".$command."}".$accounts_softbox == $val) {
$accounts_softbox_ok = 1;
} else {
@imap_createmailbox($mbox, imap_utf7_encode('{' . $command . '}' . $accounts_softbox));
@@ -136,8 +136,8 @@
if ($foldercreated == 1) {
$folders_recheck = imap_listmailbox($mbox, "{" . $command . "}", "*");
while (list( $key, $val) = each ($folders_recheck)) {
- if ("{" . $command . "}" . $accounts_hardbox == $val) $accounts_hardbox_ok = 1;
- if ("{" . $command . "}" . $accounts_softbox == $val) $accounts_softbox_ok = 1;
+ if ("{".$command."}".$accounts_hardbox == $val) $accounts_hardbox_ok = 1;
+ if ("{".$command."}".$accounts_softbox == $val) $accounts_softbox_ok = 1;
}
}
}
@@ -160,7 +160,7 @@
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_FAILED . $img_failed;
}
echo "<br />";
- echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX . " ";
+ echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_BMH_HARDBOX." ";
if ($accounts_hardbox_ok == 1) {
echo _AM_XNEWSLETTER_ACCOUNTS_CHECK_OK . $img_ok;
} else {
@@ -214,39 +214,39 @@
if ($numrows > 0) {
echo "<table class='outer width100' cellspacing='1'>
<tr>
- <th class='center width2'>" ._AM_XNEWSLETTER_ACCOUNTS_ID . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_TYPE . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_NAME . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_YOURNAME . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_YOURMAIL . "</th>
- <th class='center'>" . _AM_XNEWSLETTER_ACCOUNTS_DEFAULT . "</th>
- <th class='center width10'>" . _AM_XNEWSLETTER_FORMACTION . "</th>
+ <th class='center width2'>"._AM_XNEWSLETTER_ACCOUNTS_ID."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_TYPE."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_NAME."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_YOURNAME."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_YOURMAIL."</th>
+ <th class='center'>"._AM_XNEWSLETTER_ACCOUNTS_DEFAULT."</th>
+ <th class='center width10'>"._AM_XNEWSLETTER_FORMACTION."</th>
</tr>";
$class = "odd";
foreach (array_keys($accounts_arr) as $i) {
- echo "<tr class='" . $class . "'>";
+ echo "<tr class='".$class."'>";
$class = ($class == "even") ? "odd" : "even";
- echo "<td class='center'>" . $i . "</td>";
+ echo "<td class='center'>".$i."</td>";
$arr_accounts_type=array(
- _AM_ACCOUNTS_TYPE_VAL_PHP_MAIL=>_AM_ACCOUNTS_TYPE_PHPMAIL,
- _AM_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL=>_AM_ACCOUNTS_TYPE_PHPSENDMAIL,
- _AM_ACCOUNTS_TYPE_VAL_POP3=>_AM_ACCOUNTS_TYPE_POP3,
- _AM_ACCOUNTS_TYPE_VAL_SMTP=>_AM_ACCOUNTS_TYPE_SMTP,
- _AM_ACCOUNTS_TYPE_VAL_GMAIL=>_AM_ACCOUNTS_TYPE_GMAIL);
- echo "<td class='center'>" . $arr_accounts_type[$accounts_arr[$i]->getVar("accounts_type")] . "</td>";
- echo "<td class='center'>" . $accounts_arr[$i]->getVar("accounts_name") . "</td>";
- echo "<td class='center'>" . $accounts_arr[$i]->getVar("accounts_yourname") . "</td>";
- echo "<td class='center'>" . $accounts_arr[$i]->getVar("accounts_yourmail") . "</td>";
- $verif_accounts_default = ($accounts_arr[$i]->getVar("accounts_default") == 1) ? _YES : _NO;
- echo "<td class='center'>" . $verif_accounts_default . "</td>";
+ _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL=>_AM_XNEWSLETTER_ACCOUNTS_TYPE_PHPMAIL,
+ _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL=>_AM_XNEWSLETTER_ACCOUNTS_TYPE_PHPSENDMAIL,
+ _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3=>_AM_XNEWSLETTER_ACCOUNTS_TYPE_POP3,
+ _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_SMTP=>_AM_XNEWSLETTER_ACCOUNTS_TYPE_SMTP,
+ _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_GMAIL=>_AM_XNEWSLETTER_ACCOUNTS_TYPE_GMAIL);
+ echo "<td class='center'>". $arr_accounts_type[$accounts_arr[$i]->getVar("accounts_type")]."</td>";
+ echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_name")."</td>";
+ echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_yourname")."</td>";
+ echo "<td class='center'>".$accounts_arr[$i]->getVar("accounts_yourmail")."</td>";
+ $verif_accounts_default = ( $accounts_arr[$i]->getVar("accounts_default") == 1 ) ? _YES : _NO;
+ echo "<td class='center'>".$verif_accounts_default."</td>";
echo "<td class='center width5'>";
- echo " <a href='accounts.php?op=edit_account&accounts_id=" . $i . "'><img src=".XNEWSLETTER_ICONS_URL."/xn_edit.png alt='"._EDIT."' title='"._EDIT."' /></a>";
- echo " <a href='accounts.php?op=delete_account&accounts_id=" . $i . "'><img src=".XNEWSLETTER_ICONS_URL."/xn_delete.png alt='"._DELETE."' title='"._DELETE."' /></a>";
- if ($accounts_arr[$i]->getVar("accounts_type") != _AM_ACCOUNTS_TYPE_VAL_PHP_MAIL && $accounts_arr[$i]->getVar("accounts_type") != _AM_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL) {
- echo " <a href='accounts.php?op=check_account&accounts_id=" . $i . "'><img src=".XNEWSLETTER_ICONS_URL."/xn_check.png alt='"._AM_ACCOUNTS_TYPE_CHECK."' title='"._AM_ACCOUNTS_TYPE_CHECK."' /></a>";
+ echo " <a href='accounts.php?op=edit_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_edit.png alt='"._EDIT."' title='"._EDIT."' /></a>";
+ echo " <a href='accounts.php?op=delete_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_delete.png alt='"._DELETE."' title='"._DELETE."' /></a>";
+ if ($accounts_arr[$i]->getVar("accounts_type") != _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL && $accounts_arr[$i]->getVar("accounts_type") != _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL) {
+ echo " <a href='accounts.php?op=check_account&accounts_id=".$i."'><img src=".XNEWSLETTER_ICONS_URL."/xn_check.png alt='"._AM_XNEWSLETTER_ACCOUNTS_TYPE_CHECK."' title='"._AM_XNEWSLETTER_ACCOUNTS_TYPE_CHECK."' /></a>";
}
echo "</td>";
echo "</tr>";
@@ -304,8 +304,8 @@
global $xoopsDB;
$verif_accounts_default = "1";
//reset old accounts_default
- $sql = "UPDATE `{$xoopsDB->prefix("mod_xnewsletter_accounts")}` SET `accounts_default` = '0'";
- $result= $xoopsDB->query($sql) or die ("MySQL-Error: " . mysql_error());
+ $sql = "UPDATE `{$xoopsDB->prefix("xnewsletter_accounts")}` SET `accounts_default` = '0'";
+ $result= $xoopsDB->query($sql) || die ("MySQL-Error: " . mysql_error());
} else {
$verif_accounts_default = "0";
}
@@ -313,7 +313,7 @@
$verif_accounts_default = "1";
}
$accountObj->setVar("accounts_default", $verif_accounts_default);
- if ($accountObj->getVar("accounts_yourmail") != "" && $accountObj->getVar("accounts_yourmail") != _AM_ACCOUNTS_TYPE_YOUREMAIL ) {
+ if ($accountObj->getVar("accounts_yourmail") != "" && $accountObj->getVar("accounts_yourmail") != _AM_XNEWSLETTER_ACCOUNTS_TYPE_YOUREMAIL ) {
if ($xnewsletter->getHandler('xNewsletter_accounts')->insert($accountObj)) {
if ($save_and_check == 'none') {
redirect_header("accounts.php?op=list", 2, _AM_XNEWSLETTER_FORMOK);
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/admin_header.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/admin_header.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/admin_header.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -58,7 +58,7 @@
exit();
}
-//$pathIcon = XOOPS_URL . "/modules/" . $dirname . "/images/icons";
+//$pathIcon = XOOPS_URL . "/modules/" . $dirname . "/assets/images/icons";
$indexAdmin = new ModuleAdmin();
$myts = MyTextSanitizer::getInstance();
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -46,7 +46,7 @@
$obj_bmh =& $xnewsletter->getHandler('xNewsletter_bmh')->get($bmh_id);
$bmh_email = $obj_bmh->getVar("bmh_email");
- $sql = "SELECT subscr_id FROM " . $xoopsDB->prefix("mod_xnewsletter_subscr") . " WHERE (";
+ $sql = "SELECT subscr_id FROM " . $xoopsDB->prefix("xnewsletter_subscr") . " WHERE (";
$sql .= "subscr_email='" . $bmh_email . "'";
$sql .= ") LIMIT 1;";
if ( $user = $xoopsDB->query($sql) ) {
@@ -55,8 +55,8 @@
}
if ($subscr_id == 0) {
//set bmh_measure for all entries in bmh with this email
- $sql_upd_measure = "UPDATE ".$xoopsDB->prefix("mod_xnewsletter_bmh")." SET `bmh_measure` = '"._AM_XNEWSLETTER_BMH_MEASURE_VAL_NOTHING."'";
- $sql_upd_measure .=" WHERE ((`".$xoopsDB->prefix("mod_xnewsletter_bmh")."`.`bmh_email` ='".$bmh_email."') AND (`".$xoopsDB->prefix("mod_xnewsletter_bmh")."`.`bmh_measure` ='0'))";
+ $sql_upd_measure = "UPDATE ".$xoopsDB->prefix("xnewsletter_bmh")." SET `bmh_measure` = '"._AM_XNEWSLETTER_BMH_MEASURE_VAL_NOTHING."'";
+ $sql_upd_measure .=" WHERE ((`".$xoopsDB->prefix("xnewsletter_bmh")."`.`bmh_email` ='".$bmh_email."') AND (`".$xoopsDB->prefix("xnewsletter_bmh")."`.`bmh_measure` ='0'))";
$xoopsDB->query($sql_upd_measure);
redirect_header("bmh.php?op=list", 5, _AM_XNEWSLETTER_BMH_ERROR_NO_SUBSCRID);
}
@@ -65,7 +65,7 @@
// delete subscriber
if (!$xnewsletter->getHandler('xNewsletter_subscr')->delete($obj_subscr,true)) {
$actionprot_err = $obj_subscr->getHtmlErrors()."<br/><br/><br/>";
- $count_err++;
+ ++$count_err;
}
//delete subscription
@@ -87,7 +87,7 @@
}
} else {
$actionprot_err .= $obj_catsubscr->getHtmlErrors();
- $count_err++;
+ ++$count_err;
}
}
}
@@ -115,19 +115,19 @@
$bmh_email = $obj_bmh->getVar("bmh_email");
if ($bmh_measure == _AM_XNEWSLETTER_BMH_MEASURE_VAL_QUIT) {
- $sql = "UPDATE `".$xoopsDB->prefix("mod_xnewsletter_subscr")."` INNER JOIN `";
- $sql .= $xoopsDB->prefix("mod_xnewsletter_catsubscr")."` ON `subscr_id` = `catsubscr_subscrid` ";
+ $sql = "UPDATE `".$xoopsDB->prefix("xnewsletter_subscr")."` INNER JOIN `";
+ $sql .= $xoopsDB->prefix("xnewsletter_catsubscr")."` ON `subscr_id` = `catsubscr_subscrid` ";
$sql .= "SET `catsubscr_quited` = ".time()." WHERE (((`subscr_email`)='";
$sql .= $bmh_email. "'))";
- $result= $xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
+ $result= $xoopsDB->queryF($sql) || die ("MySQL-Error: " . mysql_error());
}
//set bmh_measure for all entries in bmh with this email
- $sql_upd = "UPDATE ".$xoopsDB->prefix("mod_xnewsletter_bmh")." SET ";
+ $sql_upd = "UPDATE ".$xoopsDB->prefix("xnewsletter_bmh")." SET ";
$sql_upd .="`bmh_measure` = '".$bmh_measure."'";
$sql_upd .=", `bmh_submitter` = '".$xoopsUser->uid()."'";
$sql_upd .=", `bmh_created` = '".time()."'";
- $sql_upd .=" WHERE ((`".$xoopsDB->prefix("mod_xnewsletter_bmh")."`.`bmh_email` ='".$bmh_email."') AND (`".$xoopsDB->prefix("mod_xnewsletter_bmh")."`.`bmh_measure` ='0'))";
- $result= $xoopsDB->queryF($sql_upd) or die ("MySQL-Error: " . mysql_error());
+ $sql_upd .=" WHERE ((`".$xoopsDB->prefix("xnewsletter_bmh")."`.`bmh_email` ='".$bmh_email."') AND (`".$xoopsDB->prefix("xnewsletter_bmh")."`.`bmh_measure` ='0'))";
+ $result= $xoopsDB->queryF($sql_upd) || die ("MySQL-Error: " . mysql_error());
redirect_header("bmh.php?op=list&filter=".$filter, 3, _AM_XNEWSLETTER_FORMOK);
@@ -172,7 +172,7 @@
$bmh->mailbox_username = $accounts_arr[$acc]->getVar("accounts_username"); // your mailbox username
$bmh->mailbox_password = $accounts_arr[$acc]->getVar("accounts_password"); // your mailbox password
$bmh->port = $accounts_arr[$acc]->getVar("accounts_port_in"); // the port to access your mailbox, default is 143
- if ($accounts_arr[$acc]->getVar("accounts_type") == _AM_ACCOUNTS_TYPE_VAL_POP3) {
+ if ($accounts_arr[$acc]->getVar("accounts_type") == _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3) {
$bmh->service = 'pop3'; // the service to use (imap or pop3), default is 'imap'
} else {
$bmh->service = 'imap'; // the service to use (imap or pop3), default is 'imap'
@@ -397,6 +397,9 @@
}
include "admin_footer.php";
+/**
+ * @return float
+ */
function microtime_float() {
list($usec, $sec) = explode(" ", microtime());
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh_callback_database.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh_callback_database.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/bmh_callback_database.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -20,6 +20,19 @@
require_once "admin_header.php";
+/**
+ * @param $msgnum
+ * @param $bounce_type
+ * @param $email
+ * @param $subject
+ * @param $xheader
+ * @param $remove
+ * @param bool $rule_no
+ * @param bool $rule_cat
+ * @param int $totalFetched
+ *
+ * @return bool
+ */
function callbackAction ($msgnum, $bounce_type, $email, $subject, $xheader, $remove, $rule_no = false, $rule_cat = false, $totalFetched = 0) {
global $xoopsUser;
$xnewsletter = xNewsletterxNewsletter::getInstance();
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/import.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/import.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/import.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -104,7 +104,7 @@
$cat_arr=$xnewsletter->getHandler('xNewsletter_cat')->getall($criteria);
foreach (array_keys($import_arr) as $i) {
- $counter++;
+ ++$counter;
$form .= "<tr class=\"" . $class . "\">";
$class = ($class == "even") ? "odd" : "even";
$form .= "<td align=\"center\">".$counter;
@@ -194,10 +194,10 @@
break;
case "apply_import_form":
- //update mod_xnewsletter with settings form_import
+ //update xnewsletter with settings form_import
$counter = xNewsletter_CleanVars($_REQUEST, 'counter', 0, 'int');
- for ($i=1; $i < ($counter + 1); $i++) {
+ for ($i=1; $i < ($counter + 1); ++$i) {
$import_id = xNewsletter_CleanVars($_REQUEST, 'import_id_'.$i, 'default', 'string');
$subscr_firstname = xNewsletter_CleanVars($_REQUEST, 'firstname_'.$i, '', 'string');
$subscr_lastname = xNewsletter_CleanVars($_REQUEST, 'lastname_'.$i, '', 'string');
@@ -207,14 +207,14 @@
if ($cat_id > 0) {
if ($subscr_id == 0) {
//update sex, firstname, lastname
- $sql = "UPDATE {$xoopsDB->prefix('mod_xnewsletter_import')}";
+ $sql = "UPDATE {$xoopsDB->prefix('xnewsletter_import')}";
$sql .= " SET `import_sex`='{$subscr_sex}', `import_firstname`='{$subscr_firstname}', `import_lastname`='{$subscr_lastname}'";
$sql .= " WHERE `import_id`={$import_id}";
$result=$xoopsDB->queryF($sql);
}
}
//update cat_id and import_status
- $sql = "UPDATE {$xoopsDB->prefix('mod_xnewsletter_import')}";
+ $sql = "UPDATE {$xoopsDB->prefix('xnewsletter_import')}";
$sql .= " SET `import_cat_id`='{$cat_id}', `import_status`=1";
$sql.= " WHERE `import_id`={$import_id}";
$result=$xoopsDB->queryF($sql);
@@ -224,8 +224,8 @@
break;
case "exec_import_final":
- //execute final import of all data from mod_xnewsletter_import, where import_status = 1
- //delete data from mod_xnewsletter_import, when imported (successful or not)
+ //execute final import of all data from xnewsletter_import, where import_status = 1
+ //delete data from xnewsletter_import, when imported (successful or not)
$indexAdmin->addItemButton(_AM_XNEWSLETTER_IMPORT_PLUGINS_AVAIL, $currentFile, 'list');
echo $indexAdmin->renderButton();
@@ -238,11 +238,11 @@
$numrows_act = $xnewsletter->getHandler('xNewsletter_import')->getCount($import_criteria);
if ($numrows_act > 0) {
$sql = "SELECT *";
- $sql .= " FROM {$xoopsDB->prefix("mod_xnewsletter_import")}";
+ $sql .= " FROM {$xoopsDB->prefix("xnewsletter_import")}";
$sql .= " WHERE ((import_status)=1)";
$sql .= " ORDER BY `import_id` ASC";
$counter = 0;
- $users_import = $xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
+ $users_import = $xoopsDB->queryF($sql) || die ("MySQL-Error: " . mysql_error());
while ($user_import = mysql_fetch_assoc($users_import)) {
$import_id = $user_import["import_id"];
$subscr_email = $user_import["import_email"];
@@ -271,7 +271,7 @@
unset($user);
$sql = "INSERT";
- $sql .= " INTO `{$xoopsDB->prefix('mod_xnewsletter_subscr')}`";
+ $sql .= " INTO `{$xoopsDB->prefix('xnewsletter_subscr')}`";
$sql .= " (`subscr_email`, `subscr_firstname`, `subscr_lastname`, `subscr_uid`, `subscr_sex`, `subscr_submitter`, `subscr_created`, `subscr_ip`, `subscr_activated`, `subscr_actoptions`)";
$sql .= " VALUES ('{$subscr_email}', '{$subscr_firstname}', '{$subscr_lastname}', " . intval($subscr_uid) . ", '{$subscr_sex}', {$submitter}, " . time() . ",'{$ip}', '1', '')";
if (!$xoopsDB->queryF($sql)) {
@@ -291,7 +291,7 @@
if ($catsubscr_id==0) {
//add subscription of this email
$sql = "INSERT";
- $sql .= " INTO `{$xoopsDB->prefix('mod_xnewsletter_catsubscr')}`";
+ $sql .= " INTO `{$xoopsDB->prefix('xnewsletter_catsubscr')}`";
$sql .= " (`catsubscr_catid`, `catsubscr_subscrid`, `catsubscr_submitter`, `catsubscr_created`)";
$sql .= " VALUES ({$cat_id}, {$subscr_id}, {$submitter}," . time() . ")";
if ($xoopsDB->queryF($sql)) {
@@ -299,7 +299,7 @@
//handle mailinglists
$cat_mailinglist = 0;
$sql = "SELECT `cat_mailinglist`";
- $sql .= " FROM {$xoopsDB->prefix("mod_xnewsletter_cat")}";
+ $sql .= " FROM {$xoopsDB->prefix("xnewsletter_cat")}";
$sql .= " WHERE (`cat_id`={$cat_id}) LIMIT 1";
if ($cat_mls = $xoopsDB->queryF($sql)) {
$cat_ml = mysql_fetch_array($cat_mls);
@@ -321,7 +321,7 @@
}
}
$sql_del = "DELETE";
- $sql_del .= " FROM {$xoopsDB->prefix('mod_xnewsletter_import')}";
+ $sql_del .= " FROM {$xoopsDB->prefix('xnewsletter_import')}";
$sql_del .= " WHERE `import_id`={$import_id}";
$result = $xoopsDB->queryF($sql_del);
}
@@ -343,7 +343,7 @@
$form_continue .= '<input id="op" type="hidden" value="show_formcheck" name="op">';
} else {
// set import_status = 1 for next package
- $sql_update = "UPDATE ".$xoopsDB->prefix("mod_xnewsletter_import")." SET `import_status`=1 ORDER BY import_id LIMIT ".$limitcheck;
+ $sql_update = "UPDATE ".$xoopsDB->prefix("xnewsletter_import")." SET `import_status`=1 ORDER BY import_id LIMIT ".$limitcheck;
$xoopsDB->queryF($sql_update);
//execute import for the next package
$form_continue .= '<input id="op" type="hidden" value="exec_import_final" name="op">';
@@ -361,7 +361,7 @@
break;
case "searchdata":
- //delete all existing data, import data into mod_xnewsletter_import with plugin
+ //delete all existing data, import data into xnewsletter_import with plugin
//set cat_id as preselected, update information about existing registration/subscriptions
//if ($action_after_read==1) execute import else show form for check before executing import
@@ -380,10 +380,10 @@
}
//delete all existing data
- $sql = "TRUNCATE TABLE ".$xoopsDB->prefix('mod_xnewsletter_import');
+ $sql = "TRUNCATE TABLE ".$xoopsDB->prefix('xnewsletter_import');
$result= $xoopsDB->queryF($sql);
- //import data into mod_xnewsletter_import with plugin
+ //import data into xnewsletter_import with plugin
if ($plugin == 'csv') {
$csv_file = $_FILES['csv_file']['tmp_name'];
$csv_header = xNewsletter_CleanVars($_REQUEST, 'csv_header', 0, 'int');
@@ -444,10 +444,15 @@
}
include "admin_footer.php";
+/**
+ * @param $prot_text
+ * @param $success
+ * @param $submitter
+ */
function createProtocol($prot_text, $success, $submitter) {
global $xoopsDB;
- $sql = "INSERT INTO `{$xoopsDB->prefix('mod_xnewsletter_protocol')}`";
+ $sql = "INSERT INTO `{$xoopsDB->prefix('xnewsletter_protocol')}`";
$sql .= " (`protocol_letter_id`, `protocol_subscriber_id`, `protocol_status`, `protocol_success`, `protocol_submitter`, `protocol_created`)";
$sql .= " VALUES (0,0,'{$prot_text}', {$success}, {$submitter}, " . time() . ")";
- $xoopsDB->queryF($sql) or die ("MySQL-Error: " . mysql_error());
+ $xoopsDB->queryF($sql) || die ("MySQL-Error: " . mysql_error());
}
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/letter.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/letter.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -169,7 +169,7 @@
$j = 0;
$cat_arr = explode("|" , $letter_arr[$i]->getVar("letter_cats"));
foreach ($cat_arr as $cat) {
- $j++;
+ ++$j;
$cat_obj = $xnewsletter->getHandler('xNewsletter_cat')->get($cat);
if (count($cat_arr)>1) $letter_cats .= "($j) ";
if (is_object($cat_obj)) {
@@ -325,7 +325,7 @@
copy($indexFile, $uploaddir . "index.html");
}
- for ($upl = 0 ;$upl < 5; $upl++) {
+ for ($upl = 0 ;$upl < 5; ++$upl) {
$uploader = new XoopsMediaUploader($uploaddir, $xnewsletter->getConfig('xn_mimetypes'), $xnewsletter->getConfig('xn_maxsize'), null, null);
if ($uploader->fetchMedia(@$_POST['xoops_upload_file'][$upl])) {
//$uploader->setPrefix("xn_") ; keep original name
@@ -423,8 +423,8 @@
if ($xnewsletter->getHandler('xNewsletter_letter')->delete($letterObj)) {
//delete protocol
- $sql = "DELETE FROM `".$xoopsDB->prefix("mod_xnewsletter_protocol")."` WHERE `protocol_letter_id`=".$letter_id;
- $result = $xoopsDB->query($sql) or die("MySQL-Error: " . mysql_error());
+ $sql = "DELETE FROM `".$xoopsDB->prefix("xnewsletter_protocol")."` WHERE `protocol_letter_id`=".$letter_id;
+ $result = $xoopsDB->query($sql) || die("MySQL-Error: " . mysql_error());
//delete attachments
$crit_att = new CriteriaCompo();
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/maintenance.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/maintenance.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/maintenance.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -153,13 +153,13 @@
case 'del_import':
if (isset($_POST["ok"]) && $_POST["ok"] == "1") {
- $sql = "TRUNCATE TABLE `{$xoopsDB->prefix('mod_xnewsletter_import')}`";
+ $sql = "TRUNCATE TABLE `{$xoopsDB->prefix('xnewsletter_import')}`";
$result = $xoopsDB->queryF($sql);
- $sql = "REPAIR TABLE `{$xoopsDB->prefix('mod_xnewsletter_import')}`";
+ $sql = "REPAIR TABLE `{$xoopsDB->prefix('xnewsletter_import')}`";
$result = $xoopsDB->queryF($sql);
- $sql = "OPTIMIZE TABLE `{$xoopsDB->prefix('mod_xnewsletter_import')}`";
+ $sql = "OPTIMIZE TABLE `{$xoopsDB->prefix('xnewsletter_import')}`";
$result = $xoopsDB->queryF($sql);
- $sql = "ALTER TABLE `{$xoopsDB->prefix('mod_xnewsletter_import')}` AUTO_INCREMENT =1";
+ $sql = "ALTER TABLE `{$xoopsDB->prefix('xnewsletter_import')}` AUTO_INCREMENT =1";
$result = $xoopsDB->queryF($sql);
$obj =& $xnewsletter->getHandler('xNewsletter_protocol')->create();
@@ -201,16 +201,16 @@
$delusers = $xnewsletter->getHandler('xNewsletter_subscr')->getall($criteria, array('subscr_id'), false, false);
foreach ($delusers as $id => $user) {
$obj =& $xnewsletter->getHandler('xNewsletter_subscr')->get(intval($user['subscr_id']));
- $sql = "DELETE FROM `{$xoopsDB->prefix('mod_xnewsletter_subscr')}` WHERE subscr_id={$user['subscr_id']}";
+ $sql = "DELETE FROM `{$xoopsDB->prefix('xnewsletter_subscr')}` WHERE subscr_id={$user['subscr_id']}";
$result = $xoopsDB->queryF($sql);
if ($result) {
// Newsletterlist delete
- $sql = "DELETE FROM `{$xoopsDB->prefix('mod_xnewsletter_catsubscr')}` WHERE catsubscr_subscrid={$user['subscr_id']}";
+ $sql = "DELETE FROM `{$xoopsDB->prefix('xnewsletter_catsubscr')}` WHERE catsubscr_subscrid={$user['subscr_id']}";
$result = $xoopsDB->queryF($sql);
if (!$result) {
$error[] = "Error CAT-Subscr-ID: " . $user['subscr_id'] . " / " . $result->getHtmlErrors();
}
- $delete++;
+ ++$delete;
} else {
$error[] = "Error Subscr-ID: " . $user['subscr_id'] . " / " . $result->getHtmlErrors();
}
@@ -253,13 +253,13 @@
case 'del_oldprotocol':
if (isset($_POST["ok"]) && $_POST["ok"] == "1") {
- $sql = "TRUNCATE TABLE `".$xoopsDB->prefix('mod_xnewsletter_protocol')."`";
+ $sql = "TRUNCATE TABLE `".$xoopsDB->prefix('xnewsletter_protocol')."`";
$result = $xoopsDB->queryF($sql);
- $sql = "REPAIR TABLE `".$xoopsDB->prefix('mod_xnewsletter_protocol')."`";
+ $sql = "REPAIR TABLE `".$xoopsDB->prefix('xnewsletter_protocol')."`";
$result = $xoopsDB->queryF($sql);
- $sql = "OPTIMIZE TABLE `".$xoopsDB->prefix('mod_xnewsletter_protocol')."`";
+ $sql = "OPTIMIZE TABLE `".$xoopsDB->prefix('xnewsletter_protocol')."`";
$result = $xoopsDB->queryF($sql);
- $sql = "ALTER TABLE `".$xoopsDB->prefix('mod_xnewsletter_protocol')."` AUTO_INCREMENT =1";
+ $sql = "ALTER TABLE `".$xoopsDB->prefix('xnewsletter_protocol')."` AUTO_INCREMENT =1";
$result = $xoopsDB->queryF($sql);
$obj =& $xnewsletter->getHandler('xNewsletter_protocol')->create();
@@ -290,16 +290,16 @@
$number_ids = 0;
$delete = 0;
$error = array();
- $sql = "SELECT Count(`catsubscr_id`) AS `nb_ids` FROM `".$xoopsDB->prefix("mod_xnewsletter_catsubscr")."` LEFT JOIN `".$xoopsDB->prefix("mod_xnewsletter_subscr")."` ON `catsubscr_subscrid` = `subscr_id` WHERE (`subscr_id` Is Null)";
+ $sql = "SELECT Count(`catsubscr_id`) AS `nb_ids` FROM `".$xoopsDB->prefix("xnewsletter_catsubscr")."` LEFT JOIN `".$xoopsDB->prefix("xnewsletter_subscr")."` ON `catsubscr_subscrid` = `subscr_id` WHERE (`subscr_id` Is Null)";
if ( $result = $xoopsDB->query($sql) ) {
$row_result = $xoopsDB->fetchRow($result);
$number_ids = $row_result[0];
}
if ($number_ids > 0) {
- $sql = "DELETE `".$xoopsDB->prefix("mod_xnewsletter_catsubscr")."` FROM `".$xoopsDB->prefix("mod_xnewsletter_catsubscr")."` LEFT JOIN `".$xoopsDB->prefix("mod_xnewsletter_subscr")."` ON `catsubscr_subscrid` = `subscr_id` WHERE (`subscr_id` Is Null)";
+ $sql = "DELETE `".$xoopsDB->prefix("xnewsletter_catsubscr")."` FROM `".$xoopsDB->prefix("xnewsletter_catsubscr")."` LEFT JOIN `".$xoopsDB->prefix("xnewsletter_subscr")."` ON `catsubscr_subscrid` = `subscr_id` WHERE (`subscr_id` Is Null)";
$result = $xoopsDB->query($sql);
if ($result = $xoopsDB->query($sql)) {
- $delete++;
+ ++$delete;
} else {
$error[] = "Error delete catsubscr: " . $result->getHtmlErrors();
}
@@ -346,30 +346,30 @@
$error = array();
if ($use_mailinglist == 0 || $use_mailinglist == '0') {
//set cat_mailinglist = 0, if use mailinglist = false (if someone changed module preferences later)
- $sql = "SELECT Count(`cat_id`) AS `nb_ids` FROM `".$xoopsDB->prefix("mod_xnewsletter_cat")."` WHERE (`cat_mailinglist` > 0)";
+ $sql = "SELECT Count(`cat_id`) AS `nb_ids` FROM `".$xoopsDB->prefix("xnewsletter_cat")."` WHERE (`cat_mailinglist` > 0)";
if ( $result = $xoopsDB->query($sql) ) {
$row_result = $xoopsDB->fetchRow($result);
$number_ids = $row_result[0];
}
if ($number_ids > 0) {
- $sql = "UPDATE `".$xoopsDB->prefix("mod_xnewsletter_cat")."` SET `cat_mailinglist` = 0";
+ $sql = "UPDATE `".$xoopsDB->prefix("xnewsletter_cat")."` SET `cat_mailinglist` = 0";
if ($result = $xoopsDB->query($sql)) {
- $update++;
+ ++$update;
} else {
$error[] = "Error update cat_mailinglist: " . $result->getHtmlErrors();
}
}
} else {
//set cat_mailinglist = 0, if mailinglist_id is no more existing in table mailinglist
- $sql = "SELECT Count(`cat_mailinglist`) AS `nb_ids` FROM `".$xoopsDB->prefix("mod_xnewsletter_cat")."` LEFT JOIN `".$xoopsDB->prefix("mod_xnewsletter_mailinglist")."` ON `cat_mailinglist` = `mailinglist_id` WHERE (((`mailinglist_id`) Is Null) AND ((`cat_mailinglist`)>0)) HAVING (((Count(`cat_mailinglist`))>0));";
+ $sql = "SELECT Count(`cat_mailinglist`) AS `nb_ids` FROM `".$xoopsDB->prefix("xnewsletter_cat")."` LEFT JOIN `".$xoopsDB->prefix("xnewsletter_mailinglist")."` ON `cat_mailinglist` = `mailinglist_id` WHERE (((`mailinglist_id`) Is Null) AND ((`cat_mailinglist`)>0)) HAVING (((Count(`cat_mailinglist`))>0));";
if ( $result = $xoopsDB->query($sql) ) {
$row_result = $xoopsDB->fetchRow($result);
$number_ids = $row_result[0];
}
if ($number_ids > 0) {
- $sql = "UPDATE `".$xoopsDB->prefix("mod_xnewsletter_cat")."` LEFT JOIN `".$xoopsDB->prefix("mod_xnewsletter_mailinglist")."` ON `cat_mailinglist` = `mailinglist_id` SET `cat_mailinglist` = 0 WHERE (((`cat_mailinglist`)>0) AND ((`mailinglist_id`) Is Null));";
+ $sql = "UPDATE `".$xoopsDB->prefix("xnewsletter_cat")."` LEFT JOIN `".$xoopsDB->prefix("xnewsletter_mailinglist")."` ON `cat_mailinglist` = `mailinglist_id` SET `cat_mailinglist` = 0 WHERE (((`cat_mailinglist`)>0) AND ((`mailinglist_id`) Is Null));";
if ($result = $xoopsDB->query($sql)) {
- $update++;
+ ++$update;
} else {
$error[] = "Error update cat_mailinglist: " . $result->getHtmlErrors();
}
@@ -438,7 +438,7 @@
$obj_letter = $xnewsletter->getHandler('xNewsletter_letter')->get($letter_id);
$obj_letter->setVar("letter_cats", $letter_cats_new);
if ($xnewsletter->getHandler('xNewsletter_letter')->insert($obj_letter)) {
- $update++;
+ ++$update;
} else {
$error[] = "Error update cat: " . $result->getHtmlErrors();
}
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/protocol.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/protocol.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/protocol.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -87,7 +87,7 @@
$protocol_created = "";
$p = 0;
foreach ($protocol_arr as $protocol) {
- $p++;
+ ++$p;
if (count($protocol_arr)>1) $protocol_status .="($p) ";
$protocol_status .= $protocol->getVar("protocol_status")."<br/>";
$protocol_created .= formatTimeStamp($protocol->getVar("protocol_created"),"M")."<br/>";
@@ -123,7 +123,7 @@
$p = 0;
foreach ($protocol_arr as $protocol) {
- $p++;
+ ++$p;
if (count($protocol_arr)>1) $protocol_status .="($p) ";
$protocol_status .= $protocol->getVar("protocol_status")."<br/>";
$protocol_created .= formatTimeStamp($protocol->getVar("protocol_created"),"M")."<br/>";
@@ -315,7 +315,7 @@
if ( !$GLOBALS["xoopsSecurity"]->check() ) {
redirect_header("protocol.php", 3, implode(",", $GLOBALS["xoopsSecurity"]->getErrors()));
}
- $sql = "DELETE FROM `".$xoopsDB->prefix("mod_xnewsletter_protocol")."` WHERE `protocol_letter_id`=$letter_id;";
+ $sql = "DELETE FROM `".$xoopsDB->prefix("xnewsletter_protocol")."` WHERE `protocol_letter_id`=$letter_id;";
$result = $xoopsDB->query($sql);
if ($result) {
redirect_header("protocol.php", 3, _AM_XNEWSLETTER_FORMDELOK);
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/subscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/subscr.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/admin/subscr.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -305,7 +305,7 @@
}
if ($xnewsletter->getHandler('xNewsletter_subscr')->delete($obj)) {
// Newsletterlist delete
- $sql = "DELETE FROM `".$xoopsDB->prefix('mod_xnewsletter_catsubscr')."` WHERE catsubscr_subscrid=" . $subscr_id;
+ $sql = "DELETE FROM `".$xoopsDB->prefix('xnewsletter_catsubscr')."` WHERE catsubscr_subscrid=" . $subscr_id;
$result = $xoopsDB->queryF($sql);
redirect_header("subscr.php", 3, _AM_XNEWSLETTER_FORMDELOK);
} else {
Added: XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_search.png
===================================================================
(Binary files differ)
Index: XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_search.png
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_search.png 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_search.png 2014-06-02 08:10:39 UTC (rev 12559)
Property changes on: XoopsModules/xnewsletter/branches/mamba/xNewsletter/assets/images/icons/xn_search.png
___________________________________________________________________
Added: svn:mime-type
## -0,0 +1 ##
+application/octet-stream
\ No newline at end of property
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/blocks/blocks_catsubscr.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/blocks/blocks_catsubscr.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/blocks/blocks_catsubscr.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -25,9 +25,14 @@
* Version : 1 Mon 2012/11/05 14:31:32 : Exp $
* ****************************************************************************
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
include_once dirname(dirname(__FILE__)) . '/include/common.php';
+/**
+ * @param $options
+ *
+ * @return array
+ */
function b_xnewsletter_catsubscr($options) {
global $xoopsUser;
$xnewsletter = xNewsletterxNewsletter::getInstance();
@@ -82,6 +87,11 @@
return $catsubscr;
}
+/**
+ * @param $options
+ *
+ * @return string
+ */
function b_xnewsletter_catsubscr_edit($options) {
global $xoopsUser;
$xnewsletter = xNewsletterxNewsletter::getInstance();
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/blocks/blocks_letter.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/blocks/blocks_letter.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/blocks/blocks_letter.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -25,9 +25,14 @@
* Version : 1 Mon 2012/11/05 14:31:32 : Exp $
* ****************************************************************************
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
include_once dirname(dirname(__FILE__)) . '/include/common.php';
+/**
+ * @param $options
+ *
+ * @return array
+ */
function b_xnewsletter_letter($options) {
global $xoopsUser;
$myts = MyTextSanitizer::getInstance();
@@ -98,6 +103,11 @@
return $letter;
}
+/**
+ * @param $options
+ *
+ * @return string
+ */
function b_xnewsletter_letter_edit($options) {
$form = "" . _MB_XNEWSLETTER_LETTER_DISPLAY . "\n";
$form .= "<input type=\"hidden\" name=\"options[0]\" value=\"{$options[0]}\" />";
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/blocks/blocks_subscrinfo.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/blocks/blocks_subscrinfo.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/blocks/blocks_subscrinfo.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -25,9 +25,14 @@
* Version : 1 Mon 2012/11/05 14:31:32 : Exp $
* ****************************************************************************
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
include_once dirname(dirname(__FILE__)) . '/include/common.php';
+/**
+ * @param $options
+ *
+ * @return array
+ */
function b_xnewsletter_subscrinfo($options) {
xoops_loadLanguage('modinfo', 'xNewsletter');
$unique_id = uniqid(mt_rand());
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/breadcrumb.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/breadcrumb.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/breadcrumb.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -25,13 +25,16 @@
* $breadcrumb->addLink( 'bread 3', 'index3.php' );
* echo $breadcrumb->render();
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
class xNewsletterBreadcrumb
{
var $dirname;
var $_bread = array();
+ /**
+ *
+ */
function __construct()
{
$this->dirname = basename(dirname(dirname(__FILE__)));
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/request.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/request.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/request.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -244,11 +244,25 @@
return (string) xNewsletterRequest::getVar($name, $default, $hash, 'string', $mask);
}
+ /**
+ * @param $name
+ * @param array $default
+ * @param string $hash
+ *
+ * @return mixed
+ */
static function getArray($name, $default = array(), $hash = 'default')
{
return xNewsletterRequest::getVar($name, $default, $hash, 'array');
}
+ /**
+ * @param $name
+ * @param string $default
+ * @param string $hash
+ *
+ * @return string
+ */
static function getText($name, $default = '', $hash = 'default')
{
return (string) xNewsletterRequest::getVar($name, $default, $hash, 'string', PUBLISHER_REQUEST_ALLOWRAW);
@@ -735,7 +749,7 @@
// Iteration provides nested tag protection
while ($source != $this->_cleanTags($source)) {
$source = $this->_cleanTags($source);
- $loopCounter++;
+ ++$loopCounter;
}
return $source;
@@ -861,7 +875,7 @@
// Open or Single tag
$attrSet = $this->_cleanAttributes($attrSet);
$preTag .= '<' . $tagName;
- for ($i = 0; $i < count($attrSet); $i++) {
+ for ($i = 0; $i < count($attrSet); ++$i) {
$preTag .= ' ' . $attrSet[$i];
}
// Reformat single tags to XHTML
@@ -901,7 +915,7 @@
// Initialize variables
$newSet = array();
// Iterate through attribute pairs
- for ($i = 0; $i < count($attrSet); $i++) {
+ for ($i = 0; $i < count($attrSet); ++$i) {
// Skip blank spaces
if (!$attrSet[$i]) {
continue;
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/session.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/session.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/session.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -19,10 +19,13 @@
* @author Harry Fuecks (PHP Anthology Volume II)
* @version svn:$id$
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
include_once dirname(dirname(__FILE__)) . '/include/common.php';
+/**
+ * Class xNewsletterSession
+ */
class xNewsletterSession
{
/**
@@ -92,6 +95,9 @@
session_destroy();
}
+ /**
+ * @return xNewsletterSession
+ */
public static function &getInstance()
{
static $_sess;
Modified: XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_accounts.php
===================================================================
--- XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_accounts.php 2014-06-02 06:37:39 UTC (rev 12558)
+++ XoopsModules/xnewsletter/branches/mamba/xNewsletter/class/xNewsletter_accounts.php 2014-06-02 08:10:39 UTC (rev 12559)
@@ -26,13 +26,20 @@
* ****************************************************************************
*/
-defined("XOOPS_ROOT_PATH") or die("XOOPS root path not defined");
+// defined("XOOPS_ROOT_PATH") || die("XOOPS root path not defined");
include_once dirname(dirname(__FILE__)) . '/include/common.php';
+
+/**
+ * Class xnewsletter_accounts
+ */
class xnewsletter_accounts extends XoopsObject
{
public $xnewsletter = null;
//Constructor
+ /**
+ *
+ */
public function __construct()
{
$this->xnewsletter = xNewsletterxNewsletter::getInstance();
@@ -61,6 +68,11 @@
$this->initVar("accounts_created", XOBJ_DTYPE_INT, null, false, 10);
}
+ /**
+ * @param bool $action
+ *
+ * @return XoopsThemeForm
+ */
public function getForm($action = false)
{
global $xoopsDB, $xoopsModule;
@@ -78,7 +90,7 @@
$default = $this->getVar("accounts_type");
switch ($default) {
- case _AM_ACCOUNTS_TYPE_VAL_PHP_MAIL:
+ case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL:
default:
$dis_accounts_userpass = "1";
$dis_accounts_server_in = "1";
@@ -86,22 +98,22 @@
$dis_accounts_use_bmh = "1";
$dis_accounts_button_check = "1";
break;
- case _AM_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL:
+ case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL:
$dis_accounts_userpass = "0";
$dis_accounts_server_in = "1";
$dis_accounts_server_out = "0";
$dis_accounts_use_bmh = "1";
$dis_accounts_button_check = "1";
break;
- case _AM_ACCOUNTS_TYPE_VAL_POP3:
+ case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3:
$dis_accounts_userpass = "0";
$dis_accounts_server_in = "0";
$dis_accounts_server_out = "0";
$dis_accounts_use_bmh = "1";
$dis_accounts_button_check = "0";
break;
- case _AM_ACCOUNTS_TYPE_VAL_SMTP:
- case _AM_ACCOUNTS_TYPE_VAL_GMAIL:
+ case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_SMTP:
+ case _AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_GMAIL:
$dis_accounts_userpass = "0";
$dis_accounts_server_in = "0";
$dis_accounts_server_out = "0";
@@ -112,11 +124,11 @@
$accstd_select = new XoopsFormSelect(_AM_XNEWSLETTER_ACCOUNTS_TYPE, "accounts_type", $this->getVar("accounts_type"));
$accstd_select->setextra('onchange="document.forms.' . $xoopsModule->getVar('dirname') . '_form.submit()"');
- $accstd_select->addOption(_AM_ACCOUNTS_TYPE_VAL_PHP_MAIL, _AM_ACCOUNTS_TYPE_PHPMAIL);
- $accstd_select->addOption(_AM_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL, _AM_ACCOUNTS_TYPE_PHPSENDMAIL);
- $accstd_select->addOption(_AM_ACCOUNTS_TYPE_VAL_POP3, _AM_ACCOUNTS_TYPE_POP3);
- $accstd_select->addOption(_AM_ACCOUNTS_TYPE_VAL_SMTP, _AM_ACCOUNTS_TYPE_SMTP);
- $accstd_select->addOption(_AM_ACCOUNTS_TYPE_VAL_GMAIL, _AM_ACCOUNTS_TYPE_GMAIL);
+ $accstd_select->addOption(_AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_MAIL, _AM_XNEWSLETTER_ACCOUNTS_TYPE_PHPMAIL);
+ $accstd_select->addOption(_AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_PHP_SENDMAIL, _AM_XNEWSLETTER_ACCOUNTS_TYPE_PHPSENDMAIL);
+ $accstd_select->addOption(_AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_POP3, _AM_XNEWSLETTER_ACCOUNTS_TYPE_POP3);
+ $accstd_select->addOption(_AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_SMTP, _AM_XNEWSLETTER_ACCOUNTS_TYPE_SMTP);
+ $accstd_select->addOption(_AM_XNEWSLETTER_ACCOUNTS_TYPE_VAL_GMAIL, _AM_XNEWSLETTER_ACCOUNTS_TYPE_GMAIL);
$form->addElement($accstd_select, true);
$form->addElement(new XoopsFormText(_AM_XNEWSLETTER_ACCOUNTS_NAME, "accounts_name", 50, 255, $this->getVar("accounts_name")), true);
@@ -203,6 +215,9 @@
}
}
+/**
+ * Class xNewsletterxnewsletter_accountsHandler
+ */
class xNewsletterxnewsletter_accountsHandler extends XoopsPersistable...
[truncated message content] |
