Changeset 17383 for extensions/gvideo/admin

Timestamp:

Aug 4, 2012, 4:15:54 PM (12 years ago)

Author:

mistic100

Message:

• simplify add page
• simplify migration task
• add option to add film effect on element edition page

Location:

extensions/gvideo/admin

Files:

• add.php (modified) (3 diffs)
• template/add.tpl (modified) (2 diffs)
• template/style.css (modified) (1 diff)

extensions/gvideo/admin/add.php

@@ -12 +12 @@
     array_push($page['errors'], l10n('Please fill the video URL'));
   }
-  if ($_POST['name_server'] == 'false' and empty($_POST['name']))
-  {
-    array_push($page['errors'], l10n('Please fill the video name'));
-  }
-  if ($_POST['thumbnail_server'] == 'false' and empty($_FILES['thumbnail_src']))
-  {
-    array_push($page['errors'], l10n('Please add a thumbnail'));
-  }
   if ( !empty($_POST['url']) and ($video = parse_video_url($_POST['url'])) === false )
   {
@@ -28 +20 @@
   {
     // download thumbnail
-    $thumb_name = $video['type'].'-'.$video['id'].'-'.uniqid();
-    if ($_POST['thumbnail_server'] == 'true')
+    $thumb_name = $video['type'].'-'.$video['id'].'-'.uniqid().'.'.get_extension($video['thumbnail']);
+    $thumb_source = $conf['data_location'].$thumb_name;
+    if (download_remote_file($video['thumbnail'], $thumb_source) !== true)
     {
-      $thumb_name.= '.'.get_extension($video['thumbnail']);
-      $thumb_source = $conf['data_location'].$thumb_name;
-      if (download_remote_file($video['thumbnail'], $thumb_source) !== true)
-      {
-        $thumb_source = $conf['data_location'].get_filename_wo_extension($thumb_name).'.jpg';
-        copy(GVIDEO_PATH.'mimetypes/'.$video['type'].'.jpg', $thumb_source);
-      }
-    }
-    // upload thumbnail
-    else
-    {
-      if ($_FILES['thumbnail_src']['error'] > 0) 
-      {
-        array_push($page['errors'], l10n('Unknown upload error'));
-      }
-      else if ( !in_array($_FILES['thumbnail_src']['type'], array('image/jpeg','image/png','image/gif')) )
-      {
-        array_push($page['errors'], l10n('Incorrect file type,').' '.sprintf(l10n('Allowed file types: %s.'), 'jpg, png, gif'));
-      }
-      
-      $thumb_name.= '.'.get_extension($_FILES['thumbnail_src']['name']);
-      $thumb_source = $_FILES['thumbnail_src']['tmp_name'];
+      $thumb_source = $conf['data_location'].get_filename_wo_extension($thumb_name).'.jpg';
+      copy(GVIDEO_PATH.'mimetypes/'.$video['type'].'.jpg', $thumb_source);
     }
     
-    if (count($page['errors']) == 0)
+    if (isset($_POST['add_film_frame']))
     {
-      if (isset($_POST['add_film_frame']))
-      {
-        add_film_frame($thumb_source);
-      }
+      add_film_frame($thumb_source);
+    }
+    
+    // add image and update infos
+    $image_id = add_uploaded_file($thumb_source, $thumb_name, array($_POST['category']));
+    
+    $updates = array(
+      'name' => pwg_db_real_escape_string($video['title']),
+      'comment' => pwg_db_real_escape_string($video['description']),
+      'author' => pwg_db_real_escape_string($video['author']),
+      );
+    
+    single_update(
+      IMAGES_TABLE,
+      $updates,
+      array('id' => $image_id),
+      true
+      );
+    
+    // register video
+    if ($_POST['size_common'] == 'true')
+    {
+      $_POST['width'] = $_POST['height'] = '';
+    }
+    if ($_POST['autoplay_common'] == 'true')
+    {
+      $_POST['autoplay'] = '';
+    }
+    
+    $insert = array(
+      'picture_id' => $image_id,
+      'url' => $video['url'],
+      'type' => $video['type'],
+      'video_id' => $video['id'],
+      'width' => $_POST['width'],
+      'height' => $_POST['height'],
+      'autoplay' => $_POST['autoplay'],
+      );
       
-      // add image and update infos
-      $image_id = add_uploaded_file($thumb_source, $thumb_name, array($_POST['category']));
+    single_insert(
+      GVIDEO_TABLE,
+      $insert
+      );
       
-      if ($_POST['name_server'] == 'true')        $_POST['name'] = $video['title'];
-      if ($_POST['description_server'] == 'true') $_POST['description'] = $video['description'];
-      if ($_POST['author_server'] == 'true')      $_POST['author'] = $video['author'];
-      
-      $updates = array(
-        'name' => pwg_db_real_escape_string($_POST['name']),
-        'comment' => pwg_db_real_escape_string(@$_POST['description']),
-        'author' => pwg_db_real_escape_string(@$_POST['author']),
-        );
-      
-      single_update(
-        IMAGES_TABLE,
-        $updates,
-        array('id' => $image_id),
-        true
-        );
-      
-      // register video
-      if ($_POST['size_common'] == 'true')
-      {
-        $_POST['width'] = $_POST['height'] = '';
-      }
-      if ($_POST['autoplay_common'] == 'true')
-      {
-        $_POST['autoplay'] = '';
-      }
-      
-      $insert = array(
-        'picture_id' => $image_id,
-        'type' => $video['type'],
-        'video_id' => $video['id'],
-        'width' => $_POST['width'],
-        'height' => $_POST['height'],
-        'autoplay' => $_POST['autoplay'],
-        );
-        
-      single_insert(
-        GVIDEO_TABLE,
-        $insert
-        );
-        
-      array_push($page['infos'], sprintf(
-        l10n('Video successfully added. <a href="%s">View</a>'), 
-        make_picture_url(array(
-          'image_id' => $image_id,
-          'category' => array(
-            'id' => $_POST['category'],
-            'name' => '',
-            'permalink' => '',
-            ),
-          ))
-        ));
-      unset($_POST);
-    }
+    array_push($page['infos'], sprintf(
+      l10n('Video successfully added. <a href="%s">View</a>'), 
+      make_picture_url(array(
+        'image_id' => $image_id,
+        'category' => array(
+          'id' => $_POST['category'],
+          'name' => '',
+          'permalink' => '',
+          ),
+        ))
+      ));
+    unset($_POST);
   }
 }
