Merge pull request #1842 from annando/1508-directory-configurable

Make the hardcoded path to dir.friendica.com configurable

diff --git a/INSTALL.txt b/INSTALL.txt
index 294c6c9dd3369d99fccea5eabaa8a8e4202aa31c..7726bdb0d7d6d3374f30b24b37fd5338ed1ce325 100644 (file)
--- a/INSTALL.txt
+++ b/INSTALL.txt
@@ -64,6 +64,8 @@ you wish to communicate with the Diaspora network.
 3. Create an empty database and note the access details (hostname, username, 
 password, database name).
 
+    - Friendica needs the permission to create and delete fields and tables in its own database.
+
 
 4. If you know in advance that it will be impossible for the web server to 
 write or create files in your web directory, create an empty file called 

diff --git a/doc/Install.md b/doc/Install.md
index cf58af66f710cd37fd97a551d2f49c3adaf5153c..bd15f10b5aa97b5733f657802928cb3d1085b81d 100644 (file)
--- a/doc/Install.md
+++ b/doc/Install.md
@@ -65,6 +65,8 @@ If you copy the directory tree to your webserver, make sure that you also copy .
 
 Create an empty database and note the access details (hostname, username, password, database name).
 
+Friendica needs the permission to create and delete fields and tables in its own database.
+
 ###Run the installer
 
 Point your web browser to the new site and follow the instructions.

diff --git a/doc/de/Install.md b/doc/de/Install.md
index 36692bd2c8f5fbf5e883a1a135bfa1750bf45611..df95735f3601a88075c51decac48d12de788c848 100644 (file)
--- a/doc/de/Install.md
+++ b/doc/de/Install.md
@@ -70,6 +70,8 @@ Wir planen, diese Einschränkung in einer zukünftigen Version zu beheben.
 
 3. Erstelle eine leere Datenbank und notiere alle Zugangsdaten (Adresse der Datenbank, Nutzername, Passwort, Datenbankname).
 
+Friendica benötigt die Berechtigungen um neue Felder in dieser Datenbank zu ertellen (create) und zu löschen (delete).
+
 4. Besuche deine Webseite mit deinem Browser und befolge die Anleitung. Bitte beachte jeden Fehler und korrigiere diese, bevor du fortfährst.
 
 5. *Wenn* die automatisierte Installation aus irgendeinem Grund fehlschlägt, dann prüfe das Folgende:

diff --git a/mod/admin.php b/mod/admin.php
index e9d128369243933e56ea3637b17d640bce376468..be4ab8b52ea014cfbccb3273caf4c0274664f7e1 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -557,8 +557,8 @@ function admin_page_site_post(&$a){
        set_config('system','only_tag_search', $only_tag_search);
 
        set_config('system','rino_encrypt', $rino);
-       
-       
+
+
        info( t('Site settings updated.') . EOL);
        goaway($a->get_baseurl(true) . '/admin/site' );
        return; // NOTREACHED
@@ -761,9 +761,9 @@ function admin_page_site(&$a) {
                '$only_tag_search'      => array('only_tag_search', t("Only search in tags"), get_config('system','only_tag_search'), t("On large systems the text search can slow down the system extremely.")),
 
                '$relocate_url'     => array('relocate_url', t("New base url"), $a->get_baseurl(), "Change base url for this server. Sends relocate message to all DFRN contacts of all users."),
-               
+
                '$rino'                 => array('rino', t("RINO Encryption"), intval(get_config('system','rino_encrypt')), t("Encryption layer between nodes."), array("Disabled", "RINO1 (deprecated)", "RINO2")),
-               
+
                '$form_security_token' => get_form_security_token("admin_site")
 
        ));
@@ -1196,6 +1196,13 @@ function admin_page_plugins(&$a){
         * List plugins
         */
 
+    if (x($_GET,"a") && $_GET['a']=="r"){
+               check_form_security_token_redirectOnErr($a->get_baseurl().'/admin/plugins', 'admin_themes', 't');
+               reload_plugins();
+               info("Plugins reloaded");
+               goaway($a->get_baseurl().'/admin/plugins');
+       }
+
        $plugins = array();
        $files = glob("addon/*/"); /* */
        if($files) {

diff --git a/view/templates/admin_plugins.tpl b/view/templates/admin_plugins.tpl
index c194c46ccddfa1f845cdd42235848f12bddc24da..6577ab8eb0c6413aaa919eb9d8cf912c072c8b3c 100644 (file)
--- a/view/templates/admin_plugins.tpl
+++ b/view/templates/admin_plugins.tpl
@@ -1,7 +1,7 @@
 
 <div id='adminpage'>
        <h1>{{$title}} - {{$page}}</h1>
-       
+               <a class="btn" href="{{$baseurl}}/admin/{{$function}}?a=r&amp;t={{$form_security_token}}">{{"Reload active plugins"|t}}</a>
                <ul id='pluginslist'>
                {{foreach $plugins as $p}}
                        <li class='plugin {{$p.1}}'>