Merge pull request #3051 from aternatik/api

Changes into API

htdocs/api/admin/api.php

@@ -3,7 +3,7 @@
  * Copyright (C) 2005-2010	Laurent Destailleur		<eldy@users.sourceforge.org>
  * Copyright (C) 2011		Juanjo Menent			<jmenent@2byte.es>
  * Copyright (C) 2012		Regis Houssin			<regis.houssin@capnetworks.com>
- * Copyright (C) 2015		Regis Houssin			<jfefe@aternatik.fr>
+ * Copyright (C) 2015		Jean-François Ferry     <jfefe@aternatik.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -33,27 +33,22 @@ $langs->load("admin");
 if (! $user->admin)
 	accessforbidden();
 
-$actionsave=GETPOST("save");
+$action=GETPOST("action");
 
-// Sauvegardes parametres
+//Activate ProfId
-if ($actionsave)
+if ($action == 'setproductionmode')
 {
-    $i=0;
+	$status = GETPOST('status','alpha');
 
-    $db->begin();
+	if (dolibarr_set_const($db, 'API_PRODUCTION_MODE', $status, 'chaine', 0, '', $conf->entity) > 0)
-
+	{
-    $i+=dolibarr_set_const($db,'API_KEY',trim(GETPOST("API_KEY")),'chaine',0,'',$conf->entity);
+		header("Location: ".$_SERVER["PHP_SELF"]);
-
+		exit;
-    if ($i >= 1)
+	}
-    {
+	else
-        $db->commit();
+	{
-        setEventMessage($langs->trans("SetupSaved"));
+		dol_print_error($db);
-    }
+	}
-    else
-    {
-        $db->rollback();
-        setEventMessage($langs->trans("Error"), 'errors');
-    }
 }
 
 
@@ -69,7 +64,7 @@ print_fiche_titre($langs->trans("ApiSetup"),$linkback,'title_setup');
 print $langs->trans("ApiDesc")."<br>\n";
 print "<br>\n";
 
-print '<form name="apisetupform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
+//print '<form name="apisetupform" action="'.$_SERVER["PHP_SELF"].'" method="post">';
 print '<input type="hidden" name="token" value="'.$_SESSION['newtoken'].'">';
 print '<table class="noborder" width="100%">';
 
@@ -80,22 +75,24 @@ print "<td>&nbsp;</td>";
 print "</tr>";
 
 print '<tr class="impair">';
-print '<td class="fieldrequired">'.$langs->trans("KeyForApiAccess").'</td>';
+print '<td>'.$langs->trans("ApiProductionMode").'</td>';
-print '<td><input type="text" class="flat" id="API_KEY" name="API_KEY" value="'. (GETPOST('API_KEY')?GETPOST('API_KEY'):(! empty($conf->global->API_KEY)?$conf->global->API_KEY:'')) . '" size="40">';
+$production_mode=(empty($conf->global->API_PRODUCTION_MODE)?false:true);
-if (! empty($conf->use_javascript_ajax))
+if ($production_mode)
-	print '&nbsp;'.img_picto($langs->trans('Generate'), 'refresh', 'id="generate_token" class="linkobject"');
+{
-print '</td>';
+    print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i+1).'&status=0">';
+    print img_picto($langs->trans("Activated"),'switch_on');
+    print '</a></td>';
+}
+else
+{
+    print '<td align="center"><a href="'.$_SERVER['PHP_SELF'].'?action=setproductionmode&value='.($i+1).'&status=1">';
+    print img_picto($langs->trans("Disabled"),'switch_off');
+    print '</a></td>';
+}
 print '<td>&nbsp;</td>';
 print '</tr>';
 
 print '</table>';
-
-print '<br><div class="center">';
-print '<input type="submit" name="save" class="button" value="'.$langs->trans("Save").'">';
-print '</div>';
-
-print '</form>';
-
 print '<br><br>';
 
 // API endpoint
@@ -111,27 +108,9 @@ $url=DOL_MAIN_URL_ROOT.'/public/api/explorer/index.html';
 print img_picto('','object_globe.png').' <a href="'.$url.'" target="_blank">'.$url."</a><br>\n";
 
 print '<br>';
