Changeset 19056


Ignore:
Timestamp:
11/17/12 17:05:32 (7 years ago)
Author:
mistic100
Message:

allow to add private dailymotion videos, remove videobb support, add tags support

Location:
extensions/gvideo
Files:
1 deleted
14 edited

Legend:

Unmodified
Added
Removed
  • extensions/gvideo/admin.php

    r17626 r19056  
    44global $template, $page, $conf; 
    55 
    6 $conf['gvideo'] = unserialize($conf['gvideo']); 
     6if (is_string($conf['gvideo'])) 
     7{ 
     8  $conf['gvideo'] = unserialize($conf['gvideo']); 
     9} 
    710 
    811$page['tab'] = (isset($_GET['tab'])) ? $_GET['tab'] : $page['tab'] = 'add'; 
  • extensions/gvideo/admin/add.php

    r17488 r19056  
    2020  { 
    2121    // download thumbnail 
    22     $thumb_name = $video['type'].'-'.$video['id'].'-'.uniqid().'.'.get_extension($video['thumbnail']); 
     22    $thumb_name = $video['type'].'-'.$video['video_id'].'-'.uniqid().'.'.get_extension($video['thumbnail']); 
    2323    $thumb_source = $conf['data_location'].$thumb_name; 
    2424    if (download_remote_file($video['thumbnail'], $thumb_source) !== true) 
     
    3838    $updates = array( 
    3939      'name' => pwg_db_real_escape_string($video['title']), 
    40       'comment' => pwg_db_real_escape_string($video['description']), 
    4140      'author' => pwg_db_real_escape_string($video['author']), 
    4241      'is_gvideo' => 1, 
    4342      ); 
     43       
     44    if ( $_POST['sync_description'] and !empty($video['description']) ) 
     45    { 
     46      $updates['comment'] = pwg_db_real_escape_string($video['description']); 
     47    } 
     48    if ( $_POST['sync_tags'] and !empty($video['tags']) ) 
     49    { 
     50      set_tags(get_tag_ids(implode(',', $video['tags'])), $image_id); 
     51    } 
    4452     
    4553    single_update( 
     
    5563      $_POST['width'] = $_POST['height'] = ''; 
    5664    } 
     65    else if ( !preg_match('#^([0-9]+)$#', $_POST['width']) or !preg_match('#^([0-9]+)$#', $_POST['height']) ) 
     66    { 
     67      array_push($page['errors'], l10n('Width and height must be integers')); 
     68      $_POST['width'] = $_POST['height'] = ''; 
     69    } 
    5770    if ($_POST['autoplay_common'] == 'true') 
    5871    { 
     
    6477      'url' => $video['url'], 
    6578      'type' => $video['type'], 
    66       'video_id' => $video['id'], 
     79      'video_id' => $video['video_id'], 
    6780      'width' => $_POST['width'], 
    6881      'height' => $_POST['height'], 
  • extensions/gvideo/admin/config.php

    r17307 r19056  
    55{ 
    66  $conf['gvideo'] = array( 
    7     'autoplay' => $_POST['autoplay'], 
    8     'width' => $_POST['width'], 
    9     'height' => $_POST['height'], 
     7    'autoplay' => (int)$_POST['autoplay'], 
     8    'width' => (int)$_POST['width'], 
     9    'height' => (int)$_POST['height'], 
     10    'sync_description' => (int)$_POST['sync_description'], 
     11    'sync_tags' => (int)$_POST['sync_tags'], 
    1012    'vimeo' => array( 
    1113      'title' => (int)isset($_POST['vimeo']['title']), 
     
    2426    'videobb' => array(), 
    2527    ); 
    26        
     28   
    2729  conf_update_param('gvideo', serialize($conf['gvideo'])); 
    2830  array_push($page['infos'], l10n('Information data registered in database')); 
  • extensions/gvideo/admin/photo.php

    r17687 r19056  
    7070    array_push($page['errors'], l10n('Please fill the video URL')); 
    7171  } 
    72   if ( !empty($_POST['url']) and ($video = parse_video_url($_POST['url'])) === false ) 
    73   { 
    74     array_push($page['errors'], l10n('Unable to contact host server')); 
     72  else if ($gvideo['url']!=$_POST['url']) 
     73  { 
     74    if( ($video = parse_video_url($_POST['url'])) === false ) 
     75    { 
     76      array_push($page['errors'], l10n('Unable to contact host server')); 
     77    } 
     78  } 
     79  else 
     80  { 
     81    $video = $gvideo; 
    7582  } 
    7683   
     
    8289    { 
    8390      // download thumbnail 
    84       $thumb_name = $video['type'].'-'.$video['id'].'-'.uniqid().'.'.get_extension($video['thumbnail']); 
     91      $thumb_name = $video['type'].'-'.$video['video_id'].'-'.uniqid().'.'.get_extension($video['thumbnail']); 
    8592      $thumb_source = $conf['data_location'].$thumb_name; 
    8693      if (download_remote_file($video['thumbnail'], $thumb_source) !== true) 
     
    95102      $updates = array( 
    96103        'name' => pwg_db_real_escape_string($video['title']), 
    97         'comment' => pwg_db_real_escape_string($video['description']), 
    98104        'author' => pwg_db_real_escape_string($video['author']), 
    99105        'is_gvideo' => 1, 
    100106        ); 
     107         
     108      if ( $_POST['sync_description'] and !empty($video['description']) ) 
     109      { 
     110        $updates['comment'] = pwg_db_real_escape_string($video['description']); 
     111      } 
     112      else 
     113      { 
     114        $updates['comment'] = null; 
     115      } 
     116      if ( $_POST['sync_tags'] and !empty($video['tags']) ) 
     117      { 
     118        set_tags(get_tag_ids(implode(',', $video['tags'])), $image_id); 
     119      } 
    101120       
    102121      single_update( 
     
    126145      'url' => $video['url'], 
    127146      'type' => $video['type'], 
    128       'video_id' => $video['id'], 
     147      'video_id' => $video['video_id'], 
    129148      'width' => $_POST['width'], 
    130149      'height' => $_POST['height'], 
     
    199218  $gvideo['autoplay_common'] = 'true'; 
    200219} 
     220$gvideo['sync_description'] = $conf['gvideo']['sync_description']; 
     221$gvideo['sync_tags'] = $conf['gvideo']['sync_tags']; 
    201222 
    202223if (function_exists('imagecreatetruecolor')) 
  • extensions/gvideo/admin/template/add.tpl

    r17626 r19056  
    7474      <label><input type="radio" name="autoplay" value="1" {if $POST.autoplay == '1'}checked="checked"{/if}> {'Yes'|@translate}</label> 
    7575    </li> 
     76    <li> 
     77      <span class="property">{'Get video description'|@translate}</span> 
     78      <label><input type="radio" name="sync_description" value="1" {if $gvideo.sync_description}checked="checked"{/if}> {'Yes'|@translate}</label> 
     79      <label><input type="radio" name="sync_description" value="0" {if not $gvideo.sync_description}checked="checked"{/if}> {'No'|@translate}</label> 
     80    </li> 
     81    <li> 
     82      <span class="property">{'Get video tags'|@translate}</span> 
     83      <label><input type="radio" name="sync_tags" value="1" {if $gvideo.sync_tags}checked="checked"{/if}> {'Yes'|@translate}</label> 
     84      <label><input type="radio" name="sync_tags" value="0" {if not $gvideo.sync_tags}checked="checked"{/if}> {'No'|@translate}</label> 
     85    </li> 
    7686  </ul>   
    7787</fieldset> 
     
    104114      <a href="http://www.wideo.fr" target="_blank">Wideo</a> 
    105115    </li> 
    106     <li> 
    107       <img class="icon" src="{$GVIDEO_PATH}admin/template/icons/videobb.png"> 
    108       <a href="http://www.videobb.com" target="_blank">videobb</a> 
    109     </li> 
    110116  </ul> 
    111117</fieldset> 
  • extensions/gvideo/admin/template/config.tpl

    r17307 r19056  
    1818  <ul> 
    1919    <li> 
    20       <label> 
    21         <span class="property">{'Video size'|@translate}</span> 
    22         <input type="text" name="width" value="{$gvideo.width}" size="4"> &times; 
    23         <input type="text" name="height" value="{$gvideo.height}" size="4"> px 
    24       </label> 
     20      <span class="property">{'Video size'|@translate}</span> 
     21      <input type="text" name="width" value="{$gvideo.width}" size="4"> &times; 
     22      <input type="text" name="height" value="{$gvideo.height}" size="4"> px 
    2523    </li> 
    2624    <li> 
    27       <label> 
    28         <span class="property">{'Autoplay'|@translate}</span> 
    29         <label><input type="radio" name="autoplay" value="0" {if not $gvideo.autoplay}checked="checked"{/if}> {'No'|@translate}</label> 
    30         <label><input type="radio" name="autoplay" value="1" {if $gvideo.autoplay}checked="checked"{/if}> {'Yes'|@translate}</label> 
    31       </label> 
     25      <span class="property">{'Autoplay'|@translate}</span> 
     26      <label><input type="radio" name="autoplay" value="1" {if $gvideo.autoplay}checked="checked"{/if}> {'Yes'|@translate}</label> 
     27      <label><input type="radio" name="autoplay" value="0" {if not $gvideo.autoplay}checked="checked"{/if}> {'No'|@translate}</label> 
     28    </li> 
     29    <li> 
     30      <span class="property">{'Get video description'|@translate}</span> 
     31      <label><input type="radio" name="sync_description" value="1" {if $gvideo.sync_description}checked="checked"{/if}> {'Yes'|@translate}</label> 
     32      <label><input type="radio" name="sync_description" value="0" {if not $gvideo.sync_description}checked="checked"{/if}> {'No'|@translate}</label> 
     33    </li> 
     34    <li> 
     35      <span class="property">{'Get video tags'|@translate}</span> 
     36      <label><input type="radio" name="sync_tags" value="1" {if $gvideo.sync_tags}checked="checked"{/if}> {'Yes'|@translate}</label> 
     37      <label><input type="radio" name="sync_tags" value="0" {if not $gvideo.sync_tags}checked="checked"{/if}> {'No'|@translate}</label> 
    3238    </li> 
    3339  </ul> 
     
    3541 
    3642<div class="left"><fieldset> 
    37   <legend><img class="icon" src="{$GVIDEO_PATH}admin/template/icons/vimeo.png"> {'Vimeo'|@translate}</legend> 
     43  <legend><img class="icon" src="{$GVIDEO_PATH}admin/template/icons/vimeo.png"> {'Vimeo player'|@translate}</legend> 
    3844   
    3945  <ul> 
     
    4551    </li> 
    4652    <li> 
    47       <label> 
    48         <span class="property">{'Display'|@translate}</span> 
    49         <label><input type="checkbox" name="vimeo[title]" value="1" {if $gvideo.vimeo.title}checked="checked"{/if}> {'Title'|@translate}</label> 
    50         <label><input type="checkbox" name="vimeo[portrait]" value="1" {if $gvideo.vimeo.portrait}checked="checked"{/if}> {'Author portrait'|@translate}</label> 
    51         <label><input type="checkbox" name="vimeo[byline]" value="1" {if $gvideo.vimeo.byline}checked="checked"{/if}> {'Author name'|@translate}</label> 
    52       </label> 
     53      <span class="property">{'Display'|@translate}</span> 
     54      <label><input type="checkbox" name="vimeo[title]" value="1" {if $gvideo.vimeo.title}checked="checked"{/if}> {'Title'|@translate}</label> 
     55      <label><input type="checkbox" name="vimeo[portrait]" value="1" {if $gvideo.vimeo.portrait}checked="checked"{/if}> {'Author portrait'|@translate}</label> 
     56      <label><input type="checkbox" name="vimeo[byline]" value="1" {if $gvideo.vimeo.byline}checked="checked"{/if}> {'Author name'|@translate}</label> 
    5357    </li> 
    5458  </ul> 
     
    5660 
    5761<div class="right"><fieldset> 
    58   <legend><img class="icon" src="{$GVIDEO_PATH}admin/template/icons/dailymotion.png"> {'Dailymotion'|@translate}</legend> 
     62  <legend><img class="icon" src="{$GVIDEO_PATH}admin/template/icons/dailymotion.png"> {'Dailymotion player'|@translate}</legend> 
    5963   
    6064  <ul> 
     
    6670    </li> 
    6771    <li> 
    68       <label> 
    69         <span class="property">{'Display'|@translate}</span> 
    70         <label><input type="checkbox" name="dailymotion[logo]" value="1" {if $gvideo.dailymotion.logo}checked="checked"{/if}> {'Logo'|@translate}</label> 
    71         <label><input type="checkbox" name="dailymotion[title]" value="1" {if $gvideo.dailymotion.title}checked="checked"{/if}> {'Title'|@translate}</label> 
    72       </label> 
     72      <span class="property">{'Display'|@translate}</span> 
     73      <label><input type="checkbox" name="dailymotion[logo]" value="1" {if $gvideo.dailymotion.logo}checked="checked"{/if}> {'Logo'|@translate}</label> 
     74      <label><input type="checkbox" name="dailymotion[title]" value="1" {if $gvideo.dailymotion.title}checked="checked"{/if}> {'Title'|@translate}</label> 
    7375    </li> 
    7476  </ul> 
  • extensions/gvideo/admin/template/photo.tpl

    r17687 r19056  
    1717  if ($(this).val() != "{$GVIDEO.url}") {ldelim} 
    1818    $(this).css('border', '1px solid #c00'); 
    19     $("#change_warning").show(); 
     19    $(".video_update").show(); 
    2020  } else {ldelim} 
    2121    $(this).css('border', border); 
    22     $("#change_warning").hide(); 
     22    $(".video_update").hide(); 
    2323  } 
    2424}); 
     
    6060      <b>{'Video URL'|@translate}</b> 
    6161      <input type="text" name="url" value="{$GVIDEO.url}" style="width:400px;"> 
    62       <span id="change_warning" style="display:none;">{'Changing the url will reset video description, name and thumbnail'|@translate}</span> 
     62      <span class="video_update warning" style="display:none;"> {'Changing the url will reset video description, name and thumbnail'|@translate}</span> 
    6363    </p> 
    64  
     64     
     65    <p class="video_update"> 
     66      <b>{'Get video description'|@translate}</b> 
     67      <label><input type="radio" name="sync_description" value="1" {if $GVIDEO.sync_description}checked="checked"{/if}> {'Yes'|@translate}</label> 
     68      <label><input type="radio" name="sync_description" value="0" {if not $GVIDEO.sync_description}checked="checked"{/if}> {'No'|@translate}</label> 
     69    </p> 
     70     
     71    <p class="video_update"> 
     72      <b>{'Get video tags'|@translate}</b> 
     73      <label><input type="radio" name="sync_tags" value="1" {if $GVIDEO.sync_tags}checked="checked"{/if}> {'Yes'|@translate}</label> 
     74      <label><input type="radio" name="sync_tags" value="0" {if not $GVIDEO.sync_tags}checked="checked"{/if}> {'No'|@translate}</label> 
     75    </p> 
     76     
    6577    <p> 
    6678      <b>{'Video size'|@translate}</b> 
  • extensions/gvideo/admin/template/style.css

    r17626 r19056  
    99 
    1010FORM.properties SPAN.property { 
    11   width:150px; 
     11  width:180px; 
    1212} 
    1313 
     
    5858} 
    5959 
    60 #change_warning { 
     60.video_update { 
     61  display:none; 
     62} 
     63.video_update.warning { 
    6164  display:block; 
    6265  color:#c00; 
  • extensions/gvideo/include/functions.inc.php

    r17661 r19056  
    2121      if (empty($url['query']['v'])) return false; 
    2222       
    23       $video['id'] = $url['query']['v']; 
     23      $video['video_id'] = $url['query']['v']; 
    2424    } 
    2525     
     
    3131         
    3232        $url['path'] = explode('/', $url['path']); 
    33         $video['id'] = $url['path'][1]; 
    34       } 
    35        
    36       $api_url = 'http://gdata.youtube.com/feeds/api/videos/'.$video['id'].'?v=2&alt=json'; 
     33        $video['video_id'] = $url['path'][1]; 
     34      } 
     35       
     36      $api_url = 'http://gdata.youtube.com/feeds/api/videos/'.$video['video_id'].'?v=2&alt=json'; 
    3737      $json = download_remote_file($api_url, true); 
    3838      if ($json === false or $json == 'file_error') return false; 
     
    4040      $json = json_decode($json, true); 
    4141      $video = array_merge($video, array( 
    42         'url' => 'http://youtube.com/watch?v='.$video['id'], 
     42        'url' => 'http://youtube.com/watch?v='.$video['video_id'], 
    4343        'title' => $json['entry']['title']['$t'], 
    4444        'description' => $json['entry']['media$group']['media$description']['$t'], 
    4545        'thumbnail' => $json['entry']['media$group']['media$thumbnail'][2]['url'], 
    4646        'author' => $json['entry']['author'][0]['name']['$t'], 
     47        'tags' => null, 
    4748        )); 
    4849      break; 
     
    5556       
    5657      $url['path'] = explode('/', $url['path']); 
    57       $video['id'] = $url['path'][1]; 
    58        
    59       $api_url = 'http://vimeo.com/api/v2/video/'.$video['id'].'.json'; 
     58      $video['video_id'] = $url['path'][1]; 
     59       
     60      $api_url = 'http://vimeo.com/api/v2/video/'.$video['video_id'].'.json'; 
    6061      $json = download_remote_file($api_url, true); 
    6162      if ($json === false or $json == 'file_error') return false; 
     
    6364      $json = json_decode($json, true); 
    6465      $video = array_merge($video, array( 
    65         'url' => 'http://vimeo.com/'.$video['id'], 
     66        'url' => 'http://vimeo.com/'.$video['video_id'], 
    6667        'title' => $json[0]['title'], 
    6768        'description' => $json[0]['description'], 
    6869        'thumbnail' => $json[0]['thumbnail_large'], 
    6970        'author' => $json[0]['user_name'], 
     71        'tags' => array_map('trim', explode(',', $json[0]['tags'])), 
    7072        )); 
    7173      break; 
     
    7981      $url['path'] = explode('/', $url['path']); 
    8082      if ($url['path'][1] != 'video') return false; 
    81       $video['id'] = $url['path'][2]; 
    82        
    83       $api_url = 'https://api.dailymotion.com/video/'.$video['id'].'?fields=description,id,thumbnail_large_url,title,owner.username'; // DM doesn't accept non secure connection 
     83      $video['video_id'] = $url['path'][2]; 
     84       
     85      $api_url = 'https://api.dailymotion.com/video/'.$video['video_id'].'?fields=description,thumbnail_large_url,title,owner.username,tags'; // DM doesn't accept non secure connection 
    8486      $json = download_remote_file($api_url, true); 
    8587      if ($json === false or $json == 'file_error') return false; 
     
    8991       
    9092      $video = array_merge($video, array( 
    91         'id' => $json['id'], 
    92         'url' => 'http://dailymotion.com/video/'.$json['id'], 
     93        'url' => 'http://dailymotion.com/video/'.$video['video_id'], 
    9394        'title' => $json['title'], 
    9495        'description' => $json['description'], 
    9596        'thumbnail' => $json['thumbnail_large_url'], 
    9697        'author' => $json['owner.username'], 
     98        'tags' => $json['tags'], 
    9799        )); 
    98100      break; 
     
    109111      preg_match('#<meta property="og:video" content="http://www.wat.tv/swf2/([^"/>]+)" />#', $html, $matches); 
    110112      if (empty($matches[1])) return false; 
    111       $video['id'] = $matches[1]; 
     113      $video['video_id'] = $matches[1]; 
    112114       
    113115      $video['url'] = $source_url; 
     
    116118      $video['title'] = $matches[1]; 
    117119       
    118       preg_match('#<p class="description"([^>]*)>(.*?)</p>#s', $html, $matches); 
    119       $video['description'] = $matches[2]; 
     120      preg_match('#<p class="description"(?:[^>]*)>(.*?)</p>#s', $html, $matches); 
     121      $video['description'] = $matches[1]; 
    120122       
    121123      preg_match('#<meta property="og:image" content="([^">]+)" />#', $html, $matches); 
     
    123125       
    124126      $video['author'] = null; 
     127       
     128      preg_match_all('#<meta property="video:tag" content="([^">]+)" />#', $html, $matches); 
     129      $video['tags'] = $matches[1]; 
    125130      break; 
    126131    } 
     
    132137       
    133138      $url['path'] = explode('/', $url['path']); 
    134       $video['id'] = rtrim($url['path'][2], '.html'); 
     139      $video['video_id'] = rtrim($url['path'][2], '.html'); 
    135140       
    136141      $html = download_remote_file($source_url, true); 
    137142      if ($html === false or $html == 'file_error') return false; 
    138143       
    139       $video['url'] = 'http://wideo.fr/video/'.$video['id'].'.html'; 
     144      $video['url'] = 'http://wideo.fr/video/'.$video['video_id'].'.html'; 
    140145       
    141146      preg_match('#<meta property="og:title" content="([^">]*)" />#', $html, $matches); 
     
    148153      $video['thumbnail'] = $matches[1]; 
    149154       
    150       preg_match('#<li id="li_author">Auteur :  <a href="\#"([^>]*)><span>(.*?)</span></a>#', $html, $matches); 
    151       $video['author'] = $matches[2]; 
    152       break; 
    153     } 
    154        
    155     /* videobb */ 
    156     case 'videobb': 
    157     { 
    158       $video['type'] = 'videobb'; 
    159        
    160       if (!empty($url['query'])) 
    161       { 
    162         parse_str($url['query'], $url['query']); 
    163         if (empty($url['query']['v'])) return false; 
    164         $video['id'] = $url['query']['v']; 
    165       } 
    166       else 
    167       { 
    168         $url['path'] = explode('/', $url['path']); 
    169         if ($url['path'][1] != 'video') return false; 
    170         $video['id'] = $url['path'][2]; 
    171       } 
    172        
    173       $html = download_remote_file($source_url, true); 
    174       if ($html === false or $html == 'file_error') return false; 
    175        
    176       $video['url'] = 'http://www.videobb.com/video/'.$video['id']; 
    177        
    178       preg_match('#<meta content="videobb - ([^">]*)"  name="title" property="" />#', $html, $matches); 
    179       $video['title'] = $matches[1]; 
    180        
    181       $video['description'] = null; 
    182        
    183       preg_match('#<link rel="image_src" href="([^">]+)" type="image/jpeg" />#', $html, $matches); 
    184       $video['thumbnail'] = $matches[1]; 
    185        
    186       $video['author'] = null; 
     155      preg_match('#<li id="li_author">Auteur :  <a href=(?:[^>]*)><span>(.*?)</span></a>#', $html, $matches); 
     156      $video['author'] = $matches[1]; 
     157       
     158      preg_match('#<meta name="keywords" content="([^">]+)" />#', $html, $matches); 
     159      $video['tags'] = array_map('trim', explode(',', $matches[1])); 
    187160      break; 
    188161    } 
  • extensions/gvideo/include/gvideo.inc.php

    r17678 r19056  
    4141  global $page, $picture, $template, $conf; 
    4242   
    43   $conf['gvideo'] = unserialize($conf['gvideo']); 
     43  if (is_string($conf['gvideo'])) 
     44  { 
     45    $conf['gvideo'] = unserialize($conf['gvideo']); 
     46  } 
    4447   
    4548   
  • extensions/gvideo/include/install.inc.php

    r17684 r19056  
    2222      'width' => 640, 
    2323      'height' => 360, 
     24      'sync_description' => 1, 
     25      'sync_tags' => 1, 
    2426      'vimeo' => array( 
    2527        'title' => 1, 
     
    3638      'wat' => array(), 
    3739      'wideo' => array(), 
    38       'videobb' => array(), 
    3940      )); 
    4041     
    4142    conf_update_param('gvideo', $gvideo_default_config); 
    4243    $conf['gvideo'] = $gvideo_default_config; 
     44  } 
     45  else 
     46  { 
     47    if (is_string($conf['gvideo'])) 
     48    { 
     49      $conf['gvideo'] = unserialize($conf['gvideo']); 
     50    } 
     51     
     52    if (!isset($conf['gvideo']['sync_description'])) 
     53    { 
     54      $conf['gvideo']['sync_description'] = 1; 
     55      $conf['gvideo']['sync_tags'] = 1; 
     56       
     57      conf_update_param('gvideo', serialize($conf['gvideo'])); 
     58    } 
    4359  } 
    4460   
  • extensions/gvideo/language/en_UK/plugin.lang.php

    r17626 r19056  
    2222$lang['Video successfully updated'] = 'Video successfully updated'; 
    2323$lang['Changing the url will reset video description, name and thumbnail'] = 'Changing the url will reset video description, name and thumbnail'; 
     24$lang['Get video description'] = 'Get video description'; 
     25$lang['Get video tags'] = 'Get video tags'; 
     26$lang['Vimeo player'] = 'Vimeo player'; 
     27$lang['Dailymotion player'] = 'Dailymotion player'; 
    2428 
    2529?> 
  • extensions/gvideo/language/fr_FR/plugin.lang.php

    r17626 r19056  
    2222$lang['Video successfully updated'] = 'Vidéo mise à jour'; 
    2323$lang['Changing the url will reset video description, name and thumbnail'] = 'Changer l\'url réinitialisera le nom, la description et la miniature de la vidéo'; 
     24$lang['Get video description'] = 'Récupérer la description'; 
     25$lang['Get video tags'] = 'Récupérer les tags'; 
     26$lang['Vimeo player'] = 'Lecteur Vimeo'; 
     27$lang['Dailymotion player'] = 'Lecteur Dailymotion'; 
    2428 
    2529?> 
  • extensions/gvideo/main.inc.php

    r17688 r19056  
    1616define('GVIDEO_ADMIN',   get_root_url() . 'admin.php?page=plugin-gvideo'); 
    1717define('GVIDEO_TABLE',   $prefixeTable.'image_video'); 
    18 define('GVIDEO_VERSION', '2.4.e'); 
     18define('GVIDEO_VERSION', 'auto'); 
    1919 
    2020 
     
    4141   
    4242  if ( 
     43    GVIDEO_VERSION == 'auto' or 
    4344    $pwg_loaded_plugins['gvideo']['version'] == 'auto' or 
    4445    version_compare($pwg_loaded_plugins['gvideo']['version'], GVIDEO_VERSION, '<') 
     
    4849    gvideo_install(); 
    4950     
    50     if ($pwg_loaded_plugins['gvideo']['version'] != 'auto') 
     51    if ( $pwg_loaded_plugins['gvideo']['version'] != 'auto' and GVIDEO_VERSION !='auto' ) 
    5152    { 
    5253      $query = ' 
Note: See TracChangeset for help on using the changeset viewer.