diff --git a/admin_message.php b/admin_message.php index 6f06156b..ce84da88 100644 --- a/admin_message.php +++ b/admin_message.php @@ -32,10 +32,10 @@ if ($page == 'message') { $log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'viewed panel_message'); if (isset($_POST['send']) && $_POST['send'] == 'send') { - if ($_POST['receipient'] == 0 && $userinfo['customers_see_all'] == '1') { + if ($_POST['recipient'] == 0 && $userinfo['customers_see_all'] == '1') { $log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'sending messages to admins'); $result = Database::query('SELECT `name`, `email` FROM `' . TABLE_PANEL_ADMINS . "`"); - } elseif ($_POST['receipient'] == 1) { + } elseif ($_POST['recipient'] == 1) { if ($userinfo['customers_see_all'] == '1') { $log->logAction(\Froxlor\FroxlorLogger::ADM_ACTION, LOG_NOTICE, 'sending messages to ALL customers'); $result = Database::query('SELECT `firstname`, `name`, `company`, `email` FROM `' . TABLE_PANEL_CUSTOMERS . "`"); @@ -49,7 +49,7 @@ if ($page == 'message') { )); } } else { - \Froxlor\UI\Response::standard_error('noreceipientsgiven'); + \Froxlor\UI\Response::standard_error('norecipientsgiven'); } $subject = $_POST['subject']; @@ -105,7 +105,7 @@ if ($page == 'message') { $sentitems = isset($_GET['sentitems']) ? (int) $_GET['sentitems'] : 0; if ($sentitems == 0) { - $successmessage = $lng['message']['noreceipients']; + $successmessage = $lng['message']['norecipients']; } else { $successmessage = str_replace('%s', $sentitems, $lng['message']['success']); } @@ -116,12 +116,12 @@ if ($page == 'message') { } $action = ''; - $receipients = ''; + $recipients = ''; if ($userinfo['customers_see_all'] == '1') { - $receipients .= \Froxlor\UI\HTML::makeoption($lng['panel']['reseller'], 0); + $recipients .= \Froxlor\UI\HTML::makeoption($lng['panel']['reseller'], 0); } - $receipients .= \Froxlor\UI\HTML::makeoption($lng['panel']['customer'], 1); + $recipients .= \Froxlor\UI\HTML::makeoption($lng['panel']['customer'], 1); eval("echo \"" . \Froxlor\UI\Template::getTemplate('message/message') . "\";"); } diff --git a/lng/czech.lng.php b/lng/czech.lng.php index 0d19b467..d5cfcbcf 100644 --- a/lng/czech.lng.php +++ b/lng/czech.lng.php @@ -659,7 +659,7 @@ $lng['panel']['reseller'] = 'prodejce'; $lng['panel']['admin'] = 'admin'; $lng['panel']['customer'] = 'zákazník/ci'; $lng['error']['nomessagetosend'] = 'Nezadal/a jsi zprávu.'; -$lng['error']['noreceipientsgiven'] = 'Nespecifikoval/a jsi žádného příjemce'; +$lng['error']['norecipientsgiven'] = 'Nespecifikoval/a jsi žádného příjemce'; $lng['admin']['emaildomain'] = 'Emailová doména'; $lng['admin']['email_only'] = 'Jen email?'; $lng['admin']['wwwserveralias'] = 'Přidat "www." ServerAlias'; @@ -667,14 +667,14 @@ $lng['admin']['ipsandports']['enable_ssl'] = 'Je tohle SSL port?'; $lng['admin']['ipsandports']['ssl_cert_file'] = 'Cesta k SSL certifikátu'; $lng['panel']['send'] = 'odeslat'; $lng['admin']['subject'] = 'Předmět'; -$lng['admin']['receipient'] = 'Příjemce'; +$lng['admin']['recipient'] = 'Příjemce'; $lng['admin']['message'] = 'Napsat zprávu'; $lng['admin']['text'] = 'Zpráva'; $lng['menu']['message'] = 'Zprávy'; $lng['error']['errorsendingmail'] = 'Zpráva uživateli "%s" selhala'; $lng['error']['cannotreaddir'] = 'Nelze přečíst adresář "%s"'; $lng['message']['success'] = 'Zpráva úspěšně odeslána %s příjemcům,'; -$lng['message']['noreceipients'] = 'Email nebyl odeslán, protože databáze neobsahuje žádné příjemce'; +$lng['message']['norecipients'] = 'Email nebyl odeslán, protože databáze neobsahuje žádné příjemce'; $lng['admin']['sslsettings'] = 'SSL nastavení'; $lng['cronjobs']['notyetrun'] = 'Ještě nespuštěno'; $lng['serversettings']['default_vhostconf']['title'] = 'Výchozí vHost-nastavení'; diff --git a/lng/dutch.lng.php b/lng/dutch.lng.php index e1c3bf7d..6198b37a 100644 --- a/lng/dutch.lng.php +++ b/lng/dutch.lng.php @@ -587,7 +587,7 @@ $lng['panel']['reseller'] = 'wederverkoper'; $lng['panel']['admin'] = 'beheerder'; $lng['panel']['customer'] = 'klant(en)'; $lng['error']['nomessagetosend'] = 'U hebt geen bericht opgegeven.'; -$lng['error']['noreceipientsgiven'] = 'U hebt geen ontvanger opgegeven'; +$lng['error']['norecipientsgiven'] = 'U hebt geen ontvanger opgegeven'; $lng['admin']['emaildomain'] = 'Emaildomein'; $lng['admin']['email_only'] = 'Alleen email?'; $lng['admin']['wwwserveralias'] = 'Voeg een "www." ServerAlias toe'; @@ -595,14 +595,14 @@ $lng['admin']['ipsandports']['enable_ssl'] = 'Is dit een SSL-poort?'; $lng['admin']['ipsandports']['ssl_cert_file'] = 'Pad naar SSL-certificaat'; $lng['panel']['send'] = 'verzenden'; $lng['admin']['subject'] = 'Onderwerp'; -$lng['admin']['receipient'] = 'Ontvanger'; +$lng['admin']['recipient'] = 'Ontvanger'; $lng['admin']['message'] = 'Bericht schrijven'; $lng['admin']['text'] = 'Bericht'; $lng['menu']['message'] = 'Berichten'; $lng['error']['errorsendingmail'] = 'Het versturen van het bericht naar "%s" is mislukt'; $lng['error']['cannotreaddir'] = 'De map "%s" kan niet gelezen worden'; $lng['message']['success'] = 'Bericht verzonden naar ontvangers %s'; -$lng['message']['noreceipients'] = 'Er is geen email verstuurd omdat er geen ontvangers in de database zijn'; +$lng['message']['norecipients'] = 'Er is geen email verstuurd omdat er geen ontvangers in de database zijn'; $lng['admin']['sslsettings'] = 'Instellingen voor SSL'; $lng['cronjobs']['notyetrun'] = 'Nog niet uitgevoerd'; $lng['serversettings']['default_vhostconf']['title'] = 'Standaard vhost-instellingen'; diff --git a/lng/english.lng.php b/lng/english.lng.php index 20379bdf..576b2673 100644 --- a/lng/english.lng.php +++ b/lng/english.lng.php @@ -660,7 +660,7 @@ $lng['panel']['reseller'] = 'reseller'; $lng['panel']['admin'] = 'admin'; $lng['panel']['customer'] = 'customer/s'; $lng['error']['nomessagetosend'] = 'You did not enter a message.'; -$lng['error']['noreceipientsgiven'] = 'You did not specify any recipient'; +$lng['error']['norecipientsgiven'] = 'You did not specify any recipient'; $lng['admin']['emaildomain'] = 'Emaildomain'; $lng['admin']['email_only'] = 'Only email?'; $lng['admin']['wwwserveralias'] = 'Add a "www." ServerAlias'; @@ -668,14 +668,14 @@ $lng['admin']['ipsandports']['enable_ssl'] = 'Is this an SSL Port?'; $lng['admin']['ipsandports']['ssl_cert_file'] = 'Path to the SSL Certificate'; $lng['panel']['send'] = 'send'; $lng['admin']['subject'] = 'Subject'; -$lng['admin']['receipient'] = 'Recipient'; +$lng['admin']['recipient'] = 'Recipient'; $lng['admin']['message'] = 'Write a Message'; $lng['admin']['text'] = 'Message'; $lng['menu']['message'] = 'Messages'; $lng['error']['errorsendingmail'] = 'The message to "%s" failed'; $lng['error']['cannotreaddir'] = 'Unable to read directory "%s"'; $lng['message']['success'] = 'Successfully sent message to %s recipients'; -$lng['message']['noreceipients'] = 'No e-mail has been sent because there are no recipients in the database'; +$lng['message']['norecipients'] = 'No e-mail has been sent because there are no recipients in the database'; $lng['admin']['sslsettings'] = 'SSL settings'; $lng['cronjobs']['notyetrun'] = 'Not yet run'; $lng['serversettings']['default_vhostconf']['title'] = 'Default vHost-settings'; diff --git a/lng/french.lng.php b/lng/french.lng.php index 9920fa95..ab22cbfc 100644 --- a/lng/french.lng.php +++ b/lng/french.lng.php @@ -627,7 +627,7 @@ $lng['panel']['reseller'] = 'revendeur'; $lng['panel']['admin'] = 'administrateur'; $lng['panel']['customer'] = 'client(s)'; $lng['error']['nomessagetosend'] = 'Vous n\'avez pas entré de message.'; -$lng['error']['noreceipientsgiven'] = 'Vous n\'avez pas spécifier de destinataire'; +$lng['error']['norecipientsgiven'] = 'Vous n\'avez pas spécifier de destinataire'; $lng['admin']['emaildomain'] = 'Domaine e-mail'; $lng['admin']['email_only'] = 'Seulement des e-mails ?'; $lng['admin']['wwwserveralias'] = 'Ajouter un "www." à l\'alias du serveur "ServerAlias"'; @@ -635,14 +635,14 @@ $lng['admin']['ipsandports']['enable_ssl'] = 'Est-ce un port SSL ?'; $lng['admin']['ipsandports']['ssl_cert_file'] = 'Emplacement du certificat SSL'; $lng['panel']['send'] = 'envoyé'; $lng['admin']['subject'] = 'Sujet'; -$lng['admin']['receipient'] = 'Destinataire'; +$lng['admin']['recipient'] = 'Destinataire'; $lng['admin']['message'] = 'Ecrire un message'; $lng['admin']['text'] = 'Message'; $lng['menu']['message'] = 'Messages'; $lng['error']['errorsendingmail'] = 'Echec d\'envoi du message à "%s"'; $lng['error']['cannotreaddir'] = 'Impossible de lire dossier "%s"'; $lng['message']['success'] = 'Le message a été envoyé aux destinataires "%s"'; -$lng['message']['noreceipients'] = 'Aucun e-mail n\'a été envoyé car il n\'existe aucun destinataire dans la base de données'; +$lng['message']['norecipients'] = 'Aucun e-mail n\'a été envoyé car il n\'existe aucun destinataire dans la base de données'; $lng['admin']['sslsettings'] = 'Paramètres SSL'; $lng['cronjobs']['notyetrun'] = 'Pas encore lancé'; $lng['serversettings']['default_vhostconf']['title'] = 'Paramètres par défaut pour les vHosts'; diff --git a/lng/german.lng.php b/lng/german.lng.php index a13bf8e0..cec305f0 100644 --- a/lng/german.lng.php +++ b/lng/german.lng.php @@ -653,7 +653,7 @@ $lng['panel']['reseller'] = 'Reseller'; $lng['panel']['admin'] = 'Administrator'; $lng['panel']['customer'] = 'Kunde/n'; $lng['error']['nomessagetosend'] = 'Keine Nachricht angegeben'; -$lng['error']['noreceipientsgiven'] = 'Keine Empfänger angegeben'; +$lng['error']['norecipientsgiven'] = 'Keine Empfänger angegeben'; $lng['admin']['emaildomain'] = 'E-Mail-Domain'; $lng['admin']['email_only'] = 'Nur als E-Mail-Domain verwenden?'; $lng['admin']['wwwserveralias'] = 'Einen "www." ServerAlias hinzufügen'; @@ -661,14 +661,14 @@ $lng['admin']['ipsandports']['enable_ssl'] = 'Ist dies ein SSL-Port?'; $lng['admin']['ipsandports']['ssl_cert_file'] = 'Pfad zum Zertifikat'; $lng['panel']['send'] = 'Versenden'; $lng['admin']['subject'] = 'Betreff'; -$lng['admin']['receipient'] = 'Empfänger'; +$lng['admin']['recipient'] = 'Empfänger'; $lng['admin']['message'] = 'Rundmail senden'; $lng['admin']['text'] = 'Nachricht'; $lng['menu']['message'] = 'Nachrichten'; $lng['error']['errorsendingmail'] = 'Das Versenden der Nachricht an "%s" schlug fehl.'; $lng['error']['cannotreaddir'] = 'Der Ordner "%s" kann nicht gelesen werden'; $lng['message']['success'] = 'Nachricht erfolgreich an "%s" Empfänger gesendet'; -$lng['message']['noreceipients'] = 'Es wurde keine E-Mail versendet, da sich keine Empfänger in der Datenbank befinden'; +$lng['message']['norecipients'] = 'Es wurde keine E-Mail versendet, da sich keine Empfänger in der Datenbank befinden'; $lng['admin']['sslsettings'] = 'SSL-Einstellungen'; $lng['cronjobs']['notyetrun'] = 'Bisher nicht gestartet'; $lng['serversettings']['default_vhostconf']['title'] = 'Standard vHost-Einstellungen'; diff --git a/lng/italian.lng.php b/lng/italian.lng.php index d56ec21c..0807cd92 100644 --- a/lng/italian.lng.php +++ b/lng/italian.lng.php @@ -610,7 +610,7 @@ $lng['panel']['reseller'] = 'rivenditore'; $lng['panel']['admin'] = 'amministratore'; $lng['panel']['customer'] = 'cliente/i'; $lng['error']['nomessagetosend'] = 'Non hai inserito un messaggio.'; -$lng['error']['noreceipientsgiven'] = 'Non hai specificato alcun destinatario'; +$lng['error']['norecipientsgiven'] = 'Non hai specificato alcun destinatario'; $lng['admin']['emaildomain'] = 'Email dominio'; $lng['admin']['email_only'] = 'Solo email?'; $lng['admin']['wwwserveralias'] = 'Aggiungi a "www." ServerAlias'; @@ -618,14 +618,14 @@ $lng['admin']['ipsandports']['enable_ssl'] = 'Questa è una porta SSL?'; $lng['admin']['ipsandports']['ssl_cert_file'] = 'Percorso del certificato SSL (SSL certificate)'; $lng['panel']['send'] = 'invia'; $lng['admin']['subject'] = 'Oggetto'; -$lng['admin']['receipient'] = 'Destinatario'; +$lng['admin']['recipient'] = 'Destinatario'; $lng['admin']['message'] = 'Scrivi un messaggio'; $lng['admin']['text'] = 'Messaggio'; $lng['menu']['message'] = 'Messaggi'; $lng['error']['errorsendingmail'] = 'Il messaggio a "%s" fallito'; $lng['error']['cannotreaddir'] = 'Impossibile leggere la cartella "%s"'; $lng['message']['success'] = 'Inviato correttamente il messaggio a %s recipients'; -$lng['message']['noreceipients'] = 'Nessuna e-mail è stata inviata perch¸ non ci sono i destinatari nel database'; +$lng['message']['norecipients'] = 'Nessuna e-mail è stata inviata perch¸ non ci sono i destinatari nel database'; $lng['admin']['sslsettings'] = 'Impostazioni SSL'; $lng['cronjobs']['notyetrun'] = 'Non ancora avviato'; $lng['serversettings']['default_vhostconf']['title'] = 'Impostazioni default vhost'; diff --git a/lng/portugues.lng.php b/lng/portugues.lng.php index e97c3e95..98e3a1a5 100644 --- a/lng/portugues.lng.php +++ b/lng/portugues.lng.php @@ -554,7 +554,7 @@ $lng['panel']['reseller'] = 'Revenda'; $lng['panel']['admin'] = 'Administrador'; $lng['panel']['customer'] = 'Cliente(s)'; $lng['error']['nomessagetosend'] = 'Você não entrou com uma mensagem'; -$lng['error']['noreceipientsgiven'] = 'Você não especificou um destinatário'; +$lng['error']['norecipientsgiven'] = 'Você não especificou um destinatário'; $lng['admin']['emaildomain'] = 'Domínio de Email'; $lng['admin']['email_only'] = 'Somente Email?'; $lng['admin']['wwwserveralias'] = 'Adicionar um "www." ServerAlias'; @@ -562,14 +562,14 @@ $lng['admin']['ipsandports']['enable_ssl'] = 'Esta é uma porta SSL?'; $lng['admin']['ipsandports']['ssl_cert_file'] = 'Caminho para o certificado SSL'; $lng['panel']['send'] = 'Enviar'; $lng['admin']['subject'] = 'Assunto'; -$lng['admin']['receipient'] = 'Destinatário'; +$lng['admin']['recipient'] = 'Destinatário'; $lng['admin']['message'] = 'Escrever uma mensagem'; $lng['admin']['text'] = 'Mensagem'; $lng['menu']['message'] = 'Mensagens'; $lng['error']['errorsendingmail'] = 'A mensagem para "%s" falhou'; $lng['error']['cannotreaddir'] = 'Não é possível ler o diretório "%s"'; $lng['message']['success'] = 'Mensagens enviadas para %s destinatários com sucesso'; -$lng['message']['noreceipients'] = 'Email não enviado porque não tem destinatário no banco de dados'; +$lng['message']['norecipients'] = 'Email não enviado porque não tem destinatário no banco de dados'; $lng['admin']['sslsettings'] = 'Configuração de SSL'; $lng['cronjobs']['notyetrun'] = 'Ainda não está rodando'; $lng['serversettings']['default_vhostconf']['title'] = 'Configuração de Vhost padrão'; diff --git a/templates/Sparkle/admin/message/message.tpl b/templates/Sparkle/admin/message/message.tpl index eaacf581..f047150a 100644 --- a/templates/Sparkle/admin/message/message.tpl +++ b/templates/Sparkle/admin/message/message.tpl @@ -23,8 +23,8 @@ $header
| - | + | + | |