Skip to content

Commit

Permalink
updated various references towards restplugin.php to the new api.php
Browse files Browse the repository at this point in the history
  • Loading branch information
Hufschmidt committed Nov 10, 2016
1 parent 676cdd9 commit 2e5163f
Show file tree
Hide file tree
Showing 9 changed files with 14 additions and 15 deletions.
4 changes: 2 additions & 2 deletions RESTController/RESTController.php
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public function __construct($iliasRoot, array $userSettings = array()) {
$this->container->singleton('response', function ($c) { return new libs\RESTResponse(); });
$this->container->singleton('request', function ($c) { return new libs\RESTRequest($this->environment()); });

// Initialize ILIAS (if not created via restplugin.php)
// Initialize ILIAS (if not created via api.php)
$this->initILIAS();

# Configure the logger
Expand Down Expand Up @@ -389,7 +389,7 @@ protected function initResponseFormat() {
* Function: initILIAS()
* Makes sure ILIAS was initialized, eg.
* when this has not already been done
* by the restplugin.php
* by the api.php
*/
protected function initILIAS() {
// Initialize ILIAS (if not created via api.php)
Expand Down
2 changes: 1 addition & 1 deletion RESTController/core/oauth2_v2/models/Authorize.php
Original file line number Diff line number Diff line change
Expand Up @@ -342,7 +342,7 @@ public static function ShowWebsite($app, $param) {
array(
'baseURL' => ILIAS_HTTP_PATH,
'viewURL' => ILIAS_HTTP_PATH . '/' . $pluginDir,
'endpoint' => ILIAS_HTTP_PATH . '/restplugin.php' . $routeURL,
'endpoint' => ILIAS_HTTP_PATH . '/' . $pluginDir . '/api.php' . $routeURL,
'client' => CLIENT_ID,
'parameters' => $param,
)
Expand Down
4 changes: 2 additions & 2 deletions RESTController/extensions/admin_v1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ Examples
---------
Example
> **Retrieve info about an object with ref_id 67 **
curl -X GET http://localhost/restplugin.php/admin/describe/67
curl -X GET http://localhost/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/api.php/admin/describe/67

> ** Retrieve object properties with an obj_id **
curl -X GET http://localhost/restplugin.php/admin//describe/308?id_type=obj_id
curl -X GET http://localhost/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/api.php/admin/describe/308?id_type=obj_id
4 changes: 2 additions & 2 deletions RESTController/extensions/files_v1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Examples
---------
Example
> **Retrieve a file with ref_id 67 **
curl -X GET http://localhost/restplugin.php/v1/files/67 > x.pdf
curl -X GET http://localhost/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/api.php/v1/files/67 > x.pdf
> ** Add a file to repository object with ref_id 65 (e.g. a course) **
curl --form uploadfile=@image.jpg --form ref_id=65 http://localhost/restplugin.php/v1/files
curl --form uploadfile=@image.jpg --form ref_id=65 http://localhost/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/api.php/v1/files
6 changes: 3 additions & 3 deletions RESTController/extensions/mobile_v1/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ The goal is to provide additional REST endpoints for a mobile app.
* todo

#### Notes
Mobile Search:
Mobile Search:
For the installation of Elastic Search and the River Connector please refer to:
https://github.com/jprante/elasticsearch-river-jdbc

Expand All @@ -31,11 +31,11 @@ Examples
---------
Example
> **Retrieve info about an object with ref_id 67 **
curl -K token --data "q=Test" -X POST http://localhost/ilias5/restplugin.php/m/v1/search
curl -K token --data "q=Test" -X POST http://localhost/ilias5/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/api.php/m/v1/search

#### History:
v0.2 - 2014-12 Mobile Search --
v0.1 - 2014-07 INIT

##### Authors:
Dirk Schaefer <schaefer at hrz.uni-marburg.de>
Dirk Schaefer <schaefer at hrz.uni-marburg.de>
2 changes: 1 addition & 1 deletion RESTController/libs/RESTilias.php
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ public static function initILIAS($client = null) {
* Function: FetchILIASClient()
* Returns the current ILIAS Client-ID. This cannot be changed
* and can only be controlled by setting $_GET['ilias_client_id']
* (see restplugin.php) or via $_COOKIE['client_id'] (See ilInitialize)
* (see RESTController.php) or via $_COOKIE['client_id'] (See ilInitialize)
*
* Return:
* <String> - ILIAS Client-ID (fixed)
Expand Down
2 changes: 1 addition & 1 deletion tools/RESTClient/restsystemclient.ini.default
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
; ILIAS REST System Client - Configuration File
; by D.Schaefer
host = "http://localhost/ilias5/restplugin.php"
host = "http://localhost/ilias5/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/api.php"
oauth2_endpoint = "/v2/oauth2/token"

; Please do not change grant_type - at current the tool only supports this type.
Expand Down
3 changes: 1 addition & 2 deletions tools/codeception/tests/api.suite.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,4 @@ modules:
PhpBrowser:
url: http://localhost/ilias5/
REST:
url: http://localhost/ilias5/restplugin.php/

url: http://localhost/ilias5/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/api.php/
2 changes: 1 addition & 1 deletion tools/shell/ishell.ini.default
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ oauth2_endpoint=/v2/oauth2/token

[System]
ilias_client_id=beta
rest_endpoint=http://localhost/ilias5/restplugin.php
rest_endpoint=http://localhost/ilias5/Customizing/global/plugins/Services/UIComponent/UserInterfaceHook/REST/api.php

0 comments on commit 2e5163f

Please sign in to comment.