diff options
| author | friendica <info@friendica.com> | 2012-08-29 23:03:03 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-08-29 23:03:03 -0700 |
| commit | f6d198ce5dcd9fe416975ff760439dfacbb83812 (patch) | |
| tree | 77be24f7ab74dfcd62c2e621eb6f7568a78d8de6 /include | |
| parent | da49a27aa24b6a85b2623134884d933dc04e201b (diff) | |
| download | volse-hubzilla-f6d198ce5dcd9fe416975ff760439dfacbb83812.tar.gz volse-hubzilla-f6d198ce5dcd9fe416975ff760439dfacbb83812.tar.bz2 volse-hubzilla-f6d198ce5dcd9fe416975ff760439dfacbb83812.zip | |
trim a bit of fat
Diffstat (limited to 'include')
| -rw-r--r-- | include/bbcode.php | 6 | ||||
| -rw-r--r-- | include/security.php | 8 | ||||
| -rw-r--r-- | include/text.php | 7 |
3 files changed, 10 insertions, 11 deletions
diff --git a/include/bbcode.php b/include/bbcode.php index f43d2f547..8ee6a4ee0 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -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); diff --git a/include/security.php b/include/security.php index 5302639d4..4141d0948 100644 --- a/include/security.php +++ b/include/security.php @@ -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); } diff --git a/include/text.php b/include/text.php index 79b4bba39..a1b718d44 100644 --- a/include/text.php +++ b/include/text.php @@ -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)); +}
\ No newline at end of file |