From 1ad3b7b8a34a948ba2e20421a681685a6c3fefd0 Mon Sep 17 00:00:00 2001
From: rurban <rurban@96ab9672-09ca-45d6-a79d-3d69d39ca109>
Date: Sun, 16 May 2004 23:10:45 +0000
Subject: [PATCH] update_locale wrongly resetted LANG, which broke japanese.
 japanese now correctly uses EUC_JP, not utf-8. more charset and lang headers
 to help the browser.

git-svn-id: svn://svn.code.sf.net/p/phpwiki/code/trunk@3528 96ab9672-09ca-45d6-a79d-3d69d39ca109
---
 lib/PagePerm.php                   | 10 +++++++---
 lib/config.php                     | 12 +++++++++---
 themes/default/templates/head.tmpl |  8 ++++++--
 themes/default/templates/html.tmpl |  4 ++--
 4 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/lib/PagePerm.php b/lib/PagePerm.php
index 8cedda9bc..d85ad6a57 100644
--- a/lib/PagePerm.php
+++ b/lib/PagePerm.php
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-rcs_id('$Id: PagePerm.php,v 1.16 2004-05-16 22:32:53 rurban Exp $');
+rcs_id('$Id: PagePerm.php,v 1.17 2004-05-16 23:10:44 rurban Exp $');
 /*
  Copyright 2004 $ThePhpWikiProgrammingTeam
 
@@ -26,8 +26,9 @@ rcs_id('$Id: PagePerm.php,v 1.16 2004-05-16 22:32:53 rurban Exp $');
    opposed to the simplier unix like ugo:rwx system.
    The previous system was only based on action and current user. (lib/main.php)
 
-   Permissions maybe inherited its parent pages, and ultimativly the 
-   optional master page (".")
+   Permissions may be inherited from its parent pages, a optional the 
+   optional master page ("."), and predefined default permissions, if "." 
+   is not defined.
    Pagenames starting with "." have special default permissions.
    For Authentication see WikiUserNew.php, WikiGroup.php and main.php
    Page Permssions are in PhpWiki since v1.3.9 and enabled since v1.4.0
@@ -663,6 +664,9 @@ class PagePermission {
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.16  2004/05/16 22:32:53  rurban
+// setacl icons
+//
 // Revision 1.15  2004/05/16 22:07:35  rurban
 // check more config-default and predefined constants
 // various PagePerm fixes:
diff --git a/lib/config.php b/lib/config.php
index 52a5f78ae..c9faefb44 100644
--- a/lib/config.php
+++ b/lib/config.php
@@ -1,5 +1,5 @@
 <?php
-rcs_id('$Id: config.php,v 1.109 2004-05-08 14:06:12 rurban Exp $');
+rcs_id('$Id: config.php,v 1.110 2004-05-16 23:10:44 rurban Exp $');
 /*
  * NOTE: The settings here should probably not need to be changed.
  * The user-configurable settings have been moved to IniConfig.php
@@ -171,7 +171,7 @@ function update_locale($loc) {
         //return false;
     }
     //if (substr($newlocale,0,2) == $loc) // don't update with C or failing setlocale
-    $GLOBALS['LANG'] = $loc;
+    if (!isset($GLOBALS['LANG'])) $GLOBALS['LANG'] = $loc;
     // Try to put new locale into environment (so any
     // programs we run will get the right locale.)
     //
@@ -248,8 +248,10 @@ function pcre_fix_posix_classes ($regexp) {
     global $charset;
     if (!isset($charset))
         $charset = CHARSET; // get rid of constant. pref is dynamic and language specific
-    if (in_array($GLOBALS['LANG'],array('ja','zh')))
+    if (in_array($GLOBALS['LANG'],array('zh')))
         $charset = 'utf-8';
+    if (in_array($GLOBALS['LANG'],array('ja')))
+        $charset = 'EUC-JP';
     if (strtolower($charset) == 'utf-8') { // thanks to John McPherson
         // until posix class names/pcre work with utf-8
 	if (preg_match('/[[:upper:]]/', '\xc4\x80'))
@@ -321,6 +323,10 @@ if (!function_exists('is_scalar')) { // lib/stdlib.php:hash()
 }
 
 // $Log: not supported by cvs2svn $
+// Revision 1.109  2004/05/08 14:06:12  rurban
+// new support for inlined image attributes: [image.jpg size=50x30 align=right]
+// minor stability and portability fixes
+//
 // Revision 1.108  2004/05/08 11:25:16  rurban
 // php-4.0.4 fixes
 //
diff --git a/themes/default/templates/head.tmpl b/themes/default/templates/head.tmpl
index a6954f2bf..4d5535967 100644
--- a/themes/default/templates/head.tmpl
+++ b/themes/default/templates/head.tmpl
@@ -1,8 +1,9 @@
 <?php  // -*-html-*-
-  rcs_id('$Id: head.tmpl,v 1.14 2004-02-17 12:19:49 rurban Exp $');
+  rcs_id('$Id: head.tmpl,v 1.15 2004-05-16 23:10:45 rurban Exp $');
 ?>
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?=CHARSET?>" />
+<meta http-equiv="content-language" content="<?=$GLOBALS['LANG']?>" />
 <?php $ROBOTS_CONTENT = $ROBOTS_META ? $ROBOTS_META : "noindex,nofollow"; ?>
 <meta name="robots" content="<?= $ROBOTS_CONTENT ?>" />
 <?php if (!empty($PAGE_DESCRIPTION)) { ?>
@@ -11,7 +12,7 @@
 <?php if (!empty($PAGE_KEYWORDS)) { ?>
 <meta name="keywords" content="<?=$PAGE_KEYWORDS?>" />
 <?php } ?>
-<meta name="language" content="<?=DEFAULT_LANGUAGE?>" />
+<meta name="language" content="<?=$GLOBALS['LANG']?>" />
 <meta name="document-type" content="Public" />
 <meta name="document-rating" content="General" />
 <meta name="generator" content="PhpWiki" />
@@ -112,6 +113,9 @@ _("UserPreferences"))?>" />
 <?php
 // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -                         
 // $Log: not supported by cvs2svn $
+// Revision 1.14  2004/02/17 12:19:49  rurban
+// support to add more javascript dynamically
+//
 // Revision 1.13  2003/12/05 15:36:39  carstenklapp
 // Improvements: to make it easier to run multiple wikis off of one set
 // of code, urls for link rel author and copyright now defined in
diff --git a/themes/default/templates/html.tmpl b/themes/default/templates/html.tmpl
index 76eae9e06..3da686410 100644
--- a/themes/default/templates/html.tmpl
+++ b/themes/default/templates/html.tmpl
@@ -1,5 +1,5 @@
 <?php  // -*-html-*-
-rcs_id('$Id: html.tmpl,v 1.4 2004-04-09 17:49:12 rurban Exp $');
+rcs_id('$Id: html.tmpl,v 1.5 2004-05-16 23:10:45 rurban Exp $');
 /*
  * This template is responsible mainly for the outer level <html> stuff.
  *
@@ -10,7 +10,7 @@ if (browserVersion() >= 4.0)
 ?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?=$GLOBALS['LANG']?>" lang="<?=$GLOBALS['LANG']?>">
 <?= Template('head') ?>
 <?= Template('body') ?>
 <?php
-- 
2.45.0