From 5d1c7b4e4f0e7dae4bec157fe043859ad06303a0 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sat, 20 Sep 2014 11:41:44 +0200 Subject: [PATCH 1/5] Cleanup mods folder and remove privacy_image_cache from docs. fix #1151 --- doc/Improve-Performance.md | 13 ----------- doc/de/Improve-Performance.md | 44 +++++++++++++---------------------- mods/readme.txt | 23 +++++------------- mods/sample-Lighttpd.config | 30 +++++++++++++----------- 4 files changed, 39 insertions(+), 71 deletions(-) diff --git a/doc/Improve-Performance.md b/doc/Improve-Performance.md index ceed6fcabc..d4c94d2d11 100644 --- a/doc/Improve-Performance.md +++ b/doc/Improve-Performance.md @@ -70,19 +70,6 @@ This plugin reduces the database load massively. Downside: You can't see the tot Go to the admin settings of "altpager" and set it to "global". -###Privacy Image Cache - -**Description** - -This plugin pre-fetches external content and stores it in the cache. Besides speeding up the page rendering it is also good for the privacy of your users, since embedded pictures are loaded from your site and not from a foreign site (that could spy on the IP addresses). - -Additionally it helps with content from external sites that have slow performance or aren not online all the time. - -**Administration** - -Please create a folder named "privacy_image_cache" and "photo" in your web root. If these folders exists then the cached files will be stored there. This has the great advantage that your web server will fetch the files directly from there. - - ###rendertime This plugin doesn't speed up your system. It helps analyzing your bottlenecks. diff --git a/doc/de/Improve-Performance.md b/doc/de/Improve-Performance.md index fe99123342..346c76fc3e 100644 --- a/doc/de/Improve-Performance.md +++ b/doc/de/Improve-Performance.md @@ -12,7 +12,7 @@ Wenn du Fragen zu den folgenden Anweisungen oder zu anderen Themen hast, dann ka Systemeinstellungen --------------- -Geh auf /admin/site in deinem System und ändere die folgenden Werte: +Geh auf /admin/site in deinem System und ändere die folgenden Werte: setze "Qualität des JPEG Bildes" auf 50. @@ -36,20 +36,20 @@ Wenn du MyISAM (Standardeinstellung) nutzt, dann beschleunigt dies die Suche. setze "Pfad zum Eintrag Cache" auf einen leeren Ordner außerhalb deines Stammverzeichnisses. -Verarbeiteter BBCode und einige externe Bilder werden hier gespeichert. BBCode verarbeiten ist ein zeitintensiver Prozess, der zudem eine hohe CPU-Leistung erfordert. +Verarbeiteter BBCode und einige externe Bilder werden hier gespeichert. BBCode verarbeiten ist ein zeitintensiver Prozess, der zudem eine hohe CPU-Leistung erfordert. -Du kannst den gleichen Ordner nutzen, den du für die Sperrdatei genutzt hast. +Du kannst den gleichen Ordner nutzen, den du für die Sperrdatei genutzt hast. **Warnung!** -Der Ordner für den Eintrag-Cache wird regelmäßig geleert. Jede Datei, die die Cache-Dauer überschreitet, wird gelöscht. **Wenn du versehentlich den Cache-Pfad auf dein Stammverzeichnis legst, dann würde dir dies das gesamte Stammverzeichnis löschen.** +Der Ordner für den Eintrag-Cache wird regelmäßig geleert. Jede Datei, die die Cache-Dauer überschreitet, wird gelöscht. **Wenn du versehentlich den Cache-Pfad auf dein Stammverzeichnis legst, dann würde dir dies das gesamte Stammverzeichnis löschen.** -Prüfe also doppelt, dass der gewählte Ordner nur temporäre Dateien enthält, die jederzeit gelöscht werden können. +Prüfe also doppelt, dass der gewählte Ordner nur temporäre Dateien enthält, die jederzeit gelöscht werden können. Plugins -------- -Aktiviere die folgenden Plugins: +Aktiviere die folgenden Plugins: Alternate Pagination Privacy Image Cache @@ -59,29 +59,17 @@ Aktiviere die folgenden Plugins: **Beschreibung** -Dieses Plugin reduziert die Ladezeit der Datenbank massiv. Nachteil: Du kannst nicht mehr die Anzahl aller Seiten sehen. +Dieses Plugin reduziert die Ladezeit der Datenbank massiv. Nachteil: Du kannst nicht mehr die Anzahl aller Seiten sehen. **Einrichtung** Gehe auf admin/plugins/altpager und wähle "global". -###Privacy Image Cache - -**Beschreibung** - -Dieses Plugin lädt externe Inhalte vor und speichert sie im Cache. Neben der Beschleunigung der Seite dient es so außerdem dazu, die Privatssphäre der Nutzer zu schützen, da eingebettete Inhalte so von deiner Seite aus geladen werden und nicht von externen Quellen (die deine IP-Adresse ermitteln könnten). - -Ebenso hilft es bei Inhalten, die nur langsam laden oder nicht immer online sind. - -**Einrichtung** - -Bitte erstelle einen Ordner namens "privacy_image_cache" und "photo" in deinem Stammverzeichnis. Wenn diese Ordner existieren, dann werden die zwischengespeicherten Inhalte dort abgelegt. Dies hat den großen Vorteil, dass der Server die Dateien direkt von dort bezieht. - ###rendertime **Beschreibung** -Dieses Plugin beschleunigt dein System nicht, aber es hilft dabei, die Flaschenhälse zu ermitteln. +Dieses Plugin beschleunigt dein System nicht, aber es hilft dabei, die Flaschenhälse zu ermitteln. Wenn es aktiviert ist, dann siehst du Werte wie die folgenden auf jeder deiner Seiten: @@ -100,17 +88,17 @@ Diese Werte zeigen deine Performance-Probleme. Webserver ---------- -Wenn du einen Apache-Webserver nutzt, aktiviere bitte die folgenden Module: +Wenn du einen Apache-Webserver nutzt, aktiviere bitte die folgenden Module: ###Cache-Control **Beschreibung** -Dieses Modul weist den Client an, den Inhalt statischer Dateien zu speichern, um diese nicht immer wieder neu laden zu müssen. +Dieses Modul weist den Client an, den Inhalt statischer Dateien zu speichern, um diese nicht immer wieder neu laden zu müssen. Aktiviere das Modul "mod_expires", indem du "a2enmod expires" als root eingibst. -Füge die folgenden Zeilen in die Apache-Konfiguration deiner Seite im "directory"-Bereich ein. +Füge die folgenden Zeilen in die Apache-Konfiguration deiner Seite im "directory"-Bereich ein. ExpiresActive on ExpiresDefault "access plus 1 week" @@ -120,7 +108,7 @@ Weitere Informationen findest du hier: http://httpd.apache.org/docs/2.2/mod/mod_ **Beschreibung** -Dieses Modul komprimiert den Datenverkehr (Traffic) zwischen dem Webserver und dem Client. +Dieses Modul komprimiert den Datenverkehr (Traffic) zwischen dem Webserver und dem Client. Aktiviere das Modul "mod_deflate" durch die Eingabe "a2enmod deflate" als root. @@ -131,7 +119,7 @@ Weitere Informationen findest du hier: http://httpd.apache.org/docs/2.2/mod/mod_ **FCGI** -Wenn du Apache nutzt, dann denk darüber nach, FCGI zu nutzen. Wenn du eine Debian-basierte Distribution nutzt, dann wirst du die Pakete "php5-cgi" und "libapache2-mod-fcgid" benötigen. +Wenn du Apache nutzt, dann denk darüber nach, FCGI zu nutzen. Wenn du eine Debian-basierte Distribution nutzt, dann wirst du die Pakete "php5-cgi" und "libapache2-mod-fcgid" benötigen. Nutze externe Dokumente, um eine detailiertere Erklärung für die Einrichtung eines Systems auf FCGI-Basis zu erhalten. **APC** @@ -142,6 +130,6 @@ Wenn APC aktiviert ist, dann nutzt Friendica dies, um Konfigurationseinstellunge ###Database -Es gibt Skripte wie [tuning-primer.sh](http://www.day32.com/MySQL/) und [mysqltuner.pl](http://mysqltuner.pl), die den Datenbankserver analysieren und Hinweise darauf geben, welche Werte verändert werden könnten. - -Aktivere hierfür die "Slow query" Log-Datei, um Performanceprobleme zu erkennen. +Es gibt Skripte wie [tuning-primer.sh](http://www.day32.com/MySQL/) und [mysqltuner.pl](http://mysqltuner.pl), die den Datenbankserver analysieren und Hinweise darauf geben, welche Werte verändert werden könnten. + +Aktivere hierfür die "Slow query" Log-Datei, um Performanceprobleme zu erkennen. diff --git a/mods/readme.txt b/mods/readme.txt index 9f47f85d5a..83878aefb3 100644 --- a/mods/readme.txt +++ b/mods/readme.txt @@ -1,18 +1,7 @@ -Site speed can be improved when the following indexes are set. They -cannot be set through the update script because on large sites they will -block the site for several minutes. +sample-Lighttpd.config +sample-nginx.config + + Sample configuration files to use Friendica with Lighttpd + or Nginx. Pleas check software documentation to know how modify + these examples to make them work on your server. -CREATE INDEX `uid_commented` ON `item` (`uid`, `commented`); -CREATE INDEX `uid_created` ON `item` (`uid`, `created`); -CREATE INDEX `uid_unseen` ON `item` (`uid`, `unseen`); -CREATE INDEX `resource-id` ON `item` (`resource-id`); -CREATE INDEX `uri_received` ON item(`uri`, `received`); -CREATE INDEX `received_uri` ON item(`received`, `uri`); -CREATE INDEX `contact-id_created` ON item(`contact-id`, created); -CREATE INDEX `uid_network_received` ON item(`uid`, `network`, `received`); -CREATE INDEX `uid_parent` ON item(`uid`, `parent`); -CREATE INDEX `uid_received` ON item(`uid`, `received`); -CREATE INDEX `uid_network_commented` ON item(`uid`, `network`, `commented`); -CREATE INDEX `uid_commented` ON item(`uid`, `commented`); -CREATE INDEX `uid_title` ON item(uid, `title`); -CREATE INDEX `created_contact-id` ON item(`created`, `contact-id`); diff --git a/mods/sample-Lighttpd.config b/mods/sample-Lighttpd.config index 66d00585d9..422c710069 100644 --- a/mods/sample-Lighttpd.config +++ b/mods/sample-Lighttpd.config @@ -42,26 +42,30 @@ server.pid-file = "/var/run/lighttpd.pid" server.username = "www-data" server.groupname = "www-data" +# enable SSL ssl.engine = "enable" ssl.pemfile = "/etc/lighttpd/ssl/wordpress.pem" ssl.ca-file = "/etc/lighttpd/ssl/ca.pem" +# fix for problem between curl and lighttpd +server.reject-expect-100-with-417 = "disable" + # Send everybody to landing -page: +page: $SERVER["socket"] == ":80" { $HTTP["scheme"] == "http" { $HTTP["host"] =~ ".*" { # This next redirect doesn't appear to ever execute in -Firefox +Firefox # (sometimes, anyway -- caching issue?), but it does seem -to +to # reliably in Google's Chromium browser. If I change it -here +here # and restart Lighty, Firefox still goes to the URL in -the - # last 'else' below. Or something. -Sometimes. +the + # last 'else' below. Or something. +Sometimes. server.document-root = "/var/www" url.redirect = (".*" => "https://example.com") } @@ -76,7 +80,7 @@ $HTTP["scheme"] == "https" { server.document-root = "/var/www/wordpress" ssl.pemfile = "/etc/lighttpd/ssl/wordpress.pem" # include -"wpmu-rewrites.conf" +"wpmu-rewrites.conf" url.rewrite-if-not-file = ( "^/(.*/)?files/$" => "/index.php", "^/(.*/)?files/(.*)" => "/wp-includes/ms-files.php?file=$2", @@ -90,9 +94,9 @@ $HTTP["scheme"] == "https" { server.document-root = "/var/www/friendica" ssl.pemfile = "/etc/lighttpd/ssl/friendica.pem" # Got the following 'Drupal Clean URL'after Mike suggested -trying +trying # something along those lines, from -http://drupal.org/node/1414950 +http://drupal.org/node/1414950 url.rewrite-if-not-file = ( "^\/([^\?]*)\?(.*)$" => "/index.php?q=$1&$2", "^\/(.*)$" => "/index.php?q=$1" @@ -121,14 +125,14 @@ dir-listing.encoding = "utf-8" server.dir-listing = "disable" #compress.cache-dir = -"/var/cache/lighttpd/compress/" +"/var/cache/lighttpd/compress/" #compress.filetype = ( "application/x-javascript", "text/css", "text/html", "text/p\ lain" -) +) include_shell "/usr/share/lighttpd/create-mime.assign.pl" include_shell "/usr/share/lighttpd/include-conf-enabled.pl" ----------------( config ends )----------------- \ No newline at end of file +---------------( config ends )----------------- From d2afb263ae5f9399015b5cc72ba8267e35ab4533 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sat, 20 Sep 2014 12:08:10 +0200 Subject: [PATCH 2/5] Set internal PuSH server as default --- htconfig.php | 2 +- view/ca/htconfig.tpl | 2 +- view/ca/smarty3/htconfig.tpl | 2 +- view/cs/htconfig.tpl | 2 +- view/cs/smarty3/htconfig.tpl | 2 +- view/de/htconfig.tpl | 2 +- view/de/smarty3/htconfig.tpl | 2 +- view/en/htconfig.tpl | 2 +- view/en/smarty3/htconfig.tpl | 2 +- view/es/htconfig.tpl | 2 +- view/es/smarty3/htconfig.tpl | 2 +- view/fr/htconfig.tpl | 2 +- view/fr/smarty3/htconfig.tpl | 2 +- view/it/smarty3/htconfig.tpl | 2 +- view/sv/htconfig.tpl | 2 +- view/sv/smarty3/htconfig.tpl | 2 +- 16 files changed, 16 insertions(+), 16 deletions(-) diff --git a/htconfig.php b/htconfig.php index a5f5574eea..4208924cfd 100644 --- a/htconfig.php +++ b/htconfig.php @@ -59,7 +59,7 @@ $a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directo // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +$a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the diff --git a/view/ca/htconfig.tpl b/view/ca/htconfig.tpl index 1e6e2365ad..435c19a73a 100644 --- a/view/ca/htconfig.tpl +++ b/view/ca/htconfig.tpl @@ -54,7 +54,7 @@ $a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directo // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +$a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the diff --git a/view/ca/smarty3/htconfig.tpl b/view/ca/smarty3/htconfig.tpl index 17bd56f79b..cfe4d55ada 100644 --- a/view/ca/smarty3/htconfig.tpl +++ b/view/ca/smarty3/htconfig.tpl @@ -55,7 +55,7 @@ $a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directo // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +$a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl index 5d116dd995..5fe35dfe6f 100644 --- a/view/cs/htconfig.tpl +++ b/view/cs/htconfig.tpl @@ -58,7 +58,7 @@ $a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directo // PuSH - také zvaný jako pubsubhubbub URL. Tímto zajistíte doručování veřejných přízpěvků stejně rychle jako těch soukromých -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +$a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) je defaultně povolen. // Šifrování bude zajištěno pouze pokud je toto nastaveno na true a diff --git a/view/cs/smarty3/htconfig.tpl b/view/cs/smarty3/htconfig.tpl index 4aeff753a1..a8062e64da 100644 --- a/view/cs/smarty3/htconfig.tpl +++ b/view/cs/smarty3/htconfig.tpl @@ -59,7 +59,7 @@ $a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directo // PuSH - také zvaný jako pubsubhubbub URL. Tímto zajistíte doručování veřejných přízpěvků stejně rychle jako těch soukromých -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +$a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) je defaultně povolen. // Šifrování bude zajištěno pouze pokud je toto nastaveno na true a diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl index 76709ea752..f413f3bcbd 100644 --- a/view/de/htconfig.tpl +++ b/view/de/htconfig.tpl @@ -54,7 +54,7 @@ $a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directo // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +$a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the diff --git a/view/de/smarty3/htconfig.tpl b/view/de/smarty3/htconfig.tpl index a5f8dab1ab..c828bed48c 100644 --- a/view/de/smarty3/htconfig.tpl +++ b/view/de/smarty3/htconfig.tpl @@ -55,7 +55,7 @@ $a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directo // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +$a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl index 9e39eeb59c..36d123841a 100644 --- a/view/en/htconfig.tpl +++ b/view/en/htconfig.tpl @@ -54,7 +54,7 @@ $a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directo // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +$a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the diff --git a/view/en/smarty3/htconfig.tpl b/view/en/smarty3/htconfig.tpl index f11922a9cd..ae9697d94f 100644 --- a/view/en/smarty3/htconfig.tpl +++ b/view/en/smarty3/htconfig.tpl @@ -55,7 +55,7 @@ $a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directo // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +$a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl index 6158f6a33d..61dcd3bc45 100644 --- a/view/es/htconfig.tpl +++ b/view/es/htconfig.tpl @@ -54,7 +54,7 @@ $a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directo // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +$a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the diff --git a/view/es/smarty3/htconfig.tpl b/view/es/smarty3/htconfig.tpl index 30998b86cf..340491c380 100644 --- a/view/es/smarty3/htconfig.tpl +++ b/view/es/smarty3/htconfig.tpl @@ -55,7 +55,7 @@ $a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directo // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +$a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl index 76709ea752..f413f3bcbd 100644 --- a/view/fr/htconfig.tpl +++ b/view/fr/htconfig.tpl @@ -54,7 +54,7 @@ $a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directo // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +$a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the diff --git a/view/fr/smarty3/htconfig.tpl b/view/fr/smarty3/htconfig.tpl index a5f8dab1ab..c828bed48c 100644 --- a/view/fr/smarty3/htconfig.tpl +++ b/view/fr/smarty3/htconfig.tpl @@ -55,7 +55,7 @@ $a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directo // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +$a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the diff --git a/view/it/smarty3/htconfig.tpl b/view/it/smarty3/htconfig.tpl index eb85de8218..1587838dc0 100644 --- a/view/it/smarty3/htconfig.tpl +++ b/view/it/smarty3/htconfig.tpl @@ -55,7 +55,7 @@ // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -{{$a}}->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +{{$a}}->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl index 76709ea752..f413f3bcbd 100644 --- a/view/sv/htconfig.tpl +++ b/view/sv/htconfig.tpl @@ -54,7 +54,7 @@ $a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directo // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +$a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the diff --git a/view/sv/smarty3/htconfig.tpl b/view/sv/smarty3/htconfig.tpl index a5f8dab1ab..c828bed48c 100644 --- a/view/sv/smarty3/htconfig.tpl +++ b/view/sv/smarty3/htconfig.tpl @@ -55,7 +55,7 @@ $a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directo // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -$a->config['system']['huburl'] = 'http://pubsubhubbub.appspot.com'; +$a->config['system']['huburl'] = '[internal]'; // Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the From b95e746259a763fc3f7635299d99141e0accdf95 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sat, 20 Sep 2014 12:09:10 +0200 Subject: [PATCH 3/5] allow mod/view in install mode to load pcss files. Fix unstiled install --- index.php | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/index.php b/index.php index 1b60071534..d628f9ad21 100644 --- a/index.php +++ b/index.php @@ -70,7 +70,7 @@ load_translation_table($lang); * * The order of these may be important so use caution if you think they're all * intertwingled with no logical order and decide to sort it out. Some of the - * dependencies have changed, but at least at one time in the recent past - the + * dependencies have changed, but at least at one time in the recent past - the * order was critical to everything working properly * */ @@ -103,7 +103,7 @@ if((x($_GET,'zrl')) && (!$install && !$maintenance)) { * * For Mozilla auth manager - still needs sorting, and this might conflict with LRDD header. * Apache/PHP lumps the Link: headers into one - and other services might not be able to parse it - * this way. There's a PHP flag to link the headers because by default this will over-write any other + * this way. There's a PHP flag to link the headers because by default this will over-write any other * link header. * * What we really need to do is output the raw headers ourselves so we can keep them separate. @@ -131,14 +131,16 @@ if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array(); /* - * check_config() is responsible for running update scripts. These automatically + * check_config() is responsible for running update scripts. These automatically * update the DB schema whenever we push a new one out. It also checks to see if - * any plugins have been added or removed and reacts accordingly. + * any plugins have been added or removed and reacts accordingly. */ -if($install) +// in install mode, any url loads install module +// but we need "view" module for stylesheet +if($install && $a->module!="view") $a->module = 'install'; -elseif($maintenance) +elseif($maintenance && $a->module!="view") $a->module = 'maintenance'; else { check_url($a); @@ -167,13 +169,13 @@ if((local_user()) || (! $privateapps === "1")) * and use it for handling our URL request. * The module file contains a few functions that we call in various circumstances * and in the following order: - * + * * "module"_init * "module"_post (only called if there are $_POST variables) * "module"_afterpost * "module"_content - the string return of this function contains our page body * - * Modules which emit other serialisations besides HTML (XML,JSON, etc.) should do + * Modules which emit other serialisations besides HTML (XML,JSON, etc.) should do * so within the module init and/or post functions and then invoke killme() to terminate * further processing. */ @@ -222,8 +224,8 @@ if(strlen($a->module)) { * * The URL provided does not resolve to a valid module. * - * On Dreamhost sites, quite often things go wrong for no apparent reason and they send us to '/internal_error.html'. - * We don't like doing this, but as it occasionally accounts for 10-20% or more of all site traffic - + * On Dreamhost sites, quite often things go wrong for no apparent reason and they send us to '/internal_error.html'. + * We don't like doing this, but as it occasionally accounts for 10-20% or more of all site traffic - * we are going to trap this and redirect back to the requested page. As long as you don't have a critical error on your page * this will often succeed and eventually do the right thing. * @@ -365,7 +367,7 @@ if(stristr( implode("",$_SESSION['sysmsg']), t('Permission denied'))) { * Report anything which needs to be communicated in the notification area (before the main body) * */ - + /*if(x($_SESSION,'sysmsg')) { $a->page['content'] = "
{$_SESSION['sysmsg']}
\r\n" . ((x($a->page,'content')) ? $a->page['content'] : ''); @@ -534,7 +536,7 @@ if (isset($_GET["mode"]) AND ($_GET["mode"] == "minimal")) { require "view/minimal.php"; } else { - $template = 'view/theme/' . current_theme() . '/' + $template = 'view/theme/' . current_theme() . '/' . ((x($a->page,'template')) ? $a->page['template'] : 'default' ) . '.php'; if(file_exists($template)) From f6cfdf4af1bd7d5e153276155761df81b10c8283 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sat, 20 Sep 2014 12:10:24 +0200 Subject: [PATCH 4/5] remove uneeded email templates --- view/ca/cmnt_received_eml.tpl | 18 ------------- view/ca/mail_received_html_body_eml.tpl | 24 ----------------- view/ca/mail_received_text_body_eml.tpl | 9 ------- view/ca/smarty3/cmnt_received_eml.tpl | 19 ------------- .../smarty3/mail_received_html_body_eml.tpl | 25 ----------------- .../smarty3/mail_received_text_body_eml.tpl | 10 ------- view/ca/smarty3/wall_received_eml.tpl | 19 ------------- view/ca/wall_received_eml.tpl | 18 ------------- view/cs/cmnt_received_eml.tpl | 14 ---------- view/cs/cmnt_received_html_body_eml.tpl | 25 ----------------- view/cs/cmnt_received_text_body_eml.tpl | 14 ---------- view/cs/mail_received_html_body_eml.tpl | 25 ----------------- view/cs/mail_received_text_body_eml.tpl | 10 ------- view/cs/smarty3/cmnt_received_eml.tpl | 15 ----------- .../smarty3/cmnt_received_html_body_eml.tpl | 26 ------------------ .../smarty3/cmnt_received_text_body_eml.tpl | 15 ----------- .../smarty3/mail_received_html_body_eml.tpl | 26 ------------------ .../smarty3/mail_received_text_body_eml.tpl | 11 -------- view/cs/smarty3/wall_received_eml.tpl | 15 ----------- .../smarty3/wall_received_html_body_eml.tpl | 25 ----------------- .../smarty3/wall_received_text_body_eml.tpl | 15 ----------- view/cs/wall_received_eml.tpl | 14 ---------- view/cs/wall_received_html_body_eml.tpl | 24 ----------------- view/cs/wall_received_text_body_eml.tpl | 14 ---------- view/de/cmnt_received_eml.tpl | 17 ------------ view/de/cmnt_received_html_body_eml.tpl | 25 ----------------- view/de/cmnt_received_text_body_eml.tpl | 16 ----------- view/de/mail_received_html_body_eml.tpl | 26 ------------------ view/de/mail_received_text_body_eml.tpl | 11 -------- view/de/smarty3/cmnt_received_eml.tpl | 18 ------------- .../smarty3/cmnt_received_html_body_eml.tpl | 26 ------------------ .../smarty3/cmnt_received_text_body_eml.tpl | 17 ------------ .../smarty3/mail_received_html_body_eml.tpl | 27 ------------------- .../smarty3/mail_received_text_body_eml.tpl | 12 --------- view/de/smarty3/wall_received_eml.tpl | 19 ------------- .../smarty3/wall_received_html_body_eml.tpl | 25 ----------------- .../smarty3/wall_received_text_body_eml.tpl | 19 ------------- view/de/wall_received_eml.tpl | 18 ------------- view/de/wall_received_html_body_eml.tpl | 24 ----------------- view/de/wall_received_text_body_eml.tpl | 18 ------------- view/es/cmnt_received_eml.tpl | 18 ------------- view/es/mail_received_html_body_eml.tpl | 24 ----------------- view/es/mail_received_text_body_eml.tpl | 9 ------- view/es/smarty3/cmnt_received_eml.tpl | 19 ------------- .../smarty3/mail_received_html_body_eml.tpl | 25 ----------------- .../smarty3/mail_received_text_body_eml.tpl | 10 ------- view/es/smarty3/wall_received_eml.tpl | 19 ------------- view/es/wall_received_eml.tpl | 18 ------------- view/fr/cmnt_received_eml.tpl | 18 ------------- view/fr/cmnt_received_html_body_eml.tpl | 25 ----------------- view/fr/cmnt_received_text_body_eml.tpl | 15 ----------- view/fr/mail_received_html_body_eml.tpl | 25 ----------------- view/fr/mail_received_text_body_eml.tpl | 10 ------- view/fr/smarty3/cmnt_received_eml.tpl | 19 ------------- .../smarty3/cmnt_received_html_body_eml.tpl | 26 ------------------ .../smarty3/cmnt_received_text_body_eml.tpl | 16 ----------- .../smarty3/mail_received_html_body_eml.tpl | 26 ------------------ .../smarty3/mail_received_text_body_eml.tpl | 11 -------- view/fr/smarty3/wall_received_eml.tpl | 19 ------------- view/fr/wall_received_eml.tpl | 18 ------------- view/sv/cmnt_received_eml.tpl | 17 ------------ view/sv/mail_received_html_body_eml.tpl | 25 ----------------- view/sv/mail_received_text_body_eml.tpl | 10 ------- view/sv/smarty3/cmnt_received_eml.tpl | 18 ------------- .../smarty3/mail_received_html_body_eml.tpl | 26 ------------------ .../smarty3/mail_received_text_body_eml.tpl | 11 -------- view/sv/smarty3/wall_received_eml.tpl | 17 ------------ view/sv/wall_received_eml.tpl | 16 ----------- 68 files changed, 1258 deletions(-) delete mode 100644 view/ca/cmnt_received_eml.tpl delete mode 100644 view/ca/mail_received_html_body_eml.tpl delete mode 100644 view/ca/mail_received_text_body_eml.tpl delete mode 100644 view/ca/smarty3/cmnt_received_eml.tpl delete mode 100644 view/ca/smarty3/mail_received_html_body_eml.tpl delete mode 100644 view/ca/smarty3/mail_received_text_body_eml.tpl delete mode 100644 view/ca/smarty3/wall_received_eml.tpl delete mode 100644 view/ca/wall_received_eml.tpl delete mode 100644 view/cs/cmnt_received_eml.tpl delete mode 100644 view/cs/cmnt_received_html_body_eml.tpl delete mode 100644 view/cs/cmnt_received_text_body_eml.tpl delete mode 100644 view/cs/mail_received_html_body_eml.tpl delete mode 100644 view/cs/mail_received_text_body_eml.tpl delete mode 100644 view/cs/smarty3/cmnt_received_eml.tpl delete mode 100644 view/cs/smarty3/cmnt_received_html_body_eml.tpl delete mode 100644 view/cs/smarty3/cmnt_received_text_body_eml.tpl delete mode 100644 view/cs/smarty3/mail_received_html_body_eml.tpl delete mode 100644 view/cs/smarty3/mail_received_text_body_eml.tpl delete mode 100644 view/cs/smarty3/wall_received_eml.tpl delete mode 100644 view/cs/smarty3/wall_received_html_body_eml.tpl delete mode 100644 view/cs/smarty3/wall_received_text_body_eml.tpl delete mode 100644 view/cs/wall_received_eml.tpl delete mode 100644 view/cs/wall_received_html_body_eml.tpl delete mode 100644 view/cs/wall_received_text_body_eml.tpl delete mode 100644 view/de/cmnt_received_eml.tpl delete mode 100644 view/de/cmnt_received_html_body_eml.tpl delete mode 100644 view/de/cmnt_received_text_body_eml.tpl delete mode 100644 view/de/mail_received_html_body_eml.tpl delete mode 100644 view/de/mail_received_text_body_eml.tpl delete mode 100644 view/de/smarty3/cmnt_received_eml.tpl delete mode 100644 view/de/smarty3/cmnt_received_html_body_eml.tpl delete mode 100644 view/de/smarty3/cmnt_received_text_body_eml.tpl delete mode 100644 view/de/smarty3/mail_received_html_body_eml.tpl delete mode 100644 view/de/smarty3/mail_received_text_body_eml.tpl delete mode 100644 view/de/smarty3/wall_received_eml.tpl delete mode 100644 view/de/smarty3/wall_received_html_body_eml.tpl delete mode 100644 view/de/smarty3/wall_received_text_body_eml.tpl delete mode 100644 view/de/wall_received_eml.tpl delete mode 100644 view/de/wall_received_html_body_eml.tpl delete mode 100644 view/de/wall_received_text_body_eml.tpl delete mode 100644 view/es/cmnt_received_eml.tpl delete mode 100644 view/es/mail_received_html_body_eml.tpl delete mode 100644 view/es/mail_received_text_body_eml.tpl delete mode 100644 view/es/smarty3/cmnt_received_eml.tpl delete mode 100644 view/es/smarty3/mail_received_html_body_eml.tpl delete mode 100644 view/es/smarty3/mail_received_text_body_eml.tpl delete mode 100644 view/es/smarty3/wall_received_eml.tpl delete mode 100644 view/es/wall_received_eml.tpl delete mode 100644 view/fr/cmnt_received_eml.tpl delete mode 100644 view/fr/cmnt_received_html_body_eml.tpl delete mode 100644 view/fr/cmnt_received_text_body_eml.tpl delete mode 100644 view/fr/mail_received_html_body_eml.tpl delete mode 100644 view/fr/mail_received_text_body_eml.tpl delete mode 100644 view/fr/smarty3/cmnt_received_eml.tpl delete mode 100644 view/fr/smarty3/cmnt_received_html_body_eml.tpl delete mode 100644 view/fr/smarty3/cmnt_received_text_body_eml.tpl delete mode 100644 view/fr/smarty3/mail_received_html_body_eml.tpl delete mode 100644 view/fr/smarty3/mail_received_text_body_eml.tpl delete mode 100644 view/fr/smarty3/wall_received_eml.tpl delete mode 100644 view/fr/wall_received_eml.tpl delete mode 100644 view/sv/cmnt_received_eml.tpl delete mode 100644 view/sv/mail_received_html_body_eml.tpl delete mode 100644 view/sv/mail_received_text_body_eml.tpl delete mode 100644 view/sv/smarty3/cmnt_received_eml.tpl delete mode 100644 view/sv/smarty3/mail_received_html_body_eml.tpl delete mode 100644 view/sv/smarty3/mail_received_text_body_eml.tpl delete mode 100644 view/sv/smarty3/wall_received_eml.tpl delete mode 100644 view/sv/wall_received_eml.tpl diff --git a/view/ca/cmnt_received_eml.tpl b/view/ca/cmnt_received_eml.tpl deleted file mode 100644 index ca61ca492e..0000000000 --- a/view/ca/cmnt_received_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -Apreciat/da $username, - - '$from' ha comentat un element/conversació que estàs seguint. - ------ -$body ------ - -Accedeix a $siteurl per a veure la conversa completa: - -$display - - - $sitename - - - diff --git a/view/ca/mail_received_html_body_eml.tpl b/view/ca/mail_received_html_body_eml.tpl deleted file mode 100644 index c3a74054fb..0000000000 --- a/view/ca/mail_received_html_body_eml.tpl +++ /dev/null @@ -1,24 +0,0 @@ - - - - Mensaje de Friendica - - - - - - - - - - - - - - - - - -
Friendica
Has rebut un nou missatge privat de '$from' en $siteName.
$from
$title
$htmlversion
Accedeix a $siteurl per a llegir i respondre als teus missatges privats.
$siteName
- - diff --git a/view/ca/mail_received_text_body_eml.tpl b/view/ca/mail_received_text_body_eml.tpl deleted file mode 100644 index b343c4e6d2..0000000000 --- a/view/ca/mail_received_text_body_eml.tpl +++ /dev/null @@ -1,9 +0,0 @@ -Has rebut un nou missatge privat de '$from' en $siteName. - -$title - -$textversion - -Accedeix a $siteurl per a llegir i respondre als teus missatges privats. - - $siteName diff --git a/view/ca/smarty3/cmnt_received_eml.tpl b/view/ca/smarty3/cmnt_received_eml.tpl deleted file mode 100644 index 406eaaeb67..0000000000 --- a/view/ca/smarty3/cmnt_received_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - -Apreciat/da {{$username}}, - - '{{$from}}' ha comentat un element/conversació que estàs seguint. - ------ -{{$body}} ------ - -Accedeix a {{$siteurl}} per a veure la conversa completa: - -{{$display}} - - - {{$sitename}} - - - diff --git a/view/ca/smarty3/mail_received_html_body_eml.tpl b/view/ca/smarty3/mail_received_html_body_eml.tpl deleted file mode 100644 index 8c22fb867e..0000000000 --- a/view/ca/smarty3/mail_received_html_body_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - - - Mensaje de Friendica - - - - - - - - - - - - - - - - - -
Friendica
Has rebut un nou missatge privat de '{{$from}}' en {{$siteName}}.
{{$from}}
{{$title}}
{{$htmlversion}}
Accedeix a {{$siteurl}} per a llegir i respondre als teus missatges privats.
{{$siteName}}
- - diff --git a/view/ca/smarty3/mail_received_text_body_eml.tpl b/view/ca/smarty3/mail_received_text_body_eml.tpl deleted file mode 100644 index 4addb7d6e8..0000000000 --- a/view/ca/smarty3/mail_received_text_body_eml.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -Has rebut un nou missatge privat de '{{$from}}' en {{$siteName}}. - -{{$title}} - -{{$textversion}} - -Accedeix a {{$siteurl}} per a llegir i respondre als teus missatges privats. - - {{$siteName}} diff --git a/view/ca/smarty3/wall_received_eml.tpl b/view/ca/smarty3/wall_received_eml.tpl deleted file mode 100644 index 2540957751..0000000000 --- a/view/ca/smarty3/wall_received_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - -Apreciat/da {{$username}}, - - '{{$from}}' ha escrit quelcom en el mur del teu perfil. - ------ -{{$body}} ------ - -Accedeix a {{$siteurl}} per a veure o esborrar l'element: - -{{$display}} - - - {{$sitename}} - - - diff --git a/view/ca/wall_received_eml.tpl b/view/ca/wall_received_eml.tpl deleted file mode 100644 index 0b5c150fd4..0000000000 --- a/view/ca/wall_received_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -Apreciat/da $username, - - '$from' ha escrit quelcom en el mur del teu perfil. - ------ -$body ------ - -Accedeix a $siteurl per a veure o esborrar l'element: - -$display - - - $sitename - - - diff --git a/view/cs/cmnt_received_eml.tpl b/view/cs/cmnt_received_eml.tpl deleted file mode 100644 index ff44923222..0000000000 --- a/view/cs/cmnt_received_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ -Milý/Milá $username, - - '$from' okommentoval položku/konverzaci, kterou následujete. - ------ -$body ------ - -Přihlaste se na $siteurl pro zobrazení kompletní konverzace: - -$display - -Díky, - $sitename administrátor diff --git a/view/cs/cmnt_received_html_body_eml.tpl b/view/cs/cmnt_received_html_body_eml.tpl deleted file mode 100644 index e18129697b..0000000000 --- a/view/cs/cmnt_received_html_body_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - - Friendica zpráva - - - - - - - - - - - - - - - - - - -
Friendica
$from okomentoval položku/konverzaci, kterou následujete.
$from
$body
Přihlaste se na pro zobrazení kompletní konverzace.
Díky,
$sitename administrátor
- - diff --git a/view/cs/cmnt_received_text_body_eml.tpl b/view/cs/cmnt_received_text_body_eml.tpl deleted file mode 100644 index ff44923222..0000000000 --- a/view/cs/cmnt_received_text_body_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ -Milý/Milá $username, - - '$from' okommentoval položku/konverzaci, kterou následujete. - ------ -$body ------ - -Přihlaste se na $siteurl pro zobrazení kompletní konverzace: - -$display - -Díky, - $sitename administrátor diff --git a/view/cs/mail_received_html_body_eml.tpl b/view/cs/mail_received_html_body_eml.tpl deleted file mode 100644 index be59ecd228..0000000000 --- a/view/cs/mail_received_html_body_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - - Friendica Zpráva - - - - - - - - - - - - - - - - - - -
Friendica
$from Vám poslal(a) novou soukromou zprávu na $siteName.
$from
$title
$htmlversion
Přihlaste se na $siteurl pro čtení a zaslání odpovědí na Vaše soukromé zprávy.
Díky,
$siteName administrátor
- - diff --git a/view/cs/mail_received_text_body_eml.tpl b/view/cs/mail_received_text_body_eml.tpl deleted file mode 100644 index c698723773..0000000000 --- a/view/cs/mail_received_text_body_eml.tpl +++ /dev/null @@ -1,10 +0,0 @@ -$from Vám poslal(a) novou soukromou zprávu na $siteName. - -$title - -$textversion - -Přihlaste se na $siteurl pro čtení a zaslání odpovědí na Vaše soukromé zprávy. - -Díky, -$siteName administrátor diff --git a/view/cs/smarty3/cmnt_received_eml.tpl b/view/cs/smarty3/cmnt_received_eml.tpl deleted file mode 100644 index 87d379d2eb..0000000000 --- a/view/cs/smarty3/cmnt_received_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - -Milý/Milá {{$username}}, - - '{{$from}}' okommentoval položku/konverzaci, kterou následujete. - ------ -{{$body}} ------ - -Přihlaste se na {{$siteurl}} pro zobrazení kompletní konverzace: - -{{$display}} - -Díky, - {{$sitename}} administrátor diff --git a/view/cs/smarty3/cmnt_received_html_body_eml.tpl b/view/cs/smarty3/cmnt_received_html_body_eml.tpl deleted file mode 100644 index c512a317e7..0000000000 --- a/view/cs/smarty3/cmnt_received_html_body_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Friendica zpráva - - - - - - - - - - - - - - - - - - -
Friendica
{{$from}} okomentoval položku/konverzaci, kterou následujete.
{{$from}}
{{$body}}
Přihlaste se na pro zobrazení kompletní konverzace.
Díky,
{{$sitename}} administrátor
- - diff --git a/view/cs/smarty3/cmnt_received_text_body_eml.tpl b/view/cs/smarty3/cmnt_received_text_body_eml.tpl deleted file mode 100644 index 87d379d2eb..0000000000 --- a/view/cs/smarty3/cmnt_received_text_body_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - -Milý/Milá {{$username}}, - - '{{$from}}' okommentoval položku/konverzaci, kterou následujete. - ------ -{{$body}} ------ - -Přihlaste se na {{$siteurl}} pro zobrazení kompletní konverzace: - -{{$display}} - -Díky, - {{$sitename}} administrátor diff --git a/view/cs/smarty3/mail_received_html_body_eml.tpl b/view/cs/smarty3/mail_received_html_body_eml.tpl deleted file mode 100644 index 5d7564dc58..0000000000 --- a/view/cs/smarty3/mail_received_html_body_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Friendica Zpráva - - - - - - - - - - - - - - - - - - -
Friendica
{{$from}} Vám poslal(a) novou soukromou zprávu na {{$siteName}}.
{{$from}}
{{$title}}
{{$htmlversion}}
Přihlaste se na {{$siteurl}} pro čtení a zaslání odpovědí na Vaše soukromé zprávy.
Díky,
{{$siteName}} administrátor
- - diff --git a/view/cs/smarty3/mail_received_text_body_eml.tpl b/view/cs/smarty3/mail_received_text_body_eml.tpl deleted file mode 100644 index a15fd6c4ab..0000000000 --- a/view/cs/smarty3/mail_received_text_body_eml.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -{{$from}} Vám poslal(a) novou soukromou zprávu na {{$siteName}}. - -{{$title}} - -{{$textversion}} - -Přihlaste se na {{$siteurl}} pro čtení a zaslání odpovědí na Vaše soukromé zprávy. - -Díky, -{{$siteName}} administrátor diff --git a/view/cs/smarty3/wall_received_eml.tpl b/view/cs/smarty3/wall_received_eml.tpl deleted file mode 100644 index b225513017..0000000000 --- a/view/cs/smarty3/wall_received_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - -Milý/Milá {{$username}}, - - '{{$from}}' obohatil Vaši profilovou zeď. - ------ -{{$body}} ------ - -Přihlaste se na {{$siteurl}} k zobrazení nebo smazání této položky: - -{{$display}} - -Díky, - {{$sitename}} administrátor diff --git a/view/cs/smarty3/wall_received_html_body_eml.tpl b/view/cs/smarty3/wall_received_html_body_eml.tpl deleted file mode 100644 index 6d6b06b03d..0000000000 --- a/view/cs/smarty3/wall_received_html_body_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - - - Friendica zpráva - - - - - - - - - - - - - - - - - -
Friendica
{{$from}} obohatil Vaši profilovou zeď.
{{$from}}
{{$body}}
Přihlaste se na {{$siteurl}} k zobrazení nebo smazání této položky.
Díky,
{{$sitename}} administrátor
- - diff --git a/view/cs/smarty3/wall_received_text_body_eml.tpl b/view/cs/smarty3/wall_received_text_body_eml.tpl deleted file mode 100644 index 9646db63dc..0000000000 --- a/view/cs/smarty3/wall_received_text_body_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - -Milý/Milá {{$username}}, - - '{{$from}}' obohatil Vaši profilovou zeď. - ------ -{{$body}} ------ - -Přihlaste se na {{$siteurl}} k zobrazení nebo smazání této položky: - -{{$display}} - -Díky, - {{$sitename}} administrátor diff --git a/view/cs/wall_received_eml.tpl b/view/cs/wall_received_eml.tpl deleted file mode 100644 index 9fb27ddd8b..0000000000 --- a/view/cs/wall_received_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ -Milý/Milá $username, - - '$from' obohatil Vaši profilovou zeď. - ------ -$body ------ - -Přihlaste se na $siteurl k zobrazení nebo smazání této položky: - -$display - -Díky, - $sitename administrátor diff --git a/view/cs/wall_received_html_body_eml.tpl b/view/cs/wall_received_html_body_eml.tpl deleted file mode 100644 index 043d5f8d2a..0000000000 --- a/view/cs/wall_received_html_body_eml.tpl +++ /dev/null @@ -1,24 +0,0 @@ - - - - Friendica zpráva - - - - - - - - - - - - - - - - - -
Friendica
$from obohatil Vaši profilovou zeď.
$from
$body
Přihlaste se na $siteurl k zobrazení nebo smazání této položky.
Díky,
$sitename administrátor
- - diff --git a/view/cs/wall_received_text_body_eml.tpl b/view/cs/wall_received_text_body_eml.tpl deleted file mode 100644 index 088f7f9db5..0000000000 --- a/view/cs/wall_received_text_body_eml.tpl +++ /dev/null @@ -1,14 +0,0 @@ -Milý/Milá $username, - - '$from' obohatil Vaši profilovou zeď. - ------ -$body ------ - -Přihlaste se na $siteurl k zobrazení nebo smazání této položky: - -$display - -Díky, - $sitename administrátor diff --git a/view/de/cmnt_received_eml.tpl b/view/de/cmnt_received_eml.tpl deleted file mode 100644 index 500c93eb48..0000000000 --- a/view/de/cmnt_received_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Hallo $username, - -'$from' hat einen Pinnwandeintrag kommentiert dem du auch folgst. - ------ -$body ------ - -Um die gesamte Konversation zu sehen melde dich bitte bei $siteurl an: - -$display - -Danke für die Aufmerksamkeit - $sitename Administrator - - diff --git a/view/de/cmnt_received_html_body_eml.tpl b/view/de/cmnt_received_html_body_eml.tpl deleted file mode 100644 index db7f829bce..0000000000 --- a/view/de/cmnt_received_html_body_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - - Friendica Nachricht - - - - - - - - - - - - - - - - - - -
Friendica
$from hat einen Beitrag kommentiert dem du auch folgst.
$from
$body
Bitte melde dich an um die komplette Unterhaltung anzuzeigen.
Beste Grüße,
$sitename Administrator
- - diff --git a/view/de/cmnt_received_text_body_eml.tpl b/view/de/cmnt_received_text_body_eml.tpl deleted file mode 100644 index e00a868af2..0000000000 --- a/view/de/cmnt_received_text_body_eml.tpl +++ /dev/null @@ -1,16 +0,0 @@ -Hallo $username, - -'$from' hat einen Pinnwandeintrag kommentiert dem du auch folgst. - ------ -$body ------ - -Um die gesamte Konversation zu sehen melde dich bitte bei $siteurl an: - -$display - -Danke fr die Aufmerksamkeit - $sitename Administrator - - diff --git a/view/de/mail_received_html_body_eml.tpl b/view/de/mail_received_html_body_eml.tpl deleted file mode 100644 index 34eea59dac..0000000000 --- a/view/de/mail_received_html_body_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - - - Friendica Nachricht - - - - - - - - - - - - - - - - - - - -
Friendica
$fromi hat dir eine private Nachricht auf $siteName gesendet.
$from
$title
$htmlversion
Bitte melde dich auf $siteurl/message an um die Nachricht zu bearbeiten.
Beste Grüße,
$siteName Administrator
- - diff --git a/view/de/mail_received_text_body_eml.tpl b/view/de/mail_received_text_body_eml.tpl deleted file mode 100644 index f5c90cfed2..0000000000 --- a/view/de/mail_received_text_body_eml.tpl +++ /dev/null @@ -1,11 +0,0 @@ -Du hast eine neue private Nachricht von '$from' auf '$siteName' erhhalten. - -$title - -$textversion - -Bitte melde dich unter $siteurl an um deine privaten Nachrichte zu lesen und zu -beantworten. - -Viele Gre, -$siteName Administrator diff --git a/view/de/smarty3/cmnt_received_eml.tpl b/view/de/smarty3/cmnt_received_eml.tpl deleted file mode 100644 index 6e5eab7ab6..0000000000 --- a/view/de/smarty3/cmnt_received_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -Hallo {{$username}}, - -'{{$from}}' hat einen Pinnwandeintrag kommentiert dem du auch folgst. - ------ -{{$body}} ------ - -Um die gesamte Konversation zu sehen melde dich bitte bei {{$siteurl}} an: - -{{$display}} - -Danke für die Aufmerksamkeit - {{$sitename}} Administrator - - diff --git a/view/de/smarty3/cmnt_received_html_body_eml.tpl b/view/de/smarty3/cmnt_received_html_body_eml.tpl deleted file mode 100644 index 39f08073ce..0000000000 --- a/view/de/smarty3/cmnt_received_html_body_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Friendica Nachricht - - - - - - - - - - - - - - - - - - -
Friendica
{{$from}} hat einen Beitrag kommentiert dem du auch folgst.
{{$from}}
{{$body}}
Bitte melde dich an um die komplette Unterhaltung anzuzeigen.
Beste Grüße,
{{$sitename}} Administrator
- - diff --git a/view/de/smarty3/cmnt_received_text_body_eml.tpl b/view/de/smarty3/cmnt_received_text_body_eml.tpl deleted file mode 100644 index b99432a764..0000000000 --- a/view/de/smarty3/cmnt_received_text_body_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -Hallo {{$username}}, - -'{{$from}}' hat einen Pinnwandeintrag kommentiert dem du auch folgst. - ------ -{{$body}} ------ - -Um die gesamte Konversation zu sehen melde dich bitte bei {{$siteurl}} an: - -{{$display}} - -Danke f�r die Aufmerksamkeit - {{$sitename}} Administrator - - diff --git a/view/de/smarty3/mail_received_html_body_eml.tpl b/view/de/smarty3/mail_received_html_body_eml.tpl deleted file mode 100644 index ecea1bfc04..0000000000 --- a/view/de/smarty3/mail_received_html_body_eml.tpl +++ /dev/null @@ -1,27 +0,0 @@ - - - - - Friendica Nachricht - - - - - - - - - - - - - - - - - - - -
Friendica
{{$fromi}} hat dir eine private Nachricht auf {{$siteName}} gesendet.
{{$from}}
{{$title}}
{{$htmlversion}}
Bitte melde dich auf {{$siteurl}}/message an um die Nachricht zu bearbeiten.
Beste Grüße,
{{$siteName}} Administrator
- - diff --git a/view/de/smarty3/mail_received_text_body_eml.tpl b/view/de/smarty3/mail_received_text_body_eml.tpl deleted file mode 100644 index a09dafc6e9..0000000000 --- a/view/de/smarty3/mail_received_text_body_eml.tpl +++ /dev/null @@ -1,12 +0,0 @@ - -Du hast eine neue private Nachricht von '{{$from}}' auf '{{$siteName}}' erhhalten. - -{{$title}} - -{{$textversion}} - -Bitte melde dich unter {{$siteurl}} an um deine privaten Nachrichte zu lesen und zu -beantworten. - -Viele Gr��e, -{{$siteName}} Administrator diff --git a/view/de/smarty3/wall_received_eml.tpl b/view/de/smarty3/wall_received_eml.tpl deleted file mode 100644 index 19e314135a..0000000000 --- a/view/de/smarty3/wall_received_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - -Hallo {{$username}}, - -'{{$from}}' hat etwas auf deiner Profilwand gepostet. - ------ -{{$body}} ------ - -Bitte melde dich unter {{$siteurl}} an um den Eintrag anzusehen oder zu löschen. - -{{$display}} - -Besten Dank! - {{$sitename}} Administrator - - - diff --git a/view/de/smarty3/wall_received_html_body_eml.tpl b/view/de/smarty3/wall_received_html_body_eml.tpl deleted file mode 100644 index e8d8dd2cda..0000000000 --- a/view/de/smarty3/wall_received_html_body_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - - - Friendica Nachricht - - - - - - - - - - - - - - - - - -
Friendica
{{$from}} hat etwas auf deine Pinnwand gepostet.
{{$from}}
{{$body}}
Bitte melde dich auf {{$siteurl}} an um den Eintrag anzusehen oder ihn zu löschen.
Beste Grüße,
{{$sitename}} Administrator
- - diff --git a/view/de/smarty3/wall_received_text_body_eml.tpl b/view/de/smarty3/wall_received_text_body_eml.tpl deleted file mode 100644 index 1ecba1dd7e..0000000000 --- a/view/de/smarty3/wall_received_text_body_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - -Hallo {{$username}}, - - '{{$from}}' hat etwas auf deiner Pinnwand gepostet. - ------ -{{$body}} ------ - -Bitte melde dich auf {{$siteurl}} an um den Beitrag anzusehen oder ihn zu löschen: - -{{$display}} - -Besten Dank! - {{$sitename}} Administrator - - - diff --git a/view/de/wall_received_eml.tpl b/view/de/wall_received_eml.tpl deleted file mode 100644 index b0ca45b244..0000000000 --- a/view/de/wall_received_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -Hallo $username, - -'$from' hat etwas auf deiner Profilwand gepostet. - ------ -$body ------ - -Bitte melde dich unter $siteurl an um den Eintrag anzusehen oder zu löschen. - -$display - -Besten Dank! - $sitename Administrator - - - diff --git a/view/de/wall_received_html_body_eml.tpl b/view/de/wall_received_html_body_eml.tpl deleted file mode 100644 index 407e4fdce7..0000000000 --- a/view/de/wall_received_html_body_eml.tpl +++ /dev/null @@ -1,24 +0,0 @@ - - - - Friendica Nachricht - - - - - - - - - - - - - - - - - -
Friendica
$from hat etwas auf deine Pinnwand gepostet.
$from
$body
Bitte melde dich auf $siteurl an um den Eintrag anzusehen oder ihn zu löschen.
Beste Grüße,
$sitename Administrator
- - diff --git a/view/de/wall_received_text_body_eml.tpl b/view/de/wall_received_text_body_eml.tpl deleted file mode 100644 index c627b0c7e2..0000000000 --- a/view/de/wall_received_text_body_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -Hallo $username, - - '$from' hat etwas auf deiner Pinnwand gepostet. - ------ -$body ------ - -Bitte melde dich auf $siteurl an um den Beitrag anzusehen oder ihn zu löschen: - -$display - -Besten Dank! - $sitename Administrator - - - diff --git a/view/es/cmnt_received_eml.tpl b/view/es/cmnt_received_eml.tpl deleted file mode 100644 index abf2d95dff..0000000000 --- a/view/es/cmnt_received_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -Estimado/a $username, - - '$from' ha comentado un elemento/conversación que estás siguiendo. - ------ -$body ------ - -Accede a $siteurl para ver la conversación completa: - -$display - - - $sitename - - - diff --git a/view/es/mail_received_html_body_eml.tpl b/view/es/mail_received_html_body_eml.tpl deleted file mode 100644 index fe2f267424..0000000000 --- a/view/es/mail_received_html_body_eml.tpl +++ /dev/null @@ -1,24 +0,0 @@ - - - - Mensaje de Friendica - - - - - - - - - - - - - - - - - -
Friendica
Has recibido un nuevo mensaje privado de '$from' en $siteName.
$from
$title
$htmlversion
Accede a $siteurl para leer y responder a tus mensajes privados.
$siteName
- - diff --git a/view/es/mail_received_text_body_eml.tpl b/view/es/mail_received_text_body_eml.tpl deleted file mode 100644 index 8400b9d014..0000000000 --- a/view/es/mail_received_text_body_eml.tpl +++ /dev/null @@ -1,9 +0,0 @@ -Has recibido un nuevo mensaje privado de '$from' en $siteName. - -$title - -$textversion - -Accede a $siteurl para leer y responder a tus mensajes privados. - - $siteName diff --git a/view/es/smarty3/cmnt_received_eml.tpl b/view/es/smarty3/cmnt_received_eml.tpl deleted file mode 100644 index 2f40e523d3..0000000000 --- a/view/es/smarty3/cmnt_received_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - -Estimado/a {{$username}}, - - '{{$from}}' ha comentado un elemento/conversación que estás siguiendo. - ------ -{{$body}} ------ - -Accede a {{$siteurl}} para ver la conversación completa: - -{{$display}} - - - {{$sitename}} - - - diff --git a/view/es/smarty3/mail_received_html_body_eml.tpl b/view/es/smarty3/mail_received_html_body_eml.tpl deleted file mode 100644 index d837084d46..0000000000 --- a/view/es/smarty3/mail_received_html_body_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - - - Mensaje de Friendica - - - - - - - - - - - - - - - - - -
Friendica
Has recibido un nuevo mensaje privado de '{{$from}}' en {{$siteName}}.
{{$from}}
{{$title}}
{{$htmlversion}}
Accede a {{$siteurl}} para leer y responder a tus mensajes privados.
{{$siteName}}
- - diff --git a/view/es/smarty3/mail_received_text_body_eml.tpl b/view/es/smarty3/mail_received_text_body_eml.tpl deleted file mode 100644 index 43ea2fa3c1..0000000000 --- a/view/es/smarty3/mail_received_text_body_eml.tpl +++ /dev/null @@ -1,10 +0,0 @@ - -Has recibido un nuevo mensaje privado de '{{$from}}' en {{$siteName}}. - -{{$title}} - -{{$textversion}} - -Accede a {{$siteurl}} para leer y responder a tus mensajes privados. - - {{$siteName}} diff --git a/view/es/smarty3/wall_received_eml.tpl b/view/es/smarty3/wall_received_eml.tpl deleted file mode 100644 index daa5b4116b..0000000000 --- a/view/es/smarty3/wall_received_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - -Estimado/a {{$username}}, - - '{{$from}}' ha escrito algo en el muro de tu perfil. - ------ -{{$body}} ------ - -Accede a {{$siteurl}} para ver o borrar el elemento: - -{{$display}} - - - {{$sitename}} - - - diff --git a/view/es/wall_received_eml.tpl b/view/es/wall_received_eml.tpl deleted file mode 100644 index 4cd253c724..0000000000 --- a/view/es/wall_received_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -Estimado/a $username, - - '$from' ha escrito algo en el muro de tu perfil. - ------ -$body ------ - -Accede a $siteurl para ver o borrar el elemento: - -$display - - - $sitename - - - diff --git a/view/fr/cmnt_received_eml.tpl b/view/fr/cmnt_received_eml.tpl deleted file mode 100644 index 762a0c4cdd..0000000000 --- a/view/fr/cmnt_received_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -Cher(e) $username, - - « $from » a commenté un élément ou une conversation que vous suivez. - ------ -$body ------ - -Connectez-vous à $siteurl si vous souhaitez voir la conversation complète : - -$display - -Merci, - L'administrateur de $sitename - - - diff --git a/view/fr/cmnt_received_html_body_eml.tpl b/view/fr/cmnt_received_html_body_eml.tpl deleted file mode 100644 index 9da52dd61f..0000000000 --- a/view/fr/cmnt_received_html_body_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - - Message de Friendica - - - - - - - - - - - - - - - - - - -
Friendica
$from a commenté un élément ou une conversation que vous suivez.
$from
$body
Connectez-vous à $siteurl si vous souhaitez voir la conversation complète
Merci,
L'administrateur de $sitename
- - \ No newline at end of file diff --git a/view/fr/cmnt_received_text_body_eml.tpl b/view/fr/cmnt_received_text_body_eml.tpl deleted file mode 100644 index 876b53e126..0000000000 --- a/view/fr/cmnt_received_text_body_eml.tpl +++ /dev/null @@ -1,15 +0,0 @@ - -Cher(e) $username, - - $from a comment un lment ou une conversation que vous suivez. - ------ -$body ------ - -Connectez-vous $siteurl si vous souhaitez voir la conversation complte : - -$display - -Merci, - L'administrateur de $sitename \ No newline at end of file diff --git a/view/fr/mail_received_html_body_eml.tpl b/view/fr/mail_received_html_body_eml.tpl deleted file mode 100644 index 74956ea801..0000000000 --- a/view/fr/mail_received_html_body_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - - Message de Friendica - - - - - - - - - - - - - - - - - - -
Friendica
$from vous a envoyé un message à $siteName.
$from
$title
$htmlversion
Veuillez Ouvrir une session sur $siteurl pour lire et répondre à vos messages privés.
Merci,
$siteName Administrateur
- - diff --git a/view/fr/mail_received_text_body_eml.tpl b/view/fr/mail_received_text_body_eml.tpl deleted file mode 100644 index 65d034c159..0000000000 --- a/view/fr/mail_received_text_body_eml.tpl +++ /dev/null @@ -1,10 +0,0 @@ -$from vous a envoy un message $siteName. - -$title - -$textversion - -Veuillez ouvrir une session sur $siteurl pour lire et rpondre vos messages privs. - -Merci, -$siteName Administrateur diff --git a/view/fr/smarty3/cmnt_received_eml.tpl b/view/fr/smarty3/cmnt_received_eml.tpl deleted file mode 100644 index 05a71d5aa6..0000000000 --- a/view/fr/smarty3/cmnt_received_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - -Cher(e) {{$username}}, - - « {{$from}} » a commenté un élément ou une conversation que vous suivez. - ------ -{{$body}} ------ - -Connectez-vous à {{$siteurl}} si vous souhaitez voir la conversation complète : - -{{$display}} - -Merci, - L'administrateur de {{$sitename}} - - - diff --git a/view/fr/smarty3/cmnt_received_html_body_eml.tpl b/view/fr/smarty3/cmnt_received_html_body_eml.tpl deleted file mode 100644 index d879e4cd03..0000000000 --- a/view/fr/smarty3/cmnt_received_html_body_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Message de Friendica - - - - - - - - - - - - - - - - - - -
Friendica
{{$from}} a commenté un élément ou une conversation que vous suivez.
{{$from}}
{{$body}}
Connectez-vous à {{$siteurl}} si vous souhaitez voir la conversation complète
Merci,
L'administrateur de {{$sitename}}
- - \ No newline at end of file diff --git a/view/fr/smarty3/cmnt_received_text_body_eml.tpl b/view/fr/smarty3/cmnt_received_text_body_eml.tpl deleted file mode 100644 index e5bae0ac11..0000000000 --- a/view/fr/smarty3/cmnt_received_text_body_eml.tpl +++ /dev/null @@ -1,16 +0,0 @@ - - -Cher(e) {{$username}}, - - � {{$from}} � a comment� un �l�ment ou une conversation que vous suivez. - ------ -{{$body}} ------ - -Connectez-vous � {{$siteurl}} si vous souhaitez voir la conversation compl�te : - -{{$display}} - -Merci, - L'administrateur de {{$sitename}} \ No newline at end of file diff --git a/view/fr/smarty3/mail_received_html_body_eml.tpl b/view/fr/smarty3/mail_received_html_body_eml.tpl deleted file mode 100644 index 55622cd92d..0000000000 --- a/view/fr/smarty3/mail_received_html_body_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Message de Friendica - - - - - - - - - - - - - - - - - - -
Friendica
{{$from}} vous a envoyé un message à {{$siteName}}.
{{$from}}
{{$title}}
{{$htmlversion}}
Veuillez Ouvrir une session sur {{$siteurl}} pour lire et répondre à vos messages privés.
Merci,
{{$siteName}} Administrateur
- - diff --git a/view/fr/smarty3/mail_received_text_body_eml.tpl b/view/fr/smarty3/mail_received_text_body_eml.tpl deleted file mode 100644 index a232112984..0000000000 --- a/view/fr/smarty3/mail_received_text_body_eml.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -{{$from}} vous a envoy� un message � {{$siteName}}. - -{{$title}} - -{{$textversion}} - -Veuillez ouvrir une session sur {{$siteurl}} pour lire et r�pondre � vos messages priv�s. - -Merci, -{{$siteName}} Administrateur diff --git a/view/fr/smarty3/wall_received_eml.tpl b/view/fr/smarty3/wall_received_eml.tpl deleted file mode 100644 index 0c537c5b87..0000000000 --- a/view/fr/smarty3/wall_received_eml.tpl +++ /dev/null @@ -1,19 +0,0 @@ - - -Cher(e) {{$username}}, - - « {{$from}} » a posté quelque chose sur le mur de votre profil. - ------ -{{$body}} ------ - -Connectez-vous à {{$siteurl}} pour voir et/ou supprimer l'élément : - -{{$display}} - -Merci, - l'administrateur de {{$sitename}} - - - diff --git a/view/fr/wall_received_eml.tpl b/view/fr/wall_received_eml.tpl deleted file mode 100644 index ad365a9518..0000000000 --- a/view/fr/wall_received_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - -Cher(e) $username, - - « $from » a posté quelque chose sur le mur de votre profil. - ------ -$body ------ - -Connectez-vous à $siteurl pour voir et/ou supprimer l'élément : - -$display - -Merci, - l'administrateur de $sitename - - - diff --git a/view/sv/cmnt_received_eml.tpl b/view/sv/cmnt_received_eml.tpl deleted file mode 100644 index d87c7a1d14..0000000000 --- a/view/sv/cmnt_received_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -$username, - -'$from' har kommenterat något som du följer. - ------ -$body ------ - -Logga in på $siteurl för att se hela konversationen: - -$display - -Hälsningar, -$sitename admin - - diff --git a/view/sv/mail_received_html_body_eml.tpl b/view/sv/mail_received_html_body_eml.tpl deleted file mode 100644 index f72e4af5c4..0000000000 --- a/view/sv/mail_received_html_body_eml.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - - - Meddelande på Friendica - - - - - - - - - - - - - - - - - - -
Friendica
$from har skickat ett personligt meddelande till dig på $siteName.
$from
$title
$htmlversion
Logga in på $siteurl för att läsa och svara på personliga meddelanden.
Hälsningar,
$siteName admin
- - \ No newline at end of file diff --git a/view/sv/mail_received_text_body_eml.tpl b/view/sv/mail_received_text_body_eml.tpl deleted file mode 100644 index ac2857b587..0000000000 --- a/view/sv/mail_received_text_body_eml.tpl +++ /dev/null @@ -1,10 +0,0 @@ -$from har skickat ett personligt meddelande till dig på $siteName. - -$title - -$textversion - -Logga in på $siteurl för att läsa och svara på personliga meddelanden. - -Hälsningar, -$siteName admin diff --git a/view/sv/smarty3/cmnt_received_eml.tpl b/view/sv/smarty3/cmnt_received_eml.tpl deleted file mode 100644 index 372e6e7040..0000000000 --- a/view/sv/smarty3/cmnt_received_eml.tpl +++ /dev/null @@ -1,18 +0,0 @@ - - -{{$username}}, - -'{{$from}}' har kommenterat något som du följer. - ------ -{{$body}} ------ - -Logga in på {{$siteurl}} för att se hela konversationen: - -{{$display}} - -Hälsningar, -{{$sitename}} admin - - diff --git a/view/sv/smarty3/mail_received_html_body_eml.tpl b/view/sv/smarty3/mail_received_html_body_eml.tpl deleted file mode 100644 index 6b6e5ba2d2..0000000000 --- a/view/sv/smarty3/mail_received_html_body_eml.tpl +++ /dev/null @@ -1,26 +0,0 @@ - - - - - Meddelande på Friendica - - - - - - - - - - - - - - - - - - -
Friendica
{{$from}} har skickat ett personligt meddelande till dig på {{$siteName}}.
{{$from}}
{{$title}}
{{$htmlversion}}
Logga in på {{$siteurl}} för att läsa och svara på personliga meddelanden.
Hälsningar,
{{$siteName}} admin
- - \ No newline at end of file diff --git a/view/sv/smarty3/mail_received_text_body_eml.tpl b/view/sv/smarty3/mail_received_text_body_eml.tpl deleted file mode 100644 index fea4a74f02..0000000000 --- a/view/sv/smarty3/mail_received_text_body_eml.tpl +++ /dev/null @@ -1,11 +0,0 @@ - -{{$from}} har skickat ett personligt meddelande till dig på {{$siteName}}. - -{{$title}} - -{{$textversion}} - -Logga in på {{$siteurl}} för att läsa och svara på personliga meddelanden. - -Hälsningar, -{{$siteName}} admin diff --git a/view/sv/smarty3/wall_received_eml.tpl b/view/sv/smarty3/wall_received_eml.tpl deleted file mode 100644 index 7a3d673dc4..0000000000 --- a/view/sv/smarty3/wall_received_eml.tpl +++ /dev/null @@ -1,17 +0,0 @@ - -{{$username}}, - -'{{$from}}' har skrivit på din profilsida. - ------ -{{$body}} ------ - -Logga in på {{$siteurl}} för att kolla eller ta bort: - -{{$display}} - -Hälsningar, -{{$sitename}} admin - - diff --git a/view/sv/wall_received_eml.tpl b/view/sv/wall_received_eml.tpl deleted file mode 100644 index fc450a06df..0000000000 --- a/view/sv/wall_received_eml.tpl +++ /dev/null @@ -1,16 +0,0 @@ -$username, - -'$from' har skrivit på din profilsida. - ------ -$body ------ - -Logga in på $siteurl för att kolla eller ta bort: - -$display - -Hälsningar, -$sitename admin - - From f6cebf607fd1e08f1dc2dc3fe05af1f37b8dd621 Mon Sep 17 00:00:00 2001 From: fabrixxm Date: Sat, 20 Sep 2014 12:14:59 +0200 Subject: [PATCH 5/5] remove unneeded htconfig templates --- view/ca/htconfig.tpl | 68 --------------------------------- view/cs/htconfig.tpl | 73 ------------------------------------ view/de/htconfig.tpl | 68 --------------------------------- view/en/htconfig.tpl | 71 ----------------------------------- view/es/htconfig.tpl | 68 --------------------------------- view/fr/htconfig.tpl | 68 --------------------------------- view/it/smarty3/htconfig.tpl | 48 ++++++++++++------------ view/sv/htconfig.tpl | 68 --------------------------------- 8 files changed, 24 insertions(+), 508 deletions(-) delete mode 100644 view/ca/htconfig.tpl delete mode 100644 view/cs/htconfig.tpl delete mode 100644 view/de/htconfig.tpl delete mode 100644 view/en/htconfig.tpl delete mode 100644 view/es/htconfig.tpl delete mode 100644 view/fr/htconfig.tpl delete mode 100644 view/sv/htconfig.tpl diff --git a/view/ca/htconfig.tpl b/view/ca/htconfig.tpl deleted file mode 100644 index 435c19a73a..0000000000 --- a/view/ca/htconfig.tpl +++ /dev/null @@ -1,68 +0,0 @@ -path to 'directory/subdirectory'. - -$a->path = '$urlpath'; - -// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". -// It can be changed later and only applies to timestamps for anonymous viewers. - -$default_timezone = '$timezone'; - -// What is your site name? - -$a->config['sitename'] = "La Meva Xarxa d'Amics"; - -// 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['register_policy'] = REGISTER_OPEN; -$a->config['register_text'] = ''; -$a->config['admin_email'] = '$adminmail'; - -// Maximum size of an imported message, 0 is unlimited - -$a->config['max_import_size'] = 200000; - -// maximum size of uploaded photos - -$a->config['system']['maximagesize'] = 800000; - -// Location of PHP command line processor - -$a->config['php_path'] = '$phpath'; - -// Location of global directory submission page. - -$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; - -// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts - -$a->config['system']['huburl'] = '[internal]'; - -// Server-to-server private message encryption (RINO) is allowed by default. -// Encryption will only be provided if this setting is true and the -// PHP mcrypt extension is installed on both systems - -$a->config['system']['rino_encrypt'] = true; - -// default system theme - -$a->config['system']['theme'] = 'duepuntozero'; - diff --git a/view/cs/htconfig.tpl b/view/cs/htconfig.tpl deleted file mode 100644 index 5fe35dfe6f..0000000000 --- a/view/cs/htconfig.tpl +++ /dev/null @@ -1,73 +0,0 @@ -path na 'adresar/podadresar'. - -$a->path = '$urlpath'; - -// Vyberte platnou defaultní časovou zónu. Pokud si nejste jistí, použijte use "Europe/Prague". -// Toto nastavení lze změnit i později a používá se pouze pro časové značky anonymních čtenářů. - -$default_timezone = '$timezone'; - -// Jak se jmenuje Váš web? - -$a->config['sitename'] = "Moje síť přátel"; - -// Nastavení defaultního jazyka webu - -$a->config['system']['language'] = 'cs'; - -// Vaše možnosti jsou REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. -// Ujistěte se, že jste si vytvořili Váš osobníúčet dříve, než nastavíte -// REGISTER_CLOSED. 'register_text' (pokud je nastaven) se bude zobrazovat jako první text na -// registrační stránce. REGISTER_APPROVE vyžaduje aby byl nastaven 'admin_email' -// na e-mailovou adresu již existující registrované osoby, která může autorizovat -// a/nebo schvalovat/odmítat žádosti o registraci. - -$a->config['register_policy'] = REGISTER_OPEN; -$a->config['register_text'] = ''; -$a->config['admin_email'] = '$adminmail'; - -// Maximální velikost importované zprávy, 0 je neomezeno - -$a->config['max_import_size'] = 200000; - -// maximální velikost nahrávaných fotografií - -$a->config['system']['maximagesize'] = 800000; - -// cesta k PHP command line processor - -$a->config['php_path'] = '$phpath'; - -// URL adresy globálního adresáře. - -$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; - -// PuSH - také zvaný jako pubsubhubbub URL. Tímto zajistíte doručování veřejných přízpěvků stejně rychle jako těch soukromých - -$a->config['system']['huburl'] = '[internal]'; - -// Server-to-server private message encryption (RINO) je defaultně povolen. -// Šifrování bude zajištěno pouze pokud je toto nastaveno na true a -// PHP mcrypt extension jsou nainstalována na obou systémech - -$a->config['system']['rino_encrypt'] = true; - -// defaultní systémové grafické téma - -$a->config['system']['theme'] = 'duepuntozero'; - - diff --git a/view/de/htconfig.tpl b/view/de/htconfig.tpl deleted file mode 100644 index f413f3bcbd..0000000000 --- a/view/de/htconfig.tpl +++ /dev/null @@ -1,68 +0,0 @@ -path to 'directory/subdirectory'. - -$a->path = '$urlpath'; - -// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". -// It can be changed later and only applies to timestamps for anonymous viewers. - -$default_timezone = '$timezone'; - -// What is your site name? - -$a->config['sitename'] = "My Friend Network"; - -// 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['register_policy'] = REGISTER_OPEN; -$a->config['register_text'] = ''; -$a->config['admin_email'] = '$adminmail'; - -// Maximum size of an imported message, 0 is unlimited - -$a->config['max_import_size'] = 200000; - -// maximum size of uploaded photos - -$a->config['system']['maximagesize'] = 800000; - -// Location of PHP command line processor - -$a->config['php_path'] = '$phpath'; - -// Location of global directory submission page. - -$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; - -// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts - -$a->config['system']['huburl'] = '[internal]'; - -// Server-to-server private message encryption (RINO) is allowed by default. -// Encryption will only be provided if this setting is true and the -// PHP mcrypt extension is installed on both systems - -$a->config['system']['rino_encrypt'] = true; - -// default system theme - -$a->config['system']['theme'] = 'duepuntozero'; - diff --git a/view/en/htconfig.tpl b/view/en/htconfig.tpl deleted file mode 100644 index 36d123841a..0000000000 --- a/view/en/htconfig.tpl +++ /dev/null @@ -1,71 +0,0 @@ -path to 'directory/subdirectory'. - -$a->path = '$urlpath'; - -// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". -// It can be changed later and only applies to timestamps for anonymous viewers. - -$default_timezone = '$timezone'; - -// What is your site name? - -$a->config['sitename'] = "My Friend Network"; - -// 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['register_policy'] = REGISTER_OPEN; -$a->config['register_text'] = ''; -$a->config['admin_email'] = '$adminmail'; - -// Maximum size of an imported message, 0 is unlimited - -$a->config['max_import_size'] = 200000; - -// maximum size of uploaded photos - -$a->config['system']['maximagesize'] = 800000; - -// Location of PHP command line processor - -$a->config['php_path'] = '$phpath'; - -// Location of global directory submission page. - -$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; - -// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts - -$a->config['system']['huburl'] = '[internal]'; - -// Server-to-server private message encryption (RINO) is allowed by default. -// Encryption will only be provided if this setting is true and the -// PHP mcrypt extension is installed on both systems - -$a->config['system']['rino_encrypt'] = true; - -// default system theme - -$a->config['system']['theme'] = 'duepuntozero'; - -// By default allow pseudonyms - -$a->config['system']['no_regfullname'] = true; diff --git a/view/es/htconfig.tpl b/view/es/htconfig.tpl deleted file mode 100644 index 61dcd3bc45..0000000000 --- a/view/es/htconfig.tpl +++ /dev/null @@ -1,68 +0,0 @@ -path to 'directory/subdirectory'. - -$a->path = '$urlpath'; - -// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". -// It can be changed later and only applies to timestamps for anonymous viewers. - -$default_timezone = '$timezone'; - -// What is your site name? - -$a->config['sitename'] = "La Mia Rete di Amici"; - -// Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. -// Be certain to create your own personal account before setting -// 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['register_policy'] = REGISTER_OPEN; -$a->config['register_text'] = ''; -$a->config['admin_email'] = '$adminmail'; - -// Maximum size of an imported message, 0 is unlimited - -$a->config['max_import_size'] = 200000; - -// maximum size of uploaded photos - -$a->config['system']['maximagesize'] = 800000; - -// Location of PHP command line processor - -$a->config['php_path'] = '$phpath'; - -// Location of global directory submission page. - -$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; - -// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts - -$a->config['system']['huburl'] = '[internal]'; - -// Server-to-server private message encryption (RINO) is allowed by default. -// Encryption will only be provided if this setting is true and the -// PHP mcrypt extension is installed on both systems - -$a->config['system']['rino_encrypt'] = true; - -// default system theme - -$a->config['system']['theme'] = 'duepuntozero'; - diff --git a/view/fr/htconfig.tpl b/view/fr/htconfig.tpl deleted file mode 100644 index f413f3bcbd..0000000000 --- a/view/fr/htconfig.tpl +++ /dev/null @@ -1,68 +0,0 @@ -path to 'directory/subdirectory'. - -$a->path = '$urlpath'; - -// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". -// It can be changed later and only applies to timestamps for anonymous viewers. - -$default_timezone = '$timezone'; - -// What is your site name? - -$a->config['sitename'] = "My Friend Network"; - -// 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['register_policy'] = REGISTER_OPEN; -$a->config['register_text'] = ''; -$a->config['admin_email'] = '$adminmail'; - -// Maximum size of an imported message, 0 is unlimited - -$a->config['max_import_size'] = 200000; - -// maximum size of uploaded photos - -$a->config['system']['maximagesize'] = 800000; - -// Location of PHP command line processor - -$a->config['php_path'] = '$phpath'; - -// Location of global directory submission page. - -$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; - -// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts - -$a->config['system']['huburl'] = '[internal]'; - -// Server-to-server private message encryption (RINO) is allowed by default. -// Encryption will only be provided if this setting is true and the -// PHP mcrypt extension is installed on both systems - -$a->config['system']['rino_encrypt'] = true; - -// default system theme - -$a->config['system']['theme'] = 'duepuntozero'; - diff --git a/view/it/smarty3/htconfig.tpl b/view/it/smarty3/htconfig.tpl index 1587838dc0..b4ccf924c2 100644 --- a/view/it/smarty3/htconfig.tpl +++ b/view/it/smarty3/htconfig.tpl @@ -4,66 +4,66 @@ // Set the following for your MySQL installation // Copy or rename this file to .htconfig.php -{{$db}}_host = '{{{{$dbhost}}}}'; -{{$db}}_user = '{{{{$dbuser}}}}'; -{{$db}}_pass = '{{{{$dbpass}}}}'; -{{$db}}_data = '{{{{$dbdata}}}}'; +$db_host = '$dbhost'; +$db_user = '$dbuser'; +$db_pass = '$dbpass'; +$db_data = '$dbdata'; // If you are using a subdirectory of your domain you will need to put the // relative path (from the root of your domain) here. // For instance if your URL is 'http://example.com/directory/subdirectory', -// set {{$a}}->path to 'directory/subdirectory'. +// set $a->path to 'directory/subdirectory'. + +$a->path = '$urlpath'; -{{$a}}->path = '{{{{$urlpath}}}}'; - // Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". // It can be changed later and only applies to timestamps for anonymous viewers. -{{$default}}_timezone = '{{{{$timezone}}}}'; +$default_timezone = '$timezone'; // What is your site name? -{{$a}}->config['sitename'] = "La Mia Rete di Amici"; +$a->config['sitename'] = "La Mia Rete di Amici"; // Your choices are REGISTER_OPEN, REGISTER_APPROVE, or REGISTER_CLOSED. -// Be certain to create your own personal account before setting -// REGISTER_CLOSED. 'register_text' (if set) will be displayed prominently on +// 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['register_policy'] = REGISTER_OPEN; -{{$a}}->config['register_text'] = ''; -{{$a}}->config['admin_email'] = '{{{{$adminmail}}}}'; +$a->config['register_policy'] = REGISTER_OPEN; +$a->config['register_text'] = ''; +$a->config['admin_email'] = '$adminmail'; // Maximum size of an imported message, 0 is unlimited -{{$a}}->config['max_import_size'] = 200000; +$a->config['max_import_size'] = 200000; // maximum size of uploaded photos -{{$a}}->config['system']['maximagesize'] = 800000; +$a->config['system']['maximagesize'] = 800000; // Location of PHP command line processor -{{$a}}->config['php_path'] = '{{{{$phpath}}}}'; +$a->config['php_path'] = '$phpath'; // Location of global directory submission page. -{{$a}}->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; -{{$a}}->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; +$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; +$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; // PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts -{{$a}}->config['system']['huburl'] = '[internal]'; +$a->config['system']['huburl'] = '[internal]'; -// Server-to-server private message encryption (RINO) is allowed by default. +// Server-to-server private message encryption (RINO) is allowed by default. // Encryption will only be provided if this setting is true and the -// PHP mcrypt extension is installed on both systems +// PHP mcrypt extension is installed on both systems -{{$a}}->config['system']['rino_encrypt'] = true; +$a->config['system']['rino_encrypt'] = true; // default system theme -{{$a}}->config['system']['theme'] = 'duepuntozero'; +$a->config['system']['theme'] = 'duepuntozero'; diff --git a/view/sv/htconfig.tpl b/view/sv/htconfig.tpl deleted file mode 100644 index f413f3bcbd..0000000000 --- a/view/sv/htconfig.tpl +++ /dev/null @@ -1,68 +0,0 @@ -path to 'directory/subdirectory'. - -$a->path = '$urlpath'; - -// Choose a legal default timezone. If you are unsure, use "America/Los_Angeles". -// It can be changed later and only applies to timestamps for anonymous viewers. - -$default_timezone = '$timezone'; - -// What is your site name? - -$a->config['sitename'] = "My Friend Network"; - -// 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['register_policy'] = REGISTER_OPEN; -$a->config['register_text'] = ''; -$a->config['admin_email'] = '$adminmail'; - -// Maximum size of an imported message, 0 is unlimited - -$a->config['max_import_size'] = 200000; - -// maximum size of uploaded photos - -$a->config['system']['maximagesize'] = 800000; - -// Location of PHP command line processor - -$a->config['php_path'] = '$phpath'; - -// Location of global directory submission page. - -$a->config['system']['directory_submit_url'] = 'http://dir.friendica.com/submit'; -$a->config['system']['directory_search_url'] = 'http://dir.friendica.com/directory?search='; - -// PuSH - aka pubsubhubbub URL. This makes delivery of public posts as fast as private posts - -$a->config['system']['huburl'] = '[internal]'; - -// Server-to-server private message encryption (RINO) is allowed by default. -// Encryption will only be provided if this setting is true and the -// PHP mcrypt extension is installed on both systems - -$a->config['system']['rino_encrypt'] = true; - -// default system theme - -$a->config['system']['theme'] = 'duepuntozero'; -