Changeset 141675

Timestamp:

08/01/2009 07:24:25 AM (16 years ago)

Author:

ruslany

Message:

More JavaScript cleanup and refactoring.
Added functionality to create a db table for plugin.

Location:

wp-media-player/trunk

Files:

• scripts/playerstrings.js (deleted)
• scripts/playerstrings.js.dev.js (deleted)
• scripts/startplayer.js.dev.js (modified) (4 diffs)
• wp-media-player.php (modified) (9 diffs)

wp-media-player/trunk/scripts/startplayer.js.dev.js

@@ -27 +27 @@
                                   null, $get(this._hostname)  );   
 
-    this.post_id = 0;
-
     this._playlist = this.getPlaylist();
     this._player.set_mediainfo( this._playlist[0] );
@@ -34 +32 @@
     
     _onMediaOpened: function(sender, eventArgs){
-        this._sendMediaStatus(0);
-        //window.status = "Media Opened!";
+        this._logMediaStatus(1);
     },
     
     _onMediaEnded: function(sender, eventArgs) {
-        this._sendMediaStatus(1);
-        //window.status = "Media Ended!";
+        this._logMediaStatus(2);
     },
     
@@ -47 +43 @@
     },
     
-    _sendMediaStatus: function(status){
-        //jQuery.ajax({type: 'GET', url: 'http://wordpress/wordpress/wp-content/plugins/wp-media-player/wp-media-player.php', data: 'pid=' + this.post_id + '&status=' + status, cache: false});        
+    _getDocument: function(full_path) {
+        var end = (full_path.indexOf("?") == -1) ? full_path.length : full_path.indexOf("?");
+        return full_path.substring(full_path.lastIndexOf("/")+1, end);
+    },
+    
+    _logMediaStatus: function(status){
+        jQuery.ajax({type: 'GET', url: this.ajaxUrl, data: 'pid=' + this.postId + '&stat=' + status + '&file=' + this._getDocument(this._playlist[0].mediaSource), cache: false});      
     }
 }
@@ -55 +56 @@
     new StartMediaPlayer(parentId);
 }
+
+// strings used in scripts
+
+Sys.UI.Silverlight.ControlRes={
+'runtimeErrorWithoutPosition': "Runtime error {2} in control '{0}', method {6}: {3}",
+'scaleModeRequiresMatrixTransform': "When ScaleMode is set to zoom or stretch, the root Canvas must have not have a RenderTransform applied, or must only have a ScaleTransform.",
+'mediaError_NotFound': "Media '{3}' in control '{0}' could not be found.",
+'runtimeErrorWithPosition': "Runtime error {2} in control '{0}', method {6} (line {4}, col {5}): {3}",
+'silverlightVersionFormat': "Must be in the format 'MajorVersion.MinorVersion'.",
+'otherError': "{1} error #{2} in control '{0}': {3}",
+'cannotChangeSource': "You cannot change the XAML source after initialization.",
+'parserError': "Invalid XAML for control '{0}'. [{7}] (line {4}, col {5}): {3}",
+'sourceAlreadySet': "You cannot change the XAML source after initialization.",
+'parentNotFound' : "{1} error #{2} in control '{0}': {3}"
+};
+
+Sys.UI.Silverlight.MediaRes={
+'volumeRange':  "Volume must be a number greater than or equal to 0 and less than or equal to 1.",
+'mediaFailed':  "Unable to load media '{0}'. This may be because there is no such file at this location or the video file is encoded incorrectly.",
+'noMediaElement':  "The XAML document does not contain a media element.",
+'noThumbElement': "{1} error #{2} in control '{0}': {3}",
+'invalidChapter':  "Must be greater than or equal to 0 and less than the length of the chapter's array.",
+'silverlightNotLoaded': "{1} error #{2} in control '{0}': {3}"
+};

wp-media-player/trunk/wp-media-player.php

@@ -76 +76 @@
         var $post_needs_meta = false;
         var $content_save_pre_count = 0;
+        var $playerlogs;
 
         function wp_media_player()
         {
-            register_activation_hook(__FILE__, array(&$this, 'store_options'));
+            global $wpdb;
+            $this-> playerlogs = $wpdb->prefix.'media_player_logs';
+            register_activation_hook(__FILE__, array(&$this, 'create_playerlogs_table'));
 
             add_action( 'init', array(&$this, 'initialize'), 12 );
@@ -117 +120 @@
             load_plugin_textdomain('wp-media-player', '/wp-content/plugins/wp-media-player/languages');
         }
