From 86c22359b295314dee85650b4e2e2078dee11d32 Mon Sep 17 00:00:00 2001 From: disc5 Date: Tue, 3 May 2016 13:09:33 +0200 Subject: [PATCH] Updated success parameters --- .../extensions/admin_v1/routes/DesktopAdminRoutes.php | 8 ++++---- .../extensions/courses_v1/routes/CourseRoutes.php | 6 +++--- .../extensions/desktop_v1/routes/DesktopRoutes.php | 4 ++-- .../extensions/mobile_v1/routes/FeedbackRoutes.php | 4 ++-- .../extensions/mobile_v1/routes/MobileFileSpaceRoutes.php | 2 +- .../extensions/users_v1/routes/UsersRoutes.php | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/admin_v1/routes/DesktopAdminRoutes.php b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/admin_v1/routes/DesktopAdminRoutes.php index a5c947d2..c318c16a 100644 --- a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/admin_v1/routes/DesktopAdminRoutes.php +++ b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/admin_v1/routes/DesktopAdminRoutes.php @@ -26,8 +26,8 @@ if ($authorizedUserId == $id || Libs\RESTilias::isAdmin($authorizedUserId)) { // only the user or the admin is allowed to access the data $model = new Desktop\DesktopModel(); $data = $model->getPersonalDesktopItems($id); - - $app->success($data); + $ret = array("content" => $data); + $app->success($ret); } else $app->halt(401, Libs\OAuth2Middleware::MSG_NO_ADMIN, Libs\OAuth2Middleware::ID_NO_ADMIN); @@ -44,7 +44,7 @@ $model = new Desktop\DesktopModel(); $model->removeItemFromDesktop($id, $ref_id); - $app->success("Removed item with ref_id=".$ref_id." from desktop."); + $app->success(array("msg"=>"Removed item with ref_id=".$ref_id." from desktop.")); } catch (\Exception $e) { $app->halt(500, "Error: ".$e->getMessage(), -15); } @@ -61,7 +61,7 @@ $model = new Desktop\DesktopModel(); $model->addItemToDesktop($id, $ref_id); - $app->success("Added item with ref_id=".$ref_id." to the desktop."); + $app->success(array("msg"=>"Added item with ref_id=".$ref_id." to the desktop.")); } catch (\Exception $e) { $app->halt(500, "Error: ".$e->getMessage(), -15); } diff --git a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/courses_v1/routes/CourseRoutes.php b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/courses_v1/routes/CourseRoutes.php index 56a39802..a242210c 100644 --- a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/courses_v1/routes/CourseRoutes.php +++ b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/courses_v1/routes/CourseRoutes.php @@ -105,7 +105,7 @@ $app->success($soap_result); } else { - $app->success("No Permission."); + $app->success(array("msg"=>"No Permission.")); } }); @@ -153,9 +153,9 @@ } if($mode == "by_login") - $app->success("Enrolled user $login to course with id $crs_ref_id"); + $app->success(array("msg"=>"Enrolled user $login to course with id $crs_ref_id")); else - $app->success("Enrolled user with id $user_id to course with id $crs_ref_id"); + $app->success(array("msg"=>"Enrolled user with id $user_id to course with id $crs_ref_id")); }); /** diff --git a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/desktop_v1/routes/DesktopRoutes.php b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/desktop_v1/routes/DesktopRoutes.php index 6f22e495..026416c6 100644 --- a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/desktop_v1/routes/DesktopRoutes.php +++ b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/desktop_v1/routes/DesktopRoutes.php @@ -40,7 +40,7 @@ $ref_id = $request->params("ref_id"); $model = new DesktopModel(); $model->removeItemFromDesktop($authorizedUserId, $ref_id); - $app->success("Removed item with ref_id=".$ref_id." from desktop."); + $app->success(array("msg"=>"Removed item with ref_id=".$ref_id." from desktop.")); } catch (Libs\DeleteFailed $e) { $app->halt(401, "Error: ".$e->getFormatedMessage(), -15); } @@ -58,7 +58,7 @@ $ref_id = $request->params("ref_id"); $model = new DesktopModel(); $model->addItemToDesktop($authorizedUserId, $ref_id); - $app->success("Added item with ref_id=".$ref_id." to the desktop."); + $app->success(array("msg"=>"Added item with ref_id=".$ref_id." to the desktop.")); } catch (Libs\UpdateFailed $e) { $app->halt(401, "Error: ".$e->getFormatedMessage(), -15); } diff --git a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/mobile_v1/routes/FeedbackRoutes.php b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/mobile_v1/routes/FeedbackRoutes.php index 4dd06c3a..4844af84 100644 --- a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/mobile_v1/routes/FeedbackRoutes.php +++ b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/mobile_v1/routes/FeedbackRoutes.php @@ -87,9 +87,9 @@ $model = new MobileFeedbackModel(); $hasCreated = $model->createMobileFeedbackDatabaseTable(); if ($hasCreated == true) { - $app->success("Created new feedback database."); + $app->success(array("msg"=>"Created new feedback database.")); } else { - $app->success("Feedback database already exists. Nothing changed."); + $app->success(array("msg"=>"Feedback database already exists. Nothing changed.")); } }); diff --git a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/mobile_v1/routes/MobileFileSpaceRoutes.php b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/mobile_v1/routes/MobileFileSpaceRoutes.php index dfaa63f5..9a1fab19 100644 --- a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/mobile_v1/routes/MobileFileSpaceRoutes.php +++ b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/mobile_v1/routes/MobileFileSpaceRoutes.php @@ -84,7 +84,7 @@ if ($status == false) { $app->halt(500, 'File could not be copied!'); } else { - $app->success("Moved item from personal file space to repository."); + $app->success(array("msg"=>"Moved item from personal file space to repository.")); } } catch(Exceptions\MissingParameter $e) { $app->halt(400, $e->getFormatedMessage(), $e::ID); diff --git a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/users_v1/routes/UsersRoutes.php b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/users_v1/routes/UsersRoutes.php index 5e4540e4..2aa127e5 100644 --- a/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/users_v1/routes/UsersRoutes.php +++ b/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/RESTController/extensions/users_v1/routes/UsersRoutes.php @@ -88,7 +88,7 @@ } } } - $app->success('Empty result.'); + $app->success(array("msg"=>"Empty result.")); }); /** @@ -169,7 +169,7 @@ $status = $usr_model->deleteUser($user_id); if ($status) { - $app->success(200,"User with id $user_id deleted."); + $app->success(array("msg"=>"User with id $user_id deleted.")); } else { $app->halt(404, "Could not delete user " . $user_id . "."); }