diff --git a/boot.php b/boot.php
index c93b4f517e..438c6bb1ff 100644
--- a/boot.php
+++ b/boot.php
@@ -252,7 +252,6 @@ define ( 'NETWORK_PHANTOM', 'unkn'); // Place holder
* and existing allocations MUST NEVER BE CHANGED
* OR RE-ASSIGNED! You may only add to them.
*/
-
$netgroup_ids = array(
NETWORK_DFRN => (-1),
NETWORK_ZOT => (-2),
@@ -502,6 +501,7 @@ function startup() {
*/
class App {
+ /// @TODO decide indending as a colorful mixure is ahead ...
public $module_loaded = false;
public $query_string;
public $config;
@@ -559,12 +559,12 @@ class App {
* beyond are used.
*/
public $theme = array(
- 'sourcename' => '',
- 'videowidth' => 425,
- 'videoheight' => 350,
+ 'sourcename' => '',
+ 'videowidth' => 425,
+ 'videoheight' => 350,
'force_max_items' => 0,
- 'thread_allow' => true,
- 'stylesheet' => '',
+ 'thread_allow' => true,
+ 'stylesheet' => '',
'template_engine' => 'smarty3',
);
@@ -610,8 +610,9 @@ class App {
$hostname = "";
- if (file_exists(".htpreconfig.php"))
- @include(".htpreconfig.php");
+ if (file_exists(".htpreconfig.php")) {
+ include ".htpreconfig.php";
+ }
$this->timezone = ((x($default_timezone)) ? $default_timezone : 'UTC');
@@ -652,79 +653,78 @@ class App {
$this->scheme = 'http';
- if((x($_SERVER,'HTTPS') && $_SERVER['HTTPS']) ||
- (x($_SERVER['HTTP_FORWARDED']) && preg_match("/proto=https/", $_SERVER['HTTP_FORWARDED'])) ||
- (x($_SERVER['HTTP_X_FORWARDED_PROTO']) && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ||
- (x($_SERVER['HTTP_X_FORWARDED_SSL']) && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') ||
- (x($_SERVER['FRONT_END_HTTPS']) && $_SERVER['FRONT_END_HTTPS'] == 'on') ||
- (x($_SERVER,'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) // XXX: reasonable assumption, but isn't this hardcoding too much?
- ) {
- $this->scheme = 'https';
- }
- if(x($_SERVER,'SERVER_NAME')) {
+ if ((x($_SERVER, 'HTTPS') && $_SERVER['HTTPS']) ||
+ (x($_SERVER, 'HTTP_FORWARDED') && preg_match("/proto=https/", $_SERVER['HTTP_FORWARDED'])) ||
+ (x($_SERVER, 'HTTP_X_FORWARDED_PROTO') && $_SERVER['HTTP_X_FORWARDED_PROTO'] == 'https') ||
+ (x($_SERVER, 'HTTP_X_FORWARDED_SSL') && $_SERVER['HTTP_X_FORWARDED_SSL'] == 'on') ||
+ (x($_SERVER, 'FRONT_END_HTTPS') && $_SERVER['FRONT_END_HTTPS'] == 'on') ||
+ (x($_SERVER, 'SERVER_PORT') && (intval($_SERVER['SERVER_PORT']) == 443)) // XXX: reasonable assumption, but isn't this hardcoding too much?
+ ) {
+ $this->scheme = 'https';
+ }
+
+ if (x($_SERVER, 'SERVER_NAME')) {
$this->hostname = $_SERVER['SERVER_NAME'];
- if(x($_SERVER,'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443)
+ if (x($_SERVER, 'SERVER_PORT') && $_SERVER['SERVER_PORT'] != 80 && $_SERVER['SERVER_PORT'] != 443) {
$this->hostname .= ':' . $_SERVER['SERVER_PORT'];
+ }
/*
* Figure out if we are running at the top of a domain
* or in a sub-directory and adjust accordingly
*/
- $path = trim(dirname($_SERVER['SCRIPT_NAME']),'/\\');
- if(isset($path) && strlen($path) && ($path != $this->path))
+ /// @TODO This kind of escaping breaks syntax-highlightning on CoolEdit (Midnight Commander)
+ $path = trim(dirname($_SERVER['SCRIPT_NAME']), '/\\');
+ if (isset($path) && strlen($path) && ($path != $this->path)) {
$this->path = $path;
+ }
}
- if ($hostname != "")
+ if ($hostname != "") {
$this->hostname = $hostname;
+ }
- if (is_array($_SERVER["argv"]) && $_SERVER["argc"]>1 && substr(end($_SERVER["argv"]), 0, 4)=="http" ) {
- $this->set_baseurl(array_pop($_SERVER["argv"]) );
+ if (is_array($_SERVER["argv"]) && $_SERVER["argc"] > 1 && substr(end($_SERVER["argv"]), 0, 4) == "http" ) {
+ $this->set_baseurl(array_pop($_SERVER["argv"]));
$_SERVER["argc"] --;
}
- #set_include_path("include/$this->hostname" . PATH_SEPARATOR . get_include_path());
+ if ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 9) === "pagename=") {
+ $this->query_string = substr($_SERVER['QUERY_STRING'], 9);
- if ((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,9) === "pagename=") {
- $this->query_string = substr($_SERVER['QUERY_STRING'],9);
// removing trailing / - maybe a nginx problem
- if (substr($this->query_string, 0, 1) == "/")
- $this->query_string = substr($this->query_string, 1);
- } elseif ((x($_SERVER,'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'],0,2) === "q=") {
- $this->query_string = substr($_SERVER['QUERY_STRING'],2);
+ $this->query_string = ltrim($this->query_string, '/');
+ } elseif ((x($_SERVER, 'QUERY_STRING')) && substr($_SERVER['QUERY_STRING'], 0, 2) === "q=") {
+ $this->query_string = substr($_SERVER['QUERY_STRING'], 2);
+
// removing trailing / - maybe a nginx problem
- if (substr($this->query_string, 0, 1) == "/")
- $this->query_string = substr($this->query_string, 1);
+ $this->query_string = ltrim($this->query_string, '/');
}
- if (x($_GET,'pagename')) {
- $this->cmd = trim($_GET['pagename'],'/\\');
- } elseif (x($_GET,'q')) {
- $this->cmd = trim($_GET['q'],'/\\');
+ if (x($_GET, 'pagename')) {
+ $this->cmd = trim($_GET['pagename'], '/\\');
+ } elseif (x($_GET, 'q')) {
+ $this->cmd = trim($_GET['q'], '/\\');
}
// fix query_string
- $this->query_string = str_replace($this->cmd."&",$this->cmd."?", $this->query_string);
-
+ $this->query_string = str_replace($this->cmd . "&", $this->cmd . "?", $this->query_string);
// unix style "homedir"
-
- if (substr($this->cmd,0,1) === '~') {
- $this->cmd = 'profile/' . substr($this->cmd,1);
+ if (substr($this->cmd, 0, 1) === '~') {
+ $this->cmd = 'profile/' . substr($this->cmd, 1);
}
// Diaspora style profile url
-
- if (substr($this->cmd,0,2) === 'u/') {
- $this->cmd = 'profile/' . substr($this->cmd,2);
+ if (substr($this->cmd, 0, 2) === 'u/') {
+ $this->cmd = 'profile/' . substr($this->cmd, 2);
}
/*
- *
* Break the URL path into C style argc/argv style arguments for our
* modules. Given "http://example.com/module/arg1/arg2", $this->argc
* will be 3 (integer) and $this->argv will contain:
@@ -735,16 +735,14 @@ class App {
*
* There will always be one argument. If provided a naked domain
* URL, $this->argv[0] is set to "home".
- *
*/
- $this->argv = explode('/',$this->cmd);
+ $this->argv = explode('/', $this->cmd);
$this->argc = count($this->argv);
- if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) {
+ if ((array_key_exists('0', $this->argv)) && strlen($this->argv[0])) {
$this->module = str_replace(".", "_", $this->argv[0]);
$this->module = str_replace("-", "_", $this->module);
- }
- else {
+ } else {
$this->argc = 1;
$this->argv = array('home');
$this->module = 'home';
@@ -755,11 +753,13 @@ class App {
* pagination
*/
- $this->pager['page'] = ((x($_GET,'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1);
+ $this->pager['page'] = ((x($_GET, 'page') && intval($_GET['page']) > 0) ? intval($_GET['page']) : 1);
$this->pager['itemspage'] = 50;
$this->pager['start'] = ($this->pager['page'] * $this->pager['itemspage']) - $this->pager['itemspage'];
- if($this->pager['start'] < 0)
+
+ if ($this->pager['start'] < 0) {
$this->pager['start'] = 0;
+ }
$this->pager['total'] = 0;
/*
@@ -791,20 +791,23 @@ class App {
$basepath = get_config("system", "basepath");
- if ($basepath == "")
+ if ($basepath == "") {
$basepath = dirname(__FILE__);
+ }
- if ($basepath == "")
+ if ($basepath == "") {
$basepath = $_SERVER["DOCUMENT_ROOT"];
+ }
- if ($basepath == "")
+ if ($basepath == "") {
$basepath = $_SERVER["PWD"];
+ }
- return($basepath);
+ return $basepath;
}
function get_scheme() {
- return($this->scheme);
+ return $this->scheme;
}
/**
@@ -862,7 +865,7 @@ class App {
function set_baseurl($url) {
$parsed = @parse_url($url);
- if($parsed) {
+ if ($parsed) {
$this->scheme = $parsed['scheme'];
$hostname = $parsed['host'];
@@ -874,7 +877,7 @@ class App {
}
if (file_exists(".htpreconfig.php")) {
- @include(".htpreconfig.php");
+ include ".htpreconfig.php";
}
if (get_config('config', 'hostname') != '') {
@@ -888,8 +891,9 @@ class App {
}
function get_hostname() {
- if (get_config('config','hostname') != "")
- $this->hostname = get_config('config','hostname');
+ if (get_config('config', 'hostname') != "") {
+ $this->hostname = get_config('config', 'hostname');
+ }
return $this->hostname;
}
@@ -899,7 +903,7 @@ class App {
}
function set_path($p) {
- $this->path = trim(trim($p),'/');
+ $this->path = trim(trim($p), '/');
}
function get_path() {
@@ -924,44 +928,49 @@ class App {
$interval = ((local_user()) ? get_pconfig(local_user(),'system','update_interval') : 40000);
// If the update is "deactivated" set it to the highest integer number (~24 days)
- if ($interval < 0)
+ if ($interval < 0) {
$interval = 2147483647;
+ }
- if($interval < 10000)
+ if ($interval < 10000) {
$interval = 40000;
+ }
// compose the page title from the sitename and the
// current module called
- if (!$this->module=='')
- {
- $this->page['title'] = $this->config['sitename'].' ('.$this->module.')';
+ if (!$this->module == '') {
+ $this->page['title'] = $this->config['sitename'] . ' (' . $this->module . ')';
} else {
- $this->page['title'] = $this->config['sitename'];
+ $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']))
+ if (!isset($this->page['htmlhead'])) {
$this->page['htmlhead'] = '';
+ }
// If we're using Smarty, then doing replace_macros() will replace
// any unrecognized variables with a blank string. Since we delay
// replacing $stylesheet until later, we need to replace it now
// with another variable name
- if($this->theme['template_engine'] === 'smarty3')
+ if ($this->theme['template_engine'] === 'smarty3') {
$stylesheet = $this->get_template_ldelim('smarty3') . '$stylesheet' . $this->get_template_rdelim('smarty3');
- else
+ } else {
$stylesheet = '$stylesheet';
+ }
$shortcut_icon = get_config("system", "shortcut_icon");
- if ($shortcut_icon == "")
+ if ($shortcut_icon == "") {
$shortcut_icon = "images/friendica-32.png";
+ }
$touch_icon = get_config("system", "touch_icon");
- if ($touch_icon == "")
+ if ($touch_icon == "") {
$touch_icon = "images/friendica-128.png";
+ }
// get data wich is needed for infinite scroll on the network page
$invinite_scroll = infinite_scroll_data($this->module);
@@ -983,8 +992,9 @@ class App {
}
function init_page_end() {
- if(!isset($this->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!!!!
@@ -1017,29 +1027,6 @@ class App {
function get_cached_avatar_image($avatar_image){
return $avatar_image;
-
- // The following code is deactivated. It doesn't seem to make any sense and it slows down the system.
- /*
- if($this->cached_profile_image[$avatar_image])
- return $this->cached_profile_image[$avatar_image];
-
- $path_parts = explode("/",$avatar_image);
- $common_filename = $path_parts[count($path_parts)-1];
-
- if($this->cached_profile_picdate[$common_filename]){
- $this->cached_profile_image[$avatar_image] = $avatar_image . $this->cached_profile_picdate[$common_filename];
- } else {
- $r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like '%%/%s'",
- $common_filename);
- if (! dbm::is_result($r)) {
- $this->cached_profile_image[$avatar_image] = $avatar_image;
- } else {
- $this->cached_profile_picdate[$common_filename] = "?rev=".urlencode($r[0]['picdate']);
- $this->cached_profile_image[$avatar_image] = $avatar_image.$this->cached_profile_picdate[$common_filename];
- }
- }
- return $this->cached_profile_image[$avatar_image];
- */
}
@@ -1054,7 +1041,7 @@ class App {
// Is the function called statically?
if (!(isset($this) && get_class($this) == __CLASS__)) {
- return(self::$a->remove_baseurl($orig_url));
+ return self::$a->remove_baseurl($orig_url);
}
// Remove the hostname from the url if it is an internal link
@@ -1079,11 +1066,12 @@ class App {
* @param string $name
*/
function register_template_engine($class, $name = '') {
- if ($name===""){
+ /// @TODO Really === and not just == ?
+ if ($name === "") {
$v = get_class_vars( $class );
- if(x($v,"name")) $name = $v['name'];
+ if (x($v,"name")) $name = $v['name'];
}
- if ($name===""){
+ if ($name === "") {
echo "template engine $class cannot be registered without a name.\n";
killme();
}
@@ -1099,8 +1087,9 @@ class App {
* @param strin $name Template engine name
* @return object Template Engine instance
*/
- function template_engine($name = ''){
- if ($name!=="") {
+ function template_engine($name = '') {
+ /// @TODO really type-check included?
+ if ($name !== "") {
$template_engine = $name;
} else {
$template_engine = 'smarty3';
@@ -1110,7 +1099,7 @@ class App {
}
if (isset($this->template_engines[$template_engine])){
- if(isset($this->template_engine_instance[$template_engine])){
+ if (isset($this->template_engine_instance[$template_engine])){
return $this->template_engine_instance[$template_engine];
} else {
$class = $this->template_engines[$template_engine];
@@ -1134,18 +1123,6 @@ class App {
function set_template_engine($engine = 'smarty3') {
$this->theme['template_engine'] = $engine;
- /*
- $this->theme['template_engine'] = 'smarty3';
-
- switch($engine) {
- case 'smarty3':
- if(is_writable('view/smarty3/'))
- $this->theme['template_engine'] = 'smarty3';
- break;
- default:
- break;
- }
- */
}
function get_template_ldelim($engine = 'smarty3') {
@@ -1157,8 +1134,9 @@ class App {
}
function save_timestamp($stamp, $value) {
- if (!isset($this->config['system']['profiler']) || !$this->config['system']['profiler'])
+ if (!isset($this->config['system']['profiler']) || !$this->config['system']['profiler']) {
return;
+ }
$duration = (float)(microtime(true)-$stamp);
@@ -1240,18 +1218,24 @@ class App {
array_shift($trace);
$callstack = array();
- foreach ($trace AS $func)
+ foreach ($trace AS $func) {
$callstack[] = $func["function"];
+ }
return implode(", ", $callstack);
}
function get_useragent() {
- return(FRIENDICA_PLATFORM." '".FRIENDICA_CODENAME."' ".FRIENDICA_VERSION."-".DB_UPDATE_VERSION."; ".$this->get_baseurl());
+ return
+ FRIENDICA_PLATFORM . " '" .
+ FRIENDICA_CODENAME . "' " .
+ FRIENDICA_VERSION . "-" .
+ DB_UPDATE_VERSION . "; " .
+ $this->get_baseurl();
}
function is_friendica_app() {
- return($this->is_friendica_app);
+ return $this->is_friendica_app;
}
/**
@@ -1263,31 +1247,29 @@ class App {
* @return bool Is it a known backend?
*/
function is_backend() {
- $backend = array();
- $backend[] = "_well_known";
- $backend[] = "api";
- $backend[] = "dfrn_notify";
- $backend[] = "fetch";
- $backend[] = "hcard";
- $backend[] = "hostxrd";
- $backend[] = "nodeinfo";
- $backend[] = "noscrape";
- $backend[] = "p";
- $backend[] = "poco";
- $backend[] = "post";
- $backend[] = "proxy";
- $backend[] = "pubsub";
- $backend[] = "pubsubhubbub";
- $backend[] = "receive";
- $backend[] = "rsd_xml";
- $backend[] = "salmon";
- $backend[] = "statistics_json";
- $backend[] = "xrd";
+ static $backends = array();
+ $backends[] = "_well_known";
+ $backends[] = "api";
+ $backends[] = "dfrn_notify";
+ $backends[] = "fetch";
+ $backends[] = "hcard";
+ $backends[] = "hostxrd";
+ $backends[] = "nodeinfo";
+ $backends[] = "noscrape";
+ $backends[] = "p";
+ $backends[] = "poco";
+ $backends[] = "post";
+ $backends[] = "proxy";
+ $backends[] = "pubsub";
+ $backends[] = "pubsubhubbub";
+ $backends[] = "receive";
+ $backends[] = "rsd_xml";
+ $backends[] = "salmon";
+ $backends[] = "statistics_json";
+ $backends[] = "xrd";
- if (in_array($this->module, $backend))
- return(true);
- else
- return($this->backend);
+ // Check if current module is in backend or backend flag is set
+ return (in_array($this->module, $backends) || $this->backend);
}
/**
@@ -1300,13 +1282,15 @@ class App {
if ($this->is_backend()) {
$process = "backend";
$max_processes = get_config('system', 'max_processes_backend');
- if (intval($max_processes) == 0)
+ if (intval($max_processes) == 0) {
$max_processes = 5;
+ }
} else {
$process = "frontend";
$max_processes = get_config('system', 'max_processes_frontend');
- if (intval($max_processes) == 0)
+ if (intval($max_processes) == 0) {
$max_processes = 20;
+ }
}
$processlist = dbm::processlist();
@@ -1331,13 +1315,15 @@ class App {
if ($this->is_backend()) {
$process = "backend";
$maxsysload = intval(get_config('system', 'maxloadavg'));
- if ($maxsysload < 1)
+ if ($maxsysload < 1) {
$maxsysload = 50;
+ }
} else {
$process = "frontend";
$maxsysload = intval(get_config('system','maxloadavg_frontend'));
- if ($maxsysload < 1)
+ if ($maxsysload < 1) {
$maxsysload = 50;
+ }
}
$load = current_load();
@@ -1360,11 +1346,11 @@ class App {
// This should prevent the forking of masses of workers.
$cachekey = "app:proc_run:started";
$result = Cache::get($cachekey);
- if (!is_null($result)) {
- if ((time() - $result) < 10) {
- return;
- }
+
+ if (!is_null($result) AND (time() - $result) < 10) {
+ return;
}
+
// Set the timestamp of the last proc_run
Cache::set($cachekey, time(), CACHE_MINUTE);
@@ -1373,15 +1359,17 @@ class App {
// add baseurl to args. cli scripts can't construct it
$args[] = $this->get_baseurl();
- for($x = 0; $x < count($args); $x ++)
+ for ($x = 0; $x < count($args); $x ++) {
$args[$x] = escapeshellarg($args[$x]);
+ }
- $cmdline = implode($args," ");
+ $cmdline = implode($args, " ");
- if(get_config('system','proc_windows'))
- proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo,dirname(__FILE__)));
- else
- proc_close(proc_open($cmdline." &",array(),$foo,dirname(__FILE__)));
+ if (get_config('system', 'proc_windows')) {
+ proc_close(proc_open('cmd /c start /b ' . $cmdline, array(), $foo, dirname(__FILE__)));
+ } else {
+ proc_close(proc_open($cmdline . " &", array(), $foo, dirname(__FILE__)));
+ }
}
@@ -1459,17 +1447,17 @@ function get_app() {
* @return bool|int
*/
function x($s,$k = NULL) {
- if($k != NULL) {
- if((is_array($s)) && (array_key_exists($k,$s))) {
- if($s[$k])
+ if ($k != NULL) {
+ if ((is_array($s)) && (array_key_exists($k, $s))) {
+ if ($s[$k]) {
return (int) 1;
+ }
return (int) 0;
- }
+ }
return false;
- }
- else {
- if(isset($s)) {
- if($s) {
+ } else {
+ if (isset($s)) {
+ if ($s) {
return (int) 1;
}
return (int) 0;
@@ -1497,8 +1485,9 @@ function clean_urls() {
function z_path() {
$base = App::get_baseurl();
- if(! clean_urls())
+ if (! clean_urls()) {
$base .= '/?q=';
+ }
return $base;
}
@@ -1523,8 +1512,9 @@ function z_root() {
* @return string
*/
function absurl($path) {
- if(strpos($path,'/') === 0)
+ if (strpos($path,'/') === 0) {
return z_path() . $path;
+ }
return $path;
}
@@ -1540,12 +1530,13 @@ function is_ajax() {
function check_db() {
$build = get_config('system','build');
- if(! x($build)) {
+ if (! x($build)) {
set_config('system','build',DB_UPDATE_VERSION);
$build = DB_UPDATE_VERSION;
}
- if($build != DB_UPDATE_VERSION)
+ if ($build != DB_UPDATE_VERSION) {
proc_run(PRIORITY_CRITICAL, 'include/dbupdate.php');
+ }
}
@@ -1564,10 +1555,12 @@ function check_url(App $a) {
// and www.example.com vs example.com.
// We will only change the url to an ip address if there is no existing setting
- if(! x($url))
+ if (! x($url)) {
$url = set_config('system','url',App::get_baseurl());
- if((! link_compare($url,App::get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname)))
+ }
+ if ((! link_compare($url,App::get_baseurl())) && (! preg_match("/^(\d{1,3})\.(\d{1,3})\.(\d{1,3})\.(\d{1,3})$/",$a->get_hostname))) {
$url = set_config('system','url',App::get_baseurl());
+ }
return;
}
@@ -1578,13 +1571,14 @@ function check_url(App $a) {
*/
function update_db(App $a) {
$build = get_config('system','build');
- if(! x($build))
+ if (! x($build)) {
$build = set_config('system','build',DB_UPDATE_VERSION);
+ }
- if($build != DB_UPDATE_VERSION) {
+ if ($build != DB_UPDATE_VERSION) {
$stored = intval($build);
$current = intval(DB_UPDATE_VERSION);
- if($stored < $current) {
+ if ($stored < $current) {
Config::load('database');
// We're reporting a different version than what is currently installed.
@@ -1594,12 +1588,13 @@ function update_db(App $a) {
// updating right this very second and the correct version of the update.php
// file may not be here yet. This can happen on a very busy site.
- if(DB_UPDATE_VERSION == UPDATE_VERSION) {
+ if (DB_UPDATE_VERSION == UPDATE_VERSION) {
// Compare the current structure with the defined structure
$t = get_config('database','dbupdate_'.DB_UPDATE_VERSION);
- if($t !== false)
+ if ($t !== false) {
return;
+ }
set_config('database','dbupdate_'.DB_UPDATE_VERSION, time());
@@ -1607,15 +1602,18 @@ function update_db(App $a) {
// conflits with new routine)
for ($x = $stored; $x < NEW_UPDATE_ROUTINE_VERSION; $x++) {
$r = run_update_function($x);
- if (!$r) break;
+ if (!$r) {
+ break;
+ }
+ }
+ if ($stored < NEW_UPDATE_ROUTINE_VERSION) {
+ $stored = NEW_UPDATE_ROUTINE_VERSION;
}
- if ($stored < NEW_UPDATE_ROUTINE_VERSION) $stored = NEW_UPDATE_ROUTINE_VERSION;
-
// run new update routine
// it update the structure in one call
$retval = update_structure(false, true);
- if($retval) {
+ if ($retval) {
update_fail(
DB_UPDATE_VERSION,
$retval
@@ -1626,9 +1624,11 @@ function update_db(App $a) {
}
// run any left update_nnnn functions in update.php
- for($x = $stored; $x < $current; $x ++) {
+ for ($x = $stored; $x < $current; $x ++) {
$r = run_update_function($x);
- if (!$r) break;
+ if (!$r) {
+ break;
+ }
}
}
}
@@ -1638,7 +1638,7 @@ function update_db(App $a) {
}
function run_update_function($x) {
- if(function_exists('update_' . $x)) {
+ if (function_exists('update_' . $x)) {
// There could be a lot of processes running or about to run.
// We want exactly one process to run the update command.
@@ -1649,8 +1649,9 @@ function run_update_function($x) {
// delete the config entry to try again.
$t = get_config('database','update_' . $x);
- if($t !== false)
+ if ($t !== false) {
return false;
+ }
set_config('database','update_' . $x, time());
// call the specific update
@@ -1658,7 +1659,7 @@ function run_update_function($x) {
$func = 'update_' . $x;
$retval = $func();
- if($retval) {
+ if ($retval) {
//send the administrator an e-mail
update_fail(
$x,
@@ -1691,39 +1692,40 @@ function run_update_function($x) {
*
* @param App $a
*
- */
+ */
function check_plugins(App $a) {
$r = q("SELECT * FROM `addon` WHERE `installed` = 1");
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
$installed = $r;
- else
+ } else {
$installed = array();
+ }
$plugins = get_config('system','addon');
$plugins_arr = array();
- if($plugins)
+ if ($plugins) {
$plugins_arr = explode(',',str_replace(' ', '',$plugins));
+ }
$a->plugins = $plugins_arr;
$installed_arr = array();
- if(count($installed)) {
- foreach($installed as $i) {
- if(! in_array($i['name'],$plugins_arr)) {
+ if (count($installed)) {
+ foreach ($installed as $i) {
+ if (! in_array($i['name'],$plugins_arr)) {
uninstall_plugin($i['name']);
- }
- else {
+ } else {
$installed_arr[] = $i['name'];
}
}
}
- if(count($plugins_arr)) {
- foreach($plugins_arr as $p) {
- if(! in_array($p,$installed_arr)) {
+ if (count($plugins_arr)) {
+ foreach ($plugins_arr as $p) {
+ if (! in_array($p,$installed_arr)) {
install_plugin($p);
}
}
@@ -1742,8 +1744,9 @@ function get_guid($size=16, $prefix = "") {
$prefix = hash("crc32", $a->get_hostname());
}
- while (strlen($prefix) < ($size - 13))
+ while (strlen($prefix) < ($size - 13)) {
$prefix .= mt_rand();
+ }
if ($size >= 24) {
$prefix = substr($prefix, 0, $size - 22);
@@ -1783,12 +1786,11 @@ function login($register = false, $hiddens=false) {
$dest_url = $a->query_string;
- if(local_user()) {
+ if (local_user()) {
$tpl = get_markup_template("logout.tpl");
- }
- else {
+ } else {
$a->page['htmlhead'] .= replace_macros(get_markup_template("login_head.tpl"),array(
- '$baseurl' => $a->get_baseurl(true)
+ '$baseurl' => $a->get_baseurl(true)
));
$tpl = get_markup_template("login.tpl");
@@ -1798,29 +1800,29 @@ function login($register = false, $hiddens=false) {
$o .= replace_macros($tpl, array(
- '$dest_url' => $dest_url,
- '$logout' => t('Logout'),
- '$login' => t('Login'),
+ '$dest_url' => $dest_url,
+ '$logout' => t('Logout'),
+ '$login' => t('Login'),
- '$lname' => array('username', t('Nickname or Email: ') , '', ''),
- '$lpassword' => array('password', t('Password: '), '', ''),
- '$lremember' => array('remember', t('Remember me'), 0, ''),
+ '$lname' => array('username', t('Nickname or Email: ') , '', ''),
+ '$lpassword' => array('password', t('Password: '), '', ''),
+ '$lremember' => array('remember', t('Remember me'), 0, ''),
- '$openid' => !$noid,
- '$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''),
+ '$openid' => !$noid,
+ '$lopenid' => array('openid_url', t('Or login using OpenID: '),'',''),
- '$hiddens' => $hiddens,
+ '$hiddens' => $hiddens,
- '$register' => $reg,
+ '$register' => $reg,
'$lostpass' => t('Forgot your password?'),
'$lostlink' => t('Password Reset'),
- '$tostitle' => t('Website Terms of Service'),
- '$toslink' => t('terms of service'),
+ '$tostitle' => t('Website Terms of Service'),
+ '$toslink' => t('terms of service'),
- '$privacytitle' => t('Website Privacy Policy'),
- '$privacylink' => t('privacy policy'),
+ '$privacytitle' => t('Website Privacy Policy'),
+ '$privacylink' => t('privacy policy'),
));
@@ -1834,18 +1836,20 @@ function login($register = false, $hiddens=false) {
*/
function killme() {
- if (!get_app()->is_backend())
+ if (!get_app()->is_backend()) {
session_write_close();
+ }
- exit;
+ exit();
}
/**
* @brief Redirect to another URL and terminate this process.
*/
function goaway($s) {
- if (!strstr(normalise_link($s), "http://"))
+ if (!strstr(normalise_link($s), "http://")) {
$s = App::get_baseurl()."/".$s;
+ }
header("Location: $s");
killme();
@@ -1876,11 +1880,11 @@ function public_contact() {
if (x($_SESSION, 'my_address')) {
// Local user
$public_contact_id = intval(get_contact($_SESSION['my_address'], 0));
- } else if (x($_SESSION, 'visitor_home')) {
+ } elseif (x($_SESSION, 'visitor_home')) {
// Remote user
$public_contact_id = intval(get_contact($_SESSION['visitor_home'], 0));
}
- } else if (!x($_SESSION, 'authenticated')) {
+ } elseif (!x($_SESSION, 'authenticated')) {
$public_contact_id = false;
}
@@ -1893,8 +1897,9 @@ function public_contact() {
* @return int|bool visitor_id or false
*/
function remote_user() {
- if((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id')))
+ if ((x($_SESSION,'authenticated')) && (x($_SESSION,'visitor_id'))) {
return intval($_SESSION['visitor_id']);
+ }
return false;
}
@@ -1907,9 +1912,12 @@ function remote_user() {
*/
function notice($s) {
$a = get_app();
- if(! x($_SESSION,'sysmsg')) $_SESSION['sysmsg'] = array();
- if($a->interactive)
+ if (! x($_SESSION,'sysmsg')) {
+ $_SESSION['sysmsg'] = array();
+ }
+ if ($a->interactive) {
$_SESSION['sysmsg'][] = $s;
+ }
}
/**
@@ -1922,12 +1930,16 @@ function notice($s) {
function info($s) {
$a = get_app();
- if (local_user() AND get_pconfig(local_user(),'system','ignore_info'))
+ if (local_user() AND get_pconfig(local_user(),'system','ignore_info')) {
return;
+ }
- if(! x($_SESSION,'sysmsg_info')) $_SESSION['sysmsg_info'] = array();
- if($a->interactive)
+ if (! x($_SESSION,'sysmsg_info')) {
+ $_SESSION['sysmsg_info'] = array();
+ }
+ if ($a->interactive) {
$_SESSION['sysmsg_info'][] = $s;
+ }
}
@@ -1989,8 +2001,9 @@ function proc_run($cmd){
$arr = array('args' => $args, 'run_cmd' => true);
call_hooks("proc_run", $arr);
- if (!$arr['run_cmd'] OR !count($args))
+ if (!$arr['run_cmd'] OR !count($args)) {
return;
+ }
$priority = PRIORITY_MEDIUM;
$dont_fork = get_config("system", "worker_dont_fork");
@@ -2013,12 +2026,13 @@ function proc_run($cmd){
$found = q("SELECT `id` FROM `workerqueue` WHERE `parameter` = '%s'",
dbesc($parameters));
- if (!$found)
+ if (!dbm::is_result($found)) {
q("INSERT INTO `workerqueue` (`parameter`, `created`, `priority`)
VALUES ('%s', '%s', %d)",
dbesc($parameters),
dbesc(datetime_convert()),
intval($priority));
+ }
// Should we quit and wait for the poller to be called as a cronjob?
if ($dont_fork) {
@@ -2031,12 +2045,14 @@ function proc_run($cmd){
// Get number of allowed number of worker threads
$queues = intval(get_config("system", "worker_queues"));
- if ($queues == 0)
+ if ($queues == 0) {
$queues = 4;
+ }
// If there are already enough workers running, don't fork another one
- if ($workers[0]["workers"] >= $queues)
+ if ($workers[0]["workers"] >= $queues) {
return;
+ }
// Now call the poller to execute the jobs that we just added to the queue
$args = array("include/poller.php", "no_cron");
@@ -2053,20 +2069,22 @@ function current_theme(){
// Find the theme that belongs to the user whose stuff we are looking at
- if($a->profile_uid && ($a->profile_uid != local_user())) {
+ if ($a->profile_uid && ($a->profile_uid != local_user())) {
$r = q("select theme from user where uid = %d limit 1",
intval($a->profile_uid)
);
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
$page_theme = $r[0]['theme'];
+ }
}
// Allow folks to over-rule user themes and always use their own on their own site.
// This works only if the user is on the same server
- if($page_theme && local_user() && (local_user() != $a->profile_uid)) {
- if(get_pconfig(local_user(),'system','always_my_theme'))
+ if ($page_theme && local_user() && (local_user() != $a->profile_uid)) {
+ if (get_pconfig(local_user(),'system','always_my_theme')) {
$page_theme = null;
+ }
}
// $mobile_detect = new Mobile_Detect();
@@ -2087,39 +2105,44 @@ function current_theme(){
}
$theme_name = ((isset($_SESSION) && x($_SESSION,'mobile-theme')) ? $_SESSION['mobile-theme'] : $system_theme);
- if($theme_name === '---') {
+ if ($theme_name === '---') {
// user has selected to have the mobile theme be the same as the normal one
$system_theme = $standard_system_theme;
$theme_name = $standard_theme_name;
- if($page_theme)
+ if ($page_theme) {
$theme_name = $page_theme;
+ }
}
}
- }
- else {
+ } else {
$system_theme = $standard_system_theme;
$theme_name = $standard_theme_name;
- if($page_theme)
+ if ($page_theme) {
$theme_name = $page_theme;
+ }
}
- if($theme_name &&
+ if ($theme_name &&
(file_exists('view/theme/' . $theme_name . '/style.css') ||
- file_exists('view/theme/' . $theme_name . '/style.php')))
+ file_exists('view/theme/' . $theme_name . '/style.php'))) {
return($theme_name);
+ }
- foreach($app_base_themes as $t) {
- if(file_exists('view/theme/' . $t . '/style.css')||
- file_exists('view/theme/' . $t . '/style.php'))
+ foreach ($app_base_themes as $t) {
+ if (file_exists('view/theme/' . $t . '/style.css') ||
+ file_exists('view/theme/' . $t . '/style.php')) {
return($t);
+ }
}
$fallback = array_merge(glob('view/theme/*/style.css'),glob('view/theme/*/style.php'));
- if(count($fallback))
+ if (count($fallback)) {
return (str_replace('view/theme/','', substr($fallback[0],0,-10)));
+ }
+ /// @TODO No final return statement?
}
/**
@@ -2135,8 +2158,9 @@ function current_theme_url() {
$t = current_theme();
$opts = (($a->profile_uid) ? '?f=&puid=' . $a->profile_uid : '');
- if (file_exists('view/theme/' . $t . '/style.php'))
+ if (file_exists('view/theme/' . $t . '/style.php')) {
return('view/theme/'.$t.'/style.pcss'.$opts);
+ }
return('view/theme/'.$t.'/style.css');
}
@@ -2165,8 +2189,9 @@ function feed_birthday($uid,$tz) {
$birthday = '';
- if(! strlen($tz))
+ if (! strlen($tz)) {
$tz = 'UTC';
+ }
$p = q("SELECT `dob` FROM `profile` WHERE `is-default` = 1 AND `uid` = %d LIMIT 1",
intval($uid)
@@ -2174,13 +2199,14 @@ function feed_birthday($uid,$tz) {
if (dbm::is_result($p)) {
$tmp_dob = substr($p[0]['dob'],5);
- if(intval($tmp_dob)) {
+ if (intval($tmp_dob)) {
$y = datetime_convert($tz,$tz,'now','Y');
$bd = $y . '-' . $tmp_dob . ' 00:00';
$t_dob = strtotime($bd);
$now = strtotime(datetime_convert($tz,$tz,'now'));
- if($t_dob < $now)
+ if ($t_dob < $now) {
$bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
+ }
$birthday = datetime_convert($tz,'UTC',$bd,ATOM_TIME);
}
}
@@ -2199,8 +2225,9 @@ function is_site_admin() {
$adminlist = explode(",", str_replace(" ", "", $a->config['admin_email']));
//if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && ($a->user['email'] === $a->config['admin_email']))
- if(local_user() && x($a->user,'email') && x($a->config,'admin_email') && in_array($a->user['email'], $adminlist))
+ if (local_user() && x($a->user,'email') && x($a->config,'admin_email') && in_array($a->user['email'], $adminlist)) {
return true;
+ }
return false;
}
@@ -2212,21 +2239,24 @@ function is_site_admin() {
*
* @return string
*/
-function build_querystring($params, $name=null) {
+function build_querystring($params, $name = null) {
$ret = "";
- foreach($params as $key=>$val) {
- if(is_array($val)) {
- if($name==null) {
+ foreach ($params as $key => $val) {
+ if (is_array($val)) {
+ /// @TODO maybe not compare against null, use is_null()
+ if ($name == null) {
$ret .= build_querystring($val, $key);
} else {
$ret .= build_querystring($val, $name."[$key]");
}
} else {
$val = urlencode($val);
- if($name!=null) {
- $ret.=$name."[$key]"."=$val&";
+ /// @TODO maybe not compare against null, use is_null()
+ if ($name != null) {
+ /// @TODO two string concated, can be merged to one
+ $ret .= $name . "[$key]" . "=$val&";
} else {
- $ret.= "$key=$val&";
+ $ret .= "$key=$val&";
}
}
}
@@ -2235,7 +2265,7 @@ function build_querystring($params, $name=null) {
function explode_querystring($query) {
$arg_st = strpos($query, '?');
- if($arg_st !== false) {
+ if ($arg_st !== false) {
$base = substr($query, 0, $arg_st);
$arg_st += 1;
} else {
@@ -2244,13 +2274,15 @@ function explode_querystring($query) {
}
$args = explode('&', substr($query, $arg_st));
- foreach($args as $k=>$arg) {
- if($arg === '')
+ foreach ($args as $k => $arg) {
+ /// @TODO really compare type-safe here?
+ if ($arg === '') {
unset($args[$k]);
+ }
}
$args = array_values($args);
- if(!$base) {
+ if (!$base) {
$base = $args[0];
unset($args[0]);
$args = array_values($args);
@@ -2269,8 +2301,12 @@ function explode_querystring($query) {
*/
function curPageURL() {
$pageURL = 'http';
- if ($_SERVER["HTTPS"] == "on") {$pageURL .= "s";}
+ if ($_SERVER["HTTPS"] == "on") {
+ $pageURL .= "s";
+ }
+
$pageURL .= "://";
+
if ($_SERVER["SERVER_PORT"] != "80" && $_SERVER["SERVER_PORT"] != "443") {
$pageURL .= $_SERVER["SERVER_NAME"].":".$_SERVER["SERVER_PORT"].$_SERVER["REQUEST_URI"];
} else {
@@ -2281,7 +2317,8 @@ function curPageURL() {
function random_digits($digits) {
$rn = '';
- for($i = 0; $i < $digits; $i++) {
+ for ($i = 0; $i < $digits; $i++) {
+ /// @TODO rand() is different to mt_rand() and maybe lesser "random"
$rn .= rand(0,9);
}
return $rn;
@@ -2290,8 +2327,9 @@ function random_digits($digits) {
function get_server() {
$server = get_config("system", "directory");
- if ($server == "")
+ if ($server == "") {
$server = "http://dir.friendi.ca";
+ }
return($server);
}
@@ -2299,12 +2337,13 @@ function get_server() {
function get_cachefile($file, $writemode = true) {
$cache = get_itemcachepath();
- if ((! $cache) || (! is_dir($cache)))
+ if ((! $cache) || (! is_dir($cache))) {
return("");
+ }
- $subfolder = $cache."/".substr($file, 0, 2);
+ $subfolder = $cache . "/" . substr($file, 0, 2);
- $cachepath = $subfolder."/".$file;
+ $cachepath = $subfolder . "/" . $file;
if ($writemode) {
if (!is_dir($subfolder)) {
@@ -2313,7 +2352,8 @@ function get_cachefile($file, $writemode = true) {
}
}
- return($cachepath);
+ /// @TODO no need to put braces here
+ return $cachepath;
}
function clear_cache($basepath = "", $path = "") {
@@ -2322,24 +2362,29 @@ function clear_cache($basepath = "", $path = "") {
$path = $basepath;
}
- if (($path == "") OR (!is_dir($path)))
+ if (($path == "") OR (!is_dir($path))) {
return;
+ }
- if (substr(realpath($path), 0, strlen($basepath)) != $basepath)
+ if (substr(realpath($path), 0, strlen($basepath)) != $basepath) {
return;
+ }
$cachetime = (int)get_config('system','itemcache_duration');
- if ($cachetime == 0)
+ if ($cachetime == 0) {
$cachetime = 86400;
+ }
if (is_writable($path)){
if ($dh = opendir($path)) {
while (($file = readdir($dh)) !== false) {
$fullpath = $path."/".$file;
- if ((filetype($fullpath) == "dir") and ($file != ".") and ($file != ".."))
+ if ((filetype($fullpath) == "dir") and ($file != ".") and ($file != "..")) {
clear_cache($basepath, $fullpath);
- if ((filetype($fullpath) == "file") and (filectime($fullpath) < (time() - $cachetime)))
+ }
+ if ((filetype($fullpath) == "file") and (filectime($fullpath) < (time() - $cachetime))) {
unlink($fullpath);
+ }
}
closedir($dh);
}
@@ -2349,8 +2394,9 @@ function clear_cache($basepath = "", $path = "") {
function get_itemcachepath() {
// Checking, if the cache is deactivated
$cachetime = (int)get_config('system','itemcache_duration');
- if ($cachetime < 0)
+ if ($cachetime < 0) {
return "";
+ }
$itemcache = get_config('system','itemcache');
if (($itemcache != "") AND App::directory_usable($itemcache)) {
@@ -2361,7 +2407,7 @@ function get_itemcachepath() {
if ($temppath != "") {
$itemcache = $temppath."/itemcache";
- if(!file_exists($itemcache) && !is_dir($itemcache)) {
+ if (!file_exists($itemcache) && !is_dir($itemcache)) {
mkdir($itemcache);
}
@@ -2427,8 +2473,10 @@ function get_temppath() {
if (($temppath != "") AND App::directory_usable($temppath)) {
// To avoid any interferences with other systems we create our own directory
$new_temppath .= "/".$a->get_hostname();
- if (!is_dir($new_temppath))
+ if (!is_dir($new_temppath)) {
+ /// @TODO There is a mkdir()+chmod() upwards, maybe generalize this (+ configurable) into a function/method?
mkdir($new_temppath);
+ }
if (App::directory_usable($new_temppath)) {
// The new path is usable, we are happy
@@ -2449,14 +2497,15 @@ function get_temppath() {
function set_template_engine(App $a, $engine = 'internal') {
/// @note This function is no longer necessary, but keep it as a wrapper to the class method
/// to avoid breaking themes again unnecessarily
+/// @TODO maybe output a warning here so the theme developer can see it? PHP won't show such warnings like Java does.
$a->set_template_engine($engine);
}
-if(!function_exists('exif_imagetype')) {
+if (!function_exists('exif_imagetype')) {
function exif_imagetype($file) {
$size = getimagesize($file);
- return($size[2]);
+ return $size[2];
}
}
@@ -2465,37 +2514,42 @@ function validate_include(&$file) {
$file = realpath($file);
- if (strpos($file, getcwd()) !== 0)
+ if (strpos($file, getcwd()) !== 0) {
return false;
+ }
$file = str_replace(getcwd()."/", "", $file, $count);
- if ($count != 1)
+ if ($count != 1) {
return false;
+ }
- if ($orig_file !== $file)
+ if ($orig_file !== $file) {
return false;
+ }
$valid = false;
- if (strpos($file, "include/") === 0)
+ if (strpos($file, "include/") === 0) {
$valid = true;
+ }
- if (strpos($file, "addon/") === 0)
+ if (strpos($file, "addon/") === 0) {
$valid = true;
+ }
- if (!$valid)
- return false;
-
- return true;
+ // Simply return flag
+ return ($valid);
}
function current_load() {
- if (!function_exists('sys_getloadavg'))
+ if (!function_exists('sys_getloadavg')) {
return false;
+ }
$load_arr = sys_getloadavg();
- if (!is_array($load_arr))
+ if (!is_array($load_arr)) {
return false;
+ }
return max($load_arr[0], $load_arr[1]);
}
@@ -2516,8 +2570,9 @@ function argc() {
* @return string Value of the argv key
*/
function argv($x) {
- if(array_key_exists($x,get_app()->argv))
+ if (array_key_exists($x,get_app()->argv)) {
return get_app()->argv[$x];
+ }
return '';
}
@@ -2541,20 +2596,24 @@ function infinite_scroll_data($module) {
AND ($module == "network") AND ($_GET["mode"] != "minimal")) {
// get the page number
- if (is_string($_GET["page"]))
+ if (is_string($_GET["page"])) {
$pageno = $_GET["page"];
- else
+ } else {
$pageno = 1;
+ }
$reload_uri = "";
// try to get the uri from which we load the content
- foreach ($_GET AS $param => $value)
- if (($param != "page") AND ($param != "q"))
- $reload_uri .= "&".$param."=".urlencode($value);
+ foreach ($_GET AS $param => $value) {
+ if (($param != "page") AND ($param != "q")) {
+ $reload_uri .= "&" . $param . "=" . urlencode($value);
+ }
+ }
- if (($a->page_offset != "") AND !strstr($reload_uri, "&offset="))
- $reload_uri .= "&offset=".urlencode($a->page_offset);
+ if (($a->page_offset != "") AND !strstr($reload_uri, "&offset=")) {
+ $reload_uri .= "&offset=" . urlencode($a->page_offset);
+ }
$arr = array("pageno" => $pageno, "reload_uri" => $reload_uri);
diff --git a/include/dfrn.php b/include/dfrn.php
index 4002bb4268..aae935963d 100644
--- a/include/dfrn.php
+++ b/include/dfrn.php
@@ -41,6 +41,7 @@ class dfrn {
* @param array $owner Owner record
*
* @return string DFRN entries
+ * @todo Add type-hints
*/
public static function entries($items,$owner) {
@@ -49,10 +50,11 @@ class dfrn {
$root = self::add_header($doc, $owner, "dfrn:owner", "", false);
- if(! count($items))
+ if (! count($items)) {
return trim($doc->saveXML());
+ }
- foreach($items as $item) {
+ foreach ($items as $item) {
$entry = self::entry($doc, "text", $item, $owner, $item["entry:comment-allow"], $item["entry:cid"]);
$root->appendChild($entry);
}
@@ -82,14 +84,17 @@ class dfrn {
$starred = false; // not yet implemented, possible security issues
$converse = false;
- if($public_feed && $a->argc > 2) {
- for($x = 2; $x < $a->argc; $x++) {
- if($a->argv[$x] == 'converse')
+ if ($public_feed && $a->argc > 2) {
+ for ($x = 2; $x < $a->argc; $x++) {
+ if ($a->argv[$x] == 'converse') {
$converse = true;
- if($a->argv[$x] == 'starred')
+ }
+ if ($a->argv[$x] == 'starred') {
$starred = true;
- if($a->argv[$x] == 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1]))
+ }
+ if ($a->argv[$x] == 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1])) {
$category = $a->argv[$x+1];
+ }
}
}
@@ -115,7 +120,7 @@ class dfrn {
$sql_post_table = "";
- if(! $public_feed) {
+ if (! $public_feed) {
$sql_extra = '';
switch($direction) {
@@ -148,12 +153,13 @@ class dfrn {
require_once('include/security.php');
$groups = init_groups_visitor($contact['id']);
- if(count($groups)) {
- for($x = 0; $x < count($groups); $x ++)
+ if (count($groups)) {
+ for ($x = 0; $x < count($groups); $x ++)
$groups[$x] = '<' . intval($groups[$x]) . '>' ;
$gs = implode('|', $groups);
- } else
+ } else {
$gs = '<<>>' ; // Impossible to match
+ }
$sql_extra = sprintf("
AND ( `allow_cid` = '' OR `allow_cid` REGEXP '<%d>' )
@@ -168,23 +174,26 @@ class dfrn {
);
}
- if($public_feed)
+ if ($public_feed) {
$sort = 'DESC';
- else
+ } else {
$sort = 'ASC';
+ }
- if(! strlen($last_update))
+ if (! strlen($last_update)) {
$last_update = 'now -30 days';
+ }
- if(isset($category)) {
+ if (isset($category)) {
$sql_post_table = sprintf("INNER JOIN (SELECT `oid` FROM `term` WHERE `term` = '%s' AND `otype` = %d AND `type` = %d AND `uid` = %d ORDER BY `tid` DESC) AS `term` ON `item`.`id` = `term`.`oid` ",
dbesc(protect_sprintf($category)), intval(TERM_OBJ_POST), intval(TERM_CATEGORY), intval($owner_id));
//$sql_extra .= file_tag_file_query('item',$category,'category');
}
- if($public_feed) {
- if(! $converse)
+ if ($public_feed) {
+ if (! $converse) {
$sql_extra .= " AND `contact`.`self` = 1 ";
+ }
}
$check_date = datetime_convert('UTC','UTC',$last_update,'Y-m-d H:i:s');
@@ -207,8 +216,10 @@ class dfrn {
dbesc($sort)
);
- // Will check further below if this actually returned results.
- // We will provide an empty feed if that is the case.
+ /*
+ * Will check further below if this actually returned results.
+ * We will provide an empty feed if that is the case.
+ */
$items = $r;
@@ -217,20 +228,22 @@ class dfrn {
$alternatelink = $owner['url'];
- if(isset($category))
+ if (isset($category)) {
$alternatelink .= "/category/".$category;
+ }
- if ($public_feed)
+ if ($public_feed) {
$author = "dfrn:owner";
- else
+ } else {
$author = "author";
+ }
$root = self::add_header($doc, $owner, $author, $alternatelink, true);
- // This hook can't work anymore
+ /// @TODO This hook can't work anymore
// call_hooks('atom_feed', $atom);
- if (!count($items) OR $onlyheader) {
+ if (!dbm::is_result($items) OR $onlyheader) {
$atom = trim($doc->saveXML());
call_hooks('atom_feed_end', $atom);
@@ -238,21 +251,24 @@ class dfrn {
return $atom;
}
- foreach($items as $item) {
+ foreach ($items as $item) {
// prevent private email from leaking.
- if($item['network'] == NETWORK_MAIL)
+ if ($item['network'] == NETWORK_MAIL) {
continue;
+ }
// public feeds get html, our own nodes use bbcode
- if($public_feed) {
+ if ($public_feed) {
$type = 'html';
// catch any email that's in a public conversation and make sure it doesn't leak
- if($item['private'])
+ if ($item['private']) {
continue;
- } else
+ }
+ } else {
$type = 'text';
+ }
$entry = self::entry($doc, $type, $item, $owner, true);
$root->appendChild($entry);
@@ -273,6 +289,7 @@ class dfrn {
* @param array $owner Owner record
*
* @return string DFRN mail
+ * @todo Add type-hints
*/
public static function mail($item, $owner) {
$doc = new DOMDocument('1.0', 'utf-8');
@@ -307,6 +324,7 @@ class dfrn {
* @param array $owner Owner record
*
* @return string DFRN suggestions
+ * @todo Add type-hints
*/
public static function fsuggest($item, $owner) {
$doc = new DOMDocument('1.0', 'utf-8');
@@ -334,12 +352,13 @@ class dfrn {
* @param int $uid User ID
*
* @return string DFRN relocations
+ * @todo Add type-hints
*/
public static function relocate($owner, $uid) {
/* get site pubkey. this could be a new installation with no site keys*/
$pubkey = get_config('system','site_pubkey');
- if(! $pubkey) {
+ if (! $pubkey) {
$res = new_keypair(1024);
set_config('system','site_prvkey', $res['prvkey']);
set_config('system','site_pubkey', $res['pubkey']);
@@ -350,8 +369,9 @@ class dfrn {
$photos = array();
$ext = Photo::supportedTypes();
- foreach($rp as $p)
+ foreach ($rp as $p) {
$photos[$p['scale']] = app::get_baseurl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
+ }
unset($rp, $ext);
@@ -390,11 +410,13 @@ class dfrn {
* @param bool $public Is it a header for public posts?
*
* @return object XML root object
+ * @todo Add type-hints
*/
private static function add_header($doc, $owner, $authorelement, $alternatelink = "", $public = false) {
- if ($alternatelink == "")
+ if ($alternatelink == "") {
$alternatelink = $owner['url'];
+ }
$root = $doc->createElementNS(NAMESPACE_ATOM1, 'feed');
$doc->appendChild($root);
@@ -437,8 +459,9 @@ class dfrn {
}
// For backward compatibility we keep this element
- if ($owner['page-flags'] == PAGE_COMMUNITY)
+ if ($owner['page-flags'] == PAGE_COMMUNITY) {
xml::add_element($doc, $root, "dfrn:community", 1);
+ }
// The former element is replaced by this one
xml::add_element($doc, $root, "dfrn:account_type", $owner["account-type"]);
@@ -461,6 +484,7 @@ class dfrn {
* @param string $authorelement Element name for the author
*
* @return object XML author object
+ * @todo Add type-hints
*/
private static function add_author($doc, $owner, $authorelement, $public) {
@@ -468,10 +492,11 @@ class dfrn {
$r = q("SELECT `id` FROM `profile` INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE (`hidewall` OR NOT `net-publish`) AND `user`.`uid` = %d",
intval($owner['uid']));
- if ($r)
+ if (dbm::is_result($r)) {
$hidewall = true;
- else
+ } else {
$hidewall = false;
+ }
$author = $doc->createElement($authorelement);
@@ -479,10 +504,11 @@ class dfrn {
$uridate = datetime_convert('UTC', 'UTC', $owner['uri-date'].'+00:00', ATOM_TIME);
$picdate = datetime_convert('UTC', 'UTC', $owner['avatar-date'].'+00:00', ATOM_TIME);
- if (!$public OR !$hidewall)
+ $attributes = array();
+
+ if (!$public OR !$hidewall) {
$attributes = array("dfrn:updated" => $namdate);
- else
- $attributes = array();
+ }
xml::add_element($doc, $author, "name", $owner["name"], $attributes);
xml::add_element($doc, $author, "uri", app::get_baseurl().'/profile/'.$owner["nickname"], $attributes);
@@ -491,20 +517,23 @@ class dfrn {
$attributes = array("rel" => "photo", "type" => "image/jpeg",
"media:width" => 175, "media:height" => 175, "href" => $owner['photo']);
- if (!$public OR !$hidewall)
+ if (!$public OR !$hidewall) {
$attributes["dfrn:updated"] = $picdate;
+ }
xml::add_element($doc, $author, "link", "", $attributes);
$attributes["rel"] = "avatar";
xml::add_element($doc, $author, "link", "", $attributes);
- if ($hidewall)
+ if ($hidewall) {
xml::add_element($doc, $author, "dfrn:hide", "true");
+ }
// The following fields will only be generated if the data isn't meant for a public feed
- if ($public)
+ if ($public) {
return $author;
+ }
$birthday = feed_birthday($owner['uid'], $owner['timezone']);
@@ -519,7 +548,7 @@ class dfrn {
INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
WHERE `profile`.`is-default` AND NOT `user`.`hidewall` AND `user`.`uid` = %d",
intval($owner['uid']));
- if ($r) {
+ if (dbm::is_result($r)) {
$profile = $r[0];
xml::add_element($doc, $author, "poco:displayName", $profile["name"]);
@@ -547,8 +576,9 @@ class dfrn {
if (trim($profile["pub_keywords"]) != "") {
$keywords = explode(",", $profile["pub_keywords"]);
- foreach ($keywords AS $keyword)
+ foreach ($keywords AS $keyword) {
xml::add_element($doc, $author, "poco:tags", trim($keyword));
+ }
}
@@ -565,14 +595,17 @@ class dfrn {
xml::add_element($doc, $element, "poco:formatted", formatted_location($profile));
- if (trim($profile["locality"]) != "")
+ if (trim($profile["locality"]) != "") {
xml::add_element($doc, $element, "poco:locality", $profile["locality"]);
+ }
- if (trim($profile["region"]) != "")
+ if (trim($profile["region"]) != "") {
xml::add_element($doc, $element, "poco:region", $profile["region"]);
+ }
- if (trim($profile["country-name"]) != "")
+ if (trim($profile["country-name"]) != "") {
xml::add_element($doc, $element, "poco:country", $profile["country-name"]);
+ }
$author->appendChild($element);
}
@@ -590,6 +623,7 @@ class dfrn {
* @param array $items Item elements
*
* @return object XML author object
+ * @todo Add type-hints
*/
private static function add_entry_author($doc, $element, $contact_url, $item) {
@@ -630,35 +664,43 @@ class dfrn {
* @param string $activity activity value
*
* @return object XML activity object
+ * @todo Add type-hints
*/
private static function create_activity($doc, $element, $activity) {
- if($activity) {
+ if ($activity) {
$entry = $doc->createElement($element);
$r = parse_xml_string($activity, false);
- if(!$r)
+ if (!$r) {
return false;
- if($r->type)
+ }
+ if ($r->type) {
xml::add_element($doc, $entry, "activity:object-type", $r->type);
- if($r->id)
+ }
+ if ($r->id) {
xml::add_element($doc, $entry, "id", $r->id);
- if($r->title)
+ }
+ if ($r->title) {
xml::add_element($doc, $entry, "title", $r->title);
- if($r->link) {
- if(substr($r->link,0,1) == '<') {
- if(strstr($r->link,'&') && (! strstr($r->link,'&')))
- $r->link = str_replace('&','&', $r->link);
+ }
- $r->link = preg_replace('/\/','',$r->link);
+ if ($r->link) {
+ if (substr($r->link, 0, 1) == '<') {
+ if (strstr($r->link, '&') && (! strstr($r->link, '&'))) {
+ $r->link = str_replace('&', '&', $r->link);
+ }
+
+ $r->link = preg_replace('/\/', '', $r->link);
// XML does need a single element as root element so we add a dummy element here
- $data = parse_xml_string("".$r->link."", false);
+ $data = parse_xml_string("" . $r->link . "", false);
if (is_object($data)) {
foreach ($data->link AS $link) {
$attributes = array();
- foreach ($link->attributes() AS $parameter => $value)
+ foreach ($link->attributes() AS $parameter => $value) {
$attributes[$parameter] = $value;
+ }
xml::add_element($doc, $entry, "link", "", $attributes);
}
}
@@ -667,8 +709,9 @@ class dfrn {
xml::add_element($doc, $entry, "link", "", $attributes);
}
}
- if($r->content)
+ if ($r->content) {
xml::add_element($doc, $entry, "content", bbcode($r->content), array("type" => "html"));
+ }
return $entry;
}
@@ -684,23 +727,26 @@ class dfrn {
* @param array $item Item element
*
* @return object XML attachment object
+ * @todo Add type-hints
*/
private static function get_attachment($doc, $root, $item) {
$arr = explode('[/attach],',$item['attach']);
- if(count($arr)) {
- foreach($arr as $r) {
+ if (count($arr)) {
+ foreach ($arr as $r) {
$matches = false;
$cnt = preg_match('|\[attach\]href=\"(.*?)\" length=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"|',$r,$matches);
- if($cnt) {
+ if ($cnt) {
$attributes = array("rel" => "enclosure",
"href" => $matches[1],
"type" => $matches[3]);
- if(intval($matches[2]))
+ if (intval($matches[2])) {
$attributes["length"] = intval($matches[2]);
+ }
- if(trim($matches[4]) != "")
+ if (trim($matches[4]) != "") {
$attributes["title"] = trim($matches[4]);
+ }
xml::add_element($doc, $root, "link", "", $attributes);
}
@@ -719,25 +765,28 @@ class dfrn {
* @param int $cid Contact ID of the recipient
*
* @return object XML entry object
+ * @todo Add type-hints
*/
private static function entry($doc, $type, $item, $owner, $comment = false, $cid = 0) {
$mentioned = array();
- if(!$item['parent'])
+ if (!$item['parent']) {
return;
+ }
- if($item['deleted']) {
+ if ($item['deleted']) {
$attributes = array("ref" => $item['uri'], "when" => datetime_convert('UTC','UTC',$item['edited'] . '+00:00',ATOM_TIME));
return xml::create_element($doc, "at:deleted-entry", "", $attributes);
}
$entry = $doc->createElement("entry");
- if($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid'])
+ if ($item['allow_cid'] || $item['allow_gid'] || $item['deny_cid'] || $item['deny_gid']) {
$body = fix_private_photos($item['body'],$owner['uid'],$item,$cid);
- else
+ } else {
$body = $item['body'];
+ }
// Remove the abstract element. It is only locally important.
$body = remove_abstract($body);
@@ -745,8 +794,9 @@ class dfrn {
if ($type == 'html') {
$htmlbody = $body;
- if ($item['title'] != "")
+ if ($item['title'] != "") {
$htmlbody = "[b]".$item['title']."[/b]\n\n".$htmlbody;
+ }
$htmlbody = bbcode($htmlbody, false, false, 7);
}
@@ -757,7 +807,7 @@ class dfrn {
$dfrnowner = self::add_entry_author($doc, "dfrn:owner", $item["owner-link"], $item);
$entry->appendChild($dfrnowner);
- if(($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
+ if (($item['parent'] != $item['id']) || ($item['parent-uri'] !== $item['uri']) || (($item['thr-parent'] !== '') && ($item['thr-parent'] !== $item['uri']))) {
$parent = q("SELECT `guid` FROM `item` WHERE `id` = %d", intval($item["parent"]));
$parent_item = (($item['thr-parent']) ? $item['thr-parent'] : $item['parent-uri']);
$attributes = array("ref" => $parent_item, "type" => "text/html",
@@ -785,26 +835,33 @@ class dfrn {
// "comment-allow" is some old fashioned stuff for old Friendica versions.
// It is included in the rewritten code for completeness
- if ($comment)
+ if ($comment) {
xml::add_element($doc, $entry, "dfrn:comment-allow", intval($item['last-child']));
+ }
- if($item['location'])
+ if ($item['location']) {
xml::add_element($doc, $entry, "dfrn:location", $item['location']);
+ }
- if($item['coord'])
+ if ($item['coord']) {
xml::add_element($doc, $entry, "georss:point", $item['coord']);
+ }
- if(($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid']))
+ if (($item['private']) || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid'])) {
xml::add_element($doc, $entry, "dfrn:private", (($item['private']) ? $item['private'] : 1));
+ }
- if($item['extid'])
+ if ($item['extid']) {
xml::add_element($doc, $entry, "dfrn:extid", $item['extid']);
+ }
- if($item['bookmark'])
+ if ($item['bookmark']) {
xml::add_element($doc, $entry, "dfrn:bookmark", "true");
+ }
- if($item['app'])
+ if ($item['app']) {
xml::add_element($doc, $entry, "statusnet:notice_info", "", array("local_id" => $item['id'], "source" => $item['app']));
+ }
xml::add_element($doc, $entry, "dfrn:diaspora_guid", $item["guid"]);
@@ -817,46 +874,56 @@ class dfrn {
xml::add_element($doc, $entry, "activity:verb", construct_verb($item));
- if ($item['object-type'] != "")
+ if ($item['object-type'] != "") {
xml::add_element($doc, $entry, "activity:object-type", $item['object-type']);
- elseif ($item['id'] == $item['parent'])
+ } elseif ($item['id'] == $item['parent']) {
xml::add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_NOTE);
- else
+ } else {
xml::add_element($doc, $entry, "activity:object-type", ACTIVITY_OBJ_COMMENT);
+ }
$actobj = self::create_activity($doc, "activity:object", $item['object']);
- if ($actobj)
+ if ($actobj) {
$entry->appendChild($actobj);
+ }
$actarg = self::create_activity($doc, "activity:target", $item['target']);
- if ($actarg)
+ if ($actarg) {
$entry->appendChild($actarg);
+ }
$tags = item_getfeedtags($item);
- if(count($tags)) {
- foreach($tags as $t)
- if (($type != 'html') OR ($t[0] != "@"))
+ if (count($tags)) {
+ foreach ($tags as $t) {
+ if (($type != 'html') OR ($t[0] != "@")) {
xml::add_element($doc, $entry, "category", "", array("scheme" => "X-DFRN:".$t[0].":".$t[1], "term" => $t[2]));
+ }
+ }
}
- if(count($tags))
- foreach($tags as $t)
- if ($t[0] == "@")
+ if (count($tags)) {
+ foreach ($tags as $t) {
+ if ($t[0] == "@") {
$mentioned[$t[1]] = $t[1];
+ }
+ }
+ }
foreach ($mentioned AS $mention) {
$r = q("SELECT `forum`, `prv` FROM `contact` WHERE `uid` = %d AND `nurl` = '%s'",
intval($owner["uid"]),
dbesc(normalise_link($mention)));
- if ($r[0]["forum"] OR $r[0]["prv"])
+
+ if (dbm::is_result($r) AND ($r[0]["forum"] OR $r[0]["prv"])) {
xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_GROUP,
"href" => $mention));
- else
+ } else {
xml::add_element($doc, $entry, "link", "", array("rel" => "mentioned",
"ostatus:object-type" => ACTIVITY_OBJ_PERSON,
"href" => $mention));
+ }
}
self::get_attachment($doc, $entry, $item);
@@ -897,6 +964,7 @@ class dfrn {
* @param bool $dissolve (to be documented)
*
* @return int Deliver status. -1 means an error.
+ * @todo Add array type-hint for $owner, $contact
*/
public static function deliver($owner,$contact,$atom, $dissolve = false) {
@@ -904,13 +972,14 @@ class dfrn {
$idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
- if($contact['duplex'] && $contact['dfrn-id'])
+ if ($contact['duplex'] && $contact['dfrn-id']) {
$idtosend = '0:' . $orig_id;
- if($contact['duplex'] && $contact['issued-id'])
+ }
+ if ($contact['duplex'] && $contact['issued-id']) {
$idtosend = '1:' . $orig_id;
+ }
-
- $rino = get_config('system','rino_encrypt');
+ $rino = get_config('system', 'rino_encrypt');
$rino = intval($rino);
logger("Local rino version: ". $rino, LOGGER_DEBUG);
@@ -918,7 +987,7 @@ class dfrn {
$ssl_val = intval(get_config('system','ssl_policy'));
$ssl_policy = '';
- switch($ssl_val){
+ switch ($ssl_val) {
case SSL_POLICY_FULL:
$ssl_policy = 'full';
break;
@@ -950,10 +1019,11 @@ class dfrn {
logger('dfrn_deliver: ' . $xml, LOGGER_DATA);
- if(! $xml)
+ if (! $xml) {
return 3;
+ }
- if(strpos($xml,'status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id)))
+ if ((intval($res->status) != 0) || (! strlen($res->challenge)) || (! strlen($res->dfrn_id))) {
return (($res->status) ? $res->status : 3);
+ }
$postvars = array();
$sent_dfrn_id = hex2bin((string) $res->dfrn_id);
@@ -974,13 +1045,14 @@ class dfrn {
logger("Remote rino version: ".$rino_remote_version." for ".$contact["url"], LOGGER_DEBUG);
- if($owner['page-flags'] == PAGE_PRVGROUP)
+ if ($owner['page-flags'] == PAGE_PRVGROUP) {
$page = 2;
+ }
$final_dfrn_id = '';
- if($perm) {
- if((($perm == 'rw') && (! intval($contact['writable'])))
+ if ($perm) {
+ if ((($perm == 'rw') && (! intval($contact['writable'])))
|| (($perm == 'r') && (intval($contact['writable'])))) {
q("update contact set writable = %d where id = %d",
intval(($perm == 'rw') ? 1 : 0),
@@ -990,7 +1062,7 @@ class dfrn {
}
}
- if(($contact['duplex'] && strlen($contact['pubkey']))
+ if (($contact['duplex'] && strlen($contact['pubkey']))
|| ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
|| ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
openssl_public_decrypt($sent_dfrn_id,$final_dfrn_id,$contact['pubkey']);
@@ -1002,10 +1074,11 @@ class dfrn {
$final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
- if(strpos($final_dfrn_id,':') == 1)
+ if (strpos($final_dfrn_id,':') == 1) {
$final_dfrn_id = substr($final_dfrn_id,2);
+ }
- if($final_dfrn_id != $orig_id) {
+ if ($final_dfrn_id != $orig_id) {
logger('dfrn_deliver: wrong dfrn_id.');
// did not decode properly - cannot trust this site
return 3;
@@ -1013,11 +1086,12 @@ class dfrn {
$postvars['dfrn_id'] = $idtosend;
$postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
- if($dissolve)
+ if ($dissolve) {
$postvars['dissolve'] = '1';
+ }
- if((($contact['rel']) && ($contact['rel'] != CONTACT_IS_SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
+ if ((($contact['rel']) && ($contact['rel'] != CONTACT_IS_SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
$postvars['data'] = $atom;
$postvars['perm'] = 'rw';
} else {
@@ -1027,14 +1101,15 @@ class dfrn {
$postvars['ssl_policy'] = $ssl_policy;
- if($page)
+ if ($page) {
$postvars['page'] = $page;
+ }
- if($rino>0 && $rino_remote_version>0 && (! $dissolve)) {
+ if ($rino > 0 && $rino_remote_version > 0 && (! $dissolve)) {
logger('rino version: '. $rino_remote_version);
- switch($rino_remote_version) {
+ switch ($rino_remote_version) {
case 1:
// Deprecated rino version!
$key = openssl_random_pseudo_bytes(16);
@@ -1069,23 +1144,24 @@ class dfrn {
$postvars['rino'] = $rino_remote_version;
$postvars['data'] = bin2hex($data);
- #logger('rino: sent key = ' . $key, LOGGER_DEBUG);
+ //logger('rino: sent key = ' . $key, LOGGER_DEBUG);
- if($dfrn_version >= 2.1) {
- if(($contact['duplex'] && strlen($contact['pubkey']))
- || ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
- || ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey'])))
-
+ if ($dfrn_version >= 2.1) {
+ if (($contact['duplex'] && strlen($contact['pubkey']))
+ || ($owner['page-flags'] == PAGE_COMMUNITY && strlen($contact['pubkey']))
+ || ($contact['rel'] == CONTACT_IS_SHARING && strlen($contact['pubkey']))) {
openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
- else
+ } else {
openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
+ }
} else {
- if(($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY))
+ if (($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == PAGE_COMMUNITY)) {
openssl_private_encrypt($key,$postvars['key'],$contact['prvkey']);
- else
+ } else {
openssl_public_encrypt($key,$postvars['key'],$contact['pubkey']);
+ }
}
@@ -1110,7 +1186,7 @@ class dfrn {
return -10;
}
- if(strpos($xml,'query($element."/atom:link[@rel='avatar']", $context);
- foreach($avatars AS $avatar) {
+ foreach ($avatars AS $avatar) {
$href = "";
$width = 0;
- foreach($avatar->attributes AS $attributes) {
- if ($attributes->name == "href")
+ foreach ($avatar->attributes AS $attributes) {
+ /// @TODO Rewrite these similar if() to one switch
+ if ($attributes->name == "href") {
$href = $attributes->textContent;
- if ($attributes->name == "width")
+ }
+ if ($attributes->name == "width") {
$width = $attributes->textContent;
- if ($attributes->name == "updated")
+ }
+ if ($attributes->name == "updated") {
$contact["avatar-date"] = $attributes->textContent;
+ }
}
- if (($width > 0) AND ($href != ""))
+ if (($width > 0) AND ($href != "")) {
$avatarlist[$width] = $href;
+ }
}
if (count($avatarlist) > 0) {
krsort($avatarlist);
$author["avatar"] = current($avatarlist);
}
- if ($r AND !$onlyfetch) {
- logger("Check if contact details for contact ".$r[0]["id"]." (".$r[0]["nick"].") have to be updated.", LOGGER_DEBUG);
+ if (dbm::is_result($r) AND !$onlyfetch) {
+ logger("Check if contact details for contact " . $r[0]["id"] . " (" . $r[0]["nick"] . ") have to be updated.", LOGGER_DEBUG);
$poco = array("url" => $contact["url"]);
// When was the last change to name or uri?
- $name_element = $xpath->query($element."/atom:name", $context)->item(0);
- foreach($name_element->attributes AS $attributes)
- if ($attributes->name == "updated")
+ $name_element = $xpath->query($element . "/atom:name", $context)->item(0);
+ foreach ($name_element->attributes AS $attributes) {
+ if ($attributes->name == "updated") {
$poco["name-date"] = $attributes->textContent;
+ }
+ }
- $link_element = $xpath->query($element."/atom:link", $context)->item(0);
- foreach($link_element->attributes AS $attributes)
- if ($attributes->name == "updated")
+ $link_element = $xpath->query($element . "/atom:link", $context)->item(0);
+ foreach ($link_element->attributes AS $attributes) {
+ if ($attributes->name == "updated") {
$poco["uri-date"] = $attributes->textContent;
+ }
+ }
// Update contact data
- $value = $xpath->evaluate($element."/dfrn:handle/text()", $context)->item(0)->nodeValue;
- if ($value != "")
+ $value = $xpath->evaluate($element . "/dfrn:handle/text()", $context)->item(0)->nodeValue;
+ if ($value != "") {
$poco["addr"] = $value;
+ }
- $value = $xpath->evaluate($element."/poco:displayName/text()", $context)->item(0)->nodeValue;
- if ($value != "")
+ $value = $xpath->evaluate($element . "/poco:displayName/text()", $context)->item(0)->nodeValue;
+ if ($value != "") {
$poco["name"] = $value;
+ }
- $value = $xpath->evaluate($element."/poco:preferredUsername/text()", $context)->item(0)->nodeValue;
- if ($value != "")
+ $value = $xpath->evaluate($element . "/poco:preferredUsername/text()", $context)->item(0)->nodeValue;
+ if ($value != "") {
$poco["nick"] = $value;
+ }
- $value = $xpath->evaluate($element."/poco:note/text()", $context)->item(0)->nodeValue;
- if ($value != "")
+ $value = $xpath->evaluate($element . "/poco:note/text()", $context)->item(0)->nodeValue;
+ if ($value != "") {
$poco["about"] = $value;
+ }
- $value = $xpath->evaluate($element."/poco:address/poco:formatted/text()", $context)->item(0)->nodeValue;
- if ($value != "")
+ $value = $xpath->evaluate($element . "/poco:address/poco:formatted/text()", $context)->item(0)->nodeValue;
+ if ($value != "") {
$poco["location"] = $value;
+ }
/// @todo Only search for elements with "poco:type" = "xmpp"
- $value = $xpath->evaluate($element."/poco:ims/poco:value/text()", $context)->item(0)->nodeValue;
- if ($value != "")
+ $value = $xpath->evaluate($element . "/poco:ims/poco:value/text()", $context)->item(0)->nodeValue;
+ if ($value != "") {
$poco["xmpp"] = $value;
+ }
/// @todo Add support for the following fields that we don't support by now in the contact table:
/// - poco:utcOffset
@@ -1273,28 +1367,31 @@ class dfrn {
/// - poco:country
// If the "hide" element is present then the profile isn't searchable.
- $hide = intval($xpath->evaluate($element."/dfrn:hide/text()", $context)->item(0)->nodeValue == "true");
+ $hide = intval($xpath->evaluate($element . "/dfrn:hide/text()", $context)->item(0)->nodeValue == "true");
- logger("Hidden status for contact ".$contact["url"].": ".$hide, LOGGER_DEBUG);
+ logger("Hidden status for contact " . $contact["url"] . ": " . $hide, LOGGER_DEBUG);
// If the contact isn't searchable then set the contact to "hidden".
// Problem: This can be manually overridden by the user.
- if ($hide)
+ if ($hide) {
$contact["hidden"] = true;
+ }
// Save the keywords into the contact table
$tags = array();
- $tagelements = $xpath->evaluate($element."/poco:tags/text()", $context);
- foreach($tagelements AS $tag)
+ $tagelements = $xpath->evaluate($element . "/poco:tags/text()", $context);
+ foreach ($tagelements AS $tag) {
$tags[$tag->nodeValue] = $tag->nodeValue;
+ }
- if (count($tags))
+ if (count($tags)) {
$poco["keywords"] = implode(", ", $tags);
+ }
// "dfrn:birthday" contains the birthday converted to UTC
$old_bdyear = $contact["bdyear"];
- $birthday = $xpath->evaluate($element."/dfrn:birthday/text()", $context)->item(0)->nodeValue;
+ $birthday = $xpath->evaluate($element . "/dfrn:birthday/text()", $context)->item(0)->nodeValue;
if (strtotime($birthday) > time()) {
$bd_timestamp = strtotime($birthday);
@@ -1303,7 +1400,7 @@ class dfrn {
}
// "poco:birthday" is the birthday in the format "yyyy-mm-dd"
- $value = $xpath->evaluate($element."/poco:birthday/text()", $context)->item(0)->nodeValue;
+ $value = $xpath->evaluate($element . "/poco:birthday/text()", $context)->item(0)->nodeValue;
if (!in_array($value, array("", "0000-00-00"))) {
$bdyear = date("Y");
@@ -1319,13 +1416,15 @@ class dfrn {
$contact = array_merge($contact, $poco);
- if ($old_bdyear != $contact["bdyear"])
+ if ($old_bdyear != $contact["bdyear"]) {
self::birthday_event($contact, $birthday);
+ }
// Get all field names
$fields = array();
- foreach ($r[0] AS $field => $data)
+ foreach ($r[0] AS $field => $data) {
$fields[$field] = $data;
+ }
unset($fields["id"]);
unset($fields["uid"]);
@@ -1336,20 +1435,22 @@ class dfrn {
// Update check for this field has to be done differently
$datefields = array("name-date", "uri-date");
- foreach ($datefields AS $field)
+ foreach ($datefields AS $field) {
if (strtotime($contact[$field]) > strtotime($r[0][$field])) {
- logger("Difference for contact ".$contact["id"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
+ logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $r[0][$field] . "'", LOGGER_DEBUG);
$update = true;
}
+ }
- foreach ($fields AS $field => $data)
+ foreach ($fields AS $field => $data) {
if ($contact[$field] != $r[0][$field]) {
- logger("Difference for contact ".$contact["id"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
+ logger("Difference for contact " . $contact["id"] . " in field '" . $field . "'. New value: '" . $contact[$field] . "', old value '" . $r[0][$field] . "'", LOGGER_DEBUG);
$update = true;
}
+ }
if ($update) {
- logger("Update contact data for contact ".$contact["id"]." (".$contact["nick"].")", LOGGER_DEBUG);
+ logger("Update contact data for contact " . $contact["id"] . " (" . $contact["nick"] . ")", LOGGER_DEBUG);
q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `about` = '%s', `location` = '%s',
`addr` = '%s', `keywords` = '%s', `bdyear` = '%s', `bd` = '%s', `hidden` = %d,
@@ -1365,10 +1466,12 @@ class dfrn {
update_contact_avatar($author["avatar"], $importer["uid"], $contact["id"],
(strtotime($contact["avatar-date"]) > strtotime($r[0]["avatar-date"])));
- // The generation is a sign for the reliability of the provided data.
- // It is used in the socgraph.php to prevent that old contact data
- // that was relayed over several servers can overwrite contact
- // data that we received directly.
+ /*
+ * The generation is a sign for the reliability of the provided data.
+ * It is used in the socgraph.php to prevent that old contact data
+ * that was relayed over several servers can overwrite contact
+ * data that we received directly.
+ */
$poco["generation"] = 2;
$poco["photo"] = $author["avatar"];
@@ -1390,10 +1493,12 @@ class dfrn {
* @param text $element element name
*
* @return string XML string
+ * @todo Find good type-hints for all parameter
*/
private static function transform_activity($xpath, $activity, $element) {
- if (!is_object($activity))
+ if (!is_object($activity)) {
return "";
+ }
$obj_doc = new DOMDocument("1.0", "utf-8");
$obj_doc->formatOutput = true;
@@ -1404,21 +1509,26 @@ class dfrn {
xml::add_element($obj_doc, $obj_element, "type", $activity_type);
$id = $xpath->query("atom:id", $activity)->item(0);
- if (is_object($id))
+ if (is_object($id)) {
$obj_element->appendChild($obj_doc->importNode($id, true));
+ }
$title = $xpath->query("atom:title", $activity)->item(0);
- if (is_object($title))
+ if (is_object($title)) {
$obj_element->appendChild($obj_doc->importNode($title, true));
+ }
$links = $xpath->query("atom:link", $activity);
- if (is_object($links))
- foreach ($links AS $link)
+ if (is_object($links)) {
+ foreach ($links AS $link) {
$obj_element->appendChild($obj_doc->importNode($link, true));
+ }
+ }
$content = $xpath->query("atom:content", $activity)->item(0);
- if (is_object($content))
+ if (is_object($content)) {
$obj_element->appendChild($obj_doc->importNode($content, true));
+ }
$obj_doc->appendChild($obj_element);
@@ -1435,11 +1545,13 @@ class dfrn {
* @param object $xpath XPath object
* @param object $mail mail elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @todo Find good type-hints for all parameter
*/
private static function process_mail($xpath, $mail, $importer) {
logger("Processing mails");
+ /// @TODO Rewrite this to one statement
$msg = array();
$msg["uid"] = $importer["importer_uid"];
$msg["from-name"] = $xpath->query("dfrn:sender/dfrn:name/text()", $mail)->item(0)->nodeValue;
@@ -1459,7 +1571,7 @@ class dfrn {
$r = dbq("INSERT INTO `mail` (`".implode("`, `", array_keys($msg))."`) VALUES (".implode(", ", array_values($msg)).")");
// send notifications.
-
+ /// @TODO Arange this mess
$notif_params = array(
"type" => NOTIFY_MAIL,
"notify_flags" => $importer["notify-flags"],
@@ -1486,12 +1598,14 @@ class dfrn {
* @param object $xpath XPath object
* @param object $suggestion suggestion elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @todo Find good type-hints for all parameter
*/
private static function process_suggestion($xpath, $suggestion, $importer) {
$a = get_app();
logger("Processing suggestions");
+ /// @TODO Rewrite this to one statement
$suggest = array();
$suggest["uid"] = $importer["importer_uid"];
$suggest["cid"] = $importer["id"];
@@ -1508,8 +1622,17 @@ class dfrn {
dbesc(normalise_link($suggest["url"])),
intval($suggest["uid"])
);
- if (dbm::is_result($r))
+
+ /*
+ * The valid result means the friend we're about to send a friend
+ * suggestion already has them in their contact, which means no further
+ * action is required.
+ *
+ * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
+ */
+ if (dbm::is_result($r)) {
return false;
+ }
// Do we already have an fcontact record for this person?
@@ -1527,27 +1650,42 @@ class dfrn {
intval($suggest["uid"]),
intval($fid)
);
- if (dbm::is_result($r))
+
+ /*
+ * The valid result means the friend we're about to send a friend
+ * suggestion already has them in their contact, which means no further
+ * action is required.
+ *
+ * @see https://github.com/friendica/friendica/pull/3254#discussion_r107315246
+ */
+ if (dbm::is_result($r)) {
return false;
+ }
}
- if(!$fid)
+ if (!$fid) {
$r = q("INSERT INTO `fcontact` (`name`,`url`,`photo`,`request`) VALUES ('%s', '%s', '%s', '%s')",
- dbesc($suggest["name"]),
- dbesc($suggest["url"]),
- dbesc($suggest["photo"]),
- dbesc($suggest["request"])
- );
+ dbesc($suggest["name"]),
+ dbesc($suggest["url"]),
+ dbesc($suggest["photo"]),
+ dbesc($suggest["request"])
+ );
+ }
$r = q("SELECT `id` FROM `fcontact` WHERE `url` = '%s' AND `name` = '%s' AND `request` = '%s' LIMIT 1",
dbesc($suggest["url"]),
dbesc($suggest["name"]),
dbesc($suggest["request"])
);
- if (dbm::is_result($r))
- $fid = $r[0]["id"];
- else
- // database record did not get created. Quietly give up.
- return false;
+ /*
+ * If no record in fcontact is found, below INSERT statement will not
+ * link an introduction to it.
+ */
+ if (!dbm::is_result($r)) {
+ // database record did not get created. Quietly give up.
+ killme();
+ }
+
+ $fid = $r[0]["id"];
$hash = random_string();
@@ -1588,11 +1726,13 @@ class dfrn {
* @param object $xpath XPath object
* @param object $relocation relocation elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @todo Find good type-hints for all parameter
*/
private static function process_relocation($xpath, $relocation, $importer) {
logger("Processing relocations");
+ /// @TODO Rewrite this to one statement
$relocate = array();
$relocate["uid"] = $importer["importer_uid"];
$relocate["cid"] = $importer["id"];
@@ -1609,18 +1749,23 @@ class dfrn {
$relocate["poll"] = $xpath->query("dfrn:poll/text()", $relocation)->item(0)->nodeValue;
$relocate["sitepubkey"] = $xpath->query("dfrn:sitepubkey/text()", $relocation)->item(0)->nodeValue;
- if (($relocate["avatar"] == "") AND ($relocate["photo"] != ""))
+ if (($relocate["avatar"] == "") AND ($relocate["photo"] != "")) {
$relocate["avatar"] = $relocate["photo"];
+ }
- if ($relocate["addr"] == "")
+ if ($relocate["addr"] == "") {
$relocate["addr"] = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$3@$2", $relocate["url"]);
+ }
// update contact
$r = q("SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d;",
intval($importer["id"]),
intval($importer["importer_uid"]));
- if (!$r)
+
+ if (!dbm::is_result($r)) {
+ logger("Query failed to execute, no result returned in " . __FUNCTION__);
return false;
+ }
$old = $r[0];
@@ -1676,8 +1821,9 @@ class dfrn {
update_contact_avatar($relocate["avatar"], $importer["importer_uid"], $importer["id"], true);
- if ($x === false)
+ if ($x === false) {
return false;
+ }
// update items
/// @todo This is an extreme performance killer
@@ -1686,19 +1832,21 @@ class dfrn {
'author-link' => array($old["url"], $relocate["url"]),
//'owner-avatar' => array($old["photo"], $relocate["photo"]),
//'author-avatar' => array($old["photo"], $relocate["photo"]),
- );
+ );
foreach ($fields as $n=>$f) {
$r = q("SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
$n, dbesc($f[0]),
intval($importer["importer_uid"]));
- if ($r) {
+ if (dbm::is_result($r)) {
$x = q("UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
$n, dbesc($f[1]),
$n, dbesc($f[0]),
intval($importer["importer_uid"]));
- if ($x === false)
+
+ if ($x === false) {
return false;
+ }
}
}
@@ -1717,6 +1865,7 @@ class dfrn {
* @param array $item the new item record
* @param array $importer Record of the importer user mixed with contact of the content
* @param int $entrytype Is it a toplevel entry, a comment or a relayed comment?
+ * @todo set proper type-hints (array?)
*/
private static function update_content($current, $item, $importer, $entrytype) {
$changed = false;
@@ -1724,8 +1873,9 @@ class dfrn {
if (edited_timestamp_is_newer($current, $item)) {
// do not accept (ignore) an earlier edit than one we currently have.
- if(datetime_convert("UTC","UTC",$item["edited"]) < $current["edited"])
- return(false);
+ if (datetime_convert("UTC","UTC",$item["edited"]) < $current["edited"]) {
+ return false;
+ }
$r = q("UPDATE `item` SET `title` = '%s', `body` = '%s', `tag` = '%s', `edited` = '%s', `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d",
dbesc($item["title"]),
@@ -1741,12 +1891,13 @@ class dfrn {
$changed = true;
- if ($entrytype == DFRN_REPLY_RC)
+ if ($entrytype == DFRN_REPLY_RC) {
proc_run(PRIORITY_HIGH, "include/notifier.php","comment-import", $current["id"]);
+ }
}
// update last-child if it changes
- if($item["last-child"] AND ($item["last-child"] != $current["last-child"])) {
+ if ($item["last-child"] AND ($item["last-child"] != $current["last-child"])) {
$r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
dbesc(datetime_convert()),
dbesc($item["parent-uri"]),
@@ -1769,17 +1920,19 @@ class dfrn {
* @param array $item the new item record
*
* @return int Is it a toplevel entry, a comment or a relayed comment?
+ * @todo set proper type-hints (array?)
*/
private static function get_entry_type($importer, $item) {
if ($item["parent-uri"] != $item["uri"]) {
$community = false;
- if($importer["page-flags"] == PAGE_COMMUNITY || $importer["page-flags"] == PAGE_PRVGROUP) {
+ if ($importer["page-flags"] == PAGE_COMMUNITY || $importer["page-flags"] == PAGE_PRVGROUP) {
$sql_extra = "";
$community = true;
logger("possible community action");
- } else
+ } else {
$sql_extra = " AND `contact`.`self` AND `item`.`wall` ";
+ }
// was the top-level post for this action written by somebody on this site?
// Specifically, the recipient?
@@ -1803,29 +1956,32 @@ class dfrn {
dbesc($r[0]["parent-uri"]),
intval($importer["importer_uid"])
);
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
$is_a_remote_action = true;
- }
-
- // Does this have the characteristics of a community or private group action?
- // If it's an action to a wall post on a community/prvgroup page it's a
- // valid community action. Also forum_mode makes it valid for sure.
- // If neither, it's not.
-
- if($is_a_remote_action && $community) {
- if((!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
- $is_a_remote_action = false;
- logger("not a community action");
}
}
- if ($is_a_remote_action)
- return DFRN_REPLY_RC;
- else
- return DFRN_REPLY;
+ /*
+ * Does this have the characteristics of a community or private group action?
+ * If it's an action to a wall post on a community/prvgroup page it's a
+ * valid community action. Also forum_mode makes it valid for sure.
+ * If neither, it's not.
+ */
- } else
+ /// @TODO Maybe merge these if() blocks into one?
+ if ($is_a_remote_action && $community && (!$r[0]["forum_mode"]) && (!$r[0]["wall"])) {
+ $is_a_remote_action = false;
+ logger("not a community action");
+ }
+
+ if ($is_a_remote_action) {
+ return DFRN_REPLY_RC;
+ } else {
+ return DFRN_REPLY;
+ }
+ } else {
return DFRN_TOP_LEVEL;
+ }
}
@@ -1835,19 +1991,21 @@ class dfrn {
* @param array $item the new item record
* @param array $importer Record of the importer user mixed with contact of the content
* @param int $posted_id The record number of item record that was just posted
+ * @todo set proper type-hints (array?)
*/
private static function do_poke($item, $importer, $posted_id) {
$verb = urldecode(substr($item["verb"],strpos($item["verb"], "#")+1));
- if(!$verb)
+ if (!$verb) {
return;
+ }
$xo = parse_xml_string($item["object"],false);
- if(($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
+ if (($xo->type == ACTIVITY_OBJ_PERSON) && ($xo->id)) {
// somebody was poked/prodded. Was it me?
- foreach($xo->link as $l) {
+ foreach ($xo->link as $l) {
$atts = $l->attributes();
- switch($atts["rel"]) {
+ switch ($atts["rel"]) {
case "alternate":
$Blink = $atts["href"];
break;
@@ -1856,7 +2014,7 @@ class dfrn {
}
}
- if($Blink && link_compare($Blink,App::get_baseurl()."/profile/".$importer["nickname"])) {
+ if ($Blink && link_compare($Blink, App::get_baseurl() . "/profile/" . $importer["nickname"])) {
// send a notification
notification(array(
@@ -1890,6 +2048,7 @@ class dfrn {
* @param bool $is_like Is the verb a "like"?
*
* @return bool Should the processing of the entries be continued?
+ * @todo set proper type-hints (array?)
*/
private static function process_verbs($entrytype, $importer, &$item, &$is_like) {
@@ -1904,28 +2063,28 @@ class dfrn {
// Big question: Do we need these functions? They were part of the "consume_feed" function.
// This function once was responsible for DFRN and OStatus.
- if(activity_match($item["verb"],ACTIVITY_FOLLOW)) {
+ if (activity_match($item["verb"], ACTIVITY_FOLLOW)) {
logger("New follower");
new_follower($importer, $contact, $item, $nickname);
return false;
}
- if(activity_match($item["verb"],ACTIVITY_UNFOLLOW)) {
+ if (activity_match($item["verb"], ACTIVITY_UNFOLLOW)) {
logger("Lost follower");
lose_follower($importer, $contact, $item);
return false;
}
- if(activity_match($item["verb"],ACTIVITY_REQ_FRIEND)) {
+ if (activity_match($item["verb"], ACTIVITY_REQ_FRIEND)) {
logger("New friend request");
new_follower($importer, $contact, $item, $nickname, true);
return false;
}
- if(activity_match($item["verb"],ACTIVITY_UNFRIEND)) {
+ if (activity_match($item["verb"], ACTIVITY_UNFRIEND)) {
logger("Lost sharer");
lose_sharer($importer, $contact, $item);
return false;
}
} else {
- if(($item["verb"] == ACTIVITY_LIKE)
+ if (($item["verb"] == ACTIVITY_LIKE)
|| ($item["verb"] == ACTIVITY_DISLIKE)
|| ($item["verb"] == ACTIVITY_ATTEND)
|| ($item["verb"] == ACTIVITY_ATTENDNO)
@@ -1941,8 +2100,9 @@ class dfrn {
dbesc($item["verb"]),
dbesc($item["parent-uri"])
);
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
return false;
+ }
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `author-link` = '%s' AND `verb` = '%s' AND `thr-parent` = '%s' AND NOT `deleted` LIMIT 1",
intval($item["uid"]),
@@ -1950,28 +2110,32 @@ class dfrn {
dbesc($item["verb"]),
dbesc($item["parent-uri"])
);
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
return false;
- } else
+ }
+ } else {
$is_like = false;
+ }
- if(($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
+ if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
$xo = parse_xml_string($item["object"],false);
$xt = parse_xml_string($item["target"],false);
- if($xt->type == ACTIVITY_OBJ_NOTE) {
+ if ($xt->type == ACTIVITY_OBJ_NOTE) {
$r = q("SELECT `id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($xt->id),
intval($importer["importer_uid"])
);
- if (!dbm::is_result($r))
+ if (!dbm::is_result($r)) {
+ logger("Query failed to execute, no result returned in " . __FUNCTION__);
return false;
+ }
// extract tag, if not duplicate, add to parent item
- if($xo->content) {
- if(!(stristr($r[0]["tag"],trim($xo->content)))) {
+ if ($xo->content) {
+ if (!(stristr($r[0]["tag"],trim($xo->content)))) {
q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
dbesc($r[0]["tag"] . (strlen($r[0]["tag"]) ? ',' : '') . '#[url=' . $xo->id . ']'. $xo->content . '[/url]'),
intval($r[0]["id"])
@@ -1990,6 +2154,7 @@ class dfrn {
*
* @param object $links link elements
* @param array $item the item record
+ * @todo set proper type-hints
*/
private static function parse_links($links, &$item) {
$rel = "";
@@ -1998,31 +2163,39 @@ class dfrn {
$length = "0";
$title = "";
foreach ($links AS $link) {
- foreach($link->attributes AS $attributes) {
- if ($attributes->name == "href")
+ foreach ($link->attributes AS $attributes) {
+ /// @TODO Rewrite these repeated (same) if() statements to a switch()
+ if ($attributes->name == "href") {
$href = $attributes->textContent;
- if ($attributes->name == "rel")
+ }
+ if ($attributes->name == "rel") {
$rel = $attributes->textContent;
- if ($attributes->name == "type")
+ }
+ if ($attributes->name == "type") {
$type = $attributes->textContent;
- if ($attributes->name == "length")
+ }
+ if ($attributes->name == "length") {
$length = $attributes->textContent;
- if ($attributes->name == "title")
+ }
+ if ($attributes->name == "title") {
$title = $attributes->textContent;
+ }
}
- if (($rel != "") AND ($href != ""))
- switch($rel) {
+ if (($rel != "") AND ($href != "")) {
+ switch ($rel) {
case "alternate":
$item["plink"] = $href;
break;
case "enclosure":
$enclosure = $href;
- if(strlen($item["attach"]))
+ if (strlen($item["attach"])) {
$item["attach"] .= ",";
+ }
- $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
+ $item["attach"] .= '[attach]href="' . $href . '" length="' . $length . '" type="' . $type . '" title="' . $title . '"[/attach]';
break;
}
+ }
}
}
@@ -2033,6 +2206,7 @@ class dfrn {
* @param object $xpath XPath object
* @param object $entry entry elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @todo Add type-hints
*/
private static function process_entry($header, $xpath, $entry, $importer) {
@@ -2083,7 +2257,7 @@ class dfrn {
$item["body"] = limit_body_size($item["body"]);
/// @todo Do we really need this check for HTML elements? (It was copied from the old function)
- if((strpos($item['body'],'<') !== false) && (strpos($item['body'],'>') !== false)) {
+ if ((strpos($item['body'],'<') !== false) && (strpos($item['body'],'>') !== false)) {
$item['body'] = reltoabs($item['body'],$base_url);
@@ -2112,21 +2286,24 @@ class dfrn {
$item["location"] = $xpath->query("dfrn:location/text()", $entry)->item(0)->nodeValue;
$georsspoint = $xpath->query("georss:point", $entry);
- if ($georsspoint)
+ if ($georsspoint) {
$item["coord"] = $georsspoint->item(0)->nodeValue;
+ }
$item["private"] = $xpath->query("dfrn:private/text()", $entry)->item(0)->nodeValue;
$item["extid"] = $xpath->query("dfrn:extid/text()", $entry)->item(0)->nodeValue;
- if ($xpath->query("dfrn:bookmark/text()", $entry)->item(0)->nodeValue == "true")
+ if ($xpath->query("dfrn:bookmark/text()", $entry)->item(0)->nodeValue == "true") {
$item["bookmark"] = true;
+ }
$notice_info = $xpath->query("statusnet:notice_info", $entry);
if ($notice_info AND ($notice_info->length > 0)) {
- foreach($notice_info->item(0)->attributes AS $attributes) {
- if ($attributes->name == "source")
+ foreach ($notice_info->item(0)->attributes AS $attributes) {
+ if ($attributes->name == "source") {
$item["app"] = strip_tags($attributes->textContent);
+ }
}
}
@@ -2134,21 +2311,24 @@ class dfrn {
// We store the data from "dfrn:diaspora_signature" in a different table, this is done in "item_store"
$dsprsig = unxmlify($xpath->query("dfrn:diaspora_signature/text()", $entry)->item(0)->nodeValue);
- if ($dsprsig != "")
+ if ($dsprsig != "") {
$item["dsprsig"] = $dsprsig;
+ }
$item["verb"] = $xpath->query("activity:verb/text()", $entry)->item(0)->nodeValue;
- if ($xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue != "")
+ if ($xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue != "") {
$item["object-type"] = $xpath->query("activity:object-type/text()", $entry)->item(0)->nodeValue;
+ }
$object = $xpath->query("activity:object", $entry)->item(0);
$item["object"] = self::transform_activity($xpath, $object, "object");
if (trim($item["object"]) != "") {
$r = parse_xml_string($item["object"], false);
- if (isset($r->type))
+ if (isset($r->type)) {
$item["object-type"] = $r->type;
+ }
}
$target = $xpath->query("activity:target", $entry)->item(0);
@@ -2159,12 +2339,14 @@ class dfrn {
foreach ($categories AS $category) {
$term = "";
$scheme = "";
- foreach($category->attributes AS $attributes) {
- if ($attributes->name == "term")
+ foreach ($category->attributes AS $attributes) {
+ if ($attributes->name == "term") {
$term = $attributes->textContent;
+ }
- if ($attributes->name == "scheme")
+ if ($attributes->name == "scheme") {
$scheme = $attributes->textContent;
+ }
}
if (($term != "") AND ($scheme != "")) {
@@ -2173,10 +2355,11 @@ class dfrn {
$termhash = array_shift($parts);
$termurl = implode(":", $parts);
- if(strlen($item["tag"]))
+ if (strlen($item["tag"])) {
$item["tag"] .= ",";
+ }
- $item["tag"] .= $termhash."[url=".$termurl."]".$term."[/url]";
+ $item["tag"] .= $termhash . "[url=" . $termurl . "]" . $term . "[/url]";
}
}
}
@@ -2185,38 +2368,48 @@ class dfrn {
$enclosure = "";
$links = $xpath->query("atom:link", $entry);
- if ($links)
+ if ($links) {
self::parse_links($links, $item);
+ }
// Is it a reply or a top level posting?
$item["parent-uri"] = $item["uri"];
$inreplyto = $xpath->query("thr:in-reply-to", $entry);
- if (is_object($inreplyto->item(0)))
- foreach($inreplyto->item(0)->attributes AS $attributes)
- if ($attributes->name == "ref")
+ if (is_object($inreplyto->item(0))) {
+ foreach ($inreplyto->item(0)->attributes AS $attributes) {
+ if ($attributes->name == "ref") {
$item["parent-uri"] = $attributes->textContent;
+ }
+ }
+ }
// Get the type of the item (Top level post, reply or remote reply)
$entrytype = self::get_entry_type($importer, $item);
// Now assign the rest of the values that depend on the type of the message
if (in_array($entrytype, array(DFRN_REPLY, DFRN_REPLY_RC))) {
- if (!isset($item["object-type"]))
+ if (!isset($item["object-type"])) {
$item["object-type"] = ACTIVITY_OBJ_COMMENT;
+ }
- if ($item["contact-id"] != $owner["contact-id"])
+ if ($item["contact-id"] != $owner["contact-id"]) {
$item["contact-id"] = $owner["contact-id"];
+ }
- if (($item["network"] != $owner["network"]) AND ($owner["network"] != ""))
+ if (($item["network"] != $owner["network"]) AND ($owner["network"] != "")) {
$item["network"] = $owner["network"];
+ }
- if ($item["contact-id"] != $author["contact-id"])
+ if ($item["contact-id"] != $author["contact-id"]) {
$item["contact-id"] = $author["contact-id"];
+ }
- if (($item["network"] != $author["network"]) AND ($author["network"] != ""))
+ if (($item["network"] != $author["network"]) AND ($author["network"] != "")) {
$item["network"] = $author["network"];
+ }
+ /// @TODO maybe remove this old-lost code then?
// This code was taken from the old DFRN code
// When activated, forums don't work.
// And: Why should we disallow commenting by followers?
@@ -2231,15 +2424,17 @@ class dfrn {
$item["type"] = "remote-comment";
$item["wall"] = 1;
} elseif ($entrytype == DFRN_TOP_LEVEL) {
- if (!isset($item["object-type"]))
+ if (!isset($item["object-type"])) {
$item["object-type"] = ACTIVITY_OBJ_NOTE;
+ }
// Is it an event?
if ($item["object-type"] == ACTIVITY_OBJ_EVENT) {
logger("Item ".$item["uri"]." seems to contain an event.", LOGGER_DEBUG);
$ev = bbtoevent($item["body"]);
- if((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
+ if ((x($ev, "desc") || x($ev, "summary")) && x($ev, "start")) {
logger("Event in item ".$item["uri"]." was found.", LOGGER_DEBUG);
+ /// @TODO Mixure of "/' ahead ...
$ev["cid"] = $importer["id"];
$ev["uid"] = $importer["uid"];
$ev["uri"] = $item["uri"];
@@ -2251,8 +2446,9 @@ class dfrn {
dbesc($item["uri"]),
intval($importer["uid"])
);
- if (dbm::is_result($r))
+ if (dbm::is_result($r)) {
$ev["id"] = $r[0]["id"];
+ }
$event_id = event_store($ev);
logger("Event ".$event_id." was stored", LOGGER_DEBUG);
@@ -2268,10 +2464,11 @@ class dfrn {
// Update content if 'updated' changes
if (dbm::is_result($current)) {
- if (self::update_content($r[0], $item, $importer, $entrytype))
+ if (self::update_content($r[0], $item, $importer, $entrytype)) {
logger("Item ".$item["uri"]." was updated.", LOGGER_DEBUG);
- else
+ } else {
logger("Item ".$item["uri"]." already existed.", LOGGER_DEBUG);
+ }
return;
}
@@ -2279,7 +2476,7 @@ class dfrn {
$posted_id = item_store($item);
$parent = 0;
- if($posted_id) {
+ if ($posted_id) {
logger("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, LOGGER_DEBUG);
@@ -2294,7 +2491,7 @@ class dfrn {
$parent_uri = $r[0]["parent-uri"];
}
- if(!$is_like) {
+ if (!$is_like) {
$r1 = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `uid` = %d AND `parent` = %d",
dbesc(datetime_convert()),
intval($importer["importer_uid"]),
@@ -2308,7 +2505,7 @@ class dfrn {
);
}
- if($posted_id AND $parent AND ($entrytype == DFRN_REPLY_RC)) {
+ if ($posted_id AND $parent AND ($entrytype == DFRN_REPLY_RC)) {
logger("Notifying followers about comment ".$posted_id, LOGGER_DEBUG);
proc_run(PRIORITY_HIGH, "include/notifier.php", "comment-import", $posted_id);
}
@@ -2316,18 +2513,20 @@ class dfrn {
return true;
}
} else { // $entrytype == DFRN_TOP_LEVEL
- if(!link_compare($item["owner-link"],$importer["url"])) {
- // The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
- // but otherwise there's a possible data mixup on the sender's system.
- // the tgroup delivery code called from item_store will correct it if it's a forum,
- // but we're going to unconditionally correct it here so that the post will always be owned by our contact.
+ if (!link_compare($item["owner-link"],$importer["url"])) {
+ /*
+ * The item owner info is not our contact. It's OK and is to be expected if this is a tgroup delivery,
+ * but otherwise there's a possible data mixup on the sender's system.
+ * the tgroup delivery code called from item_store will correct it if it's a forum,
+ * but we're going to unconditionally correct it here so that the post will always be owned by our contact.
+ */
logger('Correcting item owner.', LOGGER_DEBUG);
$item["owner-name"] = $importer["senderName"];
$item["owner-link"] = $importer["url"];
$item["owner-avatar"] = $importer["thumb"];
}
- if(($importer["rel"] == CONTACT_IS_FOLLOWER) && (!tgroup_check($importer["importer_uid"], $item))) {
+ if (($importer["rel"] == CONTACT_IS_FOLLOWER) && (!tgroup_check($importer["importer_uid"], $item))) {
logger("Contact ".$importer["id"]." is only follower and tgroup check was negative.", LOGGER_DEBUG);
return;
}
@@ -2351,24 +2550,29 @@ class dfrn {
* @param object $xpath XPath object
* @param object $deletion deletion elements
* @param array $importer Record of the importer user mixed with contact of the content
+ * @todo set proper type-hints
*/
private static function process_deletion($xpath, $deletion, $importer) {
logger("Processing deletions");
- foreach($deletion->attributes AS $attributes) {
- if ($attributes->name == "ref")
+ foreach ($deletion->attributes AS $attributes) {
+ if ($attributes->name == "ref") {
$uri = $attributes->textContent;
- if ($attributes->name == "when")
+ }
+ if ($attributes->name == "when") {
$when = $attributes->textContent;
+ }
}
- if ($when)
+ if ($when) {
$when = datetime_convert("UTC", "UTC", $when, "Y-m-d H:i:s");
- else
+ } else {
$when = datetime_convert("UTC", "UTC", "now", "Y-m-d H:i:s");
+ }
- if (!$uri OR !$importer["id"])
+ if (!$uri OR !$importer["id"]) {
return false;
+ }
/// @todo Only select the used fields
$r = q("SELECT `item`.*, `contact`.`self` FROM `item` INNER JOIN `contact` on `item`.`contact-id` = `contact`.`id`
@@ -2378,7 +2582,7 @@ class dfrn {
intval($importer["id"])
);
if (!dbm::is_result($r)) {
- logger("Item with uri ".$uri." from contact ".$importer["id"]." for user ".$importer["uid"]." wasn't found.", LOGGER_DEBUG);
+ logger("Item with uri " . $uri . " from contact " . $importer["id"] . " for user " . $importer["uid"] . " wasn't found.", LOGGER_DEBUG);
return;
} else {
@@ -2386,22 +2590,23 @@ class dfrn {
$entrytype = self::get_entry_type($importer, $item);
- if(!$item["deleted"])
+ if (!$item["deleted"]) {
logger('deleting item '.$item["id"].' uri='.$uri, LOGGER_DEBUG);
- else
+ } else {
return;
+ }
- if($item["object-type"] == ACTIVITY_OBJ_EVENT) {
+ if ($item["object-type"] == ACTIVITY_OBJ_EVENT) {
logger("Deleting event ".$item["event-id"], LOGGER_DEBUG);
event_delete($item["event-id"]);
}
- if(($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
+ if (($item["verb"] == ACTIVITY_TAG) && ($item["object-type"] == ACTIVITY_OBJ_TAGTERM)) {
$xo = parse_xml_string($item["object"],false);
$xt = parse_xml_string($item["target"],false);
- if($xt->type == ACTIVITY_OBJ_NOTE) {
+ if ($xt->type == ACTIVITY_OBJ_NOTE) {
$i = q("SELECT `id`, `contact-id`, `tag` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($xt->id),
intval($importer["importer_uid"])
@@ -2414,18 +2619,21 @@ class dfrn {
$author_remove = (($item["origin"] && $item["self"]) ? true : false);
$author_copy = (($item["origin"]) ? true : false);
- if($owner_remove && $author_copy)
+ if ($owner_remove && $author_copy) {
return;
- if($author_remove || $owner_remove) {
+ }
+ if ($author_remove || $owner_remove) {
$tags = explode(',',$i[0]["tag"]);
$newtags = array();
- if(count($tags)) {
- foreach($tags as $tag)
- if(trim($tag) !== trim($xo->body))
+ if (count($tags)) {
+ foreach ($tags as $tag) {
+ if (trim($tag) !== trim($xo->body)) {
$newtags[] = trim($tag);
+ }
+ }
}
q("UPDATE `item` SET `tag` = '%s' WHERE `id` = %d",
- dbesc(implode(',',$newtags)),
+ dbesc(implode(',', $newtags)),
intval($i[0]["id"])
);
create_tags_from_item($i[0]["id"]);
@@ -2434,7 +2642,7 @@ class dfrn {
}
}
- if($entrytype == DFRN_TOP_LEVEL) {
+ if ($entrytype == DFRN_TOP_LEVEL) {
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s',
`body` = '', `title` = ''
WHERE `parent-uri` = '%s' AND `uid` = %d",
@@ -2479,8 +2687,8 @@ class dfrn {
}
// if this is a relayed delete, propagate it to other recipients
- if($entrytype == DFRN_REPLY_RC) {
- logger("Notifying followers about deletion of post ".$item["id"], LOGGER_DEBUG);
+ if ($entrytype == DFRN_REPLY_RC) {
+ logger("Notifying followers about deletion of post " . $item["id"], LOGGER_DEBUG);
proc_run(PRIORITY_HIGH, "include/notifier.php","drop", $item["id"]);
}
}
@@ -2493,13 +2701,15 @@ class dfrn {
* @param text $xml The DFRN message
* @param array $importer Record of the importer user mixed with contact of the content
* @param bool $sort_by_date Is used when feeds are polled
+ * @todo set proper type-hints
*/
public static function import($xml,$importer, $sort_by_date = false) {
- if ($xml == "")
+ if ($xml == "") {
return;
+ }
- if($importer["readonly"]) {
+ if ($importer["readonly"]) {
// We aren't receiving stuff from this person. But we will quietly ignore them
// rather than a blatant "go away" message.
logger('ignoring contact '.$importer["id"]);
@@ -2532,56 +2742,66 @@ class dfrn {
// Update the contact table if the data has changed
// The "atom:author" is only present in feeds
- if ($xpath->query("/atom:feed/atom:author")->length > 0)
+ if ($xpath->query("/atom:feed/atom:author")->length > 0) {
self::fetchauthor($xpath, $doc->firstChild, $importer, "atom:author", false, $xml);
+ }
// Only the "dfrn:owner" in the head section contains all data
- if ($xpath->query("/atom:feed/dfrn:owner")->length > 0)
+ if ($xpath->query("/atom:feed/dfrn:owner")->length > 0) {
self::fetchauthor($xpath, $doc->firstChild, $importer, "dfrn:owner", false, $xml);
+ }
- logger("Import DFRN message for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG);
+ logger("Import DFRN message for user " . $importer["uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
// The account type is new since 3.5.1
if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) {
$accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()", $context)->item(0)->nodeValue);
- if ($accounttype != $importer["contact-type"])
+ if ($accounttype != $importer["contact-type"]) {
+ /// @TODO this way is the norm or putting ); at the end of the line?
q("UPDATE `contact` SET `contact-type` = %d WHERE `id` = %d",
intval($accounttype),
intval($importer["id"])
);
+ }
}
// is it a public forum? Private forums aren't supported with this method
// This is deprecated since 3.5.1
$forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()", $context)->item(0)->nodeValue);
- if ($forum != $importer["forum"])
+ if ($forum != $importer["forum"]) {
q("UPDATE `contact` SET `forum` = %d WHERE `forum` != %d AND `id` = %d",
intval($forum), intval($forum),
intval($importer["id"])
);
+ }
$mails = $xpath->query("/atom:feed/dfrn:mail");
- foreach ($mails AS $mail)
+ foreach ($mails AS $mail) {
self::process_mail($xpath, $mail, $importer);
+ }
$suggestions = $xpath->query("/atom:feed/dfrn:suggest");
- foreach ($suggestions AS $suggestion)
+ foreach ($suggestions AS $suggestion) {
self::process_suggestion($xpath, $suggestion, $importer);
+ }
$relocations = $xpath->query("/atom:feed/dfrn:relocate");
- foreach ($relocations AS $relocation)
+ foreach ($relocations AS $relocation) {
self::process_relocation($xpath, $relocation, $importer);
+ }
$deletions = $xpath->query("/atom:feed/at:deleted-entry");
- foreach ($deletions AS $deletion)
+ foreach ($deletions AS $deletion) {
self::process_deletion($xpath, $deletion, $importer);
+ }
if (!$sort_by_date) {
$entries = $xpath->query("/atom:feed/atom:entry");
- foreach ($entries AS $entry)
+ foreach ($entries AS $entry) {
self::process_entry($header, $xpath, $entry, $importer);
+ }
} else {
$newentries = array();
$entries = $xpath->query("/atom:feed/atom:entry");
@@ -2593,10 +2813,10 @@ class dfrn {
// Now sort after the publishing date
ksort($newentries);
- foreach ($newentries AS $entry)
+ foreach ($newentries AS $entry) {
self::process_entry($header, $xpath, $entry, $importer);
+ }
}
- logger("Import done for user ".$importer["uid"]." from contact ".$importer["id"], LOGGER_DEBUG);
+ logger("Import done for user " . $importer["uid"] . " from contact " . $importer["id"], LOGGER_DEBUG);
}
}
-?>
diff --git a/include/items.php b/include/items.php
index 24eb1b30fb..c2b3d7d1f5 100644
--- a/include/items.php
+++ b/include/items.php
@@ -1496,17 +1496,19 @@ function item_is_remote_self($contact, &$datarray) {
return true;
}
-function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
+function new_follower($importer, $contact, $datarray, $item, $sharing = false) {
$url = notags(trim($datarray['author-link']));
$name = notags(trim($datarray['author-name']));
$photo = notags(trim($datarray['author-avatar']));
if (is_object($item)) {
$rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor');
- if ($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'])
+ if ($rawtag && $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data']) {
$nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
- } else
+ }
+ } else {
$nick = $item;
+ }
if (is_array($contact)) {
if (($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
@@ -1544,11 +1546,9 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true);
}
-
$r = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1",
intval($importer['uid'])
);
- $a = get_app();
if (dbm::is_result($r) AND !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
@@ -1567,8 +1567,9 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
$def_gid = get_default_group($importer['uid'], $contact_record["network"]);
- if (intval($def_gid))
- group_add_member($importer['uid'],'',$contact_record['id'],$def_gid);
+ if (intval($def_gid)) {
+ group_add_member($importer['uid'], '', $contact_record['id'], $def_gid);
+ }
if (($r[0]['notify-flags'] & NOTIFY_INTRO) &&
in_array($r[0]['page-flags'], array(PAGE_NORMAL))) {
@@ -1599,7 +1600,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
}
}
-function lose_follower($importer,$contact,$datarray = array(),$item = "") {
+function lose_follower($importer, $contact, array $datarray = array(), $item = "") {
if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) {
q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d",
@@ -1611,7 +1612,7 @@ function lose_follower($importer,$contact,$datarray = array(),$item = "") {
}
}
-function lose_sharer($importer,$contact,$datarray = array(),$item = "") {
+function lose_sharer($importer, $contact, array $datarray = array(), $item = "") {
if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) {
q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d",
@@ -1623,7 +1624,7 @@ function lose_sharer($importer,$contact,$datarray = array(),$item = "") {
}
}
-function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
+function subscribe_to_hub($url, $importer, $contact, $hubmode = 'subscribe') {
$a = get_app();
diff --git a/include/ostatus.php b/include/ostatus.php
index aad4c1041a..9b78495093 100644
--- a/include/ostatus.php
+++ b/include/ostatus.php
@@ -239,6 +239,23 @@ class ostatus {
}
}
+ /**
+ * @brief Read attributes from element
+ *
+ * @param object $element Element object
+ *
+ * @return array attributes
+ */
+ private static function read_attributes($element) {
+ $attribute = array();
+
+ foreach ($element->attributes AS $attributes) {
+ $attribute[$attributes->name] = $attributes->textContent;
+ }
+
+ return $attribute;
+ }
+
/**
* @brief Imports an XML string containing OStatus elements
*
@@ -252,9 +269,9 @@ class ostatus {
logger("Import OStatus message", LOGGER_DEBUG);
- if ($xml == "")
+ if ($xml == "") {
return;
-
+ }
//$tempfile = tempnam(get_temppath(), "import");
//file_put_contents($tempfile, $xml);
@@ -273,13 +290,14 @@ class ostatus {
$gub = "";
$hub_attributes = $xpath->query("/atom:feed/atom:link[@rel='hub']")->item(0)->attributes;
- if (is_object($hub_attributes))
- foreach($hub_attributes AS $hub_attribute)
+ if (is_object($hub_attributes)) {
+ foreach ($hub_attributes AS $hub_attribute) {
if ($hub_attribute->name == "href") {
$hub = $hub_attribute->textContent;
logger("Found hub ".$hub, LOGGER_DEBUG);
}
-
+ }
+ }
$header = array();
$header["uid"] = $importer["uid"];
$header["network"] = NETWORK_OSTATUS;
@@ -292,11 +310,11 @@ class ostatus {
// depending on that, the first node is different
$first_child = $doc->firstChild->tagName;
- if ($first_child == "feed")
+ if ($first_child == "feed") {
$entries = $xpath->query('/atom:feed/atom:entry');
- else
+ } else {
$entries = $xpath->query('/atom:entry');
-
+ }
$conversation = "";
$conversationlist = array();
$item_id = 0;
@@ -304,25 +322,25 @@ class ostatus {
// Reverse the order of the entries
$entrylist = array();
- foreach ($entries AS $entry)
+ foreach ($entries AS $entry) {
$entrylist[] = $entry;
-
+ }
foreach (array_reverse($entrylist) AS $entry) {
$mention = false;
// fetch the author
- if ($first_child == "feed")
+ if ($first_child == "feed") {
$author = self::fetchauthor($xpath, $doc->firstChild, $importer, $contact, false);
- else
+ } else {
$author = self::fetchauthor($xpath, $entry, $importer, $contact, false);
-
+ }
$value = $xpath->evaluate('atom:author/poco:preferredUsername/text()', $context)->item(0)->nodeValue;
- if ($value != "")
+ if ($value != "") {
$nickname = $value;
- else
+ } else {
$nickname = $author["author-name"];
-
+ }
$item = array_merge($header, $author);
// Now get the item
@@ -330,7 +348,7 @@ class ostatus {
$r = q("SELECT `id` FROM `item` WHERE `uid` = %d AND `uri` = '%s'",
intval($importer["uid"]), dbesc($item["uri"]));
- if ($r) {
+ if (dbm::is_result($r)) {
logger("Item with uri ".$item["uri"]." for user ".$importer["uid"]." already existed under id ".$r[0]["id"], LOGGER_DEBUG);
continue;
}
@@ -341,9 +359,9 @@ class ostatus {
if (($item["object-type"] == ACTIVITY_OBJ_BOOKMARK) OR ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
$item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
$item["body"] = $xpath->query('atom:summary/text()', $entry)->item(0)->nodeValue;
- } elseif ($item["object-type"] == ACTIVITY_OBJ_QUESTION)
+ } elseif ($item["object-type"] == ACTIVITY_OBJ_QUESTION) {
$item["title"] = $xpath->query('atom:title/text()', $entry)->item(0)->nodeValue;
-
+ }
$item["object"] = $xml;
$item["verb"] = $xpath->query('activity:verb/text()', $entry)->item(0)->nodeValue;
@@ -387,9 +405,9 @@ class ostatus {
}
// http://activitystrea.ms/schema/1.0/rsvp-yes
- if (!in_array($item["verb"], array(ACTIVITY_POST, ACTIVITY_LIKE, ACTIVITY_SHARE)))
+ if (!in_array($item["verb"], array(ACTIVITY_POST, ACTIVITY_LIKE, ACTIVITY_SHARE))) {
logger("Unhandled verb ".$item["verb"]." ".print_r($item, true));
-
+ }
$item["created"] = $xpath->query('atom:published/text()', $entry)->item(0)->nodeValue;
$item["edited"] = $xpath->query('atom:updated/text()', $entry)->item(0)->nodeValue;
$conversation = $xpath->query('ostatus:conversation/text()', $entry)->item(0)->nodeValue;
@@ -398,28 +416,32 @@ class ostatus {
$inreplyto = $xpath->query('thr:in-reply-to', $entry);
if (is_object($inreplyto->item(0))) {
- foreach($inreplyto->item(0)->attributes AS $attributes) {
- if ($attributes->name == "ref")
+ foreach ($inreplyto->item(0)->attributes AS $attributes) {
+ if ($attributes->name == "ref") {
$item["parent-uri"] = $attributes->textContent;
- if ($attributes->name == "href")
+ }
+ if ($attributes->name == "href") {
$related = $attributes->textContent;
+ }
}
}
$georsspoint = $xpath->query('georss:point', $entry);
- if ($georsspoint)
+ if ($georsspoint) {
$item["coord"] = $georsspoint->item(0)->nodeValue;
-
+ }
$categories = $xpath->query('atom:category', $entry);
if ($categories) {
foreach ($categories AS $category) {
- foreach($category->attributes AS $attributes)
+ foreach ($category->attributes AS $attributes) {
if ($attributes->name == "term") {
$term = $attributes->textContent;
- if(strlen($item["tag"]))
+ if(strlen($item["tag"])) {
$item["tag"] .= ',';
+ }
$item["tag"] .= "#[url=".App::get_baseurl()."/search?tag=".$term."]".$term."[/url]";
}
+ }
}
}
@@ -428,61 +450,54 @@ class ostatus {
$links = $xpath->query('atom:link', $entry);
if ($links) {
- $rel = "";
- $href = "";
- $type = "";
- $length = "0";
- $title = "";
foreach ($links AS $link) {
- foreach($link->attributes AS $attributes) {
- if ($attributes->name == "href")
- $href = $attributes->textContent;
- if ($attributes->name == "rel")
- $rel = $attributes->textContent;
- if ($attributes->name == "type")
- $type = $attributes->textContent;
- if ($attributes->name == "length")
- $length = $attributes->textContent;
- if ($attributes->name == "title")
- $title = $attributes->textContent;
- }
- if (($rel != "") AND ($href != ""))
- switch($rel) {
+ $attribute = self::read_attributes($link);
+
+ if (($attribute['rel'] != "") AND ($attribute['href'] != "")) {
+ switch ($attribute['rel']) {
case "alternate":
- $item["plink"] = $href;
+ $item["plink"] = $attribute['href'];
if (($item["object-type"] == ACTIVITY_OBJ_QUESTION) OR
- ($item["object-type"] == ACTIVITY_OBJ_EVENT))
- $item["body"] .= add_page_info($href);
+ ($item["object-type"] == ACTIVITY_OBJ_EVENT)) {
+ $item["body"] .= add_page_info($attribute['href']);
+ }
break;
case "ostatus:conversation":
- $conversation = $href;
+ $conversation = $attribute['href'];
break;
case "enclosure":
- $enclosure = $href;
- if(strlen($item["attach"]))
+ $enclosure = $attribute['href'];
+ if (strlen($item["attach"])) {
$item["attach"] .= ',';
-
- $item["attach"] .= '[attach]href="'.$href.'" length="'.$length.'" type="'.$type.'" title="'.$title.'"[/attach]';
+ }
+ if (!isset($attribute['length'])) {
+ $attribute['length'] = "0";
+ }
+ $item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.$attribute['title'].'"[/attach]';
break;
case "related":
if ($item["object-type"] != ACTIVITY_OBJ_BOOKMARK) {
- if (!isset($item["parent-uri"]))
- $item["parent-uri"] = $href;
-
- if ($related == "")
- $related = $href;
- } else
- $item["body"] .= add_page_info($href);
+ if (!isset($item["parent-uri"])) {
+ $item["parent-uri"] = $attribute['href'];
+ }
+ if ($related == "") {
+ $related = $attribute['href'];
+ }
+ } else {
+ $item["body"] .= add_page_info($attribute['href']);
+ }
break;
case "self":
- $self = $href;
+ $self = $attribute['href'];
break;
case "mentioned":
// Notification check
- if ($importer["nurl"] == normalise_link($href))
+ if ($importer["nurl"] == normalise_link($attribute['href'])) {
$mention = true;
+ }
break;
}
+ }
}
}
@@ -491,13 +506,16 @@ class ostatus {
$notice_info = $xpath->query('statusnet:notice_info', $entry);
if ($notice_info AND ($notice_info->length > 0)) {
- foreach($notice_info->item(0)->attributes AS $attributes) {
- if ($attributes->name == "source")
+ foreach ($notice_info->item(0)->attributes AS $attributes) {
+ if ($attributes->name == "source") {
$item["app"] = strip_tags($attributes->textContent);
- if ($attributes->name == "local_id")
+ }
+ if ($attributes->name == "local_id") {
$local_id = $attributes->textContent;
- if ($attributes->name == "repeat_of")
+ }
+ if ($attributes->name == "repeat_of") {
$repeat_of = $attributes->textContent;
+ }
}
}
@@ -508,25 +526,27 @@ class ostatus {
if (is_object($activityobjects)) {
$orig_uri = $xpath->query("activity:object/atom:id", $activityobjects)->item(0)->nodeValue;
- if (!isset($orig_uri))
+ if (!isset($orig_uri)) {
$orig_uri = $xpath->query('atom:id/text()', $activityobjects)->item(0)->nodeValue;
-
+ }
$orig_links = $xpath->query("activity:object/atom:link[@rel='alternate']", $activityobjects);
- if ($orig_links AND ($orig_links->length > 0))
- foreach($orig_links->item(0)->attributes AS $attributes)
- if ($attributes->name == "href")
+ if ($orig_links AND ($orig_links->length > 0)) {
+ foreach ($orig_links->item(0)->attributes AS $attributes) {
+ if ($attributes->name == "href") {
$orig_link = $attributes->textContent;
-
- if (!isset($orig_link))
+ }
+ }
+ }
+ if (!isset($orig_link)) {
$orig_link = $xpath->query("atom:link[@rel='alternate']", $activityobjects)->item(0)->nodeValue;
-
- if (!isset($orig_link))
+ }
+ if (!isset($orig_link)) {
$orig_link = self::convert_href($orig_uri);
-
+ }
$orig_body = $xpath->query('activity:object/atom:content/text()', $activityobjects)->item(0)->nodeValue;
- if (!isset($orig_body))
+ if (!isset($orig_body)) {
$orig_body = $xpath->query('atom:content/text()', $activityobjects)->item(0)->nodeValue;
-
+ }
$orig_created = $xpath->query('atom:published/text()', $activityobjects)->item(0)->nodeValue;
$orig_edited = $xpath->query('atom:updated/text()', $activityobjects)->item(0)->nodeValue;
@@ -550,8 +570,26 @@ class ostatus {
$item["verb"] = $xpath->query('activity:verb/text()', $activityobjects)->item(0)->nodeValue;
$item["object-type"] = $xpath->query('activity:object/activity:object-type/text()', $activityobjects)->item(0)->nodeValue;
- if (!isset($item["object-type"]))
+ if (!isset($item["object-type"])) {
$item["object-type"] = $xpath->query('activity:object-type/text()', $activityobjects)->item(0)->nodeValue;
+ }
+
+ $enclosures = $xpath->query("atom:link[@rel='alternate']", $activityobjects);
+ if ($enclosures) {
+ foreach ($enclosures AS $link) {
+ $attribute = self::read_attributes($link);
+ if ($href != "") {
+ $enclosure = $attribute['href'];
+ if (strlen($item["attach"])) {
+ $item["attach"] .= ',';
+ }
+ if (!isset($attribute['length'])) {
+ $attribute['length'] = "0";
+ }
+ $item["attach"] .= '[attach]href="'.$attribute['href'].'" length="'.$attribute['length'].'" type="'.$attribute['type'].'" title="'.$attribute['title'].'"[/attach]';
+ }
+ }
+ }
}
}
@@ -579,13 +617,13 @@ class ostatus {
intval($importer["uid"]), dbesc($item["parent-uri"]));
}
}
- if ($r) {
+ if (dbm::is_result($r)) {
$item["type"] = 'remote-comment';
$item["gravity"] = GRAVITY_COMMENT;
}
- } else
+ } else {
$item["parent-uri"] = $item["uri"];
-
+ }
$item_id = self::completion($conversation, $importer["uid"], $item, $self);
if (!$item_id) {
diff --git a/include/update_gcontact.php b/include/update_gcontact.php
index 08d4149a71..221c0829f5 100644
--- a/include/update_gcontact.php
+++ b/include/update_gcontact.php
@@ -2,11 +2,11 @@
use \Friendica\Core\Config;
-function update_gcontact_run(&$argv, &$argc){
+function update_gcontact_run(&$argv, &$argc) {
global $a;
- require_once('include/Scrape.php');
- require_once('include/socgraph.php');
+ require_once 'include/Scrape.php';
+ require_once 'include/socgraph.php';
logger('update_gcontact: start');
@@ -21,11 +21,13 @@ function update_gcontact_run(&$argv, &$argc){
$r = q("SELECT * FROM `gcontact` WHERE `id` = %d", intval($contact_id));
- if (!$r)
+ if (!dbm::_is_result($r)) {
return;
+ }
- if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
+ if (!in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
return;
+ }
$data = probe_url($r[0]["url"]);
diff --git a/index.php b/index.php
index 7408f495cd..ebc65cdb01 100644
--- a/index.php
+++ b/index.php
@@ -28,17 +28,17 @@ $a->backend = false;
/**
*
* Load the configuration file which contains our DB credentials.
- * Ignore errors. If the file doesn't exist or is empty, we are running in installation mode.
+ * Ignore errors. If the file doesn't exist or is empty, we are running in
+ * installation mode.
*
*/
$install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false : true);
-@include(".htconfig.php");
-
-
-
-
+// Only load config if found, don't surpress errors
+if (!$install) {
+ include ".htconfig.php";
+}
/**
*
@@ -46,11 +46,11 @@ $install = ((file_exists('.htconfig.php') && filesize('.htconfig.php')) ? false
*
*/
-require_once("include/dba.php");
+require_once "include/dba.php";
-if(!$install) {
+if (!$install) {
$db = new dba($db_host, $db_user, $db_pass, $db_data, $install);
- unset($db_host, $db_user, $db_pass, $db_data);
+ unset($db_host, $db_user, $db_pass, $db_data);
/**
* Load configs from db. Overwrite configs from .htconfig.php
@@ -59,17 +59,17 @@ if(!$install) {
Config::load();
if ($a->max_processes_reached() OR $a->maxload_reached()) {
- header($_SERVER["SERVER_PROTOCOL"].' 503 Service Temporarily Unavailable');
+ header($_SERVER["SERVER_PROTOCOL"] . ' 503 Service Temporarily Unavailable');
header('Retry-After: 120');
- header('Refresh: 120; url='.App::get_baseurl()."/".$a->query_string);
+ header('Refresh: 120; url=' . App::get_baseurl() . "/" . $a->query_string);
die("System is currently unavailable. Please try again later");
}
- if (get_config('system','force_ssl') AND ($a->get_scheme() == "http") AND
- (intval(get_config('system','ssl_policy')) == SSL_POLICY_FULL) AND
+ if (get_config('system', 'force_ssl') AND ($a->get_scheme() == "http") AND
+ (intval(get_config('system', 'ssl_policy')) == SSL_POLICY_FULL) AND
(substr(App::get_baseurl(), 0, 8) == "https://")) {
header("HTTP/1.1 302 Moved Temporarily");
- header("Location: ".App::get_baseurl()."/".$a->query_string);
+ header("Location: " . App::get_baseurl() . "/" . $a->query_string);
exit();
}
@@ -117,12 +117,12 @@ if (x($_SESSION,'authenticated') && !x($_SESSION,'language')) {
if (dbm::is_result($r)) $_SESSION['language'] = $r[0]['language'];
}
-if((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
+if ((x($_SESSION,'language')) && ($_SESSION['language'] !== $lang)) {
$lang = $_SESSION['language'];
load_translation_table($lang);
}
-if((x($_GET,'zrl')) && (!$install && !$maintenance)) {
+if ((x($_GET,'zrl')) && (!$install && !$maintenance)) {
// Only continue when the given profile link seems valid
// Valid profile links contain a path with "/profile/" and no query parameters
if ((parse_url($_GET['zrl'], PHP_URL_QUERY) == "") AND
@@ -223,7 +223,7 @@ if ((local_user()) || (! $privateapps === "1")) {
* further processing.
*/
-if(strlen($a->module)) {
+if (strlen($a->module)) {
/**
*
@@ -233,12 +233,14 @@ if(strlen($a->module)) {
*/
// Compatibility with the Android Diaspora client
- if ($a->module == "stream")
+ if ($a->module == "stream") {
$a->module = "network";
+ }
// Compatibility with the Firefox App
- if (($a->module == "users") AND ($a->cmd == "users/sign_in"))
+ if (($a->module == "users") AND ($a->cmd == "users/sign_in")) {
$a->module = "login";
+ }
$privateapps = get_config('config','private_addons');
@@ -246,11 +248,11 @@ if(strlen($a->module)) {
//Check if module is an app and if public access to apps is allowed or not
if ((!local_user()) && plugin_is_app($a->module) && $privateapps === "1") {
info( t("You must be logged in to use addons. "));
- }
- else {
+ } else {
include_once("addon/{$a->module}/{$a->module}.php");
- if(function_exists($a->module . '_module'))
+ if (function_exists($a->module . '_module')) {
$a->module_loaded = true;
+ }
}
}
@@ -320,29 +322,22 @@ if (!$install && !$maintenance) {
* Call module functions
*/
-if($a->module_loaded) {
+if ($a->module_loaded) {
$a->page['page_title'] = $a->module;
$placeholder = '';
- if(function_exists($a->module . '_init')) {
+ if (function_exists($a->module . '_init')) {
call_hooks($a->module . '_mod_init', $placeholder);
$func = $a->module . '_init';
$func($a);
}
- if(function_exists(str_replace('-','_',current_theme()) . '_init')) {
+ if (function_exists(str_replace('-','_',current_theme()) . '_init')) {
$func = str_replace('-','_',current_theme()) . '_init';
$func($a);
}
-// elseif (x($a->theme_info,"extends") && file_exists("view/theme/".$a->theme_info["extends"]."/theme.php")) {
-// require_once("view/theme/".$a->theme_info["extends"]."/theme.php");
-// if(function_exists(str_replace('-','_',$a->theme_info["extends"]) . '_init')) {
-// $func = str_replace('-','_',$a->theme_info["extends"]) . '_init';
-// $func($a);
-// }
-// }
- if(($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error)
+ if (($_SERVER['REQUEST_METHOD'] === 'POST') && (! $a->error)
&& (function_exists($a->module . '_post'))
&& (! x($_POST,'auth-params'))) {
call_hooks($a->module . '_mod_post', $_POST);
@@ -350,13 +345,13 @@ if($a->module_loaded) {
$func($a);
}
- if((! $a->error) && (function_exists($a->module . '_afterpost'))) {
+ if ((! $a->error) && (function_exists($a->module . '_afterpost'))) {
call_hooks($a->module . '_mod_afterpost',$placeholder);
$func = $a->module . '_afterpost';
$func($a);
}
- if((! $a->error) && (function_exists($a->module . '_content'))) {
+ if ((! $a->error) && (function_exists($a->module . '_content'))) {
$arr = array('content' => $a->page['content']);
call_hooks($a->module . '_mod_content', $arr);
$a->page['content'] = $arr['content'];
@@ -366,7 +361,7 @@ if($a->module_loaded) {
$a->page['content'] .= $arr['content'];
}
- if(function_exists(str_replace('-','_',current_theme()) . '_content_loaded')) {
+ if (function_exists(str_replace('-','_',current_theme()) . '_content_loaded')) {
$func = str_replace('-','_',current_theme()) . '_content_loaded';
$func($a);
}
@@ -374,98 +369,76 @@ if($a->module_loaded) {
/*
* Create the page head after setting the language
- * and getting any auth credentials
+ * and getting any auth credentials.
*
* Moved init_pagehead() and init_page_end() to after
* all the module functions have executed so that all
- * theme choices made by the modules can take effect
+ * theme choices made by the modules can take effect.
*/
$a->init_pagehead();
-/**
+/*
* Build the page ending -- this is stuff that goes right before
* the closing tag
*/
-
$a->init_page_end();
// If you're just visiting, let javascript take you home
-
-if(x($_SESSION,'visitor_home'))
+if (x($_SESSION, 'visitor_home')) {
$homebase = $_SESSION['visitor_home'];
-elseif(local_user())
+} elseif (local_user()) {
$homebase = 'profile/' . $a->user['nickname'];
+}
-if(isset($homebase))
+if (isset($homebase)) {
$a->page['content'] .= '