deon/phpldapadmin
1
0
Fork 0
Code Issues 36 Pull Requests Packages Projects Releases Wiki Activity

Fix deletion special char DNs, and refresh tree on delete

Browse Source
This commit is contained in:
Deon George 2011-05-04 00:02:33 +10:00
parent 66e24fb86c
commit 6c93c1fc72
3 changed files with 21 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/create_confirm.php
View File

@ -82,7 +82,7 @@ if (count($request['template']->getLDAPadd(true))) {
echo "\n\n"; echo "\n\n";
$counter = 0; $counter = 0;
printf('<tr class="%s"><td colspan="3" style="text-align: center;"><b>%s</b></td></tr>',$counter%2 ? 'even' : 'odd',$request['template']->getDN()); printf('<tr class="%s"><td colspan="3" style="text-align: center;"><b>%s</b></td></tr>',$counter%2 ? 'even' : 'odd',htmlspecialchars($request['template']->getDN()));
foreach ($request['template']->getLDAPadd(true) as $attribute) { foreach ($request['template']->getLDAPadd(true) as $attribute) {
$counter++; $counter++;

11
htdocs/delete.php
View File

@ -21,13 +21,18 @@ if (! $app['server']->dnExists($request['dn']))
# Delete the entry. # Delete the entry.
$result = $app['server']->delete($request['dn']); $result = $app['server']->delete($request['dn']);
if ($result) if ($result) {
$redirect_url = '';
if (isAjaxEnabled())
$redirect_url .= sprintf('&refresh=SID_%s_nodes&noheader=1',$app['server']->getIndex());
system_message(array( system_message(array(
'title'=>_('Delete DN'), 'title'=>_('Delete DN'),
'body'=>_('Successfully deleted DN ').sprintf('<b>%s</b>',$request['dn']), 'body'=>_('Successfully deleted DN ').sprintf('<b>%s</b>',$request['dn']),
'type'=>'info'), 'type'=>'info'),
sprintf('index.php?server_id=%s',$app['server']->getIndex())); sprintf('index.php?server_id=%s%s',$app['server']->getIndex(),$redirect_url));
else } else
system_message(array( system_message(array(
'title'=>_('Could not delete the entry.').sprintf(' (%s)',pretty_print_dn($request['dn'])), 'title'=>_('Could not delete the entry.').sprintf(' (%s)',pretty_print_dn($request['dn'])),
'body'=>ldap_error_msg($app['server']->getErrorMessage(null),$app['server']->getErrorNum(null)), 'body'=>ldap_error_msg($app['server']->getErrorMessage(null),$app['server']->getErrorNum(null)),

19
htdocs/delete_form.php
View File

@ -15,6 +15,11 @@ require './common.php';
$request = array(); $request = array();
$request['dn'] = get_request('dn','GET'); $request['dn'] = get_request('dn','GET');
$request['page'] = new PageRender($app['server']->getIndex(),get_request('template','REQUEST',false,'none'));
$request['page']->setDN($request['dn']);
$request['page']->accept();
$request['template'] = $request['page']->getTemplate();
# Check if the entry exists. # Check if the entry exists.
if (! $request['dn'] || ! $app['server']->dnExists($request['dn'])) if (! $request['dn'] || ! $app['server']->dnExists($request['dn']))
system_message(array( system_message(array(
@ -25,7 +30,7 @@ if (! $request['dn'] || ! $app['server']->dnExists($request['dn']))
# We search all children, not only the visible children in the tree # We search all children, not only the visible children in the tree
$request['children'] = $app['server']->getContainerContents($request['dn'],null,0,'(objectClass=*)',LDAP_DEREF_NEVER); $request['children'] = $app['server']->getContainerContents($request['dn'],null,0,'(objectClass=*)',LDAP_DEREF_NEVER);
printf('<h3 class="title">%s %s</h3>',_('Delete'),get_rdn($request['dn'])); printf('<h3 class="title">%s %s</h3>',_('Delete'),htmlspecialchars(get_rdn($request['dn'])));
printf('<h3 class="subtitle">%s: <b>%s</b> &nbsp;&nbsp;&nbsp; %s: <b>%s</b></h3>', printf('<h3 class="subtitle">%s: <b>%s</b> &nbsp;&nbsp;&nbsp; %s: <b>%s</b></h3>',
_('Server'),$app['server']->getName(),_('Distinguished Name'),$request['dn']); _('Server'),$app['server']->getName(),_('Distinguished Name'),$request['dn']);
echo "\n"; echo "\n";
@ -70,7 +75,7 @@ if (count($request['children'])) {
echo '<form action="cmd.php" method="post" id="delete_form">'; echo '<form action="cmd.php" method="post" id="delete_form">';
echo '<input type="hidden" name="cmd" value="rdelete" />'; echo '<input type="hidden" name="cmd" value="rdelete" />';
printf('<input type="hidden" name="server_id" value="%s" />',$app['server']->getIndex()); printf('<input type="hidden" name="server_id" value="%s" />',$app['server']->getIndex());
printf('<input type="hidden" name="dn" value="%s" />',htmlspecialchars($request['dn'])); printf('<input type="hidden" name="dn" value="%s" />',$request['template']->getDNEncode(false));
//@todo need to refresh the tree after a delete //@todo need to refresh the tree after a delete
printf('<input type="submit" value="%s" %s />', printf('<input type="submit" value="%s" %s />',
sprintf(_('Delete all %s objects'),count($request['search'])), sprintf(_('Delete all %s objects'),count($request['search'])),
@ -82,10 +87,10 @@ if (count($request['children'])) {
echo '<form action="cmd.php" method="get">'; echo '<form action="cmd.php" method="get">';
echo '<input type="hidden" name="cmd" value="template_engine" />'; echo '<input type="hidden" name="cmd" value="template_engine" />';
printf('<input type="hidden" name="server_id" value="%s" />',$app['server']->getIndex()); printf('<input type="hidden" name="server_id" value="%s" />',$app['server']->getIndex());
printf('<input type="hidden" name="dn" value="%s" />',htmlspecialchars($request['dn'])); printf('<input type="hidden" name="dn" value="%s" />',$request['template']->getDNEncode(false));
printf('<input type="submit" name="submit" value="%s" %s />', printf('<input type="submit" name="submit" value="%s" %s />',
_('Cancel'), _('Cancel'),
(isAjaxEnabled() ? sprintf('onclick="return ajDISPLAY(\'BODY\',\'cmd=template_engine&server_id=%s&dn=%s\',\'%s\');"',$app['server']->getIndex(),htmlspecialchars($request['dn']),_('Retrieving DN')) : '')); (isAjaxEnabled() ? sprintf('onclick="return ajDISPLAY(\'BODY\',\'cmd=template_engine&server_id=%s&dn=%s\',\'%s\');"',$app['server']->getIndex(),$request['template']->getDNEncode(),_('Retrieving DN')) : ''));
echo '</form>'; echo '</form>';
echo '</td>'; echo '</td>';
echo '</tr>'; echo '</tr>';
@ -122,7 +127,7 @@ if (count($request['children'])) {
echo '<form action="cmd.php" method="post" id="delete_form">'; echo '<form action="cmd.php" method="post" id="delete_form">';
echo '<input type="hidden" name="cmd" value="delete" />'; echo '<input type="hidden" name="cmd" value="delete" />';
printf('<input type="hidden" name="server_id" value="%s" />',$app['server']->getIndex()); printf('<input type="hidden" name="server_id" value="%s" />',$app['server']->getIndex());
printf('<input type="hidden" name="dn" value="%s" />',htmlspecialchars($request['dn'])); printf('<input type="hidden" name="dn" value="%s" />',$request['template']->getDNEncode(false));
//@todo need to refresh the tree after a delete //@todo need to refresh the tree after a delete
printf('<input type="submit" name="submit" value="%s" %s />', printf('<input type="submit" name="submit" value="%s" %s />',
_('Delete'), _('Delete'),
@ -135,10 +140,10 @@ if (count($request['children'])) {
echo '<form action="cmd.php" method="get">'; echo '<form action="cmd.php" method="get">';
echo '<input type="hidden" name="cmd" value="template_engine" />'; echo '<input type="hidden" name="cmd" value="template_engine" />';
printf('<input type="hidden" name="server_id" value="%s" />',$app['server']->getIndex()); printf('<input type="hidden" name="server_id" value="%s" />',$app['server']->getIndex());
printf('<input type="hidden" name="dn" value="%s" />',htmlspecialchars($request['dn'])); printf('<input type="hidden" name="dn" value="%s" />',$request['template']->getDNEncode(false));
printf('<input type="submit" name="submit" value="%s" %s />', printf('<input type="submit" name="submit" value="%s" %s />',
_('Cancel'), _('Cancel'),
(isAjaxEnabled() ? sprintf('onclick="return ajDISPLAY(\'BODY\',\'cmd=template_engine&server_id=%s&dn=%s\',\'%s\');"',$app['server']->getIndex(),htmlspecialchars($request['dn']),_('Retrieving DN')) : '')); (isAjaxEnabled() ? sprintf('onclick="return ajDISPLAY(\'BODY\',\'cmd=template_engine&server_id=%s&dn=%s\',\'%s\');"',$app['server']->getIndex(),$request['template']->getDNEncode(),_('Retrieving DN')) : ''));
echo '</form>'; echo '</form>';
echo '</td>'; echo '</td>';