php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/include functions_entries.inc.php,1.20,1.21

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

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

Modified Files:
	functions_entries.inc.php 
Log Message:
- Simplyfy and clean the index.php area regarding index.php and categories *A LOT*
- Show title of selected category in header


Index: functions_entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_entries.inc.php,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- functions_entries.inc.php	9 Dec 2004 10:39:24 -0000	1.20
+++ functions_entries.inc.php	10 Dec 2004 19:58:01 -0000	1.21
@@ -147,10 +147,9 @@
     }
 
     if (isset($serendipity['GET']['category'])) {
-        $_categoryid = explode('_', $serendipity['GET']['category']);
-        $categoryid  = serendipity_db_escape_string($_categoryid[0]);
+        $categoryid  = (int)$serendipity['GET']['category'];
 
-        if (is_numeric($categoryid)) {
+        if ($categoryid != 0) {
             if (!empty($cond['and'])) {
                 $cond['and'] .= " AND c.category_left BETWEEN " . implode(' AND ', serendipity_fetchCategoryRange($categoryid));
             } else {

[php-blog-cvs] serendipity index.php,1.62,1.63

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

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

Modified Files:
	index.php 
Log Message:
- Simplyfy and clean the index.php area regarding index.php and categories *A LOT*
- Show title of selected category in header


Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.62
retrieving revision 1.63
diff -u -d -r1.62 -r1.63
--- index.php	3 Dec 2004 10:07:37 -0000	1.62
+++ index.php	10 Dec 2004 19:58:00 -0000	1.63
@@ -188,36 +188,18 @@
 } else if (preg_match(PAT_PLUGIN, $uri, $matches)) {
     serendipity_plugin_api::hook_event('external_plugin', $matches[1]);
     exit;
-} else if (preg_match(PAT_CATEGORIES, $uri, $matches) ||
-           preg_match('@/(index(\.php|\.html)?)|'. preg_quote($serendipity['indexFile']) .'@', $uri) ||
-           preg_match('@^/' . preg_quote(trim($serendipity['serendipityHTTPPath'], '/')) . '/?(\?.*)?$@', $uri)) {
-
-    if (count($serendipity['GET']) == 2) {
-        if (isset($matches) && is_array($matches) && isset($matches[1])) {
-            $serendipity['GET']['category'] = $matches[1];
-        }
+} else if (preg_match(PAT_CATEGORIES, $uri, $matches)) {
+        $serendipity['GET']['category'] = $matches[1];
+        $serendipity['GET']['action'] = 'read';
+        $cInfo = serendipity_fetchCategoryInfo($serendipity['GET']['category']);
+        $serendipity['head_title']    = $cInfo['category_name'];
+        $serendipity['head_subtitle'] = $serendipity['blogTitle'];
 
-        ob_start();
         include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
-        $data = ob_get_contents();
-        ob_end_clean();
-        if (isset($serendipity['pregenerate']) && $serendipity['pregenerate']) {
-            $fp = fopen($serendipity['serendipityPath'] . 'index.html', 'w');
-            fwrite($fp, $data);
-            fclose($fp);
-        }
-        print $data;
-    } else {
-        if (isset($matches) && is_array($matches) && isset($matches[1])) {
-            $serendipity['GET']['category'] = $matches[1];
-        }
+} else if (preg_match('@/(index(\.php|\.html)?)|'. preg_quote($serendipity['indexFile']) .'@', $uri) ||
+           preg_match('@^/' . preg_quote(trim($serendipity['serendipityHTTPPath'], '/')) . '/?(\?.*)?$@', $uri)) {
 
-        if (isset($serendipity['GET']['calendarZoom'])) {
-            $serendipity['GET']['action'] = 'read';
-            $serendipity['GET']['range']  = $serendipity['GET']['calendarZoom'];
-        }
         include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');
-    }
 } else {
     header('HTTP/1.0 404 Not found');
     include_once(S9Y_INCLUDE_PATH . 'include/genpage.inc.php');

[php-blog-cvs] serendipity/include functions_images.inc.php,1.16,1.17

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

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

Modified Files:
	functions_images.inc.php 
Log Message:
- Support image/png transparency when resizing images


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- functions_images.inc.php	10 Dec 2004 18:25:13 -0000	1.16
+++ functions_images.inc.php	10 Dec 2004 18:53:55 -0000	1.17
@@ -733,6 +733,11 @@
     }
 
     $out = imagecreatetruecolor($newwidth, $newheight);
+
+    /* Attempt to copy transparency information, this really only works for PNG */
+    imagealphablending($out, false);
+    imagesavealpha($out, true);
+
     imagecopyresampled($out, $in, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
     $func['save']($out, $outfilename, 100);
     $out = null;

[php-blog-cvs] serendipity/include functions_images.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-serv5744

Modified Files:
	functions_images.inc.php 
Log Message:
- Use 100 image quality, because thumbnails matter


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- functions_images.inc.php	10 Dec 2004 17:38:56 -0000	1.15
+++ functions_images.inc.php	10 Dec 2004 18:25:13 -0000	1.16
@@ -271,7 +271,7 @@
     $admin = '';
     if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF && $file['authorid'] != '0' && $file['authorid'] != $serendipity['authorid']) {
         // A non-admin user may not delete private files from other users.
-        return;
+        return false;
     }
 
     $infile = $outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['extension'];
@@ -291,7 +291,7 @@
 
     serendipity_updateImageInDatabase(array('dimensions_width' => $fdim[0], 'dimensions_height' => $fdim[1]), $id);
 
-    return;
+    return true;
 }
 
 
@@ -734,7 +734,7 @@
 
     $out = imagecreatetruecolor($newwidth, $newheight);
     imagecopyresampled($out, $in, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
-    $func['save']($out, $outfilename);
+    $func['save']($out, $outfilename, 100);
     $out = null;
     $in  = null;
 

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

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

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

Modified Files:
	images.inc.php 
Log Message:
serendipity_rotateImg doesn't return anything, so don't echo it.

Instead, redirect back to the image manager when the rotation is completed - because that's sexy


Index: images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/images.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- images.inc.php	7 Dec 2004 10:57:11 -0000	1.5
+++ images.inc.php	10 Dec 2004 18:22:12 -0000	1.6
@@ -353,13 +353,23 @@
     break;
 
     case 'rotateLeft':
-        echo serendipity_rotateImg($serendipity['GET']['fid'], -90) . '<br />';
-        echo DONE . '<br />';
+        if ( serendipity_rotateImg($serendipity['GET']['fid'], -90) ) {
+?>
+        <script language="javascript" type="text/javascript">
+            location.href="<?php echo $_SERVER['HTTP_REFERER'] ?>";
+        </script>
+<?php
+        }
     break;
 
     case 'rotateRight':
-        echo serendipity_rotateImg($serendipity['GET']['fid'], 90) . '<br />';
-        echo DONE . '<br />';
+        if ( serendipity_rotateImg($serendipity['GET']['fid'], 90) ) {
+?>
+        <script language="javascript" type="text/javascript">
+            location.href="<?php echo $_SERVER['HTTP_REFERER'] ?>";
+        </script>
+<?php
+        }
     break;
 
     case 'scale':

[php-blog-cvs] serendipity serendipity_config.inc.php,1.116,1.117

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
use same comment style :)


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.116
retrieving revision 1.117
diff -u -d -r1.116 -r1.117
--- serendipity_config.inc.php	10 Dec 2004 17:02:54 -0000	1.116
+++ serendipity_config.inc.php	10 Dec 2004 17:55:49 -0000	1.117
@@ -24,11 +24,11 @@
 // Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
 $serendipity['production']      = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);
 
-# Set error reporting
+// Set error reporting
 error_reporting(E_ALL & ~E_NOTICE);
 
 if ($serendipity['production'] !== true) {
-    if ( $serendipity['production'] == 'debug' ) {
+    if ($serendipity['production'] === 'debug') {
         error_reporting(E_ALL);
     }
     @ini_set('display_errors', 'on');

[php-blog-cvs] serendipity/include functions_images.inc.php,1.14,1.15

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

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

Modified Files:
	functions_images.inc.php 
Log Message:
* refactor image rotating to not use duplicate code
* use 4-space indenting


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- functions_images.inc.php	10 Dec 2004 16:56:05 -0000	1.14
+++ functions_images.inc.php	10 Dec 2004 17:38:56 -0000	1.15
@@ -264,32 +264,34 @@
  * Rotate an Image
  **/
 function serendipity_rotateImg($id, $degrees) {
-  global $serendipity;
+    global $serendipity;
 
-  $file = serendipity_fetchImageFromDatabase($id);
+    $file = serendipity_fetchImageFromDatabase($id);
 
-  $admin = '';
-  if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF && $file['authorid'] != '0' && $file['authorid'] != $serendipity['authorid']) {
-    // A non-admin user may not delete private files from other users.
-    return;
-  }
+    $admin = '';
+    if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF && $file['authorid'] != '0' && $file['authorid'] != $serendipity['authorid']) {
+        // A non-admin user may not delete private files from other users.
+        return;
+    }
 
-  $infile = $outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['extension'];
-  $infileThumb = $outfileThumb = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.'. $file['extension'];
+    $infile = $outfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['extension'];
+    $infileThumb = $outfileThumb = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.'. $file['extension'];
 
-  if ($serendipity['magick'] !== true) {
-    serendipity_rotate_image_gd($infile, $outfile, $degrees);
-    serendipity_rotate_image_gd($infileThumb, $outfileThumb, $degrees);
-  } else {
-    $cmd = $serendipity['convert'] . ' -rotate ' . $degrees . ' ' . $infile . ' ' . $outfile;
-    $res = `$cmd`;
-    $cmdThumb = $serendipity['convert'] . ' -rotate ' . $degrees . ' ' . $infileThumb . ' ' . $outfileThumb;
-    $resThumb = `$cmdThumb`;
-  }
-  $fdim = @getimagesize($outfile);
+    if ($serendipity['magick'] !== true) {
+        serendipity_rotate_image_gd($infile, $outfile, $degrees);
+        serendipity_rotate_image_gd($infileThumb, $outfileThumb, $degrees);
+    } else {
+        $cmd = $serendipity['convert'] . ' -rotate ' . $degrees . ' ' . $infile . ' ' . $outfile;
+        $res = `$cmd`;
+        $cmdThumb = $serendipity['convert'] . ' -rotate ' . $degrees . ' ' . $infileThumb . ' ' . $outfileThumb;
+        $resThumb = `$cmdThumb`;
+    }
 
-  serendipity_updateImageInDatabase(array('dimensions_width' => $fdim[0], 'dimensions_height' => $fdim[1]), $id);
-  return;
+    $fdim = @getimagesize($outfile);
+
+    serendipity_updateImageInDatabase(array('dimensions_width' => $fdim[0], 'dimensions_height' => $fdim[1]), $id);
+
+    return;
 }
 
 
@@ -628,29 +630,29 @@
     return $i;
 }
 
