jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #49 from CatoTH/master

Browse source 
Bugfix for del_config
This commit is contained in:
friendica 2012-02-26 14:49:56 -08:00
commit 6ddd444afd
10 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/config.php
View file

@ -162,7 +162,7 @@ function del_config($family,$key) {
if(x($a->config[$family],$key)) if(x($a->config[$family],$key))
unset($a->config[$family][$key]); unset($a->config[$family][$key]);
$ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1", $ret = q("DELETE FROM `config` WHERE `cat` = '%s' AND `k` = '%s' LIMIT 1",
dbesc($cat), dbesc($family),
dbesc($key) dbesc($key)
); );
return $ret; return $ret;

6
include/conversation.php
View file

@ -232,7 +232,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
$alike = array(); $alike = array();
$dlike = array(); $dlike = array();
$o = "";
// array with html for each thread (parent+comments) // array with html for each thread (parent+comments)
$threads = array(); $threads = array();
@ -436,7 +436,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
} }
else { else {
// prevent private email from leaking into public conversation // prevent private email from leaking into public conversation
if((! $toplevelpost) && (! toplevelprivate) && ($item['private']) && ($profile_owner != local_user())) if((! $toplevelpost) && (! $toplevelprivate) && ($item['private']) && ($profile_owner != local_user()))
continue; continue;
$comments_seen ++; $comments_seen ++;
} }
@ -641,7 +641,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
$body = prepare_body($item,true); $body = prepare_body($item,true);
$tmp_item = replace_macros($template,array( $tmp_item = replace_macros($template,array(
'$type' => implode("",array_slice(split("/",$item['verb']),-1)), '$type' => implode("",array_slice(explode("/",$item['verb']),-1)),
'$tags' => $tags, '$tags' => $tags,
'$body' => template_escape($body), '$body' => template_escape($body),
'$id' => $item['item_id'], '$id' => $item['item_id'],

2
include/event.php
View file

@ -163,7 +163,7 @@ function bbtoevent($s) {
if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match)) if(preg_match("/\[event\-adjust\](.*?)\[\/event\-adjust\]/is",$s,$match))
$ev['adjust'] = $match[1]; $ev['adjust'] = $match[1];
$match = ''; $match = '';
$ev['nofinish'] = (($ev['start'] && (! $ev['finish'])) ? 1 : 0); $ev['nofinish'] = (($ev['start'] && (!x($ev, 'finish') || !$ev['finish'])) ? 1 : 0);
return $ev; return $ev;
} }

6
include/items.php
View file

@ -308,7 +308,7 @@ function get_atom_elements($feed,$item) {
if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) { if($rawauthor && $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']) {
$base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']; $base = $rawauthor[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
foreach($base as $link) { foreach($base as $link) {
if(! $res['author-avatar']) { if(!x($res, 'author-avatar') || !$res['author-avatar']) {
if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar') if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
$res['author-avatar'] = unxmlify($link['attribs']['']['href']); $res['author-avatar'] = unxmlify($link['attribs']['']['href']);
} }
@ -323,7 +323,7 @@ function get_atom_elements($feed,$item) {
foreach($base as $link) { foreach($base as $link) {
if($link['attribs']['']['rel'] === 'alternate' && (! $res['author-link'])) if($link['attribs']['']['rel'] === 'alternate' && (! $res['author-link']))
$res['author-link'] = unxmlify($link['attribs']['']['href']); $res['author-link'] = unxmlify($link['attribs']['']['href']);
if(! $res['author-avatar']) { if(!x($res, 'author-avatar') || !$res['author-avatar']) {
if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo') if($link['attribs']['']['rel'] === 'avatar' || $link['attribs']['']['rel'] === 'photo')
$res['author-avatar'] = unxmlify($link['attribs']['']['href']); $res['author-avatar'] = unxmlify($link['attribs']['']['href']);
} }
@ -503,7 +503,7 @@ function get_atom_elements($feed,$item) {
$base = $rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link']; $base = $rawowner[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10]['link'];
foreach($base as $link) { foreach($base as $link) {
if(! $res['owner-avatar']) { if(!x($res, 'owner-avatar') || !$res['owner-avatar']) {
if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar') if($link['attribs']['']['rel'] === 'photo' || $link['attribs']['']['rel'] === 'avatar')
$res['owner-avatar'] = unxmlify($link['attribs']['']['href']); $res['owner-avatar'] = unxmlify($link['attribs']['']['href']);
} }

15
include/template_processor.php
View file

@ -32,11 +32,12 @@
if(is_array($r) && count($r)) { if(is_array($r) && count($r)) {
foreach ($r as $k => $v ) { foreach ($r as $k => $v ) {
if (is_array($v)) if (is_array($v)) {
$this->_build_replace($v, "$prefix$k."); $this->_build_replace($v, "$prefix$k.");
} else {
$this->search[] = $prefix . $k; $this->search[] = $prefix . $k;
$this->replace[] = $v; $this->replace[] = $v;
}
} }
} }
} }
@ -53,7 +54,7 @@
$keys = array_map('trim',explode(".",$name)); $keys = array_map('trim',explode(".",$name));
$val = $this->r; $val = $this->r;
foreach($keys as $k) { foreach($keys as $k) {
$val = $val[$k]; $val = (isset($val[$k]) ? $val[$k] : null);
} }
return $val; return $val;
} }
@ -79,8 +80,8 @@
} else { } else {
$val = $this->_get_var($args[2]); $val = $this->_get_var($args[2]);
} }
list($strue, $sfalse)= preg_split("|{{ *else *}}|", $args[3]); $x = preg_split("|{{ *else *}}|", $args[3]);
return ($val?$strue:$sfalse); return ( $val ? $x[0] : (isset($x[1]) ? $x[1] : ""));
} }
/** /**

2
include/text.php
View file

@ -996,7 +996,7 @@ function lang_selector() {
} }
$ll = substr($l,5); $ll = substr($l,5);
$ll = substr($ll,0,strrpos($ll,'/')); $ll = substr($ll,0,strrpos($ll,'/'));
$selected = (($ll === $lang && (x($_SESSION['language']))) ? ' selected="selected" ' : ''); $selected = (($ll === $lang && (x($_SESSION, 'language'))) ? ' selected="selected" ' : '');
$o .= '<option value="' . $ll . '"' . $selected . '>' . $ll . '</option>'; $o .= '<option value="' . $ll . '"' . $selected . '>' . $ll . '</option>';
} }
} }

4
mod/acl.php
View file

@ -16,6 +16,8 @@ function acl_init(&$a){
if ($search!=""){ if ($search!=""){
$sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'"; $sql_extra = "AND `name` LIKE '%%".dbesc($search)."%%'";
$sql_extra2 = "AND (`attag` LIKE '%%".dbesc($search)."%%' OR `name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')"; $sql_extra2 = "AND (`attag` LIKE '%%".dbesc($search)."%%' OR `name` LIKE '%%".dbesc($search)."%%' OR `nick` LIKE '%%".dbesc($search)."%%')";
} else {
$sql_extra = $sql_extra2 = "";
} }
// count groups and contacts // count groups and contacts
@ -75,7 +77,7 @@ function acl_init(&$a){
if ($type=='' || $type=='c'){ if ($type=='' || $type=='c'){
$r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url` FROM `contact` $r = q("SELECT `id`, `name`, `nick`, `micro`, `network`, `url`, `attag` FROM `contact`
WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != '' WHERE `uid` = %d AND `self` = 0 AND `blocked` = 0 AND `pending` = 0 AND `notify` != ''
$sql_extra2 $sql_extra2
ORDER BY `name` ASC ", ORDER BY `name` ASC ",

2
mod/photo.php
View file

@ -119,7 +119,7 @@ function photo_init(&$a) {
// NOTREACHED // NOTREACHED
} }
if(intval($customres) && $customres > 0 && $customres < 500) { if(isset($customres) && $customres > 0 && $customres < 500) {
require_once('include/Photo.php'); require_once('include/Photo.php');
$ph = new Photo($data); $ph = new Photo($data);
if($ph->is_valid()) { if($ph->is_valid()) {

5
mod/ping.php
View file

@ -26,9 +26,10 @@ function ping_init(&$a) {
$dislikes = array(); $dislikes = array();
$friends = array(); $friends = array();
$posts = array(); $posts = array();
$home = 0;
$network = 0;
$r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`author-name`, $r = q("SELECT `item`.`id`,`item`.`parent`, `item`.`verb`, `item`.`wall`, `item`.`author-name`,
`item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`, `item`.`author-link`, `item`.`author-avatar`, `item`.`created`, `item`.`object`,
`pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink` `pitem`.`author-name` as `pname`, `pitem`.`author-link` as `plink`
FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent` FROM `item` INNER JOIN `item` as `pitem` ON `pitem`.`id`=`item`.`parent`

8
mod/profile.php
View file

@ -107,7 +107,7 @@ function profile_content(&$a, $update = 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->user['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;
} }
@ -228,10 +228,12 @@ function profile_content(&$a, $update = 0) {
intval($a->profile['profile_uid']), intval($a->profile['profile_uid']),
dbesc($parents_str) dbesc($parents_str)
); );
$items = conv_sort($items,'created');
} else {
$items = array();
} }
$items = conv_sort($items,'created');
if($is_owner && ! $update) { if($is_owner && ! $update) {
$o .= get_birthdays(); $o .= get_birthdays();
$o .= get_events(); $o .= get_events();