diff --git a/include/bbcode.php b/include/bbcode.php index 8ee6a4ee0..e204e1cb4 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -171,7 +171,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { // Perform URL Search - $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1$2', $Text); + $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\%\$\!\+\,]+)/ism", '$1$2', $Text); if ($tryoembed) $Text = preg_replace_callback("/\[bookmark\=([^\]]*)\].*?\[\/bookmark\]/ism",'tryoembed',$Text); @@ -181,8 +181,8 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) { if ($tryoembed) $Text = preg_replace_callback("/\[url\]([$URLSearchString]*)\[\/url\]/ism",'tryoembed',$Text); - $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '$1', $Text); - $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$2', $Text); + $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/ism", '$1', $Text); + $Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '$2', $Text); //$Text = preg_replace("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", '$2', $Text); // Perform MAIL Search diff --git a/include/text.php b/include/text.php index c57d8a50a..eba0f5859 100644 --- a/include/text.php +++ b/include/text.php @@ -596,7 +596,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { if($textmode) { return '
'. $contact['name'] . '
' . "\r\n"; @@ -604,7 +604,7 @@ function micropro($contact, $redirect = false, $class = '', $textmode = false) { else { return '
' . $contact['name'] . '
' . "\r\n"; @@ -648,7 +648,7 @@ function valid_email($x){ if(! function_exists('linkify')) { function linkify($s) { - $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\'\%\$\!\+]*)/", ' $1', $s); + $s = preg_replace("/(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\;\.\=\_\~\#\'\%\$\!\+]*)/", ' $1', $s); $s = preg_replace("/\<(.*?)(src|href)=(.*?)\&\;(.*?)\>/ism",'<$1$2=$3&$4>',$s); return($s); }} @@ -940,7 +940,7 @@ function prepare_body($item,$attach = false) { else $the_url = $mtch[1]; - $s .= '' . $icon . ''; + $s .= '' . $icon . ''; } } } diff --git a/mod/zperms.php b/mod/zperms.php new file mode 100644 index 000000000..c15f4dccf --- /dev/null +++ b/mod/zperms.php @@ -0,0 +1,81 @@ + false); + + $zguid = ((x($_REQUEST,'guid')) ? $_REQUEST['guid'] : ''); + $zaddr = ((x($_REQUEST,'address')) ? $_REQUEST['address'] : ''); + $ztarget = ((x($_REQUEST,'target')) ? $_REQUEST['target'] : ''); + + $r = null; + + if(strlen($zguid)) { + $r = q("select * from entity where entity_global_id = '%s' limit 1", + dbesc($zguid) + ); + } + elseif(strlen($zaddr)) { + $r = q("select * from entity where entity_address = '%s' limit 1", + dbesc($zaddr) + ); + } + else { + $ret['message'] = 'Invalid request'; + json_return_and_die($ret); + } + + if(! ($r && count($r))) { + $ret['message'] = 'Item not found.'; + json_return_and_die($ret); + } + + + $e = $r[0]; + + $id = $e['entity_id']; + $r = q("select contact.*, profile.* + from contact left join profile on contact.uid = profile.uid + where contact.uid = %d && contact.self = 1 and profile.is_default = 1 limit 1", + intval($id) + ); + if($r && count($r)) { + $profile = $r[0]; + } + + + $ret['success'] = true; + + // Communication details + + $ret['guid'] = $e['entity_global_id']; + $ret['guid_sig'] = base64url_encode(rsa_sign($e['entity_global_id'],$e['entity_prvkey'])); + $ret['key'] = $e['entity_pubkey']; + $ret['name'] = $e['entity_name']; + $ret['address'] = $e['entity_address']; + + $ret['profile'] = $profile; + + // array of (verified) hubs this entity uses + + $ret['hubs'] = array(); + $x = zot_get_hubloc(array($e['entity_global_id'])); + if($x && count($x)) { + foreach($x as $hub) { + if(! ($hub['hubloc_flags'] & HUBLOC_FLAGS_UNVERIFIED)) { + $ret['hubs'][] = array( + 'primary' => (($hub['hubloc_flags'] & HUBLOC_FLAGS_PRIMARY) ? true : false), + 'url' => $hub['hubloc_url'], + 'url_sig' => base64url_encode(rsa_sign($hub['hubloc_url'],$e['entity_prvkey'])), + 'callback' => $hub['hubloc_callback'], + 'sitekey' => $hub['hubloc_sitekey'] + ); + } + } + } + + json_return_and_die($ret); + +} \ No newline at end of file diff --git a/view/theme/comix-plain/search_item.tpl b/view/theme/comix-plain/search_item.tpl index 828e1065b..695ac296d 100644 --- a/view/theme/comix-plain/search_item.tpl +++ b/view/theme/comix-plain/search_item.tpl @@ -4,7 +4,7 @@
- + $item.name menu
@@ -21,7 +21,7 @@
- $item.name + $item.name
$item.ago
diff --git a/view/theme/comix-plain/tpl/search_item.tpl b/view/theme/comix-plain/tpl/search_item.tpl index dba289031..f46f3b1bd 100644 --- a/view/theme/comix-plain/tpl/search_item.tpl +++ b/view/theme/comix-plain/tpl/search_item.tpl @@ -4,7 +4,7 @@
- + $item.name menu
@@ -21,7 +21,7 @@
- $item.name + $item.name
$item.ago
diff --git a/view/theme/comix-plain/tpl/wall_item.tpl b/view/theme/comix-plain/tpl/wall_item.tpl index dfcd8ca96..ad09b2be2 100644 --- a/view/theme/comix-plain/tpl/wall_item.tpl +++ b/view/theme/comix-plain/tpl/wall_item.tpl @@ -4,7 +4,7 @@
- + $item.name menu @@ -22,7 +22,7 @@
- $item.name + $item.name
$item.ago
@@ -47,7 +47,7 @@ {{ endif }} {{ if $item.plink }} -
+
{{ endif }} {{ if $item.edpost }} diff --git a/view/theme/comix-plain/tpl/wallwall_item.tpl b/view/theme/comix-plain/tpl/wallwall_item.tpl index abd5967b2..9f81b467f 100644 --- a/view/theme/comix-plain/tpl/wallwall_item.tpl +++ b/view/theme/comix-plain/tpl/wallwall_item.tpl @@ -2,14 +2,14 @@
$item.wall
- + $item.name menu
@@ -27,7 +27,7 @@
- $item.name $item.to $item.owner_name $item.vwall
+ $item.name $item.to $item.owner_name $item.vwall
$item.ago
@@ -51,7 +51,7 @@
{{ endif }} {{ if $item.plink }} -
+
{{ endif }} {{ if $item.edpost }} diff --git a/view/theme/comix-plain/wall_item.tpl b/view/theme/comix-plain/wall_item.tpl index 0ef70cf8b..3208a1abd 100644 --- a/view/theme/comix-plain/wall_item.tpl +++ b/view/theme/comix-plain/wall_item.tpl @@ -4,7 +4,7 @@
- + $item.name menu @@ -22,7 +22,7 @@
- $item.name + $item.name
$item.ago
@@ -47,7 +47,7 @@
{{ endif }} {{ if $item.plink }} -
+
{{ endif }} {{ if $item.edpost }} diff --git a/view/theme/comix-plain/wallwall_item.tpl b/view/theme/comix-plain/wallwall_item.tpl index 4c5b12087..fb01d96b2 100644 --- a/view/theme/comix-plain/wallwall_item.tpl +++ b/view/theme/comix-plain/wallwall_item.tpl @@ -2,14 +2,14 @@
$item.wall
- + $item.name menu
@@ -27,7 +27,7 @@
- $item.name $item.to $item.owner_name $item.vwall
+ $item.name $item.to $item.owner_name $item.vwall
$item.ago
@@ -51,7 +51,7 @@
{{ endif }} {{ if $item.plink }} -
+
{{ endif }} {{ if $item.edpost }} diff --git a/view/theme/comix/search_item.tpl b/view/theme/comix/search_item.tpl index 828e1065b..695ac296d 100644 --- a/view/theme/comix/search_item.tpl +++ b/view/theme/comix/search_item.tpl @@ -4,7 +4,7 @@
- + $item.name menu
@@ -21,7 +21,7 @@
- $item.name + $item.name
$item.ago
diff --git a/view/theme/comix/tpl/search_item.tpl b/view/theme/comix/tpl/search_item.tpl index dba289031..f46f3b1bd 100644 --- a/view/theme/comix/tpl/search_item.tpl +++ b/view/theme/comix/tpl/search_item.tpl @@ -4,7 +4,7 @@
- + $item.name menu
@@ -21,7 +21,7 @@
- $item.name + $item.name
$item.ago
diff --git a/view/theme/comix/tpl/wall_item.tpl b/view/theme/comix/tpl/wall_item.tpl index dfcd8ca96..ad09b2be2 100644 --- a/view/theme/comix/tpl/wall_item.tpl +++ b/view/theme/comix/tpl/wall_item.tpl @@ -4,7 +4,7 @@
- + $item.name menu @@ -22,7 +22,7 @@
- $item.name + $item.name
$item.ago
@@ -47,7 +47,7 @@
{{ endif }} {{ if $item.plink }} -
+
{{ endif }} {{ if $item.edpost }} diff --git a/view/theme/comix/tpl/wallwall_item.tpl b/view/theme/comix/tpl/wallwall_item.tpl index abd5967b2..9f81b467f 100644 --- a/view/theme/comix/tpl/wallwall_item.tpl +++ b/view/theme/comix/tpl/wallwall_item.tpl @@ -2,14 +2,14 @@
$item.wall
- + $item.name menu
@@ -27,7 +27,7 @@
- $item.name $item.to $item.owner_name $item.vwall
+ $item.name $item.to $item.owner_name $item.vwall
$item.ago
@@ -51,7 +51,7 @@
{{ endif }} {{ if $item.plink }} -
+
{{ endif }} {{ if $item.edpost }} diff --git a/view/theme/comix/wall_item.tpl b/view/theme/comix/wall_item.tpl index 0ef70cf8b..3208a1abd 100644 --- a/view/theme/comix/wall_item.tpl +++ b/view/theme/comix/wall_item.tpl @@ -4,7 +4,7 @@
- + $item.name menu @@ -22,7 +22,7 @@
- $item.name + $item.name
$item.ago
@@ -47,7 +47,7 @@
{{ endif }} {{ if $item.plink }} -
+
{{ endif }} {{ if $item.edpost }} diff --git a/view/theme/comix/wallwall_item.tpl b/view/theme/comix/wallwall_item.tpl index 4c5b12087..fb01d96b2 100644 --- a/view/theme/comix/wallwall_item.tpl +++ b/view/theme/comix/wallwall_item.tpl @@ -2,14 +2,14 @@
$item.wall
- + $item.name menu
@@ -27,7 +27,7 @@
- $item.name $item.to $item.owner_name $item.vwall
+ $item.name $item.to $item.owner_name $item.vwall
$item.ago
@@ -51,7 +51,7 @@
{{ endif }} {{ if $item.plink }} -
+
{{ endif }} {{ if $item.edpost }} diff --git a/view/theme/diabook/directory_item.tpl b/view/theme/diabook/directory_item.tpl index d2ed0ee8f..fd8bf4e4c 100644 --- a/view/theme/diabook/directory_item.tpl +++ b/view/theme/diabook/directory_item.tpl @@ -32,7 +32,7 @@
{{ if $marital }}
♥$marital
$profile.marital
{{ endif }} - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} + {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }}
diff --git a/view/theme/diabook/mail_conv.tpl b/view/theme/diabook/mail_conv.tpl index 989f17878..31ae289ae 100644 --- a/view/theme/diabook/mail_conv.tpl +++ b/view/theme/diabook/mail_conv.tpl @@ -2,7 +2,7 @@
@@ -22,7 +22,7 @@
- $mail.from_name $mail.date + $mail.from_name $mail.date
diff --git a/view/theme/diabook/photo_item.tpl b/view/theme/diabook/photo_item.tpl index 5d65a89b7..ea63e61da 100644 --- a/view/theme/diabook/photo_item.tpl +++ b/view/theme/diabook/photo_item.tpl @@ -8,7 +8,7 @@
- + $name menu @@ -19,7 +19,7 @@
- $name + $name - {{ if $plink }}$ago{{ else }} $ago {{ endif }} {{ if $lock }} - $lock {{ endif }} diff --git a/view/theme/diabook/profile_vcard.tpl b/view/theme/diabook/profile_vcard.tpl index 825145825..c30f4b3fc 100644 --- a/view/theme/diabook/profile_vcard.tpl +++ b/view/theme/diabook/profile_vcard.tpl @@ -46,7 +46,7 @@ {{ if $marital }}
♥$marital
$profile.marital
{{ endif }} - {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} + {{ if $homepage }}
$homepage
$profile.homepage
{{ endif }} {{ inc diaspora_vcard.tpl }}{{ endinc }} diff --git a/view/theme/diabook/search_item.tpl b/view/theme/diabook/search_item.tpl index 123834064..2266fc8b4 100644 --- a/view/theme/diabook/search_item.tpl +++ b/view/theme/diabook/search_item.tpl @@ -9,7 +9,7 @@
- + $item.name menu @@ -20,7 +20,7 @@
- $item.name + $item.name - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} {{ if $item.lock }} - $item.lock {{ endif }} diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 718db2ccf..5c316e8ec 100644 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -662,7 +662,7 @@ if ($color=="dark") $color_path = "/diabook-dark/"; $contacts = $pageD; foreach($contacts as $contact) { - $page .= '
  • ' . $contact['url'] . ' '. + $page .= '
  • ' . $contact['url'] . ' '. $contact["name"]."
    • "; } $page .= '
    '; diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index 5b9de2968..c131d2cad 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -9,7 +9,7 @@
    - + $item.name menu @@ -20,7 +20,7 @@
    - $item.name + $item.name - {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} {{ if $item.lock }} - $item.lock {{ endif }} diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl index b2c980c78..814080277 100644 --- a/view/theme/diabook/wallwall_item.tpl +++ b/view/theme/diabook/wallwall_item.tpl @@ -7,14 +7,14 @@
    - + $item.name menu @@ -25,8 +25,8 @@
    - $item.name - $item.to $item.owner_name + $item.name + $item.to $item.owner_name $item.vwall -   {{ if $item.plink }}$item.ago{{ else }} $item.ago {{ endif }} {{ if $item.lock }} - $item.lock {{ endif }} diff --git a/view/theme/dispy/profile_vcard.tpl b/view/theme/dispy/profile_vcard.tpl index b7c99edd9..5d9a3924c 100644 --- a/view/theme/dispy/profile_vcard.tpl +++ b/view/theme/dispy/profile_vcard.tpl @@ -64,7 +64,7 @@
    $homepage $profile.homepage + >$profile.homepage
    {{ endif }} {{ inc diaspora_vcard.tpl }}{{ endinc }} diff --git a/view/theme/dispy/search_item.tpl b/view/theme/dispy/search_item.tpl index 35572caa0..986e698ce 100644 --- a/view/theme/dispy/search_item.tpl +++ b/view/theme/dispy/search_item.tpl @@ -4,7 +4,7 @@
    - + $item.name menu
    @@ -21,7 +21,7 @@
    - $item.name + $item.name
    $item.ago
    diff --git a/view/theme/dispy/wall_item.tpl b/view/theme/dispy/wall_item.tpl index d5cc7f16c..6e6761f8f 100644 --- a/view/theme/dispy/wall_item.tpl +++ b/view/theme/dispy/wall_item.tpl @@ -5,7 +5,7 @@
    - $item.name + $item.name menu
      @@ -52,7 +52,7 @@
      • {{ endif }} {{ if $item.plink }} -
      • +
      • {{ endif }} {{ if $item.edpost }}
      • diff --git a/view/theme/dispy/wallwall_item.tpl b/view/theme/dispy/wallwall_item.tpl index 63c8a2e96..fa79d256e 100644 --- a/view/theme/dispy/wallwall_item.tpl +++ b/view/theme/dispy/wallwall_item.tpl @@ -3,14 +3,14 @@
      $item.wall
      - + $item.name menu
      @@ -59,7 +59,7 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
      • {{ endif }} {{ if $item.plink }} -
      • +
      • {{ endif }} {{ if $item.edpost }}
      • diff --git a/view/theme/duepuntozero/tpl/profile_vcard.tpl b/view/theme/duepuntozero/tpl/profile_vcard.tpl index bcb5baeeb..0b5c76e88 100644 --- a/view/theme/duepuntozero/tpl/profile_vcard.tpl +++ b/view/theme/duepuntozero/tpl/profile_vcard.tpl @@ -29,7 +29,7 @@ {{ if $marital }}
      ♥$marital
      $profile.marital
      {{ endif }} - {{ if $homepage }}
      $homepage
      $profile.homepage
      {{ endif }} + {{ if $homepage }}
      $homepage
      $profile.homepage
      {{ endif }} {{ inc diaspora_vcard.tpl }}{{ endinc }} diff --git a/view/theme/quattro/tpl/mail_conv.tpl b/view/theme/quattro/tpl/mail_conv.tpl index 989f17878..31ae289ae 100644 --- a/view/theme/quattro/tpl/mail_conv.tpl +++ b/view/theme/quattro/tpl/mail_conv.tpl @@ -2,7 +2,7 @@
      @@ -22,7 +22,7 @@
      - $mail.from_name $mail.date + $mail.from_name $mail.date
      diff --git a/view/theme/quattro/tpl/profile_vcard.tpl b/view/theme/quattro/tpl/profile_vcard.tpl index 5d7e92131..42cd0b3b2 100644 --- a/view/theme/quattro/tpl/profile_vcard.tpl +++ b/view/theme/quattro/tpl/profile_vcard.tpl @@ -45,7 +45,7 @@ {{ if $marital }}
      ♥$marital
      $profile.marital
      {{ endif }} - {{ if $homepage }}
      $homepage
      $profile.homepage
      {{ endif }} + {{ if $homepage }}
      $homepage
      $profile.homepage
      {{ endif }} {{ inc diaspora_vcard.tpl }}{{ endinc }} diff --git a/view/theme/quattro/tpl/search_item.tpl b/view/theme/quattro/tpl/search_item.tpl index 80d6678fb..605b0086d 100644 --- a/view/theme/quattro/tpl/search_item.tpl +++ b/view/theme/quattro/tpl/search_item.tpl @@ -11,7 +11,7 @@
      - + $item.name menu @@ -42,7 +42,7 @@
      - $item.name $item.ago + $item.name $item.ago
      diff --git a/view/theme/quattro/tpl/wall_item.tpl b/view/theme/quattro/tpl/wall_item.tpl index 411879def..52ba6ede9 100644 --- a/view/theme/quattro/tpl/wall_item.tpl +++ b/view/theme/quattro/tpl/wall_item.tpl @@ -11,7 +11,7 @@
      - + $item.name menu @@ -42,7 +42,7 @@
      - $item.name $item.ago + $item.name $item.ago
      diff --git a/view/theme/quattro/tpl/wall_item_tag.tpl b/view/theme/quattro/tpl/wall_item_tag.tpl index e1ef93213..14ad7d79c 100644 --- a/view/theme/quattro/tpl/wall_item_tag.tpl +++ b/view/theme/quattro/tpl/wall_item_tag.tpl @@ -4,7 +4,7 @@
      - + $item.name
      - $item.name + $item.name
      $item.ago
      @@ -55,7 +55,7 @@
      {{ endif }} {{ if $item.plink }} -
      +
      {{ endif }} {{ if $item.edpost }} diff --git a/view/tpl/wallwall_item.tpl b/view/tpl/wallwall_item.tpl index e614d936e..9c824fb3b 100644 --- a/view/tpl/wallwall_item.tpl +++ b/view/tpl/wallwall_item.tpl @@ -3,14 +3,14 @@
      $item.wall
      - + $item.name menu
      @@ -28,7 +28,7 @@
      - $item.name $item.to $item.owner_name $item.vwall
      + $item.name $item.to $item.owner_name $item.vwall
      $item.ago{{ if $item.app }}$item.str_app{{ endif }}
      @@ -52,7 +52,7 @@
      {{ endif }} {{ if $item.plink }} -
      +
      {{ endif }} {{ if $item.edpost }} diff --git a/view/tpl/wallwall_thread.tpl b/view/tpl/wallwall_thread.tpl index 15c016c16..ecfb65aef 100644 --- a/view/tpl/wallwall_thread.tpl +++ b/view/tpl/wallwall_thread.tpl @@ -10,14 +10,14 @@
      $item.wall
      - + $item.name menu
      @@ -35,7 +35,7 @@
      - $item.name $item.to $item.owner_name $item.vwall
      + $item.name $item.to $item.owner_name $item.vwall
      $item.ago
      @@ -59,7 +59,7 @@
      {{ endif }} {{ if $item.plink }} -
      +
      {{ endif }} {{ if $item.edpost }}