]> git.mxchange.org Git - friendica.git/blobdiff - boot.php
Merge pull request #1678 from annando/1506-ostatus-completion
[friendica.git] / boot.php
index 5ef24f4944b7060ad5483211e468a3233f4a187f..193b34a60bfd1f9d44fa9e53db64fa42d37b3cf9 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -11,10 +11,14 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 require_once('include/features.php');
 
+require_once('update.php');
+require_once('include/dbstructure.php');
+
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.2.1753' );
+define ( 'FRIENDICA_CODENAME',     'Lily of the valley');
+define ( 'FRIENDICA_VERSION',      '3.4.0' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
-define ( 'DB_UPDATE_VERSION',      1173      );
+define ( 'DB_UPDATE_VERSION',      1185      );
 define ( 'EOL',                    "<br />\r\n"     );
 define ( 'ATOM_TIME',              'Y-m-d\TH:i:s\Z' );
 
@@ -123,6 +127,11 @@ define ( 'PAGE_FREELOVE',          3 );
 define ( 'PAGE_BLOG',              4 );
 define ( 'PAGE_PRVGROUP',          5 );
 
+// Type of the community page
+define ( 'CP_NO_COMMUNITY_PAGE',   -1 );
+define ( 'CP_USERS_ON_SERVER',     0 );
+define ( 'CP_GLOBAL_COMMUNITY',    1 );
+
 /**
  * Network and protocol family types
  */
@@ -281,6 +290,7 @@ define ( 'ACTIVITY_OBJ_EVENT',   NAMESPACE_ACTIVITY_SCHEMA . 'event' );
 define ( 'ACTIVITY_OBJ_GROUP',   NAMESPACE_ACTIVITY_SCHEMA . 'group' );
 define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_DFRN            . '/tagterm' );
 define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_DFRN            . '/profile' );
+define ( 'ACTIVITY_OBJ_QUESTION', 'http://activityschema.org/object/question' );
 
 /**
  * item weight for query ordering
@@ -370,6 +380,7 @@ if(! class_exists('App')) {
                public  $identities;
                public  $is_mobile;
                public  $is_tablet;
+               public  $is_friendica_app;
                public  $performance = array();
 
                public $nav_sel;
@@ -405,9 +416,6 @@ if(! class_exists('App')) {
                // array of instanced template engines ('name'=>'instance')
                public $template_engine_instance = array();
 
-               // Used for reducing load to the ostatus completion
-               public $last_ostatus_conversation_url;
-
                private $ldelim = array(
                        'internal' => '',
                        'smarty3' => '{{'
@@ -431,7 +439,7 @@ if(! class_exists('App')) {
 
                function __construct() {
 
-                       global $default_timezone, $argv, $argc;
+                       global $default_timezone;
 
                        $hostname = "";
 
@@ -500,32 +508,46 @@ if(! class_exists('App')) {
                        if ($hostname != "")
                                $this->hostname = $hostname;
 
-                       if (is_array($argv) && $argc>1 && substr(end($argv), 0, 4)=="http" ) {
-                               $this->set_baseurl(array_pop($argv) );
-                               $argc --;
+                       if (is_array($_SERVER["argv"]) && $_SERVER["argc"]>1 && substr(end($_SERVER["argv"]), 0, 4)=="http" ) {
+                               $this->set_baseurl(array_pop($_SERVER["argv"]) );
+                               $_SERVER["argc"] --;
                        }
 
-                       set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
+                       #set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
 
-                       if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
+                       if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,9) === "pagename=") {
+                               $this->query_string = substr($_SERVER['QUERY_STRING'],9);
+                               // removing trailing / - maybe a nginx problem
+                               if (substr($this->query_string, 0, 1) == "/")
+                                       $this->query_string = substr($this->query_string, 1);
+                       } elseif((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
                                $this->query_string = substr($_SERVER['QUERY_STRING'],2);
                                // removing trailing / - maybe a nginx problem
                                if (substr($this->query_string, 0, 1) == "/")
                                        $this->query_string = substr($this->query_string, 1);
                        }
-                       if(x($_GET,'q'))
+
+                       if (x($_GET,'pagename'))
+                               $this->cmd = trim($_GET['pagename'],'/\\');
+                       elseif (x($_GET,'q'))
                                $this->cmd = trim($_GET['q'],'/\\');
 
+
+                        // fix query_string
+                        $this->query_string = str_replace($this->cmd."&",$this->cmd."?", $this->query_string);
+
+
                        // unix style "homedir"
 
                        if(substr($this->cmd,0,1) === '~')
-                               $this->cmd = 'profile/' . substr($this->cmd,1);
+                               $this->cmd = 'profile/' . substr($this->cmd,1);
 
                        // Diaspora style profile url
 
                        if(substr($this->cmd,0,2) === 'u/')
                                $this->cmd = 'profile/' . substr($this->cmd,2);
 
+
                        /**
                         *
                         * Break the URL path into C style argc/argv style arguments for our
@@ -573,6 +595,9 @@ if(! class_exists('App')) {
                        $this->is_mobile = $mobile_detect->isMobile();
                        $this->is_tablet = $mobile_detect->isTablet();
 
+                       // Friendica-Client
+                       $this->is_friendica_app = ($_SERVER['HTTP_USER_AGENT'] == "Apache-HttpClient/UNAVAILABLE (java 1.4)");
+
                        /**
                         * register template engines
                         */
