Changeset 373566

Timestamp:

04/16/2011 07:10:29 AM (15 years ago)

Author:

onigoetz

Message:

Version 0.8 - premier essai, envoye a Yves

Location:

phpbb-single-sign-on/trunk

Files:

• common-functions.php (modified) (16 diffs)
• connect-phpbb.php (modified) (5 diffs)
• files/auth_wpbb.php (modified) (3 diffs)
• files/common.php (modified) (5 diffs)
• module.phpbb.php (modified) (10 diffs)
• module.wp.php (modified) (1 diff)
• options.php (modified) (3 diffs)
• readme.txt (modified) (1 diff)

phpbb-single-sign-on/trunk/common-functions.php

@@ -2 +2 @@
 
 //Get the current options create empty ones if they don't exist.
-$connect_phpbb_options =  get_option('connect_phpbb_options');
-if($connect_phpbb_options == ''){
-    $connect_phpbb_options = array('path' => '');
+$connect_phpbb_options = get_option('connect_phpbb_options');
+if ($connect_phpbb_options == '') {
+    $connect_phpbb_options = array('path' => '');
 }
 
 //Get the paths
-if ( !defined('ABSPATH') ){
+if (!defined('ABSPATH')) {
     define('ABSPATH', (dirname(dirname(dirname(dirname(__FILE__))))) . '/');
 }
 
-if(!defined('PHPBBPATH')){
-    if($connect_phpbb_options['path'] != ''){
-        define('PHPBBPATH',$connect_phpbb_options['path']);
-    } else {
-        define('PHPBBPATH','forum/');
+if (!defined('PHPBBPATH')) {
+    if ($connect_phpbb_options['path'] != '') {
+        define('PHPBBPATH', $connect_phpbb_options['path']);
+    } else {
+        define('PHPBBPATH', 'forum/');
     }
 }
@@ -23 +23 @@
 $config_files = array(
     'auth_wpbb' => array(
-        'source' => realpath(dirname(__FILE__).'/files/auth_wpbb.php'),
-        'destin' => realpath(ABSPATH.PHPBBPATH.'includes/auth').'/auth_wpbb.php',
-        'folder' => realpath(ABSPATH.PHPBBPATH.'includes/auth')
+        'source' => realpath(dirname(__FILE__) . '/files/auth_wpbb.php'),
+        'destin' => realpath(ABSPATH . PHPBBPATH . 'includes/auth') . '/auth_wpbb.php',
+        'folder' => realpath(ABSPATH . PHPBBPATH . 'includes/auth')
     ),
     'common' => array(
-        'source' => realpath(dirname(__FILE__).'/files/common.php'),
-        'destin' => realpath(ABSPATH.PHPBBPATH).'/common.php',
-        'folder' => realpath(ABSPATH.PHPBBPATH)
+        'source' => realpath(dirname(__FILE__) . '/files/common.php'),
+        'destin' => realpath(ABSPATH . PHPBBPATH) . '/common.php',
+        'folder' => realpath(ABSPATH . PHPBBPATH)
     ),
     'common-orig' => array(
-        'destin' => realpath(ABSPATH.PHPBBPATH).'/common-orig.php',
-    )
+        'destin' => realpath(ABSPATH . PHPBBPATH) . '/common-orig.php',
+    ),
 );
 
@@ -41 +41 @@
  */
 
-function wpbb_get_file_version($file)
-{
-    if(file_exists($file)){
-        $content = file_get_contents($file);
-        if(strpos($content, '@version $Id') !== false){
-                return "Original";
-        }
-        preg_match('/@version\s([0-9.]+)/',$content,$version);
+function wpbb_get_file_version($file) {
+    if (file_exists($file)) {
+        $content = file_get_contents($file);
+        if (strpos($content, '@version $Id') !== false) {
+            return "Original";
+        }
+        preg_match('/@version\s([0-9.]+)/', $content, $version);
         return $version[1];
     } else {
@@ -55 +54 @@
 }
 
-function wpbb_get_file_versions()
-{
+function wpbb_create_form($action, $title) {
+    static $form_num;
+
+    if(empty($form_num)){
+        $form_num = 1;
+    } else {
+        $form_num++;
+    }
+
+return '
+    <form name="form'.$form_num.'" method="post" action="'.WPBB_OPTIONS_PAGE.'">
+        <input type="hidden" name="stage" value="'.$action.'" />
+        <input type="submit" name="Submit" value="'.__($title, 'phpbb').'" class="button" />
+    </form>
+';
+}
+
+function wpbb_get_file_versions() {
     global $config_files;
     //GETS all the files versions ::
@@ -63 +78 @@
             'source' => wpbb_get_file_version($config_files['auth_wpbb']['source']),
             'destin' => wpbb_get_file_version($config_files['auth_wpbb']['destin'])
-            ),
+        ),
         'common' => array(
             'source' => wpbb_get_file_version($config_files['common']['source']),
             'destin' => wpbb_get_file_version($config_files['common']['destin'])
-            ),
+        ),
         'common-orig' => array(
             'destin' => wpbb_get_file_version($config_files['common-orig']['destin']),
-            )
-        );
+        )
+    );
     return $file_versions;
 }
@@ -79 +94 @@
  */
 
-function wpbb_get_config_value($config_name)
-{
+function wpbb_get_config_value($config_name) {
     global $wpdb;
 
     //Get_the phpbb prefix
     $phpbb_db_prefix = wpbb_get_phpbb_prefix();
-    $config_table = $phpbb_db_prefix.'config';
-
-    $data = $wpdb->get_var('SELECT config_value FROM '.$config_table.' WHERE config_name = \''.$config_name.'\'', 0, 0);
+    $config_table = $phpbb_db_prefix . 'config';
+
+    $data = $wpdb->get_var('SELECT config_value FROM ' . $config_table . ' WHERE config_name = \'' . $config_name . '\'', 0, 0);
 
     return $data;
 }
 
-function wpbb_set_config_value($prefix, $config_name, $value)
-{
+function wpbb_set_config_value($prefix, $config_name, $value) {
     global $wpdb;
-    
-    if($prefix != ''){
-        $config_table = $prefix.'config';
-
-        $query = "UPDATE `".$config_table."` SET `config_value` = '".$value."' WHERE `config_name` = '".$config_name."'";
+
+    if ($prefix != '') {
+        $config_table = $prefix . 'config';
+
+        $query = "UPDATE `" . $config_table . "` SET `config_value` = '" . $value . "' WHERE `config_name` = '" . $config_name . "'";
         $wpdb->query($query);
     }
 }
 
-
-function wpbb_get_phpbb_prefix()
-{
+function wpbb_get_phpbb_prefix() {
     global $connect_phpbb_options;
 
-    $file = ABSPATH.$connect_phpbb_options['path'].'config.php';
-
-    if(file_exists($file)){
-        $content = file_get_contents($file);
-
-        preg_match('/dbname\s{0,}=\s{0,}[\'"]([0-9A-Za-z_]+)[\'"]/',$content,$dbname);
-        preg_match('/table_prefix\s{0,}=\s{0,}[\'"]([0-9A-Za-z_]+)[\'"]/',$content,$table_prefix);
+    $file = ABSPATH . $connect_phpbb_options['path'] . 'config.php';
+
+    if (file_exists($file)) {
+        $content = file_get_contents($file);
+
+        preg_match('/dbname\s{0,}=\s{0,}[\'"]([0-9A-Za-z_]+)[\'"]/', $content, $dbname);
+        preg_match('/table_prefix\s{0,}=\s{0,}[\'"]([0-9A-Za-z_]+)[\'"]/', $content, $table_prefix);
 
         return $table_prefix[1];
@@ -124 +135 @@
 
 //function to get the auth modes, copied from phpbb 3.0.6 : /includes/acp_/acp_board.php line 665
-function wpbb_select_auth_method($selected_method, $key = '')
-{
-    $phpbb_root_path = ABSPATH.PHPBBPATH;
+function wpbb_select_auth_method($selected_method, $key = '') {
+    $phpbb_root_path = ABSPATH . PHPBBPATH;
     $phpEx = 'php';
 
@@ -133 +143 @@
     $dp = @opendir($phpbb_root_path . 'includes/auth');
 
-    if (!$dp)
-    {
-            return '';
-    }
-
-    while (($file = readdir($dp)) !== false)
-    {
-            if (preg_match('#^auth_(.*?)\.' . $phpEx . '$#', $file))
-            {
-                    $auth_plugins[] = preg_replace('#^auth_(.*?)\.' . $phpEx . '$#', '\1', $file);
-            }
+    if (!$dp) {
+        return '';
+    }
+
+    while (($file = readdir($dp)) !== false) {
+        if (preg_match('#^auth_(.*?)\.' . $phpEx . '$#', $file)) {
+            $auth_plugins[] = preg_replace('#^auth_(.*?)\.' . $phpEx . '$#', '\1', $file);
+        }
     }
     closedir($dp);
@@ -150 +157 @@
 
     $auth_select = '';
-    foreach ($auth_plugins as $method)
-    {
+    foreach ($auth_plugins as $method) {
         $selected = ($selected_method == $method) ? ' selected="selected"' : '';
         $auth_select .= '<option value="' . $method . '"' . $selected . '>' . $method . '</option>';
@@ -163 +169 @@
  */
 
-function wpbb_run_test($echo = true)
-{
+function wpbb_run_test($echo = true) {
     global $config_files;
     $file_versions = wpbb_get_file_versions();
+
+    $plugin_url = WP_PLUGIN_URL.'/'.dirname(plugin_basename(__FILE__)).'/';
 
     $test = array(
@@ -173 +180 @@
         'common-orig' => array('state' => true, 'message' => 'Original'),
         'auth_method' => true,
-        'path_var' => true
+        'path_var' => true,
+        'posting.php' => true,
+        'functions_user.php' => true,
     );
     $error = false;
-
-    //auth_wpbb.php
-    if($file_versions['auth_wpbb']['source'] != $file_versions['auth_wpbb']['destin']){
-        $error = true ;
-        $test['auth_wpbb'] = false;
-    }
-
-    //common.php
-    if($file_versions['common']['source'] != $file_versions['common']['destin']){
-        $error = true ;
-        $test['common'] = false;
-    }
-
-    //common-orig.php
-    if(file_exists($config_files['common-orig']['destin'])){
-        if($file_versions['common-orig']['destin'] !== 'Original'){
-            $error = true ;
-            $test['common-orig'] = array('state' => false, 'message' => 'Wrong Version');
-        }
-    } else {
-        $error = true;
-        $test['common-orig'] = array('state' => false, 'message' => 'File not found');
-    }
-
-
+    /**
+     * Configurations
+     */
+
+    $result = '<tr><th colspan="5">'.__('configuration', 'phpbb').'</th></tr>';
+
+    ////////////////////////////////////////////////////////////////////////////
+    //path_var
+    $path_var = get_option('connect_phpbb_options');
+    if (!(isset($path_var['path']) && $path_var['path'] != '')) {
+        $error = true;
+        $test['path_var'] = false;
+    }
+
+    if($echo){
+        $result .= '<tr class="alternate">
+                <td>Wordpress Path</td>
+                <th><i>Variable</i></th>
+                <td>' . $path_var['path'] . '</td>
+                <td>' . wpbb_passed_test($test['path_var']) . '</td>
+                <td><a href="#configuration" class="button" style="height:17px; margin:1px; line-height:23px;">'.__('Configure').'</a></td>
+            </tr>';
+    }
+
+    ////////////////////////////////////////////////////////////////////////////
     //auth_method
     $auth_method = wpbb_get_config_value('auth_method');
-    if($auth_method != 'wpbb'){
+    if ($auth_method != 'wpbb') {
         $error = true;
         $test['auth_method'] = false;
     }
 
-    //path_var
-    $path_var = get_option('connect_phpbb_options');
-    if(!(isset($path_var['path']) && $path_var['path'] != '')){
-        $error = true ;
-        $test['path_var'] = false;
-    }
-
-
-    if($echo)
-    echo '
-        <table>
-            <tr>
-                <th width="200">&nbsp;</th>
-                <th width="100">Reccomended</th>
-                <th width="100">Current</th>
-                <th width="50">OK ?</th>
-            </tr>
-            <tr>
-                <th>Files</th>
-            </tr>
-            <tr>
+    if($echo){
+            $result .= '<tr>
+                <td>Auth Mode</td>
+                <td>wpbb</td>
+                <td>' . $auth_method . '</td>
+                <td>' . wpbb_passed_test($test['auth_method']) . '</td>
+                <td><a href="#configuration" class="button" style="height:17px; margin:1px; line-height:23px;">'.__('Configure').'</a></td>
+            </tr>';
+    }
+
+    if($echo){
+        $result .= '<tr class="alternate"><th colspan="5">'.__('Files', 'phpbb').'</th></tr>';
+    }
+
+    ////////////////////////////////////////////////////////////////////////////
+    //auth_wpbb.php
+    if ($file_versions['auth_wpbb']['source'] != $file_versions['auth_wpbb']['destin']) {
+        $error = true;
+        $test['auth_wpbb'] = false;
+    }
+
+    if($echo){
+        $result .= '<tr>
                 <td>auth_wpbb.php</td>
-                <td>'.$file_versions['auth_wpbb']['source'].'</td>
-                <td>'.$file_versions['auth_wpbb']['destin'].'</td>
-                <td>'.wpbb_passed_test($test['auth_wpbb']).'</td>
-            </tr>
-            <tr>
+                <td>' . $file_versions['auth_wpbb']['source'] . '</td>
+                <td>' . $file_versions['auth_wpbb']['destin'] . '</td>
+                <td>' . wpbb_passed_test($test['auth_wpbb']) . '</td>
+                <td>' . wpbb_create_form('install-auth','Install').'</td>
+            </tr>';
+    }
+
+    ////////////////////////////////////////////////////////////////////////////
+    //common.php
+    if ($file_versions['common']['source'] != $file_versions['common']['destin']) {
+        $error = true;
+        $test['common'] = false;
+    }
+
+    if($echo){
+        $result .= '<tr class="alternate">
                 <td>common.php</td>
-                <td>'.$file_versions['common']['source'].'</td>
-                <td>'.$file_versions['common']['destin'].'</td>
-                <td>'.wpbb_passed_test($test['common']).'</td>
-            </tr>
-            <tr>
+                <td>' . $file_versions['common']['source'] . '</td>
+                <td>' . $file_versions['common']['destin'] . '</td>
+                <td>' . wpbb_passed_test($test['common']) . '</td>
+                <td>' . wpbb_create_form('install-common','Install').'</td>
+            </tr>';
+    }
+
+
+    ////////////////////////////////////////////////////////////////////////////
+    //common-orig.php
+    if (file_exists($config_files['common-orig']['destin'])) {
+        if ($file_versions['common-orig']['destin'] !== 'Original') {
+            $error = true;
+            $test['common-orig'] = array('state' => false, 'message' => 'Wrong Version');
+        }
+    } else {
+        $error = true;
+        $test['common-orig'] = array('state' => false, 'message' => 'File not found');
+    }
+
+    if($echo){
+        $result .= '<tr>
                 <td>common-orig.php</td>
                 <td>-</td>
-                <td>'.$test['common-orig']['message'].'</td>
-                <td>'.wpbb_passed_test($test['common-orig']).'</td>
-            </tr>
-            <tr>
-                <th>Configurations</th>
-            </tr>
-            <tr>
-                <td>Auth Mode</td>
-                <td>wpbb</td>
-                <td>'.$auth_method.'</td>
-                <td>'.wpbb_passed_test($test['auth_method']).'</td>
-            </tr>
-            <tr>
-                <td>Wordpress Path</td>
-                <th><i>Variable</i></th>
-                <td>'.$path_var['path'].'</td>
-                <td>'.wpbb_passed_test($test['path_var']).'</td>
-            </tr>
-
-    </table>';
+                <td>' . $test['common-orig']['message'] . '</td>
+                <td>' . wpbb_passed_test($test['common-orig']) . '</td>
+                <td>' . wpbb_create_form('install-common','Install').'</td>
+            </tr>';
+    }
+
+    ////////////////////////////////////////////////////////////////////////////
+
+    $result .= '<tr class="alternate"><th colspan="5">'.__('Patches', 'phpbb').'</th></tr>';
+
+    ////////////////////////////////////////////////////////////////////////////
+    //posting.php
+    $posting_patched = wpbb_validate_user_patched(realpath(ABSPATH . PHPBBPATH).'/posting.php');
+    if(!$posting_patched){
+        $error = true;
+        $test['posting.php'] = false;
+    }
+
+    if($echo){
+        $result .= '<tr>
+                <td>posting.php</td>
+                <th>'.__('Yes').'</th>
+                <td>' . (($posting_patched)? __('Yes') : __('No')) . '</td>
+                <td>' . wpbb_passed_test($test['posting.php']) . '</td>
+                <td>' . wpbb_create_form('patch-posting','Patch').'</td>
+            </tr>';
+    }
+
+
+    ////////////////////////////////////////////////////////////////////////////
+    //includes/functions_user.php
+    $functions_user = wpbb_validate_user_patched(realpath(ABSPATH . PHPBBPATH).'/includes/functions_user.php');
+    $functions_user2 = wpbb_validate_user2_patched(realpath(ABSPATH . PHPBBPATH).'/includes/functions_user.php');
+    if(!$functions_user OR !$functions_user2){
+        $error = true;
+        $test['functions_user.php'] = false;
+    }
+
+    if($echo){
+        $result .= '<tr class="alternate">
+                <td>functions_user.php</td>
+                <th>'.__('Yes').'</th>
+                <td>' . (($functions_user)? __('Yes') : __('No')) . '</td>
+                <td>' . wpbb_passed_test($test['functions_user.php']) . '</td>
+                <td>' . wpbb_create_form('patch-user_function','Patch').'</td>
+            </tr>';
+    }
+
+    
+    ////////////////////////////////////////////////////////////////////////////
+
+    if ($echo){
+        echo '
+    <table class="widefat" summary="" title="PHPBB">
+        <thead>
+        <tr>
+                        <th scope="col">&nbsp;</th>
+            <th scope="col">'.__('Recommended', 'phpbb').'</th>
+            <th scope="col">'.__('Current', 'phpbb').'</th>
+            <th scope="col">'.__('OK ?', 'phpbb').'</th>
+                        <th scope="col">'.__('Action', 'phpbb').'</th>
+        </tr>
+        <tbody id="the-list">
+                '.$result.'
+        </tbody>
+    </table>
+        ';
+    }
 
     return $error;
 }
 
-function wpbb_passed_test($test_result){
-    if(is_array($test_result)){
+function wpbb_passed_test($test_result) {
+    if (is_array($test_result)) {
         $test_result = $test_result['state'];
     }
-    if($test_result){
+    if ($test_result) {
         return '<span style="color:green">OK</span>';
     } else {
@@ -282 +369 @@
  */
 
-
-function wpbb_get_functions_conflict(){
-    $functions_list = wpbb_folder_function_list(ABSPATH.PHPBBPATH);
-    //print_r($functions_list);
-    $modules_directory = str_replace('/phpbb-single-sign-on', '',dirname(__FILE__));
-    
+/*function wpbb_get_functions_conflict() {
+    $functions_list = wpbb_folder_function_list(ABSPATH . PHPBBPATH);
+
+    $modules_directory = str_replace('/phpbb-single-sign-on', '', dirname(__FILE__));
+
     $modules_list = wpbb_get_modules_list($modules_directory);
 
-    foreach($modules_list as $module){
-        $list = wpbb_folder_function_list($modules_directory.'/'.$module.'/');
+    foreach ($modules_list as $module) {
+        $list = wpbb_folder_function_list($modules_directory . '/' . $module . '/');
 
         print_r(array_intersect($list, $functions_list));
@@ -297 +383 @@
 }
 
-function wpbb_get_modules_list($modules_directory){
-    $modules_list= array();
+function wpbb_get_modules_list($modules_directory) {
+    $modules_list = array();
 
     $iterator = new DirectoryIterator($modules_directory);
-    foreach($iterator as $file) {
-        if($file->isDir() && !$file->isDot()){
+    foreach ($iterator as $file) {
+        if ($file->isDir() && !$file->isDot()) {
             $name = $file->getFilename();
-            if($name != 'phpbb-single-sign-on'){
+            if ($name != 'phpbb-single-sign-on') {
                 $modules_list[] = $name;
             }
@@ -312 +398 @@
 }
 
-function wpbb_folder_function_list($folder){
+function wpbb_folder_function_list($folder) {
     $file_list = wpbb_get_files_list($folder);
 
     $function_list = array();
-    foreach($file_list as $file){
-        $file_path = $folder.$file;
+    foreach ($file_list as $file) {
+        $file_path = $folder . $file;
         $function_list = array_merge($function_list, wpbb_functions_list($file_path));
     }
@@ -326 +412 @@
 }
 
-function wpbb_get_files_list($directory, &$list = array(), $base = ''){
+function wpbb_get_files_list($directory, &$list = array(), $base = '') {
     $iterator = new DirectoryIterator($directory);
-    foreach($iterator as $file) {
-
-        if(!$file->isDot()) {
+    foreach ($iterator as $file) {
+
+        if (!$file->isDot()) {
             $name = $file->getFilename();
 
-            if($file->isDir() && $name != 'cache') {
-                wpbb_get_files_list($directory.'/'.$name, &$list, $base.$name.'/');
+            if ($file->isDir() && $name != 'cache') {
+                wpbb_get_files_list($directory . '/' . $name, &$list, $base . $name . '/');
             } else {
-                if(strpos($name, '.php') !== false && $name != 'auth_wpbb.php' && $name != 'common-orig.php'){
-                    $list[] = $base.$name;
+                if (strpos($name, '.php') !== false && $name != 'auth_wpbb.php' && $name != 'common-orig.php') {
+                    $list[] = $base . $name;
                 }
             }
         }
-
     }
     return $list;
 }
 
-function wpbb_functions_list($file){
-    if(file_exists($file)){
-        $content = file_get_contents($file);
-
-        preg_match_all('/function\s{1,}([0-9A-Za-z_\-]+)\s{0,}\(/',$content,$functions);
-
-        if(count($functions != 0)){
+function wpbb_functions_list($file) {
+    if (file_exists($file)) {
+        $content = file_get_contents($file);
+
+        preg_match_all('/function\s{1,}([0-9A-Za-z_\-]+)\s{0,}\(/', $content, $functions);
+
+        if (count($functions != 0)) {
             return $functions[1];
         }
@@ -358 +443 @@
     //else
     return array();
-}
-
+}*/
+
+function wpbb_validate_user_patch($file) {
+    if (file_exists($file)) {
+        $content = file_get_contents($file);
+        $content = str_replace(' phpbb_validate_username', ' validate_phpbb_username', $content); //DEBUG PHASE, REMOVE FOR PROD
+        $content = str_replace(' validate_username', ' validate_phpbb_username', $content);
+
+        file_put_contents($file, $content);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+function wpbb_validate_user_patched($file) {
+    if (file_exists($file)) {
+        $content = file_get_contents($file);
+
+        if(strpos($content,'validate_phpbb_username') !== false){
+            return true;
+        } else {
+            return false;
+        }
+        
+    } else {
+        return false;
+    }
+}
+
+
+function wpbb_validate_user2_patch($file) {
+    if (file_exists($file)) {
+        $content = file_get_contents($file);
+        $content = str_replace(
+                '$function = array_shift($validate);'."\n\t\t\t".'array',
+                '$function = array_shift($validate);'."\n\t\t\t".'if($function == \'username\'){$function = \'phpbb_username\';}'."\n\t\t\t".'array', $content);
+
+        file_put_contents($file, $content);
+        return true;
+    } else {
+        return false;
+    }
+}
+
+function wpbb_validate_user2_patched($file) {
+    if (file_exists($file)) {
+        $content = file_get_contents($file);
+
+        if(strpos($content,'$function = array_shift($validate);'."\n\t\t\t".'if($function == \'username\'){$function = \'phpbb_username\';}') !== false){
+            return true;
+        } else {
+            return false;
+        }
+
+    } else {
+        return false;
+    }
+}

phpbb-single-sign-on/trunk/connect-phpbb.php

@@ -1 +1 @@
 <?php
+
 /*
-Plugin Name: PHPBB Single Sign On
-Version: 0.7.1
-Plugin URI: http://www.onigoetz.ch/plugins/wordpress-phpbb-plugin/
-Description: Connecte un site wordpress à PHPBB
-Author: Stéphane Goetz
-Author URI: http://www.onigoetz.ch
-*/
-
-
-
-define('FROM_WP',TRUE);
-
-//Installation
-register_activation_hook( __FILE__, 'connect_phpbb_install');
-function connect_phpbb_install(){
+  Plugin Name: PHPBB Single Sign On
+  Version: 0.8
+  Plugin URI: http://www.onigoetz.ch/plugins/wordpress-phpbb-plugin/
+  Description: Connecte un site wordpress à PHPBB
+  Author: Stéphane Goetz
+  Author URI: http://www.onigoetz.ch
+ */
+
+if(!defined('LOADED_PHPBB')){
+    define('LOADED_WP', true);
+}
+
+include (dirname(__FILE__) . '/common-functions.php');
+include (dirname(__FILE__) . '/module.phpbb.php');
+include (dirname(__FILE__) . '/module.wp.php');
+
+define('WPBB_OPTIONS_PAGE', get_option('siteurl') . '/wp-admin/admin.php?page='.dirname(plugin_basename(__FILE__)).'/options.php');
+
+////////////////////////////////////////////////////////////////////////////////
+
+register_activation_hook(__FILE__, 'connect_phpbb_install');
+
+/**
+ * Activation Hook
+ */
+function connect_phpbb_install() {
     $default_options = array(
         'path' => 'forum/'
@@ -22 +34 @@
 }
 
-//Options page
+////////////////////////////////////////////////////////////////////////////////
+
 add_action('admin_menu', 'connect_phpbb_options_page');
+
+/**
+ * Options page
+ */
 function connect_phpbb_options_page() {
-    add_options_page('PHP BB', 'PHP BB Options', 10, 'phpbb-single-sign-on/options.php');
-}
-
-include (dirname(__FILE__).'/common-functions.php');
-include (dirname(__FILE__).'/module.phpbb.php');
-include (dirname(__FILE__).'/module.wp.php');
-
-
-global $op_credentials;
-
-// AUTHENTICATE
-add_action('wp_authenticate_user','wpbb_login',10,2);
-function wpbb_login($userdata,$password){
-    
-    if(file_exists(ABSPATH.'/'.PHPBBPATH.'config.php')){ // check to see if phpBB exists
-        if(defined('IN_PHPBB')){
-            // return if we're already in phpBB (to avoid a loop)
-            return $userdata; 
-    }
-
-        // FIX start, RamonFincken.com WebsiteFreelancers.nl
-        // Fix for phpbb3 login attempts. If too many failed logins, phpbb demands you enter a visual code
-        // So include ( but do not use ) the class to make phpbb happy :)
-        define(IN_PHPBB,true);
-        if(file_exists(ABSPATH.'/'.PHPBBPATH.'includes/captcha/captcha_factory.php')){ //needed, file doesn't exist before PHPBB 3.0.6
-          include_once(ABSPATH.'/'.PHPBBPATH.'includes/captcha/captcha_factory.php');
-        }
-        // FIX end, RamonFincken.com WebsiteFreelancers.nl
-          
-        wpbb_phpBB3::getIdentity();
-        $result = wpbb_phpBB3::login($userdata->user_login,$password);
-    }
-    
-    if($result['response'] == LOGIN_SUCCESS){
+    add_options_page('PHP BB', 'PHP BB Options', 10, 'phpbb-single-sign-on/options.php');
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+//Doesn't add the hook if we're in phpbb
+if(defined('LOADED_WP')){
+    add_action('wp_authenticate_user', 'wpbb_login', 10, 2);
+}
+
+/**
+ * On login actions
+ *
+ * @param string $userdata
+ * @param string $password
+ * @return object
+ */
+function wpbb_login($userdata, $password) {
+    // check to see if phpBB exists
+    if (!file_exists(ABSPATH . '/' . PHPBBPATH . 'config.php'))
         return $userdata;
-    }
-
-    return 0;
-}
-
-// LOGOUT
-add_action('wp_logout','wpbb_logout');
-function wpbb_logout(){
-    if(!defined('FROM_WP')) define('FROM_WP',TRUE);
-
-    if(file_exists(ABSPATH.'/'.PHPBBPATH.'config.php')){ // check to see if phpBB exists
+
+    define('FROM_WP', TRUE);
+
+    // Set up phpBB environment
+    wpbb_phpBB3::getIdentity();
+
+    global $db;
+
+    //PHPBB
+    $phpBB_user = wpbb_phpBB3::getUserByName($userdata->user_login);
+
+    //Wordpress
+    $in_wp = ($userdata->ID == 0) ? FALSE : TRUE;
+
+    //WP 1 BB 0 ?
+    if (!$phpBB_user && $in_wp) { //If he doesn't exists, create the user in phpbb
+        $email = $userdata->user_email ? $userdata->user_email : '';
+
+        // since group IDs may change, use a query to make sure it is the right default group.
+        $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = '" . $db->sql_escape(REGISTERED) . "' AND group_type = " . GROUP_SPECIAL;
+        $result = $db->sql_query($sql);
+
+        $row = $db->sql_fetchrow($result);
+        $group_id = $row['group_id'];
+
+        $user_row = array(
+            'username' => $userdata->user_login,
+            'user_password' => phpbb_hash($password),
+            'group_id' => $group_id,
+            'user_email' => $email,
+            'user_type' => 0
+        );
+
+        $id = wpbb_phpBB3::addUser($user_row);
+        $phpBB_user = wpbb_phpBB3::getUserById($id);
+    }
+
+    global $user;
+
+    $result = $user->session_create($phpBB_user->user_id, 0, 1, 1);
+
+    return $userdata;
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+add_action('wp_logout', 'wpbb_logout');
+
+/**
+ * Logout action
+ */
+function wpbb_logout() {
+    if (!defined('FROM_WP'))
+        define('FROM_WP', TRUE);
+
+    if (file_exists(ABSPATH . '/' . PHPBBPATH . 'config.php')) { // check to see if phpBB exists
         wpbb_phpBB3::getIdentity();
         wpbb_phpBB3::logout();
@@ -78 +126 @@
 }
 
-// PASSWORD CHANGES, when a user changes his password in wordpress, it applies to phpbb
+////////////////////////////////////////////////////////////////////////////////
+
 add_filter('check_passwords', 'wpbb_change_password', 10, 3);
-function wpbb_change_password($username, $pass1, $pass2){
-    if(!empty($pass1) && !empty($pass2) && $pass1 == $pass2){
+
+/**
+ * PASSWORD CHANGES, when a user changes his password in wordpress, it applies to phpbb
+ *
+ * @param string $username
+ * @param string $pass1
+ * @param string $pass2
+ * @return bool
+ */
+function wpbb_change_password($username, $pass1, $pass2) {
+    if (!empty($pass1) && !empty($pass2) && $pass1 == $pass2) {
         wpbb_phpBB3::getIdentity();
-        if(wpbb_phpBB3::getUserByName($username)){
-            wpbb_phpBB3::changePassword($username,$pass1);
+        if (wpbb_phpBB3::getUserByName($username)) {
+            wpbb_phpBB3::changePassword($username, $pass1);
         }
     }
@@ -90 +148 @@
 }
 
-// TEST , Runs tests in admin to show if the user has some configs to do.
+////////////////////////////////////////////////////////////////////////////////
+
 add_action('init', 'wpbb_admin_warnings');
+
+/**
+ * Runs tests in admin to show if the user has some configs to do.
+ *
+ * @return null
+ */
 function wpbb_admin_warnings() {
-    if ( wpbb_run_test(false) ) {
+    if (wpbb_run_test(false)) {
+
         function wpbb_warning() {
             echo "
             <div id='phpbb-warning' class='updated fade'>
-            <p><strong>".__('PHP Single Sign On is almost ready.')."</strong>
-                ".sprintf(__('You have to <a href="%s">Follow the instructions</a> for it to work.'),
-                 get_option('siteurl') . '/wp-admin/admin.php?page=phpbb-single-sign-on/options.php')."</p></div>
+            <p><strong>" . __('PHP Single Sign On is almost ready.') . "</strong>
+                " . sprintf(__('You have to <a href="%s">Follow the instructions</a> for it to work.'),
+                    get_option('siteurl') . '/wp-admin/admin.php?page=phpbb-single-sign-on/options.php') . "</p></div>
             ";
         }
+
         add_action('admin_notices', 'wpbb_warning');
         return;
@@ -107 +174 @@
 }
 
+////////////////////////////////////////////////////////////////////////////////
+
+add_action('register_post', 'wpbb_register_post', 10, 3);
+
+/**
+ * Email existing
+ *
+ * @param string $login
+ * @param string $email
+ * @param object $errors
+ * @return null
+ */
+function wpbb_register_post($login, $email, $errors) {
+    if ($errors->get_error_code()){
+        return; // No need to add to the despair
+    }
+    
+    if (wpbb_phpBB3::get_wp_user_by_email($email)) {
+        $errors->add('email_exists', __('<strong>ERROR</strong>: This email is already registered, please choose another one.'));
+    }
+}
+
+////////////////////////////////////////////////////////////////////////////////
+
+add_action('register_post', 'wpbb_register_hint', 11, 3);
+
+/**
+ * Error Hints
+ *
+ * @param string $login
+ * @param string $email
+ * @param object $errors
+ * @return null
+ */
+function wpbb_register_hint($login, $email, $errors) {
+    error_log($errors->get_error_code());
+
+
+    if ($errors->get_error_code() != 'email_exists' and
+            $errors->get_error_code() != 'username_exists'
+    )
+        return;
+
+    $errors->add('email_exists', sprintf("<a href=\"%s\">%s</a>",
+                    site_url('wp-login.php', 'login'),
+                    __('Log In')));
+
+    $errors->add('email_exists', sprintf("<a href=\"%s\" title=\"%s\">%s</a>",
+                    site_url('wp-login.php?action=lostpassword','recover password'),
+                    __('Password Lost and Found'),
+                    __('Lost your password?')));
+}

phpbb-single-sign-on/trunk/files/auth_wpbb.php

@@ -1 +1 @@
 <?php
+
 /**
-* Database auth plug-in for PHPBB - Wordpress Connector
-* 
-* This is for authentication via the integrated user table
-*
-* @package login
-* @version 0.7.1
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
-
+ * Database auth plug-in for PHPBB - Wordpress Connector
+ * 
+ * This is for authentication via the integrated user table
+ *
+ * @package login
+ * @version 0.8
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ *
+ */
 //Doesn't load it in the admin area of the plugin, or it will make a conflict
-if($_GET['i'] != 'board' && $_GET['mode'] != 'auth'){
-    include(dirname(__FILE__).'/auth_db.php');
+if ($_GET['i'] != 'board' && $_GET['mode'] != 'auth') {
+    include(dirname(__FILE__) . '/auth_db.php');
 }
 
 
 /**
-* @ignore
-*/
-if (!defined('IN_PHPBB'))
-{
-    exit;
-}
-
-function init_wpbb(){
+ * @ignore
+ */
+if (!defined('IN_PHPBB')) {
+    exit;
+}
+
+function init_wpbb() {
 
 }
 
 // Provide option for WordPress path
-function acp_wpbb(&$new)
-{
-    // These are fields required in the config table
-    $tpl = '
+function acp_wpbb(&$new) {
+    // These are fields required in the config table
+    $tpl = '
     <dl>
         <dt><label for="op_path">WordPress Path:</label><br /><span>This is the path to your WordPress installation relative to the site\'s root directory.  Most users will not need to change this.</span></dt>
@@ -39 +37 @@
     </dl>
     ';
-    
-    return array(
-        'tpl'       => $tpl,
-        'config'    => array('wpbb_path')
-    );
+
+    return array(
+        'tpl' => $tpl,
+        'config' => array('wpbb_path')
+    );
 }
 
 /**
-* Login function
-*/
-function login_wpbb(&$username, &$password)
-{
+ * Login function
+ */
+function login_wpbb(&$username, &$password) {
     global $db, $config;
-    
-    //Still needed ?
-    if(defined('SECOND_RUN')){
-            return array(
-                    'status'        => LOGIN_SUCCESS,
-                    'error_msg'     => false,
-                    'user_row'      => $row,
-            );
-    } else {
-            define('SECOND_RUN', true);
-    }
-    
-    
+
     //checks if Wordpress is loaded, if not uses simple authentication
-    if(function_exists('wp_signon')){
-        
+    if (function_exists('wp_signon')) {
+
         global $current_user;
 
         /*
-        ** Exists in PHPBB ?
-        */
+         * * Exists in PHPBB ?
+         */
         $sql = 'SELECT user_id, username, user_password, user_passchg, user_pass_convert, user_email, user_type, user_login_attempts
                 FROM ' . USERS_TABLE . "
@@ -78 +63 @@
         $result = $db->sql_query($sql);
         $phpBB_user = $db->sql_fetchrow($result);
-        
+
         /*
-        ** Exists in WP ?
-        */
-        //Loaded from within WP ?
-        if(!function_exists('censor_text')){ //Loaded from within PHPBB
-            $wp_user = wpbb_Wordpress::getIdByName($username);
-            $in_wp = ($wp_user == 0) ? FALSE : TRUE;
-        } else {    //Loaded from within PHPBB
-            //SYNC to WP
-            wpbb_WordPress::loadAdminAPI();
-            wpbb_WordPress::changePassword($username, $password);
-
-            if(isset($current_user)){
-                wp_clear_auth_cookie();
-            }
-
-            if ( is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ) ){
-                $secure_cookie = false;
-            } else {
-                $secure_cookie = '';
-            }
-
-            // Use the wp_signon function to get the object of our user from WP
+         * * Exists in WP ?
+         */
+        //SYNC to WP
+        wpbb_WordPress::loadAdminAPI();
+
+        if (isset($current_user)) {
+            wp_clear_auth_cookie();
+        }
+
+        if (is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') )) {
+            $secure_cookie = false;
+        } else {
+            $secure_cookie = '';
+        }
+
+        // Use the wp_signon function to get the object of our user from WP
+        $wp_user = wp_signon(array(
+                    'user_login' => $username,
+                    'user_password' => html_entity_decode($password)
+                        ), $secure_cookie);
+
+
+        // Flag whether or not the user exists in wordpress
+        $in_wp = isset($wp_user->errors['invalid_username']) || ($wp_user->ID == 0 && !isset($wp_user->errors['incorrect_password'])) ? FALSE : TRUE;
+
+        //WP 0 BB 1 ?
+        if ($phpBB_user && !$in_wp) { //if he doesn't exist creates the user in wordpress
+            $username = $phpBB_user['username'];
+
+            $user_row = array(
+                'username' => $username,
+                'email' => $phpBB_user['user_email'] ? $phpBB_user['user_email'] : '',
+                'password' => html_entity_decode($password)
+            );
+
+            $wp_user = wpbb_WordPress::addUser($user_row);
+
             $wp_user = wp_signon(array(
-                    'user_login'    => $username,
-                    'user_password' => html_entity_decode($password)
-            ), $secure_cookie);
-
-
-            // Flag whether or not the user exists in wordpress
-            $in_wp = isset($wp_user->errors['invalid_username']) || ($wp_user->ID == 0 && !isset($wp_user->errors['incorrect_password'])) ? FALSE: TRUE;
-        }
-
-        //Checking existence of users
-        if(!function_exists('censor_text')){ //censor_text is a function from phpbb
-            //WP 1 BB 0 ?
-            if(!$phpBB_user && $in_wp){ //If he doesn't exists, create the user in phpbb
-                $email = $wp_user->user_email ? $wp_user->user_email : '';
-
-                // since group IDs may change, use a query to make sure it is the right default group.
-                $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = '" . $db->sql_escape(REGISTERED) . "' AND group_type = " . GROUP_SPECIAL;
-                $result = $db->sql_query($sql);
-
-                $row = $db->sql_fetchrow($result);
-                $group_id = $row['group_id'];
-
-                $user_row = array(
-                    'username'  => $username,
-                    'user_password' => phpbb_hash($password),
-                    'group_id'  => $group_id,
-                    'user_email'    => $email,
-                    'user_type'     => 0
-                );
-
-                $id = wpbb_phpBB3::addUser($user_row);
-                $phpBB_user = wpbb_phpBB3::getUserById($id);
-            }
+                        'user_login' => $username,
+                        'user_password' => html_entity_decode($password)
+                            ), $secure_cookie);
+
+            //mysql_select_db($db->db_name); // Select phpBB database
+        } else if (!$phpBB_user && $in_wp) {
+            $email = $wp_user->user_email ? $wp_user->user_email : '';
+
+            // since group IDs may change, use a query to make sure it is the right default group.
+            $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = '" . $db->sql_escape(REGISTERED) . "' AND group_type = " . GROUP_SPECIAL;
+            $result = $db->sql_query($sql);
+
+            $row = $db->sql_fetchrow($result);
+            $group_id = $row['group_id'];
+
+            $user_row = array(
+                'username' => $username,
+                'user_password' => phpbb_hash($password),
+                'group_id' => $group_id,
+                'user_email' => $email,
+                'user_type' => 0
+            );
+
+            $id = wpbb_phpBB3::addUser($user_row);
+            $phpBB_user = wpbb_phpBB3::getUserById($id);
+        }
+
+        //logon phpBB is the access right in wordpress ?
+        if (wp_check_password($password, $wp_user->user_pass, $wp_user->ID)) {
+            wpbb_phpBB3::changePassword($username, $password);
+
+            return array(
+                'status' => LOGIN_SUCCESS,
+                'error_msg' => false,
+                'user_row' => $phpBB_user,
+            );
         } else {
-            //WP 0 BB 1 ?
-            if($phpBB_user && !$in_wp){ //if he doesn't exist creates the user in wordpress
-
-                $username = $phpBB_user['username'];
-
-                $user_row = array(
-                        'username'  => $username,
-                        'email'     => $phpBB_user['user_email'] ? $phpBB_user['user_email'] : '',
-                        'password'  => html_entity_decode($password)
-                );
-
-                $wp_user = wpbb_WordPress::addUser($user_row);
-
-                $wp_user = wp_signon(array(
-                        'user_login'    => $username,
-                        'user_password' => html_entity_decode($password)
-                ), $secure_cookie);
-
-                mysql_select_db($db->db_name); // Select phpBB database
-            }
-        }
-        
-        //SYNC Password in PHPBB
-        //TODO :: put it in standard class
-        if(!function_exists('censor_text')){ //censor_text is a function from phpbb
-            wpbb_phpBB3::changePassword($username,$password);
-        }
-
-        //logon phpBB
-        $result =  login_db($username, $password);
-
-        if($result['status'] == LOGIN_SUCCESS){
-            $phpBB_authed = 1;
-        } else {
-            $phpBB_authed = 0;
-        }
-
-        if ((!$phpBB_user || !$phpBB_authed) && !$in_wp)
-        {
-            // FIXME -- WordPress always reports username error when user exists in phpBB but not WP and password is wrong
-            if(isset($wp_user->errors['incorrect_password']) || ($phpBB_user && !$phpBB_authed)){
-                    return array(
-                    'status'    => LOGIN_ERROR_PASSWORD,
-                    'error_msg' => 'LOGIN_ERROR_PASSWORD',
-                    'user_row'  => array('user_id' => ANONYMOUS),
-                    );
-            }
-            // error
             return array(
-                    'status'    => LOGIN_ERROR_USERNAME,
-                    'error_msg' => 'LOGIN_ERROR_USERNAME',
-                    'user_row'  => array('user_id' => ANONYMOUS),
-            );
-        }
-        
-        return $result;
+                'status' => LOGIN_ERROR_PASSWORD,
+                'error_msg' => 'LOGIN_ERROR_PASSWORD',
+                'user_row' => $phpBB_user,
+            );
+        }
+    }
+    return login_db($username, $password);
+}
+
+//Executed when the session is closed
+function logout_wpbb($data, $new_session) {
+    if (function_exists('wp_clear_auth_cookie')) {    //if WP is loaded
+        wp_clear_auth_cookie();
+    }
+    return $data;
+}
+
+//TODO :: WTH is that ?!?!?
+function validate_session_wpbb() {
+    global $phpbb_root_path, $phpEx;
+    // Need to block registrations for users that already exist
+    $mode = request_var('mode', '');
+
+    /**
+     *  There's no hook for password changing in phpBB so we have to reuse validation technique from ucp_profile.php
+     */
+    if ($mode == 'reg_details' && !empty($_POST['submit'])) { // password and email changing
+        global $auth, $config, $user;
+
+        $data = array(
+            'username' => utf8_normalize_nfc(request_var('username', $user->data['username'], true)),
+            'email' => strtolower(request_var('email', $user->data['user_email'])),
+            'email_confirm' => strtolower(request_var('email_confirm', '')),
+            'new_password' => request_var('new_password', '', true),
+            'cur_password' => request_var('cur_password', '', true),
+            'password_confirm' => request_var('password_confirm', '', true),
+        );
+
+        // Do not check cur_password, it is the old one.
+        $check_ary = array(
+            'new_password' => array(
+                array('string', true, $config['min_pass_chars'], $config['max_pass_chars']),
+                array('password')),
+            'password_confirm' => array('string', true, $config['min_pass_chars'], $config['max_pass_chars'])
+        );
+
+        if ($auth->acl_get('u_chgname') && $config['allow_namechange']) {
+            $check_ary['username'] = array(
+                array('string', false, $config['min_name_chars'], $config['max_name_chars']),
+                array('username')
+            );
+        }
+
+        if (sizeof(validate_data($data, $check_ary)))
+            return true;
+        if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && $data['password_confirm'] != $data['new_password'])
+            return true;
+        if (($data['new_password'] || ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email']) || ($data['username'] != $user->data['username'] && $auth->acl_get('u_chgname') && $config['allow_namechange'])) && !phpbb_check_hash($data['cur_password'], $user->data['user_password']))
+            return true;
+
+        if ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email'] && $data['email_confirm'] != $data['email'])
+            return true;
+
+        define('WP_ADMIN', true);
+        wpbb_WordPress::loadAdminAPI();
+        wpbb_WordPress::updateUser($data);
+    }
+
+    if ($mode != 'register' || !request_var('username', '', true))
+        return true;
+
+    global $current_user;
+
+    $username = utf8_normalize_nfc(request_var('username', '', true));
+
+    if ($user->data['is_registered'] || isset($_REQUEST['not_agreed'])) {      //FIX BY BRIAN PAN
+        //if(wpbb_userExists($username, 'phpbb')){
+        // User exists, TODO -- notify user somehow
+        //header('Location: http://www.opc.dev/forum/ucp.php?mode=register');
+        redirect(append_sid($phpbb_root_path . 'index' . $phpEx));
     } else {
-        //Does run if wordpress isn't loaded
-        return login_db($username, $password);
-    }
-}
-
-//Executed when the session is closed
-function logout_wpbb($data, $new_session){
-    if(function_exists('wp_clear_auth_cookie')){    //if WP is loaded
-        wp_clear_auth_cookie();
-    }
-    return $data;
-}
-
-//TODO :: WTH is that ?!?!?
-function validate_session_wpbb(){
-    global $phpbb_root_path, $phpEx;
-    // Need to block registrations for users that already exist
-    $mode   = request_var('mode', '');
-
-
-    /**
-     *  There's no hook for password changing in phpBB so we have to reuse validation technique from ucp_profile.php
-     */
-    if($mode == 'reg_details' && !empty($_POST['submit'])){ // password and email changing
-        global $auth, $config, $user;
-
-        $data = array(
-            'username'          => utf8_normalize_nfc(request_var('username', $user->data['username'], true)),
-            'email'             => strtolower(request_var('email', $user->data['user_email'])),
-            'email_confirm'     => strtolower(request_var('email_confirm', '')),
-            'new_password'      => request_var('new_password', '', true),
-            'cur_password'      => request_var('cur_password', '', true),
-            'password_confirm'  => request_var('password_confirm', '', true),
-        );
-        
-        // Do not check cur_password, it is the old one.
-        $check_ary = array(
-            'new_password'      => array(
-                array('string', true, $config['min_pass_chars'], $config['max_pass_chars']),
-                array('password')),
-            'password_confirm'  => array('string', true, $config['min_pass_chars'], $config['max_pass_chars'])
-        );
-
-        if ($auth->acl_get('u_chgname') && $config['allow_namechange'])
-        {
-            $check_ary['username'] = array(
-                array('string', false, $config['min_name_chars'], $config['max_name_chars']),
-                array('username')
-            );
-        }
-
-        if (sizeof(validate_data($data, $check_ary)))
-            return true;
-        if ($auth->acl_get('u_chgpasswd') && $data['new_password'] && $data['password_confirm'] != $data['new_password'])
-            return true;
-        if (($data['new_password'] || ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email']) || ($data['username'] != $user->data['username'] && $auth->acl_get('u_chgname') && $config['allow_namechange'])) && !phpbb_check_hash($data['cur_password'], $user->data['user_password']))
-            return true;    
-            
-        if ($auth->acl_get('u_chgemail') && $data['email'] != $user->data['user_email'] && $data['email_confirm'] != $data['email'])
-            return true;
-
-        define('WP_ADMIN', true);
-        wpbb_WordPress::loadAdminAPI();
-        wpbb_WordPress::updateUser($data);
-    }
-
-    if($mode != 'register' || !request_var('username', '', true)) return true;
-    
-    global $current_user;
-
-    $username = utf8_normalize_nfc(request_var('username', '', true));
-
-        if ($user->data['is_registered'] || isset($_REQUEST['not_agreed'])){      //FIX BY BRIAN PAN
-    //if(wpbb_userExists($username, 'phpbb')){
-        // User exists, TODO -- notify user somehow
-        //header('Location: http://www.opc.dev/forum/ucp.php?mode=register');
-        redirect(append_sid($phpbb_root_path.'index'.$phpEx));
-    }
-    else{
-        return true;
-    }
-}
+        return true;
+    }
+}
+
 ?>

phpbb-single-sign-on/trunk/files/common.php

@@ -1 +1 @@
 <?php
+
 /**
-* Common.php file Replacement for PHPBB - Wordpress Connector
-* 
-* This is for the loading without conflict of the two scripts
-*
-* @package login
-* @version 0.7.1
-* @license http://opensource.org/licenses/gpl-license.php GNU Public License
-*
-*/
+ * Common.php file Replacement for PHPBB - Wordpress Connector
+ *
+ * This is for the loading without conflict of the two scripts
+ *
+ * @package login
+ * @version 0.8
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ *
+ */
 
-function include_for_eval($file)
-{
-    $file_contents = file_get_contents($file);
-    $file_contents = preg_replace('/^\s*\<\?php/','',$file_contents);
-    $file_contents = preg_replace('/\?\>\s*$/','',$file_contents);  
-
-    return $file_contents;
+if(!defined('LOADED_WP')){
+    define('LOADED_PHPBB', true);
 }
 
+
+function include_for_eval($file) {
+    $file_contents = file_get_contents($file);
+    $file_contents = preg_replace('/^\s*\<\?php/', '', $file_contents);
+    $file_contents = preg_replace('/\?\>\s*$/', '', $file_contents);
+
+    return $file_contents;
+}
+
+//Affected files :
+
 //Common.php
-    //config.php
-    //includes/session.php
-    //includes/functions_content.php
-    //includes/constants.php
+//config.php
+//includes/session.php
+//includes/functions_content.php
+//includes/constants.php
 
 $include_common_contents = include_for_eval($phpbb_root_path . 'common-orig.' . $phpEx);
@@ -41 +48 @@
 
 //Fusionne
-$include_common_contents = str_replace('require($phpbb_root_path . \'config.\' . $phpEx);',$include_config_contents,$include_common_contents);
-$include_common_contents = str_replace('require($phpbb_root_path . \'includes/session.\' . $phpEx);',$include_session_contents,$include_common_contents);
-$include_common_contents = str_replace('require($phpbb_root_path . \'includes/functions_content.\' . $phpEx);',$include_formatting_contents,$include_common_contents);
-$include_common_contents = str_replace('require($phpbb_root_path . \'includes/constants.\' . $phpEx);',$include_constants_contents,$include_common_contents);
+$include_common_contents = str_replace('require($phpbb_root_path . \'config.\' . $phpEx);', $include_config_contents, $include_common_contents);
+$include_common_contents = str_replace('require($phpbb_root_path . \'includes/session.\' . $phpEx);', $include_session_contents, $include_common_contents);
+$include_common_contents = str_replace('require($phpbb_root_path . \'includes/functions_content.\' . $phpEx);', $include_formatting_contents, $include_common_contents);
+$include_common_contents = str_replace('require($phpbb_root_path . \'includes/constants.\' . $phpEx);', $include_constants_contents, $include_common_contents);
+
+//Clean memory
+unset($include_config_contents);
+unset($include_session_contents);
+unset($include_formatting_contents);
+unset($include_constants_contents);
 
 
 //suprimme le conflit de $table_prefix
-$include_common_contents = str_replace('$table_prefix','$dbname.".".$table_prefix2',$include_common_contents);
+$include_common_contents = str_replace('$table_prefix', '$dbname.".".$table_prefix2', $include_common_contents);
 
 //suprimme le conflit de make_clickable()
-$include_common_contents = str_replace('make_clickable','wpbb_make_clickable',$include_common_contents);
+$include_common_contents = str_replace('make_clickable', 'wpbb_make_clickable', $include_common_contents);
 
 
@@ -60 +73 @@
 //corrige le get_cookie
 $original_get_cookie = array(
-'$this->cookie_data[\'u\'] = request_var($config[\'cookie_name\'] . \'_u\', 0, false, true);',
-'$this->cookie_data[\'k\'] = request_var($config[\'cookie_name\'] . \'_k\', \'\', false, true);',
-'$this->session_id      = request_var($config[\'cookie_name\'] . \'_sid\', \'\', false, true);'
-//,'$config[\'cookie_path\'] . $domain . ((!$config[\'cookie_secure\'])'
+    '$this->cookie_data[\'u\'] = request_var($config[\'cookie_name\'] . \'_u\', 0, false, true);',
+    '$this->cookie_data[\'k\'] = request_var($config[\'cookie_name\'] . \'_k\', \'\', false, true);',
+    '$this->session_id      = request_var($config[\'cookie_name\'] . \'_sid\', \'\', false, true);'
 );
 $new_get_cookie = array(
-'$this->cookie_data[\'u\'] = $_COOKIE[$config[\'cookie_name\'] . \'_u\'];'
-,'$this->cookie_data[\'k\'] = $_COOKIE[$config[\'cookie_name\'] . \'_k\'];'
-,'$this->session_id = $_COOKIE[$config[\'cookie_name\'] . \'_sid\'];'
-//,'$config[\'cookie_path\'] . ((!$config[\'cookie_secure\'])'
+    '$this->cookie_data[\'u\'] = $_COOKIE[$config[\'cookie_name\'] . \'_u\'];'
+    , '$this->cookie_data[\'k\'] = $_COOKIE[$config[\'cookie_name\'] . \'_k\'];'
+    , '$this->session_id = $_COOKIE[$config[\'cookie_name\'] . \'_sid\'];'
 );
-$include_common_contents = str_replace($original_get_cookie,$new_get_cookie,$include_common_contents);
+$include_common_contents = str_replace($original_get_cookie, $new_get_cookie, $include_common_contents);
 
 //Include de la version modifiée de common.php
@@ -81 +92 @@
  */
 
-//save all vars before they're escaped by wordpress
-$saved_vars = array('SERVER' => $_SERVER, 'GET' => $_GET, 'POST' => $_POST,
-'COOKIE' => $_COOKIE, 'SESSION' => $_SESSION,'REQUEST' => $_REQUEST,'ENV' => $_ENV);
-//not $_FILE nor $GLOBALS
+//save all vars before they're escaped by wordpress (but not $_FILE nor $GLOBALS)
+$saved_vars = array(
+    'SERVER' => $_SERVER,
+    'GET' => $_GET,
+    'POST' => $_POST,
+    'COOKIE' => $_COOKIE,
+    'SESSION' => $_SESSION,
+    'REQUEST' => $_REQUEST,
+    'ENV' => $_ENV
+);
 
-
-//TODO : sanitize path name 
-if(isset($config['wpbb_path'])){
+if (isset($config['wpbb_path'])) {
     $extra_path = $config['wpbb_path'];
 } else {
@@ -97 +112 @@
 
 //tests if the wordpress files exist
-if(file_exists(dirname($root_path).'/'.$extra_path.'wp-blog-header.php'))
-{
-    $wp_blog_header_path = dirname($root_path).'/'.$extra_path.'wp-blog-header.php';
-}
-    else if(file_exists($root_path.'/'.$extra_path.'wp-blog-header.php'))
-{
-    $wp_blog_header_path = $root_path.'/'.$extra_path.'wp-blog-header.php';
-}
-    else
-{
-    $wp_blog_header_path = '';
-}
-
-
-if($wp_blog_header_path != ''){
-    //Include Wordpress
-    include($wp_blog_header_path);
+if (file_exists(dirname($root_path) . '/' . $extra_path . 'wp-blog-header.php')) {
+    include dirname($root_path) . '/' . $extra_path . 'wp-blog-header.php';
+} else if (file_exists($root_path . '/' . $extra_path . 'wp-blog-header.php')) {
+    include $root_path . '/' . $extra_path . 'wp-blog-header.php';
+} else {
+    //nothing found
 }
 
 //restore all vars.
-foreach($saved_vars as $key => $val){
-    $varname = '_'.$key;
+foreach ($saved_vars as $key => $val) {
+    $varname = '_' . $key;
     global $$varname;
     $$varname = $val;
 }
-    
+

phpbb-single-sign-on/trunk/module.phpbb.php

@@ -1 +1 @@
 <?php
 
-class wpbb_phpBB3{
+class wpbb_phpBB3 {
+
     var $user;
     var $loggedin;
 
-    function getIdentity(){
+    function getIdentity() {
         define('IN_PHPBB', true);
         global $phpbb_root_path, $phpEx;
 
-        $phpbb_root_path = ABSPATH.PHPBBPATH;
+        $phpbb_root_path = ABSPATH . PHPBBPATH;
         $phpEx = substr(strrchr(__FILE__, '.'), 1);
 
@@ -24 +25 @@
         //do not include the function_content, there is a depedency in auth_op to check if it's opened from within phpbb or within wordpress
 
-        if(file_exists($phpbb_root_path . 'common-orig.' . $phpEx)){
+        if (file_exists($phpbb_root_path . 'common-orig.' . $phpEx)) {
             $common_file = $phpbb_root_path . 'common-orig.' . $phpEx;
         } else {
@@ -32 +33 @@
 
         $include_contents = file_get_contents($common_file);
-        $include_contents = str_replace('<?php','',$include_contents);
-        $include_contents = str_replace('?>','',$include_contents);
-        $include_contents = str_replace('require($phpbb_root_path . \'includes/functions_content.\' . $phpEx);','',$include_contents);
+        $include_contents = str_replace('<?php', '', $include_contents);
+        $include_contents = str_replace('?>', '', $include_contents);
+        $include_contents = str_replace('require($phpbb_root_path . \'includes/functions_content.\' . $phpEx);', '', $include_contents);
 
 
         //called on line 189 of common.php //require($phpbb_root_path . 'includes/session.' . $phpEx);
         $include_session_contents = file_get_contents($phpbb_root_path . 'includes/session.' . $phpEx);
-        $include_session_contents = str_replace('<?php','',$include_session_contents);
-        $include_session_contents = str_replace('?>','',$include_session_contents);
-        $include_session_contents = str_replace('','',$include_session_contents);
+        $include_session_contents = str_replace('<?php', '', $include_session_contents);
+        $include_session_contents = str_replace('?>', '', $include_session_contents);
+        $include_session_contents = str_replace('', '', $include_session_contents);
 
         //corrige le set_cookie
@@ -49 +50 @@
 
 
-        $include_contents = str_replace('require($phpbb_root_path . \'includes/session.\' . $phpEx);',$include_session_contents,$include_contents);
+        $include_contents = str_replace('require($phpbb_root_path . \'includes/session.\' . $phpEx);', $include_session_contents, $include_contents);
 
         eval($include_contents);
@@ -57 +58 @@
         $user->setup();
 
-        if($user->data['is_registered'] == TRUE){
+        if ($user->data['is_registered'] == TRUE) {
             $identity = array(
-                    'id'        =>  $user->data['user_id'],
-                    'alias' =>  $user->data['username_clean'],
-                    'email' =>  $user->data['user_email'],
-                    'rank'  =>  $user->rank['user_rank']
+                'id' => $user->data['user_id'],
+                'alias' => $user->data['username_clean'],
+                'email' => $user->data['user_email'],
+                'rank' => $user->rank['user_rank']
             );
-        }
-        else{
+        } else {
             $identity = array();
         }
     }
 
-    function login($uname, $passwd){
-        define('IN_PHPBB',TRUE);
-
-        global $auth;
-
-        $username = $uname=='' ? request_var('username', '', true) : $uname;
-        $password = $passwd=='' ? request_var('password', '', true) : $passwd;
-
-        $result = $auth->login($username, $password);
-
-
-        return $result['status'] == LOGIN_SUCCESS ? array('response'=>TRUE,'error'=>'') : array('response'=>FALSE,'error'=>(!$config['board_contact']) ? sprintf($user->lang[$result['error_msg']], '', '') : sprintf($user->lang[$result['error_msg']], '<a href="mailto:' . htmlspecialchars($config['board_contact']) . '">', '</a>'));
-    }
-
-    function logout(){
+    /*
+     * WP wants a user obj on success and an WP_Error on failure
+     */
+
+    function login($username, $password) {
+
+        global $db;
+
+        //PHPBB
+        $phpBB_user = self::getUserByName($username);
+
+        //Wordpress
+        $wp_user = wpbb_Wordpress::getIdByName($username);
+        $in_wp = ($wp_user == 0) ? FALSE : TRUE;
+
+        //WP 1 BB 0 ?
+        if (!$phpBB_user && $in_wp) { //If he doesn't exists, create the user in phpbb
+            $email = $wp_user->user_email ? $wp_user->user_email : '';
+
+            // since group IDs may change, use a query to make sure it is the right default group.
+            $sql = 'SELECT group_id FROM ' . GROUPS_TABLE . " WHERE group_name = '" . $db->sql_escape(REGISTERED) . "' AND group_type = " . GROUP_SPECIAL;
+            $result = $db->sql_query($sql);
+
+            $row = $db->sql_fetchrow($result);
+            $group_id = $row['group_id'];
+
+            $user_row = array(
+                'username' => $username,
+                'user_password' => phpbb_hash($password),
+                'group_id' => $group_id,
+                'user_email' => $email,
+                'user_type' => 0
+            );
+
+            $id = wpbb_phpBB3::addUser($user_row);
+            $phpBB_user = wpbb_phpBB3::getUserById($id);
+        }
+
+        //has to be done when identity is checked
+        //wpbb_phpBB3::changePassword($username, $password);
+    }
+
+    function logout() {
         global $user, $auth;
 
@@ -94 +122 @@
      * OLD FUNCTION
      * function changePassword($username,$password){
-            $phpbb_root_path = ABSPATH.PHPBBPATH;
-
-            require($phpbb_root_path.'config.php');
-
-            // set user_pass_convert to 1 so user's pass will be hashed under phpBB rules when logging in after pass is changed in WordPress
-            $sql = 'UPDATE ' . USERS_TABLE . ' SET user_password="'.md5($password).'",user_pass_convert=1 WHERE username = "' . $username . '"';
-            $result = mysql_query($sql);
-    }*/
-
-    function changePassword($username, $password)
-    {
+      $phpbb_root_path = ABSPATH.PHPBBPATH;
+
+      require($phpbb_root_path.'config.php');
+
+      // set user_pass_convert to 1 so user's pass will be hashed under phpBB rules when logging in after pass is changed in WordPress
+      $sql = 'UPDATE ' . USERS_TABLE . ' SET user_password="'.md5($password).'",user_pass_convert=1 WHERE username = "' . $username . '"';
+      $result = mysql_query($sql);
+      } */
+
+    function changePassword($username, $password) {
         global $db;
 
         $hashed = phpbb_hash($password);
-        $sql = 'UPDATE ' . USERS_TABLE . ' SET user_password="'.$hashed.'",user_pass_convert=0,user_last_search=1 WHERE username = "' . $username . '"';
+        $sql = 'UPDATE ' . USERS_TABLE . ' SET user_password="' . $hashed . '",user_pass_convert=0,user_last_search=1 WHERE username = "' . $username . '"';
 
         $result = $db->sql_query($sql);
     }
 
-    function addUser($user){
+    function addUser($user) {
         global $phpbb_root_path, $phpEx;
 
         // Use the user_add function, this code is from auth.php line 864-869
-        if (!function_exists('user_add'))
-        {
+        if (!function_exists('user_add')) {
             include($phpbb_root_path . 'includes/functions_user.' . $phpEx);
         }
@@ -125 +151 @@
     }
 
-    function getUserById($id){
+    function getUserById($id) {
         global $db;
         mysql_select_db($db->dbname);
@@ -139 +165 @@
     }
 
-    function getUserByName($name, $clean = false){
-        $phpbb_root_path = ABSPATH.PHPBBPATH;
-
-        require($phpbb_root_path.'config.php');
-
-        $dbr = mysql_connect($dbhost,$dbuser,$dbpasswd);
+    function getUserByName($name) {
+        $phpbb_root_path = ABSPATH . PHPBBPATH;
+
+        require($phpbb_root_path . 'config.php');
+
+        $dbr = mysql_connect($dbhost, $dbuser, $dbpasswd);
         mysql_select_db($dbname);
         define('USERS_TABLE', $table_prefix . 'users');
@@ -152 +178 @@
 
         $result = mysql_query($sql);
-        if($result){
-            $user = mysql_fetch_row($result);
+        if ($result) {
+            $user = mysql_fetch_object($result);
             mysql_free_result($result);
             return $user;
@@ -160 +186 @@
         return false;
     }
+
+    ////////////////////////////////////////////////////////////
+
+    function get_wp_user_by_email($email) {
+        $lcemail = strtolower($email);
+
+        $phpbb_root_path = ABSPATH . PHPBBPATH;
+        require($phpbb_root_path . 'config.php');
+        $dbr = mysql_connect($dbhost, $dbuser, $dbpasswd);
+        mysql_select_db($dbname);
+        define('USERS_TABLE', $table_prefix . 'users');
+        $sql = 'SELECT username, user_email FROM ' . USERS_TABLE .
+                " WHERE user_email = '" . esc_sql($lcemail) . "'";
+        $result = mysql_query($sql);
+        if ($result) {
+            $user = mysql_fetch_row($result);
+            if ($user[0]) {
+                $user_row = array(
+                    'username' => $user[0],
+                    'email' => $user[1],
+                    'password' => wp_generate_password(),
+                );
+                return wpbb_WordPress::addUser($user_row);
+            }
+        }
+
+        return false;
+    }
+
+    ////////////////////////////////////////////////////////////
+
+    function get_wp_user_by_name($name) {
+        $phpbb_root_path = ABSPATH . PHPBBPATH;
+        require($phpbb_root_path . 'config.php');
+        $dbr = mysql_connect($dbhost, $dbuser, $dbpasswd);
+        mysql_select_db($dbname);
+        define('USERS_TABLE', $table_prefix . 'users');
+        $sql = 'SELECT username, user_email FROM ' . USERS_TABLE .
+                " WHERE username = '" . esc_sql($name) . "'";
+        $result = mysql_query($sql);
+        if ($result) {
+            $user = mysql_fetch_row($result);
+            if ($user[0]) {
+                $user_row = array(
+                    'username' => $user[0],
+                    'email' => $user[1],
+                    'password' => wp_generate_password(),
+                );
+                return wpbb_WordPress::addUser($user_row);
+            }
+        }
+
+        return false;
+    }
+
 }

phpbb-single-sign-on/trunk/module.wp.php

@@ -1 +1 @@
 <?php
 
-class wpbb_WordPress{
-    function load(){
-    }
-
-    function loadAdminAPI(){
-        if(!function_exists('validate_username')){
-            require_once(ABSPATH . '/wp-admin/includes/admin.php');
-        }
-        else{
-                    $include_registration_contents = file_get_contents(ABSPATH . WPINC . '/registration.php');
-                    $include_registration_contents = preg_replace('/^\<\?php/','',$include_registration_contents);
-                    $include_registration_contents = preg_replace('/\?\>$/','',$include_registration_contents);
-                    $include_registration_contents = str_replace('validate_username','op_validate_username',$include_registration_contents);
-
-                    $include_admin_contents = file_get_contents(ABSPATH . '/wp-admin/includes/admin.php');
-                    $include_admin_contents = preg_replace('/^\<\?php/','',$include_admin_contents);
-                    $include_admin_contents = preg_replace('/\?\>$/','',$include_admin_contents);
-                    $include_admin_contents = str_replace('require_once(ABSPATH . WPINC . \'/registration.php\');',$include_registration_contents,$include_admin_contents);
-
-                    eval($include_admin_contents);
-        }
-    }
-
-    function addUser($user){
-        global $wpdb;
-        mysql_select_db(DB_NAME);  // Select WP database
-
-        // Derived from wp_insert_user() wp-includes/registration.php line 104
-        $user_login = sanitize_user( $user['username'] );
-        $user_login = apply_filters('pre_user_login', $user_login);
-
-        
-                //preparing user data
-                $user_pass = wp_hash_password($user['password']);
-        $user_email = $user['email'] ? $wpdb->escape($user['email']) : '';
-                $user_login = $wpdb->escape($user_login);
-                $user_url = '';
-                $user_nicename = apply_filters('pre_user_nicename', sanitize_title( $user_login ));
-        $display_name = $user_login;
-        $user_registered = gmdate('Y-m-d H:i:s');
-
-        $data = compact( 'user_pass', 'user_email', 'user_login', 'user_url', 'user_nicename', 'display_name', 'user_registered' );
-
-                //creation
-        $wpdb->insert( $wpdb->users, $data);
-        $user_id = (int) $wpdb->insert_id;
-
-        $wp_user = new WP_User($user_id);
-        $wp_user->set_role(get_option('default_role'));
-
-                wp_cache_delete($user_id, 'users');
-                wp_cache_delete($user_login, 'userlogins');
-
-        return $wp_user;
-    }
-
-        function getNicename($username){
-            return apply_filters('pre_user_nicename', sanitize_title( $username ));
-        }
-
-    function logout(){
-        wp_clear_auth_cookie();
-    }
-
-    function updateUser($data){
-        $user = '';
-        $user->ID = wpbb_WordPress::getIdByName($data['username']);
-        $user->user_login = $data['username'];
-        $user->user_pass = $data['new_password'];
-        $user->user_email = $data['email'];
-
-        wp_update_user(get_object_vars($user));
-    }
-    
-    function changePassword($username, $password){
-            $id = wpbb_WordPress::getIdByName($username);
-            if($id != false){
-        $user = array();
-        $user['ID'] = $id;
-        $user['user_pass'] = $password;
-
-        wp_update_user($user);
-            }
-    }
-
-    function getIdByName($user){
-        mysql_select_db(DB_NAME);
-                //to find the informations correctly
-                //return get_profile('id', wpbb_WordPress::getNicename($user));
-        return get_profile('id',$user);
-    }
-
-    function wpbb_login(){
-        if ( isset( $_REQUEST['redirect_to'] ) )
-            $redirect_to = $_REQUEST['redirect_to'];
-        else
-            $redirect_to = admin_url();
-
-        if ( is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ) )
-            $secure_cookie = false;
-        else
-            $secure_cookie = '';
-
-        if ('POST' == $_SERVER['REQUEST_METHOD']) {
-            $user = wp_signon('', $secure_cookie);
-
-            $redirect_to = apply_filters('login_redirect', $redirect_to, isset( $_REQUEST['redirect_to'] ) ? $_REQUEST['redirect_to'] : '', $user);
-
-            if ( !is_wp_error($user) ) {
-                if ( !$user->has_cap('edit_posts') && ( empty( $redirect_to ) || strpos($redirect_to,'wp-admin/') )){
-                    $redirect_to = admin_url('profile.php');
-                }
-                wp_safe_redirect($redirect_to);
-                exit();
-            }
-
-            $errors = $user;
-        }
-        // Clear errors if loggedout is set.
-        if ( !empty($_GET['loggedout']) )
-            $errors = new WP_Error();
-
-        return array('redirect_to'=>$redirect_to,'errors'=>$errors);
-    }
-
-    function wpbb_register(){
-        if ( !get_option('users_can_register') ) {
-            wp_redirect('wp-login.php?registration=disabled');
-            exit();
-        }
-
-        global $errors;
-        $errors = new WP_Error();
-        require_once( ABSPATH . WPINC . '/registration.php');
-
-        $user_login = '';
-        $user_email = '';
-
-        if ('POST' == $_SERVER['REQUEST_METHOD']) {
-            require_once( ABSPATH . WPINC . '/registration.php');
-
-            $user_login = $_POST['user_login'];
-            $user_email = $_POST['user_email'];
-            register_new_user($user_login, $user_email);
-            if ( !is_wp_error($errors) ) {
-                wp_redirect('wp-login.php?checkemail=registered');
-                exit();
-            }
-        }
-        return $errors;
-    }
-
-    function wpbb_lostpassword(){
-        $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
-        if ( $http_post ) {
-            $errors = retrieve_password();
-            if ( !is_wp_error($errors) ) {
-                wp_redirect('wp-login.php?checkemail=confirm');
-                exit();
-            }
-        }
-        else{
-            $errors = new WP_Error(); // initialize error object
-        }
-
-        if ( 'invalidkey' == $_GET['error'] && isset($errors)) $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.'));
-
-        do_action('lost_password');
-        return $errors;
-    }
-
-    function wpbb_profile(){
-        if ( !$user_id ){
-            $current_user = wp_get_current_user();
-            $user_id = $current_user->ID;
-        }
-        require_once(ABSPATH.'wp-admin/includes/user.php');
-
-        if($_POST['action'] == 'update'){
-            require_once(ABSPATH.'wp-admin/includes/admin.php');
-            check_admin_referer('update-user_' . $user_id);
-
-            do_action('personal_options_update');
-
-            $errors = edit_user($user_id);
-
-            if( !is_wp_error( $errors ) ) {
-                global $wpdb;
-                $userdata = get_userdata( $user_id );
-                $user_login = $wpdb->escape( $userdata->user_login );
-                // is password being changed in wordpress?
-                if (!empty($_POST['pass1'])) // using $_POST['pass1'] is ok here because it will not reach this point if value doesn't pass checks in edit_user()
-                    wpbb_updatePassword($user_login,$_POST['pass1'],'wp');
-
-                if(!empty($_POST['email']))
-                    wpbb_updateEmail($user_login,$_POST['email'],'wp');
-
-                //op_selectDbFromModule('wp');
-
-                $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), "profile.php");
-                wp_redirect($redirect);
-                exit;
-            }
-        }
-
-        $profileuser = get_user_to_edit($user_id);
-
-        return array(
-            'is_profile_page'   =>  TRUE,
-            'profileuser'       =>  $profileuser,
-            'user_id'           =>  $user_id,
-            'errors'            =>  $errors
-        );
-    }
+class wpbb_WordPress {
+
+    function load() {
+
+    }
+
+    function loadAdminAPI() {
+        require_once(ABSPATH . '/wp-admin/includes/admin.php');
+    }
+
+    function addUser($user) {
+        global $wpdb;
+        mysql_select_db(DB_NAME);  // Select WP database
+        // Derived from wp_insert_user() wp-includes/registration.php line 104
+        $user_login = sanitize_user($user['username']);
+        $user_login = apply_filters('pre_user_login', $user_login);
+
+
+        //preparing user data
+        $user_pass = wp_hash_password($user['password']);
+        $user_email = $user['email'] ? $wpdb->escape($user['email']) : '';
+        $user_login = $wpdb->escape($user_login);
+        $user_url = '';
+        $user_nicename = apply_filters('pre_user_nicename', sanitize_title($user_login));
+        $display_name = $user_login;
+        $user_registered = gmdate('Y-m-d H:i:s');
+
+        $data = compact('user_pass', 'user_email', 'user_login', 'user_url', 'user_nicename', 'display_name', 'user_registered');
+
+        //creation
+        $wpdb->insert($wpdb->users, $data);
+        $user_id = (int) $wpdb->insert_id;
+
+        $wp_user = new WP_User($user_id);
+        $wp_user->set_role(get_option('default_role'));
+
+        wp_cache_delete($user_id, 'users');
+        wp_cache_delete($user_login, 'userlogins');
+
+        return $wp_user;
+    }
+
+    function getNicename($username) {
+        return apply_filters('pre_user_nicename', sanitize_title($username));
+    }
+
+    function logout() {
+        wp_clear_auth_cookie();
+    }
+
+    function updateUser($data) {
+        $user = '';
+        $user->ID = wpbb_WordPress::getIdByName($data['username']);
+        $user->user_login = $data['username'];
+        $user->user_pass = $data['new_password'];
+        $user->user_email = $data['email'];
+
+        wp_update_user(get_object_vars($user));
+    }
+
+    function changePassword($username, $password) {
+        $id = wpbb_WordPress::getIdByName($username);
+        if ($id != false) {
+            $user = array();
+            $user['ID'] = $id;
+            $user['user_pass'] = $password;
+
+            wp_update_user($user);
+        }
+    }
+
+    function getIdByName($user) {
+        mysql_select_db(DB_NAME);
+        //to find the informations correctly
+        //return get_profile('id', wpbb_WordPress::getNicename($user));
+        return get_profile('id', $user);
+    }
+
+    function wpbb_login() {
+        if (isset($_REQUEST['redirect_to']))
+            $redirect_to = $_REQUEST['redirect_to'];
+        else
+            $redirect_to = admin_url();
+
+        if (is_ssl() && force_ssl_login() && !force_ssl_admin() && ( 0 !== strpos($redirect_to, 'https') ) && ( 0 === strpos($redirect_to, 'http') ))
+            $secure_cookie = false;
+        else
+            $secure_cookie = '';
+
+        if ('POST' == $_SERVER['REQUEST_METHOD']) {
+            $user = wp_signon('', $secure_cookie);
+
+            $redirect_to = apply_filters('login_redirect', $redirect_to, isset($_REQUEST['redirect_to']) ? $_REQUEST['redirect_to'] : '', $user);
+
+            if (!is_wp_error($user)) {
+                if (!$user->has_cap('edit_posts') && ( empty($redirect_to) || strpos($redirect_to, 'wp-admin/') )) {
+                    $redirect_to = admin_url('profile.php');
+                }
+                wp_safe_redirect($redirect_to);
+                exit();
+            }
+
+            $errors = $user;
+        }
+        // Clear errors if loggedout is set.
+        if (!empty($_GET['loggedout']))
+            $errors = new WP_Error();
+
+        return array('redirect_to' => $redirect_to, 'errors' => $errors);
+    }
+
+    function wpbb_register() {
+        if (!get_option('users_can_register')) {
+            wp_redirect('wp-login.php?registration=disabled');
+            exit();
+        }
+
+        global $errors;
+        $errors = new WP_Error();
+        require_once( ABSPATH . WPINC . '/registration.php');
+
+        $user_login = '';
+        $user_email = '';
+
+        if ('POST' == $_SERVER['REQUEST_METHOD']) {
+            require_once( ABSPATH . WPINC . '/registration.php');
+
+            $user_login = $_POST['user_login'];
+            $user_email = $_POST['user_email'];
+            register_new_user($user_login, $user_email);
+            if (!is_wp_error($errors)) {
+                wp_redirect('wp-login.php?checkemail=registered');
+                exit();
+            }
+        }
+        return $errors;
+    }
+
+    function wpbb_lostpassword() {
+        $http_post = ('POST' == $_SERVER['REQUEST_METHOD']);
+        if ($http_post) {
+            $errors = retrieve_password();
+            if (!is_wp_error($errors)) {
+                wp_redirect('wp-login.php?checkemail=confirm');
+                exit();
+            }
+        } else {
+            $errors = new WP_Error(); // initialize error object
+        }
+
+        if ('invalidkey' == $_GET['error'] && isset($errors))
+            $errors->add('invalidkey', __('Sorry, that key does not appear to be valid.'));
+
+        do_action('lost_password');
+        return $errors;
+    }
+
+    function wpbb_profile() {
+        if (!$user_id) {
+            $current_user = wp_get_current_user();
+            $user_id = $current_user->ID;
+        }
+        require_once(ABSPATH . 'wp-admin/includes/user.php');
+
+        if ($_POST['action'] == 'update') {
+            require_once(ABSPATH . 'wp-admin/includes/admin.php');
+            check_admin_referer('update-user_' . $user_id);
+
+            do_action('personal_options_update');
+
+            $errors = edit_user($user_id);
+
+            if (!is_wp_error($errors)) {
+                global $wpdb;
+                $userdata = get_userdata($user_id);
+                $user_login = $wpdb->escape($userdata->user_login);
+                // is password being changed in wordpress?
+                if (!empty($_POST['pass1'])) // using $_POST['pass1'] is ok here because it will not reach this point if value doesn't pass checks in edit_user()
+                    wpbb_updatePassword($user_login, $_POST['pass1'], 'wp');
+
+                if (!empty($_POST['email']))
+                    wpbb_updateEmail($user_login, $_POST['email'], 'wp');
+
+                //op_selectDbFromModule('wp');
+
+                $redirect = add_query_arg('wp_http_referer', urlencode($wp_http_referer), "profile.php");
+                wp_redirect($redirect);
+                exit;
+            }
+        }
+
+        $profileuser = get_user_to_edit($user_id);
+
+        return array(
+            'is_profile_page' => TRUE,
+            'profileuser' => $profileuser,
+            'user_id' => $user_id,
+            'errors' => $errors
+        );
+    }
+
 }

phpbb-single-sign-on/trunk/options.php

@@ -1 +1 @@
 <?php
-
 //wpbb_get_functions_conflict(); //TEST
 
-$options_page = get_option('siteurl') . '/wp-admin/admin.php?page=phpbb-single-sign-on/options.php';
-
-//Version compatibility before 0.6.3
-if(file_exists(ABSPATH.PHPBBPATH.'common.orig.php')){
-    copy(ABSPATH.PHPBBPATH.'common.orig.php',$config_files['common-orig']['destin']);
-    unlink(ABSPATH.PHPBBPATH.'common.orig.php');
-}
-
-
-switch($_POST['stage']){
+switch ($_POST['stage']) {
 
     //Check if there are new options set
@@ -20 +10 @@
         $new_options = array();
 
-        foreach($connect_phpbb_options as $key => $option){
+        foreach ($connect_phpbb_options as $key => $option) {
             $new_options[$key] = $_POST[strtolower($key)];
         }
@@ -30 +20 @@
         //--------------------------------------------------------------------------
         $phpbb_db_prefix = wpbb_get_phpbb_prefix();
-        if($phpbb_db_prefix != ''){
-            if(isset($_POST['auth_method']) && $_POST['auth_method'] != ''){
+        if ($phpbb_db_prefix != '') {
+            if (isset($_POST['auth_method']) && $_POST['auth_method'] != '') {
                 wpbb_set_config_value($phpbb_db_prefix, 'auth_method', $_POST['auth_method']);
             }
-            if(isset($_POST['wpbb_path']) && $_POST['wpbb_path'] != ''){
+            if (isset($_POST['wpbb_path']) && $_POST['wpbb_path'] != '') {
                 wpbb_set_config_value($phpbb_db_prefix, 'wpbb_path', $_POST['wpbb_path']);
             }
         }
-    break;
+        break;
+        case 'install-common':
 
-    //Install the plugin
-    case 'install':
+            if (is_writable($config_files['common']['folder'])) {
+                //is original file ?
+                if (wpbb_get_file_version($config_files['common']['destin']) == 'Original') {
+                    //is original file there ?
+                    if (file_exists($config_files['common-orig']['destin'])) {
+                        unlink($config_files['common-orig']['destin']);
+                    }
+                    //put the original file there
+                    copy($config_files['common']['destin'], $config_files['common-orig']['destin']);
+                }
 
-        //if the auth folder is writable
-        if(is_writable($config_files['auth_wpbb']['folder'])){
-            //the file is already installed
-            if(!file_exists($config_files['auth_wpbb']['destin'])){
-                copy($config_files['auth_wpbb']['source'],$config_files['auth_wpbb']['destin']);
+                //in all cases, install the file
+                //is the file there ?
+                if (file_exists($config_files['common']['destin'])) {
+                    unlink($config_files['common']['destin']);
+                }
+                copy($config_files['common']['source'], $config_files['common']['destin']);
             } else {
-                unlink($config_files['auth_wpbb']['destin']);
-                copy($config_files['auth_wpbb']['source'],$config_files['auth_wpbb']['destin']);
-            }
-        //if the file isn't writable
-        } else {
-            $error = true;
-        }
-
-        if(is_writable($config_files['common']['folder'])){
-            //is original file ?
-            if(wpbb_get_file_version($config_files['common']['destin']) == 'Original') {
-                //is original file there ?
-                if(file_exists($config_files['common-orig']['destin'])){
-                        unlink($config_files['common-orig']['destin']);
-                }
-                //put the original file there
-                copy($config_files['common']['destin'],$config_files['common-orig']['destin']);
+                $error = true;
             }
 
-            //in all cases, install the file
-            //is the file there ?
-            if(file_exists($config_files['common']['destin'])){
-                unlink($config_files['common']['destin']);
+            break;
+        case 'install-auth':
+
+            //if the auth folder is writable
+            if (is_writable($config_files['auth_wpbb']['folder'])) {
+                //the file is already installed
+                if (!file_exists($config_files['auth_wpbb']['destin'])) {
+                    copy($config_files['auth_wpbb']['source'], $config_files['auth_wpbb']['destin']);
+                } else {
+                    unlink($config_files['auth_wpbb']['destin']);
+                    copy($config_files['auth_wpbb']['source'], $config_files['auth_wpbb']['destin']);
+                }
+                //if the file isn't writable
+            } else {
+                $error = true;
             }
-            copy($config_files['common']['source'],$config_files['common']['destin']);
 
-        } else {
-            $error = true;
+            break;
+        case 'patch-posting':
+            wpbb_validate_user_patch(realpath(ABSPATH . PHPBBPATH).'/posting.php');
+            break;
 
-        }
-    break;
+        case 'patch-user_function';
+            wpbb_validate_user_patch(realpath(ABSPATH . PHPBBPATH).'/includes/functions_user.php');
+            wpbb_validate_user2_patch(realpath(ABSPATH . PHPBBPATH).'/includes/functions_user.php');
+            break;
 }
 
 
 $phpbb_db_prefix = wpbb_get_phpbb_prefix();
-if($phpbb_db_prefix != ''){
+if ($phpbb_db_prefix != '') {
     $phpbb_found = true;
 } else {
     $phpbb_found = false;
 }
-
 ?>
 <div class="wrap">
-  <h2><?php _e('PHP BB Options', 'PHPBB') ?></h2>
-  <form name="form1" method="post" action="<?php echo $options_page ?>&amp;updated=true">
-    <input type="hidden" name="stage" value="update" />
-    <table width="100%" cellspacing="2" cellpadding="5" class="form-table">
-        <tr>
-            <th scope="row" colspan="2"><strong>Wordpress Part</strong></th>
-            <?php if($phpbb_found){ echo '<th scope="row" colspan="2"><strong>PHPBB Part</strong></th>'; } ?>
-        </tr>
+    <h2><?php _e('PHP BB Options', 'phpbb') ?></h2>
 
-    <tr valign="baseline">
-        <th scope="row"><?php _e('Path', 'phpbb') ?></th>
-        <td>
-            <input type="text" value="<?php echo $connect_phpbb_options['path'] ?>" name="path" />
-            <div><small><?php _e('To PHPBB from Wordpress', 'phpbb') ?></small></div>
-        </td>
-            <?php if($phpbb_found){ echo '<th scope="row">'; _e('Path', 'phpbb'); echo '</th>
-        <td>
-            <input type="text" value="'.wpbb_get_config_value('wpbb_path').'" name="wpbb_path" />
-            <div><small>'; _e('To Wordpress from PHPBB', 'phpbb'); echo '</small></div>
-        </td>'; } ?>
-    </tr>
-
-        <?php if($phpbb_found){ ?>
-        <tr valign="baseline">
-            <td>&nbsp;</td><td>&nbsp;</td>
-            <th scope="row"><?php _e('Auth Method', 'phpbb') ?></th>
-            <td>
-                <select name="auth_method">
-                    <?php echo wpbb_select_auth_method(wpbb_get_config_value('auth_method')); ?>
-                </select>
-                <div><small><?php _e('Auth method to use, you have to use "wpbb" to make this plugin work', 'phpbb') ?></small></div>
-            </td>
-        </tr>
-        <?php } ?>
-
-    </table>
-    <p class="submit">
-        <input type="submit" name="Submit" value="<?php _e('Save Changes', 'phpbb') ?>" />
-    </p>
-    </form>
-
-    <!-- Install files part -->
-    <form name="form2" method="post" action="<?php echo $options_page ?>">
-        <input type="hidden" name="stage" value="install" />
+    <form name="form1" method="post" id="configuration" action="<?php echo WPBB_OPTIONS_PAGE ?>&amp;updated=true">
+        <input type="hidden" name="stage" value="update" />
+        <table class="widefat" summary="" title="PHPBB">
+            <thead>
+            <tr>
+                <th scope="col" colspan="2"><?php _e('Wordpress Part', 'phpbb') ?></th>
+                <?php if ($phpbb_found) { ?>
+                    <th scope="col" colspan="2"><?php _e('PHPBB Part', 'phpbb') ?></th>
+                <?php } ?>
+            </tr>
+            <tbody id="the-list">
+            <tr valign="baseline">
+                <th scope="row"><?php _e('Path', 'phpbb') ?></th>
+                <td>
+                    <input type="text" value="<?php echo $connect_phpbb_options['path'] ?>" name="path" />
+                    <div><small><?php _e('To PHPBB from Wordpress', 'phpbb') ?></small></div>
+                </td>
+                    <?php if ($phpbb_found) {
+                        echo '<th scope="row">';
+                        _e('Path', 'phpbb');
+                        echo '</th>
+                                <td>
+                                    <input type="text" value="' . wpbb_get_config_value('wpbb_path') . '" name="wpbb_path" />
+                                    <div><small>';
+                        _e('To Wordpress from PHPBB', 'phpbb');
+                        echo '</small></div>
+                                </td>';
+                    } ?>
+            </tr>
+            <?php if ($phpbb_found) { ?>
+                <tr valign="baseline">
+                    <td>&nbsp;</td><td>&nbsp;</td>
+                    <th scope="row"><?php _e('Auth Method', 'phpbb') ?></th>
+                    <td>
+                        <select name="auth_method">
+                            <?php echo wpbb_select_auth_method(wpbb_get_config_value('auth_method')); ?>
+                        </select>
+                        <div><small><?php _e('Auth method to use, you have to use "wpbb" to make this plugin work', 'phpbb') ?></small></div>
+                    </td>
+                </tr>
+            <?php } ?>
+            </tbody>
+        </table>
         <p class="submit">
-            <input type="submit" name="Submit" value="<?php _e('Install Files in PHP BB', 'phpbb') ?>" />
+            <input type="submit" name="Submit" value="<?php _e('Save Changes', 'phpbb') ?>" />
         </p>
     </form>
 
-    <?php 
-    $error = wpbb_run_test();
 
-    if($error == true) { ?>
-        <p>The phpBB Plugin is not activated now.</p>
+<?php
+$error = wpbb_run_test();
 
-        <p>If the check didn't work correctly, you can see on the following instructions on how to manually correct the problems.</p>
-        <p>Notice : if the first test isn't correct, the following won't work, so please do it in the right order.</p>
+if ($error == true) {
+?>
+    <p>The phpBB Plugin is not activated now.</p>
 
-        <p><strong>Wordpress Path</strong></p>
-        <p>This is the first thing you have to set, it is the relative path to your PHPBB installation.<br />
-            If the wordpress is at the root of your web folder (/www/) and your forum in the wordpress folder (www/forum/).<br />
-            You will have to set <strong>forum/</strong> as path. (don't forget the end slash)
-        </p>
+    <p>If the check didn't work correctly, you can see on the following instructions on how to manually correct the problems.</p>
+    <p>Notice : if the first test isn't correct, the following won't work, so please do it in the right order.</p>
 
-        <p><strong>auth_wpbb.php</strong></p>
-        <p>This file must be copied from <strong><?php echo $config_files['auth_wpbb']['source']; ?></strong> to <strong><?php echo $config_files['auth_wpbb']['destin']; ?></strong></p>
+    <p><strong>Wordpress Path</strong></p>
+    <p>This is the first thing you have to set, it is the relative path to your PHPBB installation.<br />
+        If the wordpress is at the root of your web folder (/www/) and your forum in the wordpress folder (www/forum/).<br />
+        You will have to set <strong>forum/</strong> as path. (don't forget the end slash)
+    </p>
 
-        <p><strong>common.php</strong></p>
-        <?php if(wpbb_get_file_version($config_files['common']['destin']) == 'Original'){ ?>
-        <p>It seems that this file is the original common.php file.<br />
-        you will have to rename this file from <strong>common.php</strong> to <strong>common-orig.php</strong><br />
-        the file is in the folder <strong><?php echo $config_files['common']['folder'] ?></strong></p>
-        <?php } ?>
-        <p>This file must be copied from <strong><?php echo $config_files['common']['source']; ?></strong> to <strong><?php echo $config_files['common']['destin']; ?></strong></p>
+    <p><strong>auth_wpbb.php</strong></p>
+    <p>This file must be copied from <strong><?php echo $config_files['auth_wpbb']['source']; ?></strong> to <strong><?php echo $config_files['auth_wpbb']['destin']; ?></strong></p>
 
-        <p><strong>common-orig.php</strong></p>
-        <p>You already did this on the previous step, this file doesn't exist by default, it's the original common.php file, because this script needs another one in place to load some libraries</p>
+    <p><strong>common.php</strong></p>
+    <?php if (wpbb_get_file_version($config_files['common']['destin']) == 'Original') { ?>
+            <p>It seems that this file is the original common.php file.<br />
+                you will have to rename this file from <strong>common.php</strong> to <strong>common-orig.php</strong><br />
+                the file is in the folder <strong><?php echo $config_files['common']['folder'] ?></strong></p>
+    <?php } ?>
+    <p>This file must be copied from <strong><?php echo $config_files['common']['source']; ?></strong> to <strong><?php echo $config_files['common']['destin']; ?></strong></p>
 
-        <p><strong>auth_method</strong></p>
-        <p>This form element only appears when the path_var is correctly set.<br />You have to set it to <strong>wpbb</strong></p>
-        <p></p>
-    <?php } ?>
+    <p><strong>common-orig.php</strong></p>
+    <p>You already did this on the previous step, this file doesn't exist by default, it's the original common.php file, because this script needs another one in place to load some libraries</p>
+
+    <p><strong>auth_method</strong></p>
+    <p>This form element only appears when the path_var is correctly set.<br />You have to set it to <strong>wpbb</strong></p>
+    <p></p>
+<?php } ?>
 </div>

phpbb-single-sign-on/trunk/readme.txt

@@ -30 +30 @@
 * Make it work on multiple db's
 * Uninstaller
+
+= 0.8 =
+* Cleaner admin Area
+* Added a way to patch files for the "validate_username" bug
+* Rewrote some parts involved in login the user in the two codes are now separated
 
 = 0.7.1 =