From ec8091a102b9cb2f8f47ef87982533bcd5ba9886 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 22 Jun 2016 18:00:18 -0700 Subject: use the normal html escape for '@' in addresses rather than the high-plane unicode variant. This makes it copy-able, but not easily scrape-able. --- include/channel.php | 2 +- include/widgets.php | 2 +- view/tpl/profile_vcard.tpl | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/channel.php b/include/channel.php index 562aedddc..a0424ee39 100644 --- a/include/channel.php +++ b/include/channel.php @@ -862,7 +862,7 @@ function profile_load(&$a, $nickname, $profile = '') { ); if($z) { $p[0]['picdate'] = $z[0]['xchan_photo_date']; - $p[0]['reddress'] = str_replace('@','＠',$z[0]['xchan_addr']); + $p[0]['reddress'] = str_replace('@','@',$z[0]['xchan_addr']); } // fetch user tags if this isn't the default profile diff --git a/include/widgets.php b/include/widgets.php index cdd5d72ab..8a7f4b69f 100644 --- a/include/widgets.php +++ b/include/widgets.php @@ -1158,7 +1158,7 @@ function widget_cover_photo($arr) { if(array_key_exists('subtitle', $arr) && isset($arr['subtitle'])) $subtitle = $arr['subtitle']; else - $subtitle = $channel['xchan_addr']; + $subtitle = str_replace('@','@',$channel['xchan_addr']); $c = get_cover_photo($channel_id,'html'); diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index 626649784..5e9d192a1 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -26,7 +26,7 @@ {{if ! $zcard}}
{{$profile.fullname}}{{if $profile.online}} {{/if}}
- {{if $reddress}}
{{$profile.reddress}}
{{/if}} + {{if $reddress}}
{{$profile.reddress}}
{{/if}} {{/if}} {{if $pdesc}}
{{$profile.pdesc}}
{{/if}} {{if $location}} -- cgit v1.2.3 From 1267d995ef031f6ecf4d1f1951a700dfdcbf6c8d Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 22 Jun 2016 19:08:59 -0700 Subject: db statement debugging --- Zotlabs/Module/Photo.php | 4 ++-- Zotlabs/Module/Profile_photo.php | 5 ++--- include/dba/dba_driver.php | 5 ++++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Zotlabs/Module/Photo.php b/Zotlabs/Module/Photo.php index 92c9ac3c0..5148c4a94 100644 --- a/Zotlabs/Module/Photo.php +++ b/Zotlabs/Module/Photo.php @@ -62,7 +62,7 @@ class Photo extends \Zotlabs\Web\Controller { intval($uid), intval(PHOTO_PROFILE) ); - if(count($r)) { + if($r) { $data = dbunescbin($r[0]['content']); $mimetype = $r[0]['mimetype']; } @@ -79,7 +79,7 @@ class Photo extends \Zotlabs\Web\Controller { * Other photos */ - /* Check for a cookie to indicate display pixel density, in order to detect high-resolution + /* Check for a cookie to indicate display pixel density, in order to detect high-resolution displays. This procedure was derived from the "Retina Images" by Jeremey Worboys, used in accordance with the Creative Commons Attribution 3.0 Unported License. Project link: https://github.com/Retina-Images/Retina-Images diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php index 6129a7492..9480a2f7f 100644 --- a/Zotlabs/Module/Profile_photo.php +++ b/Zotlabs/Module/Profile_photo.php @@ -23,12 +23,11 @@ class Profile_photo extends \Zotlabs\Web\Controller { /* @brief Initalize the profile-photo edit view * - * @param $a Current application * @return void * */ - function init() { + function init() { if(! local_channel()) { return; @@ -46,7 +45,7 @@ class Profile_photo extends \Zotlabs\Web\Controller { * */ - function post() { + function post() { if(! local_channel()) { return; diff --git a/include/dba/dba_driver.php b/include/dba/dba_driver.php index df072ed76..f6091f6e1 100755 --- a/include/dba/dba_driver.php +++ b/include/dba/dba_driver.php @@ -90,7 +90,7 @@ abstract class dba_driver { protected $db; protected $pdo = array(); - public $debug = 0; + public $debug = 0; public $connected = false; public $error = false; @@ -332,6 +332,9 @@ function q($sql) { else db_logger('dba: vsprintf error: ' . print_r(debug_backtrace(), true),LOGGER_NORMAL,LOG_CRIT); } + if(\DBA::$dba->debug) + db_logger('Sql: ' . $stmt, LOGGER_DEBUG, LOG_INFO); + return \DBA::$dba->q($stmt); } -- cgit v1.2.3 From cef77ce5bb296829576f5d7a515b56a8b18f99eb Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 22 Jun 2016 19:22:59 -0700 Subject: the xchan_query wasn't fully optimised as we were comparing quoted and unquoted strings when looking for duplicates --- include/text.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/text.php b/include/text.php index 4f28c6dbc..12b6b1137 100644 --- a/include/text.php +++ b/include/text.php @@ -2089,9 +2089,9 @@ function xchan_query(&$items,$abook = true,$effective_uid = 0) { } foreach($items as $item) { - if($item['owner_xchan'] && (! in_array($item['owner_xchan'],$arr))) + if($item['owner_xchan'] && (! in_array("'" . dbesc($item['owner_xchan']) . "'",$arr))) $arr[] = "'" . dbesc($item['owner_xchan']) . "'"; - if($item['author_xchan'] && (! in_array($item['author_xchan'],$arr))) + if($item['author_xchan'] && (! in_array("'" . dbesc($item['author_xchan']) . "'",$arr))) $arr[] = "'" . dbesc($item['author_xchan']) . "'"; } } @@ -2124,9 +2124,9 @@ function xchan_mail_query(&$item) { $arr = array(); $chans = null; if($item) { - if($item['from_xchan'] && (! in_array($item['from_xchan'],$arr))) + if($item['from_xchan'] && (! in_array("'" . dbesc($item['from_xchan']) . "'",$arr))) $arr[] = "'" . dbesc($item['from_xchan']) . "'"; - if($item['to_xchan'] && (! in_array($item['to_xchan'],$arr))) + if($item['to_xchan'] && (! in_array("'" . dbesc($item['to_xchan']) . "'",$arr))) $arr[] = "'" . dbesc($item['to_xchan']) . "'"; } -- cgit v1.2.3 From 515b054a6e6e5030b66753147cff424e0f37bab8 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 22 Jun 2016 20:17:19 -0700 Subject: missing class selector when "use photo as profile photo" --- Zotlabs/Module/Profile_photo.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php index 9480a2f7f..d1ce9f428 100644 --- a/Zotlabs/Module/Profile_photo.php +++ b/Zotlabs/Module/Profile_photo.php @@ -348,7 +348,7 @@ class Profile_photo extends \Zotlabs\Web\Controller { } } - profile_photo_crop_ui_head($a, $ph, $hash, $smallest); + $this->profile_photo_crop_ui_head($a, $ph, $hash, $smallest); } $profiles = q("select id, profile_name as name, is_default from profile where uid = %d", -- cgit v1.2.3 From b8c5a91940f75e79b1cd7e7e2148e4acd0ff7d83 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Wed, 22 Jun 2016 20:46:44 -0700 Subject: set profile when "use existing photo" --- Zotlabs/Module/Profile_photo.php | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/Zotlabs/Module/Profile_photo.php b/Zotlabs/Module/Profile_photo.php index d1ce9f428..c02821a3c 100644 --- a/Zotlabs/Module/Profile_photo.php +++ b/Zotlabs/Module/Profile_photo.php @@ -70,6 +70,8 @@ class Profile_photo extends \Zotlabs\Web\Controller { } } + +logger('profile: ' . $_REQUEST['profile']); // phase 2 - we have finished cropping @@ -268,11 +270,19 @@ class Profile_photo extends \Zotlabs\Web\Controller { notice( t('Permission denied.') . EOL ); return; }; - - // check_form_security_token_redirectOnErr('/profile_photo', 'profile_photo'); - + $resource_id = argv(2); + // When using an existing photo, we don't have a dialogue to offer a choice of profiles, + // so it gets attached to the default + + $p = q("select id from profile where is_default = 1 and uid = %d", + intval(local_channel()) + ); + if($p) { + $_REQUEST['profile'] = $p[0]['id']; + } + $r = q("SELECT id, album, imgscale FROM photo WHERE uid = %d AND resource_id = '%s' ORDER BY imgscale ASC", intval(local_channel()), @@ -309,7 +319,7 @@ class Profile_photo extends \Zotlabs\Web\Controller { dbesc($channel['xchan_hash']) ); - profile_photo_set_profile_perms(); //Reset default photo permissions to public + profile_photo_set_profile_perms(); // Reset default photo permissions to public \Zotlabs\Daemon\Master::Summon(array('Directory',local_channel())); goaway(z_root() . '/profiles'); } -- cgit v1.2.3 From ab628eb2a348590ff3185554240e05d4f51a0b8d Mon Sep 17 00:00:00 2001 From: Ben Roberts Date: Wed, 22 Jun 2016 23:59:27 -0400 Subject: microformats 2 for posts --- view/tpl/conv_item.tpl | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 817a03028..9c879e109 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -4,7 +4,7 @@