X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=bb721530376b7601162e2bae722edc939135979c;hb=521ccc38c648ecd53aa5c52bf6b6eb3ef015a386;hp=ecf199d433d7976a04f4120e6ce78cafddc42988;hpb=dfee9faca5a45a20a434b5e4fcf0ea121c08e0ef;p=friendica.git diff --git a/boot.php b/boot.php index ecf199d433..bb72153037 100644 --- a/boot.php +++ b/boot.php @@ -12,10 +12,9 @@ require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.1.1584' ); +define ( 'FRIENDICA_VERSION', '3.1.1619' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1157 ); - +define ( 'DB_UPDATE_VERSION', 1163 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -204,10 +203,12 @@ define ( 'NOTIFY_SYSTEM', 0x8000 ); define ( 'TERM_UNKNOWN', 0 ); define ( 'TERM_HASHTAG', 1 ); -define ( 'TERM_MENTION', 2 ); +define ( 'TERM_MENTION', 2 ); define ( 'TERM_CATEGORY', 3 ); define ( 'TERM_PCATEGORY', 4 ); define ( 'TERM_FILE', 5 ); +define ( 'TERM_SAVEDSEARCH', 6 ); +define ( 'TERM_CONVERSATION', 7 ); define ( 'TERM_OBJ_POST', 1 ); define ( 'TERM_OBJ_PHOTO', 2 ); @@ -355,7 +356,8 @@ if(! class_exists('App')) { public $identities; public $is_mobile; public $is_tablet; - + public $performance = array(); + public $nav_sel; public $category; @@ -384,8 +386,14 @@ if(! class_exists('App')) { 'template_engine' => 'internal', ); - public $smarty3_ldelim = '{{'; - public $smarty3_rdelim = '}}'; + private $ldelim = array( + 'internal' => '', + 'smarty3' => '{{' + ); + private $rdelim = array( + 'internal' => '', + 'smarty3' => '}}' + ); private $scheme; private $hostname; @@ -397,7 +405,7 @@ if(! class_exists('App')) { private $cached_profile_image; private $cached_profile_picdate; - + function __construct() { global $default_timezone, $argv, $argc; @@ -406,6 +414,14 @@ if(! class_exists('App')) { date_default_timezone_set($this->timezone); + $this->performance["start"] = microtime(true); + $this->performance["database"] = 0; + $this->performance["network"] = 0; + $this->performance["rendering"] = 0; + $this->performance["parser"] = 0; + $this->performance["marktime"] = 0; + $this->performance["markstart"] = microtime(true); + $this->config = array(); $this->page = array(); $this->pager= array(); @@ -616,17 +632,17 @@ if(! class_exists('App')) { */ if(!isset($this->page['htmlhead'])) $this->page['htmlhead'] = ''; - $tpl = get_markup_template('head.tpl'); // If we're using Smarty, then doing replace_macros() will replace // any unrecognized variables with a blank string. Since we delay // replacing $stylesheet until later, we need to replace it now // with another variable name if($this->theme['template_engine'] === 'smarty3') - $stylesheet = $this->smarty3_ldelim . '$stylesheet' . $this->smarty3_rdelim; + $stylesheet = $this->get_template_ldelim('smarty3') . '$stylesheet' . $this->get_template_rdelim('smarty3'); else $stylesheet = '$stylesheet'; + $tpl = get_markup_template('head.tpl'); $this->page['htmlhead'] = replace_macros($tpl,array( '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!! '$local_user' => local_user(), @@ -665,14 +681,6 @@ if(! class_exists('App')) { return $this->curl_headers; } - function get_template_engine() { - return get_template_engine($this); - } - - function set_template_engine($engine = 'internal') { - return set_template_engine($this,$engine); - } - function get_cached_avatar_image($avatar_image){ if($this->cached_profile_image[$avatar_image]) return $this->cached_profile_image[$avatar_image]; @@ -695,7 +703,43 @@ if(! class_exists('App')) { return $this->cached_profile_image[$avatar_image]; } + function get_template_engine() { + return $this->theme['template_engine']; + } + + function set_template_engine($engine = 'internal') { + $this->theme['template_engine'] = 'internal'; + + switch($engine) { + case 'smarty3': + if(is_writable('view/smarty3/')) + $this->theme['template_engine'] = 'smarty3'; + break; + default: + break; + } + } + + function get_template_ldelim($engine = 'internal') { + return $this->ldelim[$engine]; + } + + function get_template_rdelim($engine = 'internal') { + return $this->rdelim[$engine]; + } + + function save_timestamp($stamp, $value) { + $duration = (float)(microtime(true)-$stamp); + + $this->performance[$value] += (float)$duration; + $this->performance["marktime"] += (float)$duration; + } + + function mark_timestamp($mark) { + //$this->performance["markstart"] -= microtime(true) - $this->performance["marktime"]; + $this->performance["markstart"] = microtime(true) - $this->performance["markstart"] - $this->performance["marktime"]; + } } } @@ -780,18 +824,26 @@ function is_ajax() { return (!empty($_SERVER['HTTP_X_REQUESTED_WITH']) && strtolower($_SERVER['HTTP_X_REQUESTED_WITH']) == 'xmlhttprequest'); } +function check_db() { -// Primarily involved with database upgrade, but also sets the -// base url for use in cmdline programs which don't have -// $_SERVER variables, and synchronising the state of installed plugins. + $build = get_config('system','build'); + if(! x($build)) { + set_config('system','build',DB_UPDATE_VERSION); + $build = DB_UPDATE_VERSION; + } + if($build != DB_UPDATE_VERSION) + proc_run('php', 'include/dbupdate.php'); +} -if(! function_exists('check_config')) { - function check_config(&$a) { - $build = get_config('system','build'); - if(! x($build)) - $build = set_config('system','build',DB_UPDATE_VERSION); + + +// Sets the base url for use in cmdline programs which don't have +// $_SERVER variables + +if(! function_exists('check_url')) { + function check_url(&$a) { $url = get_config('system','url'); @@ -806,6 +858,19 @@ if(! function_exists('check_config')) { if((! link_compare($url,$a->get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname))) $url = set_config('system','url',$a->get_baseurl()); + return; + } +} + + +// Automatic database updates + +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); if($build != DB_UPDATE_VERSION) { $stored = intval($build); @@ -847,10 +912,6 @@ if(! function_exists('check_config')) { $retval = $func(); if($retval) { //send the administrator an e-mail - - $engine = get_app()->get_template_engine(); - get_app()->set_template_engine(); - $email_tpl = get_intltext_template("update_fail_eml.tpl"); $email_msg = replace_macros($email_tpl, array( '$sitename' => $a->config['sitename'], @@ -858,9 +919,6 @@ if(! function_exists('check_config')) { '$update' => $x, '$error' => sprintf( t('Update %s failed. See error logs.'), $x) )); - - get_app()->set_template_engine($engine); - $subject=sprintf(t('Update Error at %s'), $a->get_baseurl()); require_once('include/email.php'); $subject = email_header_encode($subject,'UTF-8'); @@ -882,6 +940,14 @@ if(! function_exists('check_config')) { } } + return; + } +} + + +if(! function_exists('check_plugins')) { + function check_plugins(&$a) { + /** * * Synchronise plugins: @@ -1205,7 +1271,7 @@ if(! function_exists('profile_load')) { * load/reload current theme info */ - set_template_engine($a); // reset the template engine to the default in case the user's theme doesn't specify one + $a->set_template_engine(); // reset the template engine to the default in case the user's theme doesn't specify one $theme_info_file = "view/theme/".current_theme()."/theme.php"; if (file_exists($theme_info_file)){ @@ -1282,7 +1348,7 @@ if(! function_exists('profile_sidebar')) { } } - if(get_my_url() && $profile['unkmail']) + if( get_my_url() && $profile['unkmail'] && ($profile['uid'] != local_user()) ) $wallmessage = t('Message'); else $wallmessage = false; @@ -1319,9 +1385,15 @@ if(! function_exists('profile_sidebar')) { } - - } + if ($profile['uid'] == local_user() && !feature_enabled(local_user(),'multi_profiles')) { + $profile['edit'] = array($a->get_baseurl(). '/profiles/'.$profile['id'], t('Edit profile'),"", t('Edit profile')); + $profile['menu'] = array( + 'chg_photo' => t('Change profile photo'), + 'cr_new' => null, + 'entries' => array(), + ); + } @@ -1365,8 +1437,6 @@ if(! function_exists('profile_sidebar')) { } - $tpl = get_markup_template('profile_vcard.tpl'); - $p = array(); foreach($profile as $k => $v) { $k = str_replace('-','_',$k); @@ -1376,6 +1446,8 @@ 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, '$connect' => $connect, @@ -1891,6 +1963,36 @@ function build_querystring($params, $name=null) { return $ret; } +function explode_querystring($query) { + $arg_st = strpos($query, '?'); + if($arg_st !== false) { + $base = substr($query, 0, $arg_st); + $arg_st += 1; + } + else { + $base = ''; + $arg_st = 0; + } + + $args = explode('&', substr($query, $arg_st)); + foreach($args as $k=>$arg) { + if($arg === '') + unset($args[$k]); + } + $args = array_values($args); + + if(!$base) { + $base = $args[0]; + unset($args[0]); + $args = array_values($args); + } + + return array( + 'base' => $base, + 'args' => $args, + ); +} + /** * Returns the complete URL of the current page, e.g.: http(s)://something.com/network * @@ -1968,20 +2070,9 @@ function clear_cache($basepath = "", $path = "") { } function set_template_engine(&$a, $engine = 'internal') { +// This function is no longer necessary, but keep it as a wrapper to the class method +// to avoid breaking themes again unnecessarily - $a->theme['template_engine'] = 'internal'; - - if(is_writable('view/smarty3/')) { - switch($engine) { - case 'smarty3': - $a->theme['template_engine'] = 'smarty3'; - break; - default: - break; - } - } + $a->set_template_engine($engine); } -function get_template_engine($a) { - return $a->theme['template_engine']; -} \ No newline at end of file