harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

trim a bit of fat

Browse Source
This commit is contained in:
friendica
2012-08-29 23:03:03 -07:00
parent da49a27aa2
commit f6d198ce5d
23 changed files with 86 additions and 1805 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
include/bbcode.php
View File

@@ -185,12 +185,6 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
$Text = preg_replace("/\[url\=([$URLSearchString]*)\](.*?)\[\/url\]/ism", '<a href="$1" target="external-link">$2</a>', $Text);
//$Text = preg_replace("/\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[\/url\]/ism", '<a href="$1" target="_blank">$2</a>', $Text);
// we may need to restrict this further if it picks up too many strays
// link acct:user@host to a webfinger profile redirector
$Text = preg_replace('/acct:(.*?)@(.*?)([ ,])/', '<a href="' . $a->get_baseurl() . '/acctlink?addr=' . "$1@$2"
. '" target="extlink" >acct:' . "$1@$2$3" . '</a>',$Text);
// Perform MAIL Search
$Text = preg_replace("/\[mail\]([$MAILSearchString]*)\[\/mail\]/", '<a href="mailto:$1">$1</a>', $Text);
$Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '<a href="mailto:$1">$2</a>', $Text);

8
include/security.php
View File

@@ -136,11 +136,9 @@ function authenticate_success($user_record, $login_initial = false, $interactive
return;
}
unset($_SESSION['return_url']);
if(($a->module !== 'home') && isset($_SESSION['return_url']) && strlen($_SESSION['return_url'])) {
$return_url = $_SESSION['return_url'];
unset($_SESSION['return_url']);
if(($a->module !== 'home') && x($_SESSION,'login_return_url') && strlen($_SESSION['login_return_url'])) {
$return_url = $_SESSION['login_return_url'];
unset($_SESSION['login_return_url']);
goaway($a->get_baseurl() . '/' . $return_url);
}

7
include/text.php
View File

@@ -1681,3 +1681,10 @@ function check_webbie($arr) {
return '';
}
function ids_to_querystr($arr,$idx = 'id') {
$t = array();
foreach($arr as $x)
$t[] = $x[$idx];
return(implode(',', $t));
}