diff options
| -rw-r--r-- | config/ampache.cfg.php.dist | 18 | ||||
| -rwxr-xr-x | docs/CHANGELOG | 1 | ||||
| -rw-r--r-- | lib/class/user.class.php | 8 | ||||
| -rw-r--r-- | lib/install.php | 4 |
4 files changed, 19 insertions, 12 deletions
diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist index 82e8ffae..6780998e 100644 --- a/config/ampache.cfg.php.dist +++ b/config/ampache.cfg.php.dist @@ -44,10 +44,10 @@ database_username = username ; DEFAULT: "" database_password = password -; Length that a session will last, the default is very restrictive -; at 15min -; DEFAULT: 1800 -session_length = 1800 +; Length that a session will last expressed in seconds. Default is +; one hour. +; DEFAULT: 3600 +session_length = 3600 ; Length that the session for a single streaming instance will last ; the default is two hours. With some clients, and long songs this can @@ -59,8 +59,8 @@ stream_length = 7200 ; last, the default is 7200, same as length. It is up to the administrator ; of the box to increase this, for reference 86400 = 1 day ; 604800 = 1 week and 2419200 = 1 month -; DEAFULT: 7200 -remember_length = 7200 +; DEAFULT: 86400 +remember_length = 86400 ; Name of the Session/Cookie that will sent to the browser ; default should be fine @@ -68,10 +68,12 @@ remember_length = 7200 session_name = ampache ; Lifetime of the Cookie, 0 == Forever (until browser close) , otherwise in terms of seconds +; If you want cookies to last past a browser close set this to a value in seconds. ; DEFAULT: 0 session_cookielife = 0 -; Is the cookie a "secure" cookie? +; Is the cookie a "secure" cookie? This should only be set to 1 (true) if you are +; running a secure site (HTTPS). ; DEFAULT: 0 session_cookiesecure = 0 @@ -80,7 +82,7 @@ session_cookiesecure = 0 ; to use and in which order, if auto_create isn't enabled ; The user must exist locally. Local method uses PHP's PAM Auth module ; DEFAULT: mysql -; VALUES: mysql,ldap,http, local +; VALUES: mysql,ldap,http,local auth_methods = "mysql" ;##################### diff --git a/docs/CHANGELOG b/docs/CHANGELOG index a75c4717..435e9026 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,7 @@ -------------------------------------------------------------------------- v.3.6-Alpha1 + - Fix PHP warning with IP History if no data is found. - Add -g flag to catalog update to allow for art gathering via cmdline - Change Update frequency of catalog display to 1 second rather then %10 reduces cpu load due to javascript excution (Thx Dmole) diff --git a/lib/class/user.class.php b/lib/class/user.class.php index 27d901bf..60c605fc 100644 --- a/lib/class/user.class.php +++ b/lib/class/user.class.php @@ -726,8 +726,12 @@ class User extends database_object { $this->f_useage = round($total,2) . $name; /* Get Users Last ip */ - $data = $this->get_ip_history(1); - $this->ip_history = inet_ntop($data['0']['ip']); + if (count($data = $this->get_ip_history(1))) { + $this->ip_history = inet_ntop($data['0']['ip']); + } + else { + $this->ip_history = _('Not Enough Data'); + } } // format_user diff --git a/lib/install.php b/lib/install.php index 0746b062..3e07fcb9 100644 --- a/lib/install.php +++ b/lib/install.php @@ -236,8 +236,8 @@ function install_create_config($web_path,$username,$password,$hostname,$database $config_file = Config::get('prefix') . '/config/ampache.cfg.php'; - // Make sure it's writeable - if (!is_writeable($config_file)) { + // Make sure the directory is writeable OR the empty config file is + if (!is_writeable(Config::get('prefix') . '/config/') AND !is_writeable($config_file)) { /* HINT: Config File */ Error::add('general',sprintf(_('%s is not writeable'),$config_file)); return false; |