]> git.mxchange.org Git - friendica.git/blobdiff - mod/admin.php
Merge pull request #2148 from annando/issue-1871
[friendica.git] / mod / admin.php
index f79e837b770c0ec003ec9e039d11a90b3179cb6d..8d2a7688f8f500e2b7cbcb5905cb43dfdce6d080 100644 (file)
@@ -47,12 +47,35 @@ function admin_post(&$a){
                                return; // NOTREACHED
                                break;
                        case 'themes':
+                               if ($a->argc < 2) {
+                                       if(is_ajax()) return;
+                                       goaway($a->get_baseurl(true) . '/admin/' );
+                                       return;
+                               }
+
                                $theme = $a->argv[2];
                                if (is_file("view/theme/$theme/config.php")){
-                                       require_once("view/theme/$theme/config.php");
-                                       if (function_exists("theme_admin_post")){
-                                               theme_admin_post($a);
+                                       function __call_theme_admin_post(&$a, $theme) {
+                                               $orig_theme = $a->theme;
+                                               $orig_page = $a->page;
+                                               $orig_session_theme = $_SESSION['theme'];
+                                               require_once("view/theme/$theme/theme.php");
+                                               require_once("view/theme/$theme/config.php");
+                                               $_SESSION['theme'] = $theme;
+
+
+                                               $init = $theme."_init";
+                                               if(function_exists($init)) $init($a);
+                                               if(function_exists("theme_admin_post")){
+                                                       $admin_form = theme_admin_post($a);
+                                               }
+
+                                               $_SESSION['theme'] = $orig_session_theme;
+                                               $a->theme = $orig_theme;
+                                               $a->page = $orig_page;
+                                               return $admin_form;
                                        }
+                                       __call_theme_admin_post($a, $theme);
                                }
                                info(t('Theme settings updated.'));
                                if(is_ajax()) return;
@@ -112,7 +135,7 @@ function admin_content(&$a) {
 
        /* get plugins admin page */
 
-       $r = q("SELECT name FROM `addon` WHERE `plugin_admin`=1");
+       $r = q("SELECT `name` FROM `addon` WHERE `plugin_admin`=1 ORDER BY `name`");
        $aside['plugins_admin']=Array();
        foreach ($r as $h){
                $plugin =$h['name'];
@@ -386,6 +409,7 @@ function admin_page_site_post(&$a){
        $poll_interval          =       ((x($_POST,'poll_interval'))            ? intval(trim($_POST['poll_interval']))         : 0);
        $maxloadavg             =       ((x($_POST,'maxloadavg'))               ? intval(trim($_POST['maxloadavg']))            : 50);
        $maxloadavg_frontend    =       ((x($_POST,'maxloadavg_frontend'))      ? intval(trim($_POST['maxloadavg_frontend']))   : 50);
+       $optimize_max_tablesize =       ((x($_POST,'optimize_max_tablesize'))   ? intval(trim($_POST['optimize_max_tablesize'])): 100);
        $poco_completion        =       ((x($_POST,'poco_completion'))          ? intval(trim($_POST['poco_completion']))       : false);
        $poco_requery_days      =       ((x($_POST,'poco_requery_days'))        ? intval(trim($_POST['poco_requery_days']))     : 7);
        $poco_discovery         =       ((x($_POST,'poco_discovery'))           ? intval(trim($_POST['poco_discovery']))        : 0);
@@ -467,6 +491,7 @@ function admin_page_site_post(&$a){
        set_config('system','poll_interval',$poll_interval);
        set_config('system','maxloadavg',$maxloadavg);
        set_config('system','maxloadavg_frontend',$maxloadavg_frontend);
+       set_config('system','optimize_max_tablesize',$optimize_max_tablesize);
        set_config('system','poco_completion',$poco_completion);
        set_config('system','poco_requery_days',$poco_requery_days);
        set_config('system','poco_discovery',$poco_discovery);
@@ -580,18 +605,7 @@ function admin_page_site_post(&$a){
 function admin_page_site(&$a) {
 
        /* Installed langs */
-       $lang_choices = array();
-       $langs = glob('view/*/strings.php'); /**/
-
-       if(is_array($langs) && count($langs)) {
-               if(! in_array('view/en/strings.php',$langs))
-                       $langs[] = 'view/en/';
-               asort($langs);
-               foreach($langs as $l) {
-                       $t = explode("/",$l);
-                       $lang_choices[$t[1]] = $t[1];
-               }
-       }
+       $lang_choices = get_avaiable_languages();
 
        if (strlen(get_config('system','directory_submit_url')) AND
                !strlen(get_config('system','directory'))) {
@@ -603,58 +617,60 @@ function admin_page_site(&$a) {
        $theme_choices = array();
        $theme_choices_mobile = array();
        $theme_choices_mobile["---"] = t("No special theme for mobile devices");
-       $files = glob('view/theme/*');
+       $files = glob('view/theme/*'); /**/
        if($files) {
                foreach($files as $file) {
+                       if (intval(file_exists($file . '/unsupported')))
+                               continue;
+
                        $f = basename($file);
                        $theme_name = ((file_exists($file . '/experimental')) ?  sprintf("%s - \x28Experimental\x29", $f) : $f);
                        if (file_exists($file . '/mobile')) {
                                $theme_choices_mobile[$f] = $theme_name;
-                       }
-               else {
+                       } else {
                                $theme_choices[$f] = $theme_name;
                        }
                }
-               }
+       }
 
-               /* Community page style */
-               $community_page_style_choices = array(
-                       CP_NO_COMMUNITY_PAGE => t("No community page"),
-                       CP_USERS_ON_SERVER => t("Public postings from users of this site"),
-                       CP_GLOBAL_COMMUNITY => t("Global community page")
-                       );
+       /* Community page style */
+       $community_page_style_choices = array(
+               CP_NO_COMMUNITY_PAGE => t("No community page"),
+               CP_USERS_ON_SERVER => t("Public postings from users of this site"),
+               CP_GLOBAL_COMMUNITY => t("Global community page")
+               );
 
-               /* OStatus conversation poll choices */
-               $ostatus_poll_choices = array(
-                       "-2" => t("Never"),
-                       "-1" => t("At post arrival"),
-                       "0" => t("Frequently"),
-                       "60" => t("Hourly"),
-                       "720" => t("Twice daily"),
-                       "1440" => t("Daily")
-                       );
+       /* OStatus conversation poll choices */
+       $ostatus_poll_choices = array(
+               "-2" => t("Never"),
+               "-1" => t("At post arrival"),
+               "0" => t("Frequently"),
+               "60" => t("Hourly"),
+               "720" => t("Twice daily"),
+               "1440" => t("Daily")
+               );
 
-               $poco_discovery_choices = array(
-                       "0" => t("Disabled"),
-                       "1" => t("Users"),
-                       "2" => t("Users, Global Contacts"),
-                       "3" => t("Users, Global Contacts/fallback"),
-                       );
+       $poco_discovery_choices = array(
+               "0" => t("Disabled"),
+               "1" => t("Users"),
+               "2" => t("Users, Global Contacts"),
+               "3" => t("Users, Global Contacts/fallback"),
+               );
 
-               $poco_discovery_since_choices = array(
-                       "30" => t("One month"),
-                       "91" => t("Three months"),
-                       "182" => t("Half a year"),
-                       "365" => t("One year"),
-                       );
+       $poco_discovery_since_choices = array(
+               "30" => t("One month"),
+               "91" => t("Three months"),
+               "182" => t("Half a year"),
+               "365" => t("One year"),
+               );
 
-               /* get user names to make the install a personal install of X */
-               $user_names = array();
-               $user_names['---'] = t('Multi user instance');
-               $users = q("SELECT username, nickname FROM `user`");
-               foreach ($users as $user) {
-                       $user_names[$user['nickname']] = $user['username'];
-               }
+       /* get user names to make the install a personal install of X */
+       $user_names = array();
+       $user_names['---'] = t('Multi user instance');
+       $users = q("SELECT username, nickname FROM `user`");
+       foreach ($users as $user) {
+               $user_names[$user['nickname']] = $user['username'];
+       }
 
        /* Banner */
        $banner = get_config('system','banner');
@@ -758,6 +774,7 @@ function admin_page_site(&$a) {
                '$poll_interval'        => array('poll_interval', t("Poll interval"), (x(get_config('system','poll_interval'))?get_config('system','poll_interval'):2), t("Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval.")),
                '$maxloadavg'           => array('maxloadavg', t("Maximum Load Average"), ((intval(get_config('system','maxloadavg')) > 0)?get_config('system','maxloadavg'):50), t("Maximum system load before delivery and poll processes are deferred - default 50.")),
                '$maxloadavg_frontend'  => array('maxloadavg_frontend', t("Maximum Load Average (Frontend)"), ((intval(get_config('system','maxloadavg_frontend')) > 0)?get_config('system','maxloadavg_frontend'):50), t("Maximum system load before the frontend quits service - default 50.")),
+               '$optimize_max_tablesize'=> array('optimize_max_tablesize', t("Maximum table size for optimization"), ((intval(get_config('system','optimize_max_tablesize')) > 0)?get_config('system','optimize_max_tablesize'):100), t("Maximum table size (in MB) for the automatic optimization - default 100 MB. Enter -1 to disable it.")),
 
                '$poco_completion'      => array('poco_completion', t("Periodical check of global contacts"), get_config('system','poco_completion'), t("If enabled, the global contacts are checked periodically for missing or outdated data and the vitality of the contacts and servers.")),
                '$poco_requery_days'    => array('poco_requery_days', t("Days between requery"), get_config('system','poco_requery_days'), t("Number of days after which a server is requeried for his contacts.")),
@@ -1405,11 +1422,27 @@ function admin_page_themes(&$a){
 
                $admin_form="";
                if (is_file("view/theme/$theme/config.php")){
-                       require_once("view/theme/$theme/config.php");
-                       if(function_exists("theme_admin")){
-                               $admin_form = theme_admin($a);
-                       }
+                       function __get_theme_admin_form(&$a, $theme) {
+                               $orig_theme = $a->theme;
+                               $orig_page = $a->page;
+                               $orig_session_theme = $_SESSION['theme'];
+                               require_once("view/theme/$theme/theme.php");
+                               require_once("view/theme/$theme/config.php");
+                               $_SESSION['theme'] = $theme;
+
+
+                               $init = $theme."_init";
+                               if(function_exists($init)) $init($a);
+                               if(function_exists("theme_admin")){
+                                       $admin_form = theme_admin($a);
+                               }
 
+                               $_SESSION['theme'] = $orig_session_theme;
+                               $a->theme = $orig_theme;
+                               $a->page = $orig_page;
+                               return $admin_form;
+                       }
+                       $admin_form = __get_theme_admin_form($a, $theme);
                }
 
                $screenshot = array( get_theme_screenshot($theme), t('Screenshot'));