Merge lp:~yoboy-leguesh/ubuntu-fr-doc/auth_fluxbb into lp:ubuntu-fr-doc

[YoBoY]

Désactivation des actions non autorisées sur les comptes utilisateurs --fixes #717746
Reformatage mineur du fichier de configuration
Création du fichier de configuration mysql.conf.php pour l'accès à la base de donnée fluxBB basé sur le fichier inc/auth/auth_punbb.class.php utilisé actuellement. --fixes #717708
Adaptation du fichier local.protected.php.dist d'exemple pour intégration des modifications sur l'utilisation du backend mysql.
Suppression des correctifs sur le fichier inc/utf8.php devenus inutiles

Désactivation des actions non autorisées sur les comptes utilisateurs --fixes #717746
Reformatage mineur du fichier de configuration
Création du fichier de configuration mysql.conf.php pour l'accès à la base de donnée fluxBB basé sur le fichier inc/auth/auth_punbb.class.php utilisé actuellement. --fixes #717708
Adaptation du fichier local.protected.php.dist d'exemple pour intégration des modifications sur l'utilisation du backend mysql.
Suppression des correctifs sur le fichier inc/utf8.php devenus inutiles

[McPeter (mcpeter)]

Fonctionnel sur serveur de dev

review: Approve

=== modified file 'conf/local.php'
--- conf/local.php	2011-01-23 17:10:06 +0000
+++ conf/local.php	2011-02-12 15:41:23 +0000
@@ -21,15 +21,16 @@
 $conf['is_dev']      = 0;
 
 // gestion des connexions utilisateurs.
-//$conf['authtype']  = 'mysql';
-//$conf['passcrypt'] = 'sha1';
 $conf['useacl']      = 1;
-$conf['authtype']    = 'punbb';
+$conf['authtype']    = 'mysql';
+$conf['passcrypt']   = 'sha1';
 $conf['defaultgroup']= 'Members';
-
-$conf['allowdebug']  = 1;
 $conf['superuser']   = '@adminwiki';
 $conf['manager']     = '@modowiki';
+
+// Configuration principale
+$conf['disableactions']='register,profile,resendpwd,check,debug';
+$conf['allowdebug']  = 1;
 $conf['updatecheck'] = 0;
 $conf['userewrite']  = 1;
 $conf['useslash']    = 1;

=== modified file 'conf/local.protected.php.dist'
--- conf/local.protected.php.dist	2011-01-23 17:10:06 +0000
+++ conf/local.protected.php.dist	2011-02-12 15:41:23 +0000
@@ -11,19 +11,27 @@
 
 $conf['is_dev'] = 1;
 
-//Gestion des connexions utilisateurs pour le serveur de DEV.
+/* Gestion des connexions utilisateurs pour le serveur de DEV.
+ * Décommenter les lignes ci dessous pour utiliser une connexion
+ * à la base de donnée du forum fluxBB.
+ * Attention le include doit être placé après les paramètres
+ */
 //$conf['authtype']    = 'mysql';  
 //$conf['passcrypt']   = 'sha1';  
-//$conf['authtype']='punbb';
-define('PUN_ROOT', '/var/www/fr/forum/htdocs/');
+//$conf['auth']['mysql']['server']   = '';
+//$conf['auth']['mysql']['user']     = '';
+//$conf['auth']['mysql']['password'] = '';
+//$conf['auth']['mysql']['database'] = '';
+//$conf['auth']['mysql']['prefix']   = '';
+//@include(DOKU_CONF.'mysql.conf.php');
+$conf['authtype']='plain';
 $conf['useacl']  =1;
-$conf['authtype']='plain';
 $conf['defaultgroup']= 'Members';
 
 // Suivi des modifications non nécessaires en DEV
 $conf['notify'] = '';
 
 //Gestion du thème
-$conf['template']    = 'ubuntu';
+$conf['template']    = 'ubuntu-2010';
 $conf['static_host'] = 'http://www-static.dev.ubuntu-fr.org';
 

