syn2cat
/
Level2.lu
2
0
Fork 0
Code Issues 3 Pull Requests Projects Releases Wiki Activity

also removing newlines before the urls and images

master
Tezza 2015-03-01 22:20:42 +01:00
parent f3a21c7097
commit 27358653c1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/app/level2/Level2.php
View File

@ -6,8 +6,8 @@
class Level2 { class Level2 {
static public $imageMatch = '/https?:\/\/[^ ]+?(?:\.jpg|\.png|\.gif)/i'; static public $imageMatch = 'https?:\/\/[^ ]+?(?:\.jpg|\.png|\.gif)';
static public $urlMatch = '/\b(?:(?:https?|ftp|file):\/\/|www\.|ftp\.)[-A-Z0-9+&@#\/%=~_|$\(\)?!:,.]*[A-Z0-9+&@#\/%=~_|$]/i'; static public $urlMatch = '\b(?:(?:https?|ftp|file):\/\/|www\.|ftp\.)[-A-Z0-9+&@#\/%=~_|$\(\)?!:,.]*[A-Z0-9+&@#\/%=~_|$]';
static public function getStatus ( $app ) { static public function getStatus ( $app ) {
@ -60,7 +60,7 @@
static public function getImages( $googleEvent ) { static public function getImages( $googleEvent ) {
preg_match_all( self::$imageMatch, $googleEvent[ 'description' ], $image, PREG_PATTERN_ORDER ); preg_match_all( '/' . self::$imageMatch . '/i', $googleEvent[ 'description' ], $image, PREG_PATTERN_ORDER );
if ( sizeof( $image[ 0 ] ) > 0 ) { if ( sizeof( $image[ 0 ] ) > 0 ) {
@ -80,7 +80,7 @@
static public function getURLs( $googleEvent ) { static public function getURLs( $googleEvent ) {
preg_match_all( self::$urlMatch, $googleEvent[ 'description' ], $url, PREG_PATTERN_ORDER ); preg_match_all( '/' . self::$urlMatch . '/i', $googleEvent[ 'description' ], $url, PREG_PATTERN_ORDER );
if ( sizeof( $url[ 0 ] ) > 0 ) { if ( sizeof( $url[ 0 ] ) > 0 ) {
@ -103,7 +103,7 @@
preg_match_all( self::$imageMatch, $googleEvent[ 'description' ], $image, PREG_PATTERN_ORDER ); preg_match_all( self::$imageMatch, $googleEvent[ 'description' ], $image, PREG_PATTERN_ORDER );
return preg_replace( return preg_replace(
self::$imageMatch, '/\n' . self::$imageMatch . '/i',
'', '',
$googleEvent[ 'description' ] $googleEvent[ 'description' ]
); );
@ -115,7 +115,7 @@
preg_match_all( self::$urlMatch, $googleEvent[ 'description' ], $url, PREG_PATTERN_ORDER ); preg_match_all( self::$urlMatch, $googleEvent[ 'description' ], $url, PREG_PATTERN_ORDER );
return preg_replace( return preg_replace(
self::$urlMatch, '/\n' . self::$urlMatch . '/i',
'', '',
$googleEvent[ 'description' ] $googleEvent[ 'description' ]
); );