friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

fix some changes lost from another branch

This commit is contained in:
friendica 2012-01-26 23:03:27 -08:00
parent 8fe5168259
commit 3197a6e8aa
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
include/bb2diaspora.php
View File

@ -20,9 +20,6 @@ function diaspora2bb($s) {
$s = html2bbcode($s); $s = html2bbcode($s);
// $s = str_replace('*','*',$s); // $s = str_replace('*','*',$s);
// we seem to get a lot of text smushed together with links from Diaspora.
// if it's a url that we haven't already parsed into a bbcode structure, put a space before it.
$s = preg_replace("/([^=\"\]])(https?:\/\/)/ism",'$1 $2',$s);
$s = preg_replace("/\[url\=?(.*?)\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/url\]/ism",'[youtube]$2[/youtube]',$s); $s = preg_replace("/\[url\=?(.*?)\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/url\]/ism",'[youtube]$2[/youtube]',$s);
$s = preg_replace("/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism",'[youtube]$1[/youtube]',$s); $s = preg_replace("/\[url\=https?:\/\/www.youtube.com\/watch\?v\=(.*?)\].*?\[\/url\]/ism",'[youtube]$1[/youtube]',$s);
@ -32,6 +29,12 @@ function diaspora2bb($s) {
// remove duplicate adjacent code tags // remove duplicate adjacent code tags
$s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism","[code]$2[/code]", $s); $s = preg_replace("/(\[code\])+(.*?)(\[\/code\])+/ism","[code]$2[/code]", $s);
$s = scale_diaspora_images($s); $s = scale_diaspora_images($s);
// we seem to get a lot of text smushed together with links from Diaspora.
$s = preg_replace('/[^ ]\[url\=(.*?)\]/',' [url=$1]' ,$s);
$s = preg_replace('/\[\/url\][^ ]/','[/url] ',$s);
return $s; return $s;
} }

3
mod/delegate.php
View File

@ -54,8 +54,7 @@ function delegate_content(&$a) {
// These people can manage this account/page with full privilege // These people can manage this account/page with full privilege
$r = q("SELECT * FROM `user` WHERE `uid` = %d AND `email` = '%s' AND `password` = '%s' LIMIT 1", $r = q("SELECT * FROM `user` WHERE `email` = '%s' AND `password` = '%s' ",
intval(local_user()),
dbesc($a->user['email']), dbesc($a->user['email']),
dbesc($a->user['password']) dbesc($a->user['password'])
); );

6
view/delegate.tpl
View File

@ -9,7 +9,7 @@
<div class="contact-block-div"> <div class="contact-block-div">
<a class="contact-block-link" href="#" > <a class="contact-block-link" href="#" >
<img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username" /> <img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username ($x.nickname)" />
</a> </a>
</div> </div>
@ -26,7 +26,7 @@
<div class="contact-block-div"> <div class="contact-block-div">
<a class="contact-block-link" href="$base/delegate/remove/$x.uid" > <a class="contact-block-link" href="$base/delegate/remove/$x.uid" >
<img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username" /> <img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username ($x.nickname)" />
</a> </a>
</div> </div>
@ -44,7 +44,7 @@ $none
<div class="contact-block-div"> <div class="contact-block-div">
<a class="contact-block-link" href="$base/delegate/add/$x.uid" > <a class="contact-block-link" href="$base/delegate/add/$x.uid" >
<img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username" /> <img class="contact-block-img" src="$base/photo/thumb/$x.uid" title="$x.username ($x.nickname)" />
</a> </a>
</div> </div>