Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1:/tmp/cvs-serv16268
Modified Files:
NEWS rss.php serendipity_admin.php
serendipity_admin_category.inc.php
serendipity_admin_css.inc.php
serendipity_admin_entries.inc.php
serendipity_admin_image_selector.php
serendipity_admin_images.inc.php
serendipity_admin_installer.inc.php
serendipity_admin_interop.inc.php
serendipity_admin_overview.inc.php
serendipity_admin_templates.inc.php serendipity_config.inc.php
serendipity_functions.inc.php serendipity_lang_de.inc.php
serendipity_lang_en.inc.php
serendipity_functions_config.inc.php
Added Files:
serendipity_lang.inc.php
Log Message:
o Lots of languages moved to defines
o Much code style (this were the only files left)
o Some XHTML cleanup
o NEWS-update
o Allow deleting categories (moving articles to another category)
o Autodetect language on installation
o RSS feeds: added <webMaster>, <managingEditor>, <comments>, <category> and <generator> tag
o RSS feed now contains <image> link to pixel/rss_banner.png (if existing), otherwise use pixel/s9y_banner_tiny.png
o enjoy the sun.
--- NEW FILE: serendipity_lang.inc.php ---
<?php # $Id: serendipity_lang.inc.php,v 1.1 2003/08/05 14:07:41 garvinhicking Exp $
// If no config file is loaded, language includes are not available.
// Now include one. Try to auto-guess the language by looking up the HTTP_ACCEPT_LANGUAGE.
if (serendipity_LANG_LOADED !== true) {
$supported_languages = array('en', 'de');
$possible_languages = explode(',', $_SERVER['HTTP_ACCEPT_LANGUAGE']);
if (is_array($possible_languages)) {
foreach($possible_languages AS $index => $lang) {
$preferred_language = preg_replace('|^([^\-_]*)|msU', '\1', $lang);
if (in_array($preferred_language, $supported_languages)) {
include_once('serendipity_lang_' . $preferred_language . '.inc.php');
break;
}
}
}
// What the heck does the user accept, then? Forcing english!
if (serendipity_LANG_LOADED !== true) {
include_once('serendipity_lang_en.inc.php');
}
}
/* vim: set sts=4 ts=4 expandtab : */
?>
Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- NEWS 29 Jul 2003 19:41:32 -0000 1.6
+++ NEWS 5 Aug 2003 14:07:40 -0000 1.7
@@ -2,6 +2,15 @@
Version 0.3 ()
------------------------------------
+ * Allow deleting categories (moving articles to another category) (garvinhicking)
+ * Autodetect language on installation (garvinhicking)
+ * RSS feeds properly utf8encoded, added <webMaster>,<managingEditor>,<comments>,<category> and <generator> tag (garvinhicking)
+ * RSS feed now contains <image> link to pixel/rss_banner.png (if existing), otherwise use pixel/s9y_banner_tiny.png (garvinhicking)
+ * External Plugin for hotword/acronym replacements, as well as any other content-rewriting plugin (garvinhicking)
+ * Allow embeding of serendipity in your custom homepage (wrapFile directive - see http://blog.supergarv.de/ for example) (garvinhicking)
+ * Plugins: Show updated values after submit, remove config entries when a plugin is removed (garvinhicking)
+ * Added an RSS-feed for comments to entries only (garvinhicking)
+ * Fixed archives to not properly show entries from the first/last day of a month (garvinhicking)
* Fixed the database by separating primary key from {AUTOINCREMENT} (jtate)
* Rewrote installer (tomsommer)
* Added support for postgres (jtate)
Index: rss.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/rss.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- rss.php 2 Aug 2003 15:14:19 -0000 1.8
+++ rss.php 5 Aug 2003 14:07:40 -0000 1.9
@@ -30,6 +30,29 @@
$title = utf8_encode($title);
$description = utf8_encode($description);
+if (file_exists($serendipity['serendipityPath'] . 'pixel/rss_banner.png')) {
+ $i = getimagesize($serendipity['serendipityPath'] . 'pixel/rss_banner.png');
+ $image = <<<IMAGE
+<image>
+ <url>{$serendipity['baseURL']}pixel/rss_banner.png</url>
+ <title>RSS: $title - $description</title>
+ <link>{$serendipity['baseURL']}</link>
+ <width>{$i[0]}</width>
+ <height>{$i[1]}</height>
+</image>
+IMAGE;
+} else {
+ $image = <<<IMAGE
+<image>
+ <url>{$serendipity['baseURL']}pixel/s9y_banner_tiny.png</url>
+ <title>RSS: $title - $description</title>
+ <link>{$serendipity['baseURL']}</link>
+ <width>100</width>
+ <height>21</height>
+</image>
+IMAGE;
+}
+
echo '<?xml version="1.0" encoding="utf-8" ?>';
echo "\n";
switch ($version) {
@@ -41,6 +64,8 @@
<title>$title</title>
<link>{$serendipity['baseURL']}</link>
<description>$description</description>
+<language>{$serendipity['CONFIG']['lang']}</language>
+$image
HEAD;
break;
@@ -54,11 +79,16 @@
xmlns:content="http://purl.org/rss/1.0/modules/content/"
xmlns:robot="http://www.edwardbear.org/def/xml/robot">
<channel>
-<title>$title</title>
-<link>{$serendipity['baseURL']}</link>
-<description>$description</description>
-<dc:language>{$serendipity['lang']}</dc:language>
+ <title>$title</title>
+ <link>{$serendipity['baseURL']}</link>
+ <description>$description</description>
+ <dc:language>{$serendipity['lang']}</dc:language>
+ <admin:errorReportsTo rdf:resource="mailto:{$serendipity['CONFIG']['email']}" />
+ <webMaster>{$serendipity['CONFIG']['email']}</webMaster>
+ <managingEditor>{$serendipity['CONFIG']['email']}</managingEditor>
+ <generator>Serendipity - http://www.s9y.org/</generator>
+ $image
HEAD;
break;
default:
Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_admin.php 16 Jul 2003 11:58:24 -0000 1.16
+++ serendipity_admin.php 5 Aug 2003 14:07:40 -0000 1.17
@@ -5,6 +5,9 @@
if (file_exists('./serendipity_config_local.inc.php')) {
include('serendipity_config.inc.php');
} else {
+ // If no config file is loaded, language includes are not available.
+ // Now include one. Try to auto-guess the language by looking up the HTTP_ACCEPT_LANGUAGE.
+ include_once 'serendipity_lang.inc.php';
$_SESSION['serendipityAuthedUser'] = true;
}
Index: serendipity_admin_category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_category.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_admin_category.inc.php 8 Jul 2003 09:13:27 -0000 1.5
+++ serendipity_admin_category.inc.php 5 Aug 2003 14:07:40 -0000 1.6
@@ -1,84 +1,113 @@
<?php # $Id$
-if (IN_serendipity !== true) die ("Don't hack!");
+if (IN_serendipity !== true) {
+ die ("Don't hack!");
+}
session_start();
$cat_to_edit = (int)$_GET['serendipity']['cat']['catid'];
-$msg = "";
+$msg = '';
if (isset($_POST['SAVE'])) {
- $name = addslashes($_POST['serendipity']['cat']['name']);
- $desc = addslashes($_POST['serendipity']['cat']['description']);
- if ($cat_to_edit == 0) {
- $query = "INSERT INTO $serendipity[dbPrefix]category (category_name, category_description, authorid) values ('$name', '$desc', $_SESSION[serendipityAuthorid])";
- } else {
- $query = "UPDATE $serendipity[dbPrefix]category SET category_name='$name', category_description='$desc' where categoryid=$cat_to_edit";
- }
-
- $r = serendipity_db_query($query);
- if (is_string($r)) {
- $msg = $r;
- } else {
- $msg = "Category Saved";
- }
+ $name = addslashes($_POST['serendipity']['cat']['name']);
+ $desc = addslashes($_POST['serendipity']['cat']['description']);
+ if ($cat_to_edit == 0) {
+ $query = "INSERT INTO {$serendipity['dbPrefix']}category (category_name, category_description, authorid) values ('$name', '$desc', {$_SESSION['serendipityAuthorid']})";
+ } else {
+ $query = "UPDATE {$serendipity['dbPrefix']}category SET category_name='$name', category_description='$desc' where categoryid=$cat_to_edit";
+ }
+
+ $r = serendipity_db_query($query);
+ if (is_string($r)) {
+ $msg = $r;
+ } else {
+ $msg = CATEGORY_SAVED;
+ }
+} elseif (isset($_POST['REMOVE'])) {
+ if ($cat_to_edit != 0) {
+ $remaining_cat = (int)$_POST['serendipity']['cat']['remaining_catid'];
+ serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}category WHERE categoryid=$cat_to_edit");
+ serendipity_db_query("UPDATE {$serendipity['dbPrefix']}entries SET categoryid=$remaining_cat WHERE categoryid=$cat_to_edit");
+ $msg = sprintf(CATEGORY_DELETED, $cat_to_edit, $remaining_cat);
+ } else {
+ $msg = INVALID_CATEGORY;
+ }
+
+ $cat_to_edit = 0;
}
$cats = serendipity_fetchCategories();
-if ($cat_to_edit > 0 && count($cats)) {
- foreach ($cats as $cat_data) {
- if ($cat_data['categoryid'] == $cat_to_edit) {
- $this_cat = $cat_data;
- break;
- }
- }
+$existing_cats_table = '';
+$existing_cats_dropdown = '<select name="serendipity[cat][remaining_catid]">' . "\n";
+if (count($cats)) {
+ foreach ($cats as $cat_data) {
+ if ($cat_to_edit > 0 && $cat_data['categoryid'] == $cat_to_edit && !isset($this_cat)) {
+ $this_cat = $cat_data;
+ } elseif ($cat_to_edit > 0) {
+ $existing_cats_dropdown .= '<option value="' . $cat_data['categoryid'] . '">' . htmlentities($cat_data['category_name']) . '</option>' . "\n";
+ }
+
+ $name = htmlentities($cat_data['category_name']);
+ $desc = htmlentities($cat_data['category_description']);
+ $existing_cats_table .= <<<CAT
+ <tr>
+ <td>
+ • <a href="?serendipity[adminModule]=category&serendipity[cat][catid]={$cat_data['categoryid']}">$name - $desc</a>
+ </td>
+ </tr>
+CAT;
+ }
}
-
+$existing_cats_dropdown .= '</select>';
?>
-<font color="red"><?php echo $msg ; ?></font>
+<div style="color: red"><?php echo $msg ; ?></div>
+
<form method="POST" name="serendipityCategory">
<?php
if ($cat_to_edit == 0) {
- $desc = CREATE_NEW_CAT;
- $save = CREATE;
+ $desc = CREATE_NEW_CAT;
+ $save = CREATE;
+ $remove = '';
} else {
- $desc = htmlentities(sprintf(EDIT_THIS_CAT, $this_cat[category_name], $this_cat[category_description]));
- $save = SAVE;
+ $desc = htmlentities(sprintf(EDIT_THIS_CAT, $this_cat['category_name'], $this_cat['category_description']));
+ $save = SAVE;
+ $remove = str_repeat(' ', 10) . '<input type="submit" name="REMOVE" value="' . DELETE . '"> <b>>></b> ' . sprintf(CATEGORY_REMAINING, $existing_cats_dropdown);
}
?>
-<b><?php echo $desc ; ?></b>
+
+<b><?php echo $desc; ?></b>
<table cellpadding="5">
-<tr>
-<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><?php echo NAME; ?></th>
+ <td><input type="text" name="serendipity[cat][name]" value="<?php echo htmlentities($this_cat['category_name']); ?>" /></td>
+ </tr>
-<tr>
-<th><?php echo DESCRIPTION; ?></th>
-<td><input type="text" name="serendipity[cat][description]" value="<?php echo htmlentities($this_cat['category_description']) ; ?>"/></td>
-</tr>
+ <tr>
+ <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="<?php echo $save ; ?>">
+
+<div>
+ <input type="submit" name="SAVE" value="<?php echo $save; ?>"/>
+ <?php echo $remove; ?>
+</div>
<br />
<br />
<b><?php echo CLICK_CAT_TO_EDIT; ?></b>
<table>
-<?php
-if (is_array($cats)) {
- foreach ($cats as $cat_data) {
- $name = htmlentities($cat_data['category_name']);
- $desc = htmlentities($cat_data['category_description']);
- echo "<tr><td>• <a href=\"?serendipity[adminModule]=category&serendipity[cat][catid]=$cat_data[categoryid]\">$name - $desc</a></td></tr>\n";
- }
-}
-?>
-<tr><td>• <a href="?serendipity[adminModule]=category&serendipity[cat][catid]=0"><?php echo CREATE_NEW_CAT; ?></a></td></tr>
+<?php echo $existing_cats_table; ?>
+ <tr>
+ <td>
+ • <a href="?serendipity[adminModule]=category&serendipity[cat][catid]=0"><?php echo CREATE_NEW_CAT; ?></a>
+ </td>
+ </tr>
</table>
-
</form>
<?php
/* vim: set sts=4 ts=4 expandtab : */
Index: serendipity_admin_css.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_css.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- serendipity_admin_css.inc.php 8 Jul 2003 09:13:27 -0000 1.3
+++ serendipity_admin_css.inc.php 5 Aug 2003 14:07:40 -0000 1.4
@@ -1,73 +1,77 @@
<?php # $Id$
##########################################################################
-# serendipity - another blogger... #
+# serendipity - another blogger... #
##########################################################################
# #
# (c) 2003 Jannis Hermanns <J...@ha...> #
-# http://www.jannis.to/programming/serendipity.html #
+# http://www.jannis.to/programming/serendipity.html #
# #
##########################################################################
-if (IN_serendipity !== true) die ("Don't hack!");
+if (IN_serendipity !== true) {
+ die ("Don't hack!");
+}
-// A little helper we don't want in _functions.inc.php
-switch($serendipity["GET"]["adminAction"]) {
+switch($serendipity['GET']['adminAction']) {
+ case 'save':
+ $entry = array(
+ 'cssid' => $serendipity['POST']['cssid'],
+ 'name' => $serendipity['POST']['name'],
+ 'data' => $serendipity['POST']['data']
+ );
- case "save":
- $entry = array("cssid" => $serendipity["POST"]["cssid"],
- "name"=>$serendipity["POST"]["name"],
- "data" =>$serendipity["POST"]["data"]);
$res = serendipity_updateCSS($entry);
- if (is_string($res))
+
+ if (is_string($res)) {
serendipity_printCSSForm("?", "edit", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "css", "serendipity[adminAction]" => "save"), $entry, "Error: <b>$res</b>");
- else
+ } else {
serendipity_printCSSForm("?", "edit", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "css", "serendipity[adminAction]" => "save"), $entry);
- break;
+ }
+ break;
- case "edit":
- serendipity_printCSSForm("?", "edit", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "css",
+ case 'edit':
+ serendipity_printCSSForm("?", "edit", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "css",
"serendipity[adminAction]" => "save"), $entry);
- break;
+ break;
default:
+ if (isset($_POST['NEW'])) {
+ serendipity_printCSSForm("?", "edit",
+ array(
+ "serendipity[action]" => "admin",
+ "serendipity[adminModule]" => "css",
+ "serendipity[adminAction]" => "save"
+ ),
+ array(
+ "cssid" => 0,
+ "name" => "New",
+ "data" => file_get_contents("serendipity.css")
+ )
+ );
+ } else if (isset($_POST['EDIT'])) {
+ serendipity_printCSSForm("?", "edit",
+ array(
+ "serendipity[action]" => "admin",
+ "serendipity[adminModule]" => "css",
+ "serendipity[adminAction]" => "save"
+ ),
+ $_POST['serendipity']['cssid']
+ );
- if (isset($_POST['NEW'])) {
- serendipity_printCSSForm("?", "edit",
- array(
- "serendipity[action]" => "admin",
- "serendipity[adminModule]" => "css",
- "serendipity[adminAction]" => "save"
- ),
- array(
- "cssid" => 0,
- "name" => "New",
- "data" => file_get_contents("serendipity.css")
- )
- );
- } else if (isset($_POST['EDIT'])) {
- serendipity_printCSSForm("?", "edit",
- array(
- "serendipity[action]" => "admin",
- "serendipity[adminModule]" => "css",
- "serendipity[adminAction]" => "save"
- ),
- $_POST['serendipity']['cssid']
- );
-
- } else if (isset($_POST['DEFAULT'])) {
- $css = serendipity_getCSS($_POST['serendipity']['cssid']);
- serendipity_set_config_var("default_css", $css['name']);
- } else if (isset($_POST['DELETE'])) {
- if (is_numeric($_POST['serendipity']['cssid'])) {
- $id = serendipity_db_escape_string($_POST['serendipity']['cssid']);
- serendipity_db_query("delete from $serendipity[dbPrefix]css where cssid='$id'");
- }
- serendipity_printCSSForm("?", "choose", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "css"), $entry);
- } else {
+ } else if (isset($_POST['DEFAULT'])) {
+ $css = serendipity_getCSS($_POST['serendipity']['cssid']);
+ serendipity_set_config_var("default_css", $css['name']);
+ } else if (isset($_POST['DELETE'])) {
+ if (is_numeric($_POST['serendipity']['cssid'])) {
+ $id = serendipity_db_escape_string($_POST['serendipity']['cssid']);
+ serendipity_db_query("delete from $serendipity[dbPrefix]css where cssid='$id'");
+ }
+ serendipity_printCSSForm("?", "choose", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "css"), $entry);
+ } else {
- serendipity_printCSSForm("?", "choose", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "css"), $entry);
- }
+ serendipity_printCSSForm("?", "choose", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "css"), $entry);
+ }
break;
}
/* vim: set sts=4 ts=4 expandtab : */
Index: serendipity_admin_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_entries.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- serendipity_admin_entries.inc.php 8 Jul 2003 09:13:27 -0000 1.5
+++ serendipity_admin_entries.inc.php 5 Aug 2003 14:07:40 -0000 1.6
@@ -1,132 +1,186 @@
<?php # $Id$
##########################################################################
-# serendipity - another blogger... #
+# serendipity - another blogger... #
##########################################################################
# #
# (c) 2003 Jannis Hermanns <J...@ha...> #
-# http://www.jannis.to/programming/serendipity.html #
+# http://www.jannis.to/programming/serendipity.html #
# #
##########################################################################
-if (IN_serendipity !== true) die ("Don't hack!");
+if (IN_serendipity !== true) {
+ die ("Don't hack!");
+}
// A little helper we don't want in _functions.inc.php
function serendipity_drawList($action) {
- global $serendipity;
-
- // Prepare variables
- if (!is_numeric($serendipity["GET"]["offset"])) $serendipity["GET"]["offset"] = 0;
- $perPage = 30;
-
- // Fetch the entries
- $entries = serendipity_fetchEntries(false, false, serendipity_db_limit($serendipity["GET"]["offset"], $perPage));
-
- // Prepare table
- echo "<div class='serendipity_admin_list'>";
- echo "<div class='serendipity_admin_list_title'>".ucfirst($action)." Entries:</div>";
- echo "<table width='100%' class='serendipity_admin_list'>";
+ global $serendipity;
- if ( is_array($entries) ) {
- $half = (int) ((count($entries) + 1)/2);
-
- // Print the browse buttons
- echo "<tr><td align='left'>";
- if ($serendipity["GET"]["offset"] > 0) {
- echo '<input type="button" value="<<<" onClick="location.href=\'?serendipity[adminModule]=entries&serendipity[adminAction]='.$serendipity["GET"]["adminAction"].'&serendipity[offset]='.max(0,($serendipity["GET"]["offset"]-$perPage)).'\';">';
- }
- echo "</td><td align='right'>";
- if (count($entries) == $perPage) {
- echo '<input type="button" value=">>>" onClick="location.href=\'?serendipity[adminModule]=entries&serendipity[adminAction]='.$serendipity["GET"]["adminAction"].'&serendipity[offset]='.($serendipity["GET"]["offset"]+$perPage).'\';">';
- }
- echo "</td></tr>";
- // Print the entries
- $count = count($entries);
- for ($x=0; $x<$half; $x++) {
- ?>
- <tr>
- <td class="serendipity_admin_list_item">
- <?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) { ?>
- <?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
- }
+ // Prepare variables
+ if (!is_numeric($serendipity['GET']['offset'])) {
+ $serendipity['GET']['offset'] = 0;
}
- }
- else {
- //We've got nothing
- ?>
- <tr><td class="serendipity_admin_list_item" colspan="2">
- <?php echo NO_ENTRIES_TO_PRINT ?></td></tr>
- <?php
- }
+
+ $perPage = 30;
+
+ // Fetch the entries
+ $entries = serendipity_fetchEntries(
+ false,
+ false,
+ serendipity_db_limit(
+ $serendipity['GET']['offset'],
+ $perPage
+ )
+ );
+ $string_action = ($action == 'delete' ? DELETE_ENTRIES : EDIT_ENTRIES);
+
+ // Prepare table
?>
- </td>
+<div class="serendipity_admin_list">
+ <div class="serendipity_admin_list_title"><?php echo $string_action; ?>:</div>
+
+ <table width="100%" class="serendipity_admin_list">
+<?php
+ if (is_array($entries)) {
+ $half = (int) ((count($entries) + 1)/2);
+
+ // Print the browse buttons
+?>
+ <tr>
+ <td>
+<?php
+ if ($serendipity['GET']['offset'] > 0) {
+?>
+ <input type="button" value="<<<" onClick="location.href='?serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $serendipity['GET']['adminAction']; ?>&serendipity[offset]=<?php echo max(0, ($serendipity['GET']['offset'] - $perPage)); ?>';" />
+<?php
+ }
+?>
+ </td>
+
+ <td align="right">
+<?php
+ if (count($entries) == $perPage) {
+?>
+ <input type="button" value=">>>" onClick="location.href='?serendipity[adminModule]=entries&serendipity[adminAction]=<?php echo $serendipity['GET']['adminAction']; ?>&serendipity[offset]=<?php echo $serendipity['GET']['offset'] + $perPage; ?>';" />
+<?php
+ }
+?>
+ </td>
</tr>
-<?php
- echo "</table></div>";
+<?php
+ // Print the entries
+ $count = count($entries);
+ for ($x=0; $x < $half; $x++) {
+?>
+ <tr>
+ <td class="serendipity_admin_list_item">
+ <?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>
+ </td>
+
+ <td class="serendipity_admin_list_item">
+<?php
+ if ($x + $half < $count) {
+?>
+ <?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>
+<?php
+ }
+?>
+ </td>
+ </tr>
+<?php
+ }
+ } else {
+ // We've got nothing
+?>
+ <tr>
+ <td class="serendipity_admin_list_item" colspan="2">
+ <?php echo NO_ENTRIES_TO_PRINT ?>
+ </td>
+ </tr>
+<?php
+ }
+?>
+ </table>
+</div>
+<?php
}
+switch($serendipity['GET']['adminAction']) {
+ case 'save':
+ $entry = array(
+ 'id' => $serendipity['POST']['id'],
+ 'title' => $serendipity['POST']['title'],
+ 'timestamp' => $serendipity['POST']['timestamp'],
+ 'body' => $serendipity['POST']['body'],
+ 'extended' => $serendipity['POST']['extended'],
+ 'categoryid' => $serendipity['POST']['categoryid']
+ );
-switch($serendipity["GET"]["adminAction"]) {
-
- case "save":
- $entry = array("id" => $serendipity["POST"]["id"],
- "title"=>$serendipity["POST"]["title"],
- "timestamp" => $serendipity["POST"]["timestamp"],
- "body" =>$serendipity["POST"]["body"],
- "extended" => $serendipity["POST"]["extended"],
- "categoryid" => $serendipity['POST']['categoryid']
- );
- $res = serendipity_updertEntry($entry);
- if (is_string($res))
- serendipity_printEntryForm("?", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "entries",
- "serendipity[adminAction]" => "save"), $entry, "Error: <b>$res</b>");
- else
- echo "Entry saved.";
- break;
-
- case "edit":
- $entry = serendipity_fetchEntry("id", $serendipity["GET"]["id"]);
-
- serendipity_printEntryForm("?", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "entries",
- "serendipity[adminAction]" => "save"), $entry);
- break;
+ $res = serendipity_updertEntry($entry);
+
+ if (is_string($res)) {
+ serendipity_printEntryForm(
+ '?',
+ array(
+ 'serendipity[action]' => 'admin',
+ 'serendipity[adminModule]' => 'entries',
+ 'serendipity[adminAction]' => 'save'
+ ),
+ $entry,
+ ERROR . ': <b>' . $res . '</b>');
+ } else {
+ echo ENTRY_SAVED;
+ }
+ break;
- case "editSelect":
- serendipity_drawList("edit");
- break;
+ case 'editSelect':
+ serendipity_drawList('edit');
+ break;
- case "deleteSelect":
- serendipity_drawList("delete");
- break;
+ case 'deleteSelect':
+ serendipity_drawList('delete');
+ break;
- case "delete":
- echo "Are you sure you want to delete #".$serendipity["GET"]["id"]." permanently?<br>";
- echo "<input type='button' value='Not really...' onClick='history.go(-1);'>";
- echo str_repeat(" ", 10);
- $newLoc = "?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=doDelete&serendipity[id]="
- .$serendipity["GET"]["id"];
- echo "<input type='button' value='Dump it!' onClick='location.href=\"$newLoc\"'>";
- break;
+ case 'delete':
+ $newLoc = '?serendipity[action]=admin&serendipity[adminModule]=entries&serendipity[adminAction]=doDelete&serendipity[id]=' . $serendipity['GET']['id'];
+ printf(DELETE_SURE, $serendipity['GET']['id']);
+?>
+<br />
+<div>
+ <input type="button" value="<?php echo NOT_REALLY; ?>" onClick="history.go(-1);" />
+ <span style="width: 50px;"></span>
+ <input type="button" value="<?php echo DUMP_IT; ?>" onClick="location.href='<?php echo $newLoc; ?>'" />
+</div>
+<?php
+ break;
- case "doDelete":
- serendipity_deleteEntry($serendipity["GET"]["id"]);
- echo "R.I.P entry #".$serendipity["GET"]["id"];
- break;
+ case 'doDelete':
+ serendipity_deleteEntry($serendipity['GET']['id']);
+ printf(RIP_ENTRY, $serendipity['GET']['id']);
+ break;
- default:
- serendipity_printEntryForm("?", array("serendipity[action]" => "admin", "serendipity[adminModule]" => "entries",
- "serendipity[adminAction]" => "save"), $entry);
+ case 'edit':
+ $entry = serendipity_fetchEntry('id', $serendipity['GET']['id']);
+ default:
+ serendipity_printEntryForm(
+ '?',
+ array(
+ 'serendipity[action]' => 'admin',
+ 'serendipity[adminModule]' => 'entries',
+ 'serendipity[adminAction]' => 'save'
+ ),
+ $entry
+ );
}
/* vim: set sts=4 ts=4 expandtab : */
?>
Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- serendipity_admin_image_selector.php 8 Jul 2003 13:51:19 -0000 1.8
+++ serendipity_admin_image_selector.php 5 Aug 2003 14:07:40 -0000 1.9
@@ -1,110 +1,169 @@
<?php # $Id$
##########################################################################
-# serendipity - another blogger... #
+# serendipity - another blogger... #
##########################################################################
# #
# (c) 2003 Jannis Hermanns <J...@ha...> #
-# http://www.jannis.to/programming/serendipity.html #
+# http://www.jannis.to/programming/serendipity.html #
# #
##########################################################################
+
session_start();
-include("serendipity_config.inc.php");
+include('serendipity_config.inc.php');
-if (IN_serendipity !== true) die ("Don't hack!");
+if (IN_serendipity !== true) {
+ die ("Don't hack!");
+}
-if ($_SESSION["serendipityAuthedUser"] !== true) die("Log in...");
+if ($_SESSION['serendipityAuthedUser'] !== true) {
+ die(HAVE_TO_BE_LOGGED_ON);
+}
function serendipity_displayImageList($start = 0, $end = 20) {
- global $serendipity;
-
+ global $serendipity;
serendipity_fetchImages(true);
- $inc = $end - $start;
- $files = array_slice($serendipity["imageList"], $start, $inc);
+ $inc = $end - $start;
+ $files = array_slice($serendipity['imageList'], $start, $inc);
if ($start > 0) {
- $left = "<input type='button' value='<<<' onClick=\"location.href='?serendipity[start]=" . max(0, $start - $inc) . "&serendipity[end]=$start';\">\n";
+ $left = '<input type="button" value="<<<" onClick="location.href=\'?serendipity[start]=' . max(0, $start - $inc) . '&serendipity[end]=' . $start . '\';">' . "\n";
}
if (count($serendipity["imageList"]) > $end) {
- $right = "<input type='button' value='>>>' onClick=\"location.href='?serendipity[start]=$end&serendipity[end]=" . ($end + $inc) . "'\">\n";
+ $right = '<input type="button" value=">>>" onClick="location.href=\'?serendipity[start]=' . $end . '&serendipity[end]=' . ($end + $inc) . '\';">' . "\n";
}
- $lineBreak = floor(750/($serendipity["thumbSize"]+20));
- echo "<table border='0'>";
- echo "<tr><td align='left' colspan='".floor($lineBreak/2)."'>$left</td><td align='right' colspan='".ceil($lineBreak/2)."'>$right</td></tr><tr>";
+ $lineBreak = floor(750 / ($serendipity['thumbSize'] + 20));
+?>
+<table border="0">
+ <tr>
+ <td align="left" colspan="<?php echo floor($linebreak/2); ?>">
+ <?php echo $left; ?>
+ </td>
+
+ <td align="right" colspan="<?php echo ceil($linebreak/2); ?>">
+ <?php echo $right; ?>
+ </td>
+ </tr>
+
+ <tr>
+<?php
for ($x=0; $x<count($files); $x++) {
-
- // Parse filename and image info
- $f = serendipity_parseFileName($files[$x]);
- $i = getimagesize($serendipity["serendipityPath"].$serendipity["uploadPath"]."/".$files[$x]);
-
+ // Parse filename and image info
+ $f = serendipity_parseFileName($files[$x]);
+ $i = getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . '/' . $files[$x]);
+ $imgsrc = $serendipity['uploadHTTPPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
// Display thumbnails
- echo "<td height='".$serendipity["thumbSize"]."' align='center' valign='middle'>";
- echo "<a href='?serendipity[step]=1&serendipity[image]=".$files[$x]."'>";
- echo "<img src='".$serendipity["uploadHTTPPath"].$f[0].".".$serendipity["thumbSuffix"].".".$f[1]."' hspace='15' border='0'>";
- echo "</a>";
- echo "</td>";
-
+?>
+ <td height="<?php echo $serendipity['thumbSize']; ?>" align="center" valign="middle">
+ <a href="?serendipity[step]=1&serendipity[image]="<?php echo $files[$x]; ?>">
+ <img src="<?php echo $imgsrc; ?>" hspace="15" border="0" />
+ </a>
+ </td>
+<?php
// Newline?
- if (($x+1)%$lineBreak == 0) echo "</tr><tr>";
+ if (($x+1)%$lineBreak == 0) {
+?>
+ </tr>
+ <tr>
+<?php
+ }
}
- echo "</tr><tr><td align='left' colspan='".floor($lineBreak/2)."'>$left</td><td align='right' colspan='".ceil($lineBreak/2)."'>$right</td></tr>";
- echo "</table>";
+?>
+ </tr>
+ <tr>
+ <td align="left" colspan="<?php echo floor($linebreak/2); ?>">
+ <?php echo $left; ?>
+ </td>
+
+ <td align="right" colspan="<?php echo ceil($linebreak/2); ?>">
+ <?php echo $right; ?>
+ </td>
+ </tr>
+</table>
+<?php
+}
-}?>
+?>
<html>
- <head>
- <title><?php echo SELECT_IMAGE; ?></title>
- <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php">
- </head>
+ <head>
+ <title><?php echo SELECT_IMAGE; ?></title>
+ <link rel="stylesheet" type="text/css" href="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity.css.php">
+ </head>
<body>
+
<?php
+switch ($serendipity['GET']['step']) {
+ case '1':
+ $f = serendipity_parseFileName($serendipity["GET"]["image"]);
+ $imgsrc = $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
+ $imgName = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $serendipity['GET']['image'];
+ $thumbName = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
+?>
+<script type="text/javascript" language="JavaScript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_define.js.php"></script>
+<script type="text/javascript" language="Javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_editor.js"></script>
-switch ($serendipity["GET"]["step"]) {
+<div>
+ <img align="right" src="<?php echo $imgsrc; ?>">
+ <h1><?php printf(YOU_CHOSE, $serendipity['GET']['image']); ?></h1>
+ <p>
+ <form action="#" method="GET" name="serendipity[selForm]" onSubmit="serendipity_imageSelector_done()">
+ <div>
+ <input type="hidden" name="imgName" value="<?php echo $imgName; ?>" />
+ <input type="hidden" name="thumbName" value="<?php echo $thumbName; ?>" />
- case "1":
- ?>
- <script type="text/javascript" language="JavaScript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_define.js.php"></script>
- <script type="text/javascript" language="Javascript" src="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_editor.js"></script>
- <?php
- $f = serendipity_parseFileName($serendipity["GET"]["image"]);
- echo "<img align='right' src='".$serendipity["serendipityHTTPPath"] . $serendipity["uploadPath"].$f[0].".".$serendipity["thumbSuffix"].".".$f[1]."'>";
- echo "<h1>".sprintf(YOU_CHOSE,$serendipity["GET"]["image"])."</h1><p>";
- echo "<form action='#' method='GET' name='serendipity[selForm]' onSubmit='serendipity_imageSelector_done()'>";
- echo "<input type='hidden' name='imgName' value='".$serendipity["serendipityHTTPPath"] . $serendipity["uploadHTTPPath"].$serendipity["GET"]["image"]."'>";
- echo "<input type='hidden' name='thumbName' value='".$serendipity["serendipityHTTPPath"] . $serendipity["uploadHTTPPath"].$f[0].".".$serendipity["thumbSuffix"].".".$f[1]."'>";
+ <b><?php echo IMAGE_SIZE; ?>:</b>
+ <br />
+ <input type="radio" name="serendipity[linkThumbnail]" value="no" checked="checked" /><?php echo I_WANT_THUMB; ?><br />
+ <input type="radio" name="serendipity[linkThumbnail]" value="yes" /><?php echo I_WANT_BIG_IMAGE; ?><br />
+ <br />
- echo "<b>".IMAGE_SIZE.":</b><br>";
- echo "<input type='radio' name='serendipity[linkThumbnail]' value='no' CHECKED>".I_WANT_THUMB."<br>";
- echo "<input type='radio' name='serendipity[linkThumbnail]' value='yes'>".I_WANT_BIG_IMAGE."<p>";
+ <b><?php echo IMAGE_ALIGNMENT; ?>:</b>
+ <br />
+ <input type="radio" name="serendipity[align]" value="" /> <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/img_align_top.png" vspace="5"><br />
+ <input type="radio" name="serendipity[align]" value="left" checked="checked" /> <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/img_align_left.png" vspace="5"><br />
+ <input type="radio" name="serendipity[align]" value="right" /> <img src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/img_align_right.png" vspace="5"><br />
+ <br />
- echo "<b>Image alignment:</b><br>";
- echo "<input type='radio' name='serendipity[align]' value=''> <img src='".$serendipity["serendipityHTTPPath"]."pixel/img_align_top.png' vspace='5'><br>";
- echo "<input type='radio' name='serendipity[align]' value='left' CHECKED> <img src='".$serendipity["serendipityHTTPPath"]."pixel/img_align_left.png' vspace='5'><br>";
- echo "<input type='radio' name='serendipity[align]' value='right'> <img src='".$serendipity["serendipityHTTPPath"]."pixel/img_align_right.png' vspace='5'><p>";
+ <b><?php echo IMAGE_AS_A_LINK; ?>:</b>
+ <br />
+ <input type="radio" name="serendipity[isLink]" checked="checked" /> <?php echo I_WANT_NO_LINK; ?><br />
+ <input type="radio" name="serendipity[isLink]" /> <?php echo I_WANT_IT_TO_LINK; ?>
+ <input type="text" name="serendipity[url]" size="30" value="<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadPath'] . $serendipity['GET']['image']; ?>" onfocus="value='';" /><br />
+ <br />
- echo "<b>".IMAGE_AS_A_LINK.":</b><br>";
- echo "<input type='radio' name='serendipity[isLink]' CHECKED> ".I_WANT_NO_LINK."<br>";
- echo "<input type='radio' name='serendipity[isLink]' > ".I_WANT_IT_TO_LINK;
- echo "<input type='text' name='serendipity[url]' size='30' value='".$serendipity["serendipityHTTPPath"].$serendipity["uploadPath"].$serendipity["GET"]["image"]."' onFocus='value=\"\";'><p>";
- echo "<input type='button' value='".BACK."' onClick='history.go(-1);'> ";
- echo "<input type='button' value='".DONE."' onClick='serendipity_imageSelector_done()'>";
- echo "</form>";
+ <input type="button" value="<?php echo BACK; ?>" onClick="history.go(-1);" />
+ <input type="button" value="<?php echo DONE; ?>" onClick="serendipity_imageSelector_done()" />
+ </div>
+ </form>
+ </p>
+<?php
break;
- default:
- echo "<b>Select an image:</b><p>";
- if (!is_numeric($serendipity["GET"]["start"])) $serendipity["GET"]["start"] = 0;
- if (!is_numeric($serendipity["GET"]["end"]))
- $serendipity["GET"]["end"] = $serendipity["GET"]["start"]+
- floor(750/($serendipity["thumbSize"]+20))*floor(580/($serendipity["thumbSize"]+20));
- echo CLICK_IMAGE_TO_INSERT."<br>";
- serendipity_displayImageList($serendipity["GET"]["start"], $serendipity["GET"]["end"]);
+ default:
+ if (!is_numeric($serendipity['GET']['start'])) {
+ $serendipity['GET']['start'] = 0;
+ }
+
+ if (!is_numeric($serendipity['GET']['end'])) {
+ $serendipity['GET']['end'] = $serendipity['GET']['start']+ floor(750/($serendipity['thumbSize']+20))*floor(580/($serendipity['thumbSize']+20));
+ }
+?>
+ <b><?php echo SELECT_IMAGE; ?></b>
+ <br />
+
+ <?php echo CLICK_IMAGE_TO_INSERT; ?>
+ <br />
+
+ <?php serendipity_displayImageList($serendipity['GET']['start'], $serendipity['GET']['end']);
}
?>
-</body></html>
+
+</body>
+</html>
+
<?php
/* vim: set sts=4 ts=4 expandtab : */
?>
Index: serendipity_admin_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_images.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- serendipity_admin_images.inc.php 8 Jul 2003 09:13:27 -0000 1.9
+++ serendipity_admin_images.inc.php 5 Aug 2003 14:07:40 -0000 1.10
@@ -1,286 +1,359 @@
<?php # $Id$
##########################################################################
-# serendipity - another blogger... #
+# serendipity - another blogger... #
##########################################################################
# #
# (c) 2003 Jannis Hermanns <J...@ha...> #
-# http://www.jannis.to/programming/serendipity.html #
+# http://www.jannis.to/programming/serendipity.html #
# #
##########################################################################
-if (IN_serendipity !== true) die ("Don't hack!");
+if (IN_serendipity !== true) {
+ die ("Don't hack!");
+}
function serendipity_displayImageList($start = 0, $end = 20) {
- global $serendipity;
+ global $serendipity;
serendipity_fetchImages(true);
$inc = $end - $start;
- $files = @array_slice($serendipity["imageList"], $start, $inc);
- ?>
- <script language="javascript">
- <!--
- function rename(fname) {
- if(newname = prompt('Enter the new name for '+fname, fname))
- location.href='?serendipity[adminModule]=images&serendipity[adminAction]=rename&serendipity[oldname]='+
- escape(fname)+'&serendipity[newname]='+escape(newname);
- }
- //-->
- </script>
- <div class="serendipity_admin_list">
- <div class="serendipity_admin_list_title">Image manager:</div>
- <?php
+ $files = @array_slice($serendipity['imageList'], $start, $inc);
if ($start > 0) {
- $left = "<input type='button' value='<<<' onClick=\"location.href='{$_SERVER['REQUEST_URI']}&start=" . max(0, $start - $inc) . "&end=$start';\">\n";
+ $left = '<input type="button" value="<<<" onClick="location.href=\'' . $_SERVER['REQUEST_URI'] . '&start=' . max(0, $start - $inc) . '&end=' . $start . '\';" />' . "\n";
}
if (count($serendipity["imageList"]) > $end) {
- $right = "<input type='button' value='>>>' onClick=\"location.href='{$_SERVER['REQUEST_URI']}&start=$end&end=" . ($end + $inc) . "'\">\n";
+ $right = '<input type="button" value=">>>" onClick="location.href=\'' . $_SERVER['REQUEST_URI'] . '&start=' . $end . '&end=' . ($end + $inc) . '\';" />' . "\n";
}
-
- echo "<table class='serendipity_admin_list'>";
- echo "<tr><td align='left' colspan='2'>$left</td><td align='right' colspan='2'>$right</td></tr><tr>";
- for ($x=0; $x<count($files); $x++) {
-
- // Parse filename and image info
- $f = serendipity_parseFileName($files[$x]);
- $i = @getimagesize($serendipity["serendipityPath"].$serendipity["uploadPath"]."/".$files[$x]);
-
- echo "<td class='serendipity_admin_list_item' width='50%' nowrap>";
-
- // Display a thumbnail?
- echo "<b>".$files[$x]."</b><br>";
- if (file_exists($serendipity["serendipityPath"] . $serendipity["uploadPath"] . $f[0] . "." . $serendipity["thumbSuffix"] . "." . $f[1])) {
- echo "<img align='left' src='".$serendipity['serendipityHTTPPath'] . $serendipity["uploadHTTPPath"].$f[0].".".$serendipity["thumbSuffix"].".".$f[1]."' hspace='15'>";
+?>
+ <script type="text/javascript" language="javascript">
+ <!--
+ function rename(fname) {
+ if(newname = prompt('<?php echo ENTER_NEW_NAME; ?>' + fname, fname)) {
+ location.href='?serendipity[adminModule]=images&serendipity[adminAction]=rename&serendipity[oldname]='+ escape(fname) + '&serendipity[newname]='+ escape(newname);
+ }
}
+ //-->
+ </script>
- // Display image name and resolution
- echo "<br>". $i[0]."x".$i[1]."<br>";
+ <div class="serendipity_admin_list">
+ <div class="serendipity_admin_list_title"><?php echo IMAGE_MANAGER; ?></div>
- // Display tools
- echo "<img class='serendipityImageButton' alt='Fullsize' src='".$serendipity["serendipityHTTPPath"]."pixel/zoom.png' border='0' onClick=\"F1 = window.open('".$serendipity["serendipityHTTPPath"].$serendipity["uploadHTTPPath"].$files[$x]."','Zoom','height=".($i[1]+20).",width=".($i[0]+20).",toolbar=no,menubar=no,location=no');\">";
- echo "<img class='serendipityImageButton' alt='Rename this image' src='".$serendipity["serendipityHTTPPath"]."pixel/rename.png' onClick='rename(\"".addslashes($files[$x])."\")' border='0'>";
- echo "<img class='serendipityImageButton' alt='Resize this image' src='".$serendipity["serendipityHTTPPath"]."pixel/scale.png' border='0' onClick='location.href=\"?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fname]=".rawurlencode($files[$x])."\";'>";
- echo "<img class='serendipityImageButton' alt='Delete this image' src='".$serendipity["serendipityHTTPPath"]."pixel/delete.png' onClick='location.href=\"?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fname]=".rawurlencode($files[$x])."\";' border='0'>";
- echo "</td>";
+ <table class="serendipity_admin_list">
+ <tr>
+ <td align="left" colspan="2">
+ <?php echo $left; ?>
+ </td>
+
+ <td align="right" colspan="2">
+ <?php echo $right; ?>
+ </td>
+ </tr>
+
+ <tr>
+<?php
+ for ($x=0; $x<count($files); $x++) {
+ // Parse filename and image info
+ $f = serendipity_parseFileName($files[$x]);
+ $i = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . '/' . $files[$x]);
+ $_imgsrc = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
+ $imgsrc = $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1];
+ if (file_exists($_imgsrc)) {
+ $preview = '<img align="left" src="' . $imgsrc . '" hspace="15" alt="" />';
+ } else {
+ $preview = '';
+ }
+?>
+ <td class="serendipity_admin_list_item" width="50%" nowrap="nowrap">
+ <b><?php echo $files[$x]; ?></b>
+ <br />
+
+ <?php echo $preview; ?>
+ <br />
+ <?php echo $i[0] . 'x' . $i[1]; ?>
+ <br />
+ <img class="serendipityImageButton" alt="<?php echo IMAGE_FULLSIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/zoom.png" border="0" onClick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $files[$x]; ?>','Zoom','height=<?php echo ($i[1] + 20); ?>,width=<?php echo ($i[0] + 20); ?>,toolbar=no,menubar=no,location=no');" />
+ <img class="serendipityImageButton" alt="<?php echo IMAGE_RENAME; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/rename.png" border="0" onClick="rename('<?php echo addslashes($files[$x]); ?>')" />
+ <img class="serendipityImageButton" alt="<?php echo IMAGE_RESIZE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/scale.png" border="0" onClick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=scaleSelect&serendipity[fname]=<?php echo rawurlencode($files[$x]); ?>';" />
+ <img class="serendipityImageButton" alt="<?php echo IMAGE_DELETE; ?>" src="<?php echo $serendipity['serendipityHTTPPath']; ?>pixel/delete.png" border="0" onClick="location.href='?serendipity[adminModule]=images&serendipity[adminAction]=delete&serendipity[fname]=<?php echo rawurlencode($files[$x]); ?>';" />
+ </td>
+<?php
// Linebreak?
- if (($x+1)%2 == 0) echo "</tr><tr>";
+ if (($x+1)%2 == 0) {
+?>
+ </tr>
+ <tr>
+<?php
+ }
}
- echo "</tr><tr><td align='left' colspan='2'>$left</td><td align='right' colspan='2'>$right</td></tr>";
- echo "</table></div>";
+?>
+ </tr>
+ <tr>
+ <td align="left" colspan="2">
+ <?php echo $left; ?>
+ </td>
+
+ <td align="right" colspan="2">
+ <?php echo $right; ?>
+ </td>
+ </tr>
+ </table>
+ </div>
+<?php
}
+switch ($serendipity['GET']['adminAction']) {
+ case 'genThumbs':
+ set_time_limit(0);
+ ignore_user_abort();
+ echo '<b>' . RESIZING . '</b><br /><br />';
+ flush();
+ $i = serendipity_generateThumbs();
+ printf(RESIZE_DONE, $i);
+ break;
-switch ($serendipity["GET"]["adminAction"]) {
+ case 'DoDelete':
+ $file = $serendipity['GET']['fname'];
+ $fThumb = serendipity_parseFileName($file);
+ $fThumb = $fThumb[0] . '.' . $serendipity['thumbSuffix'] . '.' . $fThumb[1];
+ if ( file_exists($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file) ) {
+ if ( @unlink($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file) ) {
+ printf(DELETE_IMAGE . '<br />', $file);
+ } else {
+ printf(DELETE_IMAGE_FAIL . '<br />' $file);
+ }
- case "genThumbs":
- set_time_limit(0);
- ignore_user_abort();
- echo "<b>Resizing:</b><p>";
- flush();
- $i = serendipity_generateThumbs();
- echo "Done (resized $i images).";
- break;
+ if ( @unlink($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $fThumb) ) {
+ printf(DELETE_THUMBNAIL . '<br />', $fThumb);
+ }
+ } else {
+ printf(FILE_NOT_FOUND, $file);
+ }
+ break;
- case "DoDelete":
- $file = $serendipity['GET']['fname'];
- $fThumb = serendipity_parseFileName($file);
- $fThumb = $fThumb[0].".".$serendipity["thumbSuffix"].".".$fThumb[1];
- if ( file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$file) ) {
- if ( @unlink($serendipity["serendipityPath"].$serendipity["uploadPath"].$file) ) {
- echo "Deleted the image entitled <b>". $file ."</b>";
- } else {
- echo "Unable to delete <b>". $file ."</b>";
- }
- if ( @unlink($serendipity["serendipityPath"].$serendipity["uploadPath"].$fThumb) ) {
- echo "<br>Deleted the thumbnail entitled <b>". $fThumb ."</b>";
- }
-
- } else {
- echo "I was unable to locate the file entitled <b>". $file ."</b>, maybe it has already been deleted?";
- }
+ case 'delete':
+ $file = $serendipity['GET']['fname'];
+ $abortLoc = $serendipity['serendipityHTTPPath'] . 'serendipity_entries.php?serendipity[adminModule]=images';
+ $newLoc = $abortLoc . '&serendipity[adminAction]=DoDelete&serendipity[fname]=' . $file;
- break;
- case "delete":
- $file = $serendipity['GET']['fname'];
-
-
- echo "You are about to delete <b>$file</b><br>";
- echo "If you are using this file in some of your entries, it will cause dead images<br>";
- echo "Are you sure you wish to proceed?<p>";
-
- $newLoc = $serendipity['serendipityHTTPPath'] ."serendipity_entries.php?serendipity[adminModule]=images&serendipity[adminAction]=DoDelete&serendipity[fname]=". $file;
- echo "<input type='button' value='Delete the image' onClick='location.href=\"$newLoc\"'>";
-
- echo str_repeat(" ", 10);
-
- $newLoc = $serendipity['serendipityHTTPPath'] ."serendipity_entries.php?serendipity[adminModule]=images";
- echo "<input type='button' value='Abort now' onClick='location.href=\"$newLoc\"'>";
- break;
-
- case "rename":
- if ($serendipity["GET"]["oldname"] != "" && $serendipity["GET"]["newname"]!= "" &&
- file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["GET"]["oldname"]) &&
- !file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["GET"]["newname"])) {
+ printf(ABOUT_TO_DELETE_FILE, $file);
+?>
+ <form method="get" name="delete_image">
+ <div>
+ <input type="button" value="<?php echo IMAGE_DELETE ?>" onClick="location.href='<?php echo $newLoc; ?>'" />
+
+ <input type="button" value="<?php echo ABORT_NOW ?>" onClick="location.href='<?php echo $abortLoc; ?>'" />
+ </div>
+ </form>
+<?php
+ break;
- // Rename file
- rename($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["GET"]["oldname"],
- $serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["GET"]["newname"]);
+ case 'rename':
+ $oldfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['oldname'];
+ $newfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['GET']['newname'];
+ if ($serendipity['GET']['oldname'] != '' && $serendipity['GET']['newname']!= '' &&
+ file_exists($oldfile) &&
+ !file_exists($newfile)) {
+
+ // Rename file
+ rename($oldfile, $newfile);
+
// Rename thumbnail
- $f = serendipity_parseFileName($serendipity["GET"]["oldname"]);
- $f2= serendipity_parseFileName($serendipity["GET"]["newname"]);
- rename($serendipity["serendipityPath"].$serendipity["uploadPath"].$f[0].".".$serendipity["thumbSuffix"].".".$f[1],
- $serendipity["serendipityPath"].$serendipity["uploadPath"].$f2[0].".".$serendipity["thumbSuffix"].".".$f2[1]);
-
+ $f = serendipity_parseFileName($serendipity['GET']['oldname']);
+ $f2= serendipity_parseFileName($serendipity['GET']['newname']);
+ rename( $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f[1],
+ $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $f2[0] . '.' . $serendipity['thumbSuffix'] . '.' . $f2[1]);
+
// Forward user to overview (we don't want the user's back button to rename things again)
- echo "<script language='javascript'>\nlocation.href='?serendipity[adminModule]=images';\n</script>";
- }
- else {
- if (!file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["GET"]["oldname"]))
- echo ERROR_FILE_NOT_EXISTS;
- elseif (file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].$serendipity["GET"]["newname"]))
- echo ERROR_FILE_EXISTS;
- else
- echo ERROR_SOMETHING;
- echo "<br><input type='button' onClick='history.go(-1);' value='".BACK."'>";
+?>
+ <script language="javascript" type="text/javascript">
+ location.href="?serendipity[adminModule]=images";
+ </script>
+<?php
+ } else {
+ if (!file_exists($oldfile)) {
+ echo ERROR_FILE_NOT_EXISTS;
+ } elseif (file_exists($newfile)) {
+ echo ERROR_FILE_EXISTS;
+ } else {
+ echo ERROR_SOMETHING;
+ }
+?>
+ <br />
+ <input type="button" onclick="history.go(-1);" value="<?php echo BACK; ?>" />
+<?php
}
- break;
+ break;
- case "add":
- echo "<b>".ADDING_IMAGE."</b><p>";
- // First find out whether to fetch a file or accept an upload
- if ($serendipity["POST"]["url"] != "" && $serendipity["POST"]["url"] != "http://") {
- if (file_exists($serendipity["serendipityPath"].$serendipity["uploadPath"].basename($serendipity["POST"]["url"]))) {
- echo ERROR_FILE_EXISTS_ALREADY;
- }
- else {
- // Fetch file
- if ( !$fContent = @file_get_contents($serendipity["POST"]["url"]) ) {
- echo "File was not located on the remote server, are you sure the URL: <b>". $serendipity["POST"]["url"] ."</b> is correct?";
- } else {
- $fp = fopen($serendipity["serendipityPath"].$serendipity["uploadPath"].basename($serendipity["POST"]["url"]), "w");
- fwrite($fp, $fContent);
- fclose($fp);
-
- echo $serendipity["POST"]["url"]." fetched!<br>";
+ case 'add':
+?>
+ <b><?php echo ADDING_IMAGE; ?></b>
+ <br /><br />
...
[truncated message content] |
