From 1bdddebd44d493f65ea2eba04af6ea0de19f48eb Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sat, 6 Sep 2014 17:28:46 +0200 Subject: [PATCH] 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 8e1fc76e9a..f1ce296d90 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 7440c8ab45..5e19a1ffc1 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 539d9ff3df..0000000000 --- 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 70507d71da..0000000000 --- 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 660ac8c1ae..0000000000 --- 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 6a0e337138..0000000000 --- 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 e0ce676a87..0000000000 --- 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 b174b2c612..0000000000 --- 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 462022a050..0000000000 --- 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 0137995c7c..0000000000 --- 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 2135f99750..0000000000 --- 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 9039a7fca5..0000000000 --- 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 27dd1bc945..0000000000 --- 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 b14f6f9922..0000000000 --- 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 89f5783881..0000000000 --- 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 cd78b2a150..0000000000 --- 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 32311e837f..0000000000 --- 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 46d4402a2f..0000000000 --- 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 f429ca4501..0000000000 --- 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 56a4fd8808..0000000000 --- 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 7d50b8bc50..0000000000 --- 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 66903de96d..0000000000 --- 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 0dc867efdc..0000000000 --- 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 a2964808ce..0000000000 --- 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 493446b044..0000000000 --- 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 c9dd3fed63..0000000000 --- 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 1f2553b5eb..0000000000 --- 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 f698cfeb77..0000000000 --- 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 9f329c9500..0000000000 --- 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 88cd00fc4d..0000000000 --- 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 945ff49226..0000000000 --- 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 dba296d4e6..0000000000 --- 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 f25787eff1..0000000000 --- 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 feab4d6f6a..0000000000 --- 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 daeaae9016..0000000000 --- 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 69fce81411..0000000000 --- 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 4526c94d01..0000000000 --- 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 17b0be5a83..0000000000 --- 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 7ffe7c9ae9..0000000000 --- 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 98d4917c8f..0000000000 --- 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 7d00138c9d..0000000000 --- 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 eb9e57948b..0000000000 --- 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 16cbeeaa1b..0000000000 --- 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 a50d0e2d1b..0000000000 --- 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 b6cf0a3b60..0000000000 --- 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 8137f83e29..0000000000 --- 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 13ccbc9d76..0000000000 --- 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 30c5699b80..0000000000 --- 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 9c68c8d09c..0000000000 --- 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 16569d274c..0000000000 --- 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 2b8b0238e8..0000000000 --- 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 1f24af25f6..0000000000 --- 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 7cabdf22d3..0000000000 --- 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 48d565a033..0000000000 --- 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 a25896f09f..0000000000 --- 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 8d8d4f6030..0000000000 --- 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 5e6e99bc9a..0000000000 --- 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 db68d7d715..0000000000 --- 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