Merge commit 'spkitlasso-0.2/master'

This commit is contained in:
Benjamin Dauvergne 2008-12-02 15:49:06 +01:00
commit c1df42e40d
2 changed files with 14 additions and 7 deletions

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
spkitlasso (0.2-1) intrepid; urgency=low
* Packaging bzr r107 from my branch.
-- Benjamin Dauvergne <bdauvergne@dell-desktop.example.com> Mon, 30 Jun 2008 13:03:25 +0200
spkitlasso (0.2) unstable; urgency=low
* Setup the library into /usr/share/php/spkitlasso

View File

@ -18,19 +18,20 @@ if (isset($_POST)) {
&& (isset($_POST['idp_metadata'])
|| isset($_POST['idp_metadata_url'])))
{
$ret = $configgen->makeConfig(
$error = "";
try {
$configgen->importConfigFromPost($_POST);
$ret = $configgen->makeConfig(
$_POST['organization'],
$_POST['idp_metadata'],
$_POST['idp_metadata_url'],
isset($_POST['clear_pkey']),
$error);
if ($ret) {
try {
$configgen->importConfigFromPost($_POST);
} catch (Exception $e) {
lassospkit_showCode($e);
if ($ret) {
lassospkit_showCode($error);
}
} catch (Exception $e) {
lassospkit_showCode($e);
}
}
}