@@ -598,6 +623,10 @@ if(! class_exists('App')) {
                        return($basepath);
                }
 
+               function get_scheme() {
+                       return($this->scheme);
+               }
+
                function get_baseurl($ssl = false) {
 
                        $scheme = $this->scheme;
@@ -617,6 +646,9 @@ if(! class_exists('App')) {
                                }
                        }
 
+                       if (get_config('config','hostname') != "")
+                               $this->hostname = get_config('config','hostname');
+
                        $this->baseurl = $scheme . "://" . $this->hostname . ((isset($this->path) && strlen($this->path)) ? '/' . $this->path : '' );
                        return $this->baseurl;
                }
@@ -638,12 +670,19 @@ if(! class_exists('App')) {
                                if (file_exists(".htpreconfig.php"))
                                        @include(".htpreconfig.php");
 
-                               $this->hostname = $hostname;
+                               if (get_config('config','hostname') != "")
+                                       $this->hostname = get_config('config','hostname');
+
+                               if (!isset($this->hostname) OR ($this->hostname == ""))
+                                       $this->hostname = $hostname;
                        }
 
                }
 
                function get_hostname() {
+                       if (get_config('config','hostname') != "")
+                               $this->hostname = get_config('config','hostname');
+
                        return $this->hostname;
                }
 
@@ -789,7 +828,7 @@ if(! class_exists('App')) {
                        }
                        if ($name===""){
                                echo "template engine <tt>$class</tt> cannot be registered without a name.\n";
-                               killme(); 
+                               killme();
                        }
                        $this->template_engines[$name] = $class;
                }
@@ -797,7 +836,7 @@ if(! class_exists('App')) {
                /**
                 * return template engine instance. If $name is not defined,
                 * return engine defined by theme, or default
-                * 
+                *
                 * @param strin $name Template engine name
                 * @return object Template Engine instance
                 */
@@ -865,6 +904,14 @@ if(! class_exists('App')) {
                        $this->performance["markstart"] = microtime(true) - $this->performance["markstart"] - $this->performance["marktime"];
                }
 
+               function get_useragent() {
+                       return(FRIENDICA_PLATFORM." '".FRIENDICA_CODENAME."' ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION."; ".$this->get_baseurl());
+               }
+
+               function is_friendica_app() {
+                       return($this->is_friendica_app);
+               }
+
        }
 }
 
