Rename api class to solve conflict

htdocs/comm/action/class/api_events.class.php → htdocs/comm/action/class/api_agendaevents.class.php

@@ -26,7 +26,7 @@
  * @access protected 
  * @class  DolibarrApiAccess {@requires user,external}
  */
-class Events extends DolibarrApi
+class AgendaEvents extends DolibarrApi
 {
 
     /**
@@ -167,10 +167,10 @@ class Events extends DolibarrApi
     function post($request_data = NULL)
     {
       if(! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
-			  throw new RestException(401, "Insuffisant rights to create your event");
+			  throw new RestException(401, "Insuffisant rights to create your Agenda Event");
 		  }
       if(! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
-		      throw new RestException(401, "Insuffisant rights to create an event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+		      throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		  }
 		  
         // Check mandatory fields
@@ -206,10 +206,10 @@ class Events extends DolibarrApi
     /*
     function put($id, $request_data = NULL) {
       if(! DolibarrApiAccess::$user->rights->agenda->myactions->create) {
-			  throw new RestException(401, "Insuffisant rights to create your event");
+			  throw new RestException(401, "Insuffisant rights to create your Agenda Event");
 		  }
       if(! DolibarrApiAccess::$user->rights->agenda->allactions->create && DolibarrApiAccess::$user->id != $request_data['userownerid']) {
-		      throw new RestException(401, "Insuffisant rights to create an event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+		      throw new RestException(401, "Insuffisant rights to create an Agenda Event for owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		  }
         
         $result = $this->expensereport->fetch($id);
@@ -241,13 +241,13 @@ class Events extends DolibarrApi
     function delete($id)
     {
         if(! DolibarrApiAccess::$user->rights->agenda->myactions->delete) {
-			  throw new RestException(401, "Insuffisant rights to delete your event");
+			  throw new RestException(401, "Insuffisant rights to delete your Agenda Event");
 		}
         
 		$result = $this->actioncomm->fetch($id);
 		  
         if(! DolibarrApiAccess::$user->rights->agenda->allactions->delete && DolibarrApiAccess::$user->id != $this->actioncomm->userownerid) {
-		      throw new RestException(401, "Insuffisant rights to delete an event of owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
+		      throw new RestException(401, "Insuffisant rights to delete an Agenda Event of owner id ".$request_data['userownerid'].' Your id is '.DolibarrApiAccess::$user->id);
 		}
 		
 		if( ! $result ) {
@@ -265,7 +265,7 @@ class Events extends DolibarrApi
         return array(
             'success' => array(
                 'code' => 200,
-                'message' => 'Agenda event deleted'
+                'message' => 'Agenda Event deleted'
             )
         );
         

test/phpunit/RestAPIUserTest.php

@@ -150,7 +150,7 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
       $url = $this->api_url.'/users/123456789?api_key='.$this->api_key;
       //$addheaders=array('Content-Type: application/json');
       
-      print __METHOD__." Request url=".$url."\n";
+      print __METHOD__." Request GET url=".$url."\n";
       $result=getURLContent($url, 'GET', '', 1, array());
       //print __METHOD__." Result for unexisting user: ".var_export($result, true)."\n";
       print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
@@ -161,7 +161,7 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
       
       $url = $this->api_url.'/users/1?api_key='.$this->api_key;
 
-      print __METHOD__." Request url=".$url."\n";
+      print __METHOD__." Request GET url=".$url."\n";
       $result=getURLContent($url, 'GET', '', 1, array());
       //print __METHOD__." Result for existing user user: ".var_export($result, true)."\n";
       print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
@@ -184,7 +184,7 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
       );
       $body = json_encode($bodyobj);
       
-      print __METHOD__." Request url=".$url."\n";
+      print __METHOD__." Request POST url=".$url."\n";
       $result=getURLContent($url, 'POST', $body, 1, $addheaders);
       //print __METHOD__." Result for creating incomplete user".var_export($result, true)."\n";
       print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
@@ -202,7 +202,7 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
         "email"=>"test@restuser.com"
       );
       $body = json_encode($bodyobj);
-      print __METHOD__." Request url=".$url."\n";
+      print __METHOD__." Request POST url=".$url."\n";
       $result=getURLContent($url, 'POST', $body, 1, $addheaders);
       print __METHOD__." Result code for creating user ".var_export($result, true)."\n";
       print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";
@@ -212,7 +212,7 @@ class RestAPIUserTest extends PHPUnit_Framework_TestCase
       $this->assertGreaterThan(0, $object['id'], $object['error']['code'].' '.$object['error']['message']);
       
       // attempt to create duplicated user
-      print __METHOD__." Request url=".$url."\n";
+      print __METHOD__." Request POST url=".$url."\n";
       $result=getURLContent($url, 'POST', $body, 1, $addheaders);
       //print __METHOD__." Result for creating duplicate user".var_export($result, true)."\n";
       print __METHOD__." curl_error_no: ".$result['curl_error_no']."\n";