-function serendipity_rotate_image_gd($infilename, $outfilename, $degrees)
-{
+function serendipity_functions_gd($infilename) {
     if (!function_exists('imagecopyresampled')) {
         return false;
     }
 
-    $inf = pathinfo(strtolower($infilename));
+    $func = array();
+    $inf  = pathinfo(strtolower($infilename));
     switch ($inf['extension']) {
     case 'gif':
-        $loadfn = 'imagecreatefromgif';
-        $savefn = 'imagegif';
+        $func['load'] = 'imagecreatefromgif';
+        $func['save'] = 'imagegif';
         break;
 
     case 'jpeg':
     case 'jpg':
     case 'jfif':
-        $loadfn = 'imagecreatefromjpeg';
-        $savefn = 'imagejpeg';
+        $func['load'] = 'imagecreatefromjpeg';
+        $func['save'] = 'imagejpeg';
         break;
 
     case 'png':
-        $loadfn = 'imagecreatefrompng';
-        $savefn = 'imagepng';
+        $func['load'] = 'imagecreatefrompng';
+        $func['save'] = 'imagepng';
         break;
 
     default:
@@ -658,23 +660,33 @@
     }
 
     /* If our loader does not exist, we are doomed */
-    if (!function_exists($loadfn)) {
+    if (!function_exists($func['load'])) {
         return false;
     }
 
     /* If the save function does not exist (i.e. read-only GIF), we want to output it as PNG */
-    if (!function_exists($savefn)) {
+    if (!function_exists($func['save'])) {
         if (function_exists('imagepng')) {
-            $savefn = 'imagepng';
+            $func['save'] = 'imagepng';
         } else {
             return false;
         }
     }
 
-    $in        = $loadfn($infilename);
+    return $func;
+}
+
+function serendipity_rotate_image_gd($infilename, $outfilename, $degrees)
+{
+    $func = serendipity_functions_gd($infilename);
+    if (!is_array($func)) {
+        return false;
+    }
+
+    $in        = $func['load']($infilename);
 
     $out       = imagerotate($in, $degrees, 0);
-    $savefn($out, $outfilename);
+    $func['save']($out, $outfilename);
 
     $newwidth  = imagesx($out);
     $newheight = imagesy($out);
@@ -688,48 +700,12 @@
 
 function serendipity_resize_image_gd($infilename, $outfilename, $newwidth, $newheight=null)
 {
-    if (!function_exists('imagecopyresampled')) {
-        return false;
-    }
-
-    $inf = pathinfo(strtolower($infilename));
-    switch ($inf['extension']) {
-        case 'gif':
-            $loadfn = 'imagecreatefromgif';
-            $savefn = 'imagegif';
-            break;
-
-        case 'jpeg':
-        case 'jpg':
-        case 'jfif':
-            $loadfn = 'imagecreatefromjpeg';
-            $savefn = 'imagejpeg';
-            break;
-
-        case 'png':
-            $loadfn = 'imagecreatefrompng';
-            $savefn = 'imagepng';
-            break;
-
-        default:
-            return false;
-    }
-
-    /* If our loader does not exist, we are doomed */
-    if (!function_exists($loadfn)) {
+    $func = serendipity_functions_gd($infilename);
+    if (!is_array($func)) {
         return false;
     }
 
-    /* If the save function does not exist (i.e. read-only GIF), we want to output it as PNG */
-    if (!function_exists($savefn)) {
-        if (function_exists('imagepng')) {
-            $savefn = 'imagepng';
-        } else {
-            return false;
-        }
-    }
-
-    $in = $loadfn($infilename);
+    $in = $func['load']($infilename);
     $width = imagesx($in);
     $height = imagesy($in);
 
@@ -758,7 +734,7 @@
 
     $out = imagecreatetruecolor($newwidth, $newheight);
     imagecopyresampled($out, $in, 0, 0, 0, 0, $newwidth, $newheight, $width, $height);
-    $savefn($out, $outfilename);
+    $func['save']($out, $outfilename);
     $out = null;
     $in  = null;
 
@@ -992,8 +968,8 @@
 
     // File is PDF -> Thumb is PNG
     if ($file['mime'] == 'application/pdf') {
-       $file['imgsrc']     .= '.png';
-       $file['displaymime'] = 'image/png';
+        $file['imgsrc']     .= '.png';
+        $file['displaymime'] = 'image/png';
     }
 
     return (0 === strpos(strtolower($file['displaymime']), 'image/'));

[php-blog-cvs] serendipity serendipity_config.inc.php,1.115,1.116

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
Don't show E_NOTICE, except when ['production'] is set to 'debug'


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.115
retrieving revision 1.116
diff -u -d -r1.115 -r1.116
--- serendipity_config.inc.php	10 Dec 2004 16:47:29 -0000	1.115
+++ serendipity_config.inc.php	10 Dec 2004 17:02:54 -0000	1.116
@@ -24,10 +24,13 @@
 // Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
 $serendipity['production']      = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);
 
-if ($serendipity['production'] == true) {
-    error_reporting(E_ALL & ~E_NOTICE);
-} else {
-    error_reporting(E_ALL);
+# Set error reporting
+error_reporting(E_ALL & ~E_NOTICE);
+
+if ($serendipity['production'] !== true) {
+    if ( $serendipity['production'] == 'debug' ) {
+        error_reporting(E_ALL);
+    }
     @ini_set('display_errors', 'on');
 }
 

[php-blog-cvs] serendipity serendipity_admin.php,1.54,1.55 serendipity_admin_image_selector.php,1.36,1.37

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

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

Modified Files:
	serendipity_admin.php serendipity_admin_image_selector.php 
Log Message:
- Add some images to the administration, more to come and some might change
- Redesign image manager
- Add a success message when setting a new template
- Use diffirent method to install templates, forget about using forms and javascript


Index: serendipity_admin.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin.php,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -d -r1.54 -r1.55
--- serendipity_admin.php	8 Dec 2004 20:27:52 -0000	1.54
+++ serendipity_admin.php	10 Dec 2004 16:56:00 -0000	1.55
@@ -128,7 +128,7 @@
                             <a href="serendipity_admin.php?serendipity[adminModule]=personal"><?php echo PERSONAL_SETTINGS; ?></a><br />
                         </div>
                     </div>
-                    
+
 		    <ul class="serendipitySideBarMenu">
 		      <lh><?php echo serendipity_mb('ucfirst', ENTRIES); ?></lh>
                       <li><a href="serendipity_admin.php?serendipity[adminModule]=entries&amp;serendipity[adminAction]=new"><?php echo NEW_ENTRY; ?></a></li>

Index: serendipity_admin_image_selector.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_image_selector.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- serendipity_admin_image_selector.php	6 Dec 2004 11:09:37 -0000	1.36
+++ serendipity_admin_image_selector.php	10 Dec 2004 16:56:05 -0000	1.37
@@ -188,7 +188,7 @@
     <?php
         serendipity_displayImageList(
           isset($serendipity['GET']['page'])   ? $serendipity['GET']['page']   : 1,
-          4,
+          3,
           false,
           '?serendipity[step]=1' . $add_url . '&amp;serendipity[textarea]='. $serendipity['GET']['textarea'],
           true

[php-blog-cvs] serendipity/include/admin entries.inc.php,1.9,1.10 plugins.inc.php,1.7,1.8 templates.inc.php,1.3,1.4 users.inc.php,1.7,1.8

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

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

Modified Files:
	entries.inc.php plugins.inc.php templates.inc.php 
	users.inc.php 
Log Message:
- Add some images to the administration, more to come and some might change
- Redesign image manager
- Add a success message when setting a new template
- Use diffirent method to install templates, forget about using forms and javascript


Index: templates.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/templates.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- templates.inc.php	27 Nov 2004 22:14:15 -0000	1.3
+++ templates.inc.php	10 Dec 2004 16:56:06 -0000	1.4
@@ -8,14 +8,13 @@
     return;
 }
 
-if ($serendipity['GET']['adminAction'] == 'save' ) {
-    serendipity_set_config_var('template', $serendipity['POST']['theme']);
+if ($serendipity['GET']['adminAction'] == 'install' ) {
+    serendipity_set_config_var('template', $serendipity['GET']['theme']);
+    echo '<div class="serendipityAdminMsgSuccess">'. sprintf(TEMPLATE_SET, $serendipity['GET']['theme']) .'</div>';
 }
 ?>
 
 <?php echo SELECT_TEMPLATE; ?>
-<div>
-    <form method="post" action="<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_admin.php?serendipity[adminModule]=templates&amp;serendipity[adminAction]=save">
 <?php
     $i = 0;
     foreach (serendipity_fetchTemplates() as $theme) {
@@ -35,22 +34,21 @@
 
         $class = (($i % 2) ? 'even' : 'uneven');
 
-        $jsLine  = " onmousedown=\"document.getElementById('serendipity_theme_radio_". $theme ."').checked = true;\"";
-#        $jsLine .= " onmouseout=\"document.getElementById('serendipity_theme_". $theme ."').className='';\"";
-        $jsLine .= " onmouseover=\"style.cursor = 'pointer';\"";
 ?>
 <div class="serendipity_admin_list_item serendipity_admin_list_item_<?php echo $class ?>">
     <table width="100%" id="serendipity_theme_<?php echo $theme; ?>">
         <tr>
-            <td colspan="2" <?php echo $jsLine ?>><strong><?php echo $info['name']; ?></strong></td>
-            <td valign="middle" align="center" width="70" <?php echo $jsLine ?> rowspan="2">
-                <div><input type="radio" name="serendipity[theme]" value="<?php echo $theme; ?>" id="serendipity_theme_radio_<?php echo $theme; ?>" <?php echo $is_active; ?> /></div>
+            <td colspan="2"><strong><?php echo $info['name']; ?></strong></td>
+            <td valign="middle" align="center" width="70" rowspan="2">
+<?php if ( $serendipity['template'] != $theme ) { ?>
+            <a href="?serendipity[adminModule]=templates&amp;serendipity[adminAction]=install&amp;serendipity[theme]=<?php echo $theme ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/install_now.png') ?>" alt="<?php echo SET_AS_TEMPLATE ?>" title="<?php echo SET_AS_TEMPLATE ?>" border="0" /></a>
+<?php } ?>
             </td>
         </tr>
 
         <tr>
-            <td width="100" <?php echo $jsLine ?> style="padding-left: 10px"><?php echo $preview; ?></td>
-            <td valign="top" <?php echo $jsLine ?>>
+            <td width="100" style="padding-left: 10px"><?php echo $preview; ?></td>
+            <td valign="top">
                 <?php echo AUTHOR; ?>      : <?php echo $info['author'];?><br />
                 <?php echo LAST_UPDATED; ?>: <?php echo $info['date'];  ?>
             </td>
@@ -60,9 +58,6 @@
 <?php
     }
 ?>
-        <div align="right"><input type="submit" name="submit" value="<?php echo SET_AS_TEMPLATE; ?>" /></div>
-    </form>
-</div>
 <?php
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

Index: users.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/users.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- users.inc.php	8 Dec 2004 21:04:34 -0000	1.7
+++ users.inc.php	10 Dec 2004 16:56:06 -0000	1.8
@@ -92,11 +92,19 @@
 $i = 0;
 foreach($users as $user) {
     if ($user['userlevel'] < $serendipity['serendipityUserlevel'] || $user['authorid'] == $serendipity['authorid'] || $serendipity['serendipityUserlevel'] >= USERLEVEL_ADMIN ) {
+
+    if ( $user['userlevel'] >= USERLEVEL_ADMIN ) {
+        $img = serendipity_getTemplateFile('admin/img/user_admin.png');
+    } elseif ( $user['userlevel'] >= USERLEVEL_CHIEF ) {
+        $img = serendipity_getTemplateFile('admin/img/user_chief.png');
+    } else {
+        $img = serendipity_getTemplateFile('admin/img/user_editor.png');
+    }
 ?>
 <div class="serendipity_admin_list_item serendipity_admin_list_item_<?php echo ($i++ % 2) ? 'even' : 'uneven' ?>">
 <table width="100%">
     <tr>
-        <td><?php echo htmlspecialchars($user['username']); ?></td>
+        <td><img src="<?php echo $img ?>" alt="" style="border: 0px none ; vertical-align: bottom; display: inline;" /> <?php echo htmlspecialchars($user['username']); ?></td>
         <td width="100" align="center"><?php echo $user['userlevel']; ?></td>
         <td width="200" align="right"> [<a href="?serendipity[adminModule]=users&amp;serendipity[adminAction]=edit&amp;serendipity[userid]=<?php echo $user['authorid'] ?>"><?php echo EDIT ?></a>]
                                      - [<a href="?serendipity[adminModule]=users&amp;serendipity[adminAction]=delete&amp;serendipity[userid]=<?php echo $user['authorid'] ?>"><?php echo DELETE ?></a>]</td>

Index: entries.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/entries.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- entries.inc.php	6 Dec 2004 11:14:20 -0000	1.9
+++ entries.inc.php	10 Dec 2004 16:56:05 -0000	1.10
@@ -183,7 +183,7 @@
             $rows++;
             // Find out if the entry has been modified later than 30 minutes after creation
             if ($entry['timestamp'] <= ($entry['last_modified'] - 60*30)) {
-                $lm = '<a href="#" title="' . LAST_UPDATED . ': ' . serendipity_formatTime(DATE_FORMAT_SHORT, $entry['last_modified']) . '" onclick="alert(this.title)">*</a>';
+                $lm = '<a href="#" title="' . LAST_UPDATED . ': ' . serendipity_formatTime(DATE_FORMAT_SHORT, $entry['last_modified']) . '" onclick="alert(this.title)"><img src="'. serendipity_getTemplateFile('admin/img/clock.png') .'" alt="*" style="border: 0px none ; vertical-align: bottom;" /></a>';
             } else {
                 $lm = '';
             }

Index: plugins.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/plugins.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- plugins.inc.php	9 Dec 2004 13:36:17 -0000	1.7
+++ plugins.inc.php	10 Dec 2004 16:56:06 -0000	1.8
@@ -91,13 +91,13 @@
             if ($sort_idx == 0) {
                 $moveup   = '&nbsp;';
             } else {
-                $moveup   = '<a href="?serendipity[adminModule]=plugins&amp;submit=move+up&amp;serendipity[plugin_to_move]=' . $key . $event_only_uri . '" style="border: 0"><img src="' . serendipity_getTemplateFile('img/up.png') .'" border="0" alt="' . UP . '" /></a>';
+                $moveup   = '<a href="?serendipity[adminModule]=plugins&amp;submit=move+up&amp;serendipity[plugin_to_move]=' . $key . $event_only_uri . '" style="border: 0"><img src="' . serendipity_getTemplateFile('admin/img/uparrow.png') .'" border="0" alt="' . UP . '" /></a>';
             }
 
             if ($sort_idx == (count($plugins)-1)) {
                 $movedown = '&nbsp;';
             } else {
-                $movedown = ($moveup != '' ? '&nbsp;' : '') . '<a href="?serendipity[adminModule]=plugins&amp;submit=move+down&serendipity[plugin_to_move]=' . $key . $event_only_uri . '" style="border: 0"><img src="' . serendipity_getTemplateFile('img/down.png') . '" alt="'. DOWN .'" border="0" /></a>';
+                $movedown = ($moveup != '' ? '&nbsp;' : '') . '<a href="?serendipity[adminModule]=plugins&amp;submit=move+down&serendipity[plugin_to_move]=' . $key . $event_only_uri . '" style="border: 0"><img src="' . serendipity_getTemplateFile('admin/img/downarrow.png') . '" alt="'. DOWN .'" border="0" /></a>';
             }
 ?>
             <tr>
@@ -545,7 +545,7 @@
                     <td><strong><?php echo $plug['name'] ?></strong></td>
                     <td width="100" align="center" valign="middle" rowspan="3">
                         <?php if ( $plug['installable'] == true ) { ?>
-                            <a href="?serendipity[adminModule]=plugins&amp;serendipity[pluginPath]=<?php echo $plug['pluginPath']; ?>&amp;serendipity[install_plugin]=<?php echo $plug['plugin_class'] ?>"><?php echo INSTALL ?></a>
+                            <a href="?serendipity[adminModule]=plugins&amp;serendipity[pluginPath]=<?php echo $plug['pluginPath']; ?>&amp;serendipity[install_plugin]=<?php echo $plug['plugin_class'] ?>"><img src="<?php echo serendipity_getTemplateFile('admin/img/install_now.png') ?>" title="<?php echo INSTALL ?>" alt="<?php echo INSTALL ?>" border="0"></a>
                         <?php } else { ?>
                             <span style="color: #cccccc"><?php echo ALREADY_INSTALLED ?></span>
                         <?php } ?>
@@ -614,19 +614,24 @@
             }
         }
     }
+?>
+    <?php echo BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS ?>
+    <br />
+    <br />
 
-    echo BELOW_IS_A_LIST_OF_INSTALLED_PLUGINS . '<br /><br />';
+    <h3><?php echo SIDEBAR_PLUGINS ?></h3>
+    <a href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew"><img src="<?php echo serendipity_getTemplateFile('admin/img/install.png') ?>" style="border: 0px none ; vertical-align: middle; display: inline;" alt=""> <?php echo sprintf(CLICK_HERE_TO_INSTALL_PLUGIN, SIDEBAR_PLUGIN) ?></a>
 
-    echo '<h3>' . SIDEBAR_PLUGINS . '</h3>';
-    echo '<a href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew">'. sprintf(CLICK_HERE_TO_INSTALL_PLUGIN, SIDEBAR_PLUGIN) .'</a>';
+    <?php show_plugins(false); ?>
 
-    show_plugins(false);
+    <br />
+    <br />
 
-    echo '<br /><br />';
+    <h3><?php echo EVENT_PLUGINS ?></h3>
+    <a href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew&amp;serendipity[type]=event"><img src="<?php echo serendipity_getTemplateFile('admin/img/install.png') ?>" style="border: 0px none ; vertical-align: middle; display: inline;" alt=""> <?php echo sprintf(CLICK_HERE_TO_INSTALL_PLUGIN, EVENT_PLUGIN) ?></a>
+    <?php show_plugins(true); ?>
 
-    echo '<h3>' . EVENT_PLUGINS . '</h3>';
-    echo '<a href="?serendipity[adminModule]=plugins&amp;serendipity[adminAction]=addnew&amp;serendipity[type]=event">'. sprintf(CLICK_HERE_TO_INSTALL_PLUGIN, EVENT_PLUGIN) .'</a>';
-    show_plugins(true);
+<?php
 }
 /* vim: set sts=4 ts=4 expandtab : */
 ?>

[php-blog-cvs] serendipity/include functions_images.inc.php,1.13,1.14

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

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

Modified Files:
	functions_images.inc.php 
Log Message:
- Add some images to the administration, more to come and some might change
- Redesign image manager
- Add a success message when setting a new template
- Use diffirent method to install templates, forget about using forms and javascript


Index: functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_images.inc.php,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -d -r1.13 -r1.14
--- functions_images.inc.php	9 Dec 2004 18:32:18 -0000	1.13
+++ functions_images.inc.php	10 Dec 2004 16:56:05 -0000	1.14
@@ -901,7 +901,7 @@
         $x = 0;
         foreach ($serendipity['imageList'] as $k => $file) {
             ++$x; $preview = '';
-            $i      = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension']);
+            $i = @getimagesize($serendipity['serendipityPath'] . $serendipity['uploadPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension']);
             $file['imgsrc'] = $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.' . $file['thumbnail_name'] . '.' . $file['extension'];
             $is_image = serendipity_isImage($file);
 
@@ -911,48 +911,55 @@
             }
 
             if (!file_exists($file['imgsrc'])) {
-                $preview .= '<div class="serendipity_admin_mimetype" style="width: ' . $serendipity['thumbSize'] . 'px; height: ' . $serendipity['thumbSize'] . 'px; border: 1px solid; text-align: center;"><br /><br /><br />' . $file['mime'];
+                $preview .= '<img src="'. serendipity_getTemplateFile('admin/img/mime_unknown.png') .'" alt="'. $file['mime'] .'" /><br /><span style="font-weight: bold; font-size: 8pt">- ' . $file['mime'] .' -</span>';
                 if ($url) { $preview .= '<br /><a href="' . $url . '&amp;serendipity[image]=' . $file['id'] . '">' . $file['name'] . '.' . $file['extension'] . '</a>'; }
                 $preview .= '</div>';
             }
 ?>
-                <td nowrap="nowrap" align="center" valign="bottom" <?php echo ($manage) ? 'style="border-bottom: 1px solid #000000"' : '' ?>>
-<?php
-            echo $preview;
-            if ($manage) {
-?>
-<div align="center"><?php echo $file['name'] . '.' . $file['extension']; ?> <sub>(<?php echo ($file['authorid'] == '0' ? ALL_AUTHORS : $file['authorname']); ?>)</sub></div>
-<table border="0" width="300">
-    <tr>
-        <td valign="middle" style="font-size: x-small">
+                <td nowrap="nowrap" align="center" valign="<?php echo $manage ? 'top' : 'middle' ?>" width="<?php echo round(1/$lineBreak*100) ?>%" class="serendipity_admin_list_item serendipity_admin_list_item_<?php echo (($i % 2) ? 'even' : 'uneven') ?>">
 <?php
-                if ($is_image) {
-                    echo ORIGINAL_SHORT . ': ' . $file['dimensions_width'] . 'x' . $file['dimensions_height'] . '<br />';
-                    echo THUMBNAIL_SHORT . ': ' . $i[0] . 'x' . $i[1];
-                } else {
-                    echo SORT_ORDER_SIZE . ': ' . number_format(round($file['size']/1024, 2), NUMBER_FORMAT_DECIMALS, NUMBER_FORMAT_DECPOINT, NUMBER_FORMAT_THOUSANDS) . 'kb';
-                }
-?>
-        </td>
+if ( !$manage ) {
+    echo $preview;
+} else { ?>
+                    <table width="100%" border="0" cellspacing="0" cellpadding="3">
+                        <tr>
+                            <td valign="top" width="16" rowspan="3">
 <?php
                 if ($serendipity['authorid'] == $file['authorid'] || $file['authorid'] == '0' || $serendipity['serendipityUserlevel'] >= USERLEVEL_CHIEF) {
                     $popupWidth = ($is_image ? ($file['dimensions_width'] + 20) : 600);
                     $popupHeight = ($is_image ? ($file['dimensions_height'] + 20) : 500);
 ?>
-        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_FULLSIZE; ?>" alt="<?php echo MEDIA_FULLSIZE; ?>" src="<?php echo serendipity_getTemplateFile('img/zoom.png') ?>"   border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo $popupHeight; ?>,width=<?php echo $popupWidth; ?>,top='+ (screen.height-<?php echo $popupHeight ?>)/2 +',left='+ (screen.width-<?php echo $popupWidth ?>)/2 +',toolbar=no,menubar=no,location=no,resize=1,resizable=1<?php echo ($is_image ? '' : ',scrollbars=yes'); ?>');" /></td>
-        <td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo MEDIA_RENAME; ?>"   alt="<?php echo MEDIA_RENAME; ?>"   src="<?php echo serendipity_getTemplateFile('img/rename.png') ?>" border="0" onclick="rename('<?php echo $file['id']; ?>', '<?php echo addslashes($file['name']); ?>')" /></td>
-        <?php if ($is_image) { ?><td valign="middle" align="center"><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>"   alt="<?php echo IMAGE_RESIZE; ?>"   src="<?php echo serendipity_getTemplateFile('img/scale.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&amp;serendipity[adminAction]=scaleSelect&amp;serendipity[fid]=<?php echo $file['id']; ?>';" /></td><?php } ?>
-        <?php if ($is_image) { ?><td valign="middle" align="center"><a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=rotateLeft&amp;serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo IMAGE_ROTATE_LEFT; ?>" alt="<?php echo IMAGE_ROTATE_LEFT; ?>" src="<?php echo serendipity_getTemplateFile('img/rotate_left.png') ?>" border="0" /></td><?php } ?>
-        <?php if ($is_image) { ?><td valign="middle" align="center"><a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=rotateRight&amp;serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo IMAGE_ROTATE_RIGHT; ?>" alt="<?php echo IMAGE_ROTATE_RIGHT; ?>" src="<?php echo serendipity_getTemplateFile('img/rotate_right.png') ?>" border="0" /></td><?php } ?>
-        <td valign="middle" align="center"><a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=delete&amp;serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>"   alt="<?php echo MEDIA_DELETE; ?>"   src="<?php echo serendipity_getTemplateFile('img/delete.png') ?>" border="0" /></</td>
+                            <img class="serendipityImageButton" title="<?php echo MEDIA_FULLSIZE; ?>" alt="<?php echo MEDIA_FULLSIZE; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/zoom.png') ?>"   border="0" onclick="F1 = window.open('<?php echo $serendipity['serendipityHTTPPath'] . $serendipity['uploadHTTPPath'] . $file['path'] . $file['name'] . '.'. $file['extension']; ?>','Zoom','height=<?php echo $popupHeight; ?>,width=<?php echo $popupWidth; ?>,top='+ (screen.height-<?php echo $popupHeight ?>)/2 +',left='+ (screen.width-<?php echo $popupWidth ?>)/2 +',toolbar=no,menubar=no,location=no,resize=1,resizable=1<?php echo ($is_image ? '' : ',scrollbars=yes'); ?>');" /><br />
+                            <img class="serendipityImageButton" title="<?php echo MEDIA_RENAME; ?>" alt="<?php echo MEDIA_RENAME; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/rename.png') ?>" border="0" onclick="rename('<?php echo $file['id']; ?>', '<?php echo addslashes($file['name']); ?>')" /><br />
+                            <?php if ($is_image) { ?><img class="serendipityImageButton" title="<?php echo IMAGE_RESIZE; ?>"   alt="<?php echo IMAGE_RESIZE; ?>"   src="<?php echo serendipity_getTemplateFile('admin/img/resize.png') ?>" border="0" onclick="location.href='?serendipity[adminModule]=images&amp;serendipity[adminAction]=scaleSelect&amp;serendipity[fid]=<?php echo $file['id']; ?>';" /><br /><?php } ?>
+                            <?php if ($is_image) { ?><a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=rotateLeft&amp;serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo IMAGE_ROTATE_LEFT; ?>" alt="<?php echo IMAGE_ROTATE_LEFT; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/rotate_ccw.png') ?>" border="0" /><br /><?php } ?>
+                            <?php if ($is_image) { ?><a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=rotateRight&amp;serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo IMAGE_ROTATE_RIGHT; ?>" alt="<?php echo IMAGE_ROTATE_RIGHT; ?>" src="<?php echo serendipity_getTemplateFile('admin/img/rotate_cw.png') ?>" border="0" /><br /><?php } ?>
+                            <a href="?serendipity[adminModule]=images&amp;serendipity[adminAction]=delete&amp;serendipity[fid]=<?php echo $file['id']; ?>"><img class="serendipityImageButton" title="<?php echo MEDIA_DELETE; ?>"   alt="<?php echo MEDIA_DELETE; ?>"   src="<?php echo serendipity_getTemplateFile('admin/img/delete.png') ?>" border="0" /><br />
 <?php
                 }
 ?>
-    </tr>
-</table>
+                            </td>
+                            <td height="10" align="left" style="font-weight: bold; font-size: 8pt"><?php echo $file['name'] . '.' . $file['extension']; ?></td>
+                            <td height="10" align="right" style="font-size: 8pt"><?php echo ($file['authorid'] == '0' ? ALL_AUTHORS : $file['authorname']); ?></td>
+                        </tr>
+                        <tr>
+                            <td align="center" colspan="2"><?php echo $preview ?></td>
+                        </tr>
+                        <tr>
+                            <td colspan="2" height="10" align="center" style="font-size: 8pt">
+<?php
+                if ($is_image) {
+                    echo ORIGINAL_SHORT . ': ' . $file['dimensions_width'] . 'x' . $file['dimensions_height'] .', ';
+                    echo THUMBNAIL_SHORT . ': ' . $i[0] . 'x' . $i[1];
+                } else {
+                    echo SORT_ORDER_SIZE . ': ' . number_format(round($file['size']/1024, 2), NUMBER_FORMAT_DECIMALS, NUMBER_FORMAT_DECPOINT, NUMBER_FORMAT_THOUSANDS) . 'kb';
+                }
+?>
+                            </td>
+                        </tr>
+                    </table>
 <?php } ?>
-                </td>
-
+        </td>
 <?php
         // Newline?
         if ($x % $lineBreak == 0) {

[php-blog-cvs] serendipity/lang serendipity_lang_bg.inc.php,1.34,1.35 serendipity_lang_cn.inc.php,1.1,1.2 serendipity_lang_cs.inc.php,1.80,1.81 serendipity_lang_cz.inc.php,1.80,1.81 serendipity_lang_da.inc.php,1.100,1.101 serendipity_lang_de.inc.php,1.121,1.122 serendipity_lang_en.inc.php,1.100,1.101 serendipity_lang_es.inc.php,1.96,1.97 serendipity_lang_fr.inc.php,1.79,1.80 serendipity_lang_it.inc.php,1.20,1.21 serendipity_lang_nl.inc.php,1.56,1.57 serendipity_lang_no.inc.php,1.21,1.22 serendipity_lang_pt.inc.php,1.56,1.57 serendipity_lang_tn.inc.php,1.1,1.2 serendipity_lang_tw.inc.php,1.16,1.17 serendipity_lang_zh.inc.php,1.1,1.2

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

Update of /cvsroot/php-blog/serendipity/lang
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17912/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_fr.inc.php serendipity_lang_it.inc.php 
	serendipity_lang_nl.inc.php serendipity_lang_no.inc.php 
	serendipity_lang_pt.inc.php serendipity_lang_tn.inc.php 
	serendipity_lang_tw.inc.php serendipity_lang_zh.inc.php 
Log Message:
- Add some images to the administration, more to come and some might change
- Redesign image manager
- Add a success message when setting a new template
- Use diffirent method to install templates, forget about using forms and javascript


Index: serendipity_lang_cs.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_cs.inc.php,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- serendipity_lang_cs.inc.php	9 Dec 2004 13:31:16 -0000	1.80
+++ serendipity_lang_cs.inc.php	10 Dec 2004 16:56:07 -0000	1.81
@@ -653,6 +653,7 @@
 @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate
 @define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
 @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
+@define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // 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.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- serendipity_lang_no.inc.php	9 Dec 2004 13:31:17 -0000	1.21
+++ serendipity_lang_no.inc.php	10 Dec 2004 16:56:11 -0000	1.22
@@ -648,5 +648,6 @@
 @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate
 @define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
 @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
+@define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate
 
-?>
+?>
\ 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.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- serendipity_lang_nl.inc.php	9 Dec 2004 13:31:17 -0000	1.56
+++ serendipity_lang_nl.inc.php	10 Dec 2004 16:56:11 -0000	1.57
@@ -658,6 +658,7 @@
 @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate
 @define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
 @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
+@define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // 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.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- serendipity_lang_en.inc.php	8 Dec 2004 20:27:54 -0000	1.100
+++ serendipity_lang_en.inc.php	10 Dec 2004 16:56:10 -0000	1.101
@@ -650,7 +650,7 @@
 @define('ERROR_DETECTED_IN_INSTALL', 'An error was detected in the installation'); // Translate
 @define('OPERATING_SYSTEM', 'Operating system'); // Translate
 @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate
-
+@define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate
 
 
 /* vim: set sts=4 ts=4 expandtab : */

Index: serendipity_lang_tw.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_tw.inc.php,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -d -r1.16 -r1.17
--- serendipity_lang_tw.inc.php	9 Dec 2004 13:31:18 -0000	1.16
+++ serendipity_lang_tw.inc.php	10 Dec 2004 16:56:12 -0000	1.17
@@ -651,6 +651,7 @@
 @define('ERROR_DETECTED_IN_INSTALL', 'An error was detected in the installation'); // Translate
 @define('OPERATING_SYSTEM', 'Operating system'); // Translate
 @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate
+@define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // 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.34
retrieving revision 1.35
diff -u -d -r1.34 -r1.35
--- serendipity_lang_bg.inc.php	9 Dec 2004 13:31:15 -0000	1.34
+++ serendipity_lang_bg.inc.php	10 Dec 2004 16:56:06 -0000	1.35
@@ -635,6 +635,7 @@
 @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate
 @define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
 @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
+@define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // 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.56
retrieving revision 1.57
diff -u -d -r1.56 -r1.57
--- serendipity_lang_pt.inc.php	9 Dec 2004 13:31:17 -0000	1.56
+++ serendipity_lang_pt.inc.php	10 Dec 2004 16:56:12 -0000	1.57
@@ -654,6 +654,7 @@
 @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate
 @define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
 @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
+@define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // 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.20
retrieving revision 1.21
diff -u -d -r1.20 -r1.21
--- serendipity_lang_it.inc.php	9 Dec 2004 13:31:17 -0000	1.20
+++ serendipity_lang_it.inc.php	10 Dec 2004 16:56:11 -0000	1.21
@@ -653,6 +653,7 @@
 @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate
 @define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
 @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
+@define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // 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.100
retrieving revision 1.101
diff -u -d -r1.100 -r1.101
--- serendipity_lang_da.inc.php	9 Dec 2004 13:31:16 -0000	1.100
+++ serendipity_lang_da.inc.php	10 Dec 2004 16:56:09 -0000	1.101
@@ -648,6 +648,7 @@
 @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate
 @define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
 @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
+@define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // 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.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- serendipity_lang_fr.inc.php	9 Dec 2004 13:31:17 -0000	1.79
+++ serendipity_lang_fr.inc.php	10 Dec 2004 16:56:11 -0000	1.80
@@ -656,6 +656,7 @@
 @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate
 @define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
 @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
+@define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // 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.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- serendipity_lang_cz.inc.php	9 Dec 2004 13:31:16 -0000	1.80
+++ serendipity_lang_cz.inc.php	10 Dec 2004 16:56:08 -0000	1.81
@@ -651,6 +651,7 @@
 @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate
 @define('IMAGE_ROTATE_LEFT', 'Rotate image 90 degrees counter-clockwise'); // Translate
 @define('IMAGE_ROTATE_RIGHT', 'Rotate image 90 degrees clockwise'); // Translate
+@define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // 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.96
retrieving revision 1.97
diff -u -d -r1.96 -r1.97
--- serendipity_lang_es.inc.php	9 Dec 2004 13:31:16 -0000	1.96
+++ serendipity_lang_es.inc.php	10 Dec 2004 16:56:11 -0000	1.97
@@ -657,6 +657,7 @@
 @define('ERROR_DETECTED_IN_INSTALL', 'An error was detected in the installation'); // Translate
 @define('OPERATING_SYSTEM', 'Operating system'); // Translate
 @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate
+@define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // 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.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_lang_cn.inc.php	9 Dec 2004 13:31:16 -0000	1.1
+++ serendipity_lang_cn.inc.php	10 Dec 2004 16:56:07 -0000	1.2
@@ -651,6 +651,7 @@
 @define('ERROR_DETECTED_IN_INSTALL', 'An error was detected in the installation'); // Translate
 @define('OPERATING_SYSTEM', 'Operating system'); // Translate
 @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate
+@define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // 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.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_lang_tn.inc.php	9 Dec 2004 13:31:17 -0000	1.1
+++ serendipity_lang_tn.inc.php	10 Dec 2004 16:56:12 -0000	1.2
@@ -651,6 +651,7 @@
 @define('ERROR_DETECTED_IN_INSTALL', 'An error was detected in the installation'); // Translate
 @define('OPERATING_SYSTEM', 'Operating system'); // Translate
 @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate
+@define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // 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.121
retrieving revision 1.122
diff -u -d -r1.121 -r1.122
--- serendipity_lang_de.inc.php	9 Dec 2004 13:31:16 -0000	1.121
+++ serendipity_lang_de.inc.php	10 Dec 2004 16:56:09 -0000	1.122
@@ -650,6 +650,7 @@
 @define('ERROR_DETECTED_IN_INSTALL', 'Bei der Installation trat ein Fehler auf');
 @define('OPERATING_SYSTEM', 'Betriebssystem');
 @define('WEBSERVER_SAPI', 'Webserver SAPI');
+@define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ 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.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- serendipity_lang_zh.inc.php	9 Dec 2004 13:31:18 -0000	1.1
+++ serendipity_lang_zh.inc.php	10 Dec 2004 16:56:12 -0000	1.2
@@ -651,6 +651,7 @@
 @define('ERROR_DETECTED_IN_INSTALL', 'An error was detected in the installation'); // Translate
 @define('OPERATING_SYSTEM', 'Operating system'); // Translate
 @define('WEBSERVER_SAPI', 'Webserver SAPI'); // Translate
+@define('TEMPLATE_SET', '\'%s\' has been set as your active template'); // Translate
 
 /* vim: set sts=4 ts=4 expandtab : */
-?>
+?>
\ No newline at end of file

[php-blog-cvs] serendipity/templates/default/admin/img clock.png,NONE,1.1 delete.png,NONE,1.1 downarrow.png,NONE,1.1 install.png,NONE,1.1 install_now.png,NONE,1.1 install_template.png,NONE,1.1 menuitem.png,NONE,1.1 mime_unknown.png,NONE,1.1 rename.png,NONE,1.1 resize.png,NONE,1.1 rotate.png,NONE,1.1 rotate_ccw.png,NONE,1.1 rotate_cw.png,NONE,1.1 uparrow.png,NONE,1.1 user_admin.png,NONE,1.1 user_chief.png,NONE,1.1 user_editor.png,NONE,1.1 zoom.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-serv17912/templates/default/admin/img

Added Files:
	clock.png delete.png downarrow.png install.png install_now.png 
	install_template.png menuitem.png mime_unknown.png rename.png 
	resize.png rotate.png rotate_ccw.png rotate_cw.png uparrow.png 
	user_admin.png user_chief.png user_editor.png zoom.png 
Log Message:
- Add some images to the administration, more to come and some might change
- Redesign image manager
- Add a success message when setting a new template
- Use diffirent method to install templates, forget about using forms and javascript


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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

[php-blog-cvs] serendipity/templates/default/admin style.css,1.8,1.9

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

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

Modified Files:
	style.css 
Log Message:
- Add some images to the administration, more to come and some might change
- Redesign image manager
- Add a success message when setting a new template
- Use diffirent method to install templates, forget about using forms and javascript


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/default/admin/style.css,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- style.css	9 Dec 2004 20:16:57 -0000	1.8
+++ style.css	10 Dec 2004 16:56:13 -0000	1.9
@@ -160,6 +160,8 @@
     font-size: small;
     padding-left: 0.3em;
     padding-right: 0.3em;
+    padding-top: 0.1em;
+    padding-bottom: 0.1em;
     text-decoration: none;
 }
 

[php-blog-cvs] serendipity serendipity_config.inc.php,1.114,1.115

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
* Force 'display_errors' to true if production variable is set to FALSE
* Set production variable to FALSE in all alpha|beta|cvs versions for easier debugging from people of the forums
* Fix mbstring functions, mb_strtoupper is only available since PHP 4.3.0. :(
* Only set smarty debugging vars if production variable is set to 'debug' manually.



Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.114
retrieving revision 1.115
diff -u -d -r1.114 -r1.115
--- serendipity_config.inc.php	10 Dec 2004 10:59:05 -0000	1.114
+++ serendipity_config.inc.php	10 Dec 2004 16:47:29 -0000	1.115
@@ -15,18 +15,28 @@
 
 include_once(S9Y_INCLUDE_PATH . 'include/compat.inc.php');
 
+// The version string
 $serendipity['version']         = '0.8-alpha7';
-$serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme
-$serendipity['production']      = true; // Setting this to 'false' will enable debugging output
-$serendipity['rewrite']         = 'none';
-$serendipity['messagestack']    = array();
 
-if ($serendipity['production'] == 1) {
+// Name of folder for the default theme
+$serendipity['defaultTemplate'] = 'default';
+
+// Setting this to 'false' will enable debugging output. All alpa/beta/cvs snapshot versions will emit debug information by default. To increase the debug level (to enable Smarty debugging), set this flag to 'debug'.
+$serendipity['production']      = (preg_match('@\-(alpha|beta|cvs)@', $serendipity['version']) ? false : true);
+
+if ($serendipity['production'] == true) {
     error_reporting(E_ALL & ~E_NOTICE);
 } else {
     error_reporting(E_ALL);
+    @ini_set('display_errors', 'on');
 }
 
+// Default rewrite method
+$serendipity['rewrite']         = 'none';
+
+// Message container
+$serendipity['messagestack']    = array();
+
 // Can the user change the date of publishing for an entry?
 $serendipity['allowDateManipulation'] = true;
 
@@ -215,7 +225,7 @@
  *  Check if the installed version is higher than the version of the config
  */
 
-if (IS_up2date === false && $serendipity['production'] && !defined('IN_upgrader')) {
+if (IS_up2date === false && !defined('IN_upgrader')) {
     die(sprintf(SERENDIPITY_NEEDS_UPGRADE, $serendipity['versionInstalled'], $serendipity['version'], $serendipity['serendipityHTTPPath'] . 'serendipity_admin.php'));
 }
 

[php-blog-cvs] serendipity/include functions_smarty.inc.php,1.9,1.10 lang.inc.php,1.5,1.6

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

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

Modified Files:
	functions_smarty.inc.php lang.inc.php 
Log Message:
* Force 'display_errors' to true if production variable is set to FALSE
* Set production variable to FALSE in all alpha|beta|cvs versions for easier debugging from people of the forums
* Fix mbstring functions, mb_strtoupper is only available since PHP 4.3.0. :(
* Only set smarty debugging vars if production variable is set to 'debug' manually.



Index: functions_smarty.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_smarty.inc.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- functions_smarty.inc.php	1 Dec 2004 11:00:55 -0000	1.9
+++ functions_smarty.inc.php	10 Dec 2004 16:47:29 -0000	1.10
@@ -111,7 +111,7 @@
         @define('SMARTY_DIR', S9Y_INCLUDE_PATH . 'bundled-libs/Smarty/libs/');
         require_once SMARTY_DIR . 'Smarty.class.php';
         $serendipity['smarty'] = new Smarty;
-        if (!$serendipity['production']) {
+        if ($serendipity['production'] === 'debug') {
             $serendipity['smarty']->force_compile   = true;
             $serendipity['smarty']->debugging       = true;
         }

Index: lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/lang.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- lang.inc.php	2 Dec 2004 20:57:44 -0000	1.5
+++ lang.inc.php	10 Dec 2004 16:47:29 -0000	1.6
@@ -37,8 +37,12 @@
         static $mbstring = null;
 
         if (is_null($mbstring)) {
-            $mbstring = (extension_loaded('mbstring') ? true : false);
-            if ($mbstring) {
+            $mbstring = (extension_loaded('mbstring') ? 1 : 0);
+            if ($mbstring === 1) {
+                if (function_exists('mb_strtoupper')) {
+                    $mbstring = 2;
+                }
+
                 mb_internal_encoding(LANG_CHARSET);
             }
         }
@@ -50,12 +54,20 @@
         switch($func) {
             case 'ucfirst':
                 // there's no mb_ucfirst, so emulate it
-                if ($mbstring) {
+                if ($mbstring === 2) {
                     return mb_strtoupper(mb_substr($args[1], 0, 1)) . mb_strtolower(mb_substr($args[1], 1));
                 } else {
                     return ucfirst($args[1]);
                 }
 
+            case 'strtolower':
+            case 'strtoupper':
+                if ($mbstring === 2) {
+                    return call_user_func_array('mb_' . $func, $args);
+                } else {
+                    return call_user_func_array($func, $args);
+                }
+
             default:
                 if ($mbstring) {
                     return call_user_func_array('mb_' . $func, $args);

[php-blog-cvs] serendipity/templates/default/admin/img - New directory

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

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

Log Message:
Directory /cvsroot/php-blog/serendipity/templates/default/admin/img added to the repository

[php-blog-cvs] serendipity/include/tpl config_local.inc.php,1.4,1.5

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

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

Modified Files:
	config_local.inc.php 
Log Message:
* since 'nosave' vars are no longer stored in the DB, we need to remove them from the DB or problems arise that you can't change a config value. (see mailinglist)
* fixed remaining spelling mistake :)


Index: config_local.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_local.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- config_local.inc.php	9 Dec 2004 23:34:46 -0000	1.4
+++ config_local.inc.php	10 Dec 2004 10:59:06 -0000	1.5
@@ -51,7 +51,7 @@
                                           'default'     => 'serendipity_',
                                           'flags'       => array('nosave')),
 
-                                    array('var'         => 'dbPersistant',
+                                    array('var'         => 'dbPersistent',
                                           'title'       => INSTALL_DBPERSISTENT,
                                           'description' => INSTALL_DBPERSISTENT_DESC,
                                           'type'        => 'bool',

[php-blog-cvs] serendipity/include/admin upgrader.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-serv3789/include/admin

Modified Files:
	upgrader.inc.php 
Log Message:
* since 'nosave' vars are no longer stored in the DB, we need to remove them from the DB or problems arise that you can't change a config value. (see mailinglist)
* fixed remaining spelling mistake :)


Index: upgrader.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/upgrader.inc.php,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- upgrader.inc.php	30 Nov 2004 07:50:42 -0000	1.5
+++ upgrader.inc.php	10 Dec 2004 10:59:06 -0000	1.6
@@ -103,6 +103,10 @@
                      'title'     => 'Update of .htaccess file',
                      'desc'      => 'In order to implement the new administration, changes were made to the .htaccess file, you need to regenerate it'),
 
+               array('version'   => '0.8-alpha7',
+                     'function'  => 'serendipity_removeObsoleteVars',
+                     'title'     => 'Removal of obsolete configuration variables',
+                     'desc'      => 'Because of the new configuration parsing methods, some database variables are now only stored in serendipity_config_local.inc.php. Those obsolete variables will be removed from the database'),
 );
 
 /* Fetch SQL files which needs to be run */

[php-blog-cvs] serendipity/include functions_config.inc.php,1.7,1.8 functions_installer.inc.php,1.18,1.19

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

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

Modified Files:
	functions_config.inc.php functions_installer.inc.php 
Log Message:
* since 'nosave' vars are no longer stored in the DB, we need to remove them from the DB or problems arise that you can't change a config value. (see mailinglist)
* fixed remaining spelling mistake :)


Index: functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_config.inc.php,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- functions_config.inc.php	9 Dec 2004 10:39:24 -0000	1.7
+++ functions_config.inc.php	10 Dec 2004 10:59:05 -0000	1.8
@@ -1,5 +1,11 @@
 <?php # $Id$
 
+function serendipity_remove_config_var($name, $authorid = 0) {
+    global $serendipity;
+
+    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}config where name='" . serendipity_db_escape_string($name) . "' AND authorid = " . (int)$authorid);
+}
+
 function serendipity_set_config_var($name, $val, $authorid = 0) {
     global $serendipity;
 

Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- functions_installer.inc.php	9 Dec 2004 22:18:02 -0000	1.18
+++ functions_installer.inc.php	10 Dec 2004 10:59:05 -0000	1.19
@@ -797,4 +797,19 @@
         return $default;
     }
 }
+
+function serendipity_removeObsoleteVars() {
+global $serendipity;
+
+    $config = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);
+    foreach($config as $category) {
+        foreach($category['items'] as $item) {
+            /* Remove trash */
+            if (!serendipity_checkConfigItemFlags($item, 'remove')) {
+                serendipity_remove_config_var($item['var'], 0);
+            }
+        }
+    }
+}
+
 ?>

[php-blog-cvs] serendipity serendipity_config.inc.php,1.113,1.114

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
* since 'nosave' vars are no longer stored in the DB, we need to remove them from the DB or problems arise that you can't change a config value. (see mailinglist)
* fixed remaining spelling mistake :)


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -d -r1.113 -r1.114
--- serendipity_config.inc.php	9 Dec 2004 13:31:13 -0000	1.113
+++ serendipity_config.inc.php	10 Dec 2004 10:59:05 -0000	1.114
@@ -15,7 +15,7 @@
 
 include_once(S9Y_INCLUDE_PATH . 'include/compat.inc.php');
 
-$serendipity['version']         = '0.8-alpha6';
+$serendipity['version']         = '0.8-alpha7';
 $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme
 $serendipity['production']      = true; // Setting this to 'false' will enable debugging output
 $serendipity['rewrite']         = 'none';

[php-blog-cvs] serendipity/include/tpl config_local.inc.php,1.3,1.4

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

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

Modified Files:
	config_local.inc.php 
Log Message:
- Missing description for 'rewrite' config item


Index: config_local.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/tpl/config_local.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- config_local.inc.php	8 Dec 2004 20:27:53 -0000	1.3
+++ config_local.inc.php	9 Dec 2004 23:34:46 -0000	1.4
@@ -229,7 +229,7 @@
 
                                     array('var'         => 'rewrite',
                                           'title'       => INSTALL_REWRITE,
-                                          'description' => INSTALL_REWRITE,
+                                          'description' => INSTALL_REWRITE_DESC,
                                           'type'        => 'list',
                                           'default'     => array('none'      => 'Disable URL Rewriting',
                                                                  'errordocs' => 'Use Apache errorhandling',

[php-blog-cvs] serendipity/include/admin installer.inc.php,1.11,1.12

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

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

Modified Files:
	installer.inc.php 
Log Message:
- allow_url_fopen is nice to have also


Index: installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/installer.inc.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- installer.inc.php	9 Dec 2004 11:33:58 -0000	1.11
+++ installer.inc.php	9 Dec 2004 22:31:27 -0000	1.12
@@ -279,6 +279,17 @@
      ?></td>
     </tr>
     <tr>
+      <td>allow_url_fopen</td>
+      <td width="150"><strong><?php echo 'ON' ?></strong></td>
+      <td width="150"><?php
+            if ( serendipity_ini_bool(ini_get('allow_url_fopen')) ) {
+                echo serendipity_installerResultDiagnose(S9Y_I_SUCCESS, 'ON');
+            } else {
+                echo serendipity_installerResultDiagnose(S9Y_I_WARNING, 'OFF');
+            }
+     ?></td>
+    </tr>
+    <tr>
       <td>file_uploads</td>
       <td width="150"><strong><?php echo 'ON' ?></strong></td>
       <td width="150"><?php

[php-blog-cvs] serendipity/include/admin configuration.inc.php,1.4,1.5

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

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

Modified Files:
	configuration.inc.php 
Log Message:
- Regression: Don't expand configuration as default
- Regression: Fix small bug with +/- icon not showing the correct intial state


Index: configuration.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/admin/configuration.inc.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configuration.inc.php	8 Dec 2004 20:27:53 -0000	1.4
+++ configuration.inc.php	9 Dec 2004 22:18:01 -0000	1.5
@@ -34,7 +34,7 @@
     default:
         $from = &$serendipity;
         $t = serendipity_parseTemplate(S9Y_CONFIG_TEMPLATE);
-        serendipity_printConfigTemplate($t, $from, false, false);
+        serendipity_printConfigTemplate($t, $from, false, true);
         break;
 }
 

[php-blog-cvs] serendipity/include functions_installer.inc.php,1.17,1.18

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

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

Modified Files:
	functions_installer.inc.php 
Log Message:
- Regression: Don't expand configuration as default
- Regression: Fix small bug with +/- icon not showing the correct intial state


Index: functions_installer.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/include/functions_installer.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- functions_installer.inc.php	8 Dec 2004 20:27:52 -0000	1.17
+++ functions_installer.inc.php	9 Dec 2004 22:18:02 -0000	1.18
@@ -295,7 +295,7 @@
 <?php   }
     if (sizeof($config) > 1 && $allowToggle) { ?>
         <div align="right">
-            <a style="border:0; text-decoration: none" href="#" onClick="showConfigAll(<?php echo sizeof($config); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folded === false ? 'plus' : 'minus') .'.png') ?>" id="optionall" alt="+/-" border="0" />&nbsp;<?php echo TOGGLE_ALL; ?></a></a><br />
+            <a style="border:0; text-decoration: none" href="#" onClick="showConfigAll(<?php echo sizeof($config); ?>)" title="<?php echo TOGGLE_ALL; ?>"><img src="<?php echo serendipity_getTemplateFile('img/'. ($folded === true ? 'plus' : 'minus') .'.png') ?>" id="optionall" alt="+/-" border="0" />&nbsp;<?php echo TOGGLE_ALL; ?></a></a><br />
         </div>
 <?php
     }