diff --git a/upload/admin_area/styles/cbv2/layout/view_conversion_log.html b/upload/admin_area/styles/cbv2/layout/view_conversion_log.html index b482b8e8..e2c8d034 100644 --- a/upload/admin_area/styles/cbv2/layout/view_conversion_log.html +++ b/upload/admin_area/styles/cbv2/layout/view_conversion_log.html @@ -1,40 +1,77 @@ {if $data.File} -
-Conversion Log For File "{$data.File}" + +

Converion Log for file {$data.file_name}.{$data.file_ext}

- - - - - - - -
Conversion log for "{$data.src_name}"
-
-
-
{$data.conversion_log|nl2br}
-
+

+ Reading Conversion log for file {$data.file_name} +

+ + + +
Conversion details
+ +
+{foreach from=$data item=value key=field} + {if $field !='conversion_log' } +
+
{$field|replace:'_':' '}
+
{$value}
+
+
+ {/if} +{/foreach}
-{else} File does not exist + +
Complete conversion log
+ +
+{literal} + Expand + + + + | + Copy + + + + + +{/literal} +
+ + +
+{$data.conversion_log|nl2br}
+ + +{else} Log file was not found {/if} \ No newline at end of file diff --git a/upload/admin_area/view_conversion_log.php b/upload/admin_area/view_conversion_log.php index 0812d772..b7c5605e 100644 --- a/upload/admin_area/view_conversion_log.php +++ b/upload/admin_area/view_conversion_log.php @@ -14,11 +14,14 @@ $pages->page_redir(); $file_name = mysql_clean($_GET['file_name']); $file_details = $myquery->file_details($file_name); +$file_details['file_name'] = getname($file_details['File']); +$file_details['file_ext'] = getext($file_details['File']); if($file_details) { assign('data',$file_details); } + subtitle("Conversion Log"); template_files('view_conversion_log.html'); display_it(); diff --git a/upload/includes/functions.php b/upload/includes/functions.php index 3fa3d96a..d8907fc0 100644 --- a/upload/includes/functions.php +++ b/upload/includes/functions.php @@ -4615,16 +4615,16 @@ */ function check_module_path($params) { - $path = $params['path']; + $rPath = $path = $params['path']; if($path['get_path']) $path = get_binaries($path); $array = array(); $result = shell_output($path." -version"); - + if($result) { - if(strstr($result,'error')) + if(strstr($result,'error') || strstr(($result),'No such file or directory')) { $error['error'] = $result; diff --git a/upload/js/jquery_plugs/ZeroClipboard.swf b/upload/js/jquery_plugs/ZeroClipboard.swf new file mode 100644 index 00000000..13bf8e39 Binary files /dev/null and b/upload/js/jquery_plugs/ZeroClipboard.swf differ diff --git a/upload/player/cbplayer/preview.jpg b/upload/player/cbplayer/preview.jpg new file mode 100644 index 00000000..503abb32 Binary files /dev/null and b/upload/player/cbplayer/preview.jpg differ