diff --git a/app/helpers/StringHelper.php b/app/helpers/StringHelper.php index 2a5731c92..1dcc46959 100755 --- a/app/helpers/StringHelper.php +++ b/app/helpers/StringHelper.php @@ -9,54 +9,7 @@ use HeyUpdate\Emoji\EmojiIndex; * @param string $string * @return string */ -function prepareString($string) { - $smileys = - array( - // HFR icons - ":'\(" => 'cry.gif', - ':love:'=> 'love.gif', - 'O:\)' => 'ange.gif', - 'O:-\)' => 'ange.gif', - ':redface:' => 'redface.gif', - ':petrus:' => 'petrus75.gif', - - // famfamfam icons - ':\)\)' => 'grin.png', - ':\)' => 'smiley.png', - ':-\)' => 'smiley.png', - ':\(' => 'sad.png', - ':o' => 'shocked.png', - ':O' => 'shocked.png', - ':D' => 'grin.png', - ':d' => 'grin.png', - ':p' => 'tongue.png', - ':P' => 'tongue.png', - ':-P' => 'tongue.png', - ';D' => 'wink.png', - ';d' => 'wink.png', - ';\)' => 'wink.png', - '\^\^' => 'happy.png', - '\(k\)' => 'heart.png', - 'B\)' => 'cool.png', - ':s' => 'confused.png', - ':S' => 'confused.png', - ':\/' => 'wondering.png', - ':evil:'=> 'evil.png', - ":\|" => 'neutral.png', - - // Meme icons - ':okay:' => 'okay.gif', - ':trolldad:' => 'trolldad.png', - ':epic:' => 'epic.png', - ':aloneyeah:' => 'aloneyeah.png', - ':fapfap:' => 'fapfap.png', - ':megusta:' => 'gusta.png', - ':trollface:' => 'trollface.png', - ':troll:' => 'trollface.png', - ':lol:' => 'trollol.png', - ':genius:' => 'genius.png', - ); - +function prepareString($string, $large = false) { //replace begin by www $string = preg_replace_callback( '/(^|\s|>)(www.[^<> \n\r]+)/ix', function ($match) { @@ -122,6 +75,12 @@ function prepareString($string) { return ''; }, ' ' . $string ); + //remove all iframe + $string = preg_replace_callback( + '#<[/]?ss[^>]*>#is', function ($match) { + return ''; + }, ' ' . $string + ); // We add some smileys... $cd = new \Modl\ConfigDAO(); @@ -130,12 +89,7 @@ function prepareString($string) { $path = BASE_URI . 'themes/' . $theme . '/img/emojis/'; - /* - - foreach($smileys as $key => $value) { - $replace = ' smiley'; - $string = preg_replace('/(^|[ ])('.$key.')/', $replace, $string); - }*/ + if($large) $path .= 'large/'; $emoji = new Emoji(new EmojiIndex(), $path.'%s.png'); $string = $emoji->replaceEmojiWithImages($string); diff --git a/app/models/contact/ContactDAO.php b/app/models/contact/ContactDAO.php index 138e1708d..c0d25b1cb 100755 --- a/app/models/contact/ContactDAO.php +++ b/app/models/contact/ContactDAO.php @@ -318,6 +318,7 @@ class ContactDAO extends SQL { 'yahoo' => $contact->yahoo, 'created' => date(DATE_ISO8601), + 'updated' => date(DATE_ISO8601), 'jid' => $contact->jid ) @@ -360,7 +361,8 @@ class ContactDAO extends SQL { 'select *, privacy.value as privacy from contact left outer join privacy on contact.jid = privacy.pkey - where privacy.value = 1'; + where privacy.value = 1 + order by created desc'; if($limitr) $this->_sql = $this->_sql.' limit '.$limitr.' offset '.$limitf; diff --git a/app/views/main.tpl b/app/views/main.tpl index c29bb225a..ec6fd6b59 100755 --- a/app/views/main.tpl +++ b/app/views/main.tpl @@ -1,5 +1,3 @@ -widget('Init');?> -