Changeset 19213 for extensions/gvideo/admin

Timestamp:

Nov 28, 2012, 12:49:06 PM (11 years ago)

Author:

mistic100

Message:

• add safe mode
• fix little error when adding video without thumbnail

Location:

extensions/gvideo/admin

Files:

• add.php (modified) (2 diffs)
• photo.php (modified) (2 diffs)
• template/add.tpl (modified) (1 diff)
• template/example-frame.jpg (modified) (previous)
• template/photo.tpl (modified) (1 diff)

extensions/gvideo/admin/add.php

@@ -12 +12 @@
     array_push($page['errors'], l10n('Please fill the video URL'));
   }
-  if ( !empty($_POST['url']) and ($video = parse_video_url($_POST['url'])) === false )
+  if ( !empty($_POST['url']) and ($video = parse_video_url($_POST['url'], isset($_POST['safe_mode']))) === false )
   {
-    array_push($page['errors'], l10n('Unable to contact host server'));
+    if (isset($_POST['safe_mode']))
+    {
+      array_push($page['errors'], l10n('an error happened'));
+    }
+    else
+    {
+      array_push($page['errors'], l10n('Unable to contact host server'));
+      array_push($page['errors'], l10n('Try in safe-mode'));
+    }
+    $_POST['safe_mode'] = true;
   }
   
@@ -20 +29 @@
   {
     // download thumbnail
-    $thumb_name = $video['type'].'-'.$video['video_id'].'-'.uniqid().'.'.get_extension($video['thumbnail']);
+    $thumb_ext = empty($video['thumbnail']) ? 'jpg' : get_extension($video['thumbnail']);
+    $thumb_name = $video['type'].'-'.$video['video_id'].'-'.uniqid().'.'.$thumb_ext;
     $thumb_source = $conf['data_location'].$thumb_name;
-    if (download_remote_file($video['thumbnail'], $thumb_source) !== true)
+    if ( empty($video['thumbnail']) or download_remote_file($video['thumbnail'], $thumb_source) !== true )
     {
       $thumb_source = $conf['data_location'].get_filename_wo_extension($thumb_name).'.jpg';

extensions/gvideo/admin/photo.php

@@ -72 +72 @@
   else if ($gvideo['url']!=$_POST['url'])
   {
-    if( ($video = parse_video_url($_POST['url'])) === false )
-    {
-      array_push($page['errors'], l10n('Unable to contact host server'));
+    if( ($video = parse_video_url($_POST['url'], isset($_POST['safe_mode']))) === false )
+    {
+      if (isset($_POST['safe_mode']))
+      {
+        array_push($page['errors'], l10n('an error happened'));
+      }
+      else
+      {
+        array_push($page['errors'], l10n('Unable to contact host server'));
+        array_push($page['errors'], l10n('Try in safe-mode'));
+      }
     }
   }
@@ -89 +97 @@
     {
       // download thumbnail
-      $thumb_name = $video['type'].'-'.$video['video_id'].'-'.uniqid().'.'.get_extension($video['thumbnail']);
+      $thumb_ext = empty($video['thumbnail']) ? 'jpg' : get_extension($video['thumbnail']);
+      $thumb_name = $video['type'].'-'.$video['video_id'].'-'.uniqid().'.'.$thumb_ext;
       $thumb_source = $conf['data_location'].$thumb_name;
-      if (download_remote_file($video['thumbnail'], $thumb_source) !== true)
+      if ( empty($video['thumbnail']) or download_remote_file($video['thumbnail'], $thumb_source) !== true )
       {
         $thumb_source = $conf['data_location'].get_filename_wo_extension($thumb_name).'.jpg';

extensions/gvideo/admin/template/add.tpl

@@ -88 +88 @@
 
 
-<p style="text-align:left;"><input type="submit" name="add_video" value="{'Add'|@translate}"></p>
+<p style="text-align:left;">
+  <label style="font-weight:bold;"><input type="checkbox" name="safe_mode" {if $POST.safe_mode}checked="checked"{/if}> {'Safe-mode'|@translate}</label>
+  <a class="showInfo" title="{'In safe-mode, the plugin does\'t try to contact the video host, usefull on some websites where remote connections are blocked.'|@translate}">i</a>
+  <br>
+  <input type="submit" name="add_video" value="{'Add'|@translate}">
+</p>
 
 <fieldset>

extensions/gvideo/admin/template/photo.tpl

@@ -98 +98 @@
 
     <p style="margin:0;">
+      <label style="font-weight:bold;"><input type="checkbox" name="safe_mode"> {'Safe-mode'|@translate}</label>
+      <br>
       <input class="submit" type="submit" value="{'Save Settings'|@translate}" name="save_properties">
     </p>