php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity serendipity_admin.php,1.66,1.67

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv5423

Modified Files:
	serendipity_admin.php 
Log Message:
- Fix wrong colspan in installer/upgrader and login page
- Sex up the admin topbanner with some shadow and background


Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.66
retrieving revision 1.67
diff -u -d -r1.66 -r1.67
--- serendipity_admin.php	26 Jan 2005 16:03:27 -0000	1.66
+++ serendipity_admin.php	3 Feb 2005 19:06:31 -0000	1.67
@@ -81,16 +81,15 @@
         $file = ''; // For register_global, safety
     }
 ?>
-                <td class="serendipityAdminContent">
+                <td class="serendipityAdminContent" colspan="2">
                     <?php require_once(S9Y_INCLUDE_PATH . $file); ?>
 <?php
 
 
 } elseif ( serendipity_userLoggedIn() == false ) {
 ?>
-                <td id="content">
-                    <div class="serendipityAdminContent">
-                        <div align="center"><?php echo WELCOME_TO_ADMIN ?><br /><?php echo PLEASE_ENTER_CREDENTIALS ?></div>
+                <td colspan="2" class="serendipityAdminContent">
+                    <div align="center"><?php echo WELCOME_TO_ADMIN ?><br /><?php echo PLEASE_ENTER_CREDENTIALS ?></div>
                     <br />
                     <?php if ( isset($serendipity['POST']['action']) && !serendipity_userLoggedIn() ) { ?>
                     <div class="serendipityAdminMsgError"><?php echo WRONG_USERNAME_OR_PASSWORD; ?></div>

[php-blog-cvs] serendipity/include/admin category.inc.php,1.13,1.14 entries.inc.php,1.19,1.20 images.inc.php,1.14,1.15 import.inc.php,1.7,1.8 installer.inc.php,1.22,1.23 plugins.inc.php,1.20,1.21 upgrader.inc.php,1.13,1.14 users.inc.php,1.10,1.11

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2848/include/admin

Modified Files:
	category.inc.php entries.inc.php images.inc.php import.inc.php 
	installer.inc.php plugins.inc.php upgrader.inc.php 
	users.inc.php 
Log Message:
- Fix remaining pretty buttons


Index: users.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/users.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- users.inc.php	26 Jan 2005 14:14:05 -0000	1.10
+++ users.inc.php	3 Feb 2005 18:55:19 -0000	1.11
@@ -183,8 +183,8 @@
     <?php printf(DELETE_USER, $serendipity['GET']['userid'], $user[0]['username']); ?>
         <br /><br />
         <input type="hidden" name="serendipity[user]" value="<?php echo $serendipity['GET']['userid']; ?>" />
-        <input type="submit" name="DELETE_YES" value="<?php echo DUMP_IT; ?>" />
-        <input type="submit" name="NO" value="<?php echo NOT_REALLY; ?>" />
+        <input type="submit" name="DELETE_YES" value="<?php echo DUMP_IT; ?>" class="serendipityPrettyButton" />
+        <input type="submit" name="NO" value="<?php echo NOT_REALLY; ?>" class="serendipityPrettyButton" />
     </div>
 </form>
 <?php

Index: upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/upgrader.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- upgrader.inc.php	3 Feb 2005 18:42:25 -0000	1.13
+++ upgrader.inc.php	3 Feb 2005 18:55:19 -0000	1.14
@@ -268,10 +268,10 @@
 <hr noshade="noshade">
 <?php if ($taskCount > 0 || sizeof($sqlfiles) > 0) { ?>
     <strong><?php echo SERENDIPITY_UPGRADER_PROCEED_QUESTION ?></strong>
-    <br /><input type="button" value="<?php echo SERENDIPITY_UPGRADER_PROCEED_DOIT ?>" onclick="location.href='<?php echo $upgradeLoc ?>'"> <?php if ($showAbort) { ?><input type="button" value="<?php echo SERENDIPITY_UPGRADER_PROCEED_ABORT ?>" onclick="location.href='<?php echo $abortLoc ?>'"> <?php } ?>
+    <br /><input type="button" value="<?php echo SERENDIPITY_UPGRADER_PROCEED_DOIT ?>" onclick="location.href='<?php echo $upgradeLoc ?>'" class="serendipityPrettyButton"> <?php if ($showAbort) { ?><input type="button" value="<?php echo SERENDIPITY_UPGRADER_PROCEED_ABORT ?>" onclick="location.href='<?php echo $abortLoc ?>'" class="serendipityPrettyButton"> <?php } ?>
 <?php } else { ?>
     <strong><?php echo SERENDIPITY_UPGRADER_NO_UPGRADES ?></strong>
-    <br /><input type="button" value="<?php echo SERENDIPITY_UPGRADER_CONSIDER_DONE ?>" onclick="location.href='<?php echo $abortLoc ?>'">
+    <br /><input type="button" value="<?php echo SERENDIPITY_UPGRADER_CONSIDER_DONE ?>" onclick="location.href='<?php echo $abortLoc ?>'" class="serendipityPrettyButton">
 <?php }
 }
 ?>

Index: plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/plugins.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- plugins.inc.php	1 Feb 2005 17:12:48 -0000	1.20
+++ plugins.inc.php	3 Feb 2005 18:55:19 -0000	1.21
@@ -484,7 +484,7 @@
     </table>
 <br />
     <div style="padding-left: 20px">
-        <input type="submit" name="SAVECONF" value="<?php echo SAVE; ?>" />
+        <input type="submit" name="SAVECONF" value="<?php echo SAVE; ?>" class="serendipityPrettyButton" />
     </div>
 <?php
     if (method_exists($plugin, 'example') ) {

Index: category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/category.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- category.inc.php	3 Feb 2005 18:04:41 -0000	1.13
+++ category.inc.php	3 Feb 2005 18:55:18 -0000	1.14
@@ -168,7 +168,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']) : ''; ?>" onchange="document.getElementById('imagepreview').src = this.value; document.getElementById('imagepreview').style.display = '';" />
-            <input type="button" name="insImage" value="<?php echo IMAGE ; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[htmltarget]=img_icon&amp;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 ; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[htmltarget]=img_icon&amp;serendipity[filename_only]=true', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" class="serendipityPrettyButton" />
         </td>
     </tr>
 

Index: import.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/import.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- import.inc.php	3 Feb 2005 18:28:10 -0000	1.7
+++ import.inc.php	3 Feb 2005 18:55:19 -0000	1.8
@@ -63,7 +63,7 @@
     </tr>
     <?php } ?>
     <tr>
-      <td colspan="2" align="right"><input type="submit" value="<?php echo IMPORT_NOW ?>"></td>
+      <td colspan="2" align="right"><input type="submit" value="<?php echo IMPORT_NOW ?>" class="serendipityPrettyButton"></td>
     </tr>
   </table>
 </form>
@@ -103,7 +103,7 @@
     <option value="<?php echo $v ?>"><?php echo $k ?></option>
     <?php } ?>
   </select>
-  <input type="submit" value="<?php echo GO ?>">
+  <input type="submit" value="<?php echo GO ?>" class="serendipityPrettyButton">
 </form>
 <?php
 }

Index: images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/images.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- images.inc.php	3 Feb 2005 18:04:42 -0000	1.14
+++ images.inc.php	3 Feb 2005 18:55:19 -0000	1.15
@@ -90,7 +90,7 @@
             }
 ?>
     <br />
-    <input type="button" onclick="history.go(-1);" value="<?php echo BACK; ?>" />
+    <input type="button" onclick="history.go(-1);" value="<?php echo BACK; ?>" class="serendipityPrettyButton" />
 <?php
         }
         break;
@@ -370,7 +370,7 @@
                 </tr>
 
                 <tr>
-                    <td align="right" colspan="2"><input type="checkbox" name="serendipity[all_authors]" value="true" checked="checked" id="all_authors" /><label for="all_authors"><?php echo ALL_AUTHORS; ?></label> <input type="submit" value="<?php echo GO; ?>" /></td>
+                    <td align="right" colspan="2"><input type="checkbox" name="serendipity[all_authors]" value="true" checked="checked" id="all_authors" /><label for="all_authors"><?php echo ALL_AUTHORS; ?></label> <input type="submit" value="<?php echo GO; ?>" class="serendipityPrettyButton" /></td>
                 </tr>
             </table>
         </div>
@@ -478,7 +478,7 @@
             <?php echo KEEP_PROPORTIONS; ?>:
             <!-- <input type='button' value='preview'>-->
             <input type="checkbox" name="auto"  checked="checked" /><br />
-            <input type="button"   name="scale" value="<?php echo IMAGE_RESIZE; ?>" onclick="if (confirm('<?php echo REALLY_SCALE_IMAGE; ?>')) document.serendipityScaleForm.submit();" />
+            <input type="button"   name="scale" value="<?php echo IMAGE_RESIZE; ?>" onclick="if (confirm('<?php echo REALLY_SCALE_IMAGE; ?>')) document.serendipityScaleForm.submit();" class="serendipityPrettyButton" />
         </div>
     </form>
 

Index: installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/installer.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- installer.inc.php	31 Jan 2005 10:08:25 -0000	1.22
+++ installer.inc.php	3 Feb 2005 18:55:19 -0000	1.23
@@ -391,7 +391,7 @@
     $config = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE, null, array('simpleInstall'));
     serendipity_printConfigTemplate($config, $from, true, false, false);
 ?>
-    <div align="center"><input name="submit" type="submit" value="<?php echo COMPLETE_INSTALLATION ?>"></div>
+    <div align="center"><input name="submit" type="submit" value="<?php echo COMPLETE_INSTALLATION ?>" class="serendipityPrettyButton"></div>
 </form>
 
 <?php } elseif ( $serendipity['GET']['step'] == '2b' ) { ?>
@@ -401,7 +401,7 @@
     $config = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);
     serendipity_printConfigTemplate($config, $from, true, false, false);
 ?>
-    <div align="center"><input name="submit" type="submit" value="<?php echo COMPLETE_INSTALLATION ?>"></div>
+    <div align="center"><input name="submit" type="submit" value="<?php echo COMPLETE_INSTALLATION ?>" class="serendipityPrettyButton"></div>
 </form>
 
 <?php } elseif ( (int)$serendipity['GET']['step'] == 3 ) { ?>

Index: entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/entries.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- entries.inc.php	3 Feb 2005 18:04:41 -0000	1.19
+++ entries.inc.php	3 Feb 2005 18:55:18 -0000	1.20
@@ -136,7 +136,7 @@
             </td>
         </tr>
         <tr>
-            <td align="right" colspan="6"><input type="submit" name="go" value="<?php echo GO ?>" /></td>
+            <td align="right" colspan="6"><input type="submit" name="go" value="<?php echo GO ?>" class="serendipityPrettyButton" /></td>
         </tr>
     </table>
     <table class="serendipity_admin_list" cellpadding="5" width="100%">
@@ -228,7 +228,7 @@
             <table width="100%" cellspacing="0" cellpadding="3">
                     <tr>
                         <td>
-                            <?php echo EDIT_ENTRY . ': #<input type="text" size="3" name="serendipity[id]" /> <input type="submit" name="serendipity[editSubmit]" value="' . GO . '" />'; ?>
+                            <?php echo EDIT_ENTRY ?>: #<input type="text" size="3" name="serendipity[id]" /> <input type="submit" name="serendipity[editSubmit]" value="<?php echo GO ?>" class="serendipityPrettyButton" />
                         </td>
                     </tr>
             </table>

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.53,1.54 functions_images.inc.php,1.26,1.27

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2848/include

Modified Files:
	functions_entries.inc.php functions_images.inc.php 
Log Message:
- Fix remaining pretty buttons


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- functions_images.inc.php	3 Feb 2005 18:04:40 -0000	1.26
+++ functions_images.inc.php	3 Feb 2005 18:55:17 -0000	1.27
@@ -849,11 +849,11 @@
 <?php
         if ($show_upload) {
 ?>
-                <input type="button" value="<?php echo htmlspecialchars(ADD_MEDIA); ?>" onclick="location.href='<?php echo $url; ?>&amp;serendipity[adminAction]=addSelect'; return false" />
+                <input type="button" value="<?php echo htmlspecialchars(ADD_MEDIA); ?>" onclick="location.href='<?php echo $url; ?>&amp;serendipity[adminAction]=addSelect'; return false" class="serendipityPrettyButton" />
 <?php
         }
 ?>
-                <input type="submit" name="go" value=" - <?php echo GO ?> - " />
+                <input type="submit" name="go" value=" - <?php echo GO ?> - " class="serendipityPrettyButton" />
             </td>
         </tr>
 </table>

Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- functions_entries.inc.php	28 Jan 2005 11:16:56 -0000	1.53
+++ functions_entries.inc.php	3 Feb 2005 18:55:16 -0000	1.54
@@ -336,7 +336,7 @@
 
     $parts = array();
     serendipity_plugin_api::hook_event('frontend_entryproperties_query', $parts);
-        
+
     $properties = serendipity_db_query("SELECT property, value FROM {$serendipity['dbPrefix']}entryproperties WHERE entryid = " . (int)$id . " " . $parts['and']);
     if (!is_array($properties)) {
         $properties = array();
@@ -1359,22 +1359,22 @@
         if (!$serendipity['wysiwyg'] && eregi($serendipity['EditorBrowsers'], $_SERVER['HTTP_USER_AGENT']) ) {
 ?>
 <?php // FIXXME: This is JS only and should'nt be displayed in non-JS enviroments ?>
-                        <input type="button" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<i>','</i>')" />
-                        <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="insQ" value="<?php echo QUOTE ?>" accesskey="q" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<blockquote>','</blockquote>')" />
-                        <input type="button" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms['serendipityEntry']['serendipity[body]'])" />
-                        <input type="button" name="insImage" value="<?php echo MEDIA; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=body', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
-                        <input type="button" name="insU" value="URL" accesskey="l" style="color: blue; text-decoration: underline;" onclick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[body]'])" />
+                        <input type="button" class="serendipityPrettyButton" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<i>','</i>')" />
+                        <input type="button" class="serendipityPrettyButton" name="insB" value="B" accesskey="i" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<b>','</b>')" />
+                        <input type="button" class="serendipityPrettyButton" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<u>','</u>')" />
+                        <input type="button" class="serendipityPrettyButton" name="insQ" value="<?php echo QUOTE ?>" accesskey="q" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[body]'],'<blockquote>','</blockquote>')" />
+                        <input type="button" class="serendipityPrettyButton" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms['serendipityEntry']['serendipity[body]'])" />
+                        <input type="button" class="serendipityPrettyButton" name="insImage" value="<?php echo MEDIA; ?>" style="" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=body', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
+                        <input type="button" class="serendipityPrettyButton" name="insU" value="URL" accesskey="l" style="color: blue; text-decoration: underline;" onclick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[body]'])" />
 <?php
         /* Do the "old" non-WYSIWYG editor */
         } elseif (!$serendipity['wysiwyg']) { ?>
-                        <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="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=body', 'ImageSel', 'width=800,height=600,toolbar=no');">
-                        <input type="button" value="Link" onclick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[body]'])">
+                        <input type="button" class="serendipityPrettyButton" value=" B " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'b')">
+                        <input type="button" class="serendipityPrettyButton" value=" U " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'u')">
+                        <input type="button" class="serendipityPrettyButton" value=" I " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[body]'], 'i')">
+                        <input type="button" class="serendipityPrettyButton" value="<img>" onclick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[body]'])">
+                        <input type="button" class="serendipityPrettyButton" value="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=body', 'ImageSel', 'width=800,height=600,toolbar=no');">
+                        <input type="button" class="serendipityPrettyButton" value="Link" onclick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[body]'])">
 <?php   }
 
         serendipity_plugin_api::hook_event('backend_entry_toolbar_body', $entry);
@@ -1425,22 +1425,22 @@
         /* Since the user has WYSIWYG editor disabled, we want to check if we should use the "better" non-WYSIWYG editor */
         if (eregi($serendipity['EditorBrowsers'], $_SERVER['HTTP_USER_AGENT']) ) {
 ?>
-                        <input type="button" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<i>','</i>')" />
-                        <input type="button" name="insB" value="B" accesskey="i" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<b>','</b>')" />
-                        <input type="button" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<u>','</u>')" />
-                        <input type="button" name="insQ" value="<?php echo QUOTE ?>" accesskey="q" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<blockquote>','</blockquote>')" />
-                        <input type="button" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms['serendipityEntry']['serendipity[extended]'])" />
-                        <input type="button" name="insImage" value="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
-                        <input type="button" name="insU" value="URL" accesskey="l" style="color: blue; text-decoration: underline;" onclick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[extended]'])" />
+                        <input type="button" class="serendipityPrettyButton" name="insI" value="I" accesskey="i" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<i>','</i>')" />
+                        <input type="button" class="serendipityPrettyButton" name="insB" value="B" accesskey="i" style="font-weight: bold" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<b>','</b>')" />
+                        <input type="button" class="serendipityPrettyButton" name="insU" value="U" accesskey="u" style="text-decoration: underline;" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<u>','</u>')" />
+                        <input type="button" class="serendipityPrettyButton" name="insQ" value="<?php echo QUOTE ?>" accesskey="q" style="font-style: italic" onclick="wrapSelection(document.forms['serendipityEntry']['serendipity[extended]'],'<blockquote>','</blockquote>')" />
+                        <input type="button" class="serendipityPrettyButton" name="insJ" value="img" accesskey="j" onclick="wrapInsImage(document.forms['serendipityEntry']['serendipity[extended]'])" />
+                        <input type="button" class="serendipityPrettyButton" name="insImage" value="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');" />
+                        <input type="button" class="serendipityPrettyButton" name="insU" value="URL" accesskey="l" style="color: blue; text-decoration: underline;" onclick="wrapSelectionWithLink(document.forms['serendipityEntry']['serendipity[extended]'])" />
 <?php
         /* Do the "old" non-WYSIWYG editor */
         } else { ?>
-                        <input type="button" value=" B " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'b')">
-                        <input type="button" value=" U " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'u')">
-                        <input type="button" value=" I " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'i')">
-                        <input type="button" value="<img>" onclick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[extended]'])">
-                        <input type="button" value="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no');">
-                        <input type="button" value="Link" onclick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[extended]'])">
+                        <input type="button" class="serendipityPrettyButton" value=" B " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'b')">
+                        <input type="button" class="serendipityPrettyButton" value=" U " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'u')">
+                        <input type="button" class="serendipityPrettyButton" value=" I " onclick="serendipity_insBasic(document.forms['serendipityEntry']['serendipity[extended]'], 'i')">
+                        <input type="button" class="serendipityPrettyButton" value="<img>" onclick="serendipity_insImage(document.forms['serendipityEntry']['serendipity[extended]'])">
+                        <input type="button" class="serendipityPrettyButton" value="<?php echo MEDIA; ?>" onclick="window.open('serendipity_admin_image_selector.php?serendipity[textarea]=extended', 'ImageSel', 'width=800,height=600,toolbar=no');">
+                        <input type="button" class="serendipityPrettyButton" value="Link" onclick="serendipity_insLink(document.forms['serendipityEntry']['serendipity[extended]'])">
 <?php
         }
 

