diff --git a/fp-plugins/prettyurls/htaccess.txt b/fp-plugins/prettyurls/htaccess.txt index a666c77..15bbca7 100644 --- a/fp-plugins/prettyurls/htaccess.txt +++ b/fp-plugins/prettyurls/htaccess.txt @@ -1,20 +1,22 @@ AddType application/x-httpd-php .php .htm .html Options -Indexes + RewriteEngine On -RewriteBase /~nowhereman/flatpress/ +RewriteBase /your_subdirectory/ -#RewriteCond %{REQUEST_FILENAME} -f -#RewriteCond %{REQUEST_FILENAME} -d +# Protects the .htacces file from external access, status code 403 "Forbidden" is output +#RewriteRule ^\.htaccess$ - [F] -RewriteRule ^entry([0-9]{6})-([0-9]{6})\.html$ ./index.php?entry=entry$1-$2 -RewriteRule ^comments([0-9]{6})-([0-9]{6})\.html$ ./comments.php?entry=entry$1-$2 -#RewriteRule ^page-([-_0-9a-zA-Z]+)\.html$ static.php?page=$1 +RewriteCond %{REQUEST_FILENAME} !-f +RewriteCond %{REQUEST_FILENAME} !-d +RewriteRule . /your_subdirectory/index.php [L] +#RewriteRule ^entry([0-9]{6})-([0-9]{6})/$ ./index.php?entry=entry$1-$2 [L] +#RewriteRule ^comments([0-9]{6})-([0-9]{6})/$ ./comments.php?entry=entry$1-$2 [L] +#RewriteRule ^.+/comments/$ ./comments.php [L] +#RewriteRule ^([a-zA-Z0-9_-]+)/$ ./static.php?page=$1 [L] +#RewriteRule ^(.+)/$ ./blog.php [L] -RewriteRule ^index\.html$ index.php - - -#RewriteRule ^images/(.*) fp-content/images/$1 -#RewriteRule ^attachs/(.*) fp-content/attachs/$1 - +#RewriteRule ^index\.html$ index.php [NC,R] + \ No newline at end of file diff --git a/fp-plugins/prettyurls/lang/lang.cs-cz.php b/fp-plugins/prettyurls/lang/lang.cs-cz.php index 06f3eb7..400148c 100644 --- a/fp-plugins/prettyurls/lang/lang.cs-cz.php +++ b/fp-plugins/prettyurls/lang/lang.cs-cz.php @@ -6,8 +6,11 @@ $lang ['plugin'] ['prettyurls'] ['errors'] = array( $lang ['admin'] ['plugin'] ['submenu'] ['prettyurls'] = 'PrettyURLs Config'; $lang ['admin'] ['plugin'] ['prettyurls'] = array( 'head' => 'Nastavení PrettyURLs', + 'description1' => 'Zde můžete přeměnit standardní adresy URL FlatPressu na krásné adresy URL vhodné pro SEO.', 'htaccess' => '.htaccess', - 'description' => 'Tímto editorem můžete editovat Váš soubor .htaccess.', + 'description2' => 'Tento editor umožňuje přímo upravovat soubor .htaccess potřebný pro zásuvný modul PrettyUrls.
' . // + 'Poznámka: Pouze webové servery kompatibilní s NCSA, jako je například Apache, uznávají koncept souborů .htaccess. ' . // + 'Váš serverový software je: ' . $_SERVER["SERVER_SOFTWARE"] . '', 'cantsave' => 'Nemůžete editovat tento soubor, protože není zapisovatelný. Můžete nastavit povolení k zapisování nebo kopírovat a vložit do souboru a poté nahrát.', 'mode' => 'Režim', 'auto' => 'Automatický', diff --git a/fp-plugins/prettyurls/lang/lang.da-dk.php b/fp-plugins/prettyurls/lang/lang.da-dk.php index 7258fd6..6e84c7c 100644 --- a/fp-plugins/prettyurls/lang/lang.da-dk.php +++ b/fp-plugins/prettyurls/lang/lang.da-dk.php @@ -7,9 +7,11 @@ $lang ['plugin'] ['prettyurls'] ['errors'] = array ( $lang ['admin'] ['plugin'] ['submenu'] ['prettyurls'] = 'PrettyURLs'; $lang ['admin'] ['plugin'] ['prettyurls'] = array( 'head' => 'PrettyURLs Konfiguration', + 'description1' => 'Her kan du forvandle FlatPress\' standard-URL\'er til smukke, SEO-venlige URL\'er.', 'htaccess' => '.htaccess', - 'description' => 'Denne editor giver dig mulighed for direkte at redigere de ' . // - '.htaccess der er nødvendige for PrettyUrls plugin.', + 'description2' => 'Denne editor giver dig mulighed for direkte at redigere den .htaccess, der kræves til PrettyUrls-pluginet.
' . // + 'Bemærk: Kun webservere, der er NCSA-kompatible, såsom Apache, anerkender begrebet .htaccess-filer. ' . // + 'Din serversoftware er: ' . $_SERVER["SERVER_SOFTWARE"] . '', 'cantsave' => 'Denne fil kan ikke redigeres, fordi den er skrivebeskyttet. Ændr adgangsrettighederne, eller kopier disse linjer, indsæt dem i en lokal fil, og upload den derefter.', 'mode' => 'Tilstand', 'auto' => 'Automatisk', diff --git a/fp-plugins/prettyurls/lang/lang.de-de.php b/fp-plugins/prettyurls/lang/lang.de-de.php index 45dbf68..c66a074 100644 --- a/fp-plugins/prettyurls/lang/lang.de-de.php +++ b/fp-plugins/prettyurls/lang/lang.de-de.php @@ -7,8 +7,11 @@ $lang ['plugin'] ['prettyurls'] ['errors'] = array ( $lang ['admin'] ['plugin'] ['submenu'] ['prettyurls'] = 'PrettyURLs'; $lang ['admin'] ['plugin'] ['prettyurls'] = array( 'head' => 'PrettyURLs Konfiguration', + 'description1' => 'Hier kannst du die Standard-URL\'s von FlatPress in schöne, SEO-freundliche URL\'s verwandeln.', 'htaccess' => '.htaccess', - 'description' => 'Dieser Editor ermöglicht die für das PrettyUrls Plugin benötigte .htaccess direkt zu bearbeiten.', + 'description2' => 'Dieser Editor ermöglicht die für das PrettyURLs Plugin benötigte .htaccess direkt zu bearbeiten.
' . // + 'Hinweis: Nur Webserver, die NCSA kompatibel sind, wie beispielsweise Apache, kennen das Konzept der .htaccess Dateien. ' . // + 'Deine Serversoftware ist: ' . $_SERVER["SERVER_SOFTWARE"] . '', 'cantsave' => 'Diese Datei kann nicht bearbeitet werden, weil sie schreibgeschützt ist. Ändere die Zugriffsrechte oder kopiere diese Zeilen, füge sie in eine lokale Datei ein und lade diese dann hoch.', 'mode' => 'Modus', 'auto' => 'Automatisch', diff --git a/fp-plugins/prettyurls/lang/lang.el-gr.php b/fp-plugins/prettyurls/lang/lang.el-gr.php index 5410fdf..7ca40df 100644 --- a/fp-plugins/prettyurls/lang/lang.el-gr.php +++ b/fp-plugins/prettyurls/lang/lang.el-gr.php @@ -7,8 +7,11 @@ $lang ['plugin'] ['prettyurls'] ['errors'] = array ( $lang ['admin'] ['plugin'] ['submenu'] ['prettyurls'] = 'PrettyURLs'; $lang ['admin'] ['plugin'] ['prettyurls'] = array( 'head' => 'Διαμόρφωση της PrettyURL', + 'description1' => 'Εδώ μπορείτε να μετατρέψετε τις τυπικές διευθύνσεις URL του FlatPress σε όμορφες, φιλικές προς το SEO διευθύνσεις URL.', 'htaccess' => '.htaccess', - 'description' => 'Αυτός ο επεξεργαστής σας επιτρέπει να επεξεργαστείτε απευθείας το .htaccess που απαιτείται για το πρόσθετο PrettyUrls.', + 'description2' => 'Αυτός ο επεξεργαστής σας επιτρέπει να επεξεργαστείτε απευθείας το .htaccess που απαιτείται για το πρόσθετο PrettyUrls.
' . // + 'Σημείωση: Μόνο οι διακομιστές ιστού που είναι συμβατοί με την NCSA, όπως ο Apache, αναγνωρίζουν την έννοια των αρχείων .htaccess. ' . // + 'Το λογισμικό του διακομιστή σας είναι: ' . $_SERVER["SERVER_SOFTWARE"] . '', 'cantsave' => 'Αυτό το αρχείο δεν μπορεί να επεξεργαστεί επειδή προστατεύεται από εγγραφή. Αλλάξτε τα δικαιώματα πρόσβασης ή αντιγράψτε αυτές τις γραμμές, επικολλήστε τις σε ένα τοπικό αρχείο και στη συνέχεια ανεβάστε το.', 'mode' => 'Λειτουργία', 'auto' => 'Αυτόματο', diff --git a/fp-plugins/prettyurls/lang/lang.en-us.php b/fp-plugins/prettyurls/lang/lang.en-us.php index 541fe6d..de6d2be 100644 --- a/fp-plugins/prettyurls/lang/lang.en-us.php +++ b/fp-plugins/prettyurls/lang/lang.en-us.php @@ -7,8 +7,11 @@ $lang ['plugin'] ['prettyurls'] ['errors'] = array ( $lang ['admin'] ['plugin'] ['submenu'] ['prettyurls'] = 'PrettyURLs Config'; $lang ['admin'] ['plugin'] ['prettyurls'] = array( 'head' => 'PrettyURLs Configuration', + 'description1' => 'Here you can turn the standard FlatPress URLs into beautiful, SEO-friendly URLs.', 'htaccess' => '.htaccess', - 'description' => 'This raw editor let you edit your .htaccess.', + 'description2' => 'This editor allows you to edit the .htaccessrequired for the PrettyURLs plugin directly.
' . // + 'Note: Only web servers that are NCSA compatible, such as Apache, are familiar with the concept of .htaccess files. ' . // + 'Your server software is: ' . $_SERVER["SERVER_SOFTWARE"] . '', 'cantsave' => 'You can\'t edit this file, because it\'s not writable. You can give writing permission or copy and paste to a file and then upload manually.', 'mode' => 'Mode', 'auto' => 'Automatic', diff --git a/fp-plugins/prettyurls/lang/lang.es-es.php b/fp-plugins/prettyurls/lang/lang.es-es.php index 55dee85..e5318cb 100644 --- a/fp-plugins/prettyurls/lang/lang.es-es.php +++ b/fp-plugins/prettyurls/lang/lang.es-es.php @@ -7,8 +7,11 @@ $lang ['plugin'] ['prettyurls'] ['errors'] = array ( $lang ['admin'] ['plugin'] ['submenu'] ['prettyurls'] = 'Configuración de PrettyURLs'; $lang ['admin'] ['plugin'] ['prettyurls'] = array( 'head' => 'Configuración de PrettyURLs', + 'description1' => 'Aquí puedes transformar las URLs estándar de FlatPress en URLs bonitas y SEO-friendly.', 'htaccess' => '.htaccess', - 'description' => 'Este editor en bruto te permite editar tu .htaccess.', + 'description2' => 'Este editor le permite editar directamente el .htaccess necesario para el plugin PrettyUrls.
' . // + 'Nota: Sólo los servidores web compatibles con NCSA, como Apache, reconocen el concepto de archivos .htaccess. ' . // + 'El software de tu servidor lo es: ' . $_SERVER["SERVER_SOFTWARE"] . '', 'cantsave' => 'No puede editar este archivo, porque no es writable. Puede otorgar permiso de escritura o copiar y pegar en un archivo y luego cargarlo.', 'mode' => 'Modo', 'auto' => 'Automático', diff --git a/fp-plugins/prettyurls/lang/lang.fr-fr.php b/fp-plugins/prettyurls/lang/lang.fr-fr.php index fb4e5ba..b91c6f8 100644 --- a/fp-plugins/prettyurls/lang/lang.fr-fr.php +++ b/fp-plugins/prettyurls/lang/lang.fr-fr.php @@ -7,8 +7,11 @@ $lang ['plugin'] ['prettyurls'] ['errors'] = array ( $lang ['admin'] ['plugin'] ['submenu'] ['prettyurls'] = 'PrettyURLs Config'; $lang ['admin'] ['plugin'] ['prettyurls'] = array( 'head' => 'Configuration de PrettyURLs', + 'description1' => 'Ici, tu peux transformer les URL standard de FlatPress en de jolies URL adaptées au SEO.', 'htaccess' => '.htaccess', - 'description' => 'Cet éditeur vous permet de modifier le fichier .htaccess .htaccess.', + 'description2' => 'Cet éditeur permet d\'éditer directement le .htaccess nécessaire au plugin PrettyUrls.
' . // + 'Remarque: Seuls les serveurs web compatibles avec NCSA, comme Apache, connaissent le concept des fichiers .htaccess. ' . // + 'Ton logiciel serveur est: ' . $_SERVER["SERVER_SOFTWARE"] . '', 'cantsave' => 'Vous ne pouvez pas éditer ce fichier, parce qu\'il n\'est pas autorisé en écriture. Vous devez autoriser l\'écriture du fichier ou copier-coller vers un fichier à transférer.', 'mode' => 'Mode', 'auto' => 'Automatique', diff --git a/fp-plugins/prettyurls/lang/lang.it-it.php b/fp-plugins/prettyurls/lang/lang.it-it.php index 34e42be..5386876 100644 --- a/fp-plugins/prettyurls/lang/lang.it-it.php +++ b/fp-plugins/prettyurls/lang/lang.it-it.php @@ -7,8 +7,11 @@ $lang ['plugin'] ['prettyurls'] ['errors'] = array ( $lang ['admin'] ['plugin'] ['submenu'] ['prettyurls'] = 'Configurazione di PrettyURLs'; $lang ['admin'] ['plugin'] ['prettyurls'] = array( 'head' => 'Configurazione di PrettyURLs', + 'description1' => 'Qui è possibile trasformare gli URL standard di FlatPress in URL belli e SEO-friendly.', 'htaccess' => '.htaccess', - 'description' =>'Questo editor grezzo ti permette di modificare il tuo .htaccess.', + 'description2' => 'Questo editor consente di modificare direttamente il file .htaccess necessario per il plugin PrettyUrls.
' . // + 'Nota: Solo i server web compatibili con NCSA, come Apache, riconoscono il concetto di file .htaccess. ' . // + 'Il software del server è: ' . $_SERVER["SERVER_SOFTWARE"] . '', 'cantsave' => 'Non puoi modificare questo file, perché non è scrivibile. Puoi dargli i permessi di scrittura o copiarlo e incollarlo in un file e poi caricarlo.', 'mode' => 'Modalità', 'auto' => 'Automatica', diff --git a/fp-plugins/prettyurls/lang/lang.ja-jp.php b/fp-plugins/prettyurls/lang/lang.ja-jp.php index 09e7147..cf91113 100644 --- a/fp-plugins/prettyurls/lang/lang.ja-jp.php +++ b/fp-plugins/prettyurls/lang/lang.ja-jp.php @@ -7,8 +7,11 @@ $lang ['plugin'] ['prettyurls'] ['errors'] = array ( $lang ['admin'] ['plugin'] ['submenu'] ['prettyurls'] = 'PrettyURLsの設定'; $lang ['admin'] ['plugin'] ['prettyurls'] = array( 'head' => 'PrettyURLsの設定', + 'description1' => 'FlatPressの標準的なURLを、SEOに配慮した美しいURLに変換することができます。', 'htaccess' => '.htaccess', - 'description' => 'この生エディタは、.htaccessを編集することができます。', + 'description2' => 'このエディタでは、PrettyUrlsプラグインに必要な.htaccessを直接編集することができます。
' . // + '注: .htaccessファイルの概念を認識するのは、ApacheのようなNCSA互換のウェブサーバーだけです。 ' . // + 'サーバーソフトウェアは. ' . $_SERVER["SERVER_SOFTWARE"] . '', 'cantsave' => 'このファイルを編集できません、なぜなら 書き込み許可されてないからです。' . '書き込み許可を与えたり、ファイルにコピー＆ペーストしてアップロードすることもできる。', 'mode' => 'モード', diff --git a/fp-plugins/prettyurls/lang/lang.nl-nl.php b/fp-plugins/prettyurls/lang/lang.nl-nl.php index 54760e9..f74ab09 100644 --- a/fp-plugins/prettyurls/lang/lang.nl-nl.php +++ b/fp-plugins/prettyurls/lang/lang.nl-nl.php @@ -7,8 +7,11 @@ $lang ['plugin'] ['prettyurls'] ['errors'] = array ( $lang ['admin'] ['plugin'] ['submenu'] ['prettyurls'] = 'PrettyURLs Configuratie'; $lang ['admin'] ['plugin'] ['prettyurls'] = array( 'head' => 'PrettyURLs Configuratie', + 'description1' => 'Hier kun je de standaard FlatPress URL\'s omzetten in mooie, SEO-vriendelijke URL\'s.', 'htaccess' => '.htaccess', - 'description' => 'Met deze onbewerkte editor kunt u uw .htaccess.', + 'description2' => 'Met deze editor kun je direct de .htaccess bewerken die nodig is voor de PrettyURLs plugin.
' . // + 'Opmerking: Alleen webservers die NCSA-compatibel zijn, zoals Apache, herkennen het concept van .htaccess-bestanden. ' . // + 'Uw serversoftware is: ' . $_SERVER["SERVER_SOFTWARE"] . '', 'cantsave' => 'U kunt dit bestand niet bewerken omdat het niet schrijfbaar is. U kunt schrijfmachtigingen geven of een kopie maken en plakken in een bestand en vervolgens handmatig uploaden.', 'mode' => 'Modus', 'auto' => 'Automatisch', diff --git a/fp-plugins/prettyurls/lang/lang.pt-br.php b/fp-plugins/prettyurls/lang/lang.pt-br.php index 95b2243..c6b4353 100644 --- a/fp-plugins/prettyurls/lang/lang.pt-br.php +++ b/fp-plugins/prettyurls/lang/lang.pt-br.php @@ -1,14 +1,17 @@ 'Não consigo encontrar ou criar um arquivo .htaccess na sua raiz. Pode ser que PrettyURLs não funciona corretamente. Consulte o painel de configuração.' + -2 => 'Não consigo encontrar ou criar um arquivo .htaccess na sua raiz. Pode ser que PrettyURLs não funciona corretamente. ' . // + 'Consulte o painel de configuração.' ); $lang ['admin'] ['plugin'] ['submenu'] ['prettyurls'] = 'Configurar PrettyURLs'; $lang ['admin'] ['plugin'] ['prettyurls'] = array( 'head' => 'Configurar PrettyURLs', + 'description1' => 'Aqui, você pode transformar os URLs padrão do FlatPress em URLs bonitos e compatíveis com SEO.', 'htaccess' => '.htaccess', - - 'description' => 'Este editor bruto permite editar o seu .htaccess.', + 'description2' => 'Esse editor permite que você edite diretamente o .htaccess necessário para o plug-in PrettyURLs.
' . // + 'Observação: Somente os servidores da Web compatíveis com a NCSA, como o Apache, reconhecem o conceito de arquivos .htaccess. ' . // + 'Seu software de servidor é: ' . $_SERVER["SERVER_SOFTWARE"] . '', 'cantsave' => 'Você não pode editar este arquivo, porque ele não é gravável. Você pode conceder permissão de gravação ou copiar e colar em um arquivo e fazer o upload.', 'mode' => 'Modo', 'auto' => 'Automático', diff --git a/fp-plugins/prettyurls/lang/lang.ru-ru.php b/fp-plugins/prettyurls/lang/lang.ru-ru.php index 49a6b16..27b2bd1 100644 --- a/fp-plugins/prettyurls/lang/lang.ru-ru.php +++ b/fp-plugins/prettyurls/lang/lang.ru-ru.php @@ -7,8 +7,11 @@ $lang ['plugin'] ['prettyurls'] ['errors'] = array ( $lang ['admin'] ['plugin'] ['submenu'] ['prettyurls'] = 'Конфигурация PrettyURLs'; $lang ['admin'] ['plugin'] ['prettyurls'] = array( 'head' => 'Конфигурация PrettyURLs', + 'description1' => 'Здесь вы можете превратить стандартные URL из FlatPress в красивые, SEO-дружественные URL.', 'htaccess' => '.htaccess', - 'description' => 'Этот редактор позволяет редактировать ваш .htaccess.', + 'description2' => 'Этот редактор позволяет напрямую редактировать .htaccess, необходимый для работы плагина PrettyURLs.
' . // + 'Примечание: Только веб-серверы, совместимые с NCSA, такие как Apache, поддерживают концепцию файлов .htaccess. ' . // + 'Ваше серверное программное обеспечение: ' . $_SERVER["SERVER_SOFTWARE"] . '', 'cantsave' => 'Вы не можете редактировать этот файл, поскольку он недоступен для записи. Вы можете дать разрешение на запись или скопировать и вставить в файл, а затем загрузить вручную.', 'mode' => 'Режим', 'auto' => 'Автоматический', diff --git a/fp-plugins/prettyurls/lang/lang.sl-si.php b/fp-plugins/prettyurls/lang/lang.sl-si.php index 889f262..6b0e548 100644 --- a/fp-plugins/prettyurls/lang/lang.sl-si.php +++ b/fp-plugins/prettyurls/lang/lang.sl-si.php @@ -7,8 +7,11 @@ $lang ['plugin'] ['prettyurls'] ['errors'] = array ( $lang ['admin'] ['plugin'] ['submenu'] ['prettyurls'] = 'Nastavitve PrettyURLs'; $lang ['admin'] ['plugin'] ['prettyurls'] = array( 'head' => 'Nastavitve PrettyURLs', + 'description1' => 'Tu lahko standardne URL-je iz FlatPressa spremenite v čudovite, SEO prijazne URL-je.', 'htaccess' => '.htaccess', - 'description' => 'Ta urejevalnik vam omogoča urejanje vaše .htaccess datoteke.', + 'description2' => 'Ta urejevalnik vam omogoča neposredno urejanje .htaccess, potrebnega za vtičnik PrettyURLs.
' . // + 'Opomba: Koncept datotek .htaccess poznajo samo spletni strežniki, ki so združljivi z NCSA, kot je Apache. ' . // + 'Programska oprema vašega strežnika je: ' . $_SERVER["SERVER_SOFTWARE"] . '', 'cantsave' => 'Datoteke ne morete urejati, ker ni zapisljiva. Lahko podelite dovoljenja za pisanje ali kopirate in prilepite v datoteko ter jo nato naložite ročno.', 'mode' => 'Način', 'auto' => 'Avtomatski', diff --git a/fp-plugins/prettyurls/plugin.prettyurls.php b/fp-plugins/prettyurls/plugin.prettyurls.php index 27b4e82..62c7f92 100644 --- a/fp-plugins/prettyurls/plugin.prettyurls.php +++ b/fp-plugins/prettyurls/plugin.prettyurls.php @@ -625,9 +625,6 @@ if (class_exists('AdminPanelAction')) { if (!$txt) { $txt = ' - - # Thanks again WP :) - AddType application/x-httpd-php .php .htm .html Options -Indexes @@ -635,7 +632,6 @@ if (class_exists('AdminPanelAction')) { RewriteEngine On RewriteBase ' . $blogroot . ' - # Protects the .htacces file from external access, status code 403 "Forbidden" is output RewriteRule ^\.htaccess$ - [F] RewriteCond %{REQUEST_FILENAME} !-f diff --git a/fp-plugins/prettyurls/tpls/admin.plugin.prettyurls.tpl b/fp-plugins/prettyurls/tpls/admin.plugin.prettyurls.tpl index e0b31ca..5043a98 100644 --- a/fp-plugins/prettyurls/tpls/admin.plugin.prettyurls.tpl +++ b/fp-plugins/prettyurls/tpls/admin.plugin.prettyurls.tpl @@ -1,4 +1,5 @@

{$plang.head}

+

{$plang.description1}

{include file="shared:errorlist.tpl"} @@ -6,7 +7,7 @@ {html_form} -

{$plang.mode}

+

{$plang.mode}

@@ -30,7 +31,7 @@

{$plang.htaccess}

-

{$plang.description}

+

{$plang.description2}

diff --git a/setup/lang/lang.cs-cz.php b/setup/lang/lang.cs-cz.php index 75474b6..adb065e 100644 --- a/setup/lang/lang.cs-cz.php +++ b/setup/lang/lang.cs-cz.php @@ -76,8 +76,6 @@ $lang ['step3'] = array( A máte pravdu: příběh právě začíná, ale psaní je jen na vás! -

Upozornění: Pro větší pohodlí a bezpečnost doporučujeme nakonfigurovat pokyny pro váš server v oblasti administrace pomocí pluginu PrettyURL.

-