@@ -143 +110 @@
   'upload_max_filesize' => $upload_max_filesize,
   'upload_max_filesize_shorthand' => $upload_max_filesize_shorthand,
+  'gd_available' => function_exists('imagecreatetruecolor'),
   'gvideo' => $conf['gvideo'],
   'POST' => @$_POST,

extensions/gvideo/admin/template/add.tpl

@@ -37 +37 @@
       </label>
     </li>
-    <li>
-      <span class="property">{'Name'|@translate}</span>
-      <label><input type="radio" name="name_server" value="true" {if $POST.name_server != 'false'}checked="checked"{/if} data-toggle="name"> {'From the video'|@translate}</label>
-      <label><input type="radio" name="name_server" value="false" {if $POST.name_server == 'false'}checked="checked"{/if} data-toggle="name"> {'Change'|@translate}</label>
-    </li>
-    <li {if $POST.name_server != 'false'}style="display:none;"{/if} id="name">
-      <span class="property">&nbsp;</span>
-      <input type="text" name="name" value="{$POST.name}" size="70">
-    </li>
-    <li>
-      <span class="property">{'Author'|@translate}</span>
-      <label><input type="radio" name="author_server" value="true" {if $POST.author_server != 'false'}checked="checked"{/if} data-toggle="author"> {'From the video'|@translate}</label>
-      <label><input type="radio" name="author_server" value="false" {if $POST.author_server == 'false'}checked="checked"{/if} data-toggle="author"> {'Change'|@translate}</label>
-    </li>
-    <li {if $POST.author_server != 'false'}style="display:none;"{/if} id="author">
-      <span class="property">&nbsp;</span>
-      <input type="text" name="author" value="{$POST.author}" size="20">
-    </li>
-    <li>
-      <span class="property">{'Description'|@translate}</span>
-      <label><input type="radio" name="description_server" value="true" {if $POST.description_server != 'false'}checked="checked"{/if} data-toggle="description"> {'From the video'|@translate}</label>
-      <label><input type="radio" name="description_server" value="false" {if $POST.description_server == 'false'}checked="checked"{/if} data-toggle="description"> {'Change'|@translate}</label>
-    </li>
-    <li {if $POST.description_server != 'false'}style="display:none;"{/if} id="description">
-      <span class="property">&nbsp;</span>
-      <textarea name="description" rows="5" cols="50">{$POST.description}</textarea>
-    </li>
+  {if $gd_available}
     <li>
       <span class="property">{'Thumbnail'|@translate}</span>
-      <label><input type="radio" name="thumbnail_server" value="true" checked="checked" data-toggle="thumbnail_src"> {'From the video'|@translate}</label>
-      <label><input type="radio" name="thumbnail_server" value="false" data-toggle="thumbnail_src"> {'Change'|@translate}</label>
-    </li>
-    <li id="thumbnail_src" style="display:none;">
-      <span class="property">&nbsp;</span>
-      <input type="file" name="thumbnail_src"><br>
-      <span class="property">&nbsp;</span>
-      {'Maximum file size: %sB.'|@translate|@sprintf:$upload_max_filesize_shorthand} {'Allowed file types: %s.'|@translate|@sprintf:'jpg, png, gif'}
-      <input type="hidden" name="MAX_FILE_SIZE" value="{$upload_max_filesize}">
-    </li>
-    <li>
-      <span class="property">&nbsp;</span>
       <label><input type="checkbox" name="add_film_frame" value="true"> {'Add film effect'|@translate} </label>
       <a class="showInfo" title="<img src='{$GVIDEO_PATH}admin/template/example-frame.jpg'>">i</a>
     </li>
+  {/if}
   </ul>  
 </fieldset>
@@ -117 +80 @@
   <legend>{'Supported services'|@translate}</legend>
   
-  <ul>
+  <ul class="services">
     <li>
       <img class="icon" src="{$GVIDEO_PATH}admin/template/icons/youtube.png">

extensions/gvideo/admin/template/style.css

@@ -52 +52 @@
   font-size:0.8em;
 }
+
+ul.services li {
+  display:inline;
+  margin-left:20px;
+}