|
From: Evan N. <tad...@us...> - 2004-08-30 18:56:37
|
Update of /cvsroot/php-blog/serendipity In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31474 Modified Files: serendipity_admin_category.inc.php serendipity_admin_comments.inc.php serendipity_admin_entries.inc.php serendipity_admin_image_selector.php serendipity_admin_images.inc.php serendipity_admin_plugins.inc.php serendipity_admin_users.inc.php serendipity_entries.php serendipity_functions_images.inc.php Log Message: Fix a bunch of invalid markup. Index: serendipity_admin_users.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_users.inc.php,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- serendipity_admin_users.inc.php 11 Jun 2004 21:49:14 -0000 1.8 +++ serendipity_admin_users.inc.php 30 Aug 2004 18:56:19 -0000 1.9 @@ -74,7 +74,7 @@ */ ?> <strong><?php echo EDIT_USERS; ?></strong> -<hr noshade /> +<hr noshade="noshade" /> <table width="100%"> <tr> <td><strong><?php echo USER; ?></strong></td> @@ -91,7 +91,7 @@ <td width="200"><?php echo $user['userlevel']; ?></td> <td align="right"> <form action="?serendipity[adminModule]=users" method="post"> - <input type="hidden" name="serendipity[user]" value="<?php echo $user['authorid']; ?>"> + <input type="hidden" name="serendipity[user]" value="<?php echo $user['authorid']; ?>" /> <input type="submit" name="EDIT" value="<?php echo EDIT; ?>" /> <input type="submit" name="DELETE" value="<?php echo DELETE; ?>" /> </form> @@ -103,7 +103,7 @@ ?> <tr> - <th colspan="3"><br />- <?php echo WORD_OR; ?> -<br /><br /></td> + <th colspan="3"><br />- <?php echo WORD_OR; ?> -<br /><br /></th> </tr> <tr> @@ -117,7 +117,7 @@ </tr> </table> -<hr noshade /> +<hr noshade="noshade" /> <?php /* Index: serendipity_admin_comments.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v retrieving revision 1.14 retrieving revision 1.15 diff -u -d -r1.14 -r1.15 --- serendipity_admin_comments.inc.php 14 Aug 2004 23:25:12 -0000 1.14 +++ serendipity_admin_comments.inc.php 30 Aug 2004 18:56:19 -0000 1.15 @@ -125,13 +125,13 @@ } if ( $page != 1 && $page <= $pages ) { - $linkPrevious = '<input type="button" name="serendipity[previouspage]" value="<<<" onclick="location.href=\'serendipity_entries.php?serendipity[adminModule]=comments&serendipity[page]='. ($page-1) . $searchString . '\'">'; + $linkPrevious = '<input type="button" name="serendipity[previouspage]" value="<<<" onclick="location.href=\'serendipity_entries.php?serendipity[adminModule]=comments&serendipity[page]='. ($page-1) . $searchString . '\'" />'; } else { $linkPrevious = '<input type="button" name="serendipity[previouspage]" value="<<<" disabled="disabled" />'; } if ( $page != $pages ) { - $linkNext = '<input type="button" name="serendipity[nextpage]" value=">>>" onclick="location.href=\'serendipity_entries.php?serendipity[adminModule]=comments&serendipity[page]='. ($page+1) . $searchString . '\'">'; + $linkNext = '<input type="button" name="serendipity[nextpage]" value=">>>" onclick="location.href=\'serendipity_entries.php?serendipity[adminModule]=comments&serendipity[page]='. ($page+1) . $searchString . '\'" />'; } else { $linkNext = '<input type="button" name="serendipity[nextpage]" value=">>>" disabled="disabled" />'; } @@ -182,31 +182,31 @@ } </script> <form action="" method="GET" style="margin: 0"> -<input type="hidden" name="serendipity[adminModule]" value="comments"> -<input type="hidden" name="serendipity[page]" value="<?php echo $page ?>"> +<input type="hidden" name="serendipity[adminModule]" value="comments" /> +<input type="hidden" name="serendipity[page]" value="<?php echo $page ?>" /> <table class="serendipity_admin_filters" width="100%"> <tr> <td colspan="6" class="serendipity_admin_filters_headline"><strong><?php echo FILTERS ?></strong> - <?php echo FIND_COMMENTS ?></td> </tr> <tr> <td><?php echo AUTHOR ?>:</td> - <td><input type="text" name="serendipity[filter][author]" size="15" value="<?php echo $serendipity['GET']['filter']['author'] ?>"></td> + <td><input type="text" name="serendipity[filter][author]" size="15" value="<?php echo $serendipity['GET']['filter']['author'] ?>" /></td> <td><?php echo EMAIL ?>:</td> - <td><input type="text" name="serendipity[filter][email]" size="15" value="<?php echo $serendipity['GET']['filter']['email'] ?>"></td> + <td><input type="text" name="serendipity[filter][email]" size="15" value="<?php echo $serendipity['GET']['filter']['email'] ?>" /></td> <td><?php echo URL ?>:</td> - <td><input type="text" name="serendipity[filter][url]" size="15" value="<?php echo $serendipity['GET']['filter']['url'] ?>"></td> + <td><input type="text" name="serendipity[filter][url]" size="15" value="<?php echo $serendipity['GET']['filter']['url'] ?>" /></td> </tr> <tr> <td>IP:</td> - <td><input type="text" name="serendipity[filter][ip]" size="15" value="<?php echo $serendipity['GET']['filter']['ip'] ?>"></td> + <td><input type="text" name="serendipity[filter][ip]" size="15" value="<?php echo $serendipity['GET']['filter']['ip'] ?>" /></td> <td><?php echo CONTENT ?>:</td> - <td><input type="text" name="serendipity[filter][body]" size="15" value="<?php echo $serendipity['GET']['filter']['body'] ?>"></td> - <td colspan="2" align="center"><input type="submit" name="submit" value=" - <?php echo GO ?> - "></td> + <td><input type="text" name="serendipity[filter][body]" size="15" value="<?php echo $serendipity['GET']['filter']['body'] ?>" /></td> + <td colspan="2" align="center"><input type="submit" name="submit" value=" - <?php echo GO ?> - " /></td> </tr> </table> </form> <form action="" method="POST" name="formMultiDelete" id="formMultiDelete"> -<input type="hidden" name="serendipity[formAction]" value="multiDelete"> +<input type="hidden" name="serendipity[formAction]" value="multiDelete" /> <table width="100%" cellspacing="5" cellpadding="0" border="0" class="serendipity_admin_list"> <tr> <td align="center"> @@ -254,13 +254,13 @@ <td class="serendipity_admin_list_item <?php echo $class ?>" style="padding: 3px" id="comment_<?php echo $rs['id'] ?>"> <table width="100%" cellspacing="0" cellpadding="2" border="0"> <tr> - <td rowspan="2" width="20" align="center"><input type="checkbox" name="serendipity[delete][<?php echo $rs['id'] ?>]" value="<?php echo $rs['entry_id'] ?>" onclick="highlightComment('comment_<?php echo $rs['id'] ?>', this.checked)" tabindex="<?php echo $i ?>"></td> + <td rowspan="2" width="20" align="center"><input type="checkbox" name="serendipity[delete][<?php echo $rs['id'] ?>]" value="<?php echo $rs['entry_id'] ?>" onclick="highlightComment('comment_<?php echo $rs['id'] ?>', this.checked)" tabindex="<?php echo $i ?>" /></td> <td width="250"><strong><?php echo AUTHOR ?></strong>: <?php echo $rs['author'] ?></td> <td><strong><?php echo EMAIL ?></strong>: <?php echo $rs['email'] ?></td> </tr> <tr> <td><strong>IP</strong>: <?php echo $rs['ip'] ?></td> - <td><strong>URL</strong>: <?php echo $rs['url'] ?></a></td> + <td><strong>URL</strong>: <?php echo $rs['url'] ?></td> </tr> <tr> <td style="border-top: 1px solid #CCCCCC; border-bottom: 1px solid #CCCCCC" colspan="3"> @@ -280,11 +280,11 @@ </td> </tr> <tr> - <td><hr noshade></td> + <td><hr noshade="noshade"></td> </tr> <?php } ?> <tr> - <td><input type="button" name="toggle" value="<?php echo INVERT_SELECTIONS ?>" onclick="invertSelection()"> <input type="submit" name="toggle" value="<?php echo DELETE_SELECTED_COMMENTS ?>" onclick="return confirm('<?php echo COMMENTS_DELETE_CONFIRM ?>')" tabindex="<?php echo ($i+1) ?>></td> + <td><input type="button" name="toggle" value="<?php echo INVERT_SELECTIONS ?>" onclick="invertSelection()" /> <input type="submit" name="toggle" value="<?php echo DELETE_SELECTED_COMMENTS ?>" onclick="return confirm('<?php echo COMMENTS_DELETE_CONFIRM ?>')" tabindex="<?php echo ($i+1) ?> /></td> </tr> <tr> <td align="center"> Index: serendipity_entries.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v retrieving revision 1.39 retrieving revision 1.40 diff -u -d -r1.39 -r1.40 --- serendipity_entries.php 8 Aug 2004 22:01:38 -0000 1.39 +++ serendipity_entries.php 30 Aug 2004 18:56:19 -0000 1.40 @@ -124,9 +124,11 @@ default: include S9Y_INCLUDE_PATH . 'serendipity_entries_overview.inc.php'; } - } ?> - </div> + </div> +<?php +} +?> </td> </tr> </table> Index: serendipity_functions_images.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v retrieving revision 1.34 retrieving revision 1.35 diff -u -d -r1.34 -r1.35 --- serendipity_functions_images.inc.php 25 Aug 2004 21:50:05 -0000 1.34 +++ serendipity_functions_images.inc.php 30 Aug 2004 18:56:19 -0000 1.35 @@ -731,7 +731,7 @@ <td class="serendipity_admin_filters_headline" colspan="6"><strong><?php echo FILTERS ?></strong> - <?php echo FIND_MEDIA ?></td> </tr> <tr> - <td><?php echo FILTER_DIRECTORY ?></strong></td> + <td><?php echo FILTER_DIRECTORY ?></td> <td colspan="5"><select name="serendipity[only_path]"> <option value=""><?php echo ALL_DIRECTORIES ?></option> <?php echo $paths ?> @@ -763,6 +763,7 @@ echo '<option value="' . $so_val . '" ' . ($perPage == $so_val ? 'selected="selected"' : '') . '>' . $so_val . '</option>'; } ?> </select> + </td> </tr> <tr> <td align="right" colspan="6"> @@ -827,8 +828,8 @@ ?> <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_FULLSIZE; ?>" alt="<?php echo MEDIA_FULLSIZE; ?>" src="<?php echo serendipity_getTemplateFile('img/zoom.png') ?>" border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo $popupHeight; ?>,width=<?php echo $popupWidth; ?>,top='+ (screen.height-<?php echo $popupHeight ?>)/2 +',left='+ (screen.width-<?php echo $popupWidth ?>)/2 +',toolbar=no,menubar=no,location=no,resize=1,resizable=1<?php echo ($is_image ? '' : ',scrollbars=yes'); ?>');" /></td> <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_RENAME; ?>" alt="<?php echo MEDIA_RENAME; ?>" src="<?php echo serendipity_getTemplateFile('img/rename.png') ?>" border="0" onclick="rename('<?php echo $file['id']; ?>', '<?php echo addslashes($file['name']); ?>')" /></td> - <?php if ($is_image) { ?><td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>" alt="<?php echo IMAGE_RESIZE; ?>" src="<?php echo serendipity_getTemplateFile('img/scale.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fid]=<?php echo $file['id']; ?>';" /></td><?php } ?> - <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>" alt="<?php echo MEDIA_DELETE; ?>" src="<?php echo serendipity_getTemplateFile('img/delete.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fid]=<?php echo $file['id']; ?>';" /></td> + <?php if ($is_image) { ?><td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>" alt="<?php echo IMAGE_RESIZE; ?>" src="<?php echo serendipity_getTemplateFile('img/scale.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fid]=<?php echo $file['id']; ?>';" /></td><?php } ?> + <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>" alt="<?php echo MEDIA_DELETE; ?>" src="<?php echo serendipity_getTemplateFile('img/delete.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fid]=<?php echo $file['id']; ?>';" /></td> <?php } ?> Index: serendipity_admin_image_selector.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- serendipity_admin_image_selector.php 25 Aug 2004 21:50:04 -0000 1.31 +++ serendipity_admin_image_selector.php 30 Aug 2004 18:56:19 -0000 1.32 @@ -74,9 +74,9 @@ <?php if (empty($serendipity['GET']['filename_only']) || $serendipity['GET']['filename_only'] != 'true') { ?> <b><?php echo IMAGE_ALIGNMENT; ?>:</b> <br /> - <input type="radio" name="serendipity[align]" value="" /> <img src="<?php echo serendipity_getTemplateFile('img/img_align_top.png') ?>" vspace="5"><br /> - <input type="radio" name="serendipity[align]" value="left" checked="checked" /> <img src="<?php echo serendipity_getTemplateFile('img/img_align_left.png') ?>" vspace="5"><br /> - <input type="radio" name="serendipity[align]" value="right" /> <img src="<?php echo serendipity_getTemplateFile('img/img_align_right.png') ?>" vspace="5"><br /> + <input type="radio" name="serendipity[align]" value="" /> <img src="<?php echo serendipity_getTemplateFile('img/img_align_top.png') ?>" vspace="5" /><br /> + <input type="radio" name="serendipity[align]" value="left" checked="checked" /> <img src="<?php echo serendipity_getTemplateFile('img/img_align_left.png') ?>" vspace="5" /><br /> + <input type="radio" name="serendipity[align]" value="right" /> <img src="<?php echo serendipity_getTemplateFile('img/img_align_right.png') ?>" vspace="5" /><br /> <br /> <b><?php echo IMAGE_AS_A_LINK; ?>:</b> Index: serendipity_admin_images.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- serendipity_admin_images.inc.php 14 Aug 2004 23:33:15 -0000 1.29 +++ serendipity_admin_images.inc.php 30 Aug 2004 18:56:19 -0000 1.30 @@ -244,6 +244,7 @@ <input type="hidden" name="serendipity[action]" value="admin" /> <input type="hidden" name="serendipity[adminModule]" value="images" /> <input type="hidden" name="serendipity[adminAction]" value="directorySelect" /> + </div> <table> <tr> @@ -274,6 +275,7 @@ <td><input type="submit" value="<?php echo GO; ?>"/></td> </tr> </table> + </form> <?php break; Index: serendipity_admin_plugins.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v retrieving revision 1.41 retrieving revision 1.42 diff -u -d -r1.41 -r1.42 --- serendipity_admin_plugins.inc.php 25 Aug 2004 07:47:31 -0000 1.41 +++ serendipity_admin_plugins.inc.php 30 Aug 2004 18:56:19 -0000 1.42 @@ -78,9 +78,10 @@ <input type="checkbox" name="serendipity[all_authors]" value="true" checked="checked" id="all_authors" /> <label for="all_authors"><?php echo ALL_AUTHORS; ?></label> </td> - <td align="right"> - <input name="NEW" value="<?php echo ADD_PLUGIN; ?>" type="submit" /> - </td> + <td align="right"> + <input name="NEW" value="<?php echo ADD_PLUGIN; ?>" type="submit" /> + </td> + </tr> </table> <br /> @@ -136,7 +137,7 @@ $title = serendipity_plugin_api::get_plugin_title($plugin, '[' . $name . ']'); if ($bag->is_set('configuration') && ($plugin->protected === FALSE || $plugin_data['authorid'] == '0' || $plugin_data['authorid'] == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN)) { - $url = '?serendipity[adminModule]=plugins&serendipity[plugin_to_conf]=' . $key; + $url = '?serendipity[adminModule]=plugins&serendipity[plugin_to_conf]=' . $key; $name = '<a href="' . $url . '">' . $name . '</a>'; $title = '<a href="' . $url . '">' . $title . '</a>'; } @@ -158,7 +159,7 @@ <td style="border-bottom: 1px solid #000000"> <div> <?php if ($plugin_data['authorid'] == '0' || $plugin_data['authorid'] == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN) { ?> - <input type="checkbox" name="serendipity[plugin_to_remove][]" value="<?php echo $plugin_data['name']; ?>"> + <input type="checkbox" name="serendipity[plugin_to_remove][]" value="<?php echo $plugin_data['name']; ?>" /> <?php } else { ?> <?php } ?> @@ -192,10 +193,10 @@ ?> </table> <br /> - - <input type="submit" name="REMOVE" title="<?php echo REMOVE_TICKED_PLUGINS; ?>" value="<?php echo DELETE; ?>" /> - <input type="submit" name="SAVE" title="<?php echo SAVE_CHANGES_TO_LAYOUT; ?>" value="<?php echo SAVE; ?>" /> - </div> + <div> + <input type="submit" name="REMOVE" title="<?php echo REMOVE_TICKED_PLUGINS; ?>" value="<?php echo DELETE; ?>" /> + <input type="submit" name="SAVE" title="<?php echo SAVE_CHANGES_TO_LAYOUT; ?>" value="<?php echo SAVE; ?>" /> + </div> </form> <?php } @@ -553,7 +554,7 @@ /* Only play with the plugin if there is something to play with */ if ($bag->is_set('configuration')) { - echo '<script type="text/javascript">location.href = \'' . $serendipity['baseurl'] . '?serendipity[adminModule]=plugins&serendipity[plugin_to_conf]=' . $inst . '\';</script>'; + echo '<script type="text/javascript">location.href = \'' . $serendipity['baseurl'] . '?serendipity[adminModule]=plugins&serendipity[plugin_to_conf]=' . $inst . '\';</script>'; die(); } } Index: serendipity_admin_category.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_category.inc.php,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- serendipity_admin_category.inc.php 15 Jul 2004 07:34:02 -0000 1.19 +++ serendipity_admin_category.inc.php 30 Aug 2004 18:56:19 -0000 1.20 @@ -155,7 +155,7 @@ <td> <script type="text/javascript" language="JavaScript" src="serendipity_editor.js"></script> <input type="text" id="img_icon" name="serendipity[cat][icon]" value="<?php echo isset($this_cat['category_icon']) ? htmlspecialchars($this_cat['category_icon']) : ''; ?>" /> - <input type="button" name="insImage" value="<?php echo IMAGE ; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[htmltarget]=img_icon&serendipity[filename_only]=true', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" /> + <input type="button" name="insImage" value="<?php echo IMAGE ; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[htmltarget]=img_icon&serendipity[filename_only]=true', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" /> </td> </tr> @@ -192,12 +192,12 @@ <?php echo $remove; ?> </div> <br /> -<hr> +<hr /> <b><?php echo CLICK_CAT_TO_EDIT; ?></b> <div> <?php echo serendipity_generateCategoryList($cats, array($cat_to_edit)); ?> - <p><a href="?serendipity[adminModule]=category&serendipity[cat][catid]=0"><?php echo CREATE_NEW_CAT; ?></a></li></p> + <p><a href="?serendipity[adminModule]=category&serendipity[cat][catid]=0"><?php echo CREATE_NEW_CAT; ?></a></p> </div> </form> Index: serendipity_admin_entries.inc.php =================================================================== RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- serendipity_admin_entries.inc.php 21 Aug 2004 13:01:27 -0000 1.35 +++ serendipity_admin_entries.inc.php 30 Aug 2004 18:56:19 -0000 1.36 @@ -107,6 +107,7 @@ </td> <td width="80"><?php echo CONTENT ?></td> <td><input size="10" type="text" name="serendipity[filter][body]" value="<?php echo (isset($serendipity['GET']['filter']['body']) ? htmlspecialchars($serendipity['GET']['filter']['body']) : '') ?>" /></td> + </tr> <tr> <td class="serendipity_admin_filters_headline" colspan="6"><strong><?php echo SORT_ORDER ?></strong></td> </tr> @@ -136,6 +137,8 @@ } ?> + </select> + </td> </tr> <tr> <td align="right" colspan="6"><input type="submit" name="go" value="<?php echo GO ?>" /></td> @@ -145,12 +148,12 @@ <?php if (is_array($entries)) { $count = count($entries); - $qString = '?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect'; + $qString = '?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect'; foreach ((array)$serendipity['GET']['sort'] as $k => $v) { - $qString .= '&serendipity[sort]['. $k .']='. $v; + $qString .= '&serendipity[sort]['. $k .']='. $v; } foreach ((array)$serendipity['GET']['filter'] as $k => $v) { - $qString .= '&serendipity[filter]['. $k .']='. $v; + $qString .= '&serendipity[filter]['. $k .']='. $v; } $linkPrevious = $qString . '&serendipity[page]=' . ($page-1); $linkNext = $qString . '&serendipity[page]=' . ($page+1); |
