From 47ef689c927f8c8692bb98f190b7cc56d5e088ec Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 16 Jun 2013 16:31:59 -0700 Subject: [PATCH 01/52] implement taggable in auto-complete popups --- js/fk.autocomplete.js | 6 +++--- view/theme/redbasic/css/style.css | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/js/fk.autocomplete.js b/js/fk.autocomplete.js index fc41f9cbe..cd0a1c044 100644 --- a/js/fk.autocomplete.js +++ b/js/fk.autocomplete.js @@ -80,7 +80,7 @@ ACPopup.prototype._search = function(){ that.cont.show(); $(data.items).each(function(){ html = "{1} ({2})".format(this.photo, this.name, this.nick) - that.add(html, this.nick.replace(' ','') + '+' + this.id + ' - ' + this.link); + that.add(this.taggable, html, this.nick.replace(' ','') + '+' + this.id + ' - ' + this.link); }); } else { that.cont.hide(); @@ -89,9 +89,9 @@ ACPopup.prototype._search = function(){ }); } - ACPopup.prototype.add = function(label, value){ +ACPopup.prototype.add = function(taggable, label, value){ var that=this; - var elm = $("
"+label+"
"); + var elm = $("
"+label+"
"); elm.click(function(e){ t = $(this).attr('title').replace(new RegExp(' \- .*'),''); if(typeof(that.element.container) === "undefined") { diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 416e79dd5..f644d7903 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -3256,6 +3256,9 @@ brain is weird like that */ background-color:#ffffff; padding: 4px; clear:left; } +.acpopupitem.taggable { + background-color: #ddddff; +} .acpopupitem img { float: left; margin-right: 4px; @@ -3740,7 +3743,7 @@ ul.menu-popup { margin: 4px; } .acl-list-item.taggable { - background-color: #ccccff; + background-color: #ddddff; } .acl-list-item p { height: 12px; font-size: 10px; margin: 0px; padding: 2px 0px 1px; overflow: hidden;} From 99252d65bfd59fb704d32f7dde4c62b080303d33 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 16 Jun 2013 16:49:46 -0700 Subject: [PATCH 02/52] reset email templates to English --- view/cs/follow_notify_eml.tpl | 14 +++--- view/cs/friend_complete_eml.tpl | 21 +++++---- view/cs/htconfig.tpl | 70 ++++++++++++++++++++++++++++++ view/cs/intro_complete_eml.tpl | 23 ++++++---- view/cs/lostpass_eml.tpl | 35 +++++++++------ view/cs/passchanged_eml.tpl | 30 ++++++++----- view/cs/register_open_eml.tpl | 30 ++++++------- view/cs/register_verify_eml.tpl | 29 +++++++------ view/cs/request_notify_eml.tpl | 18 ++++---- view/cs/update_fail_eml.tpl | 13 ++++++ view/de/follow_notify_eml.tpl | 14 +++--- view/de/friend_complete_eml.tpl | 26 +++++------ view/de/htconfig.tpl | 70 ++++++++++++++++++++++++++++++ view/de/intro_complete_eml.tpl | 28 ++++++------ view/de/lostpass_eml.tpl | 36 +++++++-------- view/de/passchanged_eml.tpl | 24 +++++----- view/de/register_open_eml.tpl | 41 ++++++----------- view/de/register_verify_eml.tpl | 24 +++++----- view/de/request_notify_eml.tpl | 18 ++++---- view/de/update_fail_eml.tpl | 20 +++++---- view/eo/follow_notify_eml.tpl | 14 +++--- view/eo/friend_complete_eml.tpl | 26 +++++------ view/eo/htconfig.tpl | 70 ++++++++++++++++++++++++++++++ view/eo/intro_complete_eml.tpl | 28 ++++++------ view/eo/lostpass_eml.tpl | 36 +++++++-------- view/eo/passchanged_eml.tpl | 24 +++++----- view/eo/register_open_eml.tpl | 41 ++++++----------- view/eo/register_verify_eml.tpl | 24 +++++----- view/eo/request_notify_eml.tpl | 18 ++++---- view/eo/update_fail_eml.tpl | 20 +++++---- view/es/follow_notify_eml.tpl | 13 +++--- view/es/friend_complete_eml.tpl | 21 +++++---- view/es/htconfig.tpl | 70 ++++++++++++++++++++++++++++++ view/es/intro_complete_eml.tpl | 27 ++++++------ view/es/lostpass_eml.tpl | 36 ++++++++------- view/es/passchanged_eml.tpl | 21 ++++----- view/es/register_open_eml.tpl | 26 +++++------ view/es/register_verify_eml.tpl | 31 +++++++------ view/es/request_notify_eml.tpl | 16 ++++--- view/es/update_fail_eml.tpl | 13 ++++++ view/fr/follow_notify_eml.tpl | 14 +++--- view/fr/friend_complete_eml.tpl | 25 +++++------ view/fr/htconfig.tpl | 70 ++++++++++++++++++++++++++++++ view/fr/intro_complete_eml.tpl | 28 ++++++------ view/fr/lostpass_eml.tpl | 38 ++++++++-------- view/fr/passchanged_eml.tpl | 24 +++++----- view/fr/register_open_eml.tpl | 27 +++++------- view/fr/register_verify_eml.tpl | 26 +++++------ view/fr/request_notify_eml.tpl | 18 ++++---- view/fr/update_fail_eml.tpl | 13 ++++++ view/it/follow_notify_eml.tpl | 14 +++--- view/it/friend_complete_eml.tpl | 26 +++++------ view/it/htconfig.tpl | 70 ++++++++++++++++++++++++++++++ view/it/intro_complete_eml.tpl | 28 ++++++------ view/it/lostpass_eml.tpl | 36 +++++++-------- view/it/passchanged_eml.tpl | 24 +++++----- view/it/register_open_eml.tpl | 41 ++++++----------- view/it/register_verify_eml.tpl | 24 +++++----- view/it/request_notify_eml.tpl | 18 ++++---- view/it/update_fail_eml.tpl | 13 ++++++ view/nb-no/follow_notify_eml.tpl | 14 +++--- view/nb-no/friend_complete_eml.tpl | 26 +++++------ view/nb-no/htconfig.tpl | 70 ++++++++++++++++++++++++++++++ view/nb-no/intro_complete_eml.tpl | 28 ++++++------ view/nb-no/lostpass_eml.tpl | 36 +++++++-------- view/nb-no/passchanged_eml.tpl | 24 +++++----- view/nb-no/register_open_eml.tpl | 41 ++++++----------- view/nb-no/register_verify_eml.tpl | 24 +++++----- view/nb-no/request_notify_eml.tpl | 18 ++++---- view/nb-no/update_fail_eml.tpl | 20 +++++---- view/pt-br/follow_notify_eml.tpl | 14 ++++++ view/pt-br/friend_complete_eml.tpl | 22 ++++++++++ view/pt-br/htconfig.tpl | 70 ++++++++++++++++++++++++++++++ view/pt-br/intro_complete_eml.tpl | 22 ++++++++++ view/pt-br/lostpass_eml.tpl | 32 ++++++++++++++ view/pt-br/passchanged_eml.tpl | 20 +++++++++ view/pt-br/register_open_eml.tpl | 19 ++++++++ view/pt-br/register_verify_eml.tpl | 25 +++++++++++ view/pt-br/request_notify_eml.tpl | 17 ++++++++ view/pt-br/update_fail_eml.tpl | 13 ++++++ view/ru/follow_notify_eml.tpl | 14 ++++++ view/ru/friend_complete_eml.tpl | 22 ++++++++++ view/ru/htconfig.tpl | 70 ++++++++++++++++++++++++++++++ view/ru/intro_complete_eml.tpl | 22 ++++++++++ view/ru/lostpass_eml.tpl | 32 ++++++++++++++ view/ru/passchanged_eml.tpl | 20 +++++++++ view/ru/register_open_eml.tpl | 19 ++++++++ view/ru/register_verify_eml.tpl | 25 +++++++++++ view/ru/request_notify_eml.tpl | 17 ++++++++ view/ru/update_fail_eml.tpl | 13 ++++++ view/sv/follow_notify_eml.tpl | 16 ++++--- view/sv/friend_complete_eml.tpl | 27 +++++++----- view/sv/htconfig.tpl | 70 ++++++++++++++++++++++++++++++ view/sv/intro_complete_eml.tpl | 29 +++++++------ view/sv/lostpass_eml.tpl | 39 +++++++++-------- view/sv/passchanged_eml.tpl | 26 ++++++----- view/sv/register_open_eml.tpl | 24 +++++----- view/sv/register_verify_eml.tpl | 28 +++++++----- view/sv/request_notify_eml.tpl | 20 +++++---- view/sv/update_fail_eml.tpl | 13 ++++++ 100 files changed, 1986 insertions(+), 851 deletions(-) create mode 100644 view/cs/htconfig.tpl create mode 100644 view/cs/update_fail_eml.tpl create mode 100644 view/de/htconfig.tpl create mode 100644 view/eo/htconfig.tpl create mode 100644 view/es/htconfig.tpl create mode 100644 view/es/update_fail_eml.tpl create mode 100644 view/fr/htconfig.tpl create mode 100644 view/fr/update_fail_eml.tpl create mode 100644 view/it/htconfig.tpl create mode 100644 view/it/update_fail_eml.tpl create mode 100644 view/nb-no/htconfig.tpl create mode 100644 view/pt-br/follow_notify_eml.tpl create mode 100644 view/pt-br/friend_complete_eml.tpl create mode 100644 view/pt-br/htconfig.tpl create mode 100644 view/pt-br/intro_complete_eml.tpl create mode 100644 view/pt-br/lostpass_eml.tpl create mode 100644 view/pt-br/passchanged_eml.tpl create mode 100644 view/pt-br/register_open_eml.tpl create mode 100644 view/pt-br/register_verify_eml.tpl create mode 100644 view/pt-br/request_notify_eml.tpl create mode 100644 view/pt-br/update_fail_eml.tpl create mode 100644 view/ru/follow_notify_eml.tpl create mode 100644 view/ru/friend_complete_eml.tpl create mode 100644 view/ru/htconfig.tpl create mode 100644 view/ru/intro_complete_eml.tpl create mode 100644 view/ru/lostpass_eml.tpl create mode 100644 view/ru/passchanged_eml.tpl create mode 100644 view/ru/register_open_eml.tpl create mode 100644 view/ru/register_verify_eml.tpl create mode 100644 view/ru/request_notify_eml.tpl create mode 100644 view/ru/update_fail_eml.tpl create mode 100644 view/sv/htconfig.tpl create mode 100644 view/sv/update_fail_eml.tpl diff --git a/view/cs/follow_notify_eml.tpl b/view/cs/follow_notify_eml.tpl index 440ba9ca4..ba07b19da 100644 --- a/view/cs/follow_notify_eml.tpl +++ b/view/cs/follow_notify_eml.tpl @@ -1,14 +1,14 @@ -Milý/Milá $username, +Dear {{$myname}}, -Máte nového následovatele na $sitename - '$requestor'. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -Můžete si prohlédnout jeho/její profil na $url. +You may visit their profile at {{$url}}. -Přihlaste se na váš server k odsouhlasení nebo ignorování/zrušení žádosti. +Please login to your site to approve or ignore/cancel the request. -$siteurl +{{$siteurl}} -S pozdravem, +Regards, - $sitename administrátor + {{$sitename}} administrator diff --git a/view/cs/friend_complete_eml.tpl b/view/cs/friend_complete_eml.tpl index 50bb7e105..1c647b994 100644 --- a/view/cs/friend_complete_eml.tpl +++ b/view/cs/friend_complete_eml.tpl @@ -1,17 +1,22 @@ -Milý/Milá $username, +Dear {{$username}}, - Skvělé zprávy... '$fn' na '$dfrn_url' odsouhlasil Váš požadavek na spojení na '$sitename'. + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -Jste nyní přátelé a můžete si vyměňovat aktualizace statusu, fotek a e-mailů bez omezení. +You are now mutual friends and may exchange status updates, photos, and email +without restriction. -Pokud budete chtít tento vztah jakkoliv upravit, navštivte Vaši stránku "Kontakty" na $sitename. +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. -$siteurl +{{$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'). +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '{{$fn}}']. -S pozdravem, +Sincerely, - $sitename administrátor + {{$sitename}} Administrator + diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/cs/htconfig.tpl @@ -0,0 +1,70 @@ +config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/cs/intro_complete_eml.tpl b/view/cs/intro_complete_eml.tpl index 91753f35d..2c2428d68 100644 --- a/view/cs/intro_complete_eml.tpl +++ b/view/cs/intro_complete_eml.tpl @@ -1,17 +1,22 @@ -Milý/Milá $username, +Dear {{$username}}, + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. - '$fn' na '$dfrn_url' odsouhlasil Váš požadavek na spojení na '$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' 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}}' may choose to extend this into a two-way or more permissive +relationship in the future. - '$fn' může v budoucnu rozšířit toto spojení na oboustranné nebo jinak méně restriktivní. + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at - Nyní začnete dostávat veřejné aktualizace statusu od '$fn', které se objeví ve Vaší stránce "Síť" na webu +{{$siteurl}} -$siteurl +Sincerely, -S pozdravem, - - $sitename administrátor + {{$sitename}} Administrator diff --git a/view/cs/lostpass_eml.tpl b/view/cs/lostpass_eml.tpl index 05042ddce..3b79d2791 100644 --- a/view/cs/lostpass_eml.tpl +++ b/view/cs/lostpass_eml.tpl @@ -1,23 +1,32 @@ -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. +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. -Vaše heslo nebude změněno, dokud nebudeme mít potvrzení, že jste o tento požadavek zažádali právě Vy. +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. -Klikněte na tento odkaz pro prověření Vaší identity: +Your password will not be changed unless we can verify that you +issued this request. -$reset_link +Follow this link to verify your identity: -Poté obdržíte další zprávu obsahující nové heslo. +{{$reset_link}} -Následně si toto heslo můžete změnit z vašeho účtu na stránce Nastavení. +You will then receive a follow-up message containing the new password. -Přihlašovací údaje jsou tato: +You may change that password from your account settings page after logging in. -Adresa webu: $siteurl -Přihlašovací jméno: $email +The login details are as follows: -S pozdravem, +Site Location: {{$siteurl}} +Login Name: {{$email}} - $sitename administrátor + + + +Sincerely, + {{$sitename}} Administrator + + diff --git a/view/cs/passchanged_eml.tpl b/view/cs/passchanged_eml.tpl index 5447d2e80..0d94be3c2 100644 --- a/view/cs/passchanged_eml.tpl +++ b/view/cs/passchanged_eml.tpl @@ -1,14 +1,20 @@ -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). +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 + -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/register_open_eml.tpl b/view/cs/register_open_eml.tpl index f8e42678b..4b397201c 100644 --- a/view/cs/register_open_eml.tpl +++ b/view/cs/register_open_eml.tpl @@ -1,23 +1,19 @@ -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 +An account has been created at {{$sitename}} for this email address. +The login details are as follows: -Toto heslo si můžete změnit z vašeho účtu na stránce "Nastavení" poté, co se přihlásíte. +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) -Věnujte prosím chvíli revizi dalších nastavení Vašeho účtu na této stránce. +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. -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. +Thank you and welcome to {{$sitename}}. -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í. +Sincerely, + {{$sitename}} Administrator -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/register_verify_eml.tpl b/view/cs/register_verify_eml.tpl index 4b34c6b6d..85d9a12d3 100644 --- a/view/cs/register_verify_eml.tpl +++ b/view/cs/register_verify_eml.tpl @@ -1,22 +1,25 @@ -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: +A new user registration request was received at {{$sitename}} which requires +your approval. -$siteurl/regmod/allow/$hash +The login details are as follows: + +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} + +To approve this request please visit the following link: -Pro zamítnutí žádosti a odstranění účtu prosím klikněte na tento odkaz: +{{$siteurl}}/regmod/allow/{{$hash}} -$siteurl/regmod/deny/$hash +To deny the request and remove the account, please visit: -Díky. +{{$siteurl}}/regmod/deny/{{$hash}} + + +Thank you. + diff --git a/view/cs/request_notify_eml.tpl b/view/cs/request_notify_eml.tpl index 74010c79c..d01b8ff27 100644 --- a/view/cs/request_notify_eml.tpl +++ b/view/cs/request_notify_eml.tpl @@ -1,15 +1,17 @@ -Milý/Milá $username, +Dear {{$myname}}, -Právě jste obdržel/obdržela požadavek na spojení na webu $sitename +You have just received a connection request at {{$sitename}} -od '$requestor'. +from '{{$requestor}}'. -Můžete navštívit jeho/její profil na následujícím odkazu $url. +You may visit their profile at {{$url}}. -Přihlaste se na Váš web k zobrazení kompletní žádosti a odsouhlaste nebo ignorujte/zrušte tuto žádost. +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. -$siteurl +{{$siteurl}} -S pozdravem, - $sitename administrátor +Regards, + + {{$sitename}} administrator diff --git a/view/cs/update_fail_eml.tpl b/view/cs/update_fail_eml.tpl new file mode 100644 index 000000000..a7df8fc2f --- /dev/null +++ b/view/cs/update_fail_eml.tpl @@ -0,0 +1,13 @@ +Hey, +I'm the web server at {{$sitename}}; + +The Red Matrix developers released update {{$update}} recently, +but when I tried to install it, something went terribly wrong. +This needs to be fixed soon and it requires human intervention. +Please contact a Red developer if you can not figure out how to +fix it on your own. My database might be invalid. + +The error message is '{{$error}}'. + +Apologies for the inconvenience, + your web server at {{$siteurl}} \ No newline at end of file diff --git a/view/de/follow_notify_eml.tpl b/view/de/follow_notify_eml.tpl index a866a08a2..ba07b19da 100644 --- a/view/de/follow_notify_eml.tpl +++ b/view/de/follow_notify_eml.tpl @@ -1,14 +1,14 @@ -Hallo $[myname], +Dear {{$myname}}, -Du hast einen neuen Anhänger auf $[sitename] - '$[requestor]'. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -Du kannst das Profil unter $[url] besuchen. +You may visit their profile at {{$url}}. -Bitte melde dich an um die Anfrage zu bestätigen oder sie zu ignorieren bzw. abzulehnen. +Please login to your site to approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} -beste Grüße, +Regards, - $[sitename] Administrator \ No newline at end of file + {{$sitename}} administrator diff --git a/view/de/friend_complete_eml.tpl b/view/de/friend_complete_eml.tpl index 39f2725ea..1c647b994 100644 --- a/view/de/friend_complete_eml.tpl +++ b/view/de/friend_complete_eml.tpl @@ -1,22 +1,22 @@ -Hallo $[username], +Dear {{$username}}, - Großartige Neuigkeiten... '$[fn]' auf '$[dfrn_url]' hat -deine Kontaktanfrage auf '$[sitename]' bestätigt. + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -Ihr seid nun beidseitige Freunde und könnt Statusmitteilungen, Bilder und Emails -ohne Einschränkungen austauschen. +You are now mutual friends and may exchange status updates, photos, and email +without restriction. -Rufe deine 'Kontakte' Seite auf $[sitename] auf, wenn du -Änderungen an diesem Kontakt vornehmen willst. +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. -$[siteurl] +{{$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]. +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '{{$fn}}']. -Beste Grüße, +Sincerely, - $[sitename] Administrator + {{$sitename}} Administrator - \ No newline at end of file + diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/de/htconfig.tpl @@ -0,0 +1,70 @@ +config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/de/intro_complete_eml.tpl b/view/de/intro_complete_eml.tpl index 9d47a6fb1..2c2428d68 100644 --- a/view/de/intro_complete_eml.tpl +++ b/view/de/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Hallo $[username], +Dear {{$username}}, - '$[fn]' auf '$[dfrn_url]' hat deine Verbindungsanfrage -auf '$[sitename]' akzeptiert. + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. - '$[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}}' 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]' kann wählen, ob die Freundschaft in eine beidseitige oder alles erlaubende -Beziehung in der Zukunft erweitert wird. + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. - Du empfängst ab sofort die öffentlichen Beiträge von '$[fn]', -auf deiner "Netzwerk" Seite. + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at -$[siteurl] +{{$siteurl}} -Beste Grüße, +Sincerely, - $[sitename] Administrator \ No newline at end of file + {{$sitename}} Administrator diff --git a/view/de/lostpass_eml.tpl b/view/de/lostpass_eml.tpl index 9f71bbfb1..3b79d2791 100644 --- a/view/de/lostpass_eml.tpl +++ b/view/de/lostpass_eml.tpl @@ -1,32 +1,32 @@ -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. +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. -Wenn du die Anfrage NICHT gesendet haben solltest, dann IGNORIERE -bitte diese Mail und den Link. +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. -Dein Passwort wird nicht geändert werden solange wir nicht überprüfen -konnten, dass du die Anfrage gestellt hast. +Your password will not be changed unless we can verify that you +issued this request. -Folge diesem Link um deine Identität zu verifizieren: +Follow this link to verify your identity: -$[reset_link] +{{$reset_link}} -Du wirst eine weitere Email erhalten mit dem neuen Passwort. +You will then receive a follow-up message containing the new password. -Das Passwort kannst du anschließend wie gewohnt in deinen Account Einstellungen ändern. +You may change that password from your account settings page after logging in. -Die Login-Details sind die folgenden: +The login details are as follows: -Adresse der Seite: $[siteurl] -Login Name: $[email] +Site Location: {{$siteurl}} +Login Name: {{$email}} -Grüße, - $[sitename] Administrator +Sincerely, + {{$sitename}} Administrator - \ No newline at end of file + diff --git a/view/de/passchanged_eml.tpl b/view/de/passchanged_eml.tpl index dcabbbe49..0d94be3c2 100644 --- a/view/de/passchanged_eml.tpl +++ b/view/de/passchanged_eml.tpl @@ -1,20 +1,20 @@ -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). +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). -Deine Login Daten wurden wie folgt geändert: +Your login details are as follows: -Adresse der Seite: $[siteurl] -Login Name: $[email] -Passwort: $[new_password] +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} -Du kannst dein Passwort unter deinen Account-Einstellungen ändern, wenn du angemeldet bist. +You may change that password from your account settings page after logging in. -Beste Grüße, - $[sitename] Administrator +Sincerely, + {{$sitename}} Administrator - \ No newline at end of file + diff --git a/view/de/register_open_eml.tpl b/view/de/register_open_eml.tpl index 4392e8da2..4b397201c 100644 --- a/view/de/register_open_eml.tpl +++ b/view/de/register_open_eml.tpl @@ -1,34 +1,19 @@ -Hallo $[username], - Danke für deine Anmeldung auf $[sitename]. Dein Account wurde angelegt. -Hier die Login Details: +An account has been created at {{$sitename}} for this email address. +The login details are as follows: +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) -Adresse der Seite: $[siteurl] -Login Name: $[email] -Passwort: $[password] +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. -Du kannst und solltest das Passwort in den "Einstellungen" zu deinem Account ändern, -nachdem du dich erstmalig eingeloggt hast. +Thank you and welcome to {{$sitename}}. -Bitte nimm dir einige Augenblicke Zeit, um die anderen Einstellungen auf der Seite kennenzulernen und zu überprüfen. +Sincerely, + {{$sitename}} Administrator -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/register_verify_eml.tpl b/view/de/register_verify_eml.tpl index 8f25f5c36..85d9a12d3 100644 --- a/view/de/register_verify_eml.tpl +++ b/view/de/register_verify_eml.tpl @@ -1,25 +1,25 @@ -Eine Neuanmeldung auf $[sitename] benötigt -deine Aufmerksamkeit. +A new user registration request was received at {{$sitename}} which requires +your approval. -Die Login-Einzelheiten sind die folgenden: +The login details are as follows: -Kompletter Name: $[username] -Adresse der Seite: $[siteurl] -Login Name: $[email] +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} + +To approve this request please visit the following link: -Um die Anfrage zu bestätigen besuche bitte: +{{$siteurl}}/regmod/allow/{{$hash}} -$[siteurl]/regmod/allow/$[hash] +To deny the request and remove the account, please visit: -Um die Anfrage abzulehnen und den Account zu löschen besuche bitte: +{{$siteurl}}/regmod/deny/{{$hash}} -$[siteurl]/regmod/deny/$[hash] +Thank you. - -Danke! diff --git a/view/de/request_notify_eml.tpl b/view/de/request_notify_eml.tpl index 057044e8c..d01b8ff27 100644 --- a/view/de/request_notify_eml.tpl +++ b/view/de/request_notify_eml.tpl @@ -1,17 +1,17 @@ -Hallo $[myname], +Dear {{$myname}}, -du hast eine Kontaktanfrage von '$[requestor]' auf $[sitename] +You have just received a connection request at {{$sitename}} -erhalten. +from '{{$requestor}}'. -Du kannst sein/ihr Profil unter $[url] finden. +You may visit their profile at {{$url}}. -Bitte melde dich an um die komplette Vorstellung einzusehen -und die Anfrage zu bestätigen oder zu ignorieren oder abzulehnen. +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} -Beste Grüße, +Regards, - $[sitename] Administrator \ No newline at end of file + {{$sitename}} administrator diff --git a/view/de/update_fail_eml.tpl b/view/de/update_fail_eml.tpl index cfb55e240..a7df8fc2f 100644 --- a/view/de/update_fail_eml.tpl +++ b/view/de/update_fail_eml.tpl @@ -1,11 +1,13 @@ -Hi, -ich bin $sitename. -Die friendica Entwickler haben jüngst Update $update veröffentlicht, -aber als ich versucht habe es zu installieren ist etwas schrecklich schief gegangen. -Das sollte schnellst möglichst behoben werden und ich kann das nicht alleine machen. -Bitte wende dich an einen friendica Entwickler, falls du mir nicht alleine helfen kannst. Meine Datenbank könnte unbrauchbar sein. +Hey, +I'm the web server at {{$sitename}}; + +The Red Matrix developers released update {{$update}} recently, +but when I tried to install it, something went terribly wrong. +This needs to be fixed soon and it requires human intervention. +Please contact a Red developer if you can not figure out how to +fix it on your own. My database might be invalid. -Die Fehlermeldung lautet '$error'. +The error message is '{{$error}}'. -Tut mir Leid! -Deine friendica Instanz auf $siteurl \ No newline at end of file +Apologies for the inconvenience, + your web server at {{$siteurl}} \ No newline at end of file diff --git a/view/eo/follow_notify_eml.tpl b/view/eo/follow_notify_eml.tpl index e76453ac1..ba07b19da 100644 --- a/view/eo/follow_notify_eml.tpl +++ b/view/eo/follow_notify_eml.tpl @@ -1,14 +1,14 @@ -Kara $[myname], +Dear {{$myname}}, -Vi havas novan abonanton ĉe $[sitename] - '$[requestor]'. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -Vi povas viziti ilian profilon ĉe $[url]. +You may visit their profile at {{$url}}. -Bonvolu ensaluti en vian retejon por aprobi au malaprobi/nuligi la peton. +Please login to your site to approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} -Salutoj, +Regards, - [$sitename] administranto \ No newline at end of file + {{$sitename}} administrator diff --git a/view/eo/friend_complete_eml.tpl b/view/eo/friend_complete_eml.tpl index f429ca450..1c647b994 100644 --- a/view/eo/friend_complete_eml.tpl +++ b/view/eo/friend_complete_eml.tpl @@ -1,22 +1,22 @@ -Kara $[username], +Dear {{$username}}, - Boegaj novaĵoj.... '$[fn]' ĉe '$[dfrn_url]' aprobis -vian kontaktpeton ĉe '$[sitename]'. + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -Vi nun estas reciprokaj amikoj kaj povas interŝanĝi afiŝojn, bildojn kaj mesaĝojn -senkatene. +You are now mutual friends and may exchange status updates, photos, and email +without restriction. -Bonvolu viziti vian 'Kontaktoj' paĝon ĉe $[sitename] se vi volas -ŝangi la rilaton. +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. -$[siteurl] +{{$siteurl}} -[Ekzempe, vi eble volas krei disiĝintan profilon kun informoj kiu ne -haveblas al la komuna publiko - kaj rajtigi '$[fn]' al ĝi]' +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '{{$fn}}']. -Salutoj, +Sincerely, - $[sitename] administranto + {{$sitename}} Administrator - \ No newline at end of file + diff --git a/view/eo/htconfig.tpl b/view/eo/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/eo/htconfig.tpl @@ -0,0 +1,70 @@ +config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/eo/intro_complete_eml.tpl b/view/eo/intro_complete_eml.tpl index 56a4fd880..2c2428d68 100644 --- a/view/eo/intro_complete_eml.tpl +++ b/view/eo/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Kara $[username], +Dear {{$username}}, - '$[fn]' ĉe '$[dfrn_url]' akceptis -vian kontaktpeton ĉe '$[sitename]'. + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$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}}' 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]' eblas konverti la rilaton al ambaŭdirekta rilato -aŭ apliki pli da permesoj. + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. - Vi ekricevos publikajn afiŝojn de '$[fn]', -kiuj aperos sur via 'Reto' paĝo ĉe + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at -$[siteurl] +{{$siteurl}} -Salutoj, +Sincerely, - $[sitename] administranto \ No newline at end of file + {{$sitename}} Administrator diff --git a/view/eo/lostpass_eml.tpl b/view/eo/lostpass_eml.tpl index 26d1a3c23..3b79d2791 100644 --- a/view/eo/lostpass_eml.tpl +++ b/view/eo/lostpass_eml.tpl @@ -1,32 +1,32 @@ -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. +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. -Se vi NE petis tiun ŝanĝon, bonvolu NE KLAKU la -sekvantan ligilon kaj ignoru aŭ forvisu ĉi-mesaĝon. +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. -Ni ne ŝanĝu vian pasvorton se ni ne povas kontroli ĉu estas vi -kiu petis la ŝanĝon. +Your password will not be changed unless we can verify that you +issued this request. -Sekvu ĉi tion ligilon por konfirmi vian identecon: +Follow this link to verify your identity: -$[reset_link] +{{$reset_link}} -Poste, vi ricevos mesaĝon enhavonte la novan pasvorton. +You will then receive a follow-up message containing the new password. -Vi eblas ŝangi la pasvorton ĉe viaj kontdoagordoj paĝo post ensaluti. +You may change that password from your account settings page after logging in. -La akreditaĵoj estas: +The login details are as follows: -Retejo:»$[siteurl] -Salutnomo:»$[email] +Site Location: {{$siteurl}} +Login Name: {{$email}} -Salutoj, - $[sitename] administranto +Sincerely, + {{$sitename}} Administrator - \ No newline at end of file + diff --git a/view/eo/passchanged_eml.tpl b/view/eo/passchanged_eml.tpl index ee775d5dd..0d94be3c2 100644 --- a/view/eo/passchanged_eml.tpl +++ b/view/eo/passchanged_eml.tpl @@ -1,20 +1,20 @@ -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). +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). -Jen viaj legitimaĵoj: +Your login details are as follows: -Retejo:»$[siteurl] -Salutnomo:»$[email] -Pasvorto:»$[new_password] +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} -Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas ensalutita. +You may change that password from your account settings page after logging in. -Salutoj, - $[sitename] administranto +Sincerely, + {{$sitename}} Administrator - \ No newline at end of file + diff --git a/view/eo/register_open_eml.tpl b/view/eo/register_open_eml.tpl index 735ea9a4b..4b397201c 100644 --- a/view/eo/register_open_eml.tpl +++ b/view/eo/register_open_eml.tpl @@ -1,34 +1,19 @@ -Kara $[username], - Dankon pro via registrado ĉe $[sitename]. Vian konton estas kreita. -Jen viaj legitimaĵoj: +An account has been created at {{$sitename}} for this email address. +The login details are as follows: +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) -Retejo:»$[siteurl] -Salutnomo:»$[email] -Pasvorto:»$[password] +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. -Vi eblas ŝanĝi la pasvorton ĉe la paĝo Agordoj -> Konto kiam vi estas -ensalutita. +Thank you and welcome to {{$sitename}}. -Bonvolu preni kelkajn momentoj por kontroli la aliajn kontaktagordojn. +Sincerely, + {{$sitename}} Administrator -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/register_verify_eml.tpl b/view/eo/register_verify_eml.tpl index cc99ab4b6..85d9a12d3 100644 --- a/view/eo/register_verify_eml.tpl +++ b/view/eo/register_verify_eml.tpl @@ -1,25 +1,25 @@ -Nova peto por registrado atendas ĉe $[sitename] -kaj bezonas vian aprobon. +A new user registration request was received at {{$sitename}} which requires +your approval. -Jen la detaloj de la peto: +The login details are as follows: -Plena Nomo:»$[username] -Retejo:»$[siteurl] -Salutnomo:»$[email] +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} + +To approve this request please visit the following link: -Aprobonte la peton, bonvolu klaki tiun ligilon: +{{$siteurl}}/regmod/allow/{{$hash}} -$[siteurl]/regmod/allow/$[hash] +To deny the request and remove the account, please visit: -Malaprobonte kaj forviŝonte la konton, bonvolu klaki: +{{$siteurl}}/regmod/deny/{{$hash}} -$[siteurl]/regmod/deny/$[hash] +Thank you. - -Dankon! diff --git a/view/eo/request_notify_eml.tpl b/view/eo/request_notify_eml.tpl index eb91414b9..d01b8ff27 100644 --- a/view/eo/request_notify_eml.tpl +++ b/view/eo/request_notify_eml.tpl @@ -1,17 +1,17 @@ -Kara $[myname], +Dear {{$myname}}, -Vi ĵus ricevis kontaktpeton ĉe $[sitename] +You have just received a connection request at {{$sitename}} -de '$[requestor]'. +from '{{$requestor}}'. -Vi eblas viziti la profilon de la petanto ĉe $[url]. +You may visit their profile at {{$url}}. -Bonvolu ensaluti en la retejo por vidi la plenan prezenton -kaj aprobi aŭ ignori/nuligi la peton. +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} -Salutoj, +Regards, - $[sitename] administranto \ No newline at end of file + {{$sitename}} administrator diff --git a/view/eo/update_fail_eml.tpl b/view/eo/update_fail_eml.tpl index f7e0d8bce..a7df8fc2f 100644 --- a/view/eo/update_fail_eml.tpl +++ b/view/eo/update_fail_eml.tpl @@ -1,11 +1,13 @@ -Saluton! -Mi estas $sitename. -La programistoj de Frienda eldonis ĝisdatigon $update antaŭ ne longe, -sed kiam mi provis instali ĝin, io terure malsukcesis. -Tio tuj bezonas riparon kaj mi ne povas fari ĝin sole. Bonvolu kontakti -Friendica programistion se vi ne povas helpi vin mem. Mia datumbazo eble ne plu validas. +Hey, +I'm the web server at {{$sitename}}; + +The Red Matrix developers released update {{$update}} recently, +but when I tried to install it, something went terribly wrong. +This needs to be fixed soon and it requires human intervention. +Please contact a Red developer if you can not figure out how to +fix it on your own. My database might be invalid. -La erarmesaĝo estas '$error'. +The error message is '{{$error}}'. -Mi bedaŭras, -via Friendica servilo ĉe $siteurl \ No newline at end of file +Apologies for the inconvenience, + your web server at {{$siteurl}} \ No newline at end of file diff --git a/view/es/follow_notify_eml.tpl b/view/es/follow_notify_eml.tpl index 17bd2c01c..ba07b19da 100644 --- a/view/es/follow_notify_eml.tpl +++ b/view/es/follow_notify_eml.tpl @@ -1,13 +1,14 @@ -Estimado/a $myname, +Dear {{$myname}}, -Tienes un nuevo seguidor en $sitename - '$requestor'. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -Puedes visitar su perfil en $url. +You may visit their profile at {{$url}}. -Inicie sesión en su sitio para aprobar o rechazar/cancelar la solicitud. +Please login to your site to approve or ignore/cancel the request. -$siteurl +{{$siteurl}} +Regards, - $sitename + {{$sitename}} administrator diff --git a/view/es/friend_complete_eml.tpl b/view/es/friend_complete_eml.tpl index 0dc867efd..1c647b994 100644 --- a/view/es/friend_complete_eml.tpl +++ b/view/es/friend_complete_eml.tpl @@ -1,19 +1,22 @@ -Estimado/a $username, +Dear {{$username}}, - Grandes noticias... '$fn' a '$dfrn_url' ha aceptado tu solicitud de conexión en '$sitename'. + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -Ahora sois amigos mutuos y podreis intercambiar actualizaciones de estado, fotos, y correo electrónico -sin restricción alguna. +You are now mutual friends and may exchange status updates, photos, and email +without restriction. -Visita tu página de 'Contactos' en $sitename si desear realizar cualquier cambio en esta relación. +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. -$siteurl +{{$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']. +[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 + {{$sitename}} Administrator diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/es/htconfig.tpl @@ -0,0 +1,70 @@ +config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/es/intro_complete_eml.tpl b/view/es/intro_complete_eml.tpl index a2964808c..2c2428d68 100644 --- a/view/es/intro_complete_eml.tpl +++ b/view/es/intro_complete_eml.tpl @@ -1,21 +1,22 @@ -Estimado/a $username, +Dear {{$username}}, - '$fn' en '$dfrn_url' ha aceptado tu petición -conexión a '$sitename'. + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$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}}' 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' puede optar por extender esto en una relación más permisiva -en el futuro. + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. - Empezarás a recibir las actualizaciones públicas de estado de '$fn', -que aparecerán en tu página "Red" en + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at -$siteurl +{{$siteurl}} +Sincerely, - $sitename + {{$sitename}} Administrator diff --git a/view/es/lostpass_eml.tpl b/view/es/lostpass_eml.tpl index 607744bfe..3b79d2791 100644 --- a/view/es/lostpass_eml.tpl +++ b/view/es/lostpass_eml.tpl @@ -1,34 +1,32 @@ -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. +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. -Se NO has solicitado este cambio, por favor NO sigas el enlace indicado e ignora -y/o elimina este mensaje. +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. -Tu contraseña no se cambiará a menos que podamos verificar que eres tu quien -emitió esta solicitud. +Your password will not be changed unless we can verify that you +issued this request. -Sigue este enlace para verificar tu identidad: +Follow this link to verify your identity: -$reset_link +{{$reset_link}} -A continuación recibirás un mensaje con la nueva contraseña. +You will then receive a follow-up message containing the new password. -Despues de accceder, podrás cambiar la contraseña de tu cuenta en la página de -configuración. +You may change that password from your account settings page after logging in. -Los datos de acceso son los siguientes: +The login details are as follows: -Sitio: $siteurl -Nombre: $email +Site Location: {{$siteurl}} +Login Name: {{$email}} -Saludos, - La administración de $sitename +Sincerely, + {{$sitename}} Administrator diff --git a/view/es/passchanged_eml.tpl b/view/es/passchanged_eml.tpl index 7959846b7..0d94be3c2 100644 --- a/view/es/passchanged_eml.tpl +++ b/view/es/passchanged_eml.tpl @@ -1,19 +1,20 @@ -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). +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). -Tus datos de acceso son los siguientes: +Your login details are as follows: -Sitio: $siteurl -Nombre: $email -Contraseña: $new_password +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} -Después de acceder puedes cambiar la contraseña desde la página de configuración de tu perfil. +You may change that password from your account settings page after logging in. - $sitename +Sincerely, + {{$sitename}} Administrator diff --git a/view/es/register_open_eml.tpl b/view/es/register_open_eml.tpl index 7c7a90b40..4b397201c 100644 --- a/view/es/register_open_eml.tpl +++ b/view/es/register_open_eml.tpl @@ -1,21 +1,19 @@ -Estimado/a $username, +An account has been created at {{$sitename}} for this email address. +The login details are as follows: - Gracias por registrarte en $sitename. Tu cuenta ha sido creada. +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. -Los datos de acceso son los siguientes: +Thank you and welcome to {{$sitename}}. -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. +Sincerely, + {{$sitename}} Administrator diff --git a/view/es/register_verify_eml.tpl b/view/es/register_verify_eml.tpl index 9f2cc4d9b..85d9a12d3 100644 --- a/view/es/register_verify_eml.tpl +++ b/view/es/register_verify_eml.tpl @@ -1,22 +1,25 @@ -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 +A new user registration request was received at {{$sitename}} which requires +your approval. -Para aprobar esta solicitud, visita el siguiente enlace: +The login details are as follows: -$siteurl/regmod/allow/$hash +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} -Para denegar la solicitud y eliminar la cuenta, por favor visita: - -$siteurl/regmod/deny/$hash +To approve this request please visit the following link: -Gracias. +{{$siteurl}}/regmod/allow/{{$hash}} + + +To deny the request and remove the account, please visit: + + +{{$siteurl}}/regmod/deny/{{$hash}} + + +Thank you. diff --git a/view/es/request_notify_eml.tpl b/view/es/request_notify_eml.tpl index 6161c45c1..d01b8ff27 100644 --- a/view/es/request_notify_eml.tpl +++ b/view/es/request_notify_eml.tpl @@ -1,13 +1,17 @@ -Estimado/a $myname, +Dear {{$myname}}, -Acabas de recibir una solicitud de conexión de '$requestor' en $sitename. +You have just received a connection request at {{$sitename}} -Puedes visitar su perfil en $url. +from '{{$requestor}}'. -Accede a tu sitio para ver la presentación completa y aceptar o ignorar/cancelar la solicitud. +You may visit their profile at {{$url}}. -$siteurl +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. +{{$siteurl}} - $sitename +Regards, + + {{$sitename}} administrator diff --git a/view/es/update_fail_eml.tpl b/view/es/update_fail_eml.tpl new file mode 100644 index 000000000..a7df8fc2f --- /dev/null +++ b/view/es/update_fail_eml.tpl @@ -0,0 +1,13 @@ +Hey, +I'm the web server at {{$sitename}}; + +The Red Matrix developers released update {{$update}} recently, +but when I tried to install it, something went terribly wrong. +This needs to be fixed soon and it requires human intervention. +Please contact a Red developer if you can not figure out how to +fix it on your own. My database might be invalid. + +The error message is '{{$error}}'. + +Apologies for the inconvenience, + your web server at {{$siteurl}} \ No newline at end of file diff --git a/view/fr/follow_notify_eml.tpl b/view/fr/follow_notify_eml.tpl index 10d0b343b..ba07b19da 100644 --- a/view/fr/follow_notify_eml.tpl +++ b/view/fr/follow_notify_eml.tpl @@ -1,14 +1,14 @@ -Cher(e) $myname, +Dear {{$myname}}, -Une nouvelle personne - $requestor - vous suit désormais sur $sitename. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -Vous pouvez consulter son profil sur $url. +You may visit their profile at {{$url}}. -Merci de vous connecter à votre site pour approuver ou ignorer/annuler cette demande. +Please login to your site to approve or ignore/cancel the request. -$siteurl +{{$siteurl}} -Cordialement, +Regards, - l'administrateur de $sitename + {{$sitename}} administrator diff --git a/view/fr/friend_complete_eml.tpl b/view/fr/friend_complete_eml.tpl index 1f2553b5e..1c647b994 100644 --- a/view/fr/friend_complete_eml.tpl +++ b/view/fr/friend_complete_eml.tpl @@ -1,23 +1,22 @@ -Cher(e) $username, +Dear {{$username}}, - Grande nouvelle… « $fn » (de « $dfrn_url ») a accepté votre -demande de connexion à « $sitename ». + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -Vous êtes désormais dans une relation réciproque et pouvez échanger des -photos, des humeurs et des messages sans restriction. +You are now mutual friends and may exchange status updates, photos, and email +without restriction. -Merci de visiter votre page « Contacts » sur $sitename pour toute -modification que vous souhaiteriez apporter à cette relation. +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. -$siteurl +{{$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 »]/ +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '{{$fn}}']. -Sincèremment, +Sincerely, - l'administrateur de $sitename + {{$sitename}} Administrator diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/fr/htconfig.tpl @@ -0,0 +1,70 @@ +config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/fr/intro_complete_eml.tpl b/view/fr/intro_complete_eml.tpl index f698cfeb7..2c2428d68 100644 --- a/view/fr/intro_complete_eml.tpl +++ b/view/fr/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Cher(e) $username, +Dear {{$username}}, - « $fn » du site « $dfrn_url » a accepté votre -demande de mise en relation sur « $sitename ». + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$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}}' 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 » pourra choisir d'étendre votre relation à quelque chose de -plus permissif dans l'avenir. + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. - Vous allez commencer à recevoir les mises à jour publiques du -statut de « $fn », lesquelles apparaîtront sur votre page « Réseau » sur + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at -$siteurl +{{$siteurl}} -Sincèrement votre, +Sincerely, - l'administrateur de $sitename + {{$sitename}} Administrator diff --git a/view/fr/lostpass_eml.tpl b/view/fr/lostpass_eml.tpl index 96c11d723..3b79d2791 100644 --- a/view/fr/lostpass_eml.tpl +++ b/view/fr/lostpass_eml.tpl @@ -1,34 +1,32 @@ -Cher(e) $username, +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. - 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. +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. -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. +Your password will not be changed unless we can verify that you +issued this request. -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. +Follow this link to verify your identity: -Merci de suivre le lien suivant pour confirmer votre identité : +{{$reset_link}} -$reset_link +You will then receive a follow-up message containing the new password. -Vous recevrez en retour un message avec votre nouveau mot de passe. +You may change that password from your account settings page after logging in. -Vous pourrez ensuite changer ce mot de passe, après connexion, dans la -page des réglages du compte. +The login details are as follows: -Les informations du compte concerné sont : - -Site : $siteurl -Pseudo/Courriel : $email +Site Location: {{$siteurl}} +Login Name: {{$email}} -Sincèrement votre, - l'administrateur de $sitename + +Sincerely, + {{$sitename}} Administrator diff --git a/view/fr/passchanged_eml.tpl b/view/fr/passchanged_eml.tpl index 4ea8899fc..0d94be3c2 100644 --- a/view/fr/passchanged_eml.tpl +++ b/view/fr/passchanged_eml.tpl @@ -1,20 +1,20 @@ -Cher(e) $username, +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). - 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 : +Your login details are as follows: -Site : $siteurl -Pseudo/Courriel : $email -Mot de passe : $new_password +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} -Vous pouvez changer ce mot de passe depuis la page des « réglages » de votre compte, -après connexion +You may change that password from your account settings page after logging in. -Sincèrement votre, - l'administrateur de $sitename + +Sincerely, + {{$sitename}} Administrator diff --git a/view/fr/register_open_eml.tpl b/view/fr/register_open_eml.tpl index 5d9e737c3..4b397201c 100644 --- a/view/fr/register_open_eml.tpl +++ b/view/fr/register_open_eml.tpl @@ -1,22 +1,19 @@ -Cher(e) $username, +An account has been created at {{$sitename}} for this email address. +The login details are as follows: - Merci de votre inscription à $sitename. Votre compte a été créé. -Les informations de connexion sont les suivantes : +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) -Site : $siteurl -Pseudo/Courriel : $email -Mot de passe : $password +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. -Vous pouvez changer de mot de passe dans la page des « Réglages » de votre compte, -après connexion. +Thank you and welcome to {{$sitename}}. -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 +Sincerely, + {{$sitename}} Administrator diff --git a/view/fr/register_verify_eml.tpl b/view/fr/register_verify_eml.tpl index 9cb31a6a8..85d9a12d3 100644 --- a/view/fr/register_verify_eml.tpl +++ b/view/fr/register_verify_eml.tpl @@ -1,27 +1,25 @@ -Une nouvelle demande d'inscription a été reçue sur $sitename, et elle -nécessite votre approbation. +A new user registration request was received at {{$sitename}} which requires +your approval. -Les informations de connexion sont les suivantes : +The login details are as follows: -Nom complet : $username -Site : $siteurl -Pseudo/Courriel : $email +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} + +To approve this request please visit the following link: -Pour approuver cette demande, merci de suivre le lien : +{{$siteurl}}/regmod/allow/{{$hash}} -$siteurl/regmod/allow/$hash +To deny the request and remove the account, please visit: -Pour rejeter cette demande et supprimer le compte associé, -merci de suivre le lien : +{{$siteurl}}/regmod/deny/{{$hash}} -$siteurl/regmod/deny/$hash - - -En vous remerçiant. +Thank you. diff --git a/view/fr/request_notify_eml.tpl b/view/fr/request_notify_eml.tpl index 9234ceaaa..d01b8ff27 100644 --- a/view/fr/request_notify_eml.tpl +++ b/view/fr/request_notify_eml.tpl @@ -1,17 +1,17 @@ -Cher(e) $myname, +Dear {{$myname}}, -Vous venez de recevoir une demande de mise en relation sur $sitename +You have just received a connection request at {{$sitename}} -venant de « $requestor ». +from '{{$requestor}}'. -Vous pouvez visiter son profil sur $url. +You may visit their profile at {{$url}}. -Vous pouvez vous connecter à votre site pour voir la demande -complète et l'approuver ou l'ignorer/annuler. +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. -$siteurl +{{$siteurl}} -Cordialement, +Regards, - l'administrateur de $sitename + {{$sitename}} administrator diff --git a/view/fr/update_fail_eml.tpl b/view/fr/update_fail_eml.tpl new file mode 100644 index 000000000..a7df8fc2f --- /dev/null +++ b/view/fr/update_fail_eml.tpl @@ -0,0 +1,13 @@ +Hey, +I'm the web server at {{$sitename}}; + +The Red Matrix developers released update {{$update}} recently, +but when I tried to install it, something went terribly wrong. +This needs to be fixed soon and it requires human intervention. +Please contact a Red developer if you can not figure out how to +fix it on your own. My database might be invalid. + +The error message is '{{$error}}'. + +Apologies for the inconvenience, + your web server at {{$siteurl}} \ No newline at end of file diff --git a/view/it/follow_notify_eml.tpl b/view/it/follow_notify_eml.tpl index c85a0cdc9..ba07b19da 100644 --- a/view/it/follow_notify_eml.tpl +++ b/view/it/follow_notify_eml.tpl @@ -1,14 +1,14 @@ -Ciao $[myname], +Dear {{$myname}}, -Un nuovo utente ha iniziato a seguirti su $[sitename] - '$[requestor]'. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -Puoi vedere il suo profilo su $[url]. +You may visit their profile at {{$url}}. -Accedi sul tuo sito per approvare o ignorare la richiesta. +Please login to your site to approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} -Saluti, +Regards, - L'amministratore di $[sitename] \ No newline at end of file + {{$sitename}} administrator diff --git a/view/it/friend_complete_eml.tpl b/view/it/friend_complete_eml.tpl index 890b0148c..1c647b994 100644 --- a/view/it/friend_complete_eml.tpl +++ b/view/it/friend_complete_eml.tpl @@ -1,22 +1,22 @@ -Ciao $[username], +Dear {{$username}}, - Ottime notizie... '$[fn]' di '$[dfrn_url]' ha accettato -la tua richiesta di connessione su '$[sitename]'. + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -Adesso siete amici reciproci e potete scambiarvi aggiornamenti di stato, foto ed email -senza restrizioni. +You are now mutual friends and may exchange status updates, photos, and email +without restriction. -Vai nella pagina 'Contatti' di $[sitename] se vuoi effettuare -qualche modifica riguardo questa relazione +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. -$[siteurl] +{{$siteurl}} -[Ad esempio, potresti creare un profilo separato con le informazioni che non -sono disponibili pubblicamente - ed permettere di vederlo a '$[fn]']. +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '{{$fn}}']. -Saluti, +Sincerely, - l'amministratore di $[sitename] + {{$sitename}} Administrator - \ No newline at end of file + diff --git a/view/it/htconfig.tpl b/view/it/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/it/htconfig.tpl @@ -0,0 +1,70 @@ +config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/it/intro_complete_eml.tpl b/view/it/intro_complete_eml.tpl index 46fe7018b..2c2428d68 100644 --- a/view/it/intro_complete_eml.tpl +++ b/view/it/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Ciao $[username], +Dear {{$username}}, - '$[fn]' di '$[dfrn_url]' ha accettato -la tua richiesta di connessione a '$[sitename]'. + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$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}}' 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]' potrebbe decidere di estendere questa relazione in una comunicazione bidirezionale o ancora più permissiva -. + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. - Inizierai a ricevere gli aggiornamenti di stato pubblici da '$[fn]', -che apparirà nella tua pagina 'Rete' + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at -$[siteurl] +{{$siteurl}} -Saluti, +Sincerely, - l'amministratore di $[sitename] \ No newline at end of file + {{$sitename}} Administrator diff --git a/view/it/lostpass_eml.tpl b/view/it/lostpass_eml.tpl index 26d3d6817..3b79d2791 100644 --- a/view/it/lostpass_eml.tpl +++ b/view/it/lostpass_eml.tpl @@ -1,32 +1,32 @@ -Ciao $[username], - Su $[sitename] è stata ricevuta una richiesta di azzeramento di password per un account. -Per confermare la richiesta, clicca sul link di verifica -qui in fondo oppure copialo nella barra degli indirizzi del tuo browser. +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. -Se NON hai richiesto l'azzeramento, NON seguire il link -e ignora e/o cancella questa email. +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. -La tua password non sarà modificata finché non avremo verificato che -hai fatto questa richiesta. +Your password will not be changed unless we can verify that you +issued this request. -Per verificare la tua identità clicca su: +Follow this link to verify your identity: -$[reset_link] +{{$reset_link}} -Dopo la verifica riceverai un messaggio di risposta con la nuova password. +You will then receive a follow-up message containing the new password. -Potrai cambiare la password dalla pagina delle impostazioni dopo aver effettuato l'accesso. +You may change that password from your account settings page after logging in. -I dati di accesso sono i seguenti: +The login details are as follows: -Sito:»$[siteurl] -Nome utente:»$[email] +Site Location: {{$siteurl}} +Login Name: {{$email}} -Saluti, - l'amministratore di $[sitename] +Sincerely, + {{$sitename}} Administrator - \ No newline at end of file + diff --git a/view/it/passchanged_eml.tpl b/view/it/passchanged_eml.tpl index ab3f1aede..0d94be3c2 100644 --- a/view/it/passchanged_eml.tpl +++ b/view/it/passchanged_eml.tpl @@ -1,20 +1,20 @@ -Ciao $[username], - La tua password è cambiata come hai richiesto. Conserva queste -informazioni (oppure cambia immediatamente la password con -qualcosa che ti è più facile ricordare). +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). -I tuoi dati di access sono i seguenti: +Your login details are as follows: -Sito:»$[siteurl] -Nome utente:»$[email] -Password:»$[new_password] +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} -Puoi cambiare la tua password dalla pagina delle impostazioni dopo aver effettuato l'accesso. +You may change that password from your account settings page after logging in. -Saluti, - l'amministratore di $[sitename] +Sincerely, + {{$sitename}} Administrator - \ No newline at end of file + diff --git a/view/it/register_open_eml.tpl b/view/it/register_open_eml.tpl index 11a7752bc..4b397201c 100644 --- a/view/it/register_open_eml.tpl +++ b/view/it/register_open_eml.tpl @@ -1,34 +1,19 @@ -Ciao $[username], - Grazie per aver effettuato la registrazione a $[sitename]. Il tuo account è stato creato. -I dettagli di accesso sono i seguenti +An account has been created at {{$sitename}} for this email address. +The login details are as follows: +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) -Sito:»$[siteurl] -Nome utente:»$[email] -Password:»$[password] +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. -Puoi cambiare la tua password dalla pagina "Impostazioni" del tuo profilo dopo aver effettuato l'accesso -. +Thank you and welcome to {{$sitename}}. -Prenditi un momento per dare un'occhiata alle altre impostazioni del tuo profilo nella stessa pagina. +Sincerely, + {{$sitename}} Administrator -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/it/register_verify_eml.tpl b/view/it/register_verify_eml.tpl index baac57976..85d9a12d3 100644 --- a/view/it/register_verify_eml.tpl +++ b/view/it/register_verify_eml.tpl @@ -1,25 +1,25 @@ -Su $[sitename] è stata ricevuta una nuova richiesta di registrazione da parte di un utente che richiede -la tua approvazione. +A new user registration request was received at {{$sitename}} which requires +your approval. -I tuoi dati di accesso sono i seguenti: +The login details are as follows: -Nome completo:»$[username] -Sito:»$[siteurl] -Nome utente:»$[email] +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} + +To approve this request please visit the following link: -Per approvare questa richiesta clicca su: +{{$siteurl}}/regmod/allow/{{$hash}} -$[siteurl]/regmod/allow/$[hash] +To deny the request and remove the account, please visit: -Per negare la richiesta e rimuove il profilo, clicca su: +{{$siteurl}}/regmod/deny/{{$hash}} -$[siteurl]/regmod/deny/$[hash] +Thank you. - -Grazie. diff --git a/view/it/request_notify_eml.tpl b/view/it/request_notify_eml.tpl index 1360be90c..d01b8ff27 100644 --- a/view/it/request_notify_eml.tpl +++ b/view/it/request_notify_eml.tpl @@ -1,17 +1,17 @@ -Ciao $[myname], +Dear {{$myname}}, -Hai appena ricevuto una richiesta di connessione da $[sitename] +You have just received a connection request at {{$sitename}} -da '$[requestor]'. +from '{{$requestor}}'. -Puoi visitare il suo profilo su $[url]. +You may visit their profile at {{$url}}. -Accedi al tuo sito per vedere la richiesta completa -e approva o ignora/annulla la richiesta. +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} -Saluti, +Regards, - l'amministratore di $[sitename] \ No newline at end of file + {{$sitename}} administrator diff --git a/view/it/update_fail_eml.tpl b/view/it/update_fail_eml.tpl new file mode 100644 index 000000000..a7df8fc2f --- /dev/null +++ b/view/it/update_fail_eml.tpl @@ -0,0 +1,13 @@ +Hey, +I'm the web server at {{$sitename}}; + +The Red Matrix developers released update {{$update}} recently, +but when I tried to install it, something went terribly wrong. +This needs to be fixed soon and it requires human intervention. +Please contact a Red developer if you can not figure out how to +fix it on your own. My database might be invalid. + +The error message is '{{$error}}'. + +Apologies for the inconvenience, + your web server at {{$siteurl}} \ No newline at end of file diff --git a/view/nb-no/follow_notify_eml.tpl b/view/nb-no/follow_notify_eml.tpl index 73a347027..ba07b19da 100644 --- a/view/nb-no/follow_notify_eml.tpl +++ b/view/nb-no/follow_notify_eml.tpl @@ -1,14 +1,14 @@ -Kjære $[myname], +Dear {{$myname}}, -Du har en ny følgesvenn på $[sitename] - '$[requestor]'. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -Du kan besøke profilen deres på $[url]. +You may visit their profile at {{$url}}. -Vennligst logg inn på ditt sted for å godkjenne eller ignorere/avbryte forespørselen. +Please login to your site to approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} -Med vennlig hilsen, +Regards, - $[sitename] administrator \ No newline at end of file + {{$sitename}} administrator diff --git a/view/nb-no/friend_complete_eml.tpl b/view/nb-no/friend_complete_eml.tpl index 4526c94d0..1c647b994 100644 --- a/view/nb-no/friend_complete_eml.tpl +++ b/view/nb-no/friend_complete_eml.tpl @@ -1,22 +1,22 @@ -Kjære $[username], +Dear {{$username}}, - Gode nyheter... '$[fn]' ved '$[dfrn_url]' har godtatt -din forespørsel om kobling hos '$[sitename]'. + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -Dere er nå gjensidige venner og kan utveksle statusoppdateringer, bilder og e-post -uten hindringer. +You are now mutual friends and may exchange status updates, photos, and email +without restriction. -Vennligst besøk din side "Kontakter" ved $[sitename] hvis du ønsker å gjøre -noen endringer på denne forbindelsen. +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. -$[siteurl] +{{$siteurl}} -[For eksempel, så kan du lage en egen profil med informasjon som ikke er -tilgjengelig for alle - og angi visningsrettigheter til '$[fn]']. +[For instance, you may create a separate profile with information that is not +available to the general public - and assign viewing rights to '{{$fn}}']. -Med vennlig hilsen, +Sincerely, - $[sitename] administrator + {{$sitename}} Administrator - \ No newline at end of file + diff --git a/view/nb-no/htconfig.tpl b/view/nb-no/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/nb-no/htconfig.tpl @@ -0,0 +1,70 @@ +config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/nb-no/intro_complete_eml.tpl b/view/nb-no/intro_complete_eml.tpl index 17b0be5a8..2c2428d68 100644 --- a/view/nb-no/intro_complete_eml.tpl +++ b/view/nb-no/intro_complete_eml.tpl @@ -1,22 +1,22 @@ -Kjære $[username], +Dear {{$username}}, - '$[fn]' ved '$[dfrn_url]' har godtatt -din forespørsel om kobling ved $[sitename]'. + '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$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}}' 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]' kan velge å utvide dette til en to-veis eller mer åpen -forbindelse i fremtiden. + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. - Du vil nå motta offentlige statusoppdateringer fra '$[fn]', -som vil vises på din "Nettverk"-side ved + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at -$[siteurl] +{{$siteurl}} -Med vennlig hilsen, +Sincerely, - $[sitename] administrator \ No newline at end of file + {{$sitename}} Administrator diff --git a/view/nb-no/lostpass_eml.tpl b/view/nb-no/lostpass_eml.tpl index 762c8c2e9..3b79d2791 100644 --- a/view/nb-no/lostpass_eml.tpl +++ b/view/nb-no/lostpass_eml.tpl @@ -1,32 +1,32 @@ -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. +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. -Hvis du IKKE har spurt om denne endringen, vennligst IKKE følg lenken -som er oppgitt og ignorer og/eller slett denne e-posten. +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. -Passordet ditt vil ikke bli endret med mindre vi kan forsikre oss om at du -sendte denne forespørselen. +Your password will not be changed unless we can verify that you +issued this request. -Følg denne lenken for å bekrefte din identitet: +Follow this link to verify your identity: -$[reset_link] +{{$reset_link}} -Du vil da motta en oppfølgings melding med det nye passordet. +You will then receive a follow-up message containing the new password. -Du kan endre passordet på siden for dine kontoinnstillinger etter innlogging. +You may change that password from your account settings page after logging in. -Innloggingsdetaljene er som følger: +The login details are as follows: -Nettstedsadresse:»$[siteurl] -Brukernavn:»$[email] +Site Location: {{$siteurl}} +Login Name: {{$email}} -Beste hilsen, - $[sitename] administrator +Sincerely, + {{$sitename}} Administrator - \ No newline at end of file + diff --git a/view/nb-no/passchanged_eml.tpl b/view/nb-no/passchanged_eml.tpl index 6f153d38c..0d94be3c2 100644 --- a/view/nb-no/passchanged_eml.tpl +++ b/view/nb-no/passchanged_eml.tpl @@ -1,20 +1,20 @@ -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). +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). -Dine logg inn-detaljer er som følger: +Your login details are as follows: -Nettsted:»$[siteurl] -Brukernavn:»$[email] -Passord:»$[new_password] +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} -Du kan endre dette passordet på din side for kontoinnstillinger etter innlogging. +You may change that password from your account settings page after logging in. -Med vennlig hilsen, - $[sitename] administrator +Sincerely, + {{$sitename}} Administrator - \ No newline at end of file + diff --git a/view/nb-no/register_open_eml.tpl b/view/nb-no/register_open_eml.tpl index 345ca0b65..4b397201c 100644 --- a/view/nb-no/register_open_eml.tpl +++ b/view/nb-no/register_open_eml.tpl @@ -1,34 +1,19 @@ -Kjære $[username], - Takk for at du registrerte deg hos $[sitename]. Kontoen din er opprettet. -Innloggingsdetaljene er som følger: +An account has been created at {{$sitename}} for this email address. +The login details are as follows: +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) -Nettstedsadresse:»$[siteurl] -Brukernavn:»$[email] -Passord:»$[password] +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. -Du kan endre passordet ditt på siden "Innstillinger" etter at du har logget -inn. +Thank you and welcome to {{$sitename}}. -Vennligst bruk litt tid til å se over de andre kontoinnstillingene på den siden. +Sincerely, + {{$sitename}} Administrator -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/register_verify_eml.tpl b/view/nb-no/register_verify_eml.tpl index 4c2176d7d..85d9a12d3 100644 --- a/view/nb-no/register_verify_eml.tpl +++ b/view/nb-no/register_verify_eml.tpl @@ -1,25 +1,25 @@ -En ny forespørsel om brukerregistering ble mottatt hos $[sitename] og krever -din godkjenning. +A new user registration request was received at {{$sitename}} which requires +your approval. -Innloggingsdetaljene er som følger: +The login details are as follows: -Fullt navn:»$[username] -Nettstedsadresse:»$[siteurl] -Brukernavn:»$[email] +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} + +To approve this request please visit the following link: -For å godkjenne denne forespørselen, vennligst besøk følgende lenke: +{{$siteurl}}/regmod/allow/{{$hash}} -$[siteurl]/regmod/allow/$[hash] +To deny the request and remove the account, please visit: -For å avslå denne forespørselen og fjerne kontoen, vennligst besøk: +{{$siteurl}}/regmod/deny/{{$hash}} -$[siteurl]/regmod/deny/$[hash] +Thank you. - -Mange takk. diff --git a/view/nb-no/request_notify_eml.tpl b/view/nb-no/request_notify_eml.tpl index e6a62c51f..d01b8ff27 100644 --- a/view/nb-no/request_notify_eml.tpl +++ b/view/nb-no/request_notify_eml.tpl @@ -1,17 +1,17 @@ -Kjære $[myname], +Dear {{$myname}}, -Du har akkurat mottatt en kontaktforespørsel hos $[sitename] +You have just received a connection request at {{$sitename}} -fra '$[requestor]'. +from '{{$requestor}}'. -Du kan besøke profilen på $[url]. +You may visit their profile at {{$url}}. -Vennligst logg inn på ditt nettsted for å se hele introduksjonen -og godkjenne eller ignorere/avbryte forespørselen. +Please login to your site to view the complete introduction +and approve or ignore/cancel the request. -$[siteurl] +{{$siteurl}} -Beste hilsen, +Regards, - $[siteurl] administrator \ No newline at end of file + {{$sitename}} administrator diff --git a/view/nb-no/update_fail_eml.tpl b/view/nb-no/update_fail_eml.tpl index a4a3cf950..a7df8fc2f 100644 --- a/view/nb-no/update_fail_eml.tpl +++ b/view/nb-no/update_fail_eml.tpl @@ -1,11 +1,13 @@ -Hei, -jeg er $sitename. -Friendica-utviklerne slapp nylig oppdateringen $update, -men da jeg prøvde å installere den, gikk noe forferdelig galt. -Dette trenger å bli fikset raskt og jeg kan ikke gjøre det alene. Vennligst kontakt en -Friendica-utvikler hvis du ikke kan hjelpe meg på egenhånd. Databasen min er kanskje ugyldig. +Hey, +I'm the web server at {{$sitename}}; + +The Red Matrix developers released update {{$update}} recently, +but when I tried to install it, something went terribly wrong. +This needs to be fixed soon and it requires human intervention. +Please contact a Red developer if you can not figure out how to +fix it on your own. My database might be invalid. -Feilmeldingen er '$error'. +The error message is '{{$error}}'. -Jeg beklager, -din Friendica-tjener hos $siteurl \ No newline at end of file +Apologies for the inconvenience, + your web server at {{$siteurl}} \ No newline at end of file diff --git a/view/pt-br/follow_notify_eml.tpl b/view/pt-br/follow_notify_eml.tpl new file mode 100644 index 000000000..ba07b19da --- /dev/null +++ b/view/pt-br/follow_notify_eml.tpl @@ -0,0 +1,14 @@ + +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/pt-br/friend_complete_eml.tpl b/view/pt-br/friend_complete_eml.tpl new file mode 100644 index 000000000..1c647b994 --- /dev/null +++ b/view/pt-br/friend_complete_eml.tpl @@ -0,0 +1,22 @@ + +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 'Connnections' 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/pt-br/htconfig.tpl b/view/pt-br/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/pt-br/htconfig.tpl @@ -0,0 +1,70 @@ +config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/pt-br/intro_complete_eml.tpl b/view/pt-br/intro_complete_eml.tpl new file mode 100644 index 000000000..2c2428d68 --- /dev/null +++ b/view/pt-br/intro_complete_eml.tpl @@ -0,0 +1,22 @@ + +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 'Matrix' page at + +{{$siteurl}} + +Sincerely, + + {{$sitename}} Administrator diff --git a/view/pt-br/lostpass_eml.tpl b/view/pt-br/lostpass_eml.tpl new file mode 100644 index 000000000..3b79d2791 --- /dev/null +++ b/view/pt-br/lostpass_eml.tpl @@ -0,0 +1,32 @@ + +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/pt-br/passchanged_eml.tpl b/view/pt-br/passchanged_eml.tpl new file mode 100644 index 000000000..0d94be3c2 --- /dev/null +++ b/view/pt-br/passchanged_eml.tpl @@ -0,0 +1,20 @@ + +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/pt-br/register_open_eml.tpl b/view/pt-br/register_open_eml.tpl new file mode 100644 index 000000000..4b397201c --- /dev/null +++ b/view/pt-br/register_open_eml.tpl @@ -0,0 +1,19 @@ + +An account has been created at {{$sitename}} for this email address. +The login details are as follows: + +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) + +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. + +Thank you and welcome to {{$sitename}}. + +Sincerely, + {{$sitename}} Administrator + + diff --git a/view/pt-br/register_verify_eml.tpl b/view/pt-br/register_verify_eml.tpl new file mode 100644 index 000000000..85d9a12d3 --- /dev/null +++ b/view/pt-br/register_verify_eml.tpl @@ -0,0 +1,25 @@ + +A new user registration request was received at {{$sitename}} which requires +your approval. + + +The login details are as follows: + +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} + +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/pt-br/request_notify_eml.tpl b/view/pt-br/request_notify_eml.tpl new file mode 100644 index 000000000..d01b8ff27 --- /dev/null +++ b/view/pt-br/request_notify_eml.tpl @@ -0,0 +1,17 @@ + +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/pt-br/update_fail_eml.tpl b/view/pt-br/update_fail_eml.tpl new file mode 100644 index 000000000..a7df8fc2f --- /dev/null +++ b/view/pt-br/update_fail_eml.tpl @@ -0,0 +1,13 @@ +Hey, +I'm the web server at {{$sitename}}; + +The Red Matrix developers released update {{$update}} recently, +but when I tried to install it, something went terribly wrong. +This needs to be fixed soon and it requires human intervention. +Please contact a Red developer if you can not figure out how to +fix it on your own. My database might be invalid. + +The error message is '{{$error}}'. + +Apologies for the inconvenience, + your web server at {{$siteurl}} \ No newline at end of file diff --git a/view/ru/follow_notify_eml.tpl b/view/ru/follow_notify_eml.tpl new file mode 100644 index 000000000..ba07b19da --- /dev/null +++ b/view/ru/follow_notify_eml.tpl @@ -0,0 +1,14 @@ + +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/ru/friend_complete_eml.tpl b/view/ru/friend_complete_eml.tpl new file mode 100644 index 000000000..1c647b994 --- /dev/null +++ b/view/ru/friend_complete_eml.tpl @@ -0,0 +1,22 @@ + +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 'Connnections' 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/ru/htconfig.tpl b/view/ru/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/ru/htconfig.tpl @@ -0,0 +1,70 @@ +config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/ru/intro_complete_eml.tpl b/view/ru/intro_complete_eml.tpl new file mode 100644 index 000000000..2c2428d68 --- /dev/null +++ b/view/ru/intro_complete_eml.tpl @@ -0,0 +1,22 @@ + +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 'Matrix' page at + +{{$siteurl}} + +Sincerely, + + {{$sitename}} Administrator diff --git a/view/ru/lostpass_eml.tpl b/view/ru/lostpass_eml.tpl new file mode 100644 index 000000000..3b79d2791 --- /dev/null +++ b/view/ru/lostpass_eml.tpl @@ -0,0 +1,32 @@ + +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/ru/passchanged_eml.tpl b/view/ru/passchanged_eml.tpl new file mode 100644 index 000000000..0d94be3c2 --- /dev/null +++ b/view/ru/passchanged_eml.tpl @@ -0,0 +1,20 @@ + +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/ru/register_open_eml.tpl b/view/ru/register_open_eml.tpl new file mode 100644 index 000000000..4b397201c --- /dev/null +++ b/view/ru/register_open_eml.tpl @@ -0,0 +1,19 @@ + +An account has been created at {{$sitename}} for this email address. +The login details are as follows: + +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) + +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. + +Thank you and welcome to {{$sitename}}. + +Sincerely, + {{$sitename}} Administrator + + diff --git a/view/ru/register_verify_eml.tpl b/view/ru/register_verify_eml.tpl new file mode 100644 index 000000000..85d9a12d3 --- /dev/null +++ b/view/ru/register_verify_eml.tpl @@ -0,0 +1,25 @@ + +A new user registration request was received at {{$sitename}} which requires +your approval. + + +The login details are as follows: + +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} + +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/ru/request_notify_eml.tpl b/view/ru/request_notify_eml.tpl new file mode 100644 index 000000000..d01b8ff27 --- /dev/null +++ b/view/ru/request_notify_eml.tpl @@ -0,0 +1,17 @@ + +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/ru/update_fail_eml.tpl b/view/ru/update_fail_eml.tpl new file mode 100644 index 000000000..a7df8fc2f --- /dev/null +++ b/view/ru/update_fail_eml.tpl @@ -0,0 +1,13 @@ +Hey, +I'm the web server at {{$sitename}}; + +The Red Matrix developers released update {{$update}} recently, +but when I tried to install it, something went terribly wrong. +This needs to be fixed soon and it requires human intervention. +Please contact a Red developer if you can not figure out how to +fix it on your own. My database might be invalid. + +The error message is '{{$error}}'. + +Apologies for the inconvenience, + your web server at {{$siteurl}} \ No newline at end of file diff --git a/view/sv/follow_notify_eml.tpl b/view/sv/follow_notify_eml.tpl index fee08bdca..ba07b19da 100644 --- a/view/sv/follow_notify_eml.tpl +++ b/view/sv/follow_notify_eml.tpl @@ -1,12 +1,14 @@ -$myname, -'$requestor' på $sitename vill följa dina uppdateringar här på Friendika. +Dear {{$myname}}, -Besök dennes profil på $url. +You have a new follower at {{$sitename}} - '{{$requestor}}'. -Logga in för att godkänna eller avslå förfrågan. +You may visit their profile at {{$url}}. -$siteurl +Please login to your site to approve or ignore/cancel the request. -Hälsningar, -$sitename admin +{{$siteurl}} + +Regards, + + {{$sitename}} administrator diff --git a/view/sv/friend_complete_eml.tpl b/view/sv/friend_complete_eml.tpl index 2b8b0238e..1c647b994 100644 --- a/view/sv/friend_complete_eml.tpl +++ b/view/sv/friend_complete_eml.tpl @@ -1,17 +1,22 @@ -$username, -Goda nyheter... '$fn' på '$dfrn_url' har accepterat din kontaktförfrågan på '$sitename'. +Dear {{$username}}, -Ni är nu ömsesidiga vänner och kan se varandras statusuppdateringar samt skicka foton och meddelanden -utan begränsningar. + Great news... '{{$fn}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -Gå in på din sida 'Kontakter' på $sitename om du vill göra några -ändringar när det gäller denna kontakt. +You are now mutual friends and may exchange status updates, photos, and email +without restriction. -$siteurl +Please visit your 'Connnections' page at {{$sitename}} if you wish to make +any changes to this relationship. -[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']. +{{$siteurl}} -Hälsningar, -$sitename admin +[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/sv/htconfig.tpl b/view/sv/htconfig.tpl new file mode 100644 index 000000000..493cb5d00 --- /dev/null +++ b/view/sv/htconfig.tpl @@ -0,0 +1,70 @@ +config['system']['baseurl'] = '{{$siteurl}}'; +$a->config['system']['sitename'] = "Red Matrix"; +$a->config['system']['location_hash'] = '{{$site_id}}'; + +// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. +// Be certain to create your own personal account before setting +// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// the registration page. REGISTER_APPROVE requires you set 'admin_email' +// to the email address of an already registered person who can authorise +// and/or approve/deny the request. + +$a->config['system']['register_policy'] = REGISTER_OPEN; +$a->config['system']['register_text'] = ''; +$a->config['system']['admin_email'] = '{{$adminmail}}'; + +// Maximum size of an imported message, 0 is unlimited + +$a->config['system']['max_import_size'] = 200000; + +// maximum size of uploaded photos + +$a->config['system']['maximagesize'] = 800000; + +// Location of PHP command line processor + +$a->config['system']['php_path'] = '{{$phpath}}'; + +// Configure how we communicate with directory servers. +// DIRECTORY_MODE_NORMAL = directory client, we will find a directory +// DIRECTORY_MODE_SECONDARY = caching directory or mirror +// DIRECTORY_MODE_PRIMARY = main directory server +// DIRECTORY_MODE_STANDALONE = "off the grid" or private directory services + +$a->config['system']['directory_mode'] = DIRECTORY_MODE_NORMAL; + +// default system theme + +$a->config['system']['theme'] = 'redbasic'; + diff --git a/view/sv/intro_complete_eml.tpl b/view/sv/intro_complete_eml.tpl index 1f24af25f..2c2428d68 100644 --- a/view/sv/intro_complete_eml.tpl +++ b/view/sv/intro_complete_eml.tpl @@ -1,19 +1,22 @@ -$username, -'$fn' på '$dfrn_url' har accepterat din kontaktförfrågan på '$sitename'. +Dear {{$username}}, -'$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}}' at '{{$dfrn_url}}' has accepted +your connection request at '{{$sitename}}'. -'$fn' kan välja att utöka detta till vanlig tvåvägskommunikation eller någon annan mer -tillåtande kommunikationsform i framtiden. + '{{$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. -Du kommer hädanefter att få statusuppdateringar från '$fn', -vilka kommer att synas på din Nätverk-sida på + '{{$fn}}' may choose to extend this into a two-way or more permissive +relationship in the future. -$siteurl + You will start receiving public status updates from '{{$fn}}', +which will appear on your 'Matrix' page at -Hälsningar, -$sitename admin +{{$siteurl}} + +Sincerely, + + {{$sitename}} Administrator diff --git a/view/sv/lostpass_eml.tpl b/view/sv/lostpass_eml.tpl index df338fa69..3b79d2791 100644 --- a/view/sv/lostpass_eml.tpl +++ b/view/sv/lostpass_eml.tpl @@ -1,29 +1,32 @@ -$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. +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. -Gå INTE till länken nedan om du INTE har begärt lösenordsåterställning. -Då kan du ignorera det här meddelandet. +If you did NOT request this change, please DO NOT follow the link +provided and ignore and/or delete this email. -Ditt lösenord kommer inte att återställas om vi inte kan säkerställa att du -initierat detta. +Your password will not be changed unless we can verify that you +issued this request. -Med den här länken kan du bekräfta din identitet: +Follow this link to verify your identity: -$reset_link +{{$reset_link}} -Sedan kommer du att få ett meddelande med ett nytt lösenord. +You will then receive a follow-up message containing the new password. -Lösenordet kan sedan ändras i dina inställningar efter att du loggat in. +You may change that password from your account settings page after logging in. -Detaljerna ser ut så här: +The login details are as follows: -Webbplats: $siteurl -Inloggningsnamn: $email +Site Location: {{$siteurl}} +Login Name: {{$email}} -Hälsningar, -$sitename admin - \ No newline at end of file + + +Sincerely, + {{$sitename}} Administrator + + diff --git a/view/sv/passchanged_eml.tpl b/view/sv/passchanged_eml.tpl index 590462468..0d94be3c2 100644 --- a/view/sv/passchanged_eml.tpl +++ b/view/sv/passchanged_eml.tpl @@ -1,18 +1,20 @@ -$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). +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). -Här är dina inloggningsuppgifter: +Your login details are as follows: -Webbplats: $siteurl -Användarnamn: $email -Lösenord: $new_password +Site Location: {{$siteurl}} +Login Name: {{$email}} +Password: {{$new_password}} -När du loggat in kan du byta lösenord bland inställningarna. +You may change that password from your account settings page after logging in. -Hälsningar, -$sitename admin + +Sincerely, + {{$sitename}} Administrator + + diff --git a/view/sv/register_open_eml.tpl b/view/sv/register_open_eml.tpl index 1471c9b98..4b397201c 100644 --- a/view/sv/register_open_eml.tpl +++ b/view/sv/register_open_eml.tpl @@ -1,17 +1,19 @@ -$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 +An account has been created at {{$sitename}} for this email address. +The login details are as follows: -Lösenordet kan ändras på sidan Inställningar efter att du loggat in. +Site Location: {{$siteurl}} +Login: {{$email}} +Password: (the password which was provided during registration) -Ägna en liten stund åt att gå igenom alla kontoinställningar där. +If this account was created without your knowledge and is not desired, you may +visit this site and reset the password. This will allow you to remove the +account from the links on the Settings page, and we +apologise for any inconvenience. -Välkommen till $sitename. +Thank you and welcome to {{$sitename}}. -Hälsningar, -$sitename admin +Sincerely, + {{$sitename}} Administrator + diff --git a/view/sv/register_verify_eml.tpl b/view/sv/register_verify_eml.tpl index aa72bc9aa..85d9a12d3 100644 --- a/view/sv/register_verify_eml.tpl +++ b/view/sv/register_verify_eml.tpl @@ -1,17 +1,25 @@ -En registreringsförfrågan som kräver svar har mottagits -på $sitename + +A new user registration request was received at {{$sitename}} which requires +your approval. -Här är inloggningsuppgifterna: +The login details are as follows: -Fullständigt namn: $username -Webbplats: $siteurl -Användarnamn: $email +Site Location: {{$siteurl}} +Login Name: {{$email}} +IP Address: {{$details}} + +To approve this request please visit the following link: -Gå till denna adress om du vill godkänna: -$siteurl/regmod/allow/$hash +{{$siteurl}}/regmod/allow/{{$hash}} -Gå till denna adress om du vill avslå förfrågan och ta bort kontot: -$siteurl/regmod/deny/$hash + +To deny the request and remove the account, please visit: + + +{{$siteurl}}/regmod/deny/{{$hash}} + + +Thank you. diff --git a/view/sv/request_notify_eml.tpl b/view/sv/request_notify_eml.tpl index 893bce17c..d01b8ff27 100644 --- a/view/sv/request_notify_eml.tpl +++ b/view/sv/request_notify_eml.tpl @@ -1,13 +1,17 @@ -$myname, -Du har just fått en kontaktförfrågan på $sitename från '$requestor' +Dear {{$myname}}, -Profilen finns på $url. +You have just received a connection request at {{$sitename}} -Logga in för att se hela förfrågan och godkänna eller -avslå den. +from '{{$requestor}}'. -$siteurl +You may visit their profile at {{$url}}. -Hälsningar, -$sitename admin +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/sv/update_fail_eml.tpl b/view/sv/update_fail_eml.tpl new file mode 100644 index 000000000..a7df8fc2f --- /dev/null +++ b/view/sv/update_fail_eml.tpl @@ -0,0 +1,13 @@ +Hey, +I'm the web server at {{$sitename}}; + +The Red Matrix developers released update {{$update}} recently, +but when I tried to install it, something went terribly wrong. +This needs to be fixed soon and it requires human intervention. +Please contact a Red developer if you can not figure out how to +fix it on your own. My database might be invalid. + +The error message is '{{$error}}'. + +Apologies for the inconvenience, + your web server at {{$siteurl}} \ No newline at end of file From 764ee785f5505c2be804a850b8e4029598d81739 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 16 Jun 2013 19:14:01 -0700 Subject: [PATCH 03/52] We will need a per item comment policy to be able to determine in advance if we have permission to comment on something , and we'll need to send it out with all communications. The current check is not only flawed but also a huge performance hit. Also provide the ability for an item to disable commenting completely - such as for a webpage or wherever you want to prevent comments on one item, without requiring a change to your entire permission scheme. All of this is only partially implemented at the moment but we need the structures in place on several sites in order to finish it without breaking everything. --- boot.php | 3 ++- include/items.php | 15 ++++++++++++--- install/database.sql | 2 ++ install/update.php | 9 ++++++++- 4 files changed, 24 insertions(+), 5 deletions(-) diff --git a/boot.php b/boot.php index d4add9cc9..c0473a23c 100755 --- a/boot.php +++ b/boot.php @@ -41,7 +41,7 @@ require_once('include/features.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1043 ); +define ( 'DB_UPDATE_VERSION', 1044 ); define ( 'EOL', '
' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -436,6 +436,7 @@ define ( 'ITEM_NOTSHOWN', 0x0080); // technically visible but not normal define ( 'ITEM_NSFW', 0x0100); define ( 'ITEM_RELAY', 0x0200); // used only in the communication layers, not stored define ( 'ITEM_MENTIONSME', 0x0400); +define ( 'ITEM_NOCOMMENT', 0x0800); // commenting/followups are disabled /** diff --git a/include/items.php b/include/items.php index 64eeae4b4..9d93accfe 100755 --- a/include/items.php +++ b/include/items.php @@ -549,13 +549,17 @@ function encode_item($item) { intval($item['uid']) ); - if($r) + if($r) { $public_scope = $r[0]['channel_r_stream']; - else + $comment_scope = $r[0]['channel_w_comment']; + } + else { $public_scope = 0; + $comment_scope = 0; + } $scope = map_scope($public_scope); - + $c_scope = map_scope($comment_scope); if($item['item_restrict'] & ITEM_DELETED) { $x['message_id'] = $item['mid']; @@ -597,6 +601,11 @@ function encode_item($item) { if(! in_array('private',$y)) $x['public_scope'] = $scope; + if($item['item_flags'] & ITEM_NOCOMMENT) + $x['comment_scope'] = 'none'; + else + $x['comment_scope'] = $c_scope; + if($item['term']) $x['tags'] = encode_item_terms($item['term']); diff --git a/install/database.sql b/install/database.sql index 33dd9f31b..07f797dc4 100644 --- a/install/database.sql +++ b/install/database.sql @@ -462,6 +462,7 @@ CREATE TABLE IF NOT EXISTS `item` ( `inform` mediumtext NOT NULL, `location` char(255) NOT NULL DEFAULT '', `coord` char(255) NOT NULL DEFAULT '', + `comment_policy` char(255) NOT NULL DEFAULT '', `allow_cid` mediumtext NOT NULL, `allow_gid` mediumtext NOT NULL, `deny_cid` mediumtext NOT NULL, @@ -494,6 +495,7 @@ CREATE TABLE IF NOT EXISTS `item` ( KEY `mid` (`mid`), KEY `parent_mid` (`parent_mid`), KEY `uid_mid` (`mid`,`uid`), + KEY `comment_policy` (`comment_policy`), FULLTEXT KEY `title` (`title`), FULLTEXT KEY `body` (`body`), FULLTEXT KEY `allow_cid` (`allow_cid`), diff --git a/install/update.php b/install/update.php index 382e8723c..787c1d542 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ Date: Sun, 16 Jun 2013 20:44:29 -0700 Subject: [PATCH 04/52] implement 'can_comment_on_post()' which doesn't require a separate DB lookup per item. --- include/ItemObject.php | 2 +- include/items.php | 42 +++++++++++++++++++++++++++++++++++++++++- include/text.php | 2 +- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/include/ItemObject.php b/include/ItemObject.php index ccd192ff5..351f446d4 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -44,7 +44,7 @@ class Item extends BaseObject { $this->commentable = $this->writable; if(($this->observer) && (! $this->writable)) { - $this->commentable = perm_is_allowed($this->data['uid'],$this->observer['xchan_hash'],'post_comments'); + $this->commentable = can_comment_on_post($this->observer['xchan_hash'],$data); } // logger('writable: ' . $this->writable); diff --git a/include/items.php b/include/items.php index 9d93accfe..93fc09ae9 100755 --- a/include/items.php +++ b/include/items.php @@ -53,6 +53,37 @@ function collect_recipients($item,&$private) { } + +function can_comment_on_post($observer_xchan,$item) { + if(! $observer_xchan) + return false; + if($item['comment_policy'] === 'none') + return false; + switch($item['comment_policy']) { + case 'self': + if($observer_xchan === $item['author_xchan'] || $observer_xchan === $item['owner_xchan']) + return true; + break; + case 'public': + return false; + break; + case 'contacts': + case '': + if(($item['owner']['abook_xchan']) && ($item['owner']['abook_their_perms'] & PERMS_W_COMMENT)) + return true; + break; + default: + break; + } + if(strstr('network:',$item['comment_policy']) && strstr('red',$item['comment_policy'])) + return true; + if(strstr('site:', $item['comment_policy']) && strstr(get_app()->get_hostname(),$item['comment_policy'])) + return true; + + return false; +} + + /** * @function red_zrl_callback * preg_match function when fixing 'naked' links in mod item.php @@ -142,6 +173,7 @@ function post_activity_item($arr) { $arr['deny_cid'] = ((x($arr,'deny_cid')) ? $arr['deny_cid'] : $channel['channel_deny_cid']); $arr['deny_gid'] = ((x($arr,'deny_gid')) ? $arr['deny_gid'] : $channel['channel_deny_gid']); + $arr['comment_policy'] = map_policy($channel['channel_w_comment']); // for the benefit of plugins, we will behave as if this is an API call rather than a normal online post @@ -481,7 +513,8 @@ function get_item_elements($x) { $arr['mimetype'] = (($x['mimetype']) ? htmlentities($x['mimetype'], ENT_COMPAT,'UTF-8',false) : ''); $arr['obj_type'] = (($x['object_type']) ? htmlentities($x['object_type'], ENT_COMPAT,'UTF-8',false) : ''); $arr['tgt_type'] = (($x['target_type']) ? htmlentities($x['target_type'], ENT_COMPAT,'UTF-8',false) : ''); - + $arr['comment_policy'] = (($x['comment_scope']) ? htmlentities($x['comment_scope'], ENT_COMPAT,'UTF-8',false) : 'contacts'); + $arr['object'] = activity_sanitise($x['object']); $arr['target'] = activity_sanitise($x['target']); @@ -1332,10 +1365,17 @@ function item_store($arr,$force_parent = false) { $arr['attach'] = ((x($arr,'attach')) ? notags(trim($arr['attach'])) : ''); $arr['app'] = ((x($arr,'app')) ? notags(trim($arr['app'])) : ''); $arr['item_restrict'] = ((x($arr,'item_restrict')) ? intval($arr['item_restrict']) : 0 ); + + $arr['comment_policy'] = ((x($arr,'comment_policy')) ? notags(trim($arr['comment_policy'])) : 'contacts' ); + $arr['item_flags'] = ((x($arr,'item_flags')) ? intval($arr['item_flags']) : 0 ); $arr['item_flags'] = $arr['item_flags'] | ITEM_UNSEEN; + if($arr['comment_policy'] == 'none') + $arr['item_flags'] = $arr['item_flags'] | ITEM_NOCOMMENT; + + // handle time travelers // Allow a bit of fudge in case somebody just has a slightly slow/fast clock diff --git a/include/text.php b/include/text.php index 71f2257ac..c51ee0bd2 100755 --- a/include/text.php +++ b/include/text.php @@ -1794,7 +1794,7 @@ function ids_to_querystr($arr,$idx = 'id') { // author_xchan and owner_xchan. If $abook is true also include the abook info. // This is needed in the API to save extra per item lookups there. -function xchan_query(&$items,$abook = false) { +function xchan_query(&$items,$abook = true) { $arr = array(); if($items && count($items)) { foreach($items as $item) { From 82539ba2bc93a6a84ce01492d37a725291ba32d9 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 16 Jun 2013 22:56:56 -0700 Subject: [PATCH 05/52] override comment policy until it's working --- include/ItemObject.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/include/ItemObject.php b/include/ItemObject.php index 351f446d4..e5185bef6 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -45,6 +45,10 @@ class Item extends BaseObject { if(($this->observer) && (! $this->writable)) { $this->commentable = can_comment_on_post($this->observer['xchan_hash'],$data); + if(! $this->commentable) { + logger('commentable: ' . $data['comment_policy']); + $this->commentable = true; + } } // logger('writable: ' . $this->writable); From 7ae340dd4031c69cd84b30e68c71c80cebdd7ef0 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 16 Jun 2013 23:07:04 -0700 Subject: [PATCH 06/52] typos --- include/items.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/items.php b/include/items.php index 93fc09ae9..c3c594d59 100755 --- a/include/items.php +++ b/include/items.php @@ -75,9 +75,9 @@ function can_comment_on_post($observer_xchan,$item) { default: break; } - if(strstr('network:',$item['comment_policy']) && strstr('red',$item['comment_policy'])) + if(strstr($item['comment_policy'],'network:') && strstr($item['comment_policy'],'red')) return true; - if(strstr('site:', $item['comment_policy']) && strstr(get_app()->get_hostname(),$item['comment_policy'])) + if(strstr($item['comment_policy'],'site:') && strstr($item['comment_policy'],get_app()->get_hostname())) return true; return false; From 322c9d76fc099ac6a2b7efb7f0b3b7a25c83f87e Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 16 Jun 2013 23:08:52 -0700 Subject: [PATCH 07/52] undefined function --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index c3c594d59..1490d66ce 100755 --- a/include/items.php +++ b/include/items.php @@ -173,7 +173,7 @@ function post_activity_item($arr) { $arr['deny_cid'] = ((x($arr,'deny_cid')) ? $arr['deny_cid'] : $channel['channel_deny_cid']); $arr['deny_gid'] = ((x($arr,'deny_gid')) ? $arr['deny_gid'] : $channel['channel_deny_gid']); - $arr['comment_policy'] = map_policy($channel['channel_w_comment']); + $arr['comment_policy'] = map_scope($channel['channel_w_comment']); // for the benefit of plugins, we will behave as if this is an API call rather than a normal online post From f4e8198335960465b4ac6106f59e0346d08ece1f Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 16 Jun 2013 23:20:36 -0700 Subject: [PATCH 08/52] found it - but I'll do some more testing before undoing the bypass --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/items.php b/include/items.php index 1490d66ce..09e0f94fa 100755 --- a/include/items.php +++ b/include/items.php @@ -578,7 +578,7 @@ function encode_item($item) { logger('encode_item: ' . print_r($item,true)); - $r = q("select channel_r_stream from channel where channel_id = %d limit 1", + $r = q("select channel_r_stream, channel_w_comment from channel where channel_id = %d limit 1", intval($item['uid']) ); From 94c758080ff0b957d7d728428de5821c39a583e9 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 17 Jun 2013 16:21:03 -0700 Subject: [PATCH 09/52] zidify bodies of notification emails --- boot.php | 14 ++++++++------ include/enotify.php | 16 +++++++++++++++- version.inc | 2 +- 3 files changed, 24 insertions(+), 8 deletions(-) diff --git a/boot.php b/boot.php index c0473a23c..2f70f1d47 100755 --- a/boot.php +++ b/boot.php @@ -2061,6 +2061,8 @@ function get_my_url() { } function get_my_address() { + if(x($_SESSION,'zid_override')) + return $_SESSION['zid_override']; if(x($_SESSION,'my_address')) return $_SESSION['my_address']; return false; @@ -2098,12 +2100,12 @@ function zid_init(&$a) { } /** - * @function zid($s,$force = false) + * @function zid($s,$address = '') * Adds a zid parameter to a url * @param string $s * The url to accept the zid - * @param boolean $force - * Currently unused + * @param boolean $address + * $address to use instead of session environment * @return string * * @hooks 'zid' @@ -2113,7 +2115,7 @@ function zid_init(&$a) { */ -function zid($s,$force = false) { +function zid($s,$address = '') { if(! strlen($s) || strpos($s,'zid=')) return $s; $has_params = ((strpos($s,'?')) ? true : false); @@ -2123,9 +2125,9 @@ function zid($s,$force = false) { $achar = strpos($s,'?') ? '&' : '?'; $mine = get_my_url(); - $myaddr = get_my_address(); + $myaddr = (($address) ? $address : get_my_address()); - if($mine and ! link_compare($mine,$s)) + if($mine && $myaddr && (! link_compare($mine,$s))) $zurl = $s . (($num_slashes >= 3) ? '' : '/') . $achar . 'zid=' . urlencode($myaddr); else $zurl = $s; diff --git a/include/enotify.php b/include/enotify.php index 5728d054c..0a6befba1 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -354,8 +354,22 @@ function notification($params) { $textversion = strip_tags(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)))); + "
\n",$body))), ENT_QOUTES,'UTF-8'); + + + // use $_SESSION['zid_override'] to force zid() to use + // the recipient address instead of the current observer + + $_SESSION['zid_override'] = $recip['channel_address'] . '@' . $get_app()->get_hostname(); + + $textversion = zidify_links($textversion); + $htmlversion = zidify_links($htmlversion); + + // unset when done to revert to normal behaviour + + unset($_SESSION['zid_override']); $datarray = array(); diff --git a/version.inc b/version.inc index b47f8837e..b7f186fad 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-06-16.346 +2013-06-17.347 From 49802d9a47d1f492715193092f61c60f43dd7723 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 17 Jun 2013 17:19:05 -0700 Subject: [PATCH 10/52] one of those days... --- include/enotify.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/enotify.php b/include/enotify.php index 0a6befba1..11f594d6c 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -356,13 +356,13 @@ function notification($params) { $body))),ENT_QUOTES,'UTF-8')); $htmlversion = html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r","\\n\\n" ,"\\n"), - "
\n",$body))), ENT_QOUTES,'UTF-8'); + "
\n",$body))), ENT_QUOTES,'UTF-8'); // use $_SESSION['zid_override'] to force zid() to use // the recipient address instead of the current observer - $_SESSION['zid_override'] = $recip['channel_address'] . '@' . $get_app()->get_hostname(); + $_SESSION['zid_override'] = $recip['channel_address'] . '@' . get_app()->get_hostname(); $textversion = zidify_links($textversion); $htmlversion = zidify_links($htmlversion); From c5e38598280209903fc60c9ce996e7f3c34a4533 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 17 Jun 2013 19:25:46 -0700 Subject: [PATCH 11/52] another try on zidified notifications - this time it actually seems to work --- boot.php | 2 ++ include/enotify.php | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/boot.php b/boot.php index 2f70f1d47..fc02f28e9 100755 --- a/boot.php +++ b/boot.php @@ -2055,6 +2055,8 @@ function profile_tabs($a, $is_owner=False, $nickname=Null){ function get_my_url() { + if(x($_SESSION,'zrl_override')) + return $_SESSION['zrl_override']; if(x($_SESSION,'my_url')) return $_SESSION['my_url']; return false; diff --git a/include/enotify.php b/include/enotify.php index 11f594d6c..71629b9d9 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -363,13 +363,15 @@ function notification($params) { // the recipient address instead of the current observer $_SESSION['zid_override'] = $recip['channel_address'] . '@' . get_app()->get_hostname(); - + $_SESSION['zrl_override'] = z_root() . '/channel/' . $recip['channel_address']; + $textversion = zidify_links($textversion); $htmlversion = zidify_links($htmlversion); // unset when done to revert to normal behaviour unset($_SESSION['zid_override']); + unset($_SESSION['zrl_override']); $datarray = array(); From 5f84e3940d6a6ba8732104bf376921c061808f18 Mon Sep 17 00:00:00 2001 From: friendica Date: Mon, 17 Jun 2013 20:16:50 -0700 Subject: [PATCH 12/52] much more efficient config functions. This will save potentially hundreds of DB lookups - still need to update the xconfig but want to give the others a good workout as it has been one of those days. --- include/config.php | 159 +++++++++++++++++---------------------------- mod/settings.php | 2 +- 2 files changed, 62 insertions(+), 99 deletions(-) diff --git a/include/config.php b/include/config.php index dc4470823..5b74f6292 100644 --- a/include/config.php +++ b/include/config.php @@ -17,20 +17,22 @@ function load_config($family) { global $a; - $r = q("SELECT * FROM config WHERE cat = '%s'", dbesc($family)); - if($r) { - foreach($r as $rr) { - $k = $rr['k']; - if ($family === 'config') { - $a->config[$k] = $rr['v']; - } else { - $a->config[$family][$k] = $rr['v']; + + if(! array_key_exists($family,$a->config)) + $a->config[$family] = array(); + + if(! array_key_exists('config_loaded',$a->config[$family])) { + $r = q("SELECT * FROM config WHERE cat = '%s'", dbesc($family)); + if($r !== false) { + if($r) { + foreach($r as $rr) { + $k = $rr['k']; + $a->config[$family][$k] = $rr['v']; + } } + $a->config[$family]['config_loaded'] = true; } - } else if ($family != 'config') { - // Negative caching - $a->config[$family] = "!!"; - } + } } // get a particular config variable given the family name @@ -42,37 +44,21 @@ function load_config($family) { // to hit the DB again for this item. -function get_config($family, $key, $instore = false) { +function get_config($family, $key) { global $a; - if(! $instore) { - // Looking if the whole family isn't set - if(isset($a->config[$family])) { - if($a->config[$family] === '!!') { - return false; - } - } + if(! array_key_exists($family,$a->config)) + load_config($family); - if(isset($a->config[$family][$key])) { - if($a->config[$family][$key] === '!!') { - return false; - } - return $a->config[$family][$key]; + if(array_key_exists('config_loaded',$a->config[$family])) { + if(! array_key_exists($key,$a->config[$family])) { + return false; } - } - $ret = q("SELECT `v` FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", - dbesc($family), - dbesc($key) - ); - if(count($ret)) { - // manage array value - $val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); - $a->config[$family][$key] = $val; - return $val; - } - else { - $a->config[$family][$key] = '!!'; + return ((preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$family][$key])) + ? unserialize($a->config[$family][$key]) + : $a->config[$family][$key] + ); } return false; } @@ -85,11 +71,12 @@ function get_config($family, $key, $instore = false) { function set_config($family,$key,$value) { global $a; // manage array value - $dbvalue = (is_array($value)?serialize($value):$value); - $dbvalue = (is_bool($dbvalue) ? intval($dbvalue) : $dbvalue); - if(get_config($family,$key,true) === false) { + $dbvalue = ((is_array($value)) ? serialize($value) : $value); + $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue); + + if(get_config($family,$key) === false) { $a->config[$family][$key] = $value; - $ret = q("INSERT INTO `config` ( `cat`, `k`, `v` ) VALUES ( '%s', '%s', '%s' ) ", + $ret = q("INSERT INTO config ( cat, k, v ) VALUES ( '%s', '%s', '%s' ) ", dbesc($family), dbesc($key), dbesc($dbvalue) @@ -99,7 +86,7 @@ function set_config($family,$key,$value) { return $ret; } - $ret = q("UPDATE `config` SET `v` = '%s' WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", + $ret = q("UPDATE config SET v = '%s' WHERE cat = '%s' AND k = '%s' LIMIT 1", dbesc($dbvalue), dbesc($family), dbesc($key) @@ -112,14 +99,11 @@ function set_config($family,$key,$value) { return $ret; } - - function del_config($family,$key) { - global $a; - if(x($a->config[$family],$key)) + if(array_key_exists($family,$a->config) && array_key_exists($key,$a->config[$family])) unset($a->config[$family][$key]); - $ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", + $ret = q("DELETE FROM config WHERE cat = '%s' AND k = '%s' LIMIT 1", dbesc($family), dbesc($key) ); @@ -127,11 +111,13 @@ function del_config($family,$key) { } -function load_pconfig($uid,$family) { +function load_pconfig($uid,$family = '') { global $a; - if(($uid) && (! array_key_exists($uid,$a->config))) + if(! array_key_exists($uid,$a->config)) $a->config[$uid] = array(); + if(($family) && (! array_key_exists($family,$a->config[$uid]))) + $a->config[$uid][$family] = array(); if($family) { $r = q("SELECT * FROM `pconfig` WHERE `cat` = '%s' AND `uid` = %d", @@ -149,15 +135,13 @@ function load_pconfig($uid,$family) { foreach($r as $rr) { $k = $rr['k']; $c = $rr['cat']; - if(! array_key_exists($c,$a->config[$uid])) + if(! array_key_exists($c,$a->config[$uid])) { $a->config[$uid][$c] = array(); + $a->config[$uid][$c]['config_loaded'] = true; + } $a->config[$uid][$c][$k] = $rr['v']; } } -// else if ($family != 'config') { - // Negative caching -// $a->config[$uid][$family] = "!!"; -// } } @@ -167,67 +151,46 @@ function get_pconfig($uid,$family, $key, $instore = false) { global $a; - if(! $instore) { - // Looking if the whole family isn't set - if(isset($a->config[$uid][$family])) { - if($a->config[$uid][$family] === '!!') { - return false; - } - } + if(! array_key_exists($uid,$a->config)) + load_pconfig($uid); - if(isset($a->config[$uid][$family][$key])) { - if($a->config[$uid][$family][$key] === '!!') { - return false; - } - return $a->config[$uid][$family][$key]; - } - } + if((! array_key_exists($family,$a->config[$uid])) || (! array_key_exists($key,$a->config[$uid][$family]))) + return false; - $ret = q("SELECT `v` FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", - intval($uid), - dbesc($family), - dbesc($key) + return ((preg_match('|^a:[0-9]+:{.*}$|s', $a->config[$uid][$family][$key])) + ? unserialize($a->config[$uid][$family][$key]) + : $a->config[$uid][$family][$key] ); - - if(count($ret)) { - $val = (preg_match("|^a:[0-9]+:{.*}$|s", $ret[0]['v'])?unserialize( $ret[0]['v']):$ret[0]['v']); - $a->config[$uid][$family][$key] = $val; - return $val; - } - else { - $a->config[$uid][$family][$key] = '!!'; - } - return false; } - - - - -// Same as above functions except these are for personal config storage and take an -// additional $uid argument. - - function set_pconfig($uid,$family,$key,$value) { global $a; - // manage array value - $dbvalue = (is_array($value)?serialize($value):$value); - if(get_pconfig($uid,$family,$key,true) === false) { + // manage array value + $dbvalue = ((is_array($value)) ? serialize($value) : $value); + $dbvalue = ((is_bool($dbvalue)) ? intval($dbvalue) : $dbvalue); + + if(get_pconfig($uid,$family,$key) === false) { + if(! array_key_exists($uid,$a->config)) + $a->config[$uid] = array(); + if(! array_key_exists($family,$a->config[$uid])) + $a->config[$uid][$family] = array(); + $a->config[$uid][$family][$key] = $value; - $ret = q("INSERT INTO `pconfig` ( `uid`, `cat`, `k`, `v` ) VALUES ( %d, '%s', '%s', '%s' ) ", + $ret = q("INSERT INTO pconfig ( uid, cat, k, v ) VALUES ( %d, '%s', '%s', '%s' ) ", intval($uid), dbesc($family), dbesc($key), dbesc($dbvalue) ); - if($ret) + if($ret) return $value; return $ret; } - $ret = q("UPDATE `pconfig` SET `v` = '%s' WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", + + $ret = q("UPDATE pconfig SET v = '%s' WHERE uid = %d and cat = '%s' AND k = '%s' LIMIT 1", dbesc($dbvalue), intval($uid), dbesc($family), @@ -247,7 +210,7 @@ function del_pconfig($uid,$family,$key) { global $a; if(x($a->config[$uid][$family],$key)) unset($a->config[$uid][$family][$key]); - $ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s' LIMIT 1", + $ret = q("DELETE FROM pconfig WHERE uid = %d AND cat = '%s' AND k = '%s' LIMIT 1", intval($uid), dbesc($family), dbesc($key) diff --git a/mod/settings.php b/mod/settings.php index f417586af..a6d45e9b8 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -719,7 +719,6 @@ function settings_content(&$a) { if((argc() > 1) && (argv(1) === 'features')) { - $arr = array(); $features = get_features(); @@ -739,6 +738,7 @@ function settings_content(&$a) { '$submit' => t('Submit'), '$field_yesno' => 'field_yesno.tpl', )); + return $o; } From c0cc494bf36a61885bc3391e6f05b48baafb312a Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 18 Jun 2013 02:06:16 -0700 Subject: [PATCH 13/52] fix mod-display when not logged in. --- include/config.php | 6 ++++++ mod/display.php | 4 ++-- mod/search.php | 2 +- version.inc | 2 +- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/include/config.php b/include/config.php index 5b74f6292..7d2dbdcc7 100644 --- a/include/config.php +++ b/include/config.php @@ -114,6 +114,9 @@ function del_config($family,$key) { function load_pconfig($uid,$family = '') { global $a; + if($uid === false) + return false; + if(! array_key_exists($uid,$a->config)) $a->config[$uid] = array(); if(($family) && (! array_key_exists($family,$a->config[$uid]))) @@ -151,6 +154,9 @@ function get_pconfig($uid,$family, $key, $instore = false) { global $a; + if($uid === false) + return false; + if(! array_key_exists($uid,$a->config)) load_pconfig($uid); diff --git a/mod/display.php b/mod/display.php index b1ae54df3..110dd1807 100644 --- a/mod/display.php +++ b/mod/display.php @@ -59,7 +59,7 @@ function display_content(&$a, $update = 0, $load = false) { $o .= '
' . "\r\n"; - $o .= "\r\n"; $a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( @@ -152,7 +152,7 @@ function display_content(&$a, $update = 0, $load = false) { - $o .= conversation($a,$items,'display', $update, 'client'); + $o .= conversation($a, $items, 'display', $update, 'client'); if($updateable) { $x = q("UPDATE item SET item_flags = ( item_flags ^ %d ) diff --git a/mod/search.php b/mod/search.php index 4e093d865..3129e84b4 100644 --- a/mod/search.php +++ b/mod/search.php @@ -153,7 +153,7 @@ function search_content(&$a,$update = 0, $load = false) { // because browser prefetching might change it on us. We have to deliver it with the page. $o .= '' . "\r\n"; - $o .= "\r\n"; $a->page['htmlhead'] .= replace_macros(get_markup_template("build_query.tpl"),array( diff --git a/version.inc b/version.inc index b7f186fad..7817365d1 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-06-17.347 +2013-06-18.348 From 6220ab4b549e8a754b2d331d4e8b4fae36e8f98f Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 18 Jun 2013 02:51:43 -0700 Subject: [PATCH 14/52] fix profile update propagation --- include/directory.php | 16 ++++++++++------ include/notifier.php | 6 +++--- 2 files changed, 13 insertions(+), 9 deletions(-) diff --git a/include/directory.php b/include/directory.php index 5f3696a58..c286f5683 100644 --- a/include/directory.php +++ b/include/directory.php @@ -19,11 +19,6 @@ function directory_run($argv, $argc){ if($dirmode === false) $dirmode = DIRECTORY_MODE_NORMAL; - if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) { - syncdirs($argv[1]); - return; - } - $x = q("select * from channel where channel_id = %d limit 1", intval($argv[1]) ); @@ -32,6 +27,15 @@ function directory_run($argv, $argc){ $channel = $x[0]; + + if(($dirmode == DIRECTORY_MODE_PRIMARY) || ($dirmode == DIRECTORY_MODE_STANDALONE)) { + syncdirs($argv[1]); + + // Now update all the connections + proc_run('php','include/notifier.php','refresh_all',$channel['channel_id']); + return; + } + $directory = find_upstream_directory($dirmode); if($directory) { @@ -49,7 +53,7 @@ function directory_run($argv, $argc){ // Now update all the connections - proc_run('php','notifier','refresh_all',$channel['channel_id']); + proc_run('php','include/notifier.php','refresh_all',$channel['channel_id']); } diff --git a/include/notifier.php b/include/notifier.php index 7d107e4d4..96c0bf31f 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -189,6 +189,7 @@ function notifier_run($argv, $argc){ $item = $suggest[0]; } elseif($cmd === 'refresh_all') { + logger('notifier: refresh_all: ' . $item_id); $s = q("select * from channel where channel_id = %d limit 1", intval($item_id) ); @@ -196,10 +197,9 @@ function notifier_run($argv, $argc){ $channel = $s[0]; $uid = $item_id; $recipients = array(); - $r = q("select * from abook where abook_channel = %d and not (abook_flags & %d) and not (abook_flags & %d)", + $r = q("select * from abook where abook_channel = %d and not (abook_flags & %d)", intval($item_id), - intval(ABOOK_FLAG_SELF), - intval(ABOOK_FLAG_PENDING) + intval(ABOOK_FLAG_SELF) ); if($r) { foreach($r as $rr) { From 40c8e89d8476696a2e4a57a27970f6067b803e22 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 18 Jun 2013 18:48:41 -0700 Subject: [PATCH 15/52] undo comment policy override - there are a handful of stored posts from the 17th-June with a broken policy (which won't have a comment box) but it seems to be working for both recent and older posts. --- include/ItemObject.php | 8 ++++---- include/conversation.php | 20 ++++++++++---------- include/enotify.php | 3 +++ 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/include/ItemObject.php b/include/ItemObject.php index e5185bef6..1205ae13e 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -45,10 +45,10 @@ class Item extends BaseObject { if(($this->observer) && (! $this->writable)) { $this->commentable = can_comment_on_post($this->observer['xchan_hash'],$data); - if(! $this->commentable) { - logger('commentable: ' . $data['comment_policy']); - $this->commentable = true; - } +// if(! $this->commentable) { +// logger('commentable: ' . $data['comment_policy']); +// $this->commentable = true; +// } } // logger('writable: ' . $this->writable); diff --git a/include/conversation.php b/include/conversation.php index 8e69e9ea3..b6823e3c5 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -6,7 +6,7 @@ require_once('include/items.php'); // is identical to the code in mod/message.php for 'item_extract_images' and // 'item_redir_and_replace_images' -if(! function_exists('item_extract_images')) { + function item_extract_images($body) { $saved_image = array(); @@ -46,9 +46,9 @@ function item_extract_images($body) { $new_body = $new_body . $orig_body; return array('body' => $new_body, 'images' => $saved_image); -}} +} + -if(! function_exists('item_redir_and_replace_images')) { function item_redir_and_replace_images($body, $images, $cid) { $origbody = $body; @@ -81,7 +81,7 @@ function item_redir_and_replace_images($body, $images, $cid) { } return $newbody; -}} +} @@ -826,7 +826,7 @@ function best_link_url($item) { } -if(! function_exists('item_photo_menu')){ + function item_photo_menu($item){ $a = get_app(); $contact = null; @@ -893,9 +893,9 @@ function item_photo_menu($item){ elseif ($v!="") $o .= "
  • $k
    • \n"; } return $o; -}} +} + -if(! function_exists('like_puller')) { function like_puller($a,$item,&$arr,$mode) { $url = ''; @@ -923,7 +923,7 @@ function like_puller($a,$item,&$arr,$mode) { $arr[$item['thr_parent'] . '-l'][] = '' . $item['author']['xchan_name'] . ''; } return; -}} +} // Format the like/dislike text for a profile item // $cnt = number of people who like/dislike the item @@ -932,7 +932,7 @@ function like_puller($a,$item,&$arr,$mode) { // $id = item id // returns formatted text -if(! function_exists('format_like')) { + function format_like($cnt,$arr,$type,$id) { $o = ''; if($cnt == 1) @@ -956,7 +956,7 @@ function format_like($cnt,$arr,$type,$id) { $o .= "\t" . ''; } return $o; -}} +} function status_editor($a,$x,$popup=false) { diff --git a/include/enotify.php b/include/enotify.php index 71629b9d9..3b7a643ed 100644 --- a/include/enotify.php +++ b/include/enotify.php @@ -50,6 +50,8 @@ function notification($params) { $additional_mail_header = ""; + // We really should pass this through localize_item - but only if we have a complete item. We may only have a couple of elements. + if(array_key_exists('item',$params)) { $title = $params['item']['title']; $body = $params['item']['body']; @@ -352,6 +354,7 @@ function notification($params) { logger('notification: sending notification email'); + $textversion = strip_tags(html_entity_decode(bbcode(stripslashes(str_replace(array("\\r\\n", "\\r", "\\n"), "\n", $body))),ENT_QUOTES,'UTF-8')); From 2e7afa96f4018d63b35f276236cd60e25879fc53 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 18 Jun 2013 19:15:33 -0700 Subject: [PATCH 16/52] map comment_policy on local post submission --- mod/item.php | 1 + 1 file changed, 1 insertion(+) diff --git a/mod/item.php b/mod/item.php index ed5941d2a..338d2a2ee 100644 --- a/mod/item.php +++ b/mod/item.php @@ -532,6 +532,7 @@ function item_post(&$a) { $datarray['item_restrict'] = $item_restrict; $datarray['item_flags'] = $item_flags; + $datarray['comment_policy'] = map_scope($channel['channel_w_comment']); // preview mode - prepare the body for display and send it via json From ba4f237be26608afdab9b00d6e58e38ac4238d1f Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 18 Jun 2013 20:14:56 -0700 Subject: [PATCH 17/52] provide support for "bob likes Lisa's channel" activities --- include/conversation.php | 49 ++++++++++++++++++++++++++-------------- 1 file changed, 32 insertions(+), 17 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index b6823e3c5..0b841aa77 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -108,6 +108,31 @@ function localize_item(&$item){ $item_url = get_rel_link($obj['link'],'alternate'); + $Bphoto = ''; + + switch($obj->type) { + case ACTIVITY_OBJ_PHOTO: + $post_type = t('photo'); + break; + case ACTIVITY_OBJ_EVENT: + $post_type = t('event'); + break; + case ACTIVITY_OBJ_PERSON: + $post_type = t('channel'); + $author_name = $obj['title']; + if($obj['link']) { + $author_link = get_rel_link($obj['link'],'alternate'); + $Bphoto = get_rel_link($obj['link'],'photo'); + } + break; + case ACTIVITY_OBJ_NOTE: + default: + $post_type = t('status'); + if($obj->id != $item['mid']) + $post_type = t('comment'); + break; + } + // If we couldn't parse something useful, don't bother translating. // We need something better than zid here, probably magic_link(), but it needs writing @@ -117,21 +142,6 @@ function localize_item(&$item){ $author = '[zrl=' . chanlink_url($item['author']['xchan_url']) . ']' . $item['author']['xchan_name'] . '[/zrl]'; $objauthor = '[zrl=' . chanlink_url($author_link) . ']' . $author_name . '[/zrl]'; - switch($obj->type) { - case ACTIVITY_OBJ_PHOTO: - $post_type = t('photo'); - break; - case ACTIVITY_OBJ_EVENT: - $post_type = t('event'); - break; - case ACTIVITY_OBJ_NOTE: - default: - $post_type = t('status'); - if($obj->id != $item['mid']) - $post_type = t('comment'); - break; - } - $plink = '[zrl=' . zid($item_url) . ']' . $post_type . '[/zrl]'; if(activity_match($item['verb'],ACTIVITY_LIKE)) { @@ -141,6 +151,8 @@ function localize_item(&$item){ $bodyverb = t('%1$s doesn\'t like %2$s\'s %3$s'); } $item['body'] = $item['localize'] = sprintf($bodyverb, $author, $objauthor, $plink); + if($Bphoto != "") + $item['body'] .= "\n\n\n" . '[zrl=' . chanlink_url($author_link) . '][zmg=80x80]' . $Bphoto . '[/zmg][/zrl]'; } @@ -148,7 +160,8 @@ function localize_item(&$item){ if (activity_match($item['verb'],ACTIVITY_FRIEND)) { - if ($item['obj_type']=="" || $item['obj_type']!== ACTIVITY_OBJ_PERSON) return; + +// if ($item['obj_type']=="" || $item['obj_type']!== ACTIVITY_OBJ_PERSON) return; $Aname = $item['author']['xchan_name']; $Alink = $item['author']['xchan_url']; @@ -349,7 +362,9 @@ function count_descendants($item) { function visible_activity($item) { - if(activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)) + // likes can apply to other things besides posts. Check if they are post children, in which case we handle them specially + + if((activity_match($item['verb'],ACTIVITY_LIKE) || activity_match($item['verb'],ACTIVITY_DISLIKE)) && ($item['mid'] != $item['parent_mid'])) return false; return true; } From 0b935b79dcb82bccd45bf8f68409b6cdf0fceb40 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 18 Jun 2013 20:30:20 -0700 Subject: [PATCH 18/52] Support arbitrary likes - "David likes Bob's bicycle" or "Nancy likes Margaret's breasts" or whatever... This is a tricky activity to construct. You will need to set the object owner to the owner of the "thing" and the object title to the name of the "thing". The thing liked can include a photo if desired. This will probably have issues working correctly in other activitystreams environments. --- boot.php | 1 + include/conversation.php | 13 +++++++++++++ 2 files changed, 14 insertions(+) diff --git a/boot.php b/boot.php index fc02f28e9..aadeb0b29 100755 --- a/boot.php +++ b/boot.php @@ -379,6 +379,7 @@ define ( 'ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event' ); define ( 'ACTIVITY_OBJ_GROUP', NAMESPACE_ACTIVITY_SCHEMA . 'group' ); define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_ZOT . '/activity/tagterm' ); define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_ZOT . '/activity/profile' ); +define ( 'ACTIVITY_OBJ_THING', NAMESPACE_ZOT . '/activity/thing' ); /** * item weight for query ordering diff --git a/include/conversation.php b/include/conversation.php index 0b841aa77..e12aa1fbc 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -125,6 +125,19 @@ function localize_item(&$item){ $Bphoto = get_rel_link($obj['link'],'photo'); } break; + case ACTIVITY_OBJ_THING: + $post_type = $obj['title']; + $author_name = (($obj['owner'] && $obj['owner']['name']) ? $obj['owner']['name'] : ''); + if($obj['owner'] && $obj['owner']['link']) + $author_link = get_rel_link($obj['owner']['link'],'alternate'); + else + $author_link = ''; + + if($obj['link']) { + $Bphoto = get_rel_link($obj['link'],'photo'); + } + break; + case ACTIVITY_OBJ_NOTE: default: $post_type = t('status'); From 9d03da134807a55c74a5b15895356dc8990f01db Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 18 Jun 2013 21:52:54 -0700 Subject: [PATCH 19/52] fall back on object author/actor if no owner --- include/conversation.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/include/conversation.php b/include/conversation.php index e12aa1fbc..410143a7a 100644 --- a/include/conversation.php +++ b/include/conversation.php @@ -127,12 +127,12 @@ function localize_item(&$item){ break; case ACTIVITY_OBJ_THING: $post_type = $obj['title']; - $author_name = (($obj['owner'] && $obj['owner']['name']) ? $obj['owner']['name'] : ''); - if($obj['owner'] && $obj['owner']['link']) - $author_link = get_rel_link($obj['owner']['link'],'alternate'); - else - $author_link = ''; - + if($obj['owner']) { + if(array_key_exists('name',$obj['owner'])) + $obj['owner']['name']; + if(array_key_exists('link',$obj['owner'])) + $author_link = get_rel_link($obj['owner']['link'],'alternate'); + } if($obj['link']) { $Bphoto = get_rel_link($obj['link'],'photo'); } From 4f06905a186252327e7446b8767889dc37aff9fc Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 19 Jun 2013 18:06:14 -0700 Subject: [PATCH 20/52] infrastructure for future stuff --- boot.php | 32 +++++++++++++++++++------------- install/database.sql | 4 +++- install/update.php | 10 +++++++++- mod/like.php | 3 +-- version.inc | 2 +- 5 files changed, 33 insertions(+), 18 deletions(-) diff --git a/boot.php b/boot.php index aadeb0b29..0ad093d6a 100755 --- a/boot.php +++ b/boot.php @@ -41,7 +41,7 @@ require_once('include/features.php'); define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); define ( 'ZOT_REVISION', 1 ); -define ( 'DB_UPDATE_VERSION', 1044 ); +define ( 'DB_UPDATE_VERSION', 1045 ); define ( 'EOL', '
    ' . "\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -117,7 +117,7 @@ define ( 'DEFAULT_DB_ENGINE', 'MyISAM' ); define ( 'SSL_POLICY_NONE', 0 ); define ( 'SSL_POLICY_FULL', 1 ); -define ( 'SSL_POLICY_SELFSIGN', 2 ); +define ( 'SSL_POLICY_SELFSIGN', 2 ); // NOT supported in Red /** @@ -313,18 +313,24 @@ define ( 'XCHAN_FLAGS_HIDDEN', 0x0001); * Tag/term types */ -define ( 'TERM_UNKNOWN', 0 ); -define ( 'TERM_HASHTAG', 1 ); -define ( 'TERM_MENTION', 2 ); -define ( 'TERM_CATEGORY', 3 ); -define ( 'TERM_PCATEGORY', 4 ); -define ( 'TERM_FILE', 5 ); -define ( 'TERM_SAVEDSEARCH', 6 ); - - -define ( 'TERM_OBJ_POST', 1 ); -define ( 'TERM_OBJ_PHOTO', 2 ); +define ( 'TERM_UNKNOWN', 0 ); +define ( 'TERM_HASHTAG', 1 ); +define ( 'TERM_MENTION', 2 ); +define ( 'TERM_CATEGORY', 3 ); +define ( 'TERM_PCATEGORY', 4 ); +define ( 'TERM_FILE', 5 ); +define ( 'TERM_SAVEDSEARCH', 6 ); +define ( 'TERM_HAVETHING', 7 ); +define ( 'TERM_WANTTHING', 8 ); +define ( 'TERM_LIKETHING', 9 ); +define ( 'TERM_NOLIKETHING', 10 ); +define ( 'TERM_OBJ_POST', 1 ); +define ( 'TERM_OBJ_PHOTO', 2 ); +define ( 'TERM_OBJ_PROFILE', 3 ); +define ( 'TERM_OBJ_CHANNEL', 4 ); +define ( 'TERM_OBJ_OBJECT', 5 ); +define ( 'TERM_OBJ_THING', 6 ); /** diff --git a/install/database.sql b/install/database.sql index 07f797dc4..9964e98ea 100644 --- a/install/database.sql +++ b/install/database.sql @@ -826,13 +826,15 @@ CREATE TABLE IF NOT EXISTS `term` ( `type` tinyint(3) unsigned NOT NULL, `term` char(255) NOT NULL, `url` char(255) NOT NULL, + `imgurl` char(255) NOT NULL, PRIMARY KEY (`tid`), KEY `oid` (`oid`), KEY `otype` (`otype`), KEY `type` (`type`), KEY `term` (`term`), KEY `uid` (`uid`), - KEY `aid` (`aid`) + KEY `aid` (`aid`), + KEY `imgurl` (`imgurl`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `tokens` ( diff --git a/install/update.php b/install/update.php index 787c1d542..ba5ec0262 100644 --- a/install/update.php +++ b/install/update.php @@ -1,6 +1,6 @@ 'alternate','type' => 'text/html', - 'href' => z_root() . '/display/' . $item['mid'])); + $links = array(array('rel' => 'alternate','type' => 'text/html', 'href' => $item['plink'])); $objtype = (($item['resource_type'] === 'photo') ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); $body = $item['body']; diff --git a/version.inc b/version.inc index 7817365d1..6855656d4 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2013-06-18.348 +2013-06-19.349 From 3b1e5e5204d7cade3afc320cc45b1eb4efa6743c Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 19 Jun 2013 21:50:14 -0700 Subject: [PATCH 21/52] source code re-org, move taxonomy to separate include --- boot.php | 2 + include/taxonomy.php | 91 ++++++++++++++ include/text.php | 290 +++---------------------------------------- mod/editpost.php | 2 +- 4 files changed, 114 insertions(+), 271 deletions(-) create mode 100644 include/taxonomy.php diff --git a/boot.php b/boot.php index 0ad093d6a..661a77f2a 100755 --- a/boot.php +++ b/boot.php @@ -37,6 +37,8 @@ require_once('include/permissions.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('include/BaseObject.php'); require_once('include/features.php'); +require_once('include/taxonomy.php'); + define ( 'RED_PLATFORM', 'Red Matrix' ); define ( 'RED_VERSION', trim(file_get_contents('version.inc')) . 'R'); diff --git a/include/taxonomy.php b/include/taxonomy.php new file mode 100644 index 000000000..5130ff9b7 --- /dev/null +++ b/include/taxonomy.php @@ -0,0 +1,91 @@ +','[',']'),array('%3c','%3e','%5b','%5d'),$s); +} + +function file_tag_decode($s) { + return str_replace(array('%3c','%3e','%5b','%5d'),array('<','>','[',']'),$s); +} + +function file_tag_file_query($table,$s,$type = 'file') { + + if($type == 'file') + $termtype = TERM_FILE; + else + $termtype = TERM_CATEGORY; + + return sprintf(" AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.type = %d and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ", + intval($termtype), + protect_sprintf(dbesc($s)) + ); +} + +function term_query($table,$s,$type = TERM_UNKNOWN) { + + return sprintf(" AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.type = %d and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ", + intval($type), + protect_sprintf(dbesc($s)) + ); +} + + +function store_item_tag($uid,$iid,$otype,$type,$term,$url = '') { + if(! $term) + return false; + $r = q("select * from term + where uid = %d and oid = %d and otype = %d and type = %d + and term = '%s' and url = '%s' ", + intval($uid), + intval($iid), + intval($otype), + intval($type), + dbesc($term), + dbesc($url) + ); + if($r) + return false; + $r = q("insert into term (uid, oid, otype, type, term, url) + values( %d, %d, %d, %d, '%s', '%s') ", + intval($uid), + intval($iid), + intval($otype), + intval($type), + dbesc($term), + dbesc($url) + ); + return $r; +} + +function get_terms_oftype($arr,$type) { + $ret = array(); + if(! (is_array($arr) && count($arr))) + return $ret; + + if(! is_array($type)) + $type = array($type); + + foreach($type as $t) + foreach($arr as $x) + if($x['type'] == $t) + $ret[] = $x; + return $ret; +} + +function format_term_for_display($term) { + $s = ''; + if($term['type'] == TERM_HASHTAG) + $s .= '#'; + elseif($term['type'] == TERM_MENTION) + $s .= '@'; + + if($term['url']) $s .= '' . htmlspecialchars($term['term']) . ''; + else $s .= htmlspecialchars($term['term']); + return $s; +} + diff --git a/include/text.php b/include/text.php index c51ee0bd2..71268a793 100755 --- a/include/text.php +++ b/include/text.php @@ -1424,278 +1424,28 @@ function reltoabs($text, $base) } function item_post_type($item) { - if(intval($item['event-id'])) - return t('event'); - if(strlen($item['resource_id'])) - return t('photo'); - if(strlen($item['verb']) && $item['verb'] !== ACTIVITY_POST) - return t('activity'); - if($item['id'] != $item['parent']) - return t('comment'); - return t('post'); + + + switch($item['resource_type']) { + case 'photo': + $post_type = t('photo'); + break; + case 'event': + $post_type = t('event'); + break; + default: + $post_type = t('status'); + if($item['mid'] != $item['parent_mid']) + $post_type = t('comment'); + break; + } + + if(strlen($item['verb']) && (! activity_compare($item['verb'],ACTIVITY_POST))) + $post_type = t('activity'); + + return $post_type; } -// post categories and "save to file" use the same item.file table for storage. -// We will differentiate the different uses by wrapping categories in angle brackets -// and save to file categories in square brackets. -// To do this we need to escape these characters if they appear in our tag. - -function file_tag_encode($s) { - return str_replace(array('<','>','[',']'),array('%3c','%3e','%5b','%5d'),$s); -} - -function file_tag_decode($s) { - return str_replace(array('%3c','%3e','%5b','%5d'),array('<','>','[',']'),$s); -} - -function file_tag_file_query($table,$s,$type = 'file') { - - if($type == 'file') - $termtype = TERM_FILE; - else - $termtype = TERM_CATEGORY; - - return sprintf(" AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.type = %d and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ", - intval($termtype), - protect_sprintf(dbesc($s)) - ); -} - -function term_query($table,$s,$type = TERM_UNKNOWN) { - - return sprintf(" AND " . (($table) ? dbesc($table) . '.' : '') . "id in (select term.oid from term where term.type = %d and term.term = '%s' and term.uid = " . (($table) ? dbesc($table) . '.' : '') . "uid ) ", - intval($type), - protect_sprintf(dbesc($s)) - ); -} - -// ex. given music,video return