From a93dfd9d0adda43d45d7b7d9aa7e89c5802519ec Mon Sep 17 00:00:00 2001
From: Paul Barrett <paul@knowledgetree.com>
Date: Fri, 19 Feb 2010 08:46:21 +0200
Subject: [PATCH] Change includes to requires and move one to top of file

---
 webservice/classes/atompub/cmis/KT_cmis_atom_response.inc.php     | 2 +-
 webservice/classes/atompub/cmis/KT_cmis_atom_responseFeed.inc.php | 2 +-
 webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php       | 3 +--
 webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php   | 8 ++------
 4 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/webservice/classes/atompub/cmis/KT_cmis_atom_response.inc.php b/webservice/classes/atompub/cmis/KT_cmis_atom_response.inc.php
index aaeb22c..2f3319a 100644
--- a/webservice/classes/atompub/cmis/KT_cmis_atom_response.inc.php
+++ b/webservice/classes/atompub/cmis/KT_cmis_atom_response.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include_once(KT_ATOM_LIB_FOLDER.'KT_atom_response.inc.php');
+require_once(KT_ATOM_LIB_FOLDER.'KT_atom_response.inc.php');
 
 class KT_cmis_atom_response extends KT_atom_response {
 
diff --git a/webservice/classes/atompub/cmis/KT_cmis_atom_responseFeed.inc.php b/webservice/classes/atompub/cmis/KT_cmis_atom_responseFeed.inc.php
index b97d4e2..6bb0c29 100644
--- a/webservice/classes/atompub/cmis/KT_cmis_atom_responseFeed.inc.php
+++ b/webservice/classes/atompub/cmis/KT_cmis_atom_responseFeed.inc.php
@@ -1,6 +1,6 @@
 <?php
 
-include_once(KT_ATOM_LIB_FOLDER.'KT_atom_responseFeed.inc.php');
+require_once(KT_ATOM_LIB_FOLDER.'KT_atom_responseFeed.inc.php');
 
 class KT_cmis_atom_responseFeed extends KT_atom_responseFeed {
 
diff --git a/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php b/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php
index de38ebe..83dfec9 100644
--- a/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php
+++ b/webservice/classes/atompub/cmis/KT_cmis_atom_server.inc.php
@@ -1,7 +1,7 @@
 <?php
 
 include_once(KT_ATOM_LIB_FOLDER . 'KT_atom_server.inc.php');
-include_once('RepositoryService.inc.php');
+require_once('RepositoryService.inc.php');
 
 class KT_cmis_atom_server extends KT_atom_server {
 
@@ -45,7 +45,6 @@ class KT_cmis_atom_server extends KT_atom_server {
 		$workspace = strtolower(trim($queryArray[0]));
         if ($workspace == 'servicedocument')
         {
-            include 'services/cmis/RepositoryService.inc.php';
             $RepositoryService = new RepositoryService();
 
             // fetch data for response
diff --git a/webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php b/webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php
index 139614e..c61c94b 100644
--- a/webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php
+++ b/webservice/classes/atompub/cmis/KT_cmis_atom_serviceDoc.inc.php
@@ -43,11 +43,11 @@
  * Includes
  */
 include_once(KT_ATOM_LIB_FOLDER.'KT_atom_serviceDoc.inc.php');
-//include_once('KT_atom_baseDoc.inc.php');
+require_once('RepositoryService.inc.php');
 
 class KT_cmis_atom_serviceDoc extends KT_atom_serviceDoc {
 
-// override and extend as needed
+    // override and extend as needed
 
     public $repositoryInfo = array();
 
@@ -58,11 +58,7 @@ class KT_cmis_atom_serviceDoc extends KT_atom_serviceDoc {
         // get repositoryInfo
         // NOTE currently we only support one repository, which will be the first one found in the repositories.xml config
         // TODO multiple repositories as individual workspaces
-
-        include 'services/cmis/RepositoryService.inc.php';
         $RepositoryService = new RepositoryService();
-        // TODO add auth requirement here, don't want to even supply service doc without auth
-//        $RepositoryService->startSession();
 
         // fetch data for response
         $repositories = $RepositoryService->getRepositories();
--
libgit2 0.21.4