From e68432403288e4f7fb9e84ac0a2ca3629fb17a9e Mon Sep 17 00:00:00 2001
From: Zach Prezkuta <fermion@gmx.com>
Date: Fri, 28 Dec 2012 14:51:50 -0700
Subject: [PATCH] use explicit include paths

---
 include/api.php          | 10 +++++-----
 include/conversation.php |  2 +-
 include/cronhooks.php    |  2 +-
 include/delivery.php     |  6 +++---
 include/directory.php    |  2 +-
 include/enotify.php      |  2 +-
 include/expire.php       |  2 +-
 include/follow.php       |  2 +-
 include/gprobe.php       |  2 +-
 include/html2plain.php   |  2 +-
 include/items.php        |  4 ++--
 include/notifier.php     |  6 +++---
 include/onepoll.php      |  2 +-
 include/poller.php       |  2 +-
 include/queue.php        |  6 +++---
 index.php                |  4 ++--
 mod/_well_known.php      |  4 ++--
 mod/content.php          |  2 +-
 mod/crepair.php          |  2 +-
 mod/dfrn_confirm.php     |  2 +-
 mod/dfrn_request.php     |  4 ++--
 mod/editpost.php         |  2 +-
 mod/follow.php           |  2 +-
 mod/install.php          |  4 ++--
 mod/profile_photo.php    |  2 +-
 mod/share.php            |  2 +-
 mod/tagrm.php            |  2 +-
 mod/wall_upload.php      |  2 +-
 util/db_update.php       |  2 +-
 29 files changed, 44 insertions(+), 44 deletions(-)

diff --git a/include/api.php b/include/api.php
index 667629e139..03514ecd58 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1,9 +1,9 @@
 <?php
