Changeset 957

Timestamp:

Nov 30, 2006, 3:49:36 PM (14 years ago)

Author:

maruyama

Message:

管理画面にユーザID出力

Location:

OpenPNE/branches/maruyama/prj_ext_auth/webapp

Files:

• lib/auth.inc (modified) (2 diffs)
• lib/db/member.php (modified) (5 diffs)
• modules/admin/templates/list_c_member.tpl (modified) (2 diffs)
• modules/ktai/do/o_login.php (modified) (1 diff)
• modules/pc/do/h_regist_prof.php (added)
• modules/pc/do/o_login.php (modified) (1 diff)
• modules/pc/do/o_regist_mail.php (modified) (1 diff)
• modules/pc/page/h_regist_prof.php (added)
• modules/pc/templates/h_regist_prof.tpl (added)
• modules/pc/validate/do/h_regist_prof.ini (added)

OpenPNE/branches/maruyama/prj_ext_auth/webapp/lib/auth.inc

@@ -28 +28 @@
 $GLOBALS['AUTH'] = $auth;
 
+/*
+//プロフィールが未登録の場合はリダイレクト
+$prof_ext_page=array(
+"do_h_regist_prof"=>true,
+"page_h_regist_prof"=>true,
+"do_inc_page_header_logout"=>true,
+);
+
+$param_check = db_member_check_param_inputed($u);
+
+if (($param_check==1)&&!$prof_ext_page[$_REQUEST['a']]){
+    openpne_redirect('pc', 'page_h_regist_prof');
+}
+*/
+
 //メールアドレスが未登録の場合はリダイレクト
-$c_member_secure = db_member_c_member_secure4c_member_id($u);
 $mail_ext_page=array(
 "do_h_regist_address"=>true,
@@ -36 +50 @@
 );
 
-if (($c_member_secure['pc_address']=="")&&!$mail_ext_page[$_REQUEST['a']]){
+if (($param_check==2)&&!$mail_ext_page[$_REQUEST['a']]){
     openpne_redirect('pc', 'page_h_regist_address');
 }

OpenPNE/branches/maruyama/prj_ext_auth/webapp/lib/db/member.php

@@ -39 +39 @@
             break;
         }
+    }
+    
+    if ($is_secure) {
+        $c_member['username'] = db_member_username4c_member_id($c_member_id);
     }
 
@@ -984 +988 @@
 }
 
+function db_member_regist_c_member_pc_address4c_member_id($c_member_id, $pc_address)
+{
+    $data = array(
+    'pc_address' => t_encrypt($pc_address),
+    'regist_address' => t_encrypt($pc_address),
+    );
+    $where = array('c_member_id' => intval($c_member_id));
+    return db_update('c_member_secure', $data, $where);
+}
+
 //(ktai_address)
 
@@ -1085 +1099 @@
 }
 
+function db_member_regist_mail($sid, $password)
+{
+    if (!$c_pc_address_pre = do_common_c_pc_address_pre4sid($sid)) {
+        return false;
+    }
+
+    $c_member_id = $c_pc_address_pre['c_member_id'];
+    $pc_address = $c_pc_address_pre['pc_address'];
+
+    if (!db_common_authenticate_password($c_member_id, $password)) {
+        return false;
+    }
+
+    db_member_regist_c_member_pc_address4c_member_id($c_member_id, $pc_address);
+    db_member_delete_c_pc_address_pre4sid($sid);
+    return true;
+}
+
 //--- c_ktai_address_pre
 
@@ -1370 +1402 @@
  * ログインしたユーザのメンバー情報が存在しない場合自動で生成
  */
-function auto_create_member($username){
+function db_member_create_member($username){
         $data = array(
         'nickname'    => "NO NAME",
@@ -1403 +1435 @@
 }
 
+/**
+ * プロフィールに必須項目が入力されているかを返す。
+ * 0:入力済み
+ * 1:プロフィール未入力
+ * 2:メールアドレス未登録
+ */
+function db_member_check_param_inputed($c_member_id){
+    $c_member = db_member_c_member4c_member_id($c_member_id);
+    /*
+    if (($c_member['nickname']=="")
+    ||($c_member['birth_year']=="")
+    ||($c_member['birth_month']=="")
+    ||($c_member['birth_day']=="")
+    ||($c_member['c_password_query_id']=="")
+    ||($c_member['hashed_password_query_answer']=="")
+    ) {
+        return 1;
+    }
+    */
+    
+    if ($c_member['secure']['pc_address']=="") {
+        return 2;
+    }
+    
+    return 0;
+}
+
 ?>

OpenPNE/branches/maruyama/prj_ext_auth/webapp/modules/admin/templates/list_c_member.tpl

@@ -110 +110 @@
 ({/foreach})
 <th>ID</th>
+<th>ユーザID</th>
 <th>PCアドレス</th>
 <th>携帯アドレス</th>
@@ -207 +208 @@
 ({/foreach})
 <td class="idnumber">({$item.c_member_id})</td>
+<td>({if $item.secure.pc_address})({$item.username|t_truncate:"30"|escape:"hexentity"})({else})&nbsp;({/if})</td>
 <td>({if $item.secure.pc_address})<a href="mailto:({$item.secure.pc_address|escape:"hexentity"})">({$item.secure.pc_address|t_truncate:"30"|escape:"hexentity"})</a>({else})&nbsp;({/if})</td>
 <td>({if $item.secure.ktai_address})<a href="mailto:({$item.secure.ktai_address})">({$item.secure.ktai_address|t_truncate:"30"})</a>({else})&nbsp;({/if})</td>

OpenPNE/branches/maruyama/prj_ext_auth/webapp/modules/ktai/do/o_login.php

@@ -57 +57 @@
             }
         }
-        if(!($c_member_id = $auth->getUsername(LOGIN_NAME_TYPE)))
-            auto_create_member($_POST['username']);
+        if(!($c_member_id = $auth->getUsername(LOGIN_NAME_TYPE))){
+            db_member_create_member($_POST['username']);
+        }
         
         $_SESSION['c_member_id'] = $c_member_id;

OpenPNE/branches/maruyama/prj_ext_auth/webapp/modules/pc/do/o_login.php

@@ -46 +46 @@
         }
         
-        if(!($u = $auth->getUsername(LOGIN_NAME_TYPE)))
-            auto_create_member($_POST['username']);
+        if(!($u = $auth->getUsername(LOGIN_NAME_TYPE))) {
+            db_member_create_member($_POST['username']);
+        }
 
         db_api_update_token($auth->uid());

OpenPNE/branches/maruyama/prj_ext_auth/webapp/modules/pc/do/o_regist_mail.php

@@ -23 +23 @@
         //パスワードが正しい
 
-        if (!do_change_mail($sid, $password)) {
+        if (!db_member_regist_mail($sid, $password)) {
             $msg = "パスワードが違います";
             $p = array('sid' => $sid, 'msg' => $msg);