Changeset 3809

Timestamp:

Sep 2, 2007, 8:47:12 PM (14 years ago)

Author:

maruyama

Message:

携帯ID必須機能Slaveに対応

Location:

OpenPNE/branches/work/maruyama/prj_ktai_id/webapp

Files:

• lib/auth.inc (modified) (2 diffs)
• modules/ktai/auth.inc (modified) (2 diffs)
• modules/pc/do/h_regist_prof.php (modified) (1 diff)

OpenPNE/branches/work/maruyama/prj_ktai_id/webapp/lib/auth.inc

@@ -63 +63 @@
 }
 
-if (OPENPNE_KTAI_ID_REQUIRED) {
-        if (!db_member_is_ktai_id_registed($u)) {
+if (OPENPNE_KTAI_ID_REQUIRED && (!IS_SLAVEPNE || $_SESSION['regist_step'])) {
+    if (!db_member_is_ktai_id_registed($u)) {
         $current_page = $GLOBALS['__Framework']['current_type']."_".$GLOBALS['__Framework']['current_action'];
         //携帯個体識別番号が未登録の場合はリダイレクト
@@ -77 +77 @@
                 openpne_redirect('pc', 'page_h_regist_ktai_id');
         }
-        }
+    }
 }
 

OpenPNE/branches/work/maruyama/prj_ktai_id/webapp/modules/ktai/auth.inc

@@ -60 +60 @@
     }
 }
+if (OPENPNE_KTAI_ID_REQUIRED && (!IS_SLAVEPNE || $_SESSION['regist_step'])) {
+    if (!db_member_is_ktai_id_registed($u)) {
+        $current_page = $GLOBALS['__Framework']['current_type']."_".$GLOBALS['__Framework']['current_action'];
+        //携帯個体識別番号が未登録の場合はリダイレクト
+        $ktai_id_ext_page=array(
+        'page_h_regist_ktai_id'=>true,
+        'do_h_regist_ktai_id'=>true,
+        );
+        
+        if (!$ktai_id_ext_page[$current_page]) {
+            openpne_redirect('ktai', 'page_h_regist_ktai_id');
+        }
+    }
+}
 
 function __logout($msg = 0, $c_member_id = 0)
@@ -81 +95 @@
 }
 
-if (OPENPNE_KTAI_ID_REQUIRED) {
-    if (!db_member_is_ktai_id_registed($u)) {
-        $current_page = $GLOBALS['__Framework']['current_type']."_".$GLOBALS['__Framework']['current_action'];
-        //携帯個体識別番号が未登録の場合はリダイレクト
-        $ktai_id_ext_page=array(
-        'page_h_regist_ktai_id'=>true,
-        'do_h_regist_ktai_id'=>true,
-        );
-        
-        if (!$ktai_id_ext_page[$current_page]) {
-            openpne_redirect('ktai', 'page_h_regist_ktai_id');
-        }
-    }
-}
-
 ?>

OpenPNE/branches/work/maruyama/prj_ktai_id/webapp/modules/pc/do/h_regist_prof.php

@@ -47 +47 @@
         $profile_list = db_member_c_profile_list4null();
         foreach ($profile_list as $profile) {
-            if ($profile['disp_config']
+            if ($profile['disp_regist']
                 && $profile['is_required']
                 && !$c_member_profile_list[$profile['name']]['value']