php-blog-cvs — Serendipity commit list

[php-blog-cvs] serendipity/templates/mt3-independence style.css,1.8,1.9

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

Update of /cvsroot/php-blog/serendipity/templates/mt3-independence
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv27786

Modified Files:
	style.css 
Log Message:
Tweak


Index: style.css
===================================================================
RCS file: /cvsroot/php-blog/serendipity/templates/mt3-independence/style.css,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- style.css	2 Sep 2004 17:42:00 -0000	1.8
+++ style.css	14 Sep 2004 16:34:50 -0000	1.9
@@ -257,7 +257,8 @@
     
     text-transform: uppercase;
     padding: 3px;
-    letter-spacing: .3em;
+    letter-spacing: .25em;
+    text-decoration: none;
 }
 div.serendipityPlug {
     text-align: center;

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.419.2.14,1.419.2.15

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_functions.inc.php 
Log Message:
MFH


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.14
retrieving revision 1.419.2.15
diff -u -d -r1.419.2.14 -r1.419.2.15
--- serendipity_functions.inc.php	14 Sep 2004 13:11:16 -0000	1.419.2.14
+++ serendipity_functions.inc.php	14 Sep 2004 16:29:46 -0000	1.419.2.15
@@ -1270,8 +1270,7 @@
 
 } // end function serendipity_printEntries
 
-function serendipity_deleteComment($id, $entry_id, $type='comments')
-{
+function serendipity_deleteComment($id, $entry_id, $type='comments') {
     global $serendipity;
 
     if ($_SESSION['serendipityAuthedUser'] === true) {
@@ -1280,13 +1279,23 @@
             $admin = " AND authorid = " . (int)$_SESSION['serendipityAuthorid'] ."'";
         }
 
-        $query = "DELETE FROM {$serendipity['dbPrefix']}comments WHERE entry_id = '". (int)$entry_id ."' AND id = '". (int)$id ."' $admin";
-        serendipity_db_query($query);
-        $affected = serendipity_db_affected_rows();
+        /* We have to figure out if the comment we are about to delete, is awaiting approval,
+           if so - we should *not* subtract it from the entries table */
+        $sql = serendipity_db_query("SELECT status FROM {$serendipity['dbPrefix']}comments
+                                            WHERE entry_id = '". (int)$entry_id ."'
+                                                    AND id = '". (int)$id ."'
+                                                    $admin");
 
-        $query = "UPDATE {$serendipity['dbPrefix']}entries SET $type = $type-1 WHERE id = '". (int)$entry_id ."' $admin";
-        serendipity_db_query($query);
-        return $affected;
+        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}comments
+                                    WHERE entry_id = '". (int)$entry_id ."'
+                                            AND id = '". (int)$id ."'
+                                            $admin");
+
+        if ( $sql['status'] !== 'pending' ) {
+            serendipity_db_query("UPDATE {$serendipity['dbPrefix']}entries SET $type = $type-1 WHERE id = '". (int)$entry_id ."' $admin");
+        }
+
+        return true;
     } else {
         return false;
     }

[php-blog-cvs] serendipity serendipity_functions.inc.php,1.424,1.425

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

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

Modified Files:
	serendipity_functions.inc.php 
Log Message:
- Fix: Deleting a comment/trackback that is pending approval, will still lower the count in the entries table, thanks to griffinn


Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.424
retrieving revision 1.425
diff -u -d -r1.424 -r1.425
--- serendipity_functions.inc.php	14 Sep 2004 12:56:08 -0000	1.424
+++ serendipity_functions.inc.php	14 Sep 2004 16:24:57 -0000	1.425
@@ -1425,8 +1425,7 @@
     } // end else short mode
 } // end function serendipity_printEntries
 
-function serendipity_deleteComment($id, $entry_id, $type='comments')
-{
+function serendipity_deleteComment($id, $entry_id, $type='comments') {
     global $serendipity;
 
     if ($_SESSION['serendipityAuthedUser'] === true) {
@@ -1435,13 +1434,23 @@
             $admin = " AND authorid = " . (int)$_SESSION['serendipityAuthorid'] ."'";
         }
 
-        $query = "DELETE FROM {$serendipity['dbPrefix']}comments WHERE entry_id = '". (int)$entry_id ."' AND id = '". (int)$id ."' $admin";
-        serendipity_db_query($query);
-        $affected = serendipity_db_affected_rows();
+        /* We have to figure out if the comment we are about to delete, is awaiting approval, 
+           if so - we should *not* subtract it from the entries table */
+        $sql = serendipity_db_query("SELECT status FROM {$serendipity['dbPrefix']}comments 
+                                            WHERE entry_id = '". (int)$entry_id ."' 
+                                                    AND id = '". (int)$id ."'
+                                                    $admin");
+        
+        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}comments 
+                                    WHERE entry_id = '". (int)$entry_id ."' 
+                                            AND id = '". (int)$id ."' 
+                                            $admin");
 
-        $query = "UPDATE {$serendipity['dbPrefix']}entries SET $type = $type-1 WHERE id = '". (int)$entry_id ."' $admin";
-        serendipity_db_query($query);
-        return $affected;
+        if ( $sql['status'] !== 'pending' ) {
+            serendipity_db_query("UPDATE {$serendipity['dbPrefix']}entries SET $type = $type-1 WHERE id = '". (int)$entry_id ."' $admin");
+        }
+
+        return true;
     } else {
         return false;
     }

[php-blog-cvs] serendipity/lang serendipity_lang_da.inc.php,1.79,1.79.2.1

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_lang_da.inc.php 
Log Message:
MFH


Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.79
retrieving revision 1.79.2.1
diff -u -d -r1.79 -r1.79.2.1
--- serendipity_lang_da.inc.php	9 Sep 2004 11:36:35 -0000	1.79
+++ serendipity_lang_da.inc.php	14 Sep 2004 14:58:10 -0000	1.79.2.1
@@ -495,7 +495,7 @@
 @define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"nej": Eksterne links (Top udgangsider, Top henvisninger, bruger kommentarer) er ikke vist/vist som ren tekst hvor brugbart, for at forhindre google spam (anbefales). "ja": Eksterne links er vist som hyperlinks. Kan overskrives inde i hver enkel sidebar plugin konfigurationen!');
 @define('PAGE_BROWSE_COMMENTS', 'Side %s af %s, i alt %s kommentarer');
 @define('FILTERS', 'Filtrer');
-@define('FIND_ENTRIES', 'Find artikler');e
+@define('FIND_ENTRIES', 'Find artikler');
 @define('FIND_COMMENTS', 'Find kommentarer');
 @define('FIND_MEDIA', 'Find media');
 @define('FILTER_DIRECTORY', 'Bibliotek');

[php-blog-cvs] serendipity/lang serendipity_lang_da.inc.php,1.79,1.80

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

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

Modified Files:
	serendipity_lang_da.inc.php 
Log Message:
fixed parse error


Index: serendipity_lang_da.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_da.inc.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- serendipity_lang_da.inc.php	9 Sep 2004 11:36:35 -0000	1.79
+++ serendipity_lang_da.inc.php	14 Sep 2004 14:57:33 -0000	1.80
@@ -495,7 +495,7 @@
 @define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"nej": Eksterne links (Top udgangsider, Top henvisninger, bruger kommentarer) er ikke vist/vist som ren tekst hvor brugbart, for at forhindre google spam (anbefales). "ja": Eksterne links er vist som hyperlinks. Kan overskrives inde i hver enkel sidebar plugin konfigurationen!');
 @define('PAGE_BROWSE_COMMENTS', 'Side %s af %s, i alt %s kommentarer');
 @define('FILTERS', 'Filtrer');
-@define('FIND_ENTRIES', 'Find artikler');e
+@define('FIND_ENTRIES', 'Find artikler');
 @define('FIND_COMMENTS', 'Find kommentarer');
 @define('FIND_MEDIA', 'Find media');
 @define('FILTER_DIRECTORY', 'Bibliotek');

[php-blog-cvs] serendipity/bundled-libs create_release.sh,1.1,1.1.2.1

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

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

Modified Files:
      Tag: branch-smarty
	create_release.sh 
Log Message:
MFH


Index: create_release.sh
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/create_release.sh,v
retrieving revision 1.1
retrieving revision 1.1.2.1
diff -u -d -r1.1 -r1.1.2.1
--- create_release.sh	14 Jun 2004 13:13:19 -0000	1.1
+++ create_release.sh	14 Sep 2004 13:40:10 -0000	1.1.2.1
@@ -16,16 +16,17 @@
 echo ""
 echo "-[serendipity create_release.sh START]---------------------------------"
 
-if [ "x$1" = "x" ] || [ "x$2" = "x" ] || [ "x$3" = "x" ] ;
+if [ "x$1" = "x" ] || [ "x$2" = "x" ] || [ "x$3" = "x" ] || [ "x$4" = "x" ];
 then
     echo "usage: ./create_release.sh
             [tar.gz dump filename]
             [serendipity installation dirname, without paths]
-            [username, i.e. nobody.nogroup]"
+            [username, i.e. nobody]
+            [group, i.e. nogroup]"
     echo ""
     echo "example:"
     echo " $> cd serendipity/bundled-libs/"
-    echo " $> ./create_release.sh serendipity-0.7.tar.gz serendipity nobody.nogroup"
+    echo " $> ./create_release.sh serendipity-0.7.tar.gz serendipity nobody nogroup"
     echo ""
     echo "WARNING: Running this script in a productive blog environment will do"
     echo "         serious harm!"
@@ -47,27 +48,22 @@
             echo "    [DONE]"
             echo ""
 
-        echo "2. Adjusting directory/file ownership to $3"
-            chown -R "$3" "$2"
-            echo "    [DONE]"
-            echo ""
-
-        echo "3. Adjusting all subdirectory permissions to 755"
+        echo "2. Adjusting all subdirectory permissions to 755"
             find "$2" -type d -exec chmod 755 {} \;
             echo "    [DONE]"
             echo ""
 
-        echo "4. Adjusting core directory permissions to 777"
+        echo "3. Adjusting core directory permissions to 777"
             chmod 777 "$2"
             echo "    [DONE]"
             echo ""
 
-        echo "5. Adjusting all file permissions to 644"
+        echo "4. Adjusting all file permissions to 644"
             find "$2" -type f -exec chmod 644 {} \;
             echo "    [DONE]"
             echo ""
 
-        echo "6. Adjusting special files..."
+        echo "5. Adjusting special files..."
             echo "   - $2/.htaccess [666]"
             chmod 666 "$2/.htaccess"
 
@@ -79,7 +75,7 @@
             echo "    [DONE]"
             echo ""
 
-        echo "7. Altering CVS to be useful for anonymous users..."
+        echo "6. Altering CVS to be useful for anonymous users..."
             echo "   - Removing CVS branch tag, so that a user can upgrade to latest CVS"
             find "$2" -type f -name Tag -exec rm {} \;
             echo "       [DONE]"
@@ -91,12 +87,12 @@
             echo "       [DONE]"
             echo ""
 
-        echo "8. Creating .tgz file $1"
-            tar -czf "$1" "$2"
+        echo "7. Creating .tgz file $1"
+            tar --owner=$3 --group=$4 -czf "$1" "$2"
             echo "    [DONE]"
             echo ""
 
-        echo "9. All Done. Bybe-Bye."
+        echo "8. All Done. Bybe-Bye."
     else
         echo "Basedirectory ../../$2 not found. Check parameters"
     fi

[php-blog-cvs] serendipity/bundled-libs create_release.sh,1.2,1.3

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

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

Modified Files:
	create_release.sh 
Log Message:




Index: create_release.sh
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/create_release.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- create_release.sh	14 Sep 2004 13:37:29 -0000	1.2
+++ create_release.sh	14 Sep 2004 13:38:05 -0000	1.3
@@ -26,7 +26,7 @@
     echo ""
     echo "example:"
     echo " $> cd serendipity/bundled-libs/"
-    echo " $> ./create_release.sh serendipity-0.7.tar.gz serendipity nobody.nogroup"
+    echo " $> ./create_release.sh serendipity-0.7.tar.gz serendipity nobody nogroup"
     echo ""
     echo "WARNING: Running this script in a productive blog environment will do"
     echo "         serious harm!"

[php-blog-cvs] serendipity/bundled-libs create_release.sh,1.1,1.2

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

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

Modified Files:
	create_release.sh 
Log Message:
don'T require chmod


Index: create_release.sh
===================================================================
RCS file: /cvsroot/php-blog/serendipity/bundled-libs/create_release.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- create_release.sh	14 Jun 2004 13:13:19 -0000	1.1
+++ create_release.sh	14 Sep 2004 13:37:29 -0000	1.2
@@ -16,12 +16,13 @@
 echo ""
 echo "-[serendipity create_release.sh START]---------------------------------"
 
-if [ "x$1" = "x" ] || [ "x$2" = "x" ] || [ "x$3" = "x" ] ;
+if [ "x$1" = "x" ] || [ "x$2" = "x" ] || [ "x$3" = "x" ] || [ "x$4" = "x" ];
 then
     echo "usage: ./create_release.sh
             [tar.gz dump filename]
             [serendipity installation dirname, without paths]
-            [username, i.e. nobody.nogroup]"
+            [username, i.e. nobody]
+            [group, i.e. nogroup]"
     echo ""
     echo "example:"
     echo " $> cd serendipity/bundled-libs/"
@@ -47,27 +48,22 @@
             echo "    [DONE]"
             echo ""
 
-        echo "2. Adjusting directory/file ownership to $3"
-            chown -R "$3" "$2"
-            echo "    [DONE]"
-            echo ""
-
-        echo "3. Adjusting all subdirectory permissions to 755"
+        echo "2. Adjusting all subdirectory permissions to 755"
             find "$2" -type d -exec chmod 755 {} \;
             echo "    [DONE]"
             echo ""
 
-        echo "4. Adjusting core directory permissions to 777"
+        echo "3. Adjusting core directory permissions to 777"
             chmod 777 "$2"
             echo "    [DONE]"
             echo ""
 
-        echo "5. Adjusting all file permissions to 644"
+        echo "4. Adjusting all file permissions to 644"
             find "$2" -type f -exec chmod 644 {} \;
             echo "    [DONE]"
             echo ""
 
-        echo "6. Adjusting special files..."
+        echo "5. Adjusting special files..."
             echo "   - $2/.htaccess [666]"
             chmod 666 "$2/.htaccess"
 
@@ -79,7 +75,7 @@
             echo "    [DONE]"
             echo ""
 
-        echo "7. Altering CVS to be useful for anonymous users..."
+        echo "6. Altering CVS to be useful for anonymous users..."
             echo "   - Removing CVS branch tag, so that a user can upgrade to latest CVS"
             find "$2" -type f -name Tag -exec rm {} \;
             echo "       [DONE]"
@@ -91,12 +87,12 @@
             echo "       [DONE]"
             echo ""
 
-        echo "8. Creating .tgz file $1"
-            tar -czf "$1" "$2"
+        echo "7. Creating .tgz file $1"
+            tar --owner=$3 --group=$4 -czf "$1" "$2"
             echo "    [DONE]"
             echo ""
 
-        echo "9. All Done. Bybe-Bye."
+        echo "8. All Done. Bybe-Bye."
     else
         echo "Basedirectory ../../$2 not found. Check parameters"
     fi

[php-blog-cvs] serendipity NEWS,1.216,1.217

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

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

Modified Files:
	NEWS 
Log Message:
0.7-beta2


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.216
retrieving revision 1.217
diff -u -d -r1.216 -r1.217
--- NEWS	14 Sep 2004 10:47:26 -0000	1.216
+++ NEWS	14 Sep 2004 13:27:32 -0000	1.217
@@ -3,6 +3,8 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed possible SQL injections. Thanks to aCiDBiTS!
+
     * Fixed postgreSQL quicksearch, thanks to Mauri Sahlberg!
 
     * Added Norwegian translations, thanks to Jo Christian

[php-blog-cvs] serendipity comment.php,1.44.2.1,1.44.2.2 index.php,1.49.2.1,1.49.2.2 serendipity_admin_comments.inc.php,1.17.2.1,1.17.2.2 serendipity_admin_users.inc.php,1.10,1.10.2.1 serendipity_functions.inc.php,1.419.2.13,1.419.2.14 serendipity_functions_config.inc.php,1.10,1.10.2.1 serendipity_functions_images.inc.php,1.36,1.36.2.1

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

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

Modified Files:
      Tag: branch-smarty
	comment.php index.php serendipity_admin_comments.inc.php 
	serendipity_admin_users.inc.php serendipity_functions.inc.php 
	serendipity_functions_config.inc.php 
	serendipity_functions_images.inc.php 
Log Message:
MFH


Index: serendipity_admin_users.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_users.inc.php,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- serendipity_admin_users.inc.php	9 Sep 2004 10:52:03 -0000	1.10
+++ serendipity_admin_users.inc.php	14 Sep 2004 13:11:16 -0000	1.10.2.1
@@ -22,7 +22,7 @@
     } elseif ($_POST['userlevel'] > $serendipity['serendipityUserlevel']) {
         echo '<strong>' . CREATE_NOT_AUTHORIZED_USERLEVEL . '</strong>';
     } else {
-        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}authors WHERE authorid={$serendipity['POST']['user']}");
+        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}authors WHERE authorid=" . (int)$serendipity['POST']['user']);
         printf('<strong>' . DELETED_USER . '</strong>', $serendipity['POST']['user'], $user[0]['username']);
     }
 }
@@ -37,8 +37,8 @@
                                 password
                               )
                       VALUES  (
-                                '{$_POST['username']}',
-                                '$enc_pass'
+                                '" . serendipity_db_escape_string($_POST['username']) . "',
+                                '" . serendipity_db_escape_String($enc_pass) . "'
                               )";
         serendipity_db_query($query);
         $serendipity['POST']['user'] = serendipity_db_insert_id('authors', 'authorid');

Index: serendipity_admin_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v
retrieving revision 1.17.2.1
retrieving revision 1.17.2.2
diff -u -d -r1.17.2.1 -r1.17.2.2
--- serendipity_admin_comments.inc.php	14 Sep 2004 10:46:10 -0000	1.17.2.1
+++ serendipity_admin_comments.inc.php	14 Sep 2004 13:11:16 -0000	1.17.2.2
@@ -24,8 +24,8 @@
                         url       = '" . serendipity_db_escape_string($serendipity['POST']['url'])     . "',
                         parent_id = '" . serendipity_db_escape_string($serendipity['POST']['replyTo']) . "',
                         body      = '" . serendipity_db_escape_string($serendipity['POST']['comment']) . "'
-            WHERE id = " . serendipity_db_escape_string($serendipity['GET']['id']) . " AND
-                  entry_id = " . serendipity_db_escape_string($serendipity['POST']['entry_id']);
+            WHERE id = " . (int)$serendipity['GET']['id'] . " AND
+                  entry_id = " . (int)$serendipity['POST']['entry_id'];
     serendipity_db_query($sql);
     echo COMMENT_EDITED;
     return true;
@@ -38,7 +38,7 @@
             FROM {$serendipity['dbPrefix']}comments c
             LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id)
             LEFT JOIN {$serendipity['dbPrefix']}authors a ON (e.authorid = a.authorid)
-            WHERE c.id = " . serendipity_db_escape_string($serendipity['GET']['id'])  ." AND status = 'pending'";
+            WHERE c.id = " . (int)$serendipity['GET']['id']  ." AND status = 'pending'";
     $rs  = serendipity_db_query($sql, true);
 
     if ($rs === false) {
@@ -63,7 +63,7 @@
 
     /* If we are not in preview, we need data from our database */
     if (!isset($serendipity['POST']['preview']) ) {
-        $comment = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}comments WHERE id = ". $serendipity['GET']['id']);
+        $comment = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}comments WHERE id = ". (int)$serendipity['GET']['id']);
         $data['name']       = $comment[0]['author'];
         $data['email']      = $comment[0]['email'];
         $data['url']        = $comment[0]['url'];

Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.36
retrieving revision 1.36.2.1
diff -u -d -r1.36 -r1.36.2.1
--- serendipity_functions_images.inc.php	2 Sep 2004 13:41:00 -0000	1.36
+++ serendipity_functions_images.inc.php	14 Sep 2004 13:11:17 -0000	1.36.2.1
@@ -6,11 +6,12 @@
 function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total, $order = false, $ordermode = false, $directory = '') {
     global $serendipity;
 
-    if (empty($order)) {
+    $orderfields = serendipity_getImageFields();
+    if (empty($order) || !isset($orderfields[$order])) {
         $order = 'date';
     }
 
-    if (empty($ordermode)) {
+    if (empty($ordermode) || ($ordermode != 'DESC' && $ordermode != 'ASC')) {
         $ordermode = 'DESC';
     }
 
@@ -39,7 +40,7 @@
 
 function serendipity_fetchImageFromDatabase($id) {
     global $serendipity;
-    $rs = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}images WHERE id = ". $id, true, 'assoc');
+    $rs = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}images WHERE id = ". (int)$id, true, 'assoc');
     return $rs;
 }
 
@@ -54,9 +55,9 @@
     $i=0;
     if (sizeof($updates) > 0) {
         foreach ($updates as $k => $v) {
-            $q[] = $k ." = '" . $v . "'";
+            $q[] = $k ." = '" . serendipity_db_escape_string($v) . "'";
         }
-        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}images SET ". implode($q, ',') ." WHERE id = $id $admin");
+        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}images SET ". implode($q, ',') ." WHERE id = " . (int)$id . " $admin");
         $i++;
     }
     return $i;
@@ -87,7 +88,7 @@
     } else {
         printf(FILE_NOT_FOUND . '<br />', $dFile);
     }
-    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}images WHERE id = ". $id);
+    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}images WHERE id = ". (int)$id);
 }
 
 /**
@@ -159,12 +160,12 @@
       serendipity_db_escape_string($filename),
       serendipity_db_escape_string($extension),
       serendipity_db_escape_string($mimetype),
-      serendipity_db_escape_string($filesize),
-      serendipity_db_escape_string($width),
-      serendipity_db_escape_string($height),
+      (int)$filesize,
+      (int)$width,
+      (int)$height,
       serendipity_db_escape_string($thumbnail),
-      serendipity_db_escape_string($date),
-      serendipity_db_escape_string($authorid),
+      (int)$date,
+      (int)$authorid,
       serendipity_db_escape_string($directory)
     );
 
@@ -542,8 +543,8 @@
 
         $rs = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}images
                                             WHERE name = '" . serendipity_db_escape_string($fbase) . "'
-                                              " . ($fdir != '' ? "AND path = '$fdir'" : '') . "
-                                              AND mime = '$fdim[mime]'", true, 'assoc');
+                                              " . ($fdir != '' ? "AND path = '" . serendipity_db_escape_string($fdir) . "'" : '') . "
+                                              AND mime = '" . serendipity_db_escape_string($fdim['mime']) . "'", true, 'assoc');
         if (is_array($rs)) {
             $update    = array();
             $checkfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $rs['path'] . $rs['name'] . '.' . $rs['thumbnail_name'] . '.' . $rs['extension'];
@@ -694,15 +695,7 @@
     $left  = '<input type="button" value="&lt;&lt;&lt;" onclick="location.href=\'?'. $extraParems .'serendipity[page]=' . ($page-1) . '\';" '. (($start <= 0) ? 'disabled' : '') .'>' . "\n";
     $right = '<input type="button" value="&gt;&gt;&gt;" onclick="location.href=\'?'. $extraParems .'serendipity[page]=' . ($page+1) . '\';" '. (($totalImages < $start+$perPage) ? 'disabled' : '') .'>' . "\n";
 
-    $sort_order = array(
-                    'date'              => SORT_ORDER_DATE,
-                    'name'              => SORT_ORDER_NAME,
-                    'authorid'          => AUTHOR,
-                    'extension'         => SORT_ORDER_EXTENSION,
-                    'size'              => SORT_ORDER_SIZE,
-                    'dimensions_width'  => SORT_ORDER_WIDTH,
-                    'dimensions_height' => SORT_ORDER_HEIGHT
-    );
+    $sort_order = serendipity_getImageFields();
 
     serendipity_traversePath(
       $paths,
@@ -1035,4 +1028,16 @@
 
     return $fdim;
 }
-?>
+
+function serendipity_getImageFields() {
+    return array(
+        'date'              => SORT_ORDER_DATE,
+        'name'              => SORT_ORDER_NAME,
+        'authorid'          => AUTHOR,
+        'extension'         => SORT_ORDER_EXTENSION,
+        'size'              => SORT_ORDER_SIZE,
+        'dimensions_width'  => SORT_ORDER_WIDTH,
+        'dimensions_height' => SORT_ORDER_HEIGHT
+    );
+}
+?>
\ No newline at end of file

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.13
retrieving revision 1.419.2.14
diff -u -d -r1.419.2.13 -r1.419.2.14
--- serendipity_functions.inc.php	14 Sep 2004 10:46:10 -0000	1.419.2.13
+++ serendipity_functions.inc.php	14 Sep 2004 13:11:16 -0000	1.419.2.14
@@ -608,15 +608,15 @@
         }
     }
     elseif (is_array($range) && count($range)==2) {
-        $startts = $range[0];
-        $endts   = $range[1];
+        $startts = (int)$range[0];
+        $endts   = (int)$range[1];
         $and = " WHERE timestamp >= $startts AND timestamp <= $endts";
     }
      else {
         if ($modified_since) {
             $unix_modified = strtotime($modified_since);
             if ($unix_modified != -1) {
-                $and = ' WHERE last_modified >= ' . $unix_modified;
+                $and = ' WHERE last_modified >= ' . (int)$unix_modified;
                 if (!empty($limit)) {
                     $limit = ($limit > $serendipity['max_fetch_limit'] ? $limit : $serendipity['max_fetch_limit']);
                 }
@@ -792,7 +792,7 @@
                             {$serendipity['dbPrefix']}authors a
                     WHERE
                             a.authorid = e.authorid
-                            AND e.$key LIKE $val
+                            AND e.$key LIKE '" . serendipity_db_escape_string($val) . "'
                             $admin
                             $drafts
                     LIMIT 1";
@@ -816,7 +816,7 @@
         $authorid = 'all';
     }
 
-    if ($authorid != 'all') {
+    if ($authorid != 'all' && is_numeric($authorid)) {
         $where = " WHERE (c.authorid = $authorid OR c.authorid = 0) OR a.userlevel < ".$serendipity['serendipityUserlevel'];
     } else {
         $where = '';
@@ -838,7 +838,7 @@
     global $serendipity;
     $right = $left + 1;
 
-    $result = serendipity_db_query("SELECT categoryid FROM {$serendipity['dbPrefix']}category WHERE parentid='" . (int)$parent . "'");
+    $result = serendipity_db_query("SELECT categoryid FROM {$serendipity['dbPrefix']}category WHERE parentid = '" . (int)$parent . "'");
     if ( is_array($result) ) {
         foreach ( $result as $category ) {
             $right = serendipity_rebuildCategoryTree($category['categoryid'], $right);
@@ -1321,7 +1321,7 @@
     }
 
     if (!empty($id)) {
-        $and .= ' AND co.entry_id=' . (int)$id;
+        $and .= " AND co.entry_id = '" . (int)$id ."'";
     }
 
     if (!$showAll) {
@@ -1531,8 +1531,8 @@
                 FROM {$serendipity['dbPrefix']}comments c
                 LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id)
                 LEFT JOIN {$serendipity['dbPrefix']}authors a ON (e.authorid = a.authorid)
-                WHERE c.id = ". (int)$cid ."
-                    ". (($serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN && $force !== true) ? 'AND e.authorid = '. $serendipity['authorId'] : '') ."
+                WHERE c.id = '". (int)$cid ."'
+                    ". (($serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN && $force !== true) ? "AND e.authorid = '". (int)$serendipity['authorId'] ."'" : '') ."
                     ". (($force === true) ? "" : "AND status = 'pending'");
     $rs  = serendipity_db_query($sql, true);
 
@@ -1634,8 +1634,8 @@
 
     $sql = "SELECT $pgsql_insert author, email, type
             FROM {$serendipity['dbPrefix']}comments
-            WHERE entry_id = ". (int)$entry_id ."
-              AND email <> '$posterMail'
+            WHERE entry_id = '". (int)$entry_id ."'
+              AND email <> '" . serendipity_db_escape_string($posterMail) . "'
               AND subscribed = 'true' $mysql_insert";
     $subscribers = serendipity_db_query($sql);
 
@@ -1677,7 +1677,7 @@
     $sql = "UPDATE {$serendipity['dbPrefix']}comments
                 SET subscribed = 'false'
             WHERE entry_id = '". (int)$entry_id ."'
-                AND email = '$email'";
+                AND email = '" . serendipity_db_escape_string($email) . "'";
     serendipity_db_query($sql);
 
     return serendipity_db_affected_rows();
@@ -1747,7 +1747,7 @@
 {
     global $serendipity;
 
-    $query = "SELECT name,link FROM {$serendipity['dbPrefix']}references WHERE entry_id='" . (int)$id . "'";
+    $query = "SELECT name,link FROM {$serendipity['dbPrefix']}references WHERE entry_id = '" . (int)$id . "'";
 
     return serendipity_db_query($query);
 }
@@ -1826,7 +1826,7 @@
 
             // extract author information
             if (empty($entry['email'])) {
-                $query = "select email from {$serendipity['dbPrefix']}authors where username='". serendipity_db_escape_string($entry['username']) ."'";
+                $query = "select email FROM {$serendipity['dbPrefix']}authors WHERE username = '". serendipity_db_escape_string($entry['username']) ."'";
                 $results = serendipity_db_query($query);
                 $entry['email'] = $results[0]['email'];
             }
@@ -2323,8 +2323,9 @@
             $locations[$i] = 'http' . (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off' ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . $locations[$i];
         }
 
-        $query = "SELECT COUNT(id) FROM {$serendipity['dbPrefix']}references WHERE ";
-        $query .= "entry_id=". (int)$tmpid ." AND link='" . serendipity_db_escape_string($locations[$i]) . "'";
+        $query = "SELECT COUNT(id) FROM {$serendipity['dbPrefix']}references
+                            WHERE entry_id = '". (int)$tmpid ."'
+                                  AND link = '" . serendipity_db_escape_string($locations[$i]) . "'";
 
         $row = serendipity_db_query($query, true, 'num');
         if ($row[0] > 0) {
@@ -2481,7 +2482,7 @@
     }
 
     // Purge the daily/monthly entries so they can be rebuilt
-    $result = serendipity_db_query("SELECT timestamp, authorid FROM {$serendipity['dbPrefix']}entries WHERE id=". (int)$id, true);
+    $result = serendipity_db_query("SELECT timestamp, authorid FROM {$serendipity['dbPrefix']}entries WHERE id = '". (int)$id ."'", true);
 
     if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF && $result[1] != $serendipity['authorid']) {
         // Only admins and chief users can delete entries which do not belong to the author
@@ -2491,9 +2492,7 @@
     serendipity_purgeEntry($id, $result[0]);
 
     serendipity_db_query("DELETE FROM {$serendipity["dbPrefix"]}entries WHERE id=$id");
-
     serendipity_db_query("DELETE FROM {$serendipity["dbPrefix"]}comments WHERE entry_id=$id");
-
     serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$id'");
 }
 
@@ -2943,8 +2942,8 @@
                   FROM
                     $serendipity[dbPrefix]authors
                   WHERE
-                    username = '$username'
-                  AND password = '$password'";
+                    username   = '" . serendipity_db_escape_string($username) . "'
+                  AND password = '" . serendipity_db_escape_string($password) . "'";
         $row = serendipity_db_query($query, true, 'assoc');
 
         if (is_array($row)) {
@@ -2996,31 +2995,41 @@
         if (rand(0, 100) < 1) {
             serendipity_track_referrer_gc();
         }
-        if(preg_match('/^mysqli?/', $serendipity['dbType']))
+
+        if(preg_match('/^mysqli?/', $serendipity['dbType'])) {
             $interval = 900;
-        else
+        } else {
             $interval = "interval '900'";
+        }
 
         $suppressq = "SELECT count(1)
                       FROM $serendipity[dbPrefix]suppress
-                      WHERE ip = '$_SERVER[REMOTE_ADDR]'
-                      AND scheme = '$url_parts[scheme]'
-                      AND port = '$url_parts[port]'
-                      AND host = '$url_parts[host]'
-                      AND path = '$url_parts[path]'
-                      AND query = '$url_parts[query]'
+                      WHERE ip = '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "'
+                      AND scheme = '" . serendipity_db_escape_string($url_parts['scheme']) . "'
+                      AND port = '" . serendipity_db_escape_string($url_parts['port']) . "'
+                      AND host = '" . serendipity_db_escape_string($url_parts['host']) . "'
+                      AND path = '" . serendipity_db_escape_string($url_parts['path']) . "'
+                      AND query = '" . serendipity_db_escape_string($url_parts['query']) . "'
                       AND last > now() - $interval";
 
         $suppressp = "DELETE FROM $serendipity[dbPrefix]suppress
-                      WHERE ip = '$_SERVER[REMOTE_ADDR]'
-                      AND scheme = '$url_parts[scheme]'
-                      AND host = '$url_parts[host]'
-                      AND port = '$url_parts[port]'
-                      AND query = '$url_parts[query]'
-                      AND path = '$url_parts[path]'";
+                      WHERE ip = '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "'
+                      AND scheme = '" . serendipity_db_escape_string($url_parts['scheme']) . "'
+                      AND host = '" . serendipity_db_escape_string($url_parts['host']) . "'
+                      AND port = '" . serendipity_db_escape_string($url_parts['port']) . "'
+                      AND query = '" . serendipity_db_escape_string($url_parts['query']) . "'
+                      AND path = '" . serendipity_db_escape_string($url_parts['path']) . "'";
         $suppressu = "INSERT INTO $serendipity[dbPrefix]suppress
                       (ip, last, scheme, host, port, path, query)
-                      VALUES ('$_SERVER[REMOTE_ADDR]', now(), '$url_parts[scheme]', '$url_parts[host]', '$url_parts[port]', '$url_parts[path]', '$url_parts[query]')";
+                      VALUES (
+                      '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "',
+                      now(),
+                      '" . serendipity_db_escape_string($url_parts['scheme']) . "',
+                      '" . serendipity_db_escape_string($url_parts['host']) . "',
+                      '" . serendipity_db_escape_string($url_parts['port']) . "',
+                      '" . serendipity_db_escape_string($url_parts['path']) . "',
+                      '" . serendipity_db_escape_string($url_parts['query']) . "'
+                      )";
 
         $count = serendipity_db_query($suppressq, true);
 
@@ -3068,11 +3077,11 @@
 
         $serendipity['dbPrefix'],
         $list,
-        $url_parts['scheme'],
-        $url_parts['host'],
-        $url_parts['port'],
-        $url_parts['path'],
-        $url_parts['query'],
+        serendipity_db_escape_string($url_parts['scheme']),
+        serendipity_db_escape_string($url_parts['host']),
+        serendipity_db_escape_string($url_parts['port']),
+        serendipity_db_escape_string($url_parts['path']),
+        serendipity_db_escape_string($url_parts['query']),
         ($entry_id != 0) ? "AND entry_id = '". (int)$entry_id ."'" : ''
       )
     );
@@ -3086,12 +3095,12 @@
 
             $serendipity['dbPrefix'],
             $list,
-            $entry_id,
-            $url_parts['scheme'],
-            $url_parts['host'],
-            $url_parts['port'],
-            $url_parts['path'],
-            $url_parts['query']
+            (int)$entry_id,
+            serendipity_db_escape_string($url_parts['scheme']),
+            serendipity_db_escape_string($url_parts['host']),
+            serendipity_db_escape_string($url_parts['port']),
+            serendipity_db_escape_string($url_parts['path']),
+            serendipity_db_escape_string($url_parts['query'])
           )
         );
     }
@@ -3244,10 +3253,10 @@
         return;
     }
 
-    $query = "DELETE FROM $serendipity[dbPrefix]entrycat WHERE entryid = $postid";
+    $query = "DELETE FROM $serendipity[dbPrefix]entrycat WHERE entryid = " . (int)$postid;
     serendipity_db_query($query);
 
-    $query = "INSERT INTO $serendipity[dbPrefix]entrycat (entryid, categoryid) VALUES ($categories[0], $postid)";
+    $query = "INSERT INTO $serendipity[dbPrefix]entrycat (entryid, categoryid) VALUES (" . (int)$categories[0] . ", " . (int)$postid . ")";
     serendipity_db_query($query);
 }
 

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.49.2.1
retrieving revision 1.49.2.2
diff -u -d -r1.49.2.1 -r1.49.2.2
--- index.php	9 Sep 2004 15:02:15 -0000	1.49.2.1
+++ index.php	14 Sep 2004 13:11:16 -0000	1.49.2.2
@@ -115,7 +115,7 @@
         }
     }
 
-    $id = $matches[1];
+    $id = (int)$matches[1];
 
     serendipity_track_referrer($id);
     $track_referer = false;
@@ -123,8 +123,7 @@
     $_GET['serendipity']['action'] = 'read';
     $_GET['serendipity']['id']     = $id;
 
-    $title = serendipity_db_query("SELECT title FROM {$serendipity['dbPrefix']}entries " .
-                                 'WHERE id=' . serendipity_db_escape_string($id), true);
+    $title = serendipity_db_query("SELECT title FROM {$serendipity['dbPrefix']}entries WHERE id=$id", true);
     $title = $title[0];
 
     $serendipity['blogSubTitle'] = $serendipity['blogTitle'];

Index: serendipity_functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_config.inc.php,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- serendipity_functions_config.inc.php	30 Aug 2004 09:13:59 -0000	1.10
+++ serendipity_functions_config.inc.php	14 Sep 2004 13:11:17 -0000	1.10.2.1
@@ -3,7 +3,7 @@
 function serendipity_set_config_var($name, $val, $authorid = 0) {
     global $serendipity;
 
-        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}config where name='" . serendipity_db_escape_string($name) . "' AND authorid = " . serendipity_db_escape_string($authorid));
+        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}config where name='" . serendipity_db_escape_string($name) . "' AND authorid = " . (int)$authorid);
         $r = serendipity_db_insert('config', array('name' => $name, 'value' => $val, 'authorid' => $authorid));
         $serendipity[$name] = $val;
         if (is_string($r)) {
@@ -27,7 +27,7 @@
 function serendipity_get_user_var($name, $authorid, $default) {
     global $serendipity;
 
-    $r = serendipity_db_query("SELECT $name FROM {$serendipity['dbPrefix']}authors WHERE authorid = " . serendipity_db_escape_string($authorid), true);
+    $r = serendipity_db_query("SELECT $name FROM {$serendipity['dbPrefix']}authors WHERE authorid = " . (int)$authorid, true);
 
     if (is_array($r)) {
         return $r[0];
@@ -64,7 +64,7 @@
             break;
     }
 
-    serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors SET $name = '" . serendipity_db_escape_string($val) . "' WHERE authorid = " . serendipity_db_escape_string($authorid));
+    serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors SET $name = '" . serendipity_db_escape_string($val) . "' WHERE authorid = " . (int)$authorid);
 
     if ($copy_to_s9y) {
         if (isset($user_map_array[$name])) {

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.44.2.1
retrieving revision 1.44.2.2
diff -u -d -r1.44.2.1 -r1.44.2.2
--- comment.php	14 Sep 2004 10:31:56 -0000	1.44.2.1
+++ comment.php	14 Sep 2004 13:11:15 -0000	1.44.2.2
@@ -38,12 +38,12 @@
 
     $uri = $_SERVER['REQUEST_URI'];
     if (isset($_REQUEST['entry_id'])) {
-        $id = $_REQUEST['entry_id'];
+        $id = (int)$_REQUEST['entry_id'];
     } else if ($_REQUEST['amp;entry_id']) {
         // For possible buggy variable transmission caused by an intermediate CVS-release of s9y
-        $id = $_REQUEST['amp;entry_id'];
+        $id = (int)$_REQUEST['amp;entry_id'];
     } else if (preg_match('@/(\d+)_[^/]*$@', $uri, $matches)) {
-        $id = $matches[1];
+        $id = (int)$matches[1];
     }
 
     if ($tb_logging) {
@@ -76,7 +76,7 @@
         report_pingback_failure();
     }
 } else {
-    $id = (!empty($serendipity['POST']['entry_id']) ? $serendipity['POST']['entry_id'] : $serendipity['GET']['entry_id']);
+    $id = (int)(!empty($serendipity['POST']['entry_id']) ? $serendipity['POST']['entry_id'] : $serendipity['GET']['entry_id']);
 
     $html_header = '';
 
@@ -125,7 +125,7 @@
 ?>
     <div class="serendipity_commentsTitle"><?php echo COMMENTS; ?></div>
 <?php
-            $query = "SELECT allow_comments, moderate_comments FROM {$serendipity['dbPrefix']}entries WHERE id = '$id'";
+            $query = "SELECT allow_comments, moderate_comments FROM {$serendipity['dbPrefix']}entries WHERE id = '" . $id . "'";
             $ca    = serendipity_db_query($query, true);
 
             serendipity_printComments(serendipity_fetchComments($id), (isset($ca['allow_comments']) ? $ca['allow_comments'] : true));

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.14,1.14.2.1

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_karma.php 
Log Message:
MFH


Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.14
retrieving revision 1.14.2.1
diff -u -d -r1.14 -r1.14.2.1
--- serendipity_event_karma.php	31 Aug 2004 12:52:56 -0000	1.14
+++ serendipity_event_karma.php	14 Sep 2004 13:11:17 -0000	1.14.2.1
@@ -518,7 +518,7 @@
                                 . PLUGIN_KARMA_CURRENT . ($track_clicks == 'true' ? PLUGIN_KARMA_VISITSCOUNT : '') . '</div>';
 
                             if ($addData['extended']) {
-                                $entryid = serendipity_db_escape_string($eventData[0]['id']);
+                                $entryid = (int)serendipity_db_escape_string($eventData[0]['id']);
 
                                 if ($track_clicks) {
                                     $sql = serendipity_db_query('UPDATE ' . $serendipity['dbPrefix'] . 'karma SET visits = visits + 1 WHERE entryid = ' . $entryid, true);
@@ -561,7 +561,7 @@
                                 // Get all existing entry IDs
                                 $entries  = array();
                                 for ($i = 0; $i < $elements; $i++) {
-                                    $entries[] = $eventData[$i]['id'];
+                                    $entries[] = (int)$eventData[$i]['id'];
                                 }
 
                                 // Fetch votes for all entry IDs. Store them in an array for later usage.

[php-blog-cvs] serendipity serendipity_config.inc.php,1.93,1.94

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

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

Modified Files:
	serendipity_config.inc.php 
Log Message:
0.7-beta2


Index: serendipity_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_config.inc.php,v
retrieving revision 1.93
retrieving revision 1.94
diff -u -d -r1.93 -r1.94
--- serendipity_config.inc.php	6 Sep 2004 10:08:55 -0000	1.93
+++ serendipity_config.inc.php	14 Sep 2004 13:11:29 -0000	1.94
@@ -15,7 +15,7 @@
 
 include_once(S9Y_INCLUDE_PATH . 'compat.php');
 
-$serendipity['version']         = '0.7-beta1';
+$serendipity['version']         = '0.7-beta2';
 $serendipity['defaultTemplate'] = 'default'; // Name of folder for the default theme
 $serendipity['production']      = 1;
 $serendipity['rewrite']         = 'none';

[php-blog-cvs] serendipity/plugins/serendipity_plugin_shoutbox serendipity_plugin_shoutbox.php,1.10,1.10.2.1

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_plugin_shoutbox.php 
Log Message:
MFH


Index: serendipity_plugin_shoutbox.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- serendipity_plugin_shoutbox.php	22 Jun 2004 13:45:49 -0000	1.10
+++ serendipity_plugin_shoutbox.php	14 Sep 2004 13:11:20 -0000	1.10.2.1
@@ -123,7 +123,7 @@
 
                     $serendipity['dbPrefix'],
                     time(),
-                    $_SERVER['REMOTE_ADDR'],
+                    serendipity_db_escape_string($_SERVER['REMOTE_ADDR']),
                     serendipity_db_escape_string($_REQUEST['serendipity']['shouttext']));
             serendipity_db_query($sql);
         }
@@ -133,7 +133,7 @@
                               WHERE id = %d
                               LIMIT 1",
                                     $serendipity['dbPrefix'],
-                                    $serendipity['GET']['comment_id']);
+                                    (int)$serendipity['GET']['comment_id']);
             serendipity_db_query($sql);
          }
 

[php-blog-cvs] serendipity/plugins/serendipity_event_trackexits serendipity_event_trackexits.php,1.11,1.11.2.1

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_event_trackexits.php 
Log Message:
MFH


Index: serendipity_event_trackexits.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits/serendipity_event_trackexits.php,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -u -d -r1.11 -r1.11.2.1
--- serendipity_event_trackexits.php	9 Jul 2004 19:11:26 -0000	1.11
+++ serendipity_event_trackexits.php	14 Sep 2004 13:11:17 -0000	1.11.2.1
@@ -106,7 +106,7 @@
                         if (serendipity_db_bool($this->get_config($temp['name'], true)) && isset($eventData[$temp['element']])) {
                             $element = $temp['element'];
 
-                            $serendipity['encodeExitsCallback_entry_id'] = (isset($eventData['entry_id']) ? $eventData['entry_id'] : $eventData['id']);
+                            $serendipity['encodeExitsCallback_entry_id'] = (int)(isset($eventData['entry_id']) ? $eventData['entry_id'] : $eventData['id']);
 
                             // Fetch all existing links from the database. They have been inserted there by our trackback-discovery.
                             if (empty($serendipity['encodeExitsCallback_entry_id'])) {

[php-blog-cvs] serendipity/plugins/serendipity_event_trackexits serendipity_event_trackexits.php,1.11,1.12

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

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

Modified Files:
	serendipity_event_trackexits.php 
Log Message:
fixed some more potential sql issues, beautify.


Index: serendipity_event_trackexits.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_trackexits/serendipity_event_trackexits.php,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- serendipity_event_trackexits.php	9 Jul 2004 19:11:26 -0000	1.11
+++ serendipity_event_trackexits.php	14 Sep 2004 12:56:09 -0000	1.12
@@ -106,7 +106,7 @@
                         if (serendipity_db_bool($this->get_config($temp['name'], true)) && isset($eventData[$temp['element']])) {
                             $element = $temp['element'];
 
-                            $serendipity['encodeExitsCallback_entry_id'] = (isset($eventData['entry_id']) ? $eventData['entry_id'] : $eventData['id']);
+                            $serendipity['encodeExitsCallback_entry_id'] = (int)(isset($eventData['entry_id']) ? $eventData['entry_id'] : $eventData['id']);
 
                             // Fetch all existing links from the database. They have been inserted there by our trackback-discovery.
                             if (empty($serendipity['encodeExitsCallback_entry_id'])) {

[php-blog-cvs] serendipity comment.php,1.46,1.47 index.php,1.49,1.50 serendipity_admin_comments.inc.php,1.18,1.19 serendipity_admin_users.inc.php,1.10,1.11 serendipity_functions.inc.php,1.423,1.424 serendipity_functions_config.inc.php,1.10,1.11 serendipity_functions_images.inc.php,1.36,1.37

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

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

Modified Files:
	comment.php index.php serendipity_admin_comments.inc.php 
	serendipity_admin_users.inc.php serendipity_functions.inc.php 
	serendipity_functions_config.inc.php 
	serendipity_functions_images.inc.php 
Log Message:
fixed some more potential sql issues, beautify.


Index: serendipity_admin_users.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_users.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_admin_users.inc.php	9 Sep 2004 10:52:03 -0000	1.10
+++ serendipity_admin_users.inc.php	14 Sep 2004 12:56:08 -0000	1.11
@@ -22,7 +22,7 @@
     } elseif ($_POST['userlevel'] > $serendipity['serendipityUserlevel']) {
         echo '<strong>' . CREATE_NOT_AUTHORIZED_USERLEVEL . '</strong>';
     } else {
-        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}authors WHERE authorid={$serendipity['POST']['user']}");
+        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}authors WHERE authorid=" . (int)$serendipity['POST']['user']);
         printf('<strong>' . DELETED_USER . '</strong>', $serendipity['POST']['user'], $user[0]['username']);
     }
 }
@@ -37,8 +37,8 @@
                                 password
                               )
                       VALUES  (
-                                '{$_POST['username']}',
-                                '$enc_pass'
+                                '" . serendipity_db_escape_string($_POST['username']) . "',
+                                '" . serendipity_db_escape_String($enc_pass) . "'
                               )";
         serendipity_db_query($query);
         $serendipity['POST']['user'] = serendipity_db_insert_id('authors', 'authorid');

Index: serendipity_admin_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- serendipity_admin_comments.inc.php	14 Sep 2004 10:47:26 -0000	1.18
+++ serendipity_admin_comments.inc.php	14 Sep 2004 12:56:08 -0000	1.19
@@ -24,8 +24,8 @@
                         url       = '" . serendipity_db_escape_string($serendipity['POST']['url'])     . "',
                         parent_id = '" . serendipity_db_escape_string($serendipity['POST']['replyTo']) . "',
                         body      = '" . serendipity_db_escape_string($serendipity['POST']['comment']) . "'
-            WHERE id = " . serendipity_db_escape_string($serendipity['GET']['id']) . " AND
-                  entry_id = " . serendipity_db_escape_string($serendipity['POST']['entry_id']);
+            WHERE id = " . (int)$serendipity['GET']['id'] . " AND
+                  entry_id = " . (int)$serendipity['POST']['entry_id'];
     serendipity_db_query($sql);
     echo COMMENT_EDITED;
     return true;
@@ -38,7 +38,7 @@
             FROM {$serendipity['dbPrefix']}comments c
             LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id)
             LEFT JOIN {$serendipity['dbPrefix']}authors a ON (e.authorid = a.authorid)
-            WHERE c.id = " . serendipity_db_escape_string($serendipity['GET']['id'])  ." AND status = 'pending'";
+            WHERE c.id = " . (int)$serendipity['GET']['id']  ." AND status = 'pending'";
     $rs  = serendipity_db_query($sql, true);
 
     if ($rs === false) {
@@ -63,7 +63,7 @@
 
     /* If we are not in preview, we need data from our database */
     if (!isset($serendipity['POST']['preview']) ) {
-        $comment = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}comments WHERE id = ". $serendipity['GET']['id']);
+        $comment = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}comments WHERE id = ". (int)$serendipity['GET']['id']);
         $data['name']       = $comment[0]['author'];
         $data['email']      = $comment[0]['email'];
         $data['url']        = $comment[0]['url'];

