tobias/friendica
1
0
Fork 0
Code Pull requests Activity

CSR changes, split dbclean in separate processes if worker is active

Browse source
This commit is contained in:
Michael Vogel 2016-10-22 10:14:41 +00:00
commit b429b85680
10 changed files with 592 additions and 589 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/Core/PConfig.php
View file

@ -175,7 +175,7 @@ class PConfig {
public static function delete($uid,$family,$key) { public static function delete($uid,$family,$key) {
global $a; global $a;
if (x($a->config[$uid][$family],$key)) if (x($a->config[$uid][$family], $key))
unset($a->config[$uid][$family][$key]); unset($a->config[$uid][$family][$key]);
$ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s'", $ret = q("DELETE FROM `pconfig` WHERE `uid` = %d AND `cat` = '%s' AND `k` = '%s'",
intval($uid), intval($uid),

9
include/cron.php
View file

@ -126,7 +126,14 @@ function cron_run(&$argv, &$argc){
proc_run(PRIORITY_LOW,'include/expire.php'); proc_run(PRIORITY_LOW,'include/expire.php');
proc_run(PRIORITY_LOW,'include/dbclean.php'); if (get_config("system", "worker")) {
proc_run(PRIORITY_LOW,'include/dbclean.php', 1);
proc_run(PRIORITY_LOW,'include/dbclean.php', 2);
proc_run(PRIORITY_LOW,'include/dbclean.php', 3);
proc_run(PRIORITY_LOW,'include/dbclean.php', 4);
} else {
proc_run(PRIORITY_LOW,'include/dbclean.php');
}
} }
// Clear cache entries // Clear cache entries

155
include/dba.php
View file

@ -5,7 +5,7 @@ require_once("dbm.php");
# TODO: PDO is disabled for release 3.3. We need to investigate why # TODO: PDO is disabled for release 3.3. We need to investigate why
# the update from 3.2 fails with pdo # the update from 3.2 fails with pdo
/* /*
if(class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) { if (class_exists('\PDO') && in_array('mysql', PDO::getAvailableDrivers())) {
require_once("library/dddbl2/dddbl.php"); require_once("library/dddbl2/dddbl.php");
require_once("include/dba_pdo.php"); require_once("include/dba_pdo.php");
} }
@ -24,7 +24,7 @@ require_once('include/datetime.php');
* *
*/ */
if(! class_exists('dba')) { if (! class_exists('dba')) {
class dba { class dba {
private $debug = 0; private $debug = 0;
@ -44,15 +44,15 @@ class dba {
$pass = trim($pass); $pass = trim($pass);
$db = trim($db); $db = trim($db);
if (!(strlen($server) && strlen($user))){ if (!(strlen($server) && strlen($user))) {
$this->connected = false; $this->connected = false;
$this->db = null; $this->db = null;
return; return;
} }
if($install) { if ($install) {
if(strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) { if (strlen($server) && ($server !== 'localhost') && ($server !== '127.0.0.1')) {
if(! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) { if (! dns_get_record($server, DNS_A + DNS_CNAME + DNS_PTR)) {
$this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server); $this->error = sprintf( t('Cannot locate DNS info for database server \'%s\''), $server);
$this->connected = false; $this->connected = false;
$this->db = null; $this->db = null;
@ -61,26 +61,26 @@ class dba {
} }
} }
if(class_exists('mysqli')) { if (class_exists('mysqli')) {
$this->db = @new mysqli($server,$user,$pass,$db); $this->db = @new mysqli($server,$user,$pass,$db);
if(! mysqli_connect_errno()) { if (! mysqli_connect_errno()) {
$this->connected = true; $this->connected = true;
} }
if (isset($a->config["system"]["db_charset"])) if (isset($a->config["system"]["db_charset"])) {
$this->db->set_charset($a->config["system"]["db_charset"]); $this->db->set_charset($a->config["system"]["db_charset"]);
} }
else { } else {
$this->mysqli = false; $this->mysqli = false;
$this->db = mysql_connect($server,$user,$pass); $this->db = mysql_connect($server,$user,$pass);
if($this->db && mysql_select_db($db,$this->db)) { if ($this->db && mysql_select_db($db,$this->db)) {
$this->connected = true; $this->connected = true;
} }
if (isset($a->config["system"]["db_charset"])) if (isset($a->config["system"]["db_charset"]))
mysql_set_charset($a->config["system"]["db_charset"], $this->db); mysql_set_charset($a->config["system"]["db_charset"], $this->db);
} }
if(! $this->connected) { if (!$this->connected) {
$this->db = null; $this->db = null;
if(! $install) if (!$install)
system_unavailable(); system_unavailable();
} }
@ -111,7 +111,7 @@ class dba {
/** /**
* @brief Returns the number of rows * @brief Returns the number of rows
* *
* @return string * @return integer
*/ */
public function num_rows() { public function num_rows() {
if (!$this->result) if (!$this->result)
@ -128,32 +128,32 @@ class dba {
public function q($sql, $onlyquery = false) { public function q($sql, $onlyquery = false) {
global $a; global $a;
if((! $this->db) || (! $this->connected)) if ((!$this->db) || (!$this->connected))
return false; return false;
$this->error = ''; $this->error = '';
// Check the connection (This can reconnect the connection - if configured) // Check the connection (This can reconnect the connection - if configured)
if ($this->mysqli) if ($this->mysqli) {
$connected = $this->db->ping(); $connected = $this->db->ping();
else } else {
$connected = mysql_ping($this->db); $connected = mysql_ping($this->db);
}
$connstr = ($connected ? "Connected": "Disonnected"); $connstr = ($connected ? "Connected": "Disonnected");
$stamp1 = microtime(true); $stamp1 = microtime(true);
$orig_sql = $sql; $orig_sql = $sql;
if(x($a->config,'system') && x($a->config['system'],'db_callstack')) { if (x($a->config,'system') && x($a->config['system'],'db_callstack')) {
$sql = "/*".$a->callstack()." */ ".$sql; $sql = "/*".$a->callstack()." */ ".$sql;
} }
if($this->mysqli) if ($this->mysqli) {
$result = @$this->db->query($sql); $result = @$this->db->query($sql);
else } else {
$result = @mysql_query($sql,$this->db); $result = @mysql_query($sql,$this->db);
}
$stamp2 = microtime(true); $stamp2 = microtime(true);
$duration = (float)($stamp2-$stamp1); $duration = (float)($stamp2-$stamp1);
@ -162,7 +162,7 @@ class dba {
if (strtolower(substr($orig_sql, 0, 6)) != "select") if (strtolower(substr($orig_sql, 0, 6)) != "select")
$a->save_timestamp($stamp1, "database_write"); $a->save_timestamp($stamp1, "database_write");
if(x($a->config,'system') && x($a->config['system'],'db_log')) { if (x($a->config,'system') && x($a->config['system'],'db_log')) {
if (($duration > $a->config["system"]["db_loglimit"])) { if (($duration > $a->config["system"]["db_loglimit"])) {
$duration = round($duration, 3); $duration = round($duration, 3);
$backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS);
@ -173,33 +173,34 @@ class dba {
} }
} }
if($this->mysqli) { if ($this->mysqli) {
if($this->db->errno) { if ($this->db->errno) {
$this->error = $this->db->error; $this->error = $this->db->error;
$this->errorno = $this->db->errno; $this->errorno = $this->db->errno;
} }
} elseif(mysql_errno($this->db)) { } elseif (mysql_errno($this->db)) {
$this->error = mysql_error($this->db); $this->error = mysql_error($this->db);
$this->errorno = mysql_errno($this->db); $this->errorno = mysql_errno($this->db);
} }
if(strlen($this->error)) { if (strlen($this->error)) {
logger('DB Error ('.$connstr.') '.$this->errorno.': '.$this->error); logger('DB Error ('.$connstr.') '.$this->errorno.': '.$this->error);
} }
if($this->debug) { if ($this->debug) {
$mesg = ''; $mesg = '';
if($result === false) if ($result === false) {
$mesg = 'false'; $mesg = 'false';
elseif($result === true) } elseif ($result === true) {
$mesg = 'true'; $mesg = 'true';
else { } else {
if($this->mysqli) if ($this->mysqli) {
$mesg = $result->num_rows . ' results' . EOL; $mesg = $result->num_rows . ' results' . EOL;
else } else {
$mesg = mysql_num_rows($result) . ' results' . EOL; $mesg = mysql_num_rows($result) . ' results' . EOL;
}
} }
$str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg $str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg
@ -215,13 +216,13 @@ class dba {
* These usually indicate SQL syntax errors that need to be resolved. * These usually indicate SQL syntax errors that need to be resolved.
*/ */
if($result === false) { if ($result === false) {
logger('dba: ' . printable($sql) . ' returned false.' . "\n" . $this->error); logger('dba: ' . printable($sql) . ' returned false.' . "\n" . $this->error);
if(file_exists('dbfail.out')) if (file_exists('dbfail.out'))
file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND); file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
} }
if(($result === true) || ($result === false)) if (($result === true) || ($result === false))
return $result; return $result;
if ($onlyquery) { if ($onlyquery) {
@ -230,15 +231,14 @@ class dba {
} }
$r = array(); $r = array();
if($this->mysqli) { if ($this->mysqli) {
if($result->num_rows) { if ($result->num_rows) {
while($x = $result->fetch_array(MYSQLI_ASSOC)) while($x = $result->fetch_array(MYSQLI_ASSOC))
$r[] = $x; $r[] = $x;
$result->free_result(); $result->free_result();
} }
} } else {
else { if (mysql_num_rows($result)) {
if(mysql_num_rows($result)) {
while($x = mysql_fetch_array($result, MYSQL_ASSOC)) while($x = mysql_fetch_array($result, MYSQL_ASSOC))
$r[] = $x; $r[] = $x;
mysql_free_result($result); mysql_free_result($result);
@ -247,7 +247,7 @@ class dba {
//$a->save_timestamp($stamp1, "database"); //$a->save_timestamp($stamp1, "database");
if($this->debug) if ($this->debug)
logger('dba: ' . printable(print_r($r, true))); logger('dba: ' . printable(print_r($r, true)));
return($r); return($r);
} }
@ -256,11 +256,11 @@ class dba {
$x = false; $x = false;
if ($this->result) if ($this->result)
if($this->mysqli) { if ($this->mysqli) {
if($this->result->num_rows) if ($this->result->num_rows)
$x = $this->result->fetch_array(MYSQLI_ASSOC); $x = $this->result->fetch_array(MYSQLI_ASSOC);
} else { } else {
if(mysql_num_rows($this->result)) if (mysql_num_rows($this->result))
$x = mysql_fetch_array($this->result, MYSQL_ASSOC); $x = mysql_fetch_array($this->result, MYSQL_ASSOC);
} }
@ -269,7 +269,7 @@ class dba {
public function qclose() { public function qclose() {
if ($this->result) if ($this->result)
if($this->mysqli) { if ($this->mysqli) {
$this->result->free_result(); $this->result->free_result();
} else { } else {
mysql_free_result($this->result); mysql_free_result($this->result);
@ -281,56 +281,60 @@ class dba {
} }
public function escape($str) { public function escape($str) {
if($this->db && $this->connected) { if ($this->db && $this->connected) {
if($this->mysqli) if ($this->mysqli) {
return @$this->db->real_escape_string($str); return @$this->db->real_escape_string($str);
else } else {
return @mysql_real_escape_string($str,$this->db); return @mysql_real_escape_string($str,$this->db);
}
} }
} }
function connected() { function connected() {
if ($this->mysqli) if ($this->mysqli) {
$connected = $this->db->ping(); $connected = $this->db->ping();
else } else {
$connected = mysql_ping($this->db); $connected = mysql_ping($this->db);
}
return $connected; return $connected;
} }
function __destruct() { function __destruct() {
if ($this->db) if ($this->db) {
if($this->mysqli) if ($this->mysqli) {
$this->db->close(); $this->db->close();
else } else {
mysql_close($this->db); mysql_close($this->db);
}
}
} }
}} }}
if(! function_exists('printable')) { if (! function_exists('printable')) {
function printable($s) { function printable($s) {
$s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s); $s = preg_replace("~([\x01-\x08\x0E-\x0F\x10-\x1F\x7F-\xFF])~",".", $s);
$s = str_replace("\x00",'.',$s); $s = str_replace("\x00",'.',$s);
if(x($_SERVER,'SERVER_NAME')) if (x($_SERVER,'SERVER_NAME'))
$s = escape_tags($s); $s = escape_tags($s);
return $s; return $s;
}} }}
// Procedural functions // Procedural functions
if(! function_exists('dbg')) { if (! function_exists('dbg')) {
function dbg($state) { function dbg($state) {
global $db; global $db;
if($db) if ($db)
$db->dbg($state); $db->dbg($state);
}} }}
if(! function_exists('dbesc')) { if (! function_exists('dbesc')) {
function dbesc($str) { function dbesc($str) {
global $db; global $db;
if($db && $db->connected) if ($db && $db->connected) {
return($db->escape($str)); return($db->escape($str));
else } else {
return(str_replace("'","\\'",$str)); return(str_replace("'","\\'",$str));
}
}} }}
@ -340,17 +344,17 @@ function dbesc($str) {
// Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d", // Example: $r = q("SELECT * FROM `%s` WHERE `uid` = %d",
// 'user', 1); // 'user', 1);
if(! function_exists('q')) { if (! function_exists('q')) {
function q($sql) { function q($sql) {
global $db; global $db;
$args = func_get_args(); $args = func_get_args();
unset($args[0]); unset($args[0]);
if($db && $db->connected) { if ($db && $db->connected) {
$stmt = @vsprintf($sql,$args); // Disabled warnings $stmt = @vsprintf($sql,$args); // Disabled warnings
//logger("dba: q: $stmt", LOGGER_ALL); //logger("dba: q: $stmt", LOGGER_ALL);
if($stmt === false) if ($stmt === false)
logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG); logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG);
return $db->q($stmt); return $db->q($stmt);
} }
@ -381,9 +385,9 @@ function qu($sql) {
$args = func_get_args(); $args = func_get_args();
unset($args[0]); unset($args[0]);
if($db && $db->connected) { if ($db && $db->connected) {
$stmt = @vsprintf($sql,$args); // Disabled warnings $stmt = @vsprintf($sql,$args); // Disabled warnings
if($stmt === false) if ($stmt === false)
logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG); logger('dba: vsprintf error: ' . print_r(debug_backtrace(),true), LOGGER_DEBUG);
$db->q("SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;"); $db->q("SET TRANSACTION ISOLATION LEVEL READ UNCOMMITTED;");
$retval = $db->q($stmt); $retval = $db->q($stmt);
@ -408,14 +412,15 @@ function qu($sql) {
* *
*/ */
if(! function_exists('dbq')) { if (! function_exists('dbq')) {
function dbq($sql) { function dbq($sql) {
global $db; global $db;
if($db && $db->connected) if ($db && $db->connected) {
$ret = $db->q($sql); $ret = $db->q($sql);
else } else {
$ret = false; $ret = false;
}
return $ret; return $ret;
}} }}
@ -426,16 +431,16 @@ function dbq($sql) {
// cast to int to avoid trouble. // cast to int to avoid trouble.
if(! function_exists('dbesc_array_cb')) { if (! function_exists('dbesc_array_cb')) {
function dbesc_array_cb(&$item, $key) { function dbesc_array_cb(&$item, $key) {
if(is_string($item)) if (is_string($item))
$item = dbesc($item); $item = dbesc($item);
}} }}
if(! function_exists('dbesc_array')) { if (! function_exists('dbesc_array')) {
function dbesc_array(&$arr) { function dbesc_array(&$arr) {
if(is_array($arr) && count($arr)) { if (is_array($arr) && count($arr)) {
array_walk($arr,'dbesc_array_cb'); array_walk($arr,'dbesc_array_cb');
} }
}} }}

79
include/dbclean.php
View file

@ -8,10 +8,10 @@ require_once("boot.php");
function dbclean_run(&$argv, &$argc) { function dbclean_run(&$argv, &$argc) {
global $a, $db; global $a, $db;
if(is_null($a)) if (is_null($a))
$a = new App; $a = new App;
if(is_null($db)) { if (is_null($db)) {
@include(".htconfig.php"); @include(".htconfig.php");
require_once("include/dba.php"); require_once("include/dba.php");
$db = new dba($db_host, $db_user, $db_pass, $db_data); $db = new dba($db_host, $db_user, $db_pass, $db_data);
@ -21,52 +21,69 @@ function dbclean_run(&$argv, &$argc) {
load_config('config'); load_config('config');
load_config('system'); load_config('system');
remove_orphans(); if ($argc == 2) {
$stage = intval($argv[1]);
} else {
$stage = 0;
}
remove_orphans($stage);
killme(); killme();
} }
/** /**
* @brief Remove orphaned database entries * @brief Remove orphaned database entries
*/ */
function remove_orphans() { function remove_orphans($stage = 0) {
global $db; global $db;
logger("Deleting orphaned data from thread table"); if (($stage == 1) OR ($stage == 0)) {
if ($db->q("SELECT `iid` FROM `thread` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `thread`.`iid`)", true)) { logger("Deleting orphaned data from thread table");
logger("found thread orphans: ".$db->num_rows()); if ($db->q("SELECT `iid` FROM `thread` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`parent` = `thread`.`iid`)", true)) {
while ($orphan = $db->qfetch()) logger("found thread orphans: ".$db->num_rows());
q("DELETE FROM `thread` WHERE `iid` = %d", intval($orphan["iid"])); while ($orphan = $db->qfetch()) {
q("DELETE FROM `thread` WHERE `iid` = %d", intval($orphan["iid"]));
}
}
$db->qclose();
} }
$db->qclose();
if (($stage == 2) OR ($stage == 0)) {
logger("Deleting orphaned data from notify table"); logger("Deleting orphaned data from notify table");
if ($db->q("SELECT `iid` FROM `notify` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `notify`.`iid`)", true)) { if ($db->q("SELECT `iid` FROM `notify` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `notify`.`iid`)", true)) {
logger("found notify orphans: ".$db->num_rows()); logger("found notify orphans: ".$db->num_rows());
while ($orphan = $db->qfetch()) while ($orphan = $db->qfetch()) {
q("DELETE FROM `notify` WHERE `iid` = %d", intval($orphan["iid"])); q("DELETE FROM `notify` WHERE `iid` = %d", intval($orphan["iid"]));
}
}
$db->qclose();
} }
$db->qclose();
logger("Deleting orphaned data from sign table"); if (($stage == 3) OR ($stage == 0)) {
if ($db->q("SELECT `iid` FROM `sign` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `sign`.`iid`)", true)) { logger("Deleting orphaned data from sign table");
logger("found sign orphans: ".$db->num_rows()); if ($db->q("SELECT `iid` FROM `sign` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `sign`.`iid`)", true)) {
while ($orphan = $db->qfetch()) logger("found sign orphans: ".$db->num_rows());
q("DELETE FROM `sign` WHERE `iid` = %d", intval($orphan["iid"])); while ($orphan = $db->qfetch()) {
q("DELETE FROM `sign` WHERE `iid` = %d", intval($orphan["iid"]));
}
}
$db->qclose();
} }
$db->qclose();
logger("Deleting orphaned data from term table"); if (($stage == 4) OR ($stage == 0)) {
if ($db->q("SELECT `oid` FROM `term` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `term`.`oid`)", true)) { logger("Deleting orphaned data from term table");
logger("found term orphans: ".$db->num_rows()); if ($db->q("SELECT `oid` FROM `term` WHERE NOT EXISTS (SELECT `id` FROM `item` WHERE `item`.`id` = `term`.`oid`)", true)) {
while ($orphan = $db->qfetch()) logger("found term orphans: ".$db->num_rows());
q("DELETE FROM `term` WHERE `oid` = %d", intval($orphan["oid"])); while ($orphan = $db->qfetch()) {
q("DELETE FROM `term` WHERE `oid` = %d", intval($orphan["oid"]));
}
}
$db->qclose();
} }
$db->qclose();
// SELECT `id`, `received`, `created`, `guid` FROM `item` WHERE `uid` = 0 AND NOT EXISTS (SELECT `guid` FROM `item` AS `i` WHERE `item`.`guid` = `i`.`guid` AND `i`.`uid` != 0) LIMIT 1; /// @todo Based on the following query we should remove some more data
// SELECT `id`, `received`, `created`, `guid` FROM `item` WHERE `uid` = 0 AND NOT EXISTS (SELECT `guid` FROM `item` AS `i` WHERE `item`.`guid` = `i`.`guid` AND `i`.`uid` != 0) LIMIT 1;
logger("Done deleting orphaned data from tables"); logger("Done deleting orphaned data from tables");
} }

4
include/dbm.php
View file

@ -44,9 +44,9 @@ class dbm {
*/ */
public static function is_result($array) { public static function is_result($array) {
// It could be a return value from an update statement // It could be a return value from an update statement
if (is_bool($array)) if (is_bool($array)) {
return $array; return $array;
}
return (is_array($array) && count($array) > 0); return (is_array($array) && count($array) > 0);
} }
} }

306
include/items.php
View file

@ -23,7 +23,7 @@ require_once('include/group.php');
require_once('library/defuse/php-encryption-1.2.1/Crypto.php'); require_once('library/defuse/php-encryption-1.2.1/Crypto.php');
function construct_verb($item) { function construct_verb($item) {
if($item['verb']) if ($item['verb'])
return $item['verb']; return $item['verb'];
return ACTIVITY_POST; return ACTIVITY_POST;
} }
@ -33,7 +33,7 @@ function construct_verb($item) {
* The purpose of this function is to apply system message length limits to * The purpose of this function is to apply system message length limits to
* imported messages without including any embedded photos in the length * imported messages without including any embedded photos in the length
*/ */
if(! function_exists('limit_body_size')) { if (! function_exists('limit_body_size')) {
function limit_body_size($body) { function limit_body_size($body) {
// logger('limit_body_size: start', LOGGER_DEBUG); // logger('limit_body_size: start', LOGGER_DEBUG);
@ -42,7 +42,7 @@ function limit_body_size($body) {
// If the length of the body, including the embedded images, is smaller // If the length of the body, including the embedded images, is smaller
// than the maximum, then don't waste time looking for the images // than the maximum, then don't waste time looking for the images
if($maxlen && (strlen($body) > $maxlen)) { if ($maxlen && (strlen($body) > $maxlen)) {
logger('limit_body_size: the total body length exceeds the limit', LOGGER_DEBUG); logger('limit_body_size: the total body length exceeds the limit', LOGGER_DEBUG);
@ -60,40 +60,37 @@ function limit_body_size($body) {
$img_end += $img_start; $img_end += $img_start;
$img_end += strlen('[/img]'); $img_end += strlen('[/img]');
if(! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) { if (! strcmp(substr($orig_body, $img_start + $img_st_close, 5), 'data:')) {
// This is an embedded image // This is an embedded image
if( ($textlen + $img_start) > $maxlen ) { if ( ($textlen + $img_start) > $maxlen ) {
if($textlen < $maxlen) { if ($textlen < $maxlen) {
logger('limit_body_size: the limit happens before an embedded image', LOGGER_DEBUG); logger('limit_body_size: the limit happens before an embedded image', LOGGER_DEBUG);
$new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen);
$textlen = $maxlen; $textlen = $maxlen;
} }
} } else {
else {
$new_body = $new_body . substr($orig_body, 0, $img_start); $new_body = $new_body . substr($orig_body, 0, $img_start);
$textlen += $img_start; $textlen += $img_start;
} }
$new_body = $new_body . substr($orig_body, $img_start, $img_end - $img_start); $new_body = $new_body . substr($orig_body, $img_start, $img_end - $img_start);
} } else {
else {
if( ($textlen + $img_end) > $maxlen ) { if ( ($textlen + $img_end) > $maxlen ) {
if($textlen < $maxlen) { if ($textlen < $maxlen) {
logger('limit_body_size: the limit happens before the end of a non-embedded image', LOGGER_DEBUG); logger('limit_body_size: the limit happens before the end of a non-embedded image', LOGGER_DEBUG);
$new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen);
$textlen = $maxlen; $textlen = $maxlen;
} }
} } else {
else {
$new_body = $new_body . substr($orig_body, 0, $img_end); $new_body = $new_body . substr($orig_body, 0, $img_end);
$textlen += $img_end; $textlen += $img_end;
} }
} }
$orig_body = substr($orig_body, $img_end); $orig_body = substr($orig_body, $img_end);
if($orig_body === false) // in case the body ends on a closing image tag if ($orig_body === false) // in case the body ends on a closing image tag
$orig_body = ''; $orig_body = '';
$img_start = strpos($orig_body, '[img'); $img_start = strpos($orig_body, '[img');
@ -101,22 +98,20 @@ function limit_body_size($body) {
$img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false); $img_end = ($img_start !== false ? strpos(substr($orig_body, $img_start), '[/img]') : false);
} }
if( ($textlen + strlen($orig_body)) > $maxlen) { if ( ($textlen + strlen($orig_body)) > $maxlen) {
if($textlen < $maxlen) { if ($textlen < $maxlen) {
logger('limit_body_size: the limit happens after the end of the last image', LOGGER_DEBUG); logger('limit_body_size: the limit happens after the end of the last image', LOGGER_DEBUG);
$new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen); $new_body = $new_body . substr($orig_body, 0, $maxlen - $textlen);
$textlen = $maxlen; $textlen = $maxlen;
} }
} } else {
else {
logger('limit_body_size: the text size with embedded images extracted did not violate the limit', LOGGER_DEBUG); logger('limit_body_size: the text size with embedded images extracted did not violate the limit', LOGGER_DEBUG);
$new_body = $new_body . $orig_body; $new_body = $new_body . $orig_body;
$textlen += strlen($orig_body); $textlen += strlen($orig_body);
} }
return $new_body; return $new_body;
} } else
else
return $body; return $body;
}} }}
@ -319,9 +314,7 @@ function item_add_language_opt(&$arr) {
return; return;
} }
$postopts = $arr['postopts']; $postopts = $arr['postopts'];
} } else {
else
{
$postopts = ""; $postopts = "";
} }
@ -383,7 +376,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
// item array and set it aside for later storage. // item array and set it aside for later storage.
$dsprsig = null; $dsprsig = null;
if(x($arr,'dsprsig')) { if (x($arr,'dsprsig')) {
$dsprsig = json_decode(base64_decode($arr['dsprsig'])); $dsprsig = json_decode(base64_decode($arr['dsprsig']));
unset($arr['dsprsig']); unset($arr['dsprsig']);
} }
@ -396,16 +389,16 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
$arr['plink'] = ostatus::convert_href($arr['uri']); $arr['plink'] = ostatus::convert_href($arr['uri']);
} }
if(x($arr, 'gravity')) if (x($arr, 'gravity'))
$arr['gravity'] = intval($arr['gravity']); $arr['gravity'] = intval($arr['gravity']);
elseif($arr['parent-uri'] === $arr['uri']) elseif ($arr['parent-uri'] === $arr['uri'])
$arr['gravity'] = 0; $arr['gravity'] = 0;
elseif(activity_match($arr['verb'],ACTIVITY_POST)) elseif (activity_match($arr['verb'],ACTIVITY_POST))
$arr['gravity'] = 6; $arr['gravity'] = 6;
else else
$arr['gravity'] = 6; // extensible catchall $arr['gravity'] = 6; // extensible catchall
if(! x($arr,'type')) if (! x($arr,'type'))
$arr['type'] = 'remote'; $arr['type'] = 'remote';
@ -413,7 +406,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
/* check for create date and expire time */ /* check for create date and expire time */
$uid = intval($arr['uid']); $uid = intval($arr['uid']);
$r = q("SELECT expire FROM user WHERE uid = %d", intval($uid)); $r = q("SELECT expire FROM user WHERE uid = %d", intval($uid));
if(count($r)) { if (count($r)) {
$expire_interval = $r[0]['expire']; $expire_interval = $r[0]['expire'];
if ($expire_interval>0) { if ($expire_interval>0) {
$expire_date = new DateTime( '- '.$expire_interval.' days', new DateTimeZone('UTC')); $expire_date = new DateTime( '- '.$expire_interval.' days', new DateTimeZone('UTC'));
@ -445,7 +438,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
// Shouldn't happen but we want to make absolutely sure it doesn't leak from a plugin. // Shouldn't happen but we want to make absolutely sure it doesn't leak from a plugin.
// Deactivated, since the bbcode parser can handle with it - and it destroys posts with some smileys that contain "<" // Deactivated, since the bbcode parser can handle with it - and it destroys posts with some smileys that contain "<"
//if((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false)) //if ((strpos($arr['body'],'<') !== false) || (strpos($arr['body'],'>') !== false))
// $arr['body'] = strip_tags($arr['body']); // $arr['body'] = strip_tags($arr['body']);
item_add_language_opt($arr); item_add_language_opt($arr);
@ -530,19 +523,19 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
intval($arr['uid']) intval($arr['uid'])
); );
if(!count($r)) if (!count($r))
$r = q("SELECT `network` FROM `gcontact` WHERE `network` IN ('%s', '%s', '%s') AND `nurl` = '%s' LIMIT 1", $r = q("SELECT `network` FROM `gcontact` WHERE `network` IN ('%s', '%s', '%s') AND `nurl` = '%s' LIMIT 1",
dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS), dbesc(NETWORK_DFRN), dbesc(NETWORK_DIASPORA), dbesc(NETWORK_OSTATUS),
dbesc(normalise_link($arr['author-link'])) dbesc(normalise_link($arr['author-link']))
); );
if(!count($r)) if (!count($r))
$r = q("SELECT `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT `network` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($arr['contact-id']), intval($arr['contact-id']),
intval($arr['uid']) intval($arr['uid'])
); );
if(count($r)) if (count($r))
$arr['network'] = $r[0]["network"]; $arr['network'] = $r[0]["network"];
// Fallback to friendica (why is it empty in some cases?) // Fallback to friendica (why is it empty in some cases?)
@ -556,7 +549,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
if ($arr["contact-id"] == 0) { if ($arr["contact-id"] == 0) {
// First we are looking for a suitable contact that matches with the author of the post // First we are looking for a suitable contact that matches with the author of the post
// This is done only for comments (See below explanation at "gcontact-id") // This is done only for comments (See below explanation at "gcontact-id")
if($arr['parent-uri'] != $arr['uri']) if ($arr['parent-uri'] != $arr['uri'])
$arr["contact-id"] = get_contact($arr['author-link'], $uid); $arr["contact-id"] = get_contact($arr['author-link'], $uid);
// If not present then maybe the owner was found // If not present then maybe the owner was found
@ -576,7 +569,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
// The gcontact should mostly behave like the contact. But is is supposed to be global for the system. // The gcontact should mostly behave like the contact. But is is supposed to be global for the system.
// This means that wall posts, repeated posts, etc. should have the gcontact id of the owner. // This means that wall posts, repeated posts, etc. should have the gcontact id of the owner.
// On comments the author is the better choice. // On comments the author is the better choice.
if($arr['parent-uri'] === $arr['uri']) if ($arr['parent-uri'] === $arr['uri'])
$arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['owner-link'], "network" => $arr['network'], $arr["gcontact-id"] = get_gcontact_id(array("url" => $arr['owner-link'], "network" => $arr['network'],
"photo" => $arr['owner-avatar'], "name" => $arr['owner-name'])); "photo" => $arr['owner-avatar'], "name" => $arr['owner-name']));
else else
@ -596,7 +589,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
$r = q("SELECT `guid` FROM `item` WHERE `guid` = '%s' AND `network` = '%s' AND `uid` = '%d' LIMIT 1", $r = q("SELECT `guid` FROM `item` WHERE `guid` = '%s' AND `network` = '%s' AND `uid` = '%d' LIMIT 1",
dbesc($arr['guid']), dbesc($arr['network']), intval($arr['uid'])); dbesc($arr['guid']), dbesc($arr['network']), intval($arr['uid']));
if(count($r)) { if (count($r)) {
logger('found item with guid '.$arr['guid'].' for user '.$arr['uid'].' on network '.$arr['network'], LOGGER_DEBUG); logger('found item with guid '.$arr['guid'].' for user '.$arr['uid'].' on network '.$arr['network'], LOGGER_DEBUG);
return 0; return 0;
} }
@ -606,7 +599,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
item_body_set_hashtags($arr); item_body_set_hashtags($arr);
$arr['thr-parent'] = $arr['parent-uri']; $arr['thr-parent'] = $arr['parent-uri'];
if($arr['parent-uri'] === $arr['uri']) { if ($arr['parent-uri'] === $arr['uri']) {
$parent_id = 0; $parent_id = 0;
$parent_deleted = 0; $parent_deleted = 0;
$allow_cid = $arr['allow_cid']; $allow_cid = $arr['allow_cid'];
@ -614,8 +607,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
$deny_cid = $arr['deny_cid']; $deny_cid = $arr['deny_cid'];
$deny_gid = $arr['deny_gid']; $deny_gid = $arr['deny_gid'];
$notify_type = 'wall-new'; $notify_type = 'wall-new';
} } else {
else {
// find the parent and snarf the item id and ACLs // find the parent and snarf the item id and ACLs
// and anything else we need to inherit // and anything else we need to inherit
@ -625,13 +617,13 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
intval($arr['uid']) intval($arr['uid'])
); );
if(count($r)) { if (count($r)) {
// is the new message multi-level threaded? // is the new message multi-level threaded?
// even though we don't support it now, preserve the info // even though we don't support it now, preserve the info
// and re-attach to the conversation parent. // and re-attach to the conversation parent.
if($r[0]['uri'] != $r[0]['parent-uri']) { if ($r[0]['uri'] != $r[0]['parent-uri']) {
$arr['parent-uri'] = $r[0]['parent-uri']; $arr['parent-uri'] = $r[0]['parent-uri'];
$z = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `parent-uri` = '%s' AND `uid` = %d $z = q("SELECT * FROM `item` WHERE `uri` = '%s' AND `parent-uri` = '%s' AND `uid` = %d
ORDER BY `id` ASC LIMIT 1", ORDER BY `id` ASC LIMIT 1",
@ -639,7 +631,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
dbesc($r[0]['parent-uri']), dbesc($r[0]['parent-uri']),
intval($arr['uid']) intval($arr['uid'])
); );
if($z && count($z)) if ($z && count($z))
$r = $z; $r = $z;
} }
@ -656,21 +648,21 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
// This differs from the above settings as it subtly allows comments from // This differs from the above settings as it subtly allows comments from
// email correspondents to be private even if the overall thread is not. // email correspondents to be private even if the overall thread is not.
if($r[0]['private']) if ($r[0]['private'])
$arr['private'] = $r[0]['private']; $arr['private'] = $r[0]['private'];
// Edge case. We host a public forum that was originally posted to privately. // Edge case. We host a public forum that was originally posted to privately.
// The original author commented, but as this is a comment, the permissions // The original author commented, but as this is a comment, the permissions
// weren't fixed up so it will still show the comment as private unless we fix it here. // weren't fixed up so it will still show the comment as private unless we fix it here.
if((intval($r[0]['forum_mode']) == 1) && (! $r[0]['private'])) if ((intval($r[0]['forum_mode']) == 1) && (! $r[0]['private']))
$arr['private'] = 0; $arr['private'] = 0;
// If its a post from myself then tag the thread as "mention" // If its a post from myself then tag the thread as "mention"
logger("item_store: Checking if parent ".$parent_id." has to be tagged as mention for user ".$arr['uid'], LOGGER_DEBUG); logger("item_store: Checking if parent ".$parent_id." has to be tagged as mention for user ".$arr['uid'], LOGGER_DEBUG);
$u = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($arr['uid'])); $u = q("SELECT `nickname` FROM `user` WHERE `uid` = %d", intval($arr['uid']));
if(count($u)) { if (count($u)) {
$a = get_app(); $a = get_app();
$self = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']); $self = normalise_link($a->get_baseurl() . '/profile/' . $u[0]['nickname']);
logger("item_store: 'myself' is ".$self." for parent ".$parent_id." checking against ".$arr['author-link']." and ".$arr['owner-link'], LOGGER_DEBUG); logger("item_store: 'myself' is ".$self." for parent ".$parent_id." checking against ".$arr['author-link']." and ".$arr['owner-link'], LOGGER_DEBUG);
@ -684,13 +676,12 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
// Allow one to see reply tweets from status.net even when // Allow one to see reply tweets from status.net even when
// we don't have or can't see the original post. // we don't have or can't see the original post.
if($force_parent) { if ($force_parent) {
logger('item_store: $force_parent=true, reply converted to top-level post.'); logger('item_store: $force_parent=true, reply converted to top-level post.');
$parent_id = 0; $parent_id = 0;
$arr['parent-uri'] = $arr['uri']; $arr['parent-uri'] = $arr['uri'];
$arr['gravity'] = 0; $arr['gravity'] = 0;
} } else {
else {
logger('item_store: item parent '.$arr['parent-uri'].' for '.$arr['uid'].' was not found - ignoring item'); logger('item_store: item parent '.$arr['parent-uri'].' for '.$arr['uid'].' was not found - ignoring item');
return 0; return 0;
} }
@ -740,14 +731,14 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
$arr["global"] = true; $arr["global"] = true;
q("UPDATE `item` SET `global` = 1 WHERE `uri` = '%s'", dbesc($arr["uri"])); q("UPDATE `item` SET `global` = 1 WHERE `uri` = '%s'", dbesc($arr["uri"]));
} else { } else {
$isglobal = q("SELECT `global` FROM `item` WHERE `uid` = 0 AND `uri` = '%s'", dbesc($arr["uri"])); $isglobal = q("SELECT `global` FROM `item` WHERE `uid` = 0 AND `uri` = '%s'", dbesc($arr["uri"]));
$arr["global"] = (count($isglobal) > 0); $arr["global"] = (count($isglobal) > 0);
} }
// ACL settings // ACL settings
if(strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid)) if (strlen($allow_cid) || strlen($allow_gid) || strlen($deny_cid) || strlen($deny_gid))
$private = 1; $private = 1;
else else
$private = $arr['private']; $private = $arr['private'];
@ -767,7 +758,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
else else
call_hooks('post_remote',$arr); call_hooks('post_remote',$arr);
if(x($arr,'cancel')) { if (x($arr,'cancel')) {
logger('item_store: post cancelled by plugin.'); logger('item_store: post cancelled by plugin.');
return 0; return 0;
} }
@ -798,7 +789,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
dbesc($arr['network']) dbesc($arr['network'])
); );
if(count($r) > 1) { if (count($r) > 1) {
// There are duplicates. Keep the oldest one, delete the others // There are duplicates. Keep the oldest one, delete the others
logger('item_store: duplicated post occurred. Removing newer duplicates. uri = '.$arr['uri'].' uid = '.$arr['uid']); logger('item_store: duplicated post occurred. Removing newer duplicates. uri = '.$arr['uri'].' uid = '.$arr['uid']);
q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` = '%s' AND `id` > %d", q("DELETE FROM `item` WHERE `uri` = '%s' AND `uid` = %d AND `network` = '%s' AND `id` > %d",
@ -809,7 +800,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
); );
q("COMMIT"); q("COMMIT");
return 0; return 0;
} elseif(count($r)) { } elseif (count($r)) {
$current_post = $r[0]['id']; $current_post = $r[0]['id'];
logger('item_store: created item ' . $current_post); logger('item_store: created item ' . $current_post);
@ -821,7 +812,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
return 0; return 0;
} }
if(!$parent_id || ($arr['parent-uri'] === $arr['uri'])) if (!$parent_id || ($arr['parent-uri'] === $arr['uri']))
$parent_id = $current_post; $parent_id = $current_post;
// Set parent id // Set parent id
@ -847,7 +838,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
intval($parent_id) intval($parent_id)
); );
if($dsprsig) { if ($dsprsig) {
// Friendica servers lower than 3.4.3-2 had double encoded the signature ... // Friendica servers lower than 3.4.3-2 had double encoded the signature ...
// We can check for this condition when we decode and encode the stuff again. // We can check for this condition when we decode and encode the stuff again.
@ -869,7 +860,7 @@ function item_store($arr,$force_parent = false, $notify = false, $dontcache = fa
* If this is now the last-child, force all _other_ children of this parent to *not* be last-child * If this is now the last-child, force all _other_ children of this parent to *not* be last-child
*/ */
if($arr['last-child']) { if ($arr['last-child']) {
$r = q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d AND `id` != %d", $r = q("UPDATE `item` SET `last-child` = 0 WHERE `parent-uri` = '%s' AND `uid` = %d AND `id` != %d",
dbesc($arr['uri']), dbesc($arr['uri']),
intval($arr['uid']), intval($arr['uid']),
@ -931,17 +922,18 @@ function item_set_last_item($arr) {
if (!$update AND ($arr["network"] == NETWORK_DFRN) AND ($arr["parent-uri"] === $arr["uri"])) { if (!$update AND ($arr["network"] == NETWORK_DFRN) AND ($arr["parent-uri"] === $arr["uri"])) {
$isforum = q("SELECT `forum` FROM `contact` WHERE `id` = %d AND `forum`", $isforum = q("SELECT `forum` FROM `contact` WHERE `id` = %d AND `forum`",
intval($arr['contact-id'])); intval($arr['contact-id']));
if ($isforum) if ($isforum) {
$update = true; $update = true;
}
} }
if ($update) if ($update) {
q("UPDATE `contact` SET `success_update` = '%s', `last-item` = '%s' WHERE `id` = %d", q("UPDATE `contact` SET `success_update` = '%s', `last-item` = '%s' WHERE `id` = %d",
dbesc($arr['received']), dbesc($arr['received']),
dbesc($arr['received']), dbesc($arr['received']),
intval($arr['contact-id']) intval($arr['contact-id'])
); );
}
// Now do the same for the system wide contacts with uid=0 // Now do the same for the system wide contacts with uid=0
if (!$arr['private']) { if (!$arr['private']) {
q("UPDATE `contact` SET `success_update` = '%s', `last-item` = '%s' WHERE `id` = %d", q("UPDATE `contact` SET `success_update` = '%s', `last-item` = '%s' WHERE `id` = %d",
@ -950,12 +942,13 @@ function item_set_last_item($arr) {
intval($arr['owner-id']) intval($arr['owner-id'])
); );
if ($arr['owner-id'] != $arr['author-id']) if ($arr['owner-id'] != $arr['author-id']) {
q("UPDATE `contact` SET `success_update` = '%s', `last-item` = '%s' WHERE `id` = %d", q("UPDATE `contact` SET `success_update` = '%s', `last-item` = '%s' WHERE `id` = %d",
dbesc($arr['received']), dbesc($arr['received']),
dbesc($arr['received']), dbesc($arr['received']),
intval($arr['author-id']) intval($arr['author-id'])
); );
}
} }
} }
@ -964,7 +957,7 @@ function item_body_set_hashtags(&$item) {
$tags = get_tags($item["body"]); $tags = get_tags($item["body"]);
// No hashtags? // No hashtags?
if(!count($tags)) if (!count($tags))
return(false); return(false);
// This sorting is important when there are hashtags that are part of other hashtags // This sorting is important when there are hashtags that are part of other hashtags
@ -1004,10 +997,10 @@ function item_body_set_hashtags(&$item) {
foreach($tags as $tag) { foreach($tags as $tag) {
if(strpos($tag,'#') !== 0) if (strpos($tag,'#') !== 0)
continue; continue;
if(strpos($tag,'[url=')) if (strpos($tag,'[url='))
continue; continue;
$basetag = str_replace('_',' ',substr($tag,1)); $basetag = str_replace('_',' ',substr($tag,1));
@ -1016,8 +1009,8 @@ function item_body_set_hashtags(&$item) {
$item["body"] = str_replace($tag, $newtag, $item["body"]); $item["body"] = str_replace($tag, $newtag, $item["body"]);
if(!stristr($item["tag"],"/search?tag=".$basetag."]".$basetag."[/url]")) { if (!stristr($item["tag"],"/search?tag=".$basetag."]".$basetag."[/url]")) {
if(strlen($item["tag"])) if (strlen($item["tag"]))
$item["tag"] = ','.$item["tag"]; $item["tag"] = ','.$item["tag"];
$item["tag"] = $newtag.$item["tag"]; $item["tag"] = $newtag.$item["tag"];
} }
@ -1072,10 +1065,10 @@ function get_item_id($guid, $uid = 0) {
// return - test // return - test
function get_item_contact($item,$contacts) { function get_item_contact($item,$contacts) {
if(! count($contacts) || (! is_array($item))) if (! count($contacts) || (! is_array($item)))
return false; return false;
foreach($contacts as $contact) { foreach($contacts as $contact) {
if($contact['id'] == $item['contact-id']) { if ($contact['id'] == $item['contact-id']) {
return $contact; return $contact;
break; // NOTREACHED break; // NOTREACHED
} }
@ -1100,7 +1093,7 @@ function tag_deliver($uid,$item_id) {
$u = q("select * from user where uid = %d limit 1", $u = q("select * from user where uid = %d limit 1",
intval($uid) intval($uid)
); );
if(! count($u)) if (! count($u))
return; return;
$community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); $community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
@ -1111,7 +1104,7 @@ function tag_deliver($uid,$item_id) {
intval($item_id), intval($item_id),
intval($uid) intval($uid)
); );
if(! count($i)) if (! count($i))
return; return;
$item = $i[0]; $item = $i[0];
@ -1124,16 +1117,16 @@ function tag_deliver($uid,$item_id) {
$dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']); $dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']);
$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER); $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
if($cnt) { if ($cnt) {
foreach($matches as $mtch) { foreach($matches as $mtch) {
if(link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) { if (link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) {
$mention = true; $mention = true;
logger('tag_deliver: mention found: ' . $mtch[2]); logger('tag_deliver: mention found: ' . $mtch[2]);
} }
} }
} }
if(! $mention){ if (! $mention){
if ( ($community_page || $prvgroup) && if ( ($community_page || $prvgroup) &&
(!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])){ (!$item['wall']) && (!$item['origin']) && ($item['id'] == $item['parent'])){
// mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment) // mmh.. no mention.. community page or private group... no wall.. no origin.. top-post (not a comment)
@ -1152,7 +1145,7 @@ function tag_deliver($uid,$item_id) {
call_hooks('tagged', $arr); call_hooks('tagged', $arr);
if((! $community_page) && (! $prvgroup)) if ((! $community_page) && (! $prvgroup))
return; return;
@ -1160,7 +1153,7 @@ function tag_deliver($uid,$item_id) {
// prevent delivery looping - only proceed // prevent delivery looping - only proceed
// if the message originated elsewhere and is a top-level post // if the message originated elsewhere and is a top-level post
if(($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent'])) if (($item['wall']) || ($item['origin']) || ($item['id'] != $item['parent']))
return; return;
// now change this copy of the post to a forum head message and deliver to all the tgroup members // now change this copy of the post to a forum head message and deliver to all the tgroup members
@ -1169,7 +1162,7 @@ function tag_deliver($uid,$item_id) {
$c = q("select name, url, thumb from contact where self = 1 and uid = %d limit 1", $c = q("select name, url, thumb from contact where self = 1 and uid = %d limit 1",
intval($u[0]['uid']) intval($u[0]['uid'])
); );
if(! count($c)) if (! count($c))
return; return;
// also reset all the privacy bits to the forum default permissions // also reset all the privacy bits to the forum default permissions
@ -1207,14 +1200,14 @@ function tgroup_check($uid,$item) {
// check that the message originated elsewhere and is a top-level post // check that the message originated elsewhere and is a top-level post
if(($item['wall']) || ($item['origin']) || ($item['uri'] != $item['parent-uri'])) if (($item['wall']) || ($item['origin']) || ($item['uri'] != $item['parent-uri']))
return false; return false;
$u = q("select * from user where uid = %d limit 1", $u = q("select * from user where uid = %d limit 1",
intval($uid) intval($uid)
); );
if(! count($u)) if (! count($u))
return false; return false;
$community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false); $community_page = (($u[0]['page-flags'] == PAGE_COMMUNITY) ? true : false);
@ -1229,19 +1222,19 @@ function tgroup_check($uid,$item) {
$dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']); $dlink = normalise_link($a->get_baseurl() . '/u/' . $u[0]['nickname']);
$cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER); $cnt = preg_match_all('/[\@\!]\[url\=(.*?)\](.*?)\[\/url\]/ism',$item['body'],$matches,PREG_SET_ORDER);
if($cnt) { if ($cnt) {
foreach($matches as $mtch) { foreach($matches as $mtch) {
if(link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) { if (link_compare($link,$mtch[1]) || link_compare($dlink,$mtch[1])) {
$mention = true; $mention = true;
logger('tgroup_check: mention found: ' . $mtch[2]); logger('tgroup_check: mention found: ' . $mtch[2]);
} }
} }
} }
if(! $mention) if (! $mention)
return false; return false;
if((! $community_page) && (! $prvgroup)) if ((! $community_page) && (! $prvgroup))
return false; return false;
return true; return true;
@ -1404,13 +1397,13 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
if (is_object($item)) { if (is_object($item)) {
$rawtag = $item->get_item_tags(NAMESPACE_ACTIVITY,'actor'); $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']; $nick = $rawtag[0]['child'][NAMESPACE_POCO]['preferredUsername'][0]['data'];
} else } else
$nick = $item; $nick = $item;
if(is_array($contact)) { if (is_array($contact)) {
if(($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING) if (($contact['network'] == NETWORK_OSTATUS && $contact['rel'] == CONTACT_IS_SHARING)
|| ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) { || ($sharing && $contact['rel'] == CONTACT_IS_FOLLOWER)) {
$r = q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d", $r = q("UPDATE `contact` SET `rel` = %d, `writable` = 1 WHERE `id` = %d AND `uid` = %d",
intval(CONTACT_IS_FRIEND), intval(CONTACT_IS_FRIEND),
@ -1440,7 +1433,7 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
intval($importer['uid']), intval($importer['uid']),
dbesc($url) dbesc($url)
); );
if(count($r)) { if (count($r)) {
$contact_record = $r[0]; $contact_record = $r[0];
update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true); update_contact_avatar($photo, $importer["uid"], $contact_record["id"], true);
} }
@ -1450,12 +1443,12 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
intval($importer['uid']) intval($importer['uid'])
); );
$a = get_app(); $a = get_app();
if(count($r) AND !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) { if (count($r) AND !in_array($r[0]['page-flags'], array(PAGE_SOAPBOX, PAGE_FREELOVE))) {
// create notification // create notification
$hash = random_string(); $hash = random_string();
if(is_array($contact_record)) { if (is_array($contact_record)) {
$ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `hash`, `datetime`) $ret = q("INSERT INTO `intro` ( `uid`, `contact-id`, `blocked`, `knowyou`, `hash`, `datetime`)
VALUES ( %d, %d, 0, 0, '%s', '%s' )", VALUES ( %d, %d, 0, 0, '%s', '%s' )",
intval($importer['uid']), intval($importer['uid']),
@ -1467,10 +1460,10 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
$def_gid = get_default_group($importer['uid'], $contact_record["network"]); $def_gid = get_default_group($importer['uid'], $contact_record["network"]);
if(intval($def_gid)) if (intval($def_gid))
group_add_member($importer['uid'],'',$contact_record['id'],$def_gid); group_add_member($importer['uid'],'',$contact_record['id'],$def_gid);
if(($r[0]['notify-flags'] & NOTIFY_INTRO) && if (($r[0]['notify-flags'] & NOTIFY_INTRO) &&
in_array($r[0]['page-flags'], array(PAGE_NORMAL))) { in_array($r[0]['page-flags'], array(PAGE_NORMAL))) {
notification(array( notification(array(
@ -1501,26 +1494,24 @@ function new_follower($importer,$contact,$datarray,$item,$sharing = false) {
function lose_follower($importer,$contact,$datarray = array(),$item = "") { function lose_follower($importer,$contact,$datarray = array(),$item = "") {
if(($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) { if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_SHARING)) {
q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d", q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d",
intval(CONTACT_IS_SHARING), intval(CONTACT_IS_SHARING),
intval($contact['id']) intval($contact['id'])
); );
} } else {
else {
contact_remove($contact['id']); contact_remove($contact['id']);
} }
} }
function lose_sharer($importer,$contact,$datarray = array(),$item = "") { function lose_sharer($importer,$contact,$datarray = array(),$item = "") {
if(($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) { if (($contact['rel'] == CONTACT_IS_FRIEND) || ($contact['rel'] == CONTACT_IS_FOLLOWER)) {
q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d", q("UPDATE `contact` SET `rel` = %d WHERE `id` = %d",
intval(CONTACT_IS_FOLLOWER), intval(CONTACT_IS_FOLLOWER),
intval($contact['id']) intval($contact['id'])
); );
} } else {
else {
contact_remove($contact['id']); contact_remove($contact['id']);
} }
} }
@ -1529,7 +1520,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
$a = get_app(); $a = get_app();
if(is_array($importer)) { if (is_array($importer)) {
$r = q("SELECT `nickname` FROM `user` WHERE `uid` = %d LIMIT 1", $r = q("SELECT `nickname` FROM `user` WHERE `uid` = %d LIMIT 1",
intval($importer['uid']) intval($importer['uid'])
); );
@ -1539,7 +1530,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
// through the direct Diaspora protocol. If we try and use // through the direct Diaspora protocol. If we try and use
// the feed, we'll get duplicates. So don't. // the feed, we'll get duplicates. So don't.
if((! count($r)) || $contact['network'] === NETWORK_DIASPORA) if ((! count($r)) || $contact['network'] === NETWORK_DIASPORA)
return; return;
$push_url = get_config('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id']; $push_url = get_config('system','url') . '/pubsub/' . $r[0]['nickname'] . '/' . $contact['id'];
@ -1552,7 +1543,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
logger('subscribe_to_hub: ' . $hubmode . ' ' . $contact['name'] . ' to hub ' . $url . ' endpoint: ' . $push_url . ' with verifier ' . $verify_token); logger('subscribe_to_hub: ' . $hubmode . ' ' . $contact['name'] . ' to hub ' . $url . ' endpoint: ' . $push_url . ' with verifier ' . $verify_token);
if(!strlen($contact['hub-verify']) OR ($contact['hub-verify'] != $verify_token)) { if (!strlen($contact['hub-verify']) OR ($contact['hub-verify'] != $verify_token)) {
$r = q("UPDATE `contact` SET `hub-verify` = '%s' WHERE `id` = %d", $r = q("UPDATE `contact` SET `hub-verify` = '%s' WHERE `id` = %d",
dbesc($verify_token), dbesc($verify_token),
intval($contact['id']) intval($contact['id'])
@ -1569,7 +1560,7 @@ function subscribe_to_hub($url,$importer,$contact,$hubmode = 'subscribe') {
function fix_private_photos($s, $uid, $item = null, $cid = 0) { function fix_private_photos($s, $uid, $item = null, $cid = 0) {
if(get_config('system','disable_embedded')) if (get_config('system','disable_embedded'))
return $s; return $s;
$a = get_app(); $a = get_app();
@ -1591,14 +1582,14 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
logger('fix_private_photos: found photo ' . $image, LOGGER_DEBUG); logger('fix_private_photos: found photo ' . $image, LOGGER_DEBUG);
if(stristr($image , $site . '/photo/')) { if (stristr($image , $site . '/photo/')) {
// Only embed locally hosted photos // Only embed locally hosted photos
$replace = false; $replace = false;
$i = basename($image); $i = basename($image);
$i = str_replace(array('.jpg','.png','.gif'),array('','',''),$i); $i = str_replace(array('.jpg','.png','.gif'),array('','',''),$i);
$x = strpos($i,'-'); $x = strpos($i,'-');
if($x) { if ($x) {
$res = substr($i,$x+1); $res = substr($i,$x+1);
$i = substr($i,0,$x); $i = substr($i,0,$x);
$r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d AND `uid` = %d", $r = q("SELECT * FROM `photo` WHERE `resource-id` = '%s' AND `scale` = %d AND `uid` = %d",
@ -1606,7 +1597,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
intval($res), intval($res),
intval($uid) intval($uid)
); );
if($r) { if ($r) {
// Check to see if we should replace this photo link with an embedded image // Check to see if we should replace this photo link with an embedded image
// 1. No need to do so if the photo is public // 1. No need to do so if the photo is public
@ -1616,31 +1607,30 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
// permissions, regardless of order but first check to see if they're an exact // permissions, regardless of order but first check to see if they're an exact
// match to save some processing overhead. // match to save some processing overhead.
if(has_permissions($r[0])) { if (has_permissions($r[0])) {
if($cid) { if ($cid) {
$recips = enumerate_permissions($r[0]); $recips = enumerate_permissions($r[0]);
if(in_array($cid, $recips)) { if (in_array($cid, $recips)) {
$replace = true; $replace = true;
} }
} } elseif ($item) {
elseif($item) { if (compare_permissions($item,$r[0]))
if(compare_permissions($item,$r[0]))
$replace = true; $replace = true;
} }
} }
if($replace) { if ($replace) {
$data = $r[0]['data']; $data = $r[0]['data'];
$type = $r[0]['type']; $type = $r[0]['type'];
// If a custom width and height were specified, apply before embedding // If a custom width and height were specified, apply before embedding
if(preg_match("/\[img\=([0-9]*)x([0-9]*)\]/is", substr($orig_body, $img_start, $img_st_close), $match)) { if (preg_match("/\[img\=([0-9]*)x([0-9]*)\]/is", substr($orig_body, $img_start, $img_st_close), $match)) {
logger('fix_private_photos: scaling photo', LOGGER_DEBUG); logger('fix_private_photos: scaling photo', LOGGER_DEBUG);
$width = intval($match[1]); $width = intval($match[1]);
$height = intval($match[2]); $height = intval($match[2]);
$ph = new Photo($data, $type); $ph = new Photo($data, $type);
if($ph->is_valid()) { if ($ph->is_valid()) {
$ph->scaleImage(max($width, $height)); $ph->scaleImage(max($width, $height));
$data = $ph->imageString(); $data = $ph->imageString();
$type = $ph->getType(); $type = $ph->getType();
@ -1657,7 +1647,7 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
$new_body = $new_body . substr($orig_body, 0, $img_start + $img_st_close) . $image . '[/img]'; $new_body = $new_body . substr($orig_body, 0, $img_start + $img_st_close) . $image . '[/img]';
$orig_body = substr($orig_body, $img_start + $img_st_close + $img_len + strlen('[/img]')); $orig_body = substr($orig_body, $img_start + $img_st_close + $img_len + strlen('[/img]'));
if($orig_body === false) if ($orig_body === false)
$orig_body = ''; $orig_body = '';
$img_start = strpos($orig_body, '[img'); $img_start = strpos($orig_body, '[img');
@ -1671,14 +1661,14 @@ function fix_private_photos($s, $uid, $item = null, $cid = 0) {
} }
function has_permissions($obj) { function has_permissions($obj) {
if(($obj['allow_cid'] != '') || ($obj['allow_gid'] != '') || ($obj['deny_cid'] != '') || ($obj['deny_gid'] != '')) if (($obj['allow_cid'] != '') || ($obj['allow_gid'] != '') || ($obj['deny_cid'] != '') || ($obj['deny_gid'] != ''))
return true; return true;
return false; return false;
} }
function compare_permissions($obj1,$obj2) { function compare_permissions($obj1,$obj2) {
// first part is easy. Check that these are exactly the same. // first part is easy. Check that these are exactly the same.
if(($obj1['allow_cid'] == $obj2['allow_cid']) if (($obj1['allow_cid'] == $obj2['allow_cid'])
&& ($obj1['allow_gid'] == $obj2['allow_gid']) && ($obj1['allow_gid'] == $obj2['allow_gid'])
&& ($obj1['deny_cid'] == $obj2['deny_cid']) && ($obj1['deny_cid'] == $obj2['deny_cid'])
&& ($obj1['deny_gid'] == $obj2['deny_gid'])) && ($obj1['deny_gid'] == $obj2['deny_gid']))
@ -1690,7 +1680,7 @@ function compare_permissions($obj1,$obj2) {
$recipients2 = enumerate_permissions($obj2); $recipients2 = enumerate_permissions($obj2);
sort($recipients1); sort($recipients1);
sort($recipients2); sort($recipients2);
if($recipients1 == $recipients2) if ($recipients1 == $recipients2)
return true; return true;
return false; return false;
} }
@ -1712,17 +1702,17 @@ function item_getfeedtags($item) {
$ret = array(); $ret = array();
$matches = false; $matches = false;
$cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches); $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches);
if($cnt) { if ($cnt) {
for($x = 0; $x < $cnt; $x ++) { for($x = 0; $x < $cnt; $x ++) {
if($matches[1][$x]) if ($matches[1][$x])
$ret[$matches[2][$x]] = array('#',$matches[1][$x], $matches[2][$x]); $ret[$matches[2][$x]] = array('#',$matches[1][$x], $matches[2][$x]);
} }
} }
$matches = false; $matches = false;
$cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches); $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches);
if($cnt) { if ($cnt) {
for($x = 0; $x < $cnt; $x ++) { for($x = 0; $x < $cnt; $x ++) {
if($matches[1][$x]) if ($matches[1][$x])
$ret[] = array('@',$matches[1][$x], $matches[2][$x]); $ret[] = array('@',$matches[1][$x], $matches[2][$x]);
} }
} }
@ -1731,7 +1721,7 @@ function item_getfeedtags($item) {
function item_expire($uid, $days, $network = "", $force = false) { function item_expire($uid, $days, $network = "", $force = false) {
if((! $uid) || ($days < 1)) if ((! $uid) || ($days < 1))
return; return;
// $expire_network_only = save your own wall posts // $expire_network_only = save your own wall posts
@ -1758,7 +1748,7 @@ function item_expire($uid, $days, $network = "", $force = false) {
intval($days) intval($days)
); );
if(! count($r)) if (! count($r))
return; return;
$expire_items = get_pconfig($uid, 'expire','items'); $expire_items = get_pconfig($uid, 'expire','items');
@ -1783,18 +1773,18 @@ function item_expire($uid, $days, $network = "", $force = false) {
// don't expire filed items // don't expire filed items
if(strpos($item['file'],'[') !== false) if (strpos($item['file'],'[') !== false)
continue; continue;
// Only expire posts, not photos and photo comments // Only expire posts, not photos and photo comments
if($expire_photos==0 && strlen($item['resource-id'])) if ($expire_photos==0 && strlen($item['resource-id']))
continue; continue;
if($expire_starred==0 && intval($item['starred'])) if ($expire_starred==0 && intval($item['starred']))
continue; continue;
if($expire_notes==0 && $item['type']=='note') if ($expire_notes==0 && $item['type']=='note')
continue; continue;
if($expire_items==0 && $item['type']!='note') if ($expire_items==0 && $item['type']!='note')
continue; continue;
drop_item($item['id'],false); drop_item($item['id'],false);
@ -1808,20 +1798,20 @@ function item_expire($uid, $days, $network = "", $force = false) {
function drop_items($items) { function drop_items($items) {
$uid = 0; $uid = 0;
if(! local_user() && ! remote_user()) if (! local_user() && ! remote_user())
return; return;
if(count($items)) { if (count($items)) {
foreach($items as $item) { foreach($items as $item) {
$owner = drop_item($item,false); $owner = drop_item($item,false);
if($owner && ! $uid) if ($owner && ! $uid)
$uid = $owner; $uid = $owner;
} }
} }
// multiple threads may have been deleted, send an expire notification // multiple threads may have been deleted, send an expire notification
if($uid) if ($uid)
proc_run(PRIORITY_HIGH,"include/notifier.php", "expire", $uid); proc_run(PRIORITY_HIGH,"include/notifier.php", "expire", $uid);
} }
@ -1836,8 +1826,8 @@ function drop_item($id,$interactive = true) {
intval($id) intval($id)
); );
if(! count($r)) { if (! count($r)) {
if(! $interactive) if (! $interactive)
return 0; return 0;
notice( t('Item not found.') . EOL); notice( t('Item not found.') . EOL);
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
@ -1851,9 +1841,9 @@ function drop_item($id,$interactive = true) {
// check if logged in user is either the author or owner of this item // check if logged in user is either the author or owner of this item
if(is_array($_SESSION['remote'])) { if (is_array($_SESSION['remote'])) {
foreach($_SESSION['remote'] as $visitor) { foreach($_SESSION['remote'] as $visitor) {
if($visitor['uid'] == $item['uid'] && $visitor['cid'] == $item['contact-id']) { if ($visitor['uid'] == $item['uid'] && $visitor['cid'] == $item['contact-id']) {
$cid = $visitor['cid']; $cid = $visitor['cid'];
break; break;
} }
@ -1861,16 +1851,16 @@ function drop_item($id,$interactive = true) {
} }
if((local_user() == $item['uid']) || ($cid) || (! $interactive)) { if ((local_user() == $item['uid']) || ($cid) || (! $interactive)) {
// Check if we should do HTML-based delete confirmation // Check if we should do HTML-based delete confirmation
if($_REQUEST['confirm']) { if ($_REQUEST['confirm']) {
// <form> can't take arguments in its "action" parameter // <form> can't take arguments in its "action" parameter
// so add any arguments as hidden inputs // so add any arguments as hidden inputs
$query = explode_querystring($a->query_string); $query = explode_querystring($a->query_string);
$inputs = array(); $inputs = array();
foreach($query['args'] as $arg) { foreach($query['args'] as $arg) {
if(strpos($arg, 'confirm=') === false) { if (strpos($arg, 'confirm=') === false) {
$arg_parts = explode('=', $arg); $arg_parts = explode('=', $arg);
$inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]); $inputs[] = array('name' => $arg_parts[0], 'value' => $arg_parts[1]);
} }
@ -1887,7 +1877,7 @@ function drop_item($id,$interactive = true) {
)); ));
} }
// Now check how the user responded to the confirmation query // Now check how the user responded to the confirmation query
if($_REQUEST['canceled']) { if ($_REQUEST['canceled']) {
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
} }
@ -1907,7 +1897,7 @@ function drop_item($id,$interactive = true) {
$matches = false; $matches = false;
$cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER); $cnt = preg_match_all('/<(.*?)>/',$item['file'],$matches,PREG_SET_ORDER);
if($cnt) { if ($cnt) {
foreach($matches as $mtch) { foreach($matches as $mtch) {
file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],true); file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],true);
} }
@ -1916,7 +1906,7 @@ function drop_item($id,$interactive = true) {
$matches = false; $matches = false;
$cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER); $cnt = preg_match_all('/\[(.*?)\]/',$item['file'],$matches,PREG_SET_ORDER);
if($cnt) { if ($cnt) {
foreach($matches as $mtch) { foreach($matches as $mtch) {
file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],false); file_tag_unsave_file($item['uid'],$item['id'],$mtch[1],false);
} }
@ -1927,7 +1917,7 @@ function drop_item($id,$interactive = true) {
// This only applies to photos uploaded from the photos page. Photos inserted into a post do not // This only applies to photos uploaded from the photos page. Photos inserted into a post do not
// generate a resource-id and therefore aren't intimately linked to the item. // generate a resource-id and therefore aren't intimately linked to the item.
if(strlen($item['resource-id'])) { if (strlen($item['resource-id'])) {
q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ", q("DELETE FROM `photo` WHERE `resource-id` = '%s' AND `uid` = %d ",
dbesc($item['resource-id']), dbesc($item['resource-id']),
intval($item['uid']) intval($item['uid'])
@ -1937,7 +1927,7 @@ function drop_item($id,$interactive = true) {
// If item is a link to an event, nuke the event record. // If item is a link to an event, nuke the event record.
if(intval($item['event-id'])) { if (intval($item['event-id'])) {
q("DELETE FROM `event` WHERE `id` = %d AND `uid` = %d", q("DELETE FROM `event` WHERE `id` = %d AND `uid` = %d",
intval($item['event-id']), intval($item['event-id']),
intval($item['uid']) intval($item['uid'])
@ -1999,7 +1989,7 @@ function drop_item($id,$interactive = true) {
// If it's the parent of a comment thread, kill all the kids // If it's the parent of a comment thread, kill all the kids
if($item['uri'] == $item['parent-uri']) { if ($item['uri'] == $item['parent-uri']) {
$r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = '' $r = q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s', `body` = '' , `title` = ''
WHERE `parent-uri` = '%s' AND `uid` = %d ", WHERE `parent-uri` = '%s' AND `uid` = %d ",
dbesc(datetime_convert()), dbesc(datetime_convert()),
@ -2011,8 +2001,7 @@ function drop_item($id,$interactive = true) {
create_files_from_itemuri($item['parent-uri'], $item['uid']); create_files_from_itemuri($item['parent-uri'], $item['uid']);
delete_thread_uri($item['parent-uri'], $item['uid']); delete_thread_uri($item['parent-uri'], $item['uid']);
// ignore the result // ignore the result
} } else {
else {
// ensure that last-child is set in case the comment that had it just got wiped. // ensure that last-child is set in case the comment that had it just got wiped.
q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ", q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d ",
dbesc(datetime_convert()), dbesc(datetime_convert()),
@ -2024,7 +2013,7 @@ function drop_item($id,$interactive = true) {
dbesc($item['parent-uri']), dbesc($item['parent-uri']),
intval($item['uid']) intval($item['uid'])
); );
if(count($r)) { if (count($r)) {
q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d", q("UPDATE `item` SET `last-child` = 1 WHERE `id` = %d",
intval($r[0]['id']) intval($r[0]['id'])
); );
@ -2037,13 +2026,12 @@ function drop_item($id,$interactive = true) {
proc_run(PRIORITY_HIGH,"include/notifier.php", "drop", $drop_id); proc_run(PRIORITY_HIGH,"include/notifier.php", "drop", $drop_id);
if(! $interactive) if (! $interactive)
return $owner; return $owner;
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
//NOTREACHED //NOTREACHED
} } else {
else { if (! $interactive)
if(! $interactive)
return 0; return 0;
notice( t('Permission denied.') . EOL); notice( t('Permission denied.') . EOL);
goaway($a->get_baseurl() . '/' . $_SESSION['return_url']); goaway($a->get_baseurl() . '/' . $_SESSION['return_url']);
@ -2061,7 +2049,7 @@ function first_post_date($uid,$wall = false) {
intval($uid), intval($uid),
intval($wall ? 1 : 0) intval($wall ? 1 : 0)
); );
if(count($r)) { if (count($r)) {
// logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA); // logger('first_post_date: ' . $r[0]['id'] . ' ' . $r[0]['created'], LOGGER_DATA);
return substr(datetime_convert('',date_default_timezone_get(),$r[0]['created']),0,10); return substr(datetime_convert('',date_default_timezone_get(),$r[0]['created']),0,10);
} }
@ -2073,7 +2061,7 @@ function list_post_dates($uid, $wall) {
$dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d'); $dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d');
$dthen = first_post_date($uid, $wall); $dthen = first_post_date($uid, $wall);
if(! $dthen) if (! $dthen)
return array(); return array();
// Set the start and end date to the beginning of the month // Set the start and end date to the beginning of the month
@ -2091,7 +2079,7 @@ function list_post_dates($uid, $wall) {
$start_month = datetime_convert('','',$dstart,'Y-m-d'); $start_month = datetime_convert('','',$dstart,'Y-m-d');
$end_month = datetime_convert('','',$dend,'Y-m-d'); $end_month = datetime_convert('','',$dend,'Y-m-d');
$str = day_translate(datetime_convert('','',$dnow,'F')); $str = day_translate(datetime_convert('','',$dnow,'F'));
if(! $ret[$dyear]) if (! $ret[$dyear])
$ret[$dyear] = array(); $ret[$dyear] = array();
$ret[$dyear][] = array($str,$end_month,$start_month); $ret[$dyear][] = array($str,$end_month,$start_month);
$dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d'); $dnow = datetime_convert('','',$dnow . ' -1 month', 'Y-m-d');
@ -2103,7 +2091,7 @@ function posted_dates($uid,$wall) {
$dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d'); $dnow = datetime_convert('',date_default_timezone_get(),'now','Y-m-d');
$dthen = first_post_date($uid,$wall); $dthen = first_post_date($uid,$wall);
if(! $dthen) if (! $dthen)
return array(); return array();
// Set the start and end date to the beginning of the month // Set the start and end date to the beginning of the month
@ -2129,21 +2117,21 @@ function posted_dates($uid,$wall) {
function posted_date_widget($url,$uid,$wall) { function posted_date_widget($url,$uid,$wall) {
$o = ''; $o = '';
if(! feature_enabled($uid,'archives')) if (! feature_enabled($uid,'archives'))
return $o; return $o;
// For former Facebook folks that left because of "timeline" // For former Facebook folks that left because of "timeline"
/* if($wall && intval(get_pconfig($uid,'system','no_wall_archive_widget'))) /* if ($wall && intval(get_pconfig($uid,'system','no_wall_archive_widget')))
return $o;*/ return $o;*/
$visible_years = get_pconfig($uid,'system','archive_visible_years'); $visible_years = get_pconfig($uid,'system','archive_visible_years');
if(! $visible_years) if (! $visible_years)
$visible_years = 5; $visible_years = 5;
$ret = list_post_dates($uid,$wall); $ret = list_post_dates($uid,$wall);
if(! count($ret)) if (! count($ret))
return $o; return $o;
$cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years; $cutoff_year = intval(datetime_convert('',date_default_timezone_get(),'now','Y')) - $visible_years;

22
include/post_update.php
View file

@ -8,17 +8,18 @@
*/ */
function post_update() { function post_update() {
if (!post_update_1192()) if (!post_update_1192()) {
return; return;
}
if (!post_update_1194()) if (!post_update_1194()) {
return; return;
}
if (!post_update_1198()) if (!post_update_1198()) {
return; return;
}
if (!post_update_1206()) if (!post_update_1206()) {
return; return;
}
} }
/** /**
@ -242,14 +243,15 @@ function post_update_1206() {
FROM `user` FROM `user`
INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`"); INNER JOIN `contact` ON `contact`.`uid` = `user`.`uid` AND `contact`.`self`");
if (!dbm::is_result($r)) if (!dbm::is_result($r)) {
return false; return false;
}
foreach ($r AS $user) { foreach ($r AS $user) {
if (!empty($user["lastitem_date"]) AND ($user["lastitem_date"] > $user["last-item"])) if (!empty($user["lastitem_date"]) AND ($user["lastitem_date"] > $user["last-item"])) {
q("UPDATE `contact` SET `last-item` = '%s' WHERE `id` = %d", q("UPDATE `contact` SET `last-item` = '%s' WHERE `id` = %d",
dbesc($user["lastitem_date"]), dbesc($user["lastitem_date"]),
intval($user["id"])); intval($user["id"]));
}
} }
set_config("system", "post_update_version", 1206); set_config("system", "post_update_version", 1206);

152
mod/display.php
View file

@ -2,7 +2,7 @@
function display_init(&$a) { function display_init(&$a) {
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
return; return;
} }
@ -19,7 +19,7 @@ function display_init(&$a) {
$r = qu("SELECT `id`, `parent`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item` $r = qu("SELECT `id`, `parent`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `guid` = '%s' AND `uid` = %d", dbesc($a->argv[1]), local_user()); AND `guid` = '%s' AND `uid` = %d", dbesc($a->argv[1]), local_user());
if (count($r)) { if (dbm::isresult($r)) {
$nick = $a->user["nickname"]; $nick = $a->user["nickname"];
$itemuid = local_user(); $itemuid = local_user();
} }
@ -35,7 +35,7 @@ function display_init(&$a) {
AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = ''
AND NOT `item`.`private` AND NOT `user`.`hidewall` AND NOT `item`.`private` AND NOT `user`.`hidewall`
AND `item`.`guid` = '%s'", dbesc($a->argv[1])); AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
if (count($r)) { if (dbm::isresult($r)) {
$nick = $r[0]["nickname"]; $nick = $r[0]["nickname"];
$itemuid = $r[0]["uid"]; $itemuid = $r[0]["uid"];
} }
@ -51,12 +51,12 @@ function display_init(&$a) {
AND NOT `item`.`private` AND `item`.`uid` = 0 AND NOT `item`.`private` AND `item`.`uid` = 0
AND `item`.`guid` = '%s'", dbesc($a->argv[1])); AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
} }
if (count($r)) { if (dbm::isresult($r)) {
if ($r[0]["id"] != $r[0]["parent"]) if ($r[0]["id"] != $r[0]["parent"]) {
$r = qu("SELECT `id`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item` $r = qu("SELECT `id`, `author-name`, `author-link`, `author-avatar`, `network`, `body`, `uid`, `owner-link` FROM `item`
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `id` = %d", $r[0]["parent"]); AND `id` = %d", $r[0]["parent"]);
}
if (($itemuid != local_user()) AND local_user()) { if (($itemuid != local_user()) AND local_user()) {
// Do we know this contact but we haven't got this item? // Do we know this contact but we haven't got this item?
// Copy the wohle thread to our local storage so that we can interact. // Copy the wohle thread to our local storage so that we can interact.
@ -66,9 +66,9 @@ function display_init(&$a) {
$items = qu("SELECT * FROM `item` WHERE `parent` = %d ORDER BY `id`", intval($r[0]["id"])); $items = qu("SELECT * FROM `item` WHERE `parent` = %d ORDER BY `id`", intval($r[0]["id"]));
foreach ($items AS $item) { foreach ($items AS $item) {
$itemcontactid = get_contact($item['owner-link'], local_user()); $itemcontactid = get_contact($item['owner-link'], local_user());
if (!$itemcontactid) if (!$itemcontactid) {
$itemcontactid = $contactid; $itemcontactid = $contactid;
}
unset($item['id']); unset($item['id']);
$item['uid'] = local_user(); $item['uid'] = local_user();
$item['origin'] = 0; $item['origin'] = 0;
@ -90,16 +90,17 @@ function display_init(&$a) {
WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` AND `contact`.`self` LIMIT 1", WHERE `user`.`nickname` = '%s' AND `profile`.`is-default` AND `contact`.`self` LIMIT 1",
dbesc($nickname) dbesc($nickname)
); );
if (count($r)) if (dbm::isresult($r)) {
$profiledata = $r[0]; $profiledata = $r[0];
}
$profiledata["network"] = NETWORK_DFRN; $profiledata["network"] = NETWORK_DFRN;
} else } else {
$profiledata = array(); $profiledata = array();
}
} }
} else { } else {
$a->error = 404; $a->error = 404;
notice( t('Item not found.') . EOL); notice(t('Item not found.') . EOL);
return; return;
} }
} }
@ -127,48 +128,49 @@ function display_fetchauthor($a, $item) {
// Skip if it isn't a pure repeated messages // Skip if it isn't a pure repeated messages
// Does it start with a share? // Does it start with a share?
if (!$skip AND strpos($body, "[share") > 0) if (!$skip AND strpos($body, "[share") > 0) }
$skip = true; $skip = true;
}
// Does it end with a share? // Does it end with a share?
if (!$skip AND (strlen($body) > (strrpos($body, "[/share]") + 8))) if (!$skip AND (strlen($body) > (strrpos($body, "[/share]") + 8))) {
$skip = true; $skip = true;
}
if (!$skip) { if (!$skip) {
$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body); $attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism","$1",$body);
// Skip if there is no shared message in there // Skip if there is no shared message in there
if ($body == $attributes) if ($body == $attributes) {
$skip = true; $skip = true;
}
} }
if (!$skip) { if (!$skip) {
$author = ""; $author = "";
preg_match("/author='(.*?)'/ism", $attributes, $matches); preg_match("/author='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "") if ($matches[1] != "") {
$profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
}
preg_match('/author="(.*?)"/ism', $attributes, $matches); preg_match('/author="(.*?)"/ism', $attributes, $matches);
if ($matches[1] != "") if ($matches[1] != "") {
$profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8'); $profiledata["name"] = html_entity_decode($matches[1],ENT_QUOTES,'UTF-8');
}
$profile = ""; $profile = "";
preg_match("/profile='(.*?)'/ism", $attributes, $matches); preg_match("/profile='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "") if ($matches[1] != "") {
$profiledata["url"] = $matches[1]; $profiledata["url"] = $matches[1];
}
preg_match('/profile="(.*?)"/ism', $attributes, $matches); preg_match('/profile="(.*?)"/ism', $attributes, $matches);
if ($matches[1] != "") if ($matches[1] != "") {
$profiledata["url"] = $matches[1]; $profiledata["url"] = $matches[1];
}
$avatar = ""; $avatar = "";
preg_match("/avatar='(.*?)'/ism", $attributes, $matches); preg_match("/avatar='(.*?)'/ism", $attributes, $matches);
if ($matches[1] != "") if ($matches[1] != "") {
$profiledata["photo"] = $matches[1]; $profiledata["photo"] = $matches[1];
}
preg_match('/avatar="(.*?)"/ism', $attributes, $matches); preg_match('/avatar="(.*?)"/ism', $attributes, $matches);
if ($matches[1] != "") if ($matches[1] != "") {
$profiledata["photo"] = $matches[1]; $profiledata["photo"] = $matches[1];
}
$profiledata["nickname"] = $profiledata["name"]; $profiledata["nickname"] = $profiledata["name"];
$profiledata["network"] = GetProfileUsername($profiledata["url"], "", false, true); $profiledata["network"] = GetProfileUsername($profiledata["url"], "", false, true);
@ -181,8 +183,9 @@ function display_fetchauthor($a, $item) {
$profiledata["photo"] = App::remove_baseurl($profiledata["photo"]); $profiledata["photo"] = App::remove_baseurl($profiledata["photo"]);
if (local_user()) { if (local_user()) {
if (in_array($profiledata["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) if (in_array($profiledata["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS))) {
$profiledata["remoteconnect"] = $a->get_baseurl()."/follow?url=".urlencode($profiledata["url"]); $profiledata["remoteconnect"] = $a->get_baseurl()."/follow?url=".urlencode($profiledata["url"]);
}
} elseif ($profiledata["network"] == NETWORK_DFRN) { } elseif ($profiledata["network"] == NETWORK_DFRN) {
$connect = str_replace("/profile/", "/dfrn_request/", $profiledata["url"]); $connect = str_replace("/profile/", "/dfrn_request/", $profiledata["url"]);
$profiledata["remoteconnect"] = $connect; $profiledata["remoteconnect"] = $connect;
@ -193,8 +196,8 @@ function display_fetchauthor($a, $item) {
function display_content(&$a, $update = 0) { function display_content(&$a, $update = 0) {
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL); notice(t('Public access denied.') . EOL);
return; return;
} }
@ -208,18 +211,16 @@ function display_content(&$a, $update = 0) {
$a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array()); $a->page['htmlhead'] .= replace_macros(get_markup_template('display-head.tpl'), array());
if($update) { if ($update) {
$nick = $_REQUEST['nick']; $nick = $_REQUEST['nick'];
} } else {
else {
$nick = (($a->argc > 1) ? $a->argv[1] : ''); $nick = (($a->argc > 1) ? $a->argv[1] : '');
} }
if($update) { if ($update) {
$item_id = $_REQUEST['item_id']; $item_id = $_REQUEST['item_id'];
$a->profile = array('uid' => intval($update), 'profile_uid' => intval($update)); $a->profile = array('uid' => intval($update), 'profile_uid' => intval($update));
} } else {
else {
$item_id = (($a->argc > 2) ? $a->argv[2] : 0); $item_id = (($a->argc > 2) ? $a->argv[2] : 0);
if ($a->argc == 2) { if ($a->argc == 2) {
@ -229,7 +230,7 @@ function display_content(&$a, $update = 0) {
$r = qu("SELECT `id` FROM `item` $r = qu("SELECT `id` FROM `item`
WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated` WHERE `item`.`visible` AND NOT `item`.`deleted` AND NOT `item`.`moderated`
AND `guid` = '%s' AND `uid` = %d", dbesc($a->argv[1]), local_user()); AND `guid` = '%s' AND `uid` = %d", dbesc($a->argv[1]), local_user());
if (count($r)) { if (dbm::isresult($r)) {
$item_id = $r[0]["id"]; $item_id = $r[0]["id"];
$nick = $a->user["nickname"]; $nick = $a->user["nickname"];
} }
@ -243,7 +244,7 @@ function display_content(&$a, $update = 0) {
AND NOT `item`.`private` AND NOT `user`.`hidewall` AND NOT `item`.`private` AND NOT `user`.`hidewall`
AND `item`.`guid` = '%s'", dbesc($a->argv[1])); AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
// AND NOT `item`.`private` AND `item`.`wall` // AND NOT `item`.`private` AND `item`.`wall`
if (count($r)) { if (dbm::isresult($r)) {
$item_id = $r[0]["id"]; $item_id = $r[0]["id"];
$nick = $r[0]["nickname"]; $nick = $r[0]["nickname"];
} }
@ -256,7 +257,7 @@ function display_content(&$a, $update = 0) {
AND NOT `item`.`private` AND `item`.`uid` = 0 AND NOT `item`.`private` AND `item`.`uid` = 0
AND `item`.`guid` = '%s'", dbesc($a->argv[1])); AND `item`.`guid` = '%s'", dbesc($a->argv[1]));
// AND NOT `item`.`private` AND `item`.`wall` // AND NOT `item`.`private` AND `item`.`wall`
if (count($r)) { if (dbm::isresult($r)) {
$item_id = $r[0]["id"]; $item_id = $r[0]["id"];
} }
} }
@ -266,10 +267,11 @@ function display_content(&$a, $update = 0) {
if ($item_id AND !is_numeric($item_id)) { if ($item_id AND !is_numeric($item_id)) {
$r = qu("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", $r = qu("SELECT `id` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item_id), intval($a->profile['uid'])); dbesc($item_id), intval($a->profile['uid']));
if ($r) if (dbm::is_result($r)) {
$item_id = $r[0]["id"]; $item_id = $r[0]["id"];
else } else {
$item_id = false; $item_id = false;
}
} }
if (!$item_id) { if (!$item_id) {
@ -286,29 +288,29 @@ function display_content(&$a, $update = 0) {
$contact_id = 0; $contact_id = 0;
if(is_array($_SESSION['remote'])) { if (is_array($_SESSION['remote'])) {
foreach($_SESSION['remote'] as $v) { foreach ($_SESSION['remote'] as $v) {
if($v['uid'] == $a->profile['uid']) { if ($v['uid'] == $a->profile['uid']) {
$contact_id = $v['cid']; $contact_id = $v['cid'];
break; break;
} }
} }
} }
if($contact_id) { if ($contact_id) {
$groups = init_groups_visitor($contact_id); $groups = init_groups_visitor($contact_id);
$r = qu("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", $r = qu("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id), intval($contact_id),
intval($a->profile['uid']) intval($a->profile['uid'])
); );
if(count($r)) { if (dbm::isresult($r)) {
$contact = $r[0]; $contact = $r[0];
$remote_contact = true; $remote_contact = true;
} }
} }
if(! $remote_contact) { if (!$remote_contact) {
if(local_user()) { if (local_user()) {
$contact_id = $_SESSION['cid']; $contact_id = $_SESSION['cid'];
$contact = $a->contact; $contact = $a->contact;
} }
@ -317,13 +319,13 @@ function display_content(&$a, $update = 0) {
$r = qu("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1", $r = qu("SELECT * FROM `contact` WHERE `uid` = %d AND `self` LIMIT 1",
intval($a->profile['uid']) intval($a->profile['uid'])
); );
if(count($r)) if (dbm::isresult($r)) {
$a->page_contact = $r[0]; $a->page_contact = $r[0];
}
$is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false); $is_owner = ((local_user()) && (local_user() == $a->profile['profile_uid']) ? true : false);
if($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) { if ($a->profile['hidewall'] && (! $is_owner) && (! $remote_contact)) {
notice( t('Access to this profile has been restricted.') . EOL); notice(t('Access to this profile has been restricted.') . EOL);
return; return;
} }
@ -347,7 +349,7 @@ function display_content(&$a, $update = 0) {
$sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups); $sql_extra = item_permissions_sql($a->profile['uid'],$remote_contact,$groups);
if($update) { if ($update) {
$r = qu("SELECT `id` FROM `item` WHERE `item`.`uid` = %d $r = qu("SELECT `id` FROM `item` WHERE `item`.`uid` = %d
AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d) AND `item`.`parent` = (SELECT `parent` FROM `item` WHERE `id` = %d)
@ -356,8 +358,9 @@ function display_content(&$a, $update = 0) {
intval($item_id) intval($item_id)
); );
if(!$r) if (!$r) {
return ''; return '';
}
} }
$r = qu(item_query()." AND `item`.`uid` = %d $r = qu(item_query()." AND `item`.`uid` = %d
@ -369,7 +372,7 @@ function display_content(&$a, $update = 0) {
); );
if(!$r && local_user()) { if (!$r && local_user()) {
// Check if this is another person's link to a post that we have // Check if this is another person's link to a post that we have
$r = qu("SELECT `item`.uri FROM `item` $r = qu("SELECT `item`.uri FROM `item`
WHERE (`item`.`id` = %d OR `item`.`uri` = '%s') WHERE (`item`.`id` = %d OR `item`.`uri` = '%s')
@ -377,7 +380,7 @@ function display_content(&$a, $update = 0) {
intval($item_id), intval($item_id),
dbesc($item_id) dbesc($item_id)
); );
if($r) { if (dbm::is_result($r)) {
$item_uri = $r[0]['uri']; $item_uri = $r[0]['uri'];
$r = qu(item_query()." AND `item`.`uid` = %d $r = qu(item_query()." AND `item`.`uid` = %d
@ -390,23 +393,24 @@ function display_content(&$a, $update = 0) {
} }
} }
if($r) { if ($r) {
if((local_user()) && (local_user() == $a->profile['uid'])) { if ((local_user()) && (local_user() == $a->profile['uid'])) {
$unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `parent` = %d", $unseen = q("SELECT `id` FROM `item` WHERE `unseen` AND `parent` = %d",
intval($r[0]['parent'])); intval($r[0]['parent']));
if ($unseen) if ($unseen) {
q("UPDATE `item` SET `unseen` = 0 q("UPDATE `item` SET `unseen` = 0 WHERE `parent` = %d AND `unseen`",
WHERE `parent` = %d AND `unseen`",
intval($r[0]['parent']) intval($r[0]['parent'])
); );
}
} }
$items = conv_sort($r,"`commented`"); $items = conv_sort($r,"`commented`");
if(!$update) if (!$update) {
$o .= "<script> var netargs = '?f=&nick=" . $nick . "&item_id=" . $item_id . "'; </script>"; $o .= "<script> var netargs = '?f=&nick=" . $nick . "&item_id=" . $item_id . "'; </script>";
}
$o .= conversation($a,$items,'display', $update); $o .= conversation($a,$items,'display', $update);
// Preparing the meta header // Preparing the meta header
@ -418,9 +422,9 @@ function display_content(&$a, $update = 0) {
$image = $a->remove_baseurl($r[0]["thumb"]); $image = $a->remove_baseurl($r[0]["thumb"]);
if ($title == "") if ($title == "") {
$title = $author_name; $title = $author_name;
}
$description = htmlspecialchars($description, ENT_COMPAT, 'UTF-8', true); // allow double encoding here $description = htmlspecialchars($description, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
$title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8', true); // allow double encoding here $title = htmlspecialchars($title, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
$author_name = htmlspecialchars($author_name, ENT_COMPAT, 'UTF-8', true); // allow double encoding here $author_name = htmlspecialchars($author_name, ENT_COMPAT, 'UTF-8', true); // allow double encoding here
@ -464,16 +468,14 @@ function display_content(&$a, $update = 0) {
dbesc($item_id), dbesc($item_id),
dbesc($item_id) dbesc($item_id)
); );
if($r) { if ($r) {
if($r[0]['deleted']) { if ($r[0]['deleted']) {
notice( t('Item has been removed.') . EOL ); notice(t('Item has been removed.') . EOL );
} else {
notice(t('Permission denied.') . EOL );
} }
else { } else {
notice( t('Permission denied.') . EOL ); notice(t('Item not found.') . EOL );
}
}
else {
notice( t('Item not found.') . EOL );
} }
return $o; return $o;

1
mod/nodeinfo.php
View file

@ -217,7 +217,6 @@ function nodeinfo_cron() {
set_config('nodeinfo','active_users_monthly', $active_users_monthly); set_config('nodeinfo','active_users_monthly', $active_users_monthly);
} }
//$posts = qu("SELECT COUNT(*) AS local_posts FROM `item` WHERE `wall` AND `uid` != 0 AND `id` = `parent` AND left(body, 6) != '[share'");
$posts = qu("SELECT COUNT(*) AS `local_posts` FROM `item` $posts = qu("SELECT COUNT(*) AS `local_posts` FROM `item`
INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id` INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
WHERE `contact`.`self` and `item`.`id` = `item`.`parent` AND left(body, 6) != '[share' AND `item`.`network` IN ('%s', '%s', '%s')", WHERE `contact`.`self` and `item`.`id` = `item`.`parent` AND left(body, 6) != '[share' AND `item`.`network` IN ('%s', '%s', '%s')",

451
mod/photos.php
View file

@ -12,10 +12,10 @@ require_once('include/Probe.php');
function photos_init(&$a) { function photos_init(&$a) {
if($a->argc > 1) if ($a->argc > 1)
auto_redir($a, $a->argv[1]); auto_redir($a, $a->argv[1]);
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
return; return;
} }
@ -23,13 +23,13 @@ function photos_init(&$a) {
$o = ''; $o = '';
if($a->argc > 1) { if ($a->argc > 1) {
$nick = $a->argv[1]; $nick = $a->argv[1];
$user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1", $user = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
dbesc($nick) dbesc($nick)
); );
if(! count($user)) if (! count($user))
return; return;
$a->data['user'] = $user[0]; $a->data['user'] = $user[0];
@ -53,7 +53,7 @@ function photos_init(&$a) {
$sql_extra = permissions_sql($a->data['user']['uid']); $sql_extra = permissions_sql($a->data['user']['uid']);
$albums = q("SELECT count(distinct `resource-id`) AS `total`, `album` FROM `photo` USE INDEX (`uid_album_created`) WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s' $albums = qu("SELECT count(distinct `resource-id`) AS `total`, `album` FROM `photo` USE INDEX (`uid_album_created`) WHERE `uid` = %d AND `album` != '%s' AND `album` != '%s'
$sql_extra GROUP BY `album` ORDER BY `created` DESC", $sql_extra GROUP BY `album` ORDER BY `created` DESC",
intval($a->data['user']['uid']), intval($a->data['user']['uid']),
dbesc('Contact Photos'), dbesc('Contact Photos'),
@ -65,15 +65,15 @@ function photos_init(&$a) {
// add various encodings to the array so we can just loop through and pick them out in a template // add various encodings to the array so we can just loop through and pick them out in a template
$ret = array('success' => false); $ret = array('success' => false);
if($albums) { if ($albums) {
$a->data['albums'] = $albums; $a->data['albums'] = $albums;
if ($albums_visible) if ($albums_visible)
$ret['success'] = true; $ret['success'] = true;
$ret['albums'] = array(); $ret['albums'] = array();
foreach($albums as $k => $album) { foreach ($albums as $k => $album) {
//hide profile photos to others //hide profile photos to others
if((! $is_owner) && (! remote_user()) && ($album['album'] == t('Profile Photos'))) if ((! $is_owner) && (! remote_user()) && ($album['album'] == t('Profile Photos')))
continue; continue;
$entry = array( $entry = array(
'text' => $album['album'], 'text' => $album['album'],
@ -88,10 +88,10 @@ function photos_init(&$a) {
$albums = $ret; $albums = $ret;
if(local_user() && $a->data['user']['uid'] == local_user()) if (local_user() && $a->data['user']['uid'] == local_user())
$can_post = true; $can_post = true;
if($albums['success']) { if ($albums['success']) {
$photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'),array( $photo_albums_widget = replace_macros(get_markup_template('photo_albums.tpl'),array(
'$nick' => $a->data['user']['nickname'], '$nick' => $a->data['user']['nickname'],
'$title' => t('Photo Albums'), '$title' => t('Photo Albums'),
@ -104,7 +104,7 @@ function photos_init(&$a) {
} }
if(! x($a->page,'aside')) if (! x($a->page,'aside'))
$a->page['aside'] = ''; $a->page['aside'] = '';
$a->page['aside'] .= $vcard_widget; $a->page['aside'] .= $vcard_widget;
$a->page['aside'] .= $photo_albums_widget; $a->page['aside'] .= $photo_albums_widget;
@ -138,26 +138,26 @@ function photos_post(&$a) {
$page_owner_uid = $a->data['user']['uid']; $page_owner_uid = $a->data['user']['uid'];
$community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false); $community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false);
if((local_user()) && (local_user() == $page_owner_uid)) if ((local_user()) && (local_user() == $page_owner_uid))
$can_post = true; $can_post = true;
else { else {
if($community_page && remote_user()) { if ($community_page && remote_user()) {
$cid = 0; $cid = 0;
if(is_array($_SESSION['remote'])) { if (is_array($_SESSION['remote'])) {
foreach($_SESSION['remote'] as $v) { foreach ($_SESSION['remote'] as $v) {
if($v['uid'] == $page_owner_uid) { if ($v['uid'] == $page_owner_uid) {
$cid = $v['cid']; $cid = $v['cid'];
break; break;
} }
} }
} }
if($cid) { if ($cid) {
$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
intval($cid), intval($cid),
intval($page_owner_uid) intval($page_owner_uid)
); );
if(count($r)) { if (dbm::is_result($r)) {
$can_post = true; $can_post = true;
$visitor = $cid; $visitor = $cid;
} }
@ -165,7 +165,7 @@ function photos_post(&$a) {
} }
} }
if(! $can_post) { if (! $can_post) {
notice( t('Permission denied.') . EOL ); notice( t('Permission denied.') . EOL );
killme(); killme();
} }
@ -175,7 +175,7 @@ function photos_post(&$a) {
intval($page_owner_uid) intval($page_owner_uid)
); );
if(! count($r)) { if (! count($r)) {
notice( t('Contact information unavailable') . EOL); notice( t('Contact information unavailable') . EOL);
logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid); logger('photos_post: unable to locate contact record for page owner. uid=' . $page_owner_uid);
killme(); killme();
@ -184,10 +184,10 @@ function photos_post(&$a) {
$owner_record = $r[0]; $owner_record = $r[0];
if(($a->argc > 3) && ($a->argv[2] === 'album')) { if (($a->argc > 3) && ($a->argv[2] === 'album')) {
$album = hex2bin($a->argv[3]); $album = hex2bin($a->argv[3]);
if($album === t('Profile Photos') || $album === 'Contact Photos' || $album === t('Contact Photos')) { if ($album === t('Profile Photos') || $album === 'Contact Photos' || $album === t('Contact Photos')) {
goaway($_SESSION['photo_return']); goaway($_SESSION['photo_return']);
return; // NOTREACHED return; // NOTREACHED
} }
@ -196,14 +196,14 @@ function photos_post(&$a) {
dbesc($album), dbesc($album),
intval($page_owner_uid) intval($page_owner_uid)
); );
if(! count($r)) { if (! count($r)) {
notice( t('Album not found.') . EOL); notice( t('Album not found.') . EOL);
goaway($_SESSION['photo_return']); goaway($_SESSION['photo_return']);
return; // NOTREACHED return; // NOTREACHED
} }
// Check if the user has responded to a delete confirmation query // Check if the user has responded to a delete confirmation query
if($_REQUEST['canceled']) { if ($_REQUEST['canceled']) {
goaway($_SESSION['photo_return']); goaway($_SESSION['photo_return']);
} }
@ -212,7 +212,7 @@ function photos_post(&$a) {
*/ */
$newalbum = notags(trim($_POST['albumname'])); $newalbum = notags(trim($_POST['albumname']));
if($newalbum != $album) { if ($newalbum != $album) {
q("UPDATE `photo` SET `album` = '%s' WHERE `album` = '%s' AND `uid` = %d", q("UPDATE `photo` SET `album` = '%s' WHERE `album` = '%s' AND `uid` = %d",
dbesc($newalbum), dbesc($newalbum),
dbesc($album), dbesc($album),
@ -227,10 +227,10 @@ function photos_post(&$a) {
* DELETE photo album and all its photos * DELETE photo album and all its photos
*/ */
if($_POST['dropalbum'] == t('Delete Album')) { if ($_POST['dropalbum'] == t('Delete Album')) {
// Check if we should do HTML-based delete confirmation // Check if we should do HTML-based delete confirmation
if($_REQUEST['confirm']) { if ($_REQUEST['confirm']) {
$drop_url = $a->query_string; $drop_url = $a->query_string;
$extra_inputs = array( $extra_inputs = array(
array('name' => 'albumname', 'value' => $_POST['albumname']), array('name' => 'albumname', 'value' => $_POST['albumname']),
@ -252,25 +252,23 @@ function photos_post(&$a) {
// get the list of photos we are about to delete // get the list of photos we are about to delete
if($visitor) { if ($visitor) {
$r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `album` = '%s'", $r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `album` = '%s'",
intval($visitor), intval($visitor),
intval($page_owner_uid), intval($page_owner_uid),
dbesc($album) dbesc($album)
); );
} } else {
else {
$r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `uid` = %d AND `album` = '%s'", $r = q("SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `uid` = %d AND `album` = '%s'",
intval(local_user()), intval(local_user()),
dbesc($album) dbesc($album)
); );
} }
if(count($r)) { if (dbm::is_result($r)) {
foreach($r as $rr) { foreach ($r as $rr) {
$res[] = "'" . dbesc($rr['rid']) . "'" ; $res[] = "'" . dbesc($rr['rid']) . "'" ;
} }
} } else {
else {
goaway($_SESSION['photo_return']); goaway($_SESSION['photo_return']);
return; // NOTREACHED return; // NOTREACHED
} }
@ -288,8 +286,8 @@ function photos_post(&$a) {
$r = q("SELECT `parent-uri` FROM `item` WHERE `resource-id` IN ( $str_res ) AND `uid` = %d", $r = q("SELECT `parent-uri` FROM `item` WHERE `resource-id` IN ( $str_res ) AND `uid` = %d",
intval($page_owner_uid) intval($page_owner_uid)
); );
if(count($r)) { if (dbm::is_result($r)) {
foreach($r as $rr) { foreach ($r as $rr) {
q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d", q("UPDATE `item` SET `deleted` = 1, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc($rr['parent-uri']), dbesc($rr['parent-uri']),
@ -302,7 +300,7 @@ function photos_post(&$a) {
// send the notification upstream/downstream as the case may be // send the notification upstream/downstream as the case may be
if($rr['visible']) if ($rr['visible'])
proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id); proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
} }
} }
@ -313,16 +311,16 @@ function photos_post(&$a) {
// Check if the user has responded to a delete confirmation query for a single photo // Check if the user has responded to a delete confirmation query for a single photo
if(($a->argc > 2) && $_REQUEST['canceled']) { if (($a->argc > 2) && $_REQUEST['canceled']) {
goaway($_SESSION['photo_return']); goaway($_SESSION['photo_return']);
} }
if(($a->argc > 2) && (x($_POST,'delete')) && ($_POST['delete'] == t('Delete Photo'))) { if (($a->argc > 2) && (x($_POST,'delete')) && ($_POST['delete'] == t('Delete Photo'))) {
// same as above but remove single photo // same as above but remove single photo
// Check if we should do HTML-based delete confirmation // Check if we should do HTML-based delete confirmation
if($_REQUEST['confirm']) { if ($_REQUEST['confirm']) {
$drop_url = $a->query_string; $drop_url = $a->query_string;
$a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array( $a->page['content'] = replace_macros(get_markup_template('confirm.tpl'), array(
'$method' => 'post', '$method' => 'post',
@ -337,20 +335,19 @@ function photos_post(&$a) {
return; return;
} }
if($visitor) { if ($visitor) {
$r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `resource-id` = '%s' LIMIT 1", $r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `contact-id` = %d AND `uid` = %d AND `resource-id` = '%s' LIMIT 1",
intval($visitor), intval($visitor),
intval($page_owner_uid), intval($page_owner_uid),
dbesc($a->argv[2]) dbesc($a->argv[2])
); );
} } else {
else {
$r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' LIMIT 1", $r = q("SELECT `id`, `resource-id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' LIMIT 1",
intval(local_user()), intval(local_user()),
dbesc($a->argv[2]) dbesc($a->argv[2])
); );
} }
if(count($r)) { if (dbm::is_result($r)) {
q("DELETE FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'", q("DELETE FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'",
intval($page_owner_uid), intval($page_owner_uid),
dbesc($r[0]['resource-id']) dbesc($r[0]['resource-id'])
@ -359,7 +356,7 @@ function photos_post(&$a) {
dbesc($r[0]['resource-id']), dbesc($r[0]['resource-id']),
intval($page_owner_uid) intval($page_owner_uid)
); );
if(count($i)) { if (count($i)) {
q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d", q("UPDATE `item` SET `deleted` = 1, `edited` = '%s', `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d",
dbesc(datetime_convert()), dbesc(datetime_convert()),
dbesc(datetime_convert()), dbesc(datetime_convert()),
@ -372,7 +369,7 @@ function photos_post(&$a) {
$url = $a->get_baseurl(); $url = $a->get_baseurl();
$drop_id = intval($i[0]['id']); $drop_id = intval($i[0]['id']);
if($i[0]['visible']) if ($i[0]['visible'])
proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id); proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $drop_id);
} }
} }
@ -381,7 +378,7 @@ function photos_post(&$a) {
return; // NOTREACHED return; // NOTREACHED
} }
if(($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false)) || (x($_POST,'albname') !== false)) { if (($a->argc > 2) && ((x($_POST,'desc') !== false) || (x($_POST,'newtag') !== false)) || (x($_POST,'albname') !== false)) {
$desc = ((x($_POST,'desc')) ? notags(trim($_POST['desc'])) : ''); $desc = ((x($_POST,'desc')) ? notags(trim($_POST['desc'])) : '');
$rawtags = ((x($_POST,'newtag')) ? notags(trim($_POST['newtag'])) : ''); $rawtags = ((x($_POST,'newtag')) ? notags(trim($_POST['newtag'])) : '');
@ -394,11 +391,11 @@ function photos_post(&$a) {
$resource_id = $a->argv[2]; $resource_id = $a->argv[2];
if(! strlen($albname)) if (! strlen($albname))
$albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y'); $albname = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
if((x($_POST,'rotate') !== false) && if ((x($_POST,'rotate') !== false) &&
( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) { ( (intval($_POST['rotate']) == 1) || (intval($_POST['rotate']) == 2) )) {
logger('rotate'); logger('rotate');
@ -406,9 +403,9 @@ function photos_post(&$a) {
dbesc($resource_id), dbesc($resource_id),
intval($page_owner_uid) intval($page_owner_uid)
); );
if(count($r)) { if (dbm::is_result($r)) {
$ph = new Photo($r[0]['data'], $r[0]['type']); $ph = new Photo($r[0]['data'], $r[0]['type']);
if($ph->is_valid()) { if ($ph->is_valid()) {
$rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 ); $rotate_deg = ( (intval($_POST['rotate']) == 1) ? 270 : 90 );
$ph->rotate($rotate_deg); $ph->rotate($rotate_deg);
@ -423,7 +420,7 @@ function photos_post(&$a) {
intval($page_owner_uid) intval($page_owner_uid)
); );
if($width > 640 || $height > 640) { if ($width > 640 || $height > 640) {
$ph->scaleImage(640); $ph->scaleImage(640);
$width = $ph->getWidth(); $width = $ph->getWidth();
$height = $ph->getHeight(); $height = $ph->getHeight();
@ -437,7 +434,7 @@ function photos_post(&$a) {
); );
} }
if($width > 320 || $height > 320) { if ($width > 320 || $height > 320) {
$ph->scaleImage(320); $ph->scaleImage(320);
$width = $ph->getWidth(); $width = $ph->getWidth();
$height = $ph->getHeight(); $height = $ph->getHeight();
@ -458,7 +455,7 @@ function photos_post(&$a) {
dbesc($resource_id), dbesc($resource_id),
intval($page_owner_uid) intval($page_owner_uid)
); );
if(count($p)) { if (count($p)) {
$ext = $phototypes[$p[0]['type']]; $ext = $phototypes[$p[0]['type']];
$r = q("UPDATE `photo` SET `desc` = '%s', `album` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d", $r = q("UPDATE `photo` SET `desc` = '%s', `album` = '%s', `allow_cid` = '%s', `allow_gid` = '%s', `deny_cid` = '%s', `deny_gid` = '%s' WHERE `resource-id` = '%s' AND `uid` = %d",
dbesc($desc), dbesc($desc),
@ -475,10 +472,10 @@ function photos_post(&$a) {
/* Don't make the item visible if the only change was the album name */ /* Don't make the item visible if the only change was the album name */
$visibility = 0; $visibility = 0;
if($p[0]['desc'] !== $desc || strlen($rawtags)) if ($p[0]['desc'] !== $desc || strlen($rawtags))
$visibility = 1; $visibility = 1;
if(! $item_id) { if (! $item_id) {
// Create item container // Create item container
@ -517,18 +514,18 @@ function photos_post(&$a) {
} }
if($item_id) { if ($item_id) {
$r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `item` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($item_id), intval($item_id),
intval($page_owner_uid) intval($page_owner_uid)
); );
} }
if(count($r)) { if (dbm::is_result($r)) {
$old_tag = $r[0]['tag']; $old_tag = $r[0]['tag'];
$old_inform = $r[0]['inform']; $old_inform = $r[0]['inform'];
} }
if(strlen($rawtags)) { if (strlen($rawtags)) {
$str_tags = ''; $str_tags = '';
$inform = ''; $inform = '';
@ -536,49 +533,47 @@ function photos_post(&$a) {
// if the new tag doesn't have a namespace specifier (@foo or #foo) give it a hashtag // if the new tag doesn't have a namespace specifier (@foo or #foo) give it a hashtag
$x = substr($rawtags,0,1); $x = substr($rawtags,0,1);
if($x !== '@' && $x !== '#') if ($x !== '@' && $x !== '#')
$rawtags = '#' . $rawtags; $rawtags = '#' . $rawtags;
$taginfo = array(); $taginfo = array();
$tags = get_tags($rawtags); $tags = get_tags($rawtags);
if(count($tags)) { if (count($tags)) {
foreach($tags as $tag) { foreach ($tags as $tag) {
if(isset($profile)) if (isset($profile))
unset($profile); unset($profile);
if(strpos($tag,'@') === 0) { if (strpos($tag,'@') === 0) {
$name = substr($tag,1); $name = substr($tag,1);
if((strpos($name,'@')) || (strpos($name,'http://'))) { if ((strpos($name,'@')) || (strpos($name,'http://'))) {
$newname = $name; $newname = $name;
$links = @Probe::lrdd($name); $links = @Probe::lrdd($name);
if(count($links)) { if (count($links)) {
foreach($links as $link) { foreach ($links as $link) {
if($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page') if ($link['@attributes']['rel'] === 'http://webfinger.net/rel/profile-page')
$profile = $link['@attributes']['href']; $profile = $link['@attributes']['href'];
if($link['@attributes']['rel'] === 'salmon') { if ($link['@attributes']['rel'] === 'salmon') {
$salmon = '$url:' . str_replace(',','%sc',$link['@attributes']['href']); $salmon = '$url:' . str_replace(',','%sc',$link['@attributes']['href']);
if(strlen($inform)) if (strlen($inform))
$inform .= ','; $inform .= ',';
$inform .= $salmon; $inform .= $salmon;
} }
} }
} }
$taginfo[] = array($newname,$profile,$salmon); $taginfo[] = array($newname,$profile,$salmon);
} } else {
else {
$newname = $name; $newname = $name;
$alias = ''; $alias = '';
$tagcid = 0; $tagcid = 0;
if(strrpos($newname,'+')) if (strrpos($newname,'+'))
$tagcid = intval(substr($newname,strrpos($newname,'+') + 1)); $tagcid = intval(substr($newname,strrpos($newname,'+') + 1));
if($tagcid) { if ($tagcid) {
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
intval($tagcid), intval($tagcid),
intval($profile_uid) intval($profile_uid)
); );
} } else {
else {
$newname = str_replace('_',' ',$name); $newname = str_replace('_',' ',$name);
//select someone from this user's contacts by name //select someone from this user's contacts by name
@ -587,7 +582,7 @@ function photos_post(&$a) {
intval($page_owner_uid) intval($page_owner_uid)
); );
if(! $r) { if (! $r) {
//select someone by attag or nick and the name passed in //select someone by attag or nick and the name passed in
$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
dbesc($name), dbesc($name),
@ -596,35 +591,34 @@ function photos_post(&$a) {
); );
} }
} }
/* elseif(strstr($name,'_') || strstr($name,' ')) { /* elseif (strstr($name,'_') || strstr($name,' ')) {
$newname = str_replace('_',' ',$name); $newname = str_replace('_',' ',$name);
$r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `name` = '%s' AND `uid` = %d LIMIT 1",
dbesc($newname), dbesc($newname),
intval($page_owner_uid) intval($page_owner_uid)
); );
} } else {
else {
$r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `attag` = '%s' OR `nick` = '%s' AND `uid` = %d ORDER BY `attag` DESC LIMIT 1",
dbesc($name), dbesc($name),
dbesc($name), dbesc($name),
intval($page_owner_uid) intval($page_owner_uid)
); );
}*/ }*/
if(count($r)) { if (dbm::is_result($r)) {
$newname = $r[0]['name']; $newname = $r[0]['name'];
$profile = $r[0]['url']; $profile = $r[0]['url'];
$notify = 'cid:' . $r[0]['id']; $notify = 'cid:' . $r[0]['id'];
if(strlen($inform)) if (strlen($inform))
$inform .= ','; $inform .= ',';
$inform .= $notify; $inform .= $notify;
} }
} }
if($profile) { if ($profile) {
if(substr($notify,0,4) === 'cid:') if (substr($notify,0,4) === 'cid:')
$taginfo[] = array($newname,$profile,$notify,$r[0],'@[url=' . str_replace(',','%2c',$profile) . ']' . $newname . '[/url]'); $taginfo[] = array($newname,$profile,$notify,$r[0],'@[url=' . str_replace(',','%2c',$profile) . ']' . $newname . '[/url]');
else else
$taginfo[] = array($newname,$profile,$notify,null,$str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]'); $taginfo[] = array($newname,$profile,$notify,null,$str_tags .= '@[url=' . $profile . ']' . $newname . '[/url]');
if(strlen($str_tags)) if (strlen($str_tags))
$str_tags .= ','; $str_tags .= ',';
$profile = str_replace(',','%2c',$profile); $profile = str_replace(',','%2c',$profile);
$str_tags .= '@[url='.$profile.']'.$newname.'[/url]'; $str_tags .= '@[url='.$profile.']'.$newname.'[/url]';
@ -637,12 +631,12 @@ function photos_post(&$a) {
} }
$newtag = $old_tag; $newtag = $old_tag;
if(strlen($newtag) && strlen($str_tags)) if (strlen($newtag) && strlen($str_tags))
$newtag .= ','; $newtag .= ',';
$newtag .= $str_tags; $newtag .= $str_tags;
$newinform = $old_inform; $newinform = $old_inform;
if(strlen($newinform) && strlen($inform)) if (strlen($newinform) && strlen($inform))
$newinform .= ','; $newinform .= ',';
$newinform .= $inform; $newinform .= $inform;
@ -658,19 +652,19 @@ function photos_post(&$a) {
update_thread($item_id); update_thread($item_id);
$best = 0; $best = 0;
foreach($p as $scales) { foreach ($p as $scales) {
if(intval($scales['scale']) == 2) { if (intval($scales['scale']) == 2) {
$best = 2; $best = 2;
break; break;
} }
if(intval($scales['scale']) == 4) { if (intval($scales['scale']) == 4) {
$best = 4; $best = 4;
break; break;
} }
} }
if(count($taginfo)) { if (count($taginfo)) {
foreach($taginfo as $tagged) { foreach ($taginfo as $tagged) {
$uri = item_new_uri($a->get_hostname(),$page_owner_uid); $uri = item_new_uri($a->get_hostname(),$page_owner_uid);
@ -706,7 +700,7 @@ function photos_post(&$a) {
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>'; $arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $tagged[0] . '</title><id>' . $tagged[1] . '/' . $tagged[0] . '</id>';
$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $tagged[1] . '" />' . "\n"); $arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $tagged[1] . '" />' . "\n");
if($tagged[3]) if ($tagged[3])
$arr['object'] .= xmlify('<link rel="photo" type="'.$p[0]['type'].'" href="' . $tagged[3]['photo'] . '" />' . "\n"); $arr['object'] .= xmlify('<link rel="photo" type="'.$p[0]['type'].'" href="' . $tagged[3]['photo'] . '" />' . "\n");
$arr['object'] .= '</link></object>' . "\n"; $arr['object'] .= '</link></object>' . "\n";
@ -715,7 +709,7 @@ function photos_post(&$a) {
$arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$p[0]['type'].'" href="' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>'; $arr['target'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $a->get_baseurl() . '/photos/' . $owner_record['nickname'] . '/image/' . $p[0]['resource-id'] . '" />' . "\n" . '<link rel="preview" type="'.$p[0]['type'].'" href="' . $a->get_baseurl() . "/photo/" . $p[0]['resource-id'] . '-' . $best . '.' . $ext . '" />') . '</link></target>';
$item_id = item_store($arr); $item_id = item_store($arr);
if($item_id) { if ($item_id) {
proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $item_id); proc_run(PRIORITY_HIGH, "include/notifier.php", "tag", $item_id);
} }
} }
@ -743,8 +737,8 @@ function photos_post(&$a) {
logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG); logger('mod/photos.php: photos_post(): album= ' . $album . ' newalbum= ' . $newalbum , LOGGER_DEBUG);
if(! strlen($album)) { if (! strlen($album)) {
if(strlen($newalbum)) if (strlen($newalbum))
$album = $newalbum; $album = $newalbum;
else else
$album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y'); $album = datetime_convert('UTC',date_default_timezone_get(),'now', 'Y');
@ -764,12 +758,12 @@ function photos_post(&$a) {
dbesc($album), dbesc($album),
intval($page_owner_uid) intval($page_owner_uid)
); );
if((! count($r)) || ($album == t('Profile Photos'))) if ((! count($r)) || ($album == t('Profile Photos')))
$visible = 1; $visible = 1;
else else
$visible = 0; $visible = 0;
if(intval($_REQUEST['not_visible']) || $_REQUEST['not_visible'] === 'true') if (intval($_REQUEST['not_visible']) || $_REQUEST['not_visible'] === 'true')
$visible = 0; $visible = 0;
$str_group_allow = perms2str(((is_array($_REQUEST['group_allow'])) ? $_REQUEST['group_allow'] : explode(',',$_REQUEST['group_allow']))); $str_group_allow = perms2str(((is_array($_REQUEST['group_allow'])) ? $_REQUEST['group_allow'] : explode(',',$_REQUEST['group_allow'])));
@ -781,13 +775,12 @@ function photos_post(&$a) {
call_hooks('photo_post_file',$ret); call_hooks('photo_post_file',$ret);
if(x($ret,'src') && x($ret,'filesize')) { if (x($ret,'src') && x($ret,'filesize')) {
$src = $ret['src']; $src = $ret['src'];
$filename = $ret['filename']; $filename = $ret['filename'];
$filesize = $ret['filesize']; $filesize = $ret['filesize'];
$type = $ret['type']; $type = $ret['type'];
} } else {
else {
$src = $_FILES['userfile']['tmp_name']; $src = $_FILES['userfile']['tmp_name'];
$filename = basename($_FILES['userfile']['name']); $filename = basename($_FILES['userfile']['name']);
$filesize = intval($_FILES['userfile']['size']); $filesize = intval($_FILES['userfile']['size']);
@ -799,7 +792,7 @@ function photos_post(&$a) {
$maximagesize = get_config('system','maximagesize'); $maximagesize = get_config('system','maximagesize');
if(($maximagesize) && ($filesize > $maximagesize)) { if (($maximagesize) && ($filesize > $maximagesize)) {
notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL); notice( sprintf(t('Image exceeds size limit of %s'), formatBytes($maximagesize)) . EOL);
@unlink($src); @unlink($src);
$foo = 0; $foo = 0;
@ -807,7 +800,7 @@ function photos_post(&$a) {
return; return;
} }
if(! $filesize) { if (! $filesize) {
notice( t('Image file is empty.') . EOL); notice( t('Image file is empty.') . EOL);
@unlink($src); @unlink($src);
$foo = 0; $foo = 0;
@ -827,7 +820,7 @@ function photos_post(&$a) {
$limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit'); $limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit');
if(($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) { if (($limit !== false) && (($r[0]['total'] + strlen($imagedata)) > $limit)) {
notice( upgrade_message() . EOL ); notice( upgrade_message() . EOL );
@unlink($src); @unlink($src);
$foo = 0; $foo = 0;
@ -838,7 +831,7 @@ function photos_post(&$a) {
$ph = new Photo($imagedata, $type); $ph = new Photo($imagedata, $type);
if(! $ph->is_valid()) { if (! $ph->is_valid()) {
logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG); logger('mod/photos.php: photos_post(): unable to process image' , LOGGER_DEBUG);
notice( t('Unable to process image.') . EOL ); notice( t('Unable to process image.') . EOL );
@unlink($src); @unlink($src);
@ -851,9 +844,9 @@ function photos_post(&$a) {
@unlink($src); @unlink($src);
$max_length = get_config('system','max_image_length'); $max_length = get_config('system','max_image_length');
if(! $max_length) if (! $max_length)
$max_length = MAX_IMAGE_LENGTH; $max_length = MAX_IMAGE_LENGTH;
if($max_length > 0) if ($max_length > 0)
$ph->scaleImage($max_length); $ph->scaleImage($max_length);
$width = $ph->getWidth(); $width = $ph->getWidth();
@ -865,19 +858,19 @@ function photos_post(&$a) {
$r = $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); $r = $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 0 , 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
if(! $r) { if (! $r) {
logger('mod/photos.php: photos_post(): image store failed' , LOGGER_DEBUG); logger('mod/photos.php: photos_post(): image store failed' , LOGGER_DEBUG);
notice( t('Image upload failed.') . EOL ); notice( t('Image upload failed.') . EOL );
killme(); killme();
} }
if($width > 640 || $height > 640) { if ($width > 640 || $height > 640) {
$ph->scaleImage(640); $ph->scaleImage(640);
$ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 1, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
$smallest = 1; $smallest = 1;
} }
if($width > 320 || $height > 320) { if ($width > 320 || $height > 320) {
$ph->scaleImage(320); $ph->scaleImage(320);
$ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny); $ph->store($page_owner_uid, $visitor, $photo_hash, $filename, $album, 2, 0, $str_contact_allow, $str_group_allow, $str_contact_deny, $str_group_deny);
$smallest = 2; $smallest = 2;
@ -890,8 +883,8 @@ function photos_post(&$a) {
$lat = $lon = null; $lat = $lon = null;
if($exif && $exif['GPS']) { if ($exif && $exif['GPS']) {
if(feature_enabled($channel_id,'photo_location')) { if (feature_enabled($channel_id,'photo_location')) {
$lat = getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']); $lat = getGps($exif['GPS']['GPSLatitude'], $exif['GPS']['GPSLatitudeRef']);
$lon = getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']); $lon = getGps($exif['GPS']['GPSLongitude'], $exif['GPS']['GPSLongitudeRef']);
} }
@ -899,7 +892,7 @@ function photos_post(&$a) {
$arr = array(); $arr = array();
if($lat && $lon) if ($lat && $lon)
$arr['coord'] = $lat . ' ' . $lon; $arr['coord'] = $lat . ' ' . $lon;
$arr['guid'] = get_guid(32); $arr['guid'] = get_guid(32);
@ -931,7 +924,7 @@ function photos_post(&$a) {
$item_id = item_store($arr); $item_id = item_store($arr);
if($visible) if ($visible)
proc_run(PRIORITY_HIGH, "include/notifier.php", 'wall-new', $item_id); proc_run(PRIORITY_HIGH, "include/notifier.php", 'wall-new', $item_id);
call_hooks('photo_post_end',intval($item_id)); call_hooks('photo_post_end',intval($item_id));
@ -957,7 +950,7 @@ function photos_content(&$a) {
// photos/name/image/xxxxx/edit // photos/name/image/xxxxx/edit
if((get_config('system','block_public')) && (! local_user()) && (! remote_user())) { if ((get_config('system','block_public')) && (! local_user()) && (! remote_user())) {
notice( t('Public access denied.') . EOL); notice( t('Public access denied.') . EOL);
return; return;
} }
@ -967,7 +960,7 @@ function photos_content(&$a) {
require_once('include/security.php'); require_once('include/security.php');
require_once('include/conversation.php'); require_once('include/conversation.php');
if(! x($a->data,'user')) { if (! x($a->data,'user')) {
notice( t('No photos selected') . EOL ); notice( t('No photos selected') . EOL );
return; return;
} }
@ -980,16 +973,15 @@ function photos_content(&$a) {
// Parse arguments // Parse arguments
// //
if($a->argc > 3) { if ($a->argc > 3) {
$datatype = $a->argv[2]; $datatype = $a->argv[2];
$datum = $a->argv[3]; $datum = $a->argv[3];
} } elseif (($a->argc > 2) && ($a->argv[2] === 'upload'))
elseif(($a->argc > 2) && ($a->argv[2] === 'upload'))
$datatype = 'upload'; $datatype = 'upload';
else else
$datatype = 'summary'; $datatype = 'summary';
if($a->argc > 4) if ($a->argc > 4)
$cmd = $a->argv[4]; $cmd = $a->argv[4];
else else
$cmd = 'view'; $cmd = 'view';
@ -1008,25 +1000,25 @@ function photos_content(&$a) {
$community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false); $community_page = (($a->data['user']['page-flags'] == PAGE_COMMUNITY) ? true : false);
if((local_user()) && (local_user() == $owner_uid)) if ((local_user()) && (local_user() == $owner_uid))
$can_post = true; $can_post = true;
else { else {
if($community_page && remote_user()) { if ($community_page && remote_user()) {
if(is_array($_SESSION['remote'])) { if (is_array($_SESSION['remote'])) {
foreach($_SESSION['remote'] as $v) { foreach ($_SESSION['remote'] as $v) {
if($v['uid'] == $owner_uid) { if ($v['uid'] == $owner_uid) {
$contact_id = $v['cid']; $contact_id = $v['cid'];
break; break;
} }
} }
} }
if($contact_id) { if ($contact_id) {
$r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT `uid` FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id), intval($contact_id),
intval($owner_uid) intval($owner_uid)
); );
if(count($r)) { if (dbm::is_result($r)) {
$can_post = true; $can_post = true;
$contact = $r[0]; $contact = $r[0];
$remote_contact = true; $remote_contact = true;
@ -1038,37 +1030,37 @@ function photos_content(&$a) {
// perhaps they're visiting - but not a community page, so they wouldn't have write access // perhaps they're visiting - but not a community page, so they wouldn't have write access
if(remote_user() && (! $visitor)) { if (remote_user() && (! $visitor)) {
$contact_id = 0; $contact_id = 0;
if(is_array($_SESSION['remote'])) { if (is_array($_SESSION['remote'])) {
foreach($_SESSION['remote'] as $v) { foreach ($_SESSION['remote'] as $v) {
if($v['uid'] == $owner_uid) { if ($v['uid'] == $owner_uid) {
$contact_id = $v['cid']; $contact_id = $v['cid'];
break; break;
} }
} }
} }
if($contact_id) { if ($contact_id) {
$groups = init_groups_visitor($contact_id); $groups = init_groups_visitor($contact_id);
$r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1", $r = q("SELECT * FROM `contact` WHERE `blocked` = 0 AND `pending` = 0 AND `id` = %d AND `uid` = %d LIMIT 1",
intval($contact_id), intval($contact_id),
intval($owner_uid) intval($owner_uid)
); );
if(count($r)) { if (dbm::is_result($r)) {
$contact = $r[0]; $contact = $r[0];
$remote_contact = true; $remote_contact = true;
} }
} }
} }
if(! $remote_contact) { if (! $remote_contact) {
if(local_user()) { if (local_user()) {
$contact_id = $_SESSION['cid']; $contact_id = $_SESSION['cid'];
$contact = $a->contact; $contact = $a->contact;
} }
} }
if($a->data['user']['hidewall'] && (local_user() != $owner_uid) && (! $remote_contact)) { if ($a->data['user']['hidewall'] && (local_user() != $owner_uid) && (! $remote_contact)) {
notice( t('Access to this item is restricted.') . EOL); notice( t('Access to this item is restricted.') . EOL);
return; return;
} }
@ -1085,8 +1077,8 @@ function photos_content(&$a) {
* Display upload form * Display upload form
*/ */
if($datatype === 'upload') { if ($datatype === 'upload') {
if(! ($can_post)) { if (! ($can_post)) {
notice( t('Permission denied.')); notice( t('Permission denied.'));
return; return;
} }
@ -1099,9 +1091,9 @@ function photos_content(&$a) {
$albumselect .= '<option value="" ' . ((! $selname) ? ' selected="selected" ' : '') . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>'; $albumselect .= '<option value="" ' . ((! $selname) ? ' selected="selected" ' : '') . '>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</option>';
if(count($a->data['albums'])) { if (count($a->data['albums'])) {
foreach($a->data['albums'] as $album) { foreach ($a->data['albums'] as $album) {
if(($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos'))) if (($album['album'] === '') || ($album['album'] === 'Contact Photos') || ($album['album'] === t('Contact Photos')))
continue; continue;
$selected = (($selname === $album['album']) ? ' selected="selected" ' : ''); $selected = (($selname === $album['album']) ? ' selected="selected" ' : '');
$albumselect .= '<option value="' . $album['album'] . '"' . $selected . '>' . $album['album'] . '</option>'; $albumselect .= '<option value="' . $album['album'] . '"' . $selected . '>' . $album['album'] . '</option>';
@ -1124,7 +1116,7 @@ function photos_content(&$a) {
$usage_message = ''; $usage_message = '';
$limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit'); $limit = service_class_fetch($a->data['user']['uid'],'photo_upload_limit');
if($limit !== false) { if ($limit !== false) {
$r = q("select sum(datasize) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ", $r = q("select sum(datasize) as total from photo where uid = %d and scale = 0 and album != 'Contact Photos' ",
intval($a->data['user']['uid']) intval($a->data['user']['uid'])
@ -1135,17 +1127,17 @@ function photos_content(&$a) {
// Private/public post links for the non-JS ACL form // Private/public post links for the non-JS ACL form
$private_post = 1; $private_post = 1;
if($_REQUEST['public']) if ($_REQUEST['public'])
$private_post = 0; $private_post = 0;
$query_str = $a->query_string; $query_str = $a->query_string;
if(strpos($query_str, 'public=1') !== false) if (strpos($query_str, 'public=1') !== false)
$query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str); $query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
// I think $a->query_string may never have ? in it, but I could be wrong // I think $a->query_string may never have ? in it, but I could be wrong
// It looks like it's from the index.php?q=[etc] rewrite that the web // It looks like it's from the index.php?q=[etc] rewrite that the web
// server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61 // server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
if(strpos($query_str, '?') === false) if (strpos($query_str, '?') === false)
$public_post_link = '?public=1'; $public_post_link = '?public=1';
else else
$public_post_link = '&public=1'; $public_post_link = '&public=1';
@ -1154,11 +1146,10 @@ function photos_content(&$a) {
$tpl = get_markup_template('photos_upload.tpl'); $tpl = get_markup_template('photos_upload.tpl');
if($a->theme['template_engine'] === 'internal') { if ($a->theme['template_engine'] === 'internal') {
$albumselect_e = template_escape($albumselect); $albumselect_e = template_escape($albumselect);
$aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user))); $aclselect_e = (($visitor) ? '' : template_escape(populate_acl($a->user)));
} } else {
else {
$albumselect_e = $albumselect; $albumselect_e = $albumselect;
$aclselect_e = (($visitor) ? '' : populate_acl($a->user)); $aclselect_e = (($visitor) ? '' : populate_acl($a->user));
} }
@ -1198,7 +1189,7 @@ function photos_content(&$a) {
* Display a single photo album * Display a single photo album
*/ */
if($datatype === 'album') { if ($datatype === 'album') {
$album = hex2bin($datum); $album = hex2bin($datum);
@ -1207,12 +1198,12 @@ function photos_content(&$a) {
intval($owner_uid), intval($owner_uid),
dbesc($album) dbesc($album)
); );
if(count($r)) { if (dbm::is_result($r)) {
$a->set_pager_total(count($r)); $a->set_pager_total(count($r));
$a->set_pager_itemspage(20); $a->set_pager_itemspage(20);
} }
if($_GET['order'] === 'posted') if ($_GET['order'] === 'posted')
$order = 'ASC'; $order = 'ASC';
else else
$order = 'DESC'; $order = 'DESC';
@ -1226,15 +1217,14 @@ function photos_content(&$a) {
); );
//edit album name //edit album name
if($cmd === 'edit') { if ($cmd === 'edit') {
if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { if (($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
if($can_post) { if ($can_post) {
$edit_tpl = get_markup_template('album_edit.tpl'); $edit_tpl = get_markup_template('album_edit.tpl');
if($a->theme['template_engine'] === 'internal') { if ($a->theme['template_engine'] === 'internal') {
$album_e = template_escape($album); $album_e = template_escape($album);
} } else {
else {
$album_e = $album; $album_e = $album;
} }
@ -1248,37 +1238,35 @@ function photos_content(&$a) {
)); ));
} }
} }
} } else {
else { if (($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) {
if(($album !== t('Profile Photos')) && ($album !== 'Contact Photos') && ($album !== t('Contact Photos'))) { if ($can_post) {
if($can_post) {
$edit = array(t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit'); $edit = array(t('Edit Album'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '/edit');
} }
} }
} }
if($_GET['order'] === 'posted') if ($_GET['order'] === 'posted')
$order = array(t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album)); $order = array(t('Show Newest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album));
else else
$order = array(t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted'); $order = array(t('Show Oldest First'), 'photos/' . $a->data['user']['nickname'] . '/album/' . bin2hex($album) . '?f=&order=posted');
$photos = array(); $photos = array();
if(count($r)) if (dbm::is_result($r))
$twist = 'rotright'; $twist = 'rotright';
foreach($r as $rr) { foreach ($r as $rr) {
if($twist == 'rotright') if ($twist == 'rotright')
$twist = 'rotleft'; $twist = 'rotleft';
else else
$twist = 'rotright'; $twist = 'rotright';
$ext = $phototypes[$rr['type']]; $ext = $phototypes[$rr['type']];
if($a->theme['template_engine'] === 'internal') { if ($a->theme['template_engine'] === 'internal') {
$imgalt_e = template_escape($rr['filename']); $imgalt_e = template_escape($rr['filename']);
$desc_e = template_escape($rr['desc']); $desc_e = template_escape($rr['desc']);
} } else {
else {
$imgalt_e = $rr['filename']; $imgalt_e = $rr['filename'];
$desc_e = $rr['desc']; $desc_e = $rr['desc'];
} }
@ -1316,7 +1304,7 @@ function photos_content(&$a) {
* Display one photo * Display one photo
*/ */
if($datatype === 'image') { if ($datatype === 'image') {
//$o = ''; //$o = '';
// fetch image, item containing image, then comments // fetch image, item containing image, then comments
@ -1327,13 +1315,13 @@ function photos_content(&$a) {
dbesc($datum) dbesc($datum)
); );
if(! count($ph)) { if (! count($ph)) {
$ph = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s' $ph = q("SELECT `id` FROM `photo` WHERE `uid` = %d AND `resource-id` = '%s'
LIMIT 1", LIMIT 1",
intval($owner_uid), intval($owner_uid),
dbesc($datum) dbesc($datum)
); );
if(count($ph)) if (count($ph))
notice( t('Permission denied. Access to this item may be restricted.')); notice( t('Permission denied. Access to this item may be restricted.'));
else else
notice( t('Photo not available') . EOL ); notice( t('Photo not available') . EOL );
@ -1343,7 +1331,7 @@ function photos_content(&$a) {
$prevlink = ''; $prevlink = '';
$nextlink = ''; $nextlink = '';
if($_GET['order'] === 'posted') if ($_GET['order'] === 'posted')
$order = 'ASC'; $order = 'ASC';
else else
$order = 'DESC'; $order = 'DESC';
@ -1355,14 +1343,14 @@ function photos_content(&$a) {
intval($owner_uid) intval($owner_uid)
); );
if(count($prvnxt)) { if (count($prvnxt)) {
for($z = 0; $z < count($prvnxt); $z++) { for($z = 0; $z < count($prvnxt); $z++) {
if($prvnxt[$z]['resource-id'] == $ph[0]['resource-id']) { if ($prvnxt[$z]['resource-id'] == $ph[0]['resource-id']) {
$prv = $z - 1; $prv = $z - 1;
$nxt = $z + 1; $nxt = $z + 1;
if($prv < 0) if ($prv < 0)
$prv = count($prvnxt) - 1; $prv = count($prvnxt) - 1;
if($nxt >= count($prvnxt)) if ($nxt >= count($prvnxt))
$nxt = 0; $nxt = 0;
break; break;
} }
@ -1373,16 +1361,15 @@ function photos_content(&$a) {
} }
if(count($ph) == 1) if (count($ph) == 1)
$hires = $lores = $ph[0]; $hires = $lores = $ph[0];
if(count($ph) > 1) { if (count($ph) > 1) {
if($ph[1]['scale'] == 2) { if ($ph[1]['scale'] == 2) {
// original is 640 or less, we can display it directly // original is 640 or less, we can display it directly
$hires = $lores = $ph[0]; $hires = $lores = $ph[0];
} } else {
else { $hires = $ph[0];
$hires = $ph[0]; $lores = $ph[1];
$lores = $ph[1];
} }
} }
@ -1390,7 +1377,7 @@ function photos_content(&$a) {
$tools = Null; $tools = Null;
$lock = Null; $lock = Null;
if($can_post && ($ph[0]['uid'] == $owner_uid)) { if ($can_post && ($ph[0]['uid'] == $owner_uid)) {
$tools = array( $tools = array(
'edit' => array('photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? t('View photo') : t('Edit photo'))), 'edit' => array('photos/' . $a->data['user']['nickname'] . '/image/' . $datum . (($cmd === 'edit') ? '' : '/edit'), (($cmd === 'edit') ? t('View photo') : t('Edit photo'))),
'profile'=>array('profile_photo/use/'.$ph[0]['resource-id'], t('Use as profile photo')), 'profile'=>array('profile_photo/use/'.$ph[0]['resource-id'], t('Use as profile photo')),
@ -1405,7 +1392,7 @@ function photos_content(&$a) {
} }
if( $cmd === 'edit') { if ( $cmd === 'edit') {
$tpl = get_markup_template('photo_edit_head.tpl'); $tpl = get_markup_template('photo_edit_head.tpl');
$a->page['htmlhead'] .= replace_macros($tpl,array( $a->page['htmlhead'] .= replace_macros($tpl,array(
'$prevlink' => $prevlink, '$prevlink' => $prevlink,
@ -1413,7 +1400,7 @@ function photos_content(&$a) {
)); ));
} }
if($prevlink) if ($prevlink)
$prevlink = array($prevlink, '<div class="icon prev"></div>') ; $prevlink = array($prevlink, '<div class="icon prev"></div>') ;
$photo = array( $photo = array(
@ -1426,7 +1413,7 @@ function photos_content(&$a) {
'filename' => $hires['filename'], 'filename' => $hires['filename'],
); );
if($nextlink) if ($nextlink)
$nextlink = array($nextlink, '<div class="icon next"></div>'); $nextlink = array($nextlink, '<div class="icon next"></div>');
@ -1444,7 +1431,7 @@ function photos_content(&$a) {
$map = null; $map = null;
if(count($linked_items)) { if (count($linked_items)) {
$link_item = $linked_items[0]; $link_item = $linked_items[0];
$r = q("SELECT COUNT(*) AS `total` $r = q("SELECT COUNT(*) AS `total`
FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
@ -1458,7 +1445,7 @@ function photos_content(&$a) {
); );
if(count($r)) if (dbm::is_result($r))
$a->set_pager_total($r[0]['total']); $a->set_pager_total($r[0]['total']);
@ -1480,7 +1467,7 @@ function photos_content(&$a) {
); );
if((local_user()) && (local_user() == $link_item['uid'])) { if ((local_user()) && (local_user() == $link_item['uid'])) {
q("UPDATE `item` SET `unseen` = 0 WHERE `parent` = %d and `uid` = %d", q("UPDATE `item` SET `unseen` = 0 WHERE `parent` = %d and `uid` = %d",
intval($link_item['parent']), intval($link_item['parent']),
intval(local_user()) intval(local_user())
@ -1488,24 +1475,24 @@ function photos_content(&$a) {
update_thread($link_item['parent']); update_thread($link_item['parent']);
} }
if($link_item['coord']) { if ($link_item['coord']) {
$map = generate_map($link_item['coord']); $map = generate_map($link_item['coord']);
} }
} }
$tags=Null; $tags=Null;
if(count($linked_items) && strlen($link_item['tag'])) { if (count($linked_items) && strlen($link_item['tag'])) {
$arr = explode(',',$link_item['tag']); $arr = explode(',',$link_item['tag']);
// parse tags and add links // parse tags and add links
$tag_str = ''; $tag_str = '';
foreach($arr as $t) { foreach ($arr as $t) {
if(strlen($tag_str)) if (strlen($tag_str))
$tag_str .= ', '; $tag_str .= ', ';
$tag_str .= bbcode($t); $tag_str .= bbcode($t);
} }
$tags = array(t('Tags: '), $tag_str); $tags = array(t('Tags: '), $tag_str);
if($cmd === 'edit') { if ($cmd === 'edit') {
$tags[] = 'tagrm/' . $link_item['id']; $tags[] = 'tagrm/' . $link_item['id'];
$tags[] = t('[Remove any tag]'); $tags[] = t('[Remove any tag]');
} }
@ -1513,33 +1500,32 @@ function photos_content(&$a) {
$edit = Null; $edit = Null;
if(($cmd === 'edit') && ($can_post)) { if (($cmd === 'edit') && ($can_post)) {
$edit_tpl = get_markup_template('photo_edit.tpl'); $edit_tpl = get_markup_template('photo_edit.tpl');
// Private/public post links for the non-JS ACL form // Private/public post links for the non-JS ACL form
$private_post = 1; $private_post = 1;
if($_REQUEST['public']) if ($_REQUEST['public'])
$private_post = 0; $private_post = 0;
$query_str = $a->query_string; $query_str = $a->query_string;
if(strpos($query_str, 'public=1') !== false) if (strpos($query_str, 'public=1') !== false)
$query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str); $query_str = str_replace(array('?public=1', '&public=1'), array('', ''), $query_str);
// I think $a->query_string may never have ? in it, but I could be wrong // I think $a->query_string may never have ? in it, but I could be wrong
// It looks like it's from the index.php?q=[etc] rewrite that the web // It looks like it's from the index.php?q=[etc] rewrite that the web
// server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61 // server does, which converts any ? to &, e.g. suggest&ignore=61 for suggest?ignore=61
if(strpos($query_str, '?') === false) if (strpos($query_str, '?') === false)
$public_post_link = '?public=1'; $public_post_link = '?public=1';
else else
$public_post_link = '&public=1'; $public_post_link = '&public=1';
if($a->theme['template_engine'] === 'internal') { if ($a->theme['template_engine'] === 'internal') {
$album_e = template_escape($ph[0]['album']); $album_e = template_escape($ph[0]['album']);
$caption_e = template_escape($ph[0]['desc']); $caption_e = template_escape($ph[0]['desc']);
$aclselect_e = template_escape(populate_acl($ph[0])); $aclselect_e = template_escape(populate_acl($ph[0]));
} } else {
else {
$album_e = $ph[0]['album']; $album_e = $ph[0]['album'];
$caption_e = $ph[0]['desc']; $caption_e = $ph[0]['desc'];
$aclselect_e = populate_acl($ph[0]); $aclselect_e = populate_acl($ph[0]);
@ -1575,7 +1561,7 @@ function photos_content(&$a) {
)); ));
} }
if(count($linked_items)) { if (count($linked_items)) {
$cmnt_tpl = get_markup_template('comment_item.tpl'); $cmnt_tpl = get_markup_template('comment_item.tpl');
$tpl = get_markup_template('photo_item.tpl'); $tpl = get_markup_template('photo_item.tpl');
@ -1585,7 +1571,7 @@ function photos_content(&$a) {
$likebuttons = ''; $likebuttons = '';
if($can_post || can_write_wall($a,$owner_uid)) { if ($can_post || can_write_wall($a,$owner_uid)) {
$likebuttons = replace_macros($like_tpl,array( $likebuttons = replace_macros($like_tpl,array(
'$id' => $link_item['id'], '$id' => $link_item['id'],
'$likethis' => t("I like this \x28toggle\x29"), '$likethis' => t("I like this \x28toggle\x29"),
@ -1597,9 +1583,9 @@ function photos_content(&$a) {
} }
$comments = ''; $comments = '';
if(! count($r)) { if (! count($r)) {
if($can_post || can_write_wall($a,$owner_uid)) { if ($can_post || can_write_wall($a,$owner_uid)) {
if($link_item['last-child']) { if ($link_item['last-child']) {
$comments .= replace_macros($cmnt_tpl,array( $comments .= replace_macros($cmnt_tpl,array(
'$return_path' => '', '$return_path' => '',
'$jsreload' => $return_url, '$jsreload' => $return_url,
@ -1635,9 +1621,9 @@ function photos_content(&$a) {
// display comments // display comments
if(count($r)) { if (dbm::is_result($r)) {
foreach($r as $item) { foreach ($r as $item) {
builtin_activity_puller($item, $conv_responses); builtin_activity_puller($item, $conv_responses);
} }
@ -1646,8 +1632,8 @@ function photos_content(&$a) {
if($can_post || can_write_wall($a,$owner_uid)) { if ($can_post || can_write_wall($a,$owner_uid)) {
if($link_item['last-child']) { if ($link_item['last-child']) {
$comments .= replace_macros($cmnt_tpl,array( $comments .= replace_macros($cmnt_tpl,array(
'$return_path' => '', '$return_path' => '',
'$jsreload' => $return_url, '$jsreload' => $return_url,
@ -1669,23 +1655,22 @@ function photos_content(&$a) {
} }
foreach($r as $item) { foreach ($r as $item) {
$comment = ''; $comment = '';
$template = $tpl; $template = $tpl;
$sparkle = ''; $sparkle = '';
if(((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent'])) if (((activity_match($item['verb'],ACTIVITY_LIKE)) || (activity_match($item['verb'],ACTIVITY_DISLIKE))) && ($item['id'] != $item['parent']))
continue; continue;
$redirect_url = 'redir/' . $item['cid'] ; $redirect_url = 'redir/' . $item['cid'] ;
if(local_user() && ($item['contact-uid'] == local_user()) if (local_user() && ($item['contact-uid'] == local_user())
&& ($item['network'] == NETWORK_DFRN) && (! $item['self'] )) { && ($item['network'] == NETWORK_DFRN) && (! $item['self'] )) {
$profile_url = $redirect_url; $profile_url = $redirect_url;
$sparkle = ' sparkle'; $sparkle = ' sparkle';
} } else {
else {
$profile_url = $item['url']; $profile_url = $item['url'];
$sparkle = ''; $sparkle = '';
} }
@ -1708,12 +1693,11 @@ function photos_content(&$a) {
); );
if($a->theme['template_engine'] === 'internal') { if ($a->theme['template_engine'] === 'internal') {
$name_e = template_escape($profile_name); $name_e = template_escape($profile_name);
$title_e = template_escape($item['title']); $title_e = template_escape($item['title']);
$body_e = template_escape(bbcode($item['body'])); $body_e = template_escape(bbcode($item['body']));
} } else {
else {
$name_e = $profile_name; $name_e = $profile_name;
$title_e = $item['title']; $title_e = $item['title'];
$body_e = bbcode($item['body']); $body_e = bbcode($item['body']);
@ -1733,9 +1717,9 @@ function photos_content(&$a) {
'$comment' => $comment '$comment' => $comment
)); ));
if($can_post || can_write_wall($a,$owner_uid)) { if ($can_post || can_write_wall($a,$owner_uid)) {
if($item['last-child']) { if ($item['last-child']) {
$comments .= replace_macros($cmnt_tpl,array( $comments .= replace_macros($cmnt_tpl,array(
'$return_path' => '', '$return_path' => '',
'$jsreload' => $return_url, '$jsreload' => $return_url,
@ -1763,19 +1747,18 @@ function photos_content(&$a) {
$response_verbs = array('like'); $response_verbs = array('like');
if(feature_enabled($owner_uid,'dislike')) if (feature_enabled($owner_uid,'dislike'))
$response_verbs[] = 'dislike'; $response_verbs[] = 'dislike';
$responses = get_responses($conv_responses,$response_verbs,'',$link_item); $responses = get_responses($conv_responses,$response_verbs,'',$link_item);
$photo_tpl = get_markup_template('photo_view.tpl'); $photo_tpl = get_markup_template('photo_view.tpl');
if($a->theme['template_engine'] === 'internal') { if ($a->theme['template_engine'] === 'internal') {
$album_e = array($album_link,template_escape($ph[0]['album'])); $album_e = array($album_link,template_escape($ph[0]['album']));
$tags_e = template_escape($tags); $tags_e = template_escape($tags);
$like_e = template_escape($like); $like_e = template_escape($like);
$dislike_e = template_escape($dislike); $dislike_e = template_escape($dislike);
} } else {
else {
$album_e = array($album_link,$ph[0]['album']); $album_e = array($album_link,$ph[0]['album']);
$tags_e = $tags; $tags_e = $tags;
$like_e = $like; $like_e = $like;
@ -1821,7 +1804,7 @@ function photos_content(&$a) {
dbesc('Contact Photos'), dbesc('Contact Photos'),
dbesc( t('Contact Photos')) dbesc( t('Contact Photos'))
); );
if(count($r)) { if (dbm::is_result($r)) {
$a->set_pager_total(count($r)); $a->set_pager_total(count($r));
$a->set_pager_itemspage(20); $a->set_pager_itemspage(20);
} }
@ -1839,24 +1822,24 @@ function photos_content(&$a) {
$photos = array(); $photos = array();
if(count($r)) { if (dbm::is_result($r)) {
$twist = 'rotright'; $twist = 'rotright';
foreach($r as $rr) { foreach ($r as $rr) {
//hide profile photos to others //hide profile photos to others
if((! $is_owner) && (! remote_user()) && ($rr['album'] == t('Profile Photos'))) if ((! $is_owner) && (! remote_user()) && ($rr['album'] == t('Profile Photos')))
continue; continue;
if($twist == 'rotright') if ($twist == 'rotright')
$twist = 'rotleft'; $twist = 'rotleft';
else else
$twist = 'rotright'; $twist = 'rotright';
$ext = $phototypes[$rr['type']]; $ext = $phototypes[$rr['type']];
if($a->theme['template_engine'] === 'internal') { if ($a->theme['template_engine'] === 'internal') {
$alt_e = template_escape($rr['filename']); $alt_e = template_escape($rr['filename']);
$name_e = template_escape($rr['album']); $name_e = template_escape($rr['album']);
} } else {
else {
$alt_e = $rr['filename']; $alt_e = $rr['filename'];
$name_e = $rr['album']; $name_e = $rr['album'];
} }