[php-blog-cvs] serendipity/include/admin upgrader.inc.php,1.12,1.13

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv32198

Modified Files:
	upgrader.inc.php 
Log Message:
- Nuke all Smarty cache when running the upgrader


Index: upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/upgrader.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- upgrader.inc.php	26 Jan 2005 14:14:05 -0000	1.12
+++ upgrader.inc.php	3 Feb 2005 18:42:25 -0000	1.13
@@ -195,6 +195,12 @@
         echo '<span class="serendipityAdminMsgError">- ' . implode('<br />', $errors) . '</span><br /><br />';
     }
 
+    /* Nuke Smarty cache */
+    if ( isset($serendipity['smarty']) ) {
+        $serendipity['smarty']->clear_compiled_tpl();
+        $serendipity['smarty']->clear_all_cache();
+    }
+
 }
 
 if (($showAbort && $serendipity['GET']['action'] == 'ignore') || $serendipity['GET']['action'] == 'upgrade') {

[php-blog-cvs] serendipity/include/admin import.inc.php,1.6,1.7

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29360

Modified Files:
	import.inc.php 
Log Message:
- Use set_time_limit(0) so importing won't time out


Index: import.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/import.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- import.inc.php	3 Feb 2005 12:27:57 -0000	1.6
+++ import.inc.php	3 Feb 2005 18:28:10 -0000	1.7
@@ -9,6 +9,9 @@
     return;
 }
 
