use explicit include paths

diff --git a/include/api.php b/include/api.php
index 667629e1393ede3a0d0806332c8190fc073098dd..03514ecd580e7117d704f85dfefd01656f3a007c 100644 (file)
--- 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 1f416f352c00bfbdbe275fa74e37b703deee8673..9420d8b74af67ded54cceef675ef98162a9b8c16 100644 (file)
--- 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 27cf642b22776d238fff3447a061321c6799993d..6aa0721363a9eb374142227d6541f1a5f2438359 100644 (file)
--- 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 fcb0ee47b987b9b7521ec72f6f91da9d8b990429..d89cded9eb10ed7ecf082d25f0dbef8989109e45 100644 (file)
--- 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 29a793a2a01ecba93efe2a11ac7b6adea3d1d7ff..5c1a7c4b4c71a727271257dd45525d013e16b1d8 100644 (file)
--- 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 b4331f0926679a871249e83cdba43c4f5fdb5ed2..ba947a9bf99e334a456c230f65b66ab912ae06ae 100644 (file)
--- 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 373ebf55fead6df625e33bc716104c4139319bb0..4c6fb7a19dd3e1bd37f79cda4eccd38299615a6c 100644 (file)
--- 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 b4d1732b88091e5e7b21af3d5c71294d12955b89..59f3b1a5fcdd662be427677ee7b5e8113da7a6cd 100644 (file)
--- 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 88e6bad4a4f6ccb3329f7aed9e935d29a40f9ebd..0cf32e95fe9311f04cffeeb1cd5089eb3cb5d119 100644 (file)
--- 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 4afac41d8316267b78198d2ed054ea686497a3ce..bafaadd8d7b009f704420fe87932443f01b575c2 100644 (file)
--- 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 fa46fe108433b0985082602fe13b3acd4607ff80..7eb090136f6bd2d9c3fc5c36dd20f83e9319613c 100755 (executable)
--- 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 b5a92ff2526c5675e8825307fb9fec403b5a24f5..367f78700c9006cc0a94894c086a5c42341a9e95 100644 (file)
--- 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 d819b7f421d9b9d1e7c620a669c2317d606952f6..01686232cb153e1379f68466a9ac0bfde7654269 100644 (file)
--- 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 4eb5e8a2b912bd2b22df8cfec3c1822adbc9c1d1..6bca5872f32bbae115b4f768e96755312f75671d 100644 (file)
--- 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 b703f930b6b80fcef848608dd0826636a5ad8f28..23fcc7d5c3cf233a288c01eb2d4d007aa0ff67c5 100644 (file)
--- 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 bd5b3e396eede03224986634504e6cd915d1e59b..f6b3809ccee0711b3b4f64e70ea0a46c7fcc2951 100644 (file)
--- 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 155810df367ae04c8e516d2c9ccaa1794668dee7..6792d36fe0fcfeaa09e1caf868679c1a37f3540e 100644 (file)
--- a/mod/_well_known.php
+++ b/mod/_well_known.php
@@ -1,5 +1,5 @@
 <?php\r
-require_once("hostxrd.php");\r
+require_once("mod/hostxrd.php");\r
 \r
 function _well_known_init(&$a){\r
     if ($a->argc > 1) {\r
@@ -11,4 +11,4 @@ function _well_known_init(&$a){
     }\r
     http_status_exit(404);\r
     killme();\r
-}
\ No newline at end of file
+}\r

diff --git a/mod/content.php b/mod/content.php
index 4210843dd203c2e999186aa1c50cbfd0ed3b3ece..318c37233cb286923b424ac1649af92309ba9ae1 100644 (file)
--- 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 ec963b1053897cf912ebb8c6e83b18f2b6c10c54..ec56d7c284cc3700d3a6ebfd022ef56f44c34df3 100644 (file)
--- 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 8e39f5fd0bc0308118b628e9fa357d54cd4ab478..f02119807f83b8e53e558ff8193711404ddeafaf 100644 (file)
--- 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 0c03607fc9eee65134d0cc2b36998e54f64ce125..5a32d946e29f470ca0a441dd52375b99f51da92a 100644 (file)
--- 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 d6539e10782a55da57068903c8ccc8ef0265572d..c62252bc84ca8fc52d0ca8ea8388e95f5616392f 100644 (file)
--- 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 5e48174c937c04c21745eee403162e43724b09e7..5c2c764c7cbddac0336e601394627ba53462f416 100644 (file)
--- 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 d4e04c1a9d4fd8f005a43cd01dbfd2022a789723..7247ebb2c12c13598398f58b9373cc006456e4c0 100755 (executable)
--- 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 cf9918146504ab01306f54e0b6e3f9cf849b9c42..4a5e52315785363b05724103daa82cd38a7ea96e 100644 (file)
--- 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 e307294a6db8aa5fe5e8ff8dd23da4a862c7ae91..516ff98e73cd0bd7cbc76f496e2cc13985688ebd 100644 (file)
--- 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 5041145cc323e2a99268b706b4c0c71e2049b832..d4b483a522f970afec8f66a84cd481591cd2282d 100644 (file)
--- 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 6a6b894fbd49593373242f4737bba2194d76add2..d35b703aa832f6d09c966c8cbc20606848616f0c 100644 (file)
--- 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 978594ab9f91bc771959567e44d509024f00013b..ef85606ccb295301a00f1c3fceea368708ea6a7f 100644 (file)
--- 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);