Merge branch 'develop' into 1703-worker-splitting

diff --cc include/cron.php
index 21ce9e7c65404c74542a5f73c5bfa3212bc9b8f0,ca9b5dff25e9ade75dc9546ec3b1d86bc83b5daf..3fddcc3b6b4cb404ef8bbe6eec9fcaf64876da69
--- 1/include/cron.php
--- 2/include/cron.php
+++ b/include/cron.php
@@@ -15,12 -19,12 +15,12 @@@ function cron_run(&$argv, &$argc)
        $last = get_config('system','last_cron');
  
        $poll_interval = intval(get_config('system','cron_interval'));
 -      if(! $poll_interval)
 +      if (! $poll_interval) {
                $poll_interval = 10;
 -
 -      if($last) {
 +      }
 +      if ($last) {
                $next = $last + ($poll_interval * 60);
-               if ($next > time()) {
+               if($next > time()) {
                        logger('cron intervall not reached');
                        return;
                }
@@@ -65,9 -64,9 +65,9 @@@
        $d1 = get_config('system','last_expire_day');
        $d2 = intval(datetime_convert('UTC','UTC','now','d'));
  
-       if ($d2 != intval($d1)) {
+       if($d2 != intval($d1)) {
  
 -              update_contact_birthdays();
 +              proc_run(PRIORITY_LOW, "include/cronjobs.php", "update_contact_birthdays");
  
                proc_run(PRIORITY_LOW, "include/discover_poco.php", "update_server");
  

diff --cc include/discover_poco.php
Simple merge

diff --cc include/socgraph.php
Simple merge