Changeset 976447

Timestamp:

09/01/2014 01:37:49 PM (12 years ago)

Author:

hdflvplayer

Message:

Fixed video details not displaying in video page - Upgrade (2.7) issue

Location:

contus-video-gallery

Files:

• tags/2.7/ContusFeatureVideos.php (modified) (2 diffs)
• tags/2.7/ContusRandomVideos.php (modified) (3 diffs)
• tags/2.7/ContusRecentVideos.php (modified) (2 diffs)
• tags/2.7/ContusRelatedVideos.php (modified) (1 diff)
• tags/2.7/ContusVideoCategory.php (modified) (2 diffs)
• tags/2.7/front/models/videohome.php (modified) (1 diff)
• tags/2.7/front/views/videoshortcode.php (modified) (1 diff)
• tags/2.7/hdflvvideoshare.php (modified) (1 diff)
• trunk/ContusFeatureVideos.php (modified) (2 diffs)
• trunk/ContusRandomVideos.php (modified) (3 diffs)
• trunk/ContusRecentVideos.php (modified) (2 diffs)
• trunk/ContusRelatedVideos.php (modified) (2 diffs)
• trunk/ContusVideoCategory.php (modified) (2 diffs)
• trunk/front/models/videohome.php (modified) (1 diff)
• trunk/front/views/videoshortcode.php (modified) (2 diffs)
• trunk/hdflvvideoshare.php (modified) (1 diff)

contus-video-gallery/tags/2.7/ContusFeatureVideos.php

@@ -53 +53 @@
         extract ( $args, EXTR_SKIP );
         $title = empty ( $instance ['title'] ) ? ' ' : apply_filters ( 'widget_title', $instance ['title'] );
+        $show = 3;
         if (! empty ( $title ))
             // WIDGET CODE GOES HERE
@@ -64 +65 @@
             if( absint( $instance['show'] ) ){
                 $show = $instance ['show'];
-            }else{
-                $show =3;   
             }
-        } else {
-            $show = 3;
         }
             

contus-video-gallery/tags/2.7/ContusRandomVideos.php

@@ -93 +93 @@
         $viewslang = __ ( 'Views', 'video_gallery' );
         $viewlang = __ ( 'View', 'video_gallery' );
+        $show = 3;
         echo $before_widget;
         $div = '<div id="random-videos" class="sidebar-wrap "><h3 class="widget-title"><a href="' . $more_videos_link . '">' . $title . '</a></h3>';
@@ -99 +100 @@
             if( absint( $instance['show'] ) ){
                 $show = $instance ['show'];
-            }else{
-                $show = 3;
             }
-        }else{
-                $show = 3;
-        }
+        }
+
         $sql = 'SELECT DISTINCT a.*,s.guid,b.playlist_id,p.playlist_name FROM ' . $wpdb->prefix . 'hdflvvideoshare a
                 LEFT JOIN ' . $wpdb->prefix . 'hdflvvideoshare_med2play b ON a.vid=b.media_id
@@ -111 +109 @@
                 WHERE a.publish=1 AND p.is_publish=1 GROUP BY a.vid ORDER BY RAND() LIMIT ' . $show;
         $posts = $wpdb->get_results ( $sql );
+
         if (! empty ( $posts )) {
             $fetched = $posts [0]->playlist_name;
         }