+/* This won't do anything if safe-mode is ON, but let's try anyway since importing could take a while */
+@set_time_limit(0);
+
 /* For later use */
 class Serendipity_Import {
     function getImportNotes() { return ""; }

[php-blog-cvs] serendipity/include/tpl config_personal.inc.php,1.6,1.7

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/tpl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27631/include/tpl

Modified Files:
	config_personal.inc.php 
Log Message:
- Don't show permissionlevels as numbers, users don't know what each number does and they could enter something that wasn't valid -- so now we display it as a dropdown


Index: config_personal.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_personal.inc.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- config_personal.inc.php	27 Jan 2005 15:02:02 -0000	1.6
+++ config_personal.inc.php	3 Feb 2005 18:25:15 -0000	1.7
@@ -25,10 +25,9 @@
                                     array('var'         => 'userlevel',
                                           'title'       => USERCONF_USERLEVEL,
                                           'description' => USERCONF_USERLEVEL_DESC,
-                                          'type'        => 'int',
-                                          'default'     => USERLEVEL_EDITOR,
-                                          'userlevel'   => USERLEVEL_CHIEF,
-                                          'flags'       => array('parseDescription')),
+                                          'type'        => 'list',
+                                          'default'     => $serendipity['permissionLevels'],
+                                          'userlevel'   => USERLEVEL_CHIEF),
 
                                     array('var'         => 'email',
                                           'title'       => USERCONF_EMAIL,

[php-blog-cvs] serendipity serendipity_config.inc.php,1.140,1.141

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27631

Modified Files:
	serendipity_config.inc.php 
Log Message:
- Don't show permissionlevels as numbers, users don't know what each number does and they could enter something that wasn't valid -- so now we display it as a dropdown


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.140
retrieving revision 1.141
diff -u -d -r1.140 -r1.141
--- serendipity_config.inc.php	29 Jan 2005 11:46:13 -0000	1.140
+++ serendipity_config.inc.php	3 Feb 2005 18:25:12 -0000	1.141
@@ -237,6 +237,13 @@
  */
 @define('LANG_CHARSET', 'ISO-8859-1');
 
+/*
+ *  Create array of permission levels, with descriptions
+ */
+$serendipity['permissionLevels'] = array(USERLEVEL_EDITOR => USERLEVEL_EDITOR_DESC,
+                                         USERLEVEL_CHIEF => USERLEVEL_CHIEF_DESC,
+                                         USERLEVEL_ADMIN => USERLEVEL_ADMIN_DESC);
+
 
 if ($serendipity['embed'] && ($serendipity['embed'] === 'true' || $serendipity['embed'] === true)) {
     $serendipity['baseURL'] = 'http://' . $_SERVER['HTTP_HOST'] . $serendipity['serendipityHTTPPath'];

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.59,1.60 serendipity_lang_cn.inc.php,1.26,1.27 serendipity_lang_cs.inc.php,1.106,1.107 serendipity_lang_cz.inc.php,1.106,1.107 serendipity_lang_da.inc.php,1.126,1.127 serendipity_lang_de.inc.php,1.147,1.148 serendipity_lang_en.inc.php,1.128,1.129 serendipity_lang_es.inc.php,1.121,1.122 serendipity_lang_fi.inc.php,1.14,1.15 serendipity_lang_fr.inc.php,1.106,1.107 serendipity_lang_it.inc.php,1.45,1.46 serendipity_lang_ja.inc.php,1.22,1.23 serendipity_lang_ko.inc.php,1.14,1.15 serendipity_lang_nl.inc.php,1.82,1.83 serendipity_lang_no.inc.php,1.46,1.47 serendipity_lang_pt.inc.php,1.81,1.82 serendipity_lang_ru.inc.php,1.19,1.20 serendipity_lang_tn.inc.php,1.27,1.28 serendipity_lang_tw.inc.php,1.42,1.43 serendipity_lang_zh.inc.php,1.26,1.27

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27631/lang

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cn.inc.php 
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fi.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_ja.inc.php 
	serendipity_lang_ko.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
	serendipity_lang_ru.inc.php serendipity_lang_tn.inc.php 
	serendipity_lang_tw.inc.php serendipity_lang_zh.inc.php 
Log Message:
- Don't show permissionlevels as numbers, users don't know what each number does and they could enter something that wasn't valid -- so now we display it as a dropdown


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- serendipity_lang_cs.inc.php	3 Feb 2005 18:04:43 -0000	1.106
+++ serendipity_lang_cs.inc.php	3 Feb 2005 18:25:16 -0000	1.107
@@ -424,8 +424,6 @@
 @define('USERCONF_USERNAME_DESC', 'Vaše uživatelské jméno (pøezdívka)');
 @define('USERCONF_PASSWORD', 'Heslo');
 @define('USERCONF_PASSWORD_DESC', 'Vaše heslo');
-@define('USERCONF_USERLEVEL', 'Úroveò oprávnìní');
-@define('USERCONF_USERLEVEL_DESC', 'Uživatelská úroveò. Vyberte jednu z: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Hlavní redaktor, [USERLEVEL_EDITOR] - Bìžný autor.');
 @define('USERCONF_EMAIL', 'Emailová adresa');
 @define('USERCONF_EMAIL_DESC', 'VᚠEmail');
 @define('USERCONF_SENDCOMMENTS', 'Posílat zprávy o komentáøích?');
@@ -673,6 +671,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- serendipity_lang_no.inc.php	3 Feb 2005 18:04:48 -0000	1.46
+++ serendipity_lang_no.inc.php	3 Feb 2005 18:25:18 -0000	1.47
@@ -404,8 +404,6 @@
 @define('USERCONF_USERNAME_DESC', 'Brukernavnet du vil bruke for å logge inn i bloggen');
 @define('USERCONF_PASSWORD', 'Ditt passord');
 @define('USERCONF_PASSWORD_DESC', 'Passordet du vil bruke for å logge inn i bloggen');
-@define('USERCONF_USERLEVEL', 'Rettighetsnivå');
-@define('USERCONF_USERLEVEL_DESC', 'Brukernivå. Bør være en av følgende: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Sjefredaktør, [USERLEVEL_EDITOR] - Standardredaktør.');
 @define('USERCONF_EMAIL', 'Din e-mailadresse');
 @define('USERCONF_EMAIL_DESC', 'Din personlige e-mailadresse');
 @define('USERCONF_SENDCOMMENTS', 'Send beskjeder om nye kommentarer?');
@@ -672,5 +670,10 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 ?>
\ No newline at end of file

Index: serendipity_lang_zh.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_zh.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_lang_zh.inc.php	3 Feb 2005 18:04:49 -0000	1.26
+++ serendipity_lang_zh.inc.php	3 Feb 2005 18:25:19 -0000	1.27
@@ -448,8 +448,6 @@
 @define('USERCONF_USERNAME_DESC', 'ÄúµÇÈëÍø·ÈռǵÄÃû³Æ');
 @define('USERCONF_PASSWORD', 'ÄúµÄÃÜÂë');
 @define('USERCONF_PASSWORD_DESC', 'ÄúµÇÈëÍø·ÈռǵÄÃÜÂë');
-@define('USERCONF_USERLEVEL', 'ʹÓÃȨÏÞ');
-@define('USERCONF_USERLEVEL_DESC', 'ʹÓÃȨÏÞ. ÓÃÒÔÏ·½Ê½: [USERLEVEL_ADMIN] - ¹ÜÀíÔ±, [USERLEVEL_CHIEF] - ×ܱ༭, [USERLEVEL_EDITOR] - ±à¼­×÷Õß.');
 @define('USERCONF_EMAIL', 'ÄúµÄµç×ÓÓʼþ');
 @define('USERCONF_EMAIL_DESC', 'ÄúʹÓõĵç×ÓÓʼþ');
 @define('USERCONF_SENDCOMMENTS', '¼ÄËÍ»ØÏì֪ͨ?');
@@ -670,6 +668,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.128
retrieving revision 1.129
diff -u -d -r1.128 -r1.129
--- serendipity_lang_en.inc.php	3 Feb 2005 18:04:45 -0000	1.128
+++ serendipity_lang_en.inc.php	3 Feb 2005 18:25:18 -0000	1.129
@@ -447,8 +447,6 @@
 @define('USERCONF_USERNAME_DESC', 'The username you use to log in to the blog');
 @define('USERCONF_PASSWORD', 'Your password');
 @define('USERCONF_PASSWORD_DESC', 'The password you wish to use to log in to the blog');
-@define('USERCONF_USERLEVEL', 'Permissionlevel');
-@define('USERCONF_USERLEVEL_DESC', 'Userlevel. Should be one of the following: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Chief editor, [USERLEVEL_EDITOR] - Standard editor.');
 @define('USERCONF_EMAIL', 'Your e-mail address');
 @define('USERCONF_EMAIL_DESC', 'Your personal e-mail address');
 @define('USERCONF_SENDCOMMENTS', 'Send comment announcements?');
@@ -668,6 +666,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ja.inc.php,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -d -r1.22 -r1.23
--- serendipity_lang_ja.inc.php	3 Feb 2005 18:04:46 -0000	1.22
+++ serendipity_lang_ja.inc.php	3 Feb 2005 18:25:18 -0000	1.23
@@ -449,8 +449,6 @@
 @define('USERCONF_USERNAME_DESC', 'ブログにログインするときに使うユーザー名を指定します。');
 @define('USERCONF_PASSWORD', 'パスワード');
 @define('USERCONF_PASSWORD_DESC', 'ブログにログインするときに使うパスワードを指定します。');
-@define('USERCONF_USERLEVEL', '許可レベル');
-@define('USERCONF_USERLEVEL_DESC', 'ユーザーレベルです。 次のうちの1つであるべきです: [USERLEVEL_ADMIN] - 管理者, [USERLEVEL_CHIEF] - チーフ編集者, [USERLEVEL_EDITOR] - 標準編集者');
 @define('USERCONF_EMAIL', '電子メールアドレス');
 @define('USERCONF_EMAIL_DESC', '個人の電子メールアドレスをしていします。');
 @define('USERCONF_SENDCOMMENTS', 'コメント告知を送信しますか?');
@@ -670,6 +668,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.59
retrieving revision 1.60
diff -u -d -r1.59 -r1.60
--- serendipity_lang_bg.inc.php	3 Feb 2005 18:04:42 -0000	1.59
+++ serendipity_lang_bg.inc.php	3 Feb 2005 18:25:16 -0000	1.60
@@ -461,8 +461,6 @@
 @define('USERCONF_USERNAME_DESC', 'The username you use to log in to the blog'); // Translate
 @define('USERCONF_PASSWORD', 'Your password'); // Translate
 @define('USERCONF_PASSWORD_DESC', 'The password you wish to use to log in to the blog'); // Translate
-@define('USERCONF_USERLEVEL', 'Permissionlevel'); // Translate
-@define('USERCONF_USERLEVEL_DESC', 'Userlevel. Should be one of the following: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Chief editor, [USERLEVEL_EDITOR] - Standard editor.'); // Translate
 @define('USERCONF_EMAIL', 'Your e-mail address'); // Translate
 @define('USERCONF_EMAIL_DESC', 'Your personal e-mail address'); // Translate
 @define('USERCONF_SENDCOMMENTS', 'Send comment announcements?'); // Translate
@@ -656,6 +654,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_tw.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -d -r1.42 -r1.43
--- serendipity_lang_tw.inc.php	3 Feb 2005 18:04:49 -0000	1.42
+++ serendipity_lang_tw.inc.php	3 Feb 2005 18:25:19 -0000	1.43
@@ -448,8 +448,6 @@
 @define('USERCONF_USERNAME_DESC', '±zµn¤Jºô¸ô¤é°Oªº¦WºÙ');
 @define('USERCONF_PASSWORD', '±zªº±K½X');
 @define('USERCONF_PASSWORD_DESC', '±zµn¤Jºô¸ô¤é°Oªº±K½X');
-@define('USERCONF_USERLEVEL', '¨Ï¥ÎÅv­­');
-@define('USERCONF_USERLEVEL_DESC', '¨Ï¥ÎÅv­­. ¥Î¥H¤U¤è¦¡: [USERLEVEL_ADMIN] - ºÞ²z­û, [USERLEVEL_CHIEF] - Á`½s¿è, [USERLEVEL_EDITOR] - ½s¿è§@ªÌ.');
 @define('USERCONF_EMAIL', '±zªº¹q¤l¶l¥ó');
 @define('USERCONF_EMAIL_DESC', '±z¨Ï¥Îªº¹q¤l¶l¥ó');
 @define('USERCONF_SENDCOMMENTS', '±H°e°jÅT³qª¾?');
@@ -671,6 +669,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- serendipity_lang_cz.inc.php	3 Feb 2005 18:04:43 -0000	1.106
+++ serendipity_lang_cz.inc.php	3 Feb 2005 18:25:16 -0000	1.107
@@ -424,8 +424,6 @@
 @define('USERCONF_USERNAME_DESC', 'Va¹e u¾ivatelské jméno (pøezdívka)');
 @define('USERCONF_PASSWORD', 'Heslo');
 @define('USERCONF_PASSWORD_DESC', 'Va¹e heslo');
-@define('USERCONF_USERLEVEL', 'Úroveò oprávnìní');
-@define('USERCONF_USERLEVEL_DESC', 'U¾ivatelská úroveò. Vyberte jednu z: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Hlavní redaktor, [USERLEVEL_EDITOR] - Bì¾ný autor.');
 @define('USERCONF_EMAIL', 'Emailová adresa');
 @define('USERCONF_EMAIL_DESC', 'Vá¹ Email');
 @define('USERCONF_SENDCOMMENTS', 'Posílat zprávy o komentáøích?');
@@ -673,6 +671,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- serendipity_lang_pt.inc.php	3 Feb 2005 18:04:48 -0000	1.81
+++ serendipity_lang_pt.inc.php	3 Feb 2005 18:25:19 -0000	1.82
@@ -426,8 +426,6 @@
 @define('USERCONF_USERNAME_DESC', 'O nome de usuário que você usa para se identificar no blog');
 @define('USERCONF_PASSWORD', 'Sua senha');
 @define('USERCONF_PASSWORD_DESC', 'A senha que você quer usar para se identificar no blog');
-@define('USERCONF_USERLEVEL', 'Nível de permissões');
-@define('USERCONF_USERLEVEL_DESC', 'Nível do usuário. Deve ser um dos seguintes: [USERLEVEL_ADMIN] - Administrador, [USERLEVEL_CHIEF] - Editor Chefe, [USERLEVEL_EDITOR] - Editor normal.');
 @define('USERCONF_EMAIL', 'Seu endereço de e-mail');
 @define('USERCONF_EMAIL_DESC', 'Seu endereço de e-mail pessoal');
 @define('USERCONF_SENDCOMMENTS', 'Enviar notificação dos comentários?');
@@ -672,6 +670,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- serendipity_lang_it.inc.php	3 Feb 2005 18:04:46 -0000	1.45
+++ serendipity_lang_it.inc.php	3 Feb 2005 18:25:18 -0000	1.46
@@ -435,8 +435,6 @@
 @define('USERCONF_USERNAME_DESC', 'Il nome utente che usi per collegarti al blog');
 @define('USERCONF_PASSWORD', 'La tua password');
 @define('USERCONF_PASSWORD_DESC', 'La password che usi per collegarti al blog');
-@define('USERCONF_USERLEVEL', 'Livello di permessi');
-@define('USERCONF_USERLEVEL_DESC', 'Livello utente. Dovrebbe essere uno dei seguenti: [USERLEVEL_ADMIN] - Amministratore, [USERLEVEL_CHIEF] - Capo Editore, [USERLEVEL_EDITOR] - Normale autore.');
 @define('USERCONF_EMAIL', 'Il tuo indirizzo e-mail');
 @define('USERCONF_EMAIL_DESC', 'Il tuo indirizzo e-mail personale');
 @define('USERCONF_SENDCOMMENTS', 'Manda avvisi di commenti?');
@@ -673,6 +671,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -d -r1.126 -r1.127
--- serendipity_lang_da.inc.php	3 Feb 2005 18:04:43 -0000	1.126
+++ serendipity_lang_da.inc.php	3 Feb 2005 18:25:17 -0000	1.127
@@ -405,8 +405,6 @@
 @define('USERCONF_USERNAME_DESC', 'Brugernavnet du vil bruge for at logge ind i bloggen');
 @define('USERCONF_PASSWORD', 'Dit kodeord');
 @define('USERCONF_PASSWORD_DESC', 'Kodeordet du vil bruge for at logge ind i bloggen');
-@define('USERCONF_USERLEVEL', 'Rettighedsniveau');
-@define('USERCONF_USERLEVEL_DESC', 'Brugerniveau. Bør være ét af følgende: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Chef-Redaktør, [USERLEVEL_EDITOR] - Standard Redaktør.');
 @define('USERCONF_EMAIL', 'Din email adresse');
 @define('USERCONF_EMAIL_DESC', 'Din personlige email adresse');
 @define('USERCONF_SENDCOMMENTS', 'Send beskeder om nye kommentarer?');
@@ -672,6 +670,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.106
retrieving revision 1.107
diff -u -d -r1.106 -r1.107
--- serendipity_lang_fr.inc.php	3 Feb 2005 18:04:46 -0000	1.106
+++ serendipity_lang_fr.inc.php	3 Feb 2005 18:25:18 -0000	1.107
@@ -428,8 +428,6 @@
 @define('USERCONF_USERNAME_DESC', 'Votre nom d\'utilisateur');
 @define('USERCONF_PASSWORD', 'Votre mot de passe');
 @define('USERCONF_PASSWORD_DESC', 'Votre mot de passe');
-@define('USERCONF_USERLEVEL', 'Niveau d\'autorisation');
-@define('USERCONF_USERLEVEL_DESC', 'Le niveau d\'autorisation de l\'utilisateur. Doit être l\'un des suivants: [USERLEVEL_ADMIN] - Administrateur, [USERLEVEL_CHIEF] - Rédacteur en chef, [USERLEVEL_EDITOR] - Posteur seulement.');
 @define('USERCONF_EMAIL', 'Votre E-Mail');
 @define('USERCONF_EMAIL_DESC', 'Votre E-Mail');
 @define('USERCONF_SENDCOMMENTS', 'Notification de commentaire?');
@@ -675,6 +673,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_fi.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fi.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_lang_fi.inc.php	3 Feb 2005 18:04:46 -0000	1.14
+++ serendipity_lang_fi.inc.php	3 Feb 2005 18:25:18 -0000	1.15
@@ -447,8 +447,6 @@
 @define('USERCONF_USERNAME_DESC', 'Millä nimimerkillä kirjoitat tähän blogiin');
 @define('USERCONF_PASSWORD', 'Salasanasi');
 @define('USERCONF_PASSWORD_DESC', 'Nimimerkkisi salasana');
-@define('USERCONF_USERLEVEL', 'Oikeustaso');
-@define('USERCONF_USERLEVEL_DESC', 'Käyttäjätaso. Joku seuraavista: [USERLEVEL_ADMIN] - Ylläpitäjä, [USERLEVEL_CHIEF] - Päätoimittaja, [USERLEVEL_EDITOR] - Toimittaja.');
 @define('USERCONF_EMAIL', 'Sähköpostiosoitteesi');
 @define('USERCONF_EMAIL_DESC', 'Henkilökohtainen sähköpostiosoitteesi');
 @define('USERCONF_SENDCOMMENTS', 'Lähetänkö komentointi-ilmoitukset?');
@@ -668,6 +666,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_ko.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ko.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_lang_ko.inc.php	3 Feb 2005 18:04:46 -0000	1.14
+++ serendipity_lang_ko.inc.php	3 Feb 2005 18:25:18 -0000	1.15
@@ -453,8 +453,6 @@
 @define('USERCONF_USERNAME_DESC', 'The username you use to log in to the blog');
 @define('USERCONF_PASSWORD', 'Your password');
 @define('USERCONF_PASSWORD_DESC', 'The password you wish to use to log in to the blog');
-@define('USERCONF_USERLEVEL', 'Permissionlevel');
-@define('USERCONF_USERLEVEL_DESC', 'Userlevel. Should be one of the following: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Chief editor, [USERLEVEL_EDITOR] - Standard editor.');
 @define('USERCONF_EMAIL', 'Your e-mail address');
 @define('USERCONF_EMAIL_DESC', 'Your personal e-mail address');
 @define('USERCONF_SENDCOMMENTS', 'Send comment announcements?');
@@ -673,6 +671,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- serendipity_lang_es.inc.php	3 Feb 2005 18:04:45 -0000	1.121
+++ serendipity_lang_es.inc.php	3 Feb 2005 18:25:18 -0000	1.122
@@ -421,8 +421,6 @@
 @define('USERCONF_USERNAME_DESC', 'El nombre de usuario que usas para conectar al blog');
 @define('USERCONF_PASSWORD', 'Contraseña');
 @define('USERCONF_PASSWORD_DESC', 'La contraseña que deseas usar para conectar al blog');
-@define('USERCONF_USERLEVEL', 'Nivel');
-@define('USERCONF_USERLEVEL_DESC', 'Nivel de usuario. Debería ser uno de los siguientes: [USERLEVEL_ADMIN] - Administrador, [USERLEVEL_CHIEF] - Editor jefe, [USERLEVEL_EDITOR] - Editor normal.');
 @define('USERCONF_EMAIL', 'Correo electrónico');
 @define('USERCONF_EMAIL_DESC', 'Tu dirección de correo electrónico personal');
 @define('USERCONF_SENDCOMMENTS', '¿Enviar avisos de comentarios?');
@@ -674,6 +672,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_cn.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cn.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_lang_cn.inc.php	3 Feb 2005 18:04:43 -0000	1.26
+++ serendipity_lang_cn.inc.php	3 Feb 2005 18:25:16 -0000	1.27
@@ -448,8 +448,6 @@
 @define('USERCONF_USERNAME_DESC', '您登入网路日记的名称');
 @define('USERCONF_PASSWORD', '您的密码');
 @define('USERCONF_PASSWORD_DESC', '您登入网路日记的密码');
-@define('USERCONF_USERLEVEL', '使用权限');
-@define('USERCONF_USERLEVEL_DESC', '使用权限. 用以下方式: [USERLEVEL_ADMIN] - 管理员, [USERLEVEL_CHIEF] - 总编辑, [USERLEVEL_EDITOR] - 编辑作者.');
 @define('USERCONF_EMAIL', '您的电子邮件');
 @define('USERCONF_EMAIL_DESC', '您使用的电子邮件');
 @define('USERCONF_SENDCOMMENTS', '寄送回响通知?');
@@ -670,6 +668,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_tn.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tn.inc.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- serendipity_lang_tn.inc.php	3 Feb 2005 18:04:49 -0000	1.27
+++ serendipity_lang_tn.inc.php	3 Feb 2005 18:25:19 -0000	1.28
@@ -448,8 +448,6 @@
 @define('USERCONF_USERNAME_DESC', '您登入網路日記的名稱');
 @define('USERCONF_PASSWORD', '您的密碼');
 @define('USERCONF_PASSWORD_DESC', '您登入網路日記的密碼');
-@define('USERCONF_USERLEVEL', '使用權限');
-@define('USERCONF_USERLEVEL_DESC', '使用權限. 用以下方式: [USERLEVEL_ADMIN] - 管理員, [USERLEVEL_CHIEF] - 總編輯, [USERLEVEL_EDITOR] - 編輯作者.');
 @define('USERCONF_EMAIL', '您的電子郵件');
 @define('USERCONF_EMAIL_DESC', '您使用的電子郵件');
 @define('USERCONF_SENDCOMMENTS', '寄送迴響通知?');
@@ -671,6 +669,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_ru.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ru.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- serendipity_lang_ru.inc.php	3 Feb 2005 18:04:49 -0000	1.19
+++ serendipity_lang_ru.inc.php	3 Feb 2005 18:25:19 -0000	1.20
@@ -450,8 +450,6 @@
 @define('USERCONF_USERNAME_DESC', 'Имя пользователя, которое вы используете чтобы заходить на блог');
 @define('USERCONF_PASSWORD', 'Ваш пароль');
 @define('USERCONF_PASSWORD_DESC', 'Пароль, который вы хотите использовать при авторизации');
-@define('USERCONF_USERLEVEL', 'Уровень доступа');
-@define('USERCONF_USERLEVEL_DESC', 'Должен быть одним из следующих: [USERLEVEL_ADMIN] - Администратор, [USERLEVEL_CHIEF] - Главный редактор, [USERLEVEL_EDITOR] - Обычный редактор.');
 @define('USERCONF_EMAIL', 'Ваш адрес e-mail');
 @define('USERCONF_EMAIL_DESC', 'Адрес вашей электронной почты');
 @define('USERCONF_SENDCOMMENTS', 'Посылать уведомления о комментария?');
@@ -673,6 +671,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.147
retrieving revision 1.148
diff -u -d -r1.147 -r1.148
--- serendipity_lang_de.inc.php	3 Feb 2005 18:04:44 -0000	1.147
+++ serendipity_lang_de.inc.php	3 Feb 2005 18:25:17 -0000	1.148
@@ -433,8 +433,6 @@
 @define('USERCONF_USERNAME_DESC', 'Ihr Username');
 @define('USERCONF_PASSWORD', 'Passwort');
 @define('USERCONF_PASSWORD_DESC', 'Ihr Passwort');
-@define('USERCONF_USERLEVEL', 'Userlevel');
-@define('USERCONF_USERLEVEL_DESC', 'Userlevel.  Sollte einer der folgenden Werte sein: [USERLEVEL_ADMIN] - Admin, [USERLEVEL_CHIEF] - Chefredakteur, [USERLEVEL_EDITOR] - Einfacher Redakteur.');
 @define('USERCONF_EMAIL', 'E-Mail');
 @define('USERCONF_EMAIL_DESC', 'Ihre E-Mail Adresse');
 @define('USERCONF_SENDCOMMENTS', 'Über Kommentare benachrichtigen?');
@@ -670,6 +668,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- serendipity_lang_nl.inc.php	3 Feb 2005 18:04:47 -0000	1.82
+++ serendipity_lang_nl.inc.php	3 Feb 2005 18:25:18 -0000	1.83
@@ -452,8 +452,6 @@
 @define('USERCONF_USERNAME_DESC', 'De gebruikersnaam waarmee in zich aanmeld op het weblog');
 @define('USERCONF_PASSWORD', 'Uw wachtwoord');
 @define('USERCONF_PASSWORD_DESC', 'Het wachtwoord dat u wilt gebruiken om zich aan te melden');
-@define('USERCONF_USERLEVEL', 'Gebruikersniveau');
-@define('USERCONF_USERLEVEL_DESC', 'Gebruikersniveau. Dit moet een van de volgende zijn: [USERLEVEL_ADMIN] - Beheerder, [USERLEVEL_CHIEF] - Hoofd gebruiker, [USERLEVEL_EDITOR] - Standaard gebruiker.');
 @define('USERCONF_EMAIL', 'Uw e-mailadres');
 @define('USERCONF_EMAIL_DESC', 'Uw eigen e-mailadres');
 @define('USERCONF_SENDCOMMENTS', 'Bericht bij reacties?');
@@ -674,6 +672,11 @@
 @define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
 @define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
 @define('BASE_DIRECTORY', 'Base directory'); // Translate
+@define('USERLEVEL_EDITOR_DESC', 'Standard editor'); // Translate
+@define('USERLEVEL_CHIEF_DESC', 'Chief editor'); // Translate
+@define('USERLEVEL_ADMIN_DESC', 'Administrator'); // Translate
+@define('USERCONF_USERLEVEL', 'Access level'); // Translate
+@define('USERCONF_USERLEVEL_DESC', 'This level is used to determine what kind of access this user has to the blog'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
 ?>
\ No newline at end of file

[php-blog-cvs] serendipity/include functions_comments.inc.php,1.15,1.16

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24327

Modified Files:
	functions_comments.inc.php 
Log Message:
- Back out the use of references when displaying comments, pending investigation :)


Index: functions_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_comments.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- functions_comments.inc.php	27 Jan 2005 13:54:33 -0000	1.15
+++ functions_comments.inc.php	3 Feb 2005 18:06:49 -0000	1.16
@@ -147,7 +147,7 @@
     return $retval;
 }
 
-function serendipity_printComments(&$comments, $parentid = 0, $depth = 0, $trace = null) {
+function serendipity_printComments($comments, $parentid = 0, $depth = 0, $trace = null) {
     global $serendipity;
     static $_smartyComments;
 
@@ -204,7 +204,7 @@
     if ($depth !== 0) {
         return true;
     }
-    
+
     $serendipity['smarty']->assign('comments', $_smartyComments);
     unset($_smartyComments);
 
@@ -235,7 +235,7 @@
         if ($sql['status'] !== 'pending') {
             serendipity_db_query("UPDATE {$serendipity['dbPrefix']}entries SET $type = $type-1 WHERE id = '". (int)$entry_id ."' $admin");
         }
-        
+
         serendipity_db_query("UPDATE {$serendipity['dbPrefix']}comments SET parent_id = " . (int)$sql['parent_id'] . " WHERE parent_id = '" . (int)$id . "'");
 
         return true;

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.58,1.59 serendipity_lang_cn.inc.php,1.25,1.26 serendipity_lang_cs.inc.php,1.105,1.106 serendipity_lang_cz.inc.php,1.105,1.106 serendipity_lang_da.inc.php,1.125,1.126 serendipity_lang_de.inc.php,1.146,1.147 serendipity_lang_en.inc.php,1.127,1.128 serendipity_lang_es.inc.php,1.120,1.121 serendipity_lang_fi.inc.php,1.13,1.14 serendipity_lang_fr.inc.php,1.105,1.106 serendipity_lang_it.inc.php,1.44,1.45 serendipity_lang_ja.inc.php,1.21,1.22 serendipity_lang_ko.inc.php,1.13,1.14 serendipity_lang_nl.inc.php,1.81,1.82 serendipity_lang_no.inc.php,1.45,1.46 serendipity_lang_pt.inc.php,1.80,1.81 serendipity_lang_ru.inc.php,1.18,1.19 serendipity_lang_tn.inc.php,1.26,1.27 serendipity_lang_tw.inc.php,1.41,1.42 serendipity_lang_zh.inc.php,1.25,1.26

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23780/lang

Modified Files:
	serendipity_lang_bg.inc.php serendipity_lang_cn.inc.php 
	serendipity_lang_cs.inc.php serendipity_lang_cz.inc.php 
	serendipity_lang_da.inc.php serendipity_lang_de.inc.php 
	serendipity_lang_en.inc.php serendipity_lang_es.inc.php 
	serendipity_lang_fi.inc.php serendipity_lang_fr.inc.php 
	serendipity_lang_it.inc.php serendipity_lang_ja.inc.php 
	serendipity_lang_ko.inc.php serendipity_lang_nl.inc.php 
	serendipity_lang_no.inc.php serendipity_lang_pt.inc.php 
	serendipity_lang_ru.inc.php serendipity_lang_tn.inc.php 
	serendipity_lang_tw.inc.php serendipity_lang_zh.inc.php 
Log Message:
- Rewrite directories in terms of layout and a few core functions, fixed a few possible bugs
- Don't run imagick command after using gdlib to resize an image
- Replace old fake buttons with new and pretty fake buttons

Layout of directory overview is pending change



Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- serendipity_lang_cs.inc.php	28 Jan 2005 13:29:18 -0000	1.105
+++ serendipity_lang_cs.inc.php	3 Feb 2005 18:04:43 -0000	1.106
@@ -323,10 +323,8 @@
 @define('DIRECTORY_CREATED', 'Adresáø <strong>%s</strong> byl vytvoøen.');
 @define('NEW_DIRECTORY', 'Vytvoøit nový adresáø');
 @define('PARENT_DIRECTORY', 'Základní adresáø');
-@define('DELETE_DIRECTORY', 'Vymazat adresáø');
 @define('CONFIRM_DELETE_DIRECTORY', 'Jste si jist, že chcete odstranit všechen obsah adresáøe %s?');
 @define('ERROR_NO_DIRECTORY', 'Chyba: Adresáø %s neexistuje');
-@define('FORCE_DELETE', 'Vynucené mazání souborù, které nejsou v databázi');
 @define('CHECKING_DIRECTORY', 'Kontrola souborù v adresáøi %s');
 @define('DELETING_FILE', 'Vymazání souboru %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Nelze odstranit neprázdný adresáø. Zkuste zvolit "vynucené mazání", pokud potøebujete vymazat tyto soubory, a odešlete požadavek znovu. Existující soubory jsou:');
@@ -668,6 +666,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_no.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_no.inc.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- serendipity_lang_no.inc.php	28 Jan 2005 13:29:35 -0000	1.45
+++ serendipity_lang_no.inc.php	3 Feb 2005 18:04:48 -0000	1.46
@@ -421,10 +421,8 @@
 @define('DIRECTORY_CREATED', 'Mappen <strong>%s</strong> er oprettet.');
 @define('NEW_DIRECTORY', 'Opprett ny mappe');
 @define('PARENT_DIRECTORY', 'Hovedmappe');
-@define('DELETE_DIRECTORY', 'Slett denne mappen');
 @define('CONFIRM_DELETE_DIRECTORY', 'Er du sikker på du vil slette alt indholdet i mappen %s?');
 @define('ERROR_NO_DIRECTORY', 'Feil: Mappen %s eksisterer ikke');
-@define('FORCE_DELETE', 'Tving gjennom sletting av filer som ikke befinner seg i mediadatabasen');
 @define('CHECKING_DIRECTORY', 'Sjekker filer i mappen %s');
 @define('DELETING_FILE', 'Sletter fil %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Kunne ikke fjerne en ikke-tom mappe. Afkryss "tving gjennom sletting"-feltet hvis du vil slette disse og trykk deretter på Submit igjen. Eksisterende filer er:');
@@ -667,5 +665,12 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_zh.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_zh.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_lang_zh.inc.php	28 Jan 2005 13:29:36 -0000	1.25
+++ serendipity_lang_zh.inc.php	3 Feb 2005 18:04:49 -0000	1.26
@@ -338,10 +338,8 @@
 @define('DIRECTORY_CREATED', 'Ŀ¼ <strong>%s</strong> ÒѾ­ÐÂÔö.');
 @define('NEW_DIRECTORY', '½¨Á¢ÐÂĿ¼');
 @define('PARENT_DIRECTORY', 'ĸĿ¼');
-@define('DELETE_DIRECTORY', 'ɾ³ýÕâ¸öĿ¼');
 @define('CONFIRM_DELETE_DIRECTORY', 'È·¶¨ÒªÉ¾³ýÕâ¸öĿ¼ÄÚµÄÈ«²¿ÄÚÈÝÂð %s?');
 @define('ERROR_NO_DIRECTORY', '´íÎó: Ŀ¼ %s ²»´æÔÚ');
-@define('FORCE_DELETE', 'Ç¿ÖÆɾ³ý²»ÔÚýÌå×ÊÁÏ¿âµÄµµ°¸');
 @define('CHECKING_DIRECTORY', '¼ì²é´ËĿ¼µÄµµ°¸ %s');
 @define('DELETING_FILE', 'ɾ³ýµµ°¸ %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', '²»ÄÜÒƳýδÇå¿ÕµÄĿ¼. ¹´Ñ¡ "Ç¿ÖÆɾ³ý" ºËÈ¡·½¿éÈç¹ûÄúÒªÒƳýÕâЩµµ°¸, È»ºóÔÚ¼ÌÐø. ´æÔڵĵµ°¸ÊÇ:');
@@ -665,6 +663,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- serendipity_lang_en.inc.php	28 Jan 2005 13:29:19 -0000	1.127
+++ serendipity_lang_en.inc.php	3 Feb 2005 18:04:45 -0000	1.128
@@ -337,10 +337,8 @@
 @define('DIRECTORY_CREATED', 'Directory <strong>%s</strong> has been created.');
 @define('NEW_DIRECTORY', 'Create a new directory');
 @define('PARENT_DIRECTORY', 'Parent directory');
-@define('DELETE_DIRECTORY', 'Delete this directory');
 @define('CONFIRM_DELETE_DIRECTORY', 'Are you sure you want to remove all the contents of directory %s?');
 @define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist');
-@define('FORCE_DELETE', 'Force deletion of files not inside the media database');
 @define('CHECKING_DIRECTORY', 'Checking files in directory %s');
 @define('DELETING_FILE', 'Deleting file %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Could not remove non-empty directory. Check the "force deletion" checkbox if you want to remove those files as well, and then submit again. Existing files are:');
@@ -663,6 +661,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade');
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s');
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ja.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity_lang_ja.inc.php	3 Feb 2005 15:43:17 -0000	1.21
+++ serendipity_lang_ja.inc.php	3 Feb 2005 18:04:46 -0000	1.22
@@ -339,10 +339,8 @@
 @define('DIRECTORY_CREATED', 'ディレクトリ <strong>%s</strong> を作成しました。');
 @define('NEW_DIRECTORY', '新規ディレクトリ作成');
 @define('PARENT_DIRECTORY', '親ディレクトリ');
-@define('DELETE_DIRECTORY', 'このディレクトリを削除');
 @define('CONFIRM_DELETE_DIRECTORY', '本当にディレクトリ %s の内容をすべて削除しますか?');
 @define('ERROR_NO_DIRECTORY', 'エラー: ディレクトリ %s がありません');
-@define('FORCE_DELETE', 'メディアデータベース内にないファイルを強制削除する');
 @define('CHECKING_DIRECTORY', 'ディレクトリ %s 内のファイルを調べています');
 @define('DELETING_FILE', 'ファイル %s を削除中...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', '空でないディレクトリは削除できません。もし同様にファイルを削除したければチェックボックス「強制削除する」をチェックし、もう一度送信してください.存在するファイルは次の通りです:');
@@ -665,6 +663,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', '新規エントリのデフォルト設定');
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_bg.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_bg.inc.php,v
retrieving revision 1.58
retrieving revision 1.59
diff -u -d -r1.58 -r1.59
--- serendipity_lang_bg.inc.php	28 Jan 2005 13:29:18 -0000	1.58
+++ serendipity_lang_bg.inc.php	3 Feb 2005 18:04:42 -0000	1.59
@@ -365,10 +365,8 @@
 @define('DIRECTORY_CREATED', 'Directory <strong>%s</strong> has been created.'); // Translate
 @define('NEW_DIRECTORY', 'Create a new directory'); // Translate
 @define('PARENT_DIRECTORY', 'Parent directory'); // Translate
-@define('DELETE_DIRECTORY', 'Delete this directory'); // Translate
 @define('CONFIRM_DELETE_DIRECTORY', 'Are you sure you want to remove all the contents of directory %s?'); // Translate
 @define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist'); // Translate
-@define('FORCE_DELETE', 'Force deletion of files not inside the media database'); // Translate
 @define('CHECKING_DIRECTORY', 'Checking files in directory %s'); // Translate
 @define('DELETING_FILE', 'Deleting file %s...'); // Translate
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Could not remove non-empty directory. Check the "force deletion" checkbox if you want to remove those files as well, and then submit again. Existing files are:'); // Translate
@@ -651,6 +649,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_tw.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -d -r1.41 -r1.42
--- serendipity_lang_tw.inc.php	28 Jan 2005 13:29:36 -0000	1.41
+++ serendipity_lang_tw.inc.php	3 Feb 2005 18:04:49 -0000	1.42
@@ -338,10 +338,8 @@
 @define('DIRECTORY_CREATED', '¥Ø¿ý <strong>%s</strong> ¤w¸g·s¼W.');
 @define('NEW_DIRECTORY', '«Ø¥ß·s¥Ø¿ý');
 @define('PARENT_DIRECTORY', '¥À¥Ø¿ý');
-@define('DELETE_DIRECTORY', '§R°£³o­Ó¥Ø¿ý');
 @define('CONFIRM_DELETE_DIRECTORY', '½T©w­n§R°£³o­Ó¥Ø¿ý¤ºªº¥þ³¡¤º®e¶Ü %s?');
 @define('ERROR_NO_DIRECTORY', '¿ù»~: ¥Ø¿ý %s ¤£¦s¦b');
-@define('FORCE_DELETE', '±j¨î§R°£¤£¦b´CÅé¸ê®Æ®wªºÀÉ®×');
 @define('CHECKING_DIRECTORY', 'Àˬd¦¹¥Ø¿ýªºÀÉ®× %s');
 @define('DELETING_FILE', '§R°£ÀÉ®× %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', '¤£¯à²¾°£¥¼²MªÅªº¥Ø¿ý. ¤Ä¿ï "±j¨î§R°£" ®Ö¨ú¤è¶ô¦pªG±z­n²¾°£³o¨ÇÀÉ®×, µM«á¦bÄ~Äò. ¦s¦bªºÀɮ׬O:');
@@ -666,6 +664,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_cz.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cz.inc.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- serendipity_lang_cz.inc.php	28 Jan 2005 13:29:19 -0000	1.105
+++ serendipity_lang_cz.inc.php	3 Feb 2005 18:04:43 -0000	1.106
@@ -323,10 +323,8 @@
 @define('DIRECTORY_CREATED', 'Adresáø <strong>%s</strong> byl vytvoøen.');
 @define('NEW_DIRECTORY', 'Vytvoøit nový adresáø');
 @define('PARENT_DIRECTORY', 'Základní adresáø');
-@define('DELETE_DIRECTORY', 'Vymazat adresáø');
 @define('CONFIRM_DELETE_DIRECTORY', 'Jste si jist, ¾e chcete odstranit v¹echen obsah adresáøe %s?');
 @define('ERROR_NO_DIRECTORY', 'Chyba: Adresáø %s neexistuje');
-@define('FORCE_DELETE', 'Vynucené mazání souborù, které nejsou v databázi');
 @define('CHECKING_DIRECTORY', 'Kontrola souborù v adresáøi %s');
 @define('DELETING_FILE', 'Vymazání souboru %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Nelze odstranit neprázdný adresáø. Zkuste zvolit "vynucené mazání", pokud potøebujete vymazat tyto soubory, a ode¹lete po¾adavek znovu. Existující soubory jsou:');
@@ -668,6 +666,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_pt.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_pt.inc.php,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- serendipity_lang_pt.inc.php	28 Jan 2005 13:29:35 -0000	1.80
+++ serendipity_lang_pt.inc.php	3 Feb 2005 18:04:48 -0000	1.81
@@ -319,10 +319,8 @@
 @define('DIRECTORY_CREATED', 'Diretório <strong>%s</strong> foi criado.');
 @define('NEW_DIRECTORY', 'Criar novo diretório');
 @define('PARENT_DIRECTORY', 'Diretório superior');
-@define('DELETE_DIRECTORY', 'Excluir ese diretório');
 @define('CONFIRM_DELETE_DIRECTORY', 'Tem certeza que quer excluir todo o conteúdo do diretório %s?');
 @define('ERROR_NO_DIRECTORY', 'Erro: Diretório %s não existe');
-@define('FORCE_DELETE', 'Forçar exclusão de arquivos que não estão no banco de dados da mídias ("media")');
 @define('CHECKING_DIRECTORY', 'Verificando arquivos no diretório %s');
 @define('DELETING_FILE', 'Excluindo arquivo %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Não foi possível remover um diretório que não esteja vazio. Marque a opção "forçar exclusão" se deseja remover seus arquivos também, e envie o comando novamente. Os arquivos existenntes são:');
@@ -667,6 +665,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_it.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_it.inc.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- serendipity_lang_it.inc.php	28 Jan 2005 13:29:19 -0000	1.44
+++ serendipity_lang_it.inc.php	3 Feb 2005 18:04:46 -0000	1.45
@@ -325,10 +325,8 @@
 @define('DIRECTORY_CREATED', 'La directory <strong>%s</strong> è stata creata.');
 @define('NEW_DIRECTORY', 'Crea una nuova directory');
 @define('PARENT_DIRECTORY', 'Directory superiore');
-@define('DELETE_DIRECTORY', 'Cancella questa directory');
 @define('CONFIRM_DELETE_DIRECTORY', 'Sei sicuro di voler cancellare tutto il contenuto della directory %s?');
 @define('ERROR_NO_DIRECTORY', 'Errore: La directory %s non esiste');
-@define('FORCE_DELETE', 'Forzare la cancellazione dei file non contenuti nel database dei media');
 @define('CHECKING_DIRECTORY', 'Controllo dei file nella directory %s');
 @define('DELETING_FILE', 'Cancellazione del file %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Impossibile rimuovere directory non vuote. Attivare "Forzare la cancellazione" se volete rimuoverli e rimandare il form. I file esistenti sono:');
@@ -668,6 +666,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.125
retrieving revision 1.126
diff -u -d -r1.125 -r1.126
--- serendipity_lang_da.inc.php	28 Jan 2005 13:29:19 -0000	1.125
+++ serendipity_lang_da.inc.php	3 Feb 2005 18:04:43 -0000	1.126
@@ -422,10 +422,8 @@
 @define('DIRECTORY_CREATED', 'Mappen <strong>%s</strong> er blevet oprettet.');
 @define('NEW_DIRECTORY', 'Opret ny mappe');
 @define('PARENT_DIRECTORY', 'Hovedmappe');
-@define('DELETE_DIRECTORY', 'Slet denne mappe');
 @define('CONFIRM_DELETE_DIRECTORY', 'Er du sikker på du vil slette al indholdet af mappen %s?');
 @define('ERROR_NO_DIRECTORY', 'Fejl: Mappen %s eksistere ikke');
-@define('FORCE_DELETE', 'Gennemtving sletning af filer der ikke befinder sig i media databasen');
 @define('CHECKING_DIRECTORY', 'Checker filer i mappen %s');
 @define('DELETING_FILE', 'Sletter fil %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Kunne ikke fjerne en ikke-tom mappe. Afkryds "gennemtving sletning" feltet, hvis du vil slette disse og tryk derefter på submit igen. Eksisterende filer er:');
@@ -667,6 +665,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_fr.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fr.inc.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -u -d -r1.105 -r1.106
--- serendipity_lang_fr.inc.php	28 Jan 2005 13:29:19 -0000	1.105
+++ serendipity_lang_fr.inc.php	3 Feb 2005 18:04:46 -0000	1.106
@@ -323,10 +323,8 @@
 @define('DIRECTORY_CREATED', 'Le dossier <strong>%s</strong> a été crée.');
 @define('NEW_DIRECTORY', 'Créer un nouveau dossier');
 @define('PARENT_DIRECTORY', 'Dossier parent');
-@define('DELETE_DIRECTORY', 'Supprimer ce dossier');
 @define('CONFIRM_DELETE_DIRECTORY', 'Êtes-vous sûr de vouloir supprimer tous les contenus du dossier %s?');
 @define('ERROR_NO_DIRECTORY', 'Erreur: Le dossier %s n\'existe pas');
-@define('FORCE_DELETE', 'Forcer la suppression de fichiers non inclus dans la médiathèque');
 @define('CHECKING_DIRECTORY', 'Vérification des fichiers dans le dossier %s');
 @define('DELETING_FILE', 'Suppression du fichier %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Impossible de supprimer un dossier non vide. Cochez la case "Forcer la suppression" si vous voulez supprimer les fichiers gênants, et puis effectuez l\'opération à nouveau. Les fichiers présents dans le dossier sont les suivants:');
@@ -670,6 +668,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_fi.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_fi.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_lang_fi.inc.php	28 Jan 2005 13:29:19 -0000	1.13
+++ serendipity_lang_fi.inc.php	3 Feb 2005 18:04:46 -0000	1.14
@@ -337,10 +337,8 @@
 @define('DIRECTORY_CREATED', 'Hakemisto <strong>%s</strong> on luotu.');
 @define('NEW_DIRECTORY', 'Luo uusi hakemisto');
 @define('PARENT_DIRECTORY', 'Hakemistovanhempi');
-@define('DELETE_DIRECTORY', 'Poista hakemisto');
 @define('CONFIRM_DELETE_DIRECTORY', 'Haluatko todella poistaa hakemiston %s sisältöineen?');
 @define('ERROR_NO_DIRECTORY', 'Virhe: Hakemistoa %s ei ole');
-@define('FORCE_DELETE', 'Pakota media-kannan ulkopuolisten tiedostojen poisto');
 @define('CHECKING_DIRECTORY', 'Tarkistetaan tiedostoja hakemistossa %s');
 @define('DELETING_FILE', 'Poistetaan tiedostoa %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Hakemisto ei ole tyhjä. Valitse "pakota poiston", jos haluat poistaa tiedostotkin. Hakemiston tiedostot:');
@@ -663,6 +661,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_ko.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ko.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- serendipity_lang_ko.inc.php	28 Jan 2005 13:29:19 -0000	1.13
+++ serendipity_lang_ko.inc.php	3 Feb 2005 18:04:46 -0000	1.14
@@ -343,10 +343,8 @@
 @define('DIRECTORY_CREATED', 'Directory <strong>%s</strong> has been created.');
 @define('NEW_DIRECTORY', 'Create a new directory');
 @define('PARENT_DIRECTORY', 'Parent directory');
-@define('DELETE_DIRECTORY', 'Delete this directory');
 @define('CONFIRM_DELETE_DIRECTORY', 'Are you sure you want to remove all the contents of directory %s?');
 @define('ERROR_NO_DIRECTORY', 'Error: Directory %s does not exist');
-@define('FORCE_DELETE', 'Force deletion of files not inside the media database');
 @define('CHECKING_DIRECTORY', 'Checking files in directory %s');
 @define('DELETING_FILE', 'Deleting file %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Could not remove non-empty directory. Check the "force deletion" checkbox if you want to remove those files as well, and then submit again. Existing files are:');
@@ -668,6 +666,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_es.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_es.inc.php,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -d -r1.120 -r1.121
--- serendipity_lang_es.inc.php	28 Jan 2005 13:29:19 -0000	1.120
+++ serendipity_lang_es.inc.php	3 Feb 2005 18:04:45 -0000	1.121
@@ -312,10 +312,8 @@
 @define('DIRECTORY_CREATED', 'Directorio <strong>%s</strong> creado.');
 @define('NEW_DIRECTORY', 'Crear nuevo directorio');
 @define('PARENT_DIRECTORY', 'Directorio superior');
-@define('DELETE_DIRECTORY', 'Borrar este directorio');
 @define('CONFIRM_DELETE_DIRECTORY', '¿Estás seguro de que quieres eliminar todos los contenidos del directorio %s?');
 @define('ERROR_NO_DIRECTORY', 'Error: Directorio %s no existe');
-@define('FORCE_DELETE', 'Fuerza la eliminación de ficheros que no están dentro de la base de datos de medios');
 @define('CHECKING_DIRECTORY', 'Verificar ficheros en directorio %s');
 @define('DELETING_FILE', 'Borrando fichero %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'No puedo borrar un directorio con archivos. Marca "forzar borrado" si quieres eliminar también los ficheros e inténtalo de nuevo. Los ficheros que existen son:');
@@ -669,6 +667,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_cn.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cn.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- serendipity_lang_cn.inc.php	28 Jan 2005 13:29:18 -0000	1.25
+++ serendipity_lang_cn.inc.php	3 Feb 2005 18:04:43 -0000	1.26
@@ -338,10 +338,8 @@
 @define('DIRECTORY_CREATED', '目录 <strong>%s</strong> 已经新增.');
 @define('NEW_DIRECTORY', '建立新目录');
 @define('PARENT_DIRECTORY', '母目录');
-@define('DELETE_DIRECTORY', '删除这个目录');
 @define('CONFIRM_DELETE_DIRECTORY', '确定要删除这个目录内的全部内容吗 %s?');
 @define('ERROR_NO_DIRECTORY', '错误: 目录 %s 不存在');
-@define('FORCE_DELETE', '强制删除不在媒体资料库的档案');
 @define('CHECKING_DIRECTORY', '检查此目录的档案 %s');
 @define('DELETING_FILE', '删除档案 %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', '不能移除未清空的目录. 勾选 "强制删除" 核取方块如果您要移除这些档案, 然后在继续. 存在的档案是:');
@@ -665,6 +663,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_tn.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tn.inc.php,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -d -r1.26 -r1.27
--- serendipity_lang_tn.inc.php	28 Jan 2005 13:29:36 -0000	1.26
+++ serendipity_lang_tn.inc.php	3 Feb 2005 18:04:49 -0000	1.27
@@ -338,10 +338,8 @@
 @define('DIRECTORY_CREATED', '目錄 <strong>%s</strong> 已經新增.');
 @define('NEW_DIRECTORY', '建立新目錄');
 @define('PARENT_DIRECTORY', '母目錄');
-@define('DELETE_DIRECTORY', '刪除這個目錄');
 @define('CONFIRM_DELETE_DIRECTORY', '確定要刪除這個目錄內的全部內容嗎 %s?');
 @define('ERROR_NO_DIRECTORY', '錯誤: 目錄 %s 不存在');
-@define('FORCE_DELETE', '強制刪除不在媒體資料庫的檔案');
 @define('CHECKING_DIRECTORY', '檢查此目錄的檔案 %s');
 @define('DELETING_FILE', '刪除檔案 %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', '不能移除未清空的目錄. 勾選 "強制刪除" 核取方塊如果您要移除這些檔案, 然後在繼續. 存在的檔案是:');
@@ -666,6 +664,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_ru.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ru.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_lang_ru.inc.php	28 Jan 2005 13:29:36 -0000	1.18
+++ serendipity_lang_ru.inc.php	3 Feb 2005 18:04:49 -0000	1.19
@@ -340,10 +340,8 @@
 @define('DIRECTORY_CREATED', 'Каталог <strong>%s</strong> был успешно создан.');
 @define('NEW_DIRECTORY', 'Создать новый каталог');
 @define('PARENT_DIRECTORY', 'Главный каталог');
-@define('DELETE_DIRECTORY', 'Удалить этот каталог');
 @define('CONFIRM_DELETE_DIRECTORY', 'Вы уверены, что хотите удалить все содержимое каталога %s?');
 @define('ERROR_NO_DIRECTORY', 'Ошибка: Каталог %s не существует');
-@define('FORCE_DELETE', 'Принудительное удаление файлов, которые не находятся в медиа-коллекции');
 @define('CHECKING_DIRECTORY', 'Проверка файлов в каталоге %s');
 @define('DELETING_FILE', 'Удаление файла %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Не удалось удалить не пустой каталог. Поставьте галочку "Принудительное удаление", если вы хотиле удалить все файлы из этого каталога, и попробуйте удалить каталог снова. В каталоге найдены файлы:');
@@ -668,6 +666,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -d -r1.146 -r1.147
--- serendipity_lang_de.inc.php	28 Jan 2005 13:29:19 -0000	1.146
+++ serendipity_lang_de.inc.php	3 Feb 2005 18:04:44 -0000	1.147
@@ -321,10 +321,8 @@
 @define('DIRECTORY_CREATED', 'Verzeichnis <strong>%s</strong> wurde angelegt.');
 @define('NEW_DIRECTORY', 'Neues Verzeichnis anlegen');
 @define('PARENT_DIRECTORY', 'Stammverzeichnis');
-@define('DELETE_DIRECTORY', 'Dieses Verzeichnis löschen');
 @define('CONFIRM_DELETE_DIRECTORY', 'Wirklich alle Inhalte von Verzeichnis %s löschen?');
 @define('ERROR_NO_DIRECTORY', 'Fehler: Verzeichnis %s existiert nicht.');
-@define('FORCE_DELETE', 'Alle Dateien ausserhalb der Mediendatenbank löschen');
 @define('CHECKING_DIRECTORY', 'Prüfe Dateien im Verzeichnis %s');
 @define('DELETING_FILE', 'Lösche Datei %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Konnte das Verzeichnis nicht löschen, da noch Dateien vorhanden sind. Bitte die "Alle Dateien löschen"-Auswahlbox anklicken, falls diese Dateien trotzdem gelöscht werden sollen. Die noch vorhandenen Dateien sind:');
@@ -665,6 +663,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Voreinstellungen für neue Einträge');
 @define('UPGRADE', 'Aktualisieren');
 @define('UPGRADE_TO_VERSION', 'Aktuelle version %s');
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

Index: serendipity_lang_nl.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_nl.inc.php,v
retrieving revision 1.81
retrieving revision 1.82
diff -u -d -r1.81 -r1.82
--- serendipity_lang_nl.inc.php	28 Jan 2005 13:29:35 -0000	1.81
+++ serendipity_lang_nl.inc.php	3 Feb 2005 18:04:47 -0000	1.82
@@ -342,10 +342,8 @@
 @define('DIRECTORY_CREATED', 'Map <strong>%s</strong> is aangemaakt.');
 @define('NEW_DIRECTORY', 'Maak een nieuwe map aan');
 @define('PARENT_DIRECTORY', 'Huidige map');
-@define('DELETE_DIRECTORY', 'Verwijder deze map');
 @define('CONFIRM_DELETE_DIRECTORY', 'Weet u zeker dat u alle gevens uit map %s wilt verwijderen?');
 @define('ERROR_NO_DIRECTORY', 'Fout: Map %s bestaat niet');
-@define('FORCE_DELETE', 'Forceer de verwijdering van bestanden die niet in de media database staan');
 @define('CHECKING_DIRECTORY', 'Controleer de bestanden in map %s');
 @define('DELETING_FILE', 'Verwijder bestand %s...');
 @define('ERROR_DIRECTORY_NOT_EMPTY', 'Kan een map die nog niet leeg is niet verwijderen. Vink "force deletion" aan als u ook deze bestanden wilt verwijderen, voer het daarna nogmaals uit. Aanwezige bestanden zijn:');
@@ -669,6 +667,13 @@
 @define('USERCONF_CAT_DEFAULT_NEW_ENTRY', 'Default settings for new entries'); // Translate
 @define('UPGRADE', 'Upgrade'); // Translate
 @define('UPGRADE_TO_VERSION', 'Upgrade to version %s'); // Translate
+@define('DELETE_DIRECTORY', 'Delete directory'); // Translate
+@define('DELETE_DIRECTORY_DESC', 'You are about to delete the contents of a directory that contains media files, possibly files used in some of your entries.'); // Translate
+@define('FORCE_DELETE', 'Delete ALL files in this directory, including those not known by Serendipity'); // Translate
+@define('CREATE_DIRECTORY', 'Create directory'); // Translate
+@define('CREATE_NEW_DIRECTORY', 'Create new directory'); // Translate
+@define('CREATE_DIRECTORY_DESC', 'Here you can create a new directory to place media files in. Choose the name for your new directory and select an optional parent directory to place it in.'); // Translate
+@define('BASE_DIRECTORY', 'Base directory'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/include/admin category.inc.php,1.12,1.13 entries.inc.php,1.18,1.19 images.inc.php,1.13,1.14

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23780/include/admin

Modified Files:
	category.inc.php entries.inc.php images.inc.php 
Log Message:
- Rewrite directories in terms of layout and a few core functions, fixed a few possible bugs
- Don't run imagick command after using gdlib to resize an image
- Replace old fake buttons with new and pretty fake buttons

Layout of directory overview is pending change



Index: category.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/category.inc.php,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- category.inc.php	27 Jan 2005 10:54:19 -0000	1.12
+++ category.inc.php	3 Feb 2005 18:04:41 -0000	1.13
@@ -232,15 +232,7 @@
             } ?>
             <tr>
                 <td colspan="6" align="right">
-                  <noscript>
-                    <a href="?serendipity[adminModule]=category&serendipity[adminAction]=new"
-                       class="button"><?php echo CREATE_NEW_CAT ?></a>
-                  </noscript>
-                  <script type="text/javascript">
-                  <!--
-                    document.write('<input type="button" value="<?php echo CREATE_NEW_CAT ?>" onclick="location.href=\'?serendipity[adminModule]=category&serendipity[adminAction]=new\'" class="serendipityPrettyButton">');
-                  // -->
-                  </script>
+                    <a href="?serendipity[adminModule]=category&serendipity[adminAction]=new" class="serendipityPrettyButton"><?php echo CREATE_NEW_CAT ?></a>
                 </td>
             </tr>
 </table>

Index: entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/entries.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- entries.inc.php	26 Jan 2005 14:14:04 -0000	1.18
+++ entries.inc.php	3 Feb 2005 18:04:41 -0000	1.19
@@ -373,10 +373,11 @@
         printf(DELETE_SURE, $serendipity['GET']['id']);
 ?>
 <br />
+<br />
 <div>
-    <a href="<?php echo $_SERVER["HTTP_REFERER"]; ?>" class="button"><?php echo NOT_REALLY; ?></a>
-    <span style="width: 50px;"></span>
-    <a href="<?php echo $newLoc; ?>" class="button"><?php echo DUMP_IT; ?></a>
+    <a href="<?php echo $_SERVER["HTTP_REFERER"]; ?>" class="serendipityPrettyButton"><?php echo NOT_REALLY; ?></a>
+    <?php echo str_repeat('&nbsp;', 10); ?>
+    <a href="<?php echo $newLoc; ?>" class="serendipityPrettyButton"><?php echo DUMP_IT; ?></a>
 </div>
 <?php
         break;

Index: images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/images.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- images.inc.php	27 Jan 2005 10:54:19 -0000	1.13
+++ images.inc.php	3 Feb 2005 18:04:42 -0000	1.14
@@ -44,18 +44,9 @@
 ?>
     <form method="get" name="delete_image">
         <div>
-            <noscript>
-              <a href="<?php echo $newLoc; ?>"
-                 class="button"><?php echo DUMP_IT ?></a>
+              <a href="<?php echo $newLoc; ?>" class="serendipityPrettyButton"><?php echo DUMP_IT ?></a>
               &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-              <a href="<?php echo $abortLoc; ?>"
-                 class="button"><?php echo ABORT_NOW ?></a> 
-            </noscript>
-            <script type="text/javascript">
-            <!--
-               document.write('<input type="button" value="<?php echo DUMP_IT ?>" onclick="location.href=\'<?php echo $newLoc; ?>\'" />&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;<input type="button" value="<?php echo ABORT_NOW ?>"    onclick="location.href=\'<?php echo $abortLoc; ?>\'" />');
-            // -->
-            </script>
+              <a href="<?php echo $abortLoc; ?>" class="serendipityPrettyButton"><?php echo ABORT_NOW ?></a>
         </div>
     </form>
 <?php
@@ -63,7 +54,7 @@
 
     case 'rename':
         $file = serendipity_fetchImageFromDatabase($serendipity['GET']['fid']);
-        serendipity_uploadSecure($serendipity['GET']['newname']);
+        $serendipity['GET']['newname'] = serendipity_uploadSecure($serendipity['GET']['newname']);
 
         if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF && $file['authorid'] != '0' && $file['authorid'] != $serendipity['authorid']) {
             return;
@@ -125,8 +116,8 @@
             break;
         }
 
-        serendipity_uploadSecure($tfile);
-        serendipity_uploadSecure($serendipity['POST']['target_directory'], true);
+        $tfile = serendipity_uploadSecure($tfile);
+        $serendipity['POST']['target_directory'] = serendipity_uploadSecure($serendipity['POST']['target_directory'], true);
         $target = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['POST']['target_directory'] . $tfile;
 
         if (file_exists($target)) {
@@ -164,8 +155,8 @@
             break;
         }
 
-        serendipity_uploadSecure($tfile);
-        serendipity_uploadSecure($serendipity['POST']['target_directory'], true);
+        $tfile = serendipity_uploadSecure($tfile);
+        $serendipity['POST']['target_directory'] = serendipity_uploadSecure($serendipity['POST']['target_directory'], true);
         $target = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $serendipity['POST']['target_directory'] . $tfile;
 
         if (file_exists($target)) {
@@ -187,118 +178,136 @@
     }
     break;
 
-    case 'directorySelect':
+
+    case 'directoryDoDelete':
         if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
             return;
         }
 
+        $new_dir = serendipity_uploadSecure($serendipity['GET']['dir'], true);
+        if (is_dir($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $new_dir)) {
+            if (!is_writable($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $new_dir)) {
+                printf(DIRECTORY_WRITE_ERROR, $new_dir);
+            } else {
+                // Directory exists and is writable. Now dive within subdirectories and kill 'em all.
+                serendipity_killPath($serendipity['serendipityPath'] . $serendipity['uploadPath'], $new_dir, (isset($serendipity['POST']['nuke']) ? true : false));
+            }
+        } else {
+            printf(ERROR_NO_DIRECTORY, $new_dir);
+        }
+
+        break;
+    case 'directoryDelete':
+        if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
+            return;
+        }
 ?>
+
+    <strong><?php echo DELETE_DIRECTORY ?></strong><br />
+    <?php echo DELETE_DIRECTORY_DESC ?>
     <br />
-<?php
-        if (!empty($serendipity['POST']['directoryMode']) && !empty($serendipity['POST']['newDirectoryName'])) {
-            serendipity_uploadSecure($serendipity['POST']['newDirectoryName'], true);
+    <br />
+    <form method="POST" action="?serendipity[adminModule]=images&serendipity[adminAction]=directoryDoDelete&amp;serendipity[dir]=<?php echo $serendipity['GET']['dir'] ?>">
+    <table cellpadding="5">
+        <tr>
+            <td width="100"><strong><?php echo NAME ?></strong></td>
+            <td><?php echo basename($serendipity['GET']['dir']) ?></td>
+        </tr>
+        <tr>
+            <td colspan="2"><input type="checkbox" name="serendipity[nuke]" value="true" style="margin: 0"> <?php echo FORCE_DELETE ?></td>
+        </tr>
+    </table>
+    <br />
+    <br />
+    <div align="center">
+        <?php echo sprintf(CONFIRM_DELETE_DIRECTORY, $serendipity['GET']['dir']) ?><br />
+        <input name="SAVE" value="<?php echo NOT_REALLY ?>" class="serendipityPrettyButton" type="button"> <input name="SAVE" value="<?php echo DELETE_DIRECTORY ?>" class="serendipityPrettyButton" type="submit">
+    </div>
+    </form>
 
-            $new_dir = $serendipity['uploadPath'] .
-                       $serendipity['POST']['newDirectoryName'];
+<?php
+        break;
 
-            switch($serendipity['POST']['directoryMode']) {
-                case 'create':
-                    if (@mkdir($serendipity['serendipityPath'] . $new_dir)) {
-                        printf(DIRECTORY_CREATED, $new_dir);
-                        @umask(0000);
-                        @chmod($serendipity['serendipityPath'] . $new_dir, 0777);
-                    } else {
-                        printf(DIRECTORY_WRITE_ERROR, $new_dir);
-                    }
-                    echo '<br /><hr />';
-                    break;
 
-                case 'delete':
-                    $path = $serendipity['serendipityPath'] . $new_dir;
-                    if (is_dir($path)) {
-                        if (!is_writable($serendipity['serendipityPath'] . $serendipity['uploadPath'])) {
-                            printf(DIRECTORY_WRITE_ERROR, $new_dir);
-                        } else {
-                            // Directory exists and is writable. Now dive within subdirectories and kill 'em all.
-                            serendipity_killPath(
-                              $serendipity['serendipityPath'] . $serendipity['uploadPath'],
-                              $serendipity['POST']['newDirectoryName'],
-                              (isset($serendipity['POST']['forceDelete']) ? true : false)
-                            );
-                        }
-                    } else {
-                        printf(ERROR_NO_DIRECTORY, $new_dir);
-                    }
-                    echo '<br /><hr />';
-                    break;
-            }
+    case 'directoryDoCreate':
+        if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
+            return;
         }
 
-        $jscode = "document.getElementById('newDirectory').value = this.title; return false;";
-
-        echo DIRECTORIES_AVAILABLE;
-        echo '<br /><br /><a href="#" onclick="' . $jscode . '" title="/">' . PARENT_DIRECTORY . ' (' . $serendipity['uploadPath'] . ')</a>';
-
-        serendipity_traversePath(
-          $out,
-          $serendipity['serendipityPath'] . $serendipity['uploadPath'],
-          $jscode
-        );
+        $new_dir = serendipity_uploadSecure($serendipity['POST']['parent'] . DIRECTORY_SEPARATOR . $serendipity['POST']['name'], true);
+        $new_dir = str_replace('..', '', $new_dir);
 
-        echo $out;
-?>
-    <script type="text/javascript">
-    function verify_submit() {
-        if (document.getElementById('mode_delete').checked) {
-            warnmsg = '<?php echo CONFIRM_DELETE_DIRECTORY; ?>';
-            warnmsg = warnmsg.replace('%s', document.getElementById('newDirectory').value);
-            return confirm(warnmsg);
+        /* TODO: check if directory already exist */
+        if (@mkdir($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $new_dir)) {
+            printf(DIRECTORY_CREATED, $serendipity['POST']['name']);
+            @umask(0000);
+            @chmod($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $new_dir, 0777);
         } else {
-            return true;
+            printf(DIRECTORY_WRITE_ERROR, $new_dir);
         }
-    }
-    </script>
 
-    <form action="?" method="POST" id="directoryform" onsubmit="return verify_submit()">
-        <div>
-            <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>
-                <td>
-                    <input type="radio" name="serendipity[directoryMode]" value="create" id="mode_create" checked="checked" />
-                    <label for="mode_create"><?php echo NEW_DIRECTORY; ?></label>
-                </td>
-                <td rowspan="2"><input type="text" id="newDirectory" name="serendipity[newDirectoryName]" value="" /></td>
-            </tr>
 
-            <tr>
-                <td>
-                    <input type="radio" name="serendipity[directoryMode]" value="delete" id="mode_delete" />
-                    <label for="mode_delete"><?php echo DELETE_DIRECTORY; ?></label>
-                </td>
-            </tr>
+        break;
 
-            <tr>
-                <td colspan="2">
-                    &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
-                    <input type="checkbox" name="serendipity[forceDelete]" value="true" id="forceDelete" />
-                    <label for="forceDelete"><?php echo FORCE_DELETE; ?></label>
-                </td>
-            </tr>
 
-            <tr>
-                <td>&nbsp;</td>
-                <td><input type="submit" value="<?php echo GO; ?>"/></td>
-            </tr>
-        </table>
+    case 'directoryCreate':
+        if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
+            return;
+        }
+?>
+    <strong><?php echo CREATE_DIRECTORY ?></strong><br />
+    <?php echo CREATE_DIRECTORY_DESC ?>
+    <br />
+    <br />
+    <form method="POST" action="?serendipity[adminModule]=images&serendipity[adminAction]=directoryDoCreate">
+    <table cellpadding="5">
+        <tr>
+            <td><?php echo NAME ?></td>
+            <td><input type="text" name="serendipity[name]" value="" /></td>
+        </tr>
+        <tr>
+            <td><?php echo PARENT_DIRECTORY ?></td>
+            <td><select name="serendipity[parent]">
+                    <option value=""><?php echo BASE_DIRECTORY ?></option>
+                <?php foreach ( serendipity_traversePath($serendipity['serendipityPath'] . $serendipity['uploadPath']) as $folder ) { ?>
+                    <option value="<?php echo $folder['relpath'] ?>"><?php echo str_repeat('&nbsp;', $folder['depth']*2) . ' '. $folder['name'] ?></option>
+                <?php } ?>
+                </select>
+            </td>
+        </tr>
+    </table>
+    <div><input name="SAVE" value="<?php echo CREATE_DIRECTORY ?>" class="serendipityPrettyButton" type="submit"></div>
     </form>
 <?php
         break;
 
+    case 'directorySelect':
+        if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF) {
+            return;
+        }
+
+?>
+    <br />
+    <?php echo DIRECTORIES_AVAILABLE; ?>
+    <br />
+    <table border="0" cellspacing="0" cellpadding="4" width="100%">
+        <tr>
+            <td colspan="2"><strong><?php echo BASE_DIRECTORY ?></strong></td>
+        </tr>
+        <?php foreach ( serendipity_traversePath($serendipity['serendipityPath'] . $serendipity['uploadPath']) as $folder ) { ?>
+        <tr>
+            <td width="16"><a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=directoryDelete&amp;serendipity[dir]=<?php echo urlencode($folder['relpath']) ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/delete.png') ?>" alt="<?php echo DELETE ?>" border="0"></a></td>
+            <td style="padding-left: <?php echo $folder['depth']*10 ?>"><?php echo $folder['name'] ?></td>
+        </tr>
+        <?php } ?>
+    </table>
+    <br />
+    <div><a href="?serendipity[adminModule]=images&serendipity[adminAction]=directoryCreate" class="serendipityPrettyButton"><?php echo CREATE_NEW_DIRECTORY ?></a></div>
+
+<?php
+        break;
+
     case 'addSelect':
 ?>
     <?php echo ADD_MEDIA_BLAHBLAH; ?>