Index: serendipity_functions_images.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_images.inc.php,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- serendipity_functions_images.inc.php	2 Sep 2004 13:41:00 -0000	1.36
+++ serendipity_functions_images.inc.php	14 Sep 2004 12:56:08 -0000	1.37
@@ -6,11 +6,12 @@
 function serendipity_fetchImagesFromDatabase($start=0, $limit=0, &$total, $order = false, $ordermode = false, $directory = '') {
     global $serendipity;
 
-    if (empty($order)) {
+    $orderfields = serendipity_getImageFields();
+    if (empty($order) || !isset($orderfields[$order])) {
         $order = 'date';
     }
 
-    if (empty($ordermode)) {
+    if (empty($ordermode) || ($ordermode != 'DESC' && $ordermode != 'ASC')) {
         $ordermode = 'DESC';
     }
 
@@ -39,7 +40,7 @@
 
 function serendipity_fetchImageFromDatabase($id) {
     global $serendipity;
-    $rs = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}images WHERE id = ". $id, true, 'assoc');
+    $rs = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}images WHERE id = ". (int)$id, true, 'assoc');
     return $rs;
 }
 
@@ -54,9 +55,9 @@
     $i=0;
     if (sizeof($updates) > 0) {
         foreach ($updates as $k => $v) {
-            $q[] = $k ." = '" . $v . "'";
+            $q[] = $k ." = '" . serendipity_db_escape_string($v) . "'";
         }
-        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}images SET ". implode($q, ',') ." WHERE id = $id $admin");
+        serendipity_db_query("UPDATE {$serendipity['dbPrefix']}images SET ". implode($q, ',') ." WHERE id = " . (int)$id . " $admin");
         $i++;
     }
     return $i;
@@ -87,7 +88,7 @@
     } else {
         printf(FILE_NOT_FOUND . '<br />', $dFile);
     }
