diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-05-10 11:00:57 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2008-05-10 11:00:57 +0000 |
| commit | 08598b34a8621838ce64f4b8a3f2164072c3be1b (patch) | |
| tree | 825a9083a413fa5da3491b6da735c6ad3cdb2c41 /admin | |
| parent | 2f5c09b55c9f0f4149d2ae3ff41678807dab322a (diff) | |
| download | ampache-08598b34a8621838ce64f4b8a3f2164072c3be1b.tar.gz ampache-08598b34a8621838ce64f4b8a3f2164072c3be1b.tar.bz2 ampache-08598b34a8621838ce64f4b8a3f2164072c3be1b.zip | |
some rather major bug fixes, corrected a preference setting issue, as well as a preference update issue, fixed infinite plugin installing for fun and profit, also fixed updating the config file not regenerating the version correctly and the user creation allowing users with blank password, which does not work at the login
Diffstat (limited to 'admin')
| -rw-r--r-- | admin/modules.php | 11 | ||||
| -rw-r--r-- | admin/users.php | 4 |
2 files changed, 11 insertions, 4 deletions
diff --git a/admin/modules.php b/admin/modules.php index bc13eb22..23fc5429 100644 --- a/admin/modules.php +++ b/admin/modules.php @@ -1,7 +1,7 @@ <?php /* - Copyright (c) 2001 - 2007 Ampache.org + Copyright (c) Ampache.org All rights reserved. This program is free software; you can redistribute it and/or @@ -77,7 +77,14 @@ switch ($_REQUEST['action']) { break; } $plugin = new Plugin($_REQUEST['plugin']); - $plugin->install(); + if (!$plugin->install()) { + debug_event('plugins','Error: Plugin Install Failed, ' . $_REQUEST['plugin'],'1'); + $url = Config::get('web_path') . '/admin/modules.php?action=show_plugins'; + $title = _('Unable to Install Plugin'); + $body = ''; + show_confirmation($title,$body,$url); + break; + } // Don't trust the plugin to this stuff User::rebuild_all_preferences(); diff --git a/admin/users.php b/admin/users.php index a986bba6..a9a5039d 100644 --- a/admin/users.php +++ b/admin/users.php @@ -1,7 +1,7 @@ <?php /* - Copyright (c) 2001 - 2007 Ampache.org + Copyright (c) Ampache.org All rights reserved. This program is free software; you can redistribute it and/or @@ -97,7 +97,7 @@ switch ($_REQUEST['action']) { $pass1 = scrub_in($_REQUEST['password_1']); $pass2 = scrub_in($_REQUEST['password_2']); - if ($pass1 !== $pass2) { + if ($pass1 !== $pass2 || !strlen($pass1)) { Error::add('password',_("Error Passwords don't match")); } |