add $item.shiny to default template

[friendica.git] / boot.php

diff --git a/boot.php b/boot.php
index 1aa5ba13ff0b797ca0efb8977c5c51a32ec154e8..17fd628fca70e6e03f88a7256e16225628830883 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -11,7 +11,7 @@ require_once('include/cache.php');
 require_once('library/Mobile_Detect/Mobile_Detect.php');
 
 define ( 'FRIENDICA_PLATFORM',     'Friendica');
-define ( 'FRIENDICA_VERSION',      '3.0.1491' );
+define ( 'FRIENDICA_VERSION',      '3.0.1521' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.23'    );
 define ( 'DB_UPDATE_VERSION',      1156      );
 
@@ -283,7 +283,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
@@ -359,17 +361,26 @@ if(! class_exists('App')) {
 
                // 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;
@@ -383,7 +394,7 @@ if(! class_exists('App')) {
                                                        
                function __construct() {
 
-                       global $default_timezone;
+                       global $default_timezone, $argv, $argc;
 
                        $this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
 
@@ -403,7 +414,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'];
 
@@ -427,6 +437,9 @@ if(! class_exists('App')) {
                                if(isset($path) && strlen($path) && ($path != $this->path))
                                        $this->path = $path;
                        }
+                       if (is_array($argv) && $argc>1 && !x($_SERVER,'SERVER_NAME') && substr(end($argv), 0, 4)=="http" ) {
+                               $this->set_baseurl(array_pop($argv) );
+                       }
 
                        set_include_path(
                                        "include/$this->hostname" . PATH_SEPARATOR
@@ -435,6 +448,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);
@@ -575,6 +589,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!!!!
@@ -585,14 +606,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) {
@@ -912,6 +935,7 @@ if(! function_exists('login')) {
 
                        $tpl = get_markup_template("login.tpl");
                        $_SESSION['return_url'] = $a->query_string;
+                       $a->module = 'login';
                }
 
 
@@ -923,6 +947,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: '),'',''),
@@ -1500,14 +1525,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__)));
        }
 }
 
@@ -1794,3 +1825,11 @@ function curPageURL() {
        }
        return $pageURL;
 }
+
+function random_digits($digits) {
+       $rn = '';
+       for($i = 0; $i < $digits; $i++) {
+               $rn .= rand(0,9);
+       }
+       return $rn;
+}