diff options
| -rw-r--r-- | addon/facebook/facebook.php | 10 | ||||
| -rw-r--r-- | boot.php | 2 | ||||
| -rw-r--r-- | include/bbcode.php | 52 | ||||
| -rw-r--r-- | include/event.php | 8 | ||||
| -rw-r--r-- | include/items.php | 8 | ||||
| -rw-r--r-- | mod/item.php | 4 | ||||
| -rw-r--r-- | mod/message.php | 2 |
7 files changed, 43 insertions, 43 deletions
diff --git a/addon/facebook/facebook.php b/addon/facebook/facebook.php index 657ba7dc2..9e41065de 100644 --- a/addon/facebook/facebook.php +++ b/addon/facebook/facebook.php @@ -525,7 +525,7 @@ function facebook_post_hook(&$a,&$b) { $search_str = $a->get_baseurl() . '/search'; - if(preg_match("/\[url=(.+?)\](.+?)\[\/url\]/is",$msg,$matches)) { + if(preg_match("/\[url=(.*?)\](.*?)\[\/url\]/is",$msg,$matches)) { // don't use hashtags for message link @@ -536,12 +536,12 @@ function facebook_post_hook(&$a,&$b) { } } - $msg = preg_replace("/\[url=(.+?)\](.+?)\[\/url\]/is",'$2 $1',$msg); + $msg = preg_replace("/\[url=(.*?)\](.*?)\[\/url\]/is",'$2 $1',$msg); - if(preg_match("/\[img\](.+?)\[\/img\]/is",$msg,$matches)) + if(preg_match("/\[img\](.*?)\[\/img\]/is",$msg,$matches)) $image = $matches[1]; - $msg = preg_replace("/\[img\](.+?)\[\/img\]/is", t('Image: ') . '$1', $msg); + $msg = preg_replace("/\[img\](.*?)\[\/img\]/is", t('Image: ') . '$1', $msg); if((strpos($link,$a->get_baseurl()) !== false) && (! $image)) $image = $a->get_baseurl() . '/images/friendika-64.jpg'; @@ -557,7 +557,7 @@ function facebook_post_hook(&$a,&$b) { $msg .= "\n"; foreach($arr as $r) { $matches = false; - $cnt = preg_match('|\[attach\]href=\"(.+?)\" size=\"(.+?)\" type=\"(.+?)\" title=\"(.+?)\"\[\/attach\]|',$r,$matches); + $cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches); if($cnt) { $msg .= $matches[1]; } @@ -2574,7 +2574,7 @@ function prepare_body($item,$attach = false) { foreach($arr as $r) { $matches = false; $icon = ''; - $cnt = preg_match('|\[attach\]href=\"(.+?)\" size=\"(.+?)\" type=\"(.+?)\" title=\"(.+?)\"\[\/attach\]|',$r,$matches); + $cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches); if($cnt) { $icontype = strtolower(substr($matches[3],0,strpos($matches[3],'/'))); switch($icontype) { diff --git a/include/bbcode.php b/include/bbcode.php index 3caf2a6b1..c1576fbcf 100644 --- a/include/bbcode.php +++ b/include/bbcode.php @@ -28,69 +28,69 @@ function bbcode($Text,$preserve_nl = false) { $Text = preg_replace("/([^\]\=]|^)(https?\:\/\/[a-zA-Z0-9\:\/\-\?\&\.\=\_\~\#\'\%\$\!\+\,]+)/", ' <a href="$2" target="external-link">$2</a>', $Text); $Text = preg_replace("/\[url\]([$URLSearchString]*)\[\/url\]/", '<a href="$1" target="external-link">$1</a>', $Text); - $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.+?)\[/url\])", '<a href="$1" target="external-link">$2</a>', $Text); + $Text = preg_replace("(\[url\=([$URLSearchString]*)\](.*?)\[/url\])", '<a href="$1" target="external-link">$2</a>', $Text); //$Text = preg_replace("(\[url\=([$URLSearchString]*)\]([$URLSearchString]*)\[/url\])", '<a href="$1" target="_blank">$2</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); + $Text = preg_replace("/\[mail\=([$MAILSearchString]*)\](.*?)\[\/mail\]/", '<a href="mailto:$1">$2</a>', $Text); // Check for bold text - $Text = preg_replace("(\[b\](.+?)\[\/b])is",'<strong>$1</strong>',$Text); + $Text = preg_replace("(\[b\](.*?)\[\/b])is",'<strong>$1</strong>',$Text); // Check for Italics text - $Text = preg_replace("(\[i\](.+?)\[\/i\])is",'<em>$1</em>',$Text); + $Text = preg_replace("(\[i\](.*?)\[\/i\])is",'<em>$1</em>',$Text); // Check for Underline text - $Text = preg_replace("(\[u\](.+?)\[\/u\])is",'<u>$1</u>',$Text); + $Text = preg_replace("(\[u\](.*?)\[\/u\])is",'<u>$1</u>',$Text); // Check for strike-through text - $Text = preg_replace("(\[s\](.+?)\[\/s\])is",'<strike>$1</strike>',$Text); + $Text = preg_replace("(\[s\](.*?)\[\/s\])is",'<strike>$1</strike>',$Text); // Check for over-line text - $Text = preg_replace("(\[o\](.+?)\[\/o\])is",'<span class="overline">$1</span>',$Text); + $Text = preg_replace("(\[o\](.*?)\[\/o\])is",'<span class="overline">$1</span>',$Text); // Check for colored text - $Text = preg_replace("(\[color=(.+?)\](.+?)\[\/color\])is","<span style=\"color: $1;\">$2</span>",$Text); + $Text = preg_replace("(\[color=(.*?)\](.*?)\[\/color\])is","<span style=\"color: $1;\">$2</span>",$Text); // Check for sized text - $Text = preg_replace("(\[size=(.+?)\](.+?)\[\/size\])is","<span style=\"font-size: $1;\">$2</span>",$Text); + $Text = preg_replace("(\[size=(.*?)\](.*?)\[\/size\])is","<span style=\"font-size: $1;\">$2</span>",$Text); // Check for list text - $Text = preg_replace("/\[list\](.+?)\[\/list\]/is", '<ul class="listbullet">$1</ul>' ,$Text); - $Text = preg_replace("/\[list=1\](.+?)\[\/list\]/is", '<ul class="listdecimal">$1</ul>' ,$Text); - $Text = preg_replace("/\[list=i\](.+?)\[\/list\]/s",'<ul class="listlowerroman">$1</ul>' ,$Text); - $Text = preg_replace("/\[list=I\](.+?)\[\/list\]/s", '<ul class="listupperroman">$1</ul>' ,$Text); - $Text = preg_replace("/\[list=a\](.+?)\[\/list\]/s", '<ul class="listloweralpha">$1</ul>' ,$Text); - $Text = preg_replace("/\[list=A\](.+?)\[\/list\]/s", '<ul class="listupperalpha">$1</ul>' ,$Text); + $Text = preg_replace("/\[list\](.*?)\[\/list\]/is", '<ul class="listbullet">$1</ul>' ,$Text); + $Text = preg_replace("/\[list=1\](.*?)\[\/list\]/is", '<ul class="listdecimal">$1</ul>' ,$Text); + $Text = preg_replace("/\[list=i\](.*?)\[\/list\]/s",'<ul class="listlowerroman">$1</ul>' ,$Text); + $Text = preg_replace("/\[list=I\](.*?)\[\/list\]/s", '<ul class="listupperroman">$1</ul>' ,$Text); + $Text = preg_replace("/\[list=a\](.*?)\[\/list\]/s", '<ul class="listloweralpha">$1</ul>' ,$Text); + $Text = preg_replace("/\[list=A\](.*?)\[\/list\]/s", '<ul class="listupperalpha">$1</ul>' ,$Text); $Text = str_replace("[*]", "<li>", $Text); // Check for font change text - $Text = preg_replace("(\[font=(.+?)\](.+?)\[\/font\])","<span style=\"font-family: $1;\">$2</span>",$Text); + $Text = preg_replace("(\[font=(.*?)\](.*?)\[\/font\])","<span style=\"font-family: $1;\">$2</span>",$Text); // Declare the format for [code] layout $CodeLayout = '<code>$1</code>'; // Check for [code] text - $Text = preg_replace("/\[code\](.+?)\[\/code\]/is","$CodeLayout", $Text); + $Text = preg_replace("/\[code\](.*?)\[\/code\]/is","$CodeLayout", $Text); // Declare the format for [quote] layout $QuoteLayout = '<blockquote>$1</blockquote>'; // Check for [quote] text - $Text = preg_replace("/\[quote\](.+?)\[\/quote\]/is","$QuoteLayout", $Text); + $Text = preg_replace("/\[quote\](.*?)\[\/quote\]/is","$QuoteLayout", $Text); // Images // [img]pathtoimage[/img] - $Text = preg_replace("/\[img\](.+?)\[\/img\]/", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text); + $Text = preg_replace("/\[img\](.*?)\[\/img\]/", '<img src="$1" alt="' . t('Image/photo') . '" />', $Text); // html5 video and audio - $Text = preg_replace("/\[video\](.+?)\[\/video\]/", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text); + $Text = preg_replace("/\[video\](.*?)\[\/video\]/", '<video src="$1" controls="controls" width="425" height="350"><a href="$1">$1</a></video>', $Text); - $Text = preg_replace("/\[audio\](.+?)\[\/audio\]/", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text); + $Text = preg_replace("/\[audio\](.*?)\[\/audio\]/", '<audio src="$1" controls="controls"><a href="$1">$1</a></audio>', $Text); // [img=widthxheight]image source[/img] - $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.+?)\[\/img\]/", '<img src="$3" style="height:{$2}px; width:{$1}px;" >', $Text); + $Text = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/", '<img src="$3" style="height:{$2}px; width:{$1}px;" >', $Text); if (get_pconfig(local_user(), 'oembed', 'use_for_youtube' )==1){ // use oembed for youtube links @@ -98,11 +98,11 @@ function bbcode($Text,$preserve_nl = false) { $Text = preg_replace("/\[\/youtube\]/",'[/embed]',$Text); } else { // Youtube extensions - $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); - $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.+?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); - $Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", '<iframe width="425" height="349" src="http://www.youtube.com/embed/$1" frameborder="0" allowfullscreen></iframe>', $Text); + $Text = preg_replace("/\[youtube\]https?:\/\/www.youtube.com\/watch\?v\=(.*?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); + $Text = preg_replace("/\[youtube\]https?:\/\/youtu.be\/(.*?)\[\/youtube\]/",'[youtube]$1[/youtube]',$Text); + $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '<iframe width="425" height="349" src="http://www.youtube.com/embed/$1" frameborder="0" allowfullscreen></iframe>', $Text); } -// $Text = preg_replace("/\[youtube\](.+?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $Text); +// $Text = preg_replace("/\[youtube\](.*?)\[\/youtube\]/", '<object width="425" height="350" type="application/x-shockwave-flash" data="http://www.youtube.com/v/$1" ><param name="movie" value="http://www.youtube.com/v/$1"></param><!--[if IE]><embed src="http://www.youtube.com/v/$1" type="application/x-shockwave-flash" width="425" height="350" /><![endif]--></object>', $Text); // oembed tag $Text = oembed_bbcode2html($Text); diff --git a/include/event.php b/include/event.php index 17e12d7cf..33970efff 100644 --- a/include/event.php +++ b/include/event.php @@ -12,8 +12,8 @@ function format_event_html($ev) { $o .= '<p class="description">' . bbcode($ev['desc']) . '</p>'; - $o .= '<p>' . t('Starts: ') . '<abbr class="dtstart" title="' - . datetime_convert('UTC','UTC',$ev['start'], ATOM_TIME) + $o .= '<p>' . t('Starts:') . ' <abbr class="dtstart" title="' + . datetime_convert('UTC','UTC',$ev['start'], $ev['adjust'] ? ATOM_TIME : 'Y-m-d\TH:i:s' ) . '" >' . (($ev['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $ev['start'] /*, format */ ) @@ -22,8 +22,8 @@ function format_event_html($ev) { . '</abbr></p>'; if(! $ev['nofinish']) - $o .= '<p>' . t('Ends: ') . '<abbr class="dtend" title="' - . datetime_convert('UTC','UTC',$ev['finish'], ATOM_TIME) + $o .= '<p>' . t('Finishes:') . ' <abbr class="dtend" title="' + . datetime_convert('UTC','UTC',$ev['finish'], $ev['adjust'] ? ATOM_TIME : 'Y-m-d\TH:i:s' ) . '" >' . (($ev['adjust']) ? datetime_convert('UTC', date_default_timezone_get(), $ev['finish'] /*, format */ ) diff --git a/include/items.php b/include/items.php index fbcac30cd..dfe92378a 100644 --- a/include/items.php +++ b/include/items.php @@ -1618,7 +1618,7 @@ function fix_private_photos($s,$uid) { $a = get_app(); logger('fix_private_photos'); - if(preg_match("/\[img\](.+?)\[\/img\]/is",$s,$matches)) { + if(preg_match("/\[img\](.*?)\[\/img\]/is",$s,$matches)) { $image = $matches[1]; logger('fix_private_photos: found photo ' . $image); if(stristr($image ,$a->get_baseurl() . '/photo/')) { @@ -1649,7 +1649,7 @@ function fix_private_photos($s,$uid) { function item_getfeedtags($item) { $ret = array(); $matches = false; - $cnt = preg_match_all('|\#\[url\=(.+?)\](.+?)\[\/url\]|',$item['tag'],$matches); + $cnt = preg_match_all('|\#\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches); if($cnt) { for($x = 0; $x < count($matches); $x ++) { if($matches[1][$x]) @@ -1657,7 +1657,7 @@ function item_getfeedtags($item) { } } $matches = false; - $cnt = preg_match_all('|\@\[url\=(.+?)\](.+?)\[\/url\]|',$item['tag'],$matches); + $cnt = preg_match_all('|\@\[url\=(.*?)\](.*?)\[\/url\]|',$item['tag'],$matches); if($cnt) { for($x = 0; $x < count($matches); $x ++) { if($matches[1][$x]) @@ -1673,7 +1673,7 @@ function item_getfeedattach($item) { if(count($arr)) { foreach($arr as $r) { $matches = false; - $cnt = preg_match('|\[attach\]href=\"(.+?)\" size=\"(.+?)\" type=\"(.+?)\" title=\"(.+?)\"\[\/attach\]|',$r,$matches); + $cnt = preg_match('|\[attach\]href=\"(.*?)\" size=\"(.*?)\" type=\"(.*?)\" title=\"(.*?)\"\[\/attach\]|',$r,$matches); if($cnt) { $ret .= '<link rel="enclosure" href="' . xmlify($matches[1]) . '" type="' . xmlify($matches[3]) . '" '; if(intval($matches[2])) diff --git a/mod/item.php b/mod/item.php index 0fb780adc..2c8cf256c 100644 --- a/mod/item.php +++ b/mod/item.php @@ -196,7 +196,7 @@ function item_post(&$a) { $match = null; - if(preg_match_all("/\[img\](.+?)\[\/img\]/",$body,$match)) { + if(preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) { $images = $match[1]; if(count($images)) { foreach($images as $image) { @@ -235,7 +235,7 @@ function item_post(&$a) { $match = false; - if(preg_match_all("/\[attachment\](.+?)\[\/attachment\]/",$body,$match)) { + if(preg_match_all("/\[attachment\](.*?)\[\/attachment\]/",$body,$match)) { $attaches = $match[1]; if(count($attaches)) { foreach($attaches as $attach) { diff --git a/mod/message.php b/mod/message.php index 21f7b935e..ad598eb7d 100644 --- a/mod/message.php +++ b/mod/message.php @@ -78,7 +78,7 @@ function message_post(&$a) { $match = null; - if(preg_match_all("/\[img\](.+?)\[\/img\]/",$body,$match)) { + if(preg_match_all("/\[img\](.*?)\[\/img\]/",$body,$match)) { $images = $match[1]; if(count($images)) { foreach($images as $image) { |