Commit a93dfd9d0adda43d45d7b7d9aa7e89c5802519ec
1 parent
7261621a
Change includes to requires and move one to top of file
Committed by: Paul Barrett
Showing
4 changed files
with
5 additions
and
10 deletions
webservice/classes/atompub/cmis/KT_cmis_atom_response.inc.php
webservice/classes/atompub/cmis/KT_cmis_atom_responseFeed.inc.php
webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php
| 1 | <?php | 1 | <?php |
| 2 | 2 | ||
| 3 | include_once(KT_ATOM_LIB_FOLDER . 'KT_atom_server.inc.php'); | 3 | include_once(KT_ATOM_LIB_FOLDER . 'KT_atom_server.inc.php'); |
| 4 | -include_once('RepositoryService.inc.php'); | 4 | +require_once('RepositoryService.inc.php'); |
| 5 | 5 | ||
| 6 | class KT_cmis_atom_server extends KT_atom_server { | 6 | class KT_cmis_atom_server extends KT_atom_server { |
| 7 | 7 | ||
| @@ -45,7 +45,6 @@ class KT_cmis_atom_server extends KT_atom_server { | @@ -45,7 +45,6 @@ class KT_cmis_atom_server extends KT_atom_server { | ||
| 45 | $workspace = strtolower(trim($queryArray[0])); | 45 | $workspace = strtolower(trim($queryArray[0])); |
| 46 | if ($workspace == 'servicedocument') | 46 | if ($workspace == 'servicedocument') |
| 47 | { | 47 | { |
| 48 | - include 'services/cmis/RepositoryService.inc.php'; | ||
| 49 | $RepositoryService = new RepositoryService(); | 48 | $RepositoryService = new RepositoryService(); |
| 50 | 49 | ||
| 51 | // fetch data for response | 50 | // fetch data for response |
webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php
| @@ -43,11 +43,11 @@ | @@ -43,11 +43,11 @@ | ||
| 43 | * Includes | 43 | * Includes |
| 44 | */ | 44 | */ |
| 45 | include_once(KT_ATOM_LIB_FOLDER.'KT_atom_serviceDoc.inc.php'); | 45 | include_once(KT_ATOM_LIB_FOLDER.'KT_atom_serviceDoc.inc.php'); |
| 46 | -//include_once('KT_atom_baseDoc.inc.php'); | 46 | +require_once('RepositoryService.inc.php'); |
| 47 | 47 | ||
| 48 | class KT_cmis_atom_serviceDoc extends KT_atom_serviceDoc { | 48 | class KT_cmis_atom_serviceDoc extends KT_atom_serviceDoc { |
| 49 | 49 | ||
| 50 | -// override and extend as needed | 50 | + // override and extend as needed |
| 51 | 51 | ||
| 52 | public $repositoryInfo = array(); | 52 | public $repositoryInfo = array(); |
| 53 | 53 | ||
| @@ -58,11 +58,7 @@ class KT_cmis_atom_serviceDoc extends KT_atom_serviceDoc { | @@ -58,11 +58,7 @@ class KT_cmis_atom_serviceDoc extends KT_atom_serviceDoc { | ||
| 58 | // get repositoryInfo | 58 | // get repositoryInfo |
| 59 | // NOTE currently we only support one repository, which will be the first one found in the repositories.xml config | 59 | // NOTE currently we only support one repository, which will be the first one found in the repositories.xml config |
| 60 | // TODO multiple repositories as individual workspaces | 60 | // TODO multiple repositories as individual workspaces |
| 61 | - | ||
| 62 | - include 'services/cmis/RepositoryService.inc.php'; | ||
| 63 | $RepositoryService = new RepositoryService(); | 61 | $RepositoryService = new RepositoryService(); |
| 64 | - // TODO add auth requirement here, don't want to even supply service doc without auth | ||
| 65 | -// $RepositoryService->startSession(); | ||
| 66 | 62 | ||
| 67 | // fetch data for response | 63 | // fetch data for response |
| 68 | $repositories = $RepositoryService->getRepositories(); | 64 | $repositories = $RepositoryService->getRepositories(); |