fix json_encode on url's

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index ab1505d793511464acda87e5326d9f1baf9104c4..65606aaf20a9a803fde11f25c12e78d91272950b 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -4,7 +4,7 @@ set_time_limit(0);
 ini_set('pcre.backtrack_limit', 250000);
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.975' );
+define ( 'FRIENDIKA_VERSION',      '2.2.977' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1054      );
 
@@ -378,7 +378,7 @@ class App {
 
        function init_pagehead() {
                $this->page['title'] = $this->config['sitename'];
-               $tpl = load_view_file('view/head.tpl');
+               $tpl = file_get_contents('view/head.tpl');
                $this->page['htmlhead'] = replace_macros($tpl,array(
                        '$baseurl' => $this->get_baseurl(),
                        '$generator' => 'Friendika' . ' ' . FRIENDIKA_VERSION,
@@ -828,7 +828,7 @@ function escape_tags($string) {
 if(! function_exists('login')) {
 function login($register = false) {
        $o = "";
-       $register_tpl = (($register) ? load_view_file("view/register-link.tpl") : "");
+       $register_tpl = (($register) ? get_markup_template("register-link.tpl") : "");
        
        $register_html = replace_macros($register_tpl,array(
                '$title' => t('Create a New Account'),
@@ -852,10 +852,10 @@ function login($register = false) {
        $lostlink = t('Password Reset');
 
        if(local_user()) {
-               $tpl = load_view_file("view/logout.tpl");
+               $tpl = get_markup_template("logout.tpl");
        }
        else {
-               $tpl = load_view_file("view/login.tpl");
+               $tpl = get_markup_template("login.tpl");
 
        }
 
@@ -1864,6 +1864,8 @@ function allowed_email($email) {
 // wrapper to load a view template, checking for alternate
 // languages before falling back to the default
 
+// obsolete, deprecated.
+
 if(! function_exists('load_view_file')) {
 function load_view_file($s) {
        global $lang, $a;
@@ -1882,6 +1884,37 @@ function load_view_file($s) {
        return file_get_contents($s);
 }}
 
+if(! function_exists('get_intltext_template')) {
+function get_intltext_template($s) {
+       global $lang;
+
+       if(! isset($lang))
+               $lang = 'en';
+
+       if(file_exists("view/$lang/$s"))
+               return file_get_contents("view/$lang/$s");
+       elseif(file_exists("view/en/$s"))
+               return file_get_contents("view/en/$s");
+       else
+               return file_get_contents("view/$s");
+}}
+
+if(! function_exists('get_markup_template')) {
+function get_markup_template($s) {
+
+       $theme = current_theme();
+       
+       if(file_exists("view/theme/$theme/$s"))
+               return file_get_contents("view/theme/$theme/$s");
+       else
+               return file_get_contents("view/$s");
+
+}}
+
+
+
+
+
 // for html,xml parsing - let's say you've got
 // an attribute foobar="class1 class2 class3"
 // and you want to find out if it contains 'class3'.
@@ -2307,7 +2340,7 @@ function profile_sidebar($profile) {
 
        $homepage = ((x($profile,'homepage') == 1) ? '<div class="homepage"><span class="homepage-label">' . t('Homepage:') . ' </span><span class="homepage-url">' . linkify($profile['homepage']) . '</span></div><div class="profile-clear"></div>' : '');
 
-       $tpl = load_view_file('view/profile_vcard.tpl');
+       $tpl = get_markup_template('profile_vcard.tpl');
 
        $o .= replace_macros($tpl, array(
                '$fullname' => $fullname,
@@ -2432,28 +2465,27 @@ function get_birthdays() {
                        if(strlen($rr['name']))
                                $total ++;
 
-               $o .= '<div id="birthday-notice" class="birthday-notice fakelink" onclick=openClose(\'birthday-wrapper\'); >' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '</div>'; 
-               $o .= '<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">' . t('Birthdays this week:') . '</div>'; 
-               $o .= '<div id="birthday-adjust">' . t("\x28Adjusted for local time\x29") . '</div>';
-               $o .= '<div id="birthday-title-end"></div>';
-
-               foreach($r as $rr) {
-                       if(! strlen($rr['name']))
-                               continue;
-                       $now = strtotime('now');
-                       $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); 
+               if($total) {
+                       $o .= '<div id="birthday-notice" class="birthday-notice fakelink" onclick=openClose(\'birthday-wrapper\'); >' . t('Birthday Reminders') . ' ' . '(' . $total . ')' . '</div>'; 
+                       $o .= '<div id="birthday-wrapper" style="display: none;" ><div id="birthday-title">' . t('Birthdays this week:') . '</div>'; 
+                       $o .= '<div id="birthday-adjust">' . t("\x28Adjusted for local time\x29") . '</div>';
+                       $o .= '<div id="birthday-title-end"></div>';
 
-                       $o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="sparkle" href="' 
-                       . $a->get_baseurl() . '/redir/'  . $rr['cid'] . '">' . $rr['name'] . '</a> ' 
-                       . day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '')
-                       . '</div>' ;
+                       foreach($r as $rr) {
+                               if(! strlen($rr['name']))
+                                       continue;
+                               $now = strtotime('now');
+                               $today = (((strtotime($rr['start'] . ' +00:00') < $now) && (strtotime($rr['finish'] . ' +00:00') > $now)) ? true : false); 
+       
+                               $o .= '<div class="birthday-list" id="birthday-' . $rr['eid'] . '"><a class="sparkle" href="' 
+                               . $a->get_baseurl() . '/redir/'  . $rr['cid'] . '">' . $rr['name'] . '</a> ' 
+                               . day_translate(datetime_convert('UTC', $a->timezone, $rr['start'], $bd_format)) . (($today) ?  ' ' . t('[today]') : '')
+                               . '</div>' ;
+                       }
+                       $o .= '</div></div>';
                }
-
-               $o .= '</div></div>';
        }
-
-  return $o;
-
+       return $o;
 }}