-	require_once("bbcode.php");
-	require_once("datetime.php");
-	require_once("conversation.php");
-	require_once("oauth.php");
-	require_once("html2plain.php");
+	require_once("include/bbcode.php");
+	require_once("include/datetime.php");
+	require_once("include/conversation.php");
+	require_once("include/oauth.php");
+	require_once("include/html2plain.php");
 	/*
 	 * Twitter-Like API
 	 *
diff --git a/include/conversation.php b/include/conversation.php
index 1f416f352c..9420d8b74a 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -369,7 +369,7 @@ if(!function_exists('conversation')) {
 function conversation(&$a, $items, $mode, $update, $preview = false) {
 
 
-	require_once('bbcode.php');
+	require_once('include/bbcode.php');
 
 	$ssl_state = ((local_user()) ? true : false);
 
diff --git a/include/cronhooks.php b/include/cronhooks.php
index 27cf642b22..6aa0721363 100644
--- a/include/cronhooks.php
+++ b/include/cronhooks.php
@@ -12,7 +12,7 @@ function cronhooks_run(&$argv, &$argc){
   
 	if(is_null($db)) {
 	    @include(".htconfig.php");
-    	require_once("dba.php");
+    	require_once("include/dba.php");
 	    $db = new dba($db_host, $db_user, $db_pass, $db_data);
     	unset($db_host, $db_user, $db_pass, $db_data);
   	};
diff --git a/include/delivery.php b/include/delivery.php
index fcb0ee47b9..d89cded9eb 100644
--- a/include/delivery.php
+++ b/include/delivery.php
@@ -12,13 +12,13 @@ function delivery_run(&$argv, &$argc){
 
 	if(is_null($db)) {
 		@include(".htconfig.php");
-		require_once("dba.php");
+		require_once("include/dba.php");
 		$db = new dba($db_host, $db_user, $db_pass, $db_data);
 		        unset($db_host, $db_user, $db_pass, $db_data);
 	}
 
-	require_once("session.php");
-	require_once("datetime.php");
+	require_once("include/session.php");
+	require_once("include/datetime.php");
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
 	require_once('include/diaspora.php');
diff --git a/include/directory.php b/include/directory.php
index 29a793a2a0..5c1a7c4b4c 100644
--- a/include/directory.php
+++ b/include/directory.php
@@ -10,7 +10,7 @@ function directory_run(&$argv, &$argc){
   
 	if(is_null($db)) {
 		@include(".htconfig.php");
-		require_once("dba.php");
+		require_once("include/dba.php");
 		$db = new dba($db_host, $db_user, $db_pass, $db_data);
 				unset($db_host, $db_user, $db_pass, $db_data);
 	};
diff --git a/include/enotify.php b/include/enotify.php
index b4331f0926..ba947a9bf9 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -310,7 +310,7 @@ function notification($params) {
 
 	// send email notification if notification preferences permit
 
-	require_once('bbcode.php');
+	require_once('include/bbcode.php');
 	if((intval($params['notify_flags']) & intval($params['type'])) || $params['type'] == NOTIFY_SYSTEM) {
 
 		logger('notification: sending notification email');
diff --git a/include/expire.php b/include/expire.php
index 373ebf55fe..4c6fb7a19d 100644
--- a/include/expire.php
+++ b/include/expire.php
@@ -11,7 +11,7 @@ function expire_run(&$argv, &$argc){
   
 	if(is_null($db)) {
 	    @include(".htconfig.php");
-    	require_once("dba.php");
+    	require_once("include/dba.php");
 	    $db = new dba($db_host, $db_user, $db_pass, $db_data);
     	unset($db_host, $db_user, $db_pass, $db_data);
   	};
diff --git a/include/follow.php b/include/follow.php
index b4d1732b88..59f3b1a5fc 100644
--- a/include/follow.php
+++ b/include/follow.php
@@ -218,7 +218,7 @@ function new_contact($uid,$url,$interactive = false) {
 		group_add_member($uid,'',$contact_id,$g[0]['def_gid']);
 	}
 
-	require_once("Photo.php");
+	require_once("include/Photo.php");
 
 	$photos = import_profile_photo($ret['photo'],$uid,$contact_id);
 
diff --git a/include/gprobe.php b/include/gprobe.php
index 88e6bad4a4..0cf32e95fe 100644
--- a/include/gprobe.php
+++ b/include/gprobe.php
@@ -13,7 +13,7 @@ function gprobe_run(&$argv, &$argc){
   
 	if(is_null($db)) {
 	    @include(".htconfig.php");
-    	require_once("dba.php");
+    	require_once("include/dba.php");
 	    $db = new dba($db_host, $db_user, $db_pass, $db_data);
     	unset($db_host, $db_user, $db_pass, $db_data);
   	};
diff --git a/include/html2plain.php b/include/html2plain.php
index 4afac41d83..bafaadd8d7 100644
--- a/include/html2plain.php
+++ b/include/html2plain.php
@@ -1,5 +1,5 @@
 <?php
-require_once "html2bbcode.php";
+require_once("include/html2bbcode.php");
 
 function breaklines($line, $level, $wraplength = 75)
 {
diff --git a/include/items.php b/include/items.php
index fa46fe1084..7eb090136f 100755
--- a/include/items.php
+++ b/include/items.php
@@ -1607,7 +1607,7 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
 
 	if((is_array($contact)) && ($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $contact['avatar-date'])) {
 		logger('consume_feed: Updating photo for ' . $contact['name']);
-		require_once("Photo.php");
+		require_once("include/Photo.php");
 		$photo_failure = false;
 		$have_photo = false;
 
@@ -2240,7 +2240,7 @@ function local_delivery($importer,$data) {
 
 	if(($photo_timestamp) && (strlen($photo_url)) && ($photo_timestamp > $importer['avatar-date'])) {
 		logger('local_delivery: Updating photo for ' . $importer['name']);
-		require_once("Photo.php");
+		require_once("include/Photo.php");
 		$photo_failure = false;
 		$have_photo = false;
 
diff --git a/include/notifier.php b/include/notifier.php
index b5a92ff252..367f78700c 100644
--- a/include/notifier.php
+++ b/include/notifier.php
@@ -51,13 +51,13 @@ function notifier_run(&$argv, &$argc){
   
 	if(is_null($db)) {
 		@include(".htconfig.php");
-		require_once("dba.php");
+		require_once("include/dba.php");
 		$db = new dba($db_host, $db_user, $db_pass, $db_data);
 		        unset($db_host, $db_user, $db_pass, $db_data);
 	}
 
-	require_once("session.php");
-	require_once("datetime.php");
+	require_once("include/session.php");
+	require_once("include/datetime.php");
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
 	require_once('include/email.php');
diff --git a/include/onepoll.php b/include/onepoll.php
index d819b7f421..01686232cb 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -18,7 +18,7 @@ function onepoll_run(&$argv, &$argc){
   
 	if(is_null($db)) {
 	    @include(".htconfig.php");
-    	require_once("dba.php");
+    	require_once("include/dba.php");
 	    $db = new dba($db_host, $db_user, $db_pass, $db_data);
     	unset($db_host, $db_user, $db_pass, $db_data);
   	};
diff --git a/include/poller.php b/include/poller.php
index 4eb5e8a2b9..6bca5872f3 100644
--- a/include/poller.php
+++ b/include/poller.php
@@ -12,7 +12,7 @@ function poller_run(&$argv, &$argc){
   
 	if(is_null($db)) {
 	    @include(".htconfig.php");
-    	require_once("dba.php");
+    	require_once("include/dba.php");
 	    $db = new dba($db_host, $db_user, $db_pass, $db_data);
     	unset($db_host, $db_user, $db_pass, $db_data);
   	};
diff --git a/include/queue.php b/include/queue.php
index b703f930b6..23fcc7d5c3 100644
--- a/include/queue.php
+++ b/include/queue.php
@@ -11,14 +11,14 @@ function queue_run(&$argv, &$argc){
   
 	if(is_null($db)){
 		@include(".htconfig.php");
-		require_once("dba.php");
+		require_once("include/dba.php");
 		$db = new dba($db_host, $db_user, $db_pass, $db_data);
 		unset($db_host, $db_user, $db_pass, $db_data);
 	};
 
 
-	require_once("session.php");
-	require_once("datetime.php");
+	require_once("include/session.php");
+	require_once("include/datetime.php");
 	require_once('include/items.php');
 	require_once('include/bbcode.php');
 
diff --git a/index.php b/index.php
index bd5b3e396e..f6b3809cce 100644
--- a/index.php
+++ b/index.php
@@ -41,7 +41,7 @@ load_translation_table($lang);
  *
  */
 
