X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=boot.php;h=418d46e5a2cb658d334f77f0b5f722cff35575dd;hb=c308bb904236deeadd9f996f387bd3002d17b934;hp=070ddd64d6527e29666cce016c2b3653a6be65c7;hpb=cc8a4fbf166a61459dc5be2cdc73c510ecba68b9;p=friendica.git
diff --git a/boot.php b/boot.php
index 070ddd64d6..418d46e5a2 100644
--- a/boot.php
+++ b/boot.php
@@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php');
require_once('include/features.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '3.1.1684' );
+define ( 'FRIENDICA_VERSION', '3.2' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1163 );
define ( 'EOL', "
\r\n" );
@@ -139,6 +139,8 @@ define ( 'NETWORK_LINKEDIN', 'lnkd'); // LinkedIn
define ( 'NETWORK_XMPP', 'xmpp'); // XMPP
define ( 'NETWORK_MYSPACE', 'mysp'); // MySpace
define ( 'NETWORK_GPLUS', 'goog'); // Google+
+define ( 'NETWORK_PUMPIO', 'pump'); // pump.io
+define ( 'NETWORK_TWITTER', 'twit'); // Twitter
define ( 'NETWORK_PHANTOM', 'unkn'); // Place holder
@@ -161,6 +163,8 @@ $netgroup_ids = array(
NETWORK_XMPP => (-10),
NETWORK_MYSPACE => (-11),
NETWORK_GPLUS => (-12),
+ NETWORK_PUMPIO => (-13),
+ NETWORK_TWITTER => (-14),
NETWORK_PHANTOM => (-127),
);
@@ -285,7 +289,7 @@ define ( 'GRAVITY_COMMENT', 6);
*/
function startup() {
-
+
error_reporting(E_ERROR | E_WARNING | E_PARSE);
set_time_limit(0);
@@ -385,7 +389,7 @@ if(! class_exists('App')) {
'stylesheet' => '',
'template_engine' => 'smarty3',
);
-
+
// array of registered template engines ('name'=>'class name')
public $template_engines = array();
// array of instanced template engines ('name'=>'instance')
@@ -416,6 +420,9 @@ if(! class_exists('App')) {
global $default_timezone, $argv, $argc;
+ if (file_exists(".htpreconfig.php"))
+ @include(".htpreconfig.php");
+
$this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
date_default_timezone_set($this->timezone);
@@ -423,6 +430,7 @@ if(! class_exists('App')) {
$this->performance["start"] = microtime(true);
$this->performance["database"] = 0;
$this->performance["network"] = 0;
+ $this->performance["file"] = 0;
$this->performance["rendering"] = 0;
$this->performance["parser"] = 0;
$this->performance["marktime"] = 0;
@@ -436,11 +444,19 @@ if(! class_exists('App')) {
startup();
+ set_include_path(
+ 'include' . PATH_SEPARATOR
+ . 'library' . PATH_SEPARATOR
+ . 'library/phpsec' . PATH_SEPARATOR
+ . 'library/langdet' . PATH_SEPARATOR
+ . '.' );
+
+
$this->scheme = 'http';
if(x($_SERVER,'HTTPS') && $_SERVER['HTTPS'])
$this->scheme = 'https';
elseif(x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443))
- $this->scheme = 'https';
+ $this->scheme = 'https';
if(x($_SERVER,'SERVER_NAME')) {
$this->hostname = $_SERVER['SERVER_NAME'];
@@ -465,19 +481,16 @@ if(! class_exists('App')) {
if(isset($path) && strlen($path) && ($path != $this->path))
$this->path = $path;
}
+
+ if ($hostname != "")
+ $this->hostname = $hostname;
+
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
- . 'include' . PATH_SEPARATOR
- . 'library' . PATH_SEPARATOR
- . 'library/phpsec' . PATH_SEPARATOR
- . 'library/langdet' . PATH_SEPARATOR
- . '.' );
-
+ set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
if((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
$this->query_string = substr($_SERVER['QUERY_STRING'],2);
@@ -544,7 +557,7 @@ if(! class_exists('App')) {
$mobile_detect = new Mobile_Detect();
$this->is_mobile = $mobile_detect->isMobile();
$this->is_tablet = $mobile_detect->isTablet();
-
+
/**
* register template engines
*/
@@ -554,7 +567,7 @@ if(! class_exists('App')) {
$this->register_template_engine($k);
}
}
-
+
}
function get_basepath() {
@@ -633,7 +646,11 @@ if(! class_exists('App')) {
function set_pager_itemspage($n) {
$this->pager['itemspage'] = ((intval($n) > 0) ? intval($n) : 0);
$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
+ }
+ function set_pager_page($n) {
+ $this->pager['page'] = $n;
+ $this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
}
function init_pagehead() {
@@ -763,7 +780,7 @@ if(! class_exists('App')) {
$template_engine = $this->theme['template_engine'];
}
}
-
+
if (isset($this->template_engines[$template_engine])){
if(isset($this->template_engine_instance[$template_engine])){
return $this->template_engine_instance[$template_engine];
@@ -774,7 +791,7 @@ if(! class_exists('App')) {
return $obj;
}
}
-
+
echo "template engine $template_engine is not registered!\n"; killme();
}
@@ -817,6 +834,7 @@ if(! class_exists('App')) {
//$this->performance["markstart"] -= microtime(true) - $this->performance["marktime"];
$this->performance["markstart"] = microtime(true) - $this->performance["markstart"] - $this->performance["marktime"];
}
+
}
}
@@ -998,7 +1016,7 @@ if(! function_exists('update_db')) {
));
$subject=sprintf(t('Update Error at %s'), $a->get_baseurl());
require_once('include/email.php');
- $subject = email_header_encode($subject,'UTF-8');
+ $subject = email_header_encode($subject,'UTF-8');
mail($a->config['admin_email'], $subject, $email_msg,
'From: ' . 'Administrator' . '@' . $_SERVER['SERVER_NAME'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
@@ -1010,7 +1028,7 @@ if(! function_exists('update_db')) {
else {
set_config('database','update_' . $x, 'success');
set_config('system','build', $x + 1);
- }
+ }
}
}
}
@@ -1278,7 +1296,7 @@ if(! function_exists('profile_load')) {
$user = q("select uid from user where nickname = '%s' limit 1",
dbesc($nickname)
);
-
+
if(! ($user && count($user))) {
logger('profile error: ' . $a->query_string, LOGGER_DEBUG);
notice( t('Requested account is not available.') . EOL );
@@ -1300,7 +1318,7 @@ if(! function_exists('profile_load')) {
}
$r = null;
-
+
if($profile) {
$profile_int = intval($profile);
$r = q("SELECT `profile`.`uid` AS `profile_uid`, `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
@@ -1324,7 +1342,7 @@ if(! function_exists('profile_load')) {
$a->error = 404;
return;
}
-
+
// fetch user tags if this isn't the default profile
if(! $r[0]['is-default']) {
@@ -1955,6 +1973,13 @@ if(! function_exists('profile_tabs')){
'title' => t('Photo Albums'),
'id' => 'photo-tab',
),
+ array(
+ 'label' => t('Videos'),
+ 'url' => $a->get_baseurl() . '/videos/' . $nickname,
+ 'sel' => ((!isset($tab)&&$a->argv[0]=='videos')?'active':''),
+ 'title' => t('Videos'),
+ 'id' => 'video-tab',
+ ),
);
if ($is_owner){
@@ -2098,10 +2123,7 @@ function random_digits($digits) {
function get_cachefile($file, $writemode = true) {
$cache = get_config("system","itemcache");
- if ($cache == "")
- return("");
-
- if (!is_dir($cache))
+ if ((! $cache) || (! is_dir($cache)))
return("");
$subfolder = $cache."/".substr($file, 0, 2);