.

[friendica.git] / mod / admin.php

diff --git a/mod/admin.php b/mod/admin.php
index aeff87f8280f68af6510f4f31eaee9909ca67479..89363541ca8154a2c8223f32d1e0ea2dc9542378 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -279,6 +279,7 @@ function admin_page_site_post(&$a){
        $itemcache_duration     =       ((x($_POST,'itemcache_duration'))       ? intval($_POST['itemcache_duration'])          : 0);
        $lockpath               =       ((x($_POST,'lockpath'))                 ? notags(trim($_POST['lockpath']))              : '');
        $temppath               =       ((x($_POST,'temppath'))                 ? notags(trim($_POST['temppath']))              : '');
+       $basepath               =       ((x($_POST,'basepath'))                 ? notags(trim($_POST['basepath']))              : '');
 
        if($ssl_policy != intval(get_config('system','ssl_policy'))) {
                if($ssl_policy == SSL_POLICY_FULL) {
@@ -384,6 +385,7 @@ function admin_page_site_post(&$a){
        set_config('system','itemcache_duration', $itemcache_duration);
        set_config('system','lockpath', $lockpath);
        set_config('system','temppath', $temppath);
+       set_config('system','basepath', $basepath);
 
 
        info( t('Site settings updated.') . EOL);
@@ -509,6 +511,7 @@ function admin_page_site(&$a) {
                '$itemcache_duration'   => array('itemcache_duration', t("Cache duration in seconds"), get_config('system','itemcache_duration'), t("How long should the cache files be hold? Default value is 86400 seconds (One day).")),
                '$lockpath'             => array('lockpath', t("Path for lock file"), get_config('system','lockpath'), "The lock file is used to avoid multiple pollers at one time. Only define a folder here."),
                '$temppath'             => array('temppath', t("Temp path"), get_config('system','temppath'), "If you have a restricted system where the webserver can't access the system temp path, enter another path here."),
+               '$basepath'             => array('basepath', t("Base path to installation"), get_config('system','basepath'), "If the system cannot detect the correct path to your installation, enter the correct path here. This setting should only be set if you are using a restricted system and symbolic links to your webroot."),
 
         '$form_security_token' => get_form_security_token("admin_site"),
 
@@ -707,6 +710,16 @@ function admin_page_users(&$a){
        $users = array_map("_setup_users", $users);
        
        
+       // Get rid of dashes in key names, Smarty3 can't handle them
+       foreach($users as $key => $user) {
+               $new_user = array();
+               foreach($user as $k => $v) {
+                       $k = str_replace('-','_',$k);
+                       $new_user[$k] = $v;
+               }
+               $users[$key] = $new_user;
+       }
+
        $t = get_markup_template("admin_users.tpl");
        $o = replace_macros($t, array(
                // strings //
@@ -1204,7 +1217,7 @@ function admin_page_remoteupdate(&$a) {
                '$ftppath'      => array('ftppath', t("FTP Path"), '/',''),
                '$ftpuser'      => array('ftpuser', t("FTP User"), '',''),
                '$ftppwd'       => array('ftppwd', t("FTP Password"), '',''),
-               '$remotefile'=>array('remotefile','', $u['2'],'')
+               '$remotefile'=>array('remotefile','', $u['2'],''),
        ));
        
 }