From d8ca48b9d39606b090a90dd5575afa757dd30d37 Mon Sep 17 00:00:00 2001
From: Andrew Berry <deviantintegral@gmail.com>
Date: Mon, 13 Jun 2011 10:24:55 -0400
Subject: [PATCH] Issue #1187020: Implement coder recommendations.

---
 includes/jplayer.admin.inc        |   46 ++++++++++++++++----------------
 includes/jplayer.theme.inc        |   50 +++++++++++++++++-----------------
 includes/jplayer_style_plugin.inc |    2 +-
 jplayer.install                   |    7 +++--
 jplayer.module                    |   52 ++++++++++++++++++------------------
 5 files changed, 79 insertions(+), 78 deletions(-)

diff --git a/includes/jplayer.admin.inc b/includes/jplayer.admin.inc
index 135179d..391a45e 100644
--- a/includes/jplayer.admin.inc
+++ b/includes/jplayer.admin.inc
@@ -9,30 +9,30 @@
  */
 function jplayer_settings_form($form, &$form_state) {
   $form = array();
-  
+
   $form['library'] = array(
-    '#type' => 'fieldset', 
-    '#title' => t('Library'), 
-    '#weight' => 0, 
-    '#collapsible' => TRUE, 
+    '#type' => 'fieldset',
+    '#title' => t('Library'),
+    '#weight' => 0,
+    '#collapsible' => TRUE,
     '#collapsed' => FALSE,
   );
-  
+
   $form['library']['jplayer_directory'] = array(
     '#type' => 'textfield',
     '#title' => t('jPlayer library directory'),
     '#default_value' => variable_get('jplayer_directory', 'sites/all/libraries/jplayer'),
     '#description' => t('Specify the path that contains the jPlayer library. The jquery.jplayer.min.js file should be in the root of this directory.'),
   );
-  
+
   $form['timeformat'] = array(
-    '#type' => 'fieldset', 
-    '#title' => t('Time Format'), 
-    '#weight' => 1, 
-    '#collapsible' => TRUE, 
+    '#type' => 'fieldset',
+    '#title' => t('Time Format'),
+    '#weight' => 1,
+    '#collapsible' => TRUE,
     '#collapsed' => TRUE,
   );
-  
+
   $form['timeformat']['jplayer_showHour'] = array(
     '#title' => t('Display hours'),
     '#type' => 'select',
@@ -42,7 +42,7 @@ function jplayer_settings_form($form, &$form_state) {
     ),
     '#default_value' => variable_get('jplayer_showHour', FALSE),
   );
-  
+
   $form['timeformat']['jplayer_showMin'] = array(
     '#title' => t('Display minutes'),
     '#type' => 'select',
@@ -52,7 +52,7 @@ function jplayer_settings_form($form, &$form_state) {
     ),
     '#default_value' => variable_get('jplayer_showMin', TRUE),
   );
-  
+
   $form['timeformat']['jplayer_showSec'] = array(
     '#title' => t('Display seconds'),
     '#type' => 'select',
@@ -62,7 +62,7 @@ function jplayer_settings_form($form, &$form_state) {
     ),
     '#default_value' => variable_get('jplayer_showSec', TRUE),
   );
-  
+
   $form['timeformat']['jplayer_padHour'] = array(
     '#title' => t('Zero-pad the hours'),
     '#type' => 'select',
@@ -72,7 +72,7 @@ function jplayer_settings_form($form, &$form_state) {
     ),
     '#default_value' => variable_get('jplayer_padHour', FALSE),
   );
-  
+
   $form['timeformat']['jplayer_padMin'] = array(
     '#title' => t('Zero-pad the minutes'),
     '#type' => 'select',
@@ -82,7 +82,7 @@ function jplayer_settings_form($form, &$form_state) {
     ),
     '#default_value' => variable_get('jplayer_padMin', TRUE),
   );
-  
+
   $form['timeformat']['jplayer_padSec'] = array(
     '#title' => t('Zero-pad the seconds'),
     '#type' => 'select',
@@ -92,31 +92,31 @@ function jplayer_settings_form($form, &$form_state) {
     ),
     '#default_value' => variable_get('jplayer_padSec', TRUE),
   );
-  
+
   $form['timeformat']['jplayer_sepHour'] = array(
     '#title' => t('Hours seperator'),
     '#type' => 'textfield',
     '#maxlength' => 32,
     '#default_value' => variable_get('jplayer_sepHour', ':'),
   );
-  
+
   $form['timeformat']['jplayer_sepMin'] = array(
     '#title' => t('Minutes seperator'),
     '#type' => 'textfield',
     '#maxlength' => 32,
     '#default_value' => variable_get('jplayer_sepMin', ':'),
   );
-  
+
   $form['timeformat']['jplayer_sepSec'] = array(
     '#title' => t('Seconds seperator'),
     '#type' => 'textfield',
     '#maxlength' => 32,
     '#default_value' => variable_get('jplayer_sepSec', ''),
   );
-  
+
   $form['#validate'][] = 'jplayer_settings_form_validate';
   $form['#submit'][] = 'jplayer_settings_form_submit';
-  
+
   return system_settings_form($form);
 }
 