@@ -992,7 +1039,6 @@ if(! function_exists('check_url')) {
 
 if(! function_exists('update_db')) {
        function update_db(&$a) {
-
                $build = get_config('system','build');
                if(! x($build))
                        $build = set_config('system','build',DB_UPDATE_VERSION);
@@ -1000,99 +1046,51 @@ if(! function_exists('update_db')) {
                if($build != DB_UPDATE_VERSION) {
                        $stored = intval($build);
                        $current = intval(DB_UPDATE_VERSION);
-                       if(($stored < $current) && file_exists('update.php')) {
-
+                       if($stored < $current) {
                                load_config('database');
 
                                // We're reporting a different version than what is currently installed.
                                // Run any existing update scripts to bring the database up to current.
 
-                               require_once('update.php');
-
                                // make sure that boot.php and update.php are the same release, we might be
                                // updating right this very second and the correct version of the update.php
                                // file may not be here yet. This can happen on a very busy site.
 
                                if(DB_UPDATE_VERSION == UPDATE_VERSION) {
-
                                        // Compare the current structure with the defined structure
 
                                        $t = get_config('database','dbupdate_'.DB_UPDATE_VERSION);
                                        if($t !== false)
-                                               break;
+                                               return;
+
                                        set_config('database','dbupdate_'.DB_UPDATE_VERSION, time());
 
-                                       require_once("include/dbstructure.php");
+                                       // run old update routine (wich could modify the schema and
+                                       // conflits with new routine)
+                                       for ($x = $stored; $x < NEW_UPDATE_ROUTINE_VERSION; $x++) {
+                                               $r = run_update_function($x);
+                                               if (!$r) break;
+                                       }
+                                       if ($stored < NEW_UPDATE_ROUTINE_VERSION) $stored = NEW_UPDATE_ROUTINE_VERSION;
+
+
+                                       // run new update routine
+                                       // it update the structure in one call
                                        $retval = update_structure(false, true);
                                        if($retval) {
-                                               //send the administrator an e-mail
-                                               $email_tpl = get_intltext_template("update_fail_eml.tpl");
-                                               $email_msg = replace_macros($email_tpl, array(
-                                                       '$sitename' => $a->config['sitename'],
-                                                       '$siteurl' =>  $a->get_baseurl(),
-                                                       '$update' => DB_UPDATE_VERSION,
-                                                       '$error' => sprintf(t('Update %s failed. See error logs.'), DB_UPDATE_VERSION)
-                                               ));
-                                               $subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
-                                               require_once('include/email.php');
-                                               $subject = email_header_encode($subject,'UTF-8');
-                                               mail($a->config['admin_email'], $subject, $email_msg,
-                                                       'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME']."\n"
-                                                       .'Content-type: text/plain; charset=UTF-8'."\n"
-                                                       .'Content-transfer-encoding: 8bit');
-                                               //try the logger
-                                               logger("CRITICAL: Database structure update failed: ".$retval);
-                                               break;
-                                       } else
+                                               update_fail(
+                                                       DB_UPDATE_VERSION,
+                                                       $retval
+                                               );
+                                               return;
+                                       } else {
                                                set_config('database','dbupdate_'.DB_UPDATE_VERSION, 'success');
+                                       }
 
+                                       // run any left update_nnnn functions in update.php
                                        for($x = $stored; $x < $current; $x ++) {
-                                               if(function_exists('update_' . $x)) {
-
-                                                       // There could be a lot of processes running or about to run.
-                                                       // We want exactly one process to run the update command.
-                                                       // So store the fact that we're taking responsibility
-                                                       // after first checking to see if somebody else already has.
-
-                                                       // If the update fails or times-out completely you may need to
-                                                       // delete the config entry to try again.
-
-                                                       $t = get_config('database','update_' . $x);
-                                                       if($t !== false)
-                                                               break;
-                                                       set_config('database','update_' . $x, time());
-
-                                                       // call the specific update
-
-                                                       $func = 'update_' . $x;
-                                                       $retval = $func();
-                                                       if($retval) {
-                                                               //send the administrator an e-mail
-                                                               $email_tpl = get_intltext_template("update_fail_eml.tpl");
-                                                               $email_msg = replace_macros($email_tpl, array(
-                                                                       '$sitename' => $a->config['sitename'],
-                                                                       '$siteurl' =>  $a->get_baseurl(),
-                                                                       '$update' => $x,
-                                                                       '$error' => sprintf( t('Update %s failed. See error logs.'), $x)
-                                                               ));
-                                                               $subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
-                                                               require_once('include/email.php');
-                                                               $subject = email_header_encode($subject,'UTF-8');
-                                                               mail($a->config['admin_email'], $subject, $email_msg,
-                                                                       'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
-                                                                       . 'Content-type: text/plain; charset=UTF-8' . "\n"
-                                                                       . 'Content-transfer-encoding: 8bit' );
-                                                               //try the logger
-                                                               logger('CRITICAL: Update Failed: '. $x);
-                                                               break;
-                                                       } else {
-                                                               set_config('database','update_' . $x, 'success');
-                                                               set_config('system','build', $x + 1);
-                                                       }
-                                               } else {
-                                                       set_config('database','update_' . $x, 'success');
-                                                       set_config('system','build', $x + 1);
-                                               }
+                                               $r = run_update_function($x);
+                                               if (!$r) break;
                                        }
                                }
                        }
@@ -1101,6 +1099,48 @@ if(! function_exists('update_db')) {
                return;
        }
 }
+if(!function_exists('run_update_function')){
+       function run_update_function($x) {
+               if(function_exists('update_' . $x)) {
+
+                       // There could be a lot of processes running or about to run.
+                       // We want exactly one process to run the update command.
+                       // So store the fact that we're taking responsibility
+                       // after first checking to see if somebody else already has.
+
+                       // If the update fails or times-out completely you may need to
+                       // delete the config entry to try again.
+
+                       $t = get_config('database','update_' . $x);
+                       if($t !== false)
+                               return false;
+                       set_config('database','update_' . $x, time());
+
+                       // call the specific update
+
+                       $func = 'update_' . $x;
+                       $retval = $func();
+
+                       if($retval) {
+                               //send the administrator an e-mail
+                               update_fail(
+                                       $x,
+                                       sprintf(t('Update %s failed. See error logs.'), $x)
+                               );
+                               return false;
+                       } else {
+                               set_config('database','update_' . $x, 'success');
+                               set_config('system','build', $x + 1);
+                               return true;
+                       }
+               } else {
+                       set_config('database','update_' . $x, 'success');
+                       set_config('system','build', $x + 1);
+                       return true;
+               }
+               return true;
+       }
+}
 
 
 if(! function_exists('check_plugins')) {
@@ -1162,35 +1202,24 @@ if(! function_exists('check_plugins')) {
        }
 }
 
-function get_guid($size=16) {
-       $exists = true; // assume by default that we don't have a unique guid
-       do {
-               $prefix = "";
-               while (strlen($prefix) < ($size - 13))
-                       $prefix .= mt_rand();
+function get_guid($size=16, $prefix = "") {
 
-               $s = substr(uniqid($prefix), -$size);
-
-               $r = q("select id from guid where guid = '%s' limit 1", dbesc($s));
-               if(! count($r))
-                       $exists = false;
-       } while($exists);
-       q("insert into guid (guid) values ('%s') ", dbesc($s));
-       return $s;
-}
+       if ($prefix == "") {
+               $a = get_app();
+               $prefix = hash("crc32", $a->get_hostname());
+       }
 
-/*function get_guid($size=16) {
-       $exists = true; // assume by default that we don't have a unique guid
-       do {
-               $s = random_string($size);
-               $r = q("select id from guid where guid = '%s' limit 1", dbesc($s));
-               if(! count($r))
-                       $exists = false;
-       } while($exists);
-       q("insert into guid ( guid ) values ( '%s' ) ", dbesc($s));
-       return $s;
-}*/
+       while (strlen($prefix) < ($size - 13))
+               $prefix .= mt_rand();
 
+       if ($size >= 24) {
+               $prefix = substr($prefix, 0, $size - 22);
+               return(str_replace(".", "", uniqid($prefix, true)));
+       } else {
+               $prefix = substr($prefix, 0, $size - 13);
+               return(uniqid($prefix));
+       }
+}
 
 // wrapper for adding a login box. If $register == true provide a registration
 // link. This will most always depend on the value of $a->config['register_policy'].
@@ -1209,7 +1238,7 @@ if(! function_exists('login')) {
                }
 
                $noid = get_config('system','no_openid');
-       
+
                $dest_url = $a->get_baseurl(true) . '/' . $a->query_string;
 
                if(local_user()) {
@@ -1230,18 +1259,18 @@ if(! function_exists('login')) {
                        '$dest_url'     => $dest_url,
                        '$logout'       => t('Logout'),
                        '$login'        => t('Login'),
-       
+
                        '$lname'                => array('username', t('Nickname or Email address: ') , '', ''),
                        '$lpassword'    => array('password', t('Password: '), '', ''),
                        '$lremember'    => array('remember', t('Remember me'), 0,  ''),
-       
+
                        '$openid'               => !$noid,
                        '$lopenid'      => array('openid_url', t('Or login using OpenID: '),'',''),
-       
+
                        '$hiddens'      => $hiddens,
-       
+
                        '$register'     => $reg,
-       
+
                        '$lostpass'     => t('Forgot your password?'),
                        '$lostlink'     => t('Password Reset'),
 
@@ -1304,9 +1333,9 @@ if(! function_exists('remote_user')) {
 if(! function_exists('notice')) {
        /**
         * Show an error message to user.
-        * 
+        *
         * This function save text in session, to be shown to the user at next page load
-        * 
+        *
         * @param string $s - Text of notice
         */
        function notice($s) {
@@ -1319,9 +1348,9 @@ if(! function_exists('notice')) {
 if(! function_exists('info')) {
        /**
         * Show an info message to user.
-        * 
+        *
         * This function save text in session, to be shown to the user at next page load
-        * 
+        *
         * @param string $s - Text of notice
         */
        function info($s) {
@@ -1376,11 +1405,11 @@ if(! function_exists('get_max_import_size')) {
 if(! function_exists('profile_load')) {
        function profile_load(&$a, $nickname, $profile = 0, $profiledata = array()) {
 
-               $user = q("select uid from user where nickname = '%s' limit 1",
+               $user = q("SELECT `uid` FROM `user` WHERE `nickname` = '%s' LIMIT 1",
                        dbesc($nickname)
                );
 
-               if(! ($user && count($user))) {
+               if(!$user && count($user) && !count($profiledata)) {
                        logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
                        notice( t('Requested account is not available.') . EOL );
                        $a->error = 404;
@@ -1411,7 +1440,7 @@ if(! function_exists('profile_load')) {
                                        intval($profile_int)
                        );
                }
-               if((! $r) && (!  count($r))) {
+               if((!$r) && (!count($r))) {
                        $r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
                                        INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
                                        WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` = 1 and `contact`.`self` = 1 LIMIT 1",
@@ -1419,7 +1448,7 @@ if(! function_exists('profile_load')) {
                        );
                }
 
-               if(($r === false) || (! count($r))) {
+               if(($r === false) || (!count($r)) && !count($profiledata)) {
                        logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
                        notice( t('Requested profile is not available.') . EOL );
                        $a->error = 404;
@@ -1428,7 +1457,7 @@ if(! function_exists('profile_load')) {
 
                // fetch user tags if this isn't the default profile
 
-               if(! $r[0]['is-default']) {
+               if(!$r[0]['is-default']) {
                        $x = q("select `pub_keywords` from `profile` where uid = %d and `is-default` = 1 limit 1",
                                        intval($r[0]['profile_uid'])
                        );
@@ -1620,8 +1649,10 @@ if(! function_exists('profile_sidebar')) {
 
                $homepage = ((x($profile,'homepage') == 1) ?  t('Homepage:') : False);
 
+               $about = ((x($profile,'about') == 1) ?  t('About:') : False);
+
                if(($profile['hidewall'] || $block) && (! local_user()) && (! remote_user())) {
-                       $location = $pdesc = $gender = $marital = $homepage = False;
+                       $location = $pdesc = $gender = $marital = $homepage = $about = False;
                }
 
                $firstname = ((strpos($profile['name'],' '))
@@ -1642,8 +1673,24 @@ if(! function_exists('profile_sidebar')) {
 
                if (!$block){
                        $contact_block = contact_block();
-               }
 
+                       if(is_array($a->profile) AND !$a->profile['hide-friends']) {
+                               $r = q("SELECT `gcontact`.`updated` FROM `contact` INNER JOIN `gcontact` WHERE `gcontact`.`nurl` = `contact`.`nurl` AND `self` AND `uid` = %d LIMIT 1",
+                                       intval($a->profile['uid']));
+                               if(count($r))
+                                       $updated =  date("c", strtotime($r[0]['updated']));
+
+                               $r = q("SELECT COUNT(*) AS `total` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 and `pending` = 0 AND `hidden` = 0 AND `archive` = 0
+                                               AND `network` IN ('%s', '%s', '%s', '')",
+                                       intval($profile['uid']),
+                                       dbesc(NETWORK_DFRN),
+                                       dbesc(NETWORK_DIASPORA),
+                                       dbesc(NETWORK_OSTATUS)
+                               );
+                               if(count($r))
+                                       $contacts = intval($r[0]['total']);
+                       }
+               }
 
                $p = array();
                foreach($profile as $k => $v) {
@@ -1654,7 +1701,6 @@ if(! function_exists('profile_sidebar')) {
                if($a->theme['template_engine'] === 'internal')
                        $location = template_escape($location);
 
-
                $tpl = get_markup_template('profile_vcard.tpl');
                $o .= replace_macros($tpl, array(
                        '$profile' => $p,
@@ -1666,7 +1712,10 @@ if(! function_exists('profile_sidebar')) {
                        '$pdesc'        => $pdesc,
                        '$marital'  => $marital,
                        '$homepage' => $homepage,
+                       '$about' => $about,
                        '$network' =>  t('Network:'),
+                       '$contacts' => $contacts,
+                       '$updated' => $updated,
                        '$diaspora' => $diaspora,
                        '$contact_block' => $contact_block,
                ));
@@ -1745,7 +1794,7 @@ if(! function_exists('get_birthdays')) {
                                        $rr['date'] = day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $rr['adjust'] ? $bd_format : $bd_short)) . (($today) ?  ' ' . t('[today]') : '');
                                        $rr['startime'] = Null;
                                        $rr['today'] = $today;
-       
+
                                }
                        }
                }
@@ -1786,10 +1835,10 @@ if(! function_exists('get_events')) {
                $bd_short = t('F d');
 
                $r = q("SELECT `event`.* FROM `event`
-                               WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` > '%s'
+                               WHERE `event`.`uid` = %d AND `type` != 'birthday' AND `start` < '%s' AND `start` >= '%s'
                                ORDER BY `start` ASC ",
                                intval(local_user()),
-                               dbesc(datetime_convert('UTC','UTC','now + 6 days')),
+                               dbesc(datetime_convert('UTC','UTC','now + 7 days')),
                                dbesc(datetime_convert('UTC','UTC','now - 1 days'))
                );
 
@@ -1806,6 +1855,7 @@ if(! function_exists('get_events')) {
                        }
                        $classtoday = (($istoday) ? 'event-today' : '');
 
+                       $skip = 0;
 
                        foreach($r as &$rr) {
                                if($rr['adjust'])
@@ -1819,8 +1869,14 @@ if(! function_exists('get_events')) {
                                        $title = t('[No description]');
 
                                $strt = datetime_convert('UTC',$rr['convert'] ? $a->timezone : 'UTC',$rr['start']);
+
+                               if(substr($strt,0,10) < datetime_convert('UTC',$a->timezone,'now','Y-m-d')) {
+                                       $skip++;
+                                       continue;
+                               }
+
                                $today = ((substr($strt,0,10) === datetime_convert('UTC',$a->timezone,'now','Y-m-d')) ? true : false);
-                               
+
                                $rr['link'] = $md;
                                $rr['title'] = $title;
                                $rr['date'] = day_translate(datetime_convert('UTC', $rr['adjust'] ? $a->timezone : 'UTC', $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '');
@@ -1833,7 +1889,7 @@ if(! function_exists('get_events')) {
                return replace_macros($tpl, array(
                        '$baseurl' => $a->get_baseurl(),
                        '$classtoday' => $classtoday,
-                       '$count' => count($r),
+                       '$count' => count($r) - $skip,
                        '$event_reminders' => t('Event Reminders'),
                        '$event_title' => t('Events this week:'),
                        '$events' => $r,
@@ -1880,7 +1936,7 @@ if(! function_exists('proc_run')) {
                }
 
                $args = $newargs;
-               
+
                $arr = array('args' => $args, 'run_cmd' => true);
 
                call_hooks("proc_run", $arr);
@@ -1889,14 +1945,14 @@ if(! function_exists('proc_run')) {
 
                if(count($args) && $args[0] === 'php')
                        $args[0] = ((x($a->config,'php_path')) && (strlen($a->config['php_path'])) ? $a->config['php_path'] : 'php');
-        
+
         // add baseurl to args. cli scripts can't construct it
         $args[] = $a->get_baseurl();
-        
+
         for($x = 0; $x < count($args); $x ++)
                        $args[$x] = escapeshellarg($args[$x]);
 
-        
+
 
                $cmdline = implode($args," ");
                if(get_config('system','proc_windows'))
@@ -1909,9 +1965,9 @@ if(! function_exists('proc_run')) {
 if(! function_exists('current_theme')) {
        function current_theme(){
                $app_base_themes = array('duepuntozero', 'dispy', 'quattro');
-       
+
                $a = get_app();
-       
+
 //             $mobile_detect = new Mobile_Detect();
 //             $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet();
                $is_mobile = $a->is_mobile || $a->is_tablet;
@@ -1941,17 +1997,17 @@ if(! function_exists('current_theme')) {
                                (file_exists('view/theme/' . $theme_name . '/style.css') ||
                                                file_exists('view/theme/' . $theme_name . '/style.php')))
                        return($theme_name);
-       
+
                foreach($app_base_themes as $t) {
                        if(file_exists('view/theme/' . $t . '/style.css')||
                                        file_exists('view/theme/' . $t . '/style.php'))
                                return($t);
                }
-       
+
                $fallback = array_merge(glob('view/theme/*/style.css'),glob('view/theme/*/style.php'));
                if(count($fallback))
                        return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
-       
+
        }
 }
 
@@ -1991,7 +2047,7 @@ if(! function_exists('feed_birthday')) {
                 *
                 */
 
-       
+
                $birthday = '';
 
                if(! strlen($tz))
@@ -2042,7 +2098,7 @@ if(! function_exists('load_contact_links')) {
                if(! $uid || x($a->contacts,'empty'))
                        return;
 
-               $r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 ",
+               $r = q("SELECT `id`,`network`,`url`,`thumb` FROM `contact` WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `thumb` != ''",
                                intval($uid)
                );
                if(count($r)) {
@@ -2061,13 +2117,13 @@ if(! function_exists('load_contact_links')) {
 if(! function_exists('profile_tabs')){
        function profile_tabs($a, $is_owner=False, $nickname=Null){
                //echo "<pre>"; var_dump($a->user); killme();
-       
+
                if (is_null($nickname))
                        $nickname  = $a->user['nickname'];
-               
+
                if(x($_GET,'tab'))
                        $tab = notags(trim($_GET['tab']));
-       
+
                $url = $a->get_baseurl() . '/profile/' . $nickname;
 
                $tabs = array(
@@ -2100,7 +2156,7 @@ if(! function_exists('profile_tabs')){
                                'id' => 'video-tab',
                        ),
                );
-       
+
                if ($is_owner){
                        $tabs[] = array(
                                'label' => t('Events'),
@@ -2121,7 +2177,7 @@ if(! function_exists('profile_tabs')){
 
                $arr = array('is_owner' => $is_owner, 'nickname' => $nickname, 'tab' => (($tab) ? $tab : false), 'tabs' => $tabs);
                call_hooks('profile_tabs', $arr);
-       
+
                $tpl = get_markup_template('common_tabs.tpl');
 
                return replace_macros($tpl,array('$tabs' => $arr['tabs']));
@@ -2137,6 +2193,20 @@ function get_my_url() {
 function zrl_init(&$a) {
        $tmp_str = get_my_url();
        if(validate_url($tmp_str)) {
+
+               // Is it a DDoS attempt?
+               // The check fetches the cached value from gprobe to reduce the load for this system
+               $urlparts = parse_url($tmp_str);
+
+               $result = Cache::get("gprobe:".$urlparts["host"]);
+               if (!is_null($result)) {
+                       $result = unserialize($result);
+                       if ($result["network"] == NETWORK_FEED) {
+                               logger("DDoS attempt detected for ".$urlparts["host"]." by ".$_SERVER["REMOTE_ADDR"].". server data: ".print_r($_SERVER, true), LOGGER_DEBUG);
+                               return;
+                       }
+               }
+
                proc_run('php','include/gprobe.php',bin2hex($tmp_str));
                $arr = array('zrl' => $tmp_str, 'url' => $a->cmd);
                call_hooks('zrl_init',$arr);
@@ -2160,28 +2230,28 @@ function zrl($s,$force = false) {
 /**
 * returns querystring as string from a mapped array
 *
-* @param params Array 
+* @param params Array
 * @return string
 */
-function build_querystring($params, $name=null) { 
-    $ret = ""; 
+function build_querystring($params, $name=null) {
+    $ret = "";
     foreach($params as $key=>$val) {
-        if(is_array($val)) { 
+        if(is_array($val)) {
             if($name==null) {
-                $ret .= build_querystring($val, $key); 
+                $ret .= build_querystring($val, $key);
             } else {
-                $ret .= build_querystring($val, $name."[$key]");    
+                $ret .= build_querystring($val, $name."[$key]");
             }
         } else {
             $val = urlencode($val);
             if($name!=null) {
-                $ret.=$name."[$key]"."=$val&"; 
+                $ret.=$name."[$key]"."=$val&";
             } else {
-                $ret.= "$key=$val&"; 
+                $ret.= "$key=$val&";
             }
-        } 
-    } 
-    return $ret;    
+        }
+    }
+    return $ret;
 }
 
 function explode_querystring($query) {
@@ -2303,7 +2373,9 @@ function get_itemcachepath() {
 
        if ($temppath != "") {
                $itemcache = $temppath."/itemcache";
-               mkdir($itemcache);
+               if(!file_exists($itemcache) && !is_dir($itemcache)) {
+                       mkdir($itemcache);
+               }
 
                if (is_dir($itemcache) AND is_writable($itemcache)) {
                        set_config("system", "itemcache", $itemcache);