nettika/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use current server instead of default server; add vim lines; pass token because bs_play_media did not work after merging to current trunk

Browse Source
This commit is contained in:
Marc Delisle
2008-08-23 13:35:23 +00:00
parent 3b5b6ed3f7
commit 3f07d2aff2
4 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
libraries/blobstreaming.lib.php
View File

@@ -1,4 +1,5 @@
<?php
/* vim: set expandtab sw=4 ts=4 sts=4: */
/**
* @author Raj Kissu Rajandran
* @version 1.0
@@ -27,12 +28,12 @@ function checkBLOBStreamingPlugins()
if (empty($PMA_Config))
return FALSE;
// retrieve default server configuration
// retrieve current server configuration
$serverCfg = $PMA_Config->get('Servers');
$serverCfg = $serverCfg[$PMA_Config->settings['ServerDefault']];
$serverCfg = $serverCfg[$GLOBALS['server']];
// return if unable to retrieve default server configuration
if (!$serverCfg)
// return if unable to retrieve current server configuration
if (! $serverCfg)
return FALSE;
// if PHP extension in use is 'mysql', specify element 'PersistentConnections'
@@ -694,12 +695,12 @@ function PMA_BS_CreateReferenceLink($bs_reference, $db_name)
break;
// audio content
case 'audio/mpeg':
$output .= ' (<a href="#" onclick="popupBSMedia(\'' . urlencode($bs_reference) . '\', \'' . $content_type . '\', 640, 120)">Play Audio</a>)';
$output .= ' (<a href="#" onclick="popupBSMedia(\'' . PMA_generate_common_url() . '\',\'' . urlencode($bs_reference) . '\', \'' . $content_type . '\', 640, 120)">Play Audio</a>)';
break;
// video content
case 'application/x-flash-video':
case 'video/mpeg':
$output .= ' (<a href="#" onclick="popupBSMedia(\'' . urlencode($bs_reference) . '\', \'' . $content_type . '\', 640, 480)">View Video</a>)';
$output .= ' (<a href="#" onclick="popupBSMedia(\'' . PMA_generate_common_url() . '\',\'' . urlencode($bs_reference) . '\', \'' . $content_type . '\', 640, 480)">View Video</a>)';
break;
// unsupported content. specify download
default: