ConLite/cl-newsletter
1
0
Fork 0
Code Issues Pull-Requests Releases Wiki Aktivität

Commits vergleichen

Basis: ConLite:develop
Branches Tags
ConLite:develop
ConLite:master
..
vergleichen: ConLite:master
Branches Tags
ConLite:develop
ConLite:master

Keine gemeinsamen Commits. „develop“ und „master“ haben vollständig unterschiedliche Historien.
develop ... master

20 geänderte Dateien mit 317 neuen und 318 gelöschten Zeilen
Statistiken anzeigen Alle Dateien ausklappen Alle Dateien einklappen

1
.gitignore gevendort
Datei anzeigen

@ -1 +0,0 @@
/.project

2
cl_plugin.xml
Datei anzeigen

@ -9,7 +9,7 @@
<copyright>ConLite Team</copyright> <copyright>ConLite Team</copyright>
<mail>cl-newsletter@conlite.org</mail> <mail>cl-newsletter@conlite.org</mail>
<website>https://conlite.org</website> <website>https://conlite.org</website>
<version>1.0.2</version> <version>1.0.0</version>
</general> </general>
<requirements php="5.6"> <requirements php="5.6">
<conlite minversion="2.1.0" /> <conlite minversion="2.1.0" />

20
classes/class.newsletter.php
Datei anzeigen

