Changeset 29627 for extensions/gvideo/admin

Timestamp:

Sep 18, 2014, 3:53:51 PM (10 years ago)

Author:

mistic100

Message:

remove "safe mode" checkbox, now fully automatic

Location:

extensions/gvideo/admin

Files:

• add.php (modified) (1 diff)
• photo.php (modified) (2 diffs)
• template/add.tpl (modified) (1 diff)
• template/photo.tpl (modified) (1 diff)

extensions/gvideo/admin/add.php

@@ -18 +18 @@
       $page['errors'][] = l10n('Please fill the video URL');
     }
-    else if ( ($video = parse_video_url($_POST['url'], isset($_POST['safe_mode']))) === false )
+    else if ( ($video = parse_video_url($_POST['url'], $safe_mode)) === false )
     {
-      if (isset($_POST['safe_mode']))
+      $page['errors'][] = l10n('an error happened');
+    }
+    else
+    {
+      if ($safe_mode === true)
       {
-        $page['errors'][] = l10n('an error happened');
+        $page['warnings'][] = l10n('Unable to contact host server');
+        $page['warnings'][] = l10n('Video data like description and thumbnail might be missing');
       }
-      else
-      {
-        $page['errors'][] = l10n('Unable to contact host server');
-        $page['errors'][] = l10n('Try in safe-mode');
-      }
-      $_POST['safe_mode'] = true;
-    }
-
-    if (count($page['errors']) == 0)
-    {
+      
       if ($_POST['size_common'] == 'true')
       {

extensions/gvideo/admin/photo.php

@@ -56 +56 @@
     else if ($gvideo['url']!=$_POST['url'])
     {
-      if ( ($video = parse_video_url($_POST['url'], isset($_POST['safe_mode']))) === false )
-      {
-        if (isset($_POST['safe_mode']))
-        {
-          $page['errors'][] = l10n('an error happened');
-        }
-        else
-        {
-          $page['errors'][] = l10n('Unable to contact host server');
-          $page['errors'][] = l10n('Try in safe-mode');
-        }
+      if ( ($video = parse_video_url($_POST['url'], $safe_mode)) === false )
+      {
+        $page['errors'][] = l10n('an error happened');
       }
     }
     else
     {
+      $safe_mode = false;
       $video = $gvideo;
     }
@@ -76 +69 @@
     if (count($page['errors']) == 0)
     {
-
+      if ($safe_mode === true)
+      {
+        $page['warnings'][] = l10n('Unable to contact host server');
+        $page['warnings'][] = l10n('Video data like description and thumbnail might be missing');
+      }
+      
       if ($gvideo['url'] != $video['url'])
       {

extensions/gvideo/admin/template/add.tpl

@@ -124 +124 @@
 <p style="text-align:left;">
   <input type="submit" name="add_video" value="{'Add'|translate}">
-  
-  <span class="embed-hide provider-show">
-    <label style="font-weight:bold;"><input type="checkbox" name="safe_mode" {if $POST.safe_mode}checked="checked"{/if}> {'Safe-mode'|translate}</label>
-    <a class="icon-info-circled-1 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|escape:html}"></a>
-  </span>
 </p>
 

extensions/gvideo/admin/template/photo.tpl

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