Propset eol-style to CRLF

simplified paragraph tag cleanup regex

1 files changed, 65 insertions, 65 deletions

diff --git a/system/application/config/smileys.php b/system/application/config/smileys.php
index 7f3aba550..8ef424fcf 100644
--- a/system/application/config/smileys.php
+++ b/system/application/config/smileys.php
@@ -1,66 +1,66 @@
-<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');
-/*
-| -------------------------------------------------------------------
-| SMILEYS
-| -------------------------------------------------------------------
-| This file contains an array of smileys for use with the emoticon helper.
-| Individual images can be used to replace multiple simileys.  For example:
-| :-) and :) use the same image replacement.
-|
-| Please see user guide for more info: 
-| http://codeigniter.com/user_guide/helpers/smiley_helper.html
-|
-*/
-
-$smileys = array(
-
-//	smiley			image name						width	height	alt
-
-	':-)'			=>	array('grin.gif',			'19',	'19',	'grin'),
-	':lol:'			=>	array('lol.gif',			'19',	'19',	'LOL'),
-	':cheese:'		=>	array('cheese.gif',			'19',	'19',	'cheese'),
-	':)'			=>	array('smile.gif',			'19',	'19',	'smile'),
-	';-)'			=>	array('wink.gif',			'19',	'19',	'wink'),
-	';)'			=>	array('wink.gif',			'19',	'19',	'wink'),
-	':smirk:'		=>	array('smirk.gif',			'19',	'19',	'smirk'),
-	':roll:'		=>	array('rolleyes.gif',		'19',	'19',	'rolleyes'),
-	':-S'			=>	array('confused.gif',		'19',	'19',	'confused'),
-	':wow:'			=>	array('surprise.gif',		'19',	'19',	'surprised'),
-	':bug:'			=>	array('bigsurprise.gif',	'19',	'19',	'big surprise'),
-	':-P'			=>	array('tongue_laugh.gif',	'19',	'19',	'tongue laugh'),
-	'%-P'			=>	array('tongue_rolleye.gif',	'19',	'19',	'tongue rolleye'),
-	';-P'			=>	array('tongue_wink.gif',	'19',	'19',	'tongue wink'),
-	':P'			=>	array('raspberry.gif',		'19',	'19',	'raspberry'),
-	':blank:'		=>	array('blank.gif',			'19',	'19',	'blank stare'),
-	':long:'		=>	array('longface.gif',		'19',	'19',	'long face'),
-	':ohh:'			=>	array('ohh.gif',			'19',	'19',	'ohh'),
-	':grrr:'		=>	array('grrr.gif',			'19',	'19',	'grrr'),
-	':gulp:'		=>	array('gulp.gif',			'19',	'19',	'gulp'),
-	'8-/'			=>	array('ohoh.gif',			'19',	'19',	'oh oh'),
-	':down:'		=>	array('downer.gif',			'19',	'19',	'downer'),
-	':red:'			=>	array('embarrassed.gif',	'19',	'19',	'red face'),
-	':sick:'		=>	array('sick.gif',			'19',	'19',	'sick'),
-	':shut:'		=>	array('shuteye.gif',		'19',	'19',	'shut eye'),
-	':-/'			=>	array('hmm.gif',			'19',	'19',	'hmmm'),
-	'>:('			=>	array('mad.gif',			'19',	'19',	'mad'),
-	':mad:'			=>	array('mad.gif',			'19',	'19',	'mad'),
-	'>:-('			=>	array('angry.gif',			'19',	'19',	'angry'),
-	':angry:'		=>	array('angry.gif',			'19',	'19',	'angry'),
-	':zip:'			=>	array('zip.gif',			'19',	'19',	'zipper'),
-	':kiss:'		=>	array('kiss.gif',			'19',	'19',	'kiss'),
-	':ahhh:'		=>	array('shock.gif',			'19',	'19',	'shock'),
-	':coolsmile:'	=>	array('shade_smile.gif',	'19',	'19',	'cool smile'),
-	':coolsmirk:'	=>	array('shade_smirk.gif',	'19',	'19',	'cool smirk'),
-	':coolgrin:'	=>	array('shade_grin.gif',		'19',	'19',	'cool grin'),
-	':coolhmm:'		=>	array('shade_hmm.gif',		'19',	'19',	'cool hmm'),
-	':coolmad:'		=>	array('shade_mad.gif',		'19',	'19',	'cool mad'),
-	':coolcheese:'	=>	array('shade_cheese.gif',	'19',	'19',	'cool cheese'),
-	':vampire:'		=>	array('vampire.gif',		'19',	'19',	'vampire'),
-	':snake:'		=>	array('snake.gif',			'19',	'19',	'snake'),
-	':exclaim:'		=>	array('exclaim.gif',		'19',	'19',	'excaim'),
-	':question:'	=>	array('question.gif',		'19',	'19',	'question') // no comma after last item
-
-		);
-
-/* End of file smileys.php */
+<?php  if ( ! defined('BASEPATH')) exit('No direct script access allowed');

