merged 2 if() into one as requested by CR

[friendica.git] / include / update_gcontact.php

diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index 88e1817f0b991ff6a0749c2d794b71510ab62b22..221c0829f50eddd6afb3a4ee9bdb82f9160b7191 100644 (file)
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -1,53 +1,33 @@
 <?php
 
-require_once("boot.php");
+use \Friendica\Core\Config;
 
-function update_gcontact_run(&$argv, &$argc){
-       global $a, $db;
+function update_gcontact_run(&$argv, &$argc) {
+       global $a;
 
-       if(is_null($a)) {
-               $a = new App;
-       }
-
-       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);
-       };
-
-       require_once('include/Scrape.php');
-       require_once("include/socgraph.php");
-
-       load_config('config');
-       load_config('system');
-
-       $a->set_baseurl(get_config('system','url'));
-
-       load_hooks();
+       require_once 'include/Scrape.php';
+       require_once 'include/socgraph.php';
 
        logger('update_gcontact: start');
 
-       if(($argc > 1) && (intval($argv[1])))
+       if (($argc > 1) && (intval($argv[1]))) {
                $contact_id = intval($argv[1]);
+       }
 
-       if(!$contact_id) {
+       if (!$contact_id) {
                logger('update_gcontact: no contact');
                return;
        }
 
-       // Don't check this stuff if the function is called by the poller
-       if (App::callstack() != "poller_run")
-               if (App::is_already_running('update_gcontact'.$contact_id, '', 540))
-                       return;
-
        $r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));
 
-       if (!$r)
+       if (!dbm::_is_result($r)) {
                return;
+       }
 
-       if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
+       if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
                return;
+       }
 
        $data = probe_url($r[0]["url"]);
 
@@ -97,8 +77,3 @@ function update_gcontact_run(&$argv, &$argc){
                                dbesc(normalise_link($data["url"]))
                        );
 }
-
-if (array_search(__file__,get_included_files())===0){
-       update_gcontact_run($_SERVER["argv"],$_SERVER["argc"]);
-       killme();
-}