=== added file 'conf/mysql.conf.php'
--- conf/mysql.conf.php	1970-01-01 00:00:00 +0000
+++ conf/mysql.conf.php	2011-02-12 15:41:23 +0000
@@ -0,0 +1,147 @@
+<?php
+/*
+ * This is an example configuration for the mysql auth module.
+ *
+ * This SQL statements are optimized for following table structure.
+ * If you use a different one you have to change them accordingly.
+ * See comments of every statement for details.
+ *
+ * TABLE users
+ *     uid   login   pass   firstname   lastname   email
+ *
+ * TABLE groups
+ *     gid   name
+ *
+ * TABLE usergroup
+ *     uid   gid
+ *
+ */
+
+/* Options to configure database access. You need to set up this
+ * options carefully, otherwise you won't be able to access you
+ * database.
+ */
+//$conf['auth']['mysql']['server']   = '';
+//$conf['auth']['mysql']['user']     = '';
+//$conf['auth']['mysql']['password'] = '';
+//$conf['auth']['mysql']['database'] = '';
+//$conf['auth']['mysql']['prefix']   = '';
+
+/* variable to change the prefix of the tables
+ */
+$db_prefix = $conf['auth']['mysql']['prefix'];
+
+/* This option enables debug messages in the mysql module. It is
+ * mostly usefull for system admins.
+ */
+$conf['auth']['mysql']['debug'] = 0;
+
+/* Normally password encryption is done by DokuWiki (recommended) but for
+ * some reasons it might be usefull to let the database do the encryption.
+ * Set 'forwardClearPass' to '1' and the cleartext password is forwarded to
+ * the database, otherwise the encrypted one.
+ */
+$conf['auth']['mysql']['forwardClearPass'] = 0;
+
+/* Multiple table operations will be protected by locks. This array tolds
+ * the module which tables to lock. If you use any aliases for table names
+ * these array must also contain these aliases. Any unamed alias will cause
+ * a warning during operation. See the example below.
+ */
+$conf['auth']['mysql']['TablesToLock']= array("${db_prefix}users", "${db_prefix}users AS u", "${db_prefix}groups", "${db_prefix}groups AS g");
+
+/***********************************************************************/
+/*       Basic SQL statements for user authentication (required)       */
+/***********************************************************************/
+
+$conf['auth']['mysql']['checkPass']   = "SELECT  u.password AS pass
+                                         FROM    ${db_prefix}users AS u, ${db_prefix}groups AS g
+                                         WHERE   u.group_id  = g.g_id
+                                         AND     u.username  = '%{user}'
+                                         AND     g.g_title  != 'Guest'";
+    
+$conf['auth']['mysql']['getUserInfo'] = "SELECT  password AS pass,
+                                                 realname AS name,
+                                                 email AS mail,
+                                                 id,
+                                                 g_title as `group`
+                                         FROM    ${db_prefix}users AS u, 
+                                                 ${db_prefix}groups AS g
+                                         WHERE   u.group_id = g.g_id
+                                         AND     u.username = '%{user}'";
+
+$conf['auth']['mysql']['getGroups']   = "SELECT  g.g_title as `group`
+                                         FROM    ${db_prefix}users AS u, 
+                                                 ${db_prefix}groups AS g
+                                         WHERE   u.group_id = g.g_id
+                                         AND     u.username = '%{user}'";
+
+/***********************************************************************/
+/*      Additional minimum SQL statements to use the user manager      */
+/***********************************************************************/
+
+$conf['auth']['mysql']['getUsers']    = "SELECT DISTINCT u.username AS user
+                                         FROM    ${db_prefix}users AS u, 
+                                                 ${db_prefix}groups AS g
+                                         WHERE   u.group_id = g.g_id";
+$conf['auth']['mysql']['FilterLogin'] = "u.username LIKE '%{user}'";
+$conf['auth']['mysql']['FilterName']  = "u.realname LIKE '%{name}'";
+$conf['auth']['mysql']['FilterEmail'] = "u.email    LIKE '%{email}'";
+$conf['auth']['mysql']['FilterGroup'] = "g.g_title  LIKE '%{group}'";
+$conf['auth']['mysql']['SortOrder']   = "ORDER BY u.username";
+
+/***********************************************************************/
+/*   Additional SQL statements to add new users with the user manager  */
+/***********************************************************************/
+
+
+$conf['auth']['mysql']['addUser']     = "INSERT INTO ${db_prefix}users
+                                                (username,   password, email,      realname,  language,   registered, registration_ip, last_visit)
+                                         VALUES ('%{user}', '%{pass}', '%{email}', '%{name}', 'Francais', %{time},    '%{ip}',         %{time})";
+
+$conf['auth']['mysql']['addGroup']    = "INSERT INTO ${db_prefix}groups (g_title) VALUES ('%{group}')";
+
+$conf['auth']['mysql']['addUserGroup']= "UPDATE ${db_prefix}users
+                                         SET   group_id=%{gid}
+                                         WHERE id='%{uid}'";
+
+$conf['auth']['mysql']['delGroup']    = "DELETE FROM ${db_prefix}groups WHERE g_id='%{gid}'";
+
+$conf['auth']['mysql']['getUserID']   = "SELECT id FROM ${db_prefix}users WHERE username='%{user}'";
+
+/***********************************************************************/
+/*   Additional SQL statements to delete users with the user manager   */
+/***********************************************************************/
+
+/* This statement should remove a user fom the database.
+ * Following patterns will be replaced:
+ *   %{user}    user's login name
+ *   %{uid}     id of a user dataset
+ */
+//$conf['auth']['mysql']['delUser']     = "DELETE FROM users
+//                                         WHERE uid='%{uid}'";
+
+/* This statement should remove all connections from a user to any group
+ * (a user quits membership of all groups).
+ * Following patterns will be replaced:
+ *   %{uid}     id of a user dataset
+ */
+//$conf['auth']['mysql']['delUserRefs'] = "DELETE FROM usergroup
+//                                         WHERE uid='%{uid}'";
+
+/***********************************************************************/
+/*   Additional SQL statements to modify users with the user manager   */
+/***********************************************************************/
+
+$conf['auth']['mysql']['updateUser']  = "UPDATE ${db_prefix}users SET";
+$conf['auth']['mysql']['UpdateLogin'] = "username='%{user}'";
+$conf['auth']['mysql']['UpdatePass']  = "password='%{pass}'";
+$conf['auth']['mysql']['UpdateEmail'] = "email='%{email}'";
+$conf['auth']['mysql']['UpdateName']  = "realname='%{name}'";
+$conf['auth']['mysql']['UpdateTarget']= "WHERE id=%{uid}";
+
+$conf['auth']['mysql']['delUserGroup']= "UPDATE ${db_prefix}users SET g_id=4 WHERE id=%{uid}";
+
+$conf['auth']['mysql']['getGroupID']  = "SELECT g_id AS id FROM ${db_prefix}groups WHERE g_title='%{group}'";
+
+

