From 16a07e6d83dc4eff600bf1c12c0d638977ab44d6 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sat, 6 Sep 2014 15:52:53 +0200 Subject: [PATCH 01/26] cleanup multipart email sending code remove 'EmailNotification' class and rename 'enotify' class as 'Emailer' --- .../{EmailNotification.php => Emailer.php} | 28 ++-- include/email.php | 6 + include/enotify.php | 138 ++++++------------ 3 files changed, 62 insertions(+), 110 deletions(-) rename include/{EmailNotification.php => Emailer.php} (65%) diff --git a/include/EmailNotification.php b/include/Emailer.php similarity index 65% rename from include/EmailNotification.php rename to include/Emailer.php index 8861e8f5d..a5b600e36 100644 --- a/include/EmailNotification.php +++ b/include/Emailer.php @@ -2,7 +2,7 @@ require_once('include/email.php'); -class EmailNotification { +class Emailer { /** * Send a multipart/alternative message with Text and HTML versions * @@ -13,13 +13,13 @@ class EmailNotification { * @param messageSubject subject of the message * @param htmlVersion html version of the message * @param textVersion text only version of the message + * @param additionalMailHeader additions to the smtp mail header */ - static public function sendTextHtmlEmail($fromName,$fromEmail,$replyTo,$toEmail,$messageSubject,$htmlVersion,$textVersion) { + static public function send($params) { + + $fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8'); + $messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'UTF-8'); - $fromName = email_header_encode($fromName,'UTF-8'); - $messageSubject = email_header_encode($messageSubject,'UTF-8'); - - // generate a mime boundary $mimeBoundary =rand(0,9)."-" .rand(10000000000,9999999999)."-" @@ -28,14 +28,15 @@ class EmailNotification { // generate a multipart/alternative message header $messageHeader = - "From: {$fromName} <{$fromEmail}>\n" . - "Reply-To: {$replyTo}\n" . + $params['additionalMailHeader'] . + "From: $fromName <{$params['fromEmail']}>\n" . + "Reply-To: $fromName <{$params['replyTo']}>\n" . "MIME-Version: 1.0\n" . "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\""; // assemble the final multipart message body with the text and html types included - $textBody = chunk_split(base64_encode($textVersion)); - $htmlBody = chunk_split(base64_encode($htmlVersion)); + $textBody = chunk_split(base64_encode($params['textVersion'])); + $htmlBody = chunk_split(base64_encode($params['htmlVersion'])); $multipartMessageBody = "--" . $mimeBoundary . "\n" . // plain text section "Content-Type: text/plain; charset=UTF-8\n" . @@ -49,12 +50,13 @@ class EmailNotification { // send the message $res = mail( - $toEmail, // send to address + $params['toEmail'], // send to address $messageSubject, // subject $multipartMessageBody, // message body $messageHeader // message headers ); - logger("sendTextHtmlEmail: END"); + logger("header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, LOGGER_DEBUG); + logger("return value " . $res, LOGGER_DEBUG); } } -?> \ No newline at end of file +?> diff --git a/include/email.php b/include/email.php index dec8c93db..0f24a4249 100644 --- a/include/email.php +++ b/include/email.php @@ -249,6 +249,12 @@ function email_header_encode($in_str, $charset) { return $out_str; } +/** + * email_send is used by NETWORK_EMAIL and NETWORK_EMAIL2 code + * (not to notify the user, but to send items to email contacts + * + * TODO: this could be changed to use the Emailer class + */ function email_send($addr, $subject, $headers, $item) { //$headers .= 'MIME-Version: 1.0' . "\n"; //$headers .= 'Content-Type: text/html; charset=UTF-8' . "\n"; diff --git a/include/enotify.php b/include/enotify.php index 970ece82e..2dca5a609 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -1,10 +1,12 @@ get_baseurl(true); - $thanks = t('Thank You,'); - $sitename = $a->config['sitename']; - $site_admin = sprintf( t('%s Administrator'), $sitename); - - $sender_name = $product; - $hostname = $a->get_hostname(); - if(strpos($hostname,':')) - $hostname = substr($hostname,0,strpos($hostname,':')); - - $sender_email = t('noreply') . '@' . $hostname; - $additional_mail_header = ""; - - $additional_mail_header .= "Precedence: list\n"; - $additional_mail_header .= "X-Friendica-Host: ".$hostname."\n"; - $additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n"; - $additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n"; - $additional_mail_header .= "List-ID: \n"; - $additional_mail_header .= "List-Archive: <".$a->get_baseurl()."/notifications/system>\n"; if(array_key_exists('item',$params)) { $title = $params['item']['title']; @@ -250,6 +231,35 @@ function notification($params) { } + + /*$email = prepare_notificaion_mail($params, $subject, $preamble, $body, $sitelink, $tsitelink, $hsitelink, $itemlink); + if ($email) Emailer::send($email); + pop_lang();*/ + + + $banner = t('Friendica Notification'); + $product = FRIENDICA_PLATFORM; + $siteurl = $a->get_baseurl(true); + $thanks = t('Thank You,'); + $sitename = $a->config['sitename']; + $site_admin = sprintf( t('%s Administrator'), $sitename); + + $sender_name = $product; + $hostname = $a->get_hostname(); + if(strpos($hostname,':')) + $hostname = substr($hostname,0,strpos($hostname,':')); + + $sender_email = t('noreply') . '@' . $hostname; + + + $additional_mail_header = ""; + $additional_mail_header .= "Precedence: list\n"; + $additional_mail_header .= "X-Friendica-Host: ".$hostname."\n"; + $additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n"; + $additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n"; + $additional_mail_header .= "List-ID: \n"; + $additional_mail_header .= "List-Archive: <".$a->get_baseurl()."/notifications/system>\n"; + $h = array( 'params' => $params, 'subject' => $subject, @@ -274,7 +284,6 @@ function notification($params) { $itemlink = $h['itemlink']; - require_once('include/html2bbcode.php'); do { $dups = false; @@ -304,7 +313,7 @@ function notification($params) { if($datarray['abort']) { pop_lang(); - return; + return False; } // create notification entry in DB @@ -332,7 +341,7 @@ function notification($params) { $notify_id = $r[0]['id']; else { pop_lang(); - return; + return False; } // we seem to have a lot of duplicate comment notifications due to race conditions, mostly from forums @@ -356,17 +365,11 @@ function notification($params) { if($notify_id != $p[0]['id']) { pop_lang(); - return; + return False; } } - - - - - - $itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id; $msg = replace_macros($epreamble,array('$itemlink' => $itemlink)); $r = q("update notify set msg = '%s' where id = %d and uid = %d", @@ -378,7 +381,6 @@ function notification($params) { // send email notification if notification preferences permit - require_once('include/bbcode.php'); if((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) { logger('notification: sending notification email'); @@ -410,7 +412,7 @@ function notification($params) { } else { // If not, just "follow" the thread. $additional_mail_header .= "References: <${id_for_parent}>\nIn-Reply-To: <${id_for_parent}>\n"; - logger("include/enotify: There's already a notification for this parent:\n" . print_r($r, true), LOGGER_DEBUG); + logger("There's already a notification for this parent:\n" . print_r($r, true), LOGGER_DEBUG); } } @@ -494,9 +496,9 @@ function notification($params) { // logger('text: ' . $email_text_body); - // use the EmailNotification library to send the message + // use the Emailer class to send the message - enotify::send(array( + Emailer::send(array( 'fromName' => $sender_name, 'fromEmail' => $sender_email, 'replyTo' => $sender_email, @@ -506,69 +508,11 @@ function notification($params) { 'textVersion' => $email_text_body, 'additionalMailHeader' => $datarray['headers'], )); + return True; } - pop_lang(); + return False; } -require_once('include/email.php'); - -class enotify { - /** - * Send a multipart/alternative message with Text and HTML versions - * - * @param fromName name of the sender - * @param fromEmail email fo the sender - * @param replyTo replyTo address to direct responses - * @param toEmail destination email address - * @param messageSubject subject of the message - * @param htmlVersion html version of the message - * @param textVersion text only version of the message - * @param additionalMailHeader additions to the smtp mail header - */ - static public function send($params) { - - $fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8'); - $messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'UTF-8'); - - // generate a mime boundary - $mimeBoundary =rand(0,9)."-" - .rand(10000000000,9999999999)."-" - .rand(10000000000,9999999999)."=:" - .rand(10000,99999); - - // generate a multipart/alternative message header - $messageHeader = - $params['additionalMailHeader'] . - "From: $fromName <{$params['fromEmail']}>\n" . - "Reply-To: $fromName <{$params['replyTo']}>\n" . - "MIME-Version: 1.0\n" . - "Content-Type: multipart/alternative; boundary=\"{$mimeBoundary}\""; - - // assemble the final multipart message body with the text and html types included - $textBody = chunk_split(base64_encode($params['textVersion'])); - $htmlBody = chunk_split(base64_encode($params['htmlVersion'])); - $multipartMessageBody = - "--" . $mimeBoundary . "\n" . // plain text section - "Content-Type: text/plain; charset=UTF-8\n" . - "Content-Transfer-Encoding: base64\n\n" . - $textBody . "\n" . - "--" . $mimeBoundary . "\n" . // text/html section - "Content-Type: text/html; charset=UTF-8\n" . - "Content-Transfer-Encoding: base64\n\n" . - $htmlBody . "\n" . - "--" . $mimeBoundary . "--\n"; // message ending - - // send the message - $res = mail( - $params['toEmail'], // send to address - $messageSubject, // subject - $multipartMessageBody, // message body - $messageHeader // message headers - ); - logger("notification: enotify::send header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, LOGGER_DEBUG); - logger("notification: enotify::send returns " . $res, LOGGER_DEBUG); - } -} ?> From 83df1f45831e1ab85af2eebe6eaee699b953a9e0 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sat, 6 Sep 2014 16:12:05 +0200 Subject: [PATCH 02/26] fix italian smarty3 email templates --- view/it/smarty3/follow_notify_eml.tpl | 10 +++--- view/it/smarty3/friend_complete_eml.tpl | 14 ++++----- view/it/smarty3/htconfig.tpl | 38 +++++++++++------------ view/it/smarty3/intro_complete_eml.tpl | 16 +++++----- view/it/smarty3/lostpass_eml.tpl | 12 +++---- view/it/smarty3/passchanged_eml.tpl | 10 +++--- view/it/smarty3/register_adminadd_eml.tpl | 14 ++++----- view/it/smarty3/register_open_eml.tpl | 14 ++++----- view/it/smarty3/register_verify_eml.tpl | 12 +++---- view/it/smarty3/request_notify_eml.tpl | 12 +++---- view/it/smarty3/update_fail_eml.tpl | 8 ++--- 11 files changed, 80 insertions(+), 80 deletions(-) diff --git a/view/it/smarty3/follow_notify_eml.tpl b/view/it/smarty3/follow_notify_eml.tpl index c85a0cdc9..0bfc37552 100644 --- a/view/it/smarty3/follow_notify_eml.tpl +++ b/view/it/smarty3/follow_notify_eml.tpl @@ -1,14 +1,14 @@ -Ciao $[myname], +Ciao {{$myname}}, -Un nuovo utente ha iniziato a seguirti su $[sitename] - '$[requestor]'. +Un nuovo utente ha iniziato a seguirti su {{$sitename}} - '{{$requestor}}'. -Puoi vedere il suo profilo su $[url]. +Puoi vedere il suo profilo su {{$url}}. Accedi sul tuo sito per approvare o ignorare la richiesta. -$[siteurl] +{{$siteurl}} Saluti, - L'amministratore di $[sitename] \ No newline at end of file + L'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/friend_complete_eml.tpl b/view/it/smarty3/friend_complete_eml.tpl index 890b0148c..daeaae901 100644 --- a/view/it/smarty3/friend_complete_eml.tpl +++ b/view/it/smarty3/friend_complete_eml.tpl @@ -1,22 +1,22 @@ -Ciao $[username], +Ciao {{$username}}, - Ottime notizie... '$[fn]' di '$[dfrn_url]' ha accettato -la tua richiesta di connessione su '$[sitename]'. + Ottime notizie... '{{$fn}}' di '{{$dfrn_url}}' ha accettato +la tua richiesta di connessione su '{{$sitename}}'. Adesso siete amici reciproci e potete scambiarvi aggiornamenti di stato, foto ed email senza restrizioni. -Vai nella pagina 'Contatti' di $[sitename] se vuoi effettuare +Vai nella pagina 'Contatti' di {{$sitename}} se vuoi effettuare qualche modifica riguardo questa relazione -$[siteurl] +{{$siteurl}} [Ad esempio, potresti creare un profilo separato con le informazioni che non -sono disponibili pubblicamente - ed permettere di vederlo a '$[fn]']. +sono disponibili pubblicamente - ed permettere di vederlo a '{{$fn}}']. Saluti, - l'amministratore di $[sitename] + l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/htconfig.tpl b/view/it/smarty3/htconfig.tpl index 30998b86c..eb85de821 100644 --- a/view/it/smarty3/htconfig.tpl +++ b/view/it/smarty3/htconfig.tpl @@ -4,26 +4,26 @@ // Set the following for your MySQL installation // Copy or rename this file to .htconfig.php -$db_host = '{{$dbhost}}'; -$db_user = '{{$dbuser}}'; -$db_pass = '{{$dbpass}}'; -$db_data = '{{$dbdata}}'; +{{$db}}_host = '{{{{$dbhost}}}}'; +{{$db}}_user = '{{{{$dbuser}}}}'; +{{$db}}_pass = '{{{{$dbpass}}}}'; +{{$db}}_data = '{{{{$dbdata}}}}'; // If you are using a subdirectory of your domain you will need to put the // relative path (from the root of your domain) here. // For instance if your URL is 'http://example.com/directory/subdirectory', -// set $a->path to 'directory/subdirectory'. +// set {{$a}}->path to 'directory/subdirectory'. -$a->path = '{{$urlpath}}'; +{{$a}}->path = '{{{{$urlpath}}}}'; // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". // It can be changed later and only applies to timestamps for anonymous viewers. -$default_timezone = '{{$timezone}}'; +{{$default}}_timezone = '{{{{$timezone}}}}'; // What is your site name? -$a->config['sitename'] = "La Mia Rete di Amici"; +{{$a}}->config['sitename'] = "La Mia Rete di Amici"; // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. // Be certain to create your own personal account before setting @@ -32,38 +32,38 @@ $a->config['sitename'] = "La Mia Rete di Amici"; // to the email address of an already registered person who can authorise // and/or approve/deny the request. -$a->config['register_policy'] = REGISTER_OPEN; -$a->config['register_text'] = ''; -$a->config['admin_email'] = '{{$adminmail}}'; +{{$a}}->config['register_policy'] = REGISTER_OPEN; +{{$a}}->config['register_text'] = ''; +{{$a}}->config['admin_email'] = '{{{{$adminmail}}}}'; // Maximum size of an imported message, 0 is unlimited -$a->config['max_import_size'] = 200000; +{{$a}}->config['max_import_size'] = 200000; // maximum size of uploaded photos -$a->config['system']['maximagesize'] = 800000; +{{$a}}->config['system']['maximagesize'] = 800000; // Location of PHP command line processor -$a->config['php_path'] = '{{$phpath}}'; +{{$a}}->config['php_path'] = '{{{{$phpath}}}}'; // Location of global directory submission page. -$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; +{{$a}}->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; +{{$a}}->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +{{$a}}->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; // Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the // PHP mcrypt extension is installed on both systems -$a->config['system']['rino_encrypt'] = true; +{{$a}}->config['system']['rino_encrypt'] = true; // default system theme -$a->config['system']['theme'] = 'duepuntozero'; +{{$a}}->config['system']['theme'] = 'duepuntozero'; diff --git a/view/it/smarty3/intro_complete_eml.tpl b/view/it/smarty3/intro_complete_eml.tpl index 46fe7018b..69fce8141 100644 --- a/view/it/smarty3/intro_complete_eml.tpl +++ b/view/it/smarty3/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Ciao $[username], +Ciao {{$username}}, - '$[fn]' di '$[dfrn_url]' ha accettato -la tua richiesta di connessione a '$[sitename]'. + '{{$fn}}' di '{{$dfrn_url}}' ha accettato +la tua richiesta di connessione a '{{$sitename}}'. - '$[fn]' ha deciso di accettarti come "fan", il che restringe + '{{$fn}}' ha deciso di accettarti come "fan", il che restringe alcune forme di comunicazione - come i messaggi privati e alcune interazioni. Se è la pagina di una persona famosa o di una comunità, queste impostazioni saranno applicate automaticamente. - '$[fn]' potrebbe decidere di estendere questa relazione in una comunicazione bidirezionale o ancora più permissiva + '{{$fn}}' potrebbe decidere di estendere questa relazione in una comunicazione bidirezionale o ancora più permissiva . - Inizierai a ricevere gli aggiornamenti di stato pubblici da '$[fn]', + Inizierai a ricevere gli aggiornamenti di stato pubblici da '{{$fn}}', che apparirà nella tua pagina 'Rete' -$[siteurl] +{{$siteurl}} Saluti, - l'amministratore di $[sitename] \ No newline at end of file + l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/lostpass_eml.tpl b/view/it/smarty3/lostpass_eml.tpl index b1fe75f94..3601f18a7 100644 --- a/view/it/smarty3/lostpass_eml.tpl +++ b/view/it/smarty3/lostpass_eml.tpl @@ -1,6 +1,6 @@ -Ciao $[username], - Su $[sitename] è stata ricevuta una richiesta di azzeramento della password del tuo account. +Ciao {{$username}}, + Su {{$sitename}} è stata ricevuta una richiesta di azzeramento della password del tuo account. Per confermare la richiesta, clicca sul link di verifica qui in fondo oppure copialo nella barra degli indirizzi del tuo browser. @@ -12,7 +12,7 @@ hai fatto questa richiesta. Per verificare la tua identità clicca su: -$[reset_link] +{{$reset_link}} Dopo la verifica riceverai un messaggio di risposta con la nuova password. @@ -20,13 +20,13 @@ Potrai cambiare la password dalla pagina delle impostazioni dopo aver effettuato I dati di accesso sono i seguenti: -Sito:»$[siteurl] -Nome utente:»$[email] +Sito:»{{$siteurl}} +Nome utente:»{{$email}} Saluti, - l'amministratore di $[sitename] + l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/passchanged_eml.tpl b/view/it/smarty3/passchanged_eml.tpl index 15e05df1c..fccc0928f 100644 --- a/view/it/smarty3/passchanged_eml.tpl +++ b/view/it/smarty3/passchanged_eml.tpl @@ -1,5 +1,5 @@ -Ciao $[username], +Ciao {{$username}}, La tua password è stata cambiata, come hai richiesto. Conserva queste informazioni (oppure cambia immediatamente la password con qualcosa che ti è più facile ricordare). @@ -7,14 +7,14 @@ qualcosa che ti è più facile ricordare). I tuoi dati di accesso sono i seguenti: -Sito:»$[siteurl] -Soprannome:»$[email] -Password:»$[new_password] +Sito:»{{$siteurl}} +Soprannome:»{{$email}} +Password:»{{$new_password}} Puoi cambiare la tua password dalla pagina delle impostazioni dopo aver effettuato l'accesso. Saluti, - l'amministratore di $[sitename] + l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/register_adminadd_eml.tpl b/view/it/smarty3/register_adminadd_eml.tpl index 4cb17d294..20a9cb176 100644 --- a/view/it/smarty3/register_adminadd_eml.tpl +++ b/view/it/smarty3/register_adminadd_eml.tpl @@ -1,12 +1,12 @@ -Ciao $[username], - l'amministratore di {{$sitename}} ha creato un account per te. +Ciao {{$username}}, + l'amministratore di {{{{$sitename}}}} ha creato un account per te. I dettagli di accesso sono i seguenti -Sito:»$[siteurl] -Soprannome:»$[email] -Password:»$[password] +Sito:»{{$siteurl}} +Soprannome:»{{$email}} +Password:»{{$password}} Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso @@ -26,7 +26,7 @@ Se non ancora non conosci nessuno qui, posso essere d'aiuto per farti nuovi e interessanti amici. -Grazie. Siamo contenti di darti il benvenuto su $[sitename] +Grazie. Siamo contenti di darti il benvenuto su {{$sitename}} Saluti, - l'amministratore di $[sitename] \ No newline at end of file + l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/register_open_eml.tpl b/view/it/smarty3/register_open_eml.tpl index 11a7752bc..23dcaf2c8 100644 --- a/view/it/smarty3/register_open_eml.tpl +++ b/view/it/smarty3/register_open_eml.tpl @@ -1,12 +1,12 @@ -Ciao $[username], - Grazie per aver effettuato la registrazione a $[sitename]. Il tuo account è stato creato. +Ciao {{$username}}, + Grazie per aver effettuato la registrazione a {{$sitename}}. Il tuo account è stato creato. I dettagli di accesso sono i seguenti -Sito:»$[siteurl] -Nome utente:»$[email] -Password:»$[password] +Sito:»{{$siteurl}} +Nome utente:»{{$email}} +Password:»{{$password}} Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso . @@ -26,9 +26,9 @@ Se ancora non conosci nessuno qui, potrebbe esserti di aiuto per farti nuovi e interessanti amici. -Grazie. Siamo contenti di darti il benvenuto su $[sitename] +Grazie. Siamo contenti di darti il benvenuto su {{$sitename}} Saluti, - l'amministratore di $[sitename] + l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/register_verify_eml.tpl b/view/it/smarty3/register_verify_eml.tpl index fa039badd..931d9d4b0 100644 --- a/view/it/smarty3/register_verify_eml.tpl +++ b/view/it/smarty3/register_verify_eml.tpl @@ -1,25 +1,25 @@ -Su $[sitename] è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede +Su {{$sitename}} è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede la tua approvazione. I dati di accesso sono i seguenti: -Nome completo:»$[username] -Sito:»$[siteurl] -Nome utente:»$[email] +Nome completo:»{{$username}} +Sito:»{{$siteurl}} +Nome utente:»{{$email}} Per approvare questa richiesta clicca su: -$[siteurl]/regmod/allow/$[hash] +{{$siteurl}}/regmod/allow/{{$hash}} Per negare la richiesta e rimuovere il profilo, clicca su: -$[siteurl]/regmod/deny/$[hash] +{{$siteurl}}/regmod/deny/{{$hash}} Grazie. diff --git a/view/it/smarty3/request_notify_eml.tpl b/view/it/smarty3/request_notify_eml.tpl index 2700e49fd..b0efcb40b 100644 --- a/view/it/smarty3/request_notify_eml.tpl +++ b/view/it/smarty3/request_notify_eml.tpl @@ -1,17 +1,17 @@ -Ciao $[myname], +Ciao {{$myname}}, -Hai appena ricevuto una richiesta di connessione su $[sitename] +Hai appena ricevuto una richiesta di connessione su {{$sitename}} -da '$[requestor]'. +da '{{$requestor}}'. -Puoi visitare il suo profilo su $[url]. +Puoi visitare il suo profilo su {{$url}}. Accedi al tuo sito per vedere la richiesta completa e approva o ignora/annulla la richiesta. -$[siteurl] +{{$siteurl}} Saluti, - l'amministratore di $[sitename] \ No newline at end of file + l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/update_fail_eml.tpl b/view/it/smarty3/update_fail_eml.tpl index 96813a7bc..d647e26d8 100644 --- a/view/it/smarty3/update_fail_eml.tpl +++ b/view/it/smarty3/update_fail_eml.tpl @@ -1,11 +1,11 @@ Ehi, -Sono $sitename; -Gli sviluppatori di Friendica hanno appena rilasciato la nuova versione $update, +Sono {{$sitename}}; +Gli sviluppatori di Friendica hanno appena rilasciato la nuova versione {{$update}}, ma appena ho provato ad installarla qualcosa è andato tremendamente storto. Le cose vanno messe a posto al più presto e non riesco a farlo da solo. Contatta uno sviluppatore di friendica se non riesci ad aiutarmi da solo. Il mio database potrebbe non essere più a posto. -Il messaggio di errore è: '$error'. +Il messaggio di errore è: '{{$error}}'. Mi dispiace, -il tuo server friendica su $siteurl \ No newline at end of file +il tuo server friendica su {{$siteurl}} \ No newline at end of file From 1bdddebd44d493f65ea2eba04af6ea0de19f48eb Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sat, 6 Sep 2014 17:28:46 +0200 Subject: [PATCH 03/26] connection confirm notification mail via notification() remove unused email templates add a check for unexpected reponse from server --- mod/dfrn_confirm.php | 119 ++++++++++----------- mod/dfrn_request.php | 74 ++++++------- view/ca/friend_complete_eml.tpl | 19 ---- view/ca/intro_complete_eml.tpl | 21 ---- view/ca/smarty3/friend_complete_eml.tpl | 20 ---- view/ca/smarty3/intro_complete_eml.tpl | 22 ---- view/cs/friend_complete_eml.tpl | 22 ---- view/cs/intro_complete_eml.tpl | 22 ---- view/cs/smarty3/friend_complete_eml.tpl | 18 ---- view/cs/smarty3/intro_complete_eml.tpl | 18 ---- view/de/friend_complete_eml.tpl | 22 ---- view/de/intro_complete_eml.tpl | 22 ---- view/de/smarty3/friend_complete_eml.tpl | 23 ---- view/de/smarty3/intro_complete_eml.tpl | 23 ---- view/en/friend_complete_eml.tpl | 22 ---- view/en/intro_complete_eml.tpl | 22 ---- view/en/smarty3/friend_complete_eml.tpl | 23 ---- view/en/smarty3/intro_complete_eml.tpl | 23 ---- view/eo/friend_complete_eml.tpl | 22 ---- view/eo/intro_complete_eml.tpl | 22 ---- view/eo/smarty3/friend_complete_eml.tpl | 23 ---- view/eo/smarty3/intro_complete_eml.tpl | 23 ---- view/es/friend_complete_eml.tpl | 19 ---- view/es/intro_complete_eml.tpl | 21 ---- view/es/smarty3/friend_complete_eml.tpl | 20 ---- view/es/smarty3/intro_complete_eml.tpl | 22 ---- view/fr/friend_complete_eml.tpl | 23 ---- view/fr/intro_complete_eml.tpl | 22 ---- view/fr/smarty3/friend_complete_eml.tpl | 24 ----- view/fr/smarty3/intro_complete_eml.tpl | 23 ---- view/is/friend_complete_eml.tpl | 22 ---- view/is/intro_complete_eml.tpl | 22 ---- view/is/smarty3/friend_complete_eml.tpl | 23 ---- view/is/smarty3/intro_complete_eml.tpl | 23 ---- view/it/smarty3/friend_complete_eml.tpl | 22 ---- view/it/smarty3/intro_complete_eml.tpl | 22 ---- view/nb-no/friend_complete_eml.tpl | 22 ---- view/nb-no/intro_complete_eml.tpl | 22 ---- view/nb-no/smarty3/friend_complete_eml.tpl | 23 ---- view/nb-no/smarty3/intro_complete_eml.tpl | 23 ---- view/nl/friend_complete_eml.tpl | 22 ---- view/nl/intro_complete_eml.tpl | 22 ---- view/pl/friend_complete_eml.tpl | 22 ---- view/pl/intro_complete_eml.tpl | 22 ---- view/pl/smarty3/friend_complete_eml.tpl | 23 ---- view/pl/smarty3/intro_complete_eml.tpl | 23 ---- view/pt-br/intro_complete_eml.tpl | 22 ---- view/pt-br/smarty3/intro_complete_eml.tpl | 23 ---- view/ro/smarty3/friend_complete_eml.tpl | 22 ---- view/ro/smarty3/intro_complete_eml.tpl | 22 ---- view/sv/friend_complete_eml.tpl | 17 --- view/sv/intro_complete_eml.tpl | 19 ---- view/sv/smarty3/friend_complete_eml.tpl | 18 ---- view/sv/smarty3/intro_complete_eml.tpl | 20 ---- view/zh-cn/friend_complete_eml.tpl | 22 ---- view/zh-cn/intro_complete_eml.tpl | 22 ---- view/zh-cn/smarty3/friend_complete_eml.tpl | 23 ---- view/zh-cn/smarty3/intro_complete_eml.tpl | 23 ---- 58 files changed, 96 insertions(+), 1314 deletions(-) delete mode 100644 view/ca/friend_complete_eml.tpl delete mode 100644 view/ca/intro_complete_eml.tpl delete mode 100644 view/ca/smarty3/friend_complete_eml.tpl delete mode 100644 view/ca/smarty3/intro_complete_eml.tpl delete mode 100644 view/cs/friend_complete_eml.tpl delete mode 100644 view/cs/intro_complete_eml.tpl delete mode 100644 view/cs/smarty3/friend_complete_eml.tpl delete mode 100644 view/cs/smarty3/intro_complete_eml.tpl delete mode 100644 view/de/friend_complete_eml.tpl delete mode 100644 view/de/intro_complete_eml.tpl delete mode 100644 view/de/smarty3/friend_complete_eml.tpl delete mode 100644 view/de/smarty3/intro_complete_eml.tpl delete mode 100644 view/en/friend_complete_eml.tpl delete mode 100644 view/en/intro_complete_eml.tpl delete mode 100644 view/en/smarty3/friend_complete_eml.tpl delete mode 100644 view/en/smarty3/intro_complete_eml.tpl delete mode 100644 view/eo/friend_complete_eml.tpl delete mode 100644 view/eo/intro_complete_eml.tpl delete mode 100644 view/eo/smarty3/friend_complete_eml.tpl delete mode 100644 view/eo/smarty3/intro_complete_eml.tpl delete mode 100644 view/es/friend_complete_eml.tpl delete mode 100644 view/es/intro_complete_eml.tpl delete mode 100644 view/es/smarty3/friend_complete_eml.tpl delete mode 100644 view/es/smarty3/intro_complete_eml.tpl delete mode 100644 view/fr/friend_complete_eml.tpl delete mode 100644 view/fr/intro_complete_eml.tpl delete mode 100644 view/fr/smarty3/friend_complete_eml.tpl delete mode 100644 view/fr/smarty3/intro_complete_eml.tpl delete mode 100644 view/is/friend_complete_eml.tpl delete mode 100644 view/is/intro_complete_eml.tpl delete mode 100644 view/is/smarty3/friend_complete_eml.tpl delete mode 100644 view/is/smarty3/intro_complete_eml.tpl delete mode 100644 view/it/smarty3/friend_complete_eml.tpl delete mode 100644 view/it/smarty3/intro_complete_eml.tpl delete mode 100644 view/nb-no/friend_complete_eml.tpl delete mode 100644 view/nb-no/intro_complete_eml.tpl delete mode 100644 view/nb-no/smarty3/friend_complete_eml.tpl delete mode 100644 view/nb-no/smarty3/intro_complete_eml.tpl delete mode 100644 view/nl/friend_complete_eml.tpl delete mode 100644 view/nl/intro_complete_eml.tpl delete mode 100644 view/pl/friend_complete_eml.tpl delete mode 100644 view/pl/intro_complete_eml.tpl delete mode 100644 view/pl/smarty3/friend_complete_eml.tpl delete mode 100644 view/pl/smarty3/intro_complete_eml.tpl delete mode 100644 view/pt-br/intro_complete_eml.tpl delete mode 100644 view/pt-br/smarty3/intro_complete_eml.tpl delete mode 100644 view/ro/smarty3/friend_complete_eml.tpl delete mode 100644 view/ro/smarty3/intro_complete_eml.tpl delete mode 100644 view/sv/friend_complete_eml.tpl delete mode 100644 view/sv/intro_complete_eml.tpl delete mode 100644 view/sv/smarty3/friend_complete_eml.tpl delete mode 100644 view/sv/smarty3/intro_complete_eml.tpl delete mode 100644 view/zh-cn/friend_complete_eml.tpl delete mode 100644 view/zh-cn/intro_complete_eml.tpl delete mode 100644 view/zh-cn/smarty3/friend_complete_eml.tpl delete mode 100644 view/zh-cn/smarty3/intro_complete_eml.tpl diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 8e1fc76e9..f1ce296d9 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -9,11 +9,13 @@ * 1. A form was submitted by our user approving a friendship that originated elsewhere. * This may also be called from dfrn_request to automatically approve a friendship. * - * 2. We may be the target or other side of the conversation to scenario 1, and will + * 2. We may be the target or other side of the conversation to scenario 1, and will * interact with that process on our own user's behalf. - * + * */ +require_once('include/enotify.php'); + function dfrn_confirm_post(&$a,$handsfree = null) { if(is_array($handsfree)) { @@ -35,11 +37,11 @@ function dfrn_confirm_post(&$a,$handsfree = null) { /** * - * Main entry point. Scenario 1. Our user received a friend request notification (perhaps - * from another site) and clicked 'Approve'. + * Main entry point. Scenario 1. Our user received a friend request notification (perhaps + * from another site) and clicked 'Approve'. * $POST['source_url'] is not set. If it is, it indicates Scenario 2. * - * We may also have been called directly from dfrn_request ($handsfree != null) due to + * We may also have been called directly from dfrn_request ($handsfree != null) due to * this being a page type which supports automatic friend acceptance. That is also Scenario 1 * since we are operating on behalf of our registered user to approve a friendship. * @@ -67,7 +69,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { // These data elements may come from either the friend request notification form or $handsfree array. if(is_array($handsfree)) { - logger('dfrn_confirm: Confirm in handsfree mode'); + logger('Confirm in handsfree mode'); $dfrn_id = $handsfree['dfrn_id']; $intro_id = $handsfree['intro_id']; $duplex = $handsfree['duplex']; @@ -86,7 +88,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { /** * * Ensure that dfrn_id has precedence when we go to find the contact record. - * We only want to search based on contact id if there is no dfrn_id, + * We only want to search based on contact id if there is no dfrn_id, * e.g. for OStatus network followers. * */ @@ -94,15 +96,15 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if(strlen($dfrn_id)) $cid = 0; - logger('dfrn_confirm: Confirming request for dfrn_id (issued) ' . $dfrn_id); + logger('Confirming request for dfrn_id (issued) ' . $dfrn_id); if($cid) - logger('dfrn_confirm: Confirming follower with contact_id: ' . $cid); + logger('Confirming follower with contact_id: ' . $cid); /** * * The other person will have been issued an ID when they first requested friendship. - * Locate their record. At this time, their record will have both pending and blocked set to 1. + * Locate their record. At this time, their record will have both pending and blocked set to 1. * There won't be any dfrn_id if this is a network follower, so use the contact_id instead. * */ @@ -114,7 +116,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { ); if(! count($r)) { - logger('dfrn_confirm: Contact not found in DB.'); + logger('Contact not found in DB.'); notice( t('Contact not found.') . EOL ); notice( t('This may occasionally happen if contact was requested by both persons and it has already been approved.') . EOL ); return; @@ -127,7 +129,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $site_pubkey = $contact['site-pubkey']; $dfrn_confirm = $contact['confirm']; $aes_allow = $contact['aes_allow']; - + $network = ((strlen($contact['issued-id'])) ? NETWORK_DFRN : NETWORK_OSTATUS); if($contact['network']) @@ -139,15 +141,16 @@ function dfrn_confirm_post(&$a,$handsfree = null) { * * Generate a key pair for all further communications with this person. * We have a keypair for every contact, and a site key for unknown people. - * This provides a means to carry on relationships with other people if - * any single key is compromised. It is a robust key. We're much more - * worried about key leakage than anybody cracking it. + * This provides a means to carry on relationships with other people if + * any single key is compromised. It is a robust key. We're much more + * worried about key leakage than anybody cracking it. * */ require_once('include/crypto.php'); $res = new_keypair(4096); + $private_key = $res['prvkey']; $public_key = $res['pubkey']; @@ -156,23 +159,23 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $r = q("UPDATE `contact` SET `prvkey` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc($private_key), intval($contact_id), - intval($uid) + intval($uid) ); $params = array(); /** * - * Per the DFRN protocol, we will verify both ends by encrypting the dfrn_id with our + * Per the DFRN protocol, we will verify both ends by encrypting the dfrn_id with our * site private key (person on the other end can decrypt it with our site public key). * Then encrypt our profile URL with the other person's site public key. They can decrypt * it with their site private key. If the decryption on the other end fails for either - * item, it indicates tampering or key failure on at least one site and we will not be + * item, it indicates tampering or key failure on at least one site and we will not be * able to provide a secure communication pathway. * - * If other site is willing to accept full encryption, (aes_allow is 1 AND we have php5.3 - * or later) then we encrypt the personal public key we send them using AES-256-CBC and a - * random key which is encrypted with their site public key. + * If other site is willing to accept full encryption, (aes_allow is 1 AND we have php5.3 + * or later) then we encrypt the personal public key we send them using AES-256-CBC and a + * random key which is encrypted with their site public key. * */ @@ -205,7 +208,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if($user[0]['page-flags'] == PAGE_PRVGROUP) $params['page'] = 2; - logger('dfrn_confirm: Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA); + logger('Confirm: posting data to ' . $dfrn_confirm . ': ' . print_r($params,true), LOGGER_DATA); /** * @@ -219,10 +222,10 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $res = post_url($dfrn_confirm,$params); - logger('dfrn_confirm: Confirm: received data: ' . $res, LOGGER_DATA); + logger(' Confirm: received data: ' . $res, LOGGER_DATA); - // Now figure out what they responded. Try to be robust if the remote site is - // having difficulty and throwing up errors of some kind. + // Now figure out what they responded. Try to be robust if the remote site is + // having difficulty and throwing up errors of some kind. $leading_junk = substr($res,0,strpos($res,'status; $message = unxmlify($xml->message); // human readable text of what may have gone wrong. @@ -261,7 +270,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $r = q("UPDATE contact SET `issued-id` = '%s' WHERE `id` = %d AND `uid` = %d", dbesc($new_dfrn_id), intval($contact_id), - intval($uid) + intval($uid) ); case 2: @@ -307,7 +316,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { require_once('include/Photo.php'); $photos = import_profile_photo($contact['photo'],$uid,$contact_id); - + logger('dfrn_confirm: confirm - imported photos'); if($network === NETWORK_DFRN) { @@ -455,7 +464,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if(count($self)) { $arr = array(); - $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $uid); + $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $uid); $arr['uid'] = $uid; $arr['contact-id'] = $self[0]['id']; $arr['wall'] = 1; @@ -522,7 +531,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { * * Begin Scenario 2. This is the remote response to the above scenario. * This will take place on the site that originally initiated the friend request. - * In the section above where the confirming party makes a POST and + * In the section above where the confirming party makes a POST and * retrieves xml status information, they are communicating with the following code. * */ @@ -603,7 +612,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { // this is either a bogus confirmation (?) or we deleted the original introduction. $message = t('Contact record was not found for you on our site.'); xml_status(3,$message); - return; // NOTREACHED + return; // NOTREACHED } } @@ -731,33 +740,21 @@ function dfrn_confirm_post(&$a,$handsfree = null) { $combined = $r[0]; if((count($r)) && ($r[0]['notify-flags'] & NOTIFY_CONFIRM)) { - - push_lang($r[0]['language']); - $tpl = (($new_relation == CONTACT_IS_FRIEND) - ? get_intltext_template('friend_complete_eml.tpl') - : get_intltext_template('intro_complete_eml.tpl')); - - $email_tpl = replace_macros($tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $r[0]['username'], - '$email' => $r[0]['email'], - '$fn' => $r[0]['name'], - '$dfrn_url' => $r[0]['url'], - '$uid' => $newuid ) - ); - require_once('include/email.php'); - - $res = mail($r[0]['email'], email_header_encode( sprintf( t("Connection accepted at %s") , $a->config['sitename']),'UTF-8'), - $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); - - if(!$res) { - // pointless throwing an error here and confusing the person at the other end of the wire. - } - pop_lang(); + $mutual = ($new_relation == CONTACT_IS_FRIEND); + notification(array( + 'type' => NOTIFY_CONFIRM, + 'notify_flags' => $r[0]['notify-flags'], + 'language' => $r[0]['language'], + 'to_name' => $r[0]['username'], + 'to_email' => $r[0]['email'], + 'uid' => $r[0]['uid'], + 'link' => $a->get_baseurl() . '/contacts/' . $dfrn_record, + 'source_name' => ((strlen(stripslashes($r[0]['name']))) ? stripslashes($r[0]['name']) : t('[Name Withheld]')), + 'source_link' => $r[0]['url'], + 'source_photo' => $r[0]['photo'], + 'verb' => ($mutual?ACTIVITY_FRIEND:ACTIVITY_FOLLOW), + 'otype' => 'intro' + )); } // Send a new friend post if we are allowed to... @@ -778,7 +775,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if(count($self)) { $arr = array(); - $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $local_uid); + $arr['uri'] = $arr['parent-uri'] = item_new_uri($a->get_hostname(), $local_uid); $arr['uid'] = $local_uid; $arr['contact-id'] = $self[0]['id']; $arr['wall'] = 1; diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index 7440c8ab4..5e19a1ffc 100644 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -9,6 +9,8 @@ * */ +require_once('include/enotify.php'); + if(! function_exists('dfrn_request_init')) { function dfrn_request_init(&$a) { @@ -45,13 +47,13 @@ function dfrn_request_post(&$a) { if(x($_POST, 'cancel')) { goaway(z_root()); - } + } /** * * Scenario 2: We've introduced ourself to another cell, then have been returned to our own cell - * to confirm the request, and then we've clicked submit (perhaps after logging in). + * to confirm the request, and then we've clicked submit (perhaps after logging in). * That brings us here: * */ @@ -145,7 +147,7 @@ function dfrn_request_post(&$a) { */ $r = q("INSERT INTO `contact` ( `uid`, `created`,`url`, `nurl`, `name`, `nick`, `photo`, `site-pubkey`, - `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`) + `request`, `confirm`, `notify`, `poll`, `poco`, `network`, `aes_allow`, `hidden`) VALUES ( %d, '%s', '%s', '%s', '%s' , '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)", intval(local_user()), datetime_convert(), @@ -216,17 +218,17 @@ function dfrn_request_post(&$a) { /** * Otherwise: - * + * * Scenario 1: - * We are the requestee. A person from a remote cell has made an introduction - * on our profile web page and clicked submit. We will use their DFRN-URL to - * figure out how to contact their cell. + * We are the requestee. A person from a remote cell has made an introduction + * on our profile web page and clicked submit. We will use their DFRN-URL to + * figure out how to contact their cell. * * Scrape the originating DFRN-URL for everything we need. Create a contact record * and an introduction to show our user next time he/she logs in. * Finally redirect back to the requestor so that their site can record the request. - * If our user (the requestee) later confirms this request, a record of it will need - * to exist on the requestor's cell in order for the confirmation process to complete.. + * If our user (the requestee) later confirms this request, a record of it will need + * to exist on the requestor's cell in order for the confirmation process to complete.. * * It's possible that neither the requestor or the requestee are logged in at the moment, * and the requestor does not yet have any credentials to the requestee profile. @@ -266,19 +268,19 @@ function dfrn_request_post(&$a) { notice( t('Spam protection measures have been invoked.') . EOL); notice( t('Friends are advised to please try again in 24 hours.') . EOL); return; - } + } } /** * - * Cleanup old introductions that remain blocked. + * Cleanup old introductions that remain blocked. * Also remove the contact record, but only if there is no existing relationship * Do not remove email contacts as these may be awaiting email verification */ - $r = q("SELECT `intro`.*, `intro`.`id` AS `iid`, `contact`.`id` AS `cid`, `contact`.`rel` + $r = q("SELECT `intro`.*, `intro`.`id` AS `iid`, `contact`.`id` AS `cid`, `contact`.`rel` FROM `intro` LEFT JOIN `contact` on `intro`.`contact-id` = `contact`.`id` - WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0 + WHERE `intro`.`blocked` = 1 AND `contact`.`self` = 0 AND `contact`.`network` != '%s' AND `intro`.`datetime` < UTC_TIMESTAMP() - INTERVAL 30 MINUTE ", dbesc(NETWORK_MAIL2) @@ -401,13 +403,13 @@ function dfrn_request_post(&$a) { $photo = avatar_img($addr); - $r = q("UPDATE `contact` SET - `photo` = '%s', + $r = q("UPDATE `contact` SET + `photo` = '%s', `thumb` = '%s', - `micro` = '%s', - `name-date` = '%s', - `uri-date` = '%s', - `avatar-date` = '%s', + `micro` = '%s', + `name-date` = '%s', + `uri-date` = '%s', + `avatar-date` = '%s', `hidden` = 0, WHERE `id` = %d ", @@ -464,7 +466,7 @@ function dfrn_request_post(&$a) { if($network === NETWORK_DFRN) { - $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1", + $ret = q("SELECT * FROM `contact` WHERE `uid` = %d AND `url` = '%s' AND `self` = 0 LIMIT 1", intval($uid), dbesc($url) ); @@ -506,7 +508,7 @@ function dfrn_request_post(&$a) { goaway($a->get_baseurl() . '/' . $a->cmd); return; // NOTREACHED } - + require_once('include/Scrape.php'); @@ -521,12 +523,12 @@ function dfrn_request_post(&$a) { notice( t('Warning: profile location has no identifiable owner name.') . EOL ); if(! x($parms,'photo')) notice( t('Warning: profile location has no profile photo.') . EOL ); - $invalid = validate_dfrn($parms); + $invalid = validate_dfrn($parms); if($invalid) { notice( sprintf( tt("%d required parameter was not found at the given location", "%d required parameters were not found at the given location", $invalid), $invalid) . EOL ); - + return; } } @@ -591,7 +593,7 @@ function dfrn_request_post(&$a) { // This notice will only be seen by the requestor if the requestor and requestee are on the same server. - if(! $failed) + if(! $failed) info( t('Your introduction has been sent.') . EOL ); // "Homecoming" - send the requestor back to their site to record the introduction. @@ -599,21 +601,21 @@ function dfrn_request_post(&$a) { $dfrn_url = bin2hex($a->get_baseurl() . '/profile/' . $nickname); $aes_allow = ((function_exists('openssl_encrypt')) ? 1 : 0); - goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url" - . '&dfrn_version=' . DFRN_PROTOCOL_VERSION - . '&confirm_key=' . $hash + goaway($parms['dfrn-request'] . "?dfrn_url=$dfrn_url" + . '&dfrn_version=' . DFRN_PROTOCOL_VERSION + . '&confirm_key=' . $hash . (($aes_allow) ? "&aes_allow=1" : "") ); // NOTREACHED // END $network === NETWORK_DFRN } elseif($network === NETWORK_OSTATUS) { - + /** * * OStatus network * Check contact existence - * Try and scrape together enough information to create a contact record, + * Try and scrape together enough information to create a contact record, * with us as CONTACT_IS_FOLLOWER * Substitute our user's feed URL into $url template * Send the subscriber home to subscribe @@ -655,7 +657,7 @@ function dfrn_request_content(&$a) { return login(); } - // Edge case, but can easily happen in the wild. This person is authenticated, + // Edge case, but can easily happen in the wild. This person is authenticated, // but not as the person who needs to deal with this request. if ($a->user['nickname'] != $a->argv[1]) { @@ -683,11 +685,11 @@ function dfrn_request_content(&$a) { return $o; } - elseif((x($_GET,'confirm_key')) && strlen($_GET['confirm_key'])) { + elseif((x($_GET,'confirm_key')) && strlen($_GET['confirm_key'])) { // we are the requestee and it is now safe to send our user their introduction, - // We could just unblock it, but first we have to jump through a few hoops to - // send an email, or even to find out if we need to send an email. + // We could just unblock it, but first we have to jump through a few hoops to + // send an email, or even to find out if we need to send an email. $intro = q("SELECT * FROM `intro` WHERE `hash` = '%s' LIMIT 1", dbesc($_GET['confirm_key']) @@ -707,7 +709,7 @@ function dfrn_request_content(&$a) { $auto_confirm = true; if(! $auto_confirm) { - require_once('include/enotify.php'); + notification(array( 'type' => NOTIFY_INTRO, 'notify_flags' => $r[0]['notify-flags'], @@ -758,7 +760,7 @@ function dfrn_request_content(&$a) { /** * Normal web request. Display our user's introduction form. */ - + if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { if(! get_config('system','local_block')) { notice( t('Public access denied.') . EOL); @@ -793,7 +795,7 @@ function dfrn_request_content(&$a) { /** * * The auto_request form only has the profile address - * because nobody is going to read the comments and + * because nobody is going to read the comments and * it doesn't matter if they know you or not. * */ diff --git a/view/ca/friend_complete_eml.tpl b/view/ca/friend_complete_eml.tpl deleted file mode 100644 index 539d9ff3d..000000000 --- a/view/ca/friend_complete_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - -Apreciat/da $username, - - Grans noticies... '$fn' a '$dfrn_url' ha acceptat la teva sol·licitud de connexió en '$sitename'. - -Ara sous amics mutus i podreu intercanviar actualizacions de estatus, fotos, i correu electrónic -sense cap restricció. - -Visita la teva pàgina de 'Contactes' en $sitename si desitja realizar qualsevol canvi en aquesta relació. - -$siteurl - -[Per exemple, pots crear un perfil independent amb informació que no esta disponible al públic en general -- i assignar drets de visualització a '$fn']. - - - $sitename - - diff --git a/view/ca/intro_complete_eml.tpl b/view/ca/intro_complete_eml.tpl deleted file mode 100644 index 70507d71d..000000000 --- a/view/ca/intro_complete_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - -Apreciat/da $username, - - '$fn' en '$dfrn_url' ha acceptat la teva petició -connexió a '$sitename'. - - '$fn' ha optat per acceptar-te com a "fan", que restringeix certes -formes de comunicació, com missatges privats i algunes interaccions -amb el perfil. Si ets una "celebritat" o una pàgina de comunitat, -aquests ajustos s'aplican automàticament - - '$fn' pot optar per extendre aixó en una relació més permisiva -en el futur. - - Començaràs a rebre les actualizacions públiques de estatus de '$fn', -que apareixeran a la teva pàgina "Xarxa" en - -$siteurl - - - $sitename diff --git a/view/ca/smarty3/friend_complete_eml.tpl b/view/ca/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 660ac8c1a..000000000 --- a/view/ca/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - -Apreciat/da {{$username}}, - - Grans noticies... '{{$fn}}' a '{{$dfrn_url}}' ha acceptat la teva sol·licitud de connexió en '{{$sitename}}'. - -Ara sous amics mutus i podreu intercanviar actualizacions de estatus, fotos, i correu electrónic -sense cap restricció. - -Visita la teva pàgina de 'Contactes' en {{$sitename}} si desitja realizar qualsevol canvi en aquesta relació. - -{{$siteurl}} - -[Per exemple, pots crear un perfil independent amb informació que no esta disponible al públic en general -- i assignar drets de visualització a '{{$fn}}']. - - - {{$sitename}} - - diff --git a/view/ca/smarty3/intro_complete_eml.tpl b/view/ca/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 6a0e33713..000000000 --- a/view/ca/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - - -Apreciat/da {{$username}}, - - '{{$fn}}' en '{{$dfrn_url}}' ha acceptat la teva petició -connexió a '{{$sitename}}'. - - '{{$fn}}' ha optat per acceptar-te com a "fan", que restringeix certes -formes de comunicació, com missatges privats i algunes interaccions -amb el perfil. Si ets una "celebritat" o una pàgina de comunitat, -aquests ajustos s'aplican automàticament - - '{{$fn}}' pot optar per extendre aixó en una relació més permisiva -en el futur. - - Començaràs a rebre les actualizacions públiques de estatus de '{{$fn}}', -que apareixeran a la teva pàgina "Xarxa" en - -{{$siteurl}} - - - {{$sitename}} diff --git a/view/cs/friend_complete_eml.tpl b/view/cs/friend_complete_eml.tpl deleted file mode 100644 index e0ce676a8..000000000 --- a/view/cs/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Drahý/Drahá $[username], - - Skvělé zprávy... '$[fn]' na '$[dfrn_url]' akceptoval -Vaši žádost o spojení na '$[sitename]'. - -Jste nyní vzájemnými přáteli a můžete si vyměňovat aktualizace statusu, fotografií a emailů -bez omezení. - -Navštivte prosím stránku "Kontakty" na $[sitename] pokud si přejete provést -jakékoliv změny v tomto vztahu. - -$[siteurl] - -[Například můžete vytvořit separátní profil s informacemi, které nebudou -dostupné pro veřejnost - a přidělit práva k němu pro čtení pro '$[fn]']. - -S pozdravem, - - $[sitename] administrátor - - \ No newline at end of file diff --git a/view/cs/intro_complete_eml.tpl b/view/cs/intro_complete_eml.tpl deleted file mode 100644 index b174b2c61..000000000 --- a/view/cs/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Drahý/Drahá $[username], - - '$[fn]' na '$[dfrn_url]' akceptoval -Vaši žádost o připojení na '$[sitename]'. - - '$[fn]' se rozhodl Vás akceptovat jako "fanouška", což omezuje -určité druhy komunikace, jako jsou soukromé zprávy a určité profilové -interakce. Pokud se jedná o účet celebrity nebo o kumunitní stránky, tato nastavení byla -použita automaticky. - - '$[fn]' se může rozhodnout rozšířit tento vztah na oboustraný nebo méně restriktivní -vztah v budoucnosti. - - Nyní začnete získávat veřejné aktualizace statusu od '$[fn]', -které se objeví na Vaší stránce "Síť" na - -$[siteurl] - -S pozdravem, - - $[sitename] administrátor \ No newline at end of file diff --git a/view/cs/smarty3/friend_complete_eml.tpl b/view/cs/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 462022a05..000000000 --- a/view/cs/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Milý/Milá {{$username}}, - - Skvělé zprávy... '{{$fn}}' na '{{$dfrn_url}}' odsouhlasil Váš požadavek na spojení na '{{$sitename}}'. - -Jste nyní přátelé a můžete si vyměňovat aktualizace statusu, fotek a e-mailů bez omezení. - -Pokud budete chtít tento vztah jakkoliv upravit, navštivte Vaši stránku "Kontakty" na {{$sitename}}. - -{{$siteurl}} - -(Nyní můžete například vytvořit separátní profil s informacemi, které nebudou viditelné veřejně, a nastavit právo pro zobrazení tohoto profilu pro '{{$fn}}'). - -S pozdravem, - - {{$sitename}} administrátor - diff --git a/view/cs/smarty3/intro_complete_eml.tpl b/view/cs/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 0137995c7..000000000 --- a/view/cs/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Milý/Milá {{$username}}, - - - '{{$fn}}' na '{{$dfrn_url}}' odsouhlasil Váš požadavek na spojení na '{{$sitename}}'. - - '{{$fn}}' Vás označil za svého "fanouška", což jistým způsobem omezuje komunikaci (například v oblasti soukromých zpráv a některých profilových interakcí. Pokud je toto celebritní nebo komunitní stránka, bylo toto nastavení byla přijato automaticky. - - '{{$fn}}' může v budoucnu rozšířit toto spojení na oboustranné nebo jinak méně restriktivní. - - Nyní začnete dostávat veřejné aktualizace statusu od '{{$fn}}', které se objeví ve Vaší stránce "Síť" na webu - -{{$siteurl}} - -S pozdravem, - - {{$sitename}} administrátor diff --git a/view/de/friend_complete_eml.tpl b/view/de/friend_complete_eml.tpl deleted file mode 100644 index 2135f9975..000000000 --- a/view/de/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Hallo $[username], - - Großartige Neuigkeiten... '$[fn]' auf '$[dfrn_url]' hat -deine Kontaktanfrage auf '$[sitename]' bestätigt. - -Ihr seid nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und E-Mails -ohne Einschränkungen austauschen. - -Rufe deine 'Kontakte' Seite auf $[sitename] auf, wenn du -Änderungen an diesem Kontakt vornehmen willst. - -$[siteurl] - -[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthält, -die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '$[fn]' zum Betrachten freigeben]. - -Beste Grüße, - - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/de/intro_complete_eml.tpl b/view/de/intro_complete_eml.tpl deleted file mode 100644 index 9039a7fca..000000000 --- a/view/de/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Hallo $[username], - - '$[fn]' auf '$[dfrn_url]' akzeptierte -deine Verbindungsanfrage auf '$[sitename]'. - - '$[fn]' hat entschieden dich als "Fan" zu akzeptieren, was zu einigen -Einschränkungen bei der Kommunikation führt - wie z.B. das Schreiben von privaten Nachrichten und einige Profil -Interaktionen. Sollte dies ein Promi-Konto oder eine Forum-Seite sein, werden die Einstellungen -automatisch angewandt. - - '$[fn]' kann wählen, ob die Freundschaft in eine beidseitige oder alles erlaubende -Beziehung in der Zukunft erweitert wird. - - Du empfängst ab sofort die öffentlichen Beiträge von '$[fn]', -auf deiner "Netzwerk" Seite. - -$[siteurl] - -Beste Grüße, - - $[sitename] Administrator \ No newline at end of file diff --git a/view/de/smarty3/friend_complete_eml.tpl b/view/de/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 27dd1bc94..000000000 --- a/view/de/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Hallo {{$username}}, - - Großartige Neuigkeiten... '{{$fn}}' auf '{{$dfrn_url}}' hat -deine Kontaktanfrage auf '{{$sitename}}' bestätigt. - -Ihr seid nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails -ohne Einschränkungen austauschen. - -Rufe deine 'Kontakte' Seite auf {{$sitename}} auf, wenn du -Änderungen an diesem Kontakt vornehmen willst. - -{{$siteurl}} - -[Du könntest z.B. ein spezielles Profil anlegen, das Informationen enthält, -die nicht für die breite Öffentlichkeit sichtbar sein sollen und es für '{{$fn}}' zum Betrachten freigeben]. - -Beste Grüße, - - {{$sitename}} Administrator - - \ No newline at end of file diff --git a/view/de/smarty3/intro_complete_eml.tpl b/view/de/smarty3/intro_complete_eml.tpl deleted file mode 100644 index b14f6f992..000000000 --- a/view/de/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Hallo {{$username}}, - - '{{$fn}}' auf '{{$dfrn_url}}' hat deine Verbindungsanfrage -auf '{{$sitename}}' akzeptiert. - - '{{$fn}}' hat entschieden Dich als "Fan" zu akzeptieren, was zu einigen -Einschränkungen bei der Kommunikation führt - wie zB das Schreiben von privaten Nachrichten und einige Profil -Interaktionen. Sollte dies ein Promi-Konto oder eine Forum-Seite sein, werden die Einstellungen -automatisch angewandt. - - '{{$fn}}' kann wählen, ob die Freundschaft in eine beidseitige oder alles erlaubende -Beziehung in der Zukunft erweitert wird. - - Du empfängst ab sofort die öffentlichen Beiträge von '{{$fn}}', -auf deiner "Netzwerk" Seite. - -{{$siteurl}} - -Beste Grüße, - - {{$sitename}} Administrator \ No newline at end of file diff --git a/view/en/friend_complete_eml.tpl b/view/en/friend_complete_eml.tpl deleted file mode 100644 index 89f578388..000000000 --- a/view/en/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Dear $[username], - - Great news... '$[fn]' at '$[dfrn_url]' has accepted -your connection request at '$[sitename]'. - -You are now mutual friends and may exchange status updates, photos, and email -without restriction. - -Please visit your 'Contacts' page at $[sitename] if you wish to make -any changes to this relationship. - -$[siteurl] - -[For instance, you may create a separate profile with information that is not -available to the general public - and assign viewing rights to '$[fn]']. - -Sincerely, - - $[sitename] Administrator - - diff --git a/view/en/intro_complete_eml.tpl b/view/en/intro_complete_eml.tpl deleted file mode 100644 index cd78b2a15..000000000 --- a/view/en/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Dear $[username], - - '$[fn]' at '$[dfrn_url]' has accepted -your connection request at '$[sitename]'. - - '$[fn]' has chosen to accept you a "fan", which restricts -some forms of communication - such as private messaging and some profile -interactions. If this is a celebrity or community page, these settings were -applied automatically. - - '$[fn]' may choose to extend this into a two-way or more permissive -relationship in the future. - - You will start receiving public status updates from '$[fn]', -which will appear on your 'Network' page at - -$[siteurl] - -Sincerely, - - $[sitename] Administrator diff --git a/view/en/smarty3/friend_complete_eml.tpl b/view/en/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 32311e837..000000000 --- a/view/en/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Dear {{$username}}, - - Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted -your connection request at '{{$sitename}}'. - -You are now mutual friends and may exchange status updates, photos, and email -without restriction. - -Please visit your 'Contacts' page at {{$sitename}} if you wish to make -any changes to this relationship. - -{{$siteurl}} - -[For instance, you may create a separate profile with information that is not -available to the general public - and assign viewing rights to '{{$fn}}']. - -Sincerely, - - {{$sitename}} Administrator - - diff --git a/view/en/smarty3/intro_complete_eml.tpl b/view/en/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 46d4402a2..000000000 --- a/view/en/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Dear {{$username}}, - - '{{$fn}}' at '{{$dfrn_url}}' has accepted -your connection request at '{{$sitename}}'. - - '{{$fn}}' has chosen to accept you a "fan", which restricts -some forms of communication - such as private messaging and some profile -interactions. If this is a celebrity or community page, these settings were -applied automatically. - - '{{$fn}}' may choose to extend this into a two-way or more permissive -relationship in the future. - - You will start receiving public status updates from '{{$fn}}', -which will appear on your 'Network' page at - -{{$siteurl}} - -Sincerely, - - {{$sitename}} Administrator diff --git a/view/eo/friend_complete_eml.tpl b/view/eo/friend_complete_eml.tpl deleted file mode 100644 index f429ca450..000000000 --- a/view/eo/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Kara $[username], - - Boegaj novaĵoj.... '$[fn]' ĉe '$[dfrn_url]' aprobis -vian kontaktpeton ĉe '$[sitename]'. - -Vi nun estas reciprokaj amikoj kaj povas interŝanĝi afiŝojn, bildojn kaj mesaĝojn -senkatene. - -Bonvolu viziti vian 'Kontaktoj' paĝon ĉe $[sitename] se vi volas -ŝangi la rilaton. - -$[siteurl] - -[Ekzempe, vi eble volas krei disiĝintan profilon kun informoj kiu ne -haveblas al la komuna publiko - kaj rajtigi '$[fn]' al ĝi]' - -Salutoj, - - $[sitename] administranto - - \ No newline at end of file diff --git a/view/eo/intro_complete_eml.tpl b/view/eo/intro_complete_eml.tpl deleted file mode 100644 index 56a4fd880..000000000 --- a/view/eo/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Kara $[username], - - '$[fn]' ĉe '$[dfrn_url]' akceptis -vian kontaktpeton ĉe '$[sitename]'. - - '$[fn]' elektis vin kiel "admiranto", kio malpermesas -kelkajn komunikilojn - ekzemple privataj mesaĝoj kaj kelkaj profilrilataj -agoj. Se tio estas konto de komunumo aŭ de eminentulo, tiaj agordoj -aŭtomate aktiviĝis. - - '$[fn]' eblas konverti la rilaton al ambaŭdirekta rilato -aŭ apliki pli da permesoj. - - Vi ekricevos publikajn afiŝojn de '$[fn]', -kiuj aperos sur via 'Reto' paĝo ĉe - -$[siteurl] - -Salutoj, - - $[sitename] administranto \ No newline at end of file diff --git a/view/eo/smarty3/friend_complete_eml.tpl b/view/eo/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 7d50b8bc5..000000000 --- a/view/eo/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Kara {{$username}}, - - Boegaj novaĵoj.... '{{$fn}}' ĉe '{{$dfrn_url}}' aprobis -vian kontaktpeton ĉe '{{$sitename}}'. - -Vi nun estas reciprokaj amikoj kaj povas interŝanĝi afiŝojn, bildojn kaj mesaĝojn -senkatene. - -Bonvolu viziti vian 'Kontaktoj' paĝon ĉe {{$sitename}} se vi volas -ŝangi la rilaton. - -{{$siteurl}} - -[Ekzempe, vi eble volas krei disiĝintan profilon kun informoj kiu ne -haveblas al la komuna publiko - kaj rajtigi '{{$fn}}' al ĝi]' - -Salutoj, - - {{$sitename}} administranto - - \ No newline at end of file diff --git a/view/eo/smarty3/intro_complete_eml.tpl b/view/eo/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 66903de96..000000000 --- a/view/eo/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Kara {{$username}}, - - '{{$fn}}' ĉe '{{$dfrn_url}}' akceptis -vian kontaktpeton ĉe '{{$sitename}}'. - - '{{$fn}}' elektis vin kiel "admiranto", kio malpermesas -kelkajn komunikilojn - ekzemple privataj mesaĝoj kaj kelkaj profilrilataj -agoj. Se tio estas konto de komunumo aŭ de eminentulo, tiaj agordoj -aŭtomate aktiviĝis. - - '{{$fn}}' eblas konverti la rilaton al ambaŭdirekta rilato -aŭ apliki pli da permesoj. - - Vi ekricevos publikajn afiŝojn de '{{$fn}}', -kiuj aperos sur via 'Reto' paĝo ĉe - -{{$siteurl}} - -Salutoj, - - {{$sitename}} administranto \ No newline at end of file diff --git a/view/es/friend_complete_eml.tpl b/view/es/friend_complete_eml.tpl deleted file mode 100644 index 0dc867efd..000000000 --- a/view/es/friend_complete_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - -Estimado/a $username, - - Grandes noticias... '$fn' a '$dfrn_url' ha aceptado tu solicitud de conexión en '$sitename'. - -Ahora sois amigos mutuos y podreis intercambiar actualizaciones de estado, fotos, y correo electrónico -sin restricción alguna. - -Visita tu página de 'Contactos' en $sitename si desear realizar cualquier cambio en esta relación. - -$siteurl - -[Por ejemplo, puedes crear un perfil independiente con información que no está disponible al público en general -- y asignar derechos de visualización a '$fn']. - - - $sitename - - diff --git a/view/es/intro_complete_eml.tpl b/view/es/intro_complete_eml.tpl deleted file mode 100644 index a2964808c..000000000 --- a/view/es/intro_complete_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - -Estimado/a $username, - - '$fn' en '$dfrn_url' ha aceptado tu petición -conexión a '$sitename'. - - '$fn' ha optado por aceptarte come "fan", que restringe ciertas -formas de comunicación, como mensajes privados y algunas interacciones -con el perfil. Si eres una "celebridad" o una página de comunidad, -estos ajustes se aplican automáticamente - - '$fn' puede optar por extender esto en una relación más permisiva -en el futuro. - - Empezarás a recibir las actualizaciones públicas de estado de '$fn', -que aparecerán en tu página "Red" en - -$siteurl - - - $sitename diff --git a/view/es/smarty3/friend_complete_eml.tpl b/view/es/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 493446b04..000000000 --- a/view/es/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - -Estimado/a {{$username}}, - - Grandes noticias... '{{$fn}}' a '{{$dfrn_url}}' ha aceptado tu solicitud de conexión en '{{$sitename}}'. - -Ahora sois amigos mutuos y podreis intercambiar actualizaciones de estado, fotos, y correo electrónico -sin restricción alguna. - -Visita tu página de 'Contactos' en {{$sitename}} si desear realizar cualquier cambio en esta relación. - -{{$siteurl}} - -[Por ejemplo, puedes crear un perfil independiente con información que no está disponible al público en general -- y asignar derechos de visualización a '{{$fn}}']. - - - {{$sitename}} - - diff --git a/view/es/smarty3/intro_complete_eml.tpl b/view/es/smarty3/intro_complete_eml.tpl deleted file mode 100644 index c9dd3fed6..000000000 --- a/view/es/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - - -Estimado/a {{$username}}, - - '{{$fn}}' en '{{$dfrn_url}}' ha aceptado tu petición -conexión a '{{$sitename}}'. - - '{{$fn}}' ha optado por aceptarte come "fan", que restringe ciertas -formas de comunicación, como mensajes privados y algunas interacciones -con el perfil. Si eres una "celebridad" o una página de comunidad, -estos ajustes se aplican automáticamente - - '{{$fn}}' puede optar por extender esto en una relación más permisiva -en el futuro. - - Empezarás a recibir las actualizaciones públicas de estado de '{{$fn}}', -que aparecerán en tu página "Red" en - -{{$siteurl}} - - - {{$sitename}} diff --git a/view/fr/friend_complete_eml.tpl b/view/fr/friend_complete_eml.tpl deleted file mode 100644 index 1f2553b5e..000000000 --- a/view/fr/friend_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - -Cher(e) $username, - - Grande nouvelle… « $fn » (de « $dfrn_url ») a accepté votre -demande de connexion à « $sitename ». - -Vous êtes désormais dans une relation réciproque et pouvez échanger des -photos, des humeurs et des messages sans restriction. - -Merci de visiter votre page « Contacts » sur $sitename pour toute -modification que vous souhaiteriez apporter à cette relation. - -$siteurl - -[Par exemple, vous pouvez créer un profil spécifique avec des informations -cachées au grand public - et ainsi assigner des droits privilégiés à -« $fn »]/ - -Sincèremment, - - l'administrateur de $sitename - - diff --git a/view/fr/intro_complete_eml.tpl b/view/fr/intro_complete_eml.tpl deleted file mode 100644 index f698cfeb7..000000000 --- a/view/fr/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Cher(e) $username, - - « $fn » du site « $dfrn_url » a accepté votre -demande de mise en relation sur « $sitename ». - - « $fn » a décidé de vous accepter comme « fan », ce qui restreint -certains de vos moyens de communication - tels que les messages privés et -certaines interactions avec son profil. S'il s'agit de la page d'une -célébrité et/ou communauté, ces réglages ont été définis automatiquement. - - « $fn » pourra choisir d'étendre votre relation à quelque chose de -plus permissif dans l'avenir. - - Vous allez commencer à recevoir les mises à jour publiques du -statut de « $fn », lesquelles apparaîtront sur votre page « Réseau » sur - -$siteurl - -Sincèrement votre, - - l'administrateur de $sitename diff --git a/view/fr/smarty3/friend_complete_eml.tpl b/view/fr/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 9f329c950..000000000 --- a/view/fr/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,24 +0,0 @@ - - -Cher(e) {{$username}}, - - Grande nouvelle… « {{$fn}} » (de « {{$dfrn_url}} ») a accepté votre -demande de connexion à « {{$sitename}} ». - -Vous êtes désormais dans une relation réciproque et pouvez échanger des -photos, des humeurs et des messages sans restriction. - -Merci de visiter votre page « Contacts » sur {{$sitename}} pour toute -modification que vous souhaiteriez apporter à cette relation. - -{{$siteurl}} - -[Par exemple, vous pouvez créer un profil spécifique avec des informations -cachées au grand public - et ainsi assigner des droits privilégiés à -« {{$fn}} »]/ - -Sincèremment, - - l'administrateur de {{$sitename}} - - diff --git a/view/fr/smarty3/intro_complete_eml.tpl b/view/fr/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 88cd00fc4..000000000 --- a/view/fr/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Cher(e) {{$username}}, - - « {{$fn}} » du site « {{$dfrn_url}} » a accepté votre -demande de mise en relation sur « {{$sitename}} ». - - « {{$fn}} » a décidé de vous accepter comme « fan », ce qui restreint -certains de vos moyens de communication - tels que les messages privés et -certaines interactions avec son profil. S'il s'agit de la page d'une -célébrité et/ou communauté, ces réglages ont été définis automatiquement. - - « {{$fn}} » pourra choisir d'étendre votre relation à quelque chose de -plus permissif dans l'avenir. - - Vous allez commencer à recevoir les mises à jour publiques du -statut de « {{$fn}} », lesquelles apparaîtront sur votre page « Réseau » sur - -{{$siteurl}} - -Sincèrement votre, - - l'administrateur de {{$sitename}} diff --git a/view/is/friend_complete_eml.tpl b/view/is/friend_complete_eml.tpl deleted file mode 100644 index 945ff4922..000000000 --- a/view/is/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Góðan daginn $[username], - - Frábærar fréttir... '$[fn]' hjá '$[dfrn_url]' hefur samþykkt -tengibeiðni þína hjá '$[sitename]'. - -Þið eruð nú sameiginlegir vinir og getið skipst á stöðu uppfærslum, myndum og tölvupósti -án hafta. - -Endilega fara á síðunna 'Tengiliðir' á þjóninum $[sitename] ef þú villt gera -einhverjar breytingar á þessu sambandi. - -$[siteurl] - -[Til dæmis þá getur þú búið til nýjar notenda upplýsingar um þig, með ítarlegri lýsingu, sem eiga ekki -að vera aðgengileg almenningi - og veitt aðgang til að sjá '$[fn]']. - -Bestu kveðjur, - - Kerfisstjóri $[sitename] - - \ No newline at end of file diff --git a/view/is/intro_complete_eml.tpl b/view/is/intro_complete_eml.tpl deleted file mode 100644 index dba296d4e..000000000 --- a/view/is/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Góðan daginn $[username], - - '$[fn]' hjá '$[dfrn_url]' hefur samþykkt -tengibeiðni þína á '$[sitename]'. - - '$[fn]' hefur ákveðið að hafa þig sem "aðdáanda", sem takmarkar -ákveðnar gerðir af samskipturm - til dæmis einkapóst og ákveðnar notenda -aðgerðir. Ef þetta er stjörnu- eða hópasíða, þá voru þessar stillingar -settar á sjálfkrafa. - - '$[fn]' getur ákveðið seinna að breyta þessu í gagnkvæma eða enn hafta minni -tengingu í framtíðinni. - - Þú munt byrja að fá opinberar stöðubreytingar frá '$[fn]', -þær munu birtast á 'Tengslanet' síðunni þinni á - -$[siteurl] - -Bestu kveðjur, - - Kerfisstjóri $[sitename] \ No newline at end of file diff --git a/view/is/smarty3/friend_complete_eml.tpl b/view/is/smarty3/friend_complete_eml.tpl deleted file mode 100644 index f25787eff..000000000 --- a/view/is/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Góðan daginn {{$username}}, - - Frábærar fréttir... '{{$fn}}' hjá '{{$dfrn_url}}' hefur samþykkt -tengibeiðni þína hjá '{{$sitename}}'. - -Þið eruð nú sameiginlegir vinir og getið skipst á stöðu uppfærslum, myndum og tölvupósti -án hafta. - -Endilega fara á síðunna 'Tengiliðir' á þjóninum {{$sitename}} ef þú villt gera -einhverjar breytingar á þessu sambandi. - -{{$siteurl}} - -[Til dæmis þá getur þú búið til nýjar notenda upplýsingar um þig, með ítarlegri lýsingu, sem eiga ekki -að vera aðgengileg almenningi - og veitt aðgang til að sjá '{{$fn}}']. - -Bestu kveðjur, - - Kerfisstjóri {{$sitename}} - - \ No newline at end of file diff --git a/view/is/smarty3/intro_complete_eml.tpl b/view/is/smarty3/intro_complete_eml.tpl deleted file mode 100644 index feab4d6f6..000000000 --- a/view/is/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Góðan daginn {{$username}}, - - '{{$fn}}' hjá '{{$dfrn_url}}' hefur samþykkt -tengibeiðni þína á '{{$sitename}}'. - - '{{$fn}}' hefur ákveðið að hafa þig sem "aðdáanda", sem takmarkar -ákveðnar gerðir af samskipturm - til dæmis einkapóst og ákveðnar notenda -aðgerðir. Ef þetta er stjörnu- eða hópasíða, þá voru þessar stillingar -settar á sjálfkrafa. - - '{{$fn}}' getur ákveðið seinna að breyta þessu í gagnkvæma eða enn hafta minni -tengingu í framtíðinni. - - Þú munt byrja að fá opinberar stöðubreytingar frá '{{$fn}}', -þær munu birtast á 'Tengslanet' síðunni þinni á - -{{$siteurl}} - -Bestu kveðjur, - - Kerfisstjóri {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/friend_complete_eml.tpl b/view/it/smarty3/friend_complete_eml.tpl deleted file mode 100644 index daeaae901..000000000 --- a/view/it/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Ciao {{$username}}, - - Ottime notizie... '{{$fn}}' di '{{$dfrn_url}}' ha accettato -la tua richiesta di connessione su '{{$sitename}}'. - -Adesso siete amici reciproci e potete scambiarvi aggiornamenti di stato, foto ed email -senza restrizioni. - -Vai nella pagina 'Contatti' di {{$sitename}} se vuoi effettuare -qualche modifica riguardo questa relazione - -{{$siteurl}} - -[Ad esempio, potresti creare un profilo separato con le informazioni che non -sono disponibili pubblicamente - ed permettere di vederlo a '{{$fn}}']. - -Saluti, - - l'amministratore di {{$sitename}} - - \ No newline at end of file diff --git a/view/it/smarty3/intro_complete_eml.tpl b/view/it/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 69fce8141..000000000 --- a/view/it/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Ciao {{$username}}, - - '{{$fn}}' di '{{$dfrn_url}}' ha accettato -la tua richiesta di connessione a '{{$sitename}}'. - - '{{$fn}}' ha deciso di accettarti come "fan", il che restringe -alcune forme di comunicazione - come i messaggi privati e alcune -interazioni. Se è la pagina di una persona famosa o di una comunità, queste impostazioni saranno -applicate automaticamente. - - '{{$fn}}' potrebbe decidere di estendere questa relazione in una comunicazione bidirezionale o ancora più permissiva -. - - Inizierai a ricevere gli aggiornamenti di stato pubblici da '{{$fn}}', -che apparirà nella tua pagina 'Rete' - -{{$siteurl}} - -Saluti, - - l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/nb-no/friend_complete_eml.tpl b/view/nb-no/friend_complete_eml.tpl deleted file mode 100644 index 4526c94d0..000000000 --- a/view/nb-no/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Kjære $[username], - - Gode nyheter... '$[fn]' ved '$[dfrn_url]' har godtatt -din forespørsel om kobling hos '$[sitename]'. - -Dere er nå gjensidige venner og kan utveksle statusoppdateringer, bilder og e-post -uten hindringer. - -Vennligst besøk din side "Kontakter" ved $[sitename] hvis du ønsker å gjøre -noen endringer på denne forbindelsen. - -$[siteurl] - -[For eksempel, så kan du lage en egen profil med informasjon som ikke er -tilgjengelig for alle - og angi visningsrettigheter til '$[fn]']. - -Med vennlig hilsen, - - $[sitename] administrator - - \ No newline at end of file diff --git a/view/nb-no/intro_complete_eml.tpl b/view/nb-no/intro_complete_eml.tpl deleted file mode 100644 index 17b0be5a8..000000000 --- a/view/nb-no/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Kjære $[username], - - '$[fn]' ved '$[dfrn_url]' har godtatt -din forespørsel om kobling ved $[sitename]'. - - '$[fn]' har valgt å godta deg som "fan", som begrenser -noen typer kommunikasjon - slik som private meldinger og noen profilhandlinger. -Hvis dette er en kjendis- eller forumside, så ble disse innstillingene -angitt automatisk. - - '$[fn]' kan velge å utvide dette til en to-veis eller mer åpen -forbindelse i fremtiden. - - Du vil nå motta offentlige statusoppdateringer fra '$[fn]', -som vil vises på din "Nettverk"-side ved - -$[siteurl] - -Med vennlig hilsen, - - $[sitename] administrator \ No newline at end of file diff --git a/view/nb-no/smarty3/friend_complete_eml.tpl b/view/nb-no/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 7ffe7c9ae..000000000 --- a/view/nb-no/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Kjære {{$username}}, - - Gode nyheter... '{{$fn}}' ved '{{$dfrn_url}}' har godtatt -din forespørsel om kobling hos '{{$sitename}}'. - -Dere er nå gjensidige venner og kan utveksle statusoppdateringer, bilder og e-post -uten hindringer. - -Vennligst besøk din side "Kontakter" ved {{$sitename}} hvis du ønsker å gjøre -noen endringer på denne forbindelsen. - -{{$siteurl}} - -[For eksempel, så kan du lage en egen profil med informasjon som ikke er -tilgjengelig for alle - og angi visningsrettigheter til '{{$fn}}']. - -Med vennlig hilsen, - - {{$sitename}} administrator - - \ No newline at end of file diff --git a/view/nb-no/smarty3/intro_complete_eml.tpl b/view/nb-no/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 98d4917c8..000000000 --- a/view/nb-no/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Kjære {{$username}}, - - '{{$fn}}' ved '{{$dfrn_url}}' har godtatt -din forespørsel om kobling ved {{$sitename}}'. - - '{{$fn}}' har valgt å godta deg som "fan", som begrenser -noen typer kommunikasjon - slik som private meldinger og noen profilhandlinger. -Hvis dette er en kjendis- eller forumside, så ble disse innstillingene -angitt automatisk. - - '{{$fn}}' kan velge å utvide dette til en to-veis eller mer åpen -forbindelse i fremtiden. - - Du vil nå motta offentlige statusoppdateringer fra '{{$fn}}', -som vil vises på din "Nettverk"-side ved - -{{$siteurl}} - -Med vennlig hilsen, - - {{$sitename}} administrator \ No newline at end of file diff --git a/view/nl/friend_complete_eml.tpl b/view/nl/friend_complete_eml.tpl deleted file mode 100644 index 7d00138c9..000000000 --- a/view/nl/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Beste $[username], - - Goed nieuws... '$[fn]' op '$[dfrn_url]' heeft uw -contactaanvraag goedgekeurd op '$[sitename]'. - -U bent nu in contact met elkaar en kan statusberichten, foto's en e-mail uitwisselen, -zonder beperkingen. - -Bezoek uw 'Contacten'-pagina op $[sitename] wanneer u de instellingen -van dit contact wilt veranderen. - -$[siteurl] - -[U kunt bijvoorbeeld een apart profiel aanmaken met informatie dat niet door -iedereen valt in te zien, maar wel door '$[fn]']. - -Vriendelijke groet, - - Beheerder $[sitename] - - \ No newline at end of file diff --git a/view/nl/intro_complete_eml.tpl b/view/nl/intro_complete_eml.tpl deleted file mode 100644 index eb9e57948..000000000 --- a/view/nl/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Beste $[username], - - '$[fn]' op '$[dfrn_url]' heeft uw -contactaanvraag goedgekeurd op '$[sitename]'. - - '$[fn]' heeft besloten om u de status van "fan" te geven. -Hierdoor kunt u bijvoorbeeld geen privéberichten uitwisselen en gelden er enkele profielrestricties. -Wanneer dit een pagina voor een beroemdheid of een gemeenschap is, zijn deze -instellingen automatisch toegepast. - - '$[fn]' kan er voor kiezen om in de toekomst deze contactrestricties uit te breiden of -om ze te verminderen. - - U ontvangt vanaf nu openbare statusupdates van '$[fn]'. -Deze kunt u zien op uw 'Netwerk'-pagina op - -$[siteurl] - -Vriendelijke groet, - - Beheerder $[sitename] \ No newline at end of file diff --git a/view/pl/friend_complete_eml.tpl b/view/pl/friend_complete_eml.tpl deleted file mode 100644 index 16cbeeaa1..000000000 --- a/view/pl/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Drogi $[username], - - Świetne wieści! '$[fn]' na '$[dfrn_url]' przyjął / przyjęła -Twoją prośbę o znajomość na '$[sitename]'. - -Jesteście teraz znajomymi i możecie wymieniać się zmianami statusów, zdjęciami i wiadomościami -bez ograniczeń. - -Zajrzyj na stronę 'Kontakty' na $[sitename] jeśli chcesz dokonać -zmian w tej relacji. - -$[siteurl] - -[Możesz np.: utworzyć oddzielny profil z informacjami, który nie będzie -dostępny dla wszystkich - i przypisać sprawdzanie uprawnień do '$[fn]']. - -Z poważaniem, - - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/pl/intro_complete_eml.tpl b/view/pl/intro_complete_eml.tpl deleted file mode 100644 index a50d0e2d1..000000000 --- a/view/pl/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Drogi $[username], - - '$[fn]' w '$[dfrn_url]' zaakceptował -twoje połączenie na '$[sitename]'. - - '$[fn]' zaakceptował Cię jako "fana", uniemożliwiając -pewne sposoby komunikacji - takie jak prywatne wiadomości czy niektóre formy -interakcji pomiędzy profilami. Jeśli jest to strona gwiazdy lub społeczności, ustawienia zostały -zastosowane automatycznie. - - '$[fn]' może rozszeżyć to w dwustronną komunikację lub więcej (doprecyzować) -relacje w przyszłości. - - Będziesz teraz otrzymywać aktualizacje statusu od '$[fn]', -który będzie pojawiać się na Twojej stronie "Sieć" - -$[siteurl] - -Z poważaniem, - - Administrator $[sitename] \ No newline at end of file diff --git a/view/pl/smarty3/friend_complete_eml.tpl b/view/pl/smarty3/friend_complete_eml.tpl deleted file mode 100644 index b6cf0a3b6..000000000 --- a/view/pl/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Drogi {{$username}}, - - Świetne wieści! '{{$fn}}' na '{{$dfrn_url}}' przyjął / przyjęła -Twoją prośbę o znajomość na '{{$sitename}}'. - -Jesteście teraz znajomymi i możecie wymieniać się zmianami statusów, zdjęciami i wiadomościami -bez ograniczeń. - -Zajrzyj na stronę 'Kontakty' na {{$sitename}} jeśli chcesz dokonać -zmian w tej relacji. - -{{$siteurl}} - -[Możesz np.: utworzyć oddzielny profil z informacjami, który nie będzie -dostępny dla wszystkich - i przypisać sprawdzanie uprawnień do '{{$fn}}']. - -Z poważaniem, - - {{$sitename}} Administrator - - \ No newline at end of file diff --git a/view/pl/smarty3/intro_complete_eml.tpl b/view/pl/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 8137f83e2..000000000 --- a/view/pl/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Drogi {{$username}}, - - '{{$fn}}' w '{{$dfrn_url}}' zaakceptował -twoje połączenie na '{{$sitename}}'. - - '{{$fn}}' zaakceptował Cię jako "fana", uniemożliwiając -pewne sposoby komunikacji - takie jak prywatne wiadomości czy niektóre formy -interakcji pomiędzy profilami. Jeśli jest to strona gwiazdy lub społeczności, ustawienia zostały -zastosowane automatycznie. - - '{{$fn}}' może rozszeżyć to w dwustronną komunikację lub więcej (doprecyzować) -relacje w przyszłości. - - Będziesz teraz otrzymywać aktualizacje statusu od '{{$fn}}', -który będzie pojawiać się na Twojej stronie "Sieć" - -{{$siteurl}} - -Z poważaniem, - - Administrator {{$sitename}} \ No newline at end of file diff --git a/view/pt-br/intro_complete_eml.tpl b/view/pt-br/intro_complete_eml.tpl deleted file mode 100644 index 13ccbc9d7..000000000 --- a/view/pt-br/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Prezado/a $[username], - - '$[fn]' em '$[dfrn_url]' aceitou -seu pedido de coneção em '$[sitename]'. - - '$[fn]' optou por aceitá-lo com "fan", que restringe -algumas formas de comunicação, tais como mensagens privadas e algumas interações -com o perfil. Se essa é uma página de celebridade ou de comunidade essas configurações foram -aplicadas automaticamente. - - '$[fn]' pode escolher estender isso para uma comunicação bidirecional ourelacionamento mais permissivo -no futuro. - - Você começará a receber atualizações públicas de '$[fn]' -que aparecerão na sua página 'Rede' - -$[siteurl] - -Cordialmente, - - Administrador do $[sitemname] \ No newline at end of file diff --git a/view/pt-br/smarty3/intro_complete_eml.tpl b/view/pt-br/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 30c5699b8..000000000 --- a/view/pt-br/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Prezado/a {{$username}}, - - '{{$fn}}' em '{{$dfrn_url}}' aceitou -seu pedido de coneção em '{{$sitename}}'. - - '{{$fn}}' optou por aceitá-lo com "fan", que restringe -algumas formas de comunicação, tais como mensagens privadas e algumas interações -com o perfil. Se essa é uma página de celebridade ou de comunidade essas configurações foram -aplicadas automaticamente. - - '{{$fn}}' pode escolher estender isso para uma comunicação bidirecional ourelacionamento mais permissivo -no futuro. - - Você começará a receber atualizações públicas de '{{$fn}}' -que aparecerão na sua página 'Rede' - -{{$siteurl}} - -Cordialmente, - - Administrador do {{$sitemname}} \ No newline at end of file diff --git a/view/ro/smarty3/friend_complete_eml.tpl b/view/ro/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 9c68c8d09..000000000 --- a/view/ro/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Dragă $[username], - - Veşti bune... '$[fn]' at '$[dfrn_url]' a acceptat -cererea dvs. de conectare la '$[sitename]'. - -Sunteți acum prieteni comuni și puteţi schimba actualizări de status, fotografii, și e-mail -fără restricţii. - -Vizitaţi pagina dvs. 'Contacte' la $[sitename] dacă doriţi să faceţi -orice schimbare către această relaţie. - -$[siteurl] - -[De exemplu, puteți crea un profil separat, cu informații care nu sunt -la dispoziția publicului larg - și atribuiți drepturi de vizualizare la "$ [Fn] ']​​. - -Cu stimă, - - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/ro/smarty3/intro_complete_eml.tpl b/view/ro/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 16569d274..000000000 --- a/view/ro/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Dragă $[username], - - '$[fn]' de la '$[dfrn_url]' a acceptat -cererea dvs. de conectare la '$[sitename]'. - - '$[fn]' a decis să accepte un "fan", care restricționează -câteva forme de comunicare - cum ar fi mesageria privată şi unele profile -interacțiuni. În cazul în care aceasta este o pagină celebritate sau comunitate, aceste setări au fost -aplicat automat. - - '$[fn]' poate alege să se extindă aceasta în două sau mai căi permisive -relaţie in viitor. - - Veți începe să primiți actualizări publice de status de la '$[fn]', -care va apare pe pagina dvs. 'Network' la - -$[siteurl] - -Cu stimă, - - $[sitename] Administrator \ No newline at end of file diff --git a/view/sv/friend_complete_eml.tpl b/view/sv/friend_complete_eml.tpl deleted file mode 100644 index 2b8b0238e..000000000 --- a/view/sv/friend_complete_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ -$username, - -Goda nyheter... '$fn' på '$dfrn_url' har accepterat din kontaktförfrågan på '$sitename'. - -Ni är nu ömsesidiga vänner och kan se varandras statusuppdateringar samt skicka foton och meddelanden -utan begränsningar. - -Gå in på din sida 'Kontakter' på $sitename om du vill göra några -ändringar när det gäller denna kontakt. - -$siteurl - -[Du kan exempelvis skapa en separat profil med information som inte -är tillgänglig för vem som helst, och ge visningsrättigheter till '$fn']. - -Hälsningar, -$sitename admin diff --git a/view/sv/intro_complete_eml.tpl b/view/sv/intro_complete_eml.tpl deleted file mode 100644 index 1f24af25f..000000000 --- a/view/sv/intro_complete_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ -$username, - -'$fn' på '$dfrn_url' har accepterat din kontaktförfrågan på '$sitename'. - -'$fn' har valt att acceptera dig som ett "fan" vilket innebär vissa begränsningar -i kommunikationen mellan er - som till exempel personliga meddelanden och viss interaktion -mellan profiler. Om detta är en kändis eller en gemenskap så har dessa inställningar gjorts -per automatik. - -'$fn' kan välja att utöka detta till vanlig tvåvägskommunikation eller någon annan mer -tillåtande kommunikationsform i framtiden. - -Du kommer hädanefter att få statusuppdateringar från '$fn', -vilka kommer att synas på din Nätverk-sida på - -$siteurl - -Hälsningar, -$sitename admin diff --git a/view/sv/smarty3/friend_complete_eml.tpl b/view/sv/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 7cabdf22d..000000000 --- a/view/sv/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -{{$username}}, - -Goda nyheter... '{{$fn}}' på '{{$dfrn_url}}' har accepterat din kontaktförfrågan på '{{$sitename}}'. - -Ni är nu ömsesidiga vänner och kan se varandras statusuppdateringar samt skicka foton och meddelanden -utan begränsningar. - -Gå in på din sida 'Kontakter' på {{$sitename}} om du vill göra några -ändringar när det gäller denna kontakt. - -{{$siteurl}} - -[Du kan exempelvis skapa en separat profil med information som inte -är tillgänglig för vem som helst, och ge visningsrättigheter till '{{$fn}}']. - -Hälsningar, -{{$sitename}} admin diff --git a/view/sv/smarty3/intro_complete_eml.tpl b/view/sv/smarty3/intro_complete_eml.tpl deleted file mode 100644 index 48d565a03..000000000 --- a/view/sv/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -{{$username}}, - -'{{$fn}}' på '{{$dfrn_url}}' har accepterat din kontaktförfrågan på '{{$sitename}}'. - -'{{$fn}}' har valt att acceptera dig som ett "fan" vilket innebär vissa begränsningar -i kommunikationen mellan er - som till exempel personliga meddelanden och viss interaktion -mellan profiler. Om detta är en kändis eller en gemenskap så har dessa inställningar gjorts -per automatik. - -'{{$fn}}' kan välja att utöka detta till vanlig tvåvägskommunikation eller någon annan mer -tillåtande kommunikationsform i framtiden. - -Du kommer hädanefter att få statusuppdateringar från '{{$fn}}', -vilka kommer att synas på din Nätverk-sida på - -{{$siteurl}} - -Hälsningar, -{{$sitename}} admin diff --git a/view/zh-cn/friend_complete_eml.tpl b/view/zh-cn/friend_complete_eml.tpl deleted file mode 100644 index a25896f09..000000000 --- a/view/zh-cn/friend_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -尊敬的$[username], - - 精彩新闻... 「$[fn]」在「$[dfrn_url]」接受了 -您的连通要求在「$[sitename]」。 - -您们现在是共同的朋友们，会兑换现状更新，照片和邮件 -无限 - -请看您的联络页在$[sitename]如果您想做 -什么变化关于这个关系。 - -$[siteurl] - -[例如，您会想造成区分的简介括无 -公开－和分配看权利给「$[fn]」 - -谨上, - - $[sitename]行政人员 - - \ No newline at end of file diff --git a/view/zh-cn/intro_complete_eml.tpl b/view/zh-cn/intro_complete_eml.tpl deleted file mode 100644 index 8d8d4f603..000000000 --- a/view/zh-cn/intro_complete_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -尊敬的$[username], - - 「$[fn]」在「$[dfrn_url]」接受了 -您的联络要求在「$[sitename]」 - - 「$[fn]」接受您为迷。这限制 -有的种类沟通，例如私人信息和简介 -操作。如果这是名人或社会页，这些设置是 -自动地应用。 - - 「$[fn]」会将来选择延长关系成双向的或更允许的 -关系。 - - 您会开始受到公开的现状更新从「$[fn]」， -它们出现在您的「网络」页在 - -$[siteurl] - -谨上， - - $[sitename]行政人员 \ No newline at end of file diff --git a/view/zh-cn/smarty3/friend_complete_eml.tpl b/view/zh-cn/smarty3/friend_complete_eml.tpl deleted file mode 100644 index 5e6e99bc9..000000000 --- a/view/zh-cn/smarty3/friend_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -尊敬的{{$username}}, - - 精彩新闻... 「{{$fn}}」在「{{$dfrn_url}}」接受了 -您的连通要求在「{{$sitename}}」。 - -您们现在是共同的朋友们，会兑换现状更新，照片和邮件 -无限 - -请看您的联络页在{{$sitename}}如果您想做 -什么变化关于这个关系。 - -{{$siteurl}} - -[例如，您会想造成区分的简介括无 -公开－和分配看权利给「{{$fn}}」 - -谨上, - - {{$sitename}}行政人员 - - \ No newline at end of file diff --git a/view/zh-cn/smarty3/intro_complete_eml.tpl b/view/zh-cn/smarty3/intro_complete_eml.tpl deleted file mode 100644 index db68d7d71..000000000 --- a/view/zh-cn/smarty3/intro_complete_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -尊敬的{{$username}}, - - 「{{$fn}}」在「{{$dfrn_url}}」接受了 -您的联络要求在「{{$sitename}}」 - - 「{{$fn}}」接受您为迷。这限制 -有的种类沟通，例如私人信息和简介 -操作。如果这是名人或社会页，这些设置是 -自动地应用。 - - 「{{$fn}}」会将来选择延长关系成双向的或更允许的 -关系。 - - 您会开始受到公开的现状更新从「{{$fn}}」， -它们出现在您的「网络」页在 - -{{$siteurl}} - -谨上， - - {{$sitename}}行政人员 \ No newline at end of file From 0e628f840f0d4c7a902919328358aed873c4f11a Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sat, 6 Sep 2014 18:15:18 +0200 Subject: [PATCH 04/26] send ostatus follow/share notifications via notification() remove unused templates --- include/enotify.php | 288 ++++++++++++++--------- include/items.php | 31 ++- view/ca/follow_notify_eml.tpl | 13 - view/ca/smarty3/follow_notify_eml.tpl | 14 -- view/cs/follow_notify_eml.tpl | 14 -- view/cs/smarty3/follow_notify_eml.tpl | 15 -- view/de/follow_notify_eml.tpl | 14 -- view/de/smarty3/follow_notify_eml.tpl | 15 -- view/en/follow_notify_eml.tpl | 14 -- view/en/smarty3/follow_notify_eml.tpl | 15 -- view/eo/follow_notify_eml.tpl | 14 -- view/eo/smarty3/follow_notify_eml.tpl | 15 -- view/es/follow_notify_eml.tpl | 13 - view/es/smarty3/follow_notify_eml.tpl | 14 -- view/fr/follow_notify_eml.tpl | 14 -- view/fr/smarty3/follow_notify_eml.tpl | 15 -- view/is/follow_notify_eml.tpl | 14 -- view/is/smarty3/follow_notify_eml.tpl | 15 -- view/it/smarty3/follow_notify_eml.tpl | 14 -- view/nb-no/follow_notify_eml.tpl | 14 -- view/nb-no/smarty3/follow_notify_eml.tpl | 15 -- view/nl/follow_notify_eml.tpl | 14 -- view/pl/follow_notify_eml.tpl | 14 -- view/pl/smarty3/follow_notify_eml.tpl | 15 -- view/ro/smarty3/follow_notify_eml.tpl | 14 -- view/sv/follow_notify_eml.tpl | 12 - view/sv/smarty3/follow_notify_eml.tpl | 13 - view/zh-cn/follow_notify_eml.tpl | 14 -- view/zh-cn/smarty3/follow_notify_eml.tpl | 15 -- 29 files changed, 192 insertions(+), 509 deletions(-) delete mode 100644 view/ca/follow_notify_eml.tpl delete mode 100644 view/ca/smarty3/follow_notify_eml.tpl delete mode 100644 view/cs/follow_notify_eml.tpl delete mode 100644 view/cs/smarty3/follow_notify_eml.tpl delete mode 100644 view/de/follow_notify_eml.tpl delete mode 100644 view/de/smarty3/follow_notify_eml.tpl delete mode 100644 view/en/follow_notify_eml.tpl delete mode 100644 view/en/smarty3/follow_notify_eml.tpl delete mode 100644 view/eo/follow_notify_eml.tpl delete mode 100644 view/eo/smarty3/follow_notify_eml.tpl delete mode 100644 view/es/follow_notify_eml.tpl delete mode 100644 view/es/smarty3/follow_notify_eml.tpl delete mode 100644 view/fr/follow_notify_eml.tpl delete mode 100644 view/fr/smarty3/follow_notify_eml.tpl delete mode 100644 view/is/follow_notify_eml.tpl delete mode 100644 view/is/smarty3/follow_notify_eml.tpl delete mode 100644 view/it/smarty3/follow_notify_eml.tpl delete mode 100644 view/nb-no/follow_notify_eml.tpl delete mode 100644 view/nb-no/smarty3/follow_notify_eml.tpl delete mode 100644 view/nl/follow_notify_eml.tpl delete mode 100644 view/pl/follow_notify_eml.tpl delete mode 100644 view/pl/smarty3/follow_notify_eml.tpl delete mode 100644 view/ro/smarty3/follow_notify_eml.tpl delete mode 100644 view/sv/follow_notify_eml.tpl delete mode 100644 view/sv/smarty3/follow_notify_eml.tpl delete mode 100644 view/zh-cn/follow_notify_eml.tpl delete mode 100644 view/zh-cn/smarty3/follow_notify_eml.tpl diff --git a/include/enotify.php b/include/enotify.php index 2dca5a609..742134449 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -15,6 +15,33 @@ function notification($params) { push_lang($params['language']); + $banner = t('Friendica Notification'); + $product = FRIENDICA_PLATFORM; + $siteurl = $a->get_baseurl(true); + $thanks = t('Thank You,'); + $sitename = $a->config['sitename']; + $site_admin = sprintf( t('%s Administrator'), $sitename); + + $sender_name = $product; + $hostname = $a->get_hostname(); + if(strpos($hostname,':')) + $hostname = substr($hostname,0,strpos($hostname,':')); + + $sender_email = t('noreply') . '@' . $hostname; + + // with $params['show_in_notification_page'] == false, the notification isn't inserted into + // the database, and an email is sent if applicable. + // default, if not specified: true + $show_in_notification_page = ((x($params,'show_in_notification_page')) ? $params['show_in_notification_page']:True); + + $additional_mail_header = ""; + $additional_mail_header .= "Precedence: list\n"; + $additional_mail_header .= "X-Friendica-Host: ".$hostname."\n"; + $additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n"; + $additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n"; + $additional_mail_header .= "List-ID: \n"; + $additional_mail_header .= "List-Archive: <".$a->get_baseurl()."/notifications/system>\n"; + if(array_key_exists('item',$params)) { $title = $params['item']['title']; @@ -204,6 +231,29 @@ function notification($params) { $tsitelink = sprintf( $sitelink, $siteurl ); $hsitelink = sprintf( $sitelink, '' . $sitename . ''); $itemlink = $params['link']; + + switch ($params['verb']) { + case ACTIVITY_FRIEND: + // someone started to share with user (mostly OStatus) + $subject = sprintf( t('[Friendica:Notify] A new person is sharing with you')); + $preamble = sprintf( t('%1$s is sharing with you at %2$s'), $params['source_name'], $sitename); + $epreamble = sprintf( t('%1$s is sharing with you at %2$s'), + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', + $sitename); + break; + case ACTIVITY_FOLLOW: + // someone started to follow the user (mostly OStatus) + $subject = sprintf( t('[Friendica:Notify] You have a new follower')); + $preamble = sprintf( t('You have a new follower at %2$s : %1$s'), $params['source_name'], $sitename); + $epreamble = sprintf( t('You have a new follower at %2$s : %1$s'), + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]', + $sitename); + break; + default: + break; + } + + } if($params['type'] == NOTIFY_SUGGEST) { @@ -225,40 +275,49 @@ function notification($params) { } if($params['type'] == NOTIFY_CONFIRM) { + if ($params['verb'] == ACTIVITY_FRIEND ){ // mutual connection + $subject = sprintf( t('[Friendica:Notify] Connection accepted')); + $preamble = sprintf( t('\'%1$s\' has acepted your connection request at %2$s'), $params['source_name'], $sitename); + $epreamble = sprintf( t('%2$s has accepted your [url=%1$s]connection request[/url].'), + $itemlink, + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $body = t('You are now mutual friends and may exchange status updates, photos, and email + without restriction.'); + + $sitelink = t('Please visit %s if you wish to make any changes to this relationship.'); + $tsitelink = sprintf( $sitelink, $siteurl ); + $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + } else { // ACTIVITY_FOLLOW + $subject = sprintf( t('[Friendica:Notify] Connection accepted')); + $preamble = sprintf( t('\'%1$s\' has acepted your connection request at %2$s'), $params['source_name'], $sitename); + $epreamble = sprintf( t('%2$s has accepted your [url=%1$s]connection request[/url].'), + $itemlink, + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $body = sprintf(t('\'%1$s\' has chosen to accept you a "fan", which restricts some forms of communication - such as private messaging and some profile interactions. If this is a celebrity or community page, these settings were applied automatically.'), $params['source_name']); + $body .= "\n\n"; + $body .= sprintf(t('\'%1$s\' may choose to extend this into a two-way or more permissive relationship in the future. '), $params['source_name']); + + $sitelink = t('Please visit %s if you wish to make any changes to this relationship.'); + $tsitelink = sprintf( $sitelink, $siteurl ); + $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + } + } if($params['type'] == NOTIFY_SYSTEM) { - + $subject = $params['subject']; + $preamble = $params['preamble']; + $epreamble = $params['epreamble']; + $body = $params['body']; + $sitelink = ""; + $tsitelink = ""; + $hsitelink = ""; + $itemlink = ""; } - /*$email = prepare_notificaion_mail($params, $subject, $preamble, $body, $sitelink, $tsitelink, $hsitelink, $itemlink); - if ($email) Emailer::send($email); - pop_lang();*/ - - - $banner = t('Friendica Notification'); - $product = FRIENDICA_PLATFORM; - $siteurl = $a->get_baseurl(true); - $thanks = t('Thank You,'); - $sitename = $a->config['sitename']; - $site_admin = sprintf( t('%s Administrator'), $sitename); - - $sender_name = $product; - $hostname = $a->get_hostname(); - if(strpos($hostname,':')) - $hostname = substr($hostname,0,strpos($hostname,':')); - - $sender_email = t('noreply') . '@' . $hostname; - - - $additional_mail_header = ""; - $additional_mail_header .= "Precedence: list\n"; - $additional_mail_header .= "X-Friendica-Host: ".$hostname."\n"; - $additional_mail_header .= "X-Friendica-Platform: ".FRIENDICA_PLATFORM."\n"; - $additional_mail_header .= "X-Friendica-Version: ".FRIENDICA_VERSION."\n"; - $additional_mail_header .= "List-ID: \n"; - $additional_mail_header .= "List-Archive: <".$a->get_baseurl()."/notifications/system>\n"; $h = array( 'params' => $params, @@ -284,103 +343,104 @@ function notification($params) { $itemlink = $h['itemlink']; + if ($show_in_notification_page) { - do { - $dups = false; - $hash = random_string(); - $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", - dbesc($hash)); - if(count($r)) - $dups = true; - } while($dups == true); + do { + $dups = false; + $hash = random_string(); + $r = q("SELECT `id` FROM `notify` WHERE `hash` = '%s' LIMIT 1", + dbesc($hash)); + if(count($r)) + $dups = true; + } while($dups == true); - $datarray = array(); - $datarray['hash'] = $hash; - $datarray['name'] = $params['source_name']; - $datarray['url'] = $params['source_link']; - $datarray['photo'] = $params['source_photo']; - $datarray['date'] = datetime_convert(); - $datarray['uid'] = $params['uid']; - $datarray['link'] = $itemlink; - $datarray['parent'] = $parent_id; - $datarray['type'] = $params['type']; - $datarray['verb'] = $params['verb']; - $datarray['otype'] = $params['otype']; - $datarray['abort'] = false; + $datarray = array(); + $datarray['hash'] = $hash; + $datarray['name'] = $params['source_name']; + $datarray['url'] = $params['source_link']; + $datarray['photo'] = $params['source_photo']; + $datarray['date'] = datetime_convert(); + $datarray['uid'] = $params['uid']; + $datarray['link'] = $itemlink; + $datarray['parent'] = $parent_id; + $datarray['type'] = $params['type']; + $datarray['verb'] = $params['verb']; + $datarray['otype'] = $params['otype']; + $datarray['abort'] = false; - call_hooks('enotify_store', $datarray); + call_hooks('enotify_store', $datarray); - if($datarray['abort']) { - pop_lang(); - return False; - } - - // create notification entry in DB - - $r = q("insert into notify (hash,name,url,photo,date,uid,link,parent,type,verb,otype) - values('%s','%s','%s','%s','%s',%d,'%s',%d,%d,'%s','%s')", - dbesc($datarray['hash']), - dbesc($datarray['name']), - dbesc($datarray['url']), - dbesc($datarray['photo']), - dbesc($datarray['date']), - intval($datarray['uid']), - dbesc($datarray['link']), - intval($datarray['parent']), - intval($datarray['type']), - dbesc($datarray['verb']), - dbesc($datarray['otype']) - ); - - $r = q("select id from notify where hash = '%s' and uid = %d limit 1", - dbesc($hash), - intval($params['uid']) - ); - if($r) - $notify_id = $r[0]['id']; - else { - pop_lang(); - return False; - } - - // we seem to have a lot of duplicate comment notifications due to race conditions, mostly from forums - // After we've stored everything, look again to see if there are any duplicates and if so remove them - - $p = null; - $p = q("select id from notify where ( type = %d or type = %d ) and link = '%s' and uid = %d order by id", - intval(NOTIFY_TAGSELF), - intval(NOTIFY_COMMENT), - dbesc($params['link']), - intval($params['uid']) - ); - if($p && (count($p) > 1)) { - for ($d = 1; $d < count($p); $d ++) { - q("delete from notify where id = %d", - intval($p[$d]['id']) - ); - } - - // only continue on if we stored the first one - - if($notify_id != $p[0]['id']) { + if($datarray['abort']) { pop_lang(); return False; } + + // create notification entry in DB + + $r = q("insert into notify (hash,name,url,photo,date,uid,link,parent,type,verb,otype) + values('%s','%s','%s','%s','%s',%d,'%s',%d,%d,'%s','%s')", + dbesc($datarray['hash']), + dbesc($datarray['name']), + dbesc($datarray['url']), + dbesc($datarray['photo']), + dbesc($datarray['date']), + intval($datarray['uid']), + dbesc($datarray['link']), + intval($datarray['parent']), + intval($datarray['type']), + dbesc($datarray['verb']), + dbesc($datarray['otype']) + ); + + $r = q("select id from notify where hash = '%s' and uid = %d limit 1", + dbesc($hash), + intval($params['uid']) + ); + if($r) + $notify_id = $r[0]['id']; + else { + pop_lang(); + return False; + } + + // we seem to have a lot of duplicate comment notifications due to race conditions, mostly from forums + // After we've stored everything, look again to see if there are any duplicates and if so remove them + + $p = null; + $p = q("select id from notify where ( type = %d or type = %d ) and link = '%s' and uid = %d order by id", + intval(NOTIFY_TAGSELF), + intval(NOTIFY_COMMENT), + dbesc($params['link']), + intval($params['uid']) + ); + if($p && (count($p) > 1)) { + for ($d = 1; $d < count($p); $d ++) { + q("delete from notify where id = %d", + intval($p[$d]['id']) + ); + } + + // only continue on if we stored the first one + + if($notify_id != $p[0]['id']) { + pop_lang(); + return False; + } + } + + + $itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id; + $msg = replace_macros($epreamble,array('$itemlink' => $itemlink)); + $r = q("update notify set msg = '%s' where id = %d and uid = %d", + dbesc($msg), + intval($notify_id), + intval($params['uid']) + ); + } - - $itemlink = $a->get_baseurl() . '/notify/view/' . $notify_id; - $msg = replace_macros($epreamble,array('$itemlink' => $itemlink)); - $r = q("update notify set msg = '%s' where id = %d and uid = %d", - dbesc($msg), - intval($notify_id), - intval($params['uid']) - ); - - // send email notification if notification preferences permit - if((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) { logger('notification: sending notification email'); diff --git a/include/items.php b/include/items.php index 0e156beb2..b1ee854ae 100644 --- a/include/items.php +++ b/include/items.php @@ -3828,6 +3828,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) { dbesc(datetime_convert()) ); } + $r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer['uid']) ); @@ -3841,20 +3842,24 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) { if(($r[0]['notify-flags'] & NOTIFY_INTRO) && (($r[0]['page-flags'] == PAGE_NORMAL) OR ($r[0]['page-flags'] == PAGE_SOAPBOX))) { - $email_tpl = get_intltext_template('follow_notify_eml.tpl'); - $email = replace_macros($email_tpl, array( - '$requestor' => ((strlen($name)) ? $name : t('[Name Withheld]')), - '$url' => $url, - '$myname' => $r[0]['username'], - '$siteurl' => $a->get_baseurl(), - '$sitename' => $a->config['sitename'] + + + + notification(array( + 'type' => NOTIFY_INTRO, + 'notify_flags' => $r[0]['notify-flags'], + 'language' => $r[0]['language'], + 'to_name' => $r[0]['username'], + 'to_email' => $r[0]['email'], + 'uid' => $r[0]['uid'], + 'link' => $a->get_baseurl() . '/notifications/intro', + 'source_name' => ((strlen(stripslashes($contact_record['name']))) ? stripslashes($contact_record['name']) : t('[Name Withheld]')), + 'source_link' => $contact_record['url'], + 'source_photo' => $contact_record['photo'], + 'verb' => ($sharing ? ACTIVITY_FRIEND : ACTIVITY_FOLLOW), + 'otype' => 'intro' )); - $res = mail($r[0]['email'], - email_header_encode((($sharing) ? t('A new person is sharing with you at ') : t("You have a new follower at ")) . $a->config['sitename'],'UTF-8'), - $email, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); + } } diff --git a/view/ca/follow_notify_eml.tpl b/view/ca/follow_notify_eml.tpl deleted file mode 100644 index ab5a4b371..000000000 --- a/view/ca/follow_notify_eml.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -Apreciat/da $myname, - -Tens un nou seguidor en $sitename - '$requestor'. - -Pots visitar el seu perfil en $url. - -Iniciï sessió en el seu lloc per a aprovar o rebutjar/cancelar la sol·licitud. - -$siteurl - - - $sitename diff --git a/view/ca/smarty3/follow_notify_eml.tpl b/view/ca/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 153f19562..000000000 --- a/view/ca/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - - -Apreciat/da {{$myname}}, - -Tens un nou seguidor en {{$sitename}} - '{{$requestor}}'. - -Pots visitar el seu perfil en {{$url}}. - -Iniciï sessió en el seu lloc per a aprovar o rebutjar/cancelar la sol·licitud. - -{{$siteurl}} - - - {{$sitename}} diff --git a/view/cs/follow_notify_eml.tpl b/view/cs/follow_notify_eml.tpl deleted file mode 100644 index 5581d2d6c..000000000 --- a/view/cs/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Drahý/Drahá $[myname], - -Máte nového následovatele na $[sitename] - '$[requestor]'. - -Můžete si zobrazit jeho profil na $[url]. - -Prosím, přihlaste se na Vašem webu pro odsouhlasení nebo ignorování/zrušení této žádosti - -$[siteurl] - -S pozdravem - - $[sitename] administrátor \ No newline at end of file diff --git a/view/cs/smarty3/follow_notify_eml.tpl b/view/cs/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 1b4d6a94d..000000000 --- a/view/cs/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Milý/Milá {{$username}}, - -Máte nového následovatele na {{$sitename}} - '{{$requestor}}'. - -Můžete si prohlédnout jeho/její profil na {{$url}}. - -Přihlaste se na váš server k odsouhlasení nebo ignorování/zrušení žádosti. - -{{$siteurl}} - -S pozdravem, - - {{$sitename}} administrátor diff --git a/view/de/follow_notify_eml.tpl b/view/de/follow_notify_eml.tpl deleted file mode 100644 index a866a08a2..000000000 --- a/view/de/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Hallo $[myname], - -Du hast einen neuen Anhänger auf $[sitename] - '$[requestor]'. - -Du kannst das Profil unter $[url] besuchen. - -Bitte melde dich an um die Anfrage zu bestätigen oder sie zu ignorieren bzw. abzulehnen. - -$[siteurl] - -beste Grüße, - - $[sitename] Administrator \ No newline at end of file diff --git a/view/de/smarty3/follow_notify_eml.tpl b/view/de/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 4da71eb19..000000000 --- a/view/de/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Hallo {{$myname}}, - -Du hast einen neuen Anhänger auf {{$sitename}} - '{{$requestor}}'. - -Du kannst das Profil unter {{$url}} besuchen. - -Bitte melde dich an um die Anfrage zu bestätigen oder sie zu ignorieren bzw. abzulehnen. - -{{$siteurl}} - -beste Grüße, - - {{$sitename}} Administrator \ No newline at end of file diff --git a/view/en/follow_notify_eml.tpl b/view/en/follow_notify_eml.tpl deleted file mode 100644 index 917024b84..000000000 --- a/view/en/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Dear $[myname], - -You have a new follower at $[sitename] - '$[requestor]'. - -You may visit their profile at $[url]. - -Please login to your site to approve or ignore/cancel the request. - -$[siteurl] - -Regards, - - $[sitename] administrator diff --git a/view/en/smarty3/follow_notify_eml.tpl b/view/en/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 00a2406e8..000000000 --- a/view/en/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Dear {{$myname}}, - -You have a new follower at {{$sitename}} - '{{$requestor}}'. - -You may visit their profile at {{$url}}. - -Please login to your site to approve or ignore/cancel the request. - -{{$siteurl}} - -Regards, - - {{$sitename}} administrator diff --git a/view/eo/follow_notify_eml.tpl b/view/eo/follow_notify_eml.tpl deleted file mode 100644 index e76453ac1..000000000 --- a/view/eo/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Kara $[myname], - -Vi havas novan abonanton ĉe $[sitename] - '$[requestor]'. - -Vi povas viziti ilian profilon ĉe $[url]. - -Bonvolu ensaluti en vian retejon por aprobi au malaprobi/nuligi la peton. - -$[siteurl] - -Salutoj, - - [$sitename] administranto \ No newline at end of file diff --git a/view/eo/smarty3/follow_notify_eml.tpl b/view/eo/smarty3/follow_notify_eml.tpl deleted file mode 100644 index a4e0976d5..000000000 --- a/view/eo/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Kara {{$myname}}, - -Vi havas novan abonanton ĉe {{$sitename}} - '{{$requestor}}'. - -Vi povas viziti ilian profilon ĉe {{$url}}. - -Bonvolu ensaluti en vian retejon por aprobi au malaprobi/nuligi la peton. - -{{$siteurl}} - -Salutoj, - - [{{$sitename}}] administranto \ No newline at end of file diff --git a/view/es/follow_notify_eml.tpl b/view/es/follow_notify_eml.tpl deleted file mode 100644 index 17bd2c01c..000000000 --- a/view/es/follow_notify_eml.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -Estimado/a $myname, - -Tienes un nuevo seguidor en $sitename - '$requestor'. - -Puedes visitar su perfil en $url. - -Inicie sesión en su sitio para aprobar o rechazar/cancelar la solicitud. - -$siteurl - - - $sitename diff --git a/view/es/smarty3/follow_notify_eml.tpl b/view/es/smarty3/follow_notify_eml.tpl deleted file mode 100644 index f0090a8b5..000000000 --- a/view/es/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - - -Estimado/a {{$myname}}, - -Tienes un nuevo seguidor en {{$sitename}} - '{{$requestor}}'. - -Puedes visitar su perfil en {{$url}}. - -Inicie sesión en su sitio para aprobar o rechazar/cancelar la solicitud. - -{{$siteurl}} - - - {{$sitename}} diff --git a/view/fr/follow_notify_eml.tpl b/view/fr/follow_notify_eml.tpl deleted file mode 100644 index 10d0b343b..000000000 --- a/view/fr/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Cher(e) $myname, - -Une nouvelle personne - $requestor - vous suit désormais sur $sitename. - -Vous pouvez consulter son profil sur $url. - -Merci de vous connecter à votre site pour approuver ou ignorer/annuler cette demande. - -$siteurl - -Cordialement, - - l'administrateur de $sitename diff --git a/view/fr/smarty3/follow_notify_eml.tpl b/view/fr/smarty3/follow_notify_eml.tpl deleted file mode 100644 index b96ef04fe..000000000 --- a/view/fr/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Cher(e) {{$myname}}, - -Une nouvelle personne - {{$requestor}} - vous suit désormais sur {{$sitename}}. - -Vous pouvez consulter son profil sur {{$url}}. - -Merci de vous connecter à votre site pour approuver ou ignorer/annuler cette demande. - -{{$siteurl}} - -Cordialement, - - l'administrateur de {{$sitename}} diff --git a/view/is/follow_notify_eml.tpl b/view/is/follow_notify_eml.tpl deleted file mode 100644 index d31e37bca..000000000 --- a/view/is/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Góðan daginn $[myname], - -Þú hefur nýjan aðdáanda frá $[sitename] - '$[requestor]'. - -Þú getur heimsótt þeirra heimasvæði á $[url]. - -Vinsamlegast innskráðu þig til að samþykkja eða hunsa/hætta við beiðni. - -$[siteurl] - -Bestu kveðjur, - - Kerfisstjóri $[sitename] \ No newline at end of file diff --git a/view/is/smarty3/follow_notify_eml.tpl b/view/is/smarty3/follow_notify_eml.tpl deleted file mode 100644 index fcc0cf875..000000000 --- a/view/is/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Góðan daginn {{$myname}}, - -Þú hefur nýjan aðdáanda frá {{$sitename}} - '{{$requestor}}'. - -Þú getur heimsótt þeirra heimasvæði á {{$url}}. - -Vinsamlegast innskráðu þig til að samþykkja eða hunsa/hætta við beiðni. - -{{$siteurl}} - -Bestu kveðjur, - - Kerfisstjóri {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/follow_notify_eml.tpl b/view/it/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 0bfc37552..000000000 --- a/view/it/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Ciao {{$myname}}, - -Un nuovo utente ha iniziato a seguirti su {{$sitename}} - '{{$requestor}}'. - -Puoi vedere il suo profilo su {{$url}}. - -Accedi sul tuo sito per approvare o ignorare la richiesta. - -{{$siteurl}} - -Saluti, - - L'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/nb-no/follow_notify_eml.tpl b/view/nb-no/follow_notify_eml.tpl deleted file mode 100644 index 73a347027..000000000 --- a/view/nb-no/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Kjære $[myname], - -Du har en ny følgesvenn på $[sitename] - '$[requestor]'. - -Du kan besøke profilen deres på $[url]. - -Vennligst logg inn på ditt sted for å godkjenne eller ignorere/avbryte forespørselen. - -$[siteurl] - -Med vennlig hilsen, - - $[sitename] administrator \ No newline at end of file diff --git a/view/nb-no/smarty3/follow_notify_eml.tpl b/view/nb-no/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 4811e053b..000000000 --- a/view/nb-no/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Kjære {{$myname}}, - -Du har en ny følgesvenn på {{$sitename}} - '{{$requestor}}'. - -Du kan besøke profilen deres på {{$url}}. - -Vennligst logg inn på ditt sted for å godkjenne eller ignorere/avbryte forespørselen. - -{{$siteurl}} - -Med vennlig hilsen, - - {{$sitename}} administrator \ No newline at end of file diff --git a/view/nl/follow_notify_eml.tpl b/view/nl/follow_notify_eml.tpl deleted file mode 100644 index 6e796521d..000000000 --- a/view/nl/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Beste $[myname] - -U heeft een nieuw contact op $[sitename] - '$[requestor]'. - -U kunt het profiel bezoeken op $[url] - -U moet op uw Friendica-site inloggen om het verzoek goed te keuren, te negeren of the annuleren. - -$[siteurl] - -Vriendelijke groet, - - Beheerder $[sitename] \ No newline at end of file diff --git a/view/pl/follow_notify_eml.tpl b/view/pl/follow_notify_eml.tpl deleted file mode 100644 index de3675419..000000000 --- a/view/pl/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Drogi $[myname], - -Masz nowego obserwującego na $[sitename] - '$[requestor]'. - -Możesz odwiedzić jego profil na $[url]. - -Zaloguj się na swoją stronę by potwierdzić lub zignorować/anulować prośbę. - -$[siteurl] - -Pozdrawiam, - - $[sitename] Administrator \ No newline at end of file diff --git a/view/pl/smarty3/follow_notify_eml.tpl b/view/pl/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 934255fd3..000000000 --- a/view/pl/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Drogi {{$myname}}, - -Masz nowego obserwującego na {{$sitename}} - '{{$requestor}}'. - -Możesz odwiedzić jego profil na {{$url}}. - -Zaloguj się na swoją stronę by potwierdzić lub zignorować/anulować prośbę. - -{{$siteurl}} - -Pozdrawiam, - - {{$sitename}} Administrator \ No newline at end of file diff --git a/view/ro/smarty3/follow_notify_eml.tpl b/view/ro/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 9755732b6..000000000 --- a/view/ro/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Dragă $[myname], - -Aveţi un nou urmăritoe la $[sitename] - '$[requestor]'. - -Puteţi vizita profilul lor la $[url]. - -Vă rugăm să vă logaţi pe site-ul dvs. pentru a aproba sau ignora / anula cererea. - -$[siteurl] - -Cu respect, - - $[sitename] administrator \ No newline at end of file diff --git a/view/sv/follow_notify_eml.tpl b/view/sv/follow_notify_eml.tpl deleted file mode 100644 index 41cd34831..000000000 --- a/view/sv/follow_notify_eml.tpl +++ /dev/null @@ -1,12 +0,0 @@ -$myname, - -'$requestor' på $sitename vill följa dina uppdateringar här på Friendica. - -Besök dennes profil på $url. - -Logga in för att godkänna eller avslå förfrågan. - -$siteurl - -Hälsningar, -$sitename admin diff --git a/view/sv/smarty3/follow_notify_eml.tpl b/view/sv/smarty3/follow_notify_eml.tpl deleted file mode 100644 index 356e0a8e1..000000000 --- a/view/sv/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -{{$myname}}, - -'{{$requestor}}' på {{$sitename}} vill följa dina uppdateringar här på Friendica. - -Besök dennes profil på {{$url}}. - -Logga in för att godkänna eller avslå förfrågan. - -{{$siteurl}} - -Hälsningar, -{{$sitename}} admin diff --git a/view/zh-cn/follow_notify_eml.tpl b/view/zh-cn/follow_notify_eml.tpl deleted file mode 100644 index 48f75f3db..000000000 --- a/view/zh-cn/follow_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -尊敬的$[myname], - -您有新关注的在$[sitename]－「$[requestor]」。 - -您能看他的简介在$[url]。 - -请再您的网页登记为确认或取消要求。 - -$[siteurl] - -谨上, - - $[sitename]行政人员 \ No newline at end of file diff --git a/view/zh-cn/smarty3/follow_notify_eml.tpl b/view/zh-cn/smarty3/follow_notify_eml.tpl deleted file mode 100644 index b0ee01833..000000000 --- a/view/zh-cn/smarty3/follow_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -尊敬的{{$myname}}, - -您有新关注的在{{$sitename}}－「{{$requestor}}」。 - -您能看他的简介在{{$url}}。 - -请再您的网页登记为确认或取消要求。 - -{{$siteurl}} - -谨上, - - {{$sitename}}行政人员 \ No newline at end of file From d85bdd8fb0253e7ee6c99901246eb934aed101c6 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 10:27:39 +0200 Subject: [PATCH 05/26] lost password verification mail via notification() --- include/enotify.php | 31 ++++++++++++---- mod/lostpass.php | 55 +++++++++++++++++++++-------- view/ca/lostpass_eml.tpl | 35 ------------------ view/ca/smarty3/lostpass_eml.tpl | 36 ------------------- view/cs/lostpass_eml.tpl | 23 ------------ view/cs/smarty3/lostpass_eml.tpl | 24 ------------- view/de/lostpass_eml.tpl | 32 ----------------- view/de/smarty3/lostpass_eml.tpl | 33 ----------------- view/en/lostpass_eml.tpl | 32 ----------------- view/en/smarty3/lostpass_eml.tpl | 33 ----------------- view/eo/lostpass_eml.tpl | 32 ----------------- view/eo/smarty3/lostpass_eml.tpl | 33 ----------------- view/es/lostpass_eml.tpl | 34 ------------------ view/es/smarty3/lostpass_eml.tpl | 35 ------------------ view/fr/lostpass_eml.tpl | 34 ------------------ view/fr/smarty3/lostpass_eml.tpl | 35 ------------------ view/is/lostpass_eml.tpl | 32 ----------------- view/is/smarty3/lostpass_eml.tpl | 33 ----------------- view/it/smarty3/lostpass_eml.tpl | 32 ----------------- view/nb-no/lostpass_eml.tpl | 32 ----------------- view/nb-no/smarty3/lostpass_eml.tpl | 33 ----------------- view/nl/lostpass_eml.tpl | 32 ----------------- view/pl/lostpass_eml.tpl | 32 ----------------- view/pl/smarty3/lostpass_eml.tpl | 33 ----------------- view/ro/smarty3/lostpass_eml.tpl | 32 ----------------- view/sv/lostpass_eml.tpl | 29 --------------- view/sv/smarty3/lostpass_eml.tpl | 30 ---------------- view/zh-cn/lostpass_eml.tpl | 32 ----------------- view/zh-cn/smarty3/lostpass_eml.tpl | 33 ----------------- 29 files changed, 65 insertions(+), 887 deletions(-) delete mode 100644 view/ca/lostpass_eml.tpl delete mode 100644 view/ca/smarty3/lostpass_eml.tpl delete mode 100644 view/cs/lostpass_eml.tpl delete mode 100644 view/cs/smarty3/lostpass_eml.tpl delete mode 100644 view/de/lostpass_eml.tpl delete mode 100644 view/de/smarty3/lostpass_eml.tpl delete mode 100644 view/en/lostpass_eml.tpl delete mode 100644 view/en/smarty3/lostpass_eml.tpl delete mode 100644 view/eo/lostpass_eml.tpl delete mode 100644 view/eo/smarty3/lostpass_eml.tpl delete mode 100644 view/es/lostpass_eml.tpl delete mode 100644 view/es/smarty3/lostpass_eml.tpl delete mode 100644 view/fr/lostpass_eml.tpl delete mode 100644 view/fr/smarty3/lostpass_eml.tpl delete mode 100644 view/is/lostpass_eml.tpl delete mode 100644 view/is/smarty3/lostpass_eml.tpl delete mode 100644 view/it/smarty3/lostpass_eml.tpl delete mode 100644 view/nb-no/lostpass_eml.tpl delete mode 100644 view/nb-no/smarty3/lostpass_eml.tpl delete mode 100644 view/nl/lostpass_eml.tpl delete mode 100644 view/pl/lostpass_eml.tpl delete mode 100644 view/pl/smarty3/lostpass_eml.tpl delete mode 100644 view/ro/smarty3/lostpass_eml.tpl delete mode 100644 view/sv/lostpass_eml.tpl delete mode 100644 view/sv/smarty3/lostpass_eml.tpl delete mode 100644 view/zh-cn/lostpass_eml.tpl delete mode 100644 view/zh-cn/smarty3/lostpass_eml.tpl diff --git a/include/enotify.php b/include/enotify.php index 742134449..631cb8aed 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -250,6 +250,7 @@ function notification($params) { $sitename); break; default: + // ACTIVITY_REQ_FRIEND is default activity for notifications break; } @@ -307,14 +308,28 @@ function notification($params) { } if($params['type'] == NOTIFY_SYSTEM) { + //I have yet to find what system notificatons are... + } + + if ($params['type'] == "SYSTEM_EMAIL"){ + // not part of the notifications. + // it just send a mail to the user. + // It will be used by the system to send emails to users (like + // password reset, invitations and so) using one look (but without + // add a notification to the user, with could be inexistent) $subject = $params['subject']; $preamble = $params['preamble']; - $epreamble = $params['epreamble']; + if (x($params,'epreamble')){ + $epreamble = $params['epreamble']; + } else { + $epreamble = str_replace("\n","
\n",$preamble); + } $body = $params['body']; $sitelink = ""; $tsitelink = ""; $hsitelink = ""; $itemlink = ""; + $show_in_notification_page = false; } @@ -343,8 +358,8 @@ function notification($params) { $itemlink = $h['itemlink']; - if ($show_in_notification_page) { + if ($show_in_notification_page) { do { $dups = false; $hash = random_string(); @@ -441,9 +456,11 @@ function notification($params) { } // send email notification if notification preferences permit - if((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) { + if((intval($params['notify_flags']) & intval($params['type'])) + || $params['type'] == NOTIFY_SYSTEM + || $params['type'] == "SYSTEM_EMAIL") { - logger('notification: sending notification email'); + logger('sending notification email'); if (isset($params['parent']) AND (intval($params['parent']) != 0)) { $id_for_parent = $params['parent']."@".$hostname; @@ -477,11 +494,13 @@ function notification($params) { } - $textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n", - $body))),ENT_QUOTES,'UTF-8')); + // textversion keeps linebreaks + $textversion = strip_tags(str_replace("
","\n",html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n", + $body))),ENT_QUOTES,'UTF-8'))); $htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), "
\n",$body))),ENT_QUOTES,'UTF-8'); + $datarray = array(); $datarray['banner'] = $banner; $datarray['product'] = $product; diff --git a/mod/lostpass.php b/mod/lostpass.php index 1751c2a7e..290ebb1b4 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -1,6 +1,7 @@ $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $username, - '$email' => $email, - '$reset_link' => $a->get_baseurl() . '/lostpass?verify=' . $new_password - )); - $res = mail($email, email_header_encode(sprintf( t('Password reset requested at %s'),$a->config['sitename']),'UTF-8'), - $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); + $sitename = $a->config['sitename']; + $siteurl = $a->get_baseurl(); + $resetlink = $a->get_baseurl() . '/lostpass?verify=' . $new_password; + + $preamble = t('Dear %1$s, + A request was recently received at "%2$s" to reset your account +password. In order to confirm this request, please select the verification link +below or paste it into your web browser address bar. + +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. + +Your password will not be changed unless we can verify that you +issued this request.'); + $body = t('Follow this link to verify your identity: + +%1$s + +You will then receive a follow-up message containing the new password. + +You may change that password from your account settings page after logging in. + +The login details are as follows: + +Site Location: %2$s +Login Name: %3$s'); + + $preamble = sprintf($preamble, $username, $sitename); + $body = sprintf($body, $resetlink, $siteurl, $email); + + notification(array( + 'type' => "SYSTEM_EMAIL", + 'to_email' => $email, + 'subject'=> sprintf( t('Password reset requested at %s'),$sitename), + 'preamble'=> $preamble, + 'body' => $body)); goaway(z_root()); + } @@ -113,7 +138,7 @@ function lostpass_content(&$a) { return $o; } - + } else { $tpl = get_markup_template('lostpass.tpl'); @@ -122,7 +147,7 @@ function lostpass_content(&$a) { '$title' => t('Forgot your Password?'), '$desc' => t('Enter your email address and submit to have your password reset. Then check your email for further instructions.'), '$name' => t('Nickname or Email: '), - '$submit' => t('Reset') + '$submit' => t('Reset') )); return $o; diff --git a/view/ca/lostpass_eml.tpl b/view/ca/lostpass_eml.tpl deleted file mode 100644 index eccf2050a..000000000 --- a/view/ca/lostpass_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - -Apreciat/da $username, - - S'ha rebut una sol·licitud en $sitename recentment per restablir -la teva contrasenya. Per confirmar aquesta sol·licitud, per favor seleccioni l'enllaç de -verificació sota o copia-ho i pega-ho en la barra d'adreces del teu navegador. - -Si NO has sol·licitat aquest canvi, per favor NO segueixis l'enllaç indicat i ignora -i/o elimina aquest missatge. - -La teva contrasenya no es canviarà tret que puguem verificar que ets la teva qui -va emetre aquesta sol·licitud. - -Segueix aquest enllaç per verificar la teva identitat: - -$reset_link - -A continuació rebràs un missatge amb la nova contrasenya. - -Després de accedir, podràs canviar la contrasenya del teu compte a la pàgina de -configuració. - -Les dades d'accés són els següents: - - -Lloc: $siteurl -Nom: $email - - - - -Salutacions, - L'administració de $sitename - - diff --git a/view/ca/smarty3/lostpass_eml.tpl b/view/ca/smarty3/lostpass_eml.tpl deleted file mode 100644 index da0aff10e..000000000 --- a/view/ca/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,36 +0,0 @@ - - -Apreciat/da {{$username}}, - - S'ha rebut una sol·licitud en {{$sitename}} recentment per restablir -la teva contrasenya. Per confirmar aquesta sol·licitud, per favor seleccioni l'enllaç de -verificació sota o copia-ho i pega-ho en la barra d'adreces del teu navegador. - -Si NO has sol·licitat aquest canvi, per favor NO segueixis l'enllaç indicat i ignora -i/o elimina aquest missatge. - -La teva contrasenya no es canviarà tret que puguem verificar que ets la teva qui -va emetre aquesta sol·licitud. - -Segueix aquest enllaç per verificar la teva identitat: - -{{$reset_link}} - -A continuació rebràs un missatge amb la nova contrasenya. - -Després de accedir, podràs canviar la contrasenya del teu compte a la pàgina de -configuració. - -Les dades d'accés són els següents: - - -Lloc: {{$siteurl}} -Nom: {{$email}} - - - - -Salutacions, - L'administració de {{$sitename}} - - diff --git a/view/cs/lostpass_eml.tpl b/view/cs/lostpass_eml.tpl deleted file mode 100644 index 05042ddce..000000000 --- a/view/cs/lostpass_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - -Milý/Milá $username, - Na webu $sitename byl zaregistrován požadavek na znovunastavení hesla k Vašemu účtu. Pro potvrzení této žádosti prosím klikněte na potvrzovací odkaz níže, nebo si tento odkaz zkopírujte do adresního řádku prohlížeče. -Pokud jste o znovunastavení hesla NEŽÁDALI, prosím NEKLIKEJTE na tento odkaz a ignorujte tento e-mail nebo ho rovnou smažte. - -Vaše heslo nebude změněno, dokud nebudeme mít potvrzení, že jste o tento požadavek zažádali právě Vy. - -Klikněte na tento odkaz pro prověření Vaší identity: - -$reset_link - -Poté obdržíte další zprávu obsahující nové heslo. - -Následně si toto heslo můžete změnit z vašeho účtu na stránce Nastavení. - -Přihlašovací údaje jsou tato: - -Adresa webu: $siteurl -Přihlašovací jméno: $email - -S pozdravem, - - $sitename administrátor diff --git a/view/cs/smarty3/lostpass_eml.tpl b/view/cs/smarty3/lostpass_eml.tpl deleted file mode 100644 index 96ce6cc72..000000000 --- a/view/cs/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,24 +0,0 @@ - - -Milý/Milá {{$username}}, - Na webu {{$sitename}} byl zaregistrován požadavek na znovunastavení hesla k Vašemu účtu. Pro potvrzení této žádosti prosím klikněte na potvrzovací odkaz níže, nebo si tento odkaz zkopírujte do adresního řádku prohlížeče. -Pokud jste o znovunastavení hesla NEŽÁDALI, prosím NEKLIKEJTE na tento odkaz a ignorujte tento e-mail nebo ho rovnou smažte. - -Vaše heslo nebude změněno, dokud nebudeme mít potvrzení, že jste o tento požadavek zažádali právě Vy. - -Klikněte na tento odkaz pro prověření Vaší identity: - -{{$reset_link}} - -Poté obdržíte další zprávu obsahující nové heslo. - -Následně si toto heslo můžete změnit z vašeho účtu na stránce Nastavení. - -Přihlašovací údaje jsou tato: - -Adresa webu: {{$siteurl}} -Přihlašovací jméno: {{$email}} - -S pozdravem, - - {{$sitename}} administrátor diff --git a/view/de/lostpass_eml.tpl b/view/de/lostpass_eml.tpl deleted file mode 100644 index af91a0d46..000000000 --- a/view/de/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Hallo $[username], - Auf $[sitename] wurde eine Anfrage zum Zurücksetzen deines -Passworts empfangen. Um diese zu bestätigen folge bitte dem Link -weiter unten oder kopiere ihn in die Adressleiste deines Browsers. - -Wenn du die Anfrage NICHT gesendet haben solltest, dann IGNORIERE -bitte diese E-Mail und den Link. - -Dein Passwort wird nicht geändert solange wir nicht überprüfen -konnten, dass du die Anfrage gestellt hast. - -Folge diesem Link um deine Identität zu verifizieren: - -$[reset_link] - -Du wirst eine weitere E-Mail erhalten mit dem neuen Passwort. - -Das Passwort kannst du anschließend wie gewohnt in deinen Account Einstellungen ändern. - -Die Login-Details sind die folgenden: - -Adresse der Seite:»$[siteurl] -Login Name:»$[email] - - - - -Grüße, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/de/smarty3/lostpass_eml.tpl b/view/de/smarty3/lostpass_eml.tpl deleted file mode 100644 index 709f8f772..000000000 --- a/view/de/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,33 +0,0 @@ - - -Hallo {{$username}}, - Auf {{$sitename}} wurde eine Anfrage zum Zurücksetzen deines -Passworts empfangen. Um diese zu bestätigen folge bitte dem Link -weiter unten oder kopiere ihn in die Adressleiste deines Browsers. - -Wenn du die Anfrage NICHT gesendet haben solltest, dann IGNORIERE -bitte diese Mail und den Link. - -Dein Passwort wird nicht geändert werden solange wir nicht überprüfen -konnten, dass du die Anfrage gestellt hast. - -Folge diesem Link um deine Identität zu verifizieren: - -{{$reset_link}} - -Du wirst eine weitere Email erhalten mit dem neuen Passwort. - -Das Passwort kannst du anschließend wie gewohnt in deinen Account Einstellungen ändern. - -Die Login-Details sind die folgenden: - -Adresse der Seite: {{$siteurl}} -Login Name: {{$email}} - - - - -Grüße, - {{$sitename}} Administrator - - \ No newline at end of file diff --git a/view/en/lostpass_eml.tpl b/view/en/lostpass_eml.tpl deleted file mode 100644 index 1330caa12..000000000 --- a/view/en/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Dear $[username], - A request was recently received at $[sitename] to reset your account -password. In order to confirm this request, please select the verification link -below or paste it into your web browser address bar. - -If you did NOT request this change, please DO NOT follow the link -provided and ignore and/or delete this email. - -Your password will not be changed unless we can verify that you -issued this request. - -Follow this link to verify your identity: - -$[reset_link] - -You will then receive a follow-up message containing the new password. - -You may change that password from your account settings page after logging in. - -The login details are as follows: - -Site Location: $[siteurl] -Login Name: $[email] - - - - -Sincerely, - $[sitename] Administrator - - diff --git a/view/en/smarty3/lostpass_eml.tpl b/view/en/smarty3/lostpass_eml.tpl deleted file mode 100644 index 775583ac8..000000000 --- a/view/en/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,33 +0,0 @@ - - -Dear {{$username}}, - A request was recently received at {{$sitename}} to reset your account -password. In order to confirm this request, please select the verification link -below or paste it into your web browser address bar. - -If you did NOT request this change, please DO NOT follow the link -provided and ignore and/or delete this email. - -Your password will not be changed unless we can verify that you -issued this request. - -Follow this link to verify your identity: - -{{$reset_link}} - -You will then receive a follow-up message containing the new password. - -You may change that password from your account settings page after logging in. - -The login details are as follows: - -Site Location: {{$siteurl}} -Login Name: {{$email}} - - - - -Sincerely, - {{$sitename}} Administrator - - diff --git a/view/eo/lostpass_eml.tpl b/view/eo/lostpass_eml.tpl deleted file mode 100644 index 26d1a3c23..000000000 --- a/view/eo/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Kara $[username], - $[sitename] ricevis peton por rekomencigi vian pasvorton. -Por konfirmi la peton, bonvolu klaki la sekvantan konfirmligilon -aŭ alglui ĝin en la adreskampo de via retumilo. - -Se vi NE petis tiun ŝanĝon, bonvolu NE KLAKU la -sekvantan ligilon kaj ignoru aŭ forvisu ĉi-mesaĝon. - -Ni ne ŝanĝu vian pasvorton se ni ne povas kontroli ĉu estas vi -kiu petis la ŝanĝon. - -Sekvu ĉi tion ligilon por konfirmi vian identecon: - -$[reset_link] - -Poste, vi ricevos mesaĝon enhavonte la novan pasvorton. - -Vi eblas ŝangi la pasvorton ĉe viaj kontdoagordoj paĝo post ensaluti. - -La akreditaĵoj estas: - -Retejo:»$[siteurl] -Salutnomo:»$[email] - - - - -Salutoj, - $[sitename] administranto - - \ No newline at end of file diff --git a/view/eo/smarty3/lostpass_eml.tpl b/view/eo/smarty3/lostpass_eml.tpl deleted file mode 100644 index fe36cad03..000000000 --- a/view/eo/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,33 +0,0 @@ - - -Kara {{$username}}, - {{$sitename}} ricevis peton por rekomencigi vian pasvorton. -Por konfirmi la peton, bonvolu klaki la sekvantan konfirmligilon -aŭ alglui ĝin en la adreskampo de via retumilo. - -Se vi NE petis tiun ŝanĝon, bonvolu NE KLAKU la -sekvantan ligilon kaj ignoru aŭ forvisu ĉi-mesaĝon. - -Ni ne ŝanĝu vian pasvorton se ni ne povas kontroli ĉu estas vi -kiu petis la ŝanĝon. - -Sekvu ĉi tion ligilon por konfirmi vian identecon: - -{{$reset_link}} - -Poste, vi ricevos mesaĝon enhavonte la novan pasvorton. - -Vi eblas ŝangi la pasvorton ĉe viaj kontdoagordoj paĝo post ensaluti. - -La akreditaĵoj estas: - -Retejo:»{{$siteurl}} -Salutnomo:»{{$email}} - - - - -Salutoj, - {{$sitename}} administranto - - \ No newline at end of file diff --git a/view/es/lostpass_eml.tpl b/view/es/lostpass_eml.tpl deleted file mode 100644 index 607744bfe..000000000 --- a/view/es/lostpass_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Estimado/a $username, - - Se ha recibido una solicitud en $sitename recientemente para restablecer -tu contraseña. Para confirmar esta solicitud, por favor seleccione el enlace de -verificación debajo o cópialo y pégalo en la barra de direcciones de tu navegador. - -Se NO has solicitado este cambio, por favor NO sigas el enlace indicado e ignora -y/o elimina este mensaje. - -Tu contraseña no se cambiará a menos que podamos verificar que eres tu quien -emitió esta solicitud. - -Sigue este enlace para verificar tu identidad: - -$reset_link - -A continuación recibirás un mensaje con la nueva contraseña. - -Despues de accceder, podrás cambiar la contraseña de tu cuenta en la página de -configuración. - -Los datos de acceso son los siguientes: - -Sitio: $siteurl -Nombre: $email - - - - -Saludos, - La administración de $sitename - - diff --git a/view/es/smarty3/lostpass_eml.tpl b/view/es/smarty3/lostpass_eml.tpl deleted file mode 100644 index 61c35c68d..000000000 --- a/view/es/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -Estimado/a {{$username}}, - - Se ha recibido una solicitud en {{$sitename}} recientemente para restablecer -tu contraseña. Para confirmar esta solicitud, por favor seleccione el enlace de -verificación debajo o cópialo y pégalo en la barra de direcciones de tu navegador. - -Se NO has solicitado este cambio, por favor NO sigas el enlace indicado e ignora -y/o elimina este mensaje. - -Tu contraseña no se cambiará a menos que podamos verificar que eres tu quien -emitió esta solicitud. - -Sigue este enlace para verificar tu identidad: - -{{$reset_link}} - -A continuación recibirás un mensaje con la nueva contraseña. - -Despues de accceder, podrás cambiar la contraseña de tu cuenta en la página de -configuración. - -Los datos de acceso son los siguientes: - -Sitio: {{$siteurl}} -Nombre: {{$email}} - - - - -Saludos, - La administración de {{$sitename}} - - diff --git a/view/fr/lostpass_eml.tpl b/view/fr/lostpass_eml.tpl deleted file mode 100644 index 96c11d723..000000000 --- a/view/fr/lostpass_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Cher(e) $username, - - Nous avons récemment reçu, chez $sitename, une demande de remise -à zéro du mot de passe protégeant votre compte. Pour confirmer cette -demande, merci de cliquer sur le lien de vérification suivant, ou de le -coller dans la barre d'adresse de votre navigateur web. - -Si vous n'êtes PAS à l'origine de cette demande, merci de NE PAS suivre -le lien en question, et d'ignorer/supprimer ce courriel. - -Votre mot de passe ne sera réinitialisé qu'une fois que nous aurons pu -nous assurer que vous êtes bien à l'origine de cette demande. - -Merci de suivre le lien suivant pour confirmer votre identité : - -$reset_link - -Vous recevrez en retour un message avec votre nouveau mot de passe. - -Vous pourrez ensuite changer ce mot de passe, après connexion, dans la -page des réglages du compte. - -Les informations du compte concerné sont : - -Site : $siteurl -Pseudo/Courriel : $email - - - -Sincèrement votre, - l'administrateur de $sitename - - diff --git a/view/fr/smarty3/lostpass_eml.tpl b/view/fr/smarty3/lostpass_eml.tpl deleted file mode 100644 index 301c45fe6..000000000 --- a/view/fr/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -Cher(e) {{$username}}, - - Nous avons récemment reçu, chez {{$sitename}}, une demande de remise -à zéro du mot de passe protégeant votre compte. Pour confirmer cette -demande, merci de cliquer sur le lien de vérification suivant, ou de le -coller dans la barre d'adresse de votre navigateur web. - -Si vous n'êtes PAS à l'origine de cette demande, merci de NE PAS suivre -le lien en question, et d'ignorer/supprimer ce courriel. - -Votre mot de passe ne sera réinitialisé qu'une fois que nous aurons pu -nous assurer que vous êtes bien à l'origine de cette demande. - -Merci de suivre le lien suivant pour confirmer votre identité : - -{{$reset_link}} - -Vous recevrez en retour un message avec votre nouveau mot de passe. - -Vous pourrez ensuite changer ce mot de passe, après connexion, dans la -page des réglages du compte. - -Les informations du compte concerné sont : - -Site : {{$siteurl}} -Pseudo/Courriel : {{$email}} - - - -Sincèrement votre, - l'administrateur de {{$sitename}} - - diff --git a/view/is/lostpass_eml.tpl b/view/is/lostpass_eml.tpl deleted file mode 100644 index 053612adb..000000000 --- a/view/is/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Góðan dag $[username], - Beiðni barst á $[sitename] um að endursetja -aðgangsorðið. Til að staðfesta þessa beiði, veldu slóðina -hér fyrir neðan og settu í slóðastiku vafra. - -Ef þú samþykkir ekki þessa breytingu, EKKI fara á slóðina -sem upp er gefinn heldur hunsaðu og/eða eyddu þessum tölvupósti. - -Aðgangsorðið verður ekki breytt nama við getum staðfest að þú -baðst um þessa breytingu. - -Farðu á slóðina til að staðfesta: - -$[reset_link] - -Þú munnt fá annan tölvupóst með nýja aðgangsorðinu. - -Þú getur síðan breytt því aðgangsorði í stillingar síðunni eftir að þú innskráir þig. - -Innskráningar upplýsingarnar eru eftirfarandi: - -Vefþjónn: $[siteurl] -Notendanafn: $[email] - - - - -Bestu kveðjur, - Kerfisstjóri $[sitename] - - \ No newline at end of file diff --git a/view/is/smarty3/lostpass_eml.tpl b/view/is/smarty3/lostpass_eml.tpl deleted file mode 100644 index 2ff6812ae..000000000 --- a/view/is/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,33 +0,0 @@ - - -Góðan dag {{$username}}, - Beiðni barst á {{$sitename}} um að endursetja -aðgangsorðið. Til að staðfesta þessa beiði, veldu slóðina -hér fyrir neðan og settu í slóðastiku vafra. - -Ef þú samþykkir ekki þessa breytingu, EKKI fara á slóðina -sem upp er gefinn heldur hunsaðu og/eða eyddu þessum tölvupósti. - -Aðgangsorðið verður ekki breytt nama við getum staðfest að þú -baðst um þessa breytingu. - -Farðu á slóðina til að staðfesta: - -{{$reset_link}} - -Þú munnt fá annan tölvupóst með nýja aðgangsorðinu. - -Þú getur síðan breytt því aðgangsorði í stillingar síðunni eftir að þú innskráir þig. - -Innskráningar upplýsingarnar eru eftirfarandi: - -Vefþjónn: {{$siteurl}} -Notendanafn: {{$email}} - - - - -Bestu kveðjur, - Kerfisstjóri {{$sitename}} - - \ No newline at end of file diff --git a/view/it/smarty3/lostpass_eml.tpl b/view/it/smarty3/lostpass_eml.tpl deleted file mode 100644 index 3601f18a7..000000000 --- a/view/it/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Ciao {{$username}}, - Su {{$sitename}} è stata ricevuta una richiesta di azzeramento della password del tuo account. -Per confermare la richiesta, clicca sul link di verifica -qui in fondo oppure copialo nella barra degli indirizzi del tuo browser. - -Se NON hai richiesto l'azzeramento, NON seguire il link -e ignora e/o cancella questa email. - -La tua password non sarà modificata finché non avremo verificato che -hai fatto questa richiesta. - -Per verificare la tua identità clicca su: - -{{$reset_link}} - -Dopo la verifica riceverai un messaggio di risposta con la nuova password. - -Potrai cambiare la password dalla pagina delle impostazioni dopo aver effettuato l'accesso. - -I dati di accesso sono i seguenti: - -Sito:»{{$siteurl}} -Nome utente:»{{$email}} - - - - -Saluti, - l'amministratore di {{$sitename}} - - \ No newline at end of file diff --git a/view/nb-no/lostpass_eml.tpl b/view/nb-no/lostpass_eml.tpl deleted file mode 100644 index 762c8c2e9..000000000 --- a/view/nb-no/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Kjære $[username], - En forespørsel ble nylig mottatt hos $[sitename] om å tilbakestille din kontos -passord. For å godkjenne denne forespørselen, vennligst velg bekreftelseslenken -nedenfor eller lim den inn på adresselinjen i nettleseren din. - -Hvis du IKKE har spurt om denne endringen, vennligst IKKE følg lenken -som er oppgitt og ignorer og/eller slett denne e-posten. - -Passordet ditt vil ikke bli endret med mindre vi kan forsikre oss om at du -sendte denne forespørselen. - -Følg denne lenken for å bekrefte din identitet: - -$[reset_link] - -Du vil da motta en oppfølgings melding med det nye passordet. - -Du kan endre passordet på siden for dine kontoinnstillinger etter innlogging. - -Innloggingsdetaljene er som følger: - -Nettstedsadresse:»$[siteurl] -Brukernavn:»$[email] - - - - -Beste hilsen, - $[sitename] administrator - - \ No newline at end of file diff --git a/view/nb-no/smarty3/lostpass_eml.tpl b/view/nb-no/smarty3/lostpass_eml.tpl deleted file mode 100644 index b84b0f1d2..000000000 --- a/view/nb-no/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,33 +0,0 @@ - - -Kjære {{$username}}, - En forespørsel ble nylig mottatt hos {{$sitename}} om å tilbakestille din kontos -passord. For å godkjenne denne forespørselen, vennligst velg bekreftelseslenken -nedenfor eller lim den inn på adresselinjen i nettleseren din. - -Hvis du IKKE har spurt om denne endringen, vennligst IKKE følg lenken -som er oppgitt og ignorer og/eller slett denne e-posten. - -Passordet ditt vil ikke bli endret med mindre vi kan forsikre oss om at du -sendte denne forespørselen. - -Følg denne lenken for å bekrefte din identitet: - -{{$reset_link}} - -Du vil da motta en oppfølgings melding med det nye passordet. - -Du kan endre passordet på siden for dine kontoinnstillinger etter innlogging. - -Innloggingsdetaljene er som følger: - -Nettstedsadresse:»{{$siteurl}} -Brukernavn:»{{$email}} - - - - -Beste hilsen, - {{$sitename}} administrator - - \ No newline at end of file diff --git a/view/nl/lostpass_eml.tpl b/view/nl/lostpass_eml.tpl deleted file mode 100644 index dd62b4da1..000000000 --- a/view/nl/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Beste $[username], - Een verzoek werd onlangs ontvangen van $[sitename] om uw account te herstellen -wachtwoord. Om dit te bevestigen, selecteert u de verificatie-link -hieronder of plak deze in je web browser adresbalk. - -Als je GEEN wachtwoord hebt aangevraagd gebruik deze link dan NIET -verstrekt en te negeren en / of verwijderen van deze e-mail. - -Uw wachtwoord wordt niet gewijzigd, tenzij we kunnen controleren of u -dit heeft aangevraagd - -Volg deze link om uw identiteit te verifiëren: - -$[reset_link] - -U ontvangt dan een follow-up bericht met het nieuwe wachtwoord. - -U kunt u wachtwoord wijzigen in gebruikers instellingen na het inloggen - -De login-gegevens zijn als volgt: - -site locatie:»$[siteurl] -Gebruikers naam:»$[email] - - - - -Met vriendelijke groet, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/pl/lostpass_eml.tpl b/view/pl/lostpass_eml.tpl deleted file mode 100644 index 9663bf86c..000000000 --- a/view/pl/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -$[username], - Ze strony $[sitename] wpłynęła prośba z zresetowanie -hasła. W celu potwierdzenia kliknij w weryfikacyjny link -zamieszczony poniżej, lub wklej go do pasku adresu twojej przeglądarki. - -Jeśli uważasz, że wiadomość nie jest przeznaczona dla ciebie, nie klikaj w linka! -Zignoruj tego emaila i usuń. - -Twoje hasło nie może zostać zmienione zanim nie potwierdzimy -twojego żądania. - -Aby potwierdzić kliknik w link weryfikacyjny: - -$[reset_link] - -Otrzymasz od nas wiadomość zwrotną zawierającą nowe hasło. - -Po zalogowaniu się, będziesz miał możliwość zmiany hasła na takie jakie chcesz. - -Dane do zalogowania: - -Adres strony: $[siteurl] -Login: $[email] - - - - -Z poważaniem, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/pl/smarty3/lostpass_eml.tpl b/view/pl/smarty3/lostpass_eml.tpl deleted file mode 100644 index 87b3ad56d..000000000 --- a/view/pl/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,33 +0,0 @@ - - -{{$username}}, - Ze strony {{$sitename}} wpłynęła prośba z zresetowanie -hasła. W celu potwierdzenia kliknij w weryfikacyjny link -zamieszczony poniżej, lub wklej go do pasku adresu twojej przeglądarki. - -Jeśli uważasz, że wiadomość nie jest przeznaczona dla ciebie, nie klikaj w linka! -Zignoruj tego emaila i usuń. - -Twoje hasło nie może zostać zmienione zanim nie potwierdzimy -twojego żądania. - -Aby potwierdzić kliknik w link weryfikacyjny: - -{{$reset_link}} - -Otrzymasz od nas wiadomość zwrotną zawierającą nowe hasło. - -Po zalogowaniu się, będziesz miał możliwość zmiany hasła na takie jakie chcesz. - -Dane do zalogowania: - -Adres strony: {{$siteurl}} -Login: {{$email}} - - - - -Z poważaniem, - {{$sitename}} Administrator - - \ No newline at end of file diff --git a/view/ro/smarty3/lostpass_eml.tpl b/view/ro/smarty3/lostpass_eml.tpl deleted file mode 100644 index a20970cc9..000000000 --- a/view/ro/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -Dragă $[username], - O cerere a fost primită recent de la $ [sitename] pentru a reseta -parola contului dvs. În scopul confitmării aceastei cereri, vă rugăm să selectați link-ul de verificare -de mai jos sau inserați în bara de adrese a web browser-ului . - -Dacă nu ați solicitat această schimbare, vă rugăm să nu urmaţi link-ul -furnizat și ignoră și / sau șterge acest e-mail. - -Parola dvs nu va fi schimbată dacă nu putem verifica dacă dvs -a emis această cerere. - -Urmaţi acest link pentru a verifica identitatea dvs. : - -$[reset_link] - -Veți primi apoi un mesaj de follow-up care conține noua parolă. - -Puteți schimba această parola din pagina de setări a contului dvs. după logare - -Detaliile de login sunt următoarele ; - -Locaţie Site: »$[siteurl] -Login Name: $[email] - - - - -Cu stimă, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/sv/lostpass_eml.tpl b/view/sv/lostpass_eml.tpl deleted file mode 100644 index df338fa69..000000000 --- a/view/sv/lostpass_eml.tpl +++ /dev/null @@ -1,29 +0,0 @@ -$username, - -En begäran om återställning av lösenord på $sitename har mottagits. -Gå till adressen nedan för att bekräfta denna begäran. Du kan också -klistra in länken i adressfältet i din webbläsare. - -Gå INTE till länken nedan om du INTE har begärt lösenordsåterställning. -Då kan du ignorera det här meddelandet. - -Ditt lösenord kommer inte att återställas om vi inte kan säkerställa att du -initierat detta. - -Med den här länken kan du bekräfta din identitet: - -$reset_link - -Sedan kommer du att få ett meddelande med ett nytt lösenord. - -Lösenordet kan sedan ändras i dina inställningar efter att du loggat in. - -Detaljerna ser ut så här: - -Webbplats: $siteurl -Inloggningsnamn: $email - -Hälsningar, -$sitename admin - - \ No newline at end of file diff --git a/view/sv/smarty3/lostpass_eml.tpl b/view/sv/smarty3/lostpass_eml.tpl deleted file mode 100644 index f8668ce4e..000000000 --- a/view/sv/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,30 +0,0 @@ - -{{$username}}, - -En begäran om återställning av lösenord på {{$sitename}} har mottagits. -Gå till adressen nedan för att bekräfta denna begäran. Du kan också -klistra in länken i adressfältet i din webbläsare. - -Gå INTE till länken nedan om du INTE har begärt lösenordsåterställning. -Då kan du ignorera det här meddelandet. - -Ditt lösenord kommer inte att återställas om vi inte kan säkerställa att du -initierat detta. - -Med den här länken kan du bekräfta din identitet: - -{{$reset_link}} - -Sedan kommer du att få ett meddelande med ett nytt lösenord. - -Lösenordet kan sedan ändras i dina inställningar efter att du loggat in. - -Detaljerna ser ut så här: - -Webbplats: {{$siteurl}} -Inloggningsnamn: {{$email}} - -Hälsningar, -{{$sitename}} admin - - \ No newline at end of file diff --git a/view/zh-cn/lostpass_eml.tpl b/view/zh-cn/lostpass_eml.tpl deleted file mode 100644 index 8c5ec5c7b..000000000 --- a/view/zh-cn/lostpass_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ - -尊敬的$[username]， - $[sitename]最近收到一个要求复位您的账户 -密码。为肯定这个要求，请点击肯定按钮 -在下边或粘贴在您的游览器地址条 - -如果您没有要求这个变化，请别点击这个按努i -和不理或删除这个邮件。 - -您密码没有被变化直到我们证实您 -发送这个要求时。 - -点击这个按钮为证实您的同一个人： - -$[reset_link] - -然后您收到后续通信包括新密码。 - -您会变化密码在您的账户设置页登记后。 - -登记细节是： - -网站位置: $[siteurl] -登记名: $[email] - - - - -谨上， - $[sitename]行政人员 - - \ No newline at end of file diff --git a/view/zh-cn/smarty3/lostpass_eml.tpl b/view/zh-cn/smarty3/lostpass_eml.tpl deleted file mode 100644 index 7af16a778..000000000 --- a/view/zh-cn/smarty3/lostpass_eml.tpl +++ /dev/null @@ -1,33 +0,0 @@ - - -尊敬的{{$username}}， - {{$sitename}}最近收到一个要求复位您的账户 -密码。为肯定这个要求，请点击肯定按钮 -在下边或粘贴在您的游览器地址条 - -如果您没有要求这个变化，请别点击这个按努i -和不理或删除这个邮件。 - -您密码没有被变化直到我们证实您 -发送这个要求时。 - -点击这个按钮为证实您的同一个人： - -{{$reset_link}} - -然后您收到后续通信包括新密码。 - -您会变化密码在您的账户设置页登记后。 - -登记细节是： - -网站位置: {{$siteurl}} -登记名: {{$email}} - - - - -谨上， - {{$sitename}}行政人员 - - \ No newline at end of file From 9a0c37eb47cde20f532d7dcac583ca95a8cd4d24 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 11:20:06 +0200 Subject: [PATCH 06/26] new password mail via notification() new include/text.php::deindent() function remove unused templates --- include/Emailer.php | 2 +- include/text.php | 19 +++++++ mod/lostpass.php | 77 +++++++++++++++----------- view/ca/passchanged_eml.tpl | 19 ------- view/ca/smarty3/passchanged_eml.tpl | 20 ------- view/cs/passchanged_eml.tpl | 14 ----- view/cs/smarty3/passchanged_eml.tpl | 15 ----- view/de/passchanged_eml.tpl | 20 ------- view/de/smarty3/passchanged_eml.tpl | 21 ------- view/en/passchanged_eml.tpl | 20 ------- view/en/smarty3/passchanged_eml.tpl | 21 ------- view/eo/passchanged_eml.tpl | 20 ------- view/eo/smarty3/passchanged_eml.tpl | 21 ------- view/es/passchanged_eml.tpl | 19 ------- view/es/smarty3/passchanged_eml.tpl | 20 ------- view/fr/passchanged_eml.tpl | 20 ------- view/fr/smarty3/passchanged_eml.tpl | 21 ------- view/is/passchanged_eml.tpl | 20 ------- view/is/smarty3/passchanged_eml.tpl | 21 ------- view/it/smarty3/passchanged_eml.tpl | 20 ------- view/nb-no/passchanged_eml.tpl | 20 ------- view/nb-no/smarty3/passchanged_eml.tpl | 21 ------- view/nl/passchanged_eml.tpl | 20 ------- view/pl/passchanged_eml.tpl | 20 ------- view/pl/smarty3/passchanged_eml.tpl | 21 ------- view/ro/smarty3/passchanged_eml.tpl | 20 ------- view/sv/passchanged_eml.tpl | 18 ------ view/sv/smarty3/passchanged_eml.tpl | 19 ------- view/zh-cn/passchanged_eml.tpl | 20 ------- view/zh-cn/smarty3/passchanged_eml.tpl | 21 ------- 30 files changed, 64 insertions(+), 566 deletions(-) delete mode 100644 view/ca/passchanged_eml.tpl delete mode 100644 view/ca/smarty3/passchanged_eml.tpl delete mode 100644 view/cs/passchanged_eml.tpl delete mode 100644 view/cs/smarty3/passchanged_eml.tpl delete mode 100644 view/de/passchanged_eml.tpl delete mode 100644 view/de/smarty3/passchanged_eml.tpl delete mode 100644 view/en/passchanged_eml.tpl delete mode 100644 view/en/smarty3/passchanged_eml.tpl delete mode 100644 view/eo/passchanged_eml.tpl delete mode 100644 view/eo/smarty3/passchanged_eml.tpl delete mode 100644 view/es/passchanged_eml.tpl delete mode 100644 view/es/smarty3/passchanged_eml.tpl delete mode 100644 view/fr/passchanged_eml.tpl delete mode 100644 view/fr/smarty3/passchanged_eml.tpl delete mode 100644 view/is/passchanged_eml.tpl delete mode 100644 view/is/smarty3/passchanged_eml.tpl delete mode 100644 view/it/smarty3/passchanged_eml.tpl delete mode 100644 view/nb-no/passchanged_eml.tpl delete mode 100644 view/nb-no/smarty3/passchanged_eml.tpl delete mode 100644 view/nl/passchanged_eml.tpl delete mode 100644 view/pl/passchanged_eml.tpl delete mode 100644 view/pl/smarty3/passchanged_eml.tpl delete mode 100644 view/ro/smarty3/passchanged_eml.tpl delete mode 100644 view/sv/passchanged_eml.tpl delete mode 100644 view/sv/smarty3/passchanged_eml.tpl delete mode 100644 view/zh-cn/passchanged_eml.tpl delete mode 100644 view/zh-cn/smarty3/passchanged_eml.tpl diff --git a/include/Emailer.php b/include/Emailer.php index a5b600e36..2baa27980 100644 --- a/include/Emailer.php +++ b/include/Emailer.php @@ -56,7 +56,7 @@ class Emailer { $messageHeader // message headers ); logger("header " . 'To: ' . $params['toEmail'] . "\n" . $messageHeader, LOGGER_DEBUG); - logger("return value " . $res, LOGGER_DEBUG); + logger("return value " . (($res)?"true":"false"), LOGGER_DEBUG); } } ?> diff --git a/include/text.php b/include/text.php index 84195b036..00cbc2b59 100644 --- a/include/text.php +++ b/include/text.php @@ -2229,3 +2229,22 @@ function is_a_date_arg($s) { } return false; } + +/** + * remove intentation from a text + */ +function deindent($text, $chr="[\t ]", $count=NULL) { + $text = fix_mce_lf($text); + $lines = explode("\n", $text); + if (is_null($count)) { + $m = array(); + $k=0; while($kget_baseurl(); $resetlink = $a->get_baseurl() . '/lostpass?verify=' . $new_password; - $preamble = t('Dear %1$s, - A request was recently received at "%2$s" to reset your account -password. In order to confirm this request, please select the verification link -below or paste it into your web browser address bar. + $preamble = deindent(t(' + Dear %1$s, + A request was recently received at "%2$s" to reset your account + password. In order to confirm this request, please select the verification link + below or paste it into your web browser address bar. -If you did NOT request this change, please DO NOT follow the link -provided and ignore and/or delete this email. + If you did NOT request this change, please DO NOT follow the link + provided and ignore and/or delete this email. -Your password will not be changed unless we can verify that you -issued this request.'); - $body = t('Follow this link to verify your identity: + Your password will not be changed unless we can verify that you + issued this request.')); + $body = deindent(t(' + Follow this link to verify your identity: -%1$s + %1$s -You will then receive a follow-up message containing the new password. + You will then receive a follow-up message containing the new password. + You may change that password from your account settings page after logging in. -You may change that password from your account settings page after logging in. + The login details are as follows: -The login details are as follows: - -Site Location: %2$s -Login Name: %3$s'); + Site Location: %2$s + Login Name: %3$s')); $preamble = sprintf($preamble, $username, $sitename); $body = sprintf($body, $resetlink, $siteurl, $email); @@ -71,7 +72,6 @@ Login Name: %3$s'); 'preamble'=> $preamble, 'body' => $body)); - goaway(z_root()); } @@ -88,9 +88,8 @@ function lostpass_content(&$a) { dbesc($hash) ); if(! count($r)) { - notice( t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed.") . EOL); - goaway(z_root()); - return; + $o = t("Request could not be verified. \x28You may have previously submitted it.\x29 Password reset failed."); + return $o; } $uid = $r[0]['uid']; $username = $r[0]['username']; @@ -119,22 +118,34 @@ function lostpass_content(&$a) { info("Your password has been reset." . EOL); + $sitename = $a->config['sitename']; + $siteurl = $a->get_baseurl(); + // $username, $email, $new_password + $preamble = deindent(t(' + Dear %1$s, + Your password has been changed as requested. Please retain this + information for your records (or change your password immediately to + something that you will remember). + ')); + $body = deindent(t(' + Your login details are as follows: - $email_tpl = get_intltext_template("passchanged_eml.tpl"); - $email_tpl = replace_macros($email_tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $username, - '$email' => $email, - '$new_password' => $new_password, - '$uid' => $newuid )); + Site Location: %1$s + Login Name: %2$s + Password: %3$s - $subject = sprintf( t('Your password has been changed at %s'), $a->config['sitename']); + You may change that password from your account settings page after logging in. + ')); - $res = mail($email, email_header_encode( $subject, 'UTF-8'), $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); + $preamble = sprintf($preamble, $username); + $body = sprintf($body, $siteurl, $email, $new_password); + + notification(array( + 'type' => "SYSTEM_EMAIL", + 'to_email' => $email, + 'subject'=> sprintf( t('Your password has been changed at %s'),$sitename), + 'preamble'=> $preamble, + 'body' => $body)); return $o; } diff --git a/view/ca/passchanged_eml.tpl b/view/ca/passchanged_eml.tpl deleted file mode 100644 index 22e54b8c0..000000000 --- a/view/ca/passchanged_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - -Apreciat/da $username, - - La teva contrasenya ha estat modificada com has sol·licitat. Pren nota d'aquesta informació -(o canvía immediatament la contrasenya amb quelcom que recordis). - - -Les teves dades d'accés son les següents: - -Lloc: $siteurl -Nom: $email -Contrasenya: $new_password - -Després d'accedir pots canviar la contrasenya des de la pàgina de configuració del teu perfil. - - - $sitename - - diff --git a/view/ca/smarty3/passchanged_eml.tpl b/view/ca/smarty3/passchanged_eml.tpl deleted file mode 100644 index 43063fc81..000000000 --- a/view/ca/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - -Apreciat/da {{$username}}, - - La teva contrasenya ha estat modificada com has sol·licitat. Pren nota d'aquesta informació -(o canvía immediatament la contrasenya amb quelcom que recordis). - - -Les teves dades d'accés son les següents: - -Lloc: {{$siteurl}} -Nom: {{$email}} -Contrasenya: {{$new_password}} - -Després d'accedir pots canviar la contrasenya des de la pàgina de configuració del teu perfil. - - - {{$sitename}} - - diff --git a/view/cs/passchanged_eml.tpl b/view/cs/passchanged_eml.tpl deleted file mode 100644 index 5447d2e80..000000000 --- a/view/cs/passchanged_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -Milý/Milá $username, - Vaše heslo bylo na Vaši žádost změněno. Prosím zaznamenejte si tuto informaci (nebo si Vaše heslo změňte na nějaké, které si budete pamatovat). - -Vaše přihlašovací údaje jsou tato: - -Adresa webu: $siteurl -Přihlašovací jméno: $email -Heslo: $new_password - -Toto heslo si můžete změnit z vašeho účtu na stránce Nastavení poté, co se přihlásíte. - -S pozdravem, - $sitename administrátor diff --git a/view/cs/smarty3/passchanged_eml.tpl b/view/cs/smarty3/passchanged_eml.tpl deleted file mode 100644 index cfc71356d..000000000 --- a/view/cs/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - - -Milý/Milá {{$username}}, - Vaše heslo bylo na Vaši žádost změněno. Prosím zaznamenejte si tuto informaci (nebo si Vaše heslo změňte na nějaké, které si budete pamatovat). - -Vaše přihlašovací údaje jsou tato: - -Adresa webu: {{$siteurl}} -Přihlašovací jméno: {{$email}} -Heslo: {{$new_password}} - -Toto heslo si můžete změnit z vašeho účtu na stránce Nastavení poté, co se přihlásíte. - -S pozdravem, - {{$sitename}} administrátor diff --git a/view/de/passchanged_eml.tpl b/view/de/passchanged_eml.tpl deleted file mode 100644 index dcabbbe49..000000000 --- a/view/de/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Hallo $[username], - Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese -Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort -in etwas, was du dir merken kannst). - - -Deine Login Daten wurden wie folgt geändert: - -Adresse der Seite: $[siteurl] -Login Name: $[email] -Passwort: $[new_password] - -Du kannst dein Passwort unter deinen Account-Einstellungen ändern, wenn du angemeldet bist. - - -Beste Grüße, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/de/smarty3/passchanged_eml.tpl b/view/de/smarty3/passchanged_eml.tpl deleted file mode 100644 index 2c4576f0d..000000000 --- a/view/de/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - -Hallo {{$username}}, - Dein Passwort wurde wie gewünscht geändert. Bitte bewahre diese -Informationen in deinen Unterlagen auf (oder ändere dein Passwort sofort -in etwas, was du dir merken kannst). - - -Deine Login Daten wurden wie folgt geändert: - -Adresse der Seite: {{$siteurl}} -Login Name: {{$email}} -Passwort: {{$new_password}} - -Du kannst dein Passwort unter deinen Account-Einstellungen ändern, wenn du angemeldet bist. - - -Beste Grüße, - {{$sitename}} Administrator - - \ No newline at end of file diff --git a/view/en/passchanged_eml.tpl b/view/en/passchanged_eml.tpl deleted file mode 100644 index e7cc0e2dc..000000000 --- a/view/en/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Dear $[username], - Your password has been changed as requested. Please retain this -information for your records (or change your password immediately to -something that you will remember). - - -Your login details are as follows: - -Site Location: $[siteurl] -Login Name: $[email] -Password: $[new_password] - -You may change that password from your account settings page after logging in. - - -Sincerely, - $[sitename] Administrator - - diff --git a/view/en/smarty3/passchanged_eml.tpl b/view/en/smarty3/passchanged_eml.tpl deleted file mode 100644 index fb931387b..000000000 --- a/view/en/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - -Dear {{$username}}, - Your password has been changed as requested. Please retain this -information for your records (or change your password immediately to -something that you will remember). - - -Your login details are as follows: - -Site Location: {{$siteurl}} -Login Name: {{$email}} -Password: {{$new_password}} - -You may change that password from your account settings page after logging in. - - -Sincerely, - {{$sitename}} Administrator - - diff --git a/view/eo/passchanged_eml.tpl b/view/eo/passchanged_eml.tpl deleted file mode 100644 index ee775d5dd..000000000 --- a/view/eo/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Kara $[username], - Via pasvorto estas ŝanĝita laŭ via peto. Bonvolu konservi ĉi tiun -informon (aŭ tuj ŝanĝu vian pasvorton al -iu kiun vi povas memori). - - -Jen viaj legitimaĵoj: - -Retejo:»$[siteurl] -Salutnomo:»$[email] -Pasvorto:»$[new_password] - -Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas ensalutita. - - -Salutoj, - $[sitename] administranto - - \ No newline at end of file diff --git a/view/eo/smarty3/passchanged_eml.tpl b/view/eo/smarty3/passchanged_eml.tpl deleted file mode 100644 index f348aaf70..000000000 --- a/view/eo/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - -Kara {{$username}}, - Via pasvorto estas ŝanĝita laŭ via peto. Bonvolu konservi ĉi tiun -informon (aŭ tuj ŝanĝu vian pasvorton al -iu kiun vi povas memori). - - -Jen viaj legitimaĵoj: - -Retejo:»{{$siteurl}} -Salutnomo:»{{$email}} -Pasvorto:»{{$new_password}} - -Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas ensalutita. - - -Salutoj, - {{$sitename}} administranto - - \ No newline at end of file diff --git a/view/es/passchanged_eml.tpl b/view/es/passchanged_eml.tpl deleted file mode 100644 index 7959846b7..000000000 --- a/view/es/passchanged_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - -Estimado/a $username, - - Tu contraseña ha sido modificada como has solicitado. Anota esta información -(o cambia inmediatamente la contraseña con algo que recuerdes). - - -Tus datos de acceso son los siguientes: - -Sitio: $siteurl -Nombre: $email -Contraseña: $new_password - -Después de acceder puedes cambiar la contraseña desde la página de configuración de tu perfil. - - - $sitename - - diff --git a/view/es/smarty3/passchanged_eml.tpl b/view/es/smarty3/passchanged_eml.tpl deleted file mode 100644 index c3003b2ce..000000000 --- a/view/es/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - -Estimado/a {{$username}}, - - Tu contraseña ha sido modificada como has solicitado. Anota esta información -(o cambia inmediatamente la contraseña con algo que recuerdes). - - -Tus datos de acceso son los siguientes: - -Sitio: {{$siteurl}} -Nombre: {{$email}} -Contraseña: {{$new_password}} - -Después de acceder puedes cambiar la contraseña desde la página de configuración de tu perfil. - - - {{$sitename}} - - diff --git a/view/fr/passchanged_eml.tpl b/view/fr/passchanged_eml.tpl deleted file mode 100644 index ff518670e..000000000 --- a/view/fr/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Cher/Chère $[username], - Votre mot de passe a été changé comme demandé. Merci de -mémoriser cette information (ou de changer immédiatement pour un -mot de passe que vous retiendrez). - - -Vos identifiants sont comme suit : - -Adresse du site: $[siteurl] -Utilisateur: $[email] -Mot de passe: $[new_password] - -Vous pouvez changer ce mot de passe depuis vos 'Réglages' une fois connecté. - - -Sincèrement, - l'administrateur de $[sitename] - - \ No newline at end of file diff --git a/view/fr/smarty3/passchanged_eml.tpl b/view/fr/smarty3/passchanged_eml.tpl deleted file mode 100644 index a7a4bd306..000000000 --- a/view/fr/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - -Cher(e) {{$username}}, - - Votre mot de passe a été modifié comme demandé. Merci de conserver -cette information pour un usage ultérieur (ou bien de changer votre mot de -passe immédiatement en quelque chose dont vous vous souviendrez). - -Vos informations de connexion sont désormais : - -Site : {{$siteurl}} -Pseudo/Courriel : {{$email}} -Mot de passe : {{$new_password}} - -Vous pouvez changer ce mot de passe depuis la page des « réglages » de votre compte, -après connexion - -Sincèrement votre, - l'administrateur de {{$sitename}} - - diff --git a/view/is/passchanged_eml.tpl b/view/is/passchanged_eml.tpl deleted file mode 100644 index d2aa68797..000000000 --- a/view/is/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Góðan daginn $[username], - Lykilorð þínu hefur verið breytt einsog umbeðið var. Endilega geyma þessar -upplýsingar (eða skiptu strax um aðgangsorð -yfir í eitthvað sem þú mannst). - - -Innskráningar upplýsingar þínar eru: - -Vefþjónn: $[siteurl] -Notendanafn: $[email] -Aðgangsorð: $[new_password] - -Þú getur breytt um aðgangsorð á stillingar síðunni eftir að þú hefur innskráð þig. - - -Bestu kveðjur, - Kerfisstjóri $[sitename] - - \ No newline at end of file diff --git a/view/is/smarty3/passchanged_eml.tpl b/view/is/smarty3/passchanged_eml.tpl deleted file mode 100644 index 8574b8278..000000000 --- a/view/is/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - -Góðan daginn {{$username}}, - Lykilorð þínu hefur verið breytt einsog umbeðið var. Endilega geyma þessar -upplýsingar (eða skiptu strax um aðgangsorð -yfir í eitthvað sem þú mannst). - - -Innskráningar upplýsingar þínar eru: - -Vefþjónn: {{$siteurl}} -Notendanafn: {{$email}} -Aðgangsorð: {{$new_password}} - -Þú getur breytt um aðgangsorð á stillingar síðunni eftir að þú hefur innskráð þig. - - -Bestu kveðjur, - Kerfisstjóri {{$sitename}} - - \ No newline at end of file diff --git a/view/it/smarty3/passchanged_eml.tpl b/view/it/smarty3/passchanged_eml.tpl deleted file mode 100644 index fccc0928f..000000000 --- a/view/it/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Ciao {{$username}}, - La tua password è stata cambiata, come hai richiesto. Conserva queste -informazioni (oppure cambia immediatamente la password con -qualcosa che ti è più facile ricordare). - - -I tuoi dati di accesso sono i seguenti: - -Sito:»{{$siteurl}} -Soprannome:»{{$email}} -Password:»{{$new_password}} - -Puoi cambiare la tua password dalla pagina delle impostazioni dopo aver effettuato l'accesso. - - -Saluti, - l'amministratore di {{$sitename}} - - \ No newline at end of file diff --git a/view/nb-no/passchanged_eml.tpl b/view/nb-no/passchanged_eml.tpl deleted file mode 100644 index 6f153d38c..000000000 --- a/view/nb-no/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Kjære $[username], - Ditt passord har blitt endret som forespurt. Vennligst ta vare på denne -meldingen for sikkerhets skyld (eller bytt passordet ditt umiddelbart til -noe du husker). - - -Dine logg inn-detaljer er som følger: - -Nettsted:»$[siteurl] -Brukernavn:»$[email] -Passord:»$[new_password] - -Du kan endre dette passordet på din side for kontoinnstillinger etter innlogging. - - -Med vennlig hilsen, - $[sitename] administrator - - \ No newline at end of file diff --git a/view/nb-no/smarty3/passchanged_eml.tpl b/view/nb-no/smarty3/passchanged_eml.tpl deleted file mode 100644 index bc9c7e4f5..000000000 --- a/view/nb-no/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - -Kjære {{$username}}, - Ditt passord har blitt endret som forespurt. Vennligst ta vare på denne -meldingen for sikkerhets skyld (eller bytt passordet ditt umiddelbart til -noe du husker). - - -Dine logg inn-detaljer er som følger: - -Nettsted:»{{$siteurl}} -Brukernavn:»{{$email}} -Passord:»{{$new_password}} - -Du kan endre dette passordet på din side for kontoinnstillinger etter innlogging. - - -Med vennlig hilsen, - {{$sitename}} administrator - - \ No newline at end of file diff --git a/view/nl/passchanged_eml.tpl b/view/nl/passchanged_eml.tpl deleted file mode 100644 index 463753ce8..000000000 --- a/view/nl/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Beste $[username], - Uw wachtwoord is veranderd op uw verzoek. Onthou dit -wachtwoord goed (of verander het wachtwoord naar een -die u beter kunt onthouden). - - -Uw inloginformatie is als volgt: - -Friendica-site:»$[siteurl] -Inlognaam:$[email] -Wachtwoord:»$[new_password] - -U kunt dit wachtwoord veranderen in uw account-instellingen, nadat u bent ingelogd. - - -Vriendelijke groet, - Beheerder: $[sitename] - - \ No newline at end of file diff --git a/view/pl/passchanged_eml.tpl b/view/pl/passchanged_eml.tpl deleted file mode 100644 index 4ff6a9875..000000000 --- a/view/pl/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Drogi $[username], - Twoje hasło zostało zmienione. Zachowaj tę -Informację dla dokumentacji (lub zmień swoje hasło -na takie, które zapamiętasz). - - -Dane do logowania: - -Strona:»$[siteurl] -Twój login:»$[email] -Twoje nowe hasło:»$[new_password] - -Po zalogowaniu możesz zmienić swoje hasło w ustawieniach konta - - -Z poważaniem, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/pl/smarty3/passchanged_eml.tpl b/view/pl/smarty3/passchanged_eml.tpl deleted file mode 100644 index aa3163c60..000000000 --- a/view/pl/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - -Drogi {{$username}}, - Twoje hasło zostało zmienione. Zachowaj tę -Informację dla dokumentacji (lub zmień swoje hasło -na takie, które zapamiętasz). - - -Dane do logowania: - -Strona:»{{$siteurl}} -Twój login:»{{$email}} -Twoje nowe hasło:»{{$new_password}} - -Po zalogowaniu możesz zmienić swoje hasło w ustawieniach konta - - -Z poważaniem, - {{$sitename}} Administrator - - \ No newline at end of file diff --git a/view/ro/smarty3/passchanged_eml.tpl b/view/ro/smarty3/passchanged_eml.tpl deleted file mode 100644 index 5b35f3f2c..000000000 --- a/view/ro/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -Dragă $[username], - Parola dvs. a fost schimbată așa cum a solicitat. Vă rugăm să păstrați aceste -Informații pentru evidența dvs. (sau schimbaţi imediat parola -cu ceva care iti vei reaminti). - - -Detaliile dvs. de login sunt următoarele ; - -Locaţie Site»$[siteurl] -Login Name: $[email] -Parolă:»$[new_password] - -Puteți schimba această parolă de la pagina setări cont după logare. - - -Cu stimă, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/sv/passchanged_eml.tpl b/view/sv/passchanged_eml.tpl deleted file mode 100644 index 590462468..000000000 --- a/view/sv/passchanged_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -$username, - -Lösenordet har ändrats enligt din begäran. Behåll den här -informationen om den skulle behövas i framtiden. (eller ändra lösenord -på en gång till något som du kommer ihåg). - - -Här är dina inloggningsuppgifter: - -Webbplats: $siteurl -Användarnamn: $email -Lösenord: $new_password - -När du loggat in kan du byta lösenord bland inställningarna. - -Hälsningar, -$sitename admin diff --git a/view/sv/smarty3/passchanged_eml.tpl b/view/sv/smarty3/passchanged_eml.tpl deleted file mode 100644 index 8b724f7fc..000000000 --- a/view/sv/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - -{{$username}}, - -Lösenordet har ändrats enligt din begäran. Behåll den här -informationen om den skulle behövas i framtiden. (eller ändra lösenord -på en gång till något som du kommer ihåg). - - -Här är dina inloggningsuppgifter: - -Webbplats: {{$siteurl}} -Användarnamn: {{$email}} -Lösenord: {{$new_password}} - -När du loggat in kan du byta lösenord bland inställningarna. - -Hälsningar, -{{$sitename}} admin diff --git a/view/zh-cn/passchanged_eml.tpl b/view/zh-cn/passchanged_eml.tpl deleted file mode 100644 index 1c6e7655b..000000000 --- a/view/zh-cn/passchanged_eml.tpl +++ /dev/null @@ -1,20 +0,0 @@ - -尊敬的$[username]。 - 您的随您要求密码变化了。请保持这 -信息为您的备案(或立即变化您的密码成 -什么容易记住)。 - - -您的登记信息是： - -网站位置: $[siteurl] -登记名: $[email] -密码: $[new_password] - -您会变化这个密码在您的账户设置页登记后。 - - -谨上， - $[sitename]行政人员 - - \ No newline at end of file diff --git a/view/zh-cn/smarty3/passchanged_eml.tpl b/view/zh-cn/smarty3/passchanged_eml.tpl deleted file mode 100644 index 321f5eef2..000000000 --- a/view/zh-cn/smarty3/passchanged_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - - -尊敬的{{$username}}。 - 您的随您要求密码变化了。请保持这 -信息为您的备案(或立即变化您的密码成 -什么容易记住)。 - - -您的登记信息是： - -网站位置: {{$siteurl}} -登记名: {{$email}} -密码: {{$new_password}} - -您会变化这个密码在您的账户设置页登记后。 - - -谨上， - {{$sitename}}行政人员 - - \ No newline at end of file From 9368c7e5104e217d0b9983c9af9daad86c182769 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 11:20:56 +0200 Subject: [PATCH 07/26] html mail template add img tag only if source_photo is defined --- view/templates/email_notify_html.tpl | 2 ++ 1 file changed, 2 insertions(+) diff --git a/view/templates/email_notify_html.tpl b/view/templates/email_notify_html.tpl index 4eccff63f..94fac7447 100644 --- a/view/templates/email_notify_html.tpl +++ b/view/templates/email_notify_html.tpl @@ -15,8 +15,10 @@ {{if $content_allowed}} + {{if $source_photo}} {{$source_name}} + {{/if}} {{$title}} {{$htmlversion}} {{/if}} From fe02619114e30198e1360e41b4c7cd385c1ed8ba Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 11:31:42 +0200 Subject: [PATCH 08/26] fix indentation --- mod/admin.php | 133 +++++++++++++++++++++++++------------------------- 1 file changed, 67 insertions(+), 66 deletions(-) diff --git a/mod/admin.php b/mod/admin.php index 24069c5d9..5da07b33e 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -419,9 +419,9 @@ function admin_page_site_post(&$a){ set_config('system','banner', $banner); } if ($info=="") { - del_config('config','info'); + del_config('config','info'); } else { - set_config('config','info',$info); + set_config('config','info',$info); } set_config('system','language', $language); set_config('system','theme', $theme); @@ -429,12 +429,12 @@ function admin_page_site_post(&$a){ del_config('system','mobile-theme'); } else { set_config('system','mobile-theme', $theme_mobile); - } - if ( $singleuser === '---' ) { - del_config('system','singleuser'); - } else { - set_config('system','singleuser', $singleuser); - } + } + if ( $singleuser === '---' ) { + del_config('system','singleuser'); + } else { + set_config('system','singleuser', $singleuser); + } set_config('system','maximagesize', $maximagesize); set_config('system','max_image_length', $maximagelength); set_config('system','jpeg_quality', $jpegimagequality); @@ -473,7 +473,7 @@ function admin_page_site_post(&$a){ set_config('system','curl_timeout', $timeout); set_config('system','dfrn_only', $dfrn_only); set_config('system','ostatus_disabled', $ostatus_disabled); - set_config('system','ostatus_poll_interval', $ostatus_poll_interval); + set_config('system','ostatus_poll_interval', $ostatus_poll_interval); set_config('system','diaspora_enabled', $diaspora_enabled); set_config('config','private_addons', $private_addons); @@ -524,32 +524,32 @@ function admin_page_site(&$a) { foreach($files as $file) { $f = basename($file); $theme_name = ((file_exists($file . '/experimental')) ? sprintf("%s - \x28Experimental\x29", $f) : $f); - if (file_exists($file . '/mobile')) { - $theme_choices_mobile[$f] = $theme_name; - } + if (file_exists($file . '/mobile')) { + $theme_choices_mobile[$f] = $theme_name; + } else { - $theme_choices[$f] = $theme_name; + $theme_choices[$f] = $theme_name; } } - } + } - /* OStatus conversation poll choices */ - $ostatus_poll_choices = array( + /* OStatus conversation poll choices */ + $ostatus_poll_choices = array( "-2" => t("Never"), "-1" => t("At post arrival"), "0" => t("Frequently"), "60" => t("Hourly"), "720" => t("Twice daily"), "1440" => t("Daily") - ); + ); - /* get user names to make the install a personal install of X */ - $user_names = array(); - $user_names['---'] = t('Multi user instance'); - $users = q("SELECT username, nickname FROM `user`"); - foreach ($users as $user) { - $user_names[$user['nickname']] = $user['username']; - } + /* get user names to make the install a personal install of X */ + $user_names = array(); + $user_names['---'] = t('Multi user instance'); + $users = q("SELECT username, nickname FROM `user`"); + foreach ($users as $user) { + $user_names[$user['nickname']] = $user['username']; + } /* Banner */ $banner = get_config('system','banner'); @@ -626,9 +626,9 @@ function admin_page_site(&$a) { '$no_regfullname' => array('no_regfullname', t("Fullname check"), !get_config('system','no_regfullname'), t("Force users to register with a space between firstname and lastname in Full name, as an antispam measure")), '$no_utf' => array('no_utf', t("UTF-8 Regular expressions"), !get_config('system','no_utf'), t("Use PHP UTF8 regular expressions")), '$no_community_page' => array('no_community_page', t("Show Community Page"), !get_config('system','no_community_page'), t("Display a Community page showing all recent public postings on this site.")), - '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")), + '$ostatus_disabled' => array('ostatus_disabled', t("Enable OStatus support"), !get_config('system','ostatus_disabled'), t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")), '$ostatus_poll_interval' => array('ostatus_poll_interval', t("OStatus conversation completion interval"), (string) intval(get_config('system','ostatus_poll_interval')), t("How often shall the poller check for new entries in OStatus conversations? This can be a very ressource task."), $ostatus_poll_choices), - '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")), + '$diaspora_enabled' => array('diaspora_enabled', t("Enable Diaspora support"), get_config('system','diaspora_enabled'), t("Provide built-in Diaspora network compatibility.")), '$dfrn_only' => array('dfrn_only', t('Only allow Friendica contacts'), get_config('system','dfrn_only'), t("All contacts must use Friendica protocols. All other built-in communication protocols disabled.")), '$verifyssl' => array('verifyssl', t("Verify SSL"), get_config('system','verifyssl'), t("If you wish, you can turn on strict certificate checking. This will mean you cannot connect (at all) to self-signed SSL sites.")), '$proxyuser' => array('proxyuser', t("Proxy user"), get_config('system','proxyuser'), ""), @@ -651,7 +651,7 @@ function admin_page_site(&$a) { '$relocate_url' => array('relocate_url', t("New base url"), $a->get_baseurl(), "Change base url for this server. Sends relocate message to all DFRN contacts of all users."), '$enable_noscrape'=> array('enable_noscrape', t("Enable noscrape"), get_config('system','enable_noscrape'), t("The noscrape feature speeds up directory submissions by using JSON data instead of HTML scraping.")), - '$form_security_token' => get_form_security_token("admin_site") + '$form_security_token' => get_form_security_token("admin_site") )); @@ -744,39 +744,40 @@ function admin_page_dbsync(&$a) { function admin_page_users_post(&$a){ $pending = ( x($_POST, 'pending') ? $_POST['pending'] : Array() ); $users = ( x($_POST, 'user') ? $_POST['user'] : Array() ); - $nu_name = ( x($_POST, 'new_user_name') ? $_POST['new_user_name'] : ''); - $nu_nickname = ( x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); - $nu_email = ( x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); + $nu_name = ( x($_POST, 'new_user_name') ? $_POST['new_user_name'] : ''); + $nu_nickname = ( x($_POST, 'new_user_nickname') ? $_POST['new_user_nickname'] : ''); + $nu_email = ( x($_POST, 'new_user_email') ? $_POST['new_user_email'] : ''); - check_form_security_token_redirectOnErr('/admin/users', 'admin_users'); + check_form_security_token_redirectOnErr('/admin/users', 'admin_users'); - if (!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) { - require_once('include/user.php'); - require_once('include/email.php'); - $result = create_user( array('username'=>$nu_name, 'email'=>$nu_email, 'nickname'=>$nu_nickname, 'verified'=>1) ); - if(! $result['success']) { - notice($result['message']); - return; - } - $nu = $result['user']; - $email_tpl = get_intltext_template("register_adminadd_eml.tpl"); - $email_tpl = replace_macros($email_tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $nu['username'], - '$email' => $nu['email'], - '$password' => $result['password'], - '$uid' => $nu['uid'] )); - - $res = mail($nu['email'], email_header_encode( sprintf( t('Registration details for %s'), $a->config['sitename']),'UTF-8'), - $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); - if ($res) { - info( t('Registration successful. Email send to user').EOL ); - } - } + if (!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) { + require_once('include/user.php'); + require_once('include/email.php'); + $result = create_user( array('username'=>$nu_name, 'email'=>$nu_email, 'nickname'=>$nu_nickname, 'verified'=>1) ); + if(! $result['success']) { + notice($result['message']); + return; + } + $nu = $result['user']; + + $email_tpl = get_intltext_template("register_adminadd_eml.tpl"); + $email_tpl = replace_macros($email_tpl, array( + '$sitename' => $a->config['sitename'], + '$siteurl' => $a->get_baseurl(), + '$username' => $nu['username'], + '$email' => $nu['email'], + '$password' => $result['password'], + '$uid' => $nu['uid'] )); + + $res = mail($nu['email'], email_header_encode( sprintf( t('Registration details for %s'), $a->config['sitename']),'UTF-8'), + $email_tpl, + 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" + . 'Content-type: text/plain; charset=UTF-8' . "\n" + . 'Content-transfer-encoding: 8bit' ); + if ($res) { + info( t('Registration successful. Email send to user').EOL ); + } + } if (x($_POST,'page_users_block')){ foreach($users as $uid){ @@ -825,7 +826,7 @@ function admin_page_users(&$a){ } switch($a->argv[2]){ case "delete":{ - check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't'); + check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't'); // delete user require_once("include/Contact.php"); user_remove($uid); @@ -833,7 +834,7 @@ function admin_page_users(&$a){ notice( sprintf(t("User '%s' deleted"), $user[0]['username']) . EOL); }; break; case "block":{ - check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't'); + check_form_security_token_redirectOnErr('/admin/users', 'admin_users', 't'); q("UPDATE `user` SET `blocked`=%d WHERE `uid`=%s", intval( 1-$user[0]['blocked'] ), intval( $uid ) @@ -889,7 +890,7 @@ function admin_page_users(&$a){ t('Normal Account'), t('Soapbox Account'), t('Community/Celebrity Account'), - t('Automatic Friend Account') + t('Automatic Friend Account') ); $e['page-flags'] = $accounts[$e['page-flags']]; $e['register_date'] = relative_date($e['register_date']); @@ -1094,7 +1095,7 @@ function admin_page_plugins(&$a){ '$baseurl' => $a->get_baseurl(true), '$function' => 'plugins', '$plugins' => $plugins, - '$form_security_token' => get_form_security_token("admin_themes"), + '$form_security_token' => get_form_security_token("admin_themes"), )); } @@ -1296,7 +1297,7 @@ function admin_page_themes(&$a){ '$plugins' => $xthemes, '$experimental' => t('[Experimental]'), '$unsupported' => t('[Unsupported]'), - '$form_security_token' => get_form_security_token("admin_themes"), + '$form_security_token' => get_form_security_token("admin_themes"), )); } @@ -1309,7 +1310,7 @@ function admin_page_themes(&$a){ function admin_page_logs_post(&$a) { if (x($_POST,"page_logs")) { - check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs'); + check_form_security_token_redirectOnErr('/admin/logs', 'admin_logs'); $logfile = ((x($_POST,'logfile')) ? notags(trim($_POST['logfile'])) : ''); $debugging = ((x($_POST,'debugging')) ? true : false); @@ -1348,7 +1349,7 @@ function admin_page_logs(&$a){ $data = ''; if(!file_exists($f)) { - $data = t("Error trying to open $f log file.\r\n
Check to see if file $f exist and is + $data = t("Error trying to open $f log file.\r\n
Check to see if file $f exist and is readable."); } else { @@ -1388,7 +1389,7 @@ readable."); '$logfile' => array('logfile', t("Log file"), get_config('system','logfile'), t("Must be writable by web server. Relative to your Friendica top-level directory.")), '$loglevel' => array('loglevel', t("Log level"), get_config('system','loglevel'), "", $log_choices), - '$form_security_token' => get_form_security_token("admin_logs"), + '$form_security_token' => get_form_security_token("admin_logs"), )); } From 803854738b9bf514d11f6e8c7c0ac84aad874ae6 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 11:48:23 +0200 Subject: [PATCH 09/26] another massacre of templates --- mod/admin.php | 53 ++++++++++++++++------- view/cs/smarty3/register_adminadd_eml.tpl | 32 -------------- view/de/smarty3/register_adminadd_eml.tpl | 32 -------------- view/en/register_adminadd_eml.tpl | 32 -------------- view/en/smarty3/register_adminadd_eml.tpl | 32 -------------- view/fr/smarty3/register_adminadd_eml.tpl | 32 -------------- view/it/smarty3/register_adminadd_eml.tpl | 32 -------------- view/ro/smarty3/register_adminadd_eml.tpl | 32 -------------- 8 files changed, 37 insertions(+), 240 deletions(-) delete mode 100644 view/cs/smarty3/register_adminadd_eml.tpl delete mode 100644 view/de/smarty3/register_adminadd_eml.tpl delete mode 100644 view/en/register_adminadd_eml.tpl delete mode 100644 view/en/smarty3/register_adminadd_eml.tpl delete mode 100644 view/fr/smarty3/register_adminadd_eml.tpl delete mode 100644 view/it/smarty3/register_adminadd_eml.tpl delete mode 100644 view/ro/smarty3/register_adminadd_eml.tpl diff --git a/mod/admin.php b/mod/admin.php index 5da07b33e..db3c8b189 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -759,24 +759,45 @@ function admin_page_users_post(&$a){ return; } $nu = $result['user']; + $preamble = deindent(t(' + Dear %1$s, + the administrator of %2$s has set up an account for you.'); + $body = deindent(t(' + The login details are as follows: - $email_tpl = get_intltext_template("register_adminadd_eml.tpl"); - $email_tpl = replace_macros($email_tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $nu['username'], - '$email' => $nu['email'], - '$password' => $result['password'], - '$uid' => $nu['uid'] )); + Site Location: %1$s + Login Name: %2$s + Password: %3$s + + You may change your password from your account "Settings" page after logging + in. + + Please take a few moments to review the other account settings on that page. + + You may also wish to add some basic information to your default profile + (on the "Profiles" page) so that other people can easily find you. + + We recommend setting your full name, adding a profile photo, + adding some profile "keywords" (very useful in making new friends) - and + perhaps what country you live in; if you do not wish to be more specific + than that. + + We fully respect your right to privacy, and none of these items are necessary. + If you are new and do not know anybody here, they may help + you to make some new and interesting friends. + + Thank you and welcome to %4$s.'); + + $preamble = sprintf($preamble, $nu['username'], $a->config['sitename']); + $body = sprintf($body, $a->get_baseurl(), $nu['email'], $result['password'], $a->config['sitename']); + + notification(array( + 'type' => "SYSTEM_EMAIL", + 'to_email' => $email, + 'subject'=> sprintf( t('Registration details for %s'), $a->config['sitename']), + 'preamble'=> $preamble, + 'body' => $body)); - $res = mail($nu['email'], email_header_encode( sprintf( t('Registration details for %s'), $a->config['sitename']),'UTF-8'), - $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); - if ($res) { - info( t('Registration successful. Email send to user').EOL ); - } } if (x($_POST,'page_users_block')){ diff --git a/view/cs/smarty3/register_adminadd_eml.tpl b/view/cs/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index 63efc7151..000000000 --- a/view/cs/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Drahý {{$username}}, - administrátor webu {{$sitename}} pro Vás vytvořil uživatelský účet. - -Vaše přihlašovací údaje jsou tyto: - - -Adresa webu: {{$siteurl}} -Uživatelské jméno: {{$email}} -Heslo: {{$password}} - -Vaše heslo si můžete po přihlášení změnit na stránce -. - -Prosím věnujte chvíli k revizi ostatních nastavení svého účtu. - -Můžete také přidat některé základní informace do Vašeho defaultního profilu - (na stránce "Profily"), čímž umožníte jiným lidem Vás snadněji nalézt. - -Doporučujeme nastavit celé jméno, přidat profilové foto -, přidat nějaká profilová "klíčová slova" (což je velmi užitečné pro hledání nových přátel) a - zemi, ve které žijete. Nemusíte zadávat víc -informací. - -Plně respektujeme Vaše právo na soukromí a žádná z výše uvedených položek není povinná. -Pokud jste nový a neznáte na tomto webu nikoho jiného, zadáním těchto -položek můžete získat nové a zajímavé přátele. - - -Díky a vítejte na {{$sitename}}. - -S pozdravem, - {{$sitename}} administrátor \ No newline at end of file diff --git a/view/de/smarty3/register_adminadd_eml.tpl b/view/de/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index dbe1412b9..000000000 --- a/view/de/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Hallo {{$username}}, - der Administrator von {{$sitename}} hat einen Account für dich eingerichtet. - -Hier die Login Details: - - -Adresse der Seite: {{$siteurl}} -Login Name: {{$email}} -Passwort: {{$password}} - -Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern, -nachdem du dich erstmalig eingeloggt hast. - -Bitte nimm dir einige Augenblicke Zeit, um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen. - -Eventuell möchtest du außerdem einige grundlegende Informationen in deinem Standardprofil (auf der "Profile" Seite) eintragen, -damit andere Leute dich einfacher finden können. - -Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profilbild hochzuladen, -sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und -vielleicht auch in welchen Land du lebst; falls du nicht konkreter -werden möchtest. - -Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig. -Wenn du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen -ein paar neue und interessante Freunde zu finden. - - -Danke und willkommen auf {{$sitename}}. - -Beste Grüße, - {{$sitename}} Administrator diff --git a/view/en/register_adminadd_eml.tpl b/view/en/register_adminadd_eml.tpl deleted file mode 100644 index 6d324809c..000000000 --- a/view/en/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Dear {{$username}}, - the administrator of {{$sitename}} has set up an account for you. - -The login details are as follows: - - -Site Location: {{$siteurl}} -Login Name: {{$email}} -Password: {{$password}} - -You may change your password from your account "Settings" page after logging -in. - -Please take a few moments to review the other account settings on that page. - -You may also wish to add some basic information to your default profile -(on the "Profiles" page) so that other people can easily find you. - -We recommend setting your full name, adding a profile photo, -adding some profile "keywords" (very useful in making new friends) - and -perhaps what country you live in; if you do not wish to be more specific -than that. - -We fully respect your right to privacy, and none of these items are necessary. -If you are new and do not know anybody here, they may help -you to make some new and interesting friends. - - -Thank you and welcome to {{$sitename}}. - -Sincerely, - {{$sitename}} Administrator diff --git a/view/en/smarty3/register_adminadd_eml.tpl b/view/en/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index 6d324809c..000000000 --- a/view/en/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Dear {{$username}}, - the administrator of {{$sitename}} has set up an account for you. - -The login details are as follows: - - -Site Location: {{$siteurl}} -Login Name: {{$email}} -Password: {{$password}} - -You may change your password from your account "Settings" page after logging -in. - -Please take a few moments to review the other account settings on that page. - -You may also wish to add some basic information to your default profile -(on the "Profiles" page) so that other people can easily find you. - -We recommend setting your full name, adding a profile photo, -adding some profile "keywords" (very useful in making new friends) - and -perhaps what country you live in; if you do not wish to be more specific -than that. - -We fully respect your right to privacy, and none of these items are necessary. -If you are new and do not know anybody here, they may help -you to make some new and interesting friends. - - -Thank you and welcome to {{$sitename}}. - -Sincerely, - {{$sitename}} Administrator diff --git a/view/fr/smarty3/register_adminadd_eml.tpl b/view/fr/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index c12264087..000000000 --- a/view/fr/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Chère, Cher {{$username}}, - l'administrateur de {{$sitename}} vous à créé un compte. - -Les détails de connexion sont les suivants : - - -Emplacement du site : {{$siteurl}} -Nom de connexion : {{$email}} -Mot de passe : {{$password}} - -Vous pouvez modifier votre mot de passe à la page des "Paramètres" de votre compte, une fois -connecté. - -Veuillez prendre le temps d'examiner les autres paramètres de votre compte sur cette page. - -Vous pouvez aussi ajouter quelques informatiques de base à votre profil par défaut -(sur la page "Profils") pour que d'autres personnes vous trouvent facilement. - -Nous vous recommandons d'indiquer votre nom complet, d'ajouter une photo pour votre profil, -d'ajouter quelques "mots-clés" (très efficace pour se faire de nouveaux amis) - et -peut-être aussi votre pays de résidence ; sauf si vous souhaitez pas être -aussi spécifique. - -Nous respectons entièrement votre vie privée, et aucun de ces éléments n'est nécessaire. -Si vous êtes nouveau et ne connaissez personne, ils peuvent vous -aider à vous faire de nouveaux et interessants amis. - - -Merci, et bienvenue sur {{$sitename}}. - -Sincèrement votre, - L'administrateur de {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/register_adminadd_eml.tpl b/view/it/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index 20a9cb176..000000000 --- a/view/it/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Ciao {{$username}}, - l'amministratore di {{{{$sitename}}}} ha creato un account per te. - -I dettagli di accesso sono i seguenti - - -Sito:»{{$siteurl}} -Soprannome:»{{$email}} -Password:»{{$password}} - -Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso - - -Prenditi un momento per dare un'occhiata alle altre impostazioni del tuo profilo nella stessa pagina. - -Potrest voler aggiungere alcune informazioni di base a quelle predefinite del profilo -(nella pagina "Profilo") per rendere più facile trovarti alle altre persone. - -Noi raccomandiamo di impostare il tuo nome completo, di aggiungere una foto, -di aggiungere alcune "parole chiavi" (molto utili per farsi nuovi amici) - e -magari il paese dove vivi; se non vuoi essere più dettagliato -di così. - -Noi rispettiamo il tuo diritto alla privacy e nessuna di queste informazioni è indispensabile. -Se non ancora non conosci nessuno qui, posso essere d'aiuto -per farti nuovi e interessanti amici. - - -Grazie. Siamo contenti di darti il benvenuto su {{$sitename}} - -Saluti, - l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/ro/smarty3/register_adminadd_eml.tpl b/view/ro/smarty3/register_adminadd_eml.tpl deleted file mode 100644 index b32f223a0..000000000 --- a/view/ro/smarty3/register_adminadd_eml.tpl +++ /dev/null @@ -1,32 +0,0 @@ -Dragă {{$username}}, - administratorul {{$sitename}} v-a configurat un cont pentru dvs. - -Detaliile de autentificare sunt următoarele: - - -Locație Site: {{$siteurl}} -Nume Autentificare:⇥{{$email}} -Parolă:⇥{{$password}} - -Vă puteți schimba parola din pagina contului dvs. de "Configurări", după autentificare -în. - -Vă rugăm să acordați câteva momente pentru revizuirea altor configurări de cont de pe această pagină. - -Puteți de asemenea să adăugați câteva informații generale profilului dvs. implicit -(pe "Profile" pagina), astfel încât alte persoane să vă găsească uşor. - -Vă recomandăm să vă specificați numele complet, adăugând o fotografie de profil, -adăugând profilului câteva "cuvinte cheie" (foarte utile pentru a vă face noi prieteni) - și -poate în ce țara locuiți; dacă nu doriți să dați mai multe detalii -decât acestea. - -Respectăm pe deplin dreptul la intimitate, și nici unul dintre aceste elemente nu sunt necesar. -Dacă sunteți nou si nu ştiţi pe nimeni pe aici, ele pot ajuta -să vă faceți niște prieteni noi și interesanţi. - - -Vă multumim și vă urăm bun venit la {{$sitename}}. - -Cu stimă, - Administratorul {{$sitename}} \ No newline at end of file From 5997fb19ee93c21092ddba9ba7c5cfa34f4272d5 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 12:29:13 +0200 Subject: [PATCH 10/26] More template gore! --- include/user.php | 79 +++++++++++++++++++----- mod/admin.php | 8 ++- mod/lostpass.php | 1 + mod/register.php | 25 +++----- mod/regmod.php | 23 +++---- view/ca/register_open_eml.tpl | 22 ------- view/ca/smarty3/register_open_eml.tpl | 23 ------- view/cs/register_open_eml.tpl | 23 ------- view/cs/smarty3/register_open_eml.tpl | 24 ------- view/de/register_open_eml.tpl | 34 ---------- view/de/smarty3/register_open_eml.tpl | 35 ----------- view/en/register_open_eml.tpl | 34 ---------- view/en/smarty3/register_open_eml.tpl | 35 ----------- view/eo/register_open_eml.tpl | 34 ---------- view/eo/smarty3/register_open_eml.tpl | 35 ----------- view/es/register_open_eml.tpl | 21 ------- view/es/smarty3/register_open_eml.tpl | 22 ------- view/fr/register_open_eml.tpl | 34 ---------- view/fr/smarty3/register_open_eml.tpl | 23 ------- view/is/register_open_eml.tpl | 34 ---------- view/is/smarty3/register_open_eml.tpl | 35 ----------- view/it/smarty3/register_open_eml.tpl | 34 ---------- view/nb-no/register_open_eml.tpl | 34 ---------- view/nb-no/smarty3/register_open_eml.tpl | 35 ----------- view/nl/register_open_eml.tpl | 34 ---------- view/pl/register_open_eml.tpl | 36 ----------- view/pl/smarty3/register_open_eml.tpl | 37 ----------- view/ro/smarty3/register_open_eml.tpl | 34 ---------- view/sv/register_open_eml.tpl | 17 ----- view/sv/smarty3/register_open_eml.tpl | 18 ------ view/zh-cn/register_open_eml.tpl | 34 ---------- view/zh-cn/smarty3/register_open_eml.tpl | 35 ----------- 32 files changed, 86 insertions(+), 866 deletions(-) delete mode 100644 view/ca/register_open_eml.tpl delete mode 100644 view/ca/smarty3/register_open_eml.tpl delete mode 100644 view/cs/register_open_eml.tpl delete mode 100644 view/cs/smarty3/register_open_eml.tpl delete mode 100644 view/de/register_open_eml.tpl delete mode 100644 view/de/smarty3/register_open_eml.tpl delete mode 100644 view/en/register_open_eml.tpl delete mode 100644 view/en/smarty3/register_open_eml.tpl delete mode 100644 view/eo/register_open_eml.tpl delete mode 100644 view/eo/smarty3/register_open_eml.tpl delete mode 100644 view/es/register_open_eml.tpl delete mode 100644 view/es/smarty3/register_open_eml.tpl delete mode 100644 view/fr/register_open_eml.tpl delete mode 100644 view/fr/smarty3/register_open_eml.tpl delete mode 100644 view/is/register_open_eml.tpl delete mode 100644 view/is/smarty3/register_open_eml.tpl delete mode 100644 view/it/smarty3/register_open_eml.tpl delete mode 100644 view/nb-no/register_open_eml.tpl delete mode 100644 view/nb-no/smarty3/register_open_eml.tpl delete mode 100644 view/nl/register_open_eml.tpl delete mode 100644 view/pl/register_open_eml.tpl delete mode 100644 view/pl/smarty3/register_open_eml.tpl delete mode 100644 view/ro/smarty3/register_open_eml.tpl delete mode 100644 view/sv/register_open_eml.tpl delete mode 100644 view/sv/smarty3/register_open_eml.tpl delete mode 100644 view/zh-cn/register_open_eml.tpl delete mode 100644 view/zh-cn/smarty3/register_open_eml.tpl diff --git a/include/user.php b/include/user.php index 8528bfbfa..bf29daf1a 100644 --- a/include/user.php +++ b/include/user.php @@ -6,6 +6,7 @@ require_once('include/plugin.php'); require_once('include/text.php'); require_once('include/pgettext.php'); require_once('include/datetime.php'); +require_once('include/enotify.php'); function create_user($arr) { @@ -44,7 +45,7 @@ function create_user($arr) { $result['message'] .= t('Invitation could not be verified.') . EOL; return $result; } - } + } if((! x($username)) || (! x($email)) || (! x($nickname))) { if($openid_url) { @@ -57,17 +58,17 @@ function create_user($arr) { require_once('library/openid.php'); $openid = new LightOpenID; $openid->identity = $openid_url; - $openid->returnUrl = $a->get_baseurl() . '/openid'; + $openid->returnUrl = $a->get_baseurl() . '/openid'; $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson'); $openid->optional = array('namePerson/first','media/image/aspect11','media/image/default'); - try { + try { $authurl = $openid->authUrl(); } catch (Exception $e){ - $result['message'] .= t("We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."). EOL . EOL . t("The error message was:") . $e->getMessage() . EOL; + $result['message'] .= t("We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."). EOL . EOL . t("The error message was:") . $e->getMessage() . EOL; return $result; } goaway($authurl); - // NOTREACHED + // NOTREACHED } notice( t('Please enter the required information.') . EOL ); @@ -90,12 +91,12 @@ function create_user($arr) { // I don't really like having this rule, but it cuts down // on the number of auto-registrations by Russian spammers - + // Using preg_match was completely unreliable, due to mixed UTF-8 regex support // $no_utf = get_config('system','no_utf'); - // $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' ); + // $pat = (($no_utf) ? '/^[a-zA-Z]* [a-zA-Z]*$/' : '/^\p{L}* \p{L}*$/u' ); - // So now we are just looking for a space in the full name. + // So now we are just looking for a space in the full name. $loose_reg = get_config('system','no_regfullname'); if(! $loose_reg) { @@ -182,7 +183,7 @@ function create_user($arr) { * will take several minutes each to process. * */ - + $sres = new_keypair(512); $sprvkey = $sres['prvkey']; $spubkey = $sres['pubkey']; @@ -207,7 +208,7 @@ function create_user($arr) { ); if($r) { - $r = q("SELECT * FROM `user` + $r = q("SELECT * FROM `user` WHERE `username` = '%s' AND `password` = '%s' LIMIT 1", dbesc($username), dbesc($new_password_encoded) @@ -220,10 +221,10 @@ function create_user($arr) { else { $result['message'] .= t('An error occurred during registration. Please try again.') . EOL ; return $result; - } + } /** - * if somebody clicked submit twice very quickly, they could end up with two accounts + * if somebody clicked submit twice very quickly, they could end up with two accounts * due to race condition. Remove this one. */ @@ -281,8 +282,8 @@ function create_user($arr) { dbesc(datetime_convert()) ); - // Create a group with no members. This allows somebody to use it - // right away as a default group for new contacts. + // Create a group with no members. This allows somebody to use it + // right away as a default group for new contacts. require_once('include/group.php'); group_add($newuid, t('Friends')); @@ -323,7 +324,7 @@ function create_user($arr) { // guess mimetype from headers or filename $type = guess_image_type($photo,true); - + $img = new Photo($img_str, $type); if($img->is_valid()) { @@ -365,3 +366,51 @@ function create_user($arr) { return $result; } + + +/* + * send registration confirmation. + * It's here as a function because the mail is sent + * from different parts + */ +function send_register_open_eml($email, $sitename, $siteurl, $username, $password){ + $preamble = deindent(t(' + Dear %1$s, + Thank you for registering at %2$s. Your account has been created. + ')); + $body = deindent(t(' + The login details are as follows: + Site Location: %3$s + Login Name: %1$s + Password: %5$ + + You may change your password from your account "Settings" page after logging + in. + + Please take a few moments to review the other account settings on that page. + + You may also wish to add some basic information to your default profile + (on the "Profiles" page) so that other people can easily find you. + + We recommend setting your full name, adding a profile photo, + adding some profile "keywords" (very useful in making new friends) - and + perhaps what country you live in; if you do not wish to be more specific + than that. + + We fully respect your right to privacy, and none of these items are necessary. + If you are new and do not know anybody here, they may help + you to make some new and interesting friends. + + + Thank you and welcome to %2$s.')); + + $preamble = sprintf($preamble, $username, $sitename); + $body = sprintf($body, $email, $sitename, $siteurl, $username, $password); + + notification(array( + 'type' => "SYSTEM_EMAIL", + 'to_email' => $email, + 'subject'=> sprintf( t('Registration details for %s'), $sitename), + 'preamble'=> $preamble, + 'body' => $body)); +} diff --git a/mod/admin.php b/mod/admin.php index db3c8b189..6064a04ff 100644 --- a/mod/admin.php +++ b/mod/admin.php @@ -4,6 +4,8 @@ * Friendica admin */ require_once("include/remoteupdate.php"); +require_once("include/enotify.php"); +require_once("include/text.php"); /** @@ -752,7 +754,7 @@ function admin_page_users_post(&$a){ if (!($nu_name==="") && !($nu_email==="") && !($nu_nickname==="")) { require_once('include/user.php'); - require_once('include/email.php'); + $result = create_user( array('username'=>$nu_name, 'email'=>$nu_email, 'nickname'=>$nu_nickname, 'verified'=>1) ); if(! $result['success']) { notice($result['message']); @@ -761,7 +763,7 @@ function admin_page_users_post(&$a){ $nu = $result['user']; $preamble = deindent(t(' Dear %1$s, - the administrator of %2$s has set up an account for you.'); + the administrator of %2$s has set up an account for you.')); $body = deindent(t(' The login details are as follows: @@ -786,7 +788,7 @@ function admin_page_users_post(&$a){ If you are new and do not know anybody here, they may help you to make some new and interesting friends. - Thank you and welcome to %4$s.'); + Thank you and welcome to %4$s.')); $preamble = sprintf($preamble, $nu['username'], $a->config['sitename']); $body = sprintf($body, $a->get_baseurl(), $nu['email'], $result['password'], $a->config['sitename']); diff --git a/mod/lostpass.php b/mod/lostpass.php index f955c020e..938d1cbb0 100644 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -2,6 +2,7 @@ require_once('include/email.php'); require_once('include/enotify.php'); +require_once('include/text.php'); function lostpass_post(&$a) { diff --git a/mod/register.php b/mod/register.php index 5e011cb9a..b9a9808b9 100644 --- a/mod/register.php +++ b/mod/register.php @@ -2,6 +2,7 @@ require_once('include/email.php'); require_once('include/bbcode.php'); +require_once('include/user.php'); if(! function_exists('register_post')) { function register_post(&$a) { @@ -45,7 +46,7 @@ function register_post(&$a) { $verified = 0; break; } - + require_once('include/user.php'); @@ -62,7 +63,7 @@ function register_post(&$a) { } $user = $result['user']; - + if($netpublish && $a->config['register_policy'] != REGISTER_APPROVE) { $url = $a->get_baseurl() . '/profile/' . $user['nickname']; proc_run('php',"include/directory.php","$url"); @@ -80,20 +81,12 @@ function register_post(&$a) { set_pconfig($user['uid'],'system','invites_remaining',$num_invites); } - $email_tpl = get_intltext_template("register_open_eml.tpl"); - $email_tpl = replace_macros($email_tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $user['username'], - '$email' => $user['email'], - '$password' => $result['password'], - '$uid' => $user['uid'] )); - - $res = mail($user['email'], email_header_encode( sprintf( t('Registration details for %s'), $a->config['sitename']),'UTF-8'), - $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); + send_register_open_eml( + $user['email'], + $a->config['sitename'], + $a->get_baseurl(), + $user['username'], + $result['password']); if($res) { diff --git a/mod/regmod.php b/mod/regmod.php index 96708eeaa..05f33ab11 100644 --- a/mod/regmod.php +++ b/mod/regmod.php @@ -1,6 +1,6 @@ $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $user[0]['username'], - '$email' => $user[0]['email'], - '$password' => $register[0]['password'], - '$uid' => $user[0]['uid'] - )); - - $res = mail($user[0]['email'], email_header_encode( sprintf(t('Registration details for %s'), $a->config['sitename']), 'UTF-8'), - $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); + send_register_open_eml( + $user[0]['email'], + $a->config['sitename'], + $a->get_baseurl(), + $user[0]['username'], + $register[0]['password']); pop_lang(); diff --git a/view/ca/register_open_eml.tpl b/view/ca/register_open_eml.tpl deleted file mode 100644 index 0170c98e3..000000000 --- a/view/ca/register_open_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Apreciat/da $username, - - Gràcies per registrar-te en $sitename. El teu compte ha estat creat. - - -Les dades d'accés són les següents: - - -Lloc: $siteurl -Nom: $email -Contrasenya: $password - - -Després d'accedir pots canviar la teva contrasenya a la pàgina de "Configuració". - -Pren un moment per revisar les altres configuracions del compte en aquesta pàgina. - - -Gràcies i benvingut/da $sitename. - - diff --git a/view/ca/smarty3/register_open_eml.tpl b/view/ca/smarty3/register_open_eml.tpl deleted file mode 100644 index ba56d6ae8..000000000 --- a/view/ca/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Apreciat/da {{$username}}, - - Gràcies per registrar-te en {{$sitename}}. El teu compte ha estat creat. - - -Les dades d'accés són les següents: - - -Lloc: {{$siteurl}} -Nom: {{$email}} -Contrasenya: {{$password}} - - -Després d'accedir pots canviar la teva contrasenya a la pàgina de "Configuració". - -Pren un moment per revisar les altres configuracions del compte en aquesta pàgina. - - -Gràcies i benvingut/da {{$sitename}}. - - diff --git a/view/cs/register_open_eml.tpl b/view/cs/register_open_eml.tpl deleted file mode 100644 index f8e42678b..000000000 --- a/view/cs/register_open_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ -Milý/milá $username, - Díky za registraci na $sitename. Váš účet byl vytvořen. -Vaše přihlašovací údaje jsou tato: - -Adresa webu: $siteurl -Přihlašovací jméno: $email -Heslo: $password - -Toto heslo si můžete změnit z vašeho účtu na stránce "Nastavení" poté, co se přihlásíte. - -Věnujte prosím chvíli revizi dalších nastavení Vašeho účtu na této stránce. - -Můžete také přidat některé základní informace do Vašeho defaultního profilu (na stránce "Profily"), čímž umožníte jiným lidem Vás snadněji nalézt. - -Doporučujeme nastavit celé jméno, přidat profilové foto, přidat nějaká profilová "klíčová slova" (což je velmi užitečné pro hledání nových přátel) a zemi, ve které žijete. Nemusíte zadávat víc informací. - -Plně respektujeme Vaše právo na soukromí a žádná z výše uvedených položek není povinná. -Pokud jste nový a neznáte na tomto webu nikoho jiného, zadáním těchto položek můžete získat nové a zajímavé přátele. - -Díky a vítejte na $sitename. - -S pozdravem, - $sitename administrátor diff --git a/view/cs/smarty3/register_open_eml.tpl b/view/cs/smarty3/register_open_eml.tpl deleted file mode 100644 index df9bcf53c..000000000 --- a/view/cs/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,24 +0,0 @@ - -Milý/milá {{$username}}, - Díky za registraci na {{$sitename}}. Váš účet byl vytvořen. -Vaše přihlašovací údaje jsou tato: - -Adresa webu: {{$siteurl}} -Přihlašovací jméno: {{$email}} -Heslo: {{$password}} - -Toto heslo si můžete změnit z vašeho účtu na stránce "Nastavení" poté, co se přihlásíte. - -Věnujte prosím chvíli revizi dalších nastavení Vašeho účtu na této stránce. - -Můžete také přidat některé základní informace do Vašeho defaultního profilu (na stránce "Profily"), čímž umožníte jiným lidem Vás snadněji nalézt. - -Doporučujeme nastavit celé jméno, přidat profilové foto, přidat nějaká profilová "klíčová slova" (což je velmi užitečné pro hledání nových přátel) a zemi, ve které žijete. Nemusíte zadávat víc informací. - -Plně respektujeme Vaše právo na soukromí a žádná z výše uvedených položek není povinná. -Pokud jste nový a neznáte na tomto webu nikoho jiného, zadáním těchto položek můžete získat nové a zajímavé přátele. - -Díky a vítejte na {{$sitename}}. - -S pozdravem, - {{$sitename}} administrátor diff --git a/view/de/register_open_eml.tpl b/view/de/register_open_eml.tpl deleted file mode 100644 index 4392e8da2..000000000 --- a/view/de/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Hallo $[username], - Danke für deine Anmeldung auf $[sitename]. Dein Account wurde angelegt. -Hier die Login Details: - - -Adresse der Seite: $[siteurl] -Login Name: $[email] -Passwort: $[password] - -Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern, -nachdem du dich erstmalig eingeloggt hast. - -Bitte nimm dir einige Augenblicke Zeit, um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen. - -Eventuell möchtest du außerdem einige grundlegende Informationen in deinem Standardprofil (auf der "Profile" Seite) eintragen, -damit andere Leute dich einfacher finden können. - -Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profilbild hochzuladen, -sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und -vielleicht auch in welchen Land du lebst; falls du nicht konkreter -werden möchtest. - -Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig. -Wenn du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen -ein paar neue und interessante Freunde zu finden. - - -Danke und willkommen auf $[sitename]. - -Beste Grüße, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/de/smarty3/register_open_eml.tpl b/view/de/smarty3/register_open_eml.tpl deleted file mode 100644 index acd286935..000000000 --- a/view/de/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -Hallo {{$username}}, - Danke für deine Anmeldung auf {{$sitename}}. Dein Account wurde angelegt. -Hier die Login Details: - - -Adresse der Seite: {{$siteurl}} -Login Name: {{$email}} -Passwort: {{$password}} - -Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern, -nachdem du dich erstmalig eingeloggt hast. - -Bitte nimm dir einige Augenblicke Zeit, um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen. - -Eventuell möchtest du außerdem einige grundlegende Informationen in deinem Standardprofil (auf der "Profile" Seite) eintragen, -damit andere Leute dich einfacher finden können. - -Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profilbild hochzuladen, -sowie ein paar "Profil-Schlüsselwörter" einzutragen (um leichter Menschen mit gleichen Interessen zu finden) - und -vielleicht auch in welchen Land du lebst; falls du nicht konkreter -werden möchtest. - -Wir respektieren dein Recht auf Privatsphäre und keine dieser Angaben ist notwendig. -Wenn du ganz neu bei Friendica bist und niemanden kennst, werden sie dir aber helfen -ein paar neue und interessante Freunde zu finden. - - -Danke und willkommen auf {{$sitename}}. - -Beste Grüße, - {{$sitename}} Administrator - - \ No newline at end of file diff --git a/view/en/register_open_eml.tpl b/view/en/register_open_eml.tpl deleted file mode 100644 index c55ac1e7e..000000000 --- a/view/en/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Dear $[username], - Thank you for registering at $[sitename]. Your account has been created. -The login details are as follows: - - -Site Location: $[siteurl] -Login Name: $[email] -Password: $[password] - -You may change your password from your account "Settings" page after logging -in. - -Please take a few moments to review the other account settings on that page. - -You may also wish to add some basic information to your default profile -(on the "Profiles" page) so that other people can easily find you. - -We recommend setting your full name, adding a profile photo, -adding some profile "keywords" (very useful in making new friends) - and -perhaps what country you live in; if you do not wish to be more specific -than that. - -We fully respect your right to privacy, and none of these items are necessary. -If you are new and do not know anybody here, they may help -you to make some new and interesting friends. - - -Thank you and welcome to $[sitename]. - -Sincerely, - $[sitename] Administrator - - diff --git a/view/en/smarty3/register_open_eml.tpl b/view/en/smarty3/register_open_eml.tpl deleted file mode 100644 index 63aca9334..000000000 --- a/view/en/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -Dear {{$username}}, - Thank you for registering at {{$sitename}}. Your account has been created. -The login details are as follows: - - -Site Location: {{$siteurl}} -Login Name: {{$email}} -Password: {{$password}} - -You may change your password from your account "Settings" page after logging -in. - -Please take a few moments to review the other account settings on that page. - -You may also wish to add some basic information to your default profile -(on the "Profiles" page) so that other people can easily find you. - -We recommend setting your full name, adding a profile photo, -adding some profile "keywords" (very useful in making new friends) - and -perhaps what country you live in; if you do not wish to be more specific -than that. - -We fully respect your right to privacy, and none of these items are necessary. -If you are new and do not know anybody here, they may help -you to make some new and interesting friends. - - -Thank you and welcome to {{$sitename}}. - -Sincerely, - {{$sitename}} Administrator - - diff --git a/view/eo/register_open_eml.tpl b/view/eo/register_open_eml.tpl deleted file mode 100644 index 735ea9a4b..000000000 --- a/view/eo/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Kara $[username], - Dankon pro via registrado ĉe $[sitename]. Vian konton estas kreita. -Jen viaj legitimaĵoj: - - -Retejo:»$[siteurl] -Salutnomo:»$[email] -Pasvorto:»$[password] - -Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas -ensalutita. - -Bonvolu preni kelkajn momentoj por kontroli la aliajn kontaktagordojn. - -Eble vi volas aldoni kelkajn bazajn informojn al via profilo -(ĉe la paĝo "Profiloj"), tial vi troveblas al aliaj uzantoj. - -Ni rekomendas agordi vian plenan noman, aldoni profilbildon, -kaj aldojo kelkajn ŝlosilvortojn (tre utila por trovi novajn amikojn) - kaj -eble en kiu lando vi loĝas, se vi ne volas pli specifa -ol tio. - -Ni tute respektas vian privatecon, kaj neniu de tiuj agordoj necesas. -Se vi novas kaj ne konas iun ĉi tie, ili eble helpas -vin trovi novajn kaj interesajn amikojn. - - -Dankon kaj bonvenon ĉe $[sitename]. - -Salutoj, - $[sitename] administranto - - \ No newline at end of file diff --git a/view/eo/smarty3/register_open_eml.tpl b/view/eo/smarty3/register_open_eml.tpl deleted file mode 100644 index b2cabc68c..000000000 --- a/view/eo/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -Kara {{$username}}, - Dankon pro via registrado ĉe {{$sitename}}. Vian konton estas kreita. -Jen viaj legitimaĵoj: - - -Retejo:»{{$siteurl}} -Salutnomo:»{{$email}} -Pasvorto:»{{$password}} - -Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas -ensalutita. - -Bonvolu preni kelkajn momentoj por kontroli la aliajn kontaktagordojn. - -Eble vi volas aldoni kelkajn bazajn informojn al via profilo -(ĉe la paĝo "Profiloj"), tial vi troveblas al aliaj uzantoj. - -Ni rekomendas agordi vian plenan noman, aldoni profilbildon, -kaj aldojo kelkajn ŝlosilvortojn (tre utila por trovi novajn amikojn) - kaj -eble en kiu lando vi loĝas, se vi ne volas pli specifa -ol tio. - -Ni tute respektas vian privatecon, kaj neniu de tiuj agordoj necesas. -Se vi novas kaj ne konas iun ĉi tie, ili eble helpas -vin trovi novajn kaj interesajn amikojn. - - -Dankon kaj bonvenon ĉe {{$sitename}}. - -Salutoj, - {{$sitename}} administranto - - \ No newline at end of file diff --git a/view/es/register_open_eml.tpl b/view/es/register_open_eml.tpl deleted file mode 100644 index 7c7a90b40..000000000 --- a/view/es/register_open_eml.tpl +++ /dev/null @@ -1,21 +0,0 @@ - -Estimado/a $username, - - Gracias por registrarte en $sitename. Tu cuenta ha sido creada. - - -Los datos de acceso son los siguientes: - -Sitio: $siteurl -Nombre: $email -Contraseña: $password - - -Después de acceder puedes cambiar tu contraseña en la página de "Configuración". - -Toma un momento para revisar las otras configuraciones de la cuenta en esa página. - - -Gracias y bienvenido/a $sitename. - - diff --git a/view/es/smarty3/register_open_eml.tpl b/view/es/smarty3/register_open_eml.tpl deleted file mode 100644 index 0d0cc5ae0..000000000 --- a/view/es/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - - -Estimado/a {{$username}}, - - Gracias por registrarte en {{$sitename}}. Tu cuenta ha sido creada. - - -Los datos de acceso son los siguientes: - -Sitio: {{$siteurl}} -Nombre: {{$email}} -Contraseña: {{$password}} - - -Después de acceder puedes cambiar tu contraseña en la página de "Configuración". - -Toma un momento para revisar las otras configuraciones de la cuenta en esa página. - - -Gracias y bienvenido/a {{$sitename}}. - - diff --git a/view/fr/register_open_eml.tpl b/view/fr/register_open_eml.tpl deleted file mode 100644 index 427ad561a..000000000 --- a/view/fr/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Cher $[username], - Merci de vous être inscrit sur $[sitename]. Votre compte est bien créé. -Vos informations de connexion sont comme suit : - - -Adresse du site: $[siteurl] -Utilisateur: $[email] -Mot de passe: $[password] - -Vous pouvez changer votre mot de passe depuis la page "Réglages" une fois -connecté. - -Merci de prender quelques instants pour vérifier les autres réglages de cette page. - -Vous pouvez aussi ajouter quelques informatiques de base à votre profil par défaut -(sur la page "Profils") pour que les autres membres vous trouvent facilement. - -Nous vous recommandons d'indiquer un nom complet, d'ajouter une photo -de profil, quelques "mots-clés" (très efficace pour rencontrer des gens) - et -peut-être aussi votre pays de résidence ; sauf si vous souhaitez être plus -précis, bien sûr. - -Nous avons le plus grand respect pour votre vie privée, et aucun de ces éléments n'est nécessaire. -Si vous êtes nouveau et ne connaissez personne, ils peuvent cependant vous -aider à vous faire quelques nouveaux et intéressants contacts. - - -Merci, et bienvenue sur $[sitename]. - -Sincèrement votre, - l'administrateur de $[sitename] - - \ No newline at end of file diff --git a/view/fr/smarty3/register_open_eml.tpl b/view/fr/smarty3/register_open_eml.tpl deleted file mode 100644 index 3e8121354..000000000 --- a/view/fr/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Cher(e) {{$username}}, - - Merci de votre inscription à {{$sitename}}. Votre compte a été créé. -Les informations de connexion sont les suivantes : - -Site : {{$siteurl}} -Pseudo/Courriel : {{$email}} -Mot de passe : {{$password}} - -Vous pouvez changer de mot de passe dans la page des « Réglages » de votre compte, -après connexion. - -Merci de prendre quelques minutes pour découvrir les autres réglages disponibles -sur cette page. - -Merci, et bienvenue sur {{$sitename}}. - -Sincèrement votre, - l'administrateur de {{$sitename}} - - diff --git a/view/is/register_open_eml.tpl b/view/is/register_open_eml.tpl deleted file mode 100644 index fd564a142..000000000 --- a/view/is/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Góðan daginn $[username], - Takk fyrir að skrá þig á $[sitename]. Notandinn þinn hefur verið stofnaður. -Innskráningar upplýsingarnar þínar eru eftirfarandi: - - -Vefþjónn: $[siteurl] -Notendanafn: $[email] -Aðgangsorð: $[password] - -Þú getur breytt aðgangsorðinu þínu á "Stillingar" síðunni eftir að þú hefur skráð þig -inn. - -Endilega eyddu smá tíma í að yfirfara aðrar notenda stillingar á þeirri síðu. - -Einnig gætir þú bætt við grunnupplýsingum á sjálfgefna prófílinn -(á "Forsíður" síðunni) svo aðrið geti auðveldlega fundið þig. - -Við mælum með að þú setjir fullt nafn, bætir við prófíl mynd, -bætir nokkrum "leitarorðum" (mjög gagnlegt við að eignast nýja vini) og -mögulega bætir við í hvaða landi þú býrð, ef þú villt ekki vera nákvæmari -en það. - -Við virðum að fullu rétt þinn til einkalífs, því er ekkert að þessum atriðum skilyrði. -Ef þú ert byrjandi og þekkir ekki einhvern hér, þér eru hér fólk -sem getur aðstoðað þig við að eignast nýja og áhugaverða vini. - - -Takk fyrir og velkomin(n) á $[sitename]. - -Bestu kveðjur, - Kerfisstjóri $[sitename] - - \ No newline at end of file diff --git a/view/is/smarty3/register_open_eml.tpl b/view/is/smarty3/register_open_eml.tpl deleted file mode 100644 index 3391c08c1..000000000 --- a/view/is/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -Góðan daginn {{$username}}, - Takk fyrir að skrá þig á {{$sitename}}. Notandinn þinn hefur verið stofnaður. -Innskráningar upplýsingarnar þínar eru eftirfarandi: - - -Vefþjónn: {{$siteurl}} -Notendanafn: {{$email}} -Aðgangsorð: {{$password}} - -Þú getur breytt aðgangsorðinu þínu á "Stillingar" síðunni eftir að þú hefur skráð þig -inn. - -Endilega eyddu smá tíma í að yfirfara aðrar notenda stillingar á þeirri síðu. - -Einnig gætir þú bætt við grunnupplýsingum á sjálfgefna prófílinn -(á "Forsíður" síðunni) svo aðrið geti auðveldlega fundið þig. - -Við mælum með að þú setjir fullt nafn, bætir við prófíl mynd, -bætir nokkrum "leitarorðum" (mjög gagnlegt við að eignast nýja vini) og -mögulega bætir við í hvaða landi þú býrð, ef þú villt ekki vera nákvæmari -en það. - -Við virðum að fullu rétt þinn til einkalífs, því er ekkert að þessum atriðum skilyrði. -Ef þú ert byrjandi og þekkir ekki einhvern hér, þér eru hér fólk -sem getur aðstoðað þig við að eignast nýja og áhugaverða vini. - - -Takk fyrir og velkomin(n) á {{$sitename}}. - -Bestu kveðjur, - Kerfisstjóri {{$sitename}} - - \ No newline at end of file diff --git a/view/it/smarty3/register_open_eml.tpl b/view/it/smarty3/register_open_eml.tpl deleted file mode 100644 index 23dcaf2c8..000000000 --- a/view/it/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Ciao {{$username}}, - Grazie per aver effettuato la registrazione a {{$sitename}}. Il tuo account è stato creato. -I dettagli di accesso sono i seguenti - - -Sito:»{{$siteurl}} -Nome utente:»{{$email}} -Password:»{{$password}} - -Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso -. - -Prenditi un momento per dare un'occhiata alle altre impostazioni del tuo profilo nella stessa pagina. - -Potrest voler aggiungere alcune informazioni di base a quelle predefinite del profilo -(nella pagina "Profilo") per rendere agli altri più facile trovarti. - -Noi raccomandiamo di impostare il tuo nome completo, di aggiungere una foto, -di aggiungere alcune "parole chiavi" (molto utili per farsi nuovi amici) - e -magari il paese dove vivi; se non vuoi essere più dettagliato -di così. - -Noi rispettiamo il tuo diritto alla privacy e nessuna di queste informazioni è indispensabile. -Se ancora non conosci nessuno qui, potrebbe esserti di aiuto -per farti nuovi e interessanti amici. - - -Grazie. Siamo contenti di darti il benvenuto su {{$sitename}} - -Saluti, - l'amministratore di {{$sitename}} - - \ No newline at end of file diff --git a/view/nb-no/register_open_eml.tpl b/view/nb-no/register_open_eml.tpl deleted file mode 100644 index 345ca0b65..000000000 --- a/view/nb-no/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Kjære $[username], - Takk for at du registrerte deg hos $[sitename]. Kontoen din er opprettet. -Innloggingsdetaljene er som følger: - - -Nettstedsadresse:»$[siteurl] -Brukernavn:»$[email] -Passord:»$[password] - -Du kan endre passordet ditt på siden "Innstillinger" etter at du har logget -inn. - -Vennligst bruk litt tid til å se over de andre kontoinnstillingene på den siden. - -Du vil antakelig ønske å legge til litt grunnleggende informasjon til standardprofilen din -(på siden "Profiler") slik at folk lettere kan finne deg. - -Vi anbefaler å oppgi fullt navn, legge til et profilbilde, -legge til noen "nøkkelord" for profilen (svært nyttig for å få nye venner) - og -kanskje hvilket land du bor i, hvis du ikke ønsker å være mer spesifikk -enn det. - -Vi respekterer ditt privatliv fullt ut, og ingen av disse elementene er nødvendige. -Hvis du er ny og ikke kjenner noen her, så kan de hjelpe -deg å få noen nye og interessante venner. - - -Takk og velkommen til $[sitename]. - -Beste hilsen, - $[sitename] administrator - - \ No newline at end of file diff --git a/view/nb-no/smarty3/register_open_eml.tpl b/view/nb-no/smarty3/register_open_eml.tpl deleted file mode 100644 index 1361a0488..000000000 --- a/view/nb-no/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -Kjære {{$username}}, - Takk for at du registrerte deg hos {{$sitename}}. Kontoen din er opprettet. -Innloggingsdetaljene er som følger: - - -Nettstedsadresse:»{{$siteurl}} -Brukernavn:»{{$email}} -Passord:»{{$password}} - -Du kan endre passordet ditt på siden "Innstillinger" etter at du har logget -inn. - -Vennligst bruk litt tid til å se over de andre kontoinnstillingene på den siden. - -Du vil antakelig ønske å legge til litt grunnleggende informasjon til standardprofilen din -(på siden "Profiler") slik at folk lettere kan finne deg. - -Vi anbefaler å oppgi fullt navn, legge til et profilbilde, -legge til noen "nøkkelord" for profilen (svært nyttig for å få nye venner) - og -kanskje hvilket land du bor i, hvis du ikke ønsker å være mer spesifikk -enn det. - -Vi respekterer ditt privatliv fullt ut, og ingen av disse elementene er nødvendige. -Hvis du er ny og ikke kjenner noen her, så kan de hjelpe -deg å få noen nye og interessante venner. - - -Takk og velkommen til {{$sitename}}. - -Beste hilsen, - {{$sitename}} administrator - - \ No newline at end of file diff --git a/view/nl/register_open_eml.tpl b/view/nl/register_open_eml.tpl deleted file mode 100644 index 4e575a4a1..000000000 --- a/view/nl/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Beste $[username], - Bedankt voor uw registratie op $[sitename]. Uw account is gecreëerd. -De inloggegevens zijn als volgt: - - -Website-adres:»$[siteurl] -Inlognaam:»$[email] -Wachtwoord:»$[password] - -U kunt dit wachtwoord veranderen in uw account-instellingen, nadat u bent -ingelogd. - -Neem even een moment om de overige account-instellingen na te gaan. - -U wilt misschien ook wat algemene informatie toevoegen aan uw standaardprofiel -(op de "Profiel"-pagina), zodat andere mensen u eenvoudiger kunnen vinden. - -Wanneer u niet te specifiek wilt zijn, dan adviseren wij om uw volledige naam, -een profielfoto, enkele "trefwoorden (erg handig om nieuwe mensen te leren kennen) -en het land waar u woont toe -te voegen. - -Wij respecteren volledig uw recht op privacy en u bent daarom niet verplicht om hier iets in te vullen. -Wanneer u hier nieuw bent en hier niemand kent, dan kunnen deze -gegevens u wellicht helpen om enkele nieuwe en interessante mensen te leren kennen. - - -Bedankt en welkom op $[sitename]. - -Vriendelijke groet, - Beheerder $[sitename] - - \ No newline at end of file diff --git a/view/pl/register_open_eml.tpl b/view/pl/register_open_eml.tpl deleted file mode 100644 index 0321f8e3f..000000000 --- a/view/pl/register_open_eml.tpl +++ /dev/null @@ -1,36 +0,0 @@ - -Drogi $[username], - Dziękujemy za rejestrację na $[sitename]. Twoje konto zostało utworzone pomyślnie. -Dane do logowania: - - -Strona:»$[siteurl] -Twój Nick:»$[email] -Hasło:»$[password] - -Możesz zmienić swoje hasło odwiedzając zakładkę ustawienia konta po zalogowaniu - -się. - -Przejrzyj też inne ustawienia konta. To zajmie Ci tylko chwilę. - -Jeżeli chcesz, by inni mogli Cię łatwo znaleść wystarczy dodać podstawowe informacje -o sobie na stronie "Profile". - -Zalecamy dodać prawdziwe imię i nazwisko, zdjęcie profilowe, -słowa kluczowe (pomocne w zdobywaniu nowych przyjaciół) - i -może kraj, w którym mieszkasz, jeżeli nie chcesz dodać bardziej szczegółowych - -informacji niż ta. - -Szanujemy też twoją prywatność, więc żadna z podpowiadanych wyżej czynności nie jest przymusowa. -Jeżeli jesteś nowy i nie znasz tu nikogo, mogą one jedynie -pomóć w zdobywaniu nowych znajomości. - - -Dziękujemy i witamy na $[sitename]. - -Z poważaniem, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/pl/smarty3/register_open_eml.tpl b/view/pl/smarty3/register_open_eml.tpl deleted file mode 100644 index 6361e3c38..000000000 --- a/view/pl/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,37 +0,0 @@ - - -Drogi {{$username}}, - Dziękujemy za rejestrację na {{$sitename}}. Twoje konto zostało utworzone pomyślnie. -Dane do logowania: - - -Strona:»{{$siteurl}} -Twój Nick:»{{$email}} -Hasło:»{{$password}} - -Możesz zmienić swoje hasło odwiedzając zakładkę ustawienia konta po zalogowaniu - -się. - -Przejrzyj też inne ustawienia konta. To zajmie Ci tylko chwilę. - -Jeżeli chcesz, by inni mogli Cię łatwo znaleść wystarczy dodać podstawowe informacje -o sobie na stronie "Profile". - -Zalecamy dodać prawdziwe imię i nazwisko, zdjęcie profilowe, -słowa kluczowe (pomocne w zdobywaniu nowych przyjaciół) - i -może kraj, w którym mieszkasz, jeżeli nie chcesz dodać bardziej szczegółowych - -informacji niż ta. - -Szanujemy też twoją prywatność, więc żadna z podpowiadanych wyżej czynności nie jest przymusowa. -Jeżeli jesteś nowy i nie znasz tu nikogo, mogą one jedynie -pomóć w zdobywaniu nowych znajomości. - - -Dziękujemy i witamy na {{$sitename}}. - -Z poważaniem, - {{$sitename}} Administrator - - \ No newline at end of file diff --git a/view/ro/smarty3/register_open_eml.tpl b/view/ro/smarty3/register_open_eml.tpl deleted file mode 100644 index d1c71134d..000000000 --- a/view/ro/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -Dragă $[username], - Vă mulțumim pentru înregistrare de la $ [SITENAME]. Contul dvs. a fost creat. -Detaliile de login sunt următoarele ; - - -Locaţie Site»$[siteurl] -Login Name: $[email] -Parolă: $[password] - -Puteți schimba parola dvs. de la pagina "Setări" cont după logare. -in. - -Vă rugăm ia câteva momente pentru revizuirea altor setări din cont pe această pagină. - -Ați putea dori, de asemenea, să adăugați câteva Informații generale la profilul dvs. implicit -(pe "Profile" pagina), astfel încât alte persoane să vă găsească uşor. - -Vă recomandăm să vă setați numele complet, adăugând o fotografie de profil, -adăugând câteva "cuvinte cheie" de profil (foarte utile în a face noi prieteni) - și -poate în ce țara locuiți; dacă nu doriți să fie mai specifice -decât atât. - -Respectăm pe deplin dreptul la intimitate, și nici unul dintre aceşti itemi nu sunt necesari. -Dacă sunteți nou si nu ştiţi pe nimeni pe aici, ele pot ajuta -să faceți niște prieteni noi și interesanţi. - - -Vă multumim si bine aţi venit la $[sitename]. - -Cu stimă, - $[sitename] Administrator - - \ No newline at end of file diff --git a/view/sv/register_open_eml.tpl b/view/sv/register_open_eml.tpl deleted file mode 100644 index 1471c9b98..000000000 --- a/view/sv/register_open_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ -$username, -Tack för att du registrerat dig på $sitename. Kontot har skapats. -Här är dina inloggningsuppgifter: - -Webbplats: $siteurl -Användarnamn: $email -Lösenord: $password - -Lösenordet kan ändras på sidan Inställningar efter att du loggat in. - -Ägna en liten stund åt att gå igenom alla kontoinställningar där. - -Välkommen till $sitename. - -Hälsningar, -$sitename admin - diff --git a/view/sv/smarty3/register_open_eml.tpl b/view/sv/smarty3/register_open_eml.tpl deleted file mode 100644 index a399bd02b..000000000 --- a/view/sv/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -{{$username}}, -Tack för att du registrerat dig på {{$sitename}}. Kontot har skapats. -Här är dina inloggningsuppgifter: - -Webbplats: {{$siteurl}} -Användarnamn: {{$email}} -Lösenord: {{$password}} - -Lösenordet kan ändras på sidan Inställningar efter att du loggat in. - -Ägna en liten stund åt att gå igenom alla kontoinställningar där. - -Välkommen till {{$sitename}}. - -Hälsningar, -{{$sitename}} admin - diff --git a/view/zh-cn/register_open_eml.tpl b/view/zh-cn/register_open_eml.tpl deleted file mode 100644 index 9eb43b33b..000000000 --- a/view/zh-cn/register_open_eml.tpl +++ /dev/null @@ -1,34 +0,0 @@ - -尊敬的$[username]， - 谢谢注册在$[sitename]。您的账户造成了。 -登记信息是： - - -网页位置: $[siteurl] -用户名: $[email] -密码: $[password] - -您会变化您的密码在您的账户「设置」页 -登记后。 - -请抽几片刻评论别的账户设置在这个页。 - -您也可能想添加一些基础信息给您的默认简介 -(在「简介」页)为让别人容易地搜索。 - -我们建议您指定您全名，添加简介照片， -添加一些简介关键字(很有用找朋友们)和 -也许您的国家，如果您不想更具体 -的。 - -我们完全尊敬您隐私权利，这些项目没有必要的。 -您新注册，人们熟，他们会帮您 -找新和有意思的朋友们。 - - -谢谢您，$[sitename]欢迎您。 - -谨上 - $[sitename]行政人员 - - \ No newline at end of file diff --git a/view/zh-cn/smarty3/register_open_eml.tpl b/view/zh-cn/smarty3/register_open_eml.tpl deleted file mode 100644 index 75756d41f..000000000 --- a/view/zh-cn/smarty3/register_open_eml.tpl +++ /dev/null @@ -1,35 +0,0 @@ - - -尊敬的{{$username}}， - 谢谢注册在{{$sitename}}。您的账户造成了。 -登记信息是： - - -网页位置: {{$siteurl}} -用户名: {{$email}} -密码: {{$password}} - -您会变化您的密码在您的账户「设置」页 -登记后。 - -请抽几片刻评论别的账户设置在这个页。 - -您也可能想添加一些基础信息给您的默认简介 -(在「简介」页)为让别人容易地搜索。 - -我们建议您指定您全名，添加简介照片， -添加一些简介关键字(很有用找朋友们)和 -也许您的国家，如果您不想更具体 -的。 - -我们完全尊敬您隐私权利，这些项目没有必要的。 -您新注册，人们熟，他们会帮您 -找新和有意思的朋友们。 - - -谢谢您，{{$sitename}}欢迎您。 - -谨上 - {{$sitename}}行政人员 - - \ No newline at end of file From a5df9b8b5d0d1763009d5d20e034a9a26f3fa976 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sun, 7 Sep 2014 12:35:08 +0200 Subject: [PATCH 11/26] Somebody stop me! (not really..) --- view/ca/request_notify_eml.tpl | 13 ------------- view/ca/smarty3/request_notify_eml.tpl | 14 -------------- view/cs/request_notify_eml.tpl | 15 --------------- view/cs/smarty3/request_notify_eml.tpl | 16 ---------------- view/de/request_notify_eml.tpl | 17 ----------------- view/de/smarty3/request_notify_eml.tpl | 18 ------------------ view/en/request_notify_eml.tpl | 17 ----------------- view/en/smarty3/request_notify_eml.tpl | 18 ------------------ view/eo/request_notify_eml.tpl | 17 ----------------- view/eo/smarty3/request_notify_eml.tpl | 18 ------------------ view/es/request_notify_eml.tpl | 13 ------------- view/es/smarty3/request_notify_eml.tpl | 14 -------------- view/fr/request_notify_eml.tpl | 17 ----------------- view/fr/smarty3/request_notify_eml.tpl | 18 ------------------ view/is/request_notify_eml.tpl | 17 ----------------- view/is/smarty3/request_notify_eml.tpl | 18 ------------------ view/it/smarty3/request_notify_eml.tpl | 17 ----------------- view/nb-no/request_notify_eml.tpl | 17 ----------------- view/nb-no/smarty3/request_notify_eml.tpl | 18 ------------------ view/nl/request_notify_eml.tpl | 17 ----------------- view/pl/request_notify_eml.tpl | 17 ----------------- view/pl/smarty3/request_notify_eml.tpl | 18 ------------------ view/ro/smarty3/request_notify_eml.tpl | 17 ----------------- view/sv/request_notify_eml.tpl | 13 ------------- view/sv/smarty3/request_notify_eml.tpl | 14 -------------- view/zh-cn/request_notify_eml.tpl | 17 ----------------- view/zh-cn/smarty3/request_notify_eml.tpl | 18 ------------------ 27 files changed, 443 deletions(-) delete mode 100644 view/ca/request_notify_eml.tpl delete mode 100644 view/ca/smarty3/request_notify_eml.tpl delete mode 100644 view/cs/request_notify_eml.tpl delete mode 100644 view/cs/smarty3/request_notify_eml.tpl delete mode 100644 view/de/request_notify_eml.tpl delete mode 100644 view/de/smarty3/request_notify_eml.tpl delete mode 100644 view/en/request_notify_eml.tpl delete mode 100644 view/en/smarty3/request_notify_eml.tpl delete mode 100644 view/eo/request_notify_eml.tpl delete mode 100644 view/eo/smarty3/request_notify_eml.tpl delete mode 100644 view/es/request_notify_eml.tpl delete mode 100644 view/es/smarty3/request_notify_eml.tpl delete mode 100644 view/fr/request_notify_eml.tpl delete mode 100644 view/fr/smarty3/request_notify_eml.tpl delete mode 100644 view/is/request_notify_eml.tpl delete mode 100644 view/is/smarty3/request_notify_eml.tpl delete mode 100644 view/it/smarty3/request_notify_eml.tpl delete mode 100644 view/nb-no/request_notify_eml.tpl delete mode 100644 view/nb-no/smarty3/request_notify_eml.tpl delete mode 100644 view/nl/request_notify_eml.tpl delete mode 100644 view/pl/request_notify_eml.tpl delete mode 100644 view/pl/smarty3/request_notify_eml.tpl delete mode 100644 view/ro/smarty3/request_notify_eml.tpl delete mode 100644 view/sv/request_notify_eml.tpl delete mode 100644 view/sv/smarty3/request_notify_eml.tpl delete mode 100644 view/zh-cn/request_notify_eml.tpl delete mode 100644 view/zh-cn/smarty3/request_notify_eml.tpl diff --git a/view/ca/request_notify_eml.tpl b/view/ca/request_notify_eml.tpl deleted file mode 100644 index 276624aae..000000000 --- a/view/ca/request_notify_eml.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -Apreciat/da $myname, - -Acabes de rebre una sol·licitud de connexió de '$requestor' en $sitename. - -Pots visitar el seu perfil en $url. - -Accedeix al teu lloc per a veure la presentació completa i acceptar o ignorar/cancel·lar la sol·licitud. - -$siteurl - - - $sitename diff --git a/view/ca/smarty3/request_notify_eml.tpl b/view/ca/smarty3/request_notify_eml.tpl deleted file mode 100644 index 5bef9f672..000000000 --- a/view/ca/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - - -Apreciat/da {{$myname}}, - -Acabes de rebre una sol·licitud de connexió de '{{$requestor}}' en {{$sitename}}. - -Pots visitar el seu perfil en {{$url}}. - -Accedeix al teu lloc per a veure la presentació completa i acceptar o ignorar/cancel·lar la sol·licitud. - -{{$siteurl}} - - - {{$sitename}} diff --git a/view/cs/request_notify_eml.tpl b/view/cs/request_notify_eml.tpl deleted file mode 100644 index 74010c79c..000000000 --- a/view/cs/request_notify_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - -Milý/Milá $username, - -Právě jste obdržel/obdržela požadavek na spojení na webu $sitename - -od '$requestor'. - -Můžete navštívit jeho/její profil na následujícím odkazu $url. - -Přihlaste se na Váš web k zobrazení kompletní žádosti a odsouhlaste nebo ignorujte/zrušte tuto žádost. - -$siteurl - -S pozdravem, - $sitename administrátor diff --git a/view/cs/smarty3/request_notify_eml.tpl b/view/cs/smarty3/request_notify_eml.tpl deleted file mode 100644 index 6fd4d02bc..000000000 --- a/view/cs/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,16 +0,0 @@ - - -Milý/Milá {{$username}}, - -Právě jste obdržel/obdržela požadavek na spojení na webu {{$sitename}} - -od '{{$requestor}}'. - -Můžete navštívit jeho/její profil na následujícím odkazu {{$url}}. - -Přihlaste se na Váš web k zobrazení kompletní žádosti a odsouhlaste nebo ignorujte/zrušte tuto žádost. - -{{$siteurl}} - -S pozdravem, - {{$sitename}} administrátor diff --git a/view/de/request_notify_eml.tpl b/view/de/request_notify_eml.tpl deleted file mode 100644 index da1fe5bdc..000000000 --- a/view/de/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Hallo $[myname], - -du hast eine Kontaktanfrage von '$[requestor]' auf $[sitename] - -erhalten. - -Du kannst sein/ihr Profil unter $[url] finden. - -Bitte melde dich an um die komplette Anfrage einzusehen -und die Kontaktanfrage zu bestätigen oder zu ignorieren oder abzulehnen. - -$[siteurl] - -Beste Grüße, - - $[sitename] Administrator \ No newline at end of file diff --git a/view/de/smarty3/request_notify_eml.tpl b/view/de/smarty3/request_notify_eml.tpl deleted file mode 100644 index a68032c20..000000000 --- a/view/de/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Hallo {{$myname}}, - -du hast eine Kontaktanfrage von '{{$requestor}}' auf {{$sitename}} - -erhalten. - -Du kannst sein/ihr Profil unter {{$url}} finden. - -Bitte melde dich an um die komplette Anfrage einzusehen -und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen. - -{{$siteurl}} - -Beste Grüße, - - {{$sitename}} Administrator \ No newline at end of file diff --git a/view/en/request_notify_eml.tpl b/view/en/request_notify_eml.tpl deleted file mode 100644 index ad118a673..000000000 --- a/view/en/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Dear $[myname], - -You have just received a connection request at $[sitename] - -from '$[requestor]'. - -You may visit their profile at $[url]. - -Please login to your site to view the complete introduction -and approve or ignore/cancel the request. - -$[siteurl] - -Regards, - - $[sitename] administrator diff --git a/view/en/smarty3/request_notify_eml.tpl b/view/en/smarty3/request_notify_eml.tpl deleted file mode 100644 index b36525251..000000000 --- a/view/en/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Dear {{$myname}}, - -You have just received a connection request at {{$sitename}} - -from '{{$requestor}}'. - -You may visit their profile at {{$url}}. - -Please login to your site to view the complete introduction -and approve or ignore/cancel the request. - -{{$siteurl}} - -Regards, - - {{$sitename}} administrator diff --git a/view/eo/request_notify_eml.tpl b/view/eo/request_notify_eml.tpl deleted file mode 100644 index eb91414b9..000000000 --- a/view/eo/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Kara $[myname], - -Vi ĵus ricevis kontaktpeton ĉe $[sitename] - -de '$[requestor]'. - -Vi eblas viziti la profilon de la petanto ĉe $[url]. - -Bonvolu ensaluti en la retejo por vidi la plenan prezenton -kaj aprobi aŭ ignori/nuligi la peton. - -$[siteurl] - -Salutoj, - - $[sitename] administranto \ No newline at end of file diff --git a/view/eo/smarty3/request_notify_eml.tpl b/view/eo/smarty3/request_notify_eml.tpl deleted file mode 100644 index 9032ab7b6..000000000 --- a/view/eo/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Kara {{$myname}}, - -Vi ĵus ricevis kontaktpeton ĉe {{$sitename}} - -de '{{$requestor}}'. - -Vi eblas viziti la profilon de la petanto ĉe {{$url}}. - -Bonvolu ensaluti en la retejo por vidi la plenan prezenton -kaj aprobi aŭ ignori/nuligi la peton. - -{{$siteurl}} - -Salutoj, - - {{$sitename}} administranto \ No newline at end of file diff --git a/view/es/request_notify_eml.tpl b/view/es/request_notify_eml.tpl deleted file mode 100644 index 6161c45c1..000000000 --- a/view/es/request_notify_eml.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -Estimado/a $myname, - -Acabas de recibir una solicitud de conexión de '$requestor' en $sitename. - -Puedes visitar su perfil en $url. - -Accede a tu sitio para ver la presentación completa y aceptar o ignorar/cancelar la solicitud. - -$siteurl - - - $sitename diff --git a/view/es/smarty3/request_notify_eml.tpl b/view/es/smarty3/request_notify_eml.tpl deleted file mode 100644 index e4eae838b..000000000 --- a/view/es/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - - -Estimado/a {{$myname}}, - -Acabas de recibir una solicitud de conexión de '{{$requestor}}' en {{$sitename}}. - -Puedes visitar su perfil en {{$url}}. - -Accede a tu sitio para ver la presentación completa y aceptar o ignorar/cancelar la solicitud. - -{{$siteurl}} - - - {{$sitename}} diff --git a/view/fr/request_notify_eml.tpl b/view/fr/request_notify_eml.tpl deleted file mode 100644 index 9234ceaaa..000000000 --- a/view/fr/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Cher(e) $myname, - -Vous venez de recevoir une demande de mise en relation sur $sitename - -venant de « $requestor ». - -Vous pouvez visiter son profil sur $url. - -Vous pouvez vous connecter à votre site pour voir la demande -complète et l'approuver ou l'ignorer/annuler. - -$siteurl - -Cordialement, - - l'administrateur de $sitename diff --git a/view/fr/smarty3/request_notify_eml.tpl b/view/fr/smarty3/request_notify_eml.tpl deleted file mode 100644 index 6fa998a76..000000000 --- a/view/fr/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Cher(e) {{$myname}}, - -Vous venez de recevoir une demande de mise en relation sur {{$sitename}} - -venant de « {{$requestor}} ». - -Vous pouvez visiter son profil sur {{$url}}. - -Vous pouvez vous connecter à votre site pour voir la demande -complète et l'approuver ou l'ignorer/annuler. - -{{$siteurl}} - -Cordialement, - - l'administrateur de {{$sitename}} diff --git a/view/is/request_notify_eml.tpl b/view/is/request_notify_eml.tpl deleted file mode 100644 index 7adb48e0d..000000000 --- a/view/is/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Góðan dag $[myname], - -Þér hefur borist beiðni um tengingu á $[sitename] - -frá '$[requestor]'. - -Þú getur heimsótt forsíðuna á $[url]. - -skráðu þig inn á þína síðu til að skoða alla kynninguna -og þar getur þú hunsað/hætt við beiðnina. - -$[siteurl] - -Kveðja, - - Kerfisstjóri $[sitename] \ No newline at end of file diff --git a/view/is/smarty3/request_notify_eml.tpl b/view/is/smarty3/request_notify_eml.tpl deleted file mode 100644 index 09a80902a..000000000 --- a/view/is/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Góðan dag {{$myname}}, - -Þér hefur borist beiðni um tengingu á {{$sitename}} - -frá '{{$requestor}}'. - -Þú getur heimsótt forsíðuna á {{$url}}. - -skráðu þig inn á þína síðu til að skoða alla kynninguna -og þar getur þú hunsað/hætt við beiðnina. - -{{$siteurl}} - -Kveðja, - - Kerfisstjóri {{$sitename}} \ No newline at end of file diff --git a/view/it/smarty3/request_notify_eml.tpl b/view/it/smarty3/request_notify_eml.tpl deleted file mode 100644 index b0efcb40b..000000000 --- a/view/it/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Ciao {{$myname}}, - -Hai appena ricevuto una richiesta di connessione su {{$sitename}} - -da '{{$requestor}}'. - -Puoi visitare il suo profilo su {{$url}}. - -Accedi al tuo sito per vedere la richiesta completa -e approva o ignora/annulla la richiesta. - -{{$siteurl}} - -Saluti, - - l'amministratore di {{$sitename}} \ No newline at end of file diff --git a/view/nb-no/request_notify_eml.tpl b/view/nb-no/request_notify_eml.tpl deleted file mode 100644 index e6a62c51f..000000000 --- a/view/nb-no/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Kjære $[myname], - -Du har akkurat mottatt en kontaktforespørsel hos $[sitename] - -fra '$[requestor]'. - -Du kan besøke profilen på $[url]. - -Vennligst logg inn på ditt nettsted for å se hele introduksjonen -og godkjenne eller ignorere/avbryte forespørselen. - -$[siteurl] - -Beste hilsen, - - $[siteurl] administrator \ No newline at end of file diff --git a/view/nb-no/smarty3/request_notify_eml.tpl b/view/nb-no/smarty3/request_notify_eml.tpl deleted file mode 100644 index d12e3b75a..000000000 --- a/view/nb-no/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Kjære {{$myname}}, - -Du har akkurat mottatt en kontaktforespørsel hos {{$sitename}} - -fra '{{$requestor}}'. - -Du kan besøke profilen på {{$url}}. - -Vennligst logg inn på ditt nettsted for å se hele introduksjonen -og godkjenne eller ignorere/avbryte forespørselen. - -{{$siteurl}} - -Beste hilsen, - - {{$siteurl}} administrator \ No newline at end of file diff --git a/view/nl/request_notify_eml.tpl b/view/nl/request_notify_eml.tpl deleted file mode 100644 index 78d28c27b..000000000 --- a/view/nl/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Beste $[myname], - -U heeft zojuist een contactaanvraag ontvangen op $[sitename] - -van '$[requestor]'. - -U kunt het profiel bezoeken op $[url]. - -U moet op uw Friendica-site inloggen om de volledige contactaanvraag te bekijken en -goed te keuren, of om te negeren/annuleren. - -$[siteurl] - -Vriendelijke groet, - - Beheerder $[sitename] \ No newline at end of file diff --git a/view/pl/request_notify_eml.tpl b/view/pl/request_notify_eml.tpl deleted file mode 100644 index aece35d11..000000000 --- a/view/pl/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Drogi/a $[myname], - -Otrzymałeś właśnie zaproszenie do znajomych na stronie $[sitename] - -od '$[requestor]'. - -Skorzystaj z tego linku, aby odwiedzić jego profil: $[url]. - -Proszę się zalogować, aby zobaczyć pełen opis -i zaakceptować lub zignorować / anulować. - -$[siteurl] - -Pozdrawiam - - $[sitename] administrator \ No newline at end of file diff --git a/view/pl/smarty3/request_notify_eml.tpl b/view/pl/smarty3/request_notify_eml.tpl deleted file mode 100644 index d1431bb6f..000000000 --- a/view/pl/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Drogi/a {{$myname}}, - -Otrzymałeś właśnie zaproszenie do znajomych na stronie {{$sitename}} - -od '{{$requestor}}'. - -Skorzystaj z tego linku, aby odwiedzić jego profil: {{$url}}. - -Proszę się zalogować, aby zobaczyć pełen opis -i zaakceptować lub zignorować / anulować. - -{{$siteurl}} - -Pozdrawiam - - {{$sitename}} administrator \ No newline at end of file diff --git a/view/ro/smarty3/request_notify_eml.tpl b/view/ro/smarty3/request_notify_eml.tpl deleted file mode 100644 index d8b2d440c..000000000 --- a/view/ro/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Dragă $[myname], - -Aţi primit o cerere de conectare la $[sitename] - -de la '$[requestor]'. - -Puteţi vizita profilul lor la $[url]. - -Vă rugăm să vă logaţi pe site-ul dvs. pentru a vedea introducerea completă -şi aprobaţi sau ignoraţi/ştergeţi cererea. - -$[siteurl] - -Cu respect, - - $[sitename] administrator \ No newline at end of file diff --git a/view/sv/request_notify_eml.tpl b/view/sv/request_notify_eml.tpl deleted file mode 100644 index 893bce17c..000000000 --- a/view/sv/request_notify_eml.tpl +++ /dev/null @@ -1,13 +0,0 @@ -$myname, - -Du har just fått en kontaktförfrågan på $sitename från '$requestor' - -Profilen finns på $url. - -Logga in för att se hela förfrågan och godkänna eller -avslå den. - -$siteurl - -Hälsningar, -$sitename admin diff --git a/view/sv/smarty3/request_notify_eml.tpl b/view/sv/smarty3/request_notify_eml.tpl deleted file mode 100644 index 97a0b9618..000000000 --- a/view/sv/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ - -{{$myname}}, - -Du har just fått en kontaktförfrågan på {{$sitename}} från '{{$requestor}}' - -Profilen finns på {{$url}}. - -Logga in för att se hela förfrågan och godkänna eller -avslå den. - -{{$siteurl}} - -Hälsningar, -{{$sitename}} admin diff --git a/view/zh-cn/request_notify_eml.tpl b/view/zh-cn/request_notify_eml.tpl deleted file mode 100644 index 9dd5527a3..000000000 --- a/view/zh-cn/request_notify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -尊敬的$[myname]， - -您刚才受到了一个连接要求在$[sitename] - -从「$[requestor]」。 - -您会看他的简介在[$url]。 - -请登记在您的网站为看他们全介绍 -和批准或不理／注销要求。 - -$[siteurl] - -谨上， - - $[sitename]行政人员 \ No newline at end of file diff --git a/view/zh-cn/smarty3/request_notify_eml.tpl b/view/zh-cn/smarty3/request_notify_eml.tpl deleted file mode 100644 index 682c06fcc..000000000 --- a/view/zh-cn/smarty3/request_notify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -尊敬的{{$myname}}， - -您刚才受到了一个连接要求在{{$sitename}} - -从「{{$requestor}}」。 - -您会看他的简介在[{{$url}}]。 - -请登记在您的网站为看他们全介绍 -和批准或不理／注销要求。 - -{{$siteurl}} - -谨上， - - {{$sitename}}行政人员 \ No newline at end of file From f0aaafa7aa56f6145b66b4663c0c38455f9765ce Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 7 Sep 2014 12:48:23 +0200 Subject: [PATCH 12/26] added Greenzero as colorset of duepuntozero --- view/theme/duepuntozero/config.php | 60 ++++++++++++++++++ view/theme/duepuntozero/deriv/greenzero.css | 34 ++++++++++ .../deriv/imggreenzero/border.jpg | Bin 0 -> 342 bytes .../deriv/imggreenzero/editicons.png | Bin 0 -> 6300 bytes .../duepuntozero/deriv/imggreenzero/file.gif | Bin 0 -> 614 bytes .../deriv/imggreenzero/greenicons.png | Bin 0 -> 12317 bytes .../duepuntozero/deriv/imggreenzero/head.jpg | Bin 0 -> 1078 bytes .../deriv/imggreenzero/screenshot.jpg | Bin 0 -> 71106 bytes .../duepuntozero/deriv/imggreenzero/shiny.png | Bin 0 -> 362 bytes view/theme/duepuntozero/style.php | 11 ++++ 10 files changed, 105 insertions(+) create mode 100644 view/theme/duepuntozero/config.php create mode 100644 view/theme/duepuntozero/deriv/greenzero.css create mode 100644 view/theme/duepuntozero/deriv/imggreenzero/border.jpg create mode 100644 view/theme/duepuntozero/deriv/imggreenzero/editicons.png create mode 100644 view/theme/duepuntozero/deriv/imggreenzero/file.gif create mode 100644 view/theme/duepuntozero/deriv/imggreenzero/greenicons.png create mode 100644 view/theme/duepuntozero/deriv/imggreenzero/head.jpg create mode 100644 view/theme/duepuntozero/deriv/imggreenzero/screenshot.jpg create mode 100644 view/theme/duepuntozero/deriv/imggreenzero/shiny.png create mode 100644 view/theme/duepuntozero/style.php diff --git a/view/theme/duepuntozero/config.php b/view/theme/duepuntozero/config.php new file mode 100644 index 000000000..f8209bb87 --- /dev/null +++ b/view/theme/duepuntozero/config.php @@ -0,0 +1,60 @@ +t('default'), + 'greenzero'=>t('greenzero'), + ); + if ($user) { + $color = get_pconfig(local_user(), 'duepuntozero', 'colorset'); + } else { + $color = get_config( 'duepuntozero', 'colorset'); + } + $t = get_markup_template("theme_settings.tpl" ); + $o .= replace_macros($t, array( + '$submit' => t('Submit'), + '$baseurl' => $a->get_baseurl(), + '$title' => t("Theme settings"), + '$colorset' => array('duepuntozero_colorset', t('Color scheme'), $color, '', $colorset), + )); + return $o; +} diff --git a/view/theme/duepuntozero/deriv/greenzero.css b/view/theme/duepuntozero/deriv/greenzero.css new file mode 100644 index 000000000..0f6f7881e --- /dev/null +++ b/view/theme/duepuntozero/deriv/greenzero.css @@ -0,0 +1,34 @@ +/* green variation by Tobias Diekershoff */ + +a:link, a:visited { color: #549f4f; text-decoration: none; } +a:hover {text-decoration: underline; } + +.nav-selected.nav-link { color: #549f4f!important; border-bottom: 0px} +.nav-commlink, .nav-login-link {background-color: #aed3b2;} +.nav-commlink:link, .nav-commlink:visited, +.nav-login-link:link, .nav-login-link:visited{ + color: #ffffff; +} + +.icon { + display: block; width: 16px; height: 16px; + background-image: url('imggreenzero/greenicons.png'); +} + + + +body { background-image: url('imggreenzero/head.jpg'); } +aside { background-image: url('imggreenzero/border.jpg'); } +section { background-image: url('imggreenzero/border.jpg'); } +.tabs { background-image: url('imggreenzero/head.jpg'); } +div.wall-item-content-wrapper.shiny { background-image: url('imggreenzero/shiny.png'); } + +.fakelink, .fakelink:visited, .fakelink:hover, .fakelink:link { + color: #549f4f !important; +} + +.wall-item-name-link { + color: #549f4f; +} + + diff --git a/view/theme/duepuntozero/deriv/imggreenzero/border.jpg b/view/theme/duepuntozero/deriv/imggreenzero/border.jpg new file mode 100644 index 0000000000000000000000000000000000000000..034a1cb63b65268d78567f19cd2a0416f7b06509 GIT binary patch literal 342 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 literal 0 HcmV?d00001 diff --git a/view/theme/duepuntozero/deriv/imggreenzero/greenicons.png b/view/theme/duepuntozero/deriv/imggreenzero/greenicons.png new file mode 100644 index 0000000000000000000000000000000000000000..2644e428430fc16b4208b59d1c7d974c7182d54c GIT binary patch literal 12317 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

QoxV#s===(j{~*7qZFpzX~=} zt5z+B4joE*dOEMY_8P&#!R5N((pGFlm!Scc?DF=^O0C(x>v zQT}teMxJU&^Kjn-?-m$B4g559E8}7+&!SA2_!`av2X5IzcwAIK9L=aRaNpR6(C8#| zT0L%$ixD$M2gLoh&0de=qCFr6*j0a(%DMiAdNrUasj^rh~;u#CCaX{OCv?(>k#==%lEpFW*-8#kf`2UF*rcW4(MA8;|RT)r$~PM*Z6syJG<{LSHuj*jNxhaYCch7BxT zx|D_u8zO`#=ZJ(qS6{TgryVo@JC|9HPQxJSne^7b2yPNe-kxlnYYQv2W+$fYrCYX1O#r;!@CB*m%ePa%e=G~0 znq98FSKB;K)V&QE`2OD+{NCeeblP&>vF)>*a>qBT*_+baFHdIh(7`O7u!!7uGNe%> zM*(p6-T~sjg`36lyw&2N15b*F4m>ILxDE;cog_)p;#FB9Wom|xp8%_(peitRbsTZA zM^VWjEzQi54HjmOjxEUo3>y?f%G3-*N_?5ax~e}BFhvZ<1T5*ho|&U#Nm>G({`_Z- z?c7PbTD2&gKAqMD1r%8<1ikYPw|DDS?nL*@p3Uu7u8 zyLk55XX)eLPi5JW$I?fM<{`1HIlrEne|?)%_OncXdm16l!^zv9gR~;KS?lML#9vk48R3@XMpYoNB@jd`=H-1Ih<2ooF zd}9Dl6Icp7vi~K(Uye1TZ(Y9FkVR6e>W46};U2Lnv9b9iXP6j2&q93L7<%=xl&l{< zC`RfvELD&OQe3JZVl_bj=#j-FXQ&M8_dKyNF%0VG%jw28YbLFjGe@*aOQT*y1Ohm5 z@4Y;D*InhpF}oKmp!ql7pa~5n=l=WYSi81VQ7Ufm;K6k3){Q&wyc2*SLxxaTSV&x4 zT$LBl0}b$1dMWPab_qd^>9;TD=A|An7Fxk-i%_Z_-?J!Fuol8ZXMZB8I;6ES>eGLS9mN zOZd`)1dKYv4INuo{cYu@1Sy>fDcSAm(?SdypGI0n83IkPe0&B+vf!iT7Gh%}*svsy zn24))qjYLbic79iKR=~+KnA7Q<6Zgo+dO#b5^j%&JgXH)qedt#THw^{kx!q-v~wqx z{Cvzh9cKm)=Ak#=lx}u0LP0?RCr+FoHa3>X$jF)(BXrV>ueYw|c1wGfo%@E_link= zbp)3t{`x;n{2K?=5|ZB;@yae5{K zYz_y7ZZ`!H5jdZCf_~3E_nQ|Z)HLAS^4sp5n6iiP?lClfssn`?SCEW4P7K`jKd(A@ z>)dQH@8kJsO&Z*G7j^qI=5WvL(!A_X#e@m3651*Px7Eec2_N%NXm6>eMF-bYd{9wF zd$P0WYp2TdyA6H!XHsS zx%{Pgrq17g*W>#^-X+#$ea}TTyCf5G^?=$ZGzUKO#|FO#KH_lV<#MgGPiPFh4>SN~ zaX4|+?|D*+O9-?6`pZ^?5F%~K5SA=i&AeoV_(4k;Ho6z1d&Sng3;u&j|ASA9o>ASZ z49ip{v$7V69XY#Ld)v~Q>kkdN0~iY21GEMlKnAcK_>@m=yD8tx1ML&Ez>~l<|B_=s ze-0;FOKsB>SOOdX1_Cw?C$=kIy=v8}a@J_jpg}i$gQ{v*k|ZI7xFG7jW^y%t7be`PakerpbItJF5DjBE^?+zI_Z)t z-}wx%4p`t=Q?Q{b_>w-{#E@5>WMQir*L8hH9{;CU{{Aw0z0jv-5DpDl0F10=tA%`O zd#?C{j`j&HfYTgK^Z-j~pWp!A^V2&5m{|(GrNB<0Gq4(nD-FrOfdfm@R7FKac)ea$ zty(2+1j6dteei(?*|>S57&>$)sryoi?;KxgTiv?-iJpD>)24Am`9j>q{~%(x#Jp|3 z_~q(pJs318g@NO?v1(>7-vmwmuK8L3{rvOKV`W+1r6@|Cs;YHmS$-`nEUfQ~FTVKZ z+_`h7R2pDz7M2-(UqfkFhsVjZXR+qz|29@KZOj|}0WU3m<)JG-UI5ro8GL&-CKGvg z3})^1&qij}nu)wShCLgT>3{HPQ6+>!LpB1wcvXxRI_RO1|4VJ>-0+JFvOEAI85+`r zPi+qthhg3VvVk$hnKQuS?}~f);cEeW?1!%#uos92J}3=IK|uk>jvWh(bJeSN-4NEK z-NAzg^WXyy^2sNkaPZ(!Zo92brR^O&c$D`hk7e(%9MPq9lq5+~2}y1G^#Z=2N3U4a zOG_9uDWwFsw3*j8%v`o?S$$cSlT=mRr6@`hS(YbGnKEVd^UpuuO;MC2V2W{oMPqIp z_6_h5px5Xm&_KVZ`_r{n91;33G-!DKff209+{mYAzAR3KeOncL5%EzdSvO}QsEGKe zsv-1QJ|BD!m>{mqH|J_=eaq4uuvrD@!_bfgd}@162jl{OqkTdV@EtH8&=)@hv`+{J zW&yi^JAgfY3-~dI6W5duVI(Cb1$4QqR;?1=8=MKDChczAypdz)3fR4S54YXchPNiq zsj#g#CyybnbsY0&{FBn~)kJ3g!$R6MY`=8r(nwjBcPffKm(5iQ`D+BWg!YM&YQ z6af7mdz@nhS1;zYmqzmDPwKu@4jn#JVSA>!!&o(S36dl+aNIWEIHOlz z;w6c=fs3p6I6wI$T9)PGilY3as_GR*QNEL9dFyk}J@=z5%R6ORjw_z3Lefh0wZZyu zfSngo0BBLWIWeYa8VA?M?oa3+vz~MsYMBjZ?C0<*ZX9b0E>;B}fGH}N+lO{7*~Te+ z%ZqG9ga(Ilc#&@&iS{EpVYOQc3-L{(VvzJ#BO&2zvJGr5OIH*uEY0=3I4FrJOt0%qG3?9c;)f24; zT`Xt5OK-2!xB~vCI|AEn-Z!(H{<+L696x%Tg$tLmYuDBJk&hK(Jk$l@_Kk~$*G^MU z5yE{QsX;bJw^lx(d9w%4<8|kO*N$)(l+oYDUpi-VbgQF6&pO*CM5{Kfh>WzbYuAr> z-6~&hN`Xx&74B=#uC4TY>~ZSXtM9XbM~^~${PmgM)WCA4k3asng)GZIsH*y3S(a5r zQBo8|`C69cgQ}{ok!3kXQIvb#ZucEqwrsf!pfzc_{HbrR@JuBONuxzmDlidY2*>8O z5pAr)PbZVZgPVkM>X(xM=~coP;)6lbNeH*_rQiVJ@IB0Ks|$_(Y9*d4-+|leLKmv{ zZ4;zNIE62z=WnC9&0+|5eD{M7!uS8-uHUqD8T? zEN@X1Wt}X`R=?FtQWWKYEX&IkMQNt0Y9Eis(`Cz+EhUrvX@m3~g0(@xhq4bNoPwrx zV~GuJM6@ZApDyq5CZE~ua68?4OSDC2E3~0x+5#MqbM{O$MjaZHw#4!k!{@uWzJK;i ztA7mW#_MncMuh9?ZS*?ac>FppyOrPup(VN{5c=EJn6zk&I?mZMZ+Q5msbu+TeADce zl}CXO{V~I95|?~qlM>ZbU-f8NlK2@*5~{NecDp^+X0y$-*=(omcKZrhmSa^_?dx{Cn{U~&C7=h<1?!`o!lmui zuqXF6yPFPSty#T&4e!sLDK>80c;L2%9i9O`-*d-C@KWr6Y$?`H>AFs8bZ0F2`!5q( zFDw8);S_jm8;uk=qku`^z)Ai{{iFy6UuBcz`xxKC6>@z^(5B9aUtM@%bUO( z)GsA&hf2T49xri3!u2W-y>frRHhN1P8a9q)b4ohgQ>y!oi-Y83ABc(qJ$hWVf~!}< zkRh;qIrQoUM>C+8Z@tZCYoe;ERZ)~N)22-mz~HBzdTNHED8Idf<@2^ftKa{sy)M*X7H$uK%U$H$Z~y#q4}cYV293>ySM}gg+z5{-sgwaq-b-2ut=VTy z^&xsRMjgWA#VdP|3=&}xVVqAsQyM<}8IIQc;;NYw0zN0iud6GQ3F+gH_k9lR;&9?m zv`+{EUaSB@1ML$=!Ulx*#^!y#QT@_^=0**wu3{NF)aSHWERl3+9VH2qsd}=Dft)lI z1`aH@T9)N3S(c5es+O2(o6WXZRn<3KE>~BN$8+blZQJrHOeLz4&98b4Tsz{%c2uUTw%hHe6h+x5%kt94AAfv|EXz@{EH8As-N7D@ zr)N@9QqGO0b%Xt-_f^TBJ2pyPcRwi3{&14WyX#{=XXS}W&)iTdZsU*NV{8}1*&j~Q z@ZP5ExnpBsTc6r?Gc;r&Fw!62s~p0sf#~9t-0orv_?92OBH)d3ih&TG;c#Ma+9xyt z*0>cf-YY+V;{qDM02quWFvdVcO!Zyn4eFPcHjN{sqi6F)c!TPHLaa;csETjO>eYcx zNlJ?E^A}&h)Ja#n|9|gLy^8zvVG%gR{RS2JBXh;*F51UnA7h8EM z&KE@Y=Yw^$Pk0n~7&rq==5S)g12P|kI$#*>6Yc<-0#>)`;po<>xa=O(0(XtaY9#>P zpngRVUURlZReis+*Z_X6HagU8 zv()~FKZz6nK8U;L^*euV;o;JTGqiZ=wt$~zs06|XONtS)Jf&eP=d%SCBS18;7WgNJ z6RZB=iNlFgX`f)lSD>H(ue2YMeM7(H)P6|z?_184nu_H{;(%@2{x6Pl!KwMbJm+@~ z7t}=I@V!4u?UH(m7<2S>?=;37P4gE!a`@gKYj%%(mhe-qs~pQOBhXe^&$S58?ixQq zY0C%m>QHoBT;E*J1(SC+BKF)mU^Xzkvc$!X`__!*mi%s_D+6Ce z^;||jh^>K$dABD&nodIit_z^#+`ZF-8ir7Ko%%gD^`DJf3}18KvI?hj z8nE@r;lM2be@D@jf^TCnd`*CVpkXpvCZpvaXlPQ(Ir48?we=gIj}_tjnv2^#&0P=b zVz2eUYK?0g8=?INvysK{C4)W; zJuXg@CFP()tpDj}Xp62i6n$1s=QWdEhX>T_5zBEfnwYIWN2yn&G*?>T~OGx}7*&PCm<8 z$zw4C2+{-wW`%MKz(2wmFczTYHToMz2`~aM$z)W+QutzcYGjXoe@V1ioS^lC7-B zTEi7@9;(-g>UA<^#&|2TckwL*{y<@v>uO-PQw0{PTKzWWNgKK7ZpOnip5fEfV4Qu6_MsclQ9JT>icozN(>)a*0=OmQmKt%5ZR&YuS-h$A68 zOotpTgHq*kB^t_#D!XSwE}(@+_xtamAU(N!uA5UI*4=c{?0y3RYaY0&WLdC*!S=69SM-$=GRo zKx6ydUZtV*i}pNsqCXC{532%|9bs3E3o+BtlhWZ`vY0PPr+A-u!HIc zPh27CJ80#bn=fE3`o4|Pv%Z(l$38hjZR@TCJK|MDXBd~tRCLcebD0`KFIxC!yrqsTYjv#u~+urAhJ z@O}*xf(Z4-JYHMU17@IX&6EcdPF=9JUV*cS^vwr3{mGFFC;ol#!tPbc6grF01#4q4 zQpXRg4)CUbxNoe-|0a1;Jswc>N~I2Bacbfrp(}$9|g@;d!hC9KSW%6vykK_2}*1BXNG0 zA-Ul%&N1&@@~(Z-PP33q8X6+K+IxiA`Tkk=_ELH!*3A6Z$k&4!hxN|fmBE!A7n9xV zipF@3scRLD(yTBuzo9WYNb8Qk>OLgz#MikCfGhhheIL;wvd+)zceL-?x4W^HDT1h= zNRR}xM!#bf9`E8`7azI>-ycu{VlR~xBb1d&ixG-CXbx%(nl{O~(wzIxxIXjqD*<8O zH|EK^LNqUW^}3^>2b{N8q;KdSeo$l7wNXzN%puhipijK^NqtQ4iyFP=sAEk*h5AjO zY&RPi{^I;`p#XD7&9VZEPcKWq1>gS<0Qw=ku5zqlk?5yHNFQZ+*wXp5SnIb?-csX3 z!=6|kZm5-de`FVq#xu$uh6 zRq67p#b>@eeha=^a!YQ>Ex9GPSNl00000NkvXXu0mjf Di^3ks literal 0 HcmV?d00001 diff --git a/view/theme/duepuntozero/deriv/imggreenzero/head.jpg b/view/theme/duepuntozero/deriv/imggreenzero/head.jpg new file mode 100644 index 0000000000000000000000000000000000000000..c697762141ec5b75d215db9715e3b81c07ddd85c GIT binary patch literal 1078 zcmbW0M@$q^7{}k6K3imGw!m(7VPfe<3gA|)6?7m`f`L4g}pFeU~>ih-yISZ;v* zLbG9_5f$4>6dQ>LumO4yD-umW5ygY!8&F(4iQnXVd6WM?FY}x4|D+M=1<<6Yq@@4| zA;?7!kjAm|$u(sq0Jz;C7y!Va24DriFbD{=gQ!C=?Drn4lV!>CB-w*p(ld|<7>c4P zlA&puWf_G^r&cMIDkHD;(pgM?z7~_&EZ9RGf;GfuHU~xqg{%y7xmDjHaY!Q01Z z@(*wX1_iq!Rz*fd$0Q~tr=+e)OJA3jy?#SZZeC$gammKgvQ1knw^dcw)NbG1*wnmd z@4o%5Z3hk>I(+2lv99jpCr+L^-E-!`#Y=scuUx%${pPKK+js8XyFWPm@X_NZPe(?_ z#$UdA{pRhviT9J!pFYognf>~0?z_wd0lt8>NcI;Ohqy3;zzJIBf>pD2ntqupT_0xW_k%!iMpD28Ud7{*J`^Lk;~wGh5K zKrRWN3EdD30eKX9MbSe86gBAn;27y)UK&@r=D#W=O(Am SH4Se5&@qy~CBCOq8vP0JEFic5 literal 0 HcmV?d00001 diff --git a/view/theme/duepuntozero/deriv/imggreenzero/screenshot.jpg b/view/theme/duepuntozero/deriv/imggreenzero/screenshot.jpg new file mode 100644 index 0000000000000000000000000000000000000000..692ad354b501a737a03dafb23986cb6d40070b19 GIT binary patch literal 71106 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 K_FiS3dTZ9Fiq0ukSoqWWBao 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 literal 0 HcmV?d00001 diff --git a/view/theme/duepuntozero/style.php b/view/theme/duepuntozero/style.php new file mode 100644 index 000000000..d5f8696a7 --- /dev/null +++ b/view/theme/duepuntozero/style.php @@ -0,0 +1,11 @@ + From 2802402e57db78d43a3405856b11eba6dce71268 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 7 Sep 2014 13:01:23 +0200 Subject: [PATCH 13/26] added darkzero as colorset of duepuntozero --- view/theme/duepuntozero/deriv/darkzero.css | 187 ++++++++++++++++++ .../duepuntozero/deriv/imgdarkzero/border.jpg | Bin 0 -> 521 bytes .../deriv/imgdarkzero/editicons.png | Bin 0 -> 6300 bytes .../duepuntozero/deriv/imgdarkzero/head.jpg | Bin 0 -> 1269 bytes .../deriv/imgdarkzero/sectionend.jpg | Bin 0 -> 355 bytes .../duepuntozero/deriv/imgdarkzero/shiny.png | Bin 0 -> 362 bytes 6 files changed, 187 insertions(+) create mode 100644 view/theme/duepuntozero/deriv/darkzero.css create mode 100644 view/theme/duepuntozero/deriv/imgdarkzero/border.jpg create mode 100644 view/theme/duepuntozero/deriv/imgdarkzero/editicons.png create mode 100644 view/theme/duepuntozero/deriv/imgdarkzero/head.jpg create mode 100644 view/theme/duepuntozero/deriv/imgdarkzero/sectionend.jpg create mode 100644 view/theme/duepuntozero/deriv/imgdarkzero/shiny.png diff --git a/view/theme/duepuntozero/deriv/darkzero.css b/view/theme/duepuntozero/deriv/darkzero.css new file mode 100644 index 000000000..d2b7a67d4 --- /dev/null +++ b/view/theme/duepuntozero/deriv/darkzero.css @@ -0,0 +1,187 @@ +/* dark variation Fabio Comuni */ + +a:link, a:visited { color: #99CCFF; text-decoration: none; } +a:hover {text-decoration: underline; } + +input, select, textarea { + background-color: #222222; + color: #FFFFFF !important; + border: 1px solid #444444; +} +.openid { background-color: #222222;} + +body { background-color: #222222; color: #cccccc; background-image: url('imgdarkzero/head.jpg'); } +aside{ background-image: url('imgdarkzero/border.jpg'); padding-bottom: 0px; } +section { background-color: #333333; background-image: url('imgdarkzero/border.jpg'); } +#panel { background-color: #2e2f2e;} + +.tabs { background-image: url('imgdarkzero/head.jpg'); } +div.wall-item-content-wrapper.shiny { background-image: url('ingdarkzero/shiny.png'); } + +nav #banner #logo-text a { color: #ffffff; } + +.wall-item-content-wrapper { + border: 1px solid #444444; + background: #444444; +} +.wall-item-outside-wrapper.threaded > .wall-item-content-wrapper { + -moz-border-radius: 3px 3px 0px; + border-radius: 3px 3px 0px; +} +.wall-item-tools { background-color: #444444; background-image: none;} +.comment-wwedit-wrapper{ + background-color: #333333; +} +.comment-wwedit-wrapper.threaded { + border: solid #444444; + border-width: 0px 3px 3px; + -moz-border-radius: 0px 0px 3px 3px; + border-radius: 0px 0px 3px 3px; +} +.editicon { + background-color: #333; +} +.comment-edit-preview{ color: #000000; } +.wall-item-content-wrapper.comment { background-color: #444444; border: 0px;} +.photo-top-album-name{ background-color: #333333; } +.photo-album-image-wrapper .caption { background-color: rgba(51, 51, 51, 0.8); color: #FFFFFF; } + +.nav-selected.nav-link { color: #ffffff!important; border-bottom: 0px} +.nav-commlink, .nav-login-link {background-color: #b7bab3;} +.nav-commlink:link, .nav-commlink:visited, +.nav-login-link:link, .nav-login-link:visited{ + color: #ffffff; +} + +.fakelink, .fakelink:visited { + color: #99CCFF; +} + +.wall-item-name-link { + color: #99CCFF; +} + +.wall-item-photo-menu li a, .contact-photo-menu { + color: #CCCCCC; background-color: #333333; +} + +.wall-item-photo-menu li a:hover { + background-color: #CCCCCC; color: #333333; +} + +code { + background:#2e2f2e !important; + color:#fff !important; +} + +blockquote { + background:#2e2f2e !important; + color:#eec !important; +} + + +#page-footer { min-height: 1em;} +footer { + margin: 0px 10%; + display: block; + background-image: url('imgdarkzero/sectionend.jpg'); + background-position: top left; + background-repeat: repeat-x; + height: 25px; +} + + +input#dfrn-url { + background-color: #222222; + color: #FFFFFF !important; +} +.pager_first a, .pager_last a, .pager_prev a, .pager_next a, .pager_n a, .pager_current { + color: #000088; +} + +#jot-perms-icon { + float: left; +} + + +#jot-title, #jot-category { + background-color: #333333; + border: 1px solid #333333; +} + +#jot-title::-webkit-input-placeholder{ color: #555555!important;} +#jot-title:-moz-placeholder{color: #555555!important;} +#jot-category::-webkit-input-placeholder{ color: #555555!important;} +#jot-category:-moz-placeholder{color: #555555!important;} + + +#jot-title:hover, +#jot-title:focus, +#jot-category:hover, +#jot-category:focus { + border: 1px solid #cccccc; +} + +.acl-list-item p, #profile-jot-email-label, div#jot-preview-content, div.profile-jot-net { + color: #eec; +} +#fancybox-content{ + background:#444; +} + +input#acl-search { + background-color: #aaa; +} + + +.notify-seen { + background:#111; +} + +#nav-notifications-menu { + background: #2e2e2f; +} + +#nav-notifications-menu li:hover { + background: #444; +} + +.acpopupitem{ + background:#2e2f2e; +} + +.group-selected, .nets-selected, .fileas-selected, .categories-selected{ + background:#2e2f2e; +} + +/* Events */ + +.fc-state-highlight { +background: #666 !important; +} + +.fc-state-disabled, .fc-state-disabled .fc-button-inner { +color: #000 !important; +} + +/*Admin page */ + +#adminpage table tr:hover { + color: #eec; + background-color: #666; +} + +.settings-widget .selected { +background: #666; +} + + +/* Stuff that doesn't seem to fit with anything else */ + +#datebrowse-sidebar select { +color:#99CCFF !important; +} + +input#prvmail-subject { +background: #222 !important; +} diff --git a/view/theme/duepuntozero/deriv/imgdarkzero/border.jpg b/view/theme/duepuntozero/deriv/imgdarkzero/border.jpg new file mode 100644 index 0000000000000000000000000000000000000000..4967412bf49332e10ad40b4a1a751c3e7f97bdbb GIT binary patch literal 521 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 literal 0 HcmV?d00001 diff --git a/view/theme/duepuntozero/deriv/imgdarkzero/sectionend.jpg b/view/theme/duepuntozero/deriv/imgdarkzero/sectionend.jpg new file mode 100644 index 0000000000000000000000000000000000000000..9d5d5c8f3be6059bde488b340c9c9e4207a3e977 GIT binary patch literal 355 zcmex=LJ%Z3btM5{dxG z5Q+={Y5sqJL6Cz%l7W$#QHg;`kdaxC@&6G9aj@eUkO3Pj7f?b*fPsmTl@VEjQG_Wd zanhm>Kv^-6iO6ycj0{XbaXCSt`7F#xGK>t0iGqQJ6CD>G{C|sqhZ(3&kXewyp5d8T k^yd{q#>OX9On)DFT=Z$O=;<^bg|xQk{c3!t!vEg{06lv(JOBUy literal 0 HcmV?d00001 diff --git a/view/theme/duepuntozero/deriv/imgdarkzero/shiny.png b/view/theme/duepuntozero/deriv/imgdarkzero/shiny.png new file mode 100644 index 0000000000000000000000000000000000000000..994c0d05d730d7302a6de1298ba2e6514b1b2b1f GIT binary patch literal 362 zcmeAS@N?(olHy`uVBq!ia0vp^{2DD*GD0X#=CwqOyN|ANrXCgtsO~{o7Kx>VR49a!E110l tt5Y-2UBA!rY|*rqD|U=*i^{m~zTrK5!YQLoO7=6zm!7VEF6*2UngHobgVX>3 literal 0 HcmV?d00001 From bbf22938aece7a0071b492d3f7c7b1ead556619e Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 7 Sep 2014 13:09:02 +0200 Subject: [PATCH 14/26] added Comix as a colorset of duepuntozero --- view/theme/duepuntozero/deriv/comix.css | 107 ++++++++++++++++++++++++ 1 file changed, 107 insertions(+) create mode 100644 view/theme/duepuntozero/deriv/comix.css diff --git a/view/theme/duepuntozero/deriv/comix.css b/view/theme/duepuntozero/deriv/comix.css new file mode 100644 index 000000000..d4585fb35 --- /dev/null +++ b/view/theme/duepuntozero/deriv/comix.css @@ -0,0 +1,107 @@ +body { + font-family: "Comic Sans MS", sans !important; + font-size: 13px; +} +.wall-item-content-wrapper { + border: none; +} + +.wall-item-content-wrapper.comment { + background: #ffffff !important; + border-left: 1px solid #EEE; +} + +.wall-item-tools { + background: none; +} + +.comment-edit-text-empty, .comment-edit-text-full { + border: none; + border-left: 1px solid #EEE; + background: #EEEEEE; +} + +.comment-edit-wrapper, .comment-wwedit-wrapper { + background: #ffffff !important; +} + +section { + margin: 0px 32px; +} + +aside { + margin-left: 32px; +} +nav { + margin-left: 32px; + margin-right: 32px; +} + +nav #site-location { + top: 80px; + right: 36px; +} + +.wall-item-photo, .photo, .contact-block-img, .my-comment-photo { + border-radius: 3px; + -moz-border-radius: 3px; + margin-top: 15px; +} + +.wall-item-photo.comment { + margin-top: 26px; +} + + +.triangle-isosceles { + position:relative; + padding:15px; + margin:1em 0 3em; + color:#000; + background:#EEEEEE; /* default background for browsers without gradient support */ + /* css3 */ + background:-webkit-gradient(linear, 0 0, 0 100%, from(#EEEEEE), to(#ffffff)); + background:-moz-linear-gradient(#EEEEEE, #ffffff); + background:-o-linear-gradient(#EEEEEE, #ffffff); + background:linear-gradient(#EEEEEE, #ffffff); + -webkit-border-radius:10px; + -moz-border-radius:10px; + border-radius:10px; +} + +/* Variant : for left/right positioned triangle +------------------------------------------ */ + +.triangle-isosceles.left { + margin-left:30px; + background:#F8F8F8; + border: 2px solid #CCCCCC; +} + +/* THE TRIANGLE +------------------------------------------------------------------------------------------------------------------------------- */ + +/* creates triangle */ +.triangle-isosceles:after { + content:""; + position:absolute; + bottom:-8px; /* value = - border-top-width - border-bottom-width */ + left:30px; /* controls horizontal position */ + border-width:15px 15px 0; /* vary these values to change the angle of the vertex */ + border-style:solid; + border-color:#f8f8f8 transparent; + /* reduce the damage in FF3.0 */ + display:block; + width:0; +} + +/* Variant : left +------------------------------------------ */ + +.triangle-isosceles.left:after { + top:12px; /* controls vertical position */ + left:-30px; /* value = - border-left-width - border-right-width */ + bottom:auto; + border-width:10px 30px 10px 0; + border-color:transparent #f8f8f8; +} From 22d019004169aa2f89a23b49ae9c5b1a0f3598fb Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 7 Sep 2014 13:29:56 +0200 Subject: [PATCH 15/26] revive easterbunny from the dead --- view/theme/duepuntozero/deriv/easterbunny.css | 46 +++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 view/theme/duepuntozero/deriv/easterbunny.css diff --git a/view/theme/duepuntozero/deriv/easterbunny.css b/view/theme/duepuntozero/deriv/easterbunny.css new file mode 100644 index 000000000..0619644ea --- /dev/null +++ b/view/theme/duepuntozero/deriv/easterbunny.css @@ -0,0 +1,46 @@ +.vcard .fn { + color: orange !important; +} + +.vcard .title { + color: #00BB00 !important; +} + +.wall-item-content-wrapper { + border: 1px solid red; + background: #FFDDFF; +} + +.wall-item-content-wrapper.comment { + background: #FFCCAA; +} + +.comment-edit-wrapper { + background: yellow; +} + +body { background-image: url('imgeasterbunny/head.jpg'); } +section { background: #EEFFFF; } + +a, a:visited { color: #0000FF; text-decoration: none; } +a:hover {text-decoration: underline; } + + +aside( background-image: url('imgeasterbunny/border.jpg'); } +.tabs { background-image: url('imgeasterbunny/head.jpg'); } +div.wall-item-content-wrapper.shiny { background-image: url('imgeasterbunny/shiny.png'); } + + +.nav-commlink, .nav-login-link { + background-color: #aed3b2; + +} + +.fakelink, .fakelink:visited { + color: #0000FF; +} + +.wall-item-name-link { + color: #0000FF; +} + From 0989ad335f0c425db36944a169d6faed89880fc8 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 7 Sep 2014 13:41:02 +0200 Subject: [PATCH 16/26] added purplezero to duepunto as variation --- .../deriv/imgeasterbunny/border.jpg | Bin 0 -> 364 bytes .../deriv/imgeasterbunny/head.jpg | Bin 0 -> 1109 bytes .../deriv/imgeasterbunny/shiny.png | Bin 0 -> 320 bytes .../deriv/imgpurplezero/border.jpg | Bin 0 -> 364 bytes .../deriv/imgpurplezero/editicons.png | Bin 0 -> 6300 bytes .../duepuntozero/deriv/imgpurplezero/head.jpg | Bin 0 -> 1109 bytes .../deriv/imgpurplezero/shiny.png | Bin 0 -> 320 bytes view/theme/duepuntozero/deriv/purplezero.css | 25 ++++++++++++++++++ 8 files changed, 25 insertions(+) create mode 100644 view/theme/duepuntozero/deriv/imgeasterbunny/border.jpg create mode 100644 view/theme/duepuntozero/deriv/imgeasterbunny/head.jpg create mode 100644 view/theme/duepuntozero/deriv/imgeasterbunny/shiny.png create mode 100644 view/theme/duepuntozero/deriv/imgpurplezero/border.jpg create mode 100644 view/theme/duepuntozero/deriv/imgpurplezero/editicons.png create mode 100644 view/theme/duepuntozero/deriv/imgpurplezero/head.jpg create mode 100644 view/theme/duepuntozero/deriv/imgpurplezero/shiny.png create mode 100644 view/theme/duepuntozero/deriv/purplezero.css diff --git a/view/theme/duepuntozero/deriv/imgeasterbunny/border.jpg b/view/theme/duepuntozero/deriv/imgeasterbunny/border.jpg new file mode 100644 index 0000000000000000000000000000000000000000..66c7a6fcc7493b233e78a81f9a97f26fd4133335 GIT binary patch literal 364 zcmex=LJ%Z3brsR%R9! z7G_o;!OF_Y#?HgR4g~z%+?+gu{6a#4{DOkQVlv{wB2uD)f)a`nQnIr0^76vsN-9cn zDl&5Nav(z(fm+$w*!eg(_~b+cMdU~Z{|_(-axfGyFfubLF)#@-G7B>PKf)jmaz7&j zGGJk52TDi@FfuTsN-+v03I{F(X#(j%(ZtNe3NlSh5KWwcK~U)bEe0NDMxd3WnyY(ZeeNV?BeR??&0Yb91<+v*#~fzWVs-^OvvRzW@073*;|G24;x2;66k1mmttzOe`$SEbJhE zF*20{F|!~GtD+&BkYgZwVxh2-Q6qGeQ$1KQT&+v`^t>=G+lZ(2vcTckIo98kA|IPpZ7=)dRQWHy3 zQxwWGOEMJPJ$(bfNsyJ91?X3xPgz)5fsxAtN{sCM+}xZzg8V{4g8YJl!eTPw!Xi?l zf`Sr?5>m3V^78V+;z}w?aw;-%@^auL2-M2X#?HsV!6zpoC?ZEPfF!{h23C|LC6DM5)s*(ihho@hVIgHE< zOf0NGDQQ8l9I_;%Ad`?tAoG9Jz>Ih}i$kn0dnwEFyv8X>MJrnVw7s%gXrJF`$#z9Q zLJ%Z3brsR%R9! z7G_o;!OF_Y#?HgR4g~z%+?+gu{6a#4{DOkQVlv{wB2uD)f)a`nQnIr0^76vsN-9cn zDl&5Nav(z(fm+$w*!eg(_~b+cMdU~Z{|_(-axfGyFfubLF)#@-G7B>PKf)jmaz7&j zGGJk52TDi@FfuTsN-+v03I{F(X#(j%(ZtNe3NlSh5KWwcK~U)bEe0NDMxd3p9-+@3Nq-v^)I$&!6zRpC1U_JQ^Qw%mZ zo;oV>kjmc-NbrNuN<&2va((m3X)8_!M{c{RzVQT?BW}Jp^6VM!!NFTzYMM&77Vzn4 zL}``Q)P6u9bPQ^Wa(eIQ_A-6-bnPztJJ6eKAsP6%I0Q;Ga@t(odYz=)`UREFraLpF64)7mGViF`~w;rt*ENJ;i@d&WZ6%xYzA#ROh|6cUR(IXC6o>za0)0>5$=T zRNEgO&dXfx8oV-ipDY;^c+etwaO|5cf)AOTnu>RFaG1?|#h&*p=5yz;l_348WBrer z<>l)=m&G5MRg;LDQ(Rn@*0#2`su!oHr>zQg2CL_(Pbll_>vH_NbG2VYA-tEi6 z5iL&lD5LQ)SEv2yLQaBrBCLE=RR=!J&CR7{q^Gz0ZDqdub8&Goiu7`sPgO6BN=)qE z9L^BJVzK3mm3e7R!PnTfDJOlEHWmB?ABvZv?s^o$HkLHdXE&i3{n z^vg&gko2O*7xc{H;&Xj2*4B^dA3Pw~n?@k!XEr8KYVJz#r@eV;xUyegu>HQJUttn) zcHS1z% zNVgPp<@_Q;IQ}?m&?a=7_LB>e8XDd|%BjcY_bh*GfE=Gi)QjeyC60Z1-%3iCVUrsR z#NuZZ#rfHGV?$ZtAkp7X^2vj&><#Vhj1$FLA5C~v9345n@S2lBRJFAFyTWem8CXUs zKKeW6q|dAN`KyoTZoKNk|~c`uiR!f?VUlL>Xl8&Mt|!X;ovS}FacTkMWpC9b0;A6maec(cM-K97SAky2Pta#? zE+RA(m!0Ykm+22GAt9mdrM8xwrKl*Pg_d_C&Mj?zr!`|5uorB~isCN#sp=8I5C5eN zlS}!Zah);Ej7UhTf(akAq1gpQ!@4uRA|C4R)f9p)wE1tid_oT-;i+xDfX6 zscLE}>FVCQa$8$pKkB75?_7IRGUW(eXrh3@V55%pp?*&&qg8yk^GEX1Z0I6cRJ%6@ z)AQIB6_uG;S$`tyR(|7xA?M}ikJZ{~b!9nKAl6>jH8iY&B-jlmgZ#r_+)>lqzZD#z zP<$orP(SWt)cVZZEt6bjdwcuNI)ft1eJ9Uq_X*{?#>V{M4y<9bRbhUX#*dmy02S-W z678>imbm)mh9M0N!aw`_t=IeFTYW0FOkz#_(}sW0kr4Xasa?)|)4r8pX0SVldU8LK z|BaD}y<8a_-XB3so0Ob^2Z@S{3(xLOgl`!|!gO04>*)cPh@gpr~4#dVe|ELhp)(0ed_bxnamy-9df-9vASdMsa za?jBIva*0ZGJ&~(gjW6h$N5iRpYni>0CcJK{>H|}Ze9T9(wp_^Q{tUKy@Q6upFb5J zw53E-oT+Shh%Nb{xXJNDwzut1_9kc{Zr9jAK_MYAhIY1Owb5XGb}GYWk0(T-vQQ}3 z+S(cfg5F9ki>>VW?ZTnBLz8tBD)wl-Z+;S_*lIpElbF$a z#WO6sd9DM!ZqbX?p@V}qbXE?nRYhZKD+5#TUw-9+1li@8-ydBB(sTBFiUv+A7>pWyD-mxzuZ&U&nr zAJwh( zoW*k`2o&j;z{WBAN#jknu&$iOCSJcbGZpgiSp=f-O`%SOeyLt@`N9|X;o)K94G&*) z&a{4eJ~|Sb?5Vj*EJdv)UE~|psIsYv?uNn=gT=f#i4 zt|FXe989rAU((V%8=C3k3GXsWk{6Vk#$!LrpNKqtdh5CEZ&{#m^NV&v-*8lpKbM_| zNJu=mfB*jb^FtO$PD29?*gs$W$iz_5-Fkv{kCmvK(}Z^kUCvKW_f>uq&rFy|j##Ud z_YtBe6&DwWKpsAP*oyO@y)*uK+di4O*7^t!fy*~-BduO(hnBOGv?7NWnF964lDI=4 z1lyxNA1HP09ij5m7hJ6;YZ^&|Hq5HHwtYj=vgt+cD=Ro=ZGd`@H;1j&!n!PgI7g_m z$~!xACp?shG%ydORxhM{^eO6z5Dl#>KuhI>`MWK810=kqXDAEH#>TpKf}Bv*(CEou zd`5MLAVvL2w_jwgKYAa4?eO?mK}m@Kyt1q|RX{+X+rJt2pECCn|NE|p=VTA_^+1a3J#Gk&%x;&VUzs`}Xaw>X$(q(ZEZ=pyQ0?oYvOX=UFHojJMra zsZz1HMC`aAX|qW}`SF{QvNAkK9FquRcF^Us`56c^O)S6DG#7)6`?vUTf?K!3_@B4> z0agKuJ(jPcZE8vi`6?YK-hRGDoUk~U{B*rD1P{u}B`Qki*M?2Yx+*YGd*|@I%x4b? zH-oFZefz{L;7AFu>9&_R;4d!YhPXm}%II*ZO~Igr_dX@GR8+DR`o}v{NUs}J{uzBQ z7lF#1Kr*NOI{Gbf@WGN!&%mH|VaQ(4YI6w2tVW41w*u4_;J`f->o@9Yn%9xlB>ZK7 zN=duvJ@OITi?5wzrT|1?T^}MN2~ApjNUx<&Tqh?dfxh1?9I2ss>_9Y65>bgYH3DXB z#ah{YU-_+b5GXlv`~sb4B!qa5j*dy0nen_G|0th4c>*34qMRR+n0WW66+c+=^73Ap znCyySyz955kyD7EbNYDYfa3#K{Em0nt78|G5Pf`WaZvfM=zC91#x=zAI~IR*>Lnu$xNr4IcJOMJ1k*kySnPRX?JbeTl9TflJ0|X*#VZn^O zIF&hC@Ep0#E%_38FjH;q{_ot~&`tBzD{??r(frnZqNnoT#vJd`sHfT2KQ&8M005+{ z4mXXih&AN$v8Q^u4SyR{URt_JIx9A>NQ68spfDLj9kJo!3Z70Pbw$1Byp2{lG^ITL z5CM0%R%6PGiAclFp-#umc`;z+TFv?YLGI&MS{#jyMBh=l{OVQgj-$ao_PR}5Tl=f1 zdtT0>!bh^)yu5B@US3QlNRTY1Q%Q)$@SKovOI=(X$qU$muf6YlgEKo9N8K!pXl&B= zc++yB$sO|HiN=?i-ElU}^zhkQJ3Poz@O9uqd*J+ZCGp9-&JQ?AQBSs~%4qf5T4E}S z9q1(*4mz7Xx5#N|`h+V18SwK{0IUA#(Csx_FQopice1iTdJ-XOdM^RPdncv+|Gs{sq3yMi)MTblVNw)r|qZ< zo{l+v^ed!%R%gV`P9dT^3Z$v|g$tg%=@e(Gbj`1O{-gGSuh^-8S!8IlF~}?ZooAp^ zN~Q3TL}@2VFT*cFJ_I>Y{J2h~#CgP98xC?#Ie{Vi#B2UyVR@Me-hmbG?(T;Axug|$ zB&cgTlUACwIO=Wzsg0ebl}ifOyz8mr`ua7shldAr2LKkt6D0LkuD8Rblc}G|sj`j^ zUU|&UPSo4m z3mva-TjJ3Op5`dwp`E{YJ4h<@ zV>2b*&Ak@}S)rt;h!5BeV9W0D#0C;xsHmcn|D%XrT3Q;!LHKECKw#k5=nN!(kf>1S z_E%HHg9i^{V`A={UtZ?b*H5tt#T7Y72Aq?#CEpGS2_ZZEJ8s@LG}FW)>=LbKbr3v< z#{YPNxI7M6l~D0{xPis(1dNnB<+xgWSUcEC6|ESByoWcJru^p3eLW6p`V4y0=___N z;^5%mNd%(ylu9WVlxu+3*?D-B-Q4*6H;2u52SoxZ4BDgI<}ZF;y0)L_V zE}ANoKSP$v_ZaXbKYk(>k^iK@mCMT7nk7$>ots<9#)kC{F|p}%*(-LwfOEHmFHKFN zBy@ZbDy7w>Hvg#T=<3-+L)1oLhp)^=HGDbXSd*3Hg{-VBL_k0wDSZyPdBb)RlTu;{Rh() zA35rh?&JI{6_=MhcAl#*4zi^D-GD#O_yM>MI$J{^CnrZI;lssa);ch2LbQpcp`l*e zZLU>i%1i*KS^<0tA7l*M2As{>wHoN%9-9Orz7BZj#w&OC^i=z!T@n@(r7xqb4Wh7= z_#w@nn`@J$x=l%eAr-;kB7U|&l9-s7D%Wf2+=$NxymI7*RTem8Oww_{1Js;`-MZTc zC|>*3s}CL5n1fKWd&sCFTU*;TFlD>^S{kM0&FOwLu4I<)Ca-G%H@l(X&zd?7 zDS!WZa2eGREeE1ASJ=AEK>1fvS*dK=#$C9-y)EnO+dN^M%7A>LMwyzL%Aj5`<*03B z#9@zkh5>v$b9%w^&l$Z;&d5jxiX!3ob={51ao}vDxQ!bu`V$^*FSdv%KBAa(tnbm? zm=>I}>Nav6$&%7GF!*?Gw>BoRljdt&s@Dw_J~pFWk68j@J2^eQHfxvt*7_NQoSYm| zJ3HiW8rNpFL!lX8lby)bYr&V()HI`;PVbH0H~r|dM@wfXNNs`SEqjM*s37;a2(RR) z8gFq~6i?jqL&DRrVAc5kW(RvPx}1~4O!7dOq^;Xe4itpB)i@v!N#<4TAX&J% zNde&{sTY>O;VLg*l2w|voOQ?rKkbmbPfWwLQeFce@qZ{LCT7@SDYZq(Vqm{h{-*YD zOXeC@`yciwF<8;ZM;H{Q0nvnqEjI?w+-FY2wjX?w9vuyl; zLcq7qLw?)u{25HHw(7m3TByTE687yI!#6R{NYWp1bo{syKD#T8^8}v3VkZV%G}hRI zt=a@^&BiYa-#h^r2~*G^3#c=a`1o*oBFSoJ35mz_stw}+>sR^Eav63OHUGEau{&2! zjCYGn5fIe)_&Btot8(1D@j;i;B}(ldOau*B{!^RA(RiUo6(a{I&(9qX40e}C3Z=FL zFq&#=mWkKF=*4%!7d`axk!_k}+ma7fZ)3duy{}!juzf#&R>3`khc*KEd3h5Tse2Xs zn_dK8ouc~N+r5yK{relg(q>Jyq0n*_U>~a|lZ&Pbq)t!J$M5Ls8YHPT_)JUne!K{- zka2oA+t}a)^WPhbmN-F7^kIbTg&eeWD<~54Ev-r$v$MnPzn?N7D^2ZA(EPAvxN@18 zh>Y=L#$OB$rtC4H+2&hq&17GxcoV7@W+9LOF;Xg}>b8u#$D(;1S{_F4$LrEPk88c7 z+y+)yzVWg>eOfD3e)ux?m*6R=uWZc|>G(sf-<=<>mYZH_#*kwIai!1(`BMy+{>Ph| z4O=%&0D!IrSYq&1pX+Q#N5^3sxO8W#Y}Z7>agsfQP@f~!ux>l8#S3&6dQfwQk919+ z7{HRRoCIKpNV{yS)0Q$8%IGRf3?UUYwOrX$o>sQ>t`?ceqab~?@3F0o ztu1g+y9>?t2nYx=-{qhW?ncPtKtL;C&7}XY6X~+KgaHh_xm8}y1)2;)*O-7&LFaX4 zoK8^uRwKhS$v%d?4XHw_Xk|&>mXVRU=|X@c8Ie4W8@}55o!RsKbr}OUxhW4Cu{u1W zlEBafDop-I-uQkeyCEe5>?HTc#cnk=HhOjzPAT$y)$m{G#Q7%feFup|-naxSD=R*a zKdRG}QcZQ{Q`zYY%hS{P3=%?78+X&V8{-Wcj#oaFn@ZCBz&mR62~TTJ%hx|dGN$%ytwnrDO0-V3J4P6+y+4?ny) zn8x*{J8P3aV;G1IR8=<$EB*3F4_>?W|4ON)wVeO)fS+e@TXTnxU*;xOhbkfnb17G- zBUhoHpO+Vk)?v{o8GW6uu1y7+D>v>Rj4~xP^~j9F=60pbYY~}b*632*;8*B=^5*B#=Tx^Rri~jOzo2k2{Y)Q$;h~5}6 zHiiSp;4|x3qn2GeZGXwVbairk>3@d`t%u#j&`eP1fKHa$=cw4&bynAzj|^iG+q|y( zu6)nI8qQu8F2Ms-Q8bH0es^G%)FAJM#ha^J@LpF^%U4>7^H9scceVW4r7#2QV_sc$hb z%EI1c3Mti#85mF{VU(nsuzRt!V7?Mpv_DrLE2URs*+Uq|AVzsJ9^eZ>q9>)N$DEva zB`g-lV3%5b?=c1chA1f08ID_4V~VUkSTg1)UXmMHO+h-f#Wy z{K%zZM~eW18Cktv*{Lu4D(DWTiIO>aFbC+SzJ8<=qVfpK*vu*D4LYdWnyY(ZeeNV?BeR??&0Yb91<+v*#~fzWVs-^OvvRzW@073*;|G24;x2;66k1mmttzOe`$SEbJhE zF*20{F|!~GtD+&BkYgZwVxh2-Q6qGeQ$1KQT&+v`^t>=G+lZ(2vcTckIo98kA|IPpZ7=)dRQWHy3 zQxwWGOEMJPJ$(bfNsyJ91?X3xPgz)5fsxAtN{sCM+}xZzg8V{4g8YJl!eTPw!Xi?l zf`Sr?5>m3V^78V+;z}w?aw;-%@^auL2-M2X#?HsV!6zpoC?ZEPfF!{h23C|LC6DM5)s*(ihho@hVIgHE< zOf0NGDQQ8l9I_;%Ad`?tAoG9Jz>Ih}i$kn0dnwEFyv8X>MJrnVw7s%gXrJF`$#z9Q z Date: Sun, 7 Sep 2014 13:55:02 +0200 Subject: [PATCH 17/26] registration request as system notification kill the template send email to all admins --- include/enotify.php | 20 +++++++- mod/register.php | 58 ++++++++++------------ view/ca/register_verify_eml.tpl | 23 --------- view/ca/smarty3/register_verify_eml.tpl | 24 --------- view/cs/register_verify_eml.tpl | 22 -------- view/cs/smarty3/register_verify_eml.tpl | 23 --------- view/de/register_verify_eml.tpl | 25 ---------- view/de/smarty3/register_verify_eml.tpl | 26 ---------- view/en/register_verify_eml.tpl | 26 ---------- view/en/smarty3/register_verify_eml.tpl | 27 ---------- view/eo/register_verify_eml.tpl | 25 ---------- view/eo/smarty3/register_verify_eml.tpl | 26 ---------- view/es/register_verify_eml.tpl | 22 -------- view/es/smarty3/register_verify_eml.tpl | 23 --------- view/fr/register_verify_eml.tpl | 25 ---------- view/fr/smarty3/register_verify_eml.tpl | 28 ----------- view/is/register_verify_eml.tpl | 25 ---------- view/is/smarty3/register_verify_eml.tpl | 26 ---------- view/it/smarty3/register_verify_eml.tpl | 25 ---------- view/nb-no/register_verify_eml.tpl | 25 ---------- view/nb-no/smarty3/register_verify_eml.tpl | 26 ---------- view/nl/register_verify_eml.tpl | 25 ---------- view/pl/register_verify_eml.tpl | 25 ---------- view/pl/smarty3/register_verify_eml.tpl | 26 ---------- view/ro/smarty3/register_verify_eml.tpl | 25 ---------- view/sv/register_verify_eml.tpl | 17 ------- view/sv/smarty3/register_verify_eml.tpl | 18 ------- view/zh-cn/register_verify_eml.tpl | 25 ---------- view/zh-cn/smarty3/register_verify_eml.tpl | 26 ---------- 29 files changed, 45 insertions(+), 692 deletions(-) delete mode 100644 view/ca/register_verify_eml.tpl delete mode 100644 view/ca/smarty3/register_verify_eml.tpl delete mode 100644 view/cs/register_verify_eml.tpl delete mode 100644 view/cs/smarty3/register_verify_eml.tpl delete mode 100644 view/de/register_verify_eml.tpl delete mode 100644 view/de/smarty3/register_verify_eml.tpl delete mode 100644 view/en/register_verify_eml.tpl delete mode 100644 view/en/smarty3/register_verify_eml.tpl delete mode 100644 view/eo/register_verify_eml.tpl delete mode 100644 view/eo/smarty3/register_verify_eml.tpl delete mode 100644 view/es/register_verify_eml.tpl delete mode 100644 view/es/smarty3/register_verify_eml.tpl delete mode 100644 view/fr/register_verify_eml.tpl delete mode 100644 view/fr/smarty3/register_verify_eml.tpl delete mode 100644 view/is/register_verify_eml.tpl delete mode 100644 view/is/smarty3/register_verify_eml.tpl delete mode 100644 view/it/smarty3/register_verify_eml.tpl delete mode 100644 view/nb-no/register_verify_eml.tpl delete mode 100644 view/nb-no/smarty3/register_verify_eml.tpl delete mode 100644 view/nl/register_verify_eml.tpl delete mode 100644 view/pl/register_verify_eml.tpl delete mode 100644 view/pl/smarty3/register_verify_eml.tpl delete mode 100644 view/ro/smarty3/register_verify_eml.tpl delete mode 100644 view/sv/register_verify_eml.tpl delete mode 100644 view/sv/smarty3/register_verify_eml.tpl delete mode 100644 view/zh-cn/register_verify_eml.tpl delete mode 100644 view/zh-cn/smarty3/register_verify_eml.tpl diff --git a/include/enotify.php b/include/enotify.php index 631cb8aed..54db6912c 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -308,7 +308,24 @@ function notification($params) { } if($params['type'] == NOTIFY_SYSTEM) { - //I have yet to find what system notificatons are... + switch($params['event']) { + case "SYSTEM_REGISTER_REQUEST": + $subject = sprintf( t('[Friendica System:Notify] registration request')); + $preamble = sprintf( t('You\'ve received a registration request from \'%1$s\' at %2$s'), $params['source_name'], $sitename); + $epreamble = sprintf( t('You\'ve received a registration request [url=%1$s]an introduction[/url] from %2$s.'), + $itemlink, + '[url=' . $params['source_link'] . ']' . $params['source_name'] . '[/url]'); + $body = sprintf( t('Full Name: %1$s\nSite Location: %2$s\nLogin Name: %3$s (%4$s)'), + $params['source_name'], $siteurl, $params['source_mail'], $params['source_nick']); + + $sitelink = t('Please visit %s to approve or reject the request.'); + $tsitelink = sprintf( $sitelink, $params['link'] ); + $hsitelink = sprintf( $sitelink, '' . $sitename . ''); + $itemlink = $params['link']; + break; + case "SYSTEM_DB_UPDATE_FAIL": + break; + } } if ($params['type'] == "SYSTEM_EMAIL"){ @@ -360,6 +377,7 @@ function notification($params) { if ($show_in_notification_page) { + logger("adding notification entry", LOGGER_DEBUG); do { $dups = false; $hash = random_string(); diff --git a/mod/register.php b/mod/register.php index b9a9808b9..50f5fedb5 100644 --- a/mod/register.php +++ b/mod/register.php @@ -1,6 +1,6 @@ config['admin_email'])); - - $r = q("SELECT `language` FROM `user` WHERE `email` = '%s' LIMIT 1", - //dbesc($a->config['admin_email']) - dbesc($adminlist[0]) - ); - if(count($r)) - push_lang($r[0]['language']); - else - push_lang('en'); - + // invite system if($using_invites && $invite_id) { q("delete * from register where hash = '%s' limit 1", dbesc($invite_id)); set_pconfig($user['uid'],'system','invites_remaining',$num_invites); } - $email_tpl = get_intltext_template("register_verify_eml.tpl"); - $email_tpl = replace_macros($email_tpl, array( - '$sitename' => $a->config['sitename'], - '$siteurl' => $a->get_baseurl(), - '$username' => $user['username'], - '$email' => $user['email'], - '$password' => $result['password'], - '$uid' => $user['uid'], - '$hash' => $hash - )); + // send email to admins + $admin_mail_list = "'".implode("','", array_map(dbesc, explode(",", str_replace(" ", "", $a->config['admin_email']))))."'"; + $adminlist = q("SELECT uid, language, email FROM user WHERE email IN (%s) LIMIT 1", + $admin_mail_list + ); - $res = mail($a->config['admin_email'], email_header_encode( sprintf(t('Registration request at %s'), $a->config['sitename']),'UTF-8'), - $email_tpl, - 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" - . 'Content-type: text/plain; charset=UTF-8' . "\n" - . 'Content-transfer-encoding: 8bit' ); - pop_lang(); - - if($res) { - info( t('Your registration is pending approval by the site owner.') . EOL ) ; - goaway(z_root()); + foreach ($adminlist as $admin) { + notification(array( + 'type' => NOTIFY_SYSTEM, + 'event' => 'SYSTEM_REGISTER_REQUEST', + 'source_name' => $user['username'], + 'source_mail' => $user['email'], + 'source_nick' => $user['nickname'], + 'source_link' => $a->get_baseurl()."/admin/users/", + 'link' => $a->get_baseurl()."/admin/users/", + 'source_photo' => $a->get_baseurl() . "/photo/avatar/".$user['uid'].".jpg", + 'to_email' => $admin['mail'], + 'uid' => $admin['uid'], + 'language' => ($admin['language']?$admin['language']:'en')) + ); } + + info( t('Your registration is pending approval by the site owner.') . EOL ) ; + goaway(z_root()); + + } return; diff --git a/view/ca/register_verify_eml.tpl b/view/ca/register_verify_eml.tpl deleted file mode 100644 index 3dd966e0a..000000000 --- a/view/ca/register_verify_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - -S'ha rebut la sol·licitud de registre d'un nou usuari en -$sitename que requereix la teva aprovació. - -Les dades d'accés són els següents: - -Nom Complet: $username -Lloc: $siteurl -Nom: $email - - -Per aprovar aquesta sol·licitud, visita el següent enllaç: - -$siteurl/regmod/allow/$hash - -Per denegar la sol·licitud i eliminar el compte, per favor visita: - -$siteurl/regmod/deny/$hash - - -Gràcies. - - diff --git a/view/ca/smarty3/register_verify_eml.tpl b/view/ca/smarty3/register_verify_eml.tpl deleted file mode 100644 index 070288a43..000000000 --- a/view/ca/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,24 +0,0 @@ - - -S'ha rebut la sol·licitud de registre d'un nou usuari en -{{$sitename}} que requereix la teva aprovació. - -Les dades d'accés són els següents: - -Nom Complet: {{$username}} -Lloc: {{$siteurl}} -Nom: {{$email}} - - -Per aprovar aquesta sol·licitud, visita el següent enllaç: - -{{$siteurl}}/regmod/allow/{{$hash}} - -Per denegar la sol·licitud i eliminar el compte, per favor visita: - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Gràcies. - - diff --git a/view/cs/register_verify_eml.tpl b/view/cs/register_verify_eml.tpl deleted file mode 100644 index 4b34c6b6d..000000000 --- a/view/cs/register_verify_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Na webu $sitename byla vytvořena nová uživatelská registrace, která vyžaduje Vaše schválení. - -Přihlašovací údaje jsou tato: - -Celé jméno: $username -Adresa webu: $siteurl -Přihlašovací jméno: $email - -Pro odsouhlasení tohoto požadavku prosím klikněte na následující odkaz: - - -$siteurl/regmod/allow/$hash - - -Pro zamítnutí žádosti a odstranění účtu prosím klikněte na tento odkaz: - - -$siteurl/regmod/deny/$hash - - -Díky. diff --git a/view/cs/smarty3/register_verify_eml.tpl b/view/cs/smarty3/register_verify_eml.tpl deleted file mode 100644 index 7d08ffa00..000000000 --- a/view/cs/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Na webu {{$sitename}} byla vytvořena nová uživatelská registrace, která vyžaduje Vaše schválení. - -Přihlašovací údaje jsou tato: - -Celé jméno: {{$username}} -Adresa webu: {{$siteurl}} -Přihlašovací jméno: {{$email}} - -Pro odsouhlasení tohoto požadavku prosím klikněte na následující odkaz: - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -Pro zamítnutí žádosti a odstranění účtu prosím klikněte na tento odkaz: - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Díky. diff --git a/view/de/register_verify_eml.tpl b/view/de/register_verify_eml.tpl deleted file mode 100644 index 8f25f5c36..000000000 --- a/view/de/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -Eine Neuanmeldung auf $[sitename] benötigt -deine Aufmerksamkeit. - - -Die Login-Einzelheiten sind die folgenden: - -Kompletter Name: $[username] -Adresse der Seite: $[siteurl] -Login Name: $[email] - - -Um die Anfrage zu bestätigen besuche bitte: - - -$[siteurl]/regmod/allow/$[hash] - - -Um die Anfrage abzulehnen und den Account zu löschen besuche bitte: - - -$[siteurl]/regmod/deny/$[hash] - - -Danke! diff --git a/view/de/smarty3/register_verify_eml.tpl b/view/de/smarty3/register_verify_eml.tpl deleted file mode 100644 index 9c0bb77f2..000000000 --- a/view/de/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - -Eine Neuanmeldung auf {{$sitename}} benötigt -deine Aufmerksamkeit. - - -Die Login-Einzelheiten sind die folgenden: - -Kompletter Name: {{$username}} -Adresse der Seite: {{$siteurl}} -Login Name: {{$email}} - - -Um die Anfrage zu bestätigen besuche bitte: - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -Um die Anfrage abzulehnen und den Account zu löschen besuche bitte: - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Danke! diff --git a/view/en/register_verify_eml.tpl b/view/en/register_verify_eml.tpl deleted file mode 100644 index 73980bb5c..000000000 --- a/view/en/register_verify_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - -A new user registration request was received at $[sitename] which requires -your approval. - - -The login details are as follows: - -Full Name: $[username] -Site Location: $[siteurl] -Login Name: $[email] - - -To approve this request please visit the following link: - - -$[siteurl]/regmod/allow/$[hash] - - -To deny the request and remove the account, please visit: - - -$[siteurl]/regmod/deny/$[hash] - - -Thank you. - diff --git a/view/en/smarty3/register_verify_eml.tpl b/view/en/smarty3/register_verify_eml.tpl deleted file mode 100644 index 962e82a83..000000000 --- a/view/en/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,27 +0,0 @@ - - -A new user registration request was received at {{$sitename}} which requires -your approval. - - -The login details are as follows: - -Full Name: {{$username}} -Site Location: {{$siteurl}} -Login Name: {{$email}} - - -To approve this request please visit the following link: - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -To deny the request and remove the account, please visit: - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Thank you. - diff --git a/view/eo/register_verify_eml.tpl b/view/eo/register_verify_eml.tpl deleted file mode 100644 index cc99ab4b6..000000000 --- a/view/eo/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -Nova peto por registrado atendas ĉe $[sitename] -kaj bezonas vian aprobon. - - -Jen la detaloj de la peto: - -Plena Nomo:»$[username] -Retejo:»$[siteurl] -Salutnomo:»$[email] - - -Aprobonte la peton, bonvolu klaki tiun ligilon: - - -$[siteurl]/regmod/allow/$[hash] - - -Malaprobonte kaj forviŝonte la konton, bonvolu klaki: - - -$[siteurl]/regmod/deny/$[hash] - - -Dankon! diff --git a/view/eo/smarty3/register_verify_eml.tpl b/view/eo/smarty3/register_verify_eml.tpl deleted file mode 100644 index bb5bc65e2..000000000 --- a/view/eo/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - -Nova peto por registrado atendas ĉe {{$sitename}} -kaj bezonas vian aprobon. - - -Jen la detaloj de la peto: - -Plena Nomo:»{{$username}} -Retejo:»{{$siteurl}} -Salutnomo:»{{$email}} - - -Aprobonte la peton, bonvolu klaki tiun ligilon: - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -Malaprobonte kaj forviŝonte la konton, bonvolu klaki: - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Dankon! diff --git a/view/es/register_verify_eml.tpl b/view/es/register_verify_eml.tpl deleted file mode 100644 index 9f2cc4d9b..000000000 --- a/view/es/register_verify_eml.tpl +++ /dev/null @@ -1,22 +0,0 @@ - -Se ha recibido la solicitud de registro de un nuevo usuario en -$sitename que requiere tu aprobación. - -Los datos de acceso son los siguientes: - -Nombre Completo: $username -Sitio: $siteurl -Nombre: $email - - -Para aprobar esta solicitud, visita el siguiente enlace: - -$siteurl/regmod/allow/$hash - -Para denegar la solicitud y eliminar la cuenta, por favor visita: - -$siteurl/regmod/deny/$hash - - -Gracias. - diff --git a/view/es/smarty3/register_verify_eml.tpl b/view/es/smarty3/register_verify_eml.tpl deleted file mode 100644 index b49a616d2..000000000 --- a/view/es/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - -Se ha recibido la solicitud de registro de un nuevo usuario en -{{$sitename}} que requiere tu aprobación. - -Los datos de acceso son los siguientes: - -Nombre Completo: {{$username}} -Sitio: {{$siteurl}} -Nombre: {{$email}} - - -Para aprobar esta solicitud, visita el siguiente enlace: - -{{$siteurl}}/regmod/allow/{{$hash}} - -Para denegar la solicitud y eliminar la cuenta, por favor visita: - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Gracias. - diff --git a/view/fr/register_verify_eml.tpl b/view/fr/register_verify_eml.tpl deleted file mode 100644 index 35d0a730b..000000000 --- a/view/fr/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -Une nouvelle demande d'inscription a été reçue par $[sitename], elle -nécessite votre approbation. - - -Les détails du compte sont: - -Nom complet: $[username] -Adresse du site: $[siteurl] -Utilisateur: $[email] - - -Pour approuver, merci de visiter le lien suivant: - - -$[siteurl]/regmod/allow/$[hash] - - -Pour refuser et supprimer le compte: - - -$[siteurl]/regmod/deny/$[hash] - - -Merci d'avance. diff --git a/view/fr/smarty3/register_verify_eml.tpl b/view/fr/smarty3/register_verify_eml.tpl deleted file mode 100644 index f046797db..000000000 --- a/view/fr/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,28 +0,0 @@ - - -Une nouvelle demande d'inscription a été reçue sur {{$sitename}}, et elle -nécessite votre approbation. - - -Les informations de connexion sont les suivantes : - -Nom complet : {{$username}} -Site : {{$siteurl}} -Pseudo/Courriel : {{$email}} - - -Pour approuver cette demande, merci de suivre le lien : - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -Pour rejeter cette demande et supprimer le compte associé, -merci de suivre le lien : - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -En vous remerçiant. - diff --git a/view/is/register_verify_eml.tpl b/view/is/register_verify_eml.tpl deleted file mode 100644 index 3ebc6fda4..000000000 --- a/view/is/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -Beiðni um nýjan notanda barst $[sitename] sem krefst -þíns samþykkis. - - -Innskráningar upplýsingarnar eru eftirfarandi: - -Fullt nafn: $[username] -Vefþjónn: $[siteurl] -Notendanafn: $[email] - - -Til að samþykkja beiðnina þarf að heimsækja eftirfarandi slóð: - - -$[siteurl]/regmod/allow/$[hash] - - -Til að synja beiðni og eyða notanda þá heimsækir þú slóðina: - - -$[siteurl]/regmod/deny/$[hash] - - -Takk fyrir. diff --git a/view/is/smarty3/register_verify_eml.tpl b/view/is/smarty3/register_verify_eml.tpl deleted file mode 100644 index 0b16695a9..000000000 --- a/view/is/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - -Beiðni um nýjan notanda barst {{$sitename}} sem krefst -þíns samþykkis. - - -Innskráningar upplýsingarnar eru eftirfarandi: - -Fullt nafn: {{$username}} -Vefþjónn: {{$siteurl}} -Notendanafn: {{$email}} - - -Til að samþykkja beiðnina þarf að heimsækja eftirfarandi slóð: - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -Til að synja beiðni og eyða notanda þá heimsækir þú slóðina: - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Takk fyrir. diff --git a/view/it/smarty3/register_verify_eml.tpl b/view/it/smarty3/register_verify_eml.tpl deleted file mode 100644 index 931d9d4b0..000000000 --- a/view/it/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -Su {{$sitename}} è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede -la tua approvazione. - - -I dati di accesso sono i seguenti: - -Nome completo:»{{$username}} -Sito:»{{$siteurl}} -Nome utente:»{{$email}} - - -Per approvare questa richiesta clicca su: - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -Per negare la richiesta e rimuovere il profilo, clicca su: - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Grazie. diff --git a/view/nb-no/register_verify_eml.tpl b/view/nb-no/register_verify_eml.tpl deleted file mode 100644 index 4c2176d7d..000000000 --- a/view/nb-no/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -En ny forespørsel om brukerregistering ble mottatt hos $[sitename] og krever -din godkjenning. - - -Innloggingsdetaljene er som følger: - -Fullt navn:»$[username] -Nettstedsadresse:»$[siteurl] -Brukernavn:»$[email] - - -For å godkjenne denne forespørselen, vennligst besøk følgende lenke: - - -$[siteurl]/regmod/allow/$[hash] - - -For å avslå denne forespørselen og fjerne kontoen, vennligst besøk: - - -$[siteurl]/regmod/deny/$[hash] - - -Mange takk. diff --git a/view/nb-no/smarty3/register_verify_eml.tpl b/view/nb-no/smarty3/register_verify_eml.tpl deleted file mode 100644 index 00b5b93cf..000000000 --- a/view/nb-no/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - -En ny forespørsel om brukerregistering ble mottatt hos {{$sitename}} og krever -din godkjenning. - - -Innloggingsdetaljene er som følger: - -Fullt navn:»{{$username}} -Nettstedsadresse:»{{$siteurl}} -Brukernavn:»{{$email}} - - -For å godkjenne denne forespørselen, vennligst besøk følgende lenke: - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -For å avslå denne forespørselen og fjerne kontoen, vennligst besøk: - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Mange takk. diff --git a/view/nl/register_verify_eml.tpl b/view/nl/register_verify_eml.tpl deleted file mode 100644 index 23388678d..000000000 --- a/view/nl/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -Er heeft zich op $[sitename] een nieuwe gebruiker aangemeld. Dit verzoek vereist -uw toestemming. - - -De inloggegevens zijn als volgt: - -Volledige naam:»$[username] -Friendica-site:»$[siteurl] -Inlognaam:»$[email] - - -Om dit verzoek goed te keuren moet u op de volgende link klikken: - - -$[siteurl]/regmod/allow/$[hash] - - -Om dit verzoek af te keuren en de nieuwe gebruiker weer te verwijderen, moet u op de volgende link klikken: - - -$[siteurl]/regmod/deny/$[hash] - - -Bedankt. diff --git a/view/pl/register_verify_eml.tpl b/view/pl/register_verify_eml.tpl deleted file mode 100644 index 8faf05aeb..000000000 --- a/view/pl/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -Nowy wniosek o rejestrację użytkownika wpłynął na $[sitename] i wymaga -potwierdzenia. - - -Oto szczegóły konta: - -Pełna nazwa:»$[username] -Jesteś na: $[siteurl] -Login:»$[email] - - -Aby potwierdzić rejestrację wejdź na: - - -$[siteurl]/regmod/allow/$[hash] - - -Aby anulować rejestrację i usunąć konto wejdź na: - - -$[siteurl]/regmod/deny/$[hash] - - -Dziękuję. diff --git a/view/pl/smarty3/register_verify_eml.tpl b/view/pl/smarty3/register_verify_eml.tpl deleted file mode 100644 index 2457f74e4..000000000 --- a/view/pl/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - -Nowy wniosek o rejestrację użytkownika wpłynął na {{$sitename}} i wymaga -potwierdzenia. - - -Oto szczegóły konta: - -Pełna nazwa:»{{$username}} -Jesteś na: {{$siteurl}} -Login:»{{$email}} - - -Aby potwierdzić rejestrację wejdź na: - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -Aby anulować rejestrację i usunąć konto wejdź na: - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -Dziękuję. diff --git a/view/ro/smarty3/register_verify_eml.tpl b/view/ro/smarty3/register_verify_eml.tpl deleted file mode 100644 index 8d63a4eb5..000000000 --- a/view/ro/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -O nouă cererea de înregistrare utilizator a fost primită la $ [sitename], care impune -aprobarea ta. - - -Detaliile de login sunt următoarele ; - -Nume complet:»[$[username], -Locaţie Site»$[siteurl] -Login Name: $[email] - - -Pentru a aproba această cerere va rugam sa accesati link-ul următor: - - -$[siteurl]/regmod/allow/$[hash] - - -Pentru a refuza cererea și elimina contul, vă rugăm să vizitați: - - -$[siteurl]/regmod/deny/$[hash] - - -Vă mulţumesc. diff --git a/view/sv/register_verify_eml.tpl b/view/sv/register_verify_eml.tpl deleted file mode 100644 index aa72bc9aa..000000000 --- a/view/sv/register_verify_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ -En registreringsförfrågan som kräver svar har mottagits -på $sitename - - -Här är inloggningsuppgifterna: - -Fullständigt namn: $username -Webbplats: $siteurl -Användarnamn: $email - - -Gå till denna adress om du vill godkänna: -$siteurl/regmod/allow/$hash - -Gå till denna adress om du vill avslå förfrågan och ta bort kontot: -$siteurl/regmod/deny/$hash - diff --git a/view/sv/smarty3/register_verify_eml.tpl b/view/sv/smarty3/register_verify_eml.tpl deleted file mode 100644 index 369c9a53c..000000000 --- a/view/sv/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -En registreringsförfrågan som kräver svar har mottagits -på {{$sitename}} - - -Här är inloggningsuppgifterna: - -Fullständigt namn: {{$username}} -Webbplats: {{$siteurl}} -Användarnamn: {{$email}} - - -Gå till denna adress om du vill godkänna: -{{$siteurl}}/regmod/allow/{{$hash}} - -Gå till denna adress om du vill avslå förfrågan och ta bort kontot: -{{$siteurl}}/regmod/deny/{{$hash}} - diff --git a/view/zh-cn/register_verify_eml.tpl b/view/zh-cn/register_verify_eml.tpl deleted file mode 100644 index eead002f5..000000000 --- a/view/zh-cn/register_verify_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - -受到新的用户注册要求在$[sitename]，要 -您的批准。 - - -登记信息是： - -全名: $[username] -网站位置: $[siteurl] -登记名: $[email] - - -为批准这个要求请点击这个按钮： - - -$[siteurl]/regmod/allow/$[hash] - - -为否定这个要求和删除账户，请点击这个按钮： - - -$[siteurl]/regmod/deny/$[hash] - - -谢谢您。 diff --git a/view/zh-cn/smarty3/register_verify_eml.tpl b/view/zh-cn/smarty3/register_verify_eml.tpl deleted file mode 100644 index 16a935fce..000000000 --- a/view/zh-cn/smarty3/register_verify_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - -受到新的用户注册要求在{{$sitename}}，要 -您的批准。 - - -登记信息是： - -全名: {{$username}} -网站位置: {{$siteurl}} -登记名: {{$email}} - - -为批准这个要求请点击这个按钮： - - -{{$siteurl}}/regmod/allow/{{$hash}} - - -为否定这个要求和删除账户，请点击这个按钮： - - -{{$siteurl}}/regmod/deny/{{$hash}} - - -谢谢您。 From c72d850113fc1d611fe48206886458a5fe291f88 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 7 Sep 2014 13:57:51 +0200 Subject: [PATCH 18/26] added slackr to duepuntoderivates --- view/theme/duepuntozero/deriv/slackr.css | 210 +++++++++++++++++++++++ 1 file changed, 210 insertions(+) create mode 100644 view/theme/duepuntozero/deriv/slackr.css diff --git a/view/theme/duepuntozero/deriv/slackr.css b/view/theme/duepuntozero/deriv/slackr.css new file mode 100644 index 000000000..3b42cdd10 --- /dev/null +++ b/view/theme/duepuntozero/deriv/slackr.css @@ -0,0 +1,210 @@ +.wall-item-content-wrapper { + border: none; +} + +.wall-item-content-wrapper.comment { + background: #ffffff !important; + border-left: 1px solid #EEE; +} + +.wall-item-tools { + background: none; +} +.wall-item-body a:hover { + color: #ff6600; +} + + +.widget { +/* box-shadow: 4px 4px 3px 0 #444444; */ +} + +.comment-edit-text-empty, .comment-edit-text-full { + border: none; + border-left: 1px solid #EEE; + background: #EEEEEE; +} + +.comment-edit-wrapper, .comment-wwedit-wrapper { + background: #ffffff !important; +} + +section { + margin: 0px 32px; +} + +aside { + margin-left: 32px; +} +nav { + margin-left: 32px; + margin-right: 32px; +} + +nav #site-location { + top: 80px; + right: 36px; +} + +#profile-jot-text_parent, .mceLayout { + border-radius: 3px; + -moz-border-radius: 3px; + box-shadow: 4px 4px 3px 0 #444444; +} + +#profile-jot-text:hover { + color: #000000; +} + +#events-reminder { + border-radius: 3px; + -moz-border-radius: 3px; + opacity: 0.3; + filter:alpha(opacity=30); + margin-left: 5px; + margin-top: 5px; +} + +#events-reminder.birthday-today, #events-reminder.event-today { + opacity: 1.0; + filter:alpha(opacity=100); + box-shadow: 4px 4px 3px 0 #444444; + margin-left: 0px; + margin-top: 0px; +} + +#events-reminder:hover { + opacity: 1.0; + filter:alpha(opacity=100); + box-shadow: 4px 4px 3px 0 #444444; + margin-left: 0px; + margin-top: 0px; +} + +.fc-event-skin { + background-color: #3465a4 !important; +} +.wall-item-photo, .photo, .contact-block-img, .my-comment-photo { + border-radius: 3px; + -moz-border-radius: 3px; + box-shadow: 4px 4px 3px 0 #444444; +} + +.forumlist-img { + border-radius: 3px; + -moz-border-radius: 3px; + box-shadow: 4px 4px 3px 0 #444444; +} + +#datebrowse-sidebar select { + margin-left: 25px; + border-radius: 3px; + -moz-border-radius: 3px; + opacity: 0.3; + filter:alpha(opacity=30); +} + +#datebrowse-sidebar select:hover { + opacity: 1.0; + filter:alpha(opacity=100); +} + +#posted-date-selector { + margin-left: 30px !important; + margin-top: 5px !important; + margin-right: 0px !important; + margin-bottom: 0px !important; +} + + +#posted-date-selector:hover { + box-shadow: 4px 4px 3px 0 #444444; + margin-left: 25px !important; + margin-top: 0px !important; + margin-right: 5px !important; + margin-bottom: 5px !important; + +} + +.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img, .photo-album-photo, .photo-top-photo, .profile-jot-text, .group-selected, .nets-selected, .fileas-selected, #profile-jot-submit, .categories-selected { + border-radius: 3px; + -moz-border-radius: 3px; + box-shadow: 4px 4px 3px 0 #444444; +} +.settings-widget .selected { + border-radius: 3px; + -moz-border-radius: 3px; + box-shadow: 4px 4px 3px 0 #444444; +} + +#sidebar-page-list .label { + margin-left: 5px; +} + + +.photo { + border: 1px solid #AAAAAA; +} + +.photo-top-photo, .photo-album-photo { + padding: 10px; + max-width: 300px; + border: 1px solid #888888; +} + +.rotleft1 { +-webkit-transform: rotate(-1deg); +-moz-transform: rotate(-1deg); +-ms-transform: rotate(-1deg); +-o-transform: rotate(-1deg); +} + +.rotleft2 { +-webkit-transform: rotate(-2deg); +-moz-transform: rotate(-2deg); +-ms-transform: rotate(-2deg); +-o-transform: rotate(-2deg); +} + +.rotleft3 { +-webkit-transform: rotate(-3deg); +-moz-transform: rotate(-3deg); +-ms-transform: rotate(-3deg); +-o-transform: rotate(-3deg); +} + +.rotleft4 { +-webkit-transform: rotate(-4deg); +-moz-transform: rotate(-4deg); +-ms-transform: rotate(-4deg); +-o-transform: rotate(-4deg); +} + +.rotright1 { +-webkit-transform: rotate(1deg); +-moz-transform: rotate(1deg); +-ms-transform: rotate(1deg); +-o-transform: rotate(1deg); +} + +.rotright2 { +-webkit-transform: rotate(2deg); +-moz-transform: rotate(2deg); +-ms-transform: rotate(2deg); +-o-transform: rotate(2deg); +} + +.rotright3 { +-webkit-transform: rotate(3deg); +-moz-transform: rotate(3deg); +-ms-transform: rotate(3deg); +-o-transform: rotate(3deg); +} + +.rotright4 { +-webkit-transform: rotate(4deg); +-moz-transform: rotate(4deg); +-ms-transform: rotate(4deg); +-o-transform: rotate(4deg); +} + From a9782251e5a56a5897e0ca050d85c2c98aaa1b69 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 7 Sep 2014 14:00:09 +0200 Subject: [PATCH 19/26] updating config files for duepuntozero --- view/theme/duepuntozero/config.php | 7 ++++++- view/theme/duepuntozero/theme.php | 17 +++++++++++++++++ 2 files changed, 23 insertions(+), 1 deletion(-) diff --git a/view/theme/duepuntozero/config.php b/view/theme/duepuntozero/config.php index f8209bb87..edf12c35f 100644 --- a/view/theme/duepuntozero/config.php +++ b/view/theme/duepuntozero/config.php @@ -43,6 +43,11 @@ function clean_form(&$a, &$colorset, $user){ $colorset = array( 'default'=>t('default'), 'greenzero'=>t('greenzero'), + 'purplezero'=>t('purplezero'), + 'easterbunny'=>t('easterbunny'), + 'darkzero'=>t('darkzero'), + 'comix'=>t('comix'), + 'slackr'=>t('slackr'), ); if ($user) { $color = get_pconfig(local_user(), 'duepuntozero', 'colorset'); @@ -54,7 +59,7 @@ function clean_form(&$a, &$colorset, $user){ '$submit' => t('Submit'), '$baseurl' => $a->get_baseurl(), '$title' => t("Theme settings"), - '$colorset' => array('duepuntozero_colorset', t('Color scheme'), $color, '', $colorset), + '$colorset' => array('duepuntozero_colorset', t('Variations'), $color, '', $colorset), )); return $o; } diff --git a/view/theme/duepuntozero/theme.php b/view/theme/duepuntozero/theme.php index e6c276c0a..ba3f25d3e 100644 --- a/view/theme/duepuntozero/theme.php +++ b/view/theme/duepuntozero/theme.php @@ -5,6 +5,23 @@ function duepuntozero_init(&$a) { $a->theme_info = array(); set_template_engine($a, 'smarty3'); + $colorset = get_pconfig( local_user(), 'duepuntozero','colorset'); + if (!$colorset) + $colorset = get_config('duepuntozero', 'colorset'); // user setting have priority, then node settings + if ($colorset) { + if ($colorset == 'greenzero') + $a->page['htmlhead'] .= ''."\n"; + if ($colorset == 'purplezero') + $a->page['htmlhead'] .= ''."\n"; + if ($colorset == 'easterbunny') + $a->page['htmlhead'] .= ''."\n"; + if ($colorset == 'darkzero') + $a->page['htmlhead'] .= ''."\n"; + if ($colorset == 'comix') + $a->page['htmlhead'] .= ''."\n"; + if ($colorset == 'slackr') + $a->page['htmlhead'] .= ''."\n"; + } $a->page['htmlhead'] .= <<< EOT