|
From: <go...@us...> - 2013-11-26 14:08:13
|
Revision: 12232
http://sourceforge.net/p/xoops/svn/12232
Author: goffy
Date: 2013-11-26 14:08:09 +0000 (Tue, 26 Nov 2013)
Log Message:
-----------
fixed bugs in display (cesag/goffy)
Modified Paths:
--------------
XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_letter.php
XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_letter.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_letter.php 2013-11-21 22:19:06 UTC (rev 12231)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_letter.php 2013-11-26 14:08:09 UTC (rev 12232)
@@ -169,6 +169,7 @@
$crit_accounts->setSort("accounts_id");
$crit_accounts->setOrder("ASC");
$numrows_accounts = $accountsHandler->getCount($crit_accounts);
+ $account_default = 0;
if ($this->isNew()) {
$accounts_arr = $accountsHandler->getall($crit_accounts);
foreach ($accounts_arr as $account) {
Modified: XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php 2013-11-21 22:19:06 UTC (rev 12231)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/class/xNewsletter_subscr.php 2013-11-26 14:08:09 UTC (rev 12232)
@@ -99,13 +99,13 @@
$form->addElement(new XoopsFormLabel("<span style='text-decoration:underline'>"._MA_XNEWSLETTER_SUBSCRIPTION_INFO_PERS."</span>",""));
$subscr_id = $this->isNew() ? 0 : $this->getVar("subscr_id");
if ($subscr_id > 0 || $this->getVar("subscr_email") != "") {
- $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_SUBSCR_EMAIL.": ", $this->getVar("subscr_email")));
+ $form->addElement(new XoopsFormLabel(_AM_XNEWSLETTER_SUBSCR_EMAIL, $this->getVar("subscr_email")));
$form->addElement(new XoopsFormHidden("subscr_email", $this->getVar("subscr_email")));
} else {
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_EMAIL.": ", "subscr_email", 50, 255, $this->getVar("subscr_email")), true);
+ $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_EMAIL, "subscr_email", 50, 255, $this->getVar("subscr_email")), true);
}
if ($xoopsModuleConfig["xn_use_salutation"] == 1) {
- $select_subscr_sex = new XoopsFormSelect(_AM_XNEWSLETTER_SUBSCR_SEX.": ", "subscr_sex", $this->getVar("subscr_sex"));
+ $select_subscr_sex = new XoopsFormSelect(_AM_XNEWSLETTER_SUBSCR_SEX, "subscr_sex", $this->getVar("subscr_sex"));
$select_subscr_sex->addOption(_AM_XNEWSLETTER_SUBSCR_SEX_EMPTY,_AM_XNEWSLETTER_SUBSCR_SEX_EMPTY);
$select_subscr_sex->addOption(_AM_XNEWSLETTER_SUBSCR_SEX_FEMALE,_AM_XNEWSLETTER_SUBSCR_SEX_FEMALE);
$select_subscr_sex->addOption(_AM_XNEWSLETTER_SUBSCR_SEX_MALE,_AM_XNEWSLETTER_SUBSCR_SEX_MALE);
@@ -113,9 +113,9 @@
$select_subscr_sex->addOption(_AM_XNEWSLETTER_SUBSCR_SEX_FAMILY,_AM_XNEWSLETTER_SUBSCR_SEX_FAMILY);
$form->addElement($select_subscr_sex);
}
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_FIRSTNAME.": ", "subscr_firstname", 50, 255, $this->getVar("subscr_firstname")), false);
+ $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_FIRSTNAME, "subscr_firstname", 50, 255, $this->getVar("subscr_firstname")), false);
- $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_LASTNAME.": ", "subscr_lastname", 50, 255, $this->getVar("subscr_lastname")), false);
+ $form->addElement(new XoopsFormText(_AM_XNEWSLETTER_SUBSCR_LASTNAME, "subscr_lastname", 50, 255, $this->getVar("subscr_lastname")), false);
$form->addElement(new XoopsFormLabel("<br/><br/>", ""));
|