-    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}images WHERE id = ". $id);
+    serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}images WHERE id = ". (int)$id);
 }
 
 /**
@@ -159,12 +160,12 @@
       serendipity_db_escape_string($filename),
       serendipity_db_escape_string($extension),
       serendipity_db_escape_string($mimetype),
-      serendipity_db_escape_string($filesize),
-      serendipity_db_escape_string($width),
-      serendipity_db_escape_string($height),
+      (int)$filesize,
+      (int)$width,
+      (int)$height,
       serendipity_db_escape_string($thumbnail),
-      serendipity_db_escape_string($date),
-      serendipity_db_escape_string($authorid),
+      (int)$date,
+      (int)$authorid,
       serendipity_db_escape_string($directory)
     );
 
@@ -542,8 +543,8 @@
 
         $rs = serendipity_db_query("SELECT * FROM {$serendipity['dbPrefix']}images
                                             WHERE name = '" . serendipity_db_escape_string($fbase) . "'
-                                              " . ($fdir != '' ? "AND path = '$fdir'" : '') . "
-                                              AND mime = '$fdim[mime]'", true, 'assoc');
+                                              " . ($fdir != '' ? "AND path = '" . serendipity_db_escape_string($fdir) . "'" : '') . "
+                                              AND mime = '" . serendipity_db_escape_string($fdim['mime']) . "'", true, 'assoc');
         if (is_array($rs)) {
             $update    = array();
             $checkfile = $serendipity['serendipityPath'] . $serendipity['uploadPath'] . $rs['path'] . $rs['name'] . '.' . $rs['thumbnail_name'] . '.' . $rs['extension'];
@@ -694,15 +695,7 @@
     $left  = '<input type="button" value="&lt;&lt;&lt;" onclick="location.href=\'?'. $extraParems .'serendipity[page]=' . ($page-1) . '\';" '. (($start <= 0) ? 'disabled' : '') .'>' . "\n";
     $right = '<input type="button" value="&gt;&gt;&gt;" onclick="location.href=\'?'. $extraParems .'serendipity[page]=' . ($page+1) . '\';" '. (($totalImages < $start+$perPage) ? 'disabled' : '') .'>' . "\n";
 
-    $sort_order = array(
-                    'date'              => SORT_ORDER_DATE,
-                    'name'              => SORT_ORDER_NAME,
-                    'authorid'          => AUTHOR,
-                    'extension'         => SORT_ORDER_EXTENSION,
-                    'size'              => SORT_ORDER_SIZE,
-                    'dimensions_width'  => SORT_ORDER_WIDTH,
-                    'dimensions_height' => SORT_ORDER_HEIGHT
-    );
+    $sort_order = serendipity_getImageFields();
 
     serendipity_traversePath(
       $paths,
@@ -1035,4 +1028,16 @@
 
     return $fdim;
 }
-?>
+
+function serendipity_getImageFields() {
+    return array(
+        'date'              => SORT_ORDER_DATE,
+        'name'              => SORT_ORDER_NAME,
+        'authorid'          => AUTHOR,
+        'extension'         => SORT_ORDER_EXTENSION,
+        'size'              => SORT_ORDER_SIZE,
+        'dimensions_width'  => SORT_ORDER_WIDTH,
+        'dimensions_height' => SORT_ORDER_HEIGHT
+    );
+}
+?>
\ No newline at end of file

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.423
retrieving revision 1.424
diff -u -d -r1.423 -r1.424
--- serendipity_functions.inc.php	14 Sep 2004 10:47:26 -0000	1.423
+++ serendipity_functions.inc.php	14 Sep 2004 12:56:08 -0000	1.424
@@ -650,15 +650,15 @@
         }
     }
     elseif (is_array($range) && count($range)==2) {
-        $startts = $range[0];
-        $endts   = $range[1];
+        $startts = (int)$range[0];
+        $endts   = (int)$range[1];
         $and = " WHERE timestamp >= $startts AND timestamp <= $endts";
     }
      else {
         if ($modified_since) {
             $unix_modified = strtotime($modified_since);
             if ($unix_modified != -1) {
-                $and = ' WHERE last_modified >= ' . $unix_modified;
+                $and = ' WHERE last_modified >= ' . (int)$unix_modified;
                 if (!empty($limit)) {
                     $limit = ($limit > $serendipity['max_fetch_limit'] ? $limit : $serendipity['max_fetch_limit']);
                 }
@@ -834,7 +834,7 @@
                             {$serendipity['dbPrefix']}authors a
                     WHERE
                             a.authorid = e.authorid
-                            AND e.$key LIKE $val
+                            AND e.$key LIKE '" . serendipity_db_escape_string($val) . "'
                             $admin
                             $drafts
                     LIMIT 1";
@@ -858,7 +858,7 @@
         $authorid = 'all';
     }
 
-    if ($authorid != 'all') {
+    if ($authorid != 'all' && is_numeric($authorid)) {
         $where = " WHERE (c.authorid = $authorid OR c.authorid = 0) OR a.userlevel < ".$serendipity['serendipityUserlevel'];
     } else {
         $where = '';
@@ -1813,7 +1813,7 @@
     $sql = "SELECT $pgsql_insert author, email, type
             FROM {$serendipity['dbPrefix']}comments
             WHERE entry_id = '". (int)$entry_id ."'
-              AND email <> '$posterMail'
+              AND email <> '" . serendipity_db_escape_string($posterMail) . "'
               AND subscribed = 'true' $mysql_insert";
     $subscribers = serendipity_db_query($sql);
 
@@ -1855,7 +1855,7 @@
     $sql = "UPDATE {$serendipity['dbPrefix']}comments
                 SET subscribed = 'false'
             WHERE entry_id = '". (int)$entry_id ."'
-                AND email = '$email'";
+                AND email = '" . serendipity_db_escape_string($email) . "'";
     serendipity_db_query($sql);
 
     return serendipity_db_affected_rows();
@@ -2671,9 +2671,7 @@
     serendipity_purgeEntry($id, $result[0]);
 
     serendipity_db_query("DELETE FROM {$serendipity["dbPrefix"]}entries WHERE id=$id");
-
     serendipity_db_query("DELETE FROM {$serendipity["dbPrefix"]}comments WHERE entry_id=$id");
-
     serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}references WHERE entry_id='$id'");
 }
 
@@ -3123,8 +3121,8 @@
                   FROM
                     $serendipity[dbPrefix]authors
                   WHERE
-                    username = '$username'
-                  AND password = '$password'";
+                    username   = '" . serendipity_db_escape_string($username) . "'
+                  AND password = '" . serendipity_db_escape_string($password) . "'";
         $row = serendipity_db_query($query, true, 'assoc');
 
         if (is_array($row)) {
@@ -3176,31 +3174,41 @@
         if (rand(0, 100) < 1) {
             serendipity_track_referrer_gc();
         }
-        if(preg_match('/^mysqli?/', $serendipity['dbType']))
+
+        if(preg_match('/^mysqli?/', $serendipity['dbType'])) {
             $interval = 900;
-        else
+        } else {
             $interval = "interval '900'";
+        }
 
         $suppressq = "SELECT count(1)
                       FROM $serendipity[dbPrefix]suppress
-                      WHERE ip = '$_SERVER[REMOTE_ADDR]'
-                      AND scheme = '$url_parts[scheme]'
-                      AND port = '$url_parts[port]'
-                      AND host = '$url_parts[host]'
-                      AND path = '$url_parts[path]'
-                      AND query = '$url_parts[query]'
+                      WHERE ip = '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "'
+                      AND scheme = '" . serendipity_db_escape_string($url_parts['scheme']) . "'
+                      AND port = '" . serendipity_db_escape_string($url_parts['port']) . "'
+                      AND host = '" . serendipity_db_escape_string($url_parts['host']) . "'
+                      AND path = '" . serendipity_db_escape_string($url_parts['path']) . "'
+                      AND query = '" . serendipity_db_escape_string($url_parts['query']) . "'
                       AND last > now() - $interval";
 
         $suppressp = "DELETE FROM $serendipity[dbPrefix]suppress
-                      WHERE ip = '$_SERVER[REMOTE_ADDR]'
-                      AND scheme = '$url_parts[scheme]'
-                      AND host = '$url_parts[host]'
-                      AND port = '$url_parts[port]'
-                      AND query = '$url_parts[query]'
-                      AND path = '$url_parts[path]'";
+                      WHERE ip = '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "'
+                      AND scheme = '" . serendipity_db_escape_string($url_parts['scheme']) . "'
+                      AND host = '" . serendipity_db_escape_string($url_parts['host']) . "'
+                      AND port = '" . serendipity_db_escape_string($url_parts['port']) . "'
+                      AND query = '" . serendipity_db_escape_string($url_parts['query']) . "'
+                      AND path = '" . serendipity_db_escape_string($url_parts['path']) . "'";
         $suppressu = "INSERT INTO $serendipity[dbPrefix]suppress
                       (ip, last, scheme, host, port, path, query)
-                      VALUES ('$_SERVER[REMOTE_ADDR]', now(), '$url_parts[scheme]', '$url_parts[host]', '$url_parts[port]', '$url_parts[path]', '$url_parts[query]')";
+                      VALUES (
+                      '" . serendipity_db_escape_string($_SERVER['REMOTE_ADDR']) . "',
+                      now(),
+                      '" . serendipity_db_escape_string($url_parts['scheme']) . "',
+                      '" . serendipity_db_escape_string($url_parts['host']) . "',
+                      '" . serendipity_db_escape_string($url_parts['port']) . "',
+                      '" . serendipity_db_escape_string($url_parts['path']) . "',
+                      '" . serendipity_db_escape_string($url_parts['query']) . "'
+                      )";
 
         $count = serendipity_db_query($suppressq, true);
 
@@ -3248,11 +3256,11 @@
 
         $serendipity['dbPrefix'],
         $list,
-        $url_parts['scheme'],
-        $url_parts['host'],
-        $url_parts['port'],
-        $url_parts['path'],
-        $url_parts['query'],
+        serendipity_db_escape_string($url_parts['scheme']),
+        serendipity_db_escape_string($url_parts['host']),
+        serendipity_db_escape_string($url_parts['port']),
+        serendipity_db_escape_string($url_parts['path']),
+        serendipity_db_escape_string($url_parts['query']),
         ($entry_id != 0) ? "AND entry_id = '". (int)$entry_id ."'" : ''
       )
     );
@@ -3266,12 +3274,12 @@
 
             $serendipity['dbPrefix'],
             $list,
-            $entry_id,
-            $url_parts['scheme'],
-            $url_parts['host'],
-            $url_parts['port'],
-            $url_parts['path'],
-            $url_parts['query']
+            (int)$entry_id,
+            serendipity_db_escape_string($url_parts['scheme']),
+            serendipity_db_escape_string($url_parts['host']),
+            serendipity_db_escape_string($url_parts['port']),
+            serendipity_db_escape_string($url_parts['path']),
+            serendipity_db_escape_string($url_parts['query'])
           )
         );
     }
@@ -3424,10 +3432,10 @@
         return;
     }
 
-    $query = "DELETE FROM $serendipity[dbPrefix]entrycat WHERE entryid = $postid";
+    $query = "DELETE FROM $serendipity[dbPrefix]entrycat WHERE entryid = " . (int)$postid;
     serendipity_db_query($query);
 
-    $query = "INSERT INTO $serendipity[dbPrefix]entrycat (entryid, categoryid) VALUES ($categories[0], $postid)";
+    $query = "INSERT INTO $serendipity[dbPrefix]entrycat (entryid, categoryid) VALUES (" . (int)$categories[0] . ", " . (int)$postid . ")";
     serendipity_db_query($query);
 }
 

Index: index.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/index.php,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -d -r1.49 -r1.50
--- index.php	24 Aug 2004 17:32:45 -0000	1.49
+++ index.php	14 Sep 2004 12:56:08 -0000	1.50
@@ -114,7 +114,7 @@
         }
     }
 
-    $id = $matches[1];
+    $id = (int)$matches[1];
 
     serendipity_track_referrer($id);
     $track_referer = false;
@@ -122,8 +122,7 @@
     $_GET['serendipity']['action'] = 'read';
     $_GET['serendipity']['id']     = $id;
 
-    $title = serendipity_db_query("SELECT title FROM {$serendipity['dbPrefix']}entries " .
-                                 'WHERE id=' . serendipity_db_escape_string($id), true);
+    $title = serendipity_db_query("SELECT title FROM {$serendipity['dbPrefix']}entries WHERE id=$id", true);
     $title = $title[0];
 
     $serendipity['blogSubTitle'] = $serendipity['blogTitle'];
@@ -176,7 +175,7 @@
 } else if (preg_match(PAT_CATEGORIES, $uri, $matches) ||
            preg_match('@/(index\.(php|html))?@', $uri) ||
            preg_match('@/(' . preg_quote($serendipity['indexFile']) . ')?@', $uri)) {
-    
+
     if (count($serendipity['GET']) == 2) {
         if (isset($matches) && is_array($matches) && isset($matches[1])) {
             $serendipity['GET']['category'] = $matches[1];

Index: serendipity_functions_config.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions_config.inc.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_functions_config.inc.php	30 Aug 2004 09:13:59 -0000	1.10
+++ serendipity_functions_config.inc.php	14 Sep 2004 12:56:08 -0000	1.11
@@ -3,7 +3,7 @@
 function serendipity_set_config_var($name, $val, $authorid = 0) {
     global $serendipity;
 
-        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}config where name='" . serendipity_db_escape_string($name) . "' AND authorid = " . serendipity_db_escape_string($authorid));
+        serendipity_db_query("DELETE FROM {$serendipity['dbPrefix']}config where name='" . serendipity_db_escape_string($name) . "' AND authorid = " . (int)$authorid);
         $r = serendipity_db_insert('config', array('name' => $name, 'value' => $val, 'authorid' => $authorid));
         $serendipity[$name] = $val;
         if (is_string($r)) {
@@ -27,7 +27,7 @@
 function serendipity_get_user_var($name, $authorid, $default) {
     global $serendipity;
 
-    $r = serendipity_db_query("SELECT $name FROM {$serendipity['dbPrefix']}authors WHERE authorid = " . serendipity_db_escape_string($authorid), true);
+    $r = serendipity_db_query("SELECT $name FROM {$serendipity['dbPrefix']}authors WHERE authorid = " . (int)$authorid, true);
 
     if (is_array($r)) {
         return $r[0];
@@ -64,7 +64,7 @@
             break;
     }
 
-    serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors SET $name = '" . serendipity_db_escape_string($val) . "' WHERE authorid = " . serendipity_db_escape_string($authorid));
+    serendipity_db_query("UPDATE {$serendipity['dbPrefix']}authors SET $name = '" . serendipity_db_escape_string($val) . "' WHERE authorid = " . (int)$authorid);
 
     if ($copy_to_s9y) {
         if (isset($user_map_array[$name])) {

Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -d -r1.46 -r1.47
--- comment.php	13 Sep 2004 20:06:26 -0000	1.46
+++ comment.php	14 Sep 2004 12:56:08 -0000	1.47
@@ -38,12 +38,12 @@
 
     $uri = $_SERVER['REQUEST_URI'];
     if (isset($_REQUEST['entry_id'])) {
-        $id = $_REQUEST['entry_id'];
+        $id = (int)$_REQUEST['entry_id'];
     } else if ($_REQUEST['amp;entry_id']) {
         // For possible buggy variable transmission caused by an intermediate CVS-release of s9y
-        $id = $_REQUEST['amp;entry_id'];
+        $id = (int)$_REQUEST['amp;entry_id'];
     } else if (preg_match('@/(\d+)_[^/]*$@', $uri, $matches)) {
-        $id = $matches[1];
+        $id = (int)$matches[1];
     }
 
     if ($tb_logging) {
@@ -76,7 +76,7 @@
         report_pingback_failure();
     }
 } else {
-    $id = (!empty($serendipity['POST']['entry_id']) ? $serendipity['POST']['entry_id'] : $serendipity['GET']['entry_id']);
+    $id = (int)(!empty($serendipity['POST']['entry_id']) ? $serendipity['POST']['entry_id'] : $serendipity['GET']['entry_id']);
 
     $html_header = '';
 
@@ -125,7 +125,7 @@
 ?>
     <div class="serendipity_commentsTitle"><?php echo COMMENTS; ?></div>
 <?php
-            $query = "SELECT allow_comments, moderate_comments FROM {$serendipity['dbPrefix']}entries WHERE id = '$id'";
+            $query = "SELECT allow_comments, moderate_comments FROM {$serendipity['dbPrefix']}entries WHERE id = '" . $id . "'";
             $ca    = serendipity_db_query($query, true);
 
             serendipity_printComments(serendipity_fetchComments($id), (isset($ca['allow_comments']) ? $ca['allow_comments'] : true));

[php-blog-cvs] serendipity/plugins/serendipity_event_karma serendipity_event_karma.php,1.14,1.15

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

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

Modified Files:
	serendipity_event_karma.php 
Log Message:
fixed some more potential sql issues, beautify.


Index: serendipity_event_karma.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_event_karma/serendipity_event_karma.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- serendipity_event_karma.php	31 Aug 2004 12:52:56 -0000	1.14
+++ serendipity_event_karma.php	14 Sep 2004 12:56:10 -0000	1.15
@@ -518,7 +518,7 @@
                                 . PLUGIN_KARMA_CURRENT . ($track_clicks == 'true' ? PLUGIN_KARMA_VISITSCOUNT : '') . '</div>';
 
                             if ($addData['extended']) {
-                                $entryid = serendipity_db_escape_string($eventData[0]['id']);
+                                $entryid = (int)serendipity_db_escape_string($eventData[0]['id']);
 
                                 if ($track_clicks) {
                                     $sql = serendipity_db_query('UPDATE ' . $serendipity['dbPrefix'] . 'karma SET visits = visits + 1 WHERE entryid = ' . $entryid, true);
@@ -561,7 +561,7 @@
                                 // Get all existing entry IDs
                                 $entries  = array();
                                 for ($i = 0; $i < $elements; $i++) {
-                                    $entries[] = $eventData[$i]['id'];
+                                    $entries[] = (int)$eventData[$i]['id'];
                                 }
 
                                 // Fetch votes for all entry IDs. Store them in an array for later usage.

[php-blog-cvs] serendipity/plugins/serendipity_plugin_shoutbox serendipity_plugin_shoutbox.php,1.10,1.11

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

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

Modified Files:
	serendipity_plugin_shoutbox.php 
Log Message:
fixed some more potential sql issues, beautify.


Index: serendipity_plugin_shoutbox.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/plugins/serendipity_plugin_shoutbox/serendipity_plugin_shoutbox.php,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- serendipity_plugin_shoutbox.php	22 Jun 2004 13:45:49 -0000	1.10
+++ serendipity_plugin_shoutbox.php	14 Sep 2004 12:56:09 -0000	1.11
@@ -123,7 +123,7 @@
 
                     $serendipity['dbPrefix'],
                     time(),
-                    $_SERVER['REMOTE_ADDR'],
+                    serendipity_db_escape_string($_SERVER['REMOTE_ADDR']),
                     serendipity_db_escape_string($_REQUEST['serendipity']['shouttext']));
             serendipity_db_query($sql);
         }
@@ -133,7 +133,7 @@
                               WHERE id = %d
                               LIMIT 1",
                                     $serendipity['dbPrefix'],
-                                    $serendipity['GET']['comment_id']);
+                                    (int)$serendipity['GET']['comment_id']);
             serendipity_db_query($sql);
          }
 

[php-blog-cvs] serendipity NEWS,1.215,1.216 serendipity_admin_comments.inc.php,1.17,1.18 serendipity_functions.inc.php,1.422,1.423

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

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

Modified Files:
	NEWS serendipity_admin_comments.inc.php 
	serendipity_functions.inc.php 
Log Message:
* Updated english language file with propositions by Jason Levitt
* fixed pgsql issues with comments and quicksearch by Mauri Sahlberg


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.215
retrieving revision 1.216
diff -u -d -r1.215 -r1.216
--- NEWS	10 Sep 2004 15:13:10 -0000	1.215
+++ NEWS	14 Sep 2004 10:47:26 -0000	1.216
@@ -3,9 +3,11 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed postgreSQL quicksearch, thanks to Mauri Sahlberg!
+
     * Added Norwegian translations, thanks to Jo Christian
 
-    * Fixed postgresql bug for viewing comment moderation panel
+    * Fixed postgreSQL bugs for viewing comment moderation panel
       (garvinhicking)
 
     * Fixed postgresql bug for fetching the last entry id. Will fix bug

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.422
retrieving revision 1.423
diff -u -d -r1.422 -r1.423
--- serendipity_functions.inc.php	13 Sep 2004 20:40:39 -0000	1.422
+++ serendipity_functions.inc.php	14 Sep 2004 10:47:26 -0000	1.423
@@ -912,12 +912,15 @@
 function serendipity_searchEntries($term) {
     global $serendipity;
 
+    $term = serendipity_db_escape_string($term);
     if (strtolower($serendipity['dbType']) == 'postgres') {
-        $group    = '';
-        $distinct = 'DISTINCT';
+        $group     = '';
+        $distinct  = 'DISTINCT';
+        $find_part = "(title~'$term' OR body~'$term' OR extended~'$term')";
     } else {
-        $group    = 'GROUP BY e.id';
-        $distinct = '';
+        $group     = 'GROUP BY e.id';
+        $distinct  = '';
+        $find_part = "MATCH(title,body,extended) AGAINST('$term')";
     }
 
     $querystring = "SELECT $distinct
@@ -940,7 +943,7 @@
                     WHERE
                             a.authorid = e.authorid
                             AND e.id = ec.entryid
-                            AND MATCH (title,body,extended) AGAINST ('" . serendipity_db_escape_string($term) . "')
+                            AND $find_part
                             AND isdraft = 'false'
                             AND timestamp <= " . time() . "
                     $group
@@ -2498,8 +2501,8 @@
             $locations[$i] = 'http' . (!empty($_SERVER['HTTPS']) && strtolower($_SERVER['HTTPS']) != 'off' ? 's' : '') . '://' . $_SERVER['HTTP_HOST'] . $locations[$i];
         }
 
-        $query = "SELECT COUNT(id) FROM {$serendipity['dbPrefix']}references 
-                            WHERE entry_id = '". (int)$tmpid ."' 
+        $query = "SELECT COUNT(id) FROM {$serendipity['dbPrefix']}references
+                            WHERE entry_id = '". (int)$tmpid ."'
                                   AND link = '" . serendipity_db_escape_string($locations[$i]) . "'";
 
         $row = serendipity_db_query($query, true, 'num');

Index: serendipity_admin_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- serendipity_admin_comments.inc.php	9 Sep 2004 11:17:27 -0000	1.17
+++ serendipity_admin_comments.inc.php	14 Sep 2004 10:47:26 -0000	1.18
@@ -115,7 +115,7 @@
 
 
 /* Paging */
-$sql = serendipity_db_query("SELECT COUNT(*) AS total FROM {$serendipity['dbPrefix']}comments c WHERE c.type = 'normal' ". $and, true);
+$sql = serendipity_db_query("SELECT COUNT(*) AS total FROM {$serendipity['dbPrefix']}comments c WHERE c.type = 'NORMAL' ". $and, true);
 
 $totalComments = $sql['total'];
 $pages = ceil($totalComments/$commentsPerPage);

[php-blog-cvs] serendipity/lang serendipity_lang_en.inc.php,1.79,1.80

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

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

Modified Files:
	serendipity_lang_en.inc.php 
Log Message:
* Updated english language file with propositions by Jason Levitt
* fixed pgsql issues with comments and quicksearch by Mauri Sahlberg


Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.79
retrieving revision 1.80
diff -u -d -r1.79 -r1.80
--- serendipity_lang_en.inc.php	5 Sep 2004 19:31:00 -0000	1.79
+++ serendipity_lang_en.inc.php	14 Sep 2004 10:47:26 -0000	1.80
@@ -20,7 +20,7 @@
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administration Suite');
 @define('HAVE_TO_BE_LOGGED_ON', 'You have to be logged in to view this page');
-@define('WRONG_USERNAME_OR_PASSWORD', 'You appear to have entered a wrong username or password');
+@define('WRONG_USERNAME_OR_PASSWORD', 'You appear to have entered an invalid username or password');
 @define('APPEARANCE', 'Appearance');
 @define('MANAGE_STYLES', 'Manage styles');
 @define('CONFIGURE_PLUGINS', 'Configure Plugins');
@@ -107,7 +107,7 @@
 @define('NEWSIZE', 'New size: ');
 @define('RESIZE_BLAHBLAH', '<b>Resize %s</b><p>');
 @define('ORIGINAL_SIZE', 'Original size: <i>%sx%s</i> pixel');
-@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Here you can adjust the images new size. If you want to keep the proportions, just enter one value and press the TAB key, I\'ll automatically calculate the new size so the proportions  one value and press the TAB key, I\'ll automatically calculate the new size so the proportions don\'t get messed up:');
+@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Here, you can adjust the image size. If you want to resize the image proportionally, just enter a value in one of the two boxes and press the TAB key --  I\'ll automatically calculate the new size so the image proportions don\'t get messed up</p>');
 @define('QUICKJUMP_CALENDAR', 'QuickJump Calendar');
 @define('QUICKSEARCH', 'Quicksearch');
 @define('SEARCH_FOR_ENTRY', 'Search for an entry');
@@ -153,11 +153,11 @@
 @define('DIRECT_LINK', 'Direct link to this entry');
 @define('COMMENT_ADDED', 'Your comment was successfully added. ');
 @define('COMMENT_ADDED_CLICK', 'Click %shere to return%s to the comments, and %shere to close%s this window.');
-@define('COMMENT_NOT_ADDED', 'Your comment could not be added, because comments for this entry has been disabled. ');
+@define('COMMENT_NOT_ADDED', 'Your comment could not be added, because comments for this entry have been disabled. ');
 @define('COMMENT_NOT_ADDED_CLICK', 'Click %shere to return%s to the comments, and %shere to close%s this window.');
 @define('COMMENTS_DISABLE', 'Do not allow comments to this entry');
 @define('COMMENTS_ENABLE', 'Allow comments to this entry');
