X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=c136dc57441b5bcfaca0eebb005adb5b666241bc;hb=e3b6770ad4b452841da25d5275ae8e2fbcb5b148;hp=20abdde5005401145c1ff6a52518b282a234b21f;hpb=70659b67d2a268b58877c874b07369d04df26a95;p=friendica.git diff --git a/boot.php b/boot.php index 20abdde500..c136dc5744 100644 --- a/boot.php +++ b/boot.php @@ -15,9 +15,10 @@ require_once('update.php'); require_once('include/dbstructure.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.3rc' ); +define ( 'FRIENDICA_CODENAME', 'Ginger'); +define ( 'FRIENDICA_VERSION', '3.3.3-RC' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1173 ); +define ( 'DB_UPDATE_VERSION', 1179 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -126,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 */ @@ -434,7 +440,7 @@ if(! class_exists('App')) { function __construct() { - global $default_timezone, $argv, $argc; + global $default_timezone; $hostname = ""; @@ -503,9 +509,9 @@ 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()); @@ -521,21 +527,28 @@ if(! class_exists('App')) { if (substr($this->query_string, 0, 1) == "/") $this->query_string = substr($this->query_string, 1); } + 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 @@ -608,6 +621,10 @@ if(! class_exists('App')) { return($basepath); } + function get_scheme() { + return($this->scheme); + } + function get_baseurl($ssl = false) { $scheme = $this->scheme; @@ -627,6 +644,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; } @@ -648,12 +668,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; } @@ -876,7 +903,7 @@ if(! class_exists('App')) { } function get_useragent() { - return(FRIENDICA_PLATFORM." ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION."; ".$this->get_baseurl()); + return(FRIENDICA_PLATFORM." '".FRIENDICA_CODENAME."' ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION."; ".$this->get_baseurl()); } } @@ -1383,11 +1410,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; @@ -1418,7 +1445,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", @@ -1426,7 +1453,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; @@ -1435,7 +1462,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']) ); @@ -1627,8 +1654,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'],' ')) @@ -1673,6 +1702,7 @@ if(! function_exists('profile_sidebar')) { '$pdesc' => $pdesc, '$marital' => $marital, '$homepage' => $homepage, + '$about' => $about, '$network' => t('Network:'), '$diaspora' => $diaspora, '$contact_block' => $contact_block, @@ -2049,7 +2079,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)) {