Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18121
Modified Files:
serendipity_functions.inc.php
Log Message:
shared installation javascript update.
fixed code for WYSIWYG editor. Will post about this on mailinglist.
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.341
retrieving revision 1.342
diff -u -d -r1.341 -r1.342
--- serendipity_functions.inc.php 16 Jul 2004 23:06:08 -0000 1.341
+++ serendipity_functions.inc.php 17 Jul 2004 11:42:32 -0000 1.342
@@ -279,7 +279,7 @@
</td>
</tr>
<?php
- if ($moderate_comments==true) {
+ if ($moderate_comments==true) {
?>
<tr>
<td colspan="2"><div style="color: #FF0000; font-size: 8pt"><?php echo COMMENTS_WILL_BE_MODERATED ?></div></td>
@@ -1324,7 +1324,7 @@
<br />
<div class="serendipity_center" style="color: #FF0000"><?php echo COMMENTS_CLOSED; ?></div>
<?php
- } else {
+ } else {
?>
<br />
<div class="serendipity_commentsTitle"><?php echo ADD_COMMENT; ?></div>
@@ -1648,7 +1648,7 @@
FROM {$serendipity['dbPrefix']}comments c
LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id)
LEFT JOIN {$serendipity['dbPrefix']}authors a ON (e.authorid = a.authorid)
- WHERE c.id = ". $cid ."
+ WHERE c.id = ". $cid ."
". (($serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN) ? 'AND e.authorid = '. $serendipity['authorId'] : '') ."
AND status = 'pending'";
$rs = serendipity_db_query($sql, true);
@@ -2867,7 +2867,7 @@
<input type="button" value=" U " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'u')">
<input type="button" value=" I " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'i')">
<input type="button" value="<img>" onclick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[body]'])">
- <input type="button" value="<?php echo IMAGE; ?>" onclick="window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800,height=600,toolbar=no');">
+ <input type="button" value="<?php echo IMAGE; ?>" onclick="window.open('serendipity_admin_image_selector.php'?serendipity[textarea]=body, 'ImageSel', 'width=800,height=600,toolbar=no');">
<input type="button" value="Link" onclick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[body]'])">
<?php }
} else {
@@ -2928,9 +2928,9 @@
<input type="button" value=" U " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'u')">
<input type="button" value=" I " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'i')">
<input type="button" value="<img>" onclick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[extended]'])">
- <input type="button" value="<?php echo IMAGE; ?>" onclick="window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800,height=600,toolbar=no');">
+ <input type="button" value="<?php echo IMAGE; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no');">
<input type="button" value="Link" onclick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[extended]'])">
-<?php
+<?php
}
?>
</td>
@@ -3251,7 +3251,7 @@
var config<?php echo $jsname; ?> = editor<?php echo $jsname; ?>.config;
config<?php echo $jsname; ?>.registerButton('image_selector', '<?PHP echo MANAGE_IMAGES; ?>', 'htmlarea/images/ed_s9yimage.gif', false,
function(editor, id) {
- window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
+ window.open('serendipity_admin_image_selector.php?serendipity[textarea]=<?php echo $jsname; ?>', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
editorref = editor<?php echo $jsname; ?>;
}
);
|