-
-
 print '<br>';
 print $langs->trans("OnlyActiveElementsAreExposed", DOL_URL_ROOT.'/admin/modules.php');
 
-if (! empty($conf->use_javascript_ajax))
-{
-	print "\n".'<script type="text/javascript">';
-	print '$(document).ready(function () {
-            $("#generate_token").click(function() {
-            	$.get( "'.DOL_URL_ROOT.'/core/ajax/security.php", {
-            		action: \'getrandompassword\',
-            		generic: true
-				},
-				function(token) {
-					$("#API_KEY").val(token);
-				});
-            });
-    });';
-	print '</script>';
-}
 
 
 llxFooter();

htdocs/api/class/api.class.php

@@ -43,8 +43,10 @@ class DolibarrApi
      * @param	DoliDb	$db		Database handler
      */
     function __construct($db) {
+        global $conf;
         $this->db = $db;
-        $this->r = new Restler();
+        $production_mode = ( empty($conf->global->API_PRODUCTION_MODE) ? false : true );
+        $this->r = new Restler($production_mode);
     }
 
     /**

htdocs/api/class/api_access.class.php

@@ -52,7 +52,7 @@ class DolibarrApiAccess implements iAuthenticate
 	 * @return bool
 	 * @throws RestException
 	 */
-	public function _isAllowed()
+	public function __isAllowed()
 	{
 		global $db;
 
@@ -114,7 +114,7 @@ class DolibarrApiAccess implements iAuthenticate
 	 * @example Digest
 	 * @example OAuth
 	 */
-	public function _getWWWAuthenticateString()
+	public function __getWWWAuthenticateString()
     {
         return '';
     }

htdocs/langs/en_US/admin.lang

@@ -1564,6 +1564,7 @@ EndPointIs=SOAP clients must send their requests to the Dolibarr endpoint availa
 ApiSetup=API module setup
 ApiDesc=By enabling this module, Dolibarr become a REST server to provide miscellaneous web services.
 KeyForApiAccess=Key to use API (parameter "api_key")
+ApiProductionMode=Enable production mode
 ApiEndPointIs=You can access to the API at url
 ApiExporerIs=You can explore the API at url
 OnlyActiveElementsAreExposed=Only elements from enabled modules are exposed

htdocs/public/api/htaccess.txt

@@ -0,0 +1,15 @@
+#
+# Apache configuration file to use API
+#
+
+DirectoryIndex index.php
+<IfModule mod_rewrite.c>
+    RewriteEngine On
+    RewriteRule ^$ index.php [QSA,L]
+    RewriteCond %{REQUEST_FILENAME} !-f
+    RewriteCond %{REQUEST_FILENAME} !-d
+    RewriteRule ^(.*)$ index.php [QSA,L]
+</IfModule>
+<IfModule mod_php5.c>
+    php_flag display_errors On
+</IfModule>

htdocs/public/api/index.php

@@ -28,8 +28,7 @@
 if (! defined("NOLOGIN"))        define("NOLOGIN",'1');
 
 $res=0;
-if (! $res && file_exists("../../main.inc.php")) $res=@include '../../main.inc.php';
+if (! $res && file_exists("../../main.inc.php")) $res=include '../../main.inc.php';
-if (! $res && file_exists("../../../dolibarr/htdocs/main.inc.php")) $res=@include '../../../dolibarr/htdocs/main.inc.php';     // For custom directory
 if (! $res) die("Include of main fails");
 
 require_once DOL_DOCUMENT_ROOT.'/includes/restler/vendor/autoload.php';
@@ -48,7 +47,6 @@ if (empty($conf->global->MAIN_MODULE_API))
 }
 
 use \Luracast\Restler\Defaults;
-Defaults::setProperty('authenticationMethod','_isAllowed');
 
 $api = new DolibarrApi($db);
 
@@ -113,12 +111,12 @@ foreach ($modulesdir as $dir)
                                 $classname=$reg[1];
                                 $classname = str_replace('Api_','',ucwords($reg[1])).'Api';
                                 require_once $dir_part.$file_searched;
-                                if(class_exists($classname))
+                                if(class_exists($classname)) {
                                     $api->r->addAPIClass($classname,'');
+                                }
                             }
                         }
                     }
-
                 }
             }
         }