hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-13 04:53:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Enhanced error messages

Browse Source
This commit is contained in:
Romain Neutron
2011-12-15 12:31:58 +01:00
parent db99657c26
commit c94c4279ac
1 changed files with 48 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
www/admin/databases.php
View File

@@ -63,7 +63,6 @@ phrasea::headers();
$code = _('Propositions de modifications des tables') $code = _('Propositions de modifications des tables')
. '<blockquote>' . $code . '</blockquote>'; . '<blockquote>' . $code . '</blockquote>';
?> ?>
<pre> <pre>
<?php echo $code; ?> <?php echo $code; ?>
@@ -87,9 +86,10 @@ phrasea::headers();
{ {
if (!$parm['new_settings'] && $parm['new_dbname'] && $parm['new_data_template']) if (!$parm['new_settings'] && $parm['new_dbname'] && $parm['new_data_template'])
{ {
if (p4string::hasAccent($parm['new_dbname'])) if (p4string::hasAccent($parm['new_dbname']))
$error['new_dbname'] = 'No special chars in dbname'; {
$error[] = _('Database name can not contains special characters');
}
if (count($error) === 0) if (count($error) === 0)
{ {
@@ -99,22 +99,33 @@ phrasea::headers();
$data_template = new system_file($registry->get('GV_RootPath') . 'lib/conf.d/data_templates/' . $parm['new_data_template'] . '.xml'); $data_template = new system_file($registry->get('GV_RootPath') . 'lib/conf.d/data_templates/' . $parm['new_data_template'] . '.xml');
$connbas = new connection_pdo('databox_creation', $hostname, $port, $user, $password, $parm['new_dbname']); $connbas = new connection_pdo('databox_creation', $hostname, $port, $user, $password, $parm['new_dbname']);
try
{
$base = databox::create($appbox, $connbas, $data_template, $registry); $base = databox::create($appbox, $connbas, $data_template, $registry);
$base->registerAdmin($user_obj); $base->registerAdmin($user_obj);
$createBase = $sbas_id = $base->get_sbas_id(); $createBase = $sbas_id = $base->get_sbas_id();
} }
catch (Exception $e) catch (Exception $e)
{ {
$errors = $e->getMessage(); $error[] = $e->getMessage();
}
}
catch (Exception $e)
{
$error[] = _('Database does not exists or can not be accessed');
} }
} }
} }
elseif ($parm['new_settings'] && $parm['new_hostname'] && $parm['new_port'] && $parm['new_user'] && $parm['new_password'] elseif ($parm['new_settings'] && $parm['new_hostname'] && $parm['new_port']
&& $parm['new_user'] && $parm['new_password']
&& $parm['new_dbname'] && $parm['new_data_template']) && $parm['new_dbname'] && $parm['new_data_template'])
{ {
if (p4string::hasAccent($parm['new_dbname'])) if (p4string::hasAccent($parm['new_dbname']))
$error['new_dbname'] = 'No special chars in dbname'; {
$error[] = _('Database name can not contains special characters');
}
if (count($error) === 0) if (count($error) === 0)
{ {
@@ -129,7 +140,7 @@ phrasea::headers();
} }
catch (Exception $e) catch (Exception $e)
{ {
$errors = $e->getMessage(); $error[] = $e->getMessage();
} }
} }
} }
@@ -140,7 +151,7 @@ phrasea::headers();
{ {
if (p4string::hasAccent($parm['new_dbname'])) if (p4string::hasAccent($parm['new_dbname']))
$error['new_dbname'] = 'No special chars in dbname'; $error[] = _('Database name can not contains special characters');
if (count($error) === 0) if (count($error) === 0)
{ {
@@ -156,7 +167,7 @@ phrasea::headers();
catch (Exception $e) catch (Exception $e)
{ {
$appbox->get_connection()->rollBack(); $appbox->get_connection()->rollBack();
$errors = $e->getMessage(); $error[] = $e->getMessage();
} }
} }
} }
@@ -165,7 +176,7 @@ phrasea::headers();
{ {
if (p4string::hasAccent($parm['new_dbname'])) if (p4string::hasAccent($parm['new_dbname']))
$error['new_dbname'] = 'No special chars in dbname'; $error[] = 'No special chars in dbname';
if (count($error) === 0) if (count($error) === 0)
{ {
@@ -174,13 +185,12 @@ phrasea::headers();
$appbox->get_connection()->beginTransaction(); $appbox->get_connection()->beginTransaction();
$base = databox::mount($appbox, $parm['new_hostname'], $parm['new_port'], $parm['new_user'], $parm['new_password'], $parm['new_dbname'], $registry); $base = databox::mount($appbox, $parm['new_hostname'], $parm['new_port'], $parm['new_user'], $parm['new_password'], $parm['new_dbname'], $registry);
$base->registerAdmin($user_obj); $base->registerAdmin($user_obj);
// $createBase = $sbas_id = $base->get_sbas_id();
$appbox->get_connection()->commit(); $appbox->get_connection()->commit();
} }
catch (Exception $e) catch (Exception $e)
{ {
$appbox->get_connection()->rollBack(); $appbox->get_connection()->rollBack();
$errors = $e->getMessage(); $error[] = $e->getMessage() . '@' . $e->getFile() . $e->getLine();
} }
} }
} }
@@ -240,9 +250,18 @@ if ($createBase || $mountBase)
phrasea::redirect('/admin/databases.php'); phrasea::redirect('/admin/databases.php');
} }
} }
?> ?>
</script> </script>
<?php
foreach($error as $e)
{
?>
<span style="background-color:red;color:white;padding:3px"><?php echo $e; ?></span>
<?php
}
?>
<div style="position:relative;float:left;width:100%;"> <div style="position:relative;float:left;width:100%;">
<h2>Bases actuelles :</h2> <h2>Bases actuelles :</h2>
<ul> <ul>
@@ -306,20 +325,20 @@ if ($createBase || $mountBase)
</div> </div>
<div id="server_opts" style="display:none;"> <div id="server_opts" style="display:none;">
<div> <div>
<label><?php echo _('phraseanet:: hostname'); ?></label><input name="new_hostname" value="" type="text"/><span class="error"><?php echo isset($error['new_hostname']) ? $error['new_hostname'] : ''; ?></span> <label><?php echo _('phraseanet:: hostname'); ?></label><input name="new_hostname" value="" type="text"/>
</div> </div>
<div> <div>
<label><?php echo _('phraseanet:: port'); ?></label><input name="new_port" value="3306" type="text"/><span class="error"><?php echo isset($error['new_port']) ? $error['new_port'] : ''; ?></span> <label><?php echo _('phraseanet:: port'); ?></label><input name="new_port" value="3306" type="text"/>
</div> </div>
<div> <div>
<label><?php echo _('phraseanet:: user'); ?></label><input name="new_user" value="" type="text"/><span class="error"><?php echo isset($error['new_user']) ? $error['new_user'] : ''; ?></span> <label><?php echo _('phraseanet:: user'); ?></label><input name="new_user" value="" type="text"/>
</div> </div>
<div> <div>
<label><?php echo _('phraseanet:: password'); ?></label><input name="new_password" value="" type="password"/><span class="error"><?php echo isset($error['new_password']) ? $error['new_password'] : ''; ?></span> <label><?php echo _('phraseanet:: password'); ?></label><input name="new_password" value="" type="password"/>
</div> </div>
</div> </div>
<div> <div>
<label><?php echo _('phraseanet:: dbname'); ?></label><input name="new_dbname" value="" type="text"/><span class="error"><?php echo isset($error['new_dbname']) ? $error['new_dbname'] : ''; ?></span> <label><?php echo _('phraseanet:: dbname'); ?></label><input name="new_dbname" value="" type="text"/>
</div> </div>
<div> <div>
<label><?php echo _('phraseanet:: Modele de donnees'); ?></label> <label><?php echo _('phraseanet:: Modele de donnees'); ?></label>
@@ -358,20 +377,20 @@ if ($createBase || $mountBase)
</div> </div>
<div id="servermount_opts" style="display:none;"> <div id="servermount_opts" style="display:none;">
<div> <div>
<label><?php echo _('phraseanet:: hostname'); ?></label><input name="new_hostname" value="" type="text"/><span class="error"><?php echo isset($error['new_hostname']) ? $error['new_hostname'] : ''; ?></span> <label><?php echo _('phraseanet:: hostname'); ?></label><input name="new_hostname" value="" type="text"/>
</div> </div>
<div> <div>
<label><?php echo _('phraseanet:: port'); ?></label><input name="new_port" value="3306" type="text"/><span class="error"><?php echo isset($error['new_port']) ? $error['new_port'] : ''; ?></span> <label><?php echo _('phraseanet:: port'); ?></label><input name="new_port" value="3306" type="text"/>
</div> </div>
<div> <div>
<label><?php echo _('phraseanet:: user'); ?></label><input name="new_user" value="" type="text"/><span class="error"><?php echo isset($error['new_user']) ? $error['new_user'] : ''; ?></span> <label><?php echo _('phraseanet:: user'); ?></label><input name="new_user" value="" type="text"/>
</div> </div>
<div> <div>
<label><?php echo _('phraseanet:: password'); ?></label><input name="new_password" value="" type="password"/><span class="error"><?php echo isset($error['new_password']) ? $error['new_password'] : ''; ?></span> <label><?php echo _('phraseanet:: password'); ?></label><input name="new_password" value="" type="password"/>
</div> </div>
</div> </div>
<div> <div>
<label><?php echo _('phraseanet:: dbname'); ?></label><input name="new_dbname" value="" type="text"/><span class="error"><?php echo isset($error['new_dbname']) ? $error['new_dbname'] : ''; ?></span> <label><?php echo _('phraseanet:: dbname'); ?></label><input name="new_dbname" value="" type="text"/>
</div> </div>
<div> <div>
<input type="hidden" name="mount_base" value="yes"/> <input type="hidden" name="mount_base" value="yes"/>