Changeset 6802

Timestamp:

Apr 28, 2008, 10:20:05 PM (13 years ago)

Author:

ebihara

Message:

#2181:DISPLAY_OFF*->IS_DISPLAY*

Location:

OpenPNE/trunk

Files:

• webapp/modules/pc/do/h_member_config.php (modified) (1 diff)
• webapp/modules/pc/page/h_home.php (modified) (2 diffs)
• webapp/modules/pc/templates/h_config.tpl (modified) (1 diff)
• webapp/modules/pc/validate/do/h_member_config.ini (modified) (1 diff)
• webapp_biz/modules/pc/page/h_home.php (modified) (2 diffs)

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

@@ -21 +21 @@
         $u = $GLOBALS['AUTH']->uid();
 
-        db_member_update_c_member_config($u, 'DISPLAY_OFF_NEWDIARY_HOME', $requests['DISPLAY_OFF_NEWDIARY_HOME']);
-        db_member_update_c_member_config($u, 'DISPLAY_OFF_NEWTOPIC_HOME', $requests['DISPLAY_OFF_NEWTOPIC_HOME']);
+        db_member_update_c_member_config($u, 'IS_DISPLAY_NEWDIARY_HOME', $requests['IS_DISPLAY_NEWDIARY_HOME']);
+        db_member_update_c_member_config($u, 'IS_DISPLAY_NEWTOPIC_HOME', $requests['IS_DISPLAY_NEWTOPIC_HOME']);
         openpne_redirect('pc', 'page_h_home');
     }

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

@@ -71 +71 @@
 
         // 最新日記
-        if(DISPLAY_NEWDIARYTOPIC_HOME && !$OPTION['DISPLAY_OFF_NEWDIARY_HOME']){
+        if(DISPLAY_NEWDIARYTOPIC_HOME && $OPTION['IS_DISPLAY_NEWDIARY_HOME']){
             $this->set('c_diary_list_all', p_h_home_c_diary_all_list(5));
         }
@@ -83 +83 @@
         $this->set('c_diary_my_comment_list', $c_diary_my_comment_list);
         // コミュニティ全ての新着書き込み
-        if(DISPLAY_NEWDIARYTOPIC_HOME && !$OPTION['DISPLAY_OFF_NEWTOPIC_HOME']){
+        if(DISPLAY_NEWDIARYTOPIC_HOME && $OPTION['IS_DISPLAY_NEWTOPIC_HOME']){
             $this->set('c_topic_list_all', p_h_home_c_topic_all_list(5));
         }

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

@@ -212 +212 @@
 <p>SNS全体の最新({$WORD_DIARY})</p>
 <ul>
-<li><input type="radio" class="input_radio" name="DISPLAY_OFF_NEWDIARY_HOME" id="display_off_newdiary_home_0" value="0"({if $C_MEMBER_CONFIG.DISPLAY_OFF_NEWDIARY_HOME == 0}) checked="checked"({/if}) /><label for="display_off_newdiary_home_0">表示する</label></li>
-<li><input type="radio" class="input_radio" name="DISPLAY_OFF_NEWDIARY_HOME" id="display_off_newdiary_home_1" value="1"({if $C_MEMBER_CONFIG.DISPLAY_OFF_NEWDIARY_HOME == 1}) checked="checked"({/if}) /><label for="display_off_newdiary_home_1">表示しない</label></li>
+<li><input type="radio" class="input_radio" name="IS_DISPLAY_NEWDIARY_HOME" id="display_off_newdiary_home_0" value="0"({if $C_MEMBER_CONFIG.IS_DISPLAY_NEWDIARY_HOME}) checked="checked"({/if}) /><label for="display_off_newdiary_home_0">表示する</label></li>
+<li><input type="radio" class="input_radio" name="IS_DISPLAY_NEWDIARY_HOME" id="display_off_newdiary_home_1" value="1"({if !$C_MEMBER_CONFIG.IS_DISPLAY_NEWDIARY_HOME}) checked="checked"({/if}) /><label for="display_off_newdiary_home_1">表示しない</label></li>
 </ul>
 <p>SNS全体の最新トピック</p>
 <ul>
-<li><input type="radio" class="input_radio" name="DISPLAY_OFF_NEWTOPIC_HOME" id="display_off_newtopic_home_0" value="0"({if $C_MEMBER_CONFIG.DISPLAY_OFF_NEWTOPIC_HOME == 0}) checked="checked"({/if}) /><label for="display_off_newtopic_home_0">表示する</label></li>
-<li><input type="radio" class="input_radio" name="DISPLAY_OFF_NEWTOPIC_HOME" id="display_off_newtopic_home_1" value="1"({if $C_MEMBER_CONFIG.DISPLAY_OFF_NEWTOPIC_HOME == 1}) checked="checked"({/if}) /><label for="display_off_newtopic_home_1">表示しない</label></li>
+<li><input type="radio" class="input_radio" name="IS_DISPLAY_NEWTOPIC_HOME" id="display_off_newtopic_home_0" value="0"({if $C_MEMBER_CONFIG.IS_DISPLAY_NEWTOPIC_HOME}) checked="checked"({/if}) /><label for="display_off_newtopic_home_0">表示する</label></li>
+<li><input type="radio" class="input_radio" name="IS_DISPLAY_NEWTOPIC_HOME" id="display_off_newtopic_home_1" value="1"({if !$C_MEMBER_CONFIG.IS_DISPLAY_NEWTOPIC_HOME}) checked="checked"({/if}) /><label for="display_off_newtopic_home_1">表示しない</label></li>
 </ul>
 <p>※マイホームに表示する情報を選択出来ます。</p>

OpenPNE/trunk/webapp/modules/pc/validate/do/h_member_config.ini

@@ -1 @@
-[DISPLAY_OFF_NEWDIARY_HOME]
+[IS_DISPLAY_NEWDIARY_HOME]
 type = "string"
 default = "0"
 
-[DISPLAY_OFF_NEWTOPIC_HOME]
+[IS_DISPLAY_NEWTOPIC_HOME]
 type = "string"
 default = "0"

OpenPNE/trunk/webapp_biz/modules/pc/page/h_home.php

@@ -75 +75 @@
 
         // 最新日記
-        if(DISPLAY_NEWDIARYTOPIC_HOME && !$OPTION['DISPLAY_OFF_NEWDIARY_HOME']){
+        if(DISPLAY_NEWDIARYTOPIC_HOME && $OPTION['IS_DISPLAY_NEWDIARY_HOME']){
             $this->set('c_diary_list_all', p_h_home_c_diary_all_list(5));
         }
@@ -87 +87 @@
         $this->set('c_diary_my_comment_list', $c_diary_my_comment_list);
         // コミュニティ全ての新着書き込み
-        if(DISPLAY_NEWDIARYTOPIC_HOME && !$OPTION['DISPLAY_OFF_NEWTOPIC_HOME']){
+        if(DISPLAY_NEWDIARYTOPIC_HOME && $OPTION['IS_DISPLAY_NEWTOPIC_HOME']){
             $this->set('c_topic_list_all', p_h_home_c_topic_all_list(5));
         }