BugTrack/2176 showrss: Fix character encoding issues etc.

[pukiwiki/pukiwiki.git] / lib / auth.php

diff --git a/lib/auth.php b/lib/auth.php
index 890aec3..f364d40 100644 (file)
--- a/lib/auth.php
+++ b/lib/auth.php
@@ -157,7 +157,7 @@ function pkwk_ldap_escape_dn($value) {
 // Check edit-permission
 function check_editable($page, $auth_enabled = TRUE, $exit_on_fail = TRUE)
 {
-       global $script, $_title_cannotedit, $_msg_unfreeze;
+       global $_title_cannotedit, $_msg_unfreeze;
 
        if (edit_auth($page, $auth_enabled, $exit_on_fail) && is_editable($page)) {
                // Editable
@@ -171,7 +171,7 @@ function check_editable($page, $auth_enabled = TRUE, $exit_on_fail = TRUE)
                        $body = $title = str_replace('$1',
                                htmlsc(strip_bracket($page)), $_title_cannotedit);
                        if (is_freeze($page))
-                               $body .= '(<a href="' . $script . '?cmd=unfreeze&amp;page=' .
+                               $body .= '(<a href="' . get_base_uri() . '?cmd=unfreeze&amp;page=' .
                                        rawurlencode($page) . '">' . $_msg_unfreeze . '</a>)';
                        $page = str_replace('$1', make_search($page), $_title_cannotedit);
                        catbody($title, $page, $body);
@@ -307,8 +307,8 @@ function basic_auth($page, $auth_enabled, $exit_on_fail, $auth_pages, $title_can
                                header('WWW-Authenticate: Basic realm="' . $_msg_auth . '"');
                                header('HTTP/1.0 401 Unauthorized');
                        } elseif (AUTH_TYPE_FORM === $auth_type) {
-                               $url_after_login = get_script_uri() . '?' . $g_query_string;
-                               $loginurl = get_script_uri() . '?plugin=loginform'
+                               $url_after_login = get_base_uri() . '?' . $g_query_string;
+                               $loginurl = get_base_uri() . '?plugin=loginform'
                                        . '&page=' . rawurlencode($page)
                                        . '&url_after_login=' . rawurlencode($url_after_login);
                                header('HTTP/1.0 302 Found');