require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '3.1.1565' );
+define ( 'FRIENDICA_VERSION', '3.1.1584' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1157 );
'template_engine' => 'internal',
);
- public $smarty3_ldelim = '{{';
- public $smarty3_rdelim = '}}';
+ private $ldelim = array(
+ 'internal' => '',
+ 'smarty3' => '{{'
+ );
+ private $rdelim = array(
+ 'internal' => '',
+ 'smarty3' => '}}'
+ );
private $scheme;
private $hostname;
// 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';
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];
+ }
}
}
'$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
$a->module = 'login';
}
-
- $includes = array(
- '$field_input' => 'field_input.tpl',
- '$field_password' => 'field_password.tpl',
- '$field_openid' => 'field_openid.tpl',
- '$field_checkbox' => 'field_checkbox.tpl',
- );
- $includes = set_template_includes($a->theme['template_engine'], $includes);
-
- $o .= replace_macros($tpl,$includes + array(
+ $o .= replace_macros($tpl, array(
'$dest_url' => $dest_url,
'$logout' => t('Logout'),
'$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);
* 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')) {
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'];
$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'];
* 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);
$tpl = get_markup_template('profile_vcard.tpl');
-
- $includes = array(
- '$diaspora_vcard' => 'diaspora_vcard.tpl'
- );
- $includes = set_template_includes($a->theme['template_engine'], $includes);
+ $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, $includes + array(
- '$profile' => $profile,
+ $o .= replace_macros($tpl, array(
+ '$profile' => $p,
'$connect' => $connect,
'$wallmessage' => $wallmessage,
'$location' => $location,
'$pdesc' => $pdesc,
'$marital' => $marital,
'$homepage' => $homepage,
- '$diaspora_info' => $diaspora,
+ '$diaspora' => $diaspora,
'$contact_block' => $contact_block,
));
// $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 = '';
}
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);
}
+
projects / friendica.git / blobdiff