diff --git a/cis/testtool/admin/index.php b/cis/testtool/admin/index.php index 20c1cc322..7b5c14fa7 100644 --- a/cis/testtool/admin/index.php +++ b/cis/testtool/admin/index.php @@ -189,13 +189,14 @@ if(isset($_POST['submitaudio'])) { $filename = $_FILES['audio']['tmp_name']; //File oeffnen - $fp = fopen($filename,'r'); + $content = file_get_contents($filename); + /*$fp = fopen($filename,'r'); //auslesen $content = fread($fp, filesize($filename)); - fclose($fp); + fclose($fp);*/ + //die('

'.$content); //base64 codieren $content = base64_encode($content); - $frage = new frage(); if($frage->getFrageSprache($_GET['frage_id'], $sprache)) { @@ -594,7 +595,16 @@ if($frage_id!='') } if($frage->audio!='') { - echo '
'; + //echo '
'; + echo ' + + + + + + + + '; } echo ''; //Zusaetzliche EingabeFelder anzeigen @@ -671,7 +681,18 @@ if($frage_id!='') "; if($vs->audio!='') - echo ""; + { + //echo ""; + echo ' + + + + + + + + '; + } echo " edit delete diff --git a/cis/testtool/audio-player/audio-player-noswfobject.js b/cis/testtool/audio-player/audio-player-noswfobject.js new file mode 100644 index 000000000..ef0612d32 --- /dev/null +++ b/cis/testtool/audio-player/audio-player-noswfobject.js @@ -0,0 +1 @@ +var AudioPlayer=function(){var G=[];var D;var F="";var A={};var E=-1;function B(H){if(document.all&&!window[H]){for(var I=0;I + is released under the MIT License +*/ +var audioplayer_swfobject=function(){var D="undefined",r="object",S="Shockwave Flash",W="ShockwaveFlash.ShockwaveFlash",q="application/x-shockwave-flash",R="SWFObjectExprInst",x="onreadystatechange",O=window,j=document,t=navigator,T=false,U=[h],o=[],N=[],I=[],l,Q,E,B,J=false,a=false,n,G,m=true,M=function(){var aa=typeof j.getElementById!=D&&typeof j.getElementsByTagName!=D&&typeof j.createElement!=D,ah=t.userAgent.toLowerCase(),Y=t.platform.toLowerCase(),ae=Y?/win/.test(Y):/win/.test(ah),ac=Y?/mac/.test(Y):/mac/.test(ah),af=/webkit/.test(ah)?parseFloat(ah.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,X=!+"\v1",ag=[0,0,0],ab=null;if(typeof t.plugins!=D&&typeof t.plugins[S]==r){ab=t.plugins[S].description;if(ab&&!(typeof t.mimeTypes!=D&&t.mimeTypes[q]&&!t.mimeTypes[q].enabledPlugin)){T=true;X=false;ab=ab.replace(/^.*\s+(\S+\s+\S+$)/,"$1");ag[0]=parseInt(ab.replace(/^(.*)\..*$/,"$1"),10);ag[1]=parseInt(ab.replace(/^.*\.(.*)\s.*$/,"$1"),10);ag[2]=/[a-zA-Z]/.test(ab)?parseInt(ab.replace(/^.*[a-zA-Z]+(.*)$/,"$1"),10):0}}else{if(typeof O.ActiveXObject!=D){try{var ad=new ActiveXObject(W);if(ad){ab=ad.GetVariable("$version");if(ab){X=true;ab=ab.split(" ")[1].split(",");ag=[parseInt(ab[0],10),parseInt(ab[1],10),parseInt(ab[2],10)]}}}catch(Z){}}}return{w3:aa,pv:ag,wk:af,ie:X,win:ae,mac:ac}}(),k=function(){if(!M.w3){return}if((typeof j.readyState!=D&&j.readyState=="complete")||(typeof j.readyState==D&&(j.getElementsByTagName("body")[0]||j.body))){f()}if(!J){if(typeof j.addEventListener!=D){j.addEventListener("DOMContentLoaded",f,false)}if(M.ie&&M.win){j.attachEvent(x,function(){if(j.readyState=="complete"){j.detachEvent(x,arguments.callee);f()}});if(O==top){(function(){if(J){return}try{j.documentElement.doScroll("left")}catch(X){setTimeout(arguments.callee,0);return}f()})()}}if(M.wk){(function(){if(J){return}if(!/loaded|complete/.test(j.readyState)){setTimeout(arguments.callee,0);return}f()})()}s(f)}}();function f(){if(J){return}try{var Z=j.getElementsByTagName("body")[0].appendChild(C("span"));Z.parentNode.removeChild(Z)}catch(aa){return}J=true;var X=U.length;for(var Y=0;Y0){for(var af=0;af0){var ae=c(Y);if(ae){if(F(o[af].swfVersion)&&!(M.wk&&M.wk<312)){w(Y,true);if(ab){aa.success=true;aa.ref=z(Y);ab(aa)}}else{if(o[af].expressInstall&&A()){var ai={};ai.data=o[af].expressInstall;ai.width=ae.getAttribute("width")||"0";ai.height=ae.getAttribute("height")||"0";if(ae.getAttribute("class")){ai.styleclass=ae.getAttribute("class")}if(ae.getAttribute("align")){ai.align=ae.getAttribute("align")}var ah={};var X=ae.getElementsByTagName("param");var ac=X.length;for(var ad=0;ad'}}aa.outerHTML='"+af+"";N[N.length]=ai.id;X=c(ai.id)}else{var Z=C(r);Z.setAttribute("type",q);for(var ac in ai){if(ai[ac]!=Object.prototype[ac]){if(ac.toLowerCase()=="styleclass"){Z.setAttribute("class",ai[ac])}else{if(ac.toLowerCase()!="classid"){Z.setAttribute(ac,ai[ac])}}}}for(var ab in ag){if(ag[ab]!=Object.prototype[ab]&&ab.toLowerCase()!="movie"){e(Z,ab,ag[ab])}}aa.parentNode.replaceChild(Z,aa);X=Z}}return X}function e(Z,X,Y){var aa=C("param");aa.setAttribute("name",X);aa.setAttribute("value",Y);Z.appendChild(aa)}function y(Y){var X=c(Y);if(X&&X.nodeName=="OBJECT"){if(M.ie&&M.win){X.style.display="none";(function(){if(X.readyState==4){b(Y)}else{setTimeout(arguments.callee,10)}})()}else{X.parentNode.removeChild(X)}}}function b(Z){var Y=c(Z);if(Y){for(var X in Y){if(typeof Y[X]=="function"){Y[X]=null}}Y.parentNode.removeChild(Y)}}function c(Z){var X=null;try{X=j.getElementById(Z)}catch(Y){}return X}function C(X){return j.createElement(X)}function i(Z,X,Y){Z.attachEvent(X,Y);I[I.length]=[Z,X,Y]}function F(Z){var Y=M.pv,X=Z.split(".");X[0]=parseInt(X[0],10);X[1]=parseInt(X[1],10)||0;X[2]=parseInt(X[2],10)||0;return(Y[0]>X[0]||(Y[0]==X[0]&&Y[1]>X[1])||(Y[0]==X[0]&&Y[1]==X[1]&&Y[2]>=X[2]))?true:false}function v(ac,Y,ad,ab){if(M.ie&&M.mac){return}var aa=j.getElementsByTagName("head")[0];if(!aa){return}var X=(ad&&typeof ad=="string")?ad:"screen";if(ab){n=null;G=null}if(!n||G!=X){var Z=C("style");Z.setAttribute("type","text/css");Z.setAttribute("media",X);n=aa.appendChild(Z);if(M.ie&&M.win&&typeof j.styleSheets!=D&&j.styleSheets.length>0){n=j.styleSheets[j.styleSheets.length-1]}G=X}if(M.ie&&M.win){if(n&&typeof n.addRule==r){n.addRule(ac,Y)}}else{if(n&&typeof j.createTextNode!=D){n.appendChild(j.createTextNode(ac+" {"+Y+"}"))}}}function w(Z,X){if(!m){return}var Y=X?"visible":"hidden";if(J&&c(Z)){c(Z).style.visibility=Y}else{v("#"+Z,"visibility:"+Y)}}function L(Y){var Z=/[\\\"<>\.;]/;var X=Z.exec(Y)!=null;return X&&typeof encodeURIComponent!=D?encodeURIComponent(Y):Y}var d=function(){if(M.ie&&M.win){window.attachEvent("onunload",function(){var ac=I.length;for(var ab=0;abdb_query($qry_pruefling)) } } +$fortschrittsbalken=''; +if($levelgebiet) +{ + $max = $gebiet->maxfragen; + $aktuell=0; + $qry = "SELECT count(*) as anzahl FROM testtool.tbl_pruefling_frage JOIN testtool.tbl_frage USING(frage_id) + WHERE pruefling_id='".addslashes($_SESSION['pruefling_id'])."' + AND gebiet_id='$gebiet_id'"; + + if($result_aktuell = $db->db_query($qry)) + { + if($row_aktuell = $db->db_fetch_object($result_aktuell)) + { + $aktuell = $row_aktuell->anzahl; + } + } + $psolved = $aktuell/$max*100; + //$fortschrittsbalken .= "$aktuell / $max"; + $fortschrittsbalken .= ' + + + + +
+ + + + +
+ + + +
+
'; + $fortschrittsbalken .= ' '.$aktuell.' / '.$max.' ['.number_format($psolved,1,'.','').'%]'; + +} //Zeit des Gebietes holen -echo ' -
'.$info.''; +echo '"; @@ -514,6 +573,37 @@ if($frage->frage_id!='') } } } + else + { + //Naechste Frage holen und Weiter-Button anzeigen + $frage = new frage(); + $nextfrage = $frage->getNextFrage($gebiet_id, $_SESSION['pruefling_id'], $frage_id, $demo); + if($nextfrage) + { + echo " Weiter >>"; + } + else + { + if($demo) + { + //Naechste Frage holen und Weiter-Button anzeigen + //$frage = new frage(); + //$nextfrage = $frage->getNextFrage($gebiet_id, $_SESSION['pruefling_id'], $frage_id, $demo); + + $qry = "SELECT count(*) as anzahl FROM testtool.tbl_frage + WHERE tbl_frage.gebiet_id='".addslashes($gebiet_id)."' + AND demo "; + if($row = $db->db_fetch_object($db->db_query($qry))) + { + if($row->anzahl>1) + { + //Bei Demos den Weiter-Button nur anzeigen, wenn ausser der Startseite noch andere Demoseiten vorhanden sind + echo " Weiter >>"; + } + } + } + } + } echo ''; } diff --git a/cis/testtool/gebietfertig.php b/cis/testtool/gebietfertig.php index 8e86f2268..839abe1d6 100644 --- a/cis/testtool/gebietfertig.php +++ b/cis/testtool/gebietfertig.php @@ -31,6 +31,6 @@


