[xoops-svn] SF.net SVN: xoops-svn:[12233] XoopsModules/xnewsletter/trunk/xNewsletter

[<go...@us...>]

Revision: 12233
          http://sourceforge.net/p/xoops/svn/12233
Author:   goffy
Date:     2013-11-26 17:15:27 +0000 (Tue, 26 Nov 2013)
Log Message:
-----------
added new error code if no emailaccount available (cesag/goffy)

Modified Paths:
--------------
    XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php
    XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php

Modified: XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php	2013-11-26 14:08:09 UTC (rev 12232)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/include/task.inc.php	2013-11-26 17:15:27 UTC (rev 12233)
@@ -178,7 +178,9 @@
     }
 
     //read data of account
-    $obj_account 			    = $accountsHandler->get($obj_letter->getVar("letter_account"));
+    $letter_account = $obj_letter->getVar("letter_account");
+    if ( $letter_account == "" && $letter_account == 0) return _MA_XNEWSLETTER_ACCOUNTS_NONEAVAIL;
+    $obj_account 			    = $accountsHandler->get($letter_account);
     $account_type 			  = $obj_account->getVar("accounts_type");
     $account_yourname 		= $obj_account->getVar("accounts_yourname");
     $account_yourmail 		= $obj_account->getVar("accounts_yourmail");

Modified: XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php
===================================================================
--- XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php	2013-11-26 14:08:09 UTC (rev 12232)
+++ XoopsModules/xnewsletter/trunk/xNewsletter/language/english/main.php	2013-11-26 17:15:27 UTC (rev 12233)
@@ -86,4 +86,6 @@
 define('_MA_XNEWSLETTER_SUBSCRIPTION_UNFINISHED', "<span style='color:red'>Attention: the registration has not been confirm till now. Please click on the activating link in the e-mail we sent you. If you did not get this e-mail, please click <a href='%link'>here</a> to get this mail once more.</span>");
 define('_MA_XNEWSLETTER_PLEASE_LOGIN', "The email address %s belongs to a registered user. <br /> please login to change the data.");
 define('_MA_XNEWSLETTER_LETTER_NONEAVAIL', "No newsletters available for the moment");
+//1.2.2
+define('_MA_XNEWSLETTER_ACCOUNTS_NONEAVAIL', "No email-accounts available for the moment");
 ?>
\ No newline at end of file