Changeset 7205

Timestamp:

May 14, 2008, 8:10:37 PM (14 years ago)

Author:

ebihara

Message:

#2414:c_member_config のデフォルト値を指定できるようにした

Location:

OpenPNE/branches/stable-2.12.x/webapp

Files:

• lib/util/mail_send.php (modified) (1 diff)
• lib/util/util.php (modified) (1 diff)
• modules/ktai/init.inc (modified) (1 diff)
• modules/pc/init.inc (modified) (1 diff)

OpenPNE/branches/stable-2.12.x/webapp/lib/util/mail_send.php

@@ -890 +890 @@
 
     // 日記オーナーの通知設定が無ければ通知しない
-    $target_c_member_config = db_member_c_member_config4c_member_id($target_c_member_id);
+    $target_c_member_config = util_get_c_member_config($target_c_member_id);
     if (!$target_c_member_config['SEND_DIARY_COMMENT_MAIL_KTAI']) {
         return false;

OpenPNE/branches/stable-2.12.x/webapp/lib/util/util.php

@@ -885 +885 @@
 }
 
+function util_get_c_member_config($c_member_id)
+{
+    $default_config = array(
+        'SEND_DIARY_COMMENT_MAIL_KTAI' => 0,
+        'IS_DISPLAY_NEWDIARY_HOME' => 0,
+        'IS_DISPLAY_NEWTOPIC_HOME' => 0,
+        'DISPLAY_CHANGE_NEWDIARY_HOME_KTAI' => 0,
+        'DISPLAY_CHANGE_NEWTOPIC_HOME_KTAI' => 0,
+    );
+
+    $member_config = array_merge($default_config, db_member_c_member_config4c_member_id($c_member_id));
+
+    return $member_config;
+}
+
 ?>

OpenPNE/branches/stable-2.12.x/webapp/modules/ktai/init.inc

@@ -87 +87 @@
     if ($is_secure) {
         $u = $GLOBALS['AUTH']->uid();
-        $smarty->assign('C_MEMBER_CONFIG',db_member_c_member_config4c_member_id($u));
+        $smarty->assign('C_MEMBER_CONFIG', util_get_c_member_config($u));
     }
 

OpenPNE/branches/stable-2.12.x/webapp/modules/pc/init.inc

@@ -69 +69 @@
     if ($is_secure) {
         $u = $GLOBALS['AUTH']->uid();
-        $smarty->assign('C_MEMBER_CONFIG',db_member_c_member_config4c_member_id($u));
+        $smarty->assign('C_MEMBER_CONFIG', util_get_c_member_config($u));
     }