Rudolf.grossmann has submitted this change and it was merged. Change subject: Added HTML5 support (by Rudolf Grossmann) Extension should now support adding both HTML5 applets and Java applets ......................................................................
Added HTML5 support (by Rudolf Grossmann) Extension should now support adding both HTML5 applets and Java applets Change-Id: Ifc806890012c676dcb62d2b4d4ef0f30759683ce --- M GeoGebra.php 1 file changed, 185 insertions(+), 142 deletions(-) Approvals: Rudolf.grossmann: Verified; Looks good to me, approved diff --git a/GeoGebra.php b/GeoGebra.php index 407005a..b2eb84e 100644 --- a/GeoGebra.php +++ b/GeoGebra.php @@ -3,10 +3,10 @@ * GeoGebra extension * * @author Rudolf Grossmann - * @version 2.9a + * @version 3.0d-web */ -$ggb_version = "2.9a"; +$ggb_version = "3.0d-web"; // This MediaWiki extension is based on the Java Applet extension by Phil Trasatti // see: http://www.mediawiki.org/wiki/Extension:Java_Applet @@ -24,167 +24,210 @@ ); function ggb_AppletSetup() { - global $wgParser; - $wgParser->setHook( 'ggb_applet', 'get_ggbAppletOutput' ); - return true; + global $wgParser; + $wgParser->setHook( 'ggb_applet', 'get_ggbAppletOutput' ); + return true; } function get_ggbAppletOutput( $input, $args, $parser ) { - global $wgServer; // URL of the WIKI's server - global $wgVersion; // Version number of MediaWiki Software - global $ggb_version; // see line 9 of this file + global $wgServer; // URL of the WIKI's server + global $wgVersion; // Version number of MediaWiki Software + global $ggb_version; // see line 9 of this file + $parser->disableCache(); + global $applet_counter; + $applet_counter = isset( $applet_counter ) ? ( $applet_counter + 1 ) : 0; - $error_message = "no error"; //will be overwritten, if error occurs - $debug = 'Debug: '; - $CRLF = "\r\n"; - $quot = '"'; - $appletBinary = "geogebra.jar"; - $codeBaseSigned = 'http://www.geogebra.org/webstart/'; - if ( isset( $args['version'] ) ) { - $version = htmlspecialchars( strip_tags( $args['version'] ) ); - $codeBaseUnsigned = 'http://www.geogebra.org/webstart/' . $version . '/unsigned/'; - } else { - $codeBaseUnsigned = 'http://www.geogebra.org/webstart/unsigned/'; - } + $error_message = "no error"; // will be overwritten, if error occurs + $debug = 'Debug: '; + $CRLF = "\r\n"; + $quot = '"'; + $appletBinary = "geogebra.jar" ; + $codeBaseSigned = 'http://www.geogebra.org/webstart/'; - // Special parameters, not for parameter (name - value) tags. Use lowercase for sake of comparison! - $special_parameters = array( 'width', 'height', 'uselocaljar', 'usesignedjar', 'substimage', 'filename', 'ggbbase64', 'version', 'debug' ); - $noJavaText = wfMessage( 'geogebra-nojava', '[http://java.com Java]' )->parse(); - - // retrieve URL of image file substituting GeoGebra applet if Java ist not installed - $imgBinary = isset( $args['substimage'] ) ? htmlspecialchars( strip_tags( $args['substimage'] ) ) : ''; - if ( $imgBinary == '' ) { - $imgBinary = 'filenotfound.jpg'; - } - $imgFile = wfLocalFile( $imgBinary ); - if ( $imgFile->exists() ) { - $imgURL = $imgFile->getURL(); - // if URL doesn't start with slash, add starting slash. - if ( substr( $imgURL, 0, 1 ) != '/' ) { - $imgURL = '/' . $imgURL; + $isMobile = preg_match( '/iPhone|iPod|iPad|BlackBerry|Android|CrOS/', $_SERVER['HTTP_USER_AGENT'] ) != 0; + if ( isset($_GET['mobile']) && $_GET['mobile'] == 'true' ) { + $isMobile = true; } - $imgURL = $wgServer . $imgURL; - $noJavaText = "<img src=" . $quot . $imgURL . $quot; - $noJavaText = $noJavaText . " width=" . $quot . htmlspecialchars( strip_tags( $args['width'] ) ) . $quot; // Add width value to tag - $noJavaText = $noJavaText . " height=" . $quot . htmlspecialchars( strip_tags( $args['height'] ) ) . $quot; // Add height value to tag - // TODO: i18n - $noJavaText = $noJavaText . " alt=" . $quot . "Image replacing GeoGebra applet" . $quot . " >" . $CRLF; - $noJavaText = $noJavaText . '<p>Please <a href="http://java.sun.com/getjava";>install Java</a> to see a dynamic version of this image.</p>'; - } - //Look for parameter 'useSignedJar'. - $useSignedJar = isset( $args['usesignedjar'] ) ? $args['usesignedjar'] : ''; - //Look for parameter 'useLocalJar'. Will be overwritten with 'true', if parameter 'filename is used' - $useLocalJar = isset( $args['uselocaljar'] ) ? $args['uselocaljar'] : ''; - $printDebug = isset( $args['debug'] ) ? $args['debug'] : 'false'; + if ( isset( $args['version'] ) ) { + $version = htmlspecialchars( strip_tags( $args['version'] ) ); + $codeBaseUnsigned = 'http://www.geogebra.org/webstart/' . $version . '/unsigned/'; + $version_without_point = substr($version, 0, 1) . substr($version, 2,1); + if ($version == '4.2' || $version == '4.4' || $version == '5.0'){ + // just use $version as is + } else if ($version_without_point < 42) { + $version = '4.2'; + } else { + $version = '4.4'; + } + $JScriptTag = '<script type="text/javascript" src="http://www.geogebra.org/web/' . $version . '/web/web.nocache.js"></script>'; + } else { + $codeBaseUnsigned = 'http://www.geogebra.org/webstart/unsigned/'; + $JScriptTag = '<script type="text/javascript" src="http://www.geogebra.org/web/4.4/web/web.nocache.js";></script>'; + } + // Special parameters, not for parameter (name - value) tags. Use lowercase for sake of comparison! + $special_parameters = array( 'width', 'height', 'uselocaljar', 'usesignedjar', 'substimage', 'filename', 'ggbbase64', 'version', 'debug' ); + $noJavaText = wfMessage( 'geogebra-nojava', '[http://java.com Java]' )->parse(); - // Look for required parameters width, height, ggbBase64 or filename + // retrieve URL of image file substituting GeoGebra applet if Java ist not installed + $imgBinary = isset( $args['substimage'] ) ? htmlspecialchars( strip_tags( $args['substimage'] ) ) : ''; + if ( $imgBinary == '' ) { + $imgBinary = 'filenotfound.jpg'; + } + $imgFile = wfLocalFile( $imgBinary ); + if ( $imgFile->exists() ) { + $imgURL = $imgFile->getURL(); + // if URL doesn't start with slash, add starting slash. + if ( substr( $imgURL, 0, 1 ) != '/' ) { + $imgURL = '/' . $imgURL; + } + $imgURL = $wgServer . $imgURL; + $noJavaText = "<img src=" . $quot . $imgURL . $quot; + $noJavaText = $noJavaText . " width=" . $quot . htmlspecialchars( strip_tags( $args['width'] ) ) . $quot; // Add width value to tag + $noJavaText = $noJavaText . " height=" . $quot . htmlspecialchars( strip_tags( $args['height'] ) ) . $quot; // Add height value to tag + // TODO: i18n + $noJavaText = $noJavaText . " alt=" . $quot . "Image replacing GeoGebra applet" . $quot . " >" . $CRLF; + $noJavaText = $noJavaText . '<p>Please <a href="http://java.sun.com/getjava";>install Java</a> to see a dynamic version of this image.</p>'; + } + + // Look for parameter 'useSignedJar'. + $useSignedJar = isset( $args['usesignedjar'] ) ? $args['usesignedjar'] : ''; + // Look for parameter 'useLocalJar'. Will be overwritten with 'true', if parameter 'filename is used' + $useLocalJar = isset( $args['uselocaljar'] ) ? $args['uselocaljar'] : ''; + $printDebug = isset( $args['debug'] ) ? $args['debug'] : 'false'; + + // Look for required parameters width, height, ggbBase64 or filename if ( !( isset( $args['width'] ) ) ) { - $error_message = wfMessage( 'geogebra-missing-parameter' )->escaped(); - } else { + $error_message = wfMessage( 'geogebra-missing-parameter' )->escaped(); + } else { if ( !( isset( $args['height'] ) ) ) { - $error_message = wfMessage( 'geogebra-missing-parameter' )->escaped(); - } else { + $error_message = wfMessage( 'geogebra-missing-parameter' )->escaped(); + } else { if ( isset( $args['ggbbase64'] ) ) { - $ggbBase64String = htmlspecialchars( strip_tags( $args['ggbbase64'] ) ); + $ggbBase64String = htmlspecialchars( strip_tags( $args['ggbbase64'] ) ); if ( $ggbBase64String != '' ) { - $ggbSource = '<param name="ggbBase64" value="' . $ggbBase64String . '">' . $CRLF; - } - } else { - // No parameter ' ggbBase64'. Parameter 'filename' necessary + $ggbSource = '<param name="ggbBase64" value="' . $ggbBase64String . '">' . $CRLF; + } + } else { + // No parameter ' ggbBase64'. Parameter 'filename' necessary if ( !( isset( $args['filename'] ) ) ) { $error_message = wfMessage( 'geogebra-missing-parameter' )->escaped(); - } else { - // retrieve URL of *.ggb file - $ggbBinary = htmlspecialchars( strip_tags( $args['filename'] ) ); - if ( $ggbBinary == '' ) { - $ggbBinary = 'filenotfound.ggb'; - } - $ggbFile = wfLocalFile( $ggbBinary ); + } else { + // retrieve URL of *.ggb file + $ggbBinary = htmlspecialchars( strip_tags( $args['filename'] ) ); + if ( $ggbBinary == '' ) { + $ggbBinary = 'filenotfound.ggb'; + } + $ggbFile = wfLocalFile( $ggbBinary ); if ( !( $ggbFile->exists() ) ) { - $error = wfMessage( 'geogebra-file-not-found' )->rawParams( $ggbBinary )->escaped(); + $error = wfMessage( 'geogebra-file-not-found' )->rawParams( $ggbBinary )->escaped(); } else { - $ggbURL = $ggbFile->getURL(); - // if URL doesn't start with slash, add starting slash. - if ( substr( $ggbURL, 0, 1 ) != '/' ) { - $ggbURL = '/' . $ggbURL; - } - $ggbURL = $wgServer . $ggbURL; - // Add URL of *.ggb file to tag - $ggbSource = '<param name="filename" value="' . $ggbURL . '">' . $CRLF; - $useLocalJar = 'true'; //Avoid trouble (security exception) - } - } - } - } - } + $ggbURL = $ggbFile->getURL(); + // if URL doesn't start with slash, add starting slash. + if ( substr( $ggbURL, 0, 1 ) != '/' ) { + $ggbURL = '/' . $ggbURL; + } + $ggbURL = $wgServer . $ggbURL; + // Add URL of *.ggb file to tag + $ggbSource = '<param name="filename" value="' . $ggbURL . '">' . $CRLF; + $useLocalJar = 'true'; // Avoid trouble (security exception) + } + } + } + } + } - // if error occured, discard applet and output error message - if ( $error_message == 'no error' ) { - $debug .= 'No error<br>' . $CRLF; - if ( $useSignedJar != 'true' ) { // Default - $debug .= 'useSigned=false<br>' . $CRLF; - if ( $useLocalJar != 'true' ) { - $debug .= 'useLocal=false<br>' . $CRLF; - $codeBase = $codeBaseUnsigned; //Default - } - } else { - $debug .= 'User explicitly wants signed applet!<br>' . $CRLF; - // User explicitly wants signed applet - $codeBase = $codeBaseSigned; - $useLocalJar = 'false'; - } + // if error occured, discard applet and output error message + if ( $error_message == 'no error' ) { + $debug .= 'No error<br>' . $CRLF; + if ( $useSignedJar != 'true' ) { // Default + $debug .= 'useSigned=false<br>' . $CRLF; + if ( $useLocalJar != 'true' ) { + $debug .= 'useLocal=false<br>' . $CRLF; + $codeBase = $codeBaseUnsigned; // Default + } + } else { + $debug .= 'User explicitly wants signed applet!<br>' . $CRLF; + // User explicitly wants signed applet + $codeBase = $codeBaseSigned; + $useLocalJar = 'false'; + } - if ( $useLocalJar == 'true' ) { // Parameter set or JAR from geogebra.org not found - $debug .= 'useLocal=true<br>' . $CRLF; - # The following line is code from http://code.activestate.com/recipes/576595/ "A more reliable DOCUMENT_ROOT" + if ( $useLocalJar == 'true' ) { // Parameter set or JAR from geogebra.org not found + $debug .= 'useLocal=true<br>' . $CRLF; + # The following line is code from http://code.activestate.com/recipes/576595/ "A more reliable DOCUMENT_ROOT" $docroot = realpath( ( getenv( 'DOCUMENT_ROOT' ) && ereg( '^' . preg_quote( realpath( getenv( 'DOCUMENT_ROOT' ) ) ), realpath( __FILE__ ) ) ) ? getenv( 'DOCUMENT_ROOT' ) : str_replace( dirname( @$_SERVER['PHP_SELF'] ), '', str_replace( DIRECTORY_SEPARATOR, '/', __DIR__ ) ) ); - # $docroot = $_SERVER['DOCUMENT_ROOT']; #ereg is deprecated and causes an error + # $docroot = $_SERVER['DOCUMENT_ROOT']; #ereg is deprecated and causes an error $delta = substr( __DIR__, strlen( $docroot ) ); - $codeBase = $wgServer . $delta; - # replace backslash by slash - $codeBase = str_replace( '\\', '/', $codeBase ); - # add slash at ending - if ( substr( $codeBase, strlen( $codeBase ) - 1 ) != '/' ) { - $codeBase = $codeBase . "/"; - } - } - } + $codeBase = $wgServer . $delta; + # replace backslash by slash + $codeBase = str_replace( '\\', '/', $codeBase ); + # add slash at ending + if ( substr( $codeBase, strlen( $codeBase ) -1 ) != '/' ) { + $codeBase = $codeBase . "/"; + } + } + } - if ( $error_message == 'no error' ) { - // Assemble the applet tag - $output = "<!-- GeoGebra Applet MediaWiki extension " . $ggb_version . " by R. Grossmann -->"; - $output .= '<applet code="geogebra.GeoGebraApplet"'; // Add code value to tag - if ( isset( $args['name'] ) ) { - $output = $output . " name=" . $quot . htmlspecialchars( strip_tags( $args['name'] ) ) . $quot; // Add name value to tag - } - $output .= " codebase=" . $quot . $codeBase . $quot; // Add codebase value to tag - $output .= " width=" . $quot . htmlspecialchars( strip_tags( $args['width'] ) ) . $quot; // Add width value to tag - $output .= " height=" . $quot . htmlspecialchars( strip_tags( $args['height'] ) ) . $quot; // Add height value to tag - $output .= " archive=" . $quot . $appletBinary . $quot . " >"; // Add archive value to tag - $output .= $ggbSource; - - // Add code for non-special parameters - foreach ( $args as $par_name => $par_value ) { - if ( !in_array( strtolower( $par_name ), $special_parameters ) ) { - $parameter = htmlspecialchars( strip_tags( $par_name ) ); - $value = htmlspecialchars( strip_tags( $par_value ) ); - $debug .= '<p>Allgemein: ' . $par_name . ' => ' . $par_value . '</p>' . $CRLF; - if ( strlen( $value ) > 0 ) { - $output .= '<param name="' . $parameter . '" value="' . $value . '">' . $CRLF; + if ( $error_message == 'no error' ) { + // Assemble the applet tag + if ( $isMobile ) { + $output = "<!-- GeoGebra Applet MediaWiki extension " . $ggb_version . " by R. Grossmann (Mode: HTML5) -->"; + if ( $applet_counter == 0 ) { + $output .= $JScriptTag . $CRLF; } + $output .= '<article class="geogebraweb" style="width: '; + $output .= htmlspecialchars( strip_tags( $args['width'] ) ); + $output .= 'px; height: '; + $output .= htmlspecialchars( strip_tags( $args['height'] ) ); + $output .= 'px;" ' . $CRLF; + $output .= 'data-param-width="'; + $output .= htmlspecialchars( strip_tags( $args['width'] ) ); + $output .= '"' . $CRLF; + $output .= 'data-param-height="'; + $output .= htmlspecialchars( strip_tags( $args['height'] ) ); + $output .= '"' . $CRLF; + $output .= 'data-param-useBrowserForJS="false"' . $CRLF; + $output .= 'data-param-enableLabelDrags="false"' . $CRLF; + $output .= 'data-param-enableShiftDragZoom="false"' . $CRLF; + $output .= 'data-param-ggbbase64="'; + $output .= $ggbBase64String; + $output .= '"></article>' . $CRLF; + } else { + $output = "<!-- GeoGebra Applet MediaWiki extension " . $ggb_version . " by R. Grossmann (Mode: Java) -->"; + $output .= '<applet code="geogebra.GeoGebraApplet"'; // Add code value to tag + if ( isset( $args['name'] ) ) { + $output = $output . " name=" . $quot . htmlspecialchars( strip_tags( $args['name'] ) ) . $quot; // Add name value to tag + } + $output .= " codebase=" . $quot . $codeBase . $quot; // Add codebase value to tag + $output .= " width=" . $quot . htmlspecialchars( strip_tags( $args['width'] ) ) . $quot; // Add width value to tag + $output .= " height=" . $quot . htmlspecialchars( strip_tags( $args['height'] ) ) . $quot; // Add height value to tag + $output .= " archive=" . $quot . $appletBinary . $quot . " >"; // Add archive value to tag + $output .= $ggbSource; + + // Add code for non-special parameters + foreach ( $args as $par_name => $par_value ) { + if ( ! in_array( strtolower( $par_name ), $special_parameters ) ) { + $parameter = htmlspecialchars( strip_tags( $par_name ) ); + $value = htmlspecialchars( strip_tags( $par_value ) ); + $debug .= '<p>Allgemein: ' . $par_name . ' => ' . $par_value . '</p>' . $CRLF; + if ( strlen( $value ) > 0 ) { + $output .= '<param name="' . $parameter . '" value="' . $value . '">' . $CRLF; + } + } + } + $output .= '<param name="java_arguments" value="-Djnlp.packEnabled=true">' . $CRLF; // Use packed JAR if available + // Close applet tag + $output .= $noJavaText . $CRLF; // Message if Java is not installed + $output .= "</applet>" . $CRLF; // The closing applet tag } - } - $output .= '<param name="java_arguments" value="-Djnlp.packEnabled=true">' . $CRLF; // Use packed JAR if available - // Close applet tag - $output .= $noJavaText . $CRLF; // Message if Java is not installed - $output .= "</applet>" . $CRLF; // The closing applet tag - } else { - $output = wfMessage( 'geogebra-error' )->rawParams( $error_message )->parseAsBlock() . $CRLF; - } - if ( $printDebug == 'true' ) { - $output .= '<p>' . $debug . '</p>' . $CRLF; - } - // Send the output to the browser - return $output; + } else { + $output = wfMessage( 'geogebra-error' )->rawParams( $error_message )->parseAsBlock() . $CRLF; + } + if ( $printDebug == 'true' ) { + $output .= '<p>' . $debug . '</p>' . $CRLF; + } + // Send the output to the browser + return $output; } // missing php end tag to avoid troubles. + -- To view, visit https://gerrit.wikimedia.org/r/95955 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ifc806890012c676dcb62d2b4d4ef0f30759683ce Gerrit-PatchSet: 1 Gerrit-Project: mediawiki/extensions/GeoGebra Gerrit-Branch: master Gerrit-Owner: Zbynek <zby...@geogebra.org> Gerrit-Reviewer: Cscott <canan...@wikimedia.org> Gerrit-Reviewer: GWicke <gwi...@wikimedia.org> Gerrit-Reviewer: Rudolf.grossmann <r...@gmx.de> Gerrit-Reviewer: Subramanya Sastry <ssas...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
