Changeset 6745 for OpenPNE/trunk/webapp/modules/pc/page/fh_album_image_show.php

Timestamp:

Apr 26, 2008, 6:02:47 PM (14 years ago)

Author:

ebihara

Message:

#2279:公開範囲設定を無視してアルバム写真が表示できてしまっていたのを修正

File:

• OpenPNE/trunk/webapp/modules/pc/page/fh_album_image_show.php (modified) (3 diffs)

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

@@ -7 +7 @@
 class pc_page_fh_album_image_show extends OpenPNE_Action
 {
-
-
     function execute($requests)
     {
@@ -18 +16 @@
         
         // --- リクエスト変数
-        $target_c_album_id       = $requests['target_c_album_id'];
         $target_c_album_image_id = $requests['target_c_album_image_id'];
         // ----------
         
         //targetが指定されていない
-        if(!$target_c_album_id || !$target_c_album_image_id){
+        if (!$target_c_album_image_id) {
+            openpne_redirect('pc', 'page_h_err_fh_album');
+        }
+
+        //targetのアルバム写真が存在しない
+        if (!p_common_is_active_c_album_image_id($target_c_album_image_id)) {
             openpne_redirect('pc', 'page_h_err_fh_album');
         }
         
+        $target_c_album_image = db_album_image_get_c_album_image4id($target_c_album_image_id);
+        $target_c_album_id = $target_c_album_image['c_album_id'];
+        
         //targetのアルバムが存在しない
-        if(!p_common_is_active_c_album_id($target_c_album_id)) {
-            openpne_redirect('pc', 'page_h_err_fh_album');
-        }
-        
-        //targetのアルバム写真が存在しない
-        if(!p_common_is_active_c_album_image_id($target_c_album_image_id)) {
+        if (!p_common_is_active_c_album_id($target_c_album_id)) {
             openpne_redirect('pc', 'page_h_err_fh_album');
         }
@@ -58 +58 @@
         }
         
-        $this->set("type", $type);
+        $this->set('type', $type);
         $this->set('inc_navi', fetch_inc_navi($type, $target_c_member_id));
-        
-        $target_c_album_image = db_album_image_get_c_album_image4id($target_c_album_image_id);
-        $this->set('c_album_image',$target_c_album_image);
-        
+        $this->set('c_album_image', $target_c_album_image);
         $this->set('c_album_iamge_id_prev', db_album_image_c_album_image_id_prev4c_album_id($target_c_member_id, $target_c_album_id, $target_c_album_image_id, $u));
         $this->set('c_album_iamge_id_next', db_album_image_c_album_image_id_next4c_album_id($target_c_member_id, $target_c_album_id, $target_c_album_image_id, $u));