-@define('COMMENTS_CLOSED', 'The author has not allowed comments to this entry');
+@define('COMMENTS_CLOSED', 'The author does not allow comments to this entry');
 @define('EMPTY_COMMENT', 'Your comment did not contain anything, please %sgo back%s and try again');
 @define('ENTRIES_FOR', 'Entries for %s');
 @define('DOCUMENT_NOT_FOUND', 'The document %s was not found.');
@@ -216,8 +216,8 @@
 @define('ENTER_NEW_NAME', 'Enter the new name for: ');
 @define('RESIZING', 'Resizing');
 @define('RESIZE_DONE', 'Done (resized %s images).');
-@define('SYNCING', 'Syncronizing the database with the image folder');
-@define('SYNC_DONE', 'Done (Syncronized %s images).');
+@define('SYNCING', 'Synchronizing the database with the image folder');
+@define('SYNC_DONE', 'Done (Synchronized %s images).');
 @define('FILE_NOT_FOUND', 'Unable to locate the file entitled <b>%s</b>, maybe it has already been deleted?');
 @define('ABORT_NOW', 'Abort now');
 @define('REMOTE_FILE_NOT_FOUND', 'File was not located on the remote server, are you sure the URL: <b>%s</b> is correct?');
@@ -226,7 +226,7 @@
 @define('WORD_OR', 'Or');
 @define('SCALING_IMAGE', 'Scaling %s to %s x %s px');
 @define('KEEP_PROPORTIONS', 'Keep proportions');
-@define('REALLY_SCALE_IMAGE', 'Really scale the image? No way back!');
+@define('REALLY_SCALE_IMAGE', 'Really scale the image? This operation cannot be undone!');
 @define('TOGGLE_ALL', 'Toggle expand all');
 @define('TOGGLE_OPTION', 'Toggle option');
 @define('SUBSCRIBE_TO_THIS_ENTRY', 'Subscribe to this entry');
@@ -293,7 +293,7 @@
 @define('THUMBNAIL_SHORT', 'Thumb');
 @define('ORIGINAL_SHORT', 'Orig.');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prevent HTTP caching');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true" this will suggest the link to your RSS feed to not allow clients the bandwidth saving caching of RSS feed request. It is suggested to set this to "false".');
+@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true", this will modify the link to your RSS feed to NOT include a setting for bandwidth saving caching of RSS feed requests. It is recommended to set this to "false", so that clients can benefit from caching.');
 @define('APPLY_MARKUP_TO', 'Apply markup to %s');
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Beginning of the week');
 @define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity has detected that your configuration is currently installed with version %s, however serendipity itself is installed as version %s, you need to upgrade! <a href="%s">Click here</a>');

[php-blog-cvs] serendipity NEWS,1.214.2.2,1.214.2.3 serendipity_admin_comments.inc.php,1.17,1.17.2.1 serendipity_functions.inc.php,1.419.2.12,1.419.2.13

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

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

Modified Files:
      Tag: branch-smarty
	NEWS serendipity_admin_comments.inc.php 
	serendipity_functions.inc.php 
Log Message:
MFH


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.2
retrieving revision 1.214.2.3
diff -u -d -r1.214.2.2 -r1.214.2.3
--- NEWS	14 Sep 2004 10:30:07 -0000	1.214.2.2
+++ NEWS	14 Sep 2004 10:46:10 -0000	1.214.2.3
@@ -8,9 +8,11 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Fixed postgreSQL quicksearch, thanks to Mauri Sahlberg!
+
     * Added Norwegian translations, thanks to Jo Christian
 
-    * Fixed postgresql bug for viewing comment moderation panel
+    * Fixed postgreSQL bugs for viewing comment moderation panel
       (garvinhicking)
 
     * Fixed postgresql bug for fetching the last entry id. Will fix bug

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.12
retrieving revision 1.419.2.13
diff -u -d -r1.419.2.12 -r1.419.2.13
--- serendipity_functions.inc.php	14 Sep 2004 10:30:07 -0000	1.419.2.12
+++ serendipity_functions.inc.php	14 Sep 2004 10:46:10 -0000	1.419.2.13
@@ -870,12 +870,15 @@
 function serendipity_searchEntries($term) {
     global $serendipity;
 
+    $term = serendipity_db_escape_string($term);
     if (strtolower($serendipity['dbType']) == 'postgres') {
-        $group    = '';
-        $distinct = 'DISTINCT';
+        $group     = '';
+        $distinct  = 'DISTINCT';
+        $find_part = "(title~'$term' OR body~'$term' OR extended~'$term')";
     } else {
-        $group    = 'GROUP BY e.id';
-        $distinct = '';
+        $group     = 'GROUP BY e.id';
+        $distinct  = '';
+        $find_part = "MATCH(title,body,extended) AGAINST('$term')";
     }
 
     $querystring = "SELECT $distinct
@@ -898,7 +901,7 @@
                     WHERE
                             a.authorid = e.authorid
                             AND e.id = ec.entryid
-                            AND MATCH (title,body,extended) AGAINST ('" . serendipity_db_escape_string($term) . "')
+                            AND $find_part
                             AND isdraft = 'false'
                             AND timestamp <= " . time() . "
                     $group
@@ -1126,7 +1129,7 @@
                 $entry['rdf_ident']    = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL');
                 $entry['title']        = htmlspecialchars($entry['title']);
                 $entry['commURL']      = serendipity_archiveURL($entry['id'], $entry['title'], 'baseURL', false);
-                
+
                 if (strlen($entry['extended'])) {
                     $entry['has_extended']      = true;
                 }

Index: serendipity_admin_comments.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_admin_comments.inc.php,v
retrieving revision 1.17
retrieving revision 1.17.2.1
diff -u -d -r1.17 -r1.17.2.1
--- serendipity_admin_comments.inc.php	9 Sep 2004 11:17:27 -0000	1.17
+++ serendipity_admin_comments.inc.php	14 Sep 2004 10:46:10 -0000	1.17.2.1
@@ -115,7 +115,7 @@
 
 
 /* Paging */
-$sql = serendipity_db_query("SELECT COUNT(*) AS total FROM {$serendipity['dbPrefix']}comments c WHERE c.type = 'normal' ". $and, true);
+$sql = serendipity_db_query("SELECT COUNT(*) AS total FROM {$serendipity['dbPrefix']}comments c WHERE c.type = 'NORMAL' ". $and, true);
 
 $totalComments = $sql['total'];
 $pages = ceil($totalComments/$commentsPerPage);

[php-blog-cvs] serendipity/lang serendipity_lang_en.inc.php,1.79,1.79.2.1

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_lang_en.inc.php 
Log Message:
MFH


Index: serendipity_lang_en.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_en.inc.php,v
retrieving revision 1.79
retrieving revision 1.79.2.1
diff -u -d -r1.79 -r1.79.2.1
--- serendipity_lang_en.inc.php	5 Sep 2004 19:31:00 -0000	1.79
+++ serendipity_lang_en.inc.php	14 Sep 2004 10:46:10 -0000	1.79.2.1
@@ -20,7 +20,7 @@
 
 @define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administration Suite');
 @define('HAVE_TO_BE_LOGGED_ON', 'You have to be logged in to view this page');
-@define('WRONG_USERNAME_OR_PASSWORD', 'You appear to have entered a wrong username or password');
+@define('WRONG_USERNAME_OR_PASSWORD', 'You appear to have entered an invalid username or password');
 @define('APPEARANCE', 'Appearance');
 @define('MANAGE_STYLES', 'Manage styles');
 @define('CONFIGURE_PLUGINS', 'Configure Plugins');
@@ -107,7 +107,7 @@
 @define('NEWSIZE', 'New size: ');
 @define('RESIZE_BLAHBLAH', '<b>Resize %s</b><p>');
 @define('ORIGINAL_SIZE', 'Original size: <i>%sx%s</i> pixel');
-@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Here you can adjust the images new size. If you want to keep the proportions, just enter one value and press the TAB key, I\'ll automatically calculate the new size so the proportions  one value and press the TAB key, I\'ll automatically calculate the new size so the proportions don\'t get messed up:');
+@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Here, you can adjust the image size. If you want to resize the image proportionally, just enter a value in one of the two boxes and press the TAB key --  I\'ll automatically calculate the new size so the image proportions don\'t get messed up</p>');
 @define('QUICKJUMP_CALENDAR', 'QuickJump Calendar');
 @define('QUICKSEARCH', 'Quicksearch');
 @define('SEARCH_FOR_ENTRY', 'Search for an entry');
@@ -153,11 +153,11 @@
 @define('DIRECT_LINK', 'Direct link to this entry');
 @define('COMMENT_ADDED', 'Your comment was successfully added. ');
 @define('COMMENT_ADDED_CLICK', 'Click %shere to return%s to the comments, and %shere to close%s this window.');
-@define('COMMENT_NOT_ADDED', 'Your comment could not be added, because comments for this entry has been disabled. ');
+@define('COMMENT_NOT_ADDED', 'Your comment could not be added, because comments for this entry have been disabled. ');
 @define('COMMENT_NOT_ADDED_CLICK', 'Click %shere to return%s to the comments, and %shere to close%s this window.');
 @define('COMMENTS_DISABLE', 'Do not allow comments to this entry');
 @define('COMMENTS_ENABLE', 'Allow comments to this entry');
-@define('COMMENTS_CLOSED', 'The author has not allowed comments to this entry');
+@define('COMMENTS_CLOSED', 'The author does not allow comments to this entry');
 @define('EMPTY_COMMENT', 'Your comment did not contain anything, please %sgo back%s and try again');
 @define('ENTRIES_FOR', 'Entries for %s');
 @define('DOCUMENT_NOT_FOUND', 'The document %s was not found.');
@@ -216,8 +216,8 @@
 @define('ENTER_NEW_NAME', 'Enter the new name for: ');
 @define('RESIZING', 'Resizing');
 @define('RESIZE_DONE', 'Done (resized %s images).');
-@define('SYNCING', 'Syncronizing the database with the image folder');
-@define('SYNC_DONE', 'Done (Syncronized %s images).');
+@define('SYNCING', 'Synchronizing the database with the image folder');
+@define('SYNC_DONE', 'Done (Synchronized %s images).');
 @define('FILE_NOT_FOUND', 'Unable to locate the file entitled <b>%s</b>, maybe it has already been deleted?');
 @define('ABORT_NOW', 'Abort now');
 @define('REMOTE_FILE_NOT_FOUND', 'File was not located on the remote server, are you sure the URL: <b>%s</b> is correct?');
@@ -226,7 +226,7 @@
 @define('WORD_OR', 'Or');
 @define('SCALING_IMAGE', 'Scaling %s to %s x %s px');
 @define('KEEP_PROPORTIONS', 'Keep proportions');
-@define('REALLY_SCALE_IMAGE', 'Really scale the image? No way back!');
+@define('REALLY_SCALE_IMAGE', 'Really scale the image? This operation cannot be undone!');
 @define('TOGGLE_ALL', 'Toggle expand all');
 @define('TOGGLE_OPTION', 'Toggle option');
 @define('SUBSCRIBE_TO_THIS_ENTRY', 'Subscribe to this entry');
@@ -293,7 +293,7 @@
 @define('THUMBNAIL_SHORT', 'Thumb');
 @define('ORIGINAL_SHORT', 'Orig.');
 @define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Prevent HTTP caching');
-@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true" this will suggest the link to your RSS feed to not allow clients the bandwidth saving caching of RSS feed request. It is suggested to set this to "false".');
+@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'If set to "true", this will modify the link to your RSS feed to NOT include a setting for bandwidth saving caching of RSS feed requests. It is recommended to set this to "false", so that clients can benefit from caching.');
 @define('APPLY_MARKUP_TO', 'Apply markup to %s');
 @define('CALENDAR_BEGINNING_OF_WEEK', 'Beginning of the week');
 @define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity has detected that your configuration is currently installed with version %s, however serendipity itself is installed as version %s, you need to upgrade! <a href="%s">Click here</a>');

[php-blog-cvs] serendipity comment.php,1.44,1.44.2.1

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

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

Modified Files:
      Tag: branch-smarty
	comment.php 
Log Message:
MFH


