Merge pull request #1836 from fabrixxm/feature-reload-plugins

add 'reload active plugins' button in admin/plugins
This commit is contained in:
Tobias Diekershoff 2015-08-20 19:48:16 +02:00
commit 501a676180
2 changed files with 12 additions and 5 deletions

View file

@ -557,8 +557,8 @@ function admin_page_site_post(&$a){
set_config('system','only_tag_search', $only_tag_search); set_config('system','only_tag_search', $only_tag_search);
set_config('system','rino_encrypt', $rino); set_config('system','rino_encrypt', $rino);
info( t('Site settings updated.') . EOL); info( t('Site settings updated.') . EOL);
goaway($a->get_baseurl(true) . '/admin/site' ); goaway($a->get_baseurl(true) . '/admin/site' );
return; // NOTREACHED 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.")), '$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."), '$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")), '$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") '$form_security_token' => get_form_security_token("admin_site")
)); ));
@ -1196,6 +1196,13 @@ function admin_page_plugins(&$a){
* List plugins * 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(); $plugins = array();
$files = glob("addon/*/"); /* */ $files = glob("addon/*/"); /* */
if($files) { if($files) {

View file

@ -1,7 +1,7 @@
<div id='adminpage'> <div id='adminpage'>
<h1>{{$title}} - {{$page}}</h1> <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'> <ul id='pluginslist'>
{{foreach $plugins as $p}} {{foreach $plugins as $p}}
<li class='plugin {{$p.1}}'> <li class='plugin {{$p.1}}'>