+
         $moreR = $wpdb->get_results ( 'SELECT count(a.vid) as contus from ' . $wpdb->prefix . 'hdflvvideoshare a
                 LEFT JOIN ' . $wpdb->prefix . 'hdflvvideoshare_med2play b ON a.vid=b.media_id

contus-video-gallery/tags/2.7/ContusRecentVideos.php

@@ -81 +81 @@
         $viewslang = __ ( 'Views', 'video_gallery' );
         $viewlang = __ ( 'View', 'video_gallery' );
+        $show = 3;
         echo $before_widget;
         $div = '<div id="recent-videos" class="sidebar-wrap "><h3 class="widget-title"><a href="' .$more_videos_link .'">' . $title . '</a></h3>';
+
         if ($instance ['show']) {
             if( absint( $instance['show'] ) ) {
                 $show = $instance['show'];
             }
-            $show = 3;
-        } else {
-            $show = 3;
         }
+
         $sql = 'SELECT DISTINCT a.*,s.guid,b.playlist_id,p.playlist_name FROM ' . $wpdb->prefix . 'hdflvvideoshare a
                 LEFT JOIN ' . $wpdb->prefix . 'hdflvvideoshare_med2play b ON a.vid=b.media_id
@@ -97 +97 @@
                 WHERE a.publish=1 AND p.is_publish=1 GROUP BY a.vid ORDER BY a.vid DESC LIMIT ' . $show;
         $posts = $wpdb->get_results ( $sql );
+
         if (! empty ( $posts )) {
             $fetched = $posts [0]->playlist_name;
         }
+
         $moreR = $wpdb->get_results ( 'SELECT count(a.vid) as contus from ' . $wpdb->prefix . 'hdflvvideoshare a
                 LEFT JOIN ' . $wpdb->prefix . 'hdflvvideoshare_med2play b ON a.vid=b.media_id

contus-video-gallery/tags/2.7/ContusRelatedVideos.php

@@ -40 +40 @@
         extract( $args, EXTR_SKIP );
         $title = empty( $instance['title'] ) ? ' ' : apply_filters( 'widget_title', $instance['title'] );
+        $show = 3;
         global $wpdb;
         // These are our own options
+
         if($instance['show']){
            if( absint( $instance['show'] ) ){
                 $show = $instance['show']; 
-            }else{
-                $show=3;
             }
-        }else{
-            $show = 3;      
         }
+
         $site_url = get_site_url();
         $dir      = dirname( plugin_basename( __FILE__ ) );

contus-video-gallery/tags/2.7/ContusVideoCategory.php

@@ -39 +39 @@
         extract( $args, EXTR_SKIP );
         $title = empty( $instance['title']) ? ' ' : apply_filters( 'widget_title', $instance['title'] );
+        $show = 3;
         ## WIDGET CODE GOES HERE
         global $wpdb;
@@ -46 +47 @@
             if( absint( $instance['show'] ) ) {
                 $show = $instance['show'];
-            }else{
-                $show = 3;
-            } 
-        }else{
-            $show = 3;      
+            }
         }
         ?>

contus-video-gallery/tags/2.7/front/models/videohome.php

@@ -99 +99 @@
             $select = 'SELECT distinct w.vid,w.*,s.guid FROM ' . $wpdb->prefix . 'hdflvvideoshare w
                     LEFT JOIN ' . $wpdb->prefix . 'hdflvvideoshare_med2play m ON m.media_id = w.vid
-                    LEFT JOIN ' . $wpdb->prefix . 'hdflvvideoshare_playlist p ON p.pid=m.playlist_id ON p.pid=m.playlist_id
+                    LEFT JOIN ' . $wpdb->prefix . 'hdflvvideoshare_playlist p ON p.pid=m.playlist_id
                     LEFT JOIN ' . $wpdb->prefix . 'posts s ON s.ID=w.slug
                     WHERE w.vid="' . $vid . '" AND w.publish=1 AND p.is_publish=1 GROUP BY w.vid';

contus-video-gallery/tags/2.7/front/views/videoshortcode.php

@@ -698 +698 @@
                 // Show /hide video description.
                 if ($configXML->showTag) {
-                    $output .= '<div style="clear: both;"></div><div class="video-page-desc">' . apply_filters('the_content', $description ) . '</div></div>';
+                    $output .= '<div style="clear: both;"></div><div class="video-page-desc">' . apply_filters('the_content', $description ) . '</div>';
                 }
                 