Index: comment.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/comment.php,v
retrieving revision 1.44
retrieving revision 1.44.2.1
diff -u -d -r1.44 -r1.44.2.1
--- comment.php	24 Aug 2004 17:32:45 -0000	1.44
+++ comment.php	14 Sep 2004 10:31:56 -0000	1.44.2.1
@@ -106,8 +106,8 @@
     } else if (!isset($serendipity['POST']['submit'])) {
         echo $html_header;
         if ($serendipity['GET']['type'] == 'trackbacks') {
-            $tbu = $serendipity['baseURL'] . 'comment.php?type=trackback&entry_id=' . $serendipity['GET']['entry_id'];
-            $query = 'SELECT title FROM ' . $serendipity['dbPrefix'] . 'entries WHERE id = ' . $serendipity['GET']['entry_id'];
+            $tbu = $serendipity['baseURL'] . 'comment.php?type=trackback&entry_id=' . (int)$serendipity['GET']['entry_id'];
+            $query = "SELECT title FROM {$serendipity['dbPrefix']}entries WHERE id = '". (int)$serendipity['GET']['entry_id'] ."'";
             $entry = serendipity_db_query($query);
             $entry = serendipity_archiveURL($serendipity['GET']['entry_id'], $entry[0]['title'], 'baseURL');
 ?>

[php-blog-cvs] serendipity NEWS,1.214.2.1,1.214.2.2 serendipity_functions.inc.php,1.419.2.11,1.419.2.12 serendipity_lang.inc.php,1.16,1.16.2.1

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

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

Modified Files:
      Tag: branch-smarty
	NEWS serendipity_functions.inc.php serendipity_lang.inc.php 
Log Message:
MFH


Index: NEWS
===================================================================
RCS file: /cvsroot/php-blog/serendipity/NEWS,v
retrieving revision 1.214.2.1
retrieving revision 1.214.2.2
diff -u -d -r1.214.2.1 -r1.214.2.2
--- NEWS	9 Sep 2004 15:14:59 -0000	1.214.2.1
+++ NEWS	14 Sep 2004 10:30:07 -0000	1.214.2.2
@@ -8,6 +8,8 @@
 Version 0.7 ()
 ------------------------------------------------------------------------
 
+    * Added Norwegian translations, thanks to Jo Christian
+
     * Fixed postgresql bug for viewing comment moderation panel
       (garvinhicking)
 

Index: serendipity_lang.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_lang.inc.php,v
retrieving revision 1.16
retrieving revision 1.16.2.1
diff -u -d -r1.16 -r1.16.2.1
--- serendipity_lang.inc.php	3 Aug 2004 10:38:44 -0000	1.16
+++ serendipity_lang.inc.php	14 Sep 2004 10:30:07 -0000	1.16.2.1
@@ -1,6 +1,6 @@
 <?php # $Id$
 
-if (!defined('LANGUAGE_LIST')) define('LANGUAGE_LIST', 'en=>English,de=>German,da=>Danish,es=>Spanish,fr=>French,cs=>Czech (Win-1250),cz=>Czech (ISO-8859-2),nl=>Dutch,pt=>Portuguese Brazilian,bg=>Bulgarian');
+if (!defined('LANGUAGE_LIST')) define('LANGUAGE_LIST', 'en=>English,de=>German,da=>Danish,es=>Spanish,fr=>French,cs=>Czech (Win-1250),cz=>Czech (ISO-8859-2),nl=>Dutch,pt=>Portuguese Brazilian,bg=>Bulgarian,no=>Norwegian');
 
 if (!defined('serendipity_LANG_LOADED') || serendipity_LANG_LOADED !== true) {
     // Try and include preferred language from the configurated setting
@@ -11,7 +11,7 @@
         // If no config file is loaded, language includes are not available.
         // Now include one. Try to auto-guess the language by looking up the HTTP_ACCEPT_LANGUAGE.
         $serendipty['autolang'] = 'en';
-        $supported_languages = array('en', 'da', 'de', 'es', 'cs', 'cz', 'fr', 'nl', 'pt', 'bg');
+        $supported_languages = array('en', 'da', 'de', 'es', 'cs', 'cz', 'fr', 'nl', 'pt', 'bg', 'no');
         $possible_languages = explode(',', (isset($_SERVER['HTTP_ACCEPT_LANGUAGE']) ? $_SERVER['HTTP_ACCEPT_LANGUAGE'] : ''));
         if (is_array($possible_languages)) {
             foreach($possible_languages as $index => $lang) {

Index: serendipity_functions.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/serendipity_functions.inc.php,v
retrieving revision 1.419.2.11
retrieving revision 1.419.2.12
diff -u -d -r1.419.2.11 -r1.419.2.12
--- serendipity_functions.inc.php	10 Sep 2004 22:20:24 -0000	1.419.2.11
+++ serendipity_functions.inc.php	14 Sep 2004 10:30:07 -0000	1.419.2.12
@@ -504,7 +504,7 @@
 function serendipity_fetchCategoryRange($categoryid) {
     global $serendipity;
 
-    $res = serendipity_db_query("SELECT category_left, category_right FROM {$serendipity['dbPrefix']}category WHERE categoryid='{$categoryid}'");
+    $res = serendipity_db_query("SELECT category_left, category_right FROM {$serendipity['dbPrefix']}category WHERE categoryid='". (int)$categoryid ."'");
     return array('category_left' => $res[0]['category_left'], 'category_right' => $res[0]['category_right']);
 }
 
@@ -838,7 +838,7 @@
     global $serendipity;
     $right = $left + 1;
 
-    $result = serendipity_db_query("SELECT categoryid FROM {$serendipity['dbPrefix']}category WHERE parentid='" . $parent . "'");
+    $result = serendipity_db_query("SELECT categoryid FROM {$serendipity['dbPrefix']}category WHERE parentid='" . (int)$parent . "'");
     if ( is_array($result) ) {
         foreach ( $result as $category ) {
             $right = serendipity_rebuildCategoryTree($category['categoryid'], $right);
@@ -856,7 +856,7 @@
 
     $where = '';
     if (!empty($user)) {
-        $where = 'WHERE authorid = ' . serendipity_db_escape_string($user);
+        $where = "WHERE authorid = '" . (int)$user ."'";
     }
 
     $querystring = "SELECT * FROM {$serendipity['dbPrefix']}authors $where ORDER BY username ASC";
@@ -1274,14 +1274,14 @@
     if ($_SESSION['serendipityAuthedUser'] === true) {
         $admin = '';
         if ($_SESSION['serendipityUserlevel'] < USERLEVEL_CHIEF) {
-            $admin = ' AND authorid = ' . $_SESSION['serendipityAuthorid'];
+            $admin = " AND authorid = " . (int)$_SESSION['serendipityAuthorid'] ."'";
         }
 
-        $query = "DELETE FROM {$serendipity['dbPrefix']}comments WHERE entry_id = $entry_id AND id = $id $admin";
+        $query = "DELETE FROM {$serendipity['dbPrefix']}comments WHERE entry_id = '". (int)$entry_id ."' AND id = '". (int)$id ."' $admin";
         serendipity_db_query($query);
         $affected = serendipity_db_affected_rows();
 
-        $query = "UPDATE {$serendipity['dbPrefix']}entries SET $type = $type-1 WHERE id = $entry_id $admin";
+        $query = "UPDATE {$serendipity['dbPrefix']}entries SET $type = $type-1 WHERE id = '". (int)$entry_id ."' $admin";
         serendipity_db_query($query);
         return $affected;
     } else {
@@ -1295,10 +1295,10 @@
     if ($_SESSION['serendipityAuthedUser'] === true) {
         $admin = '';
         if ($_SESSION['serendipityUserlevel'] < USERLEVEL_CHIEF) {
-            $admin = ' AND authorid = ' . $_SESSION['serendipityAuthorid'];
+            $admin = " AND authorid = '" . (int)$_SESSION['serendipityAuthorid'] ."'";
         }
 
-        $query = "UPDATE {$serendipity['dbPrefix']}entries SET allow_comments = '" . ($switch == 'disable' ? 'false' : 'true') . "' WHERE id = $entry_id $admin";
+        $query = "UPDATE {$serendipity['dbPrefix']}entries SET allow_comments = '" . ($switch == 'disable' ? 'false' : 'true') . "' WHERE id = '". (int)$entry_id ."' $admin";
         serendipity_db_query($query);
         header('Location: '. $_SERVER['HTTP_REFERER']);
     } else {
@@ -1318,7 +1318,7 @@
     }
 
     if (!empty($id)) {
-        $and .= ' AND co.entry_id=' . $id;
+        $and .= ' AND co.entry_id=' . (int)$id;
     }
 
     if (!$showAll) {
@@ -1371,7 +1371,7 @@
         $and = "AND status = 'approved'";
     }
 
-    $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id=$id AND type = 'TRACKBACK' $and ORDER BY id";
+    $query = "SELECT * FROM {$serendipity['dbPrefix']}comments WHERE entry_id = '". (int)$id ."' AND type = 'TRACKBACK' $and ORDER BY id";
     if (isset($limit)) {
         $limit  = serendipity_db_limit_sql($limit);
         $query .= " $limit";
@@ -1528,7 +1528,7 @@
                 FROM {$serendipity['dbPrefix']}comments c
                 LEFT JOIN {$serendipity['dbPrefix']}entries e ON (e.id = c.entry_id)
                 LEFT JOIN {$serendipity['dbPrefix']}authors a ON (e.authorid = a.authorid)
-                WHERE c.id = ". $cid ."
+                WHERE c.id = ". (int)$cid ."
                     ". (($serendipity['serendipityUserlevel'] != USERLEVEL_ADMIN && $force !== true) ? 'AND e.authorid = '. $serendipity['authorId'] : '') ."
                     ". (($force === true) ? "" : "AND status = 'pending'");
     $rs  = serendipity_db_query($sql, true);
@@ -1551,7 +1551,7 @@
         $lm = (int)$rs['entry_last_modified'];
     }
 
-    $query = "UPDATE {$serendipity['dbPrefix']}entries SET $field=$field+1, last_modified=". $lm ." WHERE id='$entry_id'";
+    $query = "UPDATE {$serendipity['dbPrefix']}entries SET $field=$field+1, last_modified=". $lm ." WHERE id='". (int)$entry_id ."'";
     serendipity_db_query($query);
 
     if ($serendipity['allowSubscriptions']) {
@@ -1563,7 +1563,7 @@
 function serendipity_saveComment($id, $commentInfo, $type = 'NORMAL') {
     global $serendipity;
 
-    $query = "SELECT allow_comments, moderate_comments, last_modified, timestamp FROM {$serendipity['dbPrefix']}entries WHERE id = '$id'";
+    $query = "SELECT allow_comments, moderate_comments, last_modified, timestamp FROM {$serendipity['dbPrefix']}entries WHERE id = '". (int)$id ."'";
     $ca    = serendipity_db_query($query, true);
 
     serendipity_plugin_api::hook_event('frontend_saveComment', $ca, $commentInfo);
@@ -1593,7 +1593,7 @@
 
         $query = "SELECT a.email, e.title, a.mail_comments, a.mail_trackbacks, e.moderate_comments
                  FROM {$serendipity['dbPrefix']}entries e, {$serendipity['dbPrefix']}authors a
-                 WHERE e.id  = '$id'
+                 WHERE e.id  = '". (int)$id ."'
                  AND e.authorid = a.authorid";
         $row = serendipity_db_query($query, true); // Get info on author/entry
 
@@ -1631,7 +1631,7 @@
 
     $sql = "SELECT $pgsql_insert author, email, type
             FROM {$serendipity['dbPrefix']}comments
-            WHERE entry_id = $entry_id
+            WHERE entry_id = ". (int)$entry_id ."
               AND email <> '$posterMail'
               AND subscribed = 'true' $mysql_insert";
     $subscribers = serendipity_db_query($sql);
@@ -1650,7 +1650,7 @@
                       $title,
                       $poster,
                       $entryURI,
-                      $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'unsubscribe/' . urlencode($subscriber['email']) . '/' . $entry_id
+                      $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'unsubscribe/' . urlencode($subscriber['email']) . '/' . (int)$entry_id
             );
         } else {
             $text = sprintf(
@@ -1661,7 +1661,7 @@
                       $title,
                       $poster,
                       $entryURI,
-                      $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'unsubscribe/' . urlencode($subscriber['email']) . '/' . $entry_id
+                      $serendipity['baseURL'] . ($serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . 'unsubscribe/' . urlencode($subscriber['email']) . '/' . (int)$entry_id
             );
         }
 
@@ -1673,7 +1673,7 @@
     global $serendipity;
     $sql = "UPDATE {$serendipity['dbPrefix']}comments
                 SET subscribed = 'false'
-            WHERE entry_id = $entry_id
+            WHERE entry_id = '". (int)$entry_id ."'
                 AND email = '$email'";
     serendipity_db_query($sql);
 
@@ -1744,7 +1744,7 @@
 {
     global $serendipity;
 
-    $query = "SELECT name,link FROM {$serendipity['dbPrefix']}references WHERE entry_id='" . serendipity_db_escape_string($id) . "'";
+    $query = "SELECT name,link FROM {$serendipity['dbPrefix']}references WHERE entry_id='" . (int)$id . "'";
 
     return serendipity_db_query($query);
 }
@@ -1823,7 +1823,7 @@
 
             // extract author information
             if (empty($entry['email'])) {
-                $query = "select email from {$serendipity['dbPrefix']}authors where username='{$entry['username']}'";
+                $query = "select email from {$serendipity['dbPrefix']}authors where username='". serendipity_db_escape_string($entry['username']) ."'";
                 $results = serendipity_db_query($query);
                 $entry['email'] = $results[0]['email'];
             }
@@ -2280,7 +2280,7 @@
 function serendipity_archiveURL($id, $title, $key = 'baseURL', $checkrewrite = true) {
 global $serendipity;
 
-    return $serendipity[$key] . ($checkrewrite && $serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . $id . '-' . serendipity_makeFilename($title) . '.html';
+    return $serendipity[$key] . ($checkrewrite && $serendipity['rewrite'] == 'none' ? $serendipity['indexFile'] . '?/' : '') . PATH_ARCHIVES . '/' . (int)$id . '-' . serendipity_makeFilename($title) . '.html';
 }
 
 /**
@@ -2321,7 +2321,7 @@
         }
 
         $query = "SELECT COUNT(id) FROM {$serendipity['dbPrefix']}references WHERE ";
-        $query .= "entry_id=$tmpid AND link='" . serendipity_db_escape_string($locations[$i]) . "'";
+        $query .= "entry_id=". (int)$tmpid ." AND link='" . serendipity_db_escape_string($locations[$i]) . "'";
 
         $row = serendipity_db_query($query, true, 'num');
         if ($row[0] > 0) {
@@ -2478,7 +2478,7 @@
     }
 
     // Purge the daily/monthly entries so they can be rebuilt
-    $result = serendipity_db_query("SELECT timestamp, authorid FROM {$serendipity['dbPrefix']}entries WHERE id=$id", true);
+    $result = serendipity_db_query("SELECT timestamp, authorid FROM {$serendipity['dbPrefix']}entries WHERE id=". (int)$id, true);
 
     if ($serendipity['serendipityUserlevel'] < USERLEVEL_CHIEF && $result[1] != $serendipity['authorid']) {
         // Only admins and chief users can delete entries which do not belong to the author
@@ -3070,7 +3070,7 @@
         $url_parts['port'],
         $url_parts['path'],
         $url_parts['query'],
-        ($entry_id != 0) ? "AND entry_id = '$entry_id'" : ''
+        ($entry_id != 0) ? "AND entry_id = '". (int)$entry_id ."'" : ''
       )
     );
 
@@ -3388,7 +3388,7 @@
         // Replace default configuration directives with user-relevant data
         $rows = serendipity_db_query("SELECT name,value
                                         FROM {$serendipity['dbPrefix']}config
-                                        WHERE authorid = $author");
+                                        WHERE authorid = '". (int)$author ."'");
     } else {
         // Only get default variables, user-independent (frontend)
         $rows = serendipity_db_query("SELECT name,value

[php-blog-cvs] serendipity/lang serendipity_lang_no.inc.php,NONE,1.2.2.1 serendipity_lang_de.inc.php,1.98,1.98.2.1

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

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

Modified Files:
      Tag: branch-smarty
	serendipity_lang_de.inc.php 
Added Files:
      Tag: branch-smarty
	serendipity_lang_no.inc.php 
Log Message:
MFH


--- NEW FILE: serendipity_lang_no.inc.php ---
<?php # $Id: serendipity_lang_no.inc.php,v 1.2.2.1 2004/09/14 10:30:07 garvinhicking Exp $

// Norwegian Language file
//
// Based in part on the Danish translation rev. 1.78
// Jo Christian Oterhals, ote...@gm...

@define('LANG_CHARSET', 'ISO-8859-1');
@define('DATE_LOCALES', 'norwegian, no, no_NO');
@define('DATE_FORMAT_ENTRY', '%A d. %e. %B %Y');
@define('DATE_FORMAT_SHORT', '%d.%m.%Y %H:%M');
@define('WYSIWYG_LANG', 'no');

@define('SERENDIPITY_ADMIN_SUITE', 'Serendipity Administrasjonssuite');
@define('HAVE_TO_BE_LOGGED_ON', 'Du må være logget inn for å kunne se denne siden');
@define('WRONG_USERNAME_OR_PASSWORD', 'Du har tastet inn feil brukernavn eller passord');
@define('APPEARANCE', 'Utseende');
@define('MANAGE_STYLES', 'Administrer temaer');
@define('CONFIGURE_PLUGINS', 'Konfigurerer plugins');
@define('ADMIN', 'Admin:');
@define('CONFIGURATION', 'Konfigurasjon');
@define('IMPORT_EXPORT_ENTRIES', 'Importer/eksporter artikler');
@define('BACK_TO_BLOG', 'Tilbake til weblogg');
@define('LOGIN', 'Logg inn');
@define('LOGOUT', 'Logg ut');
@define('LOGGEDOUT', 'Logget ut.');
@define('CREATE', 'Opprett');
@define('EDIT_THIS_CAT', 'Redigerer "%s - %s"');
@define('SAVE', 'Lagre');
@define('NAME', 'Navn');
@define('CLICK_CAT_TO_EDIT', 'Klik på en kategori for å redigere den');
@define('CREATE_NEW_CAT', 'Oppret ny kategori');
@define('I_WANT_THUMB', 'Jeg vil bruke minibildet i min artikkel.');
@define('I_WANT_BIG_IMAGE', 'Jeg vil bruke det originale bildet i min artikkel.');
@define('I_WANT_NO_LINK', 'Vis bildet uten link');
@define('I_WANT_IT_TO_LINK', 'Vis bildet med link');
@define('BACK', 'Tilbake');
@define('FORWARD', 'Frem');
@define('ANONYMOUS', 'Anonym');
@define('LINK_TO_COMMENT', 'Link til kommentar #');
@define('SEND_MAIL_TO', 'Send en mail til');
@define('NEW_TRACKBACK_TO', 'Ny trackback opprettet til');
@define('NEW_COMMENT_TO', 'Ny kommentar opprettet til');
@define('RECENT', 'Nyere...');
@define('OLDER', 'Eldre...');
@define('DONE', 'Ferdig');
@define('WELCOME_BACK', 'Velkommen tilbake,');
@define('RUNNING', 'Du benytter Serendipity v.');
@define('ADD_PLUGIN', 'Legg til plugin');
@define('TITLE', 'Tittel');
@define('DESCRIPTION', 'Beskrivelse');
@define('PLACEMENT', 'Plassering');
@define('DELETE', 'Slett');
@define('SELECT_A_PLUGIN_TO_ADD', 'Velg den plugin-en du vil legge til');
@define('UP', 'OPP');
@define('DOWN', 'NED');
@define('ENTRIES', 'artikler');
@define('NEW_ENTRY', 'Ny artikkel');
@define('AUTHOR_SUITE', 'Redaktørsuite');
@define('EDIT_ENTRIES', 'Rediger artikler');
@define('CATEGORIES', 'Kategorier');
@define('EDIT_CATEGORIES', 'Administrer kategorier');
@define('WARNING_THIS_BLAHBLAH', "ADVARSEL:\\nDette kan ta lang tid hvis det er mange bilder uten minibilder.");
@define('CREATE_THUMBS', 'Lag minibilder på nytt');
@define('MANAGE_IMAGES', 'Administrer bilder');
@define('ADMIN_INTERFACE', 'Admin-interface');
@define('SERENDIPITY_AUTHORING_SUITE', 'Serendipity Redaktørsuite');
@define('NAME', 'Navn');
@define('EMAIL', 'Email');
@define('HOMEPAGE', 'Hjemmeside');
@define('COMMENT', 'Kommentar');
@define('REMEMBER_INFO', 'Husk opplysninger?');
@define('SUBMIT_COMMENT', 'Legg til kommentar');
@define('NO_ENTRIES_TO_PRINT', 'Der er ingen artikler å vise.');
@define('COMMENTS', 'Kommentarer');
@define('ADD_COMMENT', 'Legg til kommentar');
@define('NO_COMMENTS', 'Ingen kommentarer.');
@define('POSTED_BY', 'Skrevet av');
@define('ON', 'aktiv');
@define('A_NEW_COMMENT_BLAHBLAH', 'En ny kommentar har blitt opprettet på din blog "%s", til artiklen med navnet "%s".');
@define('A_NEW_TRACKBACK_BLAHBLAH', 'En ny trackback har blitt laget til din artikel ved navn "%s".');
@define('NO_CATEGORY', 'Ingen kategori');
@define('ENTRY_BODY', 'Artikkelindhold');
@define('EXTENDED_BODY', 'Utvidet indhold');
@define('CATEGORY', 'Kategori');
@define('EDIT', 'Rediger');
@define('NO_ENTRIES_BLAHBLAH', 'Ingen artikler ble funnet som inneholdt %s' . "\n");
@define('YOUR_SEARCH_RETURNED_BLAHBLAH', 'Ditt søk på %s retunerte %s resultater:');
@define('SEARCH_TOO_SHORT', 'Ditt søk må være på mere enn 3 tegn');
@define('IMAGE', 'Bilde');
@define('ERROR_FILE_NOT_EXISTS', 'Feil: Det gamle filnavnet finnes ikke!');
@define('ERROR_FILE_EXISTS', 'Feil: Det nye filnavnet brukes allerede, velg et andet!');
@define('ERROR_SOMETHING', 'Fejl: Der gikk noe galt');
@define('ADDING_IMAGE', 'Legg til et bilde...');
@define('THUMB_CREATED_DONE', 'Minibilde er oprettet.<br>Utført.');
@define('ERROR_FILE_EXISTS_ALREADY', 'Feil: Filen finnes allerede på din maskin!');
@define('GO', 'Begynn!');
@define('NEWSIZE', 'Ny størrelse: ');
@define('RESIZE_BLAHBLAH', '<b>Endre størrelse på %s</b><p>');
@define('ORIGINAL_SIZE', 'Original størrelse: <i>%sx%s</i> pixel');
@define('HERE_YOU_CAN_ENTER_BLAHBLAH', '<p>Her kan du justere bildets størrelse. Hvis du vil bevare proporsjonene, behøver du bare taste en av verdiene og trykke på TAB-tasten.  Jeg vil automatisk beregne den andre verdien:');
@define('QUICKJUMP_CALENDAR', 'Hurtigkalender');
@define('QUICKSEARCH', 'Søk');
@define('SEARCH_FOR_ENTRY', 'Søk etter en artikel');
@define('ARCHIVES', 'Arkiver');
@define('BROWSE_ARCHIVES', 'Bla gjennom arkiv etter måneder');
@define('TOP_REFERRER', 'Referanser');
@define('SHOWS_TOP_SITES', 'Viser de sitene som oftest linker til din blog');
@define('TOP_EXITS', 'Exit-sider');
@define('SHOWS_TOP_EXIT', 'Viser de exit-sider det har blitt klikket flest ganger på');
@define('SYNDICATION', 'Syndikering');
@define('SHOWS_RSS_BLAHBLAH', 'Viser RSS syndikeringslinker');
@define('PLUG', 'Plug');
@define('ADVERTISES_BLAHBLAH', 'Reklamer for din blogs opprinnelse');
@define('HTML_NUGGET', 'HTML Nugget');
@define('HOLDS_A_BLAHBLAH', 'Indeholder en bit HTML i din sidebar');
@define('TITLE_FOR_NUGGET', 'Tittel på din nugget');
@define('THE_NUGGET', 'HTML-indholdet av din nugget');
@define('SYNDICATE_THIS_BLOG', 'Syndiker denne bloggen');
@define('YOU_CHOSE', 'Du valgte %s');
@define('IMAGE_SIZE', 'Bildestørrelse');
@define('IMAGE_AS_A_LINK', 'Sett inn bilde');
@define('POWERED_BY', 'Drives av');
@define('TRACKBACKS', 'Trackbacks');
@define('TRACKBACK', 'Trackback');
@define('NO_TRACKBACKS', 'Ingen Trackbacks');
@define('TOPICS_OF', 'Emner av');
@define('VIEW_FULL', 'Vis fullt');
@define('VIEW_TOPICS', 'Vis temaer');
@define('AT', 'kl');
@define('SET_AS_TEMPLATE', 'Sett som mal');
@define('IN', 'i');
@define('EXCERPT', 'Utdrag');
@define('TRACKED', 'Tracked');
@define('LINK_TO_ENTRY', 'Link til artikel');
@define('LINK_TO_REMOTE_ENTRY', 'Link til ekstern artikel');
@define('IP_ADDRESS', 'IP-adresse');
@define('USER', 'Bruker');
@define('THUMBNAIL_USING_OWN', 'Bruker %s i seg selv som minibilde, fordi det allerede er så lite.');
@define('THUMBNAIL_FAILED_COPY', 'Ville gjerne ha brukt %s som minibilde i seg selv, men kunne ikke kopiere!');
@define('AUTHOR', 'Forfatter');
@define('LAST_UPDATED', 'Sist opdatert');
@define('TRACKBACK_SPECIFIC', 'Trackback URI til denne artikel');
@define('DIRECT_LINK', 'Direktelink til denne artikel');
@define('COMMENT_ADDED', 'Din kommentar ble lagt til. ');
@define('COMMENT_ADDED_CLICK', 'Klik %her for å gå tilbake%s til kommentarene, og %sher for å lukke%s dette vinduet.');
@define('COMMENT_NOT_ADDED', 'Din kommentar kunne ikke legges til fordi kommentarer til denne artikelen er blitt deaktivert.');
@define('COMMENT_NOT_ADDED_CLICK', 'Klikk %sher for å gå tilbake%s til kommentarene, og %sher for å lukke%s dette vinduet. ');
@define('COMMENTS_DISABLE', 'Tillat ikke kommentarer til denne artikelen');
@define('COMMENTS_ENABLE', 'Tillat kommentarer til denne artikelen');
@define('COMMENTS_CLOSED', 'Forfatteren har valgt ikke å tillate kommentarer til denne artikelen');
@define('EMPTY_COMMENT', 'Din kommentar indeholdt ikke noe, vennligst gå %stilbage%s og prøv igjen');
@define('ENTRIES_FOR', 'Artikler fra %s');
@define('DOCUMENT_NOT_FOUND', 'Dokumentet %s kunne ikke finnes.');
@define('USERNAME', 'Brukernavn');
@define('PASSWORD', 'Passord');
@define('AUTOMATIC_LOGIN', 'Lagre oplysningerne');
@define('SERENDIPITY_INSTALLATION', 'Serendipity Installasjon');
@define('LEFT', 'venstre');
@define('RIGHT', 'høyre');
@define('HIDDEN', 'skjult');
@define('REMOVE_TICKED_PLUGINS', 'Fjern valgte plugins');
@define('SAVE_CHANGES_TO_LAYOUT', 'Lagre layout-endringene');
@define('COMMENTS_FROM', 'Kommentar fra');
@define('ERROR', 'Feil');
@define('ENTRY_SAVED', 'Din artikkel ble lagret');
@define('DELETE_SURE', 'Er du sikker på du vil slette #%s permanent?');
@define('NOT_REALLY', 'Egentlig ikke...');
@define('DUMP_IT', 'Kast den!');
@define('RIP_ENTRY', 'Farvel artikel #%s');
@define('CATEGORY_DELETED_ARTICLES_MOVED', 'Kategori #%s ble slettet. Gamle artikler flyttet til kategori #%s');
@define('CATEGORY_DELETED', 'Kategori #%s ble slettet.');
@define('CATEGORY_REMAINING', 'Slet denne kategoriem og flytt artiklene dens til denne kategori: %s');
@define('INVALID_CATEGORY', 'Ingen kategori ble valgt for sletting');
@define('CATEGORY_SAVED', 'Kategori lagret');
@define('SELECT_TEMPLATE', 'Velg den malen du ønsker å bruke til din blog');
@define('ENTRIES_SUCCESSFULLY_INSERTED', 'Artikler innsatt uten problemer!');
@define('ENTRIES_NOT_SUCCESSFULLY_INSERTED', 'Det var problemer under indsettelsen av artiklene!');
@define('VIEW_FEED_EXPORT', 'Vis eksportert feed');
@define('IMPORT', 'Importer');
@define('EXPORT', 'Eksportér');
@define('YES', 'Ja');
@define('NO', 'Nei');
@define('USE_DEFAULT', 'Default');
@define('CHECK_N_SAVE', 'Sjekk &amp; lagre');
@define('DIRECTORY_WRITE_ERROR', 'Kan ikke skrive til biblioteket %s. Sjekk filrettighederne.');
@define('DIRECTORY_CREATE_ERROR', 'Biblioteket %s eksisterer ikke og kunne ikke op1prettes. Vennligst opprett biblioteket manuelt');
@define('DIRECTORY_RUN_CMD', '&nbsp;-&gt; Kjør <i>%s %s</i>');
@define('CANT_EXECUTE_BINARY', 'Kan ikke eksekvere %s');
@define('FILE_WRITE_ERROR', 'Kan ikke skrive til filen %s.');
@define('FILE_CREATE_YOURSELF', 'Venligst opprett filen selv og sjekk dens rettigheter');
@define('COPY_CODE_BELOW', '<br />* Kopier koden nedenunder og plasser den i %s i din %s mappe:<b><pre>%s</pre></b>' . "\n");
@define('WWW_USER', 'Endre www til den bruker som apache kører som (fx. nobody).');
@define('BROWSER_RELOAD', 'Når du har gjort dette, så tryk på browserens "oppdater"-knapp');
@define('DIAGNOSTIC_ERROR', 'Vi har opdaget noen feil mens vi kørte noen diagnostikker på dine oppgitte informasjoner:');
@define('SERENDIPITY_NOT_INSTALLED', 'Serendipity er ennå ikke installert. Klikk <a href="%s">her for å installere</a> nå.');
@define('INCLUDE_ERROR', 'serendipityfejl: Kunne ikke inkludere %s - Avbryter.');
@define('DATABASE_ERROR', 'serendipityfejl: Kunne ikke oprette forbindelse til databasen - Avbryter.');
@define('ATTEMPT_SETUP_DATABASE', 'Forsøker å sette opp databasen...');
@define('CHECK_DATABASE_EXISTS', 'Undersøker om databasen allerede finnes. Hvis du ser en database feil-query her, så ignorer det...');
@define('CREATE_DATABASE', 'Oppretter standarddatabase-setup...');
@define('DATABASE_DONE', 'Ferdig med å sette opp database');
@define('ATTEMPT_WRITE_FILE', 'Forsøker å skrive til %s ...');
@define('SERENDIPITY_INSTALLED', '%sSerendipity er nå installert på ditt system.%s Husk passordet ditt: "%s", brukernavnet ditt er "%s".%sDu kan finne din nye blogg <a href="%s">akkurat her</a>');
@define('WRITTEN_N_SAVED', 'Konfigurasjon skrevet &amp; lagret');
@define('IMAGE_ALIGNMENT', 'Bildejustering');
@define('ENTER_NEW_NAME', 'Oppgi det nye navn for: ');
@define('RESIZING', 'Endre dimensjoner');
@define('RESIZE_DONE', 'Ferdig (Endret %s bilder).');
@define('SYNCING', 'Synkronisere databasen med bildemappen');
@define('SYNC_DONE', 'Ferdig (Synkroniserte %s bilder).');
@define('DELETE_IMAGE_FAIL' , 'Kunne ikke slette bildet <b>%s</b>');
@define('DELETE_THUMBNAIL', 'Slettet bildet med navn <b>%s</b>');
@define('FILE_NOT_FOUND', 'Kunne ikke finne filen ved navn <b>%s</b>, den er kanskje allerede slettet?');
@define('ABORT_NOW', 'Avbryt nå');
@define('REMOTE_FILE_NOT_FOUND', 'Filen kunne ikke finnes på serveren, er du sikker på at URL-en: <b>%s</b> er korrekt?');
@define('FILE_FETCHED', '%s hentet: %s');
@define('FILE_UPLOADED', 'Filen %s er lastet opp: %s');
@define('WORD_OR', 'eller');
@define('SCALING_IMAGE', 'Endre størrelsen på %s til %s x %s px');
@define('KEEP_PROPORTIONS', 'Bevar forholdet');
@define('REALLY_SCALE_IMAGE', 'Er du sikker på at du vil endre størrelsen på dette bildet? Det er ingen vei tilbake!');
@define('TOGGLE_ALL', 'Vis/Skjul alle');
@define('TOGGLE_OPTION', 'Vis/Skjul denne opsjonen');
@define('SUBSCRIBE_TO_THIS_ENTRY', 'Abonnér på denne artikkelen');
@define('UNSUBSCRIBE_OK', "%s er ikke lenger abonnent på denne artikkelen");
@define('NEW_COMMENT_TO_SUBSCRIBED_ENTRY', 'Ny kommentar til abonnert artikel "%s"');
@define('SUBSCRIPTION_MAIL', "Hej %s,\n\nEn ny kommentar er blitt lagt til en artikkel du abonnerer på hos \"%s\", ved navn \"%s\"\nNavnet på skribenten er: %s\n\nDu kan finne artikkelen her: %s\n\nDu kan stoppe ditt abonnement ved å klikke på denne linken: %s\n");
@define('SUBSCRIPTION_TRACKBACK_MAIL', "Hei %s,\n\nEn ny trackback er laget til en artikkel du abonnerer på hos \"%s\", ved navn \"%s\"\nNavnet på skribenten er: %s\n\nDu kan finne artiklen her: %s\n\nDu kan stoppe ditt abonnement ved å klikke på denne linken: %s\n");
@define('SIGNATURE', "\n-- \n%s bruker Serendipity.\nDen bedste blogg på dette, du kan også bruke det.\nKikk nærmere på <http://s9y.org> for å finne mere informasjon.");
@define('DATABASE_ALREADY_INSTALLED', 'IGNORERE: Database er allerede installert');
@define('SYNDICATION_PLUGIN_091', 'RSS 0.91-feed');
@define('SYNDICATION_PLUGIN_10', 'RSS 1.0-feed');
@define('SYNDICATION_PLUGIN_20', 'RSS 2.0-feed');
@define('SYNDICATION_PLUGIN_20c', 'RSS 2.0-kommentarer');
@define('SYNDICATION_PLUGIN_ATOM03', 'ATOM 0.3-feed');
@define('SYNDICATION_PLUGIN_GENERIC_FEED', '%s-feed');
@define('SYNDICATION_PLUGIN_MANAGINGEDITOR', 'Feltet "Hovedredaktør"');
@define('SYNDICATION_PLUGIN_WEBMASTER',  'Feltet "webmaster"');
@define('SYNDICATION_PLUGIN_BANNERURL', 'Bilde til RSS-feed');
@define('SYNDICATION_PLUGIN_BANNERWIDTH', 'Bildebredde');
@define('SYNDICATION_PLUGIN_BANNERHEIGHT', 'Bildehøjde');
@define('SYNDICATION_PLUGIN_WEBMASTER_DESC',  'Emailadressen til webmasteren, hvis tilgjengelig. (tom: skjult) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_MANAGINGEDITOR_DESC', 'E-mailadressen til redaktøren, hvis tilgjengelig. (tom: skjult) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_BANNERURL_DESC', 'URL til et bilde i GIF/JPEG/PNG format, hvis tilgjengelig. (tom: serendipity-logo)');
@define('SYNDICATION_PLUGIN_BANNERWIDTH_DESC', 'i pixels, max. 144');
@define('SYNDICATION_PLUGIN_BANNERHEIGHT_DESC', 'i pixels, max. 400');
@define('SYNDICATION_PLUGIN_TTL', 'Feltet "ttl" (time-to-live)');
@define('SYNDICATION_PLUGIN_TTL_DESC', 'Antallet minutter din blog skal caches av eksterne sider/programmer (tom: skjult) [RSS 2.0]');
@define('SYNDICATION_PLUGIN_PUBDATE', 'Feltet "pubDate"');
@define('SYNDICATION_PLUGIN_PUBDATE_DESC', 'Skal "pubDate"-feltet være innkapslet til en RSS-kanal, for å vise datoen på den nyeste artikkelen?');
@define('CONTENT', 'Innhold');
@define('TYPE', 'Type');
@define('DRAFT', 'Utkast');
@define('PUBLISH', 'Publiser');
@define('PREVIEW', 'Vis');
@define('DATE', 'Dato');
@define('DATE_FORMAT_2', 'Y-m-d H:i'); // Needs to be ISO 8601 compliant for date conversion!
@define('DATE_INVALID', 'Advarsel: Den datoen du tastet inn var ugyldig. Den skal tastes inn i følgende format: ÅÅÅÅ-MM-DD TT:MM.');
@define('CATEGORY_PLUGIN_DESC', 'Viser listen over kategorier.');
@define('ALL_AUTHORS', 'Alle forfattere');
@define('CATEGORIES_TO_FETCH', 'Kategorier som skal hentes');
@define('CATEGORIES_TO_FETCH_DESC', 'Hent kategorier fra en bestemt forfatter?');
@define('PAGE_BROWSE_ENTRIES', 'Side %s av %s, i alt %s artikler');
@define('PREVIOUS_PAGE', 'forrige side');
@define('NEXT_PAGE', 'neste side');
@define('ALL_CATEGORIES', 'Alle kategorier');
@define('DO_MARKUP', 'Utført Markup-transformasjon');
@define('DO_MARKUP_DESCRIPTION', 'Tilføy markup-transformasjoner på teksten (smilies, shortcut markups via *, /, _, ...). Hvis du slår dette av vil all HTML-kode i teksten bli beholdt. Standard er "Ja".');
@define('GENERAL_PLUGIN_DATEFORMAT', 'Datoformat');
@define('GENERAL_PLUGIN_DATEFORMAT_BLAHBLAH', 'Formatet på artiklens faktiske dato, brug PHPs strftime()-variabler. (Standard: "%s")');
@define('ERROR_TEMPLATE_FILE', 'Kunne ikke åpne malen, oppater Serendipity!');
@define('ADVANCED_OPTIONS', 'Avanserte innstillinger');
@define('EDIT_ENTRY', 'Rediger artikkel');
@define('HTACCESS_ERROR', 'For å kunne sjekke din lokale webservers installasjon, må Serendipity være i stand til å skrive til filen ".htaccess". Dette var ikke mulig pga. feil rettigheter. Endre rettighetene slik: <br />&nbsp;&nbsp;%s<br />og oppdater denne siden.');
@define('SORT_ORDER', 'Sorter etter');
@define('SORT_ORDER_NAME', 'Filnavn');
@define('SORT_ORDER_EXTENSION', 'Filtype');
@define('SORT_ORDER_SIZE', 'Filstørrelse');
@define('SORT_ORDER_WIDTH', 'Bildebredde');
@define('SORT_ORDER_HEIGHT', 'Bildehøyde');
@define('SORT_ORDER_DATE', 'Upload-dato');
@define('SORT_ORDER_ASC', 'Stigende');
@define('SORT_ORDER_DESC', 'Fallende');
@define('THUMBNAIL_SHORT', 'Mini');
@define('ORIGINAL_SHORT', 'Orig.');
@define('APPLY_MARKUP_TO', 'Formater %s');
@define('SYNDICATION_PLUGIN_PREVENT_CACHE', 'Forhindrer HTTP-caching');
@define('SYNDICATION_PLUGIN_PREVENT_CACHE_DESC', 'Hvis satt til "true" vil dette befale RSS-feeden din om å ikke tillate klienter å cache feeden. Det anbefales å sette dette til "false".');
@define('CALENDAR_BEGINNING_OF_WEEK', 'Starten på uken');
@define('SERENDIPITY_NEEDS_UPGRADE', 'Serendipity har opdaget at din nåværende konfigurasjon passer til versjon %s. Serendipity selv er installert som version %s, Det er nødvendig å oppgradere! <a href="%s">Klikk her!</a>');
@define('SERENDIPITY_UPGRADER_WELCOME', 'Velkommen til Serendipitys oppgraderingsscript.');
@define('SERENDIPITY_UPGRADER_PURPOSE', 'Scriptet vil hjelpe deg med å oppgradere Serendipity %s.');
@define('SERENDIPITY_UPGRADER_WHY', 'Denne meldingen vises fordi Serendipity versjon %s er installert, men databasen er ennå ikke opgradert til denne versjonen.');
@define('SERENDIPITY_UPGRADER_DATABASE_UPDATES', 'Databasen oppdateringer (%s)');
@define('SERENDIPITY_UPGRADER_FOUND_SQL_FILES', 'Følgende .sql-filer må kjøres før Serendipity igjen kan fungere normalt.');
@define('SERENDIPITY_UPGRADER_VERSION_SPECIFIC',  'Versjonsspesifikke oppgaver');
@define('SERENDIPITY_UPGRADER_NO_VERSION_SPECIFIC', 'Ingen versjonsspesifikke oppgaver funnet');
@define('SERENDIPITY_UPGRADER_PROCEED_QUESTION', 'Ønsker du at ovenstående opgaver utføres?');
@define('SERENDIPITY_UPGRADER_PROCEED_ABORT', 'Nei, jeg utfører dem manuelt');
@define('SERENDIPITY_UPGRADER_PROCEED_DOIT', 'Ja takk!');
@define('SERENDIPITY_UPGRADER_NO_UPGRADES', 'Det ser ut til at oppgradering ikke er nødvendig.');
@define('SERENDIPITY_UPGRADER_CONSIDER_DONE', 'Serendipity er oppgradert');
@define('SERENDIPITY_UPGRADER_YOU_HAVE_IGNORED', 'Du har ignorert en del av oppgraderingen. Vennligst undersøk hvorvidt databasen er korrekt opdatert, og planlagte opgaver utført');
@define('SERENDIPITY_UPGRADER_NOW_UPGRADED', 'Din Serendipity-installation er nå oppgradert til version %s');
@define('SERENDIPITY_UPGRADER_RETURN_HERE', 'Du kan vende tilbake til din blog ved å klikke %sher%s');
@define('MANAGE_USERS', 'Håndter brukere');
@define('EDIT_USERS', 'Rediger brukere');
@define('CREATE_USERS', 'Opprett brukere');
@define('CREATE_NEW_USER', 'Opprett ny bruker');
@define('CREATE_NOT_AUTHORIZED', 'Du kan ikke redigere brukere med det samme brukernivå som deg selv');
@define('CREATE_NOT_AUTHORIZED_USERLEVEL', 'Du kan ikke opprette brukere med et høyere brukernivå enn deg selv');
@define('CREATED_USER', 'En ny bruker %s er opprettet');
@define('MODIFIED_USER', 'Egenskapene for brukeren %s er endret');
@define('USER_SELF_INFO', 'logget inn som %s, brukernivå %s');
@define('USER_LEVEL', 'brukernivå');
@define('DELETE_USER', 'Du er i ferd med å slette bruker #%d %s. Er du sikker? Dette vil forhindre visning av alle artikler skrevet av brukeren.');
@define('DELETED_USER', 'Bruker #%d %s er slettet.');
@define('LIMIT_TO_NUMBER', 'Hvor mange punkter skal vises?');
@define('FILTER', 'Filter');
@define('ENTRIES_PER_PAGE', 'artikler per side');

/* TRANSLATE */
@define('PERMISSIONS', 'Rettigheter');

/* DATABASE SETTINGS */
@define('INSTALL_CAT_DB', 'Databaseinnstillinger');
@define('INSTALL_CAT_DB_DESC', 'Her kan du taste inn all databaseinformasjon');
@define('INSTALL_DBTYPE', 'Databasetype');
@define('INSTALL_DBTYPE_DESC', 'Databasetype');
@define('INSTALL_DBHOST', 'Databaseserver');
@define('INSTALL_DBHOST_DESC', 'Hostname til din databaseserver');
@define('INSTALL_DBUSER', 'Databasebrukernavn');
@define('INSTALL_DBUSER_DESC', 'Brukernavnet som er brukt til å koble til databasen din');
@define('INSTALL_DBPASS', 'Databasepassord');
@define('INSTALL_DBPASS_DESC', 'Passordet som passer til brukernavnet over');
@define('INSTALL_DBNAME', 'Databasenavn');
@define('INSTALL_DBNAME_DESC', 'Navnet på din database');
@define('INSTALL_DBPREFIX', 'Databasetabell-prefiks');
@define('INSTALL_DBPREFIX_DESC', 'Prefiks på tabellnavn, f.eks. serendipity_');

/* PATHS */
@define('INSTALL_CAT_PATHS', 'Baner');
@define('INSTALL_CAT_PATHS_DESC', 'Forskjellige baner til forskjellige essensielle mapper og filer. Glem ikke etterfølgende slasher på biblioteker!');
@define('INSTALL_FULLPATH', 'Full bane');
@define('INSTALL_FULLPATH_DESC', 'Den fulle og absolutte bane til din serendipity-installasjon');
@define('INSTALL_UPLOADPATH', 'Upload-bane');
@define('INSTALL_UPLOADPATH_DESC', 'Alle uploads blir plassert her, relativ til \'Full bane\' - typisk \'uploads/\'');
@define('INSTALL_RELPATH', 'Relativ bane');
@define('INSTALL_RELPATH_DESC', 'Bane til Serendipity i henhold til din browser, typisk \'/serendipity/\'');
@define('INSTALL_RELTEMPLPATH', 'Relativ mal-bane');
@define('INSTALL_RELTEMPLPATH_DESC', 'Bane til mappen som inneholder dine maler - Relativ til \'relative bane\'');
@define('INSTALL_RELUPLOADPATH', 'Relativ upload-bane');
@define('INSTALL_RELUPLOADPATH_DESC', 'Bane til dine uploads i henhold til din browser - Relativ til \'relative bane\'');
@define('INSTALL_URL', 'URL til din blogg');
@define('INSTALL_URL_DESC', 'Base-URL for din Serendipity-installasjon');
@define('INSTALL_INDEXFILE', 'Index-fil');
@define('INSTALL_INDEXFILE_DESC', 'Navnet på din Serendipity index-fil');

/* Generel settings */
@define('INSTALL_CAT_SETTINGS', 'Generelle innstillinger');
@define('INSTALL_CAT_SETTINGS_DESC', 'Tilpass måten Serendipity oppfører seg på');
@define('INSTALL_USERNAME', 'Admin-brukernavn');
@define('INSTALL_USERNAME_DESC', 'Brukernavn til admin-login');
@define('INSTALL_PASSWORD', 'Admin-passord');
@define('INSTALL_PASSWORD_DESC', 'Passord til admin-login');
@define('INSTALL_EMAIL', 'Admin-email');
@define('INSTALL_EMAIL_DESC', 'E-mailadresse til eieren av bloggen');
@define('INSTALL_SENDMAIL', 'Send e-mailer til admin?');
@define('INSTALL_SENDMAIL_DESC', 'Vil du motta email når kommentare blir gitt til dine artikler?');
@define('INSTALL_SUBSCRIBE', 'Tillat brukere å abonnere på artikler?');
@define('INSTALL_SUBSCRIBE_DESC', 'Tillat brukere å abonnere på en artikkel og dermed motte en mail når det oprettes nye kommentare på den artikkelen');
@define('INSTALL_BLOGNAME', 'Navn på blogg');
@define('INSTALL_BLOGNAME_DESC', 'Tittelen på din blogg');
@define('INSTALL_BLOGDESC', 'Blogg-beskrivelse');
@define('INSTALL_BLOGDESC_DESC', 'Beskrivelse av din blogg');
@define('INSTALL_LANG', 'Språk');
@define('INSTALL_LANG_DESC', 'Velg språket på din blogg');

/* Appearance and options */
@define('INSTALL_CAT_DISPLAY', 'Utseende og innstillinger');
@define('INSTALL_CAT_DISPLAY_DESC', 'Tilpass hvordan Serendipity ser ut og føles');
@define('INSTALL_EXTERNALSTYLE', 'Eksternt Stylesheet');
@define('INSTALL_EXTERNALSTYLE_DESC', 'Du kan definere en stylesheet-URI her, det bliver lagt over de innstillinger du har satt i ditt admin-interface (tast inn \'none\' hvis du ikke skal bruke det)');
@define('INSTALL_WYSIWYG', 'Bruk WYSIWYG-editor');
@define('INSTALL_WYSIWYG_DESC', 'Vil du benytte WYSIWYG-editoren? (Virker med IE5+, delvis i Mozilla 1.3+)');
@define('INSTALL_XHTML11', 'Tving gjennom XHTML 1.1');
@define('INSTALL_XHTML11_DESC', 'Ønsker du å kreve overholdelse av XHTML 1.1 (kan skape problemer i 4.-generasjonsbrowsere)');
@define('INSTALL_POPUP', 'Aktiver bruk av popup-vinduer');
@define('INSTALL_POPUP_DESC', 'Vil du åpne kommentarer og trackbacks i et popupvindu?');
@define('INSTALL_EMBED', 'Er Serendipity embedded?');
@define('INSTALL_EMBED_DESC', 'Hvis du ønsker å kapsle Serendipity inn i en normal side, aktiver da dette direktivet for å ignorere headere og kun skrive ut innholdet. Du kan benytte indexFile-direktivet til å lage en wrapper-fil hvor du plasserer din normale hjemmesides headere. Konsulter README filen for mer informasjon!');
@define('INSTALL_TOP_AS_LINKS', 'Vis topp utgangssider/referanser som links?');
@define('INSTALL_TOP_AS_LINKS_DESC', '"no": Utgangssider og referanser blir vist som ren tekst for å forhindre Google-spam.  "yes": Utgangssider og referanser blir vist som hyperlinker.  "default": Bruk innstillinger fra global konfigurasjon (anbefalt).');
@define('INSTALL_BLOCKREF', 'Blokkér referanser');
@define('INSTALL_BLOCKREF_DESC', 'Er det noen spesielle hosts du ikke ønsker skal vises i referanselisten?  Seprarer listen av hostnavn med \';\' og merk deg at disse er blokkert med substring-masker!');
@define('INSTALL_REWRITE', 'URL-omskrivning');
@define('INSTALL_REWRITE_DESC', 'Velg hvilken regel du ønsker å bruke når du genererer URL-er. Aktivering av omskrivningsregler vil gjøre URL-ene dine flotte og gjøre din side mer egnet for indeksering av roboter som google. Webserveren må enten støtte mod_rewrite eller "AllowOverride All" for ditt Serendipity-bibliotek. Standardindstillingen er automatisk beregnet');

/* Imageconversion Settings */
@define('INSTALL_CAT_IMAGECONV', 'Bildekonverterings-innstillinger');
@define('INSTALL_CAT_IMAGECONV_DESC', 'Generell informasjon om hvordan Serendipity skal håndtere bilder');
@define('INSTALL_IMAGEMAGICK', 'Bruk Imagemagick');
@define('INSTALL_IMAGEMAGICK_DESC', 'Har du ImageMagick installert og ønsker å bruke det til å endre størrelse på bilder?');
@define('INSTALL_IMAGEMAGICKPATH', 'Bane til convert binærfil');
@define('INSTALL_IMAGEMAGICKPATH_DESC', 'Full bane og navn på din ImageMagick convert binærfil');
@define('INSTALL_THUMBSUFFIX', 'Thumbnail-suffiks');
@define('INSTALL_THUMBSUFFIX_DESC', 'Thumbnails vil bli gitt navn etter følgende mønster: original.[suffix].ext');
@define('INSTALL_THUMBWIDTH', 'Thumbnail-dimensjoner');
@define('INSTALL_THUMBWIDTH_DESC', 'Statisk maksimalbredde på en auto-genereret thumbnail');

/* Personal details */
@define('USERCONF_CAT_PERSONAL', 'Dine personlige detaljer');
@define('USERCONF_CAT_PERSONAL_DESC', 'Endre dine personlige detaljer');
@define('USERCONF_USERNAME', 'Ditt brukernavn');
@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?');
@define('USERCONF_SENDCOMMENTS_DESC', 'Ønsker du å motta en mail når nye kommentarer blir lagt til dine artikler?');
@define('USERCONF_SENDTRACKBACKS', 'Send bjeskeder om nye trackbacks?');
@define('USERCONF_SENDTRACKBACKS_DESC', 'Ønsker du å motta en mail når nye trackbacks blir lagt til dine artikler?');
@define('USERCONF_ALLOWPUBLISH', 'Tillatelse: Publisere artikler?');
@define('USERCONF_ALLOWPUBLISH_DESC', 'Kan denne brukeren publisere artikler?');

@define('DIRECTORIES_AVAILABLE', 'I listen over tilgjengelige undermapper, kan du klikke på en ny mappe for å oprette en ny mappe innenfor den stukturen.');
@define('ALL_DIRECTORIES', 'alle mapper');
@define('MANAGE_DIRECTORIES', 'Håndter mapper');
@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:');
@define('DIRECTORY_DELETE_FAILED', 'Sletting av mappe %s mislyktes. Sjekk rettigheter eller ovenstående beskjeder.');
@define('DIRECTORY_DELETE_SUCCESS', 'Mappen %s er slettet.');
@define('SKIPPING_FILE_EXTENSION', 'Ignorerte filen: Manglende filtype %s.');
@define('SKIPPING_FILE_UNREADABLE', 'Ignorerte fil: %s er ikke lesbar.');
@define('FOUND_FILE', 'Fant ny/endret fil: %s.');
@define('ALREADY_SUBCATEGORY', '%s er allerede en underkategori av %s.');
@define('PARENT_CATEGORY', 'Hovedkategori');
@define('REPLY', 'Besvar');
@define('IN_REPLY_TO', 'Som svar på');
@define('TOP_LEVEL', 'Topnivå');
@define('XML_IMAGE_TO_DISPLAY', 'XML-knapp');
@define('XML_IMAGE_TO_DISPLAY_DESC','Linker til XML-feeder vil bli vist med dette bildet.  Etterlat tomt for standard, tast inn \'none\' for å deaktivere.');
@define('SUCCESS', 'Suksess');
@define('NUMBER_FORMAT_DECIMALS', '2');
@define('NUMBER_FORMAT_DECPOINT', ',');
@define('NUMBER_FORMAT_THOUSANDS', '.');
@define('POWERED_BY_SHOW_TEXT', 'Vis "Serendipity" som tekst');
@define('POWERED_BY_SHOW_TEXT_DESC', 'Vil vise "Serendipity Weblog" som tekst');
@define('POWERED_BY_SHOW_IMAGE', 'Vis "Serendipity" med en logo');
@define('POWERED_BY_SHOW_IMAGE_DESC', 'Vis Serendipity-logoen');
@define('SETTINGS_SAVED_AT', 'De nye innstillgene er lagret kl %s');
@define('PLUGIN_ITEM_DISPLAY', 'Hvor skal enheten vises?');
@define('PLUGIN_ITEM_DISPLAY_EXTENDED', 'Kun udvidet artikkel');
@define('PLUGIN_ITEM_DISPLAY_OVERVIEW', 'Kun i oversikten');
@define('PLUGIN_ITEM_DISPLAY_BOTH', 'Hele tiden');
@define('RSS_IMPORT_DESC', 'RSS-import vil hente en RSS-feed og sette inn alle artiklene i denne i ditt arkiv. Du kan velge om du vil importere disse med UTKAST eller PUBLISER status. Kategorier i den fremmede feeden skal inneholde nøyaktig det samme navnet som de navn du har tastet inn i Serendipity. Via det andre feltet kan du velge hvilken kategori du vil plassere artikler som ikke matcher kategorier i den importerete feeden.');
@define('RSS_IMPORT_CATEGORY', 'Bruk denne kategorien for kategoriløse artikler');
@define('ERROR_UNKNOWN_NOUPLOAD', 'Det oppstod en ukjent feil, filen ble ikke lastet opp. Kanskje er din filstørrelse større end den maksimale størrelse tillatt av ditt serveroppsett. Spør din webtilbyder eller rediger din php.ini fil for å tillate uploads av større filer.');
@define('COMMENTS_WILL_BE_MODERATED', 'Kommentarer på denne artikkelen vil først bli vist når de er blitt godkjendt.');
@define('YOU_HAVE_THESE_OPTIONS', 'Du har følgende muligheter:');
@define('THIS_COMMENT_NEEDS_REVIEW', 'Advarsel: Denne kommentaren krever godkjennelse før den blir vist');
@define('DELETE_COMMENT', 'Slett kommentar');
@define('APPROVE_COMMENT', 'Godkjenn kommentar');
@define('REQUIRES_REVIEW', 'Krever godkjennelse');
@define('COMMENT_APPROVED', 'Kommentar #%s er godkjent');
@define('COMMENT_DELETED', 'Kommentar #%s er slettet');
@define('VIEW', 'Vis');
@define('COMMENT_ALREADY_APPROVED', 'Kommentar #%s ser allerede ut til å være godkjent');
@define('COMMENT_EDITED', 'Den valgte kommentar er redigert');
@define('HIDE', 'Skjul');
@define('VIEW_EXTENDED_ENTRY', 'Les resten av "%s"');
@define('TRACKBACK_SPECIFIC_ON_CLICK', 'Det er ikke meningen at denne linken skal klikkes.  Den innholder trackback-URI-en for denne postingen.  Du kan bruke denne URI-en til å sende ping- og trackbacks fra din egen blog til denne posten.  For å kopiere linken, høyreklikk og velg "Kopier snarvei" i Internet Explorer eller "Copy Link Location" i Mozilla.');
@define('THIS_TRACKBACK_NEEDS_REVIEW', 'Advarsel:  Denne trackbacken trenger godkjennelse før den blir vist.');
@define('DELETE_TRACKBACK', 'Slett trackback');
@define('APPROVE_TRACKBACK', 'Godkjenn trackback');
@define('TRACKBACK_APPROVED', 'Trackback #%s har blitt godkjent');
@define('TRACKBACK_DELETED', 'Trackback #%s har blitt slettet');
@define('COMMENTS_MODERATE', 'Kommentarer og trackback til denne posten krever moderasjon.');
@define('PLUGIN_SUPERUSER_HTTPS', 'Bruk https ved innlogging');
@define('PLUGIN_SUPERUSER_HTTPS_DESC', 'Peker login-linken til en https-adresse. Webserveren din må støtte dette!');
@define('INSTALL_SHOW_EXTERNAL_LINKS', 'Gjøre eksterne lenker klikkbare?');
@define('INSTALL_SHOW_EXTERNAL_LINKS_DESC', '"no": Usjekkede eksterne lenker (topp utgangssider, referanser, brukerkommentarer) er ikke vist - vist som ren tekst hvor mulig, for å forhindre Google-spam (anbefalt).  "yes":  Usjekkede eksterne lenker blir vist som hyperlenker.  Kan bli overstyrt i sidebar plugin-konfigurasjon!');
@define('PAGE_BROWSE_COMMENTS', 'Side %s av %s, totalt %s kommentarer');
@define('FILTERS', 'Filtere');
@define('FIND_ENTRIES', 'Finn poster');
@define('FIND_COMMENTS', 'Finn kommentarer');
@define('FIND_MEDIA', 'Finn media');
@define('FILTER_DIRECTORY', 'Katalog');
@define('SORT_BY', 'Sorter på');
@define('TRACKBACK_COULD_NOT_CONNECT', 'Ingen Trackback sendt:  Kunne ikke åpne tilkobling til %s på port %d');
@define('MEDIA', 'Media');
@define('MEDIA_LIBRARY', 'Media-bibliotek');
@define('ADD_MEDIA', 'Legg til media');
@define('ENTER_MEDIA_URL', 'Oppgi en URL til en fil som skal hentes:');
@define('ENTER_MEDIA_UPLOAD', 'Velg en fil du ønsker å laste opp:');
@define('SAVE_FILE_AS', 'Lagre filen som:');
@define('STORE_IN_DIRECTORY', 'Lagre i følgende katalog: ');
@define('MEDIA_RENAME', 'Gi denne filen nytt navn');
@define('IMAGE_RESIZE', 'Endre størrelsen på dette bildet');
@define('MEDIA_DELETE', 'Slett denne filen');
@define('FILES_PER_PAGE', 'Antall filer per side');
@define('CLICK_FILE_TO_INSERT', 'Klikk på filen du ønsker å sette inn:');
@define('SELECT_FILE', 'Velg fil å sette inn');
@define('MEDIA_FULLSIZE', 'Full størrelse');
@define('CALENDAR_BOW_DESC', 'Ukedagen som skal være starten på uken.  Standard er mandag');
@define('SUPERUSER', 'Blogg-administrasjon');
@define('ALLOWS_YOU_BLAHBLAH', 'Legger en link til blogg-administrasjonen i sidebaren.');

@define('CALENDAR', 'Kalender');
@define('SUPERUSER_OPEN_ADMIN', 'Åpne administrasjon');
@define('SUPERUSER_OPEN_LOGIN', 'Åpne login-skjerm');
@define('INVERT_SELECTIONS', 'Inverter valgene');
@define('COMMENTS_DELETE_CONFIRM', 'Er du sikker på at du ønsker å slette de valgte kommentarene?');
@define('COMMENT_DELETE_CONFIRM', 'Er du sikker på at du ønsker å slette kommentar #%d, skrevet av %s?');
@define('DELETE_SELECTED_COMMENTS', 'Slett valgte kommentarer');
@define('VIEW_COMMENT', 'Se kommentar');
@define('VIEW_ENTRY', 'Se posting');
@define('DELETE_FILE', 'Slettet filen kalt <b>%s</b>');
@define('ABOUT_TO_DELETE_FILE', 'Du er i ferd med å slette <b>%s</b><br />Hvis du bruker denne filen i noen av postene dine vil dette forårsake døde lenker eller bilder<br />Er du sikker på at du vil gå videre?<br /><br />');
@define('TRACKBACK_SENDING', 'Sender trackback til URI %s...');
@define('TRACKBACK_SENT', 'Trackback suksess');
@define('TRACKBACK_FAILED', 'Trackback slo feil: %s');
@define('TRACKBACK_NOT_FOUND', 'Fant ingen trackback-URI.');
@define('TRACKBACK_URI_MISMATCH', 'Den autofunnede trackback-URI-en stemmer ikke overens med vår mål-URI.');
@define('TRACKBACK_CHECKING', 'Sjekker <u>%s</u> for mulige trackbacks...');
@define('TRACKBACK_NO_DATA', 'Mål inneholdt ingen data');
@define('TRACKBACK_SIZE', 'Mål-URI oversteg maksimum filstørrelse på %s bytes.');
@define('VIEWMODE_THREADED', 'Bytt til trådet visning');
@define('COMMENTS_VIEWMODE_THREADED', 'Trådet');
@define('COMMENTS_VIEWMODE_LINEAR', 'Lineær');
@define('DISPLAY_COMMENTS_AS', 'Vis kommentarer som');
@define('SIDEBAR_PLUGINS', 'Sidebar-plugins');
@define('EVENT_PLUGINS', 'Hendelses-lugins');
@define('ADD_MEDIA_BLAHBLAH', '<b>Legg til en fil til ditt mediabibliotek:</b><p>Her kan du laste opp mediafiler, eller be meg om å hente dem fra en adresse på nettet!  Hvis du ikke har et passende bilde, <a href="http://images.google.com" target="_blank">søk etter bilder på Google</a> som passer til tankene dine.  Resultatene er ofte nyttige og morsomme :)<p><b>Velg metode:</b><br>');


?>

Index: serendipity_lang_de.inc.php
===================================================================
RCS file: /cvsroot/php-blog/serendipity/lang/serendipity_lang_de.inc.php,v
retrieving revision 1.98
retrieving revision 1.98.2.1
diff -u -d -r1.98 -r1.98.2.1
--- serendipity_lang_de.inc.php	6 Sep 2004 10:38:54 -0000	1.98
+++ serendipity_lang_de.inc.php	14 Sep 2004 10:30:07 -0000	1.98.2.1
@@ -507,7 +507,7 @@
 @define('MEDIA_LIBRARY', 'Mediendatenbank');
 @define('ADD_MEDIA', 'Mediendaten hinzufügen');
 @define('ENTER_MEDIA_URL', 'URL zum Download angeben:');
-@define('ENTER_MEDIA_UPLOAD', 'Bild zum Hochladen angeben:');
+@define('ENTER_MEDIA_UPLOAD', 'Datei zum Hochladen angeben:');
 @define('SAVE_FILE_AS', 'Datei speichern mit Name:');
 @define('STORE_IN_DIRECTORY', 'In diesem Verzeichnis ablegen: ');
 @define('MEDIA_RENAME', 'Datei umbenennen');
@@ -530,7 +530,7 @@
 @define('VIEW_COMMENT', 'Kommentar ansehen');
 @define('VIEW_ENTRY', 'Eintrag ansehen');
 @define('DELETE_FILE', 'Datei namens <b>%s</b> gelöscht');
-@define('ABOUT_TO_DELETE_FILE', 'Sie sind dabei die Datei <b>%s</b> zu löschen.<br />Wenn Sie die Date in einem Ihrer Einträge verwenden, wird das Löschen Lücken erzeugen.<br />Soll trotzdem fortgefahren werden?<br /><br />');
+@define('ABOUT_TO_DELETE_FILE', 'Sie sind dabei die Datei <b>%s</b> zu löschen.<br />Wenn Sie die Datei in einem Ihrer Einträge verwenden, wird das Löschen Lücken erzeugen.<br />Soll trotzdem fortgefahren werden?<br /><br />');
 @define('A_NEW_TRACKBACK_BLAHBLAH', 'Ein neues Trackback für den Blog-Eintrag namens "%s" wurde empfangen.');
 @define('LOGIN', 'Login');
 @define('TRACKBACK_SENDING', 'Sende Trackback zu URI %s...');