X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=boot.php;h=600a02afad34023f205fff2f96050eba72756934;hb=5d904a9fa8b383c7aa736993aa07b7d4d74c5fce;hp=7ae4ca315f2ea54387ffa806785cfda0a4d6b3b6;hpb=9e9765a89fe26d751cbfea6c9ac07ac8d794fa03;p=friendica.git diff --git a/boot.php b/boot.php index 7ae4ca315f..1809df966c 100644 --- a/boot.php +++ b/boot.php @@ -9,11 +9,12 @@ require_once('include/pgettext.php'); require_once('include/nav.php'); require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); +require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1461' ); +define ( 'FRIENDICA_VERSION', '3.0.1538' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1154 ); +define ( 'DB_UPDATE_VERSION', 1157 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -283,7 +284,9 @@ define ( 'GRAVITY_COMMENT', 6); */ function startup() { + error_reporting(E_ERROR | E_WARNING | E_PARSE); + set_time_limit(0); // This has to be quite large to deal with embedded private photos @@ -350,24 +353,36 @@ if(! class_exists('App')) { public $plugins; public $apps = array(); public $identities; + public $is_mobile; + public $is_tablet; public $nav_sel; public $category; + // Allow themes to control internal parameters // by changing App values in theme.php - // - // Possibly should make these part of the plugin - // system, but it seems like overkill to invoke - // all the plugin machinery just to change a couple - // of values + public $sourcename = ''; public $videowidth = 425; public $videoheight = 350; public $force_max_items = 0; public $theme_thread_allow = true; + // An array for all theme-controllable parameters + // Mostly unimplemented yet. Only options 'stylesheet' and + // beyond are used. + + public $theme = array( + 'sourcename' => '', + 'videowidth' => 425, + 'videoheight' => 350, + 'force_max_items' => 0, + 'thread_allow' => true, + 'stylesheet' => '' + ); + private $scheme; private $hostname; private $baseurl; @@ -381,7 +396,7 @@ if(! class_exists('App')) { function __construct() { - global $default_timezone; + global $default_timezone, $argv, $argc; $this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC'); @@ -401,7 +416,6 @@ if(! class_exists('App')) { elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) $this->scheme = 'https'; - if(x($_SERVER,'SERVER_NAME')) { $this->hostname = $_SERVER['SERVER_NAME']; @@ -425,6 +439,10 @@ if(! class_exists('App')) { if(isset($path) && strlen($path) && ($path != $this->path)) $this->path = $path; } + if (is_array($argv) && $argc>1 && substr(end($argv), 0, 4)=="http" ) { + $this->set_baseurl(array_pop($argv) ); + $argc --; + } set_include_path( "include/$this->hostname" . PATH_SEPARATOR @@ -433,6 +451,7 @@ if(! class_exists('App')) { . 'library/phpsec' . PATH_SEPARATOR . 'library/langdet' . PATH_SEPARATOR . '.' ); + if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") { $this->query_string = substr($_SERVER['QUERY_STRING'],2); @@ -491,6 +510,14 @@ if(! class_exists('App')) { if($this->pager['start'] < 0) $this->pager['start'] = 0; $this->pager['total'] = 0; + + /** + * Detect mobile devices + */ + + $mobile_detect = new Mobile_Detect(); + $this->is_mobile = $mobile_detect->isMobile(); + $this->is_tablet = $mobile_detect->isTablet(); } function get_baseurl($ssl = false) { @@ -565,6 +592,13 @@ if(! class_exists('App')) { $interval = 40000; $this->page['title'] = $this->config['sitename']; + + /* put the head template at the beginning of page['htmlhead'] + * since the code added by the modules frequently depends on it + * being first + */ + if(!isset($this->page['htmlhead'])) + $this->page['htmlhead'] = ''; $tpl = get_markup_template('head.tpl'); $this->page['htmlhead'] = replace_macros($tpl,array( '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!! @@ -575,14 +609,16 @@ if(! class_exists('App')) { '$showmore' => t('show more'), '$showfewer' => t('show fewer'), '$update_interval' => $interval - )); + )) . $this->page['htmlhead']; } function init_page_end() { + if(!isset($this->page['end'])) + $this->page['end'] = ''; $tpl = get_markup_template('end.tpl'); $this->page['end'] = replace_macros($tpl,array( '$baseurl' => $this->get_baseurl() // FIXME for z_path!!!! - )); + )) . $this->page['end']; } function set_curl_code($code) { @@ -902,6 +938,7 @@ if(! function_exists('login')) { $tpl = get_markup_template("login.tpl"); $_SESSION['return_url'] = $a->query_string; + $a->module = 'login'; } @@ -913,6 +950,7 @@ if(! function_exists('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: '),'',''), @@ -974,6 +1012,13 @@ if(! function_exists('remote_user')) { // a page is loaded. Usually used for errors or alerts. 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) { $a = get_app(); if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = array(); @@ -982,6 +1027,13 @@ 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) { $a = get_app(); if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array(); @@ -1182,7 +1234,7 @@ if(! function_exists('profile_sidebar')) { // show edit profile to yourself - if ($profile['uid'] == local_user()) { + if ($profile['uid'] == local_user() && feature_enabled(local_user(),'multi_profiles')) { $profile['edit'] = array($a->get_baseurl(). '/profiles', t('Profiles'),"", t('Manage/edit profiles')); $r = q("SELECT * FROM `profile` WHERE `uid` = %d", @@ -1288,14 +1340,14 @@ if(! function_exists('get_birthdays')) { $a = get_app(); $o = ''; - if(! local_user()) + if(! local_user() || $a->is_mobile || $a->is_tablet) return $o; - $mobile_detect = new Mobile_Detect(); - $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet(); +// $mobile_detect = new Mobile_Detect(); +// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet(); - if($is_mobile) - return $o; +// if($is_mobile) +// return $o; $bd_format = t('g A l F d') ; // 8 AM Friday January 18 $bd_short = t('F d'); @@ -1373,15 +1425,15 @@ if(! function_exists('get_events')) { $a = get_app(); - if(! local_user()) + if(! local_user() || $a->is_mobile || $a->is_tablet) return $o; - $mobile_detect = new Mobile_Detect(); - $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet(); +// $mobile_detect = new Mobile_Detect(); +// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet(); - if($is_mobile) - return $o; +// if($is_mobile) +// return $o; $bd_format = t('g A l F d') ; // 8 AM Friday January 18 $bd_short = t('F d'); @@ -1490,14 +1542,20 @@ 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'); - for($x = 0; $x < count($args); $x ++) + + // 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')) - proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo)); + proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo,dirname(__FILE__))); else - proc_close(proc_open($cmdline." &",array(),$foo)); + proc_close(proc_open($cmdline." &",array(),$foo,dirname(__FILE__))); } } @@ -1507,18 +1565,25 @@ if(! function_exists('current_theme')) { $a = get_app(); - $mobile_detect = new Mobile_Detect(); - $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet(); +// $mobile_detect = new Mobile_Detect(); +// $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet(); + $is_mobile = $a->is_mobile || $a->is_tablet; if($is_mobile) { - $system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : ''); - $theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme); - - if($theme_name === '---') { - // user has selected to have the mobile theme be the same as the normal one + if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) { $system_theme = ''; $theme_name = ''; } + else { + $system_theme = ((isset($a->config['system']['mobile-theme'])) ? $a->config['system']['mobile-theme'] : ''); + $theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme); + + if($theme_name === '---') { + // user has selected to have the mobile theme be the same as the normal one + $system_theme = ''; + $theme_name = ''; + } + } } if(!$is_mobile || ($system_theme === '' && $theme_name === '')) { $system_theme = ((isset($a->config['system']['theme'])) ? $a->config['system']['theme'] : ''); @@ -1760,3 +1825,79 @@ function build_querystring($params, $name=null) { } return $ret; } + +/** +* Returns the complete URL of the current page, e.g.: http(s)://something.com/network +* +* Taken from http://webcheatsheet.com/php/get_current_page_url.php +*/ +function curPageURL() { + $pageURL = 'http'; + if ($_SERVER["HTTPS"] == "on") {$pageURL .= "s";} + $pageURL .= "://"; + if ($_SERVER["SERVER_PORT"] != "80" && $_SERVER["SERVER_PORT"] != "443") { + $pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"]; + } else { + $pageURL .= $_SERVER["SERVER_NAME"].$_SERVER["REQUEST_URI"]; + } + return $pageURL; +} + +function random_digits($digits) { + $rn = ''; + for($i = 0; $i < $digits; $i++) { + $rn .= rand(0,9); + } + return $rn; +} + +function get_cachefile($file, $writemode = true) { + $cache = get_config("system","itemcache"); + + if ($cache == "") + return(""); + + if (!is_dir($cache)) + return(""); + + $subfolder = $cache."/".substr($file, 0, 2); + + $cachepath = $subfolder."/".$file; + + if ($writemode) { + if (!is_dir($subfolder)) { + mkdir($subfolder); + chmod($subfolder, 0777); + } + } + + return($cachepath); +} + +function clear_cache($basepath = "", $path = "") { + if ($path == "") { + $basepath = get_config('system','itemcache'); + $path = $basepath; + } + + if (($path == "") OR (!is_dir($path))) + return; + + if (substr(realpath($path), 0, strlen($basepath)) != $basepath) + return; + + $cachetime = (int)get_config('system','itemcache_duration'); + if ($cachetime == 0) + $cachetime = 86400; + + if ($dh = opendir($path)) { + while (($file = readdir($dh)) !== false) { + $fullpath = $path."/".$file; + if ((filetype($fullpath) == "dir") and ($file != ".") and ($file != "..")) + clear_cache($basepath, $fullpath); + if ((filetype($fullpath) == "file") and filectime($fullpath) < (time() - $cachetime)) + unlink($fullpath); + } + closedir($dh); + } +}