fixed admin detection on server side, incremented the version number

Author: puthre

appinfo/info.xml

@@ -5,7 +5,7 @@
     <name>Time Tracker</name>
     <summary>Time Tracker App</summary>
     <description><![CDATA[Time Tracker App]]></description>
-    <version>0.0.17</version>
+    <version>0.0.18</version>
     <licence>agpl</licence>
     <author mail="[email protected]" >MTier Ltd.</author>
     <namespace>TimeTracker</namespace>

lib/Controller/AjaxController.php

@@ -111,6 +111,10 @@ public function workIntervals() {
 	}
 
 
+	public function isAdminUser(){
+		return \OC_User::isAdminUser(\OC_User::getUser());
+	}
+
 	/**
 	 *
 	 * @NoAdminRequired
@@ -366,7 +370,7 @@ public function addProject($name) {
 			$p->setClientId($clientId);
 			$this->projectMapper->insert($p);
 		} else {
-			if($p->locked && $this->userId != 'admin'){
+			if($p->locked && !$this->isAdminUser()){
 				return new JSONResponse(["Error" => "This project is locked"]);
 			}
 		}
@@ -474,7 +478,7 @@ public function getProjects(){
 	 * @NoCSRFRequired
 	 */
 	public function getProjectsTable(){
-		if ($this->userId == 'admin'){
+		if ($this->isAdminUser()){
 			$projects = $this->projectMapper->findAllAdmin();
 		} else {
 			$projects = $this->projectMapper->findAll($this->userId);
@@ -519,8 +523,7 @@ public function addTag($name) {
 			$c->setUserUid($this->userId);
 			$c->setCreatedAt(time());
 			$this->tagMapper->insert($c);
-		}
-		if ($c != null){
+		} else 	if ($c != null){
 			return new JSONResponse(["Error" => "This tag name already exists"]);
 		}
 
@@ -612,7 +615,8 @@ public function getReport(){
 			$name = $this->userId;
 		}
 
-		if($this->userId != 'admin'){
+		
+		if($this->isAdminUser()){
 			$allowedClients =  $this->clientMapper->findAll($this->userId);
 			$allowedClientsId = array_map(function($client){ return $client->id;}, $allowedClients );
 			if(empty($filterClientId)){