-
Die Maximalzeit für dieses Gebiet ist bereits abgelaufen!
+
Die Maximalzeit für dieses Gebiet ist abgelaufen, oder alle Fragen wurden beantwortet!
diff --git a/cis/testtool/sound.php b/cis/testtool/sound.php index b9b428226..9fe3400fa 100644 --- a/cis/testtool/sound.php +++ b/cis/testtool/sound.php @@ -44,12 +44,19 @@ else if($qry!='') { //Header fuer Sound schicken - header("Content-type: audio/mpeg"); - //header("Content-type: audio/wav"); + header("Content-type: audio/mp3"); + //base64 Werte in Zeichen $result = $db->db_query($qry); $row = $db->db_fetch_object($result); - //base64 Werte in Zeichen umwandeln und ausgeben - echo base64_decode($row->audio); + + $content = base64_decode($row->audio); + + $len = strlen($content); + header("Content-Length: $len\n"); + //header("Content-type: audio/wav"); + + //ausgeben + echo $content; } ?> diff --git a/cis/testtool/topbar.html b/cis/testtool/topbar.html index a5f8a7122..9a85c223e 100644 --- a/cis/testtool/topbar.html +++ b/cis/testtool/topbar.html @@ -29,7 +29,6 @@
'.$info.''.$fortschrittsbalken.''; if($demo) { @@ -392,7 +429,18 @@ if($frage->frage_id!='') //Sound einbinden if($frage->audio!='') - echo '
'; + { + //echo '
'; + echo ' + + + + + + + + '; + } echo "$frage->text

\n"; //Vorschlaege laden @@ -435,7 +483,18 @@ if($frage->frage_id!='') if($vorschlag->bild!='') echo "
"; if($vorschlag->audio!='') - echo '
'; + { + //echo '
'; + echo ' + + + + + + + + '; + } if($vorschlag->text!='') echo $vorschlag->text.'
'; echo "