From c7d80e8dd4e3f2a5d6423bcc28dfa4506507ec79 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Fri, 14 Jun 2013 10:27:17 +0200 Subject: [PATCH] more splash messages --- languages/en_GB/lang.inc | 12 ++++++++++++ op/op.AttributeMgr.php | 14 ++++++++++++-- op/op.GroupMgr.php | 25 +++++++++++++++++++------ op/op.UsrMgr.php | 5 ++++- 4 files changed, 47 insertions(+), 9 deletions(-) diff --git a/languages/en_GB/lang.inc b/languages/en_GB/lang.inc index 8cbbb03c4..4bf28f9a0 100644 --- a/languages/en_GB/lang.inc +++ b/languages/en_GB/lang.inc @@ -786,15 +786,27 @@ $text = array( 'sign_out' => "Sign out", 'sign_out_user' => "Sign out user", 'space_used_on_data_folder' => "Space used on data folder", +'splash_add_attribute' => "New attribute added", +'splash_add_group' => "New group added", +'splash_add_group_member' => "New group member added", +'splash_add_user' => "New user added", 'splash_added_to_clipboard' => "Added to clipboard", 'splash_cleared_clipboard' => "Clipboard cleared", 'splash_document_edited' => "Document saved", 'splash_document_locked' => "Document locked", 'splash_document_unlocked' => "Document unlocked", +'splash_edit_attribute' => "Attribute saved", +'splash_edit_group' => "Group saved", +'splash_edit_user' => "User saved", 'splash_folder_edited' => "Save folder changes", 'splash_invalid_folder_id' => "Invalid folder ID", 'splash_moved_clipboard' => "Clipboard moved into current folder", 'splash_removed_from_clipboard' => "Removed from clipboard", +'splash_rm_attribute' => "Attribute removed", +'splash_rm_group' => "Group removed", +'splash_rm_group_member' => "Member of group removed", +'splash_rm_user' => "User removed", +'splash_toogle_group_manager' => "Group manager toogled", 'splash_settings_saved' => "Settings saved", 'splash_substituted_user' => "Substituted user", 'splash_switched_back_user' => "Switched back to original user", diff --git a/op/op.AttributeMgr.php b/op/op.AttributeMgr.php index 236d54a07..1a3d56495 100644 --- a/op/op.AttributeMgr.php +++ b/op/op.AttributeMgr.php @@ -63,6 +63,10 @@ if ($action == "addattrdef") { UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); } $attrdefid=$newAttrdef->getID(); + + $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_attribute'))); + + add_log_line("&action=addattrdef&name=".$name); } // delet attribute definition ----------------------------------------------- @@ -85,6 +89,10 @@ else if ($action == "removeattrdef") { if (!$attrdef->remove()) { UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); } + $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_attribute'))); + + add_log_line("&action=removeattrdef&attrdefid=".$attrdefid); + $attrdefid=-1; } @@ -140,9 +148,11 @@ else if ($action == "editattrdef") { if (!$attrdef->setRegex($regex)) { UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); } -} -else { + $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_attribute'))); + + add_log_line("&action=editattrdef&attrdefid=".$attrdefid); +} else { UI::exitError(getMLText("admin_tools"),getMLText("unknown_command")); } diff --git a/op/op.GroupMgr.php b/op/op.GroupMgr.php index 61a9f4acd..95cfe1e74 100644 --- a/op/op.GroupMgr.php +++ b/op/op.GroupMgr.php @@ -55,7 +55,9 @@ if ($action == "addgroup") { $groupid=$newGroup->getID(); - add_log_line(); + $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_group'))); + + add_log_line("&action=addgroup&name=".$name); } // Delete group ------------------------------------------------------------- @@ -80,7 +82,10 @@ else if ($action == "removegroup") { } $groupid = ''; - add_log_line(".php?groupid=".$_POST["groupid"]."&action=removegroup"); + + $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_group'))); + + add_log_line("?groupid=".$_POST["groupid"]."&action=removegroup"); } // Modifiy group ------------------------------------------------------------ @@ -110,7 +115,9 @@ else if ($action == "editgroup") { if ($group->getComment() != $comment) $group->setComment($comment); - add_log_line(); + $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_group'))); + + add_log_line("?groupid=".$_POST["groupid"]."&action=editgroup"); } // Add user to group -------------------------------------------------------- @@ -146,7 +153,9 @@ else if ($action == "addmember") { if (isset($_POST["manager"])) $group->toggleManager($newMember); } - add_log_line(".php?groupid=".$groupid."&userid=".$_POST["userid"]."&action=addmember"); + $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_group_member'))); + + add_log_line("?groupid=".$groupid."&userid=".$_POST["userid"]."&action=addmember"); } // Remove user from group -------------------------------------------------- @@ -179,7 +188,9 @@ else if ($action == "rmmember") { $group->removeUser($oldMember); - add_log_line(); + $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_group_member'))); + + add_log_line("?groupid=".$groupid."&userid=".$_POST["userid"]."&action=rmmember"); } // toggle manager flag @@ -212,7 +223,9 @@ else if ($action == "tmanager") { $group->toggleManager($usertoedit); - add_log_line(); + $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_toogle_group_manager'))); + + add_log_line("?groupid=".$groupid."&userid=".$_POST["userid"]."&action=tmanager"); } header("Location:../out/out.GroupMgr.php?groupid=".$groupid); diff --git a/op/op.UsrMgr.php b/op/op.UsrMgr.php index edbf9d39a..e05d01aad 100644 --- a/op/op.UsrMgr.php +++ b/op/op.UsrMgr.php @@ -116,6 +116,8 @@ if ($action == "adduser") { $userid=$newUser->getID(); + $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_add_user'))); + add_log_line(".php&action=adduser&login=".$login); } @@ -158,6 +160,7 @@ else if ($action == "removeuser") { add_log_line(".php&action=removeuser&userid=".$userid); + $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_rm_user'))); $userid=-1; } @@ -289,8 +292,8 @@ else if ($action == "edituser") { $group->removeUser($editedUser); } + $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_edit_user'))); add_log_line(".php&action=edituser&userid=".$userid); - } else UI::exitError(getMLText("admin_tools"),getMLText("unknown_command"));