X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=7d02ba9e041435ddb19e2199e4059eb09660f752;hb=74caf1a4a745643312ab4ee2bf28d7e82c9e1350;hp=05711e3a256d58c9bd1c1c0a46cc58bcf2004f11;hpb=f1c579e74a438bfab6dce15c6bbe0075084bbf68;p=friendica.git diff --git a/boot.php b/boot.php index 05711e3a25..7d02ba9e04 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.1531' ); +define ( 'FRIENDICA_VERSION', '3.1.1584' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); -define ( 'DB_UPDATE_VERSION', 1156 ); +define ( 'DB_UPDATE_VERSION', 1157 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); @@ -359,6 +360,7 @@ if(! class_exists('App')) { public $category; + // Allow themes to control internal parameters // by changing App values in theme.php @@ -378,7 +380,17 @@ if(! class_exists('App')) { 'videoheight' => 350, 'force_max_items' => 0, 'thread_allow' => true, - 'stylesheet' => '' + 'stylesheet' => '', + 'template_engine' => 'internal', + ); + + private $ldelim = array( + 'internal' => '', + 'smarty3' => '{{' + ); + private $rdelim = array( + 'internal' => '', + 'smarty3' => '}}' ); private $scheme; @@ -518,6 +530,19 @@ if(! class_exists('App')) { $this->is_tablet = $mobile_detect->isTablet(); } + function get_basepath() { + + $basepath = get_config("system", "basepath"); + + if ($basepath == "") + $basepath = $_SERVER["DOCUMENT_ROOT"]; + + if ($basepath == "") + $basepath = $_SERVER["PWD"]; + + return($basepath); + } + function get_baseurl($ssl = false) { $scheme = $this->scheme; @@ -598,6 +623,16 @@ 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->get_template_ldelim('smarty3') . '$stylesheet' . $this->get_template_rdelim('smarty3'); + else + $stylesheet = '$stylesheet'; + $this->page['htmlhead'] = replace_macros($tpl,array( '$baseurl' => $this->get_baseurl(), // FIXME for z_path!!!! '$local_user' => local_user(), @@ -606,7 +641,8 @@ if(! class_exists('App')) { '$comment' => t('Comment'), '$showmore' => t('show more'), '$showfewer' => t('show fewer'), - '$update_interval' => $interval + '$update_interval' => $interval, + '$stylesheet' => $stylesheet )) . $this->page['htmlhead']; } @@ -657,6 +693,31 @@ 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]; + } } } @@ -817,9 +878,10 @@ if(! function_exists('check_config')) { '$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: ' . t('Administrator') . '@' . $_SERVER['SERVER_NAME'] . "\n" + 'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" . 'Content-transfer-encoding: 8bit' ); //try the logger @@ -939,8 +1001,7 @@ if(! function_exists('login')) { $a->module = 'login'; } - - $o .= replace_macros($tpl,array( + $o .= replace_macros($tpl, array( '$dest_url' => $dest_url, '$logout' => t('Logout'), @@ -959,6 +1020,13 @@ if(! function_exists('login')) { '$lostpass' => t('Forgot your password?'), '$lostlink' => t('Password Reset'), + + '$tostitle' => t('Website Terms of Service'), + '$toslink' => t('terms of service'), + + '$privacytitle' => t('Website Privacy Policy'), + '$privacylink' => t('privacy policy'), + )); call_hooks('login_hook',$o); @@ -1071,6 +1139,10 @@ if(! function_exists('get_max_import_size')) { * Profile information is placed in the App structure for later retrieval. * Honours the owner's chosen theme for display. * + * IMPORTANT: Should only be run in the _init() functions of a module. That ensures that + * the theme is chosen before the _init() function of a theme is run, which will usually + * load a lot of theme-specific content + * */ if(! function_exists('profile_load')) { @@ -1130,7 +1202,7 @@ if(! function_exists('profile_load')) { if(! $r[0]['is-default']) { $x = q("select `pub_keywords` from `profile` where uid = %d and `is-default` = 1 limit 1", - intval($profile_uid) + intval($r[0]['profile_uid']) ); if($x && count($x)) $r[0]['pub_keywords'] = $x[0]['pub_keywords']; @@ -1138,7 +1210,7 @@ if(! function_exists('profile_load')) { $a->profile = $r[0]; - $a->profile['mobile-theme'] = get_pconfig($profile_uid, 'system', 'mobile_theme'); + $a->profile['mobile-theme'] = get_pconfig($a->profile['profile_uid'], 'system', 'mobile_theme'); $a->page['title'] = $a->profile['name'] . " @ " . $a->config['sitename']; @@ -1149,6 +1221,8 @@ if(! function_exists('profile_load')) { * load/reload current theme info */ + $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)){ require_once($theme_info_file); @@ -1232,7 +1306,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", @@ -1309,11 +1383,20 @@ if(! function_exists('profile_sidebar')) { $tpl = get_markup_template('profile_vcard.tpl'); + $p = array(); + foreach($profile as $k => $v) { + $k = str_replace('-','_',$k); + $p[$k] = $v; + } + + if($a->theme['template_engine'] === 'internal') + $location = template_escape($location); + $o .= replace_macros($tpl, array( - '$profile' => $profile, + '$profile' => $p, '$connect' => $connect, '$wallmessage' => $wallmessage, - '$location' => template_escape($location), + '$location' => $location, '$gender' => $gender, '$pdesc' => $pdesc, '$marital' => $marital, @@ -1566,7 +1649,7 @@ if(! function_exists('current_theme')) { // $mobile_detect = new Mobile_Detect(); // $is_mobile = $mobile_detect->isMobile() || $mobile_detect->isTablet(); $is_mobile = $a->is_mobile || $a->is_tablet; - + if($is_mobile) { if(isset($_SESSION['show-mobile']) && !$_SESSION['show-mobile']) { $system_theme = ''; @@ -1893,9 +1976,17 @@ function clear_cache($basepath = "", $path = "") { $fullpath = $path."/".$file; if ((filetype($fullpath) == "dir") and ($file != ".") and ($file != "..")) clear_cache($basepath, $fullpath); - if ((filetype($fullpath) == "file") and filectime($fullpath) < (time() - $cachetime)) + if ((filetype($fullpath) == "file") and (filectime($fullpath) < (time() - $cachetime))) unlink($fullpath); } closedir($dh); } } + +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->set_template_engine($engine); +} +