VladPolskiy/dokuwiki-plugin-struct
1
0
Fork 0
mirror of https://github.com/cosmocode/dokuwiki-plugin-struct.git synced 2025-08-06 10:24:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed wrong error message in schema assignment

Browse Source
This commit is contained in:
Andreas Gohr
2016-02-24 16:20:01 +01:00
parent fd81b928af
commit 28e054687d
1 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
admin/assignments.php
View File

@ -45,19 +45,25 @@ class admin_plugin_struct_assignments extends DokuWiki_Admin_Plugin {
*/ */
public function handle() { public function handle() {
global $INPUT; global $INPUT;
global $ID;
$assignments = new Assignments(); $assignments = new Assignments();
if($INPUT->str('action') && $INPUT->arr('assignment') && checkSecurityToken()) { if($INPUT->str('action') && $INPUT->arr('assignment') && checkSecurityToken()) {
$assignment = $INPUT->arr('assignment'); $assignment = $INPUT->arr('assignment');
$ok = false; $ok = true;
if(!blank($assignment['assign']) && !blank($assignment['tbl'])) {
if($INPUT->str('action') === 'delete') { if($INPUT->str('action') === 'delete') {
$ok = $assignments->remove($assignment['assign'], $assignment['tbl']); $ok = $assignments->remove($assignment['assign'], $assignment['tbl']);
} else if($INPUT->str('action') === 'add') { } else if($INPUT->str('action') === 'add') {
$ok = $assignments->add($assignment['assign'], $assignment['tbl']); $ok = $assignments->add($assignment['assign'], $assignment['tbl']);
} }
if(empty($sql) || empty($assignment['assign']) || empty($assignment['tbl']) || !$ok) { }
if(!$ok) {
msg('something went wrong while saving', -1); msg('something went wrong while saving', -1);
} }
send_redirect(wl($ID, array('do' => 'admin', 'page' => 'struct_assignments'), true, '&'));
} }
} }
@ -80,9 +86,7 @@ class admin_plugin_struct_assignments extends DokuWiki_Admin_Plugin {
$ass = new Assignments(); $ass = new Assignments();
$assignments = $ass->getAll(); $assignments = $ass->getAll();
echo '<form action="' . wl($ID) . '" action="post">';
echo '<form action="'.wl($ID).'">';
echo '<input type="hidden" name="do" value="admin" />'; echo '<input type="hidden" name="do" value="admin" />';
echo '<input type="hidden" name="page" value="struct_assignments" />'; echo '<input type="hidden" name="page" value="struct_assignments" />';
echo '<input type="hidden" name="sectok" value="' . getSecurityToken() . '" />'; echo '<input type="hidden" name="sectok" value="' . getSecurityToken() . '" />';
@ -100,14 +104,16 @@ class admin_plugin_struct_assignments extends DokuWiki_Admin_Plugin {
$schema = $assignment['tbl']; $schema = $assignment['tbl'];
$assignee = $assignment['assign']; $assignee = $assignment['assign'];
$link = wl($ID, array( $link = wl(
$ID, array(
'do' => 'admin', 'do' => 'admin',
'page' => 'struct_assignments', 'page' => 'struct_assignments',
'action' => 'delete', 'action' => 'delete',
'sectok' => getSecurityToken(), 'sectok' => getSecurityToken(),
'assignment[tbl]' => $schema, 'assignment[tbl]' => $schema,
'assignment[assign]' => $assignee, 'assignment[assign]' => $assignee,
)); )
);
echo '<tr>'; echo '<tr>';
echo '<td>' . hsc($assignee) . '</td>'; echo '<td>' . hsc($assignee) . '</td>';