Changeset 194957

Timestamp:

01/18/2010 12:55:22 PM (16 years ago)

Author:

frekel

Message:

Kleine fixes voor ILFN

Location:

wp-photocontest/trunk

Files:

• images/polaroid.fla (modified) (previous)
• lib/wp-photocontest.class.php (modified) (3 diffs)
• photocontest-manager.php (modified) (1 diff)
• skins/aqua/polaroid.swf (modified) (previous)
• viewimg.php (modified) (2 diffs)

wp-photocontest/trunk/lib/wp-photocontest.class.php

@@ -161 +161 @@
         $outnum_photo = (array) $this->db->get_row( $this->db->prepare( "SELECT count(distinct(img_id)) as total_nr,img_id FROM ".$this->db->prefix."photocontest_votes ORDER BY img_id GROUP BY img_id")); 
 
-        $out            = $this->db->get_results( $this->db->prepare( "SELECT pr.wp_uid AS userid, pr.sum_votes AS sumvotes, wpu.user_login AS userlogin, pr.img_id AS img_id, pr.img_path AS img_path, pr.img_name AS img_name, pr.insert_time AS insert_time, pr.visibile AS visibile FROM ".$this->db->prefix."photocontest AS pr join ".$this->db->prefix."users as wpu on (pr.wp_uid = wpu.ID) AND pr.contest_id= %d ORDER BY pr.wp_uid, pr.insert_time LIMIT %d, %d", $contest_id, ($p * 10),(($p + 1) * 10) ) );     
+        $out            = $this->db->get_results( $this->db->prepare( "SELECT pr.wp_uid AS userid, pr.sum_votes AS sumvotes, wpu.user_login AS userlogin, pr.img_id AS img_id, pr.img_path AS img_path, pr.img_name AS img_name, pr.insert_time AS insert_time, pr.visibile AS visibile FROM ".$this->db->prefix."photocontest AS pr join ".$this->db->prefix."users as wpu on (pr.wp_uid = wpu.ID) AND pr.contest_id= %d ORDER BY pr.sum_votes DESC, pr.wp_uid ASC, pr.insert_time ASC LIMIT %d, %d", $contest_id, ($p * 10),(($p + 1) * 10) ) );      
 
         $i=0;
@@ -169 +169 @@
         foreach ($out as $k=>$v)
         {
+            /*
             $v = (array) $v;
-            $votes = (array) $this->db->get_row( $this->db->prepare( "SELECT count(*) as number_of_votes FROM ".$this->db->prefix."photocontest_votes WHERE img_id= %d" ,$v['img_id'] ) );
+            $votes = (array) $this->db->get_row( $this->db->prepare( "SELECT count(*) as number_of_votes FROM ".$this->db->prefix."photocontest_votes WHERE img_id= %d AND vote>0" ,$v['img_id'] ) );
             $total_votes +=$votes['number_of_votes'];
             $votes_array['nr_of_votes'][$v['img_id']]=$votes['number_of_votes'];
+            $votes_array['total_votes']=$total_votes;
+            */
+            $votes = (array) $v;
+            $total_votes +=$votes['sumvotes'];
+            $votes_array['nr_of_votes'][$votes['img_id']]=$votes['sumvotes'];
             $votes_array['total_votes']=$total_votes;
         }
@@ -186 +192 @@
             $data_array[$i]['med_thumb']    = preg_replace("/$img_name/", "med_".$img_name, $img_path);         
             $data_array[$i]['nr_of_votes']  = $votes_array['nr_of_votes'][$v['img_id']];    
-            $data_array[$i]['rank']         = round(($votes_array['nr_of_votes'][$v['img_id']]/$votes_array['total_votes'])*100,0); 
+            if ($votes_array['total_votes']>0)
+            {
+                $data_array[$i]['rank']         = round(($votes_array['nr_of_votes'][$v['img_id']]/$votes_array['total_votes'])*100,0); 
+            }
+            else
+            {
+                $data_array[$i]['rank']         = 0;
+            }
             $i++;
         }

wp-photocontest/trunk/photocontest-manager.php

@@ -399 +399 @@
                 else
                 {
-                    $contest_items_sorted = wppc_multiArraySort($view_contest['data'],'rank','DESC');
+                    $contest_items_sorted = wppc_multiArraySort($view_contest['data'],'nr_of_votes','DESC');
                     $filter_post_id = $contest_id;
                     $show_list=false;

wp-photocontest/trunk/viewimg.php

@@ -121 +121 @@
         {
             nocache_headers();
-            wp_redirect(get_option('siteurl') . '/wp-content/plugins/wp-photocontest/login.php?post_id='.$post_id.'&redirect_to=' .urlencode(get_option('siteurl').'/wp-content/plugins/wp-photocontest/viewimg.php?post_id='.$post_id));
+            wp_redirect(get_option('siteurl') . '/wp-content/plugins/wp-photocontest/login.php?post_id='.$post_id.'&img_id='.$img_id.'&redirect_to=' .urlencode(get_option('siteurl').'/wp-content/plugins/wp-photocontest/viewimg.php?post_id='.$post_id.'&img_id='.$img_id));
             exit();
         }
@@ -423 +423 @@
                         <h2 class="wp-photocontest_detailstitle"><?php _e('Photo', 'wp-photocontest');?></h2>
                         <div class="wp-photocontest_detailstext">
-                            <a href="<?php echo get_option("siteurl");?><?php echo $image_details['img_path'];?>" rel="lightbox" title="<?php echo $image_details['img_title'];?>"><img border="0" title="<?php echo $image_details['img_title'];?>" src="<?php echo get_option("siteurl");?><?php echo $large_thumb;?>"></a>
+                            <a href="<?php echo get_option("siteurl");?><?php echo $image_details['img_path'];?>" rel="lightbox[<?php echo $image_details['img_id'];?>]" title="<?php echo $image_details['img_title'];?>"><img border="0" title="<?php echo $image_details['img_title'];?>" src="<?php echo get_option("siteurl");?><?php echo $large_thumb;?>"></a>
                         </div>                                  
                     </span>