Changeset 1603

Timestamp:

11/10/2006 11:07:36 PM (2 years ago)

Author:

jeena

Message:

slash from categoriy url removed

Location:

trunk

Files:

• .htaccess (modified) (1 diff)
• lang/lang-admin.inc.php (modified) (1 diff)
• scripts/categories.class.php (modified) (1 diff)
• setup.php (modified) (1 diff)

trunk/.htaccess

@@ -5 +5 @@
   RewriteCond %{REQUEST_FILENAME} !-f
   RewriteCond %{REQUEST_FILENAME} !-d
-  RewriteRule "^cat/([a-z0-9_\-\.,/]+?)/?([0-9]{0,4})/?$" archive.php?cat=$1&y=$2 [QSA]
+  RewriteRule "^cat/([a-z0-9_\-\.,]+)/?([0-9]{0,4})/?$" archive.php?cat=$1&y=$2 [QSA]
 
   # catches all archive links, month and year

trunk/lang/lang-admin.inc.php

@@ -218 +218 @@
 
 "cat_name"                 => "Name der Kategorie",
-"cat_url"                  => "URL im Kategoriearchiv (nur a-z 0-9 _-,./ )",
+"cat_url"                  => "URL im Kategoriearchiv (nur a-z 0-9 _-,. )",
 "cat_description"          => "Beschreibung der Kategorie, die im Archiv auftaucht",
 "cat_new"                  => "Neue Kategorie anlegen",

trunk/scripts/categories.class.php

@@ -225 +225 @@
 
         if(empty($form_input['url'])) $errors[] = $this->l['admin']['no_url'];
-        elseif(!preg_match("/^[a-z0-9\-_\.\/,]+$/", $form_input['url'])) $errors[] = $this->l['admin']['false_url_letters'];
+        elseif(!preg_match("/^[a-z0-9\-_\.,]+$/", $form_input['url'])) $errors[] = $this->l['admin']['false_url_letters'];
         else {
             $sql = "SELECT id FROM ".JLOG_DB_CATEGORIES." WHERE url = '".escape_for_mysql($form_input['url'])."';";

trunk/setup.php

@@ -228 +228 @@
    .notok, .error { color: red; }
    table { border-spacing: 0.5em; }
-   fieldset { padding: 1em; border: 1px solid #ccc; }
+   fieldset { padding: 1em; border: 1px solid #ccc; clear: both; margin-top: 1em; }
    legend { font-weight: bold; padding: 0 1em; }
    .button { font-size: 3em; }
    p { text-align: center; }
    fieldset p { text-align: left; }
+   a img { border: none; }
   </style>
  </head>