Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1:/tmp/cvs-serv26176 Modified Files: serendipity_editor.js serendipity_functions_config.inc.php serendipity_lang_es.inc.php serendipity_rss_exchange.inc.php Log Message: ...take a wild guess...: XHTML conformance, code style. Index: serendipity_editor.js =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_editor.js,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- serendipity_editor.js 8 Jul 2003 09:13:27 -0000 1.3 +++ serendipity_editor.js 8 Jul 2003 12:10:09 -0000 1.4 @@ -2,109 +2,115 @@ /* $Id$ */ /* - Written by chris wetherell - http://www.massless.org - chris [THE AT SIGN] massless.org - - warning: it only works for IE4+/Win and Moz1.1+ - feel free to take it for your site - if there are any problems, let chris know. + Written by chris wetherell + http://www.massless.org + chris [THE AT SIGN] massless.org + + warning: it only works for IE4+/Win and Moz1.1+ + feel free to take it for your site + if there are any problems, let chris know. */ - + var thisForm; function getMozSelection(txtarea) { - var selLength = txtarea.textLength; - var selStart = txtarea.selectionStart; - var selEnd = txtarea.selectionEnd; - if (selEnd==1 || selEnd==2) selEnd=selLength; - return (txtarea.value).substring(selStart, selEnd); + var selLength = txtarea.textLength; + var selStart = txtarea.selectionStart; + var selEnd = txtarea.selectionEnd; + if (selEnd==1 || selEnd==2) { + selEnd=selLength; + } + return (txtarea.value).substring(selStart, selEnd); } function mozWrap(txtarea, lft, rgt) { - var selLength = txtarea.textLength; - var selStart = txtarea.selectionStart; - var selEnd = txtarea.selectionEnd; - if (selEnd==1 || selEnd==2) selEnd=selLength; - var s1 = (txtarea.value).substring(0,selStart); - var s2 = (txtarea.value).substring(selStart, selEnd) - var s3 = (txtarea.value).substring(selEnd, selLength); - txtarea.value = s1 + lft + s2 + rgt + s3; + var selLength = txtarea.textLength; + var selStart = txtarea.selectionStart; + var selEnd = txtarea.selectionEnd; + if (selEnd==1 || selEnd==2) selEnd=selLength; + var s1 = (txtarea.value).substring(0,selStart); + var s2 = (txtarea.value).substring(selStart, selEnd) + var s3 = (txtarea.value).substring(selEnd, selLength); + txtarea.value = s1 + lft + s2 + rgt + s3; } function IEWrap(lft, rgt) { - strSelection = document.selection.createRange().text; - if (strSelection!="") { - document.selection.createRange().text = lft + strSelection + rgt; - } + strSelection = document.selection.createRange().text; + if (strSelection != "") { + document.selection.createRange().text = lft + strSelection + rgt; + } } function wrapSelection(txtarea, lft, rgt) { - if (document.all) {IEWrap(lft, rgt);} - else if (document.getElementById) {mozWrap(txtarea, lft, rgt);} + if (document.all) { + IEWrap(lft, rgt); + } else if (document.getElementById) { + mozWrap(txtarea, lft, rgt); + } } function wrapSelectionWithLink(txtarea) { - var my_link = prompt("Enter URL:","http://"); - if (getMozSelection(txtarea) == "") { - var my_desc = prompt("Enter Description"); - } - if (my_link != null) { - lft = "<a href=\"" + my_link + "\">"; - if (my_desc != null && my_desc != "") { - rgt = my_desc +"</a>"; - } else { - rgt = "</a>"; - } - wrapSelection(txtarea, lft, rgt); - } - return; -} + var my_link = prompt("Enter URL:","http://"); + + if (getMozSelection(txtarea) == "") { + var my_desc = prompt("Enter Description"); + } + + if (my_link != null) { + lft = "<a href=\"" + my_link + "\">"; + if (my_desc != null && my_desc != "") { + rgt = my_desc +"</a>"; + } else { + rgt = "</a>"; + } + wrapSelection(txtarea, lft, rgt); + } + + return; +} /* end chris w. script */ function mozInsert(txtarea, str) { - var selLength = txtarea.textLength; - var selStart = txtarea.selectionStart; - var selEnd = txtarea.selectionEnd; - if (selEnd==1 || selEnd==2) selEnd=selLength; - var s1 = (txtarea.value).substring(0,selStart); - var s2 = (txtarea.value).substring(selStart, selEnd) - var s3 = (txtarea.value).substring(selEnd, selLength); - txtarea.value = s1 + str + s2 + s3; + var selLength = txtarea.textLength; + var selStart = txtarea.selectionStart; + var selEnd = txtarea.selectionEnd; + if (selEnd==1 || selEnd==2) { + selEnd=selLength; + } + var s1 = (txtarea.value).substring(0,selStart); + var s2 = (txtarea.value).substring(selStart, selEnd) + var s3 = (txtarea.value).substring(selEnd, selLength); + txtarea.value = s1 + str + s2 + s3; } -function wrapInsImage (area) -{ +function wrapInsImage(area) { var loc = prompt('Enter the Image Location: '); if (!loc) { return; } - mozInsert(area,'<img src="'+ loc + '" />'); + mozInsert(area,'<img src="'+ loc + '" alt="" />'); } /* end Better-Editor functions */ -function serendipity_insImage (area) -{ +function serendipity_insImage (area) { var loc = prompt('Enter the Image Location: '); if (!loc) { area.focus(); return; } - area.value = area.value + '<img src="' + loc + '" />'; + area.value = area.value + '<img src="' + loc + '" alt="" />'; area.focus(); } -function serendipity_insBasic (area, tag) -{ +function serendipity_insBasic (area, tag) { area.value = area.value + "<" + tag + "></" + tag + ">"; area.focus(); } -function serendipity_insLink (area) -{ - var loc = prompt('Enter Location: '); +function serendipity_insLink (area) { + var loc = prompt('Enter Location: '); var text = prompt('Enter Description: '); if (!loc) { @@ -124,9 +130,8 @@ function serendipity_imageSelector_done() { - - var insert = ''; - var img = ''; + var insert = ''; + var img = ''; var src = ''; var f = document.forms['serendipity[selForm]'].elements; @@ -137,16 +142,16 @@ } if (f['serendipity[align]'][0].checked == true) { - img = "<img border='0' hspace='5' src='"+img+"'>\n"; + img = "<img border='0' hspace='5' src='" + img + "' alt="" />\n"; } else if (f['serendipity[align]'][1].checked == true) { - img = "<img border='0' hspace='5' align='left' src='"+img+"'>"; + img = "<img border='0' hspace='5' align='left' src='" + img + "' alt="" />"; } else if (f['serendipity[align]'][2].checked == true) { - img = "<img border='0' hspace='5' align='right' src='"+img+"'>"; + img = "<img border='0' hspace='5' align='right' src='" + img + "' alt="" />"; } - if (f['serendipity[isLink]'][1].checked == true) { - insert = "<a href='"+f['serendipity[url]'].value+"'>"+img+"</a>"; + if (f['serendipity[isLink]'][1].checked == true) { + insert = "<a href='" + f['serendipity[url]'].value + "'>" + img + "</a>"; } else { insert = img; } @@ -154,5 +159,5 @@ self.opener.serendipity_imageSelector_addToBody(insert); self.close(); } - + // --> Index: serendipity_functions_config.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_config.inc.php,v retrieving revision 1.2 retrieving revision 1.3 diff -u -d -r1.2 -r1.3 --- serendipity_functions_config.inc.php 7 Jul 2003 19:29:11 -0000 1.2 +++ serendipity_functions_config.inc.php 8 Jul 2003 12:10:09 -0000 1.3 @@ -1,23 +1,24 @@ <?php # $Id$ - function serendipity_set_config_var($name, $val) { global $serendipity; - serendipity_db_query("DELETE FROM $serendipity[dbPrefix]config where name='" . serendipity_db_escape_string($name) . "'"); - $r = serendipity_db_insert("config", array("name"=>$name, "value"=>$val)); - if (is_string($r)) { - echo $r; - } + serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}config where name='" . serendipity_db_escape_string($name) . "'"); + $r = serendipity_db_insert("config", array("name"=>$name, "value"=>$val)); + + if (is_string($r)) { + echo $r; + } } function serendipity_get_config_var($name, $defval = false) { global $serendipity; - if ( isset($serendipity['CONFIG'][$name]) ) { - return $serendipity['CONFIG'][$name]; - } else { - return $defval; - } + if ( isset($serendipity['CONFIG'][$name]) ) { + return $serendipity['CONFIG'][$name]; + } else { + return $defval; + } } + /* vim: set sts=4 ts=4 expandtab : */ ?> Index: serendipity_lang_es.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_lang_es.inc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- serendipity_lang_es.inc.php 8 Jul 2003 09:13:27 -0000 1.3 +++ serendipity_lang_es.inc.php 8 Jul 2003 12:10:09 -0000 1.4 @@ -1,16 +1,17 @@ <?php # $Id$ ########################################################################## -# serendipity - un otro blogger... # +# serendipity - un otro blogger... # ########################################################################## // Spanish language file -$serendipity["months"] = array("", "Enero", "Febrero", "Marzo", - "Abril", "Mayo", "Junio", "Julio", "Augusto", "Septiembre", - "Octobre", "Noviembre", "Deciembre"); +$serendipity['months'] = array('', 'Enero', 'Febrero', 'Marzo', + 'Abril', 'Mayo', 'Junio', 'Julio', 'Augusto', 'Septiembre', + 'Octobre', 'Noviembre', 'Deciembre'); -$serendipity["weekDayAbb"] = array("L", "Ma", "Mi", "J", "V", "S", "D"); +$serendipity['weekDayAbb'] = array('L', 'Ma', 'Mi', 'J', 'V', 'S', 'D'); + +define('serendipity_LANG_LOADED', true); -define("serendipity_LANG_LOADED", true); /* vim: set sts=4 ts=4 expandtab : */ ?> Index: serendipity_rss_exchange.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_rss_exchange.inc.php,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- serendipity_rss_exchange.inc.php 8 Jul 2003 09:13:27 -0000 1.3 +++ serendipity_rss_exchange.inc.php 8 Jul 2003 12:10:09 -0000 1.4 @@ -49,5 +49,6 @@ return true; } + /* vim: set sts=4 ts=4 expandtab : */ ?> |
