unsafe chars in admin, add img to diaspora markdown processor

diff --git a/boot.php b/boot.php
index 46f1e318c05d8b950498274c2bb9da0e58d0cfc5..5c5dc18614cbe1b977e68ba5b34cbe1ee8f88c89 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -7,7 +7,7 @@ require_once('include/text.php');
 require_once("include/pgettext.php");
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1087' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1088' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1084      );
 

diff --git a/include/bb2diaspora.php b/include/bb2diaspora.php
index 7f7b8748d38d42a5e1a02d4410491a47a5f32f67..066d7bfffee5e8635d7726bb58f7f19a1bf4d05a 100644 (file)
--- a/include/bb2diaspora.php
+++ b/include/bb2diaspora.php
@@ -17,6 +17,7 @@ function diaspora2bb($s) {
        $s = preg_replace("/\_(.+?)\_/", '[i]$1[/i]', $s);
        $s = str_replace(array('-^doublestar^-','-^doublescore-^','-^star^-','-^score^-'), array('**','__','*','_'), $s);
        $s = preg_replace('/\[(.+?)\]\((.+?)\)/','[url=$2]$1[/url]',$s);
+       $s = preg_replace('/\!\[(.+?)\]\((.+?)\)/','[img]$2[/img]',$s);
 
        $s = escape_tags($s);
        return $s;

diff --git a/mod/admin.php b/mod/admin.php
index 7799e64ab1a9fb1e468287a16835f5fe6be9a326..72544ee701ee0d733b24a5fe86845a853d2787f7 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -344,7 +344,7 @@ function admin_page_site(&$a) {
  * Users admin page
  */
 function admin_page_users_post(&$a){
-       $pending = ( x(£_POST, 'pending') ? $_POST['pending'] : Array() );
+       $pending = ( x($_POST, 'pending') ? $_POST['pending'] : Array() );
        $users = ( x($_POST, 'user') ? $_POST['user'] : Array() );
        
        if (x($_POST,'page_users_block')){