-require_once("dba.php");
+require_once("include/dba.php");
 
 if(! $install) {
 	$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
@@ -54,7 +54,7 @@ if(! $install) {
 	load_config('config');
 	load_config('system');
 
-	require_once("session.php");
+	require_once("include/session.php");
 	load_hooks();
 	call_hooks('init_1');
 }
diff --git a/mod/_well_known.php b/mod/_well_known.php
index 155810df36..6792d36fe0 100644
--- a/mod/_well_known.php
+++ b/mod/_well_known.php
@@ -1,5 +1,5 @@
 <?php
-require_once("hostxrd.php");
+require_once("mod/hostxrd.php");
 
 function _well_known_init(&$a){
     if ($a->argc > 1) {
@@ -11,4 +11,4 @@ function _well_known_init(&$a){
     }
     http_status_exit(404);
     killme();
-}
\ No newline at end of file
+}
diff --git a/mod/content.php b/mod/content.php
index 4210843dd2..318c37233c 100644
--- a/mod/content.php
+++ b/mod/content.php
@@ -309,7 +309,7 @@ function content_content(&$a, $update = 0) {
 function render_content(&$a, $items, $mode, $update, $preview = false) {
 
 
-	require_once('bbcode.php');
+	require_once('include/bbcode.php');
 
 	$ssl_state = ((local_user()) ? true : false);
 
diff --git a/mod/crepair.php b/mod/crepair.php
index ec963b1053..ec56d7c284 100644
--- a/mod/crepair.php
+++ b/mod/crepair.php
@@ -76,7 +76,7 @@ function crepair_post(&$a) {
 
 	if($photo) {
 		logger('mod-crepair: updating photo from ' . $photo);
-		require_once("Photo.php");
+		require_once("include/Photo.php");
 
 		$photos = import_profile_photo($photo,local_user(),$contact['id']);
 
diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php
index 8e39f5fd0b..f02119807f 100644
--- a/mod/dfrn_confirm.php
+++ b/mod/dfrn_confirm.php
@@ -671,7 +671,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
 		else
 			$photo = $a->get_baseurl() . '/images/person-175.jpg';
 				
-		require_once("Photo.php");
+		require_once("include/Photo.php");
 
 		$photos = import_profile_photo($photo,$local_uid,$dfrn_record);
 
diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php
index 0c03607fc9..5a32d946e2 100644
--- a/mod/dfrn_request.php
+++ b/mod/dfrn_request.php
@@ -110,7 +110,7 @@ function dfrn_request_post(&$a) {
 					 * Scrape the other site's profile page to pick up the dfrn links, key, fn, and photo
 					 */
 
-					require_once('Scrape.php');
+					require_once('include/Scrape.php');
 	
 					$parms = scrape_dfrn($dfrn_url);
 	
@@ -505,7 +505,7 @@ function dfrn_request_post(&$a) {
 				}
 			
 
-				require_once('Scrape.php');
+				require_once('include/Scrape.php');
 
 				$parms = scrape_dfrn(($hcard) ? $hcard : $url);
 
diff --git a/mod/editpost.php b/mod/editpost.php
index d6539e1078..c62252bc84 100644
--- a/mod/editpost.php
+++ b/mod/editpost.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('acl_selectors.php');
+require_once('include/acl_selectors.php');
 
 function editpost_content(&$a) {
 
diff --git a/mod/follow.php b/mod/follow.php
index 5e48174c93..5c2c764c7c 100644
--- a/mod/follow.php
+++ b/mod/follow.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('Scrape.php');
+require_once('include/Scrape.php');
 require_once('include/follow.php');
 
 function follow_init(&$a) {
diff --git a/mod/install.php b/mod/install.php
index d4e04c1a9d..7247ebb2c1 100755
--- a/mod/install.php
+++ b/mod/install.php
@@ -32,7 +32,7 @@ function install_post(&$a) {
 			$dbdata = notags(trim($_POST['dbdata']));
 			$phpath = notags(trim($_POST['phpath']));
 
-			require_once("dba.php");
+			require_once("include/dba.php");
 			unset($db);
 			$db = new dba($dbhost, $dbuser, $dbpass, $dbdata, true);
 			/*if(get_db_errno()) {
@@ -251,7 +251,7 @@ function install_content(&$a) {
 			return $o;
 		}; break;
 		case 3: { // Site settings
-			require_once('datetime.php');
+			require_once('include/datetime.php');
 			$dbhost = ((x($_POST,'dbhost')) ? notags(trim($_POST['dbhost'])) : 'localhost');
 			$dbuser = notags(trim($_POST['dbuser']));
 			$dbpass = notags(trim($_POST['dbpass']));
diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index cf99181465..4a5e523157 100644
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once("Photo.php");
+require_once("include/Photo.php");
 
 function profile_photo_init(&$a) {
 
diff --git a/mod/share.php b/mod/share.php
index e307294a6d..516ff98e73 100644
--- a/mod/share.php
+++ b/mod/share.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('bbcode.php');
+require_once('include/bbcode.php');
 
 function share_init(&$a) {
 
diff --git a/mod/tagrm.php b/mod/tagrm.php
index 5041145cc3..d4b483a522 100644
--- a/mod/tagrm.php
+++ b/mod/tagrm.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('bbcode.php');
+require_once('include/bbcode.php');
 
 function tagrm_post(&$a) {
 
diff --git a/mod/wall_upload.php b/mod/wall_upload.php
index 6a6b894fbd..d35b703aa8 100644
--- a/mod/wall_upload.php
+++ b/mod/wall_upload.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once('Photo.php');
+require_once('include/Photo.php');
 
 function wall_upload_post(&$a) {
 
diff --git a/util/db_update.php b/util/db_update.php
index 978594ab9f..ef85606ccb 100644
--- a/util/db_update.php
+++ b/util/db_update.php
@@ -14,7 +14,7 @@ $a = new App;
 $lang = get_browser_language();
 load_translation_table($lang);
 
-require_once("dba.php");
+require_once("include/dba.php");
 $db = new dba($db_host, $db_user, $db_pass, $db_data, false);
         unset($db_host, $db_user, $db_pass, $db_data);