diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-03-26 21:10:53 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2009-03-26 21:10:53 +0000 |
| commit | b443458311d981eb6dc16c1f1a6d21350a33d162 (patch) | |
| tree | ac958a4f2190a8daf34822575cabe3f36449069f | |
| parent | ca47c2d9b57f12a4584ff68a34207a1aa42a1df1 (diff) | |
| download | ampache-b443458311d981eb6dc16c1f1a6d21350a33d162.tar.gz ampache-b443458311d981eb6dc16c1f1a6d21350a33d162.tar.bz2 ampache-b443458311d981eb6dc16c1f1a6d21350a33d162.zip | |
slight tweak to /test.php and /install.php check to make the sha256() check work, also make reference to auto_user config option under auto_create config option
| -rw-r--r-- | config/ampache.cfg.php.dist | 9 | ||||
| -rwxr-xr-x | docs/CHANGELOG | 4 | ||||
| -rw-r--r-- | templates/show_install_check.inc.php | 1 | ||||
| -rw-r--r-- | templates/show_test.inc.php | 3 |
4 files changed, 13 insertions, 4 deletions
diff --git a/config/ampache.cfg.php.dist b/config/ampache.cfg.php.dist index abce79d7..66547318 100644 --- a/config/ampache.cfg.php.dist +++ b/config/ampache.cfg.php.dist @@ -374,7 +374,8 @@ refresh_limit = "60" ; This setting will silently create an ampache account ; for anyone who can login using ldap (or any other login -; extension) +; extension). The default is to create new users as guests +; see auto_user config option if you would like to change this ; DEFAULT: false ;auto_create = "false" @@ -459,9 +460,9 @@ refresh_limit = "60" ; DEFAULT: false ;admin_notify_reg = "false" -; This setting will allow all registrants to be auto-approved -; as a user. By default, they will be added as a guest and -; must be "promoted" by the admin. +; This setting will allow all registrants/ldap/http users +; to be auto-approved as a user. By default, they will be +; added as a guest and must be promoted by the admin. ; POSSIBLE VALUES: guest, user, admin ; DEFAULT: guest ;auto_user = "guest" diff --git a/docs/CHANGELOG b/docs/CHANGELOG index e36bb4f1..3b458978 100755 --- a/docs/CHANGELOG +++ b/docs/CHANGELOG @@ -4,6 +4,10 @@ -------------------------------------------------------------------------- v.3.5-Beta2 + - Add text to /test.php for hash() and SHA256() support under PHP + section + - Fix SHA256 Support so that it references something that exists + - Fix incorrect debug_event() on login due to typo - Remove manage democratic playlist as it has no meaning in the current version - Run Dba::reset_db_charset() after upgrade incase people are playing diff --git a/templates/show_install_check.inc.php b/templates/show_install_check.inc.php index 1d3c1115..5a723dfc 100644 --- a/templates/show_install_check.inc.php +++ b/templates/show_install_check.inc.php @@ -24,6 +24,7 @@ <p><?php echo _('PHP Version'); ?>: <?php if(!check_php_ver()) { + if (function_exists('hash_algos')) { $algos = hash_algos(); } $string = phpversion() . " " . _('Hash Function Exists') . " " . print_boolean(function_exists('hash_algos')) . " " . _('SHA256 Support') . " " . print_boolean(in_array('sha256',$algos)); echo debug_result($string,false); Error::add('install',_('PHP Version')); diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php index c8f569be..1e0cafcb 100644 --- a/templates/show_test.inc.php +++ b/templates/show_test.inc.php @@ -47,6 +47,8 @@ <?php if (!check_php_ver()) { echo debug_result('',false); + if (function_exists('hash_algos')) { $algos = hash_algos(); } + $string = ."<strong>" . phpversion() . " " . _('Hash Function Exists') . " " . print_boolean(function_exists('hash_algos')) . " " . _('SHA256 Support') . " " . print_boolean(in_array('sha256',$algos)) . "</strong>"; } else { echo debug_result('',true); @@ -56,6 +58,7 @@ </td> <td> <?php echo _('This tests to make sure that you are running a version of PHP that is known to work with Ampache.'); ?> + <?php echo $string; ?> </td> </tr> <tr> |