From 6e77aa99c4e4a3bbca9ab16675496863066b234f Mon Sep 17 00:00:00 2001 From: Thilina Hasantha Date: Fri, 26 Jul 2019 04:04:32 +0200 Subject: [PATCH] Update google api key setting --- core/migrations/list.php | 1 + .../v20190707_260006_google_map_api.php | 20 +++++++++++++++++++ .../Rest/AttendanceRestEndPoint.php | 10 +++------- 3 files changed, 24 insertions(+), 7 deletions(-) create mode 100644 core/migrations/v20190707_260006_google_map_api.php diff --git a/core/migrations/list.php b/core/migrations/list.php index 980b0064..3e7be1f6 100644 --- a/core/migrations/list.php +++ b/core/migrations/list.php @@ -1,5 +1,6 @@ executeQuery($sql); + } + + public function down(){ + + return true; + } + +} diff --git a/core/src/Attendance/Rest/AttendanceRestEndPoint.php b/core/src/Attendance/Rest/AttendanceRestEndPoint.php index 731856f6..61433d12 100644 --- a/core/src/Attendance/Rest/AttendanceRestEndPoint.php +++ b/core/src/Attendance/Rest/AttendanceRestEndPoint.php @@ -90,9 +90,9 @@ class AttendanceRestEndPoint extends RestEndPoint } if ($user->user_level !== 'Admin' && !PermissionManager::manipulationAllowed( - BaseService::getInstance()->getCurrentProfileId(), - $this->getModelObject($parameter) - ) + BaseService::getInstance()->getCurrentProfileId(), + $this->getModelObject($parameter) + ) ) { return new IceResponse(IceResponse::ERROR, self::RESPONSE_ERR_PERMISSION_DENIED, 403); } @@ -392,13 +392,9 @@ class AttendanceRestEndPoint extends RestEndPoint &markers=color:red%7Clabel:C%7C$location &key=".SettingsManager::getInstance()->getSetting('System: Google Maps Api Key'); - LogManager::getInstance()->info('Url:'.$url); $data = file_get_contents($url); - - //LogManager::getInstance()->info('Data:'.$data); if (!empty($data)) { - //LogManager::getInstance()->info('Data Base64:'.base64_encode($data)); return'data:image/png;base64,' . base64_encode($data); }