Issue 2122: Make sure to always return the correct number of entries

[friendica.git] / include / directory.php

diff --git a/include/directory.php b/include/directory.php
index 5f835dc4bf58dc036a4ebbc33a46cfb3585bca0b..85476bd5fdf498eaed07787c6c8e695732c2bd1f 100644 (file)
--- a/include/directory.php
+++ b/include/directory.php
@@ -1,28 +1,53 @@
 <?php
+require_once("boot.php");
 
-       require_once("boot.php");
+function directory_run(&$argv, &$argc){
+       global $a, $db;
 
-       $a = new App;
+       if(is_null($a)) {
+               $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);
+       if(is_null($db)) {
+               @include(".htconfig.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);
+       };
+
+       load_config('config');
+       load_config('system');
 
 
        if($argc != 2)
-               exit;
+               return;
 
        load_config('system');
 
+       load_hooks();
+
+
        $a->set_baseurl(get_config('system','url'));
 
-       $dir = get_config('system','directory_submit_url');
+       $dir = get_config('system','directory');
 
        if(! strlen($dir))
-               exit;
+               return;
+
+       $dir .= "/submit";
+
+       $arr = array('url' => $argv[1]);
+
+       call_hooks('globaldir_update', $arr);
 
-       fetch_url($dir . '?url=' . bin2hex($argv[1]));
+       logger('Updating directory: ' . $arr['url'], LOGGER_DEBUG);
+       if(strlen($arr['url']))
+               fetch_url($dir . '?url=' . bin2hex($arr['url']));
 
-       exit;
+       return;
+}
 
+if (array_search(__file__,get_included_files())===0){
+  directory_run($_SERVER["argv"],$_SERVER["argc"]);
+  killme();
+}