[geeklog-cvs] geeklog: Merge with Dirk's changes

[geeklog-cvs at lists.geeklog.net]

changeset 7862:47ac8fa20740
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/47ac8fa20740
user: Tom <websitemaster at cogeco.net>
date: Mon Mar 29 19:51:11 2010 -0400
description:
Merge with Dirk's changes

diffstat:

 language/german_formal.php        |   2 +-
 language/german_formal_utf-8.php  |   2 +-
 plugins/staticpages/functions.inc |  20 +++++++++++++++++---
 3 files changed, 19 insertions(+), 5 deletions(-)

diffs (68 lines):

diff -r fedfb5dd5dbb -r 47ac8fa20740 language/german_formal.php
--- a/language/german_formal.php	Mon Mar 29 19:45:07 2010 -0400
+++ b/language/german_formal.php	Mon Mar 29 19:51:11 2010 -0400
@@ -93,7 +93,7 @@
     45 => 'MySQL Fehlernummer',
     46 => 'MySQL Fehlermeldung',
     47 => 'Anmelden',
-    48 => 'Mein Profil',
+    48 => 'Ihr Profil',
     49 => 'Einstellungen',
     50 => 'Fehler im SQL-Befehl',
     51 => 'Hilfe',
diff -r fedfb5dd5dbb -r 47ac8fa20740 language/german_formal_utf-8.php
--- a/language/german_formal_utf-8.php	Mon Mar 29 19:45:07 2010 -0400
+++ b/language/german_formal_utf-8.php	Mon Mar 29 19:51:11 2010 -0400
@@ -93,7 +93,7 @@
     45 => 'MySQL Fehlernummer',
     46 => 'MySQL Fehlermeldung',
     47 => 'Anmelden',
-    48 => 'Mein Profil',
+    48 => 'Ihr Profil',
     49 => 'Einstellungen',
     50 => 'Fehler im SQL-Befehl',
     51 => 'Hilfe',
diff -r fedfb5dd5dbb -r 47ac8fa20740 plugins/staticpages/functions.inc
--- a/plugins/staticpages/functions.inc	Mon Mar 29 19:45:07 2010 -0400
+++ b/plugins/staticpages/functions.inc	Mon Mar 29 19:51:11 2010 -0400
@@ -651,7 +651,7 @@
     if (!empty($perms)) {
         $perms = ' AND ' . $perms;
     }
-    $result = DB_query("SELECT sp_id,sp_title,sp_hits FROM {$_TABLES['staticpage']} WHERE (sp_hits > 0) AND (draft_flag = 0)" . $perms . ' ORDER BY sp_hits DESC LIMIT 10');
+    $result = DB_query("SELECT sp_id,sp_title,sp_page_title,sp_hits FROM {$_TABLES['staticpage']} WHERE (sp_hits > 0) AND (draft_flag = 0)" . $perms . ' ORDER BY sp_hits DESC LIMIT 10');
     $nrows  = DB_numRows($result);
     if ($nrows > 0) {
         require_once $_CONF['path_system'] . 'lib-admin.php';
@@ -671,7 +671,14 @@
         );
         for ($i = 0; $i < $nrows; $i++) {
             $A = DB_fetchArray($result);
-            $A['sp_title'] = stripslashes($A['sp_title']);
+            $A['sp_title'] = stripslashes(trim($A['sp_title']));
+            if (empty($A['sp_title'])) {
+                $A['sp_title'] = $A['sp_page_title'];
+                if (empty($A['sp_title'])) {
+                    $A['sp_title'] = $A['sp_id'];
+                }
+                $A['sp_title'] = '(' . $A['sp_title'] . ')';
+            }
             $A['sid'] = COM_createLink($A['sp_title'],
                             COM_buildUrl($_CONF['site_url']
                                 . "/staticpages/index.php?page={$A['sp_id']}"));
@@ -1370,7 +1377,14 @@
         break;
 
     case 'sp_title':
-        $sp_title = stripslashes($A['sp_title']);
+        $sp_title = stripslashes(trim($A['sp_title']));
+        if (empty($sp_title)) {
+            $sp_title = $A['sp_page_title'];
+            if (empty($sp_title)) {
+                $sp_title = $A['sp_id'];
+            }
+            $sp_title = '(' . $sp_title . ')';
+        }
         $url = COM_buildUrl($_CONF['site_url'] .
                             '/staticpages/index.php?page=' . $A['sp_id']);
         $attr = array();