remove the require_once lib base from all (or nearly all) files

ajax/activation.php

@@ -7,7 +7,7 @@
  * See the COPYING-README file.
  */
 
-require_once ("../../../lib/base.php");
+ 
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 

ajax/addbook.php

@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../../../lib/base.php');
+ 
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 $book = array(

ajax/addcontact.php

@@ -21,7 +21,7 @@
  */
 
 // Init owncloud
-require_once('../../../lib/base.php');
+ 
 function bailOut($msg) {
 	OC_JSON::error(array('data' => array('message' => $msg)));
 	OC_Log::write('contacts','ajax/addcontact.php: '.$msg, OC_Log::DEBUG);

ajax/addproperty.php

@@ -21,7 +21,7 @@
  */
 
 // Init owncloud
-require_once('../../../lib/base.php');
+ 
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();

ajax/categories/categoriesfor.php

@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../../../../lib/base.php');
+ 
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 

ajax/categories/delete.php

@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../../../../lib/base.php');
+ 
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 

ajax/categories/list.php

@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../../../../lib/base.php');
+ 
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 

ajax/categories/rescan.php

@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../../../../lib/base.php');
+ 
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 

ajax/chooseaddressbook.php

@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../../../lib/base.php');
+ 
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 

ajax/contactdetails.php

@@ -21,7 +21,7 @@
  */
 
 // Init owncloud
-require_once('../../../lib/base.php');
+ 
 function bailOut($msg) {
 	OC_JSON::error(array('data' => array('message' => $msg)));
 	OC_Log::write('contacts','ajax/contactdetails.php: '.$msg, OC_Log::DEBUG);

ajax/contacts.php

@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../../../lib/base.php');
+ 
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 

ajax/createaddressbook.php

@@ -6,7 +6,7 @@
  * later.
  * See the COPYING-README file.
  */
-require_once('../../../lib/base.php');
+ 
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();

ajax/cropphoto.php

@@ -21,7 +21,7 @@
  */
 
 // Init owncloud
-require_once('../../../lib/base.php');
+ 
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();

ajax/deletebook.php

@@ -21,7 +21,7 @@
  */
 
 // Init owncloud
-require_once('../../../lib/base.php');
+ 
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();

ajax/deletecard.php

@@ -26,7 +26,7 @@ function bailOut($msg) {
 }
 
 // Init owncloud
-require_once('../../../lib/base.php');
+ 
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();

ajax/deleteproperty.php

@@ -21,7 +21,7 @@
  */
 
 // Init owncloud
-require_once('../../../lib/base.php');
+ 
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();

ajax/editaddress.php

@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../../../lib/base.php');
+ 
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 

ajax/editaddressbook.php

@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../../../lib/base.php');
+ 
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 $addressbook = OC_Contacts_App::getAddressbook($_GET['bookid']);

ajax/editname.php

@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../../../lib/base.php');
+ 
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');
 function bailOut($msg) {

ajax/getdetails.php

@@ -21,7 +21,7 @@
  */
 
 // Init owncloud
-require_once('../../../lib/base.php');
+ 
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();

ajax/importdialog.php

@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../../../lib/base.php');
+ 
 OC_JSON::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 $tmpl = new OC_Template('contacts', 'part.import');

ajax/loadcard.php

@@ -21,7 +21,7 @@
  */
 
 // Init owncloud
-require_once('../../../lib/base.php');
+ 
 function bailOut($msg) {
 	OC_JSON::error(array('data' => array('message' => $msg)));
 	OC_Log::write('contacts','ajax/loadcard.php: '.$msg, OC_Log::DEBUG);

ajax/loadintro.php

@@ -21,7 +21,7 @@
  */
 
 // Init owncloud
-require_once('../../../lib/base.php');
+ 
 function bailOut($msg) {
 	OC_JSON::error(array('data' => array('message' => $msg)));
 	OC_Log::write('contacts','ajax/loadintro.php: '.$msg, OC_Log::DEBUG);

ajax/loadphoto.php

@@ -20,7 +20,7 @@
  *
  */
 // Init owncloud
-require_once('../../../lib/base.php');
+ 
 // Check if we are a user
 OC_JSON::checkLoggedIn();
 OC_JSON::checkAppEnabled('contacts');

ajax/newcontact.php

@@ -21,7 +21,7 @@
  */
 
 // Init owncloud
-require_once('../../../lib/base.php');
+ 
 function bailOut($msg) {
 	OC_JSON::error(array('data' => array('message' => $msg)));
 	OC_Log::write('contacts','ajax/newcontact.php: '.$msg, OC_Log::DEBUG);

ajax/savecrop.php

@@ -22,7 +22,7 @@
  *       Remember to delete tmp file at some point.
  */
 // Init owncloud
-require_once('../../../lib/base.php');
+ 
 OC_Log::write('contacts','ajax/savecrop.php: Huzzah!!!', OC_Log::DEBUG);
 
 // Check if we are a user

ajax/saveproperty.php

@@ -21,7 +21,7 @@
  */
 
 // Init owncloud
-require_once('../../../lib/base.php');
+ 
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();

ajax/updateaddressbook.php

@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once('../../../lib/base.php');
+ 
 
 // Check if we are a user
 OC_JSON::checkLoggedIn();

ajax/uploadphoto.php

@@ -20,7 +20,7 @@
  *
  */
 // Init owncloud
-require_once('../../../lib/base.php');
+ 
 
 // Check if we are a user
 // Firefox and Konqueror tries to download application/json for me.  --Arthur

carddav.php

@@ -23,7 +23,7 @@
 // Do not load FS ...
 $RUNTIME_NOSETUPFS = true;
 
-require_once('../../lib/base.php');
+
 OC_Util::checkAppEnabled('contacts');
 
 // Backends

dynphoto.php

@@ -21,7 +21,7 @@
  */
 
 // Init owncloud
-require_once('../../lib/base.php');
+
 $tmp_path = $_GET['tmp_path'];
 $maxsize = isset($_GET['maxsize']) ? $_GET['maxsize'] : -1;
 header("Cache-Control: no-cache, no-store, must-revalidate");

export.php

@@ -6,7 +6,7 @@
  * See the COPYING-README file.
  */
 
-require_once ("../../lib/base.php");
+ 
 OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 $bookid = isset($_GET['bookid']) ? $_GET['bookid'] : NULL;

import.php

@@ -7,7 +7,7 @@
  */
 //check for addressbooks rights or create new one
 ob_start();
-require_once ('../../lib/base.php');
+ 
 OC_JSON::checkLoggedIn();
 OC_Util::checkAppEnabled('calendar');
 $nl = "\n";

index.php

@@ -6,7 +6,7 @@
  * later.
  * See the COPYING-README file.
  */
-require_once('../../lib/base.php');
+
 
 // Check if we are a user
 OC_Util::checkLoggedIn();

photo.php

@@ -9,7 +9,7 @@
  */
 
 // Init owncloud
-require_once('../../lib/base.php');
+
 OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');
 

thumbnail.php

@@ -21,7 +21,7 @@
  */
 
 // Init owncloud
-require_once('../../lib/base.php');
+
 OC_JSON::checkLoggedIn();
 //OC_Util::checkLoggedIn();
 OC_Util::checkAppEnabled('contacts');