-                $output .= '</div>';                
-            } else {
-                // show / hide video description
-                if ($configXML->showTag) {
-                    $output .= '<div style="clear:both;"></div><div class="video-page-desc">' . apply_filters('the_content', $fetched [0]->description ). '</div>';
-                }
-            }
-            $output .= '</div></div>';
+                $output .= '</div></div>';              
+            }
+
             // Enable/disable Related videos starts here
             if ( ( ( $this->_post_type === 'videogallery' && $configXML->playlist == 1|| $this->_page_post_type === 'videogallery' && $configXML->playlist == 1) ) || (((isset ( $arguments ['playlistid'] ) && isset ( $arguments ['id'] )) || $player_color['show_related_video']== 1|| (isset ( $arguments ['playlistid'] ))) && (isset ( $arguments ['relatedvideos'] ) && $arguments ['relatedvideos'] == 'on'))) {

contus-video-gallery/tags/2.7/hdflvvideoshare.php

@@ -684 +684 @@
         $progressControl      = add_column_if_not_exists( $errorMsg, "$table_settings", 'progressControl', 'INT( 3 ) NOT NULL DEFAULT 1' );
         $imageDefault         = add_column_if_not_exists( $errorMsg, "$table_settings", 'imageDefault', 'INT( 3 ) NOT NULL' );
-        $memeber_upload_enable =  add_column_if_not_exists( $errorMsg , "$table_setting" , 'memeber_upload_enable' , 'INT( 3 ) NOT NULL ');
         
         /**

contus-video-gallery/trunk/ContusFeatureVideos.php

@@ -53 +53 @@
         extract ( $args, EXTR_SKIP );
         $title = empty ( $instance ['title'] ) ? ' ' : apply_filters ( 'widget_title', $instance ['title'] );
+        $show =3;
         if (! empty ( $title ))
             // WIDGET CODE GOES HERE
@@ -64 +65 @@
             if( absint( $instance['show'] ) ){
                 $show = $instance ['show'];
-            }else{
-                $show =3;   
             }
-        } else {
-            $show = 3;
         }
             

contus-video-gallery/trunk/ContusRandomVideos.php

@@ -67 +67 @@
         extract ( $args, EXTR_SKIP );
         $title = empty ( $instance ['title'] ) ? ' ' : apply_filters ( 'widget_title', $instance ['title'] );
+        $show = 3;
         global $wpdb;
         // These are our own options
@@ -99 +100 @@
             if( absint( $instance['show'] ) ){
                 $show = $instance ['show'];
-            }else{
-                $show = 3;
             }
-        }else{
-                $show = 3;
-        }
+        }
+
         $sql = 'SELECT DISTINCT a.*,s.guid,b.playlist_id,p.playlist_name FROM ' . $wpdb->prefix . 'hdflvvideoshare a
                 LEFT JOIN ' . $wpdb->prefix . 'hdflvvideoshare_med2play b ON a.vid=b.media_id
@@ -111 +109 @@
                 WHERE a.publish=1 AND p.is_publish=1 GROUP BY a.vid ORDER BY RAND() LIMIT ' . $show;
         $posts = $wpdb->get_results ( $sql );
+
         if (! empty ( $posts )) {
             $fetched = $posts [0]->playlist_name;
         }
+
         $moreR = $wpdb->get_results ( 'SELECT count(a.vid) as contus from ' . $wpdb->prefix . 'hdflvvideoshare a
                 LEFT JOIN ' . $wpdb->prefix . 'hdflvvideoshare_med2play b ON a.vid=b.media_id

contus-video-gallery/trunk/ContusRecentVideos.php

@@ -81 +81 @@
         $viewslang = __ ( 'Views', 'video_gallery' );
         $viewlang = __ ( 'View', 'video_gallery' );
+        $show = 3;
         echo $before_widget;
         $div = '<div id="recent-videos" class="sidebar-wrap "><h3 class="widget-title"><a href="' .$more_videos_link .'">' . $title . '</a></h3>';
@@ -87 +88 @@
                 $show = $instance['show'];
             }
-            $show = 3;
-        } else {
-            $show = 3;
         }
+
         $sql = 'SELECT DISTINCT a.*,s.guid,b.playlist_id,p.playlist_name FROM ' . $wpdb->prefix . 'hdflvvideoshare a
                 LEFT JOIN ' . $wpdb->prefix . 'hdflvvideoshare_med2play b ON a.vid=b.media_id

contus-video-gallery/trunk/ContusRelatedVideos.php

@@ -40 +40 @@
         extract( $args, EXTR_SKIP );
         $title = empty( $instance['title'] ) ? ' ' : apply_filters( 'widget_title', $instance['title'] );
+        $show = 3;
         global $wpdb;
         // These are our own options
@@ -45 +46 @@
            if( absint( $instance['show'] ) ){
                 $show = $instance['show']; 
-            }else{
-                $show=3;
             }
-        }else{
-            $show = 3;      
         }
+
         $site_url = get_site_url();
         $dir      = dirname( plugin_basename( __FILE__ ) );

contus-video-gallery/trunk/ContusVideoCategory.php

@@ -39 +39 @@
         extract( $args, EXTR_SKIP );
         $title = empty( $instance['title']) ? ' ' : apply_filters( 'widget_title', $instance['title'] );
+        $show = 3;
         ## WIDGET CODE GOES HERE
         global $wpdb;
@@ -46 +47 @@
             if( absint( $instance['show'] ) ) {
                 $show = $instance['show'];
-            }else{
-                $show = 3;
-            } 
-        }else{
-            $show = 3;      
+            }
         }
         ?>

contus-video-gallery/trunk/front/models/videohome.php

@@ -99 +99 @@
             $select = 'SELECT distinct w.vid,w.*,s.guid FROM ' . $wpdb->prefix . 'hdflvvideoshare w
                     LEFT JOIN ' . $wpdb->prefix . 'hdflvvideoshare_med2play m ON m.media_id = w.vid
-                    LEFT JOIN ' . $wpdb->prefix . 'hdflvvideoshare_playlist p ON p.pid=m.playlist_id ON p.pid=m.playlist_id
+                    LEFT JOIN ' . $wpdb->prefix . 'hdflvvideoshare_playlist p ON p.pid=m.playlist_id
                     LEFT JOIN ' . $wpdb->prefix . 'posts s ON s.ID=w.slug
                     WHERE w.vid="' . $vid . '" AND w.publish=1 AND p.is_publish=1 GROUP BY w.vid';

contus-video-gallery/trunk/front/views/videoshortcode.php

@@ -197 +197 @@
             }
             // get Playlist detail
-            $playlistData = $this->playlist_detail ($vid);
+            $playlistData = $this->playlist_detail ($vid );
             $incre = 0;
             $playlistname = $windo = $htmlvideo = '';
@@ -698 +698 @@
                 // Show /hide video description.
                 if ($configXML->showTag) {
-                    $output .= '<div style="clear: both;"></div><div class="video-page-desc">' . apply_filters('the_content', $description ) . '</div></div>';
+                    $output .= '<div style="clear: both;"></div><div class="video-page-desc">' . apply_filters('the_content', $description ) . '</div>';
                 }
                 
-                $output .= '</div>';                
-            } else {
-                // show / hide video description
-                if ($configXML->showTag) {
-                    $output .= '<div style="clear:both;"></div><div class="video-page-desc">' . apply_filters('the_content', $fetched [0]->description ). '</div>';
-                }
-            }
-            $output .= '</div></div>';
+                $output .= '</div></div>';              
+            }
+
             // Enable/disable Related videos starts here
             if ( ( ( $this->_post_type === 'videogallery' && $configXML->playlist == 1|| $this->_page_post_type === 'videogallery' && $configXML->playlist == 1) ) || (((isset ( $arguments ['playlistid'] ) && isset ( $arguments ['id'] )) || $player_color['show_related_video']== 1|| (isset ( $arguments ['playlistid'] ))) && (isset ( $arguments ['relatedvideos'] ) && $arguments ['relatedvideos'] == 'on'))) {

contus-video-gallery/trunk/hdflvvideoshare.php

@@ -684 +684 @@
         $progressControl      = add_column_if_not_exists( $errorMsg, "$table_settings", 'progressControl', 'INT( 3 ) NOT NULL DEFAULT 1' );
         $imageDefault         = add_column_if_not_exists( $errorMsg, "$table_settings", 'imageDefault', 'INT( 3 ) NOT NULL' );
-        $memeber_upload_enable =  add_column_if_not_exists( $errorMsg , "$table_setting" , 'memeber_upload_enable' , 'INT( 3 ) NOT NULL ');
         
         /**