Changeset 5568

Timestamp:

Mar 4, 2008, 4:40:55 PM (12 years ago)

Author:

ebihara

Message:

#2012:ログインIDとパスワードによるログインモードを追加

Location:

OpenPNE/trunk

Files:

• config.php.sample (modified) (2 diffs)
• setup/sql/mysql40/update/update05-for2.11.5-alter_c_member_pre.sql (copied) (copied from OpenPNE/branches/work/ebihara/prj_id_login/setup/sql/mysql40/update/update05-for2.11.5-alter_c_member_pre.sql)
• setup/sql/mysql41/update/update05-for2.11.5-alter_c_member_pre.sql (copied) (copied from OpenPNE/branches/work/ebihara/prj_id_login/setup/sql/mysql41/update/update05-for2.11.5-alter_c_member_pre.sql)
• setup/sql/postgres74/update/update04-for2.11.5-alter_c_member_pre.sql (copied) (copied from OpenPNE/branches/work/ebihara/prj_id_login/setup/sql/postgres74/update/update04-for2.11.5-alter_c_member_pre.sql)
• webapp/init.inc (modified) (1 diff)
• webapp/lib/OpenPNE/Auth.php (modified) (4 diffs)
• webapp/lib/OpenPNE/Config.php (modified) (1 diff)
• webapp/lib/auth.inc (modified) (2 diffs)
• webapp/lib/db/etc.php (modified) (1 diff)
• webapp/lib/db/member.php (modified) (5 diffs)
• webapp/lib/util/mail_send.php (modified) (2 diffs)
• webapp/lib/util/util.php (modified) (3 diffs)
• webapp/modules/admin/do/import_c_member.php (modified) (3 diffs)
• webapp/modules/admin/templates/import_c_member.tpl (modified) (1 diff)
• webapp/modules/ktai/auth.inc (modified) (2 diffs)
• webapp/modules/ktai/do/h_invite_insert_c_invite.php (modified) (2 diffs)
• webapp/modules/ktai/do/o_easy_login.php (modified) (1 diff)
• webapp/modules/ktai/do/o_insert_c_member.php (modified) (4 diffs)
• webapp/modules/ktai/do/o_login.php (modified) (1 diff)
• webapp/modules/ktai/page/o_regist_end.php (modified) (1 diff)
• webapp/modules/ktai/page/o_regist_input.php (modified) (1 diff)
• webapp/modules/ktai/page/o_regist_pre.php (modified) (1 diff)
• webapp/modules/ktai/templates/h_config_mail.tpl (modified) (1 diff)
• webapp/modules/ktai/templates/o_login.tpl (modified) (2 diffs)
• webapp/modules/ktai/templates/o_regist_input.tpl (modified) (1 diff)
• webapp/modules/pc/do/h_invite_insert_c_invite.php (modified) (2 diffs)
• webapp/modules/pc/do/o_login.php (modified) (1 diff)
• webapp/modules/pc/do/o_public_invite.php (modified) (1 diff)
• webapp/modules/pc/do/o_regist_ktai_address.php (modified) (1 diff)
• webapp/modules/pc/do/o_regist_prof.php (modified) (5 diffs)
• webapp/modules/pc/page/h_invite.php (modified) (1 diff)
• webapp/modules/pc/page/o_public_invite.php (modified) (1 diff)
• webapp/modules/pc/page/o_public_invite_end.php (modified) (1 diff)
• webapp/modules/pc/page/o_regist_end.php (modified) (1 diff)
• webapp/modules/pc/page/o_regist_intro.php (modified) (1 diff)
• webapp/modules/pc/page/o_regist_ktai_address.php (modified) (1 diff)
• webapp/modules/pc/page/o_regist_ktai_address_confirm.php (modified) (1 diff)
• webapp/modules/pc/page/o_regist_ktai_address_end.php (modified) (1 diff)
• webapp/modules/pc/page/o_regist_prof.php (modified) (1 diff)
• webapp/modules/pc/page/o_regist_prof_confirm.php (modified) (1 diff)
• webapp/modules/pc/templates/h_config.tpl (modified) (2 diffs)
• webapp/modules/pc/templates/o_login.tpl (modified) (1 diff)
• webapp/modules/pc/templates/o_regist_prof.tpl (modified) (1 diff)
• webapp/modules/pc/templates/o_regist_prof_confirm.tpl (modified) (1 diff)
• webapp/modules/setup/do/setup.php (modified) (4 diffs)
• webapp/modules/setup/templates/setup.tpl (modified) (2 diffs)
• webapp/templates/mail/m_ktai_password_query.tpl (modified) (1 diff)
• webapp/templates/mail/m_ktai_regist_invite.tpl (modified) (1 diff)
• webapp/templates/mail/m_pc_password_query.tpl (modified) (1 diff)
• webapp/templates/mail/m_pc_syoutai_mail.tpl (modified) (1 diff)

OpenPNE/trunk/config.php.sample

@@ -504 +504 @@
 define('OPENPNE_USE_CAPTCHA', true);
 
-// 外部認証を使用するかどうか
-define('IS_SLAVEPNE', false);
+// 認証モード設定
+//  email    : メールアドレスとパスワードによるログイン
+//  pneid    : IDとパスワードによるログイン
+//  slavepne : 外部認証(SlavePNE機能)を使ったログイン
+define('OPENPNE_AUTH_MODE', 'email');
 
 // 外部認証時にメールアドレス登録を必須にするかどうか
