diff options
| -rw-r--r-- | include/directory.php | 32 | ||||
| -rw-r--r-- | include/notifier.php | 51 | ||||
| -rw-r--r-- | include/poller.php | 36 | ||||
| -rw-r--r-- | include/queue.php | 31 |
4 files changed, 94 insertions, 56 deletions
diff --git a/include/directory.php b/include/directory.php index 4fdcf4928..2c9daa5ea 100644 --- a/include/directory.php +++ b/include/directory.php @@ -1,14 +1,19 @@ <?php - - require_once("boot.php"); - - $a = new App; - - @include(".htconfig.php"); - require_once("dba.php"); - $db = new dba($db_host, $db_user, $db_pass, $db_data); - unset($db_host, $db_user, $db_pass, $db_data); - +require_once("boot.php"); + +function directory_run($argv, $argc){ + global $a, $db; + + if(is_null($a)){ + $a = new App; + } + + if(is_null($db)){ + @include(".htconfig.php"); + require_once("dba.php"); + $db = new dba($db_host, $db_user, $db_pass, $db_data); + unset($db_host, $db_user, $db_pass, $db_data); + }; if($argc != 2) return; @@ -20,9 +25,14 @@ $dir = get_config('system','directory_submit_url'); if(! strlen($dir)) - exit; + return; fetch_url($dir . '?url=' . bin2hex($argv[1])); return; +} +if (array_search(__file__,get_included_files())===0){ + directory_run($argv,$argc); + killme(); +} diff --git a/include/notifier.php b/include/notifier.php index bb38ecf51..dd5d55ed0 100644 --- a/include/notifier.php +++ b/include/notifier.php @@ -1,14 +1,19 @@ <?php - - require_once("boot.php"); - - $a = new App; - - @include(".htconfig.php"); - require_once("dba.php"); - $db = new dba($db_host, $db_user, $db_pass, $db_data); - unset($db_host, $db_user, $db_pass, $db_data); - +require_once("boot.php"); + +function notifier_run($argv, $argc){ + global $a, $db; + + if(is_null($a)){ + $a = new App; + } + + if(is_null($db)){ + @include(".htconfig.php"); + require_once("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"); @@ -30,7 +35,7 @@ default: $item_id = intval($argv[2]); if(! $item_id){ - killme(); return; + return; } break; } @@ -44,7 +49,7 @@ intval($item_id) ); if(! count($message)){ - killme(); return; + return; } $uid = $message[0]['uid']; $recipients[] = $message[0]['contact-id']; @@ -52,15 +57,15 @@ } else { - // find ancestors + // find ancestors $r = q("SELECT `parent`, `uid`, `edited` FROM `item` WHERE `id` = %d LIMIT 1", intval($item_id) ); if(! count($r)){ - killme(); return; + return; } - + $parent_id = $r[0]['parent']; $uid = $r[0]['uid']; $updated = $r[0]['edited']; @@ -70,7 +75,7 @@ ); if(! count($items)){ - killme(); return; + return; } } @@ -83,7 +88,7 @@ if(count($r)) $owner = $r[0]; else { - killme(); return; + return; } $hub = get_config('system','huburl'); @@ -155,7 +160,7 @@ $r = q("SELECT * FROM `contact` WHERE `id` IN ( $conversant_str ) AND `blocked` = 0 AND `pending` = 0"); if( ! count($r)){ - killme(); return; + return; } $contacts = $r; @@ -254,7 +259,7 @@ dbesc($recip_str) ); if(! count($r)){ - killme(); return; + return; } // delivery loop @@ -365,5 +370,11 @@ } } - killme(); + return; +} +if (array_search(__file__,get_included_files())===0){ + echo "run!"; + notifier_run($argv,$argc); + killme(); +} diff --git a/include/poller.php b/include/poller.php index a4bc60767..1003b2f08 100644 --- a/include/poller.php +++ b/include/poller.php @@ -1,14 +1,19 @@ <?php - - - require_once('boot.php'); - - $a = new App; - - @include('.htconfig.php'); - require_once('dba.php'); - $db = new dba($db_host, $db_user, $db_pass, $db_data); - unset($db_host, $db_user, $db_pass, $db_data); +require_once("boot.php"); + +function poller_run($argv, $argc){ + global $a, $db; + + if(is_null($a)){ + $a = new App; + } + + if(is_null($db)){ + @include(".htconfig.php"); + require_once("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'); @@ -48,7 +53,7 @@ AND `self` = 0 AND `blocked` = 0 AND `readonly` = 0 ORDER BY RAND()"); if(! count($contacts)){ - killme(); return; + return; } foreach($contacts as $contact) { @@ -267,7 +272,10 @@ // loop - next contact } - killme(); - - + return; +} +if (array_search(__file__,get_included_files())===0){ + poller_run($argv,$argc); + killme(); +} diff --git a/include/queue.php b/include/queue.php index fae93e328..d4fc7dbd6 100644 --- a/include/queue.php +++ b/include/queue.php @@ -1,5 +1,5 @@ <?php - +require_once("boot.php"); function update_queue_time($id) { logger('queue: requeue item ' . $id); @@ -16,14 +16,19 @@ function remove_queue_item($id) { ); } - require_once("boot.php"); - - $a = new App; +function queue_run($argv, $argc){ + global $a, $db; - @include(".htconfig.php"); - require_once("dba.php"); - $db = new dba($db_host, $db_user, $db_pass, $db_data); - unset($db_host, $db_user, $db_pass, $db_data); + if(is_null($a)){ + $a = new App; + } + + if(is_null($db)){ + @include(".htconfig.php"); + require_once("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"); @@ -51,7 +56,7 @@ function remove_queue_item($id) { $r = q("SELECT `id` FROM `queue` WHERE `last` < UTC_TIMESTAMP() - INTERVAL 15 MINUTE "); if(! count($r)){ - killme(); return; + return; } // delivery loop @@ -118,7 +123,11 @@ function remove_queue_item($id) { } } - killme(); + return; - // NOTREACHED +} +if (array_search(__file__,get_included_files())===0){ + queue_run($argv,$argc); + killme(); +} |