-
-        function store_options()
-        {
+        /**
+         * Creates the database table for storing video views data.
+         * Also adds plugin options
+         * 
+         * @return 
+         */
+        function create_playerlogs_table()
+        {
+            global $wpdb;
+    
+            if( @is_file(ABSPATH.'/wp-admin/includes/upgrade.php') ) {
+                include_once(ABSPATH.'/wp-admin/includes/upgrade.php');
+            }
+            elseif( @is_file(ABSPATH.'/wp-admin/upgrade-functions.php') ) {
+                include_once(ABSPATH.'/wp-admin/upgrade-functions.php');
+            }
+            else {
+                die('We have problem finding your \'/wp-admin/upgrade.php\'');
+            }
+
+            $charset_collate = '';
+            if( $wpdb->supports_collation() ) {
+                if( !empty($wpdb->charset) ) {
+                    $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
+                }
+                if( !empty($wpdb->collate) ) {
+                    $charset_collate .= " COLLATE $wpdb->collate";
+                }
+            }
+
+            $create_playerlogs_sql = "CREATE TABLE ".$this->playerlogs." (".
+            "play_id INT(11) NOT NULL auto_increment,".
+            "play_postid INT(11) NOT NULL ,".
+            "play_posttitle TEXT NOT NULL,".
+            "play_videofile TEXT NOT NULL,".            
+            "play_opened INT(11) NOT NULL ,".
+            "play_ended INT(11) NOT NULL ,".
+            "PRIMARY KEY (play_id)) $charset_collate;";
+
+            maybe_create_table($this->playerlogs, $create_playerlogs_sql);
+            
             add_option('wp_media_player_autoLoad', '0');
             add_option('wp_media_player_autoPlay', '0');
@@ -129 +170 @@
             add_option('wp_media_player_show_on_home_page', 0);
         }
-
         /**
          * Create a 2D array from a CSV string
@@ -418 +458 @@
                     $scriptcode .= "player_".$post_id."_$i.mutedParam=".($tmp == '1'?'true':'false').";\n";
                     
+                    $scriptcode .= "player_".$post_id."_$i.postId=".$post_id.";\n";
+                    $scriptcode .= "player_".$post_id."_$i.ajaxUrl='".$this -> pluginurl."wp-media-player.php';\n";
+                    
                     $scriptcode .= "player_".$post_id."_$i.getPlaylist=getCustomPlaylist_".$post_id."_$i;\n";
                     $scriptcode .= "-->\n";
@@ -435 +478 @@
         {
             // This is a workaround for the weird behavior in content_save_pre.
-            // The filter is called multiple tims and the second time it contains the previos
+            // The filter is called multiple tims and the second time it contains the previous
             // revision, which screws up the meta logic.
             if ( $this -> content_save_pre_count > 0){
@@ -478 +521 @@
         {   
             if ($this -> show_player_check() == true)
-            {       
+            {   
+                global $post;
+            
                 wp_enqueue_script('jquery');
                 wp_enqueue_script('microsoftajax', $this -> pluginurl.'scripts/microsoftajax.js');
@@ -485 +530 @@
                 wp_enqueue_script('silverlightmedia', $this -> pluginurl.'scripts/silverlightmedia.js');
                 wp_enqueue_script('expressionplayer', $this -> pluginurl.'scripts/expressionplayer.js');
-                wp_enqueue_script('playerstrings', $this -> pluginurl.'scripts/playerstrings.js');
                 wp_enqueue_script('player', $this -> pluginurl.'styles/'.strtolower($this -> player_styles[$this -> plugin_parameters['style']]).'/player.js');
-                wp_enqueue_script('startmediaplayer', $this -> pluginurl.'scripts/startplayer.js.dev.js', array('jquery'));             
+                wp_enqueue_script('startmediaplayer', $this -> pluginurl.'scripts/startplayer.js.dev.js', array('jquery'));
             }
         }
@@ -631 +675 @@
         }
         
-        function process_status_ajax()
-        {
-            if ( isset($_GET['pid']) && isset($_GET['status']) ){
-            /*
-                $fp = fopen('C:\inetpub\wwwroot\wordpress\wp-content\data.txt', 'a');
-                fwrite($fp, 'success for post '.$_GET['pid'].' at '.date('l jS \of F Y h:i:s A'."\n"));
-                fclose($fp);
-            */
-            }           
+        function process_ajax_log_request()
+        {
+//          if ( isset($_GET['pid']) && isset($_GET['stat']) && isset($_GET['file']) ){
+//              $post_id = intval($_GET['pid']);
+//              $status = intval($_GET['stat']);
+//              // Check Whether Is A Valid Post
+//              $post = get_post($post_id);
+//              if ( $post ){
+//                  $post_title = addslashes($post->post_title);
+//              }
+
+                // REMOVE THIS
+//              $fp = fopen('C:\inetpub\wwwroot\wordpress\wp-content\data.txt', 'a');
+//              fwrite($fp, 'video file '.$_GET['file'].': status '.$_GET['stat'].' for post '.$_GET['pid'].' at '.date('l jS \of F Y h:i:s A'."\n"));
+//              fclose($fp);
+//          }           
         }
     } // End Class wp_media_player
@@ -650 +701 @@
         $mp_plugin = new wp_media_player();
     
-    $mp_plugin -> process_status_ajax();
+    $mp_plugin -> process_ajax_log_request();
 }