@@ -514 +517 @@
 define('SLAVEPNE_SYOUTAI_URL_KTAI', '');
 
-// IS_SLAVEPNEがtrueの場合のauthオプション
+// OPENPNE_AUTH_MODE がslavepneの場合のauthオプション
 $GLOBALS['_OPENPNE_AUTH_CONFIG'] = 
 array(

OpenPNE/trunk/webapp/init.inc

@@ -71 +71 @@
 
 // 外部認証の場合は招待・新規登録はできない
-if (defined('IS_SLAVEPNE') && IS_SLAVEPNE) {
+if (OPENPNE_AUTH_MODE == 'slavepne') {
     // 招待用URLがPC・携帯どちらも空の場合は招待不可
     if (!(defined('SLAVEPNE_SYOUTAI_URL_PC') && SLAVEPNE_SYOUTAI_URL_PC) &&

OpenPNE/trunk/webapp/lib/OpenPNE/Auth.php

@@ -29 +29 @@
     var $is_ktai = false;
     var $is_encrypt_username = false;
+    var $is_lowercase_username = false;
 
     var $expire = 0;
@@ -44 +45 @@
      * + is_ktai: 携帯用認証かどうか
      * + is_encrypt_username: usernameをt_encryptで暗号化するかどうか
+     * + is_lowercase_username: usernameを強制的に小文字にするかどうか
      *
      * @param array $config
@@ -61 +63 @@
         if (isset($config['is_encrypt_username'])) {
             $this->is_encrypt_username = $config['is_encrypt_username'];
+        }
+        if (isset($config['is_lowercase_username'])) {
+            $this->is_lowercase_username = $config['is_lowercase_username'];
         }
 
@@ -113 +118 @@
     {
         $this->auth =& $this->factory(true);
+
+        if ($this->is_lowercase_username) {
+            $this->auth->post[$this->auth->_postUsername] =
+                strtolower($this->auth->post[$this->auth->_postUsername]);
+        }
+
         if ($this->is_encrypt_username) {
             $this->auth->post[$this->auth->_postUsername] =

OpenPNE/trunk/webapp/lib/OpenPNE/Config.php

@@ -185 +185 @@
             'OPENPNE_SESSION_CHECK_URL' => false,
             'OPENPNE_DASHBOARD_URL' => 'http://ad.pne.jp/dashboard/',
-            'IS_SLAVEPNE' => false,
+            'OPENPNE_AUTH_MODE' => 'email',
             'IS_SLAVEPNE_EMAIL_REGIST' => true,
             'SLAVEPNE_SYOUTAI_URL_PC' => '',

OpenPNE/trunk/webapp/lib/auth.inc

@@ -40 +40 @@
 $GLOBALS['AUTH'] = $auth;
 
-if (IS_SLAVEPNE && (empty($_SESSION['regist_step']) || !$_SESSION['regist_step'])) {
+if (OPENPNE_AUTH_MODE != 'email' && (empty($_SESSION['regist_step']) || !$_SESSION['regist_step'])) {
     $check_param = db_member_check_param_inputed($u);
     $_SESSION['regist_step'] = ($check_param == 0);
@@ -53 +53 @@
     );
 
-    if (($check_param == 1) && !$prof_ext_page[$current_page]) {
+    if (OPENPNE_AUTH_MODE == 'slavepne' && ($check_param == 1) && !$prof_ext_page[$current_page]) {
         openpne_redirect('pc', 'page_h_regist_intro');
     }

OpenPNE/trunk/webapp/lib/db/etc.php

@@ -190 +190 @@
     $auth_config = get_auth_config($is_ktai);
     
-    if (IS_SLAVEPNE) {
+    if (OPENPNE_AUTH_MODE == 'slavepne' || OPENPNE_AUTH_MODE == 'pneid') {
         $username = db_member_username4c_member_id($c_member_id, $is_ktai);
     } else {

OpenPNE/trunk/webapp/lib/db/member.php

@@ -57 +57 @@
     }
     
-    if (IS_SLAVEPNE && $is_secure) {
+    if (OPENPNE_AUTH_MODE == 'slavepne' && $is_secure) {
         $c_member['username'] = db_member_username4c_member_id($c_member_id);
     }
@@ -1176 +1176 @@
     }
 
+    if (OPENPNE_AUTH_MODE == 'pneid') {
+        $data['login_id'] = $c_member_pre_secure['login_id'];
+    }
+
     return db_update('c_member_pre', $data, array('c_member_pre_id' => $c_member_pre_id));
 }
@@ -1791 +1795 @@
 function db_member_c_member_id4username($username, $is_ktai = false)
 {
-    if (!IS_SLAVEPNE) {
+    if (OPENPNE_AUTH_MODE != 'slavepne' && OPENPNE_AUTH_MODE != 'pneid') {
         $username = t_encrypt($username);
     }
@@ -1805 +1809 @@
 function db_member_c_member_id4username_encrypted($username, $is_ktai = false)
 {
-    if (IS_SLAVEPNE) {
+    if (OPENPNE_AUTH_MODE == 'slavepne' || OPENPNE_AUTH_MODE == 'pneid') {
         $sql = 'SELECT c_member_id FROM c_username WHERE username = ?';
         $params = array($username);
@@ -1824 +1828 @@
 function db_member_username4c_member_id($c_member_id, $is_ktai = false)
 {
-    if (IS_SLAVEPNE) {
+    if (OPENPNE_AUTH_MODE == 'slavepne' || OPENPNE_AUTH_MODE == 'pneid') {
         $sql = 'SELECT username FROM c_username WHERE c_member_id = ?';
         $params = array($c_member_id);

OpenPNE/trunk/webapp/lib/util/mail_send.php

@@ -210 +210 @@
         "password"   => $new_password,
     );
+    if (OPENPNE_AUTH_MODE == 'pneid') {
+        $params['login_id'] = db_member_username4c_member_id($c_member_id);
+    }
     return fetch_send_mail($pc_address, 'm_pc_password_query', $params);
 }
@@ -226 +229 @@
         'login_url' => $login_url,
     );
+    if (OPENPNE_AUTH_MODE == 'pneid') {
+        $params['login_id'] = db_member_username4c_member_id($c_member_id);
+    }
     return fetch_send_mail($ktai_address, 'm_ktai_password_query', $params);
 }

OpenPNE/trunk/webapp/lib/util/util.php

@@ -448 +448 @@
 function get_auth_config($is_ktai = false)
 {
-    if (IS_SLAVEPNE) {
+    if (OPENPNE_AUTH_MODE == 'slavepne') {
         $config = $GLOBALS['_OPENPNE_AUTH_CONFIG'];
+    } elseif (OPENPNE_AUTH_MODE == 'pneid') {
+        $config['storage'] = 'DB';
+        $config['is_lowercase_username'] = true;
+        $config['options'] = array(
+            'dsn'         => db_get_dsn(),
+            'auto_quote'  => false,
+            'table'       => 'c_member_secure AS cms INNER JOIN c_username AS cu USING (c_member_id)',
+            'db_fields'   => 'cms.hashed_password AS hashed_password, cu.username AS username',
+            'usernamecol' => 'username',
+            'passwordcol' => 'hashed_password',
+            'cryptType'   => 'md5',
+        );
     } else {
         $config['storage'] = 'DB';
@@ -492 +504 @@
 function check_action4pne_slave($is_ktai = false)
 {
-    if (IS_SLAVEPNE) {
+    if (OPENPNE_AUTH_MODE == 'slavepne') {
         if ($is_ktai) {
             openpne_redirect('ktai');
@@ -763 +775 @@
     }
 
+    // ログインIDを登録
+    if (OPENPNE_AUTH_MODE == 'pneid') {
+        $login_id = strtolower($c_member['login_id']);
+        db_member_insert_username($u, $login_id);       
+    }
+
     return $u;
 }

OpenPNE/trunk/webapp/modules/admin/do/import_c_member.php

@@ -15 +15 @@
     function execute($requests)
     {
-        //件数制限つき
-        $limit = 1000;
+        $member_file = $_FILES['member_file'];
 
-        //項目数
-        $column_num = 3;
+        $limit = 1000;  // 件数制限
 
-        $errors = array();
-
-        $member_file = $_FILES['member_file'];
-        $member_data = file($member_file['tmp_name']);
-
-        // --- エラーチェック1 ここから
-
-        $name_data = explode(".", $member_file['name']);
-        if ($name_data[count($name_data)-1] != 'csv') {
-            $this->handleError("データタイプはcsv形式にして下さい");
+        // 項目数
+        if (OPENPNE_AUTH_MODE == 'pneid') {
+            $column_num = 4;
+        } else {
+            $column_num = 3;
         }
 
-        if (count($member_data) > $limit) {
-            $this->handleError("一度に登録できるのは{$limit}件までです");
+        if (empty($member_file) || $member_file['error'] === UPLOAD_ERR_NO_FILE) {
+            $this->handleError('ファイルを指定してください');
         }
-        // --- エラーチェック1 ここまで
 
+        $filename_parts = explode('.', $member_file['name']);
+        if (array_pop($filename_parts) != 'csv') {
+            $this->handleError('拡張子は.csvにしてください');
+        }
+
+        $member_data = file($member_file['tmp_name']);
+        $member_data_count = count($member_data);
+        if ($member_data_count > $limit) {
+            $this->handleError("ファイルの行数は{$limit}行以内にしてください");
+        }
 
         foreach ($member_data as $key => $value) {
-            $data = explode(",", $value);
+            $columns = explode(',', trim($value));
+            $lnum = $key + 1;  // 行番号
 
-            //改行コードを除去
-            $data = str_replace("\r\n", "\n", $data);
-            $data = str_replace("\r", "\n", $data);
-            $data = str_replace("\n", "", $data);
-
-            $nickname     = $data[0];
-            $mail_address = $data[1];
-            $password     = $data[2];
-
-            // --- エラーチェック2 ここから
-
-            //入力項目が多い
-            if (count($data) > $column_num) {
-                $this->handleError(($key+1)."行目：項目数が多すぎます");
+            if (OPENPNE_AUTH_MODE == 'pneid') {
+                list($login_id, $nickname, $mail_address, $password) = $columns;
+            } else {
+                $login_id = null;
+                list($nickname, $mail_address, $password) = $columns;
             }
 
-            //空の項目が存在する
-            if (!$data[0] || !$data[1] || !$data[2]) {
-                $this->handleError(($key+1)."行目：空の項目が存在します");
+            if (count($columns) != $column_num) {
+                $this->handleError("{$lnum}行目：項目は{$column_num}つにしてください");
             }
 
-
-
-            //ニックネームの形式チェック
-            if (strlen($nickname) > 40) {
-                $this->handleError("ニックネームは40文字以内で入力してください");
+            if ($nickname === '' || $mail_address === '' || $password === '' || $login_id === '') {
+                $this->handleError("{$lnum}行目：空の項目が存在します");
             }
 
-            //メールアドレスの形式チェック
-
-            // メールアドレスとして正しくない
-            if (!db_common_is_mailaddress($mail_address)) {
-                $this->handleError(($key+1)."行目：メールアドレス [".$mail_address."] はメールアドレスとして正しくありません");
-            }
-            //対象のメールアドレスが、登録されてるか否か
-            if (db_member_is_sns_join4mail_address($mail_address)) {
-                $this->handleError(($key+1)."行目：そのメールアドレス [".$mail_address."] は既に登録済みです");
+            if (strlen($nickname) > 40) {
+                $this->handleError("{$lnum}行目：ニックネームは40文字以内で入力してください");
             }
 
-            //対象のメールアドレスが、ドメイン制限に合致しているかどうか
-            if (!db_member_is_limit_domain4mail_address($mail_address)) {
-                $this->handleError(($key+1)."行目：そのメールアドレス [".$mail_address."] では登録できません");
+            if (!db_common_is_mailaddress($mail_address)) {
+                $this->handleError("{$lnum}行目：メールアドレス [{$mail_address}] はメールアドレスとして正しくありません");
             }
 
-            //パスワードの形式チェック
-            if (!ctype_alnum($password) ||
-                strlen($password) < 6 ||
-                strlen($password) > 12) {
-                $this->handleError(($key+1)."行目：パスワードは6～12文字の半角英数で入力してください");
+            if (db_member_is_sns_join4mail_address($mail_address)) {
+                $this->handleError("{$lnum}行目：メールアドレス [{$mail_address}] は既に登録済みです");
             }
 
-            // --- エラーチェック2 ここまで
+            // ドメイン制限
+            if (!db_member_is_limit_domain4mail_address($mail_address)) {
+                $this->handleError("{$lnum}行目：メールアドレス [{$mail_address}] は登録できません");
+            }
 
-            // --- データのインポート ここから
+            if (!preg_match('/^[a-z0-9]{6,12}$/i', $password)) {
+                $this->handleError("{$lnum}行目：パスワードは6～12文字の半角英数で入力してください");
+            }
 
-            // 携帯メールアドレスか否か
+            // ログインIDを使用する場合
+            if (OPENPNE_AUTH_MODE == 'pneid') {
+                if (!preg_match('/^[a-z0-9][a-z0-9\-_]+[a-z0-9]$/i', $login_id)) {
+                    $this->handleError("{$lnum}行目：ログインIDは4～30文字の半角英数で入力してください");
+                }
+
+                if (db_member_c_member_id4username($login_id)) {
+                    $this->handleError("{$lnum}行目：ログインID［{$login_id}］は既に登録済みです");
+                }
+                
+            }
+
+            // メールアドレスが携帯メールアドレスのドメインの場合は、
+            // 携帯メールアドレスとして登録する
             if (is_ktai_mail_address($mail_address)) {
                 $ktai_address = $mail_address;
@@ -106 +103 @@
             }
 
-            $c_member['nickname'] = $nickname;
-            $c_member['birth_year'] = 0;
-            $c_member['birth_month'] = 0;
-            $c_member['birth_day'] = 0;
-            $c_member['c_password_query_id'] = 0;
-            $c_member['c_member_id_invite'] = 1;
-            $c_member['is_receive_mail'] = 1;
-            $c_member['is_receive_ktai_mail'] = 1;
-            $c_member['is_receive_daily_news'] = 1;
-            $c_member['public_flag_birth_year'] = 'public';
+            $c_member = array(
+                'nickname' => $nickname,
+                'birth_year' => 0,
+                'birth_month' => 0,
+                'birth_day' => 0,
+                'c_password_query_id' => 0,
+                'c_member_id_invite' => 1,
+                'is_receive_mail' => 1,
+                'is_receive_ktai_mail' => 1,
+                'is_receive_daily_news' => 1,
+                'public_flag_birth_year' => 'public',
+            );
+
+            if (OPENPNE_AUTH_MODE == 'pneid') {
+                $c_member['login_id'] = $login_id;
+            }
+
             $c_member_secure = array(
                 'password' => $password,
@@ -124 +128 @@
 
             $u = util_regist_c_member($c_member, $c_member_secure);
-            // --- データのインポート ここまで
-
         }
 
-        admin_client_redirect('import_c_member', count($member_data)."　件のインポートが完了しました");
+        admin_client_redirect('import_c_member', "{$member_data_count}件のインポートが完了しました");
     }
 }

OpenPNE/trunk/webapp/modules/admin/templates/import_c_member.tpl

@@ -26 +26 @@
 文字コード：UTF-8<br>
 ファイル形式：csv</p>
-<p>項目の順序「ニックネーム」「登録メールアドレス」「パスワード」</p>
+<p>項目の順序({if $smarty.const.OPENPNE_AUTH_MODE == 'pneid'})「ログインID」({/if})「ニックネーム」「登録メールアドレス」「パスワード」</p>
 <p><input type="file" name="member_file" /></p>
 <p class="textBtn"><input type="submit" class="submit" name="member_file_submit" value="登録" /></p>

OpenPNE/trunk/webapp/modules/ktai/auth.inc

@@ -36 +36 @@
 
 
-if (IS_SLAVEPNE && (empty($_SESSION['regist_step']) || !$_SESSION['regist_step'])) {
+if (OPENPNE_AUTH_MODE != 'email' && (empty($_SESSION['regist_step']) || !$_SESSION['regist_step'])) {
     $check_param = db_member_check_param_inputed($u, true);
     $_SESSION['regist_step'] = ($check_param == 0);
@@ -48 +48 @@
     );
     
-    if (($check_param == 1) && !$prof_ext_page[$current_page]) {
+    if (OPENPNE_AUTH_MODE == 'slavepne' && ($check_param == 1) && !$prof_ext_page[$current_page]) {
         openpne_redirect('ktai', 'page_h_regist_pre');
     }

OpenPNE/trunk/webapp/modules/ktai/do/h_invite_insert_c_invite.php

@@ -51 +51 @@
             //>
 
-            if (!IS_SLAVEPNE) {
+            if (OPENPNE_AUTH_MODE != 'slavepne') {
                 // c_member_ktai_pre に追加
                 if (db_member_c_member_ktai_pre4ktai_address($mail)) {
@@ -70 +70 @@
             //>
 
-            if (!IS_SLAVEPNE) {
+            if (OPENPNE_AUTH_MODE != 'slavepne') {
                 // c_member_pre に追加
                 if (db_member_c_member_pre4pc_address($mail)) {

OpenPNE/trunk/webapp/modules/ktai/do/o_easy_login.php

@@ -54 +54 @@
         $auth->auth =& $auth->factory(true);
         $username = db_member_username4c_member_id($c_member_id, true);
-        if (!IS_SLAVEPNE) {
+        if (OPENPNE_AUTH_MODE != 'slavepne') {
            $username = t_encrypt($username);
         }

OpenPNE/trunk/webapp/modules/ktai/do/o_insert_c_member.php

@@ -17 +17 @@
     {
         //<PCKTAI
-        if (IS_SLAVEPNE || !((OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_KTAI) >> 1)) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' || !((OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_KTAI) >> 1)) {
             openpne_redirect('ktai', 'page_o_login', array('msg' => 42));
         }
@@ -93 +93 @@
             if (db_member_easy_access_id_is_blacklist(md5($easy_access_id))) {
                 ktai_display_error('新規登録を完了できませんでした。');
+            }
+        }
+
+        if (OPENPNE_AUTH_MODE == 'pneid') {
+            // ログインIDの重複チェック
+            if (db_member_c_member_id4username($prof['login_id'])) {
+                $errors[] = 'このﾛｸﾞｲﾝIDはすでに登録されています';
             }
         }
@@ -151 +158 @@
     function _getValidateRules()
     {
-        return array(
+        $rules = array(
             'nickname' => array(
                 'type' => 'string',
@@ -202 +209 @@
             ),
         );
+
+        if (OPENPNE_AUTH_MODE == 'pneid') {
+            $rules['login_id'] = array(
+                'type' => 'regexp',
+                'regexp' => '/^[a-zA-Z0-9][a-zA-Z0-9\-_]+[a-zA-Z0-9]$/i',
+                'required' => '1',
+                'caption' => 'ログインID',
+                'type_error' => 'ﾛｸﾞｲﾝIDは4-30文字の半角英数字、記号(ｱﾝﾀﾞｰﾊﾞｰ「_」、ﾊｲﾌﾝ「-」)で入力してください',
+                'min' => '4',
+                'max' => '30',
+            );
+        }
+
+        return $rules;
     }
 

OpenPNE/trunk/webapp/modules/ktai/do/o_login.php

@@ -56 +56 @@
         $c_member_id = db_member_c_member_id4username_encrypted($auth->getUsername(), true);
         if (!$c_member_id) {
-            if (IS_SLAVEPNE) {
+            if (OPENPNE_AUTH_MODE == 'slavepne') {
                 db_member_create_member($_POST['username']);
             } else {

OpenPNE/trunk/webapp/modules/ktai/page/o_regist_end.php

@@ -15 +15 @@
     {
         //<PCKTAI
-        if (IS_SLAVEPNE || !((OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_KTAI) >> 1)) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' || !((OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_KTAI) >> 1)) {
             openpne_redirect('ktai', 'page_o_login');
         }

OpenPNE/trunk/webapp/modules/ktai/page/o_regist_input.php

@@ -15 +15 @@
     {
         //<PCKTAI
-        if (IS_SLAVEPNE || !((OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_KTAI) >> 1)) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' || !((OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_KTAI) >> 1)) {
             openpne_redirect('ktai', 'page_o_login', array('msg' => 42));
         }

OpenPNE/trunk/webapp/modules/ktai/page/o_regist_pre.php

@@ -15 +15 @@
     {
         //<PCKTAI
-        if (IS_SLAVEPNE || !((OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_KTAI) >> 1)) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' || !((OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_KTAI) >> 1)) {
             openpne_redirect('ktai', 'page_o_login', array('msg' => 42));
         }

OpenPNE/trunk/webapp/modules/ktai/templates/h_config_mail.tpl

@@ -19 +19 @@
 <hr color="#({$ktai_color_config.border_01})">
 届いたﾒｰﾙに記載してあるURLにｱｸｾｽして、ﾊﾟｽﾜｰﾄﾞを入力すると変更が完了します。
-({if $smarty.const.IS_SLAVEPNE && !$smarty.const.IS_SLAVEPNE_EMAIL_REGIST})
+({if $smarty.const.OPENPNE_AUTH_MODE == 'slavepne' && !$smarty.const.IS_SLAVEPNE_EMAIL_REGIST})
 <br>初期設定ではメールアドレスが登録されておりません。新着情報などご希望の際はこちらからご登録ください。 
 ({/if})

OpenPNE/trunk/webapp/modules/ktai/templates/o_login.tpl

@@ -56 +56 @@
 <input type="hidden" name="username" value="({$ktai_address})">
 ({else})
-({if !$smarty.const.IS_SLAVEPNE})
+({if $smarty.const.OPENPNE_AUTH_MODE == 'slavepne'})
+<font color="#({$ktai_color_config.bg_02})">★</font>ﾒﾝﾊﾞｰID<br>
+({elseif $smarty.const.OPENPNE_AUTH_MODE == 'pneid'})
+<font color="#({$ktai_color_config.bg_02})">★</font>ﾛｸﾞｲﾝID<br>
+({else})
 <font color="#({$ktai_color_config.bg_02})">★</font>携帯ﾒｰﾙｱﾄﾞﾚｽ<br>
-({else})
-<font color="#({$ktai_color_config.bg_02})">★</font>ﾒﾝﾊﾞｰID<br>
 ({/if})
 <textarea name="username" rows="1" istyle="3" mode="alphabet"></textarea><br>
@@ -72 +74 @@
 <a href="({t_url m=ktai a=page_o_login})">&gt;&gt;携帯ﾒｰﾙｱﾄﾞﾚｽを入力</a><br>
 ({/if})
-({if !$smarty.const.IS_SLAVEPNE})
+({if $smarty.const.OPENPNE_AUTH_MODE != 'slavepne'})
 <a href="({t_url m=ktai a=page_o_password_query})">&gt;&gt;ﾊﾟｽﾜｰﾄﾞを忘れた方</a><br>
 ({/if})
 </td></tr></table>
 <br>
-({if $smarty.const.IS_SLAVEPNE})
+({if $smarty.const.OPENPNE_AUTH_MODE == 'slavepne'})
 ({if $smarty.const.SLAVEPNE_SYOUTAI_URL_KTAI})
 <hr color="#({$ktai_color_config.border_01})">

OpenPNE/trunk/webapp/modules/ktai/templates/o_regist_input.tpl

@@ -12 +12 @@
 ({if $aff_id})
 <input type="hidden" name="aff_id" value="({$aff_id})">
+({/if})
+
+({if $smarty.const.OPENPNE_AUTH_MODE == 'pneid'})
+<font color="#({$ktai_color_config.font_06})">ﾛｸﾞｲﾝID：</font><font color="#({$ktai_color_config.font_09})">*</font><br>
+<input type="text" name="login_id"><br>
+<font color="#({$ktai_color_config.font_09})">
+※4-30文字の半角英数字、記号(ｱﾝﾀﾞｰﾊﾞｰ｢_｣、ﾊｲﾌﾝ｢-｣)で入力してください<br>
+※最初と最後の文字は半角英数字で入力してください<br>
+※ｱﾙﾌｧﾍﾞｯﾄの大文字と小文字は区別されません<br>
+</font>
+<br>
 ({/if})
 

OpenPNE/trunk/webapp/modules/pc/do/h_invite_insert_c_invite.php

@@ -64 +64 @@
             //>
 
-            if (!IS_SLAVEPNE) {
+            if (OPENPNE_AUTH_MODE != 'slavepne') {
                 // c_member_ktai_pre に追加
                 if (db_member_c_member_ktai_pre4ktai_address($mail)) {
@@ -84 +84 @@
             //>
 
-            if (!IS_SLAVEPNE) {
+            if (OPENPNE_AUTH_MODE != 'slavepne') {
                 // c_member_pre に追加
                 if (db_member_c_member_pre4pc_address($mail)) {

OpenPNE/trunk/webapp/modules/pc/do/o_login.php

@@ -48 +48 @@
         $c_member_id = db_member_c_member_id4username_encrypted($auth->getUsername(), false);
         if (!$c_member_id) {
-            if (IS_SLAVEPNE) {
+            if (OPENPNE_AUTH_MODE == 'slavepne') {
                 db_member_create_member($_POST['username']);
             } else {

OpenPNE/trunk/webapp/modules/pc/do/o_public_invite.php

@@ -19 +19 @@
         }
         //<PCKTAI
-        if (IS_SLAVEPNE || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
             client_redirect_login();
         }

OpenPNE/trunk/webapp/modules/pc/do/o_regist_ktai_address.php

@@ -15 +15 @@
     {
         //<PCKTAI
-        if (IS_SLAVEPNE || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
             client_redirect_login();
         }

OpenPNE/trunk/webapp/modules/pc/do/o_regist_prof.php

@@ -15 +15 @@
     {
         //<PCKTAI
-        if (IS_SLAVEPNE || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
             client_redirect_login();
         }
@@ -95 +95 @@
         if (t_isFutureDate($prof['birth_day'], $prof['birth_month'], $prof['birth_year'])) {
             $errors[] = '生年月日を未来に設定することはできません';
+        }
+
+        if (OPENPNE_AUTH_MODE == 'pneid') {
+            // ログインIDの重複チェック
+            if (db_member_c_member_id4username($prof['login_id'])) {
+                $errors[] = 'このログインIDはすでに登録されています';
+            }
         }
 
@@ -174 +181 @@
                 );
 
+                if (OPENPNE_AUTH_MODE == 'pneid') {
+                    $c_member_pre_secure['login_id'] = $prof['login_id'];
+                }
+
                 db_member_update_c_member_pre_secure($pre['c_member_pre_id'], $c_member_pre_secure);
 
@@ -183 +194 @@
     function _getValidateRules()
     {
-        return array(
+        $rules = array(
             'nickname' => array(
                 'type' => 'string',
@@ -234 +245 @@
             ),
         );
+
+        if (OPENPNE_AUTH_MODE == 'pneid') {
+            $rules['login_id'] = array(
+                'type' => 'regexp',
+                'regexp' => '/^[a-zA-Z0-9][a-zA-Z0-9\-_]+[a-zA-Z0-9]$/i',
+                'required' => '1',
+                'caption' => 'ログインID',
+                'type_error' => 'ログインIDは4～30文字の半角英数字、記号（アンダーバー「_」、ハイフン「-」）で入力してください',
+                'min' => '4',
+                'max' => '30',
+            );
+        }
+
+        return $rules;
     }
 

OpenPNE/trunk/webapp/modules/pc/page/h_invite.php

@@ -18 +18 @@
         $this->set('inc_navi', fetch_inc_navi('h'));
 
-        if (IS_SLAVEPNE) {
+        if (OPENPNE_AUTH_MODE == 'slavepne') {
             $inviting_member = array();
             $k_inviting_member = array();

OpenPNE/trunk/webapp/modules/pc/page/o_public_invite.php

@@ -19 +19 @@
         }
         //<PCKTAI
-        if (IS_SLAVEPNE || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
             client_redirect_login();
         }

OpenPNE/trunk/webapp/modules/pc/page/o_public_invite_end.php

@@ -19 +19 @@
         }
         //<PCKTAI
-        if (IS_SLAVEPNE || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
             client_redirect_login();
         }

OpenPNE/trunk/webapp/modules/pc/page/o_regist_end.php

@@ -15 +15 @@
     {
         //<PCKTAI
-        if (IS_SLAVEPNE || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
             client_redirect_login();
         }

OpenPNE/trunk/webapp/modules/pc/page/o_regist_intro.php

@@ -15 +15 @@
     {
         //<PCKTAI
-        if (IS_SLAVEPNE || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
             client_redirect_login();
         }

OpenPNE/trunk/webapp/modules/pc/page/o_regist_ktai_address.php

@@ -15 +15 @@
     {
         //<PCKTAI
-        if (IS_SLAVEPNE || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
             client_redirect_login();
         }

OpenPNE/trunk/webapp/modules/pc/page/o_regist_ktai_address_confirm.php

@@ -15 +15 @@
     {
         //<PCKTAI
-        if (IS_SLAVEPNE || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
             client_redirect_login();
         }

OpenPNE/trunk/webapp/modules/pc/page/o_regist_ktai_address_end.php

@@ -15 +15 @@
     {
         //<PCKTAI
-        if (IS_SLAVEPNE || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
             client_redirect_login();
         }

OpenPNE/trunk/webapp/modules/pc/page/o_regist_prof.php

@@ -15 +15 @@
     {
         //<PCKTAI
-        if (IS_SLAVEPNE || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
             client_redirect_login();
         }

OpenPNE/trunk/webapp/modules/pc/page/o_regist_prof_confirm.php

@@ -15 +15 @@
     {
         //<PCKTAI
-        if (IS_SLAVEPNE || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' || !(OPENPNE_REGIST_FROM & OPENPNE_REGIST_FROM_PC)) {
             client_redirect_login();
         }

OpenPNE/trunk/webapp/modules/pc/templates/h_config.tpl

@@ -62 +62 @@
 <input type="text" class="text" name="pc_address" value="" size="40"><br>
 <span class="caution">※メールアドレスは公開されません。</span>
-({if $smarty.const.IS_SLAVEPNE && !$smarty.const.IS_SLAVEPNE_EMAIL_REGIST})
+({if $smarty.const.OPENPNE_AUTH_MODE == 'slavepne' && !$smarty.const.IS_SLAVEPNE_EMAIL_REGIST})
 <br><span class="caution">※初期設定ではメールアドレスが登録されておりません。新着情報などご希望の際はこちらからご登録ください。 </span>
 ({/if})
@@ -120 +120 @@
 </form>
 ({*********})
-({if !$smarty.const.IS_SLAVEPNE})
+({if $smarty.const.OPENPNE_AUTH_MODE != 'slavepne'})
 ({t_form m=pc a=do_h_config_2})
 <input type="hidden" name="sessid" value="({$PHPSESSID})">

OpenPNE/trunk/webapp/modules/pc/templates/o_login.tpl

@@ -35 +35 @@
 <div class="msg lh_130">
 <input type="checkbox" tabindex="3" name="is_save" id="is_save" value="1" class="no_bg"><label for="is_save">次回から自動的にログイン</label><br>
-({if !$smarty.const.IS_SLAVEPNE})
+({if $smarty.const.OPENPNE_AUTH_MODE != 'slavepne'})
 <span class="password_query"><a href="({t_url m=pc a=page_o_password_query})">&gt;パスワードを忘れた方はこちらへ</a></span>
 ({/if})

OpenPNE/trunk/webapp/modules/pc/templates/o_regist_prof.tpl

@@ -41 +41 @@
 <td style="width:636px;height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" alt="dot" class="dot"></td>
 </tr>
+({*********})
+({if $smarty.const.OPENPNE_AUTH_MODE == 'pneid'})
+<tr>
+<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" alt="dot" class="dot"></td>
+<td style="width:150px;" class="bg_05" align="left" valign="middle">
+
+<div class="padding_s">
+
+ログインID <span class="caution">※</span>
+
+</div>
+
+</td>
+<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" alt="dot" class="dot"></td>
+<td style="width:483px;" class="bg_02" align="left" valign="middle">
+
+<div class="padding_s">
+
+<input class="text" name="login_id" type="text" value="({$profs.login_id})" size="30"><br>
+<span class="caution">※4～30文字の半角英数字、記号（アンダーバー「_」、ハイフン「-」）で入力してください<br>
+※最初と最後の文字は半角英数字で入力してください<br>
+※アルファベットの大文字と小文字は区別されません<br>
+</span>
+
+</div>
+
+</td>
+<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" alt="dot" class="dot"></td>
+</tr>
+({*********})
+<tr>
+<td style="height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" alt="dot" class="dot"></td>
+</tr>
+({/if})
 ({*********})
 ({capture name="nick"})

OpenPNE/trunk/webapp/modules/pc/templates/o_regist_prof_confirm.tpl

@@ -38 +38 @@
 <td style="width:566px;height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" alt="dot" class="dot"></td>
 </tr>
+({*********})
+({if $smarty.const.OPENPNE_AUTH_MODE == 'pneid'})
+<tr>
+<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" alt="dot" class="dot"></td>
+<td style="width:150px;" class="bg_05" align="left" valign="middle">
+
+<div class="padding_s">
+
+ログインID <span class="caution">※</span>
+
+</div>
+
+</td>
+<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" alt="dot" class="dot"></td>
+<td style="width:413px;" class="bg_02" align="left" valign="middle">
+
+<div class="padding_s">
+
+({$prof.login_id})
+
+</div>
+
+</td>
+<td style="width:1px;" class="bg_01" align="center"><img src="./skin/dummy.gif" alt="dot" class="dot"></td>
+</tr>
+({*********})
+<tr>
+<td style="height:1px;" class="bg_01" colspan="5"><img src="./skin/dummy.gif" alt="dot" class="dot"></td>
+</tr>
+({/if})
 ({*********})
 ({capture name="nick"})

OpenPNE/trunk/webapp/modules/setup/do/setup.php

@@ -16 +16 @@
     {
         $errors = array();
-        if (!IS_SLAVEPNE && $requests['password'] != $requests['password2']) {
+        if (OPENPNE_AUTH_MODE != 'slavepne' && $requests['password'] != $requests['password2']) {
             $errors[] = 'パスワードが一致していません';
         }
@@ -22 +22 @@
             $errors[] = '管理用パスワードが一致していません';
         }
-        if (IS_SLAVEPNE) {
+        if (OPENPNE_AUTH_MODE == 'slavepne') {
             $auth_config = get_auth_config(false);
             $storage = Auth::_factory($auth_config['storage'],$auth_config['options']);
@@ -51 +51 @@
         );
         
-        if (IS_SLAVEPNE && !IS_SLAVEPNE_EMAIL_REGIST) {
+        if (OPENPNE_AUTH_MODE == 'slavepne' && !IS_SLAVEPNE_EMAIL_REGIST) {
             $data['ktai_address'] = t_encrypt('1@ktai.example.com');
         }
@@ -65 +65 @@
         db_insert('c_admin_user', $data);
         
-        if (IS_SLAVEPNE) {
+        if (OPENPNE_AUTH_MODE == 'slavepne') {
             db_member_insert_username(1, $requests['username']);
         }

OpenPNE/trunk/webapp/modules/setup/templates/setup.tpl

@@ -42 +42 @@
 <td><input type="text" name="pc_address" value="({$requests.pc_address})" size="30"></td>
 </tr>
-({if $smarty.const.IS_SLAVEPNE})
+({if $smarty.const.OPENPNE_AUTH_MODE == 'slavepne'})
 <tr>
 <th>ユーザID</th>
@@ -52 +52 @@
 <td><input type="password" name="password" value="" size="15"></td>
 </tr>
-({if !$smarty.const.IS_SLAVEPNE})
+({if $smarty.const.OPENPNE_AUTH_MODE != 'slavepne'})
 <tr>
 <th>パスワード(確認)</th>

OpenPNE/trunk/webapp/templates/mail/m_ktai_password_query.tpl

@@ -5 +5 @@
 パスワードを再発行いたしました。
 
+({if $login_id})ログインID：({$login_id})
+({/if})
 パスワード：({$password})
 

OpenPNE/trunk/webapp/templates/mail/m_ktai_regist_invite.tpl

@@ -5 +5 @@
 
 下記のURLから、会員登録をおこなうと({$SNS_NAME})に参加できます。
-({if $smarty.const.IS_SLAVEPNE})
+({if $smarty.const.OPENPNE_AUTH_MODE == 'slavepne'})
 ({if $smarty.const.SLAVEPNE_SYOUTAI_URL_KTAI})
 ({$smarty.const.SLAVEPNE_SYOUTAI_URL_KTAI})

OpenPNE/trunk/webapp/templates/mail/m_pc_password_query.tpl

@@ -6 +6 @@
 パスワードを再発行いたしました。
 
+({if $login_id})ログインID：({$login_id})
+({/if})
 メールアドレス：({$pc_address})
 パスワード：({$password})

OpenPNE/trunk/webapp/templates/mail/m_pc_syoutai_mail.tpl

@@ -19 +19 @@
 
 ■ ({$SNS_NAME}) に参加する
-({if $smarty.const.IS_SLAVEPNE})
+({if $smarty.const.OPENPNE_AUTH_MODE == 'slavepne'})
 ({if $smarty.const.SLAVEPNE_SYOUTAI_URL_PC})
 ({$smarty.const.SLAVEPNE_SYOUTAI_URL_PC})