chamilo
/
chamilo-lms
mirror of https://github.com/chamilo/chamilo-lms/tree/1.11.x
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Moving php script to Documents and Upgrade to WebCamJS lib - Refs #7181

Browse Source
1.10.x
José Loguercio 9 years ago
parent d357cb2326
commit fc3e201afb
3 changed files with 115 additions and 87 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 7
      app/Resources/public/css/base.css
  2. 167
      main/document/webcam_clip.php
  3. 28
      main/document/webcam_receiver.php

7
app/Resources/public/css/base.css
Unescape View File

@ -6330,6 +6330,13 @@ a.sessionView {
#prev.disabled { #prev.disabled {
opacity: 0.2; opacity: 0.2;
} }
.webcamclip_bg{
width:340px;
height:260px;
border:10px solid;
border-radius: 25px;
border-color: #00677C;
}
/* CSS NEW TOP ******************************************************************************/ /* CSS NEW TOP ******************************************************************************/
/* CSS Responsive */ /* CSS Responsive */
@media (min-width: 1025px) and (max-width: 1200px) { @media (min-width: 1025px) and (max-width: 1200px) {

167
main/document/webcam_clip.php
Unescape View File

@ -8,6 +8,7 @@
* *
* @author Juan Carlos Raña Trabado herodoto@telefonica.net * @author Juan Carlos Raña Trabado herodoto@telefonica.net
* @since 7/jun/2012 * @since 7/jun/2012
* @Updated 04/09/2015 Upgrade to WebCamJS
*/ */
require_once '../inc/global.inc.php'; require_once '../inc/global.inc.php';
@ -127,78 +128,77 @@ echo '</div>';
<div align="center"> <div align="center">
<h2><?php echo get_lang('TakeYourPhotos'); ?></h2> <h2><?php echo get_lang('TakeYourPhotos'); ?></h2>
</div> </div>
<div align="center" style="padding-left:50px;"> <div align="center">
<table><tr><td valign=top> <table><tr><td valign='top' align='center'>
<h3><?php echo get_lang('LocalInputImage'); ?></h3> <h3 align='center'><?php echo get_lang('LocalInputImage'); ?></h3>
<!-- First, include the JPEGCam JavaScript Library --> <!-- Including New Lib WebCamJS upgrading from JPEGCam -->
<script type="text/javascript" src="<?php echo api_get_path(WEB_LIBRARY_PATH); ?>jpegcam/webcam.js"></script> <script type="text/javascript" src="<?php echo api_get_path(WEB_PATH); ?>web/assets/webcamjs/webcam.js"></script>
<!-- Adding a div container for the new live camera with some cool style options-->
<!-- Configure a few settings --> <div class="webcamclip_bg">
<script language="JavaScript"> <div id="chamilo-camera"></div>
var clip_filename='video_clip.jpg'; </div>
//var clip_filename='<?php //echo date('YmdHis') . '.jpg'; ?>'; <!-- Configure a few settings and attach the camera to the div container -->
webcam.set_swf_url ( '<?php echo api_get_path(WEB_LIBRARY_PATH); ?>jpegcam//webcam.swf?blackboard.png' );
webcam.set_shutter_sound( true,'<?php echo api_get_path(WEB_LIBRARY_PATH); ?>jpegcam/shutter.mp3' ); // true play shutter click sound
webcam.set_quality( 90 ); // JPEG quality (1 - 100)
webcam.set_api_url( '<?php echo api_get_path(WEB_LIBRARY_PATH); ?>jpegcam/webcam_receiver.php?webcamname='+escape(clip_filename)+'&webcamdir=<?php echo $webcamdir; ?>&webcamuserid=<?php echo $webcamuserid; ?>' );
</script>
<!-- Next, write the movie to the page at 320x240 -->
<script language="JavaScript"> <script language="JavaScript">
document.write( webcam.get_html(320, 240) ); Webcam.set({
width: 320,
height: 240,
image_format: 'jpeg',
jpeg_quality: 90
});
Webcam.attach( '#chamilo-camera' );
//This line Fix a minor bug that made a conflict with a videochat feature in another module file
$('video').addClass('skip');
</script> </script>
<!-- Some buttons for controlling things --> <!-- Using now Jquery to do the webcamJS Functions and handle the server response (see webcam_receiver.php now in webcamJS directory) -->
<br/>
<form>
<br/>
<input type=button value="<?php echo get_lang('Snapshot'); ?>" onClick="webcam.freeze()">
<input type=button value="<?php echo get_lang('Clean'); ?>" onClick="webcam.reset()">
<input type=button value="<?php echo get_lang('Send'); ?>" onClick="do_upload()">
&nbsp;&nbsp;||&nbsp;&nbsp;
<input type=button value="<?php echo get_lang('Auto'); ?>" onClick="start_video();">
<input type=button value="<?php echo get_lang('Stop'); ?>" onClick="stop_video()">
<br/>
<input type=button value="<?php echo get_lang('Configure'); ?>" onClick="webcam.configure()">
</form>
<!-- Code to handle the server response (see webcam_receiver.php) -->
<script language="JavaScript"> <script language="JavaScript">
webcam.set_hook( 'onComplete', 'my_completion_handler' ); $(document).ready(function() {
$('#btnCapture').click(function() {
function do_upload() { Webcam.freeze();
// upload to server return false;
if (this.loaded){ });
document.getElementById('upload_results').innerHTML = '<h3><?php echo get_lang('Uploading'); ?></h3>';
} $('#btnClean').click(function() {
webcam.upload(); Webcam.unfreeze();
} return false;
});
function my_completion_handler(msg) {
// extract URL out of PHP output $('#btnSave').click(function() {
if (msg.match(/(http\:\/\/\S+)/)) { snap();
var image_url = RegExp.$1; return false;
});
image_url=image_url.replace(/\\/g,'/').replace( /.*\//, '' );// extract basename
image_url='<?php echo api_get_path(WEB_COURSE_PATH).$_course['path'].'/document/'.$dir;?>'+image_url+'<?php echo '?'.api_get_cidreq(); ?>'; $('#btnAuto').click(function() {
start_video();
// show JPEG image in page return false;
document.getElementById('upload_results').innerHTML = });
'<div style="width: 320px;">' +
'<h3><?php echo get_lang('ClipSent'); ?></h3>' + $('#btnStop').click(function() {
'<img src="' + image_url + '">' + stop_video();
'</div>'; return false;
// reset camera for another shot });
webcam.reset(); });
}
else alert("PHP Error: " + msg); function snap() {
} Webcam.snap( function(data_uri) {
var clip_filename='video_clip.jpg';
var url = 'webcam_receiver.php?webcamname='+escape(clip_filename)+'&webcamdir=<?php echo $webcamdir; ?>&webcamuserid=<?php echo $webcamuserid; ?>';
Webcam.upload(data_uri, url, function(code, response){
$('#upload_results').html(
'<h3>'+response+'</h3>' +
'<div>'+
'<img src="' + data_uri + '" class="webcamclip_bg">' +
'</div>'+
'</div>'+
'<p hidden="true">'+code+'</p>'
);
});
});
}
</script> </script>
<script language=javascript> <script language=javascript>
var internaval=null; var interval=null;
var timeout=null; var timeout=null;
var counter=0; var counter=0;
var fps=1000;//one frame per second var fps=1000;//one frame per second
@ -207,18 +207,18 @@ echo '</div>';
function stop_video() { function stop_video() {
interval=window.clearInterval(interval); interval=window.clearInterval(interval);
return false;
} }
function start_video() { function start_video() {
webcam.set_stealth( true ); // do not freeze image upon capture
interval=window.setInterval("clip_send_video()",fps); interval=window.setInterval("clip_send_video()",fps);
} }
function clip_send_video() { function clip_send_video() {
counter++ counter++;
timeout=setTimeout('stop_video()',maxtime); timeout=setTimeout('stop_video()',maxtime);
if(maxclip>=counter){ if(maxclip>=counter){
webcam.snap();// clip and upload snap();// clip and upload
} }
else { else {
interval=window.clearInterval(interval); interval=window.clearInterval(interval);
@ -227,9 +227,38 @@ echo '</div>';
</script> </script>
</td><td width=50>&nbsp;</td><td valign=top> </td><td width=50></td><td valign='top' align='center'>
<div id="upload_results" style="background-color:#ffffff;"></div> <div id="upload_results" style="background-color:#ffffff;"></div>
</td></tr></table> </td></tr></table>
<!-- Implementing Button html5 Tags instead Inputs and some cool bootstrap button styles -->
<div>
<br/>
<form>
<br/>
<button id="btnCapture" class="btn btn-danger">
<i class="fa fa-camera"></i>
<?php echo get_lang('Snapshot'); ?>
</button>
<button id="btnClean" class="btn btn-success">
<i class="fa fa-refresh"></i>
<?php echo get_lang('Clean'); ?>
</button>
<button id="btnSave" class="btn btn-primary">
<i class="fa fa-save"></i>
<?php echo get_lang('Save'); ?>
</button>
&nbsp;&nbsp;||&nbsp;&nbsp;
<button id="btnAuto" class="btn btn-default">
<?php echo get_lang('Auto'); ?>
</button>
<button id="btnStop" class="btn btn-default">
<?php echo get_lang('Stop'); ?>
</button>
<br/>
</form>
<br/>
</div>
</div> </div>
<?php <?php

28
main/inc/lib/jpegcam/webcam_receiver.php → main/document/webcam_receiver.php
Unescape View File

@ -1,9 +1,11 @@
<?php <?php
/* JPEGCam Script */ /* JPEGCam Script *****UPDATED to lib webcamJS 2015-09-04***** */
/* Receives JPEG webcam submission and saves to local file. */ /* Receives JPEG webcam submission and saves to local file. */
/* Make sure your directory has permission to write files as your web server user! */ /* Make sure your directory has permission to write files as your web server user! */
require_once '../../../inc/global.inc.php';
//Changes on directory because move the proper script to the new lib upgrade directory
require_once '../inc/global.inc.php';
////Add security from Chamilo ////Add security from Chamilo
api_protect_course_script(); api_protect_course_script();
api_block_anonymous_users(); api_block_anonymous_users();
@ -46,11 +48,11 @@ if($ext!= 'jpg'){
//Do not use here check Fileinfo method because return: text/plain //CHECK THIS BEFORE COMMIT //Do not use here check Fileinfo method because return: text/plain //CHECK THIS BEFORE COMMIT
$dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document'; $dirBaseDocuments = api_get_path(SYS_COURSE_PATH).$_course['path'].'/document';
$saveDir=$dirBaseDocuments.$webcamdir; $saveDir = $dirBaseDocuments.$webcamdir;
$current_session_id = api_get_session_id(); $current_session_id = api_get_session_id();
$groupId = api_get_group_id(); $groupId = api_get_group_id();
//avoid duplicates //Avoid duplicates
$webcamname_to_save=$webcamname; $webcamname_to_save=$webcamname;
$title_to_save=str_replace('_',' ',$webcamname); $title_to_save=str_replace('_',' ',$webcamname);
$webcamname_noex=basename($webcamname, ".jpg"); $webcamname_noex=basename($webcamname, ".jpg");
@ -62,29 +64,19 @@ if (file_exists($saveDir.'/'.$webcamname_noex.'.'.$ext)){
$title_to_save = str_replace('_',' ',$title_to_save); $title_to_save = str_replace('_',' ',$title_to_save);
} }
$documentPath = $saveDir.'/'.$webcamname_to_save; $documentPath = $saveDir.'/'.$webcamname_to_save;
//read content //read content
$content = file_get_contents('php://input'); //Change to move_uploaded_file() function instead file_get_contents() to adapt the new lib
$content = move_uploaded_file($_FILES['webcam']['tmp_name'], $documentPath);
if (!$content) { if (!$content) {
print "ERROR: Failed to read data\n"; print "PHP ERROR: Failed to read data\n";
exit(); exit();
} }
//add to disk
$fh = fopen($documentPath, 'w') or die("can't open file");
fwrite($fh, $content);
fclose($fh);
//
//add document to database //add document to database
$doc_id = add_document($_course, $webcamdir.'/'.$webcamname_to_save, 'file', filesize($documentPath), $title_to_save); $doc_id = add_document($_course, $webcamdir.'/'.$webcamname_to_save, 'file', filesize($documentPath), $title_to_save);
api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id); api_item_property_update($_course, TOOL_DOCUMENT, $doc_id, 'DocumentAdded', $_user['user_id'], $groupId, null, null, null, $current_session_id);
/// ///
$url = 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/' . $documentPath; $url = 'http://' . $_SERVER['HTTP_HOST'] . dirname($_SERVER['REQUEST_URI']) . '/' . $documentPath;
print "$url\n"; print get_lang('ClipSent');
?>
Write Preview
Loading…
Cancel
Save