Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv29205
Modified Files:
comment.php index.php serendipity_admin.php
serendipity_admin_category.inc.php
serendipity_admin_entries.inc.php
serendipity_admin_image_selector.php
serendipity_admin_images.inc.php
serendipity_admin_interop.inc.php
serendipity_admin_overview.inc.php
serendipity_admin_plugins.inc.php serendipity_entries.php
serendipity_entries_overview.inc.php
serendipity_functions.inc.php serendipity_genpage.inc.php
serendipity_layout.inc.php serendipity_layout_table.inc.php
serendipity_sidebar_items.php
Log Message:
Here it is: No short tags required, and with spiffy semi-colons at the end before every close tag. There were also a couple of other places where short tags were used. I cleaned them up to.
Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- comment.php 18 Jun 2003 14:52:38 -0000 1.9
+++ comment.php 25 Jun 2003 22:04:30 -0000 1.10
@@ -50,7 +50,7 @@
<html>
<head>
<title>Comments</title>
-<link rel="stylesheet" type="text/css" href="<?=$serendipity['serendipityHTTPPath']?>serendipity.css.php?mode=comments">
+<link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php?mode=comments">
</head>
<body>
<?php
@@ -84,7 +84,7 @@
if ( !empty($comment['comment']) ) {
serendipity_saveComment($serendipity['POST']['entry_id'], $comment, 'NORMAL');
?>
-Your comment was successfully added. Click <a href="<?=$PHP_SELF?>?serendipity[entry_id]=<?=$serendipity['POST']['entry_id']?>">here</a> to return to
+Your comment was successfully added. Click <a href="<?php echo $PHP_SELF; ?>?serendipity[entry_id]=<?php echo $serendipity['POST']['entry_id']; ?>">here</a> to return to
the comments, and <a href="#" onClick="self.close()">here</a> to close this window.
<?php } else { ?>
Your comment did not contain anything, please <a href="#" onClick="history.go(-1)">go back</a> and try again
Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- index.php 25 May 2003 19:54:57 -0000 1.11
+++ index.php 25 Jun 2003 22:04:30 -0000 1.12
@@ -117,7 +117,7 @@
}
} else {
?>
-The document, <?=$uri?> was not found.
+The document, <?php echo $uri; ?> was not found.
<?php
}
Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_admin.php 22 Jun 2003 18:06:52 -0000 1.11
+++ serendipity_admin.php 25 Jun 2003 22:04:30 -0000 1.12
@@ -14,8 +14,8 @@
?>
<html>
<head>
- <title><?=SERENDIPITY_ADMIN_SUITE?></title>
- <link rel="stylesheet" type="text/css" href="<?=$serendipity['serendipityHTTPPath']?>serendipity.css.php">
+ <title><?php echo SERENDIPITY_ADMIN_SUITE; ?></title>
+ <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php">
<?php
if (strtolower($serendipity['extCSS'])!='none') echo "<link rel='stylesheet' type='text/css' href='{$serendipity['extCSS']}'>";
?>
@@ -23,12 +23,12 @@
</head>
<body>
<div id="serendipity_banner">
- <h1><?= $serendipity['blogTitle'] ?></h1>
+ <h1><?php echo $serendipity['blogTitle'] ; ?></h1>
<?php
$sub = isset($serendipity['blogSubTitle']) ? $serendipity['blogSubTitle'] : $serendipity['blogDescription'];
if (strlen($sub)) {
?>
- <h2><?= $sub ?></h2>
+ <h2><?php echo $sub ; ?></h2>
<?php
}
?>
@@ -39,7 +39,7 @@
&& file_exists($serendipity["serendipityPath"]."serendipity_config_local.inc.php")) {
?>
<div class='serendipity_auth_required'>
- <?=HAVE_TO_BE_LOGGED_ON?>
+ <?php echo HAVE_TO_BE_LOGGED_ON; ?>
<form action="?" method="post">
<input type="hidden" name="serendipity[action]" value="admin">
<input type="text" value="username" name="serendipity[user]" onfocus="value='';">
@@ -61,26 +61,26 @@
<td class="serendipitySideBar">
<div class="serendipitySideBarItem">
- <div class="serendipitySideBarTitle"><?=APPEARANCE?>:</div>
+ <div class="serendipitySideBarTitle"><?php echo APPEARANCE; ?>:</div>
<div class="serendipitySideBarContent">
- • <a href='?serendipity[adminModule]=templates'><?=MANAGE_STYLES?></a><br>
- • <a href='?serendipity[adminModule]=plugins'><?=CONFIGURE_PLUGINS?></a><br>
+ • <a href='?serendipity[adminModule]=templates'><?php echo MANAGE_STYLES; ?></a><br>
+ • <a href='?serendipity[adminModule]=plugins'><?php echo CONFIGURE_PLUGINS; ?></a><br>
</div>
</div>
<div class="serendipitySideBarItem">
- <div class="serendipitySideBarTitle"><?=ADMIN?></div>
+ <div class="serendipitySideBarTitle"><?php echo ADMIN; ?></div>
<div class="serendipitySideBarContent">
- • <a href='?serendipity[adminModule]=installer'><?=CONFIGURATION?></a><br />
- • <a href="?serendipity[adminModule]=interop"><?=IMPORT_EXPORT_ENTRIES?></a><br />
+ • <a href='?serendipity[adminModule]=installer'><?php echo CONFIGURATION; ?></a><br />
+ • <a href="?serendipity[adminModule]=interop"><?php echo IMPORT_EXPORT_ENTRIES; ?></a><br />
</div>
</div>
- • <a href='<?=$serendipity['serendipityHTTPPath']?>entries'><?=AUTHOR_SUITE?></a><br />
- • <a href='<?= $serendipity['serendipityHTTPPath'] ?>'><?=BACK_TO_BLOG?></a><br />
- • <a href='?serendipity[adminModule]=logout'><?=LOGOUT?></a>
+ • <a href='<?php echo $serendipity['serendipityHTTPPath']; ?>entries'><?php echo AUTHOR_SUITE; ?></a><br />
+ • <a href='<?php echo $serendipity['serendipityHTTPPath'] ; ?>'><?php echo BACK_TO_BLOG; ?></a><br />
+ • <a href='?serendipity[adminModule]=logout'><?php echo LOGOUT; ?></a>
</td>
<td class="serendipity_admin">
- <div class="serendipity_admin_title"><?=SERENDIPITY_ADMIN_SUITE?></div>
+ <div class="serendipity_admin_title"><?php echo SERENDIPITY_ADMIN_SUITE; ?></div>
<?php
if (!$serendipity["GET"]["adminModule"]) $serendipity["GET"]["adminModule"] = $serendipity["POST"]["adminModule"];
switch($serendipity["GET"]["adminModule"]) {
Index: serendipity_admin_category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_category.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_admin_category.inc.php 5 Apr 2003 23:46:55 -0000 1.2
+++ serendipity_admin_category.inc.php 25 Jun 2003 22:04:30 -0000 1.3
@@ -35,7 +35,7 @@
}
?>
-<font color="red"><?= $msg ?></font>
+<font color="red"><?php echo $msg ; ?></font>
<form method="POST" name="serendipityCategory">
<?php
@@ -47,23 +47,23 @@
$save = SAVE;
}
?>
-<b><?= $desc ?></b>
+<b><?php echo $desc ; ?></b>
<table cellpadding="5">
<tr>
-<th><?=NAME?></th>
-<td><input type="text" name="serendipity[cat][name]" value="<?= htmlentities($this_cat['category_name']) ?>" /></td>
+<th><?php echo NAME; ?></th>
+<td><input type="text" name="serendipity[cat][name]" value="<?php echo htmlentities($this_cat['category_name']) ; ?>" /></td>
</tr>
<tr>
-<th><?=DESCRIPTION?></th>
-<td><input type="text" name="serendipity[cat][description]" value="<?= htmlentities($this_cat['category_description']) ?>"/></td>
+<th><?php echo DESCRIPTION; ?></th>
+<td><input type="text" name="serendipity[cat][description]" value="<?php echo htmlentities($this_cat['category_description']) ; ?>"/></td>
</tr>
</table>
-<input type="submit" name="SAVE" value="<?= $save ?>">
+<input type="submit" name="SAVE" value="<?php echo $save ; ?>">
<br />
<br />
-<b><?=CLICK_CAT_TO_EDIT?></b>
+<b><?php echo CLICK_CAT_TO_EDIT; ?></b>
<table>
<?php
@@ -75,7 +75,7 @@
}
}
?>
-<tr><td>• <a href="?serendipity[adminModule]=category&serendipity[cat][catid]=0"><?=CREATE_NEW_CAT?></a></td></tr>
+<tr><td>• <a href="?serendipity[adminModule]=category&serendipity[cat][catid]=0"><?php echo CREATE_NEW_CAT; ?></a></td></tr>
</table>
</form>
Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_admin_entries.inc.php 28 Mar 2003 20:05:25 -0000 1.1.1.1
+++ serendipity_admin_entries.inc.php 25 Jun 2003 22:04:30 -0000 1.2
@@ -45,16 +45,16 @@
?>
<tr>
<td class="serendipity_admin_list_item">
- <?= date("d.m.y, H:i", $entries[$x]["timestamp"]).": " ?>
- <br><a href='?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=<?= $action ?>&serendipity[id]=<?= $entries[$x]["id"] ?>'>
- <?= htmlentities(substr(empty($entries[$x]["title"]) ? $entries[$x]['body'] : $entries[$x]['title'],0,40)) ?></a>
+ <?php echo date("d.m.y, H:i", $entries[$x]["timestamp"]).": " ; ?>
+ <br><a href='?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $action ; ?>&serendipity[id]=<?php echo $entries[$x]["id"] ; ?>'>
+ <?php echo htmlentities(substr(empty($entries[$x]["title"]) ? $entries[$x]['body'] : $entries[$x]['title'],0,40)); ?></a>
</a>
</td>
<td class="serendipity_admin_list_item">
<?php if ($x + $half < $count) { ?>
- <?= date("d.m.y, H:i", $entries[$x+$half]["timestamp"]).": "?>
- <br><a href='?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=<?= $action ?>&serendipity[id]=<?= $entries[$x+$half]["id"] ?>'>
- <?= htmlentities(substr($entries[$x+$half]["title"],0,40)) ?></a>
+ <?php echo date("d.m.y, H:i", $entries[$x+$half]["timestamp"]).": "; ?>
+ <br><a href='?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $action ; ?>&serendipity[id]=<?php echo $entries[$x+$half]["id"] ; ?>'>
+ <?php echo htmlentities(substr($entries[$x+$half]["title"],0,40)) ; ?></a>
</a>
<?php } ?>
</td>
Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_admin_image_selector.php 18 May 2003 14:55:41 -0000 1.4
+++ serendipity_admin_image_selector.php 25 Jun 2003 22:04:30 -0000 1.5
@@ -56,8 +56,8 @@
}?>
<html>
<head>
- <title><?=SELECT_IMAGE?></title>
- <link rel="stylesheet" type="text/css" href="<?= $serendipity['serendipityHTTPPath']?>serendipity.css.php">
+ <title><?php echo SELECT_IMAGE; ?></title>
+ <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php">
</head>
<body>
<?php
@@ -66,7 +66,7 @@
case "1":
?>
- <script src="<?=$serendipity['serendipityHTTPPath']?>serendipity_editor.js" language="Javascript" ></script>
+ <script src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_editor.js" language="Javascript" ></script>
<?php
$f = serendipity_parseFileName($serendipity["GET"]["image"]);
echo "<img align='right' src='".$serendipity["serendipityHTTPPath"] . $serendipity["uploadPath"].$f[0].".".$serendipity["thumbSuffix"].".".$f[1]."'>";
Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_admin_images.inc.php 25 May 2003 01:55:35 -0000 1.6
+++ serendipity_admin_images.inc.php 25 Jun 2003 22:04:30 -0000 1.7
@@ -197,7 +197,7 @@
case "addSelect":
?>
- <?=ADD_IMAGE_BLAHBLAH?>
+ <?php echo ADD_IMAGE_BLAHBLAH; ?>
<table>
<form action="?" method="POST" enctype="multipart/form-data" >
@@ -206,16 +206,16 @@
<input type="hidden" name="serendipity[adminModule]" value="images">
<input type="hidden" name="serendipity[adminAction]" value="add">
<tr>
- <td nowrap='nowrap'><?=ENTER_IMAGE_URL?></td>
+ <td nowrap='nowrap'><?php echo ENTER_IMAGE_URL; ?></td>
<td><input type="text" name="serendipity[url]" value="" size="40"></td>
</tr>
<tr><td align="center" colspan="2"><b>Or</b></td></tr>
<tr>
- <td nowrap='nowrap'><?=ENTER_IMAGE_TO_UP?></td>
+ <td nowrap='nowrap'><?php echo ENTER_IMAGE_TO_UP; ?></td>
<td><input name="userfile" type="file"></td>
</tr>
<tr>
- <td align="right" colspan="2"><input type="submit" value="<?=GO?>"></td>
+ <td align="right" colspan="2"><input type="submit" value="<?php echo GO; ?>"></td>
</tr>
</form>
</table>
@@ -239,8 +239,8 @@
<script language="javascript">
<!--
function rescale(dim, newval) {
- var originalWidth = <?=$s[0]?>;
- var originalHeight = <?=$s[1]?>;
+ var originalWidth = <?php echo $s[0]; ?>;
+ var originalHeight = <?php echo $s[1]; ?>;
var ratio = originalHeight/originalWidth;
var trans = new Array();
trans['width'] = new Array('serendipity[height]', ratio);
Index: serendipity_admin_interop.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_interop.inc.php,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -u -d -r1.1.1.1 -r1.2
--- serendipity_admin_interop.inc.php 28 Mar 2003 20:05:26 -0000 1.1.1.1
+++ serendipity_admin_interop.inc.php 25 Jun 2003 22:04:30 -0000 1.2
@@ -11,7 +11,7 @@
}
else if (!empty($_POST['export'])) {
?>
- <a href="<?=$serendipity['serendipityHTTPPath']?>rss.php?version=2.0&all=1">View Feed Export</a>
+ <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>rss.php?version=2.0&all=1">View Feed Export</a>
<?php
exit;
}
Index: serendipity_admin_overview.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_overview.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_admin_overview.inc.php 5 Apr 2003 23:46:55 -0000 1.3
+++ serendipity_admin_overview.inc.php 25 Jun 2003 22:04:30 -0000 1.4
@@ -12,4 +12,4 @@
if (IN_serendipity !== true) die ("Don't hack!");
session_start();
?>
-<?=WELCOME_BACK?> <?= $_SESSION['serendipityUser'] ?>.
+<?php echo WELCOME_BACK; ?> <?php echo $_SESSION['serendipityUser'] ; ?>.
Index: serendipity_admin_plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_plugins.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_admin_plugins.inc.php 6 Apr 2003 21:33:40 -0000 1.3
+++ serendipity_admin_plugins.inc.php 25 Jun 2003 22:04:30 -0000 1.4
@@ -66,11 +66,11 @@
<table cellpadding="5">
<tr>
<th>Name</th>
-<td><?= $name ?></td>
+<td><?php echo $name ; ?></td>
</tr>
<tr>
<th>Description</th>
-<td><?= $desc ?></td>
+<td><?php echo $desc ; ?></td>
</tr>
</table>
@@ -134,7 +134,7 @@
<form action="?serendipity[adminModule]=plugins" method="post">
<select name="serendipity[plugin_to_add]">
-<option value="0">[ <?=SELECT_A_PLUGIN_TO_ADD?> ]</option>
+<option value="0">[ <?php echo SELECT_A_PLUGIN_TO_ADD; ?> ]</option>
<?php
foreach ($classes as $class_name) {
$plugin =& serendipity_plugin_api::load_plugin($class_name);
@@ -153,7 +153,7 @@
?>
</select>
-<input name="NEW" value="<?=ADD_PLUGIN?>" type="submit" />
+<input name="NEW" value="<?php echo ADD_PLUGIN; ?>" type="submit" />
<br />
<br />
@@ -161,10 +161,10 @@
<table border="1" cellpadding="5">
<tr>
<th> </th>
-<th><?=TITLE?></th>
-<th><?=PLUGIN?></th>
-<th><?=DESCRIPTION?></th>
-<th><?=PLACEMENT?></th>
+<th><?php echo TITLE; ?></th>
+<th><?php echo PLUGIN; ?></th>
+<th><?php echo DESCRIPTION; ?></th>
+<th><?php echo PLACEMENT; ?></th>
</tr>
<?php
@@ -245,8 +245,8 @@
</table>
<br />
-<input type="submit" name="REMOVE" title="Remove Ticked Plugins" value="<?=DELETE?>">
-<input type="submit" name="SAVE" title="Save changes to layout" value="<?=SAVE?>">
+<input type="submit" name="REMOVE" title="Remove Ticked Plugins" value="<?php echo DELETE; ?>">
+<input type="submit" name="SAVE" title="Save changes to layout" value="<?php echo SAVE; ?>">
</form>
<?php
}
Index: serendipity_entries.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_entries.php 18 Jun 2003 15:09:59 -0000 1.8
+++ serendipity_entries.php 25 Jun 2003 22:04:30 -0000 1.9
@@ -14,7 +14,7 @@
<html>
<head>
<title>Serendipity Authoring Suite</title>
- <link rel="stylesheet" type="text/css" href="<?=$serendipity['serendipityHTTPPath']?>serendipity.css.php">
+ <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php">
<?php
if (strtolower($serendipity['extCSS'])!='none') echo "<link rel='stylesheet' type='text/css' href='{$serendipity['extCSS']}'>";
?>
@@ -22,12 +22,12 @@
</head>
<body>
<div id="serendipity_banner">
- <h1><?= $serendipity['blogTitle'] ?></h1>
+ <h1><?php echo $serendipity['blogTitle'] ; ?></h1>
<?php
$sub = isset($serendipity['blogSubTitle']) ? $serendipity['blogSubTitle'] : $serendipity['blogDescription'];
if (strlen($sub)) {
?>
- <h2><?= $sub ?></h2>
+ <h2><?php echo $sub ; ?></h2>
<?php
}
?>
@@ -41,7 +41,7 @@
?>
<td class="serendipity_admin">
<div class='serendipity_auth_required'>
- <?=HAVE_TO_BE_LOGGED_ON?>
+ <?php echo HAVE_TO_BE_LOGGED_ON; ?>
<form action="?" method="post">
<input type="hidden" name="serendipity[action]" value="admin">
<input type="text" value="username" name="serendipity[user]" onfocus="value='';">
@@ -56,35 +56,35 @@
<td class="serendipitySideBar">
<div class="serendipitySideBarItem">
- <div class="serendipitySideBarTitle"><?=ENTRIES?></div>
+ <div class="serendipitySideBarTitle"><?php echo ENTRIES; ?></div>
<div class="serendipitySideBarContent">
- • <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=new'><?=NEW_ENTRY?></a><br>
- • <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect'><?=EDIT_ENTRIES?></a><br>
- • <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=deleteSelect'><?=DELETE_ENTRIES?></a><br>
+ • <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=new'><?php echo NEW_ENTRY; ?></a><br>
+ • <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=editSelect'><?php echo EDIT_ENTRIES; ?></a><br>
+ • <a href='?serendipity[adminModule]=entries&serendipity[adminAction]=deleteSelect'><?php echo DELETE_ENTRIES; ?></a><br>
</div>
</div>
<div class="serendipitySideBarItem">
- <div class="serendipitySideBarTitle"><?=CATEGORIES?></div>
+ <div class="serendipitySideBarTitle"><?php echo CATEGORIES; ?></div>
<div class="serendipitySideBarContent">
- • <a href='?serendipity[adminModule]=category&serendipity[adminAction]=editSelect'><?=EDIT_CATEGORIES?></a><br>
+ • <a href='?serendipity[adminModule]=category&serendipity[adminAction]=editSelect'><?php echo EDIT_CATEGORIES; ?></a><br>
</div>
</div>
<div class="serendipitySideBarItem">
- <div class="serendipitySideBarTitle"><?=IMAGES?></div>
+ <div class="serendipitySideBarTitle"><?php echo IMAGES; ?></div>
<div class="serendipitySideBarContent">
- • <a href='?serendipity[adminModule]=images&serendipity[adminAction]=addSelect'><?=ADD_IMAGES?></a><br>
- • <a href='?serendipity[adminModule]=images'><?=MANAGE_IMAGES?></a><br>
- • <a href='?serendipity[adminModule]=images&serendipity[adminAction]=genThumbs' onClick="return confirm('<?=WARNING_THIS_BLAHBLAH?>');"><?=CREATE_THUMBS?></a><br>
+ • <a href='?serendipity[adminModule]=images&serendipity[adminAction]=addSelect'><?php echo ADD_IMAGES; ?></a><br>
+ • <a href='?serendipity[adminModule]=images'><?php echo MANAGE_IMAGES; ?></a><br>
+ • <a href='?serendipity[adminModule]=images&serendipity[adminAction]=genThumbs' onClick="return confirm('<?php echo WARNING_THIS_BLAHBLAH; ?>');"><?php echo CREATE_THUMBS; ?></a><br>
</div>
</div>
- • <a href="<?=$serendipity['serendipityHTTPPath']?>serendipity_admin.php"><?=ADMIN_INTERFACE?></a><br />
- • <a href="<?=$serendipity['serendipityHTTPPath']?>"><?=BACK_TO_BLOG?></a><br />
- • <a href="?serendipity[adminModule]=logout"><?=LOGOUT?></a>
+ • <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_admin.php"><?php echo ADMIN_INTERFACE; ?></a><br />
+ • <a href="<?php echo $serendipity['serendipityHTTPPath']; ?>"><?php echo BACK_TO_BLOG; ?></a><br />
+ • <a href="?serendipity[adminModule]=logout"><?php echo LOGOUT; ?></a>
</td>
<td class="serendipity_admin">
- <div class="serendipity_admin_title"><?=SERENDIPITY_AUTHORING_SUITE?></div>
+ <div class="serendipity_admin_title"><?php echo SERENDIPITY_AUTHORING_SUITE; ?></div>
<?php
if (!$serendipity["GET"]["adminModule"]) $serendipity["GET"]["adminModule"] = $serendipity["POST"]["adminModule"];
switch($serendipity["GET"]["adminModule"]) {
Index: serendipity_entries_overview.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_entries_overview.inc.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- serendipity_entries_overview.inc.php 25 May 2003 19:49:21 -0000 1.2
+++ serendipity_entries_overview.inc.php 25 Jun 2003 22:04:30 -0000 1.3
@@ -11,4 +11,4 @@
if (IN_serendipity !== true) die ("Don't hack!");
?>
-Welcome back, <?= $_SESSION['serendipityUser'] ?>.
+Welcome back, <?php echo $_SESSION['serendipityUser'] ; ?>.
Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -d -r1.78 -r1.79
--- serendipity_functions.inc.php 22 Jun 2003 20:35:22 -0000 1.78
+++ serendipity_functions.inc.php 25 Jun 2003 22:04:30 -0000 1.79
@@ -89,29 +89,29 @@
global $serendipity;
?>
<div class="serendipityCommentForm">
-<form name="serendipity_comment" action="<?=$serendipity['serendipityHTTPPath']?>comment.php" method="post" onsubmit="if (this.serendipity_remember.checked) rememberMe(this, '<?=$_SERVER['HTTP_HOST']?>')">
-<input type="hidden" name="serendipity[entry_id]" value="<?=$id?>" />
+<form name="serendipity_comment" action="<?php echo $serendipity['serendipityHTTPPath']; ?>comment.php" method="post" onsubmit="if (this.serendipity_remember.checked) rememberMe(this, '<?php echo $_SERVER['HTTP_HOST']; ?>')">
+<input type="hidden" name="serendipity[entry_id]" value="<?php echo $id; ?>" />
<table border="0" width="100%" cellpadding="3">
<tr>
-<td class="serendipity_commentsLabel"><?=NAME?></td>
-<td class="serendipity_commentsValue"><input type="text" name="serendipity[name]" value="<?= $serendipity['COOKIE']['name'] ?>" size="30" /></td>
+<td class="serendipity_commentsLabel"><?php echo NAME; ?></td>
+<td class="serendipity_commentsValue"><input type="text" name="serendipity[name]" value="<?php echo $serendipity['COOKIE']['name'] ; ?>" size="30" /></td>
</tr>
<tr>
-<td class="serendipity_commentsLabel"><?=EMAIL?></td>
-<td class="serendipity_commentsValue"><input type="text" name="serendipity[email]" value="<?= $serendipity['COOKIE']['email'] ?>" /></td>
+<td class="serendipity_commentsLabel"><?php echo EMAIL; ?></td>
+<td class="serendipity_commentsValue"><input type="text" name="serendipity[email]" value="<?php echo $serendipity['COOKIE']['email'] ; ?>" /></td>
</tr>
<tr>
-<td class="serendipity_commentsLabel"><?=HOMEPAGE?></td>
-<td class="serendipity_commentsValue"><input type="text" name="serendipity[url]" value="<?= $serendipity['COOKIE']['url'] ?>" /></td>
+<td class="serendipity_commentsLabel"><?php echo HOMEPAGE; ?></td>
+<td class="serendipity_commentsValue"><input type="text" name="serendipity[url]" value="<?php echo $serendipity['COOKIE']['url'] ; ?>" /></td>
</tr>
<tr>
-<td class="serendipity_commentsLabel"><?=COMMENT?></td>
+<td class="serendipity_commentsLabel"><?php echo COMMENT; ?></td>
<td class="serendipity_commentsValue"><textarea rows="10" cols="40" name="serendipity[comment]"></textarea></td>
</tr>
</table>
-<?=REMEMBER_INFO?>
-<input type="checkbox" name="serendipity[remember]" <?= $serendipity['COOKIE']['remember'] ?>/><br />
-<input type="submit" value="<?=SUBMIT_COMMENT?>" />
+<?php echo REMEMBER_INFO; ?>
+<input type="checkbox" name="serendipity[remember]" <?php echo $serendipity['COOKIE']['remember'] ; ?>/><br />
+<input type="submit" value="<?php echo SUBMIT_COMMENT; ?>" />
</form>
</div>
<?php
@@ -191,7 +191,7 @@
?>
<TABLE width='100%' CLASS='serendipity_calendar' CELLSPACING=0>
<TR>
-<TD ALIGN='left' class='serendipity_calendarHeader'><A HREF='<?= $serendipity['serendipityHTTPPath'] ?>index.php?serendipity[calendarZoom]=<?= $previousYear.sprintf("%02d",$previousMonth)?>'><IMG ALT="<?=BACK?>" SRC='<?= serendipity_getTemplateFile('img/back.png') ?>' BORDER='0'></A></TD>
+<TD ALIGN='left' class='serendipity_calendarHeader'><A HREF='<?php echo $serendipity['serendipityHTTPPath'] ; ?>index.php?serendipity[calendarZoom]=<?php echo $previousYear.sprintf("%02d",$previousMonth); ?>'><IMG ALT="<?php echo BACK; ?>" SRC='<?php echo serendipity_getTemplateFile('img/back.png') ; ?>' BORDER='0'></A></TD>
<TD COLSPAN='5' ALIGN='center' VALIGN='bottom' CLASS='serendipity_calendarHeader'><B><nobr>
<?php
if ($serendipity["rewrite"]==true) {
@@ -201,15 +201,15 @@
$link = "fixme";
}
?>
-<a href='<?= $link ?>'><?= $serendipity["months"][$month]." '".substr($year, 2) ?></a>
+<a href='<?php echo $link ; ?>'><?php echo $serendipity["months"][$month]." '".substr($year, 2) ; ?></a>
</nobr></B></TD>
<TD ALIGN='right' class='serendipity_calendarHeader'>
- <A HREF='<?= $serendipity['serendipityHTTPPath'] ?>index.php?serendipity[calendarZoom]=<?= $nextYear.sprintf("%02d",$nextMonth) ?>'>
- <IMG ALT="<?=FORWARD?>" SRC='<?= serendipity_getTemplateFile('img/forward.png') ?>' BORDER='0'>
+ <A HREF='<?php echo $serendipity['serendipityHTTPPath'] ; ?>index.php?serendipity[calendarZoom]=<?php echo $nextYear.sprintf("%02d",$nextMonth) ; ?>'>
+ <IMG ALT="<?php echo FORWARD; ?>" SRC='<?php echo serendipity_getTemplateFile('img/forward.png') ; ?>' BORDER='0'>
</A>
</TD>
</TR>
-<TR><TD CLASS='serendipity_weekDayName' ALIGN='center'><?= implode("</TD><TD CLASS='serendipity_weekDayName' ALIGN='center'>", $serendipity["weekDayAbb"])?>
+<TR><TD CLASS='serendipity_weekDayName' ALIGN='center'><?php echo implode("</TD><TD CLASS='serendipity_weekDayName' ALIGN='center'>", $serendipity["weekDayAbb"]); ?>
</TD>
<?php
@@ -527,10 +527,10 @@
?>
<tr>
<td class="serendipity_comment">
- <a name="c<?=$comment['id']?>"></a>
- <?=nl2br(serendipity_markup_text(serendipity_emoticate($body)))?><br />
+ <a name="c<?php echo $comment['id']; ?>"></a>
+ <?php echo nl2br(serendipity_markup_text(serendipity_emoticate($body))); ?><br />
<div class="serendipity_comment_source">
- <a href="<?=$PHP_SELF?>#c<?=$comment['id']?>" title="<?=LINK_TO_COMMENT?><?= $x ?>">#<?= $x ?></a> -
+ <a href="<?php echo $PHP_SELF; ?>#c<?php echo $comment['id']; ?>" title="<?php echo LINK_TO_COMMENT; ?><?php echo $x ; ?>">#<?php echo $x ; ?></a> -
<?php
echo $type ." ";
?>
@@ -555,7 +555,7 @@
<?php
if ( $_SESSION["serendipityAuthedUser"] === true ) {
?>
- (<a href="<?=$serendipity["baseURL"]?>comment.php?serendipity[delete]=<?=$comment['id']?>&serendipity[entry]=<?=$comment['entry_id']?>&serendipity[type]=comments"><?= DELETE ?></a>)
+ (<a href="<?php echo $serendipity["baseURL"]; ?>comment.php?serendipity[delete]=<?php echo $comment['id']; ?>&serendipity[entry]=<?php echo $comment['entry_id']; ?>&serendipity[type]=comments"><?php echo DELETE ; ?></a>)
<?php
}
?>
@@ -584,16 +584,16 @@
?>
<tr>
<td class="serendipity_comment">
- <a href="<?=strip_tags($link)?>" target="_blank"><?=$title?></a><br />
+ <a href="<?php echo strip_tags($link); ?>" target="_blank"><?php echo $title; ?></a><br />
<b>Excerpt: </b>
- <?=htmlentities(strip_tags($comment['body']))?><br />
+ <?php echo htmlentities(strip_tags($comment['body'])); ?><br />
<div class="serendipity_comment_source">
- <b>Weblog: </b> <?=strip_tags($name)?><br />
- <b>Tracked: </b><?=date("M d, h:i", $comment['timestamp'])?>
+ <b>Weblog: </b> <?php echo strip_tags($name); ?><br />
+ <b>Tracked: </b><?php echo date("M d, h:i", $comment['timestamp']); ?>
<?php
if ($_SESSION["serendipityAuthedUser"] === true) {
?>
- (<a href="<?=$serendipity["baseURL"]?>comment.php?serendipity[delete]=<?=$comment['id']?>&serendipity[entry]=<?=$comment['entry_id']?>&serendipity[type]=trackbacks"><?= DELETE ?></a>)
+ (<a href="<?php echo $serendipity["baseURL"]; ?>comment.php?serendipity[delete]=<?php echo $comment['id']; ?>&serendipity[entry]=<?php echo $comment['entry_id']; ?>&serendipity[type]=trackbacks"><?php echo DELETE ; ?></a>)
<?php
}
?></div>
@@ -1370,9 +1370,9 @@
if ($serendipity["wysiwyg"])
{
?>
- <font color="#ff0000"><?=$errMsg?></font>
+ <font color="#ff0000"><?php echo $errMsg; ?></font>
<table class='serendipityEntryEdit'>
- <form action='<?=$targetURL?>' method="post" name="serendipityEntry">
+ <form action='<?php echo $targetURL; ?>' method="post" name="serendipityEntry">
<?php
foreach($hiddens as $key => $value) {
echo "<input type='hidden' name='$key' value='$value'>\n";
@@ -1382,30 +1382,30 @@
?>
<tr>
<td align="left">
- <input type="text" name="serendipity[title]" value="<?=$entry["title"]?>" size="30">
- <input type="submit" value="- <?=SAVE?> -" style="font-weight: bold;">
+ <input type="text" name="serendipity[title]" value="<?php echo $entry["title"]; ?>" size="30">
+ <input type="submit" value="- <?php echo SAVE; ?> -" style="font-weight: bold;">
</td>
- <td><?=Category?> <?= $cat_list ?></td>
+ <td><?php echo Category; ?> <?php echo $cat_list ; ?></td>
</tr>
<tr>
- <td colspan="2"><?=ENTRY_BODY?></td>
+ <td colspan="2"><?php echo ENTRY_BODY; ?></td>
</tr>
<tr>
<td colspan="2">
- <textarea name="serendipity[body]" id="serendipity[body]" cols=80 rows=20><?=$entry["body"]?></textarea>
+ <textarea name="serendipity[body]" id="serendipity[body]" cols=80 rows=20><?php echo $entry["body"]; ?></textarea>
</td>
</tr>
<tr>
- <td colspan="2"><?=EXTENDED_BODY?></td>
+ <td colspan="2"><?php echo EXTENDED_BODY; ?></td>
</tr>
<tr>
<td colspan="2">
- <textarea name="serendipity[extended]" id="serendipity[extended]" cols=80 rows=20><?=htmlentities($entry["extended"])?></textarea>
+ <textarea name="serendipity[extended]" id="serendipity[extended]" cols=80 rows=20><?php echo htmlentities($entry["extended"]); ?></textarea>
</td>
</tr>
<tr>
<td colspan="2" align="right">
- <input type="submit" value="- <?=SAVE?> -" style="font-weight: bold;">
+ <input type="submit" value="- <?php echo SAVE; ?> -" style="font-weight: bold;">
</td>
</tr>
</form>
@@ -1418,9 +1418,9 @@
{
?>
<script language="JavaScript" src="serendipity_editor.js"></script>
- <font color="#ff0000"><?=$errMsg?></font>
+ <font color="#ff0000"><?php echo $errMsg; ?></font>
<table class='serendipityEntryEdit'>
- <form action='<?=$targetURL?>' method="post" name="serendipityEntry">
+ <form action='<?php echo $targetURL; ?>' method="post" name="serendipityEntry">
<?php
foreach($hiddens as $key => $value) {
echo "<input type='hidden' name='$key' value='$value'>\n";
@@ -1430,13 +1430,13 @@
?>
<tr>
<td align="left" colspan="2">
- <input type="text" name="serendipity[title]" value="<?=htmlentities($entry["title"])?>" size="80">
- <input type="submit" value="- <?=SAVE?> -" style="font-weight: bold;">
+ <input type="text" name="serendipity[title]" value="<?php echo htmlentities($entry["title"]); ?>" size="80">
+ <input type="submit" value="- <?php echo SAVE; ?> -" style="font-weight: bold;">
</td>
</tr>
<tr>
<td>
- <?=CATEGORY?> <?= $cat_list ?>
+ <?php echo CATEGORY; ?> <?php echo $cat_list ; ?>
</td>
<td align="right">
<?php
@@ -1447,37 +1447,37 @@
<input type="button" name="insB" value="B" accesskey="i" style="font-weight: bold" onClick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<b>','</b>')">
<input type="button" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onClick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<u>','</u>')">
<input type="button" name="insJ" value="img" accesskey="j" onClick="wrapInsImage(document.forms['serendipityEntry']['serendipity[body]'])">
- <input type="button" name="insImage" value="<?= IMAGE ?>" style="" onClick="window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800, height=600, toolbar=no');">
+ <input type="button" name="insImage" value="<?php echo IMAGE ; ?>" style="" onClick="window.open('serendipity_admin_image_selector.php', 'ImageSel', 'width=800, height=600, toolbar=no');">
<input type="button" name="insU" value="URL" accesskey="l" style="color: blue; text-decoration: underline;" onClick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[body]'])">
- <? } else { ?>
+ <?php } else { ?>
<input type="button" value=" B " onClick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'b')">
<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="<?=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', 'ImageSel', 'width=800,height=600,toolbar=no');">
<input type="button" value="Link" onClick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[body]'])">
- <? } ?>
+ <?php } ?>
</td>
</tr>
<tr>
- <td colspan="2"><?=ENTRY_BODY?></td>
+ <td colspan="2"><?php echo ENTRY_BODY; ?></td>
</tr>
<tr>
<td colspan="2">
- <textarea name="serendipity[body]" cols=80 rows=20><?=htmlentities($entry["body"])?></textarea>
+ <textarea name="serendipity[body]" cols=80 rows=20><?php echo htmlentities($entry["body"]); ?></textarea>
</td>
</tr>
<tr>
- <td colspan="2"><?=EXTENDED_BODY?></td>
+ <td colspan="2"><?php echo EXTENDED_BODY; ?></td>
</tr>
<tr>
<td colspan="2">
- <textarea name="serendipity[extended]" cols=80 rows=20><?=htmlentities($entry["extended"])?></textarea>
+ <textarea name="serendipity[extended]" cols=80 rows=20><?php echo htmlentities($entry["extended"]); ?></textarea>
</td>
</tr>
<tr>
<td colspan="2" align="right">
- <input type="submit" value="- <?=SAVE?> -" style="font-weight: bold;">
+ <input type="submit" value="- <?php echo SAVE; ?> -" style="font-weight: bold;">
</td>
</tr>
</form>
Index: serendipity_genpage.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_genpage.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_genpage.inc.php 22 Jun 2003 19:13:30 -0000 1.3
+++ serendipity_genpage.inc.php 25 Jun 2003 22:04:30 -0000 1.4
@@ -1,10 +1,10 @@
-<html><head><title><?=htmlentities($serendipity['blogTitle'])?></title>
-<link rel="stylesheet" type="text/css" href="<?=$serendipity['serendipityHTTPPath']?>serendipity.css.php" />
+<html><head><title><?php echo htmlentities($serendipity['blogTitle']); ?></title>
+<link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php" />
<?php
if (strtolower($serendipity['extCSS'])!='none') echo "<link rel='stylesheet' type='text/css' href='{$serendipity['extCSS']}'>";
?>
-<link rel="alternate" type="application/rss+xml" title="RSS" href="<?=$serendipity['baseURL']?>feeds/index.rss" />
-<script language="Javascript" src="<?=$serendipity['serendipityHTTPPath']?>serendipity.js"></script>
+<link rel="alternate" type="application/rss+xml" title="RSS" href="<?php echo $serendipity['baseURL']; ?>feeds/index.rss" />
+<script language="Javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.js"></script>
</head>
<body>
<?php
Index: serendipity_layout.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_layout.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_layout.inc.php 18 May 2003 14:21:07 -0000 1.5
+++ serendipity_layout.inc.php 25 Jun 2003 22:04:30 -0000 1.6
@@ -18,15 +18,15 @@
// API (e.g. how do I draw the calendar, fetch blog entries, etc...)
?>
<div id="serendipity_banner">
-<h1><?= $serendipity['blogTitle'] ?></h1>
+<h1><?php echo $serendipity['blogTitle'] ; ?></h1>
<?php
if($serendipity['blogSubTitle']) {
?>
-<h2><?= $serendipity['blogSubTitle'] ?></h2>
+<h2><?php echo $serendipity['blogSubTitle'] ; ?></h2>
<?php
} else {
?>
- <h2><?= $serendipity['blogDescription'] ?></h2>
+ <h2><?php echo $serendipity['blogDescription'] ; ?></h2>
<?php
}
?>
Index: serendipity_layout_table.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_layout_table.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- serendipity_layout_table.inc.php 3 May 2003 00:45:01 -0000 1.6
+++ serendipity_layout_table.inc.php 25 Jun 2003 22:04:30 -0000 1.7
@@ -14,12 +14,12 @@
?>
<div id="serendipity_banner">
- <h1><?= htmlentities($serendipity['blogTitle']) ?></h1>
+ <h1><?php echo htmlentities($serendipity['blogTitle']) ; ?></h1>
<?php
$sub = isset($serendipity['blogSubTitle']) ? $serendipity['blogSubTitle'] : $serendipity['blogDescription'];
if (strlen($sub)) {
?>
- <h2><?= $sub ?></h2>
+ <h2><?php echo $sub ; ?></h2>
<?php
}
?>
Index: serendipity_sidebar_items.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_sidebar_items.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_sidebar_items.php 25 Jun 2003 18:21:35 -0000 1.18
+++ serendipity_sidebar_items.php 25 Jun 2003 22:04:30 -0000 1.19
@@ -120,11 +120,11 @@
$title = SYNDICATE_THIS_BLOG;
?>
- <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php?version=0.91'><img src="<?= $serendipity['serendipityHTTPPath'] ?>xml.gif" border=0></a>
- <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php?version=0.91'>RSS 0.91 feed</a>
+ <a href='<?php echo $serendipity['serendipityHTTPPath'] ; ?>rss.php?version=0.91'><img src="<?php echo $serendipity['serendipityHTTPPath'] ; ?>xml.gif" border=0></a>
+ <a href='<?php echo $serendipity['serendipityHTTPPath'] ; ?>rss.php?version=0.91'>RSS 0.91 feed</a>
<br/>
- <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php?version=2.0'><img src="<?= $serendipity['serendipityHTTPPath'] ?>xml.gif" border=0></a>
- <a href='<?= $serendipity['serendipityHTTPPath'] ?>rss.php?version=2.0'>RSS 2.0 feed</a>
+ <a href='<?php echo $serendipity['serendipityHTTPPath'] ; ?>rss.php?version=2.0'><img src="<?php echo $serendipity['serendipityHTTPPath'] ; ?>xml.gif" border=0></a>
+ <a href='<?php echo $serendipity['serendipityHTTPPath'] ; ?>rss.php?version=2.0'>RSS 2.0 feed</a>
<?php
}
}
|
