From 760f17b17389eafafcb1ce2e3a031c19932cff7f Mon Sep 17 00:00:00 2001 From: Alexandre Hannud Abdo Date: Fri, 22 May 2015 10:27:17 -0300 Subject: Import security only when necessary, use correct variable in log Just some cleanup, seemed like the intent of previous changes was so --- include/items.php | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'include') diff --git a/include/items.php b/include/items.php index 3936f1a6f..0f0f1a234 100755 --- a/include/items.php +++ b/include/items.php @@ -4389,8 +4389,6 @@ function zot_feed($uid,$observer_hash,$arr) { $mindate = null; $message_id = null; - require_once('include/security.php'); - if(array_key_exists('mindate',$arr)) { $mindate = datetime_convert('UTC','UTC',$arr['mindate']); } @@ -4404,7 +4402,7 @@ function zot_feed($uid,$observer_hash,$arr) { $mindate = dbesc($mindate); - logger('zot_feed: requested for uid ' . $uid . ' from observer ' . $observer_xchan, LOGGER_DEBUG); + logger('zot_feed: requested for uid ' . $uid . ' from observer ' . $observer_hash, LOGGER_DEBUG); if($message_id) logger('message_id: ' . $message_id,LOGGER_DEBUG); -- cgit v1.2.3 From f575ef551d5c22953080faab5890b675c6e0985e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sat, 23 May 2015 22:19:02 +0200 Subject: use $a->data instead of $a->page for $content and ad another library for use with webpages - foundation --- include/comanche.php | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'include') diff --git a/include/comanche.php b/include/comanche.php index 93cbd8b12..9fe7dc255 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -175,12 +175,12 @@ function comanche_block($s, $class = '') { } if($r[0]['title'] && trim($r[0]['title']) === '$content' && get_app()->data['webpage'][0]['title']) { - $o .= '

' . get_app()->data['webpage'][0]['title'] . '

'; + $o .= '

' . get_app()->page['title'] . '

'; } if(trim($r[0]['body']) === '$content') { - $o .= prepare_text(get_app()->data['webpage'][0]['body'], get_app()->data['webpage'][0]['mimetype']); + $o .= prepare_text(get_app()->page['content'], get_app()->data['webpage'][0]['mimetype']); } else { $o .= prepare_text($r[0]['body'], $r[0]['mimetype']); @@ -202,9 +202,17 @@ function comanche_js($s) { case 'bootstrap': $path = 'library/bootstrap/js/bootstrap.min.js'; break; + case 'foundation': + $path = 'library/foundation/js/foundation.min.js'; + $init = "\r\n" . ''; + break; } - return ''; + $ret = ''; + if($init) + $ret .= $init; + + return $ret; } @@ -214,9 +222,14 @@ function comanche_css($s) { case 'bootstrap': $path = 'library/bootstrap/css/bootstrap.min.css'; break; + case 'foundation': + $path = 'library/foundation/css/foundation.min.css'; + break; } - return ''; + $ret = ''; + + return $ret; } -- cgit v1.2.3 From ee146578637f28a1b65ee3538935d2f4352381b2 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 23 May 2015 15:07:24 -0700 Subject: add local_dir_update hook --- include/dir_fns.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'include') diff --git a/include/dir_fns.php b/include/dir_fns.php index ebaa7c427..a67a429ae 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -431,10 +431,13 @@ function local_dir_update($uid, $force) { ); } + $arr = array('hash' => $hash, 'profile' => $profile); + call_hooks('local_dir_update', $arr); + $address = $p[0]['channel_address'] . '@' . get_app()->get_hostname(); if (perm_is_allowed($uid, '', 'view_profile')) { - import_directory_profile($hash, $profile, $address, 0); + import_directory_profile($hash, $arr['profile'], $address, 0); } else { // they may have made it private $r = q("delete from xprof where xprof_hash = '%s'", -- cgit v1.2.3 From 11861949bbc5867e748eb102344567387c32e75d Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 23 May 2015 15:19:50 -0700 Subject: add channel_id to local_dir_update hook --- include/dir_fns.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/dir_fns.php b/include/dir_fns.php index a67a429ae..77c78558c 100644 --- a/include/dir_fns.php +++ b/include/dir_fns.php @@ -431,7 +431,7 @@ function local_dir_update($uid, $force) { ); } - $arr = array('hash' => $hash, 'profile' => $profile); + $arr = array('channel_id' => $uid, 'hash' => $hash, 'profile' => $profile); call_hooks('local_dir_update', $arr); $address = $p[0]['channel_address'] . '@' . get_app()->get_hostname(); -- cgit v1.2.3 From 7f9e4d6add614563242db41e2fe2eee371c7a35f Mon Sep 17 00:00:00 2001 From: redmatrix Date: Sat, 23 May 2015 15:24:16 -0700 Subject: federation problem from diaspora comments relayed through red channels due to typo --- include/items.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/items.php b/include/items.php index 3936f1a6f..57a7774fd 100755 --- a/include/items.php +++ b/include/items.php @@ -976,7 +976,7 @@ function import_author_diaspora($x) { ); if($r) { logger('in_cache: ' . $x['address'], LOGGER_DATA); - return $r[0]['chan_hash']; + return $r[0]['xchan_hash']; } if(discover_by_webbie($x['address'])) { -- cgit v1.2.3 From 125cd5e32b537e2f3540a2b1c335fb62ad6a339e Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 24 May 2015 14:57:01 +0200 Subject: should not call prepare text here anymore --- include/comanche.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'include') diff --git a/include/comanche.php b/include/comanche.php index 9fe7dc255..fad499649 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -180,7 +180,7 @@ function comanche_block($s, $class = '') { if(trim($r[0]['body']) === '$content') { - $o .= prepare_text(get_app()->page['content'], get_app()->data['webpage'][0]['mimetype']); + $o .= get_app()->page['content']; } else { $o .= prepare_text($r[0]['body'], $r[0]['mimetype']); -- cgit v1.2.3 From 57d520e69fcb34a69f8e94038a23c8d52251bfc5 Mon Sep 17 00:00:00 2001 From: Mario Vavti Date: Sun, 24 May 2015 15:09:30 +0200 Subject: logic has changed - this is not needed anymore --- include/comanche.php | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'include') diff --git a/include/comanche.php b/include/comanche.php index fad499649..65f64be5c 100644 --- a/include/comanche.php +++ b/include/comanche.php @@ -170,15 +170,10 @@ function comanche_block($s, $class = '') { if($r) { $o .= (($var['wrap'] == 'none') ? '' : '
'); - if($r[0]['title'] && trim($r[0]['title']) != '$content') { + if($r[0]['title'] && trim($r[0]['body']) != '$content') { $o .= '

' . $r[0]['title'] . '

'; } - if($r[0]['title'] && trim($r[0]['title']) === '$content' && get_app()->data['webpage'][0]['title']) { - $o .= '

' . get_app()->page['title'] . '

'; - } - - if(trim($r[0]['body']) === '$content') { $o .= get_app()->page['content']; } -- cgit v1.2.3 From b15a68f05db382d23b749428a04fe39cc6c156ad Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Sun, 24 May 2015 09:26:12 -0700 Subject: avoid db compatibility issues --- include/oauth.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/oauth.php b/include/oauth.php index ec754db95..8634f9c8a 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -75,12 +75,12 @@ class FKOAuthDataStore extends OAuthDataStore { $k = $consumer; } - $r = q("INSERT INTO tokens (id, secret, client_id, scope, expires) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP()+%d)", + $r = q("INSERT INTO tokens (id, secret, client_id, scope, expires) VALUES ('%s','%s','%s','%s', %d)", dbesc($key), dbesc($sec), dbesc($k), 'request', - intval(REQUEST_TOKEN_DURATION)); + time()+intval(REQUEST_TOKEN_DURATION)); if (!$r) return null; return new OAuthToken($key,$sec); -- cgit v1.2.3 From 13546167877322afa274a2540656f525e55d3b48 Mon Sep 17 00:00:00 2001 From: Habeas Codice Date: Sun, 24 May 2015 09:30:31 -0700 Subject: one more --- include/oauth.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') diff --git a/include/oauth.php b/include/oauth.php index 8634f9c8a..a9509c68e 100644 --- a/include/oauth.php +++ b/include/oauth.php @@ -104,12 +104,12 @@ class FKOAuthDataStore extends OAuthDataStore { $key = $this->gen_token(); $sec = $this->gen_token(); - $r = q("INSERT INTO tokens (id, secret, client_id, scope, expires, uid) VALUES ('%s','%s','%s','%s', UNIX_TIMESTAMP()+%d, %d)", + $r = q("INSERT INTO tokens (id, secret, client_id, scope, expires, uid) VALUES ('%s','%s','%s','%s', %d, %d)", dbesc($key), dbesc($sec), dbesc($consumer->key), 'access', - intval(ACCESS_TOKEN_DURATION), + time()+intval(ACCESS_TOKEN_DURATION), intval($uverifier)); if ($r) -- cgit v1.2.3