=== modified file 'inc/utf8.php'
--- inc/utf8.php	2011-02-08 14:57:09 +0000
+++ inc/utf8.php	2011-02-12 15:41:23 +0000
@@ -90,11 +90,9 @@
      * @see    strlen()
      * @see    utf8_decode()
      */
-    if(!defined('PUN_ROOT')){
     function utf8_strlen($string){
         return strlen(utf8_decode($string));
     }
-    }
 }
 
 if(!function_exists('utf8_substr')){
@@ -110,7 +108,6 @@
      * @param integer (optional) length in UTF-8 characters from offset
      * @return mixed string or false if failure
      */
-    if(!defined('PUN_ROOT')){
     function utf8_substr($str, $offset, $length = null) {
         if(UTF8_MBSTRING){
             if( $length === null ){
@@ -200,7 +197,6 @@
         if (!preg_match('#'.$offset_pattern.$length_pattern.'#us',$str,$match)) return '';
         return $match[1];
     }
-    }
 }
 
 if(!function_exists('utf8_substr_replace')){
@@ -227,7 +223,6 @@
      * @see    ltrim()
      * @return string
      */
-    if(!defined('PUN_ROOT')){
     function utf8_ltrim($str,$charlist=''){
         if($charlist == '') return ltrim($str);
 
@@ -236,7 +231,6 @@
 
         return preg_replace('/^['.$charlist.']+/u','',$str);
     }
-    }
 }
 
 if(!function_exists('utf8_rtrim')){
@@ -247,7 +241,6 @@
      * @see    rtrim()
      * @return string
      */
-    if(!defined('PUN_ROOT')){
     function  utf8_rtrim($str,$charlist=''){
         if($charlist == '') return rtrim($str);
 
@@ -256,7 +249,6 @@
 
         return preg_replace('/['.$charlist.']+$/u','',$str);
     }
-    }
 }
 
 if(!function_exists('utf8_trim')){
@@ -267,13 +259,11 @@
      * @see    trim()
      * @return string
      */
-    if(!defined('PUN_ROOT')){
     function  utf8_trim($str,$charlist='') {
         if($charlist == '') return trim($str);
 
         return utf8_ltrim(utf8_rtrim($str,$charlist),$charlist);
     }
-    }
 }
 
 if(!function_exists('utf8_strtolower')){
@@ -286,14 +276,12 @@
      * @see    strtolower()
      * @see    utf8_strtoupper()
      */
-    if(!defined('PUN_ROOT')){
     function utf8_strtolower($string){
         if(UTF8_MBSTRING) return mb_strtolower($string,'utf-8');
 
         global $UTF8_UPPER_TO_LOWER;
         return strtr($string,$UTF8_UPPER_TO_LOWER);
     }
-    }
 }
 
 if(!function_exists('utf8_strtoupper')){
@@ -306,14 +294,12 @@
      * @see    strtoupper()
      * @see    utf8_strtoupper()
      */
-    if(!defined('PUN_ROOT')){
     function utf8_strtoupper($string){
         if(UTF8_MBSTRING) return mb_strtoupper($string,'utf-8');
 
         global $UTF8_LOWER_TO_UPPER;
         return strtr($string,$UTF8_LOWER_TO_UPPER);
     }
-    }
 }
 
 if(!function_exists('utf8_ucfirst')){
@@ -325,7 +311,6 @@
      * @param string
      * @return string with first character as upper case (if applicable)
      */
-    if(!defined('PUN_ROOT')){
     function utf8_ucfirst($str){
         switch ( utf8_strlen($str) ) {
             case 0:
@@ -337,7 +322,6 @@
                 return utf8_strtoupper($matches[1]).$matches[2];
         }
     }
-    }
 }
 
 if(!function_exists('utf8_ucwords')){
@@ -450,7 +434,6 @@
      * @param  integer
      * @return integer
      */
-    if(!defined('PUN_ROOT')){
     function utf8_strpos($haystack, $needle, $offset=0){
         $comp = 0;
         $length = null;
@@ -469,7 +452,6 @@
 
         return $length;
     }
-    }
 }
 
 if(!function_exists('utf8_tohtml')){