@@ -352,8 +361,10 @@
                     <td><?php echo STORE_IN_DIRECTORY; ?></td>
                     <td>
                         <select name="serendipity[target_directory]">
-                        <option value=""><?php echo PARENT_DIRECTORY; ?></option>
-                        <?php serendipity_traversePath($out, $serendipity['serendipityPath'] . $serendipity['uploadPath'], '', '', false, '', 2); echo $out; ?>
+                        <option value=""><?php echo BASE_DIRECTORY; ?></option>
+                        <?php foreach (serendipity_traversePath($serendipity['serendipityPath'] . $serendipity['uploadPath']) as $folder) { ?>
+                        <option <?php echo ($serendipity['GET']['only_path'] == $folder['relpath']) ? 'selected="selected"' : '' ?> value="<?php echo $folder['relpath'] ?>"><?php echo str_repeat('&nbsp;', $folder['depth']*2) . ' '. $folder['name'] ?></option>
+                        <?php } ?>
                         </select>
                     </td>
                 </tr>

[php-blog-cvs] serendipity/include functions.inc.php,1.20,1.21 functions_images.inc.php,1.25,1.26

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23780/include

Modified Files:
	functions.inc.php functions_images.inc.php 
Log Message:
- Rewrite directories in terms of layout and a few core functions, fixed a few possible bugs
- Don't run imagick command after using gdlib to resize an image
- Replace old fake buttons with new and pretty fake buttons

