stian/gallery3
1
0
Fork 0
mirror of https://github.com/Pathduck/gallery3.git synced 2026-07-10 01:09:19 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Trap any errors that may occur when trying to install a new identity provider and then reinstall the current one.

Browse Source
This commit is contained in:
Tim Almdal
2010-01-22 13:38:05 -08:00
parent df313cac56
commit eabeeeb126
2 changed files with 43 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
modules/gallery/libraries/IdentityProvider.php
View File

@@ -71,19 +71,35 @@ class IdentityProvider_Core {
module::uninstall($current_provider);
}
IdentityProvider::reset();
$provider = new IdentityProvider($new_provider);
try {
IdentityProvider::reset();
$provider = new IdentityProvider($new_provider);
module::set_var("gallery", "identity_provider", $new_provider);
module::set_var("gallery", "identity_provider", $new_provider);
if (method_exists("{$new_provider}_installer", "initialize")) {
call_user_func("{$new_provider}_installer::initialize");
if (method_exists("{$new_provider}_installer", "initialize")) {
call_user_func("{$new_provider}_installer::initialize");
}
module::event("identity_provider_changed", $current_provider, $new_provider);
auth::login($provider->admin_user());
Session::instance()->regenerate();
} catch (Exception $e) {
// Make sure new provider is not in the database
module::uninstall($new_provider);
// Lets reset to the current provider so that the gallery installation is still
// working.
module::set_var("gallery", "identity_provider", null);
IdentityProvider::change_provider($current_provider);
module::activate($current_provider);
message::error(
t("Error attempting to enable \"%new_provider\" identity provider, " .
"reverted to \"%old_provider\" identity provider",
array("new_provider" => $new_provider, "old_provider" => $current_provider)));
throw $e;
}
module::event("identity_provider_changed", $current_provider, $new_provider);
auth::login($provider->admin_user());
Session::instance()->regenerate();
}
/**