@ -107,7 +107,7 @@ class NewsletterCollection extends ItemCollection {
if ($oClientLang->getProperty("newsletter", "html_newsletter") == "true") { if ($oClientLang->getProperty("newsletter", "html_newsletter") == "true") {
$iIDArt = conCopyArticle($oBaseItem->get("idart"), $iIDArt = conCopyArticle($oBaseItem->get("idart"),
$oClientLang->getProperty("newsletter", "html_newsletter_idcat"), $oClientLang->getProperty("newsletter", "html_newsletter_idcat"),
sprintf(i18n("Newsletter: %s", "cl-newsletter"), $oItem->get("name"))); sprintf(i18n("Newsletter: %s", "cl_newsletter"), $oItem->get("name")));
conMakeOnline($iIDArt, $lang); // Article has to be online for sending... conMakeOnline($iIDArt, $lang); // Article has to be online for sending...
} }
unset($oClientLang); unset($oClientLang);
@ -541,7 +541,7 @@ class Newsletter extends Item {
$sReturn = $sHTML; $sReturn = $sHTML;
} else { } else {
if ($contenido) { // Use i18n only in backend if ($contenido) { // Use i18n only in backend
$sErrorText = i18n("There was a problem getting the newsletter article using http. Error: %s (%s)", "cl-newsletter"); $sErrorText = i18n("There was a problem getting the newsletter article using http. Error: %s (%s)", "cl_newsletter");
} else { } else {
$sErrorText = "There was a problem getting the newsletter article using http. Error: %s (%s)"; $sErrorText = "There was a problem getting the newsletter article using http. Error: %s (%s)";
} }
@ -646,7 +646,7 @@ class Newsletter extends Item {
// deleted). Exit with error instead of sending as text message only // deleted). Exit with error instead of sending as text message only
if ($contenido) { // Use i18n only in backend if ($contenido) { // Use i18n only in backend
$sError = i18n("Newsletter to %s could not be sent: No html message available", "cl-newsletter"); $sError = i18n("Newsletter to %s could not be sent: No html message available", "cl_newsletter");
} else { } else {
$sError = "Newsletter to %s could not be sent: No html message available"; $sError = "Newsletter to %s could not be sent: No html message available";
} }
@ -717,7 +717,7 @@ class Newsletter extends Item {
if (!isValidMail($sEMail) || strtolower($sEMail) == "sysadmin@ihresite.de") { if (!isValidMail($sEMail) || strtolower($sEMail) == "sysadmin@ihresite.de") {
// No valid destination mail address specified // No valid destination mail address specified
if ($contenido) { // Use i18n only in backend if ($contenido) { // Use i18n only in backend
$sError = i18n("Newsletter to %s could not be sent: No valid e-mail address", "cl-newsletter"); $sError = i18n("Newsletter to %s could not be sent: No valid e-mail address", "cl_newsletter");
} else { } else {
$sError = "Newsletter to %s could not be sent: No valid e-mail address"; $sError = "Newsletter to %s could not be sent: No valid e-mail address";
} }
@ -742,7 +742,7 @@ class Newsletter extends Item {
if (!$oMail->Send()) { if (!$oMail->Send()) {
if ($contenido) { // Use i18n only in backend if ($contenido) { // Use i18n only in backend
$sError = i18n("Newsletter to %s could not be sent", "cl-newsletter"); $sError = i18n("Newsletter to %s could not be sent", "cl_newsletter");
} else { } else {
$sError = "Newsletter to %s could not be sent"; $sError = "Newsletter to %s could not be sent";
} }
@ -804,7 +804,7 @@ class Newsletter extends Item {
// deleted). Exit with error instead of sending as text message only // deleted). Exit with error instead of sending as text message only
if ($contenido) { // Use i18n only in backend if ($contenido) { // Use i18n only in backend
$sError = i18n("Newsletter could not be sent: No html message available", "cl-newsletter"); $sError = i18n("Newsletter could not be sent: No html message available", "cl_newsletter");
} else { } else {
$sError = "Newsletter could not be sent: No html message available"; $sError = "Newsletter could not be sent: No html message available";
} }
@ -916,14 +916,14 @@ class Newsletter extends Item {
if (strlen($sKey) != 30) { // Prevents sending without having a key if (strlen($sKey) != 30) { // Prevents sending without having a key
if ($contenido) { // Use i18n only in backend if ($contenido) { // Use i18n only in backend
$sError = i18n("Newsletter to %s could not be sent: Recipient has an incompatible or empty key", "cl-newsletter"); $sError = i18n("Newsletter to %s could not be sent: Recipient has an incompatible or empty key", "cl_newsletter");
} else { } else {
$sError = "Newsletter to %s could not be sent: Recipient has an incompatible or empty key"; $sError = "Newsletter to %s could not be sent: Recipient has an incompatible or empty key";
} }
$aMessages[] = $sName . " (" . $sEMail . "): " . sprintf($sError, $sEMail); $aMessages[] = $sName . " (" . $sEMail . "): " . sprintf($sError, $sEMail);
} else if (!isValidMail($sEMail)) { } else if (!isValidMail($sEMail)) {
if ($contenido) { // Use i18n only in backend if ($contenido) { // Use i18n only in backend
$sError = i18n("Newsletter to %s could not be sent: No valid e-mail address specified", "cl-newsletter"); $sError = i18n("Newsletter to %s could not be sent: No valid e-mail address specified", "cl_newsletter");
} else { } else {
$sError = "Newsletter to %s could not be sent: No valid e-mail address specified"; $sError = "Newsletter to %s could not be sent: No valid e-mail address specified";
} }
@ -949,7 +949,7 @@ class Newsletter extends Item {
$aSendRcps[] = $sName . " (" . $sEMail . ")"; $aSendRcps[] = $sName . " (" . $sEMail . ")";
} else { } else {
if ($contenido) { // Use i18n only in backend if ($contenido) { // Use i18n only in backend
$sError = i18n("Newsletter to %s could not be sent", "cl-newsletter"); $sError = i18n("Newsletter to %s could not be sent", "cl_newsletter");
} else { } else {
$sError = "Newsletter to %s could not be sent"; $sError = "Newsletter to %s could not be sent";
} }
@ -959,7 +959,7 @@ class Newsletter extends Item {
} }
} else { } else {
if ($contenido) { // Use i18n only in backend if ($contenido) { // Use i18n only in backend
$sError = i18n("No recipient with specified recipient/group id %s/%s found", "cl-newsletter"); $sError = i18n("No recipient with specified recipient/group id %s/%s found", "cl_newsletter");
} else { } else {
$sError = "No recipient with specified recpient/group id %s/%s found"; $sError = "No recipient with specified recpient/group id %s/%s found";
} }

66
includes/include.newsletter_edit.php
Datei anzeigen

@ -49,7 +49,7 @@ if (is_array($cfg['plugins']['newsletters'])) {
if ($action == "news_create" && $perm->have_perm_area_action($area, "news_create")) { if ($action == "news_create" && $perm->have_perm_area_action($area, "news_create")) {
// Create new newsletter // Create new newsletter
$oNewsletter = $oNewsletters->create(i18n("-- new newsletter --", "cl-newsletter")); $oNewsletter = $oNewsletters->create(i18n("-- new newsletter --", "cl_newsletter"));
$idnewsletter = $oNewsletter->get("idnews"); $idnewsletter = $oNewsletter->get("idnews");
$oPage->setSubnav("idnewsletter=$idnewsletter", "news"); $oPage->setSubnav("idnewsletter=$idnewsletter", "news");
$oPage->setReload(); $oPage->setReload();
@ -120,9 +120,9 @@ if ($action == "news_create" && $perm->have_perm_area_action($area, "news_create
unset($oJobs); unset($oJobs);
if ($oJob) { if ($oJob) {
$notis = $notification->returnNotification("info", i18n("Newsletter dispatch job has been added for this newsletter", "cl-newsletter")) . "<br>"; $notis = $notification->returnNotification("info", i18n("Newsletter dispatch job has been added for this newsletter", "cl_newsletter")) . "<br>";
} else { } else {
$notis = $notification->returnNotification("error", i18n("Newsletter dispatch job has been not been added! Please check newsletter details", "cl-newsletter")) . "<br>"; $notis = $notification->returnNotification("error", i18n("Newsletter dispatch job has been not been added! Please check newsletter details", "cl_newsletter")) . "<br>";
} }
$oNewsletter = new Newsletter($idnewsletter); $oNewsletter = new Newsletter($idnewsletter);
@ -160,7 +160,7 @@ if ($action == "news_create" && $perm->have_perm_area_action($area, "news_create
if ($bSend) { if ($bSend) {
$aRecipients[] = $sName . " (" . $sEMail . ")"; $aRecipients[] = $sName . " (" . $sEMail . ")";
} else { } else {
$aRecipients[] = i18n("None", "cl-newsletter"); $aRecipients[] = i18n("None", "cl_newsletter");
} }
} else { } else {
$bSend = $oNewsletter->sendDirect($oClientLang->getProperty("newsletter", "idcatart"), 0, $iTestIDNewsGroup, $aRecipients, $sEncoding); $bSend = $oNewsletter->sendDirect($oClientLang->getProperty("newsletter", "idcatart"), 0, $iTestIDNewsGroup, $aRecipients, $sEncoding);
@ -168,11 +168,11 @@ if ($action == "news_create" && $perm->have_perm_area_action($area, "news_create
unset($oUser); unset($oUser);
if ($bSend) { if ($bSend) {
$notis = $notification->returnNotification("info", i18n("Test newsletter has been sent to:", "cl-newsletter") . "<br />" . implode("<br />", $aRecipients) . "<br />"); $notis = $notification->returnNotification("info", i18n("Test newsletter has been sent to:", "cl_newsletter") . "<br />" . implode("<br />", $aRecipients) . "<br />");
} else { } else {
$notis = $notification->returnNotification("warning", i18n("Test newsletter has not been sent (partly or completely):", "cl-newsletter") . "<br />" . $notis = $notification->returnNotification("warning", i18n("Test newsletter has not been sent (partly or completely):", "cl_newsletter") . "<br />" .
i18n("Successful:", "cl-newsletter") . "<br />" . implode("<br />", $aRecipients) . "<br />" . i18n("Successful:", "cl_newsletter") . "<br />" . implode("<br />", $aRecipients) . "<br />" .
i18n("Error messages:", "cl-newsletter") . "<br />" . $oNewsletter->_sError); i18n("Error messages:", "cl_newsletter") . "<br />" . $oNewsletter->_sError);
} }
} else { } else {
// No action, just get selected newsletter // No action, just get selected newsletter
@ -230,7 +230,7 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client &&
$oNewsletters->query(); $oNewsletters->query();
if ($oNewsletters->next()) { if ($oNewsletters->next()) {
$aMessages[] = i18n("Could not set new newsletter name: name already exists", "cl-newsletter"); $aMessages[] = i18n("Could not set new newsletter name: name already exists", "cl_newsletter");
} else { } else {
$oNewsletter->set("name", $sName); $oNewsletter->set("name", $sName);
if ($oNewsletter->get("idart") > 0) { if ($oNewsletter->get("idart") > 0) {
@ -241,7 +241,7 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client &&
$oArticles->query(); $oArticles->query();
if ($oArticle = $oArticles->next()) { if ($oArticle = $oArticles->next()) {
$oArticle->set("title", sprintf(i18n("Newsletter: %s", "cl-newsletter"), $oNewsletter->get("name"))); $oArticle->set("title", sprintf(i18n("Newsletter: %s", "cl_newsletter"), $oNewsletter->get("name")));
$oArticle->store(); $oArticle->store();
} }
unset($oArticle); unset($oArticle);
@ -282,7 +282,7 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client &&
// If "selected groups" have been selected and no group specified, set // If "selected groups" have been selected and no group specified, set
// selection to "all" // selection to "all"
if ($_REQUEST["optSendTo"] == "selection" && !is_array($_REQUEST["selGroup"])) { if ($_REQUEST["optSendTo"] == "selection" && !is_array($_REQUEST["selGroup"])) {
$aMessages[] = i18n("'Send to recipients in selected groups' has been selected, but no group has been specified. Selection has been set to 'Send to all recipients'", "cl-newsletter"); $aMessages[] = i18n("'Send to recipients in selected groups' has been selected, but no group has been specified. Selection has been set to 'Send to all recipients'", "cl_newsletter");
$_REQUEST["optSendTo"] = "all"; $_REQUEST["optSendTo"] = "all";
} }
$oNewsletter->set("send_to", $_REQUEST["optSendTo"]); $oNewsletter->set("send_to", $_REQUEST["optSendTo"]);
@ -353,16 +353,16 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client &&
$oForm->setVar("action", "news_save"); $oForm->setVar("action", "news_save");
$oForm->setVar("idnewsletter", $oNewsletter->get("idnews")); $oForm->setVar("idnewsletter", $oNewsletter->get("idnews"));
$oForm->addHeader(i18n("Edit newsletter", "cl-newsletter")); $oForm->addHeader(i18n("Edit newsletter", "cl_newsletter"));
$oTxtName = new cHTMLTextbox("txtName", $oNewsletter->get("name"), 40); $oTxtName = new cHTMLTextbox("txtName", $oNewsletter->get("name"), 40);
$oForm->add(i18n("Name", "cl-newsletter"), $oTxtName->render()); $oForm->add(i18n("Name", "cl_newsletter"), $oTxtName->render());
$oSelType = new cHTMLSelectElement("selType"); $oSelType = new cHTMLSelectElement("selType");
$aItems = array(); $aItems = array();
$aItems[] = array("text", i18n("Text only", "cl-newsletter")); $aItems[] = array("text", i18n("Text only", "cl_newsletter"));
if ($oClientLang->getProperty("newsletter", "html_newsletter") == "true") { if ($oClientLang->getProperty("newsletter", "html_newsletter") == "true") {
$aItems[] = array("html", i18n("HTML and text", "cl-newsletter")); $aItems[] = array("html", i18n("HTML and text", "cl_newsletter"));
} else { } else {
$oNewsletter->set("type", "text"); // just in case the global setting was switched off $oNewsletter->set("type", "text"); // just in case the global setting was switched off
// TODO: Should this setting be stored? // TODO: Should this setting be stored?
@ -370,15 +370,15 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client &&
$oSelType->autoFill($aItems); $oSelType->autoFill($aItems);
$oSelType->setDefault($oNewsletter->get("type")); $oSelType->setDefault($oNewsletter->get("type"));
$oForm->add(i18n("Type", "cl-newsletter"), $oSelType->render()); $oForm->add(i18n("Type", "cl_newsletter"), $oSelType->render());
$oTxtFromEMail = new cHTMLTextbox("txtFromEMail", $oNewsletter->get("newsfrom"), 40); $oTxtFromEMail = new cHTMLTextbox("txtFromEMail", $oNewsletter->get("newsfrom"), 40);
$oTxtFromName = new cHTMLTextbox("txtFromName", $oNewsletter->get("newsfromname"), 40); $oTxtFromName = new cHTMLTextbox("txtFromName", $oNewsletter->get("newsfromname"), 40);
$oTxtSubject = new cHTMLTextarea("txtSubject", $oNewsletter->get("subject"), 80, 2); $oTxtSubject = new cHTMLTextarea("txtSubject", $oNewsletter->get("subject"), 80, 2);
$oForm->add(i18n("From (E-Mail)", "cl-newsletter"), $oTxtFromEMail->render()); $oForm->add(i18n("From (E-Mail)", "cl_newsletter"), $oTxtFromEMail->render());
$oForm->add(i18n("From (Name)", "cl-newsletter"), $oTxtFromName->render() . "&nbsp;" . i18n("optional", "cl-newsletter")); $oForm->add(i18n("From (Name)", "cl_newsletter"), $oTxtFromName->render() . "&nbsp;" . i18n("optional", "cl_newsletter"));
$oForm->add(i18n("Subject", "cl-newsletter"), $oTxtSubject->render()); $oForm->add(i18n("Subject", "cl_newsletter"), $oTxtSubject->render());
// Send options // Send options
$oSendToAll = new cHTMLRadiobutton("optSendTo", "all"); $oSendToAll = new cHTMLRadiobutton("optSendTo", "all");
@ -406,7 +406,7 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client &&
$oSelGroup->setSize(10); $oSelGroup->setSize(10);
$oSelGroup->setStyle("width: 350px; margin-top: 5px; margin-bottom: 5px; margin-left: 25px;"); $oSelGroup->setStyle("width: 350px; margin-top: 5px; margin-bottom: 5px; margin-left: 25px;");
$oSelGroup->setMultiSelect(); $oSelGroup->setMultiSelect();
$oSelGroup->setAlt(i18n("Note: Hold <Ctrl> to select multiple items.", "cl-newsletter")); $oSelGroup->setAlt(i18n("Note: Hold <Ctrl> to select multiple items.", "cl_newsletter"));
$oSelGroup->autoFill($aItems); $oSelGroup->autoFill($aItems);
// No groups in the list, sendToGroups and group listbox disabled // No groups in the list, sendToGroups and group listbox disabled
@ -438,9 +438,9 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client &&
} }
// Recipients // Recipients
$oForm->add(i18n("Recipients", "cl-newsletter"), $oSendToAll->toHTML(false) . "&nbsp;" . i18n("Send newsletter to all recipients", "cl-newsletter") . "<br />" . chr(10) . $oForm->add(i18n("Recipients", "cl_newsletter"), $oSendToAll->toHTML(false) . "&nbsp;" . i18n("Send newsletter to all recipients", "cl_newsletter") . "<br />" . chr(10) .
$oSendToDefault->toHTML(false) . "&nbsp;" . i18n("Send newsletter to the members of the default group", "cl-newsletter") . "<br />" . chr(10) . $oSendToDefault->toHTML(false) . "&nbsp;" . i18n("Send newsletter to the members of the default group", "cl_newsletter") . "<br />" . chr(10) .
$oSendToGroups->toHTML(false) . "&nbsp;" . i18n("Send newsletter to the members of the selected group(s):", "cl-newsletter") . "<br />" . chr(10) . $oSendToGroups->toHTML(false) . "&nbsp;" . i18n("Send newsletter to the members of the selected group(s):", "cl_newsletter") . "<br />" . chr(10) .
$oSelGroup->render()); $oSelGroup->render());
/* TODO: Work in progress /* TODO: Work in progress
@ -512,25 +512,25 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client &&
$ckbCronJob->setDisabled(""); $ckbCronJob->setDisabled("");
} else { } else {
// Give the user a hint // Give the user a hint
$ckbCronJob->setAlt(i18n("Option has to be enabled as client setting - see techref for details", "cl-newsletter")); $ckbCronJob->setAlt(i18n("Option has to be enabled as client setting - see techref for details", "cl_newsletter"));
} }
$oCkbDispatch = new cHTMLCheckbox("ckbDispatch", "enabled"); $oCkbDispatch = new cHTMLCheckbox("ckbDispatch", "enabled");
$oCkbDispatch->setChecked($oNewsletter->get("dispatch")); $oCkbDispatch->setChecked($oNewsletter->get("dispatch"));
$oTxtDispatchCount = new cHTMLTextbox("txtDispatchCount", $oNewsletter->get("dispatch_count"), 4); $oTxtDispatchCount = new cHTMLTextbox("txtDispatchCount", $oNewsletter->get("dispatch_count"), 4);
$oTxtDispatchDelay = new cHTMLTextbox("txtDispatchDelay", $oNewsletter->get("dispatch_delay"), 4); $oTxtDispatchDelay = new cHTMLTextbox("txtDispatchDelay", $oNewsletter->get("dispatch_delay"), 4);
$oTxtDispatchDelay->setAlt(i18n("Note: Set to 0 to send chunks manually.", "cl-newsletter")); $oTxtDispatchDelay->setAlt(i18n("Note: Set to 0 to send chunks manually.", "cl_newsletter"));
$oCkbSaveAsDefault = new cHTMLCheckbox("ckbSetDefault", "1"); $oCkbSaveAsDefault = new cHTMLCheckbox("ckbSetDefault", "1");
$oForm->add(i18n("Options", "cl-newsletter"), $ckbWelcome->toHTML(false) . "&nbsp;" . i18n("Welcome-Newsletter", "cl-newsletter") . "<br />" . $oForm->add(i18n("Options", "cl_newsletter"), $ckbWelcome->toHTML(false) . "&nbsp;" . i18n("Welcome-Newsletter", "cl_newsletter") . "<br />" .
$ckbCronJob->toHTML(false) . "&nbsp;" . i18n("Use cronjob", "cl-newsletter") . "<br />" . $ckbCronJob->toHTML(false) . "&nbsp;" . i18n("Use cronjob", "cl_newsletter") . "<br />" .
$oCkbDispatch->toHTML(false) . "&nbsp;" . i18n("Send in blocks:", "cl-newsletter") . "&nbsp;&nbsp;&nbsp;" . $oCkbDispatch->toHTML(false) . "&nbsp;" . i18n("Send in blocks:", "cl_newsletter") . "&nbsp;&nbsp;&nbsp;" .
i18n("Recipients per block:", "cl-newsletter") . "&nbsp;" . $oTxtDispatchCount->render() . "&nbsp;" . i18n("Recipients per block:", "cl_newsletter") . "&nbsp;" . $oTxtDispatchCount->render() . "&nbsp;" .
i18n("Delay between blocks:", "cl-newsletter") . "&nbsp;" . $oTxtDispatchDelay->render() . "&nbsp;" . i18n("sec.", "cl-newsletter") . "<br />" . i18n("Delay between blocks:", "cl_newsletter") . "&nbsp;" . $oTxtDispatchDelay->render() . "&nbsp;" . i18n("sec.", "cl_newsletter") . "<br />" .
$oCkbSaveAsDefault->toHTML(false) . "&nbsp;" . i18n("Save option settings as default", "cl-newsletter")); $oCkbSaveAsDefault->toHTML(false) . "&nbsp;" . i18n("Save option settings as default", "cl_newsletter"));
$oForm->add(i18n("Author", "cl-newsletter"), $classuser->getUserName($oNewsletter->get("author")) . " (" . $oNewsletter->get("created") . ")"); $oForm->add(i18n("Author", "cl_newsletter"), $classuser->getUserName($oNewsletter->get("author")) . " (" . $oNewsletter->get("created") . ")");
$oForm->add(i18n("Last modified by", "cl-newsletter"), $classuser->getUserName($oNewsletter->get("modifiedby")) . " (" . $oNewsletter->get("modified") . ")"); $oForm->add(i18n("Last modified by", "cl_newsletter"), $classuser->getUserName($oNewsletter->get("modifiedby")) . " (" . $oNewsletter->get("modified") . ")");
$sExecScript = ' $sExecScript = '
<script type="text/javascript"> <script type="text/javascript">

68
includes/include.newsletter_edit_message.php
Datei anzeigen

@ -73,7 +73,7 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client &&
if ($_REQUEST["selTemplate"] > 0) { if ($_REQUEST["selTemplate"] > 0) {
// Template has been changed, but specified: Store template article as new newsletter article // Template has been changed, but specified: Store template article as new newsletter article
$iIDArt = conCopyArticle($_REQUEST["selTemplate"], $oClientLang->getProperty("newsletter", "html_newsletter_idcat"), sprintf(i18n("Newsletter: %s", "cl-newsletter"), $oNewsletter->get("name"))); $iIDArt = conCopyArticle($_REQUEST["selTemplate"], $oClientLang->getProperty("newsletter", "html_newsletter_idcat"), sprintf(i18n("Newsletter: %s", "cl_newsletter"), $oNewsletter->get("name")));
conMakeOnline($iIDArt, $lang); // Article has to be online for sending... conMakeOnline($iIDArt, $lang); // Article has to be online for sending...
} }
@ -91,7 +91,7 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client &&
if ($oArticles->count() == 0) { if ($oArticles->count() == 0) {
// Ups, article lost, reset idart and template_idart for newsletter // Ups, article lost, reset idart and template_idart for newsletter
$notis = $notification->returnNotification("error", sprintf(i18n("The html newsletter article has been deleted (idart: %s), the html message is lost", "cl-newsletter"), $oNewsletter->get("idart"))) . "<br>"; $notis = $notification->returnNotification("error", sprintf(i18n("The html newsletter article has been deleted (idart: %s), the html message is lost", "cl_newsletter"), $oNewsletter->get("idart"))) . "<br>";
$oNewsletter->set("idart", 0); $oNewsletter->set("idart", 0);
$oNewsletter->set("template_idart", 0); $oNewsletter->set("template_idart", 0);
@ -104,9 +104,9 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client &&
if ($oArticles->count() == 0) { if ($oArticles->count() == 0) {
// Ups, template has been deleted: Restore from current newsletter message article // Ups, template has been deleted: Restore from current newsletter message article
$notis = $notification->returnNotification("warning", i18n("The html newsletter template article has been deleted, it has been restored using the html message article of this newsletter", "cl-newsletter")) . "<br>"; $notis = $notification->returnNotification("warning", i18n("The html newsletter template article has been deleted, it has been restored using the html message article of this newsletter", "cl_newsletter")) . "<br>";
$iIDArt = conCopyArticle($oNewsletter->get("idart"), $oClientLang->getProperty("newsletter", "html_template_idcat"), sprintf(i18n("%s (Template restored)", "cl-newsletter"), $oNewsletter->get("name"))); $iIDArt = conCopyArticle($oNewsletter->get("idart"), $oClientLang->getProperty("newsletter", "html_template_idcat"), sprintf(i18n("%s (Template restored)", "cl_newsletter"), $oNewsletter->get("name")));
$oNewsletter->set("template_idart", $iIDArt); $oNewsletter->set("template_idart", $iIDArt);
$oNewsletter->store(); $oNewsletter->store();
} }
@ -120,35 +120,35 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client &&
$oForm->setVar("idnewsletter", $idnewsletter); $oForm->setVar("idnewsletter", $idnewsletter);
$oForm->setWidth("100%"); $oForm->setWidth("100%");
$oForm->addHeader(sprintf(i18n("Edit newsletter message (%s)", "cl-newsletter"), $oNewsletter->get("name"))); $oForm->addHeader(sprintf(i18n("Edit newsletter message (%s)", "cl_newsletter"), $oNewsletter->get("name")));
$oForm->add(i18n("Subject"), $oNewsletter->get("subject")); $oForm->add(i18n("Subject"), $oNewsletter->get("subject"));
$sTagInfoText = '<a href="javascript:fncShowHide(\'idTagInfoText\');"><strong>' . i18n("Tag information", "cl-newsletter") . '</strong></a>' . $sTagInfoText = '<a href="javascript:fncShowHide(\'idTagInfoText\');"><strong>' . i18n("Tag information", "cl_newsletter") . '</strong></a>' .
'<div id="idTagInfoText" style="display: none"><br /><b>' . i18n("Special message tags (will be replaced when sending)", "cl-newsletter") . ':</b><br>' . '<div id="idTagInfoText" style="display: none"><br /><b>' . i18n("Special message tags (will be replaced when sending)", "cl_newsletter") . ':</b><br>' .
'MAIL_NAME: ' . i18n("Name of the recipient", "cl-newsletter") . '<br />' . 'MAIL_NAME: ' . i18n("Name of the recipient", "cl_newsletter") . '<br />' .
'MAIL_DATE: ' . i18n("Date, when the mail has been sent", "cl-newsletter") . '<br />' . 'MAIL_DATE: ' . i18n("Date, when the mail has been sent", "cl_newsletter") . '<br />' .
'MAIL_TIME: ' . i18n("Time, when the mail has been sent", "cl-newsletter") . '<br />' . 'MAIL_TIME: ' . i18n("Time, when the mail has been sent", "cl_newsletter") . '<br />' .
'MAIL_NUMBER: ' . i18n("Number of recipients", "cl-newsletter") . '<br />' . 'MAIL_NUMBER: ' . i18n("Number of recipients", "cl_newsletter") . '<br />' .
#'MAIL_CHANGE: '.i18n("Link to change the e-mail adress", "cl-newsletter").'<br />'. #'MAIL_CHANGE: '.i18n("Link to change the e-mail adress", "cl_newsletter").'<br />'.
'MAIL_UNSUBSCRIBE: ' . i18n("Link to unsubscribe", "cl-newsletter") . '<br />' . 'MAIL_UNSUBSCRIBE: ' . i18n("Link to unsubscribe", "cl_newsletter") . '<br />' .
'MAIL_STOP: ' . i18n("Link to pause the subscription", "cl-newsletter") . '<br />' . 'MAIL_STOP: ' . i18n("Link to pause the subscription", "cl_newsletter") . '<br />' .
'MAIL_GOON: ' . i18n("Link to resume the subscription", "cl-newsletter"); 'MAIL_GOON: ' . i18n("Link to resume the subscription", "cl_newsletter");
$sTagInfoHTML = '<a href="javascript:fncShowHide(\'idTagInfoHTML\');"><strong>' . i18n("Tag information", "cl-newsletter") . '</strong></a>' . $sTagInfoHTML = '<a href="javascript:fncShowHide(\'idTagInfoHTML\');"><strong>' . i18n("Tag information", "cl_newsletter") . '</strong></a>' .
'<div id="idTagInfoHTML" style="display: none"><br /><b>' . i18n("Special message tags (will be replaced when sending, {..} = optional)", "cl-newsletter") . ":</b><br />" . '<div id="idTagInfoHTML" style="display: none"><br /><b>' . i18n("Special message tags (will be replaced when sending, {..} = optional)", "cl_newsletter") . ":</b><br />" .
'[mail name="name" type="text"]{text}MAIL_NAME{text}[/mail]: ' . i18n("Name of the recipient", "cl-newsletter") . "<br />" . '[mail name="name" type="text"]{text}MAIL_NAME{text}[/mail]: ' . i18n("Name of the recipient", "cl_newsletter") . "<br />" .
'[mail name="date" type="text"]{text}MAIL_DATE{text}[/mail]: ' . i18n("Date, when the mail has been sent", "cl-newsletter") . "<br />" . '[mail name="date" type="text"]{text}MAIL_DATE{text}[/mail]: ' . i18n("Date, when the mail has been sent", "cl_newsletter") . "<br />" .
'[mail name="time" type="text"]{text}MAIL_TIME{text}[/mail]: ' . i18n("Time, when the mail has been sent", "cl-newsletter") . "<br />" . '[mail name="time" type="text"]{text}MAIL_TIME{text}[/mail]: ' . i18n("Time, when the mail has been sent", "cl_newsletter") . "<br />" .
'[mail name="number" type="text"]{text}MAIL_NUMBER{text}[/mail]: ' . i18n("Number of recipients", "cl-newsletter") . "<br />" . '[mail name="number" type="text"]{text}MAIL_NUMBER{text}[/mail]: ' . i18n("Number of recipients", "cl_newsletter") . "<br />" .
#'[mail name="change" type="link" {text="'.i18n("Link text", "cl-newsletter").'"}]{text}MAIL_CHANGE{text}[/mail]: '.i18n("Link to change the e-mail adress", "cl-newsletter")."<br />". #'[mail name="change" type="link" {text="'.i18n("Link text", "cl_newsletter").'"}]{text}MAIL_CHANGE{text}[/mail]: '.i18n("Link to change the e-mail adress", "cl_newsletter")."<br />".
'[mail name="unsubscribe" type="link" {text="' . i18n("Link text", "cl-newsletter") . '" }]{text}MAIL_UNSUBSCRIBE{text}[/mail]: ' . i18n("Link to unsubscribe", "cl-newsletter") . "<br />" . '[mail name="unsubscribe" type="link" {text="' . i18n("Link text", "cl_newsletter") . '" }]{text}MAIL_UNSUBSCRIBE{text}[/mail]: ' . i18n("Link to unsubscribe", "cl_newsletter") . "<br />" .
'[mail name="stop" type="link" {text="' . i18n("Link text", "cl-newsletter") . '" }]{text}MAIL_STOP{text}[/mail]: ' . i18n("Link to pause the subscription", "cl-newsletter") . "<br />" . '[mail name="stop" type="link" {text="' . i18n("Link text", "cl_newsletter") . '" }]{text}MAIL_STOP{text}[/mail]: ' . i18n("Link to pause the subscription", "cl_newsletter") . "<br />" .
'[mail name="goon" type="link" {text="' . i18n("Link text", "cl-newsletter") . '" }]{text}MAIL_GOON{text}[/mail]: ' . i18n("Link to resume the subscription", "cl-newsletter"); '[mail name="goon" type="link" {text="' . i18n("Link text", "cl_newsletter") . '" }]{text}MAIL_GOON{text}[/mail]: ' . i18n("Link to resume the subscription", "cl_newsletter");
// Mention plugin interface // Mention plugin interface
if (getSystemProperty("newsletter", "newsletter-recipients-plugin") == "true") { if (getSystemProperty("newsletter", "newsletter-recipients-plugin") == "true") {
$sTagInfoText .= "<br /><br /><strong>" . i18n("Additional message tags from recipients plugins:", "cl-newsletter") . "</strong><br />"; $sTagInfoText .= "<br /><br /><strong>" . i18n("Additional message tags from recipients plugins:", "cl_newsletter") . "</strong><br />";
$sTagInfoHTML .= "<br /><br /><strong>" . i18n("Additional message tags from recipients plugins:", "cl-newsletter") . "</strong><br />"; $sTagInfoHTML .= "<br /><br /><strong>" . i18n("Additional message tags from recipients plugins:", "cl_newsletter") . "</strong><br />";
if (is_array($cfg['plugins']['recipients'])) { if (is_array($cfg['plugins']['recipients'])) {
foreach ($cfg['plugins']['recipients'] as $plugin) { foreach ($cfg['plugins']['recipients'] as $plugin) {
@ -182,7 +182,7 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client &&
$oTemplateArticles = new ArticleCollection($aOptions); $oTemplateArticles = new ArticleCollection($aOptions);
$aItems = array(); $aItems = array();
$aItems[] = array(0, i18n("-- none --", "cl-newsletter")); $aItems[] = array(0, i18n("-- none --", "cl_newsletter"));
while ($oArticle = $oTemplateArticles->nextArticle()) { while ($oArticle = $oTemplateArticles->nextArticle()) {
$aItems[] = array($oArticle->get("idart"), $oArticle->get("title")); $aItems[] = array($oArticle->get("idart"), $oArticle->get("title"));
} }
@ -193,21 +193,21 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client &&
unset($oArticles); unset($oArticles);
unset($oTemplateArticles); unset($oTemplateArticles);
$oForm->add(i18n("HTML Template", "cl-newsletter"), $oSelTemplate->render() . "&nbsp;" . i18n("Note, that changing the template discards the current html message content", "cl-newsletter")); $oForm->add(i18n("HTML Template", "cl_newsletter"), $oSelTemplate->render() . "&nbsp;" . i18n("Note, that changing the template discards the current html message content", "cl_newsletter"));
if ($iTplIDArt != 0) { if ($iTplIDArt != 0) {
$sFrameSrc = $cfgClient[$client]["path"]["htmlpath"] . "front_content.php?changeview=edit&action=con_editart&idart=" . $oNewsletter->get("idart") . "&idcat=" . $oClientLang->getProperty("newsletter", "html_newsletter_idcat") . "&lang=" . $lang . "&contenido=" . $sess->id; $sFrameSrc = $cfgClient[$client]["path"]["htmlpath"] . "front_content.php?changeview=edit&action=con_editart&idart=" . $oNewsletter->get("idart") . "&idcat=" . $oClientLang->getProperty("newsletter", "html_newsletter_idcat") . "&lang=" . $lang . "&contenido=" . $sess->id;
$oForm->add(i18n("HTML Message", "cl-newsletter"), '<iframe width="100%" height="600" src="' . $sFrameSrc . '"></iframe><br />' . $sTagInfoHTML); $oForm->add(i18n("HTML Message", "cl_newsletter"), '<iframe width="100%" height="600" src="' . $sFrameSrc . '"></iframe><br />' . $sTagInfoHTML);
} else { } else {
// Add a real note, that a template has to be specified // Add a real note, that a template has to be specified
$notis .= $notification->returnNotification("warning", i18n("Newsletter type has been set to HTML/text, please remember to select an html template", "cl-newsletter")) . "<br />"; $notis .= $notification->returnNotification("warning", i18n("Newsletter type has been set to HTML/text, please remember to select an html template", "cl_newsletter")) . "<br />";
$oForm->add(i18n("HTML Message", "cl-newsletter"), i18n("Please choose a template first", "cl-newsletter")); $oForm->add(i18n("HTML Message", "cl_newsletter"), i18n("Please choose a template first", "cl_newsletter"));
} }
} }
$oTxtMessage = new cHTMLTextarea("txtMessage", $oNewsletter->get("message"), 80, 20); $oTxtMessage = new cHTMLTextarea("txtMessage", $oNewsletter->get("message"), 80, 20);
$oForm->add(i18n("Text Message", "cl-newsletter"), $oTxtMessage->render() . "<br />" . $sTagInfoText); $oForm->add(i18n("Text Message", "cl_newsletter"), $oTxtMessage->render() . "<br />" . $sTagInfoText);
$sExecScript = ' $sExecScript = '
<script type="text/javascript"> <script type="text/javascript">
@ -237,7 +237,7 @@ if ($oNewsletter->virgin == false && $oNewsletter->get("idclient") == $client &&
submitForm(); submitForm();
} else { } else {
// You may loose information, warn! // You may loose information, warn!
box.confirm("' . i18n("HTML newsletter template changed", "cl-newsletter") . '", "' . i18n("HTML template has been changed. Do you like to save now to apply changes?<br /><br /><b>Note, that existing HTML newsletter content will get lost!</b>", "cl-newsletter") . '", "submitForm()"); box.confirm("' . i18n("HTML newsletter template changed", "cl_newsletter") . '", "' . i18n("HTML template has been changed. Do you like to save now to apply changes?<br /><br /><b>Note, that existing HTML newsletter content will get lost!</b>", "cl_newsletter") . '", "submitForm()");
} }
} }
} }

90
includes/include.newsletter_jobs_details.php
Datei anzeigen

@ -60,32 +60,32 @@ if ($action == "news_job_run" && $perm->have_perm_area_action($area, $action) &&
if ($oJob->get("dispatch_delay") == 0) { if ($oJob->get("dispatch_delay") == 0) {
// Send manually // Send manually
$oForm = new UI_Table_Form("properties", $sPathNext); $oForm = new UI_Table_Form("properties", $sPathNext);
$oForm->addHeader(i18n("Report:", "cl-newsletter")); $oForm->addHeader(i18n("Report:", "cl_newsletter"));
$oForm->add("", ""); $oForm->add("", "");
$oForm->add("", sprintf(i18n("Sending newsletter ... (chunk %s of %s, recipients: %s, sent: %s)", "cl-newsletter"), $iChunk, $iChunks, $oJob->get("rcpcount"), $oJob->get("sendcount"))); $oForm->add("", sprintf(i18n("Sending newsletter ... (chunk %s of %s, recipients: %s, sent: %s)", "cl_newsletter"), $iChunk, $iChunks, $oJob->get("rcpcount"), $oJob->get("sendcount")));
$oForm->setActionButton("cancel", $cfg['path']['contenido_fullhtml'] . "images/but_cancel.gif", i18n("Stop sending", "cl-newsletter"), "c"); $oForm->setActionButton("cancel", $cfg['path']['contenido_fullhtml'] . "images/but_cancel.gif", i18n("Stop sending", "cl_newsletter"), "c");
$oForm->setActionButton("submit", $cfg['path']['contenido_fullhtml'] . "images/but_ok.gif", i18n("Send next chunk", "cl-newsletter"), "s", "news_job_run"); $oForm->setActionButton("submit", $cfg['path']['contenido_fullhtml'] . "images/but_ok.gif", i18n("Send next chunk", "cl_newsletter"), "s", "news_job_run");
} else { } else {
// Send automatically // Send automatically
$oForm = new UI_Table_Form("properties"); $oForm = new UI_Table_Form("properties");
$oForm->addHeader(i18n("Report:", "cl-newsletter")); $oForm->addHeader(i18n("Report:", "cl_newsletter"));
$oForm->add("", ""); $oForm->add("", "");
$oForm->add("", sprintf(i18n("Sending newsletter ... (chunk %s of %s, recipients: %s, sent: %s)", "cl-newsletter"), $iChunk, $iChunks, $oJob->get("rcpcount"), $oJob->get("sendcount"))); $oForm->add("", sprintf(i18n("Sending newsletter ... (chunk %s of %s, recipients: %s, sent: %s)", "cl_newsletter"), $iChunk, $iChunks, $oJob->get("rcpcount"), $oJob->get("sendcount")));
$oPage->addScript("Refresh", '<meta http-equiv="refresh" content="' . $oJob->get("dispatch_delay") . '; URL=' . $sPathNext . '">'); $oPage->addScript("Refresh", '<meta http-equiv="refresh" content="' . $oJob->get("dispatch_delay") . '; URL=' . $sPathNext . '">');
$oForm->unsetActionButton("submit"); $oForm->unsetActionButton("submit");
$oForm->setActionButton("cancel", $cfg['path']['contenido_fullhtml'] . "images/but_cancel.gif", i18n("Stop sending", "cl-newsletter"), "c"); $oForm->setActionButton("cancel", $cfg['path']['contenido_fullhtml'] . "images/but_cancel.gif", i18n("Stop sending", "cl_newsletter"), "c");
} }
} else { } else {
// All newsletters should have been sent // All newsletters should have been sent
$oForm = new UI_Table_Form("properties"); $oForm = new UI_Table_Form("properties");
$oForm->addHeader(i18n("Report:", "cl-newsletter")); $oForm->addHeader(i18n("Report:", "cl_newsletter"));
$oForm->add("", ""); $oForm->add("", "");
$oForm->add("", sprintf(i18n("The newsletter has been sent to %s recipients", "cl-newsletter"), $oJob->get("sendcount"))); $oForm->add("", sprintf(i18n("The newsletter has been sent to %s recipients", "cl_newsletter"), $oJob->get("sendcount")));
$oPage->setReload(); $oPage->setReload();
} }
@ -142,12 +142,12 @@ if ($action == "news_job_run" && $perm->have_perm_area_action($area, $action) &&
$oFrmOptions->setVar("idnewsjob", $_REQUEST["idnewsjob"]); $oFrmOptions->setVar("idnewsjob", $_REQUEST["idnewsjob"]);
//$oFrmOptions->setVar("startpage", $startpage); //$oFrmOptions->setVar("startpage", $startpage);
//$oFrmOptions->setVar("appendparameters", $appendparameters); //$oFrmOptions->setVar("appendparameters", $appendparameters);
$oFrmOptions->addHeader(i18n("List options", "cl-newsletter")); $oFrmOptions->addHeader(i18n("List options", "cl_newsletter"));
$oSelElements = new cHTMLSelectElement("elemperpage"); $oSelElements = new cHTMLSelectElement("elemperpage");
$oSelElements->setEvent("onchange", "document.forms.frmOptions.submit();"); $oSelElements->setEvent("onchange", "document.forms.frmOptions.submit();");
$aData = Array("0" => i18n("-All-", "cl-newsletter"), $aData = Array("0" => i18n("-All-", "cl_newsletter"),
"50" => "50", "50" => "50",
"100" => "100", "100" => "100",
"250" => "250", "250" => "250",
@ -161,7 +161,7 @@ if ($action == "news_job_run" && $perm->have_perm_area_action($area, $action) &&
$oSelElements->setDefault($_REQUEST["elemperpage"]); $oSelElements->setDefault($_REQUEST["elemperpage"]);
//$oSelElements->setStyle('border:1px;border-style:solid;border-color:black;'); //$oSelElements->setStyle('border:1px;border-style:solid;border-color:black;');
$oFrmOptions->add(i18n("Items per page:", "cl-newsletter"), $oSelElements->render()); $oFrmOptions->add(i18n("Items per page:", "cl_newsletter"), $oSelElements->render());
// Ouput data // Ouput data
$oList = new cScrollList(true, "news_job_details"); $oList = new cScrollList(true, "news_job_details");
@ -170,7 +170,7 @@ if ($action == "news_job_run" && $perm->have_perm_area_action($area, $action) &&
$oList->setCustom("elemperpage", $_REQUEST["elemperpage"]); $oList->setCustom("elemperpage", $_REQUEST["elemperpage"]);
$aCols = array("rcpname", "rcpemail", "", "status", "sent"); $aCols = array("rcpname", "rcpemail", "", "status", "sent");
$oList->setHeader(i18n("Recipient", "cl-newsletter"), i18n("E-Mail", "cl-newsletter"), i18n("Type", "cl-newsletter"), i18n("Status", "cl-newsletter"), i18n("Sent", "cl-newsletter"), i18n("Actions", "cl-newsletter")); $oList->setHeader(i18n("Recipient", "cl_newsletter"), i18n("E-Mail", "cl_newsletter"), i18n("Type", "cl_newsletter"), i18n("Status", "cl_newsletter"), i18n("Sent", "cl_newsletter"), i18n("Actions", "cl_newsletter"));
$oList->setSortable(0, true); $oList->setSortable(0, true);
$oList->setSortable(1, true); $oList->setSortable(1, true);
$oList->setSortable(2, false); $oList->setSortable(2, false);
@ -214,30 +214,30 @@ if ($action == "news_job_run" && $perm->have_perm_area_action($area, $action) &&
$oLogs->query(); $oLogs->query();
$oImgDelete = new cHTMLImage("images/delete.gif"); $oImgDelete = new cHTMLImage("images/delete.gif");
$oImgDelete->setAlt(i18n("Delete item", "cl-newsletter")); $oImgDelete->setAlt(i18n("Delete item", "cl_newsletter"));
$sImgDelete = $oImgDelete->render(); $sImgDelete = $oImgDelete->render();
unset($oImgDelete); unset($oImgDelete);
$iCount = 0; $iCount = 0;
$aNewsType[] = array(); // Performance $aNewsType[] = array(); // Performance
$aNewsType[0] = i18n("Text only", "cl-newsletter"); $aNewsType[0] = i18n("Text only", "cl_newsletter");
$aNewsType[1] = i18n("HTML/Text", "cl-newsletter"); $aNewsType[1] = i18n("HTML/Text", "cl_newsletter");
while ($oLog = $oLogs->next()) { while ($oLog = $oLogs->next()) {
$sName = $oLog->get("rcpname"); $sName = $oLog->get("rcpname");
$sEMail = $oLog->get("rcpemail"); $sEMail = $oLog->get("rcpemail");
switch ($oLog->get("status")) { switch ($oLog->get("status")) {
case "pending": case "pending":
$sStatus = i18n("Waiting for sending", "cl-newsletter"); $sStatus = i18n("Waiting for sending", "cl_newsletter");
break; break;
case "sending": case "sending":
$sStatus = i18n("Sending", "cl-newsletter"); $sStatus = i18n("Sending", "cl_newsletter");
break; break;
case "successful": case "successful":
$sStatus = i18n("Successful", "cl-newsletter"); $sStatus = i18n("Successful", "cl_newsletter");
break; break;
default: default:
$sStatus = sprintf(i18n("Error: %s", "cl-newsletter"), $oLog->get("status")); $sStatus = sprintf(i18n("Error: %s", "cl_newsletter"), $oLog->get("status"));
} }
if ($oLog->get("sent") == "0000-00-00 00:00:00") { if ($oLog->get("sent") == "0000-00-00 00:00:00") {
@ -275,7 +275,7 @@ if ($action == "news_job_run" && $perm->have_perm_area_action($area, $action) &&
</tr> </tr>
<tr class="text_medium" style="background-color: #ffffff;"> <tr class="text_medium" style="background-color: #ffffff;">
<td style="border: 1px; border-color: #B3B3B3; border-style: solid; background-color: #E2E2E2; color:#666666"> ' . <td style="border: 1px; border-color: #B3B3B3; border-style: solid; background-color: #E2E2E2; color:#666666"> ' .
sprintf(i18n("Go to page: %s", "cl-newsletter"), $sBrowseLinks) . '</td> sprintf(i18n("Go to page: %s", "cl_newsletter"), $sBrowseLinks) . '</td>
</tr> </tr>
</table>'; </table>';
@ -290,52 +290,52 @@ if ($action == "news_job_run" && $perm->have_perm_area_action($area, $action) &&
$oForm->setVar("action", ""); $oForm->setVar("action", "");
$oForm->setVar("idnewsjob", $idnewsjob); $oForm->setVar("idnewsjob", $idnewsjob);
$oForm->addHeader(i18n("Newsletter Dispatch Job", "cl-newsletter")); $oForm->addHeader(i18n("Newsletter Dispatch Job", "cl_newsletter"));
$oForm->add(i18n("Name", "cl-newsletter"), $oJob->get("name")); $oForm->add(i18n("Name", "cl_newsletter"), $oJob->get("name"));
$sDateFormat = getEffectiveSetting("backend", "timeformat", "d.m.Y H:i"); $sDateFormat = getEffectiveSetting("backend", "timeformat", "d.m.Y H:i");
switch ($oJob->get("status")) { switch ($oJob->get("status")) {
case 1: case 1:
$oForm->add(i18n("Status", "cl-newsletter"), i18n("Pending", "cl-newsletter")); $oForm->add(i18n("Status", "cl_newsletter"), i18n("Pending", "cl_newsletter"));
break; break;
case 2: case 2:
$oForm->add(i18n("Status", "cl-newsletter"), sprintf(i18n("Sending (started: %s)", "cl-newsletter"), date($sDateFormat, strtotime($oJob->get("started"))))); $oForm->add(i18n("Status", "cl_newsletter"), sprintf(i18n("Sending (started: %s)", "cl_newsletter"), date($sDateFormat, strtotime($oJob->get("started")))));
break; break;
case 9: case 9:
$oForm->add(i18n("Status", "cl-newsletter"), sprintf(i18n("Finished (started: %s, finished: %s)", "cl-newsletter"), date($sDateFormat, strtotime($oJob->get("started"))), date($sDateFormat, strtotime($oJob->get("finished"))))); $oForm->add(i18n("Status", "cl_newsletter"), sprintf(i18n("Finished (started: %s, finished: %s)", "cl_newsletter"), date($sDateFormat, strtotime($oJob->get("started"))), date($sDateFormat, strtotime($oJob->get("finished")))));
break; break;
} }
$oForm->add(i18n("Statistics", "cl-newsletter"), sprintf(i18n("Planned: %s, Send: %s", "cl-newsletter"), $oJob->get("rcpcount"), $oJob->get("sendcount"))); $oForm->add(i18n("Statistics", "cl_newsletter"), sprintf(i18n("Planned: %s, Send: %s", "cl_newsletter"), $oJob->get("rcpcount"), $oJob->get("sendcount")));
$oForm->add(i18n("From", "cl-newsletter"), $oJob->get("newsfrom") . " (" . $oJob->get("newsfromname") . ")"); $oForm->add(i18n("From", "cl_newsletter"), $oJob->get("newsfrom") . " (" . $oJob->get("newsfromname") . ")");
$oForm->add(i18n("Subject", "cl-newsletter"), $oJob->get("subject")); $oForm->add(i18n("Subject", "cl_newsletter"), $oJob->get("subject"));
if ($oJob->get("type") == "html") { if ($oJob->get("type") == "html") {
$oForm->add(i18n("Type", "cl-newsletter"), i18n("HTML and text", "cl-newsletter")); $oForm->add(i18n("Type", "cl_newsletter"), i18n("HTML and text", "cl_newsletter"));
$txtMessageHTML = new cHTMLTextarea("txtMessageHTML", $oJob->get("message_html"), 80, 20); $txtMessageHTML = new cHTMLTextarea("txtMessageHTML", $oJob->get("message_html"), 80, 20);
$txtMessageHTML->setDisabled("disabled"); $txtMessageHTML->setDisabled("disabled");
$oForm->add(i18n("HTML Message", "cl-newsletter"), $txtMessageHTML->render()); $oForm->add(i18n("HTML Message", "cl_newsletter"), $txtMessageHTML->render());
} else { } else {
$oForm->add(i18n("Type", "cl-newsletter"), i18n("Text only", "cl-newsletter")); $oForm->add(i18n("Type", "cl_newsletter"), i18n("Text only", "cl_newsletter"));
} }
$txtMessageText = new cHTMLTextarea("txtMessageText", $oJob->get("message_text"), 80, 20); $txtMessageText = new cHTMLTextarea("txtMessageText", $oJob->get("message_text"), 80, 20);
$txtMessageText->setDisabled("disabled"); $txtMessageText->setDisabled("disabled");
$oForm->add(i18n("Text Message", "cl-newsletter"), $txtMessageText->render()); $oForm->add(i18n("Text Message", "cl_newsletter"), $txtMessageText->render());
$aSendTo = unserialize($oJob->get("send_to")); $aSendTo = unserialize($oJob->get("send_to"));
switch ($aSendTo[0]) { switch ($aSendTo[0]) {
case "all": case "all":
$sSendToInfo = i18n("Send newsletter to all recipients", "cl-newsletter"); $sSendToInfo = i18n("Send newsletter to all recipients", "cl_newsletter");
break; break;
case "default": case "default":
$sSendToInfo = i18n("Send newsletter to the members of the default group", "cl-newsletter"); $sSendToInfo = i18n("Send newsletter to the members of the default group", "cl_newsletter");
break; break;
case "selection": case "selection":
$sSendToInfo = i18n("Send newsletter to the members of the selected group(s):", "cl-newsletter"); $sSendToInfo = i18n("Send newsletter to the members of the selected group(s):", "cl_newsletter");
unset($aSendTo[0]); unset($aSendTo[0]);
foreach ($aSendTo as $sGroup) { foreach ($aSendTo as $sGroup) {
@ -343,31 +343,31 @@ if ($action == "news_job_run" && $perm->have_perm_area_action($area, $action) &&
} }
break; break;
case "single": case "single":
$sSendToInfo = i18n("Send newsletter to single recipient:", "cl-newsletter"); $sSendToInfo = i18n("Send newsletter to single recipient:", "cl_newsletter");
$sSendToInfo .= "<br />" . $aSendTo[1] . " (" . $aSendTo[2] . ")"; $sSendToInfo .= "<br />" . $aSendTo[1] . " (" . $aSendTo[2] . ")";
break; break;
default: default:
} }
unset($aSendTo); unset($aSendTo);
$oForm->add(i18n("Recipients", "cl-newsletter"), $sSendToInfo); $oForm->add(i18n("Recipients", "cl_newsletter"), $sSendToInfo);
if ($oJob->get("use_cronjob") == 1) { if ($oJob->get("use_cronjob") == 1) {
$sOptionsInfo = i18n("Use cronjob: Enabled", "cl-newsletter"); $sOptionsInfo = i18n("Use cronjob: Enabled", "cl_newsletter");
} else { } else {
$sOptionsInfo = i18n("Use cronjob: Not enabled", "cl-newsletter"); $sOptionsInfo = i18n("Use cronjob: Not enabled", "cl_newsletter");
} }
if ($oJob->get("dispatch")) { if ($oJob->get("dispatch")) {
$sOptionsInfo .= "<br />" . sprintf(i18n("Dispatch: Enabled (block size: %s, delay: %s sec.)", "cl-newsletter"), $oJob->get("dispatch_count"), $oJob->get("dispatch_delay")); $sOptionsInfo .= "<br />" . sprintf(i18n("Dispatch: Enabled (block size: %s, delay: %s sec.)", "cl_newsletter"), $oJob->get("dispatch_count"), $oJob->get("dispatch_delay"));
} else { } else {
$sOptionsInfo .= "<br />" . i18n("Dispatch: Disabled", "cl-newsletter"); $sOptionsInfo .= "<br />" . i18n("Dispatch: Disabled", "cl_newsletter");
} }
$oForm->add(i18n("Options", "cl-newsletter"), $sOptionsInfo); $oForm->add(i18n("Options", "cl_newsletter"), $sOptionsInfo);
$oForm->add(i18n("Author", "cl-newsletter"), $oJob->get("authorname")); $oForm->add(i18n("Author", "cl_newsletter"), $oJob->get("authorname"));
$oForm->add(i18n("Created", "cl-newsletter"), $oJob->get("created")); $oForm->add(i18n("Created", "cl_newsletter"), $oJob->get("created"));
// Just remove the "save changes" message (as it is not possible to remove the image completely in ui_table_form) // Just remove the "save changes" message (as it is not possible to remove the image completely in ui_table_form)
$oForm->setActionButton("submit", $cfg['path']['contenido_fullhtml'] . "images/but_ok.gif", "", "s"); $oForm->setActionButton("submit", $cfg['path']['contenido_fullhtml'] . "images/but_ok.gif", "", "s");

14
includes/include.newsletter_jobs_menu.php
Datei anzeigen

@ -50,9 +50,9 @@ $oUser = new cApiUser($auth->auth["uid"]);
// sort: Element can be used to be sorted by // sort: Element can be used to be sorted by
// search: Element can be used to search in // search: Element can be used to search in
$aFields = array(); $aFields = array();
$aFields["name"] = array("field" => "name", "caption" => i18n("Name", "cl-newsletter"), "type" => "base,sort,search"); $aFields["name"] = array("field" => "name", "caption" => i18n("Name", "cl_newsletter"), "type" => "base,sort,search");
$aFields["created"] = array("field" => "created", "caption" => i18n("Created", "cl-newsletter"), "type" => "base,sort"); $aFields["created"] = array("field" => "created", "caption" => i18n("Created", "cl_newsletter"), "type" => "base,sort");
$aFields["status"] = array("field" => "status", "caption" => i18n("Status", "cl-newsletter"), "type" => "base,sort"); $aFields["status"] = array("field" => "status", "caption" => i18n("Status", "cl_newsletter"), "type" => "base,sort");
// Not needed, as no sort/search, but keep as memo: $aFields["cronjob"] = array("field" => "use_cronjob", "caption" => i18n("Use cronjob"), "type" => "base"); // Not needed, as no sort/search, but keep as memo: $aFields["cronjob"] = array("field" => "use_cronjob", "caption" => i18n("Use cronjob"), "type" => "base");
################################## ##################################
@ -158,11 +158,11 @@ $sDateFormat = getEffectiveSetting("backend", "timeformat", "d.m.Y H:i");
// Store messages for repeated use (speeds performance, as i18n translation is only needed once) // Store messages for repeated use (speeds performance, as i18n translation is only needed once)
$aMsg = array(); $aMsg = array();
$aMsg["DelTitle"] = i18n("Delete dispatch job", "cl-newsletter"); $aMsg["DelTitle"] = i18n("Delete dispatch job", "cl_newsletter");
$aMsg["DelDescr"] = i18n("Do you really want to delete the following newsletter dispatch job:<br>", "cl-newsletter"); $aMsg["DelDescr"] = i18n("Do you really want to delete the following newsletter dispatch job:<br>", "cl_newsletter");
$aMsg["SendTitle"] = i18n("Run job", "cl-newsletter"); $aMsg["SendTitle"] = i18n("Run job", "cl_newsletter");
$aMsg["SendDescr"] = i18n("Do you really want to run the following job:<br>", "cl-newsletter"); $aMsg["SendDescr"] = i18n("Do you really want to run the following job:<br>", "cl_newsletter");
// Prepare "send link" template // Prepare "send link" template
$sTplSend = '<a title="'.$aMsg["SendTitle"].'" href="javascript://" onclick="showSendMsg(\'{ID}\',\'{NAME}\')"><img src="'.$cfg['path']['images'].'newsletter_16.gif" border="0" title="'.$aMsg["SendTitle"].'" alt="'.$aMsg["SendTitle"].'"></a>'; $sTplSend = '<a title="'.$aMsg["SendTitle"].'" href="javascript://" onclick="showSendMsg(\'{ID}\',\'{NAME}\')"><img src="'.$cfg['path']['images'].'newsletter_16.gif" border="0" title="'.$aMsg["SendTitle"].'" alt="'.$aMsg["SendTitle"].'"></a>';

4
includes/include.newsletter_jobs_subnav.php
Datei anzeigen

@ -36,7 +36,7 @@ if (!defined('CON_FRAMEWORK')) {
if (isset($_GET['idnewsjob']) && (int)$_GET['idnewsjob'] > 0) if (isset($_GET['idnewsjob']) && (int)$_GET['idnewsjob'] > 0)
{ {
$sCaption = i18n("View", "cl-newsletter"); $sCaption = i18n("View", "cl_newsletter");
$tmp_area = "foo2"; $tmp_area = "foo2";
# Set template data # Set template data
@ -46,7 +46,7 @@ if (isset($_GET['idnewsjob']) && (int)$_GET['idnewsjob'] > 0)
$tpl->set("d", "CAPTION", '<a class="white" onclick="sub.clicked(this)" target="right_bottom" href="'.$sess->url("main.php?area=news_jobs&frame=4&idnewsjob=$idnewsjob").'">'.$sCaption.'</a>'); $tpl->set("d", "CAPTION", '<a class="white" onclick="sub.clicked(this)" target="right_bottom" href="'.$sess->url("main.php?area=news_jobs&frame=4&idnewsjob=$idnewsjob").'">'.$sCaption.'</a>');
$tpl->next(); $tpl->next();
$sCaption = i18n("Details", "cl-newsletter"); $sCaption = i18n("Details", "cl_newsletter");
$tmp_area = "foo2"; $tmp_area = "foo2";
# Set template data # Set template data

154
includes/include.newsletter_left_top.php
Datei anzeigen

@ -56,7 +56,7 @@ $sId = 'img_newsletter';
$oTpl->set('s', 'INEWSLETTER', $sId); $oTpl->set('s', 'INEWSLETTER', $sId);
if ($perm->have_perm_area_action('news')) { if ($perm->have_perm_area_action('news')) {
$sButtonRow = '<a style="margin-right:5px;" href="javascript://" onclick="toggleContainer(\''.$sId.'\');reloadLeftBottomAndTransportFormVars(document.newsletter_listoptionsform);">'; $sButtonRow = '<a style="margin-right:5px;" href="javascript://" onclick="toggleContainer(\''.$sId.'\');reloadLeftBottomAndTransportFormVars(document.newsletter_listoptionsform);">';
$sButtonRow .= '<img onmouseover="hoverEffect(\''.$sId.'\', \'in\')" onmouseout="hoverEffect(\''.$sId.'\', \'out\')" alt="'. i18n("Newsletter", "cl-newsletter").'" title="'.i18n("Newsletter", "cl-newsletter").'" name="'.$sId.'" id="'.$sId.'" src="'.$cfg["path"]["images"].'newsletter_on.gif"/>'; $sButtonRow .= '<img onmouseover="hoverEffect(\''.$sId.'\', \'in\')" onmouseout="hoverEffect(\''.$sId.'\', \'out\')" alt="'. i18n("Newsletter", "cl_newsletter").'" title="'.i18n("Newsletter", "cl_newsletter").'" name="'.$sId.'" id="'.$sId.'" src="'.$cfg["path"]["images"].'newsletter_on.gif"/>';
$sButtonRow .= '</a>'; $sButtonRow .= '</a>';
} }
@ -65,7 +65,7 @@ $sId = 'img_dispatch';
$oTpl->set('s', 'IDISPATCH', $sId); $oTpl->set('s', 'IDISPATCH', $sId);
if ($perm->have_perm_area_action('news_jobs')) { if ($perm->have_perm_area_action('news_jobs')) {
$sButtonRow .= '<a style="margin-right:5px;" href="javascript://" onclick="toggleContainer(\''.$sId.'\');reloadLeftBottomAndTransportFormVars(document.dispatch_listoptionsform);">'; $sButtonRow .= '<a style="margin-right:5px;" href="javascript://" onclick="toggleContainer(\''.$sId.'\');reloadLeftBottomAndTransportFormVars(document.dispatch_listoptionsform);">';
$sButtonRow .= '<img onmouseover="hoverEffect(\''.$sId.'\', \'in\')" onmouseout="hoverEffect(\''.$sId.'\', \'out\')" alt="'.i18n("Dispatch", "cl-newsletter").'" title="'.i18n("Dispatch", "cl-newsletter").'" name="'.$sId.'" id="'.$sId.'" src="'.$cfg["path"]["images"].'newsletter_dispatch_on.gif"/>'; $sButtonRow .= '<img onmouseover="hoverEffect(\''.$sId.'\', \'in\')" onmouseout="hoverEffect(\''.$sId.'\', \'out\')" alt="'.i18n("Dispatch", "cl_newsletter").'" title="'.i18n("Dispatch", "cl_newsletter").'" name="'.$sId.'" id="'.$sId.'" src="'.$cfg["path"]["images"].'newsletter_dispatch_on.gif"/>';
$sButtonRow .= '</a>'; $sButtonRow .= '</a>';
} }
@ -74,7 +74,7 @@ $sId = 'img_recipient';
$oTpl->set('s', 'IRECIPIENTS', $sId); $oTpl->set('s', 'IRECIPIENTS', $sId);
if ($perm->have_perm_area_action('recipients')) { if ($perm->have_perm_area_action('recipients')) {
$sButtonRow .= '<a style="margin-right:5px;" href="javascript://" onclick="toggleContainer(\''.$sId.'\');reloadLeftBottomAndTransportFormVars(document.recipients_listoptionsform);">'; $sButtonRow .= '<a style="margin-right:5px;" href="javascript://" onclick="toggleContainer(\''.$sId.'\');reloadLeftBottomAndTransportFormVars(document.recipients_listoptionsform);">';
$sButtonRow .= '<img onmouseover="hoverEffect(\''.$sId.'\', \'in\')" onmouseout="hoverEffect(\''.$sId.'\', \'out\')" alt="'.i18n("Recipients", "cl-newsletter").'" title="'.i18n("Recipients", "cl-newsletter").'" id="'.$sId.'" src="'.$cfg["path"]["images"].'newsletter_recipients_on.gif"/>'; $sButtonRow .= '<img onmouseover="hoverEffect(\''.$sId.'\', \'in\')" onmouseout="hoverEffect(\''.$sId.'\', \'out\')" alt="'.i18n("Recipients", "cl_newsletter").'" title="'.i18n("Recipients", "cl_newsletter").'" id="'.$sId.'" src="'.$cfg["path"]["images"].'newsletter_recipients_on.gif"/>';
$sButtonRow .= '</a>'; $sButtonRow .= '</a>';
} }
@ -83,7 +83,7 @@ $sId = 'img_recipientgroup';
$oTpl->set('s', 'IRECIPIENTGROUP', $sId); $oTpl->set('s', 'IRECIPIENTGROUP', $sId);
if ($perm->have_perm_area_action('recipientgroups')) { if ($perm->have_perm_area_action('recipientgroups')) {
$sButtonRow .= '<a style="margin-right:5px;" href="javascript://" onclick="toggleContainer(\''.$sId.'\');reloadLeftBottomAndTransportFormVars(groups_listoptionsform);">'; $sButtonRow .= '<a style="margin-right:5px;" href="javascript://" onclick="toggleContainer(\''.$sId.'\');reloadLeftBottomAndTransportFormVars(groups_listoptionsform);">';
$sButtonRow .= '<img onmouseover="hoverEffect(\''.$sId.'\', \'in\')" onmouseout="hoverEffect(\''.$sId.'\', \'out\')" alt="'.i18n("Recipient groups", "cl-newsletter").'" title="'.i18n("Recipient groups", "cl-newsletter").'" id="'.$sId.'" src="'.$cfg["path"]["images"].'newsletter_recipientgroups_on.gif"/>'; $sButtonRow .= '<img onmouseover="hoverEffect(\''.$sId.'\', \'in\')" onmouseout="hoverEffect(\''.$sId.'\', \'out\')" alt="'.i18n("Recipient groups", "cl_newsletter").'" title="'.i18n("Recipient groups", "cl_newsletter").'" id="'.$sId.'" src="'.$cfg["path"]["images"].'newsletter_recipientgroups_on.gif"/>';
$sButtonRow .= '</a>'; $sButtonRow .= '</a>';
} }
@ -98,7 +98,7 @@ unset($sButtonRow);
# 1.1 Newsletter: Actions folding row # 1.1 Newsletter: Actions folding row
###################################### ######################################
$sLink = "actionlink"; // ID for HTML element $sLink = "actionlink"; // ID for HTML element
$oActionsRow = new cFoldingRow("28cf9b31-e6d7-4657-a9a7-db31478e7a5c",i18n("Actions", "cl-newsletter"), $sLink); $oActionsRow = new cFoldingRow("28cf9b31-e6d7-4657-a9a7-db31478e7a5c",i18n("Actions", "cl_newsletter"), $sLink);
$oTpl->set('s', 'ACTIONLINK', $sLink); $oTpl->set('s', 'ACTIONLINK', $sLink);
if ($perm->have_perm_area_action("news", "news_create")) if ($perm->have_perm_area_action("news", "news_create"))
@ -108,7 +108,7 @@ if ($perm->have_perm_area_action("news", "news_create"))
$oLink = new cHTMLLink; $oLink = new cHTMLLink;
$oLink->setMultiLink("news", "", "news", "news_create"); $oLink->setMultiLink("news", "", "news", "news_create");
$oLink->setContent('<img style="margin-right: 4px;" src="'.$cfg["path"]["images"] . 'folder_new.gif" align="middle">'.i18n("Create newsletter", "cl-newsletter")); $oLink->setContent('<img style="margin-right: 4px;" src="'.$cfg["path"]["images"] . 'folder_new.gif" align="middle">'.i18n("Create newsletter", "cl_newsletter"));
$sContent .= $oLink->render() . '</div>'."\n"; $sContent .= $oLink->render() . '</div>'."\n";
$oActionsRow->setContentData($sContent); $oActionsRow->setContentData($sContent);
@ -120,7 +120,7 @@ if ($perm->have_perm_area_action("news", "news_create"))
# 1.2 Newsletter: Settings folding row # 1.2 Newsletter: Settings folding row
###################################### ######################################
$sLink = "settingslink"; $sLink = "settingslink";
$oSettingsRow = new cFoldingRow("d64baf0a-aea9-47b3-8490-54a00fce02b5",i18n("Settings", "cl-newsletter"), $sLink); $oSettingsRow = new cFoldingRow("d64baf0a-aea9-47b3-8490-54a00fce02b5",i18n("Settings", "cl_newsletter"), $sLink);
$oTpl->set('s', 'SETTINGSLINK', $sLink); $oTpl->set('s', 'SETTINGSLINK', $sLink);
// HTML Newsletter: Template and newsletter category // HTML Newsletter: Template and newsletter category
@ -132,9 +132,9 @@ $oSelHTMLTemplateIDCat->setStyle("width: 220px;");
$oSelHTMLNewsletterIDCat = new cHTMLSelectElement("selHTMLNewsletterCat"); $oSelHTMLNewsletterIDCat = new cHTMLSelectElement("selHTMLNewsletterCat");
$oSelHTMLNewsletterIDCat->setStyle("width: 220px;"); $oSelHTMLNewsletterIDCat->setStyle("width: 220px;");
$oOptionTemplate = new cHTMLOptionElement("--".i18n("Please select", "cl-newsletter")."--", 0); $oOptionTemplate = new cHTMLOptionElement("--".i18n("Please select", "cl_newsletter")."--", 0);
$oSelHTMLTemplateIDCat->addOptionElement(0, $oOptionTemplate); $oSelHTMLTemplateIDCat->addOptionElement(0, $oOptionTemplate);
$oOptionNewsletter = new cHTMLOptionElement("--".i18n("Please select", "cl-newsletter")."--", 0); $oOptionNewsletter = new cHTMLOptionElement("--".i18n("Please select", "cl_newsletter")."--", 0);
$oSelHTMLNewsletterIDCat->addOptionElement(0, $oOptionNewsletter); $oSelHTMLNewsletterIDCat->addOptionElement(0, $oOptionNewsletter);
$sSQL = "SELECT tblCat.idcat AS idcat, tblCatLang.name AS name, tblCatTree.level AS level, "; $sSQL = "SELECT tblCat.idcat AS idcat, tblCatLang.name AS name, tblCatTree.level AS level, ";
@ -200,7 +200,7 @@ if (!$perm->have_perm_area_action($area, "news_html_settings"))
$oSelTestDestination = new cHTMLSelectElement("selTestDestination"); $oSelTestDestination = new cHTMLSelectElement("selTestDestination");
$oSelTestDestination->setStyle("width: 220px;"); $oSelTestDestination->setStyle("width: 220px;");
$oOption = new cHTMLOptionElement(i18n("My mail address", "cl-newsletter"), 0); $oOption = new cHTMLOptionElement(i18n("My mail address", "cl_newsletter"), 0);
$oSelTestDestination->addOptionElement(0, $oOption); $oSelTestDestination->addOptionElement(0, $oOption);
$oRcpGroups = new RecipientGroupCollection; $oRcpGroups = new RecipientGroupCollection;
@ -237,7 +237,7 @@ if (!$perm->have_perm_area_action($area, "news_send_test"))
} }
$oSelTestDestination->setDefault($iTestDestination); $oSelTestDestination->setDefault($iTestDestination);
$oBtnSave = new cHTMLButton("submit", i18n("Save", "cl-newsletter")); $oBtnSave = new cHTMLButton("submit", i18n("Save", "cl_newsletter"));
$sContent = '<div style="border-bottom: 0px solid #B3B3B3; padding-left:17px; background: '.$cfg['color']['table_dark'].';">'."\n"; $sContent = '<div style="border-bottom: 0px solid #B3B3B3; padding-left:17px; background: '.$cfg['color']['table_dark'].';">'."\n";
$sContent .= ' <form target="left_bottom" onsubmit="append_registered_parameters(this);" id="htmlnewsletter" name="htmlnewsletter" method="get" action="main.php?1">'."\n"; $sContent .= ' <form target="left_bottom" onsubmit="append_registered_parameters(this);" id="htmlnewsletter" name="htmlnewsletter" method="get" action="main.php?1">'."\n";
@ -253,16 +253,16 @@ $sContent .= ' <input type="hidden" name="searchin" value="'.$_REQUEST["search
$sContent .= ' <input type="hidden" name="action_html" value="save_newsletter_properties">'."\n"; $sContent .= ' <input type="hidden" name="action_html" value="save_newsletter_properties">'."\n";
$sContent .= ' <table>'."\n"; $sContent .= ' <table>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'.$oCkbHTMLNewsletter->toHTML(false).' '.i18n("Enable HTML Newsletter", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'.$oCkbHTMLNewsletter->toHTML(false).' '.i18n("Enable HTML Newsletter", "cl_newsletter").'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'.i18n("HTML Template Category:", "cl-newsletter").'<br />'.$oSelHTMLTemplateIDCat->render().'</td>'."\n"; $sContent .= ' <td>'.i18n("HTML Template Category:", "cl_newsletter").'<br />'.$oSelHTMLTemplateIDCat->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'.i18n("HTML Newsletter Category:", "cl-newsletter").'<br />'.$oSelHTMLNewsletterIDCat->render().'</td>'."\n"; $sContent .= ' <td>'.i18n("HTML Newsletter Category:", "cl_newsletter").'<br />'.$oSelHTMLNewsletterIDCat->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'.i18n("Send test destination:", "cl-newsletter").'<br />'.$oSelTestDestination->render().'</td>'."\n"; $sContent .= ' <td>'.i18n("Send test destination:", "cl_newsletter").'<br />'.$oSelTestDestination->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td style="text-align: right;">'.$oBtnSave->render().'</td>'."\n"; $sContent .= ' <td style="text-align: right;">'.$oBtnSave->render().'</td>'."\n";
@ -282,7 +282,7 @@ if ($iItemsPerPage == 0) {
} }
$oSelItemsPerPage = new cHTMLSelectElement("elemperpage"); $oSelItemsPerPage = new cHTMLSelectElement("elemperpage");
$oSelItemsPerPage->autoFill(array(0 => i18n("-- All --", "cl-newsletter"), 25 => 25, 50 => 50, 75 => 75, 100 => 100)); $oSelItemsPerPage->autoFill(array(0 => i18n("-- All --", "cl_newsletter"), 25 => 25, 50 => 50, 75 => 75, 100 => 100));
$oSelItemsPerPage->setDefault($iItemsPerPage); $oSelItemsPerPage->setDefault($iItemsPerPage);
// Sort By // Sort By
$oSelSortBy = new cHTMLSelectElement("sortby"); $oSelSortBy = new cHTMLSelectElement("sortby");
@ -291,19 +291,19 @@ $oSelSortBy->addOptionElement($sKey, $oOption);
$oSelSortBy->setDefault("name"); $oSelSortBy->setDefault("name");
// Sort Order // Sort Order
$oSelSortOrder = new cHTMLSelectElement("sortorder"); $oSelSortOrder = new cHTMLSelectElement("sortorder");
$oSelSortOrder->autoFill(array("ASC" => i18n("Ascending", "cl-newsletter"), "DESC" => i18n("Descending", "cl-newsletter"))); $oSelSortOrder->autoFill(array("ASC" => i18n("Ascending", "cl_newsletter"), "DESC" => i18n("Descending", "cl_newsletter")));
$oSelSortOrder->setDefault("ASC"); $oSelSortOrder->setDefault("ASC");
// Search For // Search For
$oTextboxFilter = new cHTMLTextbox("filter", "", 16); $oTextboxFilter = new cHTMLTextbox("filter", "", 16);
// Search In // Search In
$oSelSearchIn = new cHTMLSelectElement("searchin"); $oSelSearchIn = new cHTMLSelectElement("searchin");
$oOption = new cHTMLOptionElement(i18n("-- All fields --", "cl-newsletter"), "--all--"); $oOption = new cHTMLOptionElement(i18n("-- All fields --", "cl_newsletter"), "--all--");
$oSelSearchIn->addOptionElement("all", $oOption); $oSelSearchIn->addOptionElement("all", $oOption);
$oOption = new cHTMLOptionElement("Name", "name"); $oOption = new cHTMLOptionElement("Name", "name");
$oSelSearchIn->addOptionElement($sKey, $oOption); $oSelSearchIn->addOptionElement($sKey, $oOption);
$oSelSearchIn->setDefault("name"); $oSelSearchIn->setDefault("name");
// Apply button // Apply button
$oBtnApply = new cHTMLButton("submit", i18n("Apply", "cl-newsletter")); $oBtnApply = new cHTMLButton("submit", i18n("Apply", "cl_newsletter"));
$sContent = '<div style="border-bottom: 0px solid #B3B3B3; padding-left: 17px; background: '.$cfg['color']['table_dark'].';">'."\n"; $sContent = '<div style="border-bottom: 0px solid #B3B3B3; padding-left: 17px; background: '.$cfg['color']['table_dark'].';">'."\n";
$sContent .= '<form target="left_bottom" onsubmit="reloadLeftBottomAndTransportFormVars(this);" id="newsletter_listoptionsform" name="newsletter_listoptionsform" method="get" action="">'."\n"; $sContent .= '<form target="left_bottom" onsubmit="reloadLeftBottomAndTransportFormVars(this);" id="newsletter_listoptionsform" name="newsletter_listoptionsform" method="get" action="">'."\n";
@ -312,23 +312,23 @@ $sContent .= ' <input type="hidden" name="frame" value="2">'."\n";
$sContent .= ' <input type="hidden" name="contenido" value="'.$sess->id.'">'."\n"; $sContent .= ' <input type="hidden" name="contenido" value="'.$sess->id.'">'."\n";
$sContent .= ' <table>'."\n"; $sContent .= ' <table>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Items / page", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Items / page", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelItemsPerPage->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelItemsPerPage->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Sort by", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Sort by", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelSortBy->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelSortBy->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Sort order", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Sort order", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelSortOrder->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelSortOrder->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Search for", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Search for", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oTextboxFilter->render().'</td>'."\n"; $sContent .= ' <td>'.$oTextboxFilter->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Search in", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Search in", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelSearchIn->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelSearchIn->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
@ -341,7 +341,7 @@ $sContent .= '</div>'."\n";
// To template // To template
$sLink = "listoption"; $sLink = "listoption";
$oListOptionsRow = new cFoldingRow("9d0968be-601d-44f8-a666-99d51c9c777d",i18n("List options", "cl-newsletter"), $sLink); $oListOptionsRow = new cFoldingRow("9d0968be-601d-44f8-a666-99d51c9c777d",i18n("List options", "cl_newsletter"), $sLink);
$oListOptionsRow->setContentData($sContent); $oListOptionsRow->setContentData($sContent);
$oTpl->set('s', 'LISTOPTIONLINK', $sLink); $oTpl->set('s', 'LISTOPTIONLINK', $sLink);
@ -400,10 +400,10 @@ $oTpl->set('s', 'ID_CNEWSLETTER', $sContainerId);
// sort: Element can be used to be sorted by // sort: Element can be used to be sorted by
// search: Element can be used to search in // search: Element can be used to search in
$aFields = array(); $aFields = array();
$aFields["name"] = array("field" => "name", "caption" => i18n("Name", "cl-newsletter"), "type" => "base,sort,search"); $aFields["name"] = array("field" => "name", "caption" => i18n("Name", "cl_newsletter"), "type" => "base,sort,search");
$aFields["created"] = array("field" => "created", "caption" => i18n("Created", "cl-newsletter"), "type" => "base,sort"); $aFields["created"] = array("field" => "created", "caption" => i18n("Created", "cl_newsletter"), "type" => "base,sort");
$aFields["status"] = array("field" => "status", "caption" => i18n("Status", "cl-newsletter"), "type" => "base,sort"); $aFields["status"] = array("field" => "status", "caption" => i18n("Status", "cl_newsletter"), "type" => "base,sort");
$aFields["cronjob"] = array("field" => "use_cronjob", "caption" => i18n("Use cronjob", "cl-newsletter"), "type" => "base"); $aFields["cronjob"] = array("field" => "use_cronjob", "caption" => i18n("Use cronjob", "cl_newsletter"), "type" => "base");
###################################### ######################################
# 2.1 Job dispatch: List options folding row # 2.1 Job dispatch: List options folding row
@ -441,7 +441,7 @@ if ($iItemsPerPage == 0) {
} }
$oSelItemsPerPage = new cHTMLSelectElement("elemperpage"); $oSelItemsPerPage = new cHTMLSelectElement("elemperpage");
$oSelItemsPerPage->autoFill(array(0 => i18n("-- All --", "cl-newsletter"), 25 => 25, 50 => 50, 75 => 75, 100 => 100)); $oSelItemsPerPage->autoFill(array(0 => i18n("-- All --", "cl_newsletter"), 25 => 25, 50 => 50, 75 => 75, 100 => 100));
$oSelItemsPerPage->setDefault($iItemsPerPage); $oSelItemsPerPage->setDefault($iItemsPerPage);
// Sort by // Sort by
@ -457,7 +457,7 @@ $oSelSortBy->setDefault("created");
// Sort order // Sort order
$oSelSortOrder = new cHTMLSelectElement("sortorder"); $oSelSortOrder = new cHTMLSelectElement("sortorder");
$oSelSortOrder->autoFill(array("ASC" => i18n("Ascending", "cl-newsletter"), "DESC" => i18n("Descending", "cl-newsletter"))); $oSelSortOrder->autoFill(array("ASC" => i18n("Ascending", "cl_newsletter"), "DESC" => i18n("Descending", "cl_newsletter")));
$oSelSortOrder->setDefault("DESC"); $oSelSortOrder->setDefault("DESC");
// Filter // Filter
@ -465,7 +465,7 @@ $oTxtFilter = new cHTMLTextbox("filter", "", 16);
//Search in //Search in
$oSelSearchIn = new cHTMLSelectElement("searchin"); $oSelSearchIn = new cHTMLSelectElement("searchin");
$oOption = new cHTMLOptionElement(i18n("-- All fields --", "cl-newsletter"), "--all--"); $oOption = new cHTMLOptionElement(i18n("-- All fields --", "cl_newsletter"), "--all--");
$oSelSearchIn->addOptionElement("all", $oOption); $oSelSearchIn->addOptionElement("all", $oOption);
foreach ($aFields as $sKey => $aData) foreach ($aFields as $sKey => $aData)
@ -478,7 +478,7 @@ foreach ($aFields as $sKey => $aData)
} }
$oSelSearchIn->setDefault("--all--"); $oSelSearchIn->setDefault("--all--");
$oBtnApply = new cHTMLButton("submit", i18n("Apply", "cl-newsletter")); $oBtnApply = new cHTMLButton("submit", i18n("Apply", "cl_newsletter"));
$sContent = '<div style="border-bottom: 0px solid #B3B3B3; padding-left: 17px; background: '.$cfg['color']['table_dark'].';">'."\n"; $sContent = '<div style="border-bottom: 0px solid #B3B3B3; padding-left: 17px; background: '.$cfg['color']['table_dark'].';">'."\n";
$sContent .= '<form target="left_bottom" onsubmit="reloadLeftBottomAndTransportFormVars(this);" id="dispatch_listoptionsform" name="dispatch_listoptionsform" method="get" action="">'."\n"; $sContent .= '<form target="left_bottom" onsubmit="reloadLeftBottomAndTransportFormVars(this);" id="dispatch_listoptionsform" name="dispatch_listoptionsform" method="get" action="">'."\n";
@ -487,27 +487,27 @@ $sContent .= ' <input type="hidden" name="frame" value="2">'."\n";
$sContent .= ' <input type="hidden" name="contenido" value="'.$sess->id.'">'."\n"; $sContent .= ' <input type="hidden" name="contenido" value="'.$sess->id.'">'."\n";
$sContent .= ' <table>'."\n"; $sContent .= ' <table>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Author", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Author", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelAuthor->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelAuthor->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Items / page", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Items / page", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelItemsPerPage->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelItemsPerPage->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Sort by", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Sort by", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelSortBy->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelSortBy->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Sort order", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Sort order", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelSortOrder->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelSortOrder->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Search for", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Search for", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oTxtFilter->render().'</td>'."\n"; $sContent .= ' <td>'.$oTxtFilter->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Search in", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Search in", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelSearchIn->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelSearchIn->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
@ -520,7 +520,7 @@ $sContent .= '</div>'."\n";
// To template // To template
$sLink = "listoptiondisp"; $sLink = "listoptiondisp";
$oListOptionsRow = new cFoldingRow("dfa6cc00-0acf-11db-9cd8-0800200c9a66",i18n("List options", "cl-newsletter"), $sLink); $oListOptionsRow = new cFoldingRow("dfa6cc00-0acf-11db-9cd8-0800200c9a66",i18n("List options", "cl_newsletter"), $sLink);
$oListOptionsRow->setContentData($sContent); $oListOptionsRow->setContentData($sContent);
$oTpl->set('s', 'LISTOPTIONLINKDISP', $sLink); $oTpl->set('s', 'LISTOPTIONLINKDISP', $sLink);
@ -565,10 +565,10 @@ $oTpl->set('s', 'ID_CDISPATCH', $sContainerId);
###################################### ######################################
// See comment at 2. Job dispatch // See comment at 2. Job dispatch
$aFields = array(); $aFields = array();
$aFields["name"] = array("field" => "name", "caption" => i18n("Name", "cl-newsletter"),"type" => "base,sort,search"); $aFields["name"] = array("field" => "name", "caption" => i18n("Name", "cl_newsletter"),"type" => "base,sort,search");
$aFields["email"] = array("field" => "email", "caption" => i18n("E-Mail", "cl-newsletter"),"type" => "base,sort,search"); $aFields["email"] = array("field" => "email", "caption" => i18n("E-Mail", "cl_newsletter"),"type" => "base,sort,search");
$aFields["confirmed"] = array("field" => "confirmed", "caption" => i18n("Confirmed", "cl-newsletter"), "type" => "base"); $aFields["confirmed"] = array("field" => "confirmed", "caption" => i18n("Confirmed", "cl_newsletter"), "type" => "base");
$aFields["deactivated"] = array("field" => "deactivated", "caption" => i18n("Deactivated", "cl-newsletter"), "type" => "base"); $aFields["deactivated"] = array("field" => "deactivated", "caption" => i18n("Deactivated", "cl_newsletter"), "type" => "base");
###################################### ######################################
# 3.1 Recipients: Actions folding row # 3.1 Recipients: Actions folding row
@ -580,7 +580,7 @@ if ($perm->have_perm_area_action("recipients", "recipients_create"))
{ {
$oLink = new cHTMLLink; $oLink = new cHTMLLink;
$oLink->setMultiLink("recipients","","recipients","recipients_create"); $oLink->setMultiLink("recipients","","recipients","recipients_create");
$oLink->setContent('<img style="margin-right: 4px;" src="'.$cfg["path"]["images"] . 'folder_new.gif" align="middle">'.i18n("Create recipient", "cl-newsletter").'</a>'); $oLink->setContent('<img style="margin-right: 4px;" src="'.$cfg["path"]["images"] . 'folder_new.gif" align="middle">'.i18n("Create recipient", "cl_newsletter").'</a>');
$sContent .= $oLink->render().'<br />'."\n"; $sContent .= $oLink->render().'<br />'."\n";
} }
@ -590,7 +590,7 @@ if ($perm->have_perm_area_action("recipients", "recipients_create"))
{ {
$oLink = new cHTMLLink; $oLink = new cHTMLLink;
$oLink->setMultiLink("recipients", "", "recipients_import", "recipients_import"); $oLink->setMultiLink("recipients", "", "recipients_import", "recipients_import");
$oLink->setContent('<img style="margin-right: 4px;" src="'.$cfg["path"]["images"] . 'importieren.gif" align="middle">'.i18n("Import recipients", "cl-newsletter").'</a>'); $oLink->setContent('<img style="margin-right: 4px;" src="'.$cfg["path"]["images"] . 'importieren.gif" align="middle">'.i18n("Import recipients", "cl_newsletter").'</a>');
$sContent .= $oLink->render().'<br />'."\n"; $sContent .= $oLink->render().'<br />'."\n";
} }
@ -604,9 +604,9 @@ if ($iTimeframe <= 0) {
if ($perm->have_perm_area_action("recipients", "recipients_delete")) if ($perm->have_perm_area_action("recipients", "recipients_delete"))
{ {
$oLink = new cHTMLLink; $oLink = new cHTMLLink;
$oLink->setLink('javascript:showPurgeMsg("'.i18n('Purge recipients', "cl-newsletter").'", "'.sprintf(i18n("Do you really want to remove recipients, that have not been confirmed since %s days and over?", "cl-newsletter"), '"+purgetimeframe+"').'")'); $oLink->setLink('javascript:showPurgeMsg("'.i18n('Purge recipients', "cl_newsletter").'", "'.sprintf(i18n("Do you really want to remove recipients, that have not been confirmed since %s days and over?", "cl_newsletter"), '"+purgetimeframe+"').'")');
$oLink->setContent('<img style="margin-right: 4px;" src="'.$cfg["path"]["images"] . 'delete.gif" align="middle">'.i18n("Purge recipients", "cl-newsletter").'</a>'); $oLink->setContent('<img style="margin-right: 4px;" src="'.$cfg["path"]["images"] . 'delete.gif" align="middle">'.i18n("Purge recipients", "cl_newsletter").'</a>');
$sContent .= $oLink->render(); $sContent .= $oLink->render();
} }
@ -615,7 +615,7 @@ $oTpl->set('s', 'VALUE_PURGETIMEFRAME', $iTimeframe);
// To template // To template
$sLink = "actionrec"; $sLink = "actionrec";
$oListActionsRow = new cFoldingRow("f0d7bf80-e73e-11d9-8cd6-0800200c9a66", i18n("Actions", "cl-newsletter"), $sLink); $oListActionsRow = new cFoldingRow("f0d7bf80-e73e-11d9-8cd6-0800200c9a66", i18n("Actions", "cl_newsletter"), $sLink);
$oListActionsRow->setContentData($sContent); $oListActionsRow->setContentData($sContent);
$oTpl->set('s', 'ACTIONLINKREC', $sLink); $oTpl->set('s', 'ACTIONLINKREC', $sLink);
@ -623,7 +623,7 @@ $oTpl->set('s', 'ACTIONLINKREC', $sLink);
# 3.2 Recipients: Settings folding row # 3.2 Recipients: Settings folding row
###################################### ######################################
$oTxtTimeframe = new cHTMLTextbox("txtPurgeTimeframe", $iTimeframe, 5); $oTxtTimeframe = new cHTMLTextbox("txtPurgeTimeframe", $iTimeframe, 5);
$oBtnSave = new cHTMLButton("submit", i18n("Save", "cl-newsletter")); $oBtnSave = new cHTMLButton("submit", i18n("Save", "cl_newsletter"));
$sContent = '<div style="border-bottom: 0px solid #B3B3B3; padding-left: 17px; background: '.$cfg['color']['table_dark'].';">'."\n"; $sContent = '<div style="border-bottom: 0px solid #B3B3B3; padding-left: 17px; background: '.$cfg['color']['table_dark'].';">'."\n";
$sContent .= '<form target="left_bottom" onsubmit="purgetimeframe = document.options.txtPurgeTimeframe.value; append_registered_parameters(this);" id="options" name="options" method="get" action="main.php?1">'."\n"; $sContent .= '<form target="left_bottom" onsubmit="purgetimeframe = document.options.txtPurgeTimeframe.value; append_registered_parameters(this);" id="options" name="options" method="get" action="main.php?1">'."\n";
@ -638,8 +638,8 @@ $sContent .= ' <input type="hidden" name="filter" value="'.$_REQUEST["filter"]
$sContent .= ' <input type="hidden" name="searchin" value="'.$_REQUEST["searchin"].'">'."\n"; $sContent .= ' <input type="hidden" name="searchin" value="'.$_REQUEST["searchin"].'">'."\n";
$sContent .= ' <table>'."\n"; $sContent .= ' <table>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Purge timeframe", "cl-newsletter").':</td>'."\n"; $sContent .= ' <td>'. i18n("Purge timeframe", "cl_newsletter").':</td>'."\n";
$sContent .= ' <td>'.$oTxtTimeframe->render().'&nbsp;'.i18n("days", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'.$oTxtTimeframe->render().'&nbsp;'.i18n("days", "cl_newsletter").'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>&nbsp;</td>'."\n"; $sContent .= ' <td>&nbsp;</td>'."\n";
@ -651,7 +651,7 @@ $sContent .= '</div>'."\n";
// To template // To template
$sLink = "settingsrec"; $sLink = "settingsrec";
$oSettingsRow = new cFoldingRow("5ddbe820-e6f1-11d9-8cd6-0800200c9a69",i18n("Settings", "cl-newsletter"), $sLink); $oSettingsRow = new cFoldingRow("5ddbe820-e6f1-11d9-8cd6-0800200c9a69",i18n("Settings", "cl_newsletter"), $sLink);
$oSettingsRow->setContentData($sContent); $oSettingsRow->setContentData($sContent);
$oTpl->set('s', 'SETTINGSLINKREC', $sLink); $oTpl->set('s', 'SETTINGSLINKREC', $sLink);
@ -664,7 +664,7 @@ if ($iItemsPerPage == 0) {
} }
$oSelItemsPerPage = new cHTMLSelectElement("elemperpage"); $oSelItemsPerPage = new cHTMLSelectElement("elemperpage");
$oSelItemsPerPage->autoFill(array(0 => i18n("-- All --", "cl-newsletter"), 25 => 25, 50 => 50, 75 => 75, 100 => 100)); $oSelItemsPerPage->autoFill(array(0 => i18n("-- All --", "cl_newsletter"), 25 => 25, 50 => 50, 75 => 75, 100 => 100));
$oSelItemsPerPage->setDefault($iItemsPerPage); $oSelItemsPerPage->setDefault($iItemsPerPage);
$oSelSortBy = new cHTMLSelectElement("sortby"); $oSelSortBy = new cHTMLSelectElement("sortby");
@ -678,11 +678,11 @@ foreach ($aFields as $sKey => $aData)
$oSelSortBy->setDefault("name"); $oSelSortBy->setDefault("name");
$oSelSortOrder = new cHTMLSelectElement("sortorder"); $oSelSortOrder = new cHTMLSelectElement("sortorder");
$oSelSortOrder->autoFill(array("ASC" => i18n("Ascending", "cl-newsletter"), "DESC" => i18n("Descending", "cl-newsletter"))); $oSelSortOrder->autoFill(array("ASC" => i18n("Ascending", "cl_newsletter"), "DESC" => i18n("Descending", "cl_newsletter")));
$oSelSortOrder->setDefault("ASC"); $oSelSortOrder->setDefault("ASC");
$oSelRestrictGroup = new cHTMLSelectElement("restrictgroup"); $oSelRestrictGroup = new cHTMLSelectElement("restrictgroup");
$oOption = new cHTMLOptionElement(i18n("-- All groups --", "cl-newsletter"), "--all--"); $oOption = new cHTMLOptionElement(i18n("-- All groups --", "cl_newsletter"), "--all--");
$oSelRestrictGroup->addOptionElement("all", $oOption); $oSelRestrictGroup->addOptionElement("all", $oOption);
// Fetch recipient groups // Fetch recipient groups
@ -710,7 +710,7 @@ $oSelRestrictGroup->setDefault("--all--");
$oTxtFilter = new cHTMLTextbox("filter", "", 16); $oTxtFilter = new cHTMLTextbox("filter", "", 16);
$oSelSearchIn = new cHTMLSelectElement("searchin"); $oSelSearchIn = new cHTMLSelectElement("searchin");
$oOption = new cHTMLOptionElement(i18n("-- All fields --", "cl-newsletter"), "--all--"); $oOption = new cHTMLOptionElement(i18n("-- All fields --", "cl_newsletter"), "--all--");
$oSelSearchIn->addOptionElement("all", $oOption); $oSelSearchIn->addOptionElement("all", $oOption);
foreach ($aFields as $sKey => $aData) { foreach ($aFields as $sKey => $aData) {
@ -730,27 +730,27 @@ $sContent .= ' <input type="hidden" name="frame" value="2">'."\n";
$sContent .= ' <input type="hidden" name="contenido" value="'.$sess->id.'">'."\n"; $sContent .= ' <input type="hidden" name="contenido" value="'.$sess->id.'">'."\n";
$sContent .= ' <table>'."\n"; $sContent .= ' <table>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Items / page", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Items / page", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelItemsPerPage->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelItemsPerPage->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Sort by", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Sort by", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelSortBy->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelSortBy->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Sort order", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Sort order", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelSortOrder->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelSortOrder->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Show group", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Show group", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelRestrictGroup->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelRestrictGroup->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Search for", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Search for", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oTxtFilter->render().'</td>'."\n"; $sContent .= ' <td>'.$oTxtFilter->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Search in", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Search in", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelSearchIn->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelSearchIn->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
@ -763,7 +763,7 @@ $sContent .= '</div>'."\n";
// To template // To template
$sLink = "listoptionsrec"; $sLink = "listoptionsrec";
$oListOptionsRow = new cFoldingRow("5ddbe820-e6f1-11d9-8cd6-0800200c9a66",i18n("List options", "cl-newsletter"), $sLink); $oListOptionsRow = new cFoldingRow("5ddbe820-e6f1-11d9-8cd6-0800200c9a66",i18n("List options", "cl_newsletter"), $sLink);
$oListOptionsRow->setContentData($sContent); $oListOptionsRow->setContentData($sContent);
$oTpl->set('s', 'LISTOPTIONLINKREC', $sLink); $oTpl->set('s', 'LISTOPTIONLINKREC', $sLink);
@ -812,7 +812,7 @@ $oTpl->set('s', 'ID_CRECIPIENTS', $sContainerId);
###################################### ######################################
// See comment at 2. Job dispatch // See comment at 2. Job dispatch
$aFields = array(); $aFields = array();
$aFields["name"] = array("field" => "groupname", "caption" => i18n("Name", "cl-newsletter"), "type" => "base,sort,search"); $aFields["name"] = array("field" => "groupname", "caption" => i18n("Name", "cl_newsletter"), "type" => "base,sort,search");
###################################### ######################################
# 4.1 Recipient groups: Actions # 4.1 Recipient groups: Actions
@ -824,14 +824,14 @@ if ($perm->have_perm_area_action("recipientgroups", "recipientgroup_create"))
{ {
$oLnk = new cHTMLLink; $oLnk = new cHTMLLink;
$oLnk->setMultiLink("recipientgroups","","recipientgroups","recipientgroup_create"); $oLnk->setMultiLink("recipientgroups","","recipientgroups","recipientgroup_create");
$oLnk->setContent('<img style="margin-right: 4px;" src="'.$cfg["path"]["images"] . 'folder_new.gif" align="middle">'.i18n("Create group", "cl-newsletter").'</a>'); $oLnk->setContent('<img style="margin-right: 4px;" src="'.$cfg["path"]["images"] . 'folder_new.gif" align="middle">'.i18n("Create group", "cl_newsletter").'</a>');
$sContent .= $oLnk->render().'<br />'."\n"; $sContent .= $oLnk->render().'<br />'."\n";
} }
$sContent .= '</div>'."\n"; $sContent .= '</div>'."\n";
$sLink = "actiongroup"; $sLink = "actiongroup";
$oListActionsRow = new cFoldingRow("f0d7bf80-e73e-11d9-8cd6-0800200c9a67",i18n("Actions", "cl-newsletter"), $sLink); $oListActionsRow = new cFoldingRow("f0d7bf80-e73e-11d9-8cd6-0800200c9a67",i18n("Actions", "cl_newsletter"), $sLink);
$oListActionsRow->setContentData($sContent); $oListActionsRow->setContentData($sContent);
$oTpl->set('s', 'ACTIONLINKGROUP', $sLink); $oTpl->set('s', 'ACTIONLINKGROUP', $sLink);
@ -844,7 +844,7 @@ if ($iItemsPerPage == 0) {
} }
$oSelItemsPerPage = new cHTMLSelectElement("elemperpage"); $oSelItemsPerPage = new cHTMLSelectElement("elemperpage");
$oSelItemsPerPage->autoFill(array(0 => i18n("-- All --", "cl-newsletter"), 25 => 25, 50 => 50, 75 => 75, 100 => 100)); $oSelItemsPerPage->autoFill(array(0 => i18n("-- All --", "cl_newsletter"), 25 => 25, 50 => 50, 75 => 75, 100 => 100));
$oSelItemsPerPage->setDefault($iItemsPerPage); $oSelItemsPerPage->setDefault($iItemsPerPage);
$oSelSortBy = new cHTMLSelectElement("sortby"); $oSelSortBy = new cHTMLSelectElement("sortby");
@ -857,13 +857,13 @@ foreach ($aFields as $sKey => $aData) {
$oSelSortBy->setDefault("name"); $oSelSortBy->setDefault("name");
$oSelSortOrder = new cHTMLSelectElement("sortorder"); $oSelSortOrder = new cHTMLSelectElement("sortorder");
$oSelSortOrder->autoFill(array("ASC" => i18n("Ascending", "cl-newsletter"), "DESC" => i18n("Descending", "cl-newsletter"))); $oSelSortOrder->autoFill(array("ASC" => i18n("Ascending", "cl_newsletter"), "DESC" => i18n("Descending", "cl_newsletter")));
$oSelSortOrder->setDefault("ASC"); $oSelSortOrder->setDefault("ASC");
$oTxtFilter = new cHTMLTextbox("filter", "", 16); $oTxtFilter = new cHTMLTextbox("filter", "", 16);
$oSelSearchIn = new cHTMLSelectElement("searchin"); $oSelSearchIn = new cHTMLSelectElement("searchin");
$oOption = new cHTMLOptionElement(i18n("-- All fields --", "cl-newsletter"), "--all--"); $oOption = new cHTMLOptionElement(i18n("-- All fields --", "cl_newsletter"), "--all--");
$oSelSearchIn->addOptionElement("all", $oOption); $oSelSearchIn->addOptionElement("all", $oOption);
foreach ($aFields as $sKey => $aData) { foreach ($aFields as $sKey => $aData) {
@ -874,7 +874,7 @@ foreach ($aFields as $sKey => $aData) {
} }
$oSelSearchIn->setDefault("--all--"); $oSelSearchIn->setDefault("--all--");
$oBtnApply = new cHTMLButton("submit", i18n("Apply", "cl-newsletter")); $oBtnApply = new cHTMLButton("submit", i18n("Apply", "cl_newsletter"));
$sContent = '<div style="border-bottom: 0px solid #B3B3B3; padding-left: 17px; background: '.$cfg['color']['table_dark'].';">'."\n"; $sContent = '<div style="border-bottom: 0px solid #B3B3B3; padding-left: 17px; background: '.$cfg['color']['table_dark'].';">'."\n";
$sContent .= '<form target="left_bottom" onsubmit="reloadLeftBottomAndTransportFormVars(this);" id="groups_listoptionsform" name="groups_listoptionsform" method="get" action="">'."\n"; $sContent .= '<form target="left_bottom" onsubmit="reloadLeftBottomAndTransportFormVars(this);" id="groups_listoptionsform" name="groups_listoptionsform" method="get" action="">'."\n";
@ -883,23 +883,23 @@ $sContent .= ' <input type="hidden" name="frame" value="2">'."\n";
$sContent .= ' <input type="hidden" name="contenido" value="'.$sess->id.'">'."\n"; $sContent .= ' <input type="hidden" name="contenido" value="'.$sess->id.'">'."\n";
$sContent .= ' <table>'."\n"; $sContent .= ' <table>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Items / page", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Items / page", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelItemsPerPage->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelItemsPerPage->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Sort by", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Sort by", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelSortBy->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelSortBy->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Sort order", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Sort order", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelSortOrder->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelSortOrder->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Search for", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Search for", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oTxtFilter->render().'</td>'."\n"; $sContent .= ' <td>'.$oTxtFilter->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
$sContent .= ' <td>'. i18n("Search in", "cl-newsletter").'</td>'."\n"; $sContent .= ' <td>'. i18n("Search in", "cl_newsletter").'</td>'."\n";
$sContent .= ' <td>'.$oSelSearchIn->render().'</td>'."\n"; $sContent .= ' <td>'.$oSelSearchIn->render().'</td>'."\n";
$sContent .= ' </tr>'."\n"; $sContent .= ' </tr>'."\n";
$sContent .= ' <tr>'."\n"; $sContent .= ' <tr>'."\n";
@ -912,7 +912,7 @@ $sContent .= '</div>'."\n";
// To template // To template
$sLink = "listoptionsgroup"; $sLink = "listoptionsgroup";
$oListOptionsRow = new cFoldingRow("79efc1fc-111d-11dc-8314-0800200c9a66",i18n("List options", "cl-newsletter"), $sLink); $oListOptionsRow = new cFoldingRow("79efc1fc-111d-11dc-8314-0800200c9a66",i18n("List options", "cl_newsletter"), $sLink);
$oListOptionsRow->setContentData($sContent); $oListOptionsRow->setContentData($sContent);
$oTpl->set('s', 'LISTOPTIONLINKGROUP', $sLink); $oTpl->set('s', 'LISTOPTIONLINKGROUP', $sLink);

20
includes/include.newsletter_menu.php
Datei anzeigen

@ -52,7 +52,7 @@ $lIDCatArt = (int) $oClientLang->getProperty("newsletter", "idcatart");
// sort: Element can be used to be sorted by // sort: Element can be used to be sorted by
// search: Element can be used to search in // search: Element can be used to search in
$aFields = array(); $aFields = array();
$aFields["name"] = array("field" => "name", "caption" => i18n("Name", "cl-newsletter"), "type" => "base,sort,search"); $aFields["name"] = array("field" => "name", "caption" => i18n("Name", "cl_newsletter"), "type" => "base,sort,search");
################################## ##################################
# Store settings/Get basic data # Store settings/Get basic data
@ -164,14 +164,14 @@ $iMenu = 0;
// Store messages for repeated use (speeds performance, as i18n translation is only needed once) // Store messages for repeated use (speeds performance, as i18n translation is only needed once)
$aMsg = array(); $aMsg = array();
$aMsg["DelTitle"] = i18n("Delete newsletter", "cl-newsletter"); $aMsg["DelTitle"] = i18n("Delete newsletter", "cl_newsletter");
$aMsg["DelDescr"] = i18n("Do you really want to delete the following newsletter:<br>", "cl-newsletter"); $aMsg["DelDescr"] = i18n("Do you really want to delete the following newsletter:<br>", "cl_newsletter");
$aMsg["SendTestTitle"] = i18n("Send test newsletter", "cl-newsletter"); $aMsg["SendTestTitle"] = i18n("Send test newsletter", "cl_newsletter");
$aMsg["SendTestTitleOff"] = i18n("Send test newsletter (disabled, check newsletter sender e-mail address and handler article selection)", "cl-newsletter"); $aMsg["SendTestTitleOff"] = i18n("Send test newsletter (disabled, check newsletter sender e-mail address and handler article selection)", "cl_newsletter");
$aMsg["AddJobTitle"] = i18n("Add newsletter dispatch job", "cl-newsletter"); $aMsg["AddJobTitle"] = i18n("Add newsletter dispatch job", "cl_newsletter");
$aMsg["AddJobTitleOff"] = i18n("Add newsletter dispatch job (disabled, check newsletter sender e-mail address and handler article selection)", "cl-newsletter"); $aMsg["AddJobTitleOff"] = i18n("Add newsletter dispatch job (disabled, check newsletter sender e-mail address and handler article selection)", "cl_newsletter");
$aMsg["CopyTitle"] = i18n("Duplicate newsletter", "cl-newsletter"); $aMsg["CopyTitle"] = i18n("Duplicate newsletter", "cl_newsletter");
while ($oNewsletter = $oNewsletters->next()) { while ($oNewsletter = $oNewsletters->next()) {
$idnewsletter = $oNewsletter->get("idnews"); $idnewsletter = $oNewsletter->get("idnews");
@ -245,12 +245,12 @@ if ($_REQUEST["selTestDestination"] > 0 && $perm->have_perm_area_action($area, "
$oRcpGroups->query(); $oRcpGroups->query();
if ($oRcpGroup = $oRcpGroups->next()) { if ($oRcpGroup = $oRcpGroups->next()) {
$sSendTestTarget = sprintf(i18n("Recipient group: %s", "cl-newsletter"), $oRcpGroup->get("groupname")); $sSendTestTarget = sprintf(i18n("Recipient group: %s", "cl_newsletter"), $oRcpGroup->get("groupname"));
} }
unset($oRcpGroups); unset($oRcpGroups);
} }
$aMsg["SendTestDescr"] = sprintf(i18n("Do you really want to send the newsletter to:<br><strong>%s</strong>", "cl-newsletter"), $sSendTestTarget); $aMsg["SendTestDescr"] = sprintf(i18n("Do you really want to send the newsletter to:<br><strong>%s</strong>", "cl_newsletter"), $sSendTestTarget);
$sExecScript = ' $sExecScript = '
<script type="text/javascript"> <script type="text/javascript">

4
includes/include.newsletter_subnav.php
Datei anzeigen

@ -37,7 +37,7 @@ if (!defined('CON_FRAMEWORK')) {
if (isset($_GET['idnewsletter'])) if (isset($_GET['idnewsletter']))
{ {
# Set template data # Set template data
$sCaption = i18n("Edit", "cl-newsletter"); $sCaption = i18n("Edit", "cl_newsletter");
$tpl->set("d", "ID", 'c_'.$tpl->dyn_cnt); $tpl->set("d", "ID", 'c_'.$tpl->dyn_cnt);
$tpl->set("d", "CLASS", ''); $tpl->set("d", "CLASS", '');
@ -46,7 +46,7 @@ if (isset($_GET['idnewsletter']))
$tpl->next(); $tpl->next();
# Set template data # Set template data
$sCaption = i18n("Edit Message", "cl-newsletter"); $sCaption = i18n("Edit Message", "cl_newsletter");
$tpl->set("d", "ID", 'c_'.$tpl->dyn_cnt); $tpl->set("d", "ID", 'c_'.$tpl->dyn_cnt);
$tpl->set("d", "CLASS", ''); $tpl->set("d", "CLASS", '');

2
includes/include.recipients.group.subnav.php
Datei anzeigen

@ -35,7 +35,7 @@ if (!defined('CON_FRAMEWORK')) {
if (isset($_GET['idrecipientgroup']) && (int) $_GET['idrecipientgroup'] > 0) { if (isset($_GET['idrecipientgroup']) && (int) $_GET['idrecipientgroup'] > 0) {
$caption = i18n("Overview", "cl-newsletter"); $caption = i18n("Overview", "cl_newsletter");
$tmp_area = "foo2"; $tmp_area = "foo2";
# Set template data # Set template data

76
includes/include.recipients.group_edit.php
Datei anzeigen

@ -40,13 +40,13 @@ $oRGroupMembers = new RecipientGroupMemberCollection;
$oRGroup = new RecipientGroup; $oRGroup = new RecipientGroup;
$aFields = array(); $aFields = array();
$aFields["name"] = array("field" => "name", "caption" => i18n("Name", "cl-newsletter"), "type" => "base,sort,search"); $aFields["name"] = array("field" => "name", "caption" => i18n("Name", "cl_newsletter"), "type" => "base,sort,search");
$aFields["email"] = array("field" => "email", "caption" => i18n("E-Mail", "cl-newsletter"), "type" => "base,sort,search"); $aFields["email"] = array("field" => "email", "caption" => i18n("E-Mail", "cl_newsletter"), "type" => "base,sort,search");
$aFields["confirmed"] = array("field" => "confirmed", "caption" => i18n("Confirmed", "cl-newsletter"), "type" => "base"); $aFields["confirmed"] = array("field" => "confirmed", "caption" => i18n("Confirmed", "cl_newsletter"), "type" => "base");
$aFields["deactivated"] = array("field" => "deactivated", "caption" => i18n("Deactivated", "cl-newsletter"), "type" => "base"); $aFields["deactivated"] = array("field" => "deactivated", "caption" => i18n("Deactivated", "cl_newsletter"), "type" => "base");
if ($action == "recipientgroup_create" && $perm->have_perm_area_action($area, $action)) { if ($action == "recipientgroup_create" && $perm->have_perm_area_action($area, $action)) {
$oRGroup = $oRGroups->create(" " . i18n("-- new group --", "cl-newsletter")); $oRGroup = $oRGroups->create(" " . i18n("-- new group --", "cl_newsletter"));
$_REQUEST["idrecipientgroup"] = $oRGroup->get("idnewsgroup"); $_REQUEST["idrecipientgroup"] = $oRGroup->get("idnewsgroup");
$oPage->setReload(); $oPage->setReload();
$sRefreshLeftTopScript = '<script type="text/javascript">top.content.left.left_top.refreshGroupOption(\'' . $_REQUEST["idrecipientgroup"] . '\', \'add\')</script>'; $sRefreshLeftTopScript = '<script type="text/javascript">top.content.left.left_top.refreshGroupOption(\'' . $_REQUEST["idrecipientgroup"] . '\', \'add\')</script>';
@ -79,7 +79,7 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou
$oRGroups->query(); $oRGroups->query();
if ($oRGroups->next()) { if ($oRGroups->next()) {
$aMessages[] = i18n("Could not set new group name: Group already exists", "cl-newsletter"); $aMessages[] = i18n("Could not set new group name: Group already exists", "cl_newsletter");
} else { } else {
$bReload = true; $bReload = true;
@ -172,20 +172,20 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou
$oForm->setVar("idrecipientgroup", $_REQUEST["idrecipientgroup"]); $oForm->setVar("idrecipientgroup", $_REQUEST["idrecipientgroup"]);
$oForm->setSubmitJS("append_registered_parameters(this);"); $oForm->setSubmitJS("append_registered_parameters(this);");
$oForm->addHeader(i18n("Edit group", "cl-newsletter")); $oForm->addHeader(i18n("Edit group", "cl_newsletter"));
$oTxtGroupName = new cHTMLTextbox("groupname", $oRGroup->get("groupname"), 40); $oTxtGroupName = new cHTMLTextbox("groupname", $oRGroup->get("groupname"), 40);
$oForm->add(i18n("Group name", "cl-newsletter"), $oTxtGroupName->render()); $oForm->add(i18n("Group name", "cl_newsletter"), $oTxtGroupName->render());
$oCkbDefault = new cHTMLCheckbox("defaultgroup", "1"); $oCkbDefault = new cHTMLCheckbox("defaultgroup", "1");
$oCkbDefault->setChecked($oRGroup->get("defaultgroup")); $oCkbDefault->setChecked($oRGroup->get("defaultgroup"));
$oForm->add(i18n("Default group", "cl-newsletter"), $oCkbDefault->toHTML(false)); $oForm->add(i18n("Default group", "cl_newsletter"), $oCkbDefault->toHTML(false));
// Member list options folding row // Member list options folding row
$oMemberListOptionRow = new cFoldingRow("a91f5540-52db-11db-b0de-0800200c9a66", i18n("Member list options", "cl-newsletter")); $oMemberListOptionRow = new cFoldingRow("a91f5540-52db-11db-b0de-0800200c9a66", i18n("Member list options", "cl_newsletter"));
$oSelItemsPerPage = new cHTMLSelectElement("member_elemperpage"); $oSelItemsPerPage = new cHTMLSelectElement("member_elemperpage");
$oSelItemsPerPage->autoFill(array(0 => i18n("-- All --", "cl-newsletter"), 25 => 25, 50 => 50, 75 => 75, 100 => 100)); $oSelItemsPerPage->autoFill(array(0 => i18n("-- All --", "cl_newsletter"), 25 => 25, 50 => 50, 75 => 75, 100 => 100));
$oSelItemsPerPage->setDefault($_REQUEST["member_elemperpage"]); $oSelItemsPerPage->setDefault($_REQUEST["member_elemperpage"]);
$oSelSortBy = new cHTMLSelectElement("member_sortby"); $oSelSortBy = new cHTMLSelectElement("member_sortby");
@ -201,13 +201,13 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou
$oSelSortBy->setDefault($_REQUEST["member_sortby"]); $oSelSortBy->setDefault($_REQUEST["member_sortby"]);
$oSelSortOrder = new cHTMLSelectElement("member_sortorder"); $oSelSortOrder = new cHTMLSelectElement("member_sortorder");
$oSelSortOrder->autoFill(array("ASC" => i18n("Ascending", "cl-newsletter"), "DESC" => i18n("Descending", "cl-newsletter"))); $oSelSortOrder->autoFill(array("ASC" => i18n("Ascending", "cl_newsletter"), "DESC" => i18n("Descending", "cl_newsletter")));
$oSelSortOrder->setDefault($_REQUEST["member_sortorder"]); $oSelSortOrder->setDefault($_REQUEST["member_sortorder"]);
$oTxtFilter = new cHTMLTextbox("member_filter", $_REQUEST["member_filter"], 16); $oTxtFilter = new cHTMLTextbox("member_filter", $_REQUEST["member_filter"], 16);
$oSelSearchIn = new cHTMLSelectElement("member_searchin"); $oSelSearchIn = new cHTMLSelectElement("member_searchin");
$oOption = new cHTMLOptionElement(i18n("-- All fields --", "cl-newsletter"), "--all--"); $oOption = new cHTMLOptionElement(i18n("-- All fields --", "cl_newsletter"), "--all--");
$oSelSearchIn->addOptionElement("all", $oOption); $oSelSearchIn->addOptionElement("all", $oOption);
foreach ($aFields as $sKey => $aData) { foreach ($aFields as $sKey => $aData) {
@ -218,28 +218,28 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou
} }
$oSelSearchIn->setDefault($_REQUEST["member_searchin"]); $oSelSearchIn->setDefault($_REQUEST["member_searchin"]);
$oSubmit = new cHTMLButton("submit", i18n("Apply", "cl-newsletter")); $oSubmit = new cHTMLButton("submit", i18n("Apply", "cl_newsletter"));
$sContent = '<div style="border-bottom: 1px solid black; background: ' . $cfg['color']['table_dark'] . ';">' . chr(10); $sContent = '<div style="border-bottom: 1px solid black; background: ' . $cfg['color']['table_dark'] . ';">' . chr(10);
$sContent .= ' <table>' . chr(10); $sContent .= ' <table>' . chr(10);
$sContent .= ' <tr>' . chr(10); $sContent .= ' <tr>' . chr(10);
$sContent .= ' <td>' . i18n("Items / page", "cl-newsletter") . '</td>' . chr(10); $sContent .= ' <td>' . i18n("Items / page", "cl_newsletter") . '</td>' . chr(10);
$sContent .= ' <td>' . $oSelItemsPerPage->render() . '</td>' . chr(10); $sContent .= ' <td>' . $oSelItemsPerPage->render() . '</td>' . chr(10);
$sContent .= ' </tr>' . chr(10); $sContent .= ' </tr>' . chr(10);
$sContent .= ' <tr>' . chr(10); $sContent .= ' <tr>' . chr(10);
$sContent .= ' <td>' . i18n("Sort by", "cl-newsletter") . '</td>' . chr(10); $sContent .= ' <td>' . i18n("Sort by", "cl_newsletter") . '</td>' . chr(10);
$sContent .= ' <td>' . $oSelSortBy->render() . '</td>' . chr(10); $sContent .= ' <td>' . $oSelSortBy->render() . '</td>' . chr(10);
$sContent .= ' </tr>' . chr(10); $sContent .= ' </tr>' . chr(10);
$sContent .= ' <tr>' . chr(10); $sContent .= ' <tr>' . chr(10);
$sContent .= ' <td>' . i18n("Sort order", "cl-newsletter") . '</td>' . chr(10); $sContent .= ' <td>' . i18n("Sort order", "cl_newsletter") . '</td>' . chr(10);
$sContent .= ' <td>' . $oSelSortOrder->render() . '</td>' . chr(10); $sContent .= ' <td>' . $oSelSortOrder->render() . '</td>' . chr(10);
$sContent .= ' </tr>' . chr(10); $sContent .= ' </tr>' . chr(10);
$sContent .= ' <tr>' . chr(10); $sContent .= ' <tr>' . chr(10);
$sContent .= ' <td>' . i18n("Search for", "cl-newsletter") . '</td>' . chr(10); $sContent .= ' <td>' . i18n("Search for", "cl_newsletter") . '</td>' . chr(10);
$sContent .= ' <td>' . $oTxtFilter->render() . '</td>' . chr(10); $sContent .= ' <td>' . $oTxtFilter->render() . '</td>' . chr(10);
$sContent .= ' </tr>' . chr(10); $sContent .= ' </tr>' . chr(10);
$sContent .= ' <tr>' . chr(10); $sContent .= ' <tr>' . chr(10);
$sContent .= ' <td>' . i18n("Search in", "cl-newsletter") . '</td>' . chr(10); $sContent .= ' <td>' . i18n("Search in", "cl_newsletter") . '</td>' . chr(10);
$sContent .= ' <td>' . $oSelSearchIn->render() . '</td>' . chr(10); $sContent .= ' <td>' . $oSelSearchIn->render() . '</td>' . chr(10);
$sContent .= ' </tr>' . chr(10); $sContent .= ' </tr>' . chr(10);
$sContent .= ' <tr>' . chr(10); $sContent .= ' <tr>' . chr(10);
@ -255,9 +255,9 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou
$oAddedRecipientList->setWidth("100%"); $oAddedRecipientList->setWidth("100%");
$oAddedRecipientList->setBorder(1); $oAddedRecipientList->setBorder(1);
$oAddedRecipientList->setCell(0, 1, "<strong>" . i18n("Name", "cl-newsletter") . "</strong>"); $oAddedRecipientList->setCell(0, 1, "<strong>" . i18n("Name", "cl_newsletter") . "</strong>");
$oImgDel = new cHTMLImage("images/but_invert_selection.gif"); $oImgDel = new cHTMLImage("images/but_invert_selection.gif");
$sLnkDelIcon = '<a title="' . i18n("Check all", "cl-newsletter") . '" href="javascript://" onclick="fncCheckDel(\'deluser[]\');">' . $oImgDel->render() . '</a>'; $sLnkDelIcon = '<a title="' . i18n("Check all", "cl_newsletter") . '" href="javascript://" onclick="fncCheckDel(\'deluser[]\');">' . $oImgDel->render() . '</a>';
$oAddedRecipientList->setCell(0, 2, $sLnkDelIcon); $oAddedRecipientList->setCell(0, 2, $sLnkDelIcon);
$oAddedRecipientList->setCellAlignment(0, 2, "right"); $oAddedRecipientList->setCellAlignment(0, 2, "right");
@ -315,10 +315,10 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou
$iItems = $oInsiders->count(); $iItems = $oInsiders->count();
if ($iItems == 0 && $_REQUEST["member_filter"] == "" && ($_REQUEST["member_elemperpage"] == 0 || $iMembers == 0)) { if ($iItems == 0 && $_REQUEST["member_filter"] == "" && ($_REQUEST["member_elemperpage"] == 0 || $iMembers == 0)) {
$oAddedRecipientList->setCell(1, 1, i18n("No recipients are added to this group yet", "cl-newsletter")); $oAddedRecipientList->setCell(1, 1, i18n("No recipients are added to this group yet", "cl_newsletter"));
$oAddedRecipientList->setCell(1, 2, '&nbsp;'); $oAddedRecipientList->setCell(1, 2, '&nbsp;');
} else if ($iItems == 0) { } else if ($iItems == 0) {
$oAddedRecipientList->setCell(1, 1, i18n("No recipients found", "cl-newsletter")); $oAddedRecipientList->setCell(1, 1, i18n("No recipients found", "cl_newsletter"));
$oAddedRecipientList->setCell(1, 2, '&nbsp;'); $oAddedRecipientList->setCell(1, 2, '&nbsp;');
} else { } else {
while ($oRcp = $oInsiders->next()) { while ($oRcp = $oInsiders->next()) {
@ -361,9 +361,9 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou
$oPagerLink->setCustom("contenido", $sess->id); $oPagerLink->setCustom("contenido", $sess->id);
$oMemberPager = new cObjectPager("d82a3ff0-52d9-11db-b0de-0800200c9a66", $iMembers, $_REQUEST["member_elemperpage"], $_REQUEST["member_page"], $oPagerLink, "member_page"); $oMemberPager = new cObjectPager("d82a3ff0-52d9-11db-b0de-0800200c9a66", $iMembers, $_REQUEST["member_elemperpage"], $_REQUEST["member_page"], $oPagerLink, "member_page");
$oMemberPager->setCaption(i18n("Member navigation", "cl-newsletter")); $oMemberPager->setCaption(i18n("Member navigation", "cl_newsletter"));
$oForm->add(i18n("Recipients in group", "cl-newsletter"), '<table border="0" cellspacing="0" cellpadding="0" width="100%">' . $oForm->add(i18n("Recipients in group", "cl_newsletter"), '<table border="0" cellspacing="0" cellpadding="0" width="100%">' .
$oMemberListOptionRow->render() . $oMemberListOptionRow->render() .
$oMemberPager->render() . $oMemberPager->render() .
'<tr><td>' . $oAddedRecipientList->render() . '</td></tr></table>'); '<tr><td>' . $oAddedRecipientList->render() . '</td></tr></table>');
@ -374,10 +374,10 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou
// Outsiders // Outsiders
// Outsider list options folding row // Outsider list options folding row
$oOutsiderListOptionRow = new cFoldingRow("ca633b00-52e9-11db-b0de-0800200c9a66", i18n("Outsider list options", "cl-newsletter")); $oOutsiderListOptionRow = new cFoldingRow("ca633b00-52e9-11db-b0de-0800200c9a66", i18n("Outsider list options", "cl_newsletter"));
$oSelItemsPerPage = new cHTMLSelectElement("outsider_elemperpage"); $oSelItemsPerPage = new cHTMLSelectElement("outsider_elemperpage");
$oSelItemsPerPage->autoFill(array(0 => i18n("-- All --", "cl-newsletter"), 25 => 25, 50 => 50, 75 => 75, 100 => 100)); $oSelItemsPerPage->autoFill(array(0 => i18n("-- All --", "cl_newsletter"), 25 => 25, 50 => 50, 75 => 75, 100 => 100));
$oSelItemsPerPage->setDefault($_REQUEST["outsider_elemperpage"]); $oSelItemsPerPage->setDefault($_REQUEST["outsider_elemperpage"]);
$oSelSortBy = new cHTMLSelectElement("outsider_sortby"); $oSelSortBy = new cHTMLSelectElement("outsider_sortby");
@ -393,13 +393,13 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou
$oSelSortBy->setDefault($_REQUEST["outsider_sortby"]); $oSelSortBy->setDefault($_REQUEST["outsider_sortby"]);
$oSelSortOrder = new cHTMLSelectElement("outsider_sortorder"); $oSelSortOrder = new cHTMLSelectElement("outsider_sortorder");
$oSelSortOrder->autoFill(array("ASC" => i18n("Ascending", "cl-newsletter"), "DESC" => i18n("Descending", "cl-newsletter"))); $oSelSortOrder->autoFill(array("ASC" => i18n("Ascending", "cl_newsletter"), "DESC" => i18n("Descending", "cl_newsletter")));
$oSelSortOrder->setDefault($_REQUEST["outsider_sortorder"]); $oSelSortOrder->setDefault($_REQUEST["outsider_sortorder"]);
$oTxtFilter = new cHTMLTextbox("outsider_filter", $_REQUEST["outsider_filter"], 16); $oTxtFilter = new cHTMLTextbox("outsider_filter", $_REQUEST["outsider_filter"], 16);
$oSelSearchIn = new cHTMLSelectElement("outsider_searchin"); $oSelSearchIn = new cHTMLSelectElement("outsider_searchin");
$oOption = new cHTMLOptionElement(i18n("-- All fields --", "cl-newsletter"), "--all--"); $oOption = new cHTMLOptionElement(i18n("-- All fields --", "cl_newsletter"), "--all--");
$oSelSearchIn->addOptionElement("all", $oOption); $oSelSearchIn->addOptionElement("all", $oOption);
foreach ($aFields as $sKey => $aData) { foreach ($aFields as $sKey => $aData) {
@ -410,28 +410,28 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou
} }
$oSelSearchIn->setDefault($_REQUEST["outsider_searchin"]); $oSelSearchIn->setDefault($_REQUEST["outsider_searchin"]);
$oSubmit = new cHTMLButton("submit", i18n("Apply", "cl-newsletter")); $oSubmit = new cHTMLButton("submit", i18n("Apply", "cl_newsletter"));
$sContent = '<div style="border-bottom: 1px solid black; background: ' . $cfg['color']['table_dark'] . ';">' . chr(10); $sContent = '<div style="border-bottom: 1px solid black; background: ' . $cfg['color']['table_dark'] . ';">' . chr(10);
$sContent .= ' <table>' . chr(10); $sContent .= ' <table>' . chr(10);
$sContent .= ' <tr>' . chr(10); $sContent .= ' <tr>' . chr(10);
$sContent .= ' <td>' . i18n("Items / page", "cl-newsletter") . '</td>' . chr(10); $sContent .= ' <td>' . i18n("Items / page", "cl_newsletter") . '</td>' . chr(10);
$sContent .= ' <td>' . $oSelItemsPerPage->render() . '</td>' . chr(10); $sContent .= ' <td>' . $oSelItemsPerPage->render() . '</td>' . chr(10);
$sContent .= ' </tr>' . chr(10); $sContent .= ' </tr>' . chr(10);
$sContent .= ' <tr>' . chr(10); $sContent .= ' <tr>' . chr(10);
$sContent .= ' <td>' . i18n("Sort by", "cl-newsletter") . '</td>' . chr(10); $sContent .= ' <td>' . i18n("Sort by", "cl_newsletter") . '</td>' . chr(10);
$sContent .= ' <td>' . $oSelSortBy->render() . '</td>' . chr(10); $sContent .= ' <td>' . $oSelSortBy->render() . '</td>' . chr(10);
$sContent .= ' </tr>' . chr(10); $sContent .= ' </tr>' . chr(10);
$sContent .= ' <tr>' . chr(10); $sContent .= ' <tr>' . chr(10);
$sContent .= ' <td>' . i18n("Sort order", "cl-newsletter") . '</td>' . chr(10); $sContent .= ' <td>' . i18n("Sort order", "cl_newsletter") . '</td>' . chr(10);
$sContent .= ' <td>' . $oSelSortOrder->render() . '</td>' . chr(10); $sContent .= ' <td>' . $oSelSortOrder->render() . '</td>' . chr(10);
$sContent .= ' </tr>' . chr(10); $sContent .= ' </tr>' . chr(10);
$sContent .= ' <tr>' . chr(10); $sContent .= ' <tr>' . chr(10);
$sContent .= ' <td>' . i18n("Search for", "cl-newsletter") . '</td>' . chr(10); $sContent .= ' <td>' . i18n("Search for", "cl_newsletter") . '</td>' . chr(10);
$sContent .= ' <td>' . $oTxtFilter->render() . '</td>' . chr(10); $sContent .= ' <td>' . $oTxtFilter->render() . '</td>' . chr(10);
$sContent .= ' </tr>' . chr(10); $sContent .= ' </tr>' . chr(10);
$sContent .= ' <tr>' . chr(10); $sContent .= ' <tr>' . chr(10);
$sContent .= ' <td>' . i18n("Search in", "cl-newsletter") . '</td>' . chr(10); $sContent .= ' <td>' . i18n("Search in", "cl_newsletter") . '</td>' . chr(10);
$sContent .= ' <td>' . $oSelSearchIn->render() . '</td>' . chr(10); $sContent .= ' <td>' . $oSelSearchIn->render() . '</td>' . chr(10);
$sContent .= ' </tr>' . chr(10); $sContent .= ' </tr>' . chr(10);
$sContent .= ' <tr>' . chr(10); $sContent .= ' <tr>' . chr(10);
@ -529,12 +529,12 @@ if ($oRGroup->virgin == false && $oRGroup->get("idclient") == $client && $oRGrou
$oPagerLink->setCustom("contenido", $sess->id); $oPagerLink->setCustom("contenido", $sess->id);
$oOutsiderPager = new cObjectPager("4d3a7330-52eb-11db-b0de-0800200c9a66", $iOutsiders, $_REQUEST["outsider_elemperpage"], $_REQUEST["outsider_page"], $oPagerLink, "outsider_page"); $oOutsiderPager = new cObjectPager("4d3a7330-52eb-11db-b0de-0800200c9a66", $iOutsiders, $_REQUEST["outsider_elemperpage"], $_REQUEST["outsider_page"], $oPagerLink, "outsider_page");
$oOutsiderPager->setCaption(i18n("Outsider navigation", "cl-newsletter")); $oOutsiderPager->setCaption(i18n("Outsider navigation", "cl_newsletter"));
$oForm->add(i18n("Add recipients", "cl-newsletter"), '<table border="0" cellspacing="0" cellpadding="0" width="100%">' . $oForm->add(i18n("Add recipients", "cl_newsletter"), '<table border="0" cellspacing="0" cellpadding="0" width="100%">' .
$oOutsiderListOptionRow->render() . $oOutsiderListOptionRow->render() .
$oOutsiderPager->render() . $oOutsiderPager->render() .
'<tr><td>' . $oSelUser->render() . '<br />' . i18n("Note: Hold &lt;Ctrl&gt; to<br>select multiple items.", "cl-newsletter") . '</td></tr></table>'); '<tr><td>' . $oSelUser->render() . '<br />' . i18n("Note: Hold &lt;Ctrl&gt; to<br>select multiple items.", "cl_newsletter") . '</td></tr></table>');
unset($oOutsiders); unset($oOutsiders);
unset($oOutsiderListOptionRow); unset($oOutsiderListOptionRow);
unset($oOutsiderPager); unset($oOutsiderPager);

6
includes/include.recipients.group_menu.php
Datei anzeigen

@ -49,7 +49,7 @@ $oUser = new cApiUser($auth->auth["uid"]);
// sort: Element can be used to be sorted by // sort: Element can be used to be sorted by
// search: Element can be used to search in // search: Element can be used to search in
$aFields = array(); $aFields = array();
$aFields["name"] = array("field" => "groupname", "caption" => i18n("Name", "cl-newsletter"), "type" => "base,sort,search"); $aFields["name"] = array("field" => "groupname", "caption" => i18n("Name", "cl_newsletter"), "type" => "base,sort,search");
################################## ##################################
# Check external input # Check external input
@ -126,8 +126,8 @@ $iMenu = 0;
// Store messages for repeated use (speeds performance, as i18n translation is only needed once) // Store messages for repeated use (speeds performance, as i18n translation is only needed once)
$aMsg = array(); $aMsg = array();
$aMsg["DelTitle"] = i18n("Delete recipient group", "cl-newsletter"); $aMsg["DelTitle"] = i18n("Delete recipient group", "cl_newsletter");
$aMsg["DelDescr"] = i18n("Do you really want to delete the following newsletter recipient group:<br>", "cl-newsletter"); $aMsg["DelDescr"] = i18n("Do you really want to delete the following newsletter recipient group:<br>", "cl_newsletter");
while ($oRcpGroup = $oRcpGroups->next()) { while ($oRcpGroup = $oRcpGroups->next()) {
$iMenu++; $iMenu++;

38
includes/include.recipients_edit.php
Datei anzeigen

@ -44,7 +44,7 @@ if (is_array($cfg['plugins']['recipients'])) {
// Note, that the object name has to be $recipient for plugins // Note, that the object name has to be $recipient for plugins
if ($action == "recipients_create" && $perm->have_perm_area_action($area, $action)) { if ($action == "recipients_create" && $perm->have_perm_area_action($area, $action)) {
$recipient = $oRecipients->create("mail@domain.tld", " " . i18n("-- new recipient --", "cl-newsletter")); $recipient = $oRecipients->create("mail@domain.tld", " " . i18n("-- new recipient --", "cl_newsletter"));
$oPage->setReload(); $oPage->setReload();
} elseif ($action == "recipients_delete" && $perm->have_perm_area_action($area, $action)) { } elseif ($action == "recipients_delete" && $perm->have_perm_area_action($area, $action)) {
$oRecipients->delete($idrecipient); $oRecipients->delete($idrecipient);
@ -59,9 +59,9 @@ if ($action == "recipients_create" && $perm->have_perm_area_action($area, $actio
$purgedrecipients = $oRecipients->purge($timeframe); $purgedrecipients = $oRecipients->purge($timeframe);
/* backslashdollar: There is a problem translating \$ - it is either not recognized or translated correctly (using poEdit) */ /* backslashdollar: There is a problem translating \$ - it is either not recognized or translated correctly (using poEdit) */
if ($purgedrecipients > 0) { if ($purgedrecipients > 0) {
$sNotis = $notification->messageBox("info", sprintf(str_replace("backslashdollar", "\$", i18n("%1backslashdollard recipients, which hasn't been confirmed since more than %2backslashdollard days has been removed.", "cl-newsletter")), $purgedrecipients, $timeframe), 0); $sNotis = $notification->messageBox("info", sprintf(str_replace("backslashdollar", "\$", i18n("%1backslashdollard recipients, which hasn't been confirmed since more than %2backslashdollard days has been removed.", "cl_newsletter")), $purgedrecipients, $timeframe), 0);
} else { } else {
$sNotis = $notification->messageBox("info", sprintf(str_replace("backslashdollar", "\$", i18n("There are no recipients, which hasn't been confirmed since more than %2backslashdollard days has been removed.", "cl-newsletter")), 0, $timeframe), 0); $sNotis = $notification->messageBox("info", sprintf(str_replace("backslashdollar", "\$", i18n("There are no recipients, which hasn't been confirmed since more than %2backslashdollard days has been removed.", "cl_newsletter")), 0, $timeframe), 0);
} }
$recipient = new Recipient; $recipient = new Recipient;
@ -84,7 +84,7 @@ if ($recipient->virgin == false && $recipient->get("idclient") == $client && $re
$recipient->set("name", $name); $recipient->set("name", $name);
if (!isValidMail($email)) { if (!isValidMail($email)) {
$aMessages[] = i18n("Please specify a valid e-mail address", "cl-newsletter"); $aMessages[] = i18n("Please specify a valid e-mail address", "cl_newsletter");
} else { } else {
$email = strtolower($email); // e-mail always in lower case $email = strtolower($email); // e-mail always in lower case
if ($recipient->get("email") != $email) { if ($recipient->get("email") != $email) {
@ -96,7 +96,7 @@ if ($recipient->virgin == false && $recipient->get("idclient") == $client && $re
$oRecipients->query(); $oRecipients->query();
if ($oRecipients->next()) { if ($oRecipients->next()) {
$aMessages[] = i18n("Could not set new e-mail adress: Other recipient with same e-mail address already exists", "cl-newsletter"); $aMessages[] = i18n("Could not set new e-mail adress: Other recipient with same e-mail address already exists", "cl_newsletter");
} else { } else {
$recipient->set("email", $email); $recipient->set("email", $email);
} }
@ -154,7 +154,7 @@ if ($recipient->virgin == false && $recipient->get("idclient") == $client && $re
$oForm->setVar("action", "recipients_save"); $oForm->setVar("action", "recipients_save");
$oForm->setVar("idrecipient", $recipient->get("idnewsrcp")); $oForm->setVar("idrecipient", $recipient->get("idnewsrcp"));
$oForm->addHeader(i18n("Edit recipient", "cl-newsletter")); $oForm->addHeader(i18n("Edit recipient", "cl_newsletter"));
$oTxtName = new cHTMLTextbox("name", $recipient->get("name"), 40); $oTxtName = new cHTMLTextbox("name", $recipient->get("name"), 40);
$oTxtEMail = new cHTMLTextbox("email", $recipient->get("email"), 40); $oTxtEMail = new cHTMLTextbox("email", $recipient->get("email"), 40);
@ -164,17 +164,17 @@ if ($recipient->virgin == false && $recipient->get("idclient") == $client && $re
$oCkbDeactivated->setChecked($recipient->get("deactivated")); $oCkbDeactivated->setChecked($recipient->get("deactivated"));
$oSelNewsType = new cHTMLSelectElement("newstype"); $oSelNewsType = new cHTMLSelectElement("newstype");
$oOption = new cHTMLOptionElement(i18n("Text only", "cl-newsletter"), "0"); $oOption = new cHTMLOptionElement(i18n("Text only", "cl_newsletter"), "0");
$oSelNewsType->addOptionElement(0, $oOption); $oSelNewsType->addOptionElement(0, $oOption);
$oOption = new cHTMLOptionElement(i18n("HTML and text", "cl-newsletter"), "1"); $oOption = new cHTMLOptionElement(i18n("HTML and text", "cl_newsletter"), "1");
$oSelNewsType->addOptionElement(1, $oOption); $oSelNewsType->addOptionElement(1, $oOption);
$oSelNewsType->setDefault($recipient->get("news_type")); $oSelNewsType->setDefault($recipient->get("news_type"));
$oForm->add(i18n("Name", "cl-newsletter"), $oTxtName->render()); $oForm->add(i18n("Name", "cl_newsletter"), $oTxtName->render());
$oForm->add(i18n("E-Mail", "cl-newsletter"), $oTxtEMail->render()); $oForm->add(i18n("E-Mail", "cl_newsletter"), $oTxtEMail->render());
$oForm->add(i18n("Confirmed", "cl-newsletter"), $oCkbConfirmed->toHTML(false) . " (" . $recipient->get("confirmeddate") . ")"); $oForm->add(i18n("Confirmed", "cl_newsletter"), $oCkbConfirmed->toHTML(false) . " (" . $recipient->get("confirmeddate") . ")");
$oForm->add(i18n("Deactivated", "cl-newsletter"), $oCkbDeactivated->toHTML(false)); $oForm->add(i18n("Deactivated", "cl_newsletter"), $oCkbDeactivated->toHTML(false));
$oForm->add(i18n("Message type", "cl-newsletter"), $oSelNewsType->render()); $oForm->add(i18n("Message type", "cl_newsletter"), $oSelNewsType->render());
$aPluginOrder = trim_array(explode(",", getSystemProperty("plugin", "recipients-pluginorder"))); $aPluginOrder = trim_array(explode(",", getSystemProperty("plugin", "recipients-pluginorder")));
@ -192,7 +192,7 @@ if ($recipient->virgin == false && $recipient->get("idclient") == $client && $re
} }
} else { } else {
if (is_array($aPluginTitle) || is_array($aPluginDisplay)) { if (is_array($aPluginTitle) || is_array($aPluginDisplay)) {
$oForm->add(i18n("WARNING", "cl-newsletter"), sprintf(i18n("The plugin %s delivered an array for the displayed titles, but did not return an array for the contents.", "cl-newsletter"), $sPlugin)); $oForm->add(i18n("WARNING", "cl_newsletter"), sprintf(i18n("The plugin %s delivered an array for the displayed titles, but did not return an array for the contents.", "cl_newsletter"), $sPlugin));
} else { } else {
$oForm->add($aPluginTitle, $aPluginDisplay); $oForm->add($aPluginTitle, $aPluginDisplay);
} }
@ -212,10 +212,10 @@ if ($recipient->virgin == false && $recipient->get("idclient") == $client && $re
$oAssocGroups->query(); $oAssocGroups->query();
if ($oAssocGroups->count() == 0) { if ($oAssocGroups->count() == 0) {
$oGroupList->setCell(0, 1, i18n("Recipient is not member of any group", "cl-newsletter")); $oGroupList->setCell(0, 1, i18n("Recipient is not member of any group", "cl_newsletter"));
} else { } else {
// Headline // Headline
$oGroupList->setCell(0, 1, "<strong>" . i18n("Groupname", "cl-newsletter") . "</strong>"); $oGroupList->setCell(0, 1, "<strong>" . i18n("Groupname", "cl_newsletter") . "</strong>");
$oImgDel = new cHTMLImage("images/delete.gif"); $oImgDel = new cHTMLImage("images/delete.gif");
$oGroupList->setCell(0, 2, $oImgDel->render()); $oGroupList->setCell(0, 2, $oImgDel->render());
$oGroupList->setCellAlignment(0, 2, "right"); $oGroupList->setCellAlignment(0, 2, "right");
@ -232,10 +232,10 @@ if ($recipient->virgin == false && $recipient->get("idclient") == $client && $re
} }
} }
$oForm->add(i18n("Associated Groups", "cl-newsletter"), $oGroupList->render()); $oForm->add(i18n("Associated Groups", "cl_newsletter"), $oGroupList->render());
$oForm->add(i18n("Author", "cl-newsletter"), $classuser->getUserName($recipient->get("author")) . " (" . $recipient->get("created") . ")"); $oForm->add(i18n("Author", "cl_newsletter"), $classuser->getUserName($recipient->get("author")) . " (" . $recipient->get("created") . ")");
$oForm->add(i18n("Last modified by", "cl-newsletter"), $classuser->getUserName($recipient->get("modifiedby")) . " (" . $recipient->get("lastmodified") . ")"); $oForm->add(i18n("Last modified by", "cl_newsletter"), $classuser->getUserName($recipient->get("modifiedby")) . " (" . $recipient->get("lastmodified") . ")");
$oPage->setContent($sNotis . $oForm->render(true)); $oPage->setContent($sNotis . $oForm->render(true));
} else { } else {

56
includes/include.recipients_import.php
Datei anzeigen

@ -49,37 +49,37 @@ if ($_REQUEST["selDelimiter"] == "") {
$aFields = array(); $aFields = array();
$aFieldDetails = array(); $aFieldDetails = array();
$aFields["name"] = strtolower(i18n("Name", "cl-newsletter")); $aFields["name"] = strtolower(i18n("Name", "cl_newsletter"));
$aFieldDetails["name"]["fieldtype"] = "field"; // field, plugin or group $aFieldDetails["name"]["fieldtype"] = "field"; // field, plugin or group
$aFieldDetails["name"]["mandatory"] = false; // true or false $aFieldDetails["name"]["mandatory"] = false; // true or false
$aFieldDetails["name"]["type"] = "string"; // string, boolean or date $aFieldDetails["name"]["type"] = "string"; // string, boolean or date
$aFieldDetails["name"]["link"] = false; // plugin name for plugins, recipient group id for groups $aFieldDetails["name"]["link"] = false; // plugin name for plugins, recipient group id for groups
$aFieldDetails["name"]["col"] = -1; // Stores column index where this field has been found $aFieldDetails["name"]["col"] = -1; // Stores column index where this field has been found
$aFields["email"] = strtolower(i18n("Mail", "cl-newsletter")); $aFields["email"] = strtolower(i18n("Mail", "cl_newsletter"));
$aFieldDetails["email"]["fieldtype"] = "field"; $aFieldDetails["email"]["fieldtype"] = "field";
$aFieldDetails["email"]["mandatory"] = true; $aFieldDetails["email"]["mandatory"] = true;
$aFieldDetails["email"]["type"] = "string"; $aFieldDetails["email"]["type"] = "string";
$aFieldDetails["email"]["link"] = false; $aFieldDetails["email"]["link"] = false;
$aFieldDetails["email"]["col"] = -1; $aFieldDetails["email"]["col"] = -1;
$aFields["deactivated"] = strtolower(i18n("Deactivated", "cl-newsletter")); $aFields["deactivated"] = strtolower(i18n("Deactivated", "cl_newsletter"));
$aFieldDetails["deactivated"]["fieldtype"] = "field"; $aFieldDetails["deactivated"]["fieldtype"] = "field";
$aFieldDetails["deactivated"]["mandatory"] = false; $aFieldDetails["deactivated"]["mandatory"] = false;
$aFieldDetails["deactivated"]["type"] = "boolean"; $aFieldDetails["deactivated"]["type"] = "boolean";
$aFieldDetails["deactivated"]["link"] = false; $aFieldDetails["deactivated"]["link"] = false;
$aFieldDetails["deactivated"]["col"] = -1; $aFieldDetails["deactivated"]["col"] = -1;
$aFields["confirmed"] = strtolower(i18n("Confirmed", "cl-newsletter")); $aFields["confirmed"] = strtolower(i18n("Confirmed", "cl_newsletter"));
$aFieldDetails["confirmed"]["fieldtype"] = "field"; $aFieldDetails["confirmed"]["fieldtype"] = "field";
$aFieldDetails["confirmed"]["mandatory"] = false; $aFieldDetails["confirmed"]["mandatory"] = false;
$aFieldDetails["confirmed"]["type"] = "boolean"; $aFieldDetails["confirmed"]["type"] = "boolean";
$aFieldDetails["confirmed"]["link"] = false; $aFieldDetails["confirmed"]["link"] = false;
$aFieldDetails["confirmed"]["col"] = -1; $aFieldDetails["confirmed"]["col"] = -1;
$aFields["confirmeddate"] = strtolower(i18n("Confirmed Date", "cl-newsletter")); $aFields["confirmeddate"] = strtolower(i18n("Confirmed Date", "cl_newsletter"));
$aFieldDetails["confirmeddate"]["fieldtype"] = "field"; $aFieldDetails["confirmeddate"]["fieldtype"] = "field";
$aFieldDetails["confirmeddate"]["mandatory"] = false; $aFieldDetails["confirmeddate"]["mandatory"] = false;
$aFieldDetails["confirmeddate"]["type"] = "date"; $aFieldDetails["confirmeddate"]["type"] = "date";
$aFieldDetails["confirmeddate"]["link"] = false; $aFieldDetails["confirmeddate"]["link"] = false;
$aFieldDetails["confirmeddate"]["col"] = -1; $aFieldDetails["confirmeddate"]["col"] = -1;
$aFields["news_type"] = strtolower(i18n("Message type", "cl-newsletter")); $aFields["news_type"] = strtolower(i18n("Message type", "cl_newsletter"));
$aFieldDetails["news_type"]["fieldtype"] = "field"; $aFieldDetails["news_type"]["fieldtype"] = "field";
$aFieldDetails["news_type"]["mandatory"] = false; $aFieldDetails["news_type"]["mandatory"] = false;
$aFieldDetails["news_type"]["type"] = "boolean"; $aFieldDetails["news_type"]["type"] = "boolean";
@ -127,7 +127,7 @@ while ($oRcpGroup = $oRcpGroups->next()) {
// Only PHP5! // Only PHP5!
//$sGroupName = str_replace(str_split(" \t\n\r\0\x0B;"), "", $oRcpGroup->get("groupname")); //$sGroupName = str_replace(str_split(" \t\n\r\0\x0B;"), "", $oRcpGroup->get("groupname"));
$aFields[$sField] = strtolower(clHtmlEntities(trim(i18n("Group", "cl-newsletter") . "_" . $sGroupName))); $aFields[$sField] = strtolower(clHtmlEntities(trim(i18n("Group", "cl_newsletter") . "_" . $sGroupName)));
$aFieldDetails[$sField]["fieldtype"] = "group"; $aFieldDetails[$sField]["fieldtype"] = "group";
$aFieldDetails[$sField]["mandatory"] = false; $aFieldDetails[$sField]["mandatory"] = false;
$aFieldDetails[$sField]["type"] = "string"; $aFieldDetails[$sField]["type"] = "string";
@ -171,7 +171,7 @@ if ($action == "recipients_import_exec" && $perm->have_perm_area_action("recipie
foreach ($aParts as $sHeader) { foreach ($aParts as $sHeader) {
$sKey = array_search(strtolower(clHtmlEntities(trim($sHeader))), $aFields); $sKey = array_search(strtolower(clHtmlEntities(trim($sHeader))), $aFields);
if ($sKey === false) { if ($sKey === false) {
$aMessage[] = sprintf(i18n("Given column header '%s' unknown, column ignored", "cl-newsletter"), $sHeader); $aMessage[] = sprintf(i18n("Given column header '%s' unknown, column ignored", "cl_newsletter"), $sHeader);
} else { } else {
$aFieldDetails[$sKey]["col"] = $iCol; $aFieldDetails[$sKey]["col"] = $iCol;
$iCol++; $iCol++;
@ -179,7 +179,7 @@ if ($action == "recipients_import_exec" && $perm->have_perm_area_action("recipie
} }
foreach ($aFieldDetails as $sKey => $aDetails) { foreach ($aFieldDetails as $sKey => $aDetails) {
if ($aDetails["mandatory"] && $aDetails["col"] == -1) { if ($aDetails["mandatory"] && $aDetails["col"] == -1) {
$aMessage[] = sprintf(i18n("Mandatory column '%s' wasn't found, import stopped", "cl-newsletter"), $aDetails[$sKey]); $aMessage[] = sprintf(i18n("Mandatory column '%s' wasn't found, import stopped", "cl_newsletter"), $aDetails[$sKey]);
$bStop = true; $bStop = true;
} }
} }
@ -199,15 +199,15 @@ if ($action == "recipients_import_exec" && $perm->have_perm_area_action("recipie
$sName = $sEMail; $sName = $sEMail;
} }
if ($sEMail == "") { if ($sEMail == "") {
$aMessage[] = sprintf(i18n("Item with empty mail address found, item ignored (name: %s, row: %s)", "cl-newsletter"), $sName, $iRow); $aMessage[] = sprintf(i18n("Item with empty mail address found, item ignored (name: %s, row: %s)", "cl_newsletter"), $sName, $iRow);
$aInvalidLines[] = $sLine; $aInvalidLines[] = $sLine;
$iInvalid++; $iInvalid++;
} else if (!isValidMail($sEMail)) { } else if (!isValidMail($sEMail)) {
$aMessage[] = sprintf(i18n("Mail address '%s' is invalid, item ignored (row: %s)", "cl-newsletter"), $sEMail, $iRow); $aMessage[] = sprintf(i18n("Mail address '%s' is invalid, item ignored (row: %s)", "cl_newsletter"), $sEMail, $iRow);
$aInvalidLines[] = $sLine; $aInvalidLines[] = $sLine;
$iInvalid++; $iInvalid++;
} else if ($oRecipients->emailExists($sEMail)) { } else if ($oRecipients->emailExists($sEMail)) {
$aMessage[] = sprintf(i18n("Recipient with mail address '%s' already exists, item skipped (row: %s)", "cl-newsletter"), $sEMail, $iRow); $aMessage[] = sprintf(i18n("Recipient with mail address '%s' already exists, item skipped (row: %s)", "cl_newsletter"), $sEMail, $iRow);
$aInvalidLines[] = $sLine; $aInvalidLines[] = $sLine;
$iDublettes++; $iDublettes++;
} else { } else {
@ -231,7 +231,7 @@ if ($action == "recipients_import_exec" && $perm->have_perm_area_action("recipie
// html is only treated as "true", to get html messages for recipients // html is only treated as "true", to get html messages for recipients
// - quick and dirty... // - quick and dirty...
if ($sValue == "yes" || $sValue == i18n("yes", "cl-newsletter") || $sValue == "true" || if ($sValue == "yes" || $sValue == i18n("yes", "cl_newsletter") || $sValue == "true" ||
(is_numeric($sValue) && $sValue > 0) || (is_numeric($sValue) && $sValue > 0) ||
$sValue == "html") { $sValue == "html") {
$recipient->set($sKey, 1); $recipient->set($sKey, 1);
@ -269,7 +269,7 @@ if ($action == "recipients_import_exec" && $perm->have_perm_area_action("recipie
// Add recipient to group // Add recipient to group
$sValue = strtolower(trim($aParts[$aDetails["col"]])); $sValue = strtolower(trim($aParts[$aDetails["col"]]));
if ($sValue == "yes" || $sValue == i18n("yes", "cl-newsletter") || if ($sValue == "yes" || $sValue == i18n("yes", "cl_newsletter") ||
$sValue == "true" || (is_numeric($sValue) && $sValue > 0)) { $sValue == "true" || (is_numeric($sValue) && $sValue > 0)) {
$oGroupMembers->create($aDetails["link"], $iID); $oGroupMembers->create($aDetails["link"], $iID);
} }
@ -302,7 +302,7 @@ if ($action == "recipients_import_exec" && $perm->have_perm_area_action("recipie
if (count($aMessage) > 0) { if (count($aMessage) > 0) {
$sMessage = $notification->returnNotification("warning", implode("<br />", $aMessage)) . "<br />"; $sMessage = $notification->returnNotification("warning", implode("<br />", $aMessage)) . "<br />";
} }
$sMessage .= $notification->returnNotification("info", sprintf(i18n("%d recipients added, %d recipients skipped (email already exists) and %d invalid recipients/e-mail adresses ignored. Invalid recipients are shown (if any).", "cl-newsletter"), $iAdded, $iDublettes, $iInvalid)); $sMessage .= $notification->returnNotification("info", sprintf(i18n("%d recipients added, %d recipients skipped (email already exists) and %d invalid recipients/e-mail adresses ignored. Invalid recipients are shown (if any).", "cl_newsletter"), $iAdded, $iDublettes, $iInvalid));
if ($iAdded > 0) { if ($iAdded > 0) {
$oPage->setReload(); $oPage->setReload();
} }
@ -314,30 +314,30 @@ $oForm->setVar("frame", $frame);
$oForm->setVar("area", $area); $oForm->setVar("area", $area);
$oForm->setVar("action", "recipients_import_exec"); $oForm->setVar("action", "recipients_import_exec");
$oForm->addHeader(i18n("Import recipients", "cl-newsletter")); $oForm->addHeader(i18n("Import recipients", "cl_newsletter"));
$oSelDelimiter = new cHTMLSelectElement("selDelimiter"); $oSelDelimiter = new cHTMLSelectElement("selDelimiter");
$aItems = array(); $aItems = array();
$aItems[] = array("tab", i18n("Tab", "cl-newsletter")); $aItems[] = array("tab", i18n("Tab", "cl_newsletter"));
$aItems[] = array("semicolon", i18n("Semicolon", "cl-newsletter")); $aItems[] = array("semicolon", i18n("Semicolon", "cl_newsletter"));
$oSelDelimiter->autoFill($aItems); $oSelDelimiter->autoFill($aItems);
$oSelDelimiter->setDefault($_REQUEST["selDelimiter"]); $oSelDelimiter->setDefault($_REQUEST["selDelimiter"]);
$oForm->add(i18n("Delimiter", "cl-newsletter"), $oSelDelimiter->render()); $oForm->add(i18n("Delimiter", "cl_newsletter"), $oSelDelimiter->render());
$oAreaData = new cHTMLTextarea("txtData", $_REQUEST["txtData"], 80, 20); $oAreaData = new cHTMLTextarea("txtData", $_REQUEST["txtData"], 80, 20);
$sInfo = '<a href="javascript:fncShowHide(\'idInfoText\');"><strong>' . i18n("Import information", "cl-newsletter") . '</strong></a>' . $sInfo = '<a href="javascript:fncShowHide(\'idInfoText\');"><strong>' . i18n("Import information", "cl_newsletter") . '</strong></a>' .
'<div id="idInfoText" style="display: none">' . '<div id="idInfoText" style="display: none">' .
'<br /><br /><strong>' . i18n("Specify colum types:", "cl-newsletter") . '</strong>' . '<br /><br /><strong>' . i18n("Specify colum types:", "cl_newsletter") . '</strong>' .
i18n("<br />The first line must contain the column names; this specifies the column order.<br />&lt;column name&gt;[delimiter]&lt;column name&gt;...", "cl-newsletter") . i18n("<br />The first line must contain the column names; this specifies the column order.<br />&lt;column name&gt;[delimiter]&lt;column name&gt;...", "cl_newsletter") .
'<br /><br /><strong>' . i18n("Data structure:", "cl-newsletter") . '</strong><br />' . '<br /><br /><strong>' . i18n("Data structure:", "cl_newsletter") . '</strong><br />' .
i18n("The recipients have to be entered using the following format:<br />&lt;data&gt;[Delimiter]&lt;data&gt;... - each recipient in a new line.", "cl-newsletter") . i18n("The recipients have to be entered using the following format:<br />&lt;data&gt;[Delimiter]&lt;data&gt;... - each recipient in a new line.", "cl_newsletter") .
'<br /><br /><strong>' . i18n("Example:", "cl-newsletter") . '</strong>' . '<br /><br /><strong>' . i18n("Example:", "cl_newsletter") . '</strong>' .
i18n("<br />name;mail;confirmed<br />Smith;jon.smith@example.org;1", "cl-newsletter") . i18n("<br />name;mail;confirmed<br />Smith;jon.smith@example.org;1", "cl_newsletter") .
'<br /><br /><strong>' . i18n("The following column names will be recognized:", "cl-newsletter") . '</strong><br />' . '<br /><br /><strong>' . i18n("The following column names will be recognized:", "cl_newsletter") . '</strong><br />' .
implode("<br />\n", $aFields); implode("<br />\n", $aFields);
$oForm->add(i18n("Recipients", "cl-newsletter"), $oAreaData->render() . "<br />" . $sInfo); $oForm->add(i18n("Recipients", "cl_newsletter"), $oAreaData->render() . "<br />" . $sInfo);
unset($sInfo); unset($sInfo);
$sExecScript = ' $sExecScript = '

14
includes/include.recipients_menu.php
Datei anzeigen

@ -50,10 +50,10 @@ $oUser = new cApiUser($auth->auth["uid"]);
// sort: Element can be used to be sorted by // sort: Element can be used to be sorted by
// search: Element can be used to search in // search: Element can be used to search in
$aFields = array(); $aFields = array();
$aFields["name"] = array("field" => "name", "caption" => i18n("Name", "cl-newsletter"), "type" => "base,sort,search"); $aFields["name"] = array("field" => "name", "caption" => i18n("Name", "cl_newsletter"), "type" => "base,sort,search");
$aFields["email"] = array("field" => "email", "caption" => i18n("E-Mail", "cl-newsletter"), "type" => "base,sort,search"); $aFields["email"] = array("field" => "email", "caption" => i18n("E-Mail", "cl_newsletter"), "type" => "base,sort,search");
$aFields["confirmed"] = array("field" => "confirmed", "caption" => i18n("Confirmed", "cl-newsletter"), "type" => "base"); $aFields["confirmed"] = array("field" => "confirmed", "caption" => i18n("Confirmed", "cl_newsletter"), "type" => "base");
$aFields["deactivated"] = array("field" => "deactivated", "caption" => i18n("Deactivated", "cl-newsletter"), "type" => "base"); $aFields["deactivated"] = array("field" => "deactivated", "caption" => i18n("Deactivated", "cl_newsletter"), "type" => "base");
################################## ##################################
# Store settings # Store settings
@ -127,7 +127,7 @@ $oRecipients = new RecipientCollection;
$sMsg = ""; $sMsg = "";
if (getSystemProperty("newsletter", "updatekeys")) { if (getSystemProperty("newsletter", "updatekeys")) {
$iUpdatedRecipients = $oRecipients->updateKeys(); $iUpdatedRecipients = $oRecipients->updateKeys();
$sMsg = $notification->returnNotification("info", sprintf(i18n("%d recipients, with no or incompatible key has been updated. Deactivate update function.", "cl-newsletter"), $iUpdatedRecipients)); $sMsg = $notification->returnNotification("info", sprintf(i18n("%d recipients, with no or incompatible key has been updated. Deactivate update function.", "cl_newsletter"), $iUpdatedRecipients));
} }
$oRecipients->setWhere("recipientcollection.idclient", $client); $oRecipients->setWhere("recipientcollection.idclient", $client);
@ -178,8 +178,8 @@ $iMenu = 0;
// Store messages for repeated use (speeds performance, as i18n translation is only needed once) // Store messages for repeated use (speeds performance, as i18n translation is only needed once)
$aMsg = array(); $aMsg = array();
$aMsg["DelTitle"] = i18n("Delete recipient", "cl-newsletter"); $aMsg["DelTitle"] = i18n("Delete recipient", "cl_newsletter");
$aMsg["DelDescr"] = i18n("Do you really want to delete the following recipient:<br>", "cl-newsletter"); $aMsg["DelDescr"] = i18n("Do you really want to delete the following recipient:<br>", "cl_newsletter");
while ($oRecipient = $oRecipients->next()) { while ($oRecipient = $oRecipients->next()) {
$iMenu++; $iMenu++;

0
locale/cl-newsletter.pot → locale/cl_newsletter.pot
Datei anzeigen

0
locale/de_DE/LC_MESSAGES/cl-newsletter.mo → locale/de_DE/LC_MESSAGES/cl_newsletter.mo
Datei anzeigen

0
locale/de_DE/LC_MESSAGES/cl-newsletter.po → locale/de_DE/LC_MESSAGES/cl_newsletter.po
Datei anzeigen