Changeset 1744

Timestamp:

09/10/2008 08:12:50 PM (2 months ago)

Author:

driehle

Message:

Fixed #196 + lang files updated

Files:

• trunk/lang/lang-admin.de.inc.php (modified) (1 diff)
• trunk/lang/lang-admin.en.inc.php (modified) (2 diffs)
• trunk/scripts/settings.class.php (modified) (1 diff)

trunk/lang/lang-admin.de.inc.php

@@ -196 +196 @@
-"e_db_content"             => "Bitte Tabellennamen fÃŒr Inhalte eingeben",
-"e_db_comments"            => "Bitte Tabellennamen fÃŒr Kommentare eingeben",
+"e_db_prefix"              => "Das KÌrzel, welches als Prefix fÌr die Tabellennamen verwendet werden soll, darf nur aus alphanumerischen Zeichen bestehen. Sie können die Angabe auch leer lassen.",
-"e_db_occurred"            => "Datenbankfehler",
-"e_db_is"                  => "Es ist ein Fehler auf ".JLOG_PATH." aufgetreten. Der Fehler lautet:",

trunk/lang/lang-admin.en.inc.php

@@ -196 +196 @@
-"e_db_content"              => "Please enter the name of the contents table.",
-"e_db_comments"             => "Please enter the name of the comments table.",
+"e_db_prefix"               => "The prefix for table names must not contain anything but alpha-numeric characters. However, you can leave option empty.",
-"e_db_occurred"             => "Database error",
-"e_db_is"                   => "A error occured in ".JLOG_PATH.". It is:",
@@ -234 +235 @@
-"cat_duplicate"             => "Another category is already using this URL.",
-
-
+
+
+
+
-"pingback_closed"           => "Close pingbacks for this entry.",
-

trunk/scripts/settings.class.php

@@ -425 +425 @@
-    if(empty($this->d['jlog_db'])) $errors[] = $this->l['admin']['e_db'];
-    if(empty($this->d['jlog_db_url'])) $errors[] = $this->l['admin']['e_db_url'];
+    // Fix of bug #196, prefix should only contain alphanumeric values, can be empty!
+    if(!preg_match('/^[a-zA-Z0-9_]*$/', $this->d['jlog_db_prefix'])) $errors[] = $this->l['admin']['e_db_prefix'];
-
-    return $errors;