+/*

+| -------------------------------------------------------------------

+| SMILEYS

+| -------------------------------------------------------------------

+| This file contains an array of smileys for use with the emoticon helper.

+| Individual images can be used to replace multiple simileys.  For example:

+| :-) and :) use the same image replacement.

+|

+| Please see user guide for more info: 

+| http://codeigniter.com/user_guide/helpers/smiley_helper.html

+|

+*/

+

+$smileys = array(

+

+//	smiley			image name						width	height	alt

+

+	':-)'			=>	array('grin.gif',			'19',	'19',	'grin'),

+	':lol:'			=>	array('lol.gif',			'19',	'19',	'LOL'),

+	':cheese:'		=>	array('cheese.gif',			'19',	'19',	'cheese'),

+	':)'			=>	array('smile.gif',			'19',	'19',	'smile'),

+	';-)'			=>	array('wink.gif',			'19',	'19',	'wink'),

+	';)'			=>	array('wink.gif',			'19',	'19',	'wink'),

+	':smirk:'		=>	array('smirk.gif',			'19',	'19',	'smirk'),

+	':roll:'		=>	array('rolleyes.gif',		'19',	'19',	'rolleyes'),

+	':-S'			=>	array('confused.gif',		'19',	'19',	'confused'),

+	':wow:'			=>	array('surprise.gif',		'19',	'19',	'surprised'),

+	':bug:'			=>	array('bigsurprise.gif',	'19',	'19',	'big surprise'),

+	':-P'			=>	array('tongue_laugh.gif',	'19',	'19',	'tongue laugh'),

+	'%-P'			=>	array('tongue_rolleye.gif',	'19',	'19',	'tongue rolleye'),

+	';-P'			=>	array('tongue_wink.gif',	'19',	'19',	'tongue wink'),

+	':P'			=>	array('raspberry.gif',		'19',	'19',	'raspberry'),

+	':blank:'		=>	array('blank.gif',			'19',	'19',	'blank stare'),

+	':long:'		=>	array('longface.gif',		'19',	'19',	'long face'),

+	':ohh:'			=>	array('ohh.gif',			'19',	'19',	'ohh'),

+	':grrr:'		=>	array('grrr.gif',			'19',	'19',	'grrr'),

+	':gulp:'		=>	array('gulp.gif',			'19',	'19',	'gulp'),

+	'8-/'			=>	array('ohoh.gif',			'19',	'19',	'oh oh'),

+	':down:'		=>	array('downer.gif',			'19',	'19',	'downer'),

+	':red:'			=>	array('embarrassed.gif',	'19',	'19',	'red face'),

+	':sick:'		=>	array('sick.gif',			'19',	'19',	'sick'),

+	':shut:'		=>	array('shuteye.gif',		'19',	'19',	'shut eye'),

+	':-/'			=>	array('hmm.gif',			'19',	'19',	'hmmm'),

+	'>:('			=>	array('mad.gif',			'19',	'19',	'mad'),

+	':mad:'			=>	array('mad.gif',			'19',	'19',	'mad'),

+	'>:-('			=>	array('angry.gif',			'19',	'19',	'angry'),

+	':angry:'		=>	array('angry.gif',			'19',	'19',	'angry'),

+	':zip:'			=>	array('zip.gif',			'19',	'19',	'zipper'),

+	':kiss:'		=>	array('kiss.gif',			'19',	'19',	'kiss'),

+	':ahhh:'		=>	array('shock.gif',			'19',	'19',	'shock'),

+	':coolsmile:'	=>	array('shade_smile.gif',	'19',	'19',	'cool smile'),

+	':coolsmirk:'	=>	array('shade_smirk.gif',	'19',	'19',	'cool smirk'),

+	':coolgrin:'	=>	array('shade_grin.gif',		'19',	'19',	'cool grin'),

+	':coolhmm:'		=>	array('shade_hmm.gif',		'19',	'19',	'cool hmm'),

+	':coolmad:'		=>	array('shade_mad.gif',		'19',	'19',	'cool mad'),

+	':coolcheese:'	=>	array('shade_cheese.gif',	'19',	'19',	'cool cheese'),

+	':vampire:'		=>	array('vampire.gif',		'19',	'19',	'vampire'),

+	':snake:'		=>	array('snake.gif',			'19',	'19',	'snake'),

+	':exclaim:'		=>	array('exclaim.gif',		'19',	'19',	'excaim'),

+	':question:'	=>	array('question.gif',		'19',	'19',	'question') // no comma after last item

+

+		);

+

+/* End of file smileys.php */

 /* Location: ./system/application/config/smileys.php */
\ No newline at end of file