Layout of directory overview is pending change



Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- functions_images.inc.php	26 Jan 2005 14:14:02 -0000	1.25
+++ functions_images.inc.php	3 Feb 2005 18:04:40 -0000	1.26
@@ -253,11 +253,11 @@
 
     if ($serendipity['magick'] !== true) {
         serendipity_resize_image_gd($infile, $outfile, $width, $height);
+    } else {
+        $cmd = $serendipity['convert'] . ' -scale ' .  $width . 'x' . $height . ' ' . $infile . ' ' . $outfile;
+        $res = `$cmd`;
     }
 
-    $cmd = $serendipity['convert'] . ' -scale ' .  $width . 'x' . $height . ' ' . $infile . ' ' . $outfile;
-    $res = `$cmd`;
-
     serendipity_updateImageInDatabase(array('dimensions_width' => $width, 'dimensions_height' => $height), $id);
     return;
 }
@@ -775,7 +775,7 @@
 
     if (isset($serendipity['GET']['only_path']) && !empty($serendipity['GET']['only_path']) ) {
         $extraParems .= 'serendipity[only_path]='. $serendipity['GET']['only_path'] .'&';
-        serendipity_uploadSecure($serendipity['GET']['only_path'], true);
+        $serendipity['GET']['only_path'] = serendipity_uploadSecure($serendipity['GET']['only_path'], true);
     }
 
     foreach ( (array)$serendipity['GET']['sortorder'] as $k => $v ) {
@@ -788,17 +788,7 @@
 
     $sort_order = serendipity_getImageFields();
 
-    serendipity_traversePath(
-      $paths,
-      $serendipity['serendipityPath'] . $serendipity['uploadPath'],
-      '',
-      '',
-      false,
-      '',
-      2,
-      0,
-      (isset($serendipity['GET']['only_path']) ? $serendipity['GET']['only_path'] : '')
-    );
+    $paths = serendipity_traversePath($serendipity['serendipityPath'] . $serendipity['uploadPath']);
 
 
     if (is_null($lineBreak)) {
@@ -821,7 +811,9 @@
             <td><?php echo FILTER_DIRECTORY ?></td>
             <td colspan="5"><select name="serendipity[only_path]">
                     <option value=""><?php echo ALL_DIRECTORIES ?></option>
-                    <?php echo $paths ?>
+                    <?php foreach ( $paths as $folder ) { ?>
+                    <option <?php echo ($serendipity['GET']['only_path'] == $folder['relpath']) ? 'selected="selected"' : '' ?> value="<?php echo $folder['relpath'] ?>"><?php echo str_repeat('&nbsp;', $folder['depth']*2) . ' '. $folder['name'] ?></option>
+                    <?php } ?>
                 </select>
             </td>
         </tr>
@@ -979,8 +971,8 @@
 }
 
 function serendipity_killPath($basedir, $directory = '', $forceDelete = false) {
-static $n = "<br />\n";
-static $serious = true;
+    static $n = "<br />\n";
+    static $serious = true;
 
     if ($handle = @opendir($basedir . $directory)) {
         while (false !== ($file = @readdir($handle))) {
@@ -1048,47 +1040,34 @@
     return true;
 }
 
-function serendipity_traversePath(&$out, $basedir, $jscode = '', $directory = '', $show_files = false, $pattern = '', $output_mode = 1, $level = 0, $selected = '') {
-    if (empty($pattern)) {
-        $pattern = '@.*@';
-    }
 
-    if ($handle = @opendir($basedir . DIRECTORY_SEPARATOR . $directory)) {
-        if ($output_mode == 1) {
-            $out .= '<ul>';
-        }
+function serendipity_traversePath($basedir, $dir='', $onlyDirs=true, $pattern = NULL, $depth = 1) {
 
-        while (false !== ($file = @readdir($handle))) {
-            if ($file != '.' && $file != '..' && preg_match($pattern, $file)) {
-                if (is_dir($basedir . $directory . DIRECTORY_SEPARATOR . $file)) {
-                    $cdir = (!empty($directory) ? $directory . DIRECTORY_SEPARATOR : '');
-                    switch($output_mode) {
-                        default:
-                        case 1:
-                            $out .= '<li><a href="#" onclick="' . $jscode . '" title="' . $cdir . $file . DIRECTORY_SEPARATOR . '">' . $file . DIRECTORY_SEPARATOR . '</a></li>' . "\n";
-                            break;
 
-                        case 2:
-                            $value = $cdir . $file . DIRECTORY_SEPARATOR;
-                            $out .= '<option ' . ($selected == $value ? 'selected="selected"' : '') . ' value="' . $value . '">' . str_repeat('&nbsp;', $level * 2) . $file . '</option>' . "\n";
-                            break;
-                    }
+	$dh = @opendir($basedir . DIRECTORY_SEPARATOR . $dir);
+	if ( !$dh ) {
+		return false;
+	}
 
-                    serendipity_traversePath($out, $basedir, $jscode, $cdir . $file, $show_files, $pattern, $output_mode, $level + 1, $selected);
-                } elseif ($show_files) {
-                    $out .= '<li>' . $file . '</li>' . "\n";
+	$files = array();
+	while (($file = @readdir($dh)) !== false) {
+		if ( $file != '.' && $file != '..' ) {
+			if ( $onlyDirs === true && is_dir($basedir . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . $file) ) {
+                if ( is_null($pattern) || preg_match($pattern, $file) ) {
+    				$files[] = array('name' => $file, 'depth' => $depth, 'relpath' => ltrim($dir, DIRECTORY_SEPARATOR) . basename($file) . DIRECTORY_SEPARATOR);
                 }
+			}
+            if ( is_dir($basedir . DIRECTORY_SEPARATOR . $dir . DIRECTORY_SEPARATOR . $file) ) {
+                $files = array_merge($files, serendipity_traversePath($basedir, $dir . DIRECTORY_SEPARATOR . basename($file) . DIRECTORY_SEPARATOR, $onlyDirs, $pattern, ($depth+1)));
             }
-        }
-
-        if ($output_mode == 1) {
-            $out .= '</ul>';
-        }
+		}
+	}
 
-        closedir($handle);
-    }
+    fclose($dh);
+    return $files;
 }
 
+
 function serendipity_deletePath($dir) {
     $d = dir($dir);
     if ($d) {
@@ -1109,7 +1088,7 @@
     }
 }
 
-function serendipity_uploadSecure(&$var, $strip_paths = true) {
+function serendipity_uploadSecure($var, $strip_paths = true) {
     $var = preg_replace('@[^0-9a-z\._/-]@i', '', $var);
     if ($strip_paths) {
         $var = preg_replace('@(\.+[/\\\\]+)@', '/', $var);
@@ -1117,7 +1096,7 @@
 
     $var = preg_replace('@^(/+)@', '', $var);
 
-    return true;
+    return $var;
 }
 
 function serendipity_getimagesize($file, $ft_mime = '', $suf = '') {

Index: functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- functions.inc.php	26 Jan 2005 14:14:01 -0000	1.20
+++ functions.inc.php	3 Feb 2005 18:04:40 -0000	1.21
@@ -82,8 +82,11 @@
 
 function serendipity_fetchTemplateInfo($theme) {
     global $serendipity;
-    /* Blame jannis */
-    $lines = file($serendipity['serendipityPath'] . $serendipity['templatePath'] . $theme . '/info.txt');
+
+    $lines = @file($serendipity['serendipityPath'] . $serendipity['templatePath'] . $theme . '/info.txt');
+    if ( !$lines ) {
+        return array();
+    }
 
     for($x=0; $x<count($lines); $x++) {
         $j = preg_split('/([^\:]+)\:/', $lines[$x], -1, PREG_SPLIT_DELIM_CAPTURE);

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.46,1.47

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2604

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
Reverted parts of nohns commit when reordering spamblock methods:

First try to execute REJECT mechanisms, after that comes MODERATE.
Everything we want rejected should be rejected and not put into MODERATE
state because of some irrelevant "force moderation after X days". If you had
this activated, every comment that got no valid captcha would be put into
MODERATE state. Now every comment is checked for its captcha first before
auto-moderation kicks in.



Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- serendipity_event_spamblock.php	1 Feb 2005 13:23:45 -0000	1.46
+++ serendipity_event_spamblock.php	3 Feb 2005 16:29:21 -0000	1.47
@@ -507,15 +507,6 @@
                             }
                         }
 
-                        // Check for forced moderation
-                        if ($forcemoderation > 0 && $eventData['timestamp'] < (time() - ($forcemoderation * 60 * 60 * 24))) {
-                            $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION, $addData);
-                            $eventData['moderate_comments'] = true;
-                            $serendipity['csuccess']        = 'moderate';
-                            $serendipity['moderate_reason'] = PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION;
-                            return false;
-                        }
-
                         // Check for maximum number of links before rejecting
                         $link_count = substr_count(strtolower($addData['comment']), 'http://');
                         if ($links_reject > 0 && $link_count > $links_reject) {
@@ -525,15 +516,6 @@
                             return false;
                         }
 
-                        // Check for maximum number of links before forcing moderation
-                        if ($links_moderate > 0 && $link_count > $links_moderate) {
-                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_MODERATE, $addData);
-                            $eventData['moderate_comments'] = true;
-                            $serendipity['csuccess']        = 'moderate';
-                            $serendipity['moderate_reason'] = PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_MODERATE;
-                            return false;
-                        }
-
                         // Captcha checking
                         if ($show_captcha && $addData['type'] == 'NORMAL') {
                             if (!isset($_SESSION['spamblock']['captcha']) || !isset($serendipity['POST']['captcha']) || strtolower($serendipity['POST']['captcha']) != strtolower($_SESSION['spamblock']['captcha'])) {
@@ -541,7 +523,31 @@
                                 $eventData = array('allow_comments' => false);
                                 $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_CAPTCHAS;
                                 return false;
+                            } else {
+// DEBUG
+//                                $this->log($logfile, $eventData['id'], 'REJECTED', 'Captcha passed: ' . $serendipity['POST']['captcha'] . ' / ' . $_SESSION['spamblock']['captcha'] . ' // Source: ' . $_SERVER['REQUEST_URI'], $addData);
                             }
+                        } else {
+// DEBUG
+//                            $this->log($logfile, $eventData['id'], 'REJECTED', 'Captcha not needed: ' . $serendipity['POST']['captcha'] . ' / ' . $_SESSION['spamblock']['captcha'] . ' // Source: ' . $_SERVER['REQUEST_URI'], $addData);
+                        }
+
+                        // Check for forced moderation
+                        if ($forcemoderation > 0 && $eventData['timestamp'] < (time() - ($forcemoderation * 60 * 60 * 24))) {
+                            $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION, $addData);
+                            $eventData['moderate_comments'] = true;
+                            $serendipity['csuccess']        = 'moderate';
+                            $serendipity['moderate_reason'] = PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION;
+                            return false;
+                        }
+
+                        // Check for maximum number of links before forcing moderation
+                        if ($links_moderate > 0 && $link_count > $links_moderate) {
+                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_MODERATE, $addData);
+                            $eventData['moderate_comments'] = true;
+                            $serendipity['csuccess']        = 'moderate';
+                            $serendipity['moderate_reason'] = PLUGIN_EVENT_SPAMBLOCK_REASON_LINKS_MODERATE;
+                            return false;
                         }
 
                         // Check for identical comments. We allow to bypass trackbacks from our server to our own blog.

[php-blog-cvs] serendipity/lang serendipity_lang_ja.inc.php,1.20,1.21

[Tadashi J. <el...@us...>]

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24468

Modified Files:
	serendipity_lang_ja.inc.php 
Log Message:
o updated japanese translation.


Index: serendipity_lang_ja.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_ja.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_lang_ja.inc.php	30 Jan 2005 18:23:43 -0000	1.20
+++ serendipity_lang_ja.inc.php	3 Feb 2005 15:43:17 -0000	1.21
@@ -43,8 +43,8 @@
 @define('NEW_COMMENT_TO', '新規コメントを投稿する: ');
 @define('RECENT', '最近の記事...');
 @define('OLDER', '古い記事...');
-@define('DONE', '実行しました');
-@define('WELCOME_BACK', 'Welcome back,');
+@define('DONE', '実行完了');
+@define('WELCOME_BACK', 'ようこそ!! ');
 @define('RUNNING', '実行している Serendipity のバージョン:');
 @define('ADD_PLUGIN', 'プラグイン追加');
 @define('TITLE', '題名');
@@ -152,7 +152,7 @@
 @define('COMMENTS_DISABLE', 'このエントリのコメントを許可しない');
 @define('COMMENTS_ENABLE', 'このエントリへのコメントを許可する');
 @define('COMMENTS_CLOSED', '執筆者はこのエントリへのコメントを許可していません');
-@define('EMPTY_COMMENT', 'コメントは何も含んでいません。%s戻る%sでもう一度試してください。');
+@define('EMPTY_COMMENT', 'コメントは何も含んでいません。%s戻る%s でもう一度試してください。');
 @define('ENTRIES_FOR', '%s のエントリ一覧');
 @define('DOCUMENT_NOT_FOUND', 'ドキュメント %s が見つかりません。');
 @define('USERNAME', 'ユーザー名');
@@ -403,7 +403,7 @@
 @define('INSTALL_PASSWORD_DESC', '管理者ログインのパスワード');
 @define('INSTALL_EMAIL', '管理者電子メール');
 @define('INSTALL_EMAIL_DESC', 'ブログ管理者の電子メール');
-@define('INSTALL_SENDMAIL', '管理者にメールを送信?');
+@define('INSTALL_SENDMAIL', '管理者にメールを送信しますか?');
 @define('INSTALL_SENDMAIL_DESC', 'エントリにコメントが投稿されたとき、電子メールを受信しますか?');
 @define('INSTALL_SUBSCRIBE', 'ユーザーのエントリの購読を許可しますか?');
 @define('INSTALL_SUBSCRIBE_DESC', 'Allow users to subscribe to an entry and thereby receive a mail when new comments are made to that entry');
@@ -423,7 +423,7 @@
 @define('INSTALL_XHTML11_DESC', '強制で XHTML 1.1 準拠にします (may cause problems for back-/frontend on older 4th generation browsers)');
 @define('INSTALL_POPUP', 'ポップアップウィンドウを有効');
 @define('INSTALL_POPUP_DESC', 'コメントやトラックバックにポップアップウィンドウを使用しますか?');
-@define('INSTALL_EMBED', 'Is serendipity embedded?');
+@define('INSTALL_EMBED', 'serendipity を組み込みで使用しますか?');
 @define('INSTALL_EMBED_DESC', 'If you want to embed serendipity within a regular page, set to true to discard any headers and just print the contents. You can make use of the indexFile option to use a wrapper class where you put your normal webpage headers. See the README file for more information!');
 @define('INSTALL_TOP_AS_LINKS', 'トップの退出/リファラーのリンクを表示しますか?');
 @define('INSTALL_TOP_AS_LINKS_DESC', '"いいえ": Exits and Referrers are shown as plain text to prevent google spam. "yes": Exits and Referrers are shown as hyperlinks. "default": Use setting from global configuration (recommended).');
@@ -437,7 +437,7 @@
 @define('INSTALL_CAT_IMAGECONV_DESC', 'serendipity がどのようにイメージを扱わなければならないかに関する一般的な情報を入力します。');
 @define('INSTALL_IMAGEMAGICK', 'Imagemagick を使う');
 @define('INSTALL_IMAGEMAGICK_DESC', 'image magick がインストール済みで、それを使って画像のリサイズをしたいですか?');
-@define('INSTALL_IMAGEMAGICKPATH', 'contert バイナリへのパス');
+@define('INSTALL_IMAGEMAGICKPATH', 'convert バイナリへのパス');
 @define('INSTALL_IMAGEMAGICKPATH_DESC', 'image magic convert バイナリのフルパスと名前');
 @define('INSTALL_THUMBSUFFIX', 'サムネイル接尾辞');
 @define('INSTALL_THUMBSUFFIX_DESC', 'サムネイルは次の書式で指定されるでしょう: オリジナル.[接尾辞].拡張子');
@@ -608,10 +608,10 @@
 @define('WRITABLE', '書き込み可能');
 @define('NOT_WRITABLE', '書き込み不可能');
 @define('PROBLEM_DIAGNOSTIC', 'Due to a problematic diagnostic, you cannot continue with the installation before the above errors are fixed');
-@define('SELECT_INSTALLATION_TYPE', 'Select which installation type you wish to use');
+@define('SELECT_INSTALLATION_TYPE', 'どのインストールタイプの使用を希望するか選択してください');
 @define('WELCOME_TO_INSTALLATION', 'ようこそ Serendipity のインストール画面へ');
-@define('FIRST_WE_TAKE_A_LOOK', 'First we will take a look at your current setup and attempt to diagnose any compatibility problems');
-@define('ERRORS_ARE_DISPLAYED_IN', 'Errors are displayed in %s, recommendations in %s and success in %s');
+@define('FIRST_WE_TAKE_A_LOOK', 'まず初めに、現在の設定を見てごんな互換性の問題があるか分析を試みます。');
+@define('ERRORS_ARE_DISPLAYED_IN', 'エラーは %s で、推奨は %s で、成功は %s で表示されます。');
 @define('RED', '赤');
 @define('YELLOW', '黄');
 @define('GREEN', '緑');
@@ -623,15 +623,15 @@
 @define('THEY_DO', 'それを行う');
 @define('THEY_DONT', 'それを行わない');
 @define('SIMPLE_INSTALLATION', '簡単なインストール作業');
-@define('EXPERT_INSTALLATION', '達人のインストール作業');
+@define('EXPERT_INSTALLATION', '上級者のインストール作業');
 @define('COMPLETE_INSTALLATION', 'インストール作業完了');
 @define('WONT_INSTALL_DB_AGAIN', '再度データベースをインストールしないでしょう。');
-@define('CHECK_DATABASE_EXISTS', 'データベースとテーブルが既に存在するか確認してください。');
-@define('CREATING_PRIMARY_AUTHOR', '主要な執筆者 \'%s\'cを作成中');
+@define('CHECK_DATABASE_EXISTS', 'データベースとテーブルが既に存在するか確認します');
+@define('CREATING_PRIMARY_AUTHOR', '主要な執筆者 \'%s\' を作成中');
 @define('SETTING_DEFAULT_TEMPLATE', 'デフォルトテンプレート設定');
 @define('INSTALLING_DEFAULT_PLUGINS', 'デフォルトプラグインのインストール');
 @define('SERENDIPITY_INSTALLED', 'Serendipity のインストールに成功しました。');
-@define('VISIT_BLOG_HERE', 'ここからあなたの新しいブログに訪問');
+@define('VISIT_BLOG_HERE', 'ここからあなたの新しいブログに訪問します');
 @define('THANK_YOU_FOR_CHOOSING', 'Serendipity を選んでくれてありがとうございます。');
 @define('ERROR_DETECTED_IN_INSTALL', 'インストール作業でエラーを検知しました。');
 @define('OPERATING_SYSTEM', 'オペレーションシステム');

[php-blog-cvs] serendipity/include/admin import.inc.php,1.5,1.6

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16530/include/admin

Modified Files:
	import.inc.php 
Log Message:
fix empty dropddown values


Index: import.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/import.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- import.inc.php	29 Jan 2005 15:44:40 -0000	1.5
+++ import.inc.php	3 Feb 2005 12:27:57 -0000	1.6
@@ -48,7 +48,7 @@
     <?php foreach ( $importer->getInputFields() as $field ) { ?>
     <tr>
       <td><?php echo $field['text'] ?></td>
-      <td><?php serendipity_guessInput($field['type'], 'serendipity[import]['. $field['name'] .']', (isset($serendipity['POST']['import'][$field['name']]) ? $serendipity['POST']['import'][$field['name']] : $field['default'])) ?></td>
+      <td><?php serendipity_guessInput($field['type'], 'serendipity[import]['. $field['name'] .']', (isset($serendipity['POST']['import'][$field['name']]) ? $serendipity['POST']['import'][$field['name']] : $field['default']), $field['default']) ?></td>
     </tr>
     <?php } ?>
     <?php if ($notes = $importer->getImportNotes()){ ?>

[php-blog-cvs] serendipity/templates/default/admin style.css,1.25,1.26

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/default/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13314/templates/default/admin

Modified Files:
	style.css 
Log Message:
- serendipityPrettyButton on a <input> and <a> now looks *exactly* the same
 ( Soon to replace the .button class )



Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/admin/style.css,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -d -r1.25 -r1.26
--- style.css	24 Jan 2005 10:47:48 -0000	1.25
+++ style.css	1 Feb 2005 21:05:18 -0000	1.26
@@ -163,30 +163,6 @@
     margin: auto;
 }
 
-a.button {
-    background-color: #F8F9FA;
-    border: 1px solid #294366;
-    color: #000000;
-    font-family: verdana;
-    font-size: 0.9em;
-    padding-left: 0.3em;
-    padding-right: 0.3em;
-    padding-top: 0.1em;
-    padding-bottom: 0.1em;
-    text-decoration: none;
-}
-
-a.button_disabled {
-    background-color: #F8F9FA;
-    border: 1px solid #294366;
-    color: #CCCCCC;
-    font-family: verdana;
-    font-size: 0.9em;
-    padding-left: 0.3em;
-    padding-right: 0.3em;
-    text-decoration: none;
-}
-
 ul.serendipitySideBarMenu {
     padding: 0px;
     margin: 0px;
@@ -251,15 +227,33 @@
     border: 0;
 }
 
+
+a:link.serendipityPrettyButton,
+a:visited.serendipityPrettyButton,
+a:hover.serendipityPrettyButton {
+    text-decoration: none;
+    color: #1D2E3F;
+}
+
 .serendipityPrettyButton {
     padding: 1px;
     background: url({TEMPLATE_PATH}img/button_background.png) repeat-x top;
     color: #1D2E3F;
     font-weight: bold;
+    font-size: 0.9em;
     border: 1px outset #000000;
     margin: 2px;
 }
 
+/* Special class if the button is a <a> tag */
+a.serendipityPrettyButton {
+    padding: 2px;
+    padding-left: 4px;
+    padding-right: 4px;
+    cursor: default;
+}
+
+
 .direction_ltr {
     direction: ltr;
 }

[php-blog-cvs] serendipity/include/admin plugins.inc.php,1.19,1.20

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23230

Modified Files:
	plugins.inc.php 
Log Message:
- Move plugin status message to the top of the page


Index: plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/plugins.inc.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- plugins.inc.php	1 Feb 2005 17:05:09 -0000	1.19
+++ plugins.inc.php	1 Feb 2005 17:12:48 -0000	1.20
@@ -271,9 +271,13 @@
         }
 
         $plugin->cleanup();
-        $statusMsg = sprintf(SETTINGS_SAVED_AT, serendipity_strftime('%T'));
     }
 ?>
+
+<?php if ( isset($_POST['SAVECONF']) ) { ?>
+    <div class="serendipityAdminMsgSuccess"><?php echo DONE .': '. sprintf(SETTINGS_SAVED_AT, serendipity_strftime('%T')); ?></div>
+<?php } ?>
+
 <form method="post" name="serendipityPluginConfigure">
     <table cellpadding="5" style="border: 1px dashed" width="90%" align="center">
         <tr>
@@ -481,11 +485,6 @@
 <br />
     <div style="padding-left: 20px">
         <input type="submit" name="SAVECONF" value="<?php echo SAVE; ?>" />
-<?php
-    if (isset($_POST['SAVECONF'])) {
-        echo '<span class="serendipityAdminMsgSuccess">' . DONE . ': '. $statusMsg .'</span>';
-    }
-?>
     </div>
 <?php
     if (method_exists($plugin, 'example') ) {

[php-blog-cvs] serendipity/templates/default/admin/img configure.png,NONE,1.1

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/templates/default/admin/img
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20610/templates/default/admin/img

Added Files:
	configure.png 
Log Message:
- Add a small configure icon next to plugins that can be configured (since some users didn't know they could configure plugins)


--- NEW FILE: configure.png ---
(This appears to be a binary file; contents omitted.)

[php-blog-cvs] serendipity/include/admin plugins.inc.php,1.18,1.19

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20610/include/admin

Modified Files:
	plugins.inc.php 
Log Message:
- Add a small configure icon next to plugins that can be configured (since some users didn't know they could configure plugins)


Index: plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/plugins.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- plugins.inc.php	28 Jan 2005 13:42:29 -0000	1.18
+++ plugins.inc.php	1 Feb 2005 17:05:09 -0000	1.19
@@ -24,7 +24,7 @@
     <form action="?serendipity[adminModule]=plugins" method="post">
         <table border="0" cellpadding="5" cellspacing="0" width="100%">
             <tr>
-                <td>&nbsp;</td>
+                <td colspan="2">&nbsp;</td>
                 <td><strong><?php echo TITLE; ?></strong></td>
                 <td><strong><?php echo PERMISSIONS; ?></strong></td>
 <?php
@@ -77,9 +77,9 @@
                 $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&amp;serendipity[plugin_to_conf]=' . $key;
-                    $name  = '<a href="' . $url . '">' . $name  . '</a>';
-                    $title = '<a href="' . $url . '">' . $title . '</a>';
+                    $can_configure = true;
+                } else {
+                    $can_configure = false;
                 }
             }
 
@@ -114,19 +114,24 @@
                     <?php } ?>
                     </div>
                 </td>
-
-                <td style="border-bottom: 1px solid #000000"><strong><?php echo $title; ?></strong><br /><div style="font-size: 8pt"><?php echo $desc; ?></div></td>
-                <td style="border-bottom: 1px solid #000000" nowrap="nowrap">
-                    <div>
-                    <?php
-                        ownership($plugin_data['authorid'], $plugin_data['name'], $is_plugin_owner);
-                    ?>
-                    </div>
+                <td style="border-bottom: 1px solid #000000" width="16">
+                <?php if ( $can_configure ) { ?>
+                    <a href="?serendipity[adminModule]=plugins&amp;serendipity[plugin_to_conf]=<?php echo $key ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/configure.png') ?>" style="border: 0; vertical-align: bottom;"></a>
+                <?php } else { ?>
+                    &nbsp;
+                <?php } ?>
                 </td>
-            <?php if ( !$event_only ) { ?>
-                <td style="border-bottom: 1px solid #000000" nowrap="nowrap">
-                    <div><?php echo $place ?></div>
+                <td style="border-bottom: 1px solid #000000"><strong>
+                <?php if ( $can_configure ) { ?>
+                    <a href="?serendipity[adminModule]=plugins&amp;serendipity[plugin_to_conf]=<?php echo $key ?>"><?php echo $title; ?></a>
+                <?php } else { ?>
+                    <?php echo $title; ?>
+                <?php } ?></strong><br />
+                    <div style="font-size: 8pt"><?php echo $desc; ?></div>
                 </td>
+                <td style="border-bottom: 1px solid #000000" nowrap="nowrap"><?php ownership($plugin_data['authorid'], $plugin_data['name'], $is_plugin_owner); ?></td>
+            <?php if ( !$event_only ) { ?>
+                <td style="border-bottom: 1px solid #000000" nowrap="nowrap"><?php echo $place ?></td>
             <?php } ?>
                 <td style="border-bottom: 1px solid #000000"><?php echo $moveup ?></td>
                 <td style="border-bottom: 1px solid #000000"><?php echo $movedown ?></td>
@@ -628,15 +633,15 @@
         $fetchplugin_data = array('GET'     => &$serendipity['GET'],
                                   'install' => true);
         serendipity_plugin_api::hook_event('backend_plugins_fetchplugin', $fetchplugin_data);
-        
+
         if ($fetchplugin_data['install']) {
             $inst = serendipity_plugin_api::create_plugin_instance($serendipity['GET']['install_plugin'], null, (serendipity_plugin_api::is_event_plugin($serendipity['GET']['install_plugin']) ? 'event': 'right'), $authorid, serendipity_db_escape_string($serendipity['GET']['pluginPath']));
-    
+
             /* Load the new plugin */
             $plugin = &serendipity_plugin_api::load_plugin($inst);
             $bag  = new serendipity_property_bag;
             $plugin->introspect($bag);
-    
+
             /* 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>';

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.45,1.46

[Tom S. <tom...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29023

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
- Call the vars 'contentfilter_*' and not 'filter_*', because the 'filter' is what all vars do...


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.45
retrieving revision 1.46
diff -u -d -r1.45 -r1.46
--- serendipity_event_spamblock.php	1 Feb 2005 10:36:33 -0000	1.45
+++ serendipity_event_spamblock.php	1 Feb 2005 13:23:45 -0000	1.46
@@ -186,7 +186,7 @@
             'frontend_comment'     => true,
             'fetchcomments'        => true
         ));
-        $propbag->add('configuration', array('killswitch', 'bodyclone', 'ipflood', 'surbl_enabled', 'rbl_enabled', 'rbllist', 'captchas', 'captchas_ttl', 'captcha_color', 'forcemoderation', 'disable_api_comments', 'links_moderate', 'links_reject', 'filter_activate', 'filter_urls', 'filter_authors', 'hide_email', 'logtype', 'logfile'));
+        $propbag->add('configuration', array('killswitch', 'bodyclone', 'ipflood', 'surbl_enabled', 'rbl_enabled', 'rbllist', 'captchas', 'captchas_ttl', 'captcha_color', 'forcemoderation', 'disable_api_comments', 'links_moderate', 'links_reject', 'contentfilter_activate', 'contentfilter_urls', 'contentfilter_authors', 'hide_email', 'logtype', 'logfile'));
 
         $this->filter_defaults = array(
                                    'authors' => 'casino;phentermine;credit;loans;poker',
@@ -240,7 +240,7 @@
                 $propbag->add('default', false);
                 break;
 
-            case 'filter_activate':
+            case 'contentfilter_activate':
                 $propbag->add('type', 'radio');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_ACTIVATE);
                 $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_ACTIVATE_DESC);
@@ -253,14 +253,14 @@
 
                 break;
 
-            case 'filter_urls':
+            case 'contentfilter_urls':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS);
                 $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS_DESC);
                 $propbag->add('default', $this->filter_defaults['urls']);
                 break;
 
-            case 'filter_authors':
+            case 'contentfilter_authors':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS);
                 $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS_DESC);
@@ -466,10 +466,10 @@
                         }
 
                         // Check for word filtering
-                        if ($filter_type = $this->get_config('filter_activate', 'moderate')) {
+                        if ($filter_type = $this->get_config('contentfilter_activate', 'moderate')) {
 
                             // Filter authors names
-                            $filter_authors = explode(';', $this->get_config('filter_authors', $this->filter_defaults['authors']));
+                            $filter_authors = explode(';', $this->get_config('contentfilter_authors', $this->filter_defaults['authors']));
                             if (is_array($filter_authors)) {
                                 foreach($filter_authors AS $filter_author) {
                                     if (preg_match('@' . $filter_author . '@', $eventData['name'])) {
@@ -488,7 +488,7 @@
                             }
 
                             // Filter URL
-                            $filter_urls = explode(';', $this->get_config('filter_urls', $this->filter_defaults['urls']));
+                            $filter_urls = explode(';', $this->get_config('contentfilter_urls', $this->filter_defaults['urls']));
                             if (is_array($filter_urls)) {
                                 foreach($filter_urls AS $filter_url) {
                                     if (preg_match('@' . $filter_url . '@', $eventData['url'])) {

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.44,1.45

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24646

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
missed the typo


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -d -r1.44 -r1.45
--- serendipity_event_spamblock.php	1 Feb 2005 10:23:04 -0000	1.44
+++ serendipity_event_spamblock.php	1 Feb 2005 10:36:33 -0000	1.45
@@ -490,7 +490,7 @@
                             // Filter URL
                             $filter_urls = explode(';', $this->get_config('filter_urls', $this->filter_defaults['urls']));
                             if (is_array($filter_urls)) {
-                                foreach($filter_urlss AS $filter_url) {
+                                foreach($filter_urls AS $filter_url) {
                                     if (preg_match('@' . $filter_url . '@', $eventData['url'])) {
                                         if ($filter_type == 'moderate') {
                                             $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS, $addData);

[php-blog-cvs] serendipity/plugins/serendipity_event_spamblock serendipity_event_spamblock.php,1.43,1.44

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21324

Modified Files:
	serendipity_event_spamblock.php 
Log Message:
word filtering. may need some improvements.


Index: serendipity_event_spamblock.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_spamblock/serendipity_event_spamblock.php,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -d -r1.43 -r1.44
--- serendipity_event_spamblock.php	27 Jan 2005 12:46:33 -0000	1.43
+++ serendipity_event_spamblock.php	1 Feb 2005 10:23:04 -0000	1.44
@@ -75,6 +75,13 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_API_REJECT', 'abweisen');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_API', 'Keine API-erstellten Kommentare (u.a. Trackbacks) erlaubt');
 
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_ACTIVATE', 'Wortfilter aktivieren');
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_ACTIVATE_DESC', 'Durchsucht Kommentare nach speziellen Zeichenketten und markiert diese als Spam.');
+
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS', 'Wortfilter für URLs');
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS_DESC', 'Reguläre Ausdrücke erlaubt, Zeichenkennten durch Semikolon (;) trennen.');
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS', 'Wortfilter für Autorennamen');
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS_DESC', 'Reguläre Ausdrücke erlaubt, Zeichenkennten durch Semikolon (;) trennen.');
         break;
 
     default:
@@ -140,19 +147,27 @@
         @define('PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_FILE', 'File (see "logfile" option below)');
         @define('PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_DB', 'Database');
         @define('PLUGIN_EVENT_SPAMBLOCK_LOGTYPE_NONE', 'No Logging');
-        
+
         @define('PLUGIN_EVENT_SPAMBLOCK_API_COMMENTS', 'How to treat comments made via APIs');
         @define('PLUGIN_EVENT_SPAMBLOCK_API_COMMENTS_DESC', 'This affects the moderation of comments made via API calls (Trackbacks, WFW:commentAPI comments). If set to "moderate", all those comments always need to be approved first. If set to "reject", the are completely disallowed. If set to "none", the comments will be treated as usual comments.');
         @define('PLUGIN_EVENT_SPAMBLOCK_API_MODERATE', 'moderate');
         @define('PLUGIN_EVENT_SPAMBLOCK_API_REJECT', 'reject');
         @define('PLUGIN_EVENT_SPAMBLOCK_REASON_API', 'No API-created comments (like trackbacks) allowed');
 
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_ACTIVATE', 'Activate wordfilter');
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_ACTIVATE_DESC', 'Searches comments for certain strings and marks them as spam.');
+
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS', 'Wordfilter for URLs');
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS_DESC', 'Regular Expressions allowed, separate strings by semicolons (;).');
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS', 'Wordfilter for author names');
+        @define('PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS_DESC', 'Regular Expressions allowed, separate strings by semicolons (;).');
+
         break;
 }
 
 class serendipity_event_spamblock extends serendipity_event
 {
-var $services;
+var $filter_defaults;
 
     function introspect(&$propbag)
     {
@@ -164,14 +179,19 @@
         $propbag->add('description',   PLUGIN_EVENT_SPAMBLOCK_DESC);
         $propbag->add('stackable',     false);
         $propbag->add('author',        'Garvin Hicking, Sebastian Nohn');
-        $propbag->add('version',       '1.2');
+        $propbag->add('version',       '1.21');
         $propbag->add('event_hooks',    array(
             'frontend_saveComment' => true,
             'external_plugin'      => true,
             'frontend_comment'     => true,
             'fetchcomments'        => true
         ));
-        $propbag->add('configuration', array('killswitch', 'bodyclone', 'ipflood', 'surbl_enabled', 'rbl_enabled', 'rbllist', 'captchas', 'captchas_ttl', 'captcha_color', 'forcemoderation', 'disable_api_comments', 'links_moderate', 'links_reject', 'hide_email', 'logtype', 'logfile'));
+        $propbag->add('configuration', array('killswitch', 'bodyclone', 'ipflood', 'surbl_enabled', 'rbl_enabled', 'rbllist', 'captchas', 'captchas_ttl', 'captcha_color', 'forcemoderation', 'disable_api_comments', 'links_moderate', 'links_reject', 'filter_activate', 'filter_urls', 'filter_authors', 'hide_email', 'logtype', 'logfile'));
+
+        $this->filter_defaults = array(
+                                   'authors' => 'casino;phentermine;credit;loans;poker',
+                                   'urls'    => '8gold\.com;911easymoney\.com;canadianlabels\.net;condodream\.com;crepesuzette\.com;debt-help-bill-consolidation-elimination\.com;fidelityfunding\.net;flafeber\.com;gb\.com;houseofsevengables\.com;instant-quick-money-cash-advance-personal-loans-until-pay-day\.com;mediavisor\.com;newtruths\.com;oiline\.com;onlinegamingassociation\.com;online\-+poker\.com;popwow\.com;royalmailhotel\.com;spoodles\.com;sportsparent\.com;stmaryonline\.org;thatwhichis\.com;tmsathai\.org;uaeecommerce\.com;learnhowtoplay\.com'
+        );
     }
 
     function introspect_config_item($name, &$propbag)
@@ -220,6 +240,33 @@
                 $propbag->add('default', false);
                 break;
 
+            case 'filter_activate':
+                $propbag->add('type', 'radio');
+                $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_ACTIVATE);
+                $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_ACTIVATE_DESC);
+                $propbag->add('default', 'moderate');
+                $propbag->add('radio', array(
+                    'value' => array('moderate', 'reject', 'none'),
+                    'desc'  => array(PLUGIN_EVENT_SPAMBLOCK_API_MODERATE, PLUGIN_EVENT_SPAMBLOCK_API_REJECT, NONE)
+                ));
+                $propbag->add('radio_per_row', '1');
+
+                break;
+
+            case 'filter_urls':
+                $propbag->add('type', 'string');
+                $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS);
+                $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS_DESC);
+                $propbag->add('default', $this->filter_defaults['urls']);
+                break;
+
+            case 'filter_authors':
+                $propbag->add('type', 'string');
+                $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS);
+                $propbag->add('description', PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS_DESC);
+                $propbag->add('default', $this->filter_defaults['authors']);
+                break;
+
             case 'logfile':
                 $propbag->add('type', 'string');
                 $propbag->add('name', PLUGIN_EVENT_SPAMBLOCK_LOGFILE);
@@ -418,6 +465,48 @@
                             return false;
                         }
 
+                        // Check for word filtering
+                        if ($filter_type = $this->get_config('filter_activate', 'moderate')) {
+
+                            // Filter authors names
+                            $filter_authors = explode(';', $this->get_config('filter_authors', $this->filter_defaults['authors']));
+                            if (is_array($filter_authors)) {
+                                foreach($filter_authors AS $filter_author) {
+                                    if (preg_match('@' . $filter_author . '@', $eventData['name'])) {
+                                        if ($filter_type == 'moderate') {
+                                            $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS, $addData);
+                                            $eventData['moderate_comments'] = true;
+                                            $serendipity['csuccess']        = 'moderate';
+                                            $serendipity['moderate_reason'] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
+                                        } else {
+                                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_FILTER_AUTHORS, $addData);
+                                            $eventData = array('allow_comments' => false);
+                                            $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
+                                        }
+                                    }
+                                }
+                            }
+
+                            // Filter URL
+                            $filter_urls = explode(';', $this->get_config('filter_urls', $this->filter_defaults['urls']));
+                            if (is_array($filter_urls)) {
+                                foreach($filter_urlss AS $filter_url) {
+                                    if (preg_match('@' . $filter_url . '@', $eventData['url'])) {
+                                        if ($filter_type == 'moderate') {
+                                            $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS, $addData);
+                                            $eventData['moderate_comments'] = true;
+                                            $serendipity['csuccess']        = 'moderate';
+                                            $serendipity['moderate_reason'] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
+                                        } else {
+                                            $this->log($logfile, $eventData['id'], 'REJECTED', PLUGIN_EVENT_SPAMBLOCK_FILTER_URLS, $addData);
+                                            $eventData = array('allow_comments' => false);
+                                            $serendipity['messagestack']['comments'][] = PLUGIN_EVENT_SPAMBLOCK_ERROR_BODY;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+
                         // Check for forced moderation
                         if ($forcemoderation > 0 && $eventData['timestamp'] < (time() - ($forcemoderation * 60 * 60 * 24))) {
                             $this->log($logfile, $eventData['id'], 'MODERATE', PLUGIN_EVENT_SPAMBLOCK_REASON_FORCEMODERATION, $addData);

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.32,1.33

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23997/include

Modified Files:
	functions_installer.inc.php 
Log Message:
fix proper returning


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -d -r1.32 -r1.33
--- functions_installer.inc.php	26 Jan 2005 14:14:02 -0000	1.32
+++ functions_installer.inc.php	31 Jan 2005 10:08:23 -0000	1.33
@@ -582,7 +582,7 @@
     }
 
     if (!($a = file(S9Y_INCLUDE_PATH . 'include/tpl/' . $template, 1))) {
-        $err[] = ERROR_TEMPLATE_FILE;
+        $errs[] = ERROR_TEMPLATE_FILE;
     }
 
     $content = str_replace(

[php-blog-cvs] serendipity/include/admin installer.inc.php,1.21,1.22

[Garvin H. <gar...@us...>]

Update of /cvsroot/php-blog/serendipity/include/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23997/include/admin

Modified Files:
	installer.inc.php 
Log Message:
fix proper returning


Index: installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/installer.inc.php,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- installer.inc.php	26 Jan 2005 14:14:04 -0000	1.21
+++ installer.inc.php	31 Jan 2005 10:08:25 -0000	1.22
@@ -442,7 +442,8 @@
     }
 
     echo sprintf(ATTEMPT_WRITE_FILE, '.htaccess') . '... ';
-    if ( serendipity_installFiles($basedir) === true ) {
+    $errors = serendipity_installFiles($basedir);
+    if ( $errors === true ) {
          echo ' <strong>' . DONE . '</strong><br />';
     } else {
         echo ' <strong>' . FAILED . '</strong><br />';

[php-blog-cvs] serendipity/plugins/serendipity_event_weblogping servicesdb_en.inc.php,NONE,1.1 servicesdb_ja.inc.php,NONE,1.1 serendipity_event_weblogping.php,1.15,1.16

[Tadashi J. <el...@us...>]

Update of /cvsroot/php-blog/serendipity/plugins/serendipity_event_weblogping
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16496

Modified Files:
	serendipity_event_weblogping.php 
Added Files:
	servicesdb_en.inc.php servicesdb_ja.inc.php 
Log Message:
o The switch of the transmission place for every language is supported.


Index: serendipity_event_weblogping.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_weblogping/serendipity_event_weblogping.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- serendipity_event_weblogping.php	8 Jan 2005 12:25:13 -0000	1.15
+++ serendipity_event_weblogping.php	30 Jan 2005 18:27:33 -0000	1.16
@@ -52,56 +52,14 @@
             'backend_draft' => true
         ));
 
-        $this->services = array(
-            array(
-              'name'       => 'Ping-o-Matic',
-              'host'       => 'rpc.pingomatic.com',
-              'path'       => '/',
-              'extended'   => true,
-              'supersedes' => array('blo.gs', 'blogrolling.com', 'technorati.com', 'weblogs.com', 'Yahoo!')
-            ),
-
-            array(
-              'name'     => 'blo.gs',
-              'host'     => 'ping.blo.gs',
-              'path'     => '/',
-              'extended' => true
-            ),
-
-            array(
-              'name' => 'blogrolling.com',
-              'host' => 'rpc.blogrolling.com',
-              'path' => '/pinger/'
-            ),
-
-            array(
-              'name' => 'technorati.com',
-              'host' => 'rpc.technorati.com',
-              'path' => '/rpc/ping'
-            ),
-
-            array(
-              'name' => 'weblogs.com',
-              'host' => 'rpc.weblogs.com',
-              'path' => '/RPC2'
-            ),
-
-            array(
-              'name' => 'blogg.de',
-              'host' => 'xmlrpc.blogg.de',
-              'path' => '/'
-            ),
+        $servicesdb = array();
+        $servicesdb_file = dirname(__FILE__) . '/servicesdb_' . $serendipity['lang'] . '.inc.php';
+        if (!file_exists($servicesdb_file)) {
+            $servicesdb_file = dirname(__FILE__) . '/servicesdb_en.inc.php';
+        }
+        include $servicesdb_file;
+        $this->services =& $servicesdb;
 
-            array(
-              'name' => 'Yahoo!',
-              'host' => 'api.my.yahoo.com',
-              'path' => '/RPC2'
-            ),
-            array(
-              'name' => 'Blogbot.dk',
-              'host' => 'blogbot.dk',
-              'path' => '/io/xml-rpc.php')
-        );
 
         $manual_services = explode(',', $this->get_config('manual_services'));
         if (is_array($manual_services)) {

--- NEW FILE: servicesdb_en.inc.php ---
<?php # $Id: servicesdb_en.inc.php,v 1.1 2005/01/30 18:27:33 elf2000 Exp $

##########################################################################
# serendipity - another blogger...                                       #
##########################################################################
#                                                                        #
# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
# http://www.jannis.to/programming/serendipity.html                      #
#                                                                        #
##########################################################################

        $servicesdb = array(
            array(
              'name'       => 'Ping-o-Matic',
              'host'       => 'rpc.pingomatic.com',
              'path'       => '/',
              'extended'   => true,
              'supersedes' => array('blo.gs', 'blogrolling.com', 'technorati.com', 'weblogs.com', 'Yahoo!')
            ),

            array(
              'name'     => 'blo.gs',
              'host'     => 'ping.blo.gs',
              'path'     => '/',
              'extended' => true
            ),

            array(
              'name' => 'blogrolling.com',
              'host' => 'rpc.blogrolling.com',
              'path' => '/pinger/'
            ),

            array(
              'name' => 'technorati.com',
              'host' => 'rpc.technorati.com',
              'path' => '/rpc/ping'
            ),

            array(
              'name' => 'weblogs.com',
              'host' => 'rpc.weblogs.com',
              'path' => '/RPC2'
            ),

            array(
              'name' => 'blogg.de',
              'host' => 'xmlrpc.blogg.de',
              'path' => '/'
            ),

            array(
              'name' => 'Yahoo!',
              'host' => 'api.my.yahoo.com',
              'path' => '/RPC2'
            ),
            array(
              'name' => 'Blogbot.dk',
              'host' => 'blogbot.dk',
              'path' => '/io/xml-rpc.php')
        );
?>

--- NEW FILE: servicesdb_ja.inc.php ---
<?php # $Id: servicesdb_ja.inc.php,v 1.1 2005/01/30 18:27:33 elf2000 Exp $

##########################################################################
# serendipity - another blogger...                                       #
##########################################################################
#                                                                        #
# (c) 2003 Jannis Hermanns <J...@ha...>                                 #
# http://www.jannis.to/programming/serendipity.html                      #
#                                                                        #
##########################################################################

        $servicesdb = array(
            array(
              'name'       => 'Myblog japan',
              'host'       => 'ping.myblog.jp',
              'path'       => '/',
              'extended' => true
            ),

            array(
              'name'        => 'BLOGGERS.JP',
              'host'        => 'ping.bloggers.jp',
              'path'        => '/rpc/',
              'extended' => true
            ),

            array(
              'name'        => 'blogpeople.net',
              'host'        => 'www.blogpeople.net',
              'path'        => '/weblogUpdates',
              'extended' => true
            ),

            array(
              'name'        => 'ココログ',
              'host'        => 'ping.cocolog-nifty.com',
              'path'        => '/xmlrpc',
              'extended' => true
            ),

            array(
              'name'        => 'goo',
              'host'        => 'blog.goo.ne.jp',
              'path'        => '/XMLRPC',
              'extended' => true
            ),

            array(
              'name'        => 'coreblog',
              'host'        => 'coreblog.org',
              'path'        => '/ping/',
              'extended' => true
            ),

            array(
              'name'        => 'bulkfeeds',
              'host'        => 'bulkfeeds.net',
              'path'        => '/rpc',
              'extended' => true
            ),

            array(
              'name'        => 'blogrolling',
              'host'        => 'rpc.blogrolling.com',
              'path'        => '/pinger/',
              'extended' => true
            ),

            array(
              'name'        => 'dontpushme.com',
              'host'        => 'www.dontpushme.com',
              'path'        => '/ft/XmlRpc/Daily.do',
              'extended' => true
            ),

            array(
              'name'        => 'Excite エキサイト ： ブログ（blog）',
              'host'        => 'ping.exblog.jp',
              'path'        => '/xmlrpc',
              'extended' => true
            ),

            array(
              'name'        => 'blogdb.jp',
              'host'        => 'blogdb.jp',
              'path'        => '/xmlrpc',
              'extended' => true
            ),

            array(
              'name'        => 'BLOGOOGLE(ブログール)　Pingサーバ',
              'host'        => 'www.blogoole.com',
              'path'        => '/ping/',
              'extended' => true
            )
        );
?>