From 8f416baead93a48e5799e44b8bd2e2c4859f4e04 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 14 Sep 2007 13:18:58 +0200 Subject: auf Version 1.11 aktualisiert; Login-Bug behoben --- includes/templates/NoLocalSettings.php | 5 ++-- includes/templates/Userlogin.php | 49 +++++++++++++--------------------- 2 files changed, 22 insertions(+), 32 deletions(-) (limited to 'includes/templates') diff --git a/includes/templates/NoLocalSettings.php b/includes/templates/NoLocalSettings.php index e71dd396..9020c46e 100644 --- a/includes/templates/NoLocalSettings.php +++ b/includes/templates/NoLocalSettings.php @@ -7,9 +7,10 @@ if ( isset( $wgVersion ) ) { } # Set the path in case we hit a page such as /index.php/Main_Page # Could use but then we have to worry about http[s]/port #/etc. +$ext = strpos( $_SERVER['SCRIPT_NAME'], 'index.php5' ) === false ? 'php' : 'php5'; $path = ''; if( isset( $_SERVER['SCRIPT_NAME'] )) { - $path = htmlspecialchars( preg_replace('/index.php/', '', $_SERVER['SCRIPT_NAME']) ); + $path = htmlspecialchars( preg_replace('/index.php5?/', '', $_SERVER['SCRIPT_NAME']) ); } ?> @@ -39,7 +40,7 @@ if( isset( $_SERVER['SCRIPT_NAME'] )) { if ( file_exists( 'config/LocalSettings.php' ) ) { echo( 'To complete the installation, move config/LocalSettings.php to the parent directory.' ); } else { - echo( "Please set up the wiki first." ); + echo( "Please set up the wiki first." ); } ?> diff --git a/includes/templates/Userlogin.php b/includes/templates/Userlogin.php index ccddfa66..127c30a0 100644 --- a/includes/templates/Userlogin.php +++ b/includes/templates/Userlogin.php @@ -28,11 +28,12 @@ class UserloginTemplate extends QuickTemplate {

msg('login') ?>

+ html('header'); /* pre-table point for form plugins... */ ?>
msgWiki('loginprompt') ?>
haveData( 'languages' ) ) { ?> - + - + data['usedomain'] ) { @@ -54,7 +55,7 @@ class UserloginTemplate extends QuickTemplate { } ?> - +
+ value="" size='20' />
msg( 'yourdomainname' ) ?>:msg( 'yourdomainname' ) ?> - + - + data['usedomain'] ) { @@ -138,7 +139,7 @@ class UsercreateTemplate extends QuickTemplate { } ?> - + - + data['useemail'] ) { ?> - + data['userealname'] ) { ?> - + @@ -200,24 +207,6 @@ class UsercreateTemplate extends QuickTemplate {
+ value="" size='20' />
msg( 'yourdomainname' ) ?>:msg( 'yourdomainname' ) ?>
+
+ msgWiki('prefs-help-email'); ?> +
+
+ msgWiki('prefs-help-realname'); ?> +
- data['userealname'] || $this->data['useemail']) { - echo '
'; - if ( $this->data['useemail'] ) { - echo '
'; - $this->msgHtml('prefs-help-email'); - echo '
'; - } - if ( $this->data['userealname'] ) { - echo '
'; - $this->msgHtml('prefs-help-realname'); - echo '
'; - } - echo '
'; - } - - ?> haveData( 'uselang' ) ) { ?> -- cgit v1.2.2