diff --git a/boot.php b/boot.php
index d82669f231..0a2f5c50cd 100644
--- a/boot.php
+++ b/boot.php
@@ -465,11 +465,12 @@ class App {
public $plugins;
public $apps = array();
public $identities;
- public $is_mobile;
- public $is_tablet;
+ public $is_mobile = false;
+ public $is_tablet = false;
public $is_friendica_app;
public $performance = array();
public $callstack = array();
+ public $theme_info = array();
public $nav_sel;
@@ -1046,11 +1047,21 @@ class App {
function save_timestamp($stamp, $value) {
$duration = (float)(microtime(true)-$stamp);
+ if (!isset($this->performance[$value])) {
+ // Prevent ugly E_NOTICE
+ $this->performance[$value] = 0;
+ }
+
$this->performance[$value] += (float)$duration;
$this->performance["marktime"] += (float)$duration;
$callstack = $this->callstack();
+ if (!isset($this->callstack[$value][$callstack])) {
+ // Prevent ugly E_NOTICE
+ $this->callstack[$value][$callstack] = 0;
+ }
+
$this->callstack[$value][$callstack] += (float)$duration;
}
diff --git a/include/api.php b/include/api.php
index 55e39e3583..699b066d25 100644
--- a/include/api.php
+++ b/include/api.php
@@ -1691,13 +1691,13 @@
`contact`.`name`, `contact`.`photo`, `contact`.`url`, `contact`.`rel`,
`contact`.`network`, `contact`.`thumb`, `contact`.`dfrn-id`, `contact`.`self`,
`contact`.`id` AS `cid`, `contact`.`uid` AS `contact-uid`
- FROM `item`, `contact`
+ FROM `item` FORCE INDEX (`uid_id`), `contact`
WHERE `item`.`uid` = %d AND `verb` = '%s'
AND NOT (`item`.`author-link` IN ('https://%s', 'http://%s'))
- AND `item`.`visible` = 1 and `item`.`moderated` = 0 AND `item`.`deleted` = 0
+ AND `item`.`visible` AND NOT `item`.`moderated` AND NOT `item`.`deleted`
AND `contact`.`id` = `item`.`contact-id`
- AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0
- AND `item`.`parent` IN (SELECT `iid` from thread where uid = %d AND `mention` AND !`ignored`)
+ AND NOT `contact`.`blocked` AND NOT `contact`.`pending`
+ AND `item`.`parent` IN (SELECT `iid` FROM `thread` WHERE `uid` = %d AND `mention` AND !`ignored`)
$sql_extra
AND `item`.`id`>%d
ORDER BY `item`.`id` DESC LIMIT %d ,%d ",
diff --git a/include/identity.php b/include/identity.php
index aba69bae49..888a09ee6f 100644
--- a/include/identity.php
+++ b/include/identity.php
@@ -237,6 +237,7 @@ function profile_sidebar($profile, $block = 0) {
if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect']))
$connect = false;
+ $remoteconnect = NULL;
if (isset($profile['remoteconnect']))
$remoteconnect = $profile['remoteconnect'];
@@ -292,9 +293,9 @@ function profile_sidebar($profile, $block = 0) {
// check if profile is a forum
if((intval($profile['page-flags']) == PAGE_COMMUNITY)
|| (intval($profile['page-flags']) == PAGE_PRVGROUP)
- || (intval($profile['forum']))
- || (intval($profile['prv']))
- || (intval($profile['community'])))
+ || (isset($profile['forum']) && intval($profile['forum']))
+ || (isset($profile['prv']) && intval($profile['prv']))
+ || (isset($profile['community']) && intval($profile['community'])))
$account_type = t('Forum');
else
$account_type = "";
diff --git a/index.php b/index.php
index e364389b2c..625c2d82dc 100644
--- a/index.php
+++ b/index.php
@@ -72,7 +72,8 @@ if(!$install) {
(intval(get_config('system','ssl_policy')) == SSL_POLICY_FULL) AND
(substr($a->get_baseurl(), 0, 8) == "https://")) {
header("HTTP/1.1 302 Moved Temporarily");
- header("location: ".$a->get_baseurl()."/".$a->query_string);
+ header("Location: ".$a->get_baseurl()."/".$a->query_string);
+ exit();
}
require_once("include/session.php");
diff --git a/mod/admin.php b/mod/admin.php
index 7a16820c44..a98f464f81 100644
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -283,14 +283,14 @@ function admin_page_federation(&$a) {
// get a total count for the platform, the name and version of the
// highest version and the protocol tpe
$c = q('SELECT count(*) AS total, platform, network, version FROM gserver
- WHERE platform LIKE "%s" AND last_contact > last_failure
+ WHERE platform LIKE "%s" AND last_contact > last_failure AND `version` != ""
ORDER BY version ASC;', $p);
$total = $total + $c[0]['total'];
// what versions for that platform do we know at all?
// again only the active nodes
$v = q('SELECT count(*) AS total, version FROM gserver
- WHERE last_contact > last_failure AND platform LIKE "%s"
+ WHERE last_contact > last_failure AND platform LIKE "%s" AND `version` != ""
GROUP BY version
ORDER BY version;', $p);
@@ -344,6 +344,9 @@ function admin_page_federation(&$a) {
$v = $newVv;
}
+ foreach ($v as $key => $vv)
+ $v[$key]["version"] = trim(strip_tags($vv["version"]));
+
// the 3rd array item is needed for the JavaScript graphs as JS does
// not like some characters in the names of variables...
$counts[$p]=array($c[0], $v, str_replace(array(' ','%'),'',$p), $colors[$p]);
diff --git a/view/templates/dfrn_request.tpl b/view/templates/dfrn_request.tpl
index 3b96d3eefd..5225bd60b2 100644
--- a/view/templates/dfrn_request.tpl
+++ b/view/templates/dfrn_request.tpl
@@ -18,13 +18,13 @@
{{/if}}
{{if $request}}
-
+
+