@@ -135,4 +135,4 @@ function jplayer_settings_form_validate($form, &$form_state) {
  */
 function jplayer_settings_form_submit($form, &$form_state) {
   drupal_set_message(t('The jPlayer library (version @version) successfully found in the %directory directory.', array('@version' => $form_state['values']['version']['version'], '%directory' => $form_state['values']['jplayer_directory'])));
-}
\ No newline at end of file
+}
diff --git a/includes/jplayer.theme.inc b/includes/jplayer.theme.inc
index aba436a..3a3a589 100644
--- a/includes/jplayer.theme.inc
+++ b/includes/jplayer.theme.inc
@@ -9,12 +9,12 @@
  */
 function template_preprocess_jplayer(&$vars) {
   $vars['mode'] = $vars['settings']['mode'];
-  
+
   $player = jplayer_sort_files($vars['items'], $vars['player_id'], $vars['mode']);
-  
+
   $vars['playlist'] = theme('jplayer_item_list', array('items' => $player['playlist']));
   $vars['type'] = $player['type'];
-  
+
   // Add player settings
   $player = array(
     'jplayerInstances' => array(
@@ -32,7 +32,7 @@ function template_preprocess_jplayer(&$vars) {
     ),
   );
   drupal_add_js($player, 'setting');
-  
+
   $vars['dynamic'] = jplayer_add_core_js();
 }
 
@@ -96,29 +96,29 @@ function jplayer_sort_files($raw_files = array(), $player_id, $type = 'single')
   $video_extensions = array('m4v', 'mp4', 'ogv', 'webmv');
   $audio_extensions = array('mp3', 'm4a', 'oga', 'webma', 'wav');
   $poster_extensions = array('jpg', 'jpeg', 'png', 'gif');
-  
+
   $poster = NULL;
   $videos = FALSE;
   $audio = FALSE;
   $media = array();
-  
+
   $files = array();
   $extensions = array();
   $playlist = array();
-  
+
   // Look through all the files provided and see what we have
-  foreach($raw_files as $delta => $item) {
+  foreach ($raw_files as $delta => $item) {
     // Get file URL
     if (!isset($item['url'])) {
       $item['url'] = file_create_url($item['uri']);
     }
-    
+
     // Get file extension
     if (!isset($item['ext'])) {
       $fileinfo = pathinfo($item['url']);
       $item['ext'] = $fileinfo['extension'];
     }
-    
+
     // Get file label
     if (!isset($item['label'])) {
       if (empty($item['description'])) {
@@ -128,24 +128,24 @@ function jplayer_sort_files($raw_files = array(), $player_id, $type = 'single')
         $item['label'] = $item['description'];
       }
     }
-    
+
     // Add file into correct group
     if (in_array($item['ext'], $video_extensions)) {
       $videos = TRUE;
       $item['type'] = 'audio';
     }
-    else if (in_array($item['ext'], $audio_extensions)) {
+    elseif (in_array($item['ext'], $audio_extensions)) {
       $audio = TRUE;
       $item['type'] = 'video';
     }
-    else if (in_array($item['ext'], $poster_extensions)) {
+    elseif (in_array($item['ext'], $poster_extensions)) {
       $poster = $item['url'];
       $item['type'] = 'poster';
     }
-    
+
     $media[] = $item;
   }
-  
+
   $num = 0;
   foreach ($media as $file) {
     if ($videos == TRUE && $type != 'playlist') {
@@ -154,20 +154,20 @@ function jplayer_sort_files($raw_files = array(), $player_id, $type = 'single')
       }
       $player_type = 'video';
     }
-    else if ($videos == TRUE && $type == 'playlist') {
+    elseif ($videos == TRUE && $type == 'playlist') {
       $player_type = 'video';
     }
     else {
       $player_type = 'audio';
     }
-    
+
     if (isset($file) && $file['type'] == 'audio') {
       $files[][$file['ext']] = $file['url'];
       $extensions[] = $file['ext'];
       $playlist[] = l($file['label'], $file['url'], array('attributes' => array('id' => $player_id . '_item_' . $num, 'tabindex' => 1)));
       $num++;
     }
-    else if (isset($file) && $file['type'] == 'video') {
+    elseif (isset($file) && $file['type'] == 'video') {
       $files[][$file['ext']] = $file['url'];
       if ($poster != NULL) {
         $files[]['poster'] = $poster;
@@ -177,13 +177,13 @@ function jplayer_sort_files($raw_files = array(), $player_id, $type = 'single')
       $num++;
     }
   }
-  
+
   if ($type == 'single') {
     $item = array_shift($playlist);
     $playlist = array();
     $playlist[] = $item;
   }
-  
+
   return array('files' => $files, 'extensions' => implode(',', $extensions), 'playlist' => $playlist, 'type' => $player_type);
 }
 
@@ -195,12 +195,12 @@ function template_preprocess_jplayer_view_playlist(&$vars) {
   $vars['settings'] = $view->style_plugin->options;
   $vars['mode'] = 'playlist';
   $vars['player_id'] = 'jplayer-view-' . str_replace('_', '-', check_plain($view->name));
-  
+
   $player = jplayer_sort_files($vars['items'], $vars['player_id'], $vars['mode']);
-  
+
   $vars['playlist'] = theme('jplayer_item_list', array('items' => $player['playlist']));
   $vars['type'] = $player['type'];
-  
+
   // Add player settings
   $player = array(
     'jplayerInstances' => array(
@@ -218,6 +218,6 @@ function template_preprocess_jplayer_view_playlist(&$vars) {
     ),
   );
   drupal_add_js($player, 'setting');
-  
+
   $vars['dynamic'] = jplayer_add_core_js();
-}
\ No newline at end of file
+}
diff --git a/includes/jplayer_style_plugin.inc b/includes/jplayer_style_plugin.inc
index 693eb29..a53e89e 100644
--- a/includes/jplayer_style_plugin.inc
+++ b/includes/jplayer_style_plugin.inc
@@ -65,7 +65,7 @@ class jplayer_style_plugin extends views_plugin_style {
         ),
       ),
     );
-  
+
     $form += jplayer_field_formatter_settings_form($field, $instance, 'view', $form, $form_state);
   }
 
diff --git a/jplayer.install b/jplayer.install
index 60a9c7c..2da17d5 100644
--- a/jplayer.install
+++ b/jplayer.install
@@ -9,7 +9,7 @@
  */
 function jplayer_requirements($phase) {
   $requirements = array();
-  
+
   if ($phase == 'runtime') {
     $requirements['jplayer']['title'] = t('jPlayer');
     if ($jplayer_version = jplayer_get_version()) {
@@ -22,6 +22,7 @@ function jplayer_requirements($phase) {
       $requirements['jplayer']['severity'] = REQUIREMENT_ERROR;
     }
   }
-  
+
   return $requirements;
-}
\ No newline at end of file
+}
+
diff --git a/jplayer.module b/jplayer.module
index 46fe0d1..ca872fa 100644
--- a/jplayer.module
+++ b/jplayer.module
@@ -87,7 +87,7 @@ function jplayer_field_formatter_info() {
  */
 function jplayer_field_formatter_view($obj_type, $object, $field, $instance, $langcode, $items, $display) {
   $element = array();
-  
+
   switch ($display['type']) {
     case 'jplayer_player':
       $output = theme(
@@ -98,13 +98,13 @@ function jplayer_field_formatter_view($obj_type, $object, $field, $instance, $la
           'settings' => $display['settings'],
         )
       );
-      
+
       $element[0] = array(
         '#markup' => $output,
       );
       break;
   }
-  
+
   return $element;
 }
 
@@ -114,10 +114,10 @@ function jplayer_field_formatter_view($obj_type, $object, $field, $instance, $la
 function jplayer_field_formatter_settings_form($field, $instance, $view_mode, $form, &$form_state) {
   $display = $instance['display'][$view_mode];
   $settings = $display['settings'];
-  
+
   $form = array();
-  
-  if($display['type'] == 'jplayer_player') {
+
+  if ($display['type'] == 'jplayer_player') {
     $form['mode'] = array(
       '#title' => t('Kind'),
       '#type' => 'select',
@@ -127,7 +127,7 @@ function jplayer_field_formatter_settings_form($field, $instance, $view_mode, $f
       ),
       '#default_value' => $settings['mode'],
     );
-    
+
     $form['autoplay'] = array(
       '#title' => t('Autoplay'),
       '#type' => 'select',
@@ -137,7 +137,7 @@ function jplayer_field_formatter_settings_form($field, $instance, $view_mode, $f
       ),
       '#default_value' => $settings['autoplay'],
     );
-    
+
     $form['solution'] = array(
       '#title' => t('Preferred solution'),
       '#type' => 'select',
@@ -147,7 +147,7 @@ function jplayer_field_formatter_settings_form($field, $instance, $view_mode, $f
       ),
       '#default_value' => $settings['solution'],
     );
-    
+
     $form['preload'] = array(
       '#title' => t('Preload media'),
       '#type' => 'select',
@@ -158,7 +158,7 @@ function jplayer_field_formatter_settings_form($field, $instance, $view_mode, $f
       '#description' => t("Preloading media before it's requested isn't available in all browsers."),
       '#default_value' => $settings['preload'],
     );
-    
+
     $form['volume'] = array(
       '#title' => t('Initial volume'),
       '#type' => 'textfield',
@@ -168,7 +168,7 @@ function jplayer_field_formatter_settings_form($field, $instance, $view_mode, $f
       '#default_value' => $settings['volume'],
       '#element_validate' => array('jplayer_volume_check'),
     );
-    
+
     $form['muted'] = array(
       '#title' => t('Initially muted'),
       '#type' => 'select',
@@ -178,7 +178,7 @@ function jplayer_field_formatter_settings_form($field, $instance, $view_mode, $f
       ),
       '#default_value' => $settings['muted'],
     );
-    
+
     $form['repeat'] = array(
       '#title' => t('Repeat'),
       '#type' => 'select',
@@ -189,7 +189,7 @@ function jplayer_field_formatter_settings_form($field, $instance, $view_mode, $f
       ),
       '#default_value' => $settings['repeat'],
     );
-    
+
     $form['backgroundColor'] = array(
       '#title' => t('Background color'),
       '#type' => 'textfield',
@@ -199,7 +199,7 @@ function jplayer_field_formatter_settings_form($field, $instance, $view_mode, $f
       '#default_value' => $settings['backgroundColor'],
     );
   }
-  
+
   return $form;
 }
 
@@ -208,7 +208,7 @@ function jplayer_field_formatter_settings_form($field, $instance, $view_mode, $f
  */
 function jplayer_volume_check($element, &$form_state) {
   $value = $element['#value'];
-  
+
   if ($value < 0 || $value > 100) {
     form_set_error($element, t('Volume must be a percentage between 0% and 100%.'));
   }
@@ -220,9 +220,9 @@ function jplayer_volume_check($element, &$form_state) {
 function jplayer_field_formatter_settings_summary($field, $instance, $view_mode) {
   $display = $instance['display'][$view_mode];
   $settings = $display['settings'];
-  
+
   $summary = '';
-  
+
   if ($display['type'] == 'jplayer_player') {
     if (isset($settings['autoplay']) && $settings['autoplay'] == 1) {
       $summary = t('Single jPlayer instance which autoplays.');
@@ -231,7 +231,7 @@ function jplayer_field_formatter_settings_summary($field, $instance, $view_mode)
       $summary = t('Single jPlayer instance.');
     }
   }
-  
+
   return $summary;
 }
 
@@ -260,11 +260,11 @@ function jplayer_library() {
  */
 function jplayer_get_version($directory = NULL) {
   $version = 0;
-  
+
   if (!isset($directory)) {
     $directory = variable_get('jplayer_directory', 'sites/all/libraries/jplayer');
   }
-  
+
   if (file_exists($directory . '/jquery.jplayer.min.js')) {
     $contents = file_get_contents($directory . '/jquery.jplayer.min.js');
   }
@@ -274,16 +274,16 @@ function jplayer_get_version($directory = NULL) {
   else {
     $contents = NULL;
   }
-  
+
   $matches = array();
   preg_match('/Version:?[ ]*([\d.]+)/i', $contents, $matches);
-  
+
   if (isset($matches[1])) {
     $version = $matches[1];
   }
-  
+
   $parts = explode('.', $version);
-  
+
   return array('version' => $version, 'major' => $parts[0], 'minor' => $parts[1]);
 }
 
@@ -307,7 +307,7 @@ function jplayer_add_core_js() {
     ),
   );
   drupal_add_js($settings, array('type' => 'setting'));
-  
+
   return array(
     '#attached' => array(
       'library' => array(
@@ -331,4 +331,4 @@ function jplayer_views_api() {
     'path' => drupal_get_path('module', 'jplayer') . '/includes',
     'api' => 3.0,
   );
-}
\ No newline at end of file
+}
-- 
1.7.5.2