diff options
| -rwxr-xr-x | .gitignore | 2 | ||||
| -rwxr-xr-x | include/diaspora.php | 8 | ||||
| -rw-r--r-- | include/follow.php | 8 | ||||
| -rw-r--r-- | include/identity.php | 11 | ||||
| -rw-r--r-- | include/zot.php | 8 | ||||
| -rw-r--r-- | mod/dirsearch.php | 8 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/theme/redbasic/css/style.css | 24 | ||||
| -rw-r--r-- | view/theme/redbasic/php/style.php | 15 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/boxy.css | 11 | ||||
| -rw-r--r-- | view/theme/redbasic/schema/boxy.php | 15 | ||||
| -rwxr-xr-x | view/tpl/profile_vcard.tpl | 2 |
12 files changed, 60 insertions, 54 deletions
diff --git a/.gitignore b/.gitignore index 8ded8b44a..b01074eaa 100755 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ *.lock *.kate-swp #Ignore emacs tempfiles -.#* +\#* # patch attempts *.orig *.rej diff --git a/include/diaspora.php b/include/diaspora.php index 553c7474c..7295b4261 100755 --- a/include/diaspora.php +++ b/include/diaspora.php @@ -709,13 +709,19 @@ function diaspora_request($importer,$xml) { $their_perms = PERMS_R_STREAM|PERMS_R_PROFILE|PERMS_R_PHOTOS|PERMS_R_ABOOK|PERMS_W_STREAM|PERMS_W_COMMENT|PERMS_W_MAIL|PERMS_W_CHAT|PERMS_R_STORAGE|PERMS_R_PAGES; + + $closeness = get_pconfig($importer['channel_id'],'system','new_abook_closeness'); + if($closeness === false) + $closeness = 80; + + $r = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_my_perms, abook_their_perms, abook_closeness, abook_rating, abook_created, abook_updated, abook_connected, abook_dob, abook_flags) values ( %d, %d, '%s', %d, %d, %d, %d, '%s', '%s', '%s', '%s', %d )", intval($importer['channel_account_id']), intval($importer['channel_id']), dbesc($ret['xchan_hash']), intval($default_perms), intval($their_perms), - intval(99), + intval($closeness), intval(0), dbesc(datetime_convert()), dbesc(datetime_convert()), diff --git a/include/follow.php b/include/follow.php index 2d6791420..e13b5f775 100644 --- a/include/follow.php +++ b/include/follow.php @@ -227,10 +227,16 @@ function new_contact($uid,$url,$channel,$interactive = false, $confirm = false) ); } else { - $r = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_flags, abook_their_perms, abook_my_perms, abook_created, abook_updated ) + + $closeness = get_pconfig($uid,'system','new_abook_closeness'); + if($closeness === false) + $closeness = 80; + + $r = q("insert into abook ( abook_account, abook_channel, abook_closeness, abook_xchan, abook_flags, abook_their_perms, abook_my_perms, abook_created, abook_updated ) values( %d, %d, '%s', %d, %d, %d, '%s', '%s' ) ", intval($aid), intval($uid), + intval($closeness), dbesc($xchan_hash), intval(($is_http) ? ABOOK_FLAG_FEED : 0), intval(($is_http) ? $their_perms|PERMS_R_STREAM|PERMS_A_REPUBLISH : $their_perms), diff --git a/include/identity.php b/include/identity.php index f63b576b2..079c1a245 100644 --- a/include/identity.php +++ b/include/identity.php @@ -724,12 +724,13 @@ function profile_load(&$a, $nickname, $profile = '') { $p[0]['extra_fields'] = $extra_fields; - $z = q("select xchan_photo_date from xchan where xchan_hash = '%s' limit 1", + $z = q("select xchan_photo_date, xchan_addr from xchan where xchan_hash = '%s' limit 1", dbesc($p[0]['channel_hash']) ); - if($z) + if($z) { $p[0]['picdate'] = $z[0]['xchan_photo_date']; - + $p[0]['reddress'] = str_replace('@','＠',$z[0]['xchan_addr']); + } // fetch user tags if this isn't the default profile @@ -817,6 +818,7 @@ function profile_sidebar($profile, $block = 0, $show_connect = true) { $location = false; $address = false; $pdesc = true; + $reddress = true; if((! is_array($profile)) && (! count($profile))) return $o; @@ -906,7 +908,7 @@ logger('online: ' . $profile['online']); } if(($profile['hidewall'] && (! local_channel()) && (! remote_channel())) || $block ) { - $location = $pdesc = $gender = $marital = $homepage = $online = False; + $location = $reddress = $pdesc = $gender = $marital = $homepage = $online = False; } $firstname = ((strpos($profile['channel_name'],' ')) @@ -957,6 +959,7 @@ logger('online: ' . $profile['online']); '$homepage' => $homepage, '$chanmenu' => $channel_menu, '$diaspora' => $diaspora, + '$reddress' => $reddress, '$rating' => $z, '$contact_block' => $contact_block, )); diff --git a/include/zot.php b/include/zot.php index 670583929..c9019ca7a 100644 --- a/include/zot.php +++ b/include/zot.php @@ -464,9 +464,15 @@ function zot_refresh($them,$channel = null, $force = false) { // Keep original perms to check if we need to notify them $previous_perms = get_all_perms($channel['channel_id'],$x['hash']); - $y = q("insert into abook ( abook_account, abook_channel, abook_xchan, abook_their_perms, abook_my_perms, abook_created, abook_updated, abook_dob, abook_flags ) values ( %d, %d, '%s', %d, %d, '%s', '%s', '%s', %d )", + + $closeness = get_pconfig($channel['channel_id'],'system','new_abook_closeness'); + if($closeness === false) + $closeness = 80; + + $y = q("insert into abook ( abook_account, abook_channel, abook_closeness, abook_xchan, abook_their_perms, abook_my_perms, abook_created, abook_updated, abook_dob, abook_flags ) values ( %d, %d, '%s', %d, %d, '%s', '%s', '%s', %d )", intval($channel['channel_account_id']), intval($channel['channel_id']), + intval($closeness), dbesc($x['hash']), intval($their_perms), intval($default_perms), diff --git a/mod/dirsearch.php b/mod/dirsearch.php index e734423a6..b4154c1eb 100644 --- a/mod/dirsearch.php +++ b/mod/dirsearch.php @@ -12,6 +12,8 @@ function dirsearch_content(&$a) { $ret = array('success' => false); +// logger('request: ' . print_r($_REQUEST,true)); + $dirmode = intval(get_config('system','directory_mode')); @@ -119,7 +121,7 @@ function dirsearch_content(&$a) { $sql_extra .= dir_query_build($joiner,'xprof_keywords',$keywords); if($forums) - $sql_extra .= dir_flag_build(' AND ','xchan_flags',XCHAN_FLAGS_PUBFORUM, $forums); + $safesql .= dir_flag_build(' AND ','xchan_flags',XCHAN_FLAGS_PUBFORUM, $forums); // we only support an age range currently. You must set both agege @@ -165,9 +167,9 @@ function dirsearch_content(&$a) { } - $safesql = (($safe > 0) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 " : ''); + $safesql .= (($safe > 0) ? " and not ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 " : ''); if($safe < 0) - $safesql = " and ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 "; + $safesql .= " and ( xchan_flags & " . intval(XCHAN_FLAGS_CENSORED|XCHAN_FLAGS_SELFCENSORED) . " )>0 "; if($limit) $qlimit = " LIMIT $limit "; diff --git a/version.inc b/version.inc index 8780222d0..c02f7674a 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-03-06.963 +2015-03-08.965 diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 69a78f610..576eba5f6 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1688,25 +1688,22 @@ img.mail-list-sender-photo { border-radius: $radiuspx; } -.comment .wall-item-body { - padding-left: $comment_padding; -} - .wall-item-content-wrapper.comment { background-color: $comment_item_colour; - border-left: $comment_border_left $comment_border_colour; - border-right: $comment_border_right $comment_border_colour; - border-bottom: $comment_border_bottom $comment_border_colour; + border-color: $comment_border_colour; + border-style: solid; + border-width: 0px 0px 0px 3px; border-radius: 0px; padding: 7px 10px 7px 7px; } .hide-comments-outer { background-color: $comment_item_colour; - border-left: $comment_border_left $comment_border_colour; - border-right: $comment_border_right $comment_border_colour; - border-bottom: $comment_border_bottom $comment_border_colour; - border-top: 1px dashed #ccc; + border-color: $comment_border_colour; + border-top-color: #ccc; + border-style: solid; + border-top-style: dashed; + border-width: 1px 0px 0px 3px; text-align: center; border-radius: 0px; } @@ -2300,6 +2297,10 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { display: none; } +.field.checkbox:hover label { + color: $link_colour; +} + .field.checkbox > div label { display: block; overflow: hidden; cursor: pointer; border: 1px solid #ccc; @@ -2322,6 +2323,7 @@ aside .nav > li > a:hover, aside .nav > li > a:focus { content: attr(data-on); padding-right: 21px; background-color: $item_colour; + color: $font_colour; text-align: right; } diff --git a/view/theme/redbasic/php/style.php b/view/theme/redbasic/php/style.php index 30d5f0a16..a3234862a 100644 --- a/view/theme/redbasic/php/style.php +++ b/view/theme/redbasic/php/style.php @@ -282,16 +282,6 @@ if(! $a->install) { $chat_txtbgcol = "#EEE"; if(! $fancybox_bgcolour) $fancybox_bgcolour = "#FFFFFF"; - if (!$comment_padding) - $comment_padding="0px"; - if (!$comment_border_left) - $comment_border_left="3px solid"; - if (!$comment_border_right) - $comment_border_right="0px solid"; - if (!$comment_border_top) - $comment_border_top="0px solid"; - if (!$comment_border_bottom) - $comment_border_bottom="0px solid"; if (!$admintable_hoverbgcol) $admintable_hoverbgcol="#BBC7D7"; if (!$dirpopup_txtcol) @@ -352,7 +342,6 @@ $options = array ( '$selected_active_colour' => $selected_active_colour, '$selected_active_deco' => $selected_active_deco, '$body_font_size' => $body_font_size, -'$widget_brdrcolour' => $widget_brdrcolour, '$blockquote_colour' => $blockquote_colour, '$blockquote_bgcolour' => $blockquote_bgcolour, '$blockquote_bordercolour' => $blockquote_bordercolour, @@ -425,10 +414,6 @@ $options = array ( '$comment_indent' => $comment_indent, '$body_width' => $body_width, '$comment_padding' => $comment_padding, -'$comment_border_left' => $comment_border_left, -'$comment_border_right' => $comment_border_right, -'$comment_border_top' => $comment_border_top, -'$comment_border_bottom' => $comment_border_bottom, '$admintable_hoverbgcol' => $admintable_hoverbgcol, '$dirpopup_txtcol' => $dirpopup_txtcol, '$dirpopup_linkcol' => $dirpopup_linkcol, diff --git a/view/theme/redbasic/schema/boxy.css b/view/theme/redbasic/schema/boxy.css index e69de29bb..f3da9b262 100644 --- a/view/theme/redbasic/schema/boxy.css +++ b/view/theme/redbasic/schema/boxy.css @@ -0,0 +1,11 @@ +.comment .wall-item-body { + padding-left: 42px; +} + +.wall-item-content-wrapper.comment { + border-width: 0px 1px 1px 1px; +} + +.hide-comments-outer { + border-width: 1px 1px 1px 1px; +} diff --git a/view/theme/redbasic/schema/boxy.php b/view/theme/redbasic/schema/boxy.php index 1de2f98cd..d609ccd25 100644 --- a/view/theme/redbasic/schema/boxy.php +++ b/view/theme/redbasic/schema/boxy.php @@ -1,19 +1,4 @@ <?php -if (!$comment_padding) - $comment_padding="42px"; - -if (!$comment_border_left) - $comment_border_left="1px solid"; - -if (!$comment_border_right) - $comment_border_right="1px solid"; - -if (!$comment_border_top) - $comment_border_top="1px solid"; - -if (!$comment_border_bottom) - $comment_border_bottom="1px solid"; if (! $radiuspx) $radiuspx = "4"; -
\ No newline at end of file diff --git a/view/tpl/profile_vcard.tpl b/view/tpl/profile_vcard.tpl index cae920c5d..2964d9c4b 100755 --- a/view/tpl/profile_vcard.tpl +++ b/view/tpl/profile_vcard.tpl @@ -16,7 +16,7 @@ {{/if}} <div class="fn">{{$profile.name}}{{if $profile.online}} <i class="icon-asterisk online-now" title="{{$profile.online}}"></i>{{/if}}</div> - + {{if $reddress}}<div class="reddress" oncopy="return false;">{{$profile.reddress}}</div>{{/if}} {{if $pdesc}}<div class="title">{{$profile.pdesc}}</div>{{/if}} <div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="{{$profile.photo}}?rev={{$profile.picdate}}" alt="{{$profile.name}}"></div> |