From 3c168503834651b56b9b5de61621e8fbe958c298 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 11 Mar 2012 12:00:32 +0100 Subject: [PATCH 001/100] OpenID: display error msg if ID URL used to register an account does not exist --- include/auth.php | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/include/auth.php b/include/auth.php index fc52684e64..6a3e31cb7d 100755 --- a/include/auth.php +++ b/include/auth.php @@ -117,10 +117,15 @@ else { // NOTREACHED } // new account - $_SESSION['register'] = 1; - $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson'); - $openid->optional = array('namePerson/first','media/image/aspect11','media/image/default'); - goaway($openid->authUrl()); + try { + $_SESSION['register'] = 1; + $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson'); + $openid->optional = array('namePerson/first','media/image/aspect11','media/image/default'); + goaway($openid->authUrl()); + } catch (Exception $e) { + // if the OpenID is misspelled we land here + notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.

The error message was: ').$e->getMessage() ); + } // NOTREACHED } } From 6cbd765e1ff77a1efb01b1f096a875c881c43905 Mon Sep 17 00:00:00 2001 From: Tobias Diekershoff Date: Sun, 11 Mar 2012 12:03:47 +0100 Subject: [PATCH 002/100] Revert "OpenID: display error msg if ID URL used to register an account does not exist" This reverts commit 3c168503834651b56b9b5de61621e8fbe958c298. --- include/auth.php | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/include/auth.php b/include/auth.php index 6a3e31cb7d..fc52684e64 100755 --- a/include/auth.php +++ b/include/auth.php @@ -117,15 +117,10 @@ else { // NOTREACHED } // new account - try { - $_SESSION['register'] = 1; - $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson'); - $openid->optional = array('namePerson/first','media/image/aspect11','media/image/default'); - goaway($openid->authUrl()); - } catch (Exception $e) { - // if the OpenID is misspelled we land here - notice( t('We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID.

The error message was: ').$e->getMessage() ); - } + $_SESSION['register'] = 1; + $openid->required = array('namePerson/friendly', 'contact/email', 'namePerson'); + $openid->optional = array('namePerson/first','media/image/aspect11','media/image/default'); + goaway($openid->authUrl()); // NOTREACHED } } From 29ade1d9b971bb14746bab5ec57db0e204c9e137 Mon Sep 17 00:00:00 2001 From: Alexander Kampmann Date: Thu, 15 Mar 2012 10:51:22 +0100 Subject: [PATCH 003/100] another test for xmlify --- tests/xss_filter_test.php | 23 ++++++++++++++++++++++- 1 file changed, 22 insertions(+), 1 deletion(-) diff --git a/tests/xss_filter_test.php b/tests/xss_filter_test.php index d7dcf0472b..3fb6ac3109 100644 --- a/tests/xss_filter_test.php +++ b/tests/xss_filter_test.php @@ -27,11 +27,32 @@ class AntiXSSTest extends PHPUnit_Framework_TestCase { */ public function testXmlify() { $text="I want to break\n this!11!"; - $xml=xmlify($text); //test whether it actually may be part of a xml document + $xml=xmlify($text); $retext=unxmlify($text); $this->assertEquals($text, $retext); } + + /** + * xmlify and put in a document + */ + public function testXmlifyDocument() { + $tag="I want to break"; + $xml=xmlify($tag); + $text=''.$xml.''; + + $xml_parser=xml_parser_create(); + //should be possible to parse it + $values=array(); $index=array(); + $this->assertEquals(1, xml_parse_into_struct($xml_parser, $text, $values, $index)); + + $this->assertEquals(array('TEXT'=>array(0)), + $index); + $this->assertEquals(array(array('tag'=>'TEXT', 'type'=>'complete', 'level'=>1, 'value'=>$tag)), + $values); + + xml_parser_free($xml_parser); + } /** * test hex2bin and reverse From 9796e99fa8378758c4fe0f655b7c192f8fc1690f Mon Sep 17 00:00:00 2001 From: Alexander Kampmann Date: Thu, 15 Mar 2012 11:45:06 +0100 Subject: [PATCH 004/100] added simple build-in profiling --- boot.php | 2 +- database.sql | 11 ++++++++++- index.php | 1 + update.php | 16 ++++++++++++++++ util/profiler.php | 36 ++++++++++++++++++++++++++++++++++++ 5 files changed, 64 insertions(+), 2 deletions(-) create mode 100755 util/profiler.php diff --git a/boot.php b/boot.php index b30f02c9f6..e2494092de 100755 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_VERSION', '2.3.1278' ); define ( 'DFRN_PROTOCOL_VERSION', '2.22' ); -define ( 'DB_UPDATE_VERSION', 1131 ); +define ( 'DB_UPDATE_VERSION', 1132 ); define ( 'EOL', "
\r\n" ); define ( 'ATOM_TIME', 'Y-m-d\TH:i:s\Z' ); diff --git a/database.sql b/database.sql index 35c257f021..f8d4c7fc24 100755 --- a/database.sql +++ b/database.sql @@ -857,4 +857,13 @@ INDEX ( `ham` ), INDEX ( `term` ) ) ENGINE = MyISAM DEFAULT CHARSET=utf8; - +CREATE TABLE IF NOT EXISTS `profiling` ( +`id` INT NOT NULL AUTO_INCREMENT PRIMARY_KEY , +`function` VARCHAR(255) NOT NULL, +`file` VARCHAR(255) NOT NULL, +`line` INT NOT NULL DEFAULT '-1', +`class` VARCHAR(255), +`time` FLOAT(10, 2) NOT NULL, +INDEX(`function`), +INDEX(`file`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; diff --git a/index.php b/index.php index 5f6d74adb9..688eee2ee2 100755 --- a/index.php +++ b/index.php @@ -41,6 +41,7 @@ require_once("dba.php"); $db = new dba($db_host, $db_user, $db_pass, $db_data, $install); unset($db_host, $db_user, $db_pass, $db_data); +require_once('util/profiler.php'); if(! $install) { diff --git a/update.php b/update.php index c29394b480..36116341a0 100755 --- a/update.php +++ b/update.php @@ -1122,3 +1122,19 @@ function update_1130() { q("ALTER TABLE `item` ADD `file` MEDIUMTEXT NOT NULL AFTER `inform`, ADD FULLTEXT KEY (`file`) "); } +/** + * CREATE TABLE for profiling + */ +function update_1132() { + q("CREATE TABLE IF NOT EXISTS `profiling` ( +`id` INT NOT NULL AUTO_INCREMENT PRIMARY_KEY , +`function` VARCHAR(255) NOT NULL, +`file` VARCHAR(255) NOT NULL, +`line` INT NOT NULL DEFAULT '-1', +`class` VARCHAR(255), +`time` FLOAT(10, 2) NOT NULL, +INDEX(`function`), +INDEX(`file`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; "); +} + diff --git a/util/profiler.php b/util/profiler.php new file mode 100755 index 0000000000..3a3de53739 --- /dev/null +++ b/util/profiler.php @@ -0,0 +1,36 @@ + Date: Thu, 15 Mar 2012 12:55:49 +0100 Subject: [PATCH 005/100] integrated profiler --- database.sql | 18 +++++++++--------- update.php | 22 +++++++++++----------- util/profiler.php | 27 ++++++--------------------- 3 files changed, 26 insertions(+), 41 deletions(-) diff --git a/database.sql b/database.sql index f8d4c7fc24..e07e9e0701 100755 --- a/database.sql +++ b/database.sql @@ -858,12 +858,12 @@ INDEX ( `term` ) ) ENGINE = MyISAM DEFAULT CHARSET=utf8; CREATE TABLE IF NOT EXISTS `profiling` ( -`id` INT NOT NULL AUTO_INCREMENT PRIMARY_KEY , -`function` VARCHAR(255) NOT NULL, -`file` VARCHAR(255) NOT NULL, -`line` INT NOT NULL DEFAULT '-1', -`class` VARCHAR(255), -`time` FLOAT(10, 2) NOT NULL, -INDEX(`function`), -INDEX(`file`) -) ENGINE=MyISAM DEFAULT CHARSET=utf8; +`id` INT NOT NULL AUTO_INCREMENT PRIMARY KEY , +`function` VARCHAR( 255 ) NOT NULL , +`file` VARCHAR( 255 ) NOT NULL , +`line` INT NOT NULL DEFAULT '-1', +`class` VARCHAR( 255 ) NOT NULL , +`time` FLOAT( 10, 2 ) NOT NULL , +INDEX ( `function` ) , +INDEX ( `file` ) +) ENGINE = MyISAM DEFAULT CHARSET=utf8; diff --git a/update.php b/update.php index 36116341a0..8c8a2a5e42 100755 --- a/update.php +++ b/update.php @@ -1,6 +1,6 @@ Date: Mon, 19 Mar 2012 21:58:21 -0700 Subject: [PATCH 007/100] add IP address to failed login log message --- include/auth.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/include/auth.php b/include/auth.php index 4e246e3541..835616a829 100755 --- a/include/auth.php +++ b/include/auth.php @@ -104,6 +104,7 @@ else { // NOTREACHED } } + if((x($_POST,'auth-params')) && $_POST['auth-params'] === 'login') { $record = null; @@ -144,7 +145,7 @@ else { } if((! $record) || (! count($record))) { - logger('authenticate: failed login attempt: ' . notags(trim($_POST['username']))); + logger('authenticate: failed login attempt: ' . notags(trim($_POST['username'])) . ' from IP ' . $_SERVER['REMOTE_ADDR']); notice( t('Login failed.') . EOL ); goaway(z_root()); } From 9df797299320cea01c541bb4997e498f915f98fa Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 Mar 2012 01:50:20 -0700 Subject: [PATCH 008/100] bug #339 - lostpass sending to username, not email --- mod/lostpass.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/mod/lostpass.php b/mod/lostpass.php index b71398fa4b..57e6d69653 100755 --- a/mod/lostpass.php +++ b/mod/lostpass.php @@ -3,13 +3,13 @@ function lostpass_post(&$a) { - $email = notags(trim($_POST['login-name'])); - if(! $email) + $loginame = notags(trim($_POST['login-name'])); + if(! $loginame) goaway(z_root()); $r = q("SELECT * FROM `user` WHERE ( `email` = '%s' OR `nickname` = '%s' ) AND `verified` = 1 AND `blocked` = 0 LIMIT 1", - dbesc($email), - dbesc($email) + dbesc($loginame), + dbesc($loginame) ); if(! count($r)) { @@ -19,6 +19,7 @@ function lostpass_post(&$a) { $uid = $r[0]['uid']; $username = $r[0]['username']; + $email = $r[0]['email']; $new_password = autoname(12) . mt_rand(100,9999); $new_password_encoded = hash('whirlpool',$new_password); From de0298e67ece602eb95d6a86ed5eebcb713c4dbb Mon Sep 17 00:00:00 2001 From: Simon L'nu Date: Tue, 20 Mar 2012 11:37:51 -0400 Subject: [PATCH 009/100] some tweakings for intro boxes (finally got an intro i could see :). dispy synced with dispy-dark Signed-off-by: Simon L'nu --- view/theme/dispy-dark/style.css | 67 ++++++++++++++++++++++++++- view/theme/dispy/photo_view.tpl | 13 ++---- view/theme/dispy/style.css | 81 +++++++++++++++++++++++++++++++-- 3 files changed, 148 insertions(+), 13 deletions(-) diff --git a/view/theme/dispy-dark/style.css b/view/theme/dispy-dark/style.css index eaaa0acbd0..9883b2fd72 100644 --- a/view/theme/dispy-dark/style.css +++ b/view/theme/dispy-dark/style.css @@ -153,9 +153,9 @@ a:hover { color: #729fcf; } input[type=submit] { - font-weight: bold; background-color: #eee; color: #2e302e; + font-weight: bold; margin-top: 10px; height: 22px; -webkit-border-radius: 5px; @@ -1872,6 +1872,71 @@ div[id$="wrapper"] br { clear:both; } + +/** + * intros + */ +.intro-wrapper { + margin-top: 20px; +} + +.intro-fullname { + font-size: 1.1em; + font-weight: bold; + +} +.intro-desc { + margin-bottom: 20px; + font-weight: bold; +} + +.intro-note { + padding: 10px; +} + +.intro-end { + padding: 30px; +} + +.intro-form { + float: left; +} +.intro-approve-form { + clear: both; +} +.intro-approve-as-friend-end { + clear: both; +} +.intro-submit-approve, .intro-submit-ignore { + margin-right: 20px; +} +.intro-submit-approve { + margin-top: 15px; +} + +.intro-approve-as-friend-label, .intro-approve-as-fan-label { + float: left; +} +.intro-approve-as-friend, .intro-approve-as-fan { + float: left; +} +.intro-form-end { + clear: both; + margin-bottom: 10px; +} +.intro-approve-as-friend-desc { + margin-top: 10px; +} +.intro-approve-as-end { + clear: both; + margin-bottom: 10px; +} + +.intro-end { + clear: both; +} + + /** * events **/ diff --git a/view/theme/dispy/photo_view.tpl b/view/theme/dispy/photo_view.tpl index f1209ec58f..732caf6900 100644 --- a/view/theme/dispy/photo_view.tpl +++ b/view/theme/dispy/photo_view.tpl @@ -4,18 +4,15 @@ - -
- {{ if $prevlink }}{{ endif }} - - {{ if $nextlink }}{{ endif }} +{{ if $lock }} | $lock {{ endif }}
+{{ if $prevlink }}{{ endif }} +
+{{ if $nextlink }}{{ endif }}
$desc
{{ if $tags }} diff --git a/view/theme/dispy/style.css b/view/theme/dispy/style.css index 812c5ee2e6..6547cf986f 100644 --- a/view/theme/dispy/style.css +++ b/view/theme/dispy/style.css @@ -48,7 +48,7 @@ body { body, button, input, select, textarea { font-family: sans-serif; color: #222; - background-color: rgb(254,254,254); + background-color: #efefef; } select { border: 1px #555 dotted; @@ -152,10 +152,11 @@ a:hover { color: #729fcf; } input[type=submit] { + background-color: #555753; + color: #eeeeec; + font-weight: bold; margin-top: 10px; height: 22px; - background-color: #555753; - color: #eeeeec; -webkit-border-radius: 5px; -moz-border-radius: 5px; border-radius: 5px; @@ -1494,6 +1495,8 @@ div[id$="wrapper"] br { } #prvmail-subject { width: 100%; + color: #eec; + background: #444; } #prvmail-submit-wrapper { margin-top: 10px; @@ -1859,6 +1862,71 @@ div[id$="wrapper"] br { clear:both; } + +/** + * intros + */ +.intro-wrapper { + margin-top: 20px; +} + +.intro-fullname { + font-size: 1.1em; + font-weight: bold; + +} +.intro-desc { + margin-bottom: 20px; + font-weight: bold; +} + +.intro-note { + padding: 10px; +} + +.intro-end { + padding: 30px; +} + +.intro-form { + float: left; +} +.intro-approve-form { + clear: both; +} +.intro-approve-as-friend-end { + clear: both; +} +.intro-submit-approve, .intro-submit-ignore { + margin-right: 20px; +} +.intro-submit-approve { + margin-top: 15px; +} + +.intro-approve-as-friend-label, .intro-approve-as-fan-label { + float: left; +} +.intro-approve-as-friend, .intro-approve-as-fan { + float: left; +} +.intro-form-end { + clear: both; + margin-bottom: 10px; +} +.intro-approve-as-friend-desc { + margin-top: 10px; +} +.intro-approve-as-end { + clear: both; + margin-bottom: 10px; +} + +.intro-end { + clear: both; +} + + /** * events **/ @@ -2162,11 +2230,16 @@ div[id$="wrapper"] br { width: 16px; height: 16px; } #adminpage table tr:hover { - background-color:#bbc7d7; +/* color: ;*/ + background-color: #bbc7d7; } #adminpage .selectall { text-align: right; } +#adminpage #users a { +/* color: #;*/ + text-decoration: underline; +} /** * Form fields From 92ef36ad61bc96905b062a727d1f4558ed734bdb Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 Mar 2012 14:55:18 -0700 Subject: [PATCH 010/100] slightly relax overly strict permissions in community and search to match those in display - tl;dr public conversations are publicly visible --- boot.php | 2 +- mod/community.php | 12 +++++++----- mod/search.php | 7 ++++--- 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/boot.php b/boot.php index be4b8ca0e0..fa081df1b0 100755 --- a/boot.php +++ b/boot.php @@ -9,7 +9,7 @@ require_once('include/nav.php'); require_once('include/cache.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '2.3.1286' ); +define ( 'FRIENDICA_VERSION', '2.3.1287' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1132 ); diff --git a/mod/community.php b/mod/community.php index a989999420..cf459617ea 100755 --- a/mod/community.php +++ b/mod/community.php @@ -41,15 +41,16 @@ function community_content(&$a, $update = 0) { // Here is the way permissions work in this module... - // Only public wall posts can be shown + // Only public posts can be shown // OR your own posts if you are a logged in member $r = q("SELECT COUNT(*) AS `total` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 - AND `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' - AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `user`.`hidewall` = 0 + AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' + AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' + AND `item`.`private` = 0 AND `user`.`hidewall` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 " ); @@ -69,8 +70,9 @@ function community_content(&$a, $update = 0) { FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 - AND `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' - AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `user`.`hidewall` = 0 + AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' + AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' + AND `item`.`private` = 0 AND `user`.`hidewall` = 0 AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 ORDER BY `received` DESC LIMIT %d, %d ", intval($a->pager['start']), diff --git a/mod/search.php b/mod/search.php index 386592ea19..50e7a6abc7 100755 --- a/mod/search.php +++ b/mod/search.php @@ -93,8 +93,9 @@ function search_content(&$a) { return $o; // Here is the way permissions work in the search module... - // Only public wall posts can be shown + // Only public posts can be shown // OR your own posts if you are a logged in member + // No items will be shown if the member has a blocked profile wall. $s_regx = sprintf("AND ( `item`.`body` REGEXP '%s' OR `item`.`tag` REGEXP '%s' )", dbesc(preg_quote($search)), dbesc('\\]' . preg_quote($search) . '\\[')); @@ -104,7 +105,7 @@ function search_content(&$a) { $r = q("SELECT COUNT(*) AS `total` FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 - AND (( `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `user`.`hidewall` = 0) + AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0) OR `item`.`uid` = %d ) AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 $search_alg ", @@ -127,7 +128,7 @@ function search_content(&$a) { FROM `item` LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id` LEFT JOIN `user` ON `user`.`uid` = `item`.`uid` WHERE `item`.`visible` = 1 AND `item`.`deleted` = 0 and `item`.`moderated` = 0 - AND (( `wall` = 1 AND `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 ) + AND (( `item`.`allow_cid` = '' AND `item`.`allow_gid` = '' AND `item`.`deny_cid` = '' AND `item`.`deny_gid` = '' AND `item`.`private` = 0 AND `user`.`hidewall` = 0 ) OR `item`.`uid` = %d ) AND `contact`.`blocked` = 0 AND `contact`.`pending` = 0 $search_alg From 894278dbcc83857a9140a03eb6064c642b5ce293 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 Mar 2012 15:41:06 -0700 Subject: [PATCH 011/100] change default profile photo to something more interesting than a reddish brown square --- images/person-175.jpg | Bin 0 -> 8510 bytes images/person-48.jpg | Bin 0 -> 1274 bytes images/person-80.jpg | Bin 0 -> 2303 bytes include/Photo.php | 6 +++--- include/Scrape.php | 2 +- include/nav.php | 2 +- mod/dfrn_confirm.php | 2 +- mod/notifications.php | 2 +- mod/photo.php | 6 +++--- 9 files changed, 10 insertions(+), 10 deletions(-) create mode 100644 images/person-175.jpg create mode 100644 images/person-48.jpg create mode 100644 images/person-80.jpg diff --git a/images/person-175.jpg b/images/person-175.jpg new file mode 100644 index 0000000000000000000000000000000000000000..fc0ec3d7717347e77b3b101ad91af04c23dcf1be GIT binary patch literal 8510 zcmb7pWl$VI)8>-JAt5+~MZzu?9D;iif&~pO!6CR?aDuypC3u3{;_klalHjno26t!S zc)zRq?ym0sTu;^f=aZ2nh%YiOE3Z#3Zjs2?;4)Q@o<4rlqANCZ~tc(?CEp zv^4(-g7&l&3lr-FHueh|5<(K1|8IHh1Q22aDgYHgGUlSlRNM~2;4+cs>V*on8bkzzpJ|blF;+4f=?dj0r~{Oz;B`oiFl|DxciTbuNEjmv*#34J76+^4z(e$L6}1oYAyXAXKHm zG#qTv`-P;c-mVABR=#!T+x`x{v;4s#6Qdy0tuQ@ktT!C!$gdqZL4ib+z9}u% zUuBd8Ro|^-88Xspd`>R|VZh*pd`t2}LzJ@SV7l*Bq?b+LS&v%eL%;R$zuUa=vAN;_ z$;@rqrYeaet<=@+-dv!wBmxdgPM+kc{GTiG1gS~wK46kVGs)+fbJ}zXrAbtRRi#N@ zlc-8#OOvR+`!9voD?br$7q6nra`@asnu6|50_lcRwfCBL4Z1gf#n^pEhLt6Fc{vQz0znUm$av)?rl zJo}!-i13w}Nw#4)7;HI$^j4DLV$;RXQQ4jL@kq_FloxuZT3CM2udemWbvi8;*k8(g zUU6EW{s^FQ{4FHfD*iFwgil4S{(wsV+F65l^0QP;tH^q68Z&Eau@atEq$aTU*P%1_ zt$J*#o0k($|0sl~VjI^v&ud-u3bSV3>TGdYW-&sSA`ZvVE1FiUW4ge;MXX3~3I1*W zbGU~$2LN;l*S~oL$basu3KV+I58@rmnb8wdo_qXRRjskn^~%x`;Nl=cMD~gMX{tm`vY~qlz#8vl%JX^Kg?+enF2uv zP2i`|4skHHo-J`r5$n6M-^No%Mb8)$%JtfQe5qaRt>&wZ3v%}4trxOrF+5&`4OZNd z?H_Cu4V=8Y3>FZ55B}Kk2zXQ1t9kMWc4 z%3HVySLs%{% zd^HSq>qM}IxVo4-6h_c%re+FmT8Qdfj%=sS9-WkLPWfN9w4L0iEI&->vlJpdW)uqb z5>j#04sNu)P)8T}_s+$C$h0?8#i3Jdo-wBlrbdQ($Mw2px^5$CVb?v{ZXo4Q2mGpg%pc$j-`y(-Z_-F zb%a=a1tTM-eAs+NYxEj~fACKmbk7fUg`aG!SdRF}qO3gXE(g7gkH|X7W(D5|a5-AD z^AG%_q$4xhSch;)svVgg)w zG05$TQ^ho&!LZplF}7Q!UIyY3t_uPEImJeO4(#Jf-yhCc=>Imj?0n}1^0`T~`IQ%u zOx8F;^J-2|&GNie)Ny=!;FGv~nO?;Jl{dP?7vAnoJy9UW9m;g1u@xrnIfRA za!NP!HnW^I%Ttyh?jZ#;^2WME_RBg*4)ZH=D9H_icv6Sp897bqGk}fX9q#b(GfPpb<sIE!GUH!Ihp7bBYf}F%1F+%U5K0?S4d!B;y)5!@NnSH(g{W%Fy^-WG8k;4mQy)ykdit4NKe z%4RwG!)SdLmUv!JHap5=zSun9JKY(nCz@!kfl=TZJJ?L1u;*U9<7Hp`GPYQ%NDnR#pCJ5wtXvpsRU-94E>xHHRyEQIfk0-Qxd1mb)%sLIXnV% zvkh;IvUW^uoiH0ds7jN%=KXJkF!E*O|6+(;{vLM5Rt$?9JLrVbElr)It8{oj-Y}gQ zTeF${t!p%mrcC{nIco``fe4;+W=pB(KLV^I&aXeDw$%H)4UAxW!B1njt!cR?Qh$lc zO;MUCJ79`ataeYc+I;Mt;iIORa8HbbBCct-5oEBG89p%?6}y{`7+r4f>4tb+aY&7mif#QdrfD1O84W?U^@ zdu9>m)FpPwGw+(Y-E6#6TS%B;TSz+(i-Aa^-`g%Qguk8&2inG3La$M~EmMT&dxXzR zc`%V}Dy;*XXQQ_Nw36U!9$ucUuN_IyXScJIQ;PFvM$vl}U(^pFXC!(*IJg*6m95y> ziHS7tQ&CJ)G1Gr?gjkmbDRuhT@UeIc9vEab3fR0+ZN(mJhOudUY-p+w6WBe z{mM+L6boH-y|qextLXjqKU~dT@9+P~+=u{>c)&uEN&~8Ne=+LkAz$fhIzjHd-wU)H zq=S3fO$SCTF;GR*EZe_seA3|EtiR{~z(3}+^%sRL1DXi)vcg=(M!%`Kjn#7e+10W} zKi1YM8q{+=8O*R%FpIW#7PMwMTXl3Yo^Qb5XXDBFcz|X+swccvSMaYM=2WC#X7o%0 z^Y9^RPrp!AdSh}!y#446vnUfsupTa5JQ?WO$z|h@KnV)3h={ZOt z#P;pslvF%)kJ*5lu0JspB)Yydlo%rnk&%JuU;i%ne%K^IwB87O}Keu3r zEYWgnZL8NY{t(M|KP16z_@$}PuTRhFSg$sS#UxYD0&>_B-*vXFr=<(xcS@}2p|S)S zWvrOp(jKU#Io75qtR~$kP`<#e-&dCSv@y;U?i7*l0F`>qm;DEF~mHaPw`l!O}I#s^!MB5)&symt}4uu35NNduYD#BLG=pwU7%+! z6lnzpt_mTX2`);{<{kmo;OTwT_)hS*n8qGf>P^+SErPw13)0~$UOXF_rlw{!;@=4P zFXU?6DXhu+gGp0$Tj=2$<985|G$$UImJRLFS`$x4OtfpH$*TPi%H^{tH{U0orlUsy z$I!f0mm7*y$=znYwf@%Zy@q*PJPny3_I3rApwcoyrs$J_!2F_5Bl2EnfjXvbi{8;? zfVfHmpeUxcRy##U*4%q2L^{42q?3C_F)lNsJ|j({5jp)|b?L{Q$2@BrhpcVwF`3r8 z)1lAdA9*V&kxW?GHxuSA9<}9@3;LJo8r%y!o%Z;uv?D*2v0j2l@b3qUU#iJzxWh{t zx{h~P^Bs*ayKk=c{^fXEmRZl2S5D8zmb!>l{j9=VIo@{`rDDE8+tfZU4F^ZiHH7no zt|rXVa3^%|>b_f9m|KuuplEER*CD?LXUT}|+0RSY1c@I&mCo$Cx;kk%bSTbBu#9SC zcsG*sGUqq6-lb&*@%LY9*P7dl+^}2KrNq@Le*HE4N+RMcz$f4lAntiRfib$4E|`YF zT>@$@bxathINLnW=UlDsE3O*})Zj6Ukb2|n8OIs6%aS5Lp{JcijL!b*gR@|K^3Irj z*i|tmby5<$#aV;7<}gT8#8m3E_HZ*s(=lNr`UGmlB}=z$9M`tvzDxYZDc9*u)w@mX z?MmQ!70S<@EI(JDRrr_$;psVW-*rxu;gdNup?}Fu5>O zz1p6gkMoyRVlNTKcWCVmAQHb6E9$Mx2=L&K!&$^^7uDn^R9f_xsKz`q?pQX8lbDkr z;f-}`N^2L16OF7rR4XTrNsZ!P^fcmQ;;d#TiC}9b zo-VBoI?dmhIVLD8*w-Qv(;qxDUJ$wW3s}!JBrp}g(vkek!=uWpk&^J9JnnAkYP2Zw=`>^JJvhZuRDb8$qUA??&(h3J_0h=`4CQQ zZ>J_xwRuD)?GPQ*<+(z3~6w>B+#XUH~yL{9AS_P+cA3(QES=NO`;d)0Ymc3<)l!o;f zik2J4DZAJWzY{#9Qpntt>^kO>13&z-nX%+F4$}GE6rnns*y21k3!|CXbLzvBL8Dh| zDeywe(z&3Of7f>K>C1KI*87jYFz|w~I^A~83%>aiH2s0rr4nZQkRq+tBe_XBwYQ=5 zi*6>$#cw@^VkH);1kHyId7j<4pjgSjy3OjzJ?Mu(@EUNC)HrwZKbWRDI2M+4mvAEO z|2iJmqa+;ieS!|*Dh-Kp@{r%B8eY)N;fpfnR>2)>sx5*0NvWFo>@jaX zBw}@ATT8^u_Sv^PSyMcB%_f(1=$4YX;BRAR}S~QC0jx%frtPp*L9=uG1ayI)T0OrP7r;{u~?qRU%b5gL0jhwOW(%OvCC+7h2nw=9n+?7koz?*R{1IV}$>S0{f+A%+Ao zqf0qID;h**p=`Wd)0>PU8JmgZZa$dHb_ycx{j@KNqZS3D!jp9*@d7)!blUt2dxlaE zY_Hj1y+!pKuW{We(JgI#I&7zh?p>k$vQ$}x9myOOeLp(uMFNyx7$DV)3)%jL8^s^@ zR&=^Q0-FJOR5ZJQLIiEbOR6r#Gyh9Eh5cwl-j z8d&ruE=I96&8H|fe7BlKiCzG%dc0KnA!~M|=IscBU5c%#Z^K^4Y$bjPLxsjK(7 zuLQ@3K167fs^KihpABrDoR+GQkR2^R7vru&J*C7wi(>!6?NzYLpOKmNu6BVZ?sugH zPDNW9^<#SUVCs#13V7NA7f-z-E7!Y_=2hYF1W&oumHRxj+ih_T15ujo(zTu7k;1;! z``qFuW?Uoo>x(|zXDEDElY78S;PMghMLmk4!OO|b#WBxZ(q44^^kJdBt62S$*E5_K zgG?g2D1v{iGsFA?bIZ2vu*I2{;ZixaR-fm>SrADjxQIPJe6CmyeAUKhL_`5q*GLFo zc*eW)XB^rykL-IQryj(VfHJnPnCN3<>(gmse zanSc#f<>m{Di)CgFs~!-fdI5FN*KRxhaZ)+%^0#_z(rX@R%iSvpddS^Vn_gXQ5ReHu^_<1Lv1@-& z?{E^`S>lB<9CzZcnE9g8mL{@v!0*|dYpwA}?X_tO2sktK)~aze0bM_bl@0uD{P0*W z>vdh!xXNsZ4TSACh@Xy_*?cs1t3G3CCw7qQsxk*=Q>K?$o-5;hOFnNDNVkF&2B}1F zkLP(~xnP70=TDQo1gs&D8K@)m$xy2!UY8Z&!Viypy6-`H(H zHnM=-dH3=mOw%RYOrvyGDXJaNO|1SZuOODrDoVl`iTSuo7@Nyz;m){h5Zl`c7K9@g z8uDS+piT8K{;r18kvoLx%wYuB!11%f?+*>NO#Qczwv|L#m~rge2w9M6Saf!Ri^7$F z0tjY1!v*nUkX;PL!5c9%m3Xz*{<<$Ov9+_?mS9?%lP@mvr(kp%XaCh$dsH7PXGy_s zF-0N#lu}1rB;HT7Jy|%-&lJ=w%|a0qJU})I=T7u~w^nLuiHAI|dgb|L6i%I5xg4H4=r=wi3Vtqq?TUUhyxnZ8VKp{f7 z0j^jTiYTk~s+5yVsoYk=ns^w+n+55x3n0~a8zN2ay^+aB&al;i?sd^NZqyERXuf}@ z7Y(YeMB<6)`Mq3VQ)o1W?<dCy7o zWc6}gR+ph0>bIX*{)p8PS-Vutq#&XU$fNROC2tFfc$W{%TE2~2O~>oECbX8dMtata z(H2S^$!ZD5O#d!=TP+KgoOAo!@~dAM|Ke`r0*T&0&I*>VF;11T9QxiclT2r=8D-8Y z2kPaxq3CzXh~@k=aTMw}Bd4@INk!d{Y-9}Q9x(sd za_{!^q6oRQnrh~j+!KnH5`TRZJ)L)^-`da50IGLO@wrFAeL{Rx|{EMN;vud7SDPsVAD7hwgzthYPY;rNt7PC_WW`PUHWc8p z88=;j-mUhrB_i0?Il9F2JIMDbtNdcMsVL|9cdiX|E$f+Q2Qf|Q_Uu3NlNaSusR0qGMO9s$|qQ$rDSjZ?UTZ+-*uU+%+2 zI}GL9pDNp_q8&0*w=W!rBg@PPv$rhbd$x>(p?q?rs@IP==q+B1U|e?vobtI6C2z#T z=(D9@1Mh>Z8jI$KLNAd4{YBZow0!uE;@`JruRKzOr*k+>nlV(kIz>YIuR#$P`7js5 zrsme>$Xioptl=>xT0gf^V}JJIScQ)oa_NGfqS5Ma`jwCFeCDWM^cI-d%Q5}gD%v&J zn1H@i2(R25^UrB=&9qSPrdY$m=MHh8^N^5`51DF_VmO$Lm%wdFEROa3=NB-^k<6PrCy}tC3s*vOx?D4 z1o)fmzOpJvJd|DMNGz#jNI3&VC!C^+BM~+zVeHiG8xeBwYd!ni)J;`>G8eWPqAJrx z>f;{MEmr%>L+#oqR@sv-7893IFO+hB;e;}tyUAA!xcahO#2}xD)jE|-#d@OiABWYB z%)Ex!x9o%`%zyxQ3Z%pgMOkxj^*pl0BTI0QBHC6=N$9?$scMF!wrS)gFWiuEec0qAF!A`B7_4GQteF5S~@{tM~#E1Esb`*>G;m+Eb zi2N{1&C-miA~Q^K6WkT|oUgPINa0rr?jZi8jS;=EiY0n$$^>IYWF0|xAo@%(?>(D> zcpL9FKYLUU`xb~^+LG9e3}~Hs+s4mRnHMG;oicZ*RN-b&-x# zk7)e%><2t=aqC~kb?PprhNL^!-*_C>W?y3&GP&n1IJok zlqbt?e^_RRjW|xstSaQYP}~V`ephhbO6E*nVDBYNKAZtnW3jmw^AD1 z-x#D}X`J}pu|QNI*6U)FLsO2#o;`jcZru9#On=UO!67r?VyTebj){4P2FD0nRHyUC zt)F#4zy+3CrKX-y?6c41GJ~?=YJ!d_U%5hfpLYSD{vanDmg*AMqytA1Fjnm{2(yvU z{$dkbwU^hi`i}qwm<-t5!V;Q(d#1<#$|qFtka}ukj7WkVaeup3-qC|P==E)x;E2xL zP{YafU~>Pm6MnwHIbITF1xcI@?lN8x!}@jJRX{VkSMkdl+F-n)ie_6K&{v&jisf)( j`OPv^U}_x7(|-Ui(7gL=%z$4IsU5{$J8}5#aqfQrlW=fV literal 0 HcmV?d00001 diff --git a/images/person-48.jpg b/images/person-48.jpg new file mode 100644 index 0000000000000000000000000000000000000000..dc5eb6e6929835587e4e47a17b7d418c571502a6 GIT binary patch literal 1274 zcmex=582{JIV7_url1}3rzHwqPg5DS{P@ZkSj3_L))m;{*x8SEK$R$U8^c$_KQ zw5Ta!-T{8A+rGbN7~U>7nE52*=`q_MvWYr!2Ga!H{ziYDUG#qL^#IMRbtctioU)oL zl+;8^W#=VXZ8l(NwH4nW=T~cdw|ag?(D~rhJE0*{j_YZr7JQt3KIT}_en|$I%1cYO zA389p+xTh3v5gP(^JX4D{`X37Nz`}Kl&PD7EKiX61tfO1B?3b{1$O4wHsiHy*g^&L;7(aLAjbc4~$jI@G`_?wbDNT&*JFGlQ zcHPb`Tr*wjRh4UUtI-MZiQgpO)!pijxAoW%aM|xluWHG}h1v(b7AF3#lz$;xuyci* z%kf1jzB6Ps)fncjxs~y)@8?c;(ZmHyLi(aIHlGkJ@?-eMJMo{%^_RJ_X3y?S)^$=g zIsQ`7=i^^@sjRPIk8AJUZq@UbV5{JoI?>)qDdnU8_Tc8v*VV0FZ%tag!Pzy?TcP2S z$n+UGLPtL7K0asoC*zr}zq8-Oy9J?(iV{y}{rN2LYd+uV!y=uZ8@cwyXMg;0PcL*? z)3ob3%eDtPZMYolw(&@p6)+iiZ85nSw=VZ~?>>{g;i{}rJvNi{C6;_osLzlqZd|0x z8>?HYQ(6*gaOLu;J&UKQ^Yz&tl;vB0ImByT!^(8sZ6B9}PFeS4p$XIR!e8GT+*iLZ z-If1x6u4zlL7&5cbcy$G-+sTszfv${$>}#O z`~0Uio|to`NBYgCp{C2rZsk}T#e);8YU&hn};yRD#&p)ATyz=Qa?X962bEml5 zUGKPiydXw-=SgqVkYcxUcO1glSxV(@*#62m`@?(R^~mi@LNgNjmEv1G^E>}J;=?hrzBjE5; qQm&+_PSRH|JcZvanwKLzO~pM`*q@}-h~2aQe-i-G>hqBR literal 0 HcmV?d00001 diff --git a/images/person-80.jpg b/images/person-80.jpg new file mode 100644 index 0000000000000000000000000000000000000000..75b8faf9227a2acd62f9f9e76b92158dd36008fd GIT binary patch literal 2303 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 literal 0 HcmV?d00001 diff --git a/include/Photo.php b/include/Photo.php index 1450374ffc..4d02b5c651 100755 --- a/include/Photo.php +++ b/include/Photo.php @@ -268,9 +268,9 @@ function import_profile_photo($photo,$uid,$cid) { $photo_failure = true; if($photo_failure) { - $photo = $a->get_baseurl() . '/images/default-profile.jpg'; - $thumb = $a->get_baseurl() . '/images/default-profile-sm.jpg'; - $micro = $a->get_baseurl() . '/images/default-profile-mm.jpg'; + $photo = $a->get_baseurl() . '/images/person-175.jpg'; + $thumb = $a->get_baseurl() . '/images/person-80.jpg'; + $micro = $a->get_baseurl() . '/images/person-48.jpg'; } return(array($photo,$thumb,$micro)); diff --git a/include/Scrape.php b/include/Scrape.php index 8344aa7373..9c237916bc 100755 --- a/include/Scrape.php +++ b/include/Scrape.php @@ -684,7 +684,7 @@ function probe_url($url, $mode = PROBE_NORMAL) { if(! x($vcard,'photo')) { $a = get_app(); - $vcard['photo'] = $a->get_baseurl() . '/images/default-profile.jpg' ; + $vcard['photo'] = $a->get_baseurl() . '/images/person-175.jpg' ; } if(! $profile) diff --git a/include/nav.php b/include/nav.php index e280818399..f40e92dbce 100755 --- a/include/nav.php +++ b/include/nav.php @@ -55,7 +55,7 @@ function nav(&$a) { // user info $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid'])); $userinfo = array( - 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl($ssl_state)."/images/default-profile-mm.jpg"), + 'icon' => (count($r) ? $r[0]['micro']: $a->get_baseurl($ssl_state)."/images/person-48.jpg"), 'name' => $a->user['username'], ); diff --git a/mod/dfrn_confirm.php b/mod/dfrn_confirm.php index 2f4fb70452..efb5be3a41 100644 --- a/mod/dfrn_confirm.php +++ b/mod/dfrn_confirm.php @@ -655,7 +655,7 @@ function dfrn_confirm_post(&$a,$handsfree = null) { if(count($r)) $photo = $r[0]['photo']; else - $photo = $a->get_baseurl() . '/images/default-profile.jpg'; + $photo = $a->get_baseurl() . '/images/person-175.jpg'; require_once("Photo.php"); diff --git a/mod/notifications.php b/mod/notifications.php index d478b51634..633d7d4ecf 100755 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -143,7 +143,7 @@ function notifications_content(&$a) { '$intro_id' => $rr['intro_id'], '$madeby' => sprintf( t('suggested by %s'),$rr['name']), '$contact_id' => $rr['contact-id'], - '$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/default-profile.jpg"), + '$photo' => ((x($rr,'fphoto')) ? $rr['fphoto'] : "images/person-175.jpg"), '$fullname' => $rr['fname'], '$url' => $rr['furl'], '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), diff --git a/mod/photo.php b/mod/photo.php index c4a93769af..4afdd366a4 100755 --- a/mod/photo.php +++ b/mod/photo.php @@ -23,7 +23,7 @@ function photo_init(&$a) { // NOTREACHED } - $default = 'images/default-profile.jpg'; + $default = 'images/person-175.jpg'; if(isset($type)) { @@ -39,12 +39,12 @@ function photo_init(&$a) { break; case 'micro': $resolution = 6; - $default = 'images/default-profile-mm.jpg'; + $default = 'images/person-48.jpg'; break; case 'avatar': default: $resolution = 5; - $default = 'images/default-profile-sm.jpg'; + $default = 'images/person-80.jpg'; break; } From a72a23b6d6e2bf82bbeac04db52ac2fa6f9e231f Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 Mar 2012 15:43:34 -0700 Subject: [PATCH 012/100] missed a default profile photo replacement in notifications --- mod/notifications.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mod/notifications.php b/mod/notifications.php index 633d7d4ecf..ff131010f0 100755 --- a/mod/notifications.php +++ b/mod/notifications.php @@ -191,7 +191,7 @@ function notifications_content(&$a) { '$uid' => $_SESSION['uid'], '$intro_id' => $rr['intro_id'], '$contact_id' => $rr['contact-id'], - '$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/default-profile.jpg"), + '$photo' => ((x($rr,'photo')) ? $rr['photo'] : "images/person-175.jpg"), '$fullname' => $rr['name'], '$hidden' => array('hidden', t('Hide this contact from others'), ($rr['hidden'] == 1), ''), '$activity' => array('activity', t('Post a new friend activity'), 1, t('if applicable')), From ef33cfcc9a30b7e457c94d772a520162cd6b7a35 Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 Mar 2012 16:05:32 -0700 Subject: [PATCH 013/100] move friend suggestions to top of contact page, add default contact profile photos if missing --- mod/contacts.php | 5 +++++ mod/photo.php | 20 ++++++++++++++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/mod/contacts.php b/mod/contacts.php index 78c8d40928..8aa51d00ae 100755 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -395,6 +395,11 @@ function contacts_content(&$a) { $nets = ((x($_GET,'nets')) ? notags(trim($_GET['nets'])) : ''); $tabs = array( + array( + 'label' => t('Suggestions'), + 'url' => $a->get_baseurl(true) . '/suggest', + 'sel' => '', + ), array( 'label' => t('All Contacts'), 'url' => $a->get_baseurl(true) . '/contacts/all', diff --git a/mod/photo.php b/mod/photo.php index 4afdd366a4..3a70251200 100755 --- a/mod/photo.php +++ b/mod/photo.php @@ -115,8 +115,24 @@ function photo_init(&$a) { } if(! isset($data)) { - killme(); - // NOTREACHED + if(isset($resolution)) { + switch($resolution) { + + case 4: + $data = file_get_contents('images/person-175.jpg'); + break; + case 5: + $data = file_get_contents('images/person-80.jpg'); + break; + case 6: + $data = file_get_contents('images/person-48.jpg'); + break; + default: + killme(); + // NOTREACHED + break; + } + } } if(isset($customres) && $customres > 0 && $customres < 500) { From 810e69ef0a88a959ce9f5358377cdc1c7d4bd53a Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 Mar 2012 19:06:26 -0700 Subject: [PATCH 015/100] more friend suggestions --- include/socgraph.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/socgraph.php b/include/socgraph.php index 79d7340a4e..b2f5455094 100755 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -230,7 +230,7 @@ function all_friends($uid,$cid,$start = 0, $limit = 80) { -function suggestion_query($uid, $start = 0, $limit = 40) { +function suggestion_query($uid, $start = 0, $limit = 80) { if(! $uid) return array(); From f55779fd831029f764c885bf1fd026a7e94f08eb Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 20 Mar 2012 20:47:31 -0700 Subject: [PATCH 016/100] update tinymce to 3.5b2 to fix issues with FF 11 and pasting into code blocks --- .../plugins.bbcode.editor_plugin_src.js | 258 + .../mcefixes/themes.advanced.img.icons.gif | Bin 0 -> 11776 bytes .../themes.advanced.skins.default.dialog.css | 117 + .../themes.advanced.skins.default.ui.css | 213 + library/tinymce/changelog.txt | 453 + library/tinymce/examples/accessibility.html | 101 + library/tinymce/examples/css/content.css | 0 library/tinymce/examples/css/word.css | 0 library/tinymce/examples/custom_formats.html | 8 +- library/tinymce/examples/full.html | 31 +- library/tinymce/examples/index.html | 0 library/tinymce/examples/lists/image_list.js | 0 library/tinymce/examples/lists/link_list.js | 0 library/tinymce/examples/lists/media_list.js | 6 +- .../tinymce/examples/lists/template_list.js | 0 library/tinymce/examples/media/logo.jpg | Bin library/tinymce/examples/media/logo_over.jpg | Bin library/tinymce/examples/media/sample.avi | Bin library/tinymce/examples/media/sample.dcr | Bin library/tinymce/examples/media/sample.flv | Bin 0 -> 88722 bytes library/tinymce/examples/media/sample.mov | Bin library/tinymce/examples/media/sample.ram | 0 library/tinymce/examples/media/sample.rm | Bin library/tinymce/examples/media/sample.swf | Bin library/tinymce/examples/menu.html | 3 +- library/tinymce/examples/simple.html | 6 +- library/tinymce/examples/skins.html | 14 +- .../tinymce/examples/templates/layout1.htm | 0 .../tinymce/examples/templates/snippet1.htm | 0 library/tinymce/examples/translate.html | 80 - library/tinymce/examples/word.html | 11 +- library/tinymce/jscripts/tiny_mce/langs/en.js | 171 +- library/tinymce/jscripts/tiny_mce/license.txt | 0 .../tiny_mce/plugins/advhr/css/advhr.css | 0 .../tiny_mce/plugins/advhr/editor_plugin.js | 0 .../plugins/advhr/editor_plugin_src.js | 0 .../tiny_mce/plugins/advhr/js/rule.js | 0 .../tiny_mce/plugins/advhr/langs/en_dlg.js | 6 +- .../jscripts/tiny_mce/plugins/advhr/rule.htm | 59 +- .../plugins/advimage/css/advimage.css | 0 .../plugins/advimage/editor_plugin.js | 2 +- .../plugins/advimage/editor_plugin_src.js | 2 +- .../tiny_mce/plugins/advimage/image.htm | 65 +- .../tiny_mce/plugins/advimage/img/sample.gif | Bin .../tiny_mce/plugins/advimage/js/image.js | 45 +- .../tiny_mce/plugins/advimage/langs/en_dlg.js | 44 +- .../tiny_mce/plugins/advlink/css/advlink.css | 0 .../tiny_mce/plugins/advlink/editor_plugin.js | 0 .../plugins/advlink/editor_plugin_src.js | 0 .../tiny_mce/plugins/advlink/js/advlink.js | 49 +- .../tiny_mce/plugins/advlink/langs/en_dlg.js | 53 +- .../tiny_mce/plugins/advlink/link.htm | 65 +- .../tiny_mce/plugins/advlist/editor_plugin.js | 2 +- .../plugins/advlist/editor_plugin_src.js | 40 +- .../plugins/autolink/editor_plugin.js | 1 + .../plugins/autolink/editor_plugin_src.js | 174 + .../plugins/autoresize/editor_plugin.js | 2 +- .../plugins/autoresize/editor_plugin_src.js | 72 +- .../plugins/autosave/editor_plugin.js | 2 +- .../plugins/autosave/editor_plugin_src.js | 23 +- .../tiny_mce/plugins/autosave/langs/en.js | 0 .../tiny_mce/plugins/bbcode/editor_plugin.js | 156 +- .../plugins/bbcode/editor_plugin_cmp.js | 1 - .../plugins/bbcode/editor_plugin_src.js | 0 .../plugins/contextmenu/editor_plugin.js | 2 +- .../plugins/contextmenu/editor_plugin_src.js | 56 +- .../plugins/directionality/editor_plugin.js | 0 .../directionality/editor_plugin_src.js | 0 .../plugins/emotions/editor_plugin.js | 0 .../plugins/emotions/editor_plugin_src.js | 0 .../tiny_mce/plugins/emotions/emotions.htm | 62 +- .../plugins/emotions/img/smiley-cool.gif | Bin .../plugins/emotions/img/smiley-cry.gif | Bin .../emotions/img/smiley-embarassed.gif | Bin .../emotions/img/smiley-foot-in-mouth.gif | Bin 344 -> 342 bytes .../plugins/emotions/img/smiley-frown.gif | Bin .../plugins/emotions/img/smiley-innocent.gif | Bin .../plugins/emotions/img/smiley-kiss.gif | Bin .../plugins/emotions/img/smiley-laughing.gif | Bin 344 -> 343 bytes .../emotions/img/smiley-money-mouth.gif | Bin .../plugins/emotions/img/smiley-sealed.gif | Bin 325 -> 323 bytes .../plugins/emotions/img/smiley-smile.gif | Bin 345 -> 344 bytes .../plugins/emotions/img/smiley-surprised.gif | Bin 342 -> 338 bytes .../emotions/img/smiley-tongue-out.gif | Bin .../plugins/emotions/img/smiley-undecided.gif | Bin .../plugins/emotions/img/smiley-wink.gif | Bin 351 -> 350 bytes .../plugins/emotions/img/smiley-yell.gif | Bin .../tiny_mce/plugins/emotions/js/emotions.js | 21 + .../tiny_mce/plugins/emotions/langs/en_dlg.js | 21 +- .../tiny_mce/plugins/example/dialog.htm | 0 .../tiny_mce/plugins/example/editor_plugin.js | 0 .../plugins/example/editor_plugin_src.js | 0 .../tiny_mce/plugins/example/img/example.gif | Bin .../tiny_mce/plugins/example/js/dialog.js | 0 .../tiny_mce/plugins/example/langs/en.js | 0 .../tiny_mce/plugins/example/langs/en_dlg.js | 0 .../example_dependency/editor_plugin.js | 1 + .../example_dependency/editor_plugin_src.js | 50 + .../plugins/fullpage/css/fullpage.css | 45 +- .../plugins/fullpage/editor_plugin.js | 2 +- .../plugins/fullpage/editor_plugin_src.js | 384 +- .../tiny_mce/plugins/fullpage/fullpage.htm | 348 +- .../tiny_mce/plugins/fullpage/js/fullpage.js | 613 +- .../tiny_mce/plugins/fullpage/langs/en_dlg.js | 86 +- .../plugins/fullscreen/editor_plugin.js | 2 +- .../plugins/fullscreen/editor_plugin_src.js | 16 +- .../plugins/fullscreen/fullscreen.htm | 3 +- .../tiny_mce/plugins/iespell/editor_plugin.js | 0 .../plugins/iespell/editor_plugin_src.js | 0 .../plugins/inlinepopups/editor_plugin.js | 2 +- .../plugins/inlinepopups/editor_plugin_src.js | 96 +- .../skins/clearlooks2/img/alert.gif | Bin 818 -> 810 bytes .../skins/clearlooks2/img/button.gif | Bin 280 -> 272 bytes .../skins/clearlooks2/img/buttons.gif | Bin .../skins/clearlooks2/img/confirm.gif | Bin 915 -> 907 bytes .../skins/clearlooks2/img/corners.gif | Bin 911 -> 909 bytes .../skins/clearlooks2/img/horizontal.gif | Bin .../skins/clearlooks2/img/vertical.gif | Bin 92 -> 84 bytes .../inlinepopups/skins/clearlooks2/window.css | 2 +- .../plugins/inlinepopups/template.htm | 0 .../plugins/insertdatetime/editor_plugin.js | 0 .../insertdatetime/editor_plugin_src.js | 0 .../tiny_mce/plugins/layer/editor_plugin.js | 2 +- .../plugins/layer/editor_plugin_src.js | 60 +- .../plugins/legacyoutput/editor_plugin.js | 2 +- .../plugins/legacyoutput/editor_plugin_src.js | 57 +- .../tiny_mce/plugins/lists/editor_plugin.js | 1 + .../plugins/lists/editor_plugin_src.js | 951 ++ .../tiny_mce/plugins/media/css/content.css | 6 - .../tiny_mce/plugins/media/css/media.css | 9 +- .../tiny_mce/plugins/media/editor_plugin.js | 2 +- .../plugins/media/editor_plugin_src.js | 1096 +- .../tiny_mce/plugins/media/img/flash.gif | Bin 241 -> 0 bytes .../tiny_mce/plugins/media/img/flv_player.swf | Bin 11668 -> 0 bytes .../tiny_mce/plugins/media/img/quicktime.gif | Bin 303 -> 0 bytes .../tiny_mce/plugins/media/img/shockwave.gif | Bin 387 -> 0 bytes .../tiny_mce/plugins/media/js/embed.js | 0 .../tiny_mce/plugins/media/js/media.js | 1046 +- .../tiny_mce/plugins/media/langs/en_dlg.js | 104 +- .../jscripts/tiny_mce/plugins/media/media.htm | 687 +- .../tiny_mce/plugins/media/moxieplayer.swf | Bin 0 -> 19980 bytes .../plugins/nonbreaking/editor_plugin.js | 2 +- .../plugins/nonbreaking/editor_plugin_src.js | 7 +- .../plugins/noneditable/editor_plugin.js | 2 +- .../plugins/noneditable/editor_plugin_src.js | 452 +- .../plugins/pagebreak/css/content.css | 1 - .../plugins/pagebreak/editor_plugin.js | 2 +- .../plugins/pagebreak/editor_plugin_src.js | 5 +- .../tiny_mce/plugins/pagebreak/img/trans.gif | Bin 43 -> 0 bytes .../tiny_mce/plugins/paste/editor_plugin.js | 2 +- .../plugins/paste/editor_plugin_src.js | 395 +- .../tiny_mce/plugins/paste/js/pastetext.js | 0 .../tiny_mce/plugins/paste/js/pasteword.js | 0 .../tiny_mce/plugins/paste/langs/en_dlg.js | 6 +- .../tiny_mce/plugins/paste/pastetext.htm | 0 .../tiny_mce/plugins/paste/pasteword.htm | 0 .../tiny_mce/plugins/preview/editor_plugin.js | 0 .../plugins/preview/editor_plugin_src.js | 0 .../tiny_mce/plugins/preview/example.html | 0 .../plugins/preview/jscripts/embed.js | 0 .../tiny_mce/plugins/preview/preview.html | 0 .../tiny_mce/plugins/print/editor_plugin.js | 0 .../plugins/print/editor_plugin_src.js | 0 .../tiny_mce/plugins/save/editor_plugin.js | 0 .../plugins/save/editor_plugin_src.js | 0 .../searchreplace/css/searchreplace.css | 0 .../plugins/searchreplace/editor_plugin.js | 2 +- .../searchreplace/editor_plugin_src.js | 4 + .../plugins/searchreplace/js/searchreplace.js | 24 +- .../plugins/searchreplace/langs/en_dlg.js | 17 +- .../plugins/searchreplace/searchreplace.htm | 33 +- .../plugins/spellchecker/css/content.css | 0 .../plugins/spellchecker/editor_plugin.js | 2 +- .../plugins/spellchecker/editor_plugin_src.js | 155 +- .../plugins/spellchecker/img/wline.gif | Bin .../tiny_mce/plugins/style/css/props.css | 1 + .../tiny_mce/plugins/style/editor_plugin.js | 2 +- .../plugins/style/editor_plugin_src.js | 22 +- .../tiny_mce/plugins/style/js/props.js | 90 +- .../tiny_mce/plugins/style/langs/en_dlg.js | 64 +- .../jscripts/tiny_mce/plugins/style/props.htm | 908 +- .../tiny_mce/plugins/style/readme.txt | 19 + .../plugins/tabfocus/editor_plugin.js | 2 +- .../plugins/tabfocus/editor_plugin_src.js | 234 +- .../jscripts/tiny_mce/plugins/table/cell.htm | 30 +- .../tiny_mce/plugins/table/css/cell.css | 0 .../tiny_mce/plugins/table/css/row.css | 0 .../tiny_mce/plugins/table/css/table.css | 0 .../tiny_mce/plugins/table/editor_plugin.js | 2 +- .../plugins/table/editor_plugin_src.js | 2553 ++-- .../tiny_mce/plugins/table/js/cell.js | 53 +- .../tiny_mce/plugins/table/js/merge_cells.js | 0 .../jscripts/tiny_mce/plugins/table/js/row.js | 36 +- .../tiny_mce/plugins/table/js/table.js | 88 +- .../tiny_mce/plugins/table/langs/en_dlg.js | 75 +- .../tiny_mce/plugins/table/merge_cells.htm | 22 +- .../jscripts/tiny_mce/plugins/table/row.htm | 21 +- .../jscripts/tiny_mce/plugins/table/table.htm | 107 +- .../tiny_mce/plugins/template/blank.htm | 0 .../plugins/template/css/template.css | 0 .../plugins/template/editor_plugin.js | 0 .../plugins/template/editor_plugin_src.js | 0 .../tiny_mce/plugins/template/js/template.js | 2 +- .../tiny_mce/plugins/template/langs/en_dlg.js | 16 +- .../tiny_mce/plugins/template/template.htm | 0 .../plugins/visualblocks/css/visualblocks.css | 19 + .../plugins/visualblocks/editor_plugin.js | 1 + .../plugins/visualblocks/editor_plugin_src.js | 63 + .../plugins/visualchars/editor_plugin.js | 2 +- .../plugins/visualchars/editor_plugin_src.js | 33 +- .../plugins/wordcount/editor_plugin.js | 2 +- .../plugins/wordcount/editor_plugin_src.js | 74 +- .../tiny_mce/plugins/xhtmlxtras/abbr.htm | 11 +- .../tiny_mce/plugins/xhtmlxtras/acronym.htm | 11 +- .../plugins/xhtmlxtras/attributes.htm | 11 +- .../tiny_mce/plugins/xhtmlxtras/cite.htm | 9 +- .../plugins/xhtmlxtras/css/attributes.css | 0 .../tiny_mce/plugins/xhtmlxtras/css/popup.css | 0 .../tiny_mce/plugins/xhtmlxtras/del.htm | 17 +- .../plugins/xhtmlxtras/editor_plugin.js | 2 +- .../plugins/xhtmlxtras/editor_plugin_src.js | 24 +- .../tiny_mce/plugins/xhtmlxtras/ins.htm | 21 +- .../tiny_mce/plugins/xhtmlxtras/js/abbr.js | 0 .../tiny_mce/plugins/xhtmlxtras/js/acronym.js | 0 .../plugins/xhtmlxtras/js/attributes.js | 17 +- .../tiny_mce/plugins/xhtmlxtras/js/cite.js | 0 .../tiny_mce/plugins/xhtmlxtras/js/del.js | 14 +- .../plugins/xhtmlxtras/js/element_common.js | 8 +- .../tiny_mce/plugins/xhtmlxtras/js/ins.js | 17 +- .../plugins/xhtmlxtras/langs/en_dlg.js | 33 +- .../tiny_mce/themes/advanced/about.htm | 8 +- .../tiny_mce/themes/advanced/anchor.htm | 10 +- .../tiny_mce/themes/advanced/charmap.htm | 85 +- .../tiny_mce/themes/advanced/color_picker.htm | 19 +- .../themes/advanced/editor_template.js | 2 +- .../themes/advanced/editor_template_src.js | 431 +- .../tiny_mce/themes/advanced/image.htm | 102 +- .../themes/advanced/img/colorpicker.jpg | Bin 3189 -> 2584 bytes .../tiny_mce/themes/advanced/img/flash.gif | Bin 0 -> 239 bytes .../tiny_mce/themes/advanced/img/icons.gif | Bin .../tiny_mce/themes/advanced/img/iframe.gif | Bin 0 -> 600 bytes .../advanced}/img/pagebreak.gif | Bin .../themes/advanced/img/quicktime.gif | Bin 0 -> 301 bytes .../advanced}/img/realmedia.gif | Bin .../themes/advanced/img/shockwave.gif | Bin 0 -> 384 bytes .../media => themes/advanced}/img/trans.gif | Bin .../tiny_mce/themes/advanced/img/video.gif | Bin 0 -> 597 bytes .../advanced}/img/windowsmedia.gif | Bin .../tiny_mce/themes/advanced/js/about.js | 1 + .../tiny_mce/themes/advanced/js/anchor.js | 13 +- .../tiny_mce/themes/advanced/js/charmap.js | 40 +- .../themes/advanced/js/color_picker.js | 598 +- .../tiny_mce/themes/advanced/js/image.js | 18 +- .../tiny_mce/themes/advanced/js/link.js | 11 +- .../themes/advanced/js/source_editor.js | 50 +- .../tiny_mce/themes/advanced/langs/en.js | 63 +- .../tiny_mce/themes/advanced/langs/en_dlg.js | 52 +- .../tiny_mce/themes/advanced/link.htm | 55 +- .../tiny_mce/themes/advanced/shortcuts.htm | 47 + .../themes/advanced/skins/default/content.css | 32 +- .../themes/advanced/skins/default/dialog.css | 0 .../advanced/skins/default/img/buttons.png | Bin 3274 -> 3133 bytes .../advanced/skins/default/img/items.gif | Bin 70 -> 64 bytes .../advanced/skins/default/img/menu_arrow.gif | Bin .../advanced/skins/default/img/menu_check.gif | Bin .../advanced/skins/default/img/progress.gif | Bin .../advanced/skins/default/img/tabs.gif | Bin 1326 -> 1322 bytes .../themes/advanced/skins/default/ui.css | 0 .../advanced/skins/highcontrast/content.css | 25 + .../advanced/skins/highcontrast/dialog.css | 105 + .../themes/advanced/skins/highcontrast/ui.css | 102 + .../themes/advanced/skins/o2k7/content.css | 16 +- .../themes/advanced/skins/o2k7/dialog.css | 1 + .../advanced/skins/o2k7/img/button_bg.png | Bin 5859 -> 2766 bytes .../skins/o2k7/img/button_bg_black.png | Bin 3736 -> 651 bytes .../skins/o2k7/img/button_bg_silver.png | Bin 5358 -> 2084 bytes .../themes/advanced/skins/o2k7/ui.css | 15 +- .../themes/advanced/skins/o2k7/ui_black.css | 2 +- .../themes/advanced/skins/o2k7/ui_silver.css | 2 +- .../themes/advanced/source_editor.htm | 6 +- .../tiny_mce/themes/simple/editor_template.js | 2 +- .../themes/simple/editor_template_src.js | 3 +- .../tiny_mce/themes/simple/img/icons.gif | Bin 1440 -> 806 bytes .../tiny_mce/themes/simple/langs/en.js | 12 +- .../themes/simple/skins/default/content.css | 0 .../themes/simple/skins/default/ui.css | 0 .../themes/simple/skins/o2k7/content.css | 0 .../simple/skins/o2k7/img/button_bg.png | Bin .../tiny_mce/themes/simple/skins/o2k7/ui.css | 0 library/tinymce/jscripts/tiny_mce/tiny_mce.js | 2 +- .../jscripts/tiny_mce/tiny_mce_popup.js | 2 +- .../tinymce/jscripts/tiny_mce/tiny_mce_src.js | 11522 ++++++++++------ .../tiny_mce/utils/editable_selects.js | 2 +- .../jscripts/tiny_mce/utils/form_utils.js | 18 +- .../tinymce/jscripts/tiny_mce/utils/mctabs.js | 105 +- .../jscripts/tiny_mce/utils/validate.js | 38 +- 296 files changed, 17157 insertions(+), 10477 deletions(-) create mode 100755 library/mcefixes/plugins.bbcode.editor_plugin_src.js create mode 100755 library/mcefixes/themes.advanced.img.icons.gif create mode 100755 library/mcefixes/themes.advanced.skins.default.dialog.css create mode 100755 library/mcefixes/themes.advanced.skins.default.ui.css mode change 100755 => 100644 library/tinymce/changelog.txt create mode 100644 library/tinymce/examples/accessibility.html mode change 100755 => 100644 library/tinymce/examples/css/content.css mode change 100755 => 100644 library/tinymce/examples/css/word.css mode change 100755 => 100644 library/tinymce/examples/custom_formats.html mode change 100755 => 100644 library/tinymce/examples/full.html mode change 100755 => 100644 library/tinymce/examples/index.html mode change 100755 => 100644 library/tinymce/examples/lists/image_list.js mode change 100755 => 100644 library/tinymce/examples/lists/link_list.js mode change 100755 => 100644 library/tinymce/examples/lists/media_list.js mode change 100755 => 100644 library/tinymce/examples/lists/template_list.js mode change 100755 => 100644 library/tinymce/examples/media/logo.jpg mode change 100755 => 100644 library/tinymce/examples/media/logo_over.jpg mode change 100755 => 100644 library/tinymce/examples/media/sample.avi mode change 100755 => 100644 library/tinymce/examples/media/sample.dcr create mode 100644 library/tinymce/examples/media/sample.flv mode change 100755 => 100644 library/tinymce/examples/media/sample.mov mode change 100755 => 100644 library/tinymce/examples/media/sample.ram mode change 100755 => 100644 library/tinymce/examples/media/sample.rm mode change 100755 => 100644 library/tinymce/examples/media/sample.swf mode change 100755 => 100644 library/tinymce/examples/menu.html mode change 100755 => 100644 library/tinymce/examples/simple.html mode change 100755 => 100644 library/tinymce/examples/skins.html mode change 100755 => 100644 library/tinymce/examples/templates/layout1.htm mode change 100755 => 100644 library/tinymce/examples/templates/snippet1.htm delete mode 100755 library/tinymce/examples/translate.html mode change 100755 => 100644 library/tinymce/examples/word.html mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/langs/en.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/license.txt mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advhr/css/advhr.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advhr/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advhr/js/rule.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advhr/langs/en_dlg.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advhr/rule.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advimage/css/advimage.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advimage/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advimage/image.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advimage/img/sample.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advimage/js/image.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advimage/langs/en_dlg.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advlink/css/advlink.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advlink/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advlink/js/advlink.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advlink/langs/en_dlg.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advlink/link.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/advlist/editor_plugin_src.js create mode 100644 library/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin.js create mode 100644 library/tinymce/jscripts/tiny_mce/plugins/autolink/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/autoresize/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/autosave/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/autosave/langs/en.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin.js delete mode 100755 library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_cmp.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/bbcode/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/contextmenu/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/directionality/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/emotions.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cool.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-cry.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-embarassed.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-frown.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-innocent.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-kiss.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-laughing.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-sealed.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-smile.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-surprised.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-undecided.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-wink.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/img/smiley-yell.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/js/emotions.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/emotions/langs/en_dlg.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/example/dialog.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/example/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/example/img/example.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/example/js/dialog.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/example/langs/en.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/example/langs/en_dlg.js create mode 100644 library/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin.js create mode 100644 library/tinymce/jscripts/tiny_mce/plugins/example_dependency/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/fullpage/css/fullpage.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/fullpage/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/fullpage/fullpage.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/fullpage/js/fullpage.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/fullpage/langs/en_dlg.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/fullscreen/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/fullscreen/fullscreen.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/iespell/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/inlinepopups/template.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/insertdatetime/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/layer/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/legacyoutput/editor_plugin_src.js create mode 100644 library/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin.js create mode 100644 library/tinymce/jscripts/tiny_mce/plugins/lists/editor_plugin_src.js delete mode 100755 library/tinymce/jscripts/tiny_mce/plugins/media/css/content.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/media/css/media.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/media/editor_plugin_src.js delete mode 100755 library/tinymce/jscripts/tiny_mce/plugins/media/img/flash.gif delete mode 100755 library/tinymce/jscripts/tiny_mce/plugins/media/img/flv_player.swf delete mode 100755 library/tinymce/jscripts/tiny_mce/plugins/media/img/quicktime.gif delete mode 100755 library/tinymce/jscripts/tiny_mce/plugins/media/img/shockwave.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/media/js/embed.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/media/js/media.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/media/langs/en_dlg.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/media/media.htm create mode 100644 library/tinymce/jscripts/tiny_mce/plugins/media/moxieplayer.swf mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/nonbreaking/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/noneditable/editor_plugin_src.js delete mode 100755 library/tinymce/jscripts/tiny_mce/plugins/pagebreak/css/content.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/pagebreak/editor_plugin_src.js delete mode 100755 library/tinymce/jscripts/tiny_mce/plugins/pagebreak/img/trans.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/paste/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/paste/js/pastetext.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/paste/js/pasteword.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/paste/langs/en_dlg.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/paste/pastetext.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/paste/pasteword.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/preview/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/preview/example.html mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/preview/jscripts/embed.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/preview/preview.html mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/print/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/save/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/searchreplace/css/searchreplace.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/searchreplace/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/searchreplace/js/searchreplace.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/searchreplace/langs/en_dlg.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/searchreplace/searchreplace.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/spellchecker/css/content.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/spellchecker/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/spellchecker/img/wline.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/style/css/props.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/style/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/style/js/props.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/style/langs/en_dlg.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/style/props.htm create mode 100644 library/tinymce/jscripts/tiny_mce/plugins/style/readme.txt mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/tabfocus/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/table/cell.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/table/css/cell.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/table/css/row.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/table/css/table.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/table/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/table/js/cell.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/table/js/merge_cells.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/table/js/row.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/table/js/table.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/table/langs/en_dlg.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/table/merge_cells.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/table/row.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/table/table.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/template/blank.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/template/css/template.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/template/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/template/js/template.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/template/langs/en_dlg.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/template/template.htm create mode 100644 library/tinymce/jscripts/tiny_mce/plugins/visualblocks/css/visualblocks.css create mode 100644 library/tinymce/jscripts/tiny_mce/plugins/visualblocks/editor_plugin.js create mode 100644 library/tinymce/jscripts/tiny_mce/plugins/visualblocks/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/visualchars/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/wordcount/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/abbr.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/acronym.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/attributes.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/cite.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/attributes.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/css/popup.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/del.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/ins.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/abbr.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/acronym.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/attributes.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/cite.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/del.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/element_common.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/js/ins.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/about.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/anchor.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/charmap.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/color_picker.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/editor_template_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/image.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/img/colorpicker.jpg create mode 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/img/flash.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/img/icons.gif create mode 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/img/iframe.gif rename library/tinymce/jscripts/tiny_mce/{plugins/pagebreak => themes/advanced}/img/pagebreak.gif (100%) mode change 100755 => 100644 create mode 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/img/quicktime.gif rename library/tinymce/jscripts/tiny_mce/{plugins/media => themes/advanced}/img/realmedia.gif (100%) mode change 100755 => 100644 create mode 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/img/shockwave.gif rename library/tinymce/jscripts/tiny_mce/{plugins/media => themes/advanced}/img/trans.gif (100%) mode change 100755 => 100644 create mode 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/img/video.gif rename library/tinymce/jscripts/tiny_mce/{plugins/media => themes/advanced}/img/windowsmedia.gif (100%) mode change 100755 => 100644 mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/js/about.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/js/anchor.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/js/charmap.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/js/color_picker.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/js/image.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/js/link.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/js/source_editor.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/langs/en.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/langs/en_dlg.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/link.htm create mode 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/shortcuts.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/content.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/dialog.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/buttons.png mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/items.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/menu_check.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/progress.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/img/tabs.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/default/ui.css create mode 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/content.css create mode 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/dialog.css create mode 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/highcontrast/ui.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/content.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/dialog.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_black.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/advanced/source_editor.htm mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/simple/editor_template.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/simple/editor_template_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/simple/img/icons.gif mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/simple/langs/en.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/simple/skins/default/content.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/simple/skins/default/ui.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/content.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/themes/simple/skins/o2k7/ui.css mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/tiny_mce.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/tiny_mce_popup.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/tiny_mce_src.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/utils/editable_selects.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/utils/form_utils.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/utils/mctabs.js mode change 100755 => 100644 library/tinymce/jscripts/tiny_mce/utils/validate.js diff --git a/library/mcefixes/plugins.bbcode.editor_plugin_src.js b/library/mcefixes/plugins.bbcode.editor_plugin_src.js new file mode 100755 index 0000000000..183f2bc68d --- /dev/null +++ b/library/mcefixes/plugins.bbcode.editor_plugin_src.js @@ -0,0 +1,258 @@ +/** + * editor_plugin_src.js + * + * Copyright 2009, Moxiecode Systems AB + * Released under LGPL License. + * + * License: http://tinymce.moxiecode.com/license + * Contributing: http://tinymce.moxiecode.com/contributing + */ + +/* Macgirvin Aug-2010 changed from punbb to dfrn dialect */ + +(function() { + tinymce.create('tinymce.plugins.BBCodePlugin', { + init : function(ed, url) { + var t = this, dialect = ed.getParam('bbcode_dialect', 'dfrn').toLowerCase(); + + ed.onBeforeSetContent.add(function(ed, o) { + o.content = t['_' + dialect + '_bbcode2html'](o.content); + }); + + ed.onPostProcess.add(function(ed, o) { + if (o.set) + o.content = t['_' + dialect + '_bbcode2html'](o.content); + + if (o.get) + o.content = t['_' + dialect + '_html2bbcode'](o.content); + }); + }, + + getInfo : function() { + return { + longname : 'BBCode Plugin', + author : 'Moxiecode Systems AB', + authorurl : 'http://tinymce.moxiecode.com', + infourl : 'http://wiki.moxiecode.com/index.php/TinyMCE:Plugins/bbcode', + version : tinymce.majorVersion + "." + tinymce.minorVersion + }; + }, + + // Private methods + + // HTML -> BBCode in DFRN dialect + _dfrn_html2bbcode : function(s) { + s = tinymce.trim(s); + + function rep(re, str) { + + //modify code to keep stuff intact within [code][/code] blocks + //Waitman Gobble NO WARRANTY + + + var o = new Array(); + var x = s.split("[code]"); + var i = 0; + + var si = ""; + si = x.shift(); + si = si.replace(re,str); + o.push(si); + + for (i = 0; i < x.length; i++) { + var no = new Array(); + var j = x.shift(); + var g = j.split("[/code]"); + no.push(g.shift()); + si = g.shift(); + si = si.replace(re,str); + no.push(si); + o.push(no.join("[/code]")); + } + + s = o.join("[code]"); + + }; + + + + + /* oembed */ + function _h2b_cb(match) { + /* + function s_h2b(data) { + match = data; + } + $.ajax({ + type:"POST", + url: 'oembed/h2b', + data: {text: match}, + async: false, + success: s_h2b, + dataType: 'html' + }); + */ + + var f, g, tof = [], tor = []; + var find_spanc = /]*class *= *[\"'](?:[^\"']* )*oembed(?: [^\"']*)*[\"'][^>]*>(.*?(?:]*>(.*?)<\/span *>)*.*?)<\/span *>/ig; + while (f = find_spanc.exec(match)) { + var find_a = /]* rel=[\"']oembed[\"'][^>]*)>.*?<\/a *>/ig; + if (g = find_a.exec(f[1])) { + var find_href = /href=[\"']([^\"']*)[\"']/ig; + var m2 = find_href.exec(g[1]); + if (m2[1]) { + tof.push(f[0]); + tor.push("[EMBED]" + m2[1] + "[/EMBED]"); + } + } + } + for (var i = 0; i < tof.length; i++) match = match.replace(tof[i], tor[i]); + + return match; + } + if (s.indexOf('class="oembed')>=0){ + //alert("request oembed html2bbcode"); + s = _h2b_cb(s); + } + + /* /oembed */ + + + // example: to [b] + rep(/(.*?)<\/a>/gi,"[bookmark=$1]$2[/bookmark]"); + rep(/(.*?)<\/a>/gi,"[url=$1]$2[/url]"); + rep(/(.*?)<\/span>/gi,"[size=$1]$2[/size]"); + rep(/(.*?)<\/span>/gi,"[color=$1]$2[/color]"); + rep(/(.*?)<\/font>/gi,"$1"); + rep(//gi,"[img=$1x$2]$3[/img]"); + rep(//gi,"[img=$2x$1]$3[/img]"); + rep(//gi,"[img=$3x$2]$1[/img]"); + rep(//gi,"[img=$2x$3]$1[/img]"); + rep(//gi,"[img]$1[/img]"); + + rep(/