diff -Nru lua-cgi-5.1.4+dfsg/debian/README.Debian lua-cgi-5.2~alpha2/debian/README.Debian --- lua-cgi-5.1.4+dfsg/debian/README.Debian 2008-04-22 11:17:54.000000000 +0000 +++ lua-cgi-5.2~alpha2/debian/README.Debian 2013-08-12 07:47:34.000000000 +0000 @@ -1,22 +1,3 @@ -Simple and embedded SAPI implementations -======================================== - -lua-cgi needs a launcher (an implementation of the SAPI specifications[1]) -to work properly. Implementations for some web servers are part of the -liblua5.1-wsapi0 package. A simple implementation of SAPI for the CGI -protocol is shipped with this package. It can be used to write CGI -like the following one: - - #!/usr/bin/lua5.1 - require "sapi" - require "cgilua" - cgilua.htmlheader() - cgilua.print("<html><body>test</body></html>") - -More complex usage of usage of cgilua need wsapi and are explained in the -following section. - - Configuration with wsapi ======================== @@ -74,7 +55,6 @@ Reference ========= -[1]: http://keplerproject.org/cgilua/sapi.html [2]: file:///usr/share/doc/liblua5.1-cgi-dev/doc/us/manual.html#scripts [3]: file:///usr/share/doc/liblua5.1-cgi-dev/doc/us/manual.html#templates [4]: file:///usr/share/doc/liblua5.1-cgi-dev/doc/us/manual.html#config diff -Nru lua-cgi-5.1.4+dfsg/debian/changelog lua-cgi-5.2~alpha2/debian/changelog --- lua-cgi-5.1.4+dfsg/debian/changelog 2012-05-11 07:36:49.000000000 +0000 +++ lua-cgi-5.2~alpha2/debian/changelog 2013-08-12 07:47:34.000000000 +0000 @@ -1,3 +1,12 @@ +lua-cgi (5.2~alpha2-1) unstable; urgency=low + + * Packaging moved to git + * Remove transitional packages + * New upstream release working on lua5.2 too + * Removing embedded sapi library, recommend lua-wsapi + + -- Enrico Tassi <gareuselesinge@debian.org> Fri, 11 May 2012 09:43:50 +0200 + lua-cgi (5.1.4+dfsg-2) unstable; urgency=low * Update dependency on liblua5.1-socket2 -> lua-socket diff -Nru lua-cgi-5.1.4+dfsg/debian/control lua-cgi-5.2~alpha2/debian/control --- lua-cgi-5.1.4+dfsg/debian/control 2012-05-11 07:36:22.000000000 +0000 +++ lua-cgi-5.2~alpha2/debian/control 2013-08-12 07:47:34.000000000 +0000 @@ -4,39 +4,22 @@ Maintainer: Enrico Tassi <gareuselesinge@debian.org> Build-Depends: debhelper (>= 8), dh-lua Standards-Version: 3.9.3 -Vcs-Svn: svn://svn.debian.org/pkg-lua/packages/lua-cgi -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-lua/packages/lua-cgi +Vcs-Git: git://git.debian.org/git/pkg-lua/lua-cgi.git +Vcs-Browser: http://git.debian.org/?p=pkg-lua/luacgi.git Homepage: http://keplerproject.github.com/cgilua/ Package: lua-cgi Architecture: all Depends: ${misc:Depends}, lua-expat, lua-socket, lua-filesystem -Suggests: lua-wsapi -Replaces: liblua5.1-cgi0 (<< 5.1.4-1~), liblua5.1-cgi-dev (<< 5.1.4-1~) -Breaks: liblua5.1-cgi0 (<< 5.1.4-1~), liblua5.1-cgi-dev (<< 5.1.4-1~) -Provides: liblua5.1-cgi0, liblua5.1-cgi-dev, ${lua:Provides} +Recommends: lua-wsapi +Provides: ${lua:Provides} XB-Lua-Versions: ${lua:Versions} Description: CGI library for the Lua language CGILua is a tool for creating dynamic Web pages and manipulating input data from Web forms. CGILua allows the separation of logic and data handling from the generation of pages, making it easy to develop web applications with Lua. . + CGILua requires a SAPI implementation to work. The lua-wsapi packages + provides a few ready to use SAPI implementations. + . This package also contains the documentation for the Lua CGI library. - -Package: liblua5.1-cgi0 -Section: oldlibs -Priority: extra -Architecture: all -Depends: ${misc:Depends}, lua-cgi -Description: Transitional package for lua-cgi - This is a transitional package to ease upgrades to the lua-cgi - package. It can safely be removed. - -Package: liblua5.1-cgi-dev -Section: oldlibs -Priority: extra -Architecture: all -Depends: ${misc:Depends}, lua-cgi -Description: Transitional package for lua-cgi - This is a transitional package to ease upgrades to the lua-cgi - package. It can safely be removed. diff -Nru lua-cgi-5.1.4+dfsg/debian/dh-lua.conf lua-cgi-5.2~alpha2/debian/dh-lua.conf --- lua-cgi-5.1.4+dfsg/debian/dh-lua.conf 2012-04-28 16:16:15.000000000 +0000 +++ lua-cgi-5.2~alpha2/debian/dh-lua.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,19 +0,0 @@ -LUA_VERSION=5.1 -PKG_NAME=cgi - -CLIB_CFLAGS= -CLIB_LDFLAGS= -CLIB_OBJS= - -LUA_HEADER= -LUA_SOURCES=$(wildcard src/*.lua src/cgilua/*.lua src/sapi/*.lua src/sapi/*/*.lua) -LUA_SOURCES_MANGLER=sed -e s?^src/?? -e s?cgilua/cgilua.lua?cgilua.lua? -LUA_MODNAME=cgilua -LUA_TEST= -LUA_MODNAME_CPART= - -PKG_VERSION=$(shell dpkg-parsechangelog|grep ^Ver|cut -d ' ' -f 2|cut -d '-' -f 1) -PKG_LIBS_PRIVATE= -PKG_URL=https://github.com/keplerproject/cgilua -PKG_REQUIRES= -PKG_CONFLICTS= diff -Nru lua-cgi-5.1.4+dfsg/debian/lua5.1.dh-lua.conf lua-cgi-5.2~alpha2/debian/lua5.1.dh-lua.conf --- lua-cgi-5.1.4+dfsg/debian/lua5.1.dh-lua.conf 1970-01-01 00:00:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/debian/lua5.1.dh-lua.conf 2013-08-12 07:47:34.000000000 +0000 @@ -0,0 +1,19 @@ +LUA_VERSION=5.1 +PKG_NAME=cgi + +CLIB_CFLAGS= +CLIB_LDFLAGS= +CLIB_OBJS= + +LUA_HEADER= +LUA_SOURCES=$(wildcard src/*.lua src/cgilua/*.lua src/sapi/*.lua src/sapi/*/*.lua) +LUA_SOURCES_MANGLER=sed -e s?^src/?? -e s?cgilua/cgilua.lua?cgilua.lua? +LUA_MODNAME=cgilua +LUA_TEST= +LUA_MODNAME_CPART= + +PKG_VERSION=$(shell dpkg-parsechangelog|grep ^Ver|cut -d ' ' -f 2|cut -d '-' -f 1) +PKG_LIBS_PRIVATE= +PKG_URL=https://github.com/keplerproject/cgilua +PKG_REQUIRES= +PKG_CONFLICTS= diff -Nru lua-cgi-5.1.4+dfsg/debian/lua5.2.dh-lua.conf lua-cgi-5.2~alpha2/debian/lua5.2.dh-lua.conf --- lua-cgi-5.1.4+dfsg/debian/lua5.2.dh-lua.conf 1970-01-01 00:00:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/debian/lua5.2.dh-lua.conf 2013-08-12 07:47:34.000000000 +0000 @@ -0,0 +1,19 @@ +LUA_VERSION=5.1 +PKG_NAME=cgi + +CLIB_CFLAGS= +CLIB_LDFLAGS= +CLIB_OBJS= + +LUA_HEADER= +LUA_SOURCES=$(wildcard src/*.lua src/cgilua/*.lua src/sapi/*.lua src/sapi/*/*.lua) +LUA_SOURCES_MANGLER=sed -e s?^src/?? -e s?cgilua/cgilua.lua?cgilua.lua? +LUA_MODNAME=cgilua +LUA_TEST= +LUA_MODNAME_CPART= + +PKG_VERSION=$(shell dpkg-parsechangelog|grep ^Ver|cut -d ' ' -f 2|cut -d '-' -f 1) +PKG_LIBS_PRIVATE= +PKG_URL=https://github.com/keplerproject/cgilua +PKG_REQUIRES= +PKG_CONFLICTS= diff -Nru lua-cgi-5.1.4+dfsg/debian/patches/0002-Non-minimized-version-of-jquery-to-adhere-DFSG.patch lua-cgi-5.2~alpha2/debian/patches/0002-Non-minimized-version-of-jquery-to-adhere-DFSG.patch --- lua-cgi-5.1.4+dfsg/debian/patches/0002-Non-minimized-version-of-jquery-to-adhere-DFSG.patch 1970-01-01 00:00:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/debian/patches/0002-Non-minimized-version-of-jquery-to-adhere-DFSG.patch 2013-08-12 07:47:34.000000000 +0000 @@ -0,0 +1,3423 @@ +From: Enrico Tassi <gareuselesinge@debian.org> +Date: Sun, 11 Aug 2013 14:08:54 +0200 +Subject: Non minimized version of jquery to adhere DFSG + +--- + examples/jquery/jquery-1.2.3.js | 3408 +++++++++++++++++++++++++++++++++++++++ + 1 file changed, 3408 insertions(+) + create mode 100644 examples/jquery/jquery-1.2.3.js + +diff --git a/examples/jquery/jquery-1.2.3.js b/examples/jquery/jquery-1.2.3.js +new file mode 100644 +index 0000000..2e43a82 +--- /dev/null ++++ b/examples/jquery/jquery-1.2.3.js +@@ -0,0 +1,3408 @@ ++(function(){ ++/* ++ * jQuery 1.2.3 - New Wave Javascript ++ * ++ * Copyright (c) 2008 John Resig (jquery.com) ++ * Dual licensed under the MIT (MIT-LICENSE.txt) ++ * and GPL (GPL-LICENSE.txt) licenses. ++ * ++ * $Date: 2008-02-06 00:21:25 -0500 (Wed, 06 Feb 2008) $ ++ * $Rev: 4663 $ ++ */ ++ ++// Map over jQuery in case of overwrite ++if ( window.jQuery ) ++ var _jQuery = window.jQuery; ++ ++var jQuery = window.jQuery = function( selector, context ) { ++ // The jQuery object is actually just the init constructor 'enhanced' ++ return new jQuery.prototype.init( selector, context ); ++}; ++ ++// Map over the $ in case of overwrite ++if ( window.$ ) ++ var _$ = window.$; ++ ++// Map the jQuery namespace to the '$' one ++window.$ = jQuery; ++ ++// A simple way to check for HTML strings or ID strings ++// (both of which we optimize for) ++var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/; ++ ++// Is it a simple selector ++var isSimple = /^.[^:#\[\.]*$/; ++ ++jQuery.fn = jQuery.prototype = { ++ init: function( selector, context ) { ++ // Make sure that a selection was provided ++ selector = selector || document; ++ ++ // Handle $(DOMElement) ++ if ( selector.nodeType ) { ++ this[0] = selector; ++ this.length = 1; ++ return this; ++ ++ // Handle HTML strings ++ } else if ( typeof selector == "string" ) { ++ // Are we dealing with HTML string or an ID? ++ var match = quickExpr.exec( selector ); ++ ++ // Verify a match, and that no context was specified for #id ++ if ( match && (match[1] || !context) ) { ++ ++ // HANDLE: $(html) -> $(array) ++ if ( match[1] ) ++ selector = jQuery.clean( [ match[1] ], context ); ++ ++ // HANDLE: $("#id") ++ else { ++ var elem = document.getElementById( match[3] ); ++ ++ // Make sure an element was located ++ if ( elem ) ++ // Handle the case where IE and Opera return items ++ // by name instead of ID ++ if ( elem.id != match[3] ) ++ return jQuery().find( selector ); ++ ++ // Otherwise, we inject the element directly into the jQuery object ++ else { ++ this[0] = elem; ++ this.length = 1; ++ return this; ++ } ++ ++ else ++ selector = []; ++ } ++ ++ // HANDLE: $(expr, [context]) ++ // (which is just equivalent to: $(content).find(expr) ++ } else ++ return new jQuery( context ).find( selector ); ++ ++ // HANDLE: $(function) ++ // Shortcut for document ready ++ } else if ( jQuery.isFunction( selector ) ) ++ return new jQuery( document )[ jQuery.fn.ready ? "ready" : "load" ]( selector ); ++ ++ return this.setArray( ++ // HANDLE: $(array) ++ selector.constructor == Array && selector || ++ ++ // HANDLE: $(arraylike) ++ // Watch for when an array-like object, contains DOM nodes, is passed in as the selector ++ (selector.jquery || selector.length && selector != window && !selector.nodeType && selector[0] != undefined && selector[0].nodeType) && jQuery.makeArray( selector ) || ++ ++ // HANDLE: $(*) ++ [ selector ] ); ++ }, ++ ++ // The current version of jQuery being used ++ jquery: "1.2.3", ++ ++ // The number of elements contained in the matched element set ++ size: function() { ++ return this.length; ++ }, ++ ++ // The number of elements contained in the matched element set ++ length: 0, ++ ++ // Get the Nth element in the matched element set OR ++ // Get the whole matched element set as a clean array ++ get: function( num ) { ++ return num == undefined ? ++ ++ // Return a 'clean' array ++ jQuery.makeArray( this ) : ++ ++ // Return just the object ++ this[ num ]; ++ }, ++ ++ // Take an array of elements and push it onto the stack ++ // (returning the new matched element set) ++ pushStack: function( elems ) { ++ // Build a new jQuery matched element set ++ var ret = jQuery( elems ); ++ ++ // Add the old object onto the stack (as a reference) ++ ret.prevObject = this; ++ ++ // Return the newly-formed element set ++ return ret; ++ }, ++ ++ // Force the current matched set of elements to become ++ // the specified array of elements (destroying the stack in the process) ++ // You should use pushStack() in order to do this, but maintain the stack ++ setArray: function( elems ) { ++ // Resetting the length to 0, then using the native Array push ++ // is a super-fast way to populate an object with array-like properties ++ this.length = 0; ++ Array.prototype.push.apply( this, elems ); ++ ++ return this; ++ }, ++ ++ // Execute a callback for every element in the matched set. ++ // (You can seed the arguments with an array of args, but this is ++ // only used internally.) ++ each: function( callback, args ) { ++ return jQuery.each( this, callback, args ); ++ }, ++ ++ // Determine the position of an element within ++ // the matched set of elements ++ index: function( elem ) { ++ var ret = -1; ++ ++ // Locate the position of the desired element ++ this.each(function(i){ ++ if ( this == elem ) ++ ret = i; ++ }); ++ ++ return ret; ++ }, ++ ++ attr: function( name, value, type ) { ++ var options = name; ++ ++ // Look for the case where we're accessing a style value ++ if ( name.constructor == String ) ++ if ( value == undefined ) ++ return this.length && jQuery[ type || "attr" ]( this[0], name ) || undefined; ++ ++ else { ++ options = {}; ++ options[ name ] = value; ++ } ++ ++ // Check to see if we're setting style values ++ return this.each(function(i){ ++ // Set all the styles ++ for ( name in options ) ++ jQuery.attr( ++ type ? ++ this.style : ++ this, ++ name, jQuery.prop( this, options[ name ], type, i, name ) ++ ); ++ }); ++ }, ++ ++ css: function( key, value ) { ++ // ignore negative width and height values ++ if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 ) ++ value = undefined; ++ return this.attr( key, value, "curCSS" ); ++ }, ++ ++ text: function( text ) { ++ if ( typeof text != "object" && text != null ) ++ return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) ); ++ ++ var ret = ""; ++ ++ jQuery.each( text || this, function(){ ++ jQuery.each( this.childNodes, function(){ ++ if ( this.nodeType != 8 ) ++ ret += this.nodeType != 1 ? ++ this.nodeValue : ++ jQuery.fn.text( [ this ] ); ++ }); ++ }); ++ ++ return ret; ++ }, ++ ++ wrapAll: function( html ) { ++ if ( this[0] ) ++ // The elements to wrap the target around ++ jQuery( html, this[0].ownerDocument ) ++ .clone() ++ .insertBefore( this[0] ) ++ .map(function(){ ++ var elem = this; ++ ++ while ( elem.firstChild ) ++ elem = elem.firstChild; ++ ++ return elem; ++ }) ++ .append(this); ++ ++ return this; ++ }, ++ ++ wrapInner: function( html ) { ++ return this.each(function(){ ++ jQuery( this ).contents().wrapAll( html ); ++ }); ++ }, ++ ++ wrap: function( html ) { ++ return this.each(function(){ ++ jQuery( this ).wrapAll( html ); ++ }); ++ }, ++ ++ append: function() { ++ return this.domManip(arguments, true, false, function(elem){ ++ if (this.nodeType == 1) ++ this.appendChild( elem ); ++ }); ++ }, ++ ++ prepend: function() { ++ return this.domManip(arguments, true, true, function(elem){ ++ if (this.nodeType == 1) ++ this.insertBefore( elem, this.firstChild ); ++ }); ++ }, ++ ++ before: function() { ++ return this.domManip(arguments, false, false, function(elem){ ++ this.parentNode.insertBefore( elem, this ); ++ }); ++ }, ++ ++ after: function() { ++ return this.domManip(arguments, false, true, function(elem){ ++ this.parentNode.insertBefore( elem, this.nextSibling ); ++ }); ++ }, ++ ++ end: function() { ++ return this.prevObject || jQuery( [] ); ++ }, ++ ++ find: function( selector ) { ++ var elems = jQuery.map(this, function(elem){ ++ return jQuery.find( selector, elem ); ++ }); ++ ++ return this.pushStack( /[^+>] [^+>]/.test( selector ) || selector.indexOf("..") > -1 ? ++ jQuery.unique( elems ) : ++ elems ); ++ }, ++ ++ clone: function( events ) { ++ // Do the clone ++ var ret = this.map(function(){ ++ if ( jQuery.browser.msie && !jQuery.isXMLDoc(this) ) { ++ // IE copies events bound via attachEvent when ++ // using cloneNode. Calling detachEvent on the ++ // clone will also remove the events from the orignal ++ // In order to get around this, we use innerHTML. ++ // Unfortunately, this means some modifications to ++ // attributes in IE that are actually only stored ++ // as properties will not be copied (such as the ++ // the name attribute on an input). ++ var clone = this.cloneNode(true), ++ container = document.createElement("div"); ++ container.appendChild(clone); ++ return jQuery.clean([container.innerHTML])[0]; ++ } else ++ return this.cloneNode(true); ++ }); ++ ++ // Need to set the expando to null on the cloned set if it exists ++ // removeData doesn't work here, IE removes it from the original as well ++ // this is primarily for IE but the data expando shouldn't be copied over in any browser ++ var clone = ret.find("*").andSelf().each(function(){ ++ if ( this[ expando ] != undefined ) ++ this[ expando ] = null; ++ }); ++ ++ // Copy the events from the original to the clone ++ if ( events === true ) ++ this.find("*").andSelf().each(function(i){ ++ if (this.nodeType == 3) ++ return; ++ var events = jQuery.data( this, "events" ); ++ ++ for ( var type in events ) ++ for ( var handler in events[ type ] ) ++ jQuery.event.add( clone[ i ], type, events[ type ][ handler ], events[ type ][ handler ].data ); ++ }); ++ ++ // Return the cloned set ++ return ret; ++ }, ++ ++ filter: function( selector ) { ++ return this.pushStack( ++ jQuery.isFunction( selector ) && ++ jQuery.grep(this, function(elem, i){ ++ return selector.call( elem, i ); ++ }) || ++ ++ jQuery.multiFilter( selector, this ) ); ++ }, ++ ++ not: function( selector ) { ++ if ( selector.constructor == String ) ++ // test special case where just one selector is passed in ++ if ( isSimple.test( selector ) ) ++ return this.pushStack( jQuery.multiFilter( selector, this, true ) ); ++ else ++ selector = jQuery.multiFilter( selector, this ); ++ ++ var isArrayLike = selector.length && selector[selector.length - 1] !== undefined && !selector.nodeType; ++ return this.filter(function() { ++ return isArrayLike ? jQuery.inArray( this, selector ) < 0 : this != selector; ++ }); ++ }, ++ ++ add: function( selector ) { ++ return !selector ? this : this.pushStack( jQuery.merge( ++ this.get(), ++ selector.constructor == String ? ++ jQuery( selector ).get() : ++ selector.length != undefined && (!selector.nodeName || jQuery.nodeName(selector, "form")) ? ++ selector : [selector] ) ); ++ }, ++ ++ is: function( selector ) { ++ return selector ? ++ jQuery.multiFilter( selector, this ).length > 0 : ++ false; ++ }, ++ ++ hasClass: function( selector ) { ++ return this.is( "." + selector ); ++ }, ++ ++ val: function( value ) { ++ if ( value == undefined ) { ++ ++ if ( this.length ) { ++ var elem = this[0]; ++ ++ // We need to handle select boxes special ++ if ( jQuery.nodeName( elem, "select" ) ) { ++ var index = elem.selectedIndex, ++ values = [], ++ options = elem.options, ++ one = elem.type == "select-one"; ++ ++ // Nothing was selected ++ if ( index < 0 ) ++ return null; ++ ++ // Loop through all the selected options ++ for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) { ++ var option = options[ i ]; ++ ++ if ( option.selected ) { ++ // Get the specifc value for the option ++ value = jQuery.browser.msie && !option.attributes.value.specified ? option.text : option.value; ++ ++ // We don't need an array for one selects ++ if ( one ) ++ return value; ++ ++ // Multi-Selects return an array ++ values.push( value ); ++ } ++ } ++ ++ return values; ++ ++ // Everything else, we just grab the value ++ } else ++ return (this[0].value || "").replace(/\r/g, ""); ++ ++ } ++ ++ return undefined; ++ } ++ ++ return this.each(function(){ ++ if ( this.nodeType != 1 ) ++ return; ++ ++ if ( value.constructor == Array && /radio|checkbox/.test( this.type ) ) ++ this.checked = (jQuery.inArray(this.value, value) >= 0 || ++ jQuery.inArray(this.name, value) >= 0); ++ ++ else if ( jQuery.nodeName( this, "select" ) ) { ++ var values = value.constructor == Array ? ++ value : ++ [ value ]; ++ ++ jQuery( "option", this ).each(function(){ ++ this.selected = (jQuery.inArray( this.value, values ) >= 0 || ++ jQuery.inArray( this.text, values ) >= 0); ++ }); ++ ++ if ( !values.length ) ++ this.selectedIndex = -1; ++ ++ } else ++ this.value = value; ++ }); ++ }, ++ ++ html: function( value ) { ++ return value == undefined ? ++ (this.length ? ++ this[0].innerHTML : ++ null) : ++ this.empty().append( value ); ++ }, ++ ++ replaceWith: function( value ) { ++ return this.after( value ).remove(); ++ }, ++ ++ eq: function( i ) { ++ return this.slice( i, i + 1 ); ++ }, ++ ++ slice: function() { ++ return this.pushStack( Array.prototype.slice.apply( this, arguments ) ); ++ }, ++ ++ map: function( callback ) { ++ return this.pushStack( jQuery.map(this, function(elem, i){ ++ return callback.call( elem, i, elem ); ++ })); ++ }, ++ ++ andSelf: function() { ++ return this.add( this.prevObject ); ++ }, ++ ++ data: function( key, value ){ ++ var parts = key.split("."); ++ parts[1] = parts[1] ? "." + parts[1] : ""; ++ ++ if ( value == null ) { ++ var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); ++ ++ if ( data == undefined && this.length ) ++ data = jQuery.data( this[0], key ); ++ ++ return data == null && parts[1] ? ++ this.data( parts[0] ) : ++ data; ++ } else ++ return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){ ++ jQuery.data( this, key, value ); ++ }); ++ }, ++ ++ removeData: function( key ){ ++ return this.each(function(){ ++ jQuery.removeData( this, key ); ++ }); ++ }, ++ ++ domManip: function( args, table, reverse, callback ) { ++ var clone = this.length > 1, elems; ++ ++ return this.each(function(){ ++ if ( !elems ) { ++ elems = jQuery.clean( args, this.ownerDocument ); ++ ++ if ( reverse ) ++ elems.reverse(); ++ } ++ ++ var obj = this; ++ ++ if ( table && jQuery.nodeName( this, "table" ) && jQuery.nodeName( elems[0], "tr" ) ) ++ obj = this.getElementsByTagName("tbody")[0] || this.appendChild( this.ownerDocument.createElement("tbody") ); ++ ++ var scripts = jQuery( [] ); ++ ++ jQuery.each(elems, function(){ ++ var elem = clone ? ++ jQuery( this ).clone( true )[0] : ++ this; ++ ++ // execute all scripts after the elements have been injected ++ if ( jQuery.nodeName( elem, "script" ) ) { ++ scripts = scripts.add( elem ); ++ } else { ++ // Remove any inner scripts for later evaluation ++ if ( elem.nodeType == 1 ) ++ scripts = scripts.add( jQuery( "script", elem ).remove() ); ++ ++ // Inject the elements into the document ++ callback.call( obj, elem ); ++ } ++ }); ++ ++ scripts.each( evalScript ); ++ }); ++ } ++}; ++ ++// Give the init function the jQuery prototype for later instantiation ++jQuery.prototype.init.prototype = jQuery.prototype; ++ ++function evalScript( i, elem ) { ++ if ( elem.src ) ++ jQuery.ajax({ ++ url: elem.src, ++ async: false, ++ dataType: "script" ++ }); ++ ++ else ++ jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" ); ++ ++ if ( elem.parentNode ) ++ elem.parentNode.removeChild( elem ); ++} ++ ++jQuery.extend = jQuery.fn.extend = function() { ++ // copy reference to target object ++ var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options; ++ ++ // Handle a deep copy situation ++ if ( target.constructor == Boolean ) { ++ deep = target; ++ target = arguments[1] || {}; ++ // skip the boolean and the target ++ i = 2; ++ } ++ ++ // Handle case when target is a string or something (possible in deep copy) ++ if ( typeof target != "object" && typeof target != "function" ) ++ target = {}; ++ ++ // extend jQuery itself if only one argument is passed ++ if ( length == 1 ) { ++ target = this; ++ i = 0; ++ } ++ ++ for ( ; i < length; i++ ) ++ // Only deal with non-null/undefined values ++ if ( (options = arguments[ i ]) != null ) ++ // Extend the base object ++ for ( var name in options ) { ++ // Prevent never-ending loop ++ if ( target === options[ name ] ) ++ continue; ++ ++ // Recurse if we're merging object values ++ if ( deep && options[ name ] && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType ) ++ target[ name ] = jQuery.extend( target[ name ], options[ name ] ); ++ ++ // Don't bring in undefined values ++ else if ( options[ name ] != undefined ) ++ target[ name ] = options[ name ]; ++ ++ } ++ ++ // Return the modified object ++ return target; ++}; ++ ++var expando = "jQuery" + (new Date()).getTime(), uuid = 0, windowData = {}; ++ ++// exclude the following css properties to add px ++var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i; ++ ++jQuery.extend({ ++ noConflict: function( deep ) { ++ window.$ = _$; ++ ++ if ( deep ) ++ window.jQuery = _jQuery; ++ ++ return jQuery; ++ }, ++ ++ // See test/unit/core.js for details concerning this function. ++ isFunction: function( fn ) { ++ return !!fn && typeof fn != "string" && !fn.nodeName && ++ fn.constructor != Array && /function/i.test( fn + "" ); ++ }, ++ ++ // check if an element is in a (or is an) XML document ++ isXMLDoc: function( elem ) { ++ return elem.documentElement && !elem.body || ++ elem.tagName && elem.ownerDocument && !elem.ownerDocument.body; ++ }, ++ ++ // Evalulates a script in a global context ++ globalEval: function( data ) { ++ data = jQuery.trim( data ); ++ ++ if ( data ) { ++ // Inspired by code by Andrea Giammarchi ++ // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html ++ var head = document.getElementsByTagName("head")[0] || document.documentElement, ++ script = document.createElement("script"); ++ ++ script.type = "text/javascript"; ++ if ( jQuery.browser.msie ) ++ script.text = data; ++ else ++ script.appendChild( document.createTextNode( data ) ); ++ ++ head.appendChild( script ); ++ head.removeChild( script ); ++ } ++ }, ++ ++ nodeName: function( elem, name ) { ++ return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase(); ++ }, ++ ++ cache: {}, ++ ++ data: function( elem, name, data ) { ++ elem = elem == window ? ++ windowData : ++ elem; ++ ++ var id = elem[ expando ]; ++ ++ // Compute a unique ID for the element ++ if ( !id ) ++ id = elem[ expando ] = ++uuid; ++ ++ // Only generate the data cache if we're ++ // trying to access or manipulate it ++ if ( name && !jQuery.cache[ id ] ) ++ jQuery.cache[ id ] = {}; ++ ++ // Prevent overriding the named cache with undefined values ++ if ( data != undefined ) ++ jQuery.cache[ id ][ name ] = data; ++ ++ // Return the named cache data, or the ID for the element ++ return name ? ++ jQuery.cache[ id ][ name ] : ++ id; ++ }, ++ ++ removeData: function( elem, name ) { ++ elem = elem == window ? ++ windowData : ++ elem; ++ ++ var id = elem[ expando ]; ++ ++ // If we want to remove a specific section of the element's data ++ if ( name ) { ++ if ( jQuery.cache[ id ] ) { ++ // Remove the section of cache data ++ delete jQuery.cache[ id ][ name ]; ++ ++ // If we've removed all the data, remove the element's cache ++ name = ""; ++ ++ for ( name in jQuery.cache[ id ] ) ++ break; ++ ++ if ( !name ) ++ jQuery.removeData( elem ); ++ } ++ ++ // Otherwise, we want to remove all of the element's data ++ } else { ++ // Clean up the element expando ++ try { ++ delete elem[ expando ]; ++ } catch(e){ ++ // IE has trouble directly removing the expando ++ // but it's ok with using removeAttribute ++ if ( elem.removeAttribute ) ++ elem.removeAttribute( expando ); ++ } ++ ++ // Completely remove the data cache ++ delete jQuery.cache[ id ]; ++ } ++ }, ++ ++ // args is for internal usage only ++ each: function( object, callback, args ) { ++ if ( args ) { ++ if ( object.length == undefined ) { ++ for ( var name in object ) ++ if ( callback.apply( object[ name ], args ) === false ) ++ break; ++ } else ++ for ( var i = 0, length = object.length; i < length; i++ ) ++ if ( callback.apply( object[ i ], args ) === false ) ++ break; ++ ++ // A special, fast, case for the most common use of each ++ } else { ++ if ( object.length == undefined ) { ++ for ( var name in object ) ++ if ( callback.call( object[ name ], name, object[ name ] ) === false ) ++ break; ++ } else ++ for ( var i = 0, length = object.length, value = object[0]; ++ i < length && callback.call( value, i, value ) !== false; value = object[++i] ){} ++ } ++ ++ return object; ++ }, ++ ++ prop: function( elem, value, type, i, name ) { ++ // Handle executable functions ++ if ( jQuery.isFunction( value ) ) ++ value = value.call( elem, i ); ++ ++ // Handle passing in a number to a CSS property ++ return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ? ++ value + "px" : ++ value; ++ }, ++ ++ className: { ++ // internal only, use addClass("class") ++ add: function( elem, classNames ) { ++ jQuery.each((classNames || "").split(/\s+/), function(i, className){ ++ if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) ) ++ elem.className += (elem.className ? " " : "") + className; ++ }); ++ }, ++ ++ // internal only, use removeClass("class") ++ remove: function( elem, classNames ) { ++ if (elem.nodeType == 1) ++ elem.className = classNames != undefined ? ++ jQuery.grep(elem.className.split(/\s+/), function(className){ ++ return !jQuery.className.has( classNames, className ); ++ }).join(" ") : ++ ""; ++ }, ++ ++ // internal only, use is(".class") ++ has: function( elem, className ) { ++ return jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1; ++ } ++ }, ++ ++ // A method for quickly swapping in/out CSS properties to get correct calculations ++ swap: function( elem, options, callback ) { ++ var old = {}; ++ // Remember the old values, and insert the new ones ++ for ( var name in options ) { ++ old[ name ] = elem.style[ name ]; ++ elem.style[ name ] = options[ name ]; ++ } ++ ++ callback.call( elem ); ++ ++ // Revert the old values ++ for ( var name in options ) ++ elem.style[ name ] = old[ name ]; ++ }, ++ ++ css: function( elem, name, force ) { ++ if ( name == "width" || name == "height" ) { ++ var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ]; ++ ++ function getWH() { ++ val = name == "width" ? elem.offsetWidth : elem.offsetHeight; ++ var padding = 0, border = 0; ++ jQuery.each( which, function() { ++ padding += parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0; ++ border += parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0; ++ }); ++ val -= Math.round(padding + border); ++ } ++ ++ if ( jQuery(elem).is(":visible") ) ++ getWH(); ++ else ++ jQuery.swap( elem, props, getWH ); ++ ++ return Math.max(0, val); ++ } ++ ++ return jQuery.curCSS( elem, name, force ); ++ }, ++ ++ curCSS: function( elem, name, force ) { ++ var ret; ++ ++ // A helper method for determining if an element's values are broken ++ function color( elem ) { ++ if ( !jQuery.browser.safari ) ++ return false; ++ ++ var ret = document.defaultView.getComputedStyle( elem, null ); ++ return !ret || ret.getPropertyValue("color") == ""; ++ } ++ ++ // We need to handle opacity special in IE ++ if ( name == "opacity" && jQuery.browser.msie ) { ++ ret = jQuery.attr( elem.style, "opacity" ); ++ ++ return ret == "" ? ++ "1" : ++ ret; ++ } ++ // Opera sometimes will give the wrong display answer, this fixes it, see #2037 ++ if ( jQuery.browser.opera && name == "display" ) { ++ var save = elem.style.outline; ++ elem.style.outline = "0 solid black"; ++ elem.style.outline = save; ++ } ++ ++ // Make sure we're using the right name for getting the float value ++ if ( name.match( /float/i ) ) ++ name = styleFloat; ++ ++ if ( !force && elem.style && elem.style[ name ] ) ++ ret = elem.style[ name ]; ++ ++ else if ( document.defaultView && document.defaultView.getComputedStyle ) { ++ ++ // Only "float" is needed here ++ if ( name.match( /float/i ) ) ++ name = "float"; ++ ++ name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase(); ++ ++ var getComputedStyle = document.defaultView.getComputedStyle( elem, null ); ++ ++ if ( getComputedStyle && !color( elem ) ) ++ ret = getComputedStyle.getPropertyValue( name ); ++ ++ // If the element isn't reporting its values properly in Safari ++ // then some display: none elements are involved ++ else { ++ var swap = [], stack = []; ++ ++ // Locate all of the parent display: none elements ++ for ( var a = elem; a && color(a); a = a.parentNode ) ++ stack.unshift(a); ++ ++ // Go through and make them visible, but in reverse ++ // (It would be better if we knew the exact display type that they had) ++ for ( var i = 0; i < stack.length; i++ ) ++ if ( color( stack[ i ] ) ) { ++ swap[ i ] = stack[ i ].style.display; ++ stack[ i ].style.display = "block"; ++ } ++ ++ // Since we flip the display style, we have to handle that ++ // one special, otherwise get the value ++ ret = name == "display" && swap[ stack.length - 1 ] != null ? ++ "none" : ++ ( getComputedStyle && getComputedStyle.getPropertyValue( name ) ) || ""; ++ ++ // Finally, revert the display styles back ++ for ( var i = 0; i < swap.length; i++ ) ++ if ( swap[ i ] != null ) ++ stack[ i ].style.display = swap[ i ]; ++ } ++ ++ // We should always get a number back from opacity ++ if ( name == "opacity" && ret == "" ) ++ ret = "1"; ++ ++ } else if ( elem.currentStyle ) { ++ var camelCase = name.replace(/\-(\w)/g, function(all, letter){ ++ return letter.toUpperCase(); ++ }); ++ ++ ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ]; ++ ++ // From the awesome hack by Dean Edwards ++ // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 ++ ++ // If we're not dealing with a regular pixel number ++ // but a number that has a weird ending, we need to convert it to pixels ++ if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) { ++ // Remember the original values ++ var style = elem.style.left, runtimeStyle = elem.runtimeStyle.left; ++ ++ // Put in the new values to get a computed value out ++ elem.runtimeStyle.left = elem.currentStyle.left; ++ elem.style.left = ret || 0; ++ ret = elem.style.pixelLeft + "px"; ++ ++ // Revert the changed values ++ elem.style.left = style; ++ elem.runtimeStyle.left = runtimeStyle; ++ } ++ } ++ ++ return ret; ++ }, ++ ++ clean: function( elems, context ) { ++ var ret = []; ++ context = context || document; ++ // !context.createElement fails in IE with an error but returns typeof 'object' ++ if (typeof context.createElement == 'undefined') ++ context = context.ownerDocument || context[0] && context[0].ownerDocument || document; ++ ++ jQuery.each(elems, function(i, elem){ ++ if ( !elem ) ++ return; ++ ++ if ( elem.constructor == Number ) ++ elem = elem.toString(); ++ ++ // Convert html string into DOM nodes ++ if ( typeof elem == "string" ) { ++ // Fix "XHTML"-style tags in all browsers ++ elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){ ++ return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ? ++ all : ++ front + "></" + tag + ">"; ++ }); ++ ++ // Trim whitespace, otherwise indexOf won't work as expected ++ var tags = jQuery.trim( elem ).toLowerCase(), div = context.createElement("div"); ++ ++ var wrap = ++ // option or optgroup ++ !tags.indexOf("<opt") && ++ [ 1, "<select multiple='multiple'>", "</select>" ] || ++ ++ !tags.indexOf("<leg") && ++ [ 1, "<fieldset>", "</fieldset>" ] || ++ ++ tags.match(/^<(thead|tbody|tfoot|colg|cap)/) && ++ [ 1, "<table>", "</table>" ] || ++ ++ !tags.indexOf("<tr") && ++ [ 2, "<table><tbody>", "</tbody></table>" ] || ++ ++ // <thead> matched above ++ (!tags.indexOf("<td") || !tags.indexOf("<th")) && ++ [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ] || ++ ++ !tags.indexOf("<col") && ++ [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ] || ++ ++ // IE can't serialize <link> and <script> tags normally ++ jQuery.browser.msie && ++ [ 1, "div<div>", "</div>" ] || ++ ++ [ 0, "", "" ]; ++ ++ // Go to html and back, then peel off extra wrappers ++ div.innerHTML = wrap[1] + elem + wrap[2]; ++ ++ // Move to the right depth ++ while ( wrap[0]-- ) ++ div = div.lastChild; ++ ++ // Remove IE's autoinserted <tbody> from table fragments ++ if ( jQuery.browser.msie ) { ++ ++ // String was a <table>, *may* have spurious <tbody> ++ var tbody = !tags.indexOf("<table") && tags.indexOf("<tbody") < 0 ? ++ div.firstChild && div.firstChild.childNodes : ++ ++ // String was a bare <thead> or <tfoot> ++ wrap[1] == "<table>" && tags.indexOf("<tbody") < 0 ? ++ div.childNodes : ++ []; ++ ++ for ( var j = tbody.length - 1; j >= 0 ; --j ) ++ if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) ++ tbody[ j ].parentNode.removeChild( tbody[ j ] ); ++ ++ // IE completely kills leading whitespace when innerHTML is used ++ if ( /^\s/.test( elem ) ) ++ div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild ); ++ ++ } ++ ++ elem = jQuery.makeArray( div.childNodes ); ++ } ++ ++ if ( elem.length === 0 && (!jQuery.nodeName( elem, "form" ) && !jQuery.nodeName( elem, "select" )) ) ++ return; ++ ++ if ( elem[0] == undefined || jQuery.nodeName( elem, "form" ) || elem.options ) ++ ret.push( elem ); ++ ++ else ++ ret = jQuery.merge( ret, elem ); ++ ++ }); ++ ++ return ret; ++ }, ++ ++ attr: function( elem, name, value ) { ++ // don't set attributes on text and comment nodes ++ if (!elem || elem.nodeType == 3 || elem.nodeType == 8) ++ return undefined; ++ ++ var fix = jQuery.isXMLDoc( elem ) ? ++ {} : ++ jQuery.props; ++ ++ // Safari mis-reports the default selected property of a hidden option ++ // Accessing the parent's selectedIndex property fixes it ++ if ( name == "selected" && jQuery.browser.safari ) ++ elem.parentNode.selectedIndex; ++ ++ // Certain attributes only work when accessed via the old DOM 0 way ++ if ( fix[ name ] ) { ++ if ( value != undefined ) ++ elem[ fix[ name ] ] = value; ++ ++ return elem[ fix[ name ] ]; ++ ++ } else if ( jQuery.browser.msie && name == "style" ) ++ return jQuery.attr( elem.style, "cssText", value ); ++ ++ else if ( value == undefined && jQuery.browser.msie && jQuery.nodeName( elem, "form" ) && (name == "action" || name == "method") ) ++ return elem.getAttributeNode( name ).nodeValue; ++ ++ // IE elem.getAttribute passes even for style ++ else if ( elem.tagName ) { ++ ++ if ( value != undefined ) { ++ // We can't allow the type property to be changed (since it causes problems in IE) ++ if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode ) ++ throw "type property can't be changed"; ++ ++ // convert the value to a string (all browsers do this but IE) see #1070 ++ elem.setAttribute( name, "" + value ); ++ } ++ ++ if ( jQuery.browser.msie && /href|src/.test( name ) && !jQuery.isXMLDoc( elem ) ) ++ return elem.getAttribute( name, 2 ); ++ ++ return elem.getAttribute( name ); ++ ++ // elem is actually elem.style ... set the style ++ } else { ++ // IE actually uses filters for opacity ++ if ( name == "opacity" && jQuery.browser.msie ) { ++ if ( value != undefined ) { ++ // IE has trouble with opacity if it does not have layout ++ // Force it by setting the zoom level ++ elem.zoom = 1; ++ ++ // Set the alpha filter to set the opacity ++ elem.filter = (elem.filter || "").replace( /alpha\([^)]*\)/, "" ) + ++ (parseFloat( value ).toString() == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")"); ++ } ++ ++ return elem.filter && elem.filter.indexOf("opacity=") >= 0 ? ++ (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : ++ ""; ++ } ++ ++ name = name.replace(/-([a-z])/ig, function(all, letter){ ++ return letter.toUpperCase(); ++ }); ++ ++ if ( value != undefined ) ++ elem[ name ] = value; ++ ++ return elem[ name ]; ++ } ++ }, ++ ++ trim: function( text ) { ++ return (text || "").replace( /^\s+|\s+$/g, "" ); ++ }, ++ ++ makeArray: function( array ) { ++ var ret = []; ++ ++ // Need to use typeof to fight Safari childNodes crashes ++ if ( typeof array != "array" ) ++ for ( var i = 0, length = array.length; i < length; i++ ) ++ ret.push( array[ i ] ); ++ else ++ ret = array.slice( 0 ); ++ ++ return ret; ++ }, ++ ++ inArray: function( elem, array ) { ++ for ( var i = 0, length = array.length; i < length; i++ ) ++ if ( array[ i ] == elem ) ++ return i; ++ ++ return -1; ++ }, ++ ++ merge: function( first, second ) { ++ // We have to loop this way because IE & Opera overwrite the length ++ // expando of getElementsByTagName ++ ++ // Also, we need to make sure that the correct elements are being returned ++ // (IE returns comment nodes in a '*' query) ++ if ( jQuery.browser.msie ) { ++ for ( var i = 0; second[ i ]; i++ ) ++ if ( second[ i ].nodeType != 8 ) ++ first.push( second[ i ] ); ++ ++ } else ++ for ( var i = 0; second[ i ]; i++ ) ++ first.push( second[ i ] ); ++ ++ return first; ++ }, ++ ++ unique: function( array ) { ++ var ret = [], done = {}; ++ ++ try { ++ ++ for ( var i = 0, length = array.length; i < length; i++ ) { ++ var id = jQuery.data( array[ i ] ); ++ ++ if ( !done[ id ] ) { ++ done[ id ] = true; ++ ret.push( array[ i ] ); ++ } ++ } ++ ++ } catch( e ) { ++ ret = array; ++ } ++ ++ return ret; ++ }, ++ ++ grep: function( elems, callback, inv ) { ++ var ret = []; ++ ++ // Go through the array, only saving the items ++ // that pass the validator function ++ for ( var i = 0, length = elems.length; i < length; i++ ) ++ if ( !inv && callback( elems[ i ], i ) || inv && !callback( elems[ i ], i ) ) ++ ret.push( elems[ i ] ); ++ ++ return ret; ++ }, ++ ++ map: function( elems, callback ) { ++ var ret = []; ++ ++ // Go through the array, translating each of the items to their ++ // new value (or values). ++ for ( var i = 0, length = elems.length; i < length; i++ ) { ++ var value = callback( elems[ i ], i ); ++ ++ if ( value !== null && value != undefined ) { ++ if ( value.constructor != Array ) ++ value = [ value ]; ++ ++ ret = ret.concat( value ); ++ } ++ } ++ ++ return ret; ++ } ++}); ++ ++var userAgent = navigator.userAgent.toLowerCase(); ++ ++// Figure out what browser is being used ++jQuery.browser = { ++ version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1], ++ safari: /webkit/.test( userAgent ), ++ opera: /opera/.test( userAgent ), ++ msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ), ++ mozilla: /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test( userAgent ) ++}; ++ ++var styleFloat = jQuery.browser.msie ? ++ "styleFloat" : ++ "cssFloat"; ++ ++jQuery.extend({ ++ // Check to see if the W3C box model is being used ++ boxModel: !jQuery.browser.msie || document.compatMode == "CSS1Compat", ++ ++ props: { ++ "for": "htmlFor", ++ "class": "className", ++ "float": styleFloat, ++ cssFloat: styleFloat, ++ styleFloat: styleFloat, ++ innerHTML: "innerHTML", ++ className: "className", ++ value: "value", ++ disabled: "disabled", ++ checked: "checked", ++ readonly: "readOnly", ++ selected: "selected", ++ maxlength: "maxLength", ++ selectedIndex: "selectedIndex", ++ defaultValue: "defaultValue", ++ tagName: "tagName", ++ nodeName: "nodeName" ++ } ++}); ++ ++jQuery.each({ ++ parent: function(elem){return elem.parentNode;}, ++ parents: function(elem){return jQuery.dir(elem,"parentNode");}, ++ next: function(elem){return jQuery.nth(elem,2,"nextSibling");}, ++ prev: function(elem){return jQuery.nth(elem,2,"previousSibling");}, ++ nextAll: function(elem){return jQuery.dir(elem,"nextSibling");}, ++ prevAll: function(elem){return jQuery.dir(elem,"previousSibling");}, ++ siblings: function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);}, ++ children: function(elem){return jQuery.sibling(elem.firstChild);}, ++ contents: function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);} ++}, function(name, fn){ ++ jQuery.fn[ name ] = function( selector ) { ++ var ret = jQuery.map( this, fn ); ++ ++ if ( selector && typeof selector == "string" ) ++ ret = jQuery.multiFilter( selector, ret ); ++ ++ return this.pushStack( jQuery.unique( ret ) ); ++ }; ++}); ++ ++jQuery.each({ ++ appendTo: "append", ++ prependTo: "prepend", ++ insertBefore: "before", ++ insertAfter: "after", ++ replaceAll: "replaceWith" ++}, function(name, original){ ++ jQuery.fn[ name ] = function() { ++ var args = arguments; ++ ++ return this.each(function(){ ++ for ( var i = 0, length = args.length; i < length; i++ ) ++ jQuery( args[ i ] )[ original ]( this ); ++ }); ++ }; ++}); ++ ++jQuery.each({ ++ removeAttr: function( name ) { ++ jQuery.attr( this, name, "" ); ++ if (this.nodeType == 1) ++ this.removeAttribute( name ); ++ }, ++ ++ addClass: function( classNames ) { ++ jQuery.className.add( this, classNames ); ++ }, ++ ++ removeClass: function( classNames ) { ++ jQuery.className.remove( this, classNames ); ++ }, ++ ++ toggleClass: function( classNames ) { ++ jQuery.className[ jQuery.className.has( this, classNames ) ? "remove" : "add" ]( this, classNames ); ++ }, ++ ++ remove: function( selector ) { ++ if ( !selector || jQuery.filter( selector, [ this ] ).r.length ) { ++ // Prevent memory leaks ++ jQuery( "*", this ).add(this).each(function(){ ++ jQuery.event.remove(this); ++ jQuery.removeData(this); ++ }); ++ if (this.parentNode) ++ this.parentNode.removeChild( this ); ++ } ++ }, ++ ++ empty: function() { ++ // Remove element nodes and prevent memory leaks ++ jQuery( ">*", this ).remove(); ++ ++ // Remove any remaining nodes ++ while ( this.firstChild ) ++ this.removeChild( this.firstChild ); ++ } ++}, function(name, fn){ ++ jQuery.fn[ name ] = function(){ ++ return this.each( fn, arguments ); ++ }; ++}); ++ ++jQuery.each([ "Height", "Width" ], function(i, name){ ++ var type = name.toLowerCase(); ++ ++ jQuery.fn[ type ] = function( size ) { ++ // Get window width or height ++ return this[0] == window ? ++ // Opera reports document.body.client[Width/Height] properly in both quirks and standards ++ jQuery.browser.opera && document.body[ "client" + name ] || ++ ++ // Safari reports inner[Width/Height] just fine (Mozilla and Opera include scroll bar widths) ++ jQuery.browser.safari && window[ "inner" + name ] || ++ ++ // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode ++ document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] || document.body[ "client" + name ] : ++ ++ // Get document width or height ++ this[0] == document ? ++ // Either scroll[Width/Height] or offset[Width/Height], whichever is greater ++ Math.max( ++ Math.max(document.body["scroll" + name], document.documentElement["scroll" + name]), ++ Math.max(document.body["offset" + name], document.documentElement["offset" + name]) ++ ) : ++ ++ // Get or set width or height on the element ++ size == undefined ? ++ // Get width or height on the element ++ (this.length ? jQuery.css( this[0], type ) : null) : ++ ++ // Set the width or height on the element (default to pixels if value is unitless) ++ this.css( type, size.constructor == String ? size : size + "px" ); ++ }; ++}); ++ ++var chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ? ++ "(?:[\\w*_-]|\\\\.)" : ++ "(?:[\\w\u0128-\uFFFF*_-]|\\\\.)", ++ quickChild = new RegExp("^>\\s*(" + chars + "+)"), ++ quickID = new RegExp("^(" + chars + "+)(#)(" + chars + "+)"), ++ quickClass = new RegExp("^([#.]?)(" + chars + "*)"); ++ ++jQuery.extend({ ++ expr: { ++ "": function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);}, ++ "#": function(a,i,m){return a.getAttribute("id")==m[2];}, ++ ":": { ++ // Position Checks ++ lt: function(a,i,m){return i<m[3]-0;}, ++ gt: function(a,i,m){return i>m[3]-0;}, ++ nth: function(a,i,m){return m[3]-0==i;}, ++ eq: function(a,i,m){return m[3]-0==i;}, ++ first: function(a,i){return i==0;}, ++ last: function(a,i,m,r){return i==r.length-1;}, ++ even: function(a,i){return i%2==0;}, ++ odd: function(a,i){return i%2;}, ++ ++ // Child Checks ++ "first-child": function(a){return a.parentNode.getElementsByTagName("*")[0]==a;}, ++ "last-child": function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;}, ++ "only-child": function(a){return !jQuery.nth(a.parentNode.lastChild,2,"previousSibling");}, ++ ++ // Parent Checks ++ parent: function(a){return a.firstChild;}, ++ empty: function(a){return !a.firstChild;}, ++ ++ // Text Check ++ contains: function(a,i,m){return (a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;}, ++ ++ // Visibility ++ visible: function(a){return "hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";}, ++ hidden: function(a){return "hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";}, ++ ++ // Form attributes ++ enabled: function(a){return !a.disabled;}, ++ disabled: function(a){return a.disabled;}, ++ checked: function(a){return a.checked;}, ++ selected: function(a){return a.selected||jQuery.attr(a,"selected");}, ++ ++ // Form elements ++ text: function(a){return "text"==a.type;}, ++ radio: function(a){return "radio"==a.type;}, ++ checkbox: function(a){return "checkbox"==a.type;}, ++ file: function(a){return "file"==a.type;}, ++ password: function(a){return "password"==a.type;}, ++ submit: function(a){return "submit"==a.type;}, ++ image: function(a){return "image"==a.type;}, ++ reset: function(a){return "reset"==a.type;}, ++ button: function(a){return "button"==a.type||jQuery.nodeName(a,"button");}, ++ input: function(a){return /input|select|textarea|button/i.test(a.nodeName);}, ++ ++ // :has() ++ has: function(a,i,m){return jQuery.find(m[3],a).length;}, ++ ++ // :header ++ header: function(a){return /h\d/i.test(a.nodeName);}, ++ ++ // :animated ++ animated: function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;} ++ } ++ }, ++ ++ // The regular expressions that power the parsing engine ++ parse: [ ++ // Match: [@value='test'], [@foo] ++ /^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/, ++ ++ // Match: :contains('foo') ++ /^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/, ++ ++ // Match: :even, :last-chlid, #id, .class ++ new RegExp("^([:.#]*)(" + chars + "+)") ++ ], ++ ++ multiFilter: function( expr, elems, not ) { ++ var old, cur = []; ++ ++ while ( expr && expr != old ) { ++ old = expr; ++ var f = jQuery.filter( expr, elems, not ); ++ expr = f.t.replace(/^\s*,\s*/, "" ); ++ cur = not ? elems = f.r : jQuery.merge( cur, f.r ); ++ } ++ ++ return cur; ++ }, ++ ++ find: function( t, context ) { ++ // Quickly handle non-string expressions ++ if ( typeof t != "string" ) ++ return [ t ]; ++ ++ // check to make sure context is a DOM element or a document ++ if ( context && context.nodeType != 1 && context.nodeType != 9) ++ return [ ]; ++ ++ // Set the correct context (if none is provided) ++ context = context || document; ++ ++ // Initialize the search ++ var ret = [context], done = [], last, nodeName; ++ ++ // Continue while a selector expression exists, and while ++ // we're no longer looping upon ourselves ++ while ( t && last != t ) { ++ var r = []; ++ last = t; ++ ++ t = jQuery.trim(t); ++ ++ var foundToken = false; ++ ++ // An attempt at speeding up child selectors that ++ // point to a specific element tag ++ var re = quickChild; ++ var m = re.exec(t); ++ ++ if ( m ) { ++ nodeName = m[1].toUpperCase(); ++ ++ // Perform our own iteration and filter ++ for ( var i = 0; ret[i]; i++ ) ++ for ( var c = ret[i].firstChild; c; c = c.nextSibling ) ++ if ( c.nodeType == 1 && (nodeName == "*" || c.nodeName.toUpperCase() == nodeName) ) ++ r.push( c ); ++ ++ ret = r; ++ t = t.replace( re, "" ); ++ if ( t.indexOf(" ") == 0 ) continue; ++ foundToken = true; ++ } else { ++ re = /^([>+~])\s*(\w*)/i; ++ ++ if ( (m = re.exec(t)) != null ) { ++ r = []; ++ ++ var merge = {}; ++ nodeName = m[2].toUpperCase(); ++ m = m[1]; ++ ++ for ( var j = 0, rl = ret.length; j < rl; j++ ) { ++ var n = m == "~" || m == "+" ? ret[j].nextSibling : ret[j].firstChild; ++ for ( ; n; n = n.nextSibling ) ++ if ( n.nodeType == 1 ) { ++ var id = jQuery.data(n); ++ ++ if ( m == "~" && merge[id] ) break; ++ ++ if (!nodeName || n.nodeName.toUpperCase() == nodeName ) { ++ if ( m == "~" ) merge[id] = true; ++ r.push( n ); ++ } ++ ++ if ( m == "+" ) break; ++ } ++ } ++ ++ ret = r; ++ ++ // And remove the token ++ t = jQuery.trim( t.replace( re, "" ) ); ++ foundToken = true; ++ } ++ } ++ ++ // See if there's still an expression, and that we haven't already ++ // matched a token ++ if ( t && !foundToken ) { ++ // Handle multiple expressions ++ if ( !t.indexOf(",") ) { ++ // Clean the result set ++ if ( context == ret[0] ) ret.shift(); ++ ++ // Merge the result sets ++ done = jQuery.merge( done, ret ); ++ ++ // Reset the context ++ r = ret = [context]; ++ ++ // Touch up the selector string ++ t = " " + t.substr(1,t.length); ++ ++ } else { ++ // Optimize for the case nodeName#idName ++ var re2 = quickID; ++ var m = re2.exec(t); ++ ++ // Re-organize the results, so that they're consistent ++ if ( m ) { ++ m = [ 0, m[2], m[3], m[1] ]; ++ ++ } else { ++ // Otherwise, do a traditional filter check for ++ // ID, class, and element selectors ++ re2 = quickClass; ++ m = re2.exec(t); ++ } ++ ++ m[2] = m[2].replace(/\\/g, ""); ++ ++ var elem = ret[ret.length-1]; ++ ++ // Try to do a global search by ID, where we can ++ if ( m[1] == "#" && elem && elem.getElementById && !jQuery.isXMLDoc(elem) ) { ++ // Optimization for HTML document case ++ var oid = elem.getElementById(m[2]); ++ ++ // Do a quick check for the existence of the actual ID attribute ++ // to avoid selecting by the name attribute in IE ++ // also check to insure id is a string to avoid selecting an element with the name of 'id' inside a form ++ if ( (jQuery.browser.msie||jQuery.browser.opera) && oid && typeof oid.id == "string" && oid.id != m[2] ) ++ oid = jQuery('[@id="'+m[2]+'"]', elem)[0]; ++ ++ // Do a quick check for node name (where applicable) so ++ // that div#foo searches will be really fast ++ ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : []; ++ } else { ++ // We need to find all descendant elements ++ for ( var i = 0; ret[i]; i++ ) { ++ // Grab the tag name being searched for ++ var tag = m[1] == "#" && m[3] ? m[3] : m[1] != "" || m[0] == "" ? "*" : m[2]; ++ ++ // Handle IE7 being really dumb about <object>s ++ if ( tag == "*" && ret[i].nodeName.toLowerCase() == "object" ) ++ tag = "param"; ++ ++ r = jQuery.merge( r, ret[i].getElementsByTagName( tag )); ++ } ++ ++ // It's faster to filter by class and be done with it ++ if ( m[1] == "." ) ++ r = jQuery.classFilter( r, m[2] ); ++ ++ // Same with ID filtering ++ if ( m[1] == "#" ) { ++ var tmp = []; ++ ++ // Try to find the element with the ID ++ for ( var i = 0; r[i]; i++ ) ++ if ( r[i].getAttribute("id") == m[2] ) { ++ tmp = [ r[i] ]; ++ break; ++ } ++ ++ r = tmp; ++ } ++ ++ ret = r; ++ } ++ ++ t = t.replace( re2, "" ); ++ } ++ ++ } ++ ++ // If a selector string still exists ++ if ( t ) { ++ // Attempt to filter it ++ var val = jQuery.filter(t,r); ++ ret = r = val.r; ++ t = jQuery.trim(val.t); ++ } ++ } ++ ++ // An error occurred with the selector; ++ // just return an empty set instead ++ if ( t ) ++ ret = []; ++ ++ // Remove the root context ++ if ( ret && context == ret[0] ) ++ ret.shift(); ++ ++ // And combine the results ++ done = jQuery.merge( done, ret ); ++ ++ return done; ++ }, ++ ++ classFilter: function(r,m,not){ ++ m = " " + m + " "; ++ var tmp = []; ++ for ( var i = 0; r[i]; i++ ) { ++ var pass = (" " + r[i].className + " ").indexOf( m ) >= 0; ++ if ( !not && pass || not && !pass ) ++ tmp.push( r[i] ); ++ } ++ return tmp; ++ }, ++ ++ filter: function(t,r,not) { ++ var last; ++ ++ // Look for common filter expressions ++ while ( t && t != last ) { ++ last = t; ++ ++ var p = jQuery.parse, m; ++ ++ for ( var i = 0; p[i]; i++ ) { ++ m = p[i].exec( t ); ++ ++ if ( m ) { ++ // Remove what we just matched ++ t = t.substring( m[0].length ); ++ ++ m[2] = m[2].replace(/\\/g, ""); ++ break; ++ } ++ } ++ ++ if ( !m ) ++ break; ++ ++ // :not() is a special case that can be optimized by ++ // keeping it out of the expression list ++ if ( m[1] == ":" && m[2] == "not" ) ++ // optimize if only one selector found (most common case) ++ r = isSimple.test( m[3] ) ? ++ jQuery.filter(m[3], r, true).r : ++ jQuery( r ).not( m[3] ); ++ ++ // We can get a big speed boost by filtering by class here ++ else if ( m[1] == "." ) ++ r = jQuery.classFilter(r, m[2], not); ++ ++ else if ( m[1] == "[" ) { ++ var tmp = [], type = m[3]; ++ ++ for ( var i = 0, rl = r.length; i < rl; i++ ) { ++ var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ]; ++ ++ if ( z == null || /href|src|selected/.test(m[2]) ) ++ z = jQuery.attr(a,m[2]) || ''; ++ ++ if ( (type == "" && !!z || ++ type == "=" && z == m[5] || ++ type == "!=" && z != m[5] || ++ type == "^=" && z && !z.indexOf(m[5]) || ++ type == "$=" && z.substr(z.length - m[5].length) == m[5] || ++ (type == "*=" || type == "~=") && z.indexOf(m[5]) >= 0) ^ not ) ++ tmp.push( a ); ++ } ++ ++ r = tmp; ++ ++ // We can get a speed boost by handling nth-child here ++ } else if ( m[1] == ":" && m[2] == "nth-child" ) { ++ var merge = {}, tmp = [], ++ // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' ++ test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec( ++ m[3] == "even" && "2n" || m[3] == "odd" && "2n+1" || ++ !/\D/.test(m[3]) && "0n+" + m[3] || m[3]), ++ // calculate the numbers (first)n+(last) including if they are negative ++ first = (test[1] + (test[2] || 1)) - 0, last = test[3] - 0; ++ ++ // loop through all the elements left in the jQuery object ++ for ( var i = 0, rl = r.length; i < rl; i++ ) { ++ var node = r[i], parentNode = node.parentNode, id = jQuery.data(parentNode); ++ ++ if ( !merge[id] ) { ++ var c = 1; ++ ++ for ( var n = parentNode.firstChild; n; n = n.nextSibling ) ++ if ( n.nodeType == 1 ) ++ n.nodeIndex = c++; ++ ++ merge[id] = true; ++ } ++ ++ var add = false; ++ ++ if ( first == 0 ) { ++ if ( node.nodeIndex == last ) ++ add = true; ++ } else if ( (node.nodeIndex - last) % first == 0 && (node.nodeIndex - last) / first >= 0 ) ++ add = true; ++ ++ if ( add ^ not ) ++ tmp.push( node ); ++ } ++ ++ r = tmp; ++ ++ // Otherwise, find the expression to execute ++ } else { ++ var fn = jQuery.expr[ m[1] ]; ++ if ( typeof fn == "object" ) ++ fn = fn[ m[2] ]; ++ ++ if ( typeof fn == "string" ) ++ fn = eval("false||function(a,i){return " + fn + ";}"); ++ ++ // Execute it against the current filter ++ r = jQuery.grep( r, function(elem, i){ ++ return fn(elem, i, m, r); ++ }, not ); ++ } ++ } ++ ++ // Return an array of filtered elements (r) ++ // and the modified expression string (t) ++ return { r: r, t: t }; ++ }, ++ ++ dir: function( elem, dir ){ ++ var matched = []; ++ var cur = elem[dir]; ++ while ( cur && cur != document ) { ++ if ( cur.nodeType == 1 ) ++ matched.push( cur ); ++ cur = cur[dir]; ++ } ++ return matched; ++ }, ++ ++ nth: function(cur,result,dir,elem){ ++ result = result || 1; ++ var num = 0; ++ ++ for ( ; cur; cur = cur[dir] ) ++ if ( cur.nodeType == 1 && ++num == result ) ++ break; ++ ++ return cur; ++ }, ++ ++ sibling: function( n, elem ) { ++ var r = []; ++ ++ for ( ; n; n = n.nextSibling ) { ++ if ( n.nodeType == 1 && (!elem || n != elem) ) ++ r.push( n ); ++ } ++ ++ return r; ++ } ++}); ++ ++/* ++ * A number of helper functions used for managing events. ++ * Many of the ideas behind this code orignated from ++ * Dean Edwards' addEvent library. ++ */ ++jQuery.event = { ++ ++ // Bind an event to an element ++ // Original by Dean Edwards ++ add: function(elem, types, handler, data) { ++ if ( elem.nodeType == 3 || elem.nodeType == 8 ) ++ return; ++ ++ // For whatever reason, IE has trouble passing the window object ++ // around, causing it to be cloned in the process ++ if ( jQuery.browser.msie && elem.setInterval != undefined ) ++ elem = window; ++ ++ // Make sure that the function being executed has a unique ID ++ if ( !handler.guid ) ++ handler.guid = this.guid++; ++ ++ // if data is passed, bind to handler ++ if( data != undefined ) { ++ // Create temporary function pointer to original handler ++ var fn = handler; ++ ++ // Create unique handler function, wrapped around original handler ++ handler = function() { ++ // Pass arguments and context to original handler ++ return fn.apply(this, arguments); ++ }; ++ ++ // Store data in unique handler ++ handler.data = data; ++ ++ // Set the guid of unique handler to the same of original handler, so it can be removed ++ handler.guid = fn.guid; ++ } ++ ++ // Init the element's event structure ++ var events = jQuery.data(elem, "events") || jQuery.data(elem, "events", {}), ++ handle = jQuery.data(elem, "handle") || jQuery.data(elem, "handle", function(){ ++ // returned undefined or false ++ var val; ++ ++ // Handle the second event of a trigger and when ++ // an event is called after a page has unloaded ++ if ( typeof jQuery == "undefined" || jQuery.event.triggered ) ++ return val; ++ ++ val = jQuery.event.handle.apply(arguments.callee.elem, arguments); ++ ++ return val; ++ }); ++ // Add elem as a property of the handle function ++ // This is to prevent a memory leak with non-native ++ // event in IE. ++ handle.elem = elem; ++ ++ // Handle multiple events seperated by a space ++ // jQuery(...).bind("mouseover mouseout", fn); ++ jQuery.each(types.split(/\s+/), function(index, type) { ++ // Namespaced event handlers ++ var parts = type.split("."); ++ type = parts[0]; ++ handler.type = parts[1]; ++ ++ // Get the current list of functions bound to this event ++ var handlers = events[type]; ++ ++ // Init the event handler queue ++ if (!handlers) { ++ handlers = events[type] = {}; ++ ++ // Check for a special event handler ++ // Only use addEventListener/attachEvent if the special ++ // events handler returns false ++ if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(elem) === false ) { ++ // Bind the global event handler to the element ++ if (elem.addEventListener) ++ elem.addEventListener(type, handle, false); ++ else if (elem.attachEvent) ++ elem.attachEvent("on" + type, handle); ++ } ++ } ++ ++ // Add the function to the element's handler list ++ handlers[handler.guid] = handler; ++ ++ // Keep track of which events have been used, for global triggering ++ jQuery.event.global[type] = true; ++ }); ++ ++ // Nullify elem to prevent memory leaks in IE ++ elem = null; ++ }, ++ ++ guid: 1, ++ global: {}, ++ ++ // Detach an event or set of events from an element ++ remove: function(elem, types, handler) { ++ // don't do events on text and comment nodes ++ if ( elem.nodeType == 3 || elem.nodeType == 8 ) ++ return; ++ ++ var events = jQuery.data(elem, "events"), ret, index; ++ ++ if ( events ) { ++ // Unbind all events for the element ++ if ( types == undefined || (typeof types == "string" && types.charAt(0) == ".") ) ++ for ( var type in events ) ++ this.remove( elem, type + (types || "") ); ++ else { ++ // types is actually an event object here ++ if ( types.type ) { ++ handler = types.handler; ++ types = types.type; ++ } ++ ++ // Handle multiple events seperated by a space ++ // jQuery(...).unbind("mouseover mouseout", fn); ++ jQuery.each(types.split(/\s+/), function(index, type){ ++ // Namespaced event handlers ++ var parts = type.split("."); ++ type = parts[0]; ++ ++ if ( events[type] ) { ++ // remove the given handler for the given type ++ if ( handler ) ++ delete events[type][handler.guid]; ++ ++ // remove all handlers for the given type ++ else ++ for ( handler in events[type] ) ++ // Handle the removal of namespaced events ++ if ( !parts[1] || events[type][handler].type == parts[1] ) ++ delete events[type][handler]; ++ ++ // remove generic event handler if no more handlers exist ++ for ( ret in events[type] ) break; ++ if ( !ret ) { ++ if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(elem) === false ) { ++ if (elem.removeEventListener) ++ elem.removeEventListener(type, jQuery.data(elem, "handle"), false); ++ else if (elem.detachEvent) ++ elem.detachEvent("on" + type, jQuery.data(elem, "handle")); ++ } ++ ret = null; ++ delete events[type]; ++ } ++ } ++ }); ++ } ++ ++ // Remove the expando if it's no longer used ++ for ( ret in events ) break; ++ if ( !ret ) { ++ var handle = jQuery.data( elem, "handle" ); ++ if ( handle ) handle.elem = null; ++ jQuery.removeData( elem, "events" ); ++ jQuery.removeData( elem, "handle" ); ++ } ++ } ++ }, ++ ++ trigger: function(type, data, elem, donative, extra) { ++ // Clone the incoming data, if any ++ data = jQuery.makeArray(data || []); ++ ++ if ( type.indexOf("!") >= 0 ) { ++ type = type.slice(0, -1); ++ var exclusive = true; ++ } ++ ++ // Handle a global trigger ++ if ( !elem ) { ++ // Only trigger if we've ever bound an event for it ++ if ( this.global[type] ) ++ jQuery("*").add([window, document]).trigger(type, data); ++ ++ // Handle triggering a single element ++ } else { ++ // don't do events on text and comment nodes ++ if ( elem.nodeType == 3 || elem.nodeType == 8 ) ++ return undefined; ++ ++ var val, ret, fn = jQuery.isFunction( elem[ type ] || null ), ++ // Check to see if we need to provide a fake event, or not ++ event = !data[0] || !data[0].preventDefault; ++ ++ // Pass along a fake event ++ if ( event ) ++ data.unshift( this.fix({ type: type, target: elem }) ); ++ ++ // Enforce the right trigger type ++ data[0].type = type; ++ if ( exclusive ) ++ data[0].exclusive = true; ++ ++ // Trigger the event ++ if ( jQuery.isFunction( jQuery.data(elem, "handle") ) ) ++ val = jQuery.data(elem, "handle").apply( elem, data ); ++ ++ // Handle triggering native .onfoo handlers ++ if ( !fn && elem["on"+type] && elem["on"+type].apply( elem, data ) === false ) ++ val = false; ++ ++ // Extra functions don't get the custom event object ++ if ( event ) ++ data.shift(); ++ ++ // Handle triggering of extra function ++ if ( extra && jQuery.isFunction( extra ) ) { ++ // call the extra function and tack the current return value on the end for possible inspection ++ ret = extra.apply( elem, val == null ? data : data.concat( val ) ); ++ // if anything is returned, give it precedence and have it overwrite the previous value ++ if (ret !== undefined) ++ val = ret; ++ } ++ ++ // Trigger the native events (except for clicks on links) ++ if ( fn && donative !== false && val !== false && !(jQuery.nodeName(elem, 'a') && type == "click") ) { ++ this.triggered = true; ++ try { ++ elem[ type ](); ++ // prevent IE from throwing an error for some hidden elements ++ } catch (e) {} ++ } ++ ++ this.triggered = false; ++ } ++ ++ return val; ++ }, ++ ++ handle: function(event) { ++ // returned undefined or false ++ var val; ++ ++ // Empty object is for triggered events with no data ++ event = jQuery.event.fix( event || window.event || {} ); ++ ++ // Namespaced event handlers ++ var parts = event.type.split("."); ++ event.type = parts[0]; ++ ++ var handlers = jQuery.data(this, "events") && jQuery.data(this, "events")[event.type], args = Array.prototype.slice.call( arguments, 1 ); ++ args.unshift( event ); ++ ++ for ( var j in handlers ) { ++ var handler = handlers[j]; ++ // Pass in a reference to the handler function itself ++ // So that we can later remove it ++ args[0].handler = handler; ++ args[0].data = handler.data; ++ ++ // Filter the functions by class ++ if ( !parts[1] && !event.exclusive || handler.type == parts[1] ) { ++ var ret = handler.apply( this, args ); ++ ++ if ( val !== false ) ++ val = ret; ++ ++ if ( ret === false ) { ++ event.preventDefault(); ++ event.stopPropagation(); ++ } ++ } ++ } ++ ++ // Clean up added properties in IE to prevent memory leak ++ if (jQuery.browser.msie) ++ event.target = event.preventDefault = event.stopPropagation = ++ event.handler = event.data = null; ++ ++ return val; ++ }, ++ ++ fix: function(event) { ++ // store a copy of the original event object ++ // and clone to set read-only properties ++ var originalEvent = event; ++ event = jQuery.extend({}, originalEvent); ++ ++ // add preventDefault and stopPropagation since ++ // they will not work on the clone ++ event.preventDefault = function() { ++ // if preventDefault exists run it on the original event ++ if (originalEvent.preventDefault) ++ originalEvent.preventDefault(); ++ // otherwise set the returnValue property of the original event to false (IE) ++ originalEvent.returnValue = false; ++ }; ++ event.stopPropagation = function() { ++ // if stopPropagation exists run it on the original event ++ if (originalEvent.stopPropagation) ++ originalEvent.stopPropagation(); ++ // otherwise set the cancelBubble property of the original event to true (IE) ++ originalEvent.cancelBubble = true; ++ }; ++ ++ // Fix target property, if necessary ++ if ( !event.target ) ++ event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either ++ ++ // check if target is a textnode (safari) ++ if ( event.target.nodeType == 3 ) ++ event.target = originalEvent.target.parentNode; ++ ++ // Add relatedTarget, if necessary ++ if ( !event.relatedTarget && event.fromElement ) ++ event.relatedTarget = event.fromElement == event.target ? event.toElement : event.fromElement; ++ ++ // Calculate pageX/Y if missing and clientX/Y available ++ if ( event.pageX == null && event.clientX != null ) { ++ var doc = document.documentElement, body = document.body; ++ event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc.clientLeft || 0); ++ event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc.clientTop || 0); ++ } ++ ++ // Add which for key events ++ if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) ++ event.which = event.charCode || event.keyCode; ++ ++ // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs) ++ if ( !event.metaKey && event.ctrlKey ) ++ event.metaKey = event.ctrlKey; ++ ++ // Add which for click: 1 == left; 2 == middle; 3 == right ++ // Note: button is not normalized, so don't use it ++ if ( !event.which && event.button ) ++ event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) )); ++ ++ return event; ++ }, ++ ++ special: { ++ ready: { ++ setup: function() { ++ // Make sure the ready event is setup ++ bindReady(); ++ return; ++ }, ++ ++ teardown: function() { return; } ++ }, ++ ++ mouseenter: { ++ setup: function() { ++ if ( jQuery.browser.msie ) return false; ++ jQuery(this).bind("mouseover", jQuery.event.special.mouseenter.handler); ++ return true; ++ }, ++ ++ teardown: function() { ++ if ( jQuery.browser.msie ) return false; ++ jQuery(this).unbind("mouseover", jQuery.event.special.mouseenter.handler); ++ return true; ++ }, ++ ++ handler: function(event) { ++ // If we actually just moused on to a sub-element, ignore it ++ if ( withinElement(event, this) ) return true; ++ // Execute the right handlers by setting the event type to mouseenter ++ arguments[0].type = "mouseenter"; ++ return jQuery.event.handle.apply(this, arguments); ++ } ++ }, ++ ++ mouseleave: { ++ setup: function() { ++ if ( jQuery.browser.msie ) return false; ++ jQuery(this).bind("mouseout", jQuery.event.special.mouseleave.handler); ++ return true; ++ }, ++ ++ teardown: function() { ++ if ( jQuery.browser.msie ) return false; ++ jQuery(this).unbind("mouseout", jQuery.event.special.mouseleave.handler); ++ return true; ++ }, ++ ++ handler: function(event) { ++ // If we actually just moused on to a sub-element, ignore it ++ if ( withinElement(event, this) ) return true; ++ // Execute the right handlers by setting the event type to mouseleave ++ arguments[0].type = "mouseleave"; ++ return jQuery.event.handle.apply(this, arguments); ++ } ++ } ++ } ++}; ++ ++jQuery.fn.extend({ ++ bind: function( type, data, fn ) { ++ return type == "unload" ? this.one(type, data, fn) : this.each(function(){ ++ jQuery.event.add( this, type, fn || data, fn && data ); ++ }); ++ }, ++ ++ one: function( type, data, fn ) { ++ return this.each(function(){ ++ jQuery.event.add( this, type, function(event) { ++ jQuery(this).unbind(event); ++ return (fn || data).apply( this, arguments); ++ }, fn && data); ++ }); ++ }, ++ ++ unbind: function( type, fn ) { ++ return this.each(function(){ ++ jQuery.event.remove( this, type, fn ); ++ }); ++ }, ++ ++ trigger: function( type, data, fn ) { ++ return this.each(function(){ ++ jQuery.event.trigger( type, data, this, true, fn ); ++ }); ++ }, ++ ++ triggerHandler: function( type, data, fn ) { ++ if ( this[0] ) ++ return jQuery.event.trigger( type, data, this[0], false, fn ); ++ return undefined; ++ }, ++ ++ toggle: function() { ++ // Save reference to arguments for access in closure ++ var args = arguments; ++ ++ return this.click(function(event) { ++ // Figure out which function to execute ++ this.lastToggle = 0 == this.lastToggle ? 1 : 0; ++ ++ // Make sure that clicks stop ++ event.preventDefault(); ++ ++ // and execute the function ++ return args[this.lastToggle].apply( this, arguments ) || false; ++ }); ++ }, ++ ++ hover: function(fnOver, fnOut) { ++ return this.bind('mouseenter', fnOver).bind('mouseleave', fnOut); ++ }, ++ ++ ready: function(fn) { ++ // Attach the listeners ++ bindReady(); ++ ++ // If the DOM is already ready ++ if ( jQuery.isReady ) ++ // Execute the function immediately ++ fn.call( document, jQuery ); ++ ++ // Otherwise, remember the function for later ++ else ++ // Add the function to the wait list ++ jQuery.readyList.push( function() { return fn.call(this, jQuery); } ); ++ ++ return this; ++ } ++}); ++ ++jQuery.extend({ ++ isReady: false, ++ readyList: [], ++ // Handle when the DOM is ready ++ ready: function() { ++ // Make sure that the DOM is not already loaded ++ if ( !jQuery.isReady ) { ++ // Remember that the DOM is ready ++ jQuery.isReady = true; ++ ++ // If there are functions bound, to execute ++ if ( jQuery.readyList ) { ++ // Execute all of them ++ jQuery.each( jQuery.readyList, function(){ ++ this.apply( document ); ++ }); ++ ++ // Reset the list of functions ++ jQuery.readyList = null; ++ } ++ ++ // Trigger any bound ready events ++ jQuery(document).triggerHandler("ready"); ++ } ++ } ++}); ++ ++var readyBound = false; ++ ++function bindReady(){ ++ if ( readyBound ) return; ++ readyBound = true; ++ ++ // Mozilla, Opera (see further below for it) and webkit nightlies currently support this event ++ if ( document.addEventListener && !jQuery.browser.opera) ++ // Use the handy event callback ++ document.addEventListener( "DOMContentLoaded", jQuery.ready, false ); ++ ++ // If IE is used and is not in a frame ++ // Continually check to see if the document is ready ++ if ( jQuery.browser.msie && window == top ) (function(){ ++ if (jQuery.isReady) return; ++ try { ++ // If IE is used, use the trick by Diego Perini ++ // http://javascript.nwbox.com/IEContentLoaded/ ++ document.documentElement.doScroll("left"); ++ } catch( error ) { ++ setTimeout( arguments.callee, 0 ); ++ return; ++ } ++ // and execute any waiting functions ++ jQuery.ready(); ++ })(); ++ ++ if ( jQuery.browser.opera ) ++ document.addEventListener( "DOMContentLoaded", function () { ++ if (jQuery.isReady) return; ++ for (var i = 0; i < document.styleSheets.length; i++) ++ if (document.styleSheets[i].disabled) { ++ setTimeout( arguments.callee, 0 ); ++ return; ++ } ++ // and execute any waiting functions ++ jQuery.ready(); ++ }, false); ++ ++ if ( jQuery.browser.safari ) { ++ var numStyles; ++ (function(){ ++ if (jQuery.isReady) return; ++ if ( document.readyState != "loaded" && document.readyState != "complete" ) { ++ setTimeout( arguments.callee, 0 ); ++ return; ++ } ++ if ( numStyles === undefined ) ++ numStyles = jQuery("style, link[rel=stylesheet]").length; ++ if ( document.styleSheets.length != numStyles ) { ++ setTimeout( arguments.callee, 0 ); ++ return; ++ } ++ // and execute any waiting functions ++ jQuery.ready(); ++ })(); ++ } ++ ++ // A fallback to window.onload, that will always work ++ jQuery.event.add( window, "load", jQuery.ready ); ++} ++ ++jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," + ++ "mousedown,mouseup,mousemove,mouseover,mouseout,change,select," + ++ "submit,keydown,keypress,keyup,error").split(","), function(i, name){ ++ ++ // Handle event binding ++ jQuery.fn[name] = function(fn){ ++ return fn ? this.bind(name, fn) : this.trigger(name); ++ }; ++}); ++ ++// Checks if an event happened on an element within another element ++// Used in jQuery.event.special.mouseenter and mouseleave handlers ++var withinElement = function(event, elem) { ++ // Check if mouse(over|out) are still within the same parent element ++ var parent = event.relatedTarget; ++ // Traverse up the tree ++ while ( parent && parent != elem ) try { parent = parent.parentNode; } catch(error) { parent = elem; } ++ // Return true if we actually just moused on to a sub-element ++ return parent == elem; ++}; ++ ++// Prevent memory leaks in IE ++// And prevent errors on refresh with events like mouseover in other browsers ++// Window isn't included so as not to unbind existing unload events ++jQuery(window).bind("unload", function() { ++ jQuery("*").add(document).unbind(); ++}); ++jQuery.fn.extend({ ++ load: function( url, params, callback ) { ++ if ( jQuery.isFunction( url ) ) ++ return this.bind("load", url); ++ ++ var off = url.indexOf(" "); ++ if ( off >= 0 ) { ++ var selector = url.slice(off, url.length); ++ url = url.slice(0, off); ++ } ++ ++ callback = callback || function(){}; ++ ++ // Default to a GET request ++ var type = "GET"; ++ ++ // If the second parameter was provided ++ if ( params ) ++ // If it's a function ++ if ( jQuery.isFunction( params ) ) { ++ // We assume that it's the callback ++ callback = params; ++ params = null; ++ ++ // Otherwise, build a param string ++ } else { ++ params = jQuery.param( params ); ++ type = "POST"; ++ } ++ ++ var self = this; ++ ++ // Request the remote document ++ jQuery.ajax({ ++ url: url, ++ type: type, ++ dataType: "html", ++ data: params, ++ complete: function(res, status){ ++ // If successful, inject the HTML into all the matched elements ++ if ( status == "success" || status == "notmodified" ) ++ // See if a selector was specified ++ self.html( selector ? ++ // Create a dummy div to hold the results ++ jQuery("<div/>") ++ // inject the contents of the document in, removing the scripts ++ // to avoid any 'Permission Denied' errors in IE ++ .append(res.responseText.replace(/<script(.|\s)*?\/script>/g, "")) ++ ++ // Locate the specified elements ++ .find(selector) : ++ ++ // If not, just inject the full result ++ res.responseText ); ++ ++ self.each( callback, [res.responseText, status, res] ); ++ } ++ }); ++ return this; ++ }, ++ ++ serialize: function() { ++ return jQuery.param(this.serializeArray()); ++ }, ++ serializeArray: function() { ++ return this.map(function(){ ++ return jQuery.nodeName(this, "form") ? ++ jQuery.makeArray(this.elements) : this; ++ }) ++ .filter(function(){ ++ return this.name && !this.disabled && ++ (this.checked || /select|textarea/i.test(this.nodeName) || ++ /text|hidden|password/i.test(this.type)); ++ }) ++ .map(function(i, elem){ ++ var val = jQuery(this).val(); ++ return val == null ? null : ++ val.constructor == Array ? ++ jQuery.map( val, function(val, i){ ++ return {name: elem.name, value: val}; ++ }) : ++ {name: elem.name, value: val}; ++ }).get(); ++ } ++}); ++ ++// Attach a bunch of functions for handling common AJAX events ++jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){ ++ jQuery.fn[o] = function(f){ ++ return this.bind(o, f); ++ }; ++}); ++ ++var jsc = (new Date).getTime(); ++ ++jQuery.extend({ ++ get: function( url, data, callback, type ) { ++ // shift arguments if data argument was ommited ++ if ( jQuery.isFunction( data ) ) { ++ callback = data; ++ data = null; ++ } ++ ++ return jQuery.ajax({ ++ type: "GET", ++ url: url, ++ data: data, ++ success: callback, ++ dataType: type ++ }); ++ }, ++ ++ getScript: function( url, callback ) { ++ return jQuery.get(url, null, callback, "script"); ++ }, ++ ++ getJSON: function( url, data, callback ) { ++ return jQuery.get(url, data, callback, "json"); ++ }, ++ ++ post: function( url, data, callback, type ) { ++ if ( jQuery.isFunction( data ) ) { ++ callback = data; ++ data = {}; ++ } ++ ++ return jQuery.ajax({ ++ type: "POST", ++ url: url, ++ data: data, ++ success: callback, ++ dataType: type ++ }); ++ }, ++ ++ ajaxSetup: function( settings ) { ++ jQuery.extend( jQuery.ajaxSettings, settings ); ++ }, ++ ++ ajaxSettings: { ++ global: true, ++ type: "GET", ++ timeout: 0, ++ contentType: "application/x-www-form-urlencoded", ++ processData: true, ++ async: true, ++ data: null, ++ username: null, ++ password: null, ++ accepts: { ++ xml: "application/xml, text/xml", ++ html: "text/html", ++ script: "text/javascript, application/javascript", ++ json: "application/json, text/javascript", ++ text: "text/plain", ++ _default: "*/*" ++ } ++ }, ++ ++ // Last-Modified header cache for next request ++ lastModified: {}, ++ ++ ajax: function( s ) { ++ var jsonp, jsre = /=\?(&|$)/g, status, data; ++ ++ // Extend the settings, but re-extend 's' so that it can be ++ // checked again later (in the test suite, specifically) ++ s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s)); ++ ++ // convert data if not already a string ++ if ( s.data && s.processData && typeof s.data != "string" ) ++ s.data = jQuery.param(s.data); ++ ++ // Handle JSONP Parameter Callbacks ++ if ( s.dataType == "jsonp" ) { ++ if ( s.type.toLowerCase() == "get" ) { ++ if ( !s.url.match(jsre) ) ++ s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?"; ++ } else if ( !s.data || !s.data.match(jsre) ) ++ s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?"; ++ s.dataType = "json"; ++ } ++ ++ // Build temporary JSONP function ++ if ( s.dataType == "json" && (s.data && s.data.match(jsre) || s.url.match(jsre)) ) { ++ jsonp = "jsonp" + jsc++; ++ ++ // Replace the =? sequence both in the query string and the data ++ if ( s.data ) ++ s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1"); ++ s.url = s.url.replace(jsre, "=" + jsonp + "$1"); ++ ++ // We need to make sure ++ // that a JSONP style response is executed properly ++ s.dataType = "script"; ++ ++ // Handle JSONP-style loading ++ window[ jsonp ] = function(tmp){ ++ data = tmp; ++ success(); ++ complete(); ++ // Garbage collect ++ window[ jsonp ] = undefined; ++ try{ delete window[ jsonp ]; } catch(e){} ++ if ( head ) ++ head.removeChild( script ); ++ }; ++ } ++ ++ if ( s.dataType == "script" && s.cache == null ) ++ s.cache = false; ++ ++ if ( s.cache === false && s.type.toLowerCase() == "get" ) { ++ var ts = (new Date()).getTime(); ++ // try replacing _= if it is there ++ var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2"); ++ // if nothing was replaced, add timestamp to the end ++ s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : ""); ++ } ++ ++ // If data is available, append data to url for get requests ++ if ( s.data && s.type.toLowerCase() == "get" ) { ++ s.url += (s.url.match(/\?/) ? "&" : "?") + s.data; ++ ++ // IE likes to send both get and post data, prevent this ++ s.data = null; ++ } ++ ++ // Watch for a new set of requests ++ if ( s.global && ! jQuery.active++ ) ++ jQuery.event.trigger( "ajaxStart" ); ++ ++ // If we're requesting a remote document ++ // and trying to load JSON or Script with a GET ++ if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && s.dataType == "script" && s.type.toLowerCase() == "get" ) { ++ var head = document.getElementsByTagName("head")[0]; ++ var script = document.createElement("script"); ++ script.src = s.url; ++ if (s.scriptCharset) ++ script.charset = s.scriptCharset; ++ ++ // Handle Script loading ++ if ( !jsonp ) { ++ var done = false; ++ ++ // Attach handlers for all browsers ++ script.onload = script.onreadystatechange = function(){ ++ if ( !done && (!this.readyState || ++ this.readyState == "loaded" || this.readyState == "complete") ) { ++ done = true; ++ success(); ++ complete(); ++ head.removeChild( script ); ++ } ++ }; ++ } ++ ++ head.appendChild(script); ++ ++ // We handle everything using the script element injection ++ return undefined; ++ } ++ ++ var requestDone = false; ++ ++ // Create the request object; Microsoft failed to properly ++ // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available ++ var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest(); ++ ++ // Open the socket ++ xml.open(s.type, s.url, s.async, s.username, s.password); ++ ++ // Need an extra try/catch for cross domain requests in Firefox 3 ++ try { ++ // Set the correct header, if data is being sent ++ if ( s.data ) ++ xml.setRequestHeader("Content-Type", s.contentType); ++ ++ // Set the If-Modified-Since header, if ifModified mode. ++ if ( s.ifModified ) ++ xml.setRequestHeader("If-Modified-Since", ++ jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" ); ++ ++ // Set header so the called script knows that it's an XMLHttpRequest ++ xml.setRequestHeader("X-Requested-With", "XMLHttpRequest"); ++ ++ // Set the Accepts header for the server, depending on the dataType ++ xml.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ? ++ s.accepts[ s.dataType ] + ", */*" : ++ s.accepts._default ); ++ } catch(e){} ++ ++ // Allow custom headers/mimetypes ++ if ( s.beforeSend ) ++ s.beforeSend(xml); ++ ++ if ( s.global ) ++ jQuery.event.trigger("ajaxSend", [xml, s]); ++ ++ // Wait for a response to come back ++ var onreadystatechange = function(isTimeout){ ++ // The transfer is complete and the data is available, or the request timed out ++ if ( !requestDone && xml && (xml.readyState == 4 || isTimeout == "timeout") ) { ++ requestDone = true; ++ ++ // clear poll interval ++ if (ival) { ++ clearInterval(ival); ++ ival = null; ++ } ++ ++ status = isTimeout == "timeout" && "timeout" || ++ !jQuery.httpSuccess( xml ) && "error" || ++ s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" || ++ "success"; ++ ++ if ( status == "success" ) { ++ // Watch for, and catch, XML document parse errors ++ try { ++ // process the data (runs the xml through httpData regardless of callback) ++ data = jQuery.httpData( xml, s.dataType ); ++ } catch(e) { ++ status = "parsererror"; ++ } ++ } ++ ++ // Make sure that the request was successful or notmodified ++ if ( status == "success" ) { ++ // Cache Last-Modified header, if ifModified mode. ++ var modRes; ++ try { ++ modRes = xml.getResponseHeader("Last-Modified"); ++ } catch(e) {} // swallow exception thrown by FF if header is not available ++ ++ if ( s.ifModified && modRes ) ++ jQuery.lastModified[s.url] = modRes; ++ ++ // JSONP handles its own success callback ++ if ( !jsonp ) ++ success(); ++ } else ++ jQuery.handleError(s, xml, status); ++ ++ // Fire the complete handlers ++ complete(); ++ ++ // Stop memory leaks ++ if ( s.async ) ++ xml = null; ++ } ++ }; ++ ++ if ( s.async ) { ++ // don't attach the handler to the request, just poll it instead ++ var ival = setInterval(onreadystatechange, 13); ++ ++ // Timeout checker ++ if ( s.timeout > 0 ) ++ setTimeout(function(){ ++ // Check to see if the request is still happening ++ if ( xml ) { ++ // Cancel the request ++ xml.abort(); ++ ++ if( !requestDone ) ++ onreadystatechange( "timeout" ); ++ } ++ }, s.timeout); ++ } ++ ++ // Send the data ++ try { ++ xml.send(s.data); ++ } catch(e) { ++ jQuery.handleError(s, xml, null, e); ++ } ++ ++ // firefox 1.5 doesn't fire statechange for sync requests ++ if ( !s.async ) ++ onreadystatechange(); ++ ++ function success(){ ++ // If a local callback was specified, fire it and pass it the data ++ if ( s.success ) ++ s.success( data, status ); ++ ++ // Fire the global callback ++ if ( s.global ) ++ jQuery.event.trigger( "ajaxSuccess", [xml, s] ); ++ } ++ ++ function complete(){ ++ // Process result ++ if ( s.complete ) ++ s.complete(xml, status); ++ ++ // The request was completed ++ if ( s.global ) ++ jQuery.event.trigger( "ajaxComplete", [xml, s] ); ++ ++ // Handle the global AJAX counter ++ if ( s.global && ! --jQuery.active ) ++ jQuery.event.trigger( "ajaxStop" ); ++ } ++ ++ // return XMLHttpRequest to allow aborting the request etc. ++ return xml; ++ }, ++ ++ handleError: function( s, xml, status, e ) { ++ // If a local callback was specified, fire it ++ if ( s.error ) s.error( xml, status, e ); ++ ++ // Fire the global callback ++ if ( s.global ) ++ jQuery.event.trigger( "ajaxError", [xml, s, e] ); ++ }, ++ ++ // Counter for holding the number of active queries ++ active: 0, ++ ++ // Determines if an XMLHttpRequest was successful or not ++ httpSuccess: function( r ) { ++ try { ++ // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450 ++ return !r.status && location.protocol == "file:" || ++ ( r.status >= 200 && r.status < 300 ) || r.status == 304 || r.status == 1223 || ++ jQuery.browser.safari && r.status == undefined; ++ } catch(e){} ++ return false; ++ }, ++ ++ // Determines if an XMLHttpRequest returns NotModified ++ httpNotModified: function( xml, url ) { ++ try { ++ var xmlRes = xml.getResponseHeader("Last-Modified"); ++ ++ // Firefox always returns 200. check Last-Modified date ++ return xml.status == 304 || xmlRes == jQuery.lastModified[url] || ++ jQuery.browser.safari && xml.status == undefined; ++ } catch(e){} ++ return false; ++ }, ++ ++ httpData: function( r, type ) { ++ var ct = r.getResponseHeader("content-type"); ++ var xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0; ++ var data = xml ? r.responseXML : r.responseText; ++ ++ if ( xml && data.documentElement.tagName == "parsererror" ) ++ throw "parsererror"; ++ ++ // If the type is "script", eval it in global context ++ if ( type == "script" ) ++ jQuery.globalEval( data ); ++ ++ // Get the JavaScript object, if JSON is used. ++ if ( type == "json" ) ++ data = eval("(" + data + ")"); ++ ++ return data; ++ }, ++ ++ // Serialize an array of form elements or a set of ++ // key/values into a query string ++ param: function( a ) { ++ var s = []; ++ ++ // If an array was passed in, assume that it is an array ++ // of form elements ++ if ( a.constructor == Array || a.jquery ) ++ // Serialize the form elements ++ jQuery.each( a, function(){ ++ s.push( encodeURIComponent(this.name) + "=" + encodeURIComponent( this.value ) ); ++ }); ++ ++ // Otherwise, assume that it's an object of key/value pairs ++ else ++ // Serialize the key/values ++ for ( var j in a ) ++ // If the value is an array then the key names need to be repeated ++ if ( a[j] && a[j].constructor == Array ) ++ jQuery.each( a[j], function(){ ++ s.push( encodeURIComponent(j) + "=" + encodeURIComponent( this ) ); ++ }); ++ else ++ s.push( encodeURIComponent(j) + "=" + encodeURIComponent( a[j] ) ); ++ ++ // Return the resulting serialization ++ return s.join("&").replace(/%20/g, "+"); ++ } ++ ++}); ++jQuery.fn.extend({ ++ show: function(speed,callback){ ++ return speed ? ++ this.animate({ ++ height: "show", width: "show", opacity: "show" ++ }, speed, callback) : ++ ++ this.filter(":hidden").each(function(){ ++ this.style.display = this.oldblock || ""; ++ if ( jQuery.css(this,"display") == "none" ) { ++ var elem = jQuery("<" + this.tagName + " />").appendTo("body"); ++ this.style.display = elem.css("display"); ++ // handle an edge condition where css is - div { display:none; } or similar ++ if (this.style.display == "none") ++ this.style.display = "block"; ++ elem.remove(); ++ } ++ }).end(); ++ }, ++ ++ hide: function(speed,callback){ ++ return speed ? ++ this.animate({ ++ height: "hide", width: "hide", opacity: "hide" ++ }, speed, callback) : ++ ++ this.filter(":visible").each(function(){ ++ this.oldblock = this.oldblock || jQuery.css(this,"display"); ++ this.style.display = "none"; ++ }).end(); ++ }, ++ ++ // Save the old toggle function ++ _toggle: jQuery.fn.toggle, ++ ++ toggle: function( fn, fn2 ){ ++ return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ? ++ this._toggle( fn, fn2 ) : ++ fn ? ++ this.animate({ ++ height: "toggle", width: "toggle", opacity: "toggle" ++ }, fn, fn2) : ++ this.each(function(){ ++ jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ](); ++ }); ++ }, ++ ++ slideDown: function(speed,callback){ ++ return this.animate({height: "show"}, speed, callback); ++ }, ++ ++ slideUp: function(speed,callback){ ++ return this.animate({height: "hide"}, speed, callback); ++ }, ++ ++ slideToggle: function(speed, callback){ ++ return this.animate({height: "toggle"}, speed, callback); ++ }, ++ ++ fadeIn: function(speed, callback){ ++ return this.animate({opacity: "show"}, speed, callback); ++ }, ++ ++ fadeOut: function(speed, callback){ ++ return this.animate({opacity: "hide"}, speed, callback); ++ }, ++ ++ fadeTo: function(speed,to,callback){ ++ return this.animate({opacity: to}, speed, callback); ++ }, ++ ++ animate: function( prop, speed, easing, callback ) { ++ var optall = jQuery.speed(speed, easing, callback); ++ ++ return this[ optall.queue === false ? "each" : "queue" ](function(){ ++ if ( this.nodeType != 1) ++ return false; ++ ++ var opt = jQuery.extend({}, optall); ++ var hidden = jQuery(this).is(":hidden"), self = this; ++ ++ for ( var p in prop ) { ++ if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden ) ++ return jQuery.isFunction(opt.complete) && opt.complete.apply(this); ++ ++ if ( p == "height" || p == "width" ) { ++ // Store display property ++ opt.display = jQuery.css(this, "display"); ++ ++ // Make sure that nothing sneaks out ++ opt.overflow = this.style.overflow; ++ } ++ } ++ ++ if ( opt.overflow != null ) ++ this.style.overflow = "hidden"; ++ ++ opt.curAnim = jQuery.extend({}, prop); ++ ++ jQuery.each( prop, function(name, val){ ++ var e = new jQuery.fx( self, opt, name ); ++ ++ if ( /toggle|show|hide/.test(val) ) ++ e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop ); ++ else { ++ var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/), ++ start = e.cur(true) || 0; ++ ++ if ( parts ) { ++ var end = parseFloat(parts[2]), ++ unit = parts[3] || "px"; ++ ++ // We need to compute starting value ++ if ( unit != "px" ) { ++ self.style[ name ] = (end || 1) + unit; ++ start = ((end || 1) / e.cur(true)) * start; ++ self.style[ name ] = start + unit; ++ } ++ ++ // If a +=/-= token was provided, we're doing a relative animation ++ if ( parts[1] ) ++ end = ((parts[1] == "-=" ? -1 : 1) * end) + start; ++ ++ e.custom( start, end, unit ); ++ } else ++ e.custom( start, val, "" ); ++ } ++ }); ++ ++ // For JS strict compliance ++ return true; ++ }); ++ }, ++ ++ queue: function(type, fn){ ++ if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) { ++ fn = type; ++ type = "fx"; ++ } ++ ++ if ( !type || (typeof type == "string" && !fn) ) ++ return queue( this[0], type ); ++ ++ return this.each(function(){ ++ if ( fn.constructor == Array ) ++ queue(this, type, fn); ++ else { ++ queue(this, type).push( fn ); ++ ++ if ( queue(this, type).length == 1 ) ++ fn.apply(this); ++ } ++ }); ++ }, ++ ++ stop: function(clearQueue, gotoEnd){ ++ var timers = jQuery.timers; ++ ++ if (clearQueue) ++ this.queue([]); ++ ++ this.each(function(){ ++ // go in reverse order so anything added to the queue during the loop is ignored ++ for ( var i = timers.length - 1; i >= 0; i-- ) ++ if ( timers[i].elem == this ) { ++ if (gotoEnd) ++ // force the next step to be the last ++ timers[i](true); ++ timers.splice(i, 1); ++ } ++ }); ++ ++ // start the next in the queue if the last step wasn't forced ++ if (!gotoEnd) ++ this.dequeue(); ++ ++ return this; ++ } ++ ++}); ++ ++var queue = function( elem, type, array ) { ++ if ( !elem ) ++ return undefined; ++ ++ type = type || "fx"; ++ ++ var q = jQuery.data( elem, type + "queue" ); ++ ++ if ( !q || array ) ++ q = jQuery.data( elem, type + "queue", ++ array ? jQuery.makeArray(array) : [] ); ++ ++ return q; ++}; ++ ++jQuery.fn.dequeue = function(type){ ++ type = type || "fx"; ++ ++ return this.each(function(){ ++ var q = queue(this, type); ++ ++ q.shift(); ++ ++ if ( q.length ) ++ q[0].apply( this ); ++ }); ++}; ++ ++jQuery.extend({ ++ ++ speed: function(speed, easing, fn) { ++ var opt = speed && speed.constructor == Object ? speed : { ++ complete: fn || !fn && easing || ++ jQuery.isFunction( speed ) && speed, ++ duration: speed, ++ easing: fn && easing || easing && easing.constructor != Function && easing ++ }; ++ ++ opt.duration = (opt.duration && opt.duration.constructor == Number ? ++ opt.duration : ++ { slow: 600, fast: 200 }[opt.duration]) || 400; ++ ++ // Queueing ++ opt.old = opt.complete; ++ opt.complete = function(){ ++ if ( opt.queue !== false ) ++ jQuery(this).dequeue(); ++ if ( jQuery.isFunction( opt.old ) ) ++ opt.old.apply( this ); ++ }; ++ ++ return opt; ++ }, ++ ++ easing: { ++ linear: function( p, n, firstNum, diff ) { ++ return firstNum + diff * p; ++ }, ++ swing: function( p, n, firstNum, diff ) { ++ return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum; ++ } ++ }, ++ ++ timers: [], ++ timerId: null, ++ ++ fx: function( elem, options, prop ){ ++ this.options = options; ++ this.elem = elem; ++ this.prop = prop; ++ ++ if ( !options.orig ) ++ options.orig = {}; ++ } ++ ++}); ++ ++jQuery.fx.prototype = { ++ ++ // Simple function for setting a style value ++ update: function(){ ++ if ( this.options.step ) ++ this.options.step.apply( this.elem, [ this.now, this ] ); ++ ++ (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this ); ++ ++ // Set display property to block for height/width animations ++ if ( this.prop == "height" || this.prop == "width" ) ++ this.elem.style.display = "block"; ++ }, ++ ++ // Get the current size ++ cur: function(force){ ++ if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null ) ++ return this.elem[ this.prop ]; ++ ++ var r = parseFloat(jQuery.css(this.elem, this.prop, force)); ++ return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0; ++ }, ++ ++ // Start an animation from one number to another ++ custom: function(from, to, unit){ ++ this.startTime = (new Date()).getTime(); ++ this.start = from; ++ this.end = to; ++ this.unit = unit || this.unit || "px"; ++ this.now = this.start; ++ this.pos = this.state = 0; ++ this.update(); ++ ++ var self = this; ++ function t(gotoEnd){ ++ return self.step(gotoEnd); ++ } ++ ++ t.elem = this.elem; ++ ++ jQuery.timers.push(t); ++ ++ if ( jQuery.timerId == null ) { ++ jQuery.timerId = setInterval(function(){ ++ var timers = jQuery.timers; ++ ++ for ( var i = 0; i < timers.length; i++ ) ++ if ( !timers[i]() ) ++ timers.splice(i--, 1); ++ ++ if ( !timers.length ) { ++ clearInterval( jQuery.timerId ); ++ jQuery.timerId = null; ++ } ++ }, 13); ++ } ++ }, ++ ++ // Simple 'show' function ++ show: function(){ ++ // Remember where we started, so that we can go back to it later ++ this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop ); ++ this.options.show = true; ++ ++ // Begin the animation ++ this.custom(0, this.cur()); ++ ++ // Make sure that we start at a small width/height to avoid any ++ // flash of content ++ if ( this.prop == "width" || this.prop == "height" ) ++ this.elem.style[this.prop] = "1px"; ++ ++ // Start by showing the element ++ jQuery(this.elem).show(); ++ }, ++ ++ // Simple 'hide' function ++ hide: function(){ ++ // Remember where we started, so that we can go back to it later ++ this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop ); ++ this.options.hide = true; ++ ++ // Begin the animation ++ this.custom(this.cur(), 0); ++ }, ++ ++ // Each step of an animation ++ step: function(gotoEnd){ ++ var t = (new Date()).getTime(); ++ ++ if ( gotoEnd || t > this.options.duration + this.startTime ) { ++ this.now = this.end; ++ this.pos = this.state = 1; ++ this.update(); ++ ++ this.options.curAnim[ this.prop ] = true; ++ ++ var done = true; ++ for ( var i in this.options.curAnim ) ++ if ( this.options.curAnim[i] !== true ) ++ done = false; ++ ++ if ( done ) { ++ if ( this.options.display != null ) { ++ // Reset the overflow ++ this.elem.style.overflow = this.options.overflow; ++ ++ // Reset the display ++ this.elem.style.display = this.options.display; ++ if ( jQuery.css(this.elem, "display") == "none" ) ++ this.elem.style.display = "block"; ++ } ++ ++ // Hide the element if the "hide" operation was done ++ if ( this.options.hide ) ++ this.elem.style.display = "none"; ++ ++ // Reset the properties, if the item has been hidden or shown ++ if ( this.options.hide || this.options.show ) ++ for ( var p in this.options.curAnim ) ++ jQuery.attr(this.elem.style, p, this.options.orig[p]); ++ } ++ ++ // If a callback was provided, execute it ++ if ( done && jQuery.isFunction( this.options.complete ) ) ++ // Execute the complete function ++ this.options.complete.apply( this.elem ); ++ ++ return false; ++ } else { ++ var n = t - this.startTime; ++ this.state = n / this.options.duration; ++ ++ // Perform the easing function, defaults to swing ++ this.pos = jQuery.easing[this.options.easing || (jQuery.easing.swing ? "swing" : "linear")](this.state, n, 0, 1, this.options.duration); ++ this.now = this.start + ((this.end - this.start) * this.pos); ++ ++ // Perform the next step of the animation ++ this.update(); ++ } ++ ++ return true; ++ } ++ ++}; ++ ++jQuery.fx.step = { ++ scrollLeft: function(fx){ ++ fx.elem.scrollLeft = fx.now; ++ }, ++ ++ scrollTop: function(fx){ ++ fx.elem.scrollTop = fx.now; ++ }, ++ ++ opacity: function(fx){ ++ jQuery.attr(fx.elem.style, "opacity", fx.now); ++ }, ++ ++ _default: function(fx){ ++ fx.elem.style[ fx.prop ] = fx.now + fx.unit; ++ } ++}; ++// The Offset Method ++// Originally By Brandon Aaron, part of the Dimension Plugin ++// http://jquery.com/plugins/project/dimensions ++jQuery.fn.offset = function() { ++ var left = 0, top = 0, elem = this[0], results; ++ ++ if ( elem ) with ( jQuery.browser ) { ++ var parent = elem.parentNode, ++ offsetChild = elem, ++ offsetParent = elem.offsetParent, ++ doc = elem.ownerDocument, ++ safari2 = safari && parseInt(version) < 522 && !/adobeair/i.test(userAgent), ++ fixed = jQuery.css(elem, "position") == "fixed"; ++ ++ // Use getBoundingClientRect if available ++ if ( elem.getBoundingClientRect ) { ++ var box = elem.getBoundingClientRect(); ++ ++ // Add the document scroll offsets ++ add(box.left + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft), ++ box.top + Math.max(doc.documentElement.scrollTop, doc.body.scrollTop)); ++ ++ // IE adds the HTML element's border, by default it is medium which is 2px ++ // IE 6 and 7 quirks mode the border width is overwritable by the following css html { border: 0; } ++ // IE 7 standards mode, the border is always 2px ++ // This border/offset is typically represented by the clientLeft and clientTop properties ++ // However, in IE6 and 7 quirks mode the clientLeft and clientTop properties are not updated when overwriting it via CSS ++ // Therefore this method will be off by 2px in IE while in quirksmode ++ add( -doc.documentElement.clientLeft, -doc.documentElement.clientTop ); ++ ++ // Otherwise loop through the offsetParents and parentNodes ++ } else { ++ ++ // Initial element offsets ++ add( elem.offsetLeft, elem.offsetTop ); ++ ++ // Get parent offsets ++ while ( offsetParent ) { ++ // Add offsetParent offsets ++ add( offsetParent.offsetLeft, offsetParent.offsetTop ); ++ ++ // Mozilla and Safari > 2 does not include the border on offset parents ++ // However Mozilla adds the border for table or table cells ++ if ( mozilla && !/^t(able|d|h)$/i.test(offsetParent.tagName) || safari && !safari2 ) ++ border( offsetParent ); ++ ++ // Add the document scroll offsets if position is fixed on any offsetParent ++ if ( !fixed && jQuery.css(offsetParent, "position") == "fixed" ) ++ fixed = true; ++ ++ // Set offsetChild to previous offsetParent unless it is the body element ++ offsetChild = /^body$/i.test(offsetParent.tagName) ? offsetChild : offsetParent; ++ // Get next offsetParent ++ offsetParent = offsetParent.offsetParent; ++ } ++ ++ // Get parent scroll offsets ++ while ( parent && parent.tagName && !/^body|html$/i.test(parent.tagName) ) { ++ // Remove parent scroll UNLESS that parent is inline or a table to work around Opera inline/table scrollLeft/Top bug ++ if ( !/^inline|table.*$/i.test(jQuery.css(parent, "display")) ) ++ // Subtract parent scroll offsets ++ add( -parent.scrollLeft, -parent.scrollTop ); ++ ++ // Mozilla does not add the border for a parent that has overflow != visible ++ if ( mozilla && jQuery.css(parent, "overflow") != "visible" ) ++ border( parent ); ++ ++ // Get next parent ++ parent = parent.parentNode; ++ } ++ ++ // Safari <= 2 doubles body offsets with a fixed position element/offsetParent or absolutely positioned offsetChild ++ // Mozilla doubles body offsets with a non-absolutely positioned offsetChild ++ if ( (safari2 && (fixed || jQuery.css(offsetChild, "position") == "absolute")) || ++ (mozilla && jQuery.css(offsetChild, "position") != "absolute") ) ++ add( -doc.body.offsetLeft, -doc.body.offsetTop ); ++ ++ // Add the document scroll offsets if position is fixed ++ if ( fixed ) ++ add(Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft), ++ Math.max(doc.documentElement.scrollTop, doc.body.scrollTop)); ++ } ++ ++ // Return an object with top and left properties ++ results = { top: top, left: left }; ++ } ++ ++ function border(elem) { ++ add( jQuery.curCSS(elem, "borderLeftWidth", true), jQuery.curCSS(elem, "borderTopWidth", true) ); ++ } ++ ++ function add(l, t) { ++ left += parseInt(l) || 0; ++ top += parseInt(t) || 0; ++ } ++ ++ return results; ++}; ++})(); diff -Nru lua-cgi-5.1.4+dfsg/debian/patches/sapi.patch lua-cgi-5.2~alpha2/debian/patches/sapi.patch --- lua-cgi-5.1.4+dfsg/debian/patches/sapi.patch 2011-07-22 10:41:05.000000000 +0000 +++ lua-cgi-5.2~alpha2/debian/patches/sapi.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,90 +0,0 @@ -Author: Enrico Tassi <gareuselesinge@debian.org> -Description: SAPI implementation for the CGI protocol ---- /dev/null -+++ lua-cgi-5.1.3/src/sapi/cgi/info.lua -@@ -0,0 +1,16 @@ -+---------------------------------------------------------------------------- -+-- $Id: info.lua,v 1.3 2007/11/21 19:20:06 carregal Exp $ -+---------------------------------------------------------------------------- -+ -+module"sapi.cgi.info" -+ -+function open (req) -+ return { -+ _COPYRIGHT = "Copyright (C) 2004-2007 Kepler Project", -+ _DESCRIPTION = "CGI SAPI implementation", -+ _VERSION = "CGI SAPI 1.0", -+ ispersistent = false, -+ ismapped = false, -+ isdirect = false, -+ } -+end ---- /dev/null -+++ lua-cgi-5.1.3/src/sapi/cgi/request.lua -@@ -0,0 +1,18 @@ -+---------------------------------------------------------------------------- -+-- $Id: request.lua,v 1.1 2005/12/29 11:12:41 tomas Exp $ -+---------------------------------------------------------------------------- -+ -+local getenv = os.getenv -+local stdin = io.stdin -+ -+module"sapi.cgi.request" -+ -+---------------------------------------------------------------------------- -+function open (req) -+ return { -+ servervariable = getenv, -+ getpostdata = function (n) -+ return stdin:read (n) -+ end, -+ } -+end ---- /dev/null -+++ lua-cgi-5.1.3/src/sapi/cgi/response.lua -@@ -0,0 +1,34 @@ -+---------------------------------------------------------------------------- -+-- $Id: response.lua,v 1.2 2007/04/14 22:16:52 tomas Exp $ -+---------------------------------------------------------------------------- -+ -+local unpack = unpack -+local format = string.format -+local stderr, stdout = io.stderr, io.stdout -+ -+module"sapi.cgi.response" -+ -+---------------------------------------------------------------------------- -+function open (req) -+ return { -+ contenttype = function (header) -+ stdout:write ("Content-type: "..header.."\n\n") -+ end, -+ -+ errorlog = function (msg, errlevel) -+ stderr:write (msg) -+ end, -+ -+ header = function (header, value) -+ stdout:write (format ("%s: %s\n", header, value)) -+ end, -+ -+ redirect = function (url) -+ stdout:write ("Location: "..url.."\n\n") -+ end, -+ -+ write = function (...) -+ stdout:write (...) -+ end, -+ } -+end ---- /dev/null -+++ lua-cgi-5.1.3/src/sapi/init.lua -@@ -0,0 +1,8 @@ -+local info = require"sapi.cgi.info" -+local req = require"sapi.cgi.request" -+local res = require"sapi.cgi.response" -+SAPI = { -+ Info = info.open (), -+ Request = req.open (), -+ Response = res.open (), -+} diff -Nru lua-cgi-5.1.4+dfsg/debian/patches/series lua-cgi-5.2~alpha2/debian/patches/series --- lua-cgi-5.1.4+dfsg/debian/patches/series 2012-05-01 09:32:39.000000000 +0000 +++ lua-cgi-5.2~alpha2/debian/patches/series 2013-08-12 07:47:34.000000000 +0000 @@ -1 +1 @@ -sapi.patch +0002-Non-minimized-version-of-jquery-to-adhere-DFSG.patch diff -Nru lua-cgi-5.1.4+dfsg/examples/jquery/jquery-1.2.3.js lua-cgi-5.2~alpha2/examples/jquery/jquery-1.2.3.js --- lua-cgi-5.1.4+dfsg/examples/jquery/jquery-1.2.3.js 2012-05-01 09:31:45.000000000 +0000 +++ lua-cgi-5.2~alpha2/examples/jquery/jquery-1.2.3.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,3408 +0,0 @@ -(function(){ -/* - * jQuery 1.2.3 - New Wave Javascript - * - * Copyright (c) 2008 John Resig (jquery.com) - * Dual licensed under the MIT (MIT-LICENSE.txt) - * and GPL (GPL-LICENSE.txt) licenses. - * - * $Date: 2008-02-06 00:21:25 -0500 (Wed, 06 Feb 2008) $ - * $Rev: 4663 $ - */ - -// Map over jQuery in case of overwrite -if ( window.jQuery ) - var _jQuery = window.jQuery; - -var jQuery = window.jQuery = function( selector, context ) { - // The jQuery object is actually just the init constructor 'enhanced' - return new jQuery.prototype.init( selector, context ); -}; - -// Map over the $ in case of overwrite -if ( window.$ ) - var _$ = window.$; - -// Map the jQuery namespace to the '$' one -window.$ = jQuery; - -// A simple way to check for HTML strings or ID strings -// (both of which we optimize for) -var quickExpr = /^[^<]*(<(.|\s)+>)[^>]*$|^#(\w+)$/; - -// Is it a simple selector -var isSimple = /^.[^:#\[\.]*$/; - -jQuery.fn = jQuery.prototype = { - init: function( selector, context ) { - // Make sure that a selection was provided - selector = selector || document; - - // Handle $(DOMElement) - if ( selector.nodeType ) { - this[0] = selector; - this.length = 1; - return this; - - // Handle HTML strings - } else if ( typeof selector == "string" ) { - // Are we dealing with HTML string or an ID? - var match = quickExpr.exec( selector ); - - // Verify a match, and that no context was specified for #id - if ( match && (match[1] || !context) ) { - - // HANDLE: $(html) -> $(array) - if ( match[1] ) - selector = jQuery.clean( [ match[1] ], context ); - - // HANDLE: $("#id") - else { - var elem = document.getElementById( match[3] ); - - // Make sure an element was located - if ( elem ) - // Handle the case where IE and Opera return items - // by name instead of ID - if ( elem.id != match[3] ) - return jQuery().find( selector ); - - // Otherwise, we inject the element directly into the jQuery object - else { - this[0] = elem; - this.length = 1; - return this; - } - - else - selector = []; - } - - // HANDLE: $(expr, [context]) - // (which is just equivalent to: $(content).find(expr) - } else - return new jQuery( context ).find( selector ); - - // HANDLE: $(function) - // Shortcut for document ready - } else if ( jQuery.isFunction( selector ) ) - return new jQuery( document )[ jQuery.fn.ready ? "ready" : "load" ]( selector ); - - return this.setArray( - // HANDLE: $(array) - selector.constructor == Array && selector || - - // HANDLE: $(arraylike) - // Watch for when an array-like object, contains DOM nodes, is passed in as the selector - (selector.jquery || selector.length && selector != window && !selector.nodeType && selector[0] != undefined && selector[0].nodeType) && jQuery.makeArray( selector ) || - - // HANDLE: $(*) - [ selector ] ); - }, - - // The current version of jQuery being used - jquery: "1.2.3", - - // The number of elements contained in the matched element set - size: function() { - return this.length; - }, - - // The number of elements contained in the matched element set - length: 0, - - // Get the Nth element in the matched element set OR - // Get the whole matched element set as a clean array - get: function( num ) { - return num == undefined ? - - // Return a 'clean' array - jQuery.makeArray( this ) : - - // Return just the object - this[ num ]; - }, - - // Take an array of elements and push it onto the stack - // (returning the new matched element set) - pushStack: function( elems ) { - // Build a new jQuery matched element set - var ret = jQuery( elems ); - - // Add the old object onto the stack (as a reference) - ret.prevObject = this; - - // Return the newly-formed element set - return ret; - }, - - // Force the current matched set of elements to become - // the specified array of elements (destroying the stack in the process) - // You should use pushStack() in order to do this, but maintain the stack - setArray: function( elems ) { - // Resetting the length to 0, then using the native Array push - // is a super-fast way to populate an object with array-like properties - this.length = 0; - Array.prototype.push.apply( this, elems ); - - return this; - }, - - // Execute a callback for every element in the matched set. - // (You can seed the arguments with an array of args, but this is - // only used internally.) - each: function( callback, args ) { - return jQuery.each( this, callback, args ); - }, - - // Determine the position of an element within - // the matched set of elements - index: function( elem ) { - var ret = -1; - - // Locate the position of the desired element - this.each(function(i){ - if ( this == elem ) - ret = i; - }); - - return ret; - }, - - attr: function( name, value, type ) { - var options = name; - - // Look for the case where we're accessing a style value - if ( name.constructor == String ) - if ( value == undefined ) - return this.length && jQuery[ type || "attr" ]( this[0], name ) || undefined; - - else { - options = {}; - options[ name ] = value; - } - - // Check to see if we're setting style values - return this.each(function(i){ - // Set all the styles - for ( name in options ) - jQuery.attr( - type ? - this.style : - this, - name, jQuery.prop( this, options[ name ], type, i, name ) - ); - }); - }, - - css: function( key, value ) { - // ignore negative width and height values - if ( (key == 'width' || key == 'height') && parseFloat(value) < 0 ) - value = undefined; - return this.attr( key, value, "curCSS" ); - }, - - text: function( text ) { - if ( typeof text != "object" && text != null ) - return this.empty().append( (this[0] && this[0].ownerDocument || document).createTextNode( text ) ); - - var ret = ""; - - jQuery.each( text || this, function(){ - jQuery.each( this.childNodes, function(){ - if ( this.nodeType != 8 ) - ret += this.nodeType != 1 ? - this.nodeValue : - jQuery.fn.text( [ this ] ); - }); - }); - - return ret; - }, - - wrapAll: function( html ) { - if ( this[0] ) - // The elements to wrap the target around - jQuery( html, this[0].ownerDocument ) - .clone() - .insertBefore( this[0] ) - .map(function(){ - var elem = this; - - while ( elem.firstChild ) - elem = elem.firstChild; - - return elem; - }) - .append(this); - - return this; - }, - - wrapInner: function( html ) { - return this.each(function(){ - jQuery( this ).contents().wrapAll( html ); - }); - }, - - wrap: function( html ) { - return this.each(function(){ - jQuery( this ).wrapAll( html ); - }); - }, - - append: function() { - return this.domManip(arguments, true, false, function(elem){ - if (this.nodeType == 1) - this.appendChild( elem ); - }); - }, - - prepend: function() { - return this.domManip(arguments, true, true, function(elem){ - if (this.nodeType == 1) - this.insertBefore( elem, this.firstChild ); - }); - }, - - before: function() { - return this.domManip(arguments, false, false, function(elem){ - this.parentNode.insertBefore( elem, this ); - }); - }, - - after: function() { - return this.domManip(arguments, false, true, function(elem){ - this.parentNode.insertBefore( elem, this.nextSibling ); - }); - }, - - end: function() { - return this.prevObject || jQuery( [] ); - }, - - find: function( selector ) { - var elems = jQuery.map(this, function(elem){ - return jQuery.find( selector, elem ); - }); - - return this.pushStack( /[^+>] [^+>]/.test( selector ) || selector.indexOf("..") > -1 ? - jQuery.unique( elems ) : - elems ); - }, - - clone: function( events ) { - // Do the clone - var ret = this.map(function(){ - if ( jQuery.browser.msie && !jQuery.isXMLDoc(this) ) { - // IE copies events bound via attachEvent when - // using cloneNode. Calling detachEvent on the - // clone will also remove the events from the orignal - // In order to get around this, we use innerHTML. - // Unfortunately, this means some modifications to - // attributes in IE that are actually only stored - // as properties will not be copied (such as the - // the name attribute on an input). - var clone = this.cloneNode(true), - container = document.createElement("div"); - container.appendChild(clone); - return jQuery.clean([container.innerHTML])[0]; - } else - return this.cloneNode(true); - }); - - // Need to set the expando to null on the cloned set if it exists - // removeData doesn't work here, IE removes it from the original as well - // this is primarily for IE but the data expando shouldn't be copied over in any browser - var clone = ret.find("*").andSelf().each(function(){ - if ( this[ expando ] != undefined ) - this[ expando ] = null; - }); - - // Copy the events from the original to the clone - if ( events === true ) - this.find("*").andSelf().each(function(i){ - if (this.nodeType == 3) - return; - var events = jQuery.data( this, "events" ); - - for ( var type in events ) - for ( var handler in events[ type ] ) - jQuery.event.add( clone[ i ], type, events[ type ][ handler ], events[ type ][ handler ].data ); - }); - - // Return the cloned set - return ret; - }, - - filter: function( selector ) { - return this.pushStack( - jQuery.isFunction( selector ) && - jQuery.grep(this, function(elem, i){ - return selector.call( elem, i ); - }) || - - jQuery.multiFilter( selector, this ) ); - }, - - not: function( selector ) { - if ( selector.constructor == String ) - // test special case where just one selector is passed in - if ( isSimple.test( selector ) ) - return this.pushStack( jQuery.multiFilter( selector, this, true ) ); - else - selector = jQuery.multiFilter( selector, this ); - - var isArrayLike = selector.length && selector[selector.length - 1] !== undefined && !selector.nodeType; - return this.filter(function() { - return isArrayLike ? jQuery.inArray( this, selector ) < 0 : this != selector; - }); - }, - - add: function( selector ) { - return !selector ? this : this.pushStack( jQuery.merge( - this.get(), - selector.constructor == String ? - jQuery( selector ).get() : - selector.length != undefined && (!selector.nodeName || jQuery.nodeName(selector, "form")) ? - selector : [selector] ) ); - }, - - is: function( selector ) { - return selector ? - jQuery.multiFilter( selector, this ).length > 0 : - false; - }, - - hasClass: function( selector ) { - return this.is( "." + selector ); - }, - - val: function( value ) { - if ( value == undefined ) { - - if ( this.length ) { - var elem = this[0]; - - // We need to handle select boxes special - if ( jQuery.nodeName( elem, "select" ) ) { - var index = elem.selectedIndex, - values = [], - options = elem.options, - one = elem.type == "select-one"; - - // Nothing was selected - if ( index < 0 ) - return null; - - // Loop through all the selected options - for ( var i = one ? index : 0, max = one ? index + 1 : options.length; i < max; i++ ) { - var option = options[ i ]; - - if ( option.selected ) { - // Get the specifc value for the option - value = jQuery.browser.msie && !option.attributes.value.specified ? option.text : option.value; - - // We don't need an array for one selects - if ( one ) - return value; - - // Multi-Selects return an array - values.push( value ); - } - } - - return values; - - // Everything else, we just grab the value - } else - return (this[0].value || "").replace(/\r/g, ""); - - } - - return undefined; - } - - return this.each(function(){ - if ( this.nodeType != 1 ) - return; - - if ( value.constructor == Array && /radio|checkbox/.test( this.type ) ) - this.checked = (jQuery.inArray(this.value, value) >= 0 || - jQuery.inArray(this.name, value) >= 0); - - else if ( jQuery.nodeName( this, "select" ) ) { - var values = value.constructor == Array ? - value : - [ value ]; - - jQuery( "option", this ).each(function(){ - this.selected = (jQuery.inArray( this.value, values ) >= 0 || - jQuery.inArray( this.text, values ) >= 0); - }); - - if ( !values.length ) - this.selectedIndex = -1; - - } else - this.value = value; - }); - }, - - html: function( value ) { - return value == undefined ? - (this.length ? - this[0].innerHTML : - null) : - this.empty().append( value ); - }, - - replaceWith: function( value ) { - return this.after( value ).remove(); - }, - - eq: function( i ) { - return this.slice( i, i + 1 ); - }, - - slice: function() { - return this.pushStack( Array.prototype.slice.apply( this, arguments ) ); - }, - - map: function( callback ) { - return this.pushStack( jQuery.map(this, function(elem, i){ - return callback.call( elem, i, elem ); - })); - }, - - andSelf: function() { - return this.add( this.prevObject ); - }, - - data: function( key, value ){ - var parts = key.split("."); - parts[1] = parts[1] ? "." + parts[1] : ""; - - if ( value == null ) { - var data = this.triggerHandler("getData" + parts[1] + "!", [parts[0]]); - - if ( data == undefined && this.length ) - data = jQuery.data( this[0], key ); - - return data == null && parts[1] ? - this.data( parts[0] ) : - data; - } else - return this.trigger("setData" + parts[1] + "!", [parts[0], value]).each(function(){ - jQuery.data( this, key, value ); - }); - }, - - removeData: function( key ){ - return this.each(function(){ - jQuery.removeData( this, key ); - }); - }, - - domManip: function( args, table, reverse, callback ) { - var clone = this.length > 1, elems; - - return this.each(function(){ - if ( !elems ) { - elems = jQuery.clean( args, this.ownerDocument ); - - if ( reverse ) - elems.reverse(); - } - - var obj = this; - - if ( table && jQuery.nodeName( this, "table" ) && jQuery.nodeName( elems[0], "tr" ) ) - obj = this.getElementsByTagName("tbody")[0] || this.appendChild( this.ownerDocument.createElement("tbody") ); - - var scripts = jQuery( [] ); - - jQuery.each(elems, function(){ - var elem = clone ? - jQuery( this ).clone( true )[0] : - this; - - // execute all scripts after the elements have been injected - if ( jQuery.nodeName( elem, "script" ) ) { - scripts = scripts.add( elem ); - } else { - // Remove any inner scripts for later evaluation - if ( elem.nodeType == 1 ) - scripts = scripts.add( jQuery( "script", elem ).remove() ); - - // Inject the elements into the document - callback.call( obj, elem ); - } - }); - - scripts.each( evalScript ); - }); - } -}; - -// Give the init function the jQuery prototype for later instantiation -jQuery.prototype.init.prototype = jQuery.prototype; - -function evalScript( i, elem ) { - if ( elem.src ) - jQuery.ajax({ - url: elem.src, - async: false, - dataType: "script" - }); - - else - jQuery.globalEval( elem.text || elem.textContent || elem.innerHTML || "" ); - - if ( elem.parentNode ) - elem.parentNode.removeChild( elem ); -} - -jQuery.extend = jQuery.fn.extend = function() { - // copy reference to target object - var target = arguments[0] || {}, i = 1, length = arguments.length, deep = false, options; - - // Handle a deep copy situation - if ( target.constructor == Boolean ) { - deep = target; - target = arguments[1] || {}; - // skip the boolean and the target - i = 2; - } - - // Handle case when target is a string or something (possible in deep copy) - if ( typeof target != "object" && typeof target != "function" ) - target = {}; - - // extend jQuery itself if only one argument is passed - if ( length == 1 ) { - target = this; - i = 0; - } - - for ( ; i < length; i++ ) - // Only deal with non-null/undefined values - if ( (options = arguments[ i ]) != null ) - // Extend the base object - for ( var name in options ) { - // Prevent never-ending loop - if ( target === options[ name ] ) - continue; - - // Recurse if we're merging object values - if ( deep && options[ name ] && typeof options[ name ] == "object" && target[ name ] && !options[ name ].nodeType ) - target[ name ] = jQuery.extend( target[ name ], options[ name ] ); - - // Don't bring in undefined values - else if ( options[ name ] != undefined ) - target[ name ] = options[ name ]; - - } - - // Return the modified object - return target; -}; - -var expando = "jQuery" + (new Date()).getTime(), uuid = 0, windowData = {}; - -// exclude the following css properties to add px -var exclude = /z-?index|font-?weight|opacity|zoom|line-?height/i; - -jQuery.extend({ - noConflict: function( deep ) { - window.$ = _$; - - if ( deep ) - window.jQuery = _jQuery; - - return jQuery; - }, - - // See test/unit/core.js for details concerning this function. - isFunction: function( fn ) { - return !!fn && typeof fn != "string" && !fn.nodeName && - fn.constructor != Array && /function/i.test( fn + "" ); - }, - - // check if an element is in a (or is an) XML document - isXMLDoc: function( elem ) { - return elem.documentElement && !elem.body || - elem.tagName && elem.ownerDocument && !elem.ownerDocument.body; - }, - - // Evalulates a script in a global context - globalEval: function( data ) { - data = jQuery.trim( data ); - - if ( data ) { - // Inspired by code by Andrea Giammarchi - // http://webreflection.blogspot.com/2007/08/global-scope-evaluation-and-dom.html - var head = document.getElementsByTagName("head")[0] || document.documentElement, - script = document.createElement("script"); - - script.type = "text/javascript"; - if ( jQuery.browser.msie ) - script.text = data; - else - script.appendChild( document.createTextNode( data ) ); - - head.appendChild( script ); - head.removeChild( script ); - } - }, - - nodeName: function( elem, name ) { - return elem.nodeName && elem.nodeName.toUpperCase() == name.toUpperCase(); - }, - - cache: {}, - - data: function( elem, name, data ) { - elem = elem == window ? - windowData : - elem; - - var id = elem[ expando ]; - - // Compute a unique ID for the element - if ( !id ) - id = elem[ expando ] = ++uuid; - - // Only generate the data cache if we're - // trying to access or manipulate it - if ( name && !jQuery.cache[ id ] ) - jQuery.cache[ id ] = {}; - - // Prevent overriding the named cache with undefined values - if ( data != undefined ) - jQuery.cache[ id ][ name ] = data; - - // Return the named cache data, or the ID for the element - return name ? - jQuery.cache[ id ][ name ] : - id; - }, - - removeData: function( elem, name ) { - elem = elem == window ? - windowData : - elem; - - var id = elem[ expando ]; - - // If we want to remove a specific section of the element's data - if ( name ) { - if ( jQuery.cache[ id ] ) { - // Remove the section of cache data - delete jQuery.cache[ id ][ name ]; - - // If we've removed all the data, remove the element's cache - name = ""; - - for ( name in jQuery.cache[ id ] ) - break; - - if ( !name ) - jQuery.removeData( elem ); - } - - // Otherwise, we want to remove all of the element's data - } else { - // Clean up the element expando - try { - delete elem[ expando ]; - } catch(e){ - // IE has trouble directly removing the expando - // but it's ok with using removeAttribute - if ( elem.removeAttribute ) - elem.removeAttribute( expando ); - } - - // Completely remove the data cache - delete jQuery.cache[ id ]; - } - }, - - // args is for internal usage only - each: function( object, callback, args ) { - if ( args ) { - if ( object.length == undefined ) { - for ( var name in object ) - if ( callback.apply( object[ name ], args ) === false ) - break; - } else - for ( var i = 0, length = object.length; i < length; i++ ) - if ( callback.apply( object[ i ], args ) === false ) - break; - - // A special, fast, case for the most common use of each - } else { - if ( object.length == undefined ) { - for ( var name in object ) - if ( callback.call( object[ name ], name, object[ name ] ) === false ) - break; - } else - for ( var i = 0, length = object.length, value = object[0]; - i < length && callback.call( value, i, value ) !== false; value = object[++i] ){} - } - - return object; - }, - - prop: function( elem, value, type, i, name ) { - // Handle executable functions - if ( jQuery.isFunction( value ) ) - value = value.call( elem, i ); - - // Handle passing in a number to a CSS property - return value && value.constructor == Number && type == "curCSS" && !exclude.test( name ) ? - value + "px" : - value; - }, - - className: { - // internal only, use addClass("class") - add: function( elem, classNames ) { - jQuery.each((classNames || "").split(/\s+/), function(i, className){ - if ( elem.nodeType == 1 && !jQuery.className.has( elem.className, className ) ) - elem.className += (elem.className ? " " : "") + className; - }); - }, - - // internal only, use removeClass("class") - remove: function( elem, classNames ) { - if (elem.nodeType == 1) - elem.className = classNames != undefined ? - jQuery.grep(elem.className.split(/\s+/), function(className){ - return !jQuery.className.has( classNames, className ); - }).join(" ") : - ""; - }, - - // internal only, use is(".class") - has: function( elem, className ) { - return jQuery.inArray( className, (elem.className || elem).toString().split(/\s+/) ) > -1; - } - }, - - // A method for quickly swapping in/out CSS properties to get correct calculations - swap: function( elem, options, callback ) { - var old = {}; - // Remember the old values, and insert the new ones - for ( var name in options ) { - old[ name ] = elem.style[ name ]; - elem.style[ name ] = options[ name ]; - } - - callback.call( elem ); - - // Revert the old values - for ( var name in options ) - elem.style[ name ] = old[ name ]; - }, - - css: function( elem, name, force ) { - if ( name == "width" || name == "height" ) { - var val, props = { position: "absolute", visibility: "hidden", display:"block" }, which = name == "width" ? [ "Left", "Right" ] : [ "Top", "Bottom" ]; - - function getWH() { - val = name == "width" ? elem.offsetWidth : elem.offsetHeight; - var padding = 0, border = 0; - jQuery.each( which, function() { - padding += parseFloat(jQuery.curCSS( elem, "padding" + this, true)) || 0; - border += parseFloat(jQuery.curCSS( elem, "border" + this + "Width", true)) || 0; - }); - val -= Math.round(padding + border); - } - - if ( jQuery(elem).is(":visible") ) - getWH(); - else - jQuery.swap( elem, props, getWH ); - - return Math.max(0, val); - } - - return jQuery.curCSS( elem, name, force ); - }, - - curCSS: function( elem, name, force ) { - var ret; - - // A helper method for determining if an element's values are broken - function color( elem ) { - if ( !jQuery.browser.safari ) - return false; - - var ret = document.defaultView.getComputedStyle( elem, null ); - return !ret || ret.getPropertyValue("color") == ""; - } - - // We need to handle opacity special in IE - if ( name == "opacity" && jQuery.browser.msie ) { - ret = jQuery.attr( elem.style, "opacity" ); - - return ret == "" ? - "1" : - ret; - } - // Opera sometimes will give the wrong display answer, this fixes it, see #2037 - if ( jQuery.browser.opera && name == "display" ) { - var save = elem.style.outline; - elem.style.outline = "0 solid black"; - elem.style.outline = save; - } - - // Make sure we're using the right name for getting the float value - if ( name.match( /float/i ) ) - name = styleFloat; - - if ( !force && elem.style && elem.style[ name ] ) - ret = elem.style[ name ]; - - else if ( document.defaultView && document.defaultView.getComputedStyle ) { - - // Only "float" is needed here - if ( name.match( /float/i ) ) - name = "float"; - - name = name.replace( /([A-Z])/g, "-$1" ).toLowerCase(); - - var getComputedStyle = document.defaultView.getComputedStyle( elem, null ); - - if ( getComputedStyle && !color( elem ) ) - ret = getComputedStyle.getPropertyValue( name ); - - // If the element isn't reporting its values properly in Safari - // then some display: none elements are involved - else { - var swap = [], stack = []; - - // Locate all of the parent display: none elements - for ( var a = elem; a && color(a); a = a.parentNode ) - stack.unshift(a); - - // Go through and make them visible, but in reverse - // (It would be better if we knew the exact display type that they had) - for ( var i = 0; i < stack.length; i++ ) - if ( color( stack[ i ] ) ) { - swap[ i ] = stack[ i ].style.display; - stack[ i ].style.display = "block"; - } - - // Since we flip the display style, we have to handle that - // one special, otherwise get the value - ret = name == "display" && swap[ stack.length - 1 ] != null ? - "none" : - ( getComputedStyle && getComputedStyle.getPropertyValue( name ) ) || ""; - - // Finally, revert the display styles back - for ( var i = 0; i < swap.length; i++ ) - if ( swap[ i ] != null ) - stack[ i ].style.display = swap[ i ]; - } - - // We should always get a number back from opacity - if ( name == "opacity" && ret == "" ) - ret = "1"; - - } else if ( elem.currentStyle ) { - var camelCase = name.replace(/\-(\w)/g, function(all, letter){ - return letter.toUpperCase(); - }); - - ret = elem.currentStyle[ name ] || elem.currentStyle[ camelCase ]; - - // From the awesome hack by Dean Edwards - // http://erik.eae.net/archives/2007/07/27/18.54.15/#comment-102291 - - // If we're not dealing with a regular pixel number - // but a number that has a weird ending, we need to convert it to pixels - if ( !/^\d+(px)?$/i.test( ret ) && /^\d/.test( ret ) ) { - // Remember the original values - var style = elem.style.left, runtimeStyle = elem.runtimeStyle.left; - - // Put in the new values to get a computed value out - elem.runtimeStyle.left = elem.currentStyle.left; - elem.style.left = ret || 0; - ret = elem.style.pixelLeft + "px"; - - // Revert the changed values - elem.style.left = style; - elem.runtimeStyle.left = runtimeStyle; - } - } - - return ret; - }, - - clean: function( elems, context ) { - var ret = []; - context = context || document; - // !context.createElement fails in IE with an error but returns typeof 'object' - if (typeof context.createElement == 'undefined') - context = context.ownerDocument || context[0] && context[0].ownerDocument || document; - - jQuery.each(elems, function(i, elem){ - if ( !elem ) - return; - - if ( elem.constructor == Number ) - elem = elem.toString(); - - // Convert html string into DOM nodes - if ( typeof elem == "string" ) { - // Fix "XHTML"-style tags in all browsers - elem = elem.replace(/(<(\w+)[^>]*?)\/>/g, function(all, front, tag){ - return tag.match(/^(abbr|br|col|img|input|link|meta|param|hr|area|embed)$/i) ? - all : - front + "></" + tag + ">"; - }); - - // Trim whitespace, otherwise indexOf won't work as expected - var tags = jQuery.trim( elem ).toLowerCase(), div = context.createElement("div"); - - var wrap = - // option or optgroup - !tags.indexOf("<opt") && - [ 1, "<select multiple='multiple'>", "</select>" ] || - - !tags.indexOf("<leg") && - [ 1, "<fieldset>", "</fieldset>" ] || - - tags.match(/^<(thead|tbody|tfoot|colg|cap)/) && - [ 1, "<table>", "</table>" ] || - - !tags.indexOf("<tr") && - [ 2, "<table><tbody>", "</tbody></table>" ] || - - // <thead> matched above - (!tags.indexOf("<td") || !tags.indexOf("<th")) && - [ 3, "<table><tbody><tr>", "</tr></tbody></table>" ] || - - !tags.indexOf("<col") && - [ 2, "<table><tbody></tbody><colgroup>", "</colgroup></table>" ] || - - // IE can't serialize <link> and <script> tags normally - jQuery.browser.msie && - [ 1, "div<div>", "</div>" ] || - - [ 0, "", "" ]; - - // Go to html and back, then peel off extra wrappers - div.innerHTML = wrap[1] + elem + wrap[2]; - - // Move to the right depth - while ( wrap[0]-- ) - div = div.lastChild; - - // Remove IE's autoinserted <tbody> from table fragments - if ( jQuery.browser.msie ) { - - // String was a <table>, *may* have spurious <tbody> - var tbody = !tags.indexOf("<table") && tags.indexOf("<tbody") < 0 ? - div.firstChild && div.firstChild.childNodes : - - // String was a bare <thead> or <tfoot> - wrap[1] == "<table>" && tags.indexOf("<tbody") < 0 ? - div.childNodes : - []; - - for ( var j = tbody.length - 1; j >= 0 ; --j ) - if ( jQuery.nodeName( tbody[ j ], "tbody" ) && !tbody[ j ].childNodes.length ) - tbody[ j ].parentNode.removeChild( tbody[ j ] ); - - // IE completely kills leading whitespace when innerHTML is used - if ( /^\s/.test( elem ) ) - div.insertBefore( context.createTextNode( elem.match(/^\s*/)[0] ), div.firstChild ); - - } - - elem = jQuery.makeArray( div.childNodes ); - } - - if ( elem.length === 0 && (!jQuery.nodeName( elem, "form" ) && !jQuery.nodeName( elem, "select" )) ) - return; - - if ( elem[0] == undefined || jQuery.nodeName( elem, "form" ) || elem.options ) - ret.push( elem ); - - else - ret = jQuery.merge( ret, elem ); - - }); - - return ret; - }, - - attr: function( elem, name, value ) { - // don't set attributes on text and comment nodes - if (!elem || elem.nodeType == 3 || elem.nodeType == 8) - return undefined; - - var fix = jQuery.isXMLDoc( elem ) ? - {} : - jQuery.props; - - // Safari mis-reports the default selected property of a hidden option - // Accessing the parent's selectedIndex property fixes it - if ( name == "selected" && jQuery.browser.safari ) - elem.parentNode.selectedIndex; - - // Certain attributes only work when accessed via the old DOM 0 way - if ( fix[ name ] ) { - if ( value != undefined ) - elem[ fix[ name ] ] = value; - - return elem[ fix[ name ] ]; - - } else if ( jQuery.browser.msie && name == "style" ) - return jQuery.attr( elem.style, "cssText", value ); - - else if ( value == undefined && jQuery.browser.msie && jQuery.nodeName( elem, "form" ) && (name == "action" || name == "method") ) - return elem.getAttributeNode( name ).nodeValue; - - // IE elem.getAttribute passes even for style - else if ( elem.tagName ) { - - if ( value != undefined ) { - // We can't allow the type property to be changed (since it causes problems in IE) - if ( name == "type" && jQuery.nodeName( elem, "input" ) && elem.parentNode ) - throw "type property can't be changed"; - - // convert the value to a string (all browsers do this but IE) see #1070 - elem.setAttribute( name, "" + value ); - } - - if ( jQuery.browser.msie && /href|src/.test( name ) && !jQuery.isXMLDoc( elem ) ) - return elem.getAttribute( name, 2 ); - - return elem.getAttribute( name ); - - // elem is actually elem.style ... set the style - } else { - // IE actually uses filters for opacity - if ( name == "opacity" && jQuery.browser.msie ) { - if ( value != undefined ) { - // IE has trouble with opacity if it does not have layout - // Force it by setting the zoom level - elem.zoom = 1; - - // Set the alpha filter to set the opacity - elem.filter = (elem.filter || "").replace( /alpha\([^)]*\)/, "" ) + - (parseFloat( value ).toString() == "NaN" ? "" : "alpha(opacity=" + value * 100 + ")"); - } - - return elem.filter && elem.filter.indexOf("opacity=") >= 0 ? - (parseFloat( elem.filter.match(/opacity=([^)]*)/)[1] ) / 100).toString() : - ""; - } - - name = name.replace(/-([a-z])/ig, function(all, letter){ - return letter.toUpperCase(); - }); - - if ( value != undefined ) - elem[ name ] = value; - - return elem[ name ]; - } - }, - - trim: function( text ) { - return (text || "").replace( /^\s+|\s+$/g, "" ); - }, - - makeArray: function( array ) { - var ret = []; - - // Need to use typeof to fight Safari childNodes crashes - if ( typeof array != "array" ) - for ( var i = 0, length = array.length; i < length; i++ ) - ret.push( array[ i ] ); - else - ret = array.slice( 0 ); - - return ret; - }, - - inArray: function( elem, array ) { - for ( var i = 0, length = array.length; i < length; i++ ) - if ( array[ i ] == elem ) - return i; - - return -1; - }, - - merge: function( first, second ) { - // We have to loop this way because IE & Opera overwrite the length - // expando of getElementsByTagName - - // Also, we need to make sure that the correct elements are being returned - // (IE returns comment nodes in a '*' query) - if ( jQuery.browser.msie ) { - for ( var i = 0; second[ i ]; i++ ) - if ( second[ i ].nodeType != 8 ) - first.push( second[ i ] ); - - } else - for ( var i = 0; second[ i ]; i++ ) - first.push( second[ i ] ); - - return first; - }, - - unique: function( array ) { - var ret = [], done = {}; - - try { - - for ( var i = 0, length = array.length; i < length; i++ ) { - var id = jQuery.data( array[ i ] ); - - if ( !done[ id ] ) { - done[ id ] = true; - ret.push( array[ i ] ); - } - } - - } catch( e ) { - ret = array; - } - - return ret; - }, - - grep: function( elems, callback, inv ) { - var ret = []; - - // Go through the array, only saving the items - // that pass the validator function - for ( var i = 0, length = elems.length; i < length; i++ ) - if ( !inv && callback( elems[ i ], i ) || inv && !callback( elems[ i ], i ) ) - ret.push( elems[ i ] ); - - return ret; - }, - - map: function( elems, callback ) { - var ret = []; - - // Go through the array, translating each of the items to their - // new value (or values). - for ( var i = 0, length = elems.length; i < length; i++ ) { - var value = callback( elems[ i ], i ); - - if ( value !== null && value != undefined ) { - if ( value.constructor != Array ) - value = [ value ]; - - ret = ret.concat( value ); - } - } - - return ret; - } -}); - -var userAgent = navigator.userAgent.toLowerCase(); - -// Figure out what browser is being used -jQuery.browser = { - version: (userAgent.match( /.+(?:rv|it|ra|ie)[\/: ]([\d.]+)/ ) || [])[1], - safari: /webkit/.test( userAgent ), - opera: /opera/.test( userAgent ), - msie: /msie/.test( userAgent ) && !/opera/.test( userAgent ), - mozilla: /mozilla/.test( userAgent ) && !/(compatible|webkit)/.test( userAgent ) -}; - -var styleFloat = jQuery.browser.msie ? - "styleFloat" : - "cssFloat"; - -jQuery.extend({ - // Check to see if the W3C box model is being used - boxModel: !jQuery.browser.msie || document.compatMode == "CSS1Compat", - - props: { - "for": "htmlFor", - "class": "className", - "float": styleFloat, - cssFloat: styleFloat, - styleFloat: styleFloat, - innerHTML: "innerHTML", - className: "className", - value: "value", - disabled: "disabled", - checked: "checked", - readonly: "readOnly", - selected: "selected", - maxlength: "maxLength", - selectedIndex: "selectedIndex", - defaultValue: "defaultValue", - tagName: "tagName", - nodeName: "nodeName" - } -}); - -jQuery.each({ - parent: function(elem){return elem.parentNode;}, - parents: function(elem){return jQuery.dir(elem,"parentNode");}, - next: function(elem){return jQuery.nth(elem,2,"nextSibling");}, - prev: function(elem){return jQuery.nth(elem,2,"previousSibling");}, - nextAll: function(elem){return jQuery.dir(elem,"nextSibling");}, - prevAll: function(elem){return jQuery.dir(elem,"previousSibling");}, - siblings: function(elem){return jQuery.sibling(elem.parentNode.firstChild,elem);}, - children: function(elem){return jQuery.sibling(elem.firstChild);}, - contents: function(elem){return jQuery.nodeName(elem,"iframe")?elem.contentDocument||elem.contentWindow.document:jQuery.makeArray(elem.childNodes);} -}, function(name, fn){ - jQuery.fn[ name ] = function( selector ) { - var ret = jQuery.map( this, fn ); - - if ( selector && typeof selector == "string" ) - ret = jQuery.multiFilter( selector, ret ); - - return this.pushStack( jQuery.unique( ret ) ); - }; -}); - -jQuery.each({ - appendTo: "append", - prependTo: "prepend", - insertBefore: "before", - insertAfter: "after", - replaceAll: "replaceWith" -}, function(name, original){ - jQuery.fn[ name ] = function() { - var args = arguments; - - return this.each(function(){ - for ( var i = 0, length = args.length; i < length; i++ ) - jQuery( args[ i ] )[ original ]( this ); - }); - }; -}); - -jQuery.each({ - removeAttr: function( name ) { - jQuery.attr( this, name, "" ); - if (this.nodeType == 1) - this.removeAttribute( name ); - }, - - addClass: function( classNames ) { - jQuery.className.add( this, classNames ); - }, - - removeClass: function( classNames ) { - jQuery.className.remove( this, classNames ); - }, - - toggleClass: function( classNames ) { - jQuery.className[ jQuery.className.has( this, classNames ) ? "remove" : "add" ]( this, classNames ); - }, - - remove: function( selector ) { - if ( !selector || jQuery.filter( selector, [ this ] ).r.length ) { - // Prevent memory leaks - jQuery( "*", this ).add(this).each(function(){ - jQuery.event.remove(this); - jQuery.removeData(this); - }); - if (this.parentNode) - this.parentNode.removeChild( this ); - } - }, - - empty: function() { - // Remove element nodes and prevent memory leaks - jQuery( ">*", this ).remove(); - - // Remove any remaining nodes - while ( this.firstChild ) - this.removeChild( this.firstChild ); - } -}, function(name, fn){ - jQuery.fn[ name ] = function(){ - return this.each( fn, arguments ); - }; -}); - -jQuery.each([ "Height", "Width" ], function(i, name){ - var type = name.toLowerCase(); - - jQuery.fn[ type ] = function( size ) { - // Get window width or height - return this[0] == window ? - // Opera reports document.body.client[Width/Height] properly in both quirks and standards - jQuery.browser.opera && document.body[ "client" + name ] || - - // Safari reports inner[Width/Height] just fine (Mozilla and Opera include scroll bar widths) - jQuery.browser.safari && window[ "inner" + name ] || - - // Everyone else use document.documentElement or document.body depending on Quirks vs Standards mode - document.compatMode == "CSS1Compat" && document.documentElement[ "client" + name ] || document.body[ "client" + name ] : - - // Get document width or height - this[0] == document ? - // Either scroll[Width/Height] or offset[Width/Height], whichever is greater - Math.max( - Math.max(document.body["scroll" + name], document.documentElement["scroll" + name]), - Math.max(document.body["offset" + name], document.documentElement["offset" + name]) - ) : - - // Get or set width or height on the element - size == undefined ? - // Get width or height on the element - (this.length ? jQuery.css( this[0], type ) : null) : - - // Set the width or height on the element (default to pixels if value is unitless) - this.css( type, size.constructor == String ? size : size + "px" ); - }; -}); - -var chars = jQuery.browser.safari && parseInt(jQuery.browser.version) < 417 ? - "(?:[\\w*_-]|\\\\.)" : - "(?:[\\w\u0128-\uFFFF*_-]|\\\\.)", - quickChild = new RegExp("^>\\s*(" + chars + "+)"), - quickID = new RegExp("^(" + chars + "+)(#)(" + chars + "+)"), - quickClass = new RegExp("^([#.]?)(" + chars + "*)"); - -jQuery.extend({ - expr: { - "": function(a,i,m){return m[2]=="*"||jQuery.nodeName(a,m[2]);}, - "#": function(a,i,m){return a.getAttribute("id")==m[2];}, - ":": { - // Position Checks - lt: function(a,i,m){return i<m[3]-0;}, - gt: function(a,i,m){return i>m[3]-0;}, - nth: function(a,i,m){return m[3]-0==i;}, - eq: function(a,i,m){return m[3]-0==i;}, - first: function(a,i){return i==0;}, - last: function(a,i,m,r){return i==r.length-1;}, - even: function(a,i){return i%2==0;}, - odd: function(a,i){return i%2;}, - - // Child Checks - "first-child": function(a){return a.parentNode.getElementsByTagName("*")[0]==a;}, - "last-child": function(a){return jQuery.nth(a.parentNode.lastChild,1,"previousSibling")==a;}, - "only-child": function(a){return !jQuery.nth(a.parentNode.lastChild,2,"previousSibling");}, - - // Parent Checks - parent: function(a){return a.firstChild;}, - empty: function(a){return !a.firstChild;}, - - // Text Check - contains: function(a,i,m){return (a.textContent||a.innerText||jQuery(a).text()||"").indexOf(m[3])>=0;}, - - // Visibility - visible: function(a){return "hidden"!=a.type&&jQuery.css(a,"display")!="none"&&jQuery.css(a,"visibility")!="hidden";}, - hidden: function(a){return "hidden"==a.type||jQuery.css(a,"display")=="none"||jQuery.css(a,"visibility")=="hidden";}, - - // Form attributes - enabled: function(a){return !a.disabled;}, - disabled: function(a){return a.disabled;}, - checked: function(a){return a.checked;}, - selected: function(a){return a.selected||jQuery.attr(a,"selected");}, - - // Form elements - text: function(a){return "text"==a.type;}, - radio: function(a){return "radio"==a.type;}, - checkbox: function(a){return "checkbox"==a.type;}, - file: function(a){return "file"==a.type;}, - password: function(a){return "password"==a.type;}, - submit: function(a){return "submit"==a.type;}, - image: function(a){return "image"==a.type;}, - reset: function(a){return "reset"==a.type;}, - button: function(a){return "button"==a.type||jQuery.nodeName(a,"button");}, - input: function(a){return /input|select|textarea|button/i.test(a.nodeName);}, - - // :has() - has: function(a,i,m){return jQuery.find(m[3],a).length;}, - - // :header - header: function(a){return /h\d/i.test(a.nodeName);}, - - // :animated - animated: function(a){return jQuery.grep(jQuery.timers,function(fn){return a==fn.elem;}).length;} - } - }, - - // The regular expressions that power the parsing engine - parse: [ - // Match: [@value='test'], [@foo] - /^(\[) *@?([\w-]+) *([!*$^~=]*) *('?"?)(.*?)\4 *\]/, - - // Match: :contains('foo') - /^(:)([\w-]+)\("?'?(.*?(\(.*?\))?[^(]*?)"?'?\)/, - - // Match: :even, :last-chlid, #id, .class - new RegExp("^([:.#]*)(" + chars + "+)") - ], - - multiFilter: function( expr, elems, not ) { - var old, cur = []; - - while ( expr && expr != old ) { - old = expr; - var f = jQuery.filter( expr, elems, not ); - expr = f.t.replace(/^\s*,\s*/, "" ); - cur = not ? elems = f.r : jQuery.merge( cur, f.r ); - } - - return cur; - }, - - find: function( t, context ) { - // Quickly handle non-string expressions - if ( typeof t != "string" ) - return [ t ]; - - // check to make sure context is a DOM element or a document - if ( context && context.nodeType != 1 && context.nodeType != 9) - return [ ]; - - // Set the correct context (if none is provided) - context = context || document; - - // Initialize the search - var ret = [context], done = [], last, nodeName; - - // Continue while a selector expression exists, and while - // we're no longer looping upon ourselves - while ( t && last != t ) { - var r = []; - last = t; - - t = jQuery.trim(t); - - var foundToken = false; - - // An attempt at speeding up child selectors that - // point to a specific element tag - var re = quickChild; - var m = re.exec(t); - - if ( m ) { - nodeName = m[1].toUpperCase(); - - // Perform our own iteration and filter - for ( var i = 0; ret[i]; i++ ) - for ( var c = ret[i].firstChild; c; c = c.nextSibling ) - if ( c.nodeType == 1 && (nodeName == "*" || c.nodeName.toUpperCase() == nodeName) ) - r.push( c ); - - ret = r; - t = t.replace( re, "" ); - if ( t.indexOf(" ") == 0 ) continue; - foundToken = true; - } else { - re = /^([>+~])\s*(\w*)/i; - - if ( (m = re.exec(t)) != null ) { - r = []; - - var merge = {}; - nodeName = m[2].toUpperCase(); - m = m[1]; - - for ( var j = 0, rl = ret.length; j < rl; j++ ) { - var n = m == "~" || m == "+" ? ret[j].nextSibling : ret[j].firstChild; - for ( ; n; n = n.nextSibling ) - if ( n.nodeType == 1 ) { - var id = jQuery.data(n); - - if ( m == "~" && merge[id] ) break; - - if (!nodeName || n.nodeName.toUpperCase() == nodeName ) { - if ( m == "~" ) merge[id] = true; - r.push( n ); - } - - if ( m == "+" ) break; - } - } - - ret = r; - - // And remove the token - t = jQuery.trim( t.replace( re, "" ) ); - foundToken = true; - } - } - - // See if there's still an expression, and that we haven't already - // matched a token - if ( t && !foundToken ) { - // Handle multiple expressions - if ( !t.indexOf(",") ) { - // Clean the result set - if ( context == ret[0] ) ret.shift(); - - // Merge the result sets - done = jQuery.merge( done, ret ); - - // Reset the context - r = ret = [context]; - - // Touch up the selector string - t = " " + t.substr(1,t.length); - - } else { - // Optimize for the case nodeName#idName - var re2 = quickID; - var m = re2.exec(t); - - // Re-organize the results, so that they're consistent - if ( m ) { - m = [ 0, m[2], m[3], m[1] ]; - - } else { - // Otherwise, do a traditional filter check for - // ID, class, and element selectors - re2 = quickClass; - m = re2.exec(t); - } - - m[2] = m[2].replace(/\\/g, ""); - - var elem = ret[ret.length-1]; - - // Try to do a global search by ID, where we can - if ( m[1] == "#" && elem && elem.getElementById && !jQuery.isXMLDoc(elem) ) { - // Optimization for HTML document case - var oid = elem.getElementById(m[2]); - - // Do a quick check for the existence of the actual ID attribute - // to avoid selecting by the name attribute in IE - // also check to insure id is a string to avoid selecting an element with the name of 'id' inside a form - if ( (jQuery.browser.msie||jQuery.browser.opera) && oid && typeof oid.id == "string" && oid.id != m[2] ) - oid = jQuery('[@id="'+m[2]+'"]', elem)[0]; - - // Do a quick check for node name (where applicable) so - // that div#foo searches will be really fast - ret = r = oid && (!m[3] || jQuery.nodeName(oid, m[3])) ? [oid] : []; - } else { - // We need to find all descendant elements - for ( var i = 0; ret[i]; i++ ) { - // Grab the tag name being searched for - var tag = m[1] == "#" && m[3] ? m[3] : m[1] != "" || m[0] == "" ? "*" : m[2]; - - // Handle IE7 being really dumb about <object>s - if ( tag == "*" && ret[i].nodeName.toLowerCase() == "object" ) - tag = "param"; - - r = jQuery.merge( r, ret[i].getElementsByTagName( tag )); - } - - // It's faster to filter by class and be done with it - if ( m[1] == "." ) - r = jQuery.classFilter( r, m[2] ); - - // Same with ID filtering - if ( m[1] == "#" ) { - var tmp = []; - - // Try to find the element with the ID - for ( var i = 0; r[i]; i++ ) - if ( r[i].getAttribute("id") == m[2] ) { - tmp = [ r[i] ]; - break; - } - - r = tmp; - } - - ret = r; - } - - t = t.replace( re2, "" ); - } - - } - - // If a selector string still exists - if ( t ) { - // Attempt to filter it - var val = jQuery.filter(t,r); - ret = r = val.r; - t = jQuery.trim(val.t); - } - } - - // An error occurred with the selector; - // just return an empty set instead - if ( t ) - ret = []; - - // Remove the root context - if ( ret && context == ret[0] ) - ret.shift(); - - // And combine the results - done = jQuery.merge( done, ret ); - - return done; - }, - - classFilter: function(r,m,not){ - m = " " + m + " "; - var tmp = []; - for ( var i = 0; r[i]; i++ ) { - var pass = (" " + r[i].className + " ").indexOf( m ) >= 0; - if ( !not && pass || not && !pass ) - tmp.push( r[i] ); - } - return tmp; - }, - - filter: function(t,r,not) { - var last; - - // Look for common filter expressions - while ( t && t != last ) { - last = t; - - var p = jQuery.parse, m; - - for ( var i = 0; p[i]; i++ ) { - m = p[i].exec( t ); - - if ( m ) { - // Remove what we just matched - t = t.substring( m[0].length ); - - m[2] = m[2].replace(/\\/g, ""); - break; - } - } - - if ( !m ) - break; - - // :not() is a special case that can be optimized by - // keeping it out of the expression list - if ( m[1] == ":" && m[2] == "not" ) - // optimize if only one selector found (most common case) - r = isSimple.test( m[3] ) ? - jQuery.filter(m[3], r, true).r : - jQuery( r ).not( m[3] ); - - // We can get a big speed boost by filtering by class here - else if ( m[1] == "." ) - r = jQuery.classFilter(r, m[2], not); - - else if ( m[1] == "[" ) { - var tmp = [], type = m[3]; - - for ( var i = 0, rl = r.length; i < rl; i++ ) { - var a = r[i], z = a[ jQuery.props[m[2]] || m[2] ]; - - if ( z == null || /href|src|selected/.test(m[2]) ) - z = jQuery.attr(a,m[2]) || ''; - - if ( (type == "" && !!z || - type == "=" && z == m[5] || - type == "!=" && z != m[5] || - type == "^=" && z && !z.indexOf(m[5]) || - type == "$=" && z.substr(z.length - m[5].length) == m[5] || - (type == "*=" || type == "~=") && z.indexOf(m[5]) >= 0) ^ not ) - tmp.push( a ); - } - - r = tmp; - - // We can get a speed boost by handling nth-child here - } else if ( m[1] == ":" && m[2] == "nth-child" ) { - var merge = {}, tmp = [], - // parse equations like 'even', 'odd', '5', '2n', '3n+2', '4n-1', '-n+6' - test = /(-?)(\d*)n((?:\+|-)?\d*)/.exec( - m[3] == "even" && "2n" || m[3] == "odd" && "2n+1" || - !/\D/.test(m[3]) && "0n+" + m[3] || m[3]), - // calculate the numbers (first)n+(last) including if they are negative - first = (test[1] + (test[2] || 1)) - 0, last = test[3] - 0; - - // loop through all the elements left in the jQuery object - for ( var i = 0, rl = r.length; i < rl; i++ ) { - var node = r[i], parentNode = node.parentNode, id = jQuery.data(parentNode); - - if ( !merge[id] ) { - var c = 1; - - for ( var n = parentNode.firstChild; n; n = n.nextSibling ) - if ( n.nodeType == 1 ) - n.nodeIndex = c++; - - merge[id] = true; - } - - var add = false; - - if ( first == 0 ) { - if ( node.nodeIndex == last ) - add = true; - } else if ( (node.nodeIndex - last) % first == 0 && (node.nodeIndex - last) / first >= 0 ) - add = true; - - if ( add ^ not ) - tmp.push( node ); - } - - r = tmp; - - // Otherwise, find the expression to execute - } else { - var fn = jQuery.expr[ m[1] ]; - if ( typeof fn == "object" ) - fn = fn[ m[2] ]; - - if ( typeof fn == "string" ) - fn = eval("false||function(a,i){return " + fn + ";}"); - - // Execute it against the current filter - r = jQuery.grep( r, function(elem, i){ - return fn(elem, i, m, r); - }, not ); - } - } - - // Return an array of filtered elements (r) - // and the modified expression string (t) - return { r: r, t: t }; - }, - - dir: function( elem, dir ){ - var matched = []; - var cur = elem[dir]; - while ( cur && cur != document ) { - if ( cur.nodeType == 1 ) - matched.push( cur ); - cur = cur[dir]; - } - return matched; - }, - - nth: function(cur,result,dir,elem){ - result = result || 1; - var num = 0; - - for ( ; cur; cur = cur[dir] ) - if ( cur.nodeType == 1 && ++num == result ) - break; - - return cur; - }, - - sibling: function( n, elem ) { - var r = []; - - for ( ; n; n = n.nextSibling ) { - if ( n.nodeType == 1 && (!elem || n != elem) ) - r.push( n ); - } - - return r; - } -}); - -/* - * A number of helper functions used for managing events. - * Many of the ideas behind this code orignated from - * Dean Edwards' addEvent library. - */ -jQuery.event = { - - // Bind an event to an element - // Original by Dean Edwards - add: function(elem, types, handler, data) { - if ( elem.nodeType == 3 || elem.nodeType == 8 ) - return; - - // For whatever reason, IE has trouble passing the window object - // around, causing it to be cloned in the process - if ( jQuery.browser.msie && elem.setInterval != undefined ) - elem = window; - - // Make sure that the function being executed has a unique ID - if ( !handler.guid ) - handler.guid = this.guid++; - - // if data is passed, bind to handler - if( data != undefined ) { - // Create temporary function pointer to original handler - var fn = handler; - - // Create unique handler function, wrapped around original handler - handler = function() { - // Pass arguments and context to original handler - return fn.apply(this, arguments); - }; - - // Store data in unique handler - handler.data = data; - - // Set the guid of unique handler to the same of original handler, so it can be removed - handler.guid = fn.guid; - } - - // Init the element's event structure - var events = jQuery.data(elem, "events") || jQuery.data(elem, "events", {}), - handle = jQuery.data(elem, "handle") || jQuery.data(elem, "handle", function(){ - // returned undefined or false - var val; - - // Handle the second event of a trigger and when - // an event is called after a page has unloaded - if ( typeof jQuery == "undefined" || jQuery.event.triggered ) - return val; - - val = jQuery.event.handle.apply(arguments.callee.elem, arguments); - - return val; - }); - // Add elem as a property of the handle function - // This is to prevent a memory leak with non-native - // event in IE. - handle.elem = elem; - - // Handle multiple events seperated by a space - // jQuery(...).bind("mouseover mouseout", fn); - jQuery.each(types.split(/\s+/), function(index, type) { - // Namespaced event handlers - var parts = type.split("."); - type = parts[0]; - handler.type = parts[1]; - - // Get the current list of functions bound to this event - var handlers = events[type]; - - // Init the event handler queue - if (!handlers) { - handlers = events[type] = {}; - - // Check for a special event handler - // Only use addEventListener/attachEvent if the special - // events handler returns false - if ( !jQuery.event.special[type] || jQuery.event.special[type].setup.call(elem) === false ) { - // Bind the global event handler to the element - if (elem.addEventListener) - elem.addEventListener(type, handle, false); - else if (elem.attachEvent) - elem.attachEvent("on" + type, handle); - } - } - - // Add the function to the element's handler list - handlers[handler.guid] = handler; - - // Keep track of which events have been used, for global triggering - jQuery.event.global[type] = true; - }); - - // Nullify elem to prevent memory leaks in IE - elem = null; - }, - - guid: 1, - global: {}, - - // Detach an event or set of events from an element - remove: function(elem, types, handler) { - // don't do events on text and comment nodes - if ( elem.nodeType == 3 || elem.nodeType == 8 ) - return; - - var events = jQuery.data(elem, "events"), ret, index; - - if ( events ) { - // Unbind all events for the element - if ( types == undefined || (typeof types == "string" && types.charAt(0) == ".") ) - for ( var type in events ) - this.remove( elem, type + (types || "") ); - else { - // types is actually an event object here - if ( types.type ) { - handler = types.handler; - types = types.type; - } - - // Handle multiple events seperated by a space - // jQuery(...).unbind("mouseover mouseout", fn); - jQuery.each(types.split(/\s+/), function(index, type){ - // Namespaced event handlers - var parts = type.split("."); - type = parts[0]; - - if ( events[type] ) { - // remove the given handler for the given type - if ( handler ) - delete events[type][handler.guid]; - - // remove all handlers for the given type - else - for ( handler in events[type] ) - // Handle the removal of namespaced events - if ( !parts[1] || events[type][handler].type == parts[1] ) - delete events[type][handler]; - - // remove generic event handler if no more handlers exist - for ( ret in events[type] ) break; - if ( !ret ) { - if ( !jQuery.event.special[type] || jQuery.event.special[type].teardown.call(elem) === false ) { - if (elem.removeEventListener) - elem.removeEventListener(type, jQuery.data(elem, "handle"), false); - else if (elem.detachEvent) - elem.detachEvent("on" + type, jQuery.data(elem, "handle")); - } - ret = null; - delete events[type]; - } - } - }); - } - - // Remove the expando if it's no longer used - for ( ret in events ) break; - if ( !ret ) { - var handle = jQuery.data( elem, "handle" ); - if ( handle ) handle.elem = null; - jQuery.removeData( elem, "events" ); - jQuery.removeData( elem, "handle" ); - } - } - }, - - trigger: function(type, data, elem, donative, extra) { - // Clone the incoming data, if any - data = jQuery.makeArray(data || []); - - if ( type.indexOf("!") >= 0 ) { - type = type.slice(0, -1); - var exclusive = true; - } - - // Handle a global trigger - if ( !elem ) { - // Only trigger if we've ever bound an event for it - if ( this.global[type] ) - jQuery("*").add([window, document]).trigger(type, data); - - // Handle triggering a single element - } else { - // don't do events on text and comment nodes - if ( elem.nodeType == 3 || elem.nodeType == 8 ) - return undefined; - - var val, ret, fn = jQuery.isFunction( elem[ type ] || null ), - // Check to see if we need to provide a fake event, or not - event = !data[0] || !data[0].preventDefault; - - // Pass along a fake event - if ( event ) - data.unshift( this.fix({ type: type, target: elem }) ); - - // Enforce the right trigger type - data[0].type = type; - if ( exclusive ) - data[0].exclusive = true; - - // Trigger the event - if ( jQuery.isFunction( jQuery.data(elem, "handle") ) ) - val = jQuery.data(elem, "handle").apply( elem, data ); - - // Handle triggering native .onfoo handlers - if ( !fn && elem["on"+type] && elem["on"+type].apply( elem, data ) === false ) - val = false; - - // Extra functions don't get the custom event object - if ( event ) - data.shift(); - - // Handle triggering of extra function - if ( extra && jQuery.isFunction( extra ) ) { - // call the extra function and tack the current return value on the end for possible inspection - ret = extra.apply( elem, val == null ? data : data.concat( val ) ); - // if anything is returned, give it precedence and have it overwrite the previous value - if (ret !== undefined) - val = ret; - } - - // Trigger the native events (except for clicks on links) - if ( fn && donative !== false && val !== false && !(jQuery.nodeName(elem, 'a') && type == "click") ) { - this.triggered = true; - try { - elem[ type ](); - // prevent IE from throwing an error for some hidden elements - } catch (e) {} - } - - this.triggered = false; - } - - return val; - }, - - handle: function(event) { - // returned undefined or false - var val; - - // Empty object is for triggered events with no data - event = jQuery.event.fix( event || window.event || {} ); - - // Namespaced event handlers - var parts = event.type.split("."); - event.type = parts[0]; - - var handlers = jQuery.data(this, "events") && jQuery.data(this, "events")[event.type], args = Array.prototype.slice.call( arguments, 1 ); - args.unshift( event ); - - for ( var j in handlers ) { - var handler = handlers[j]; - // Pass in a reference to the handler function itself - // So that we can later remove it - args[0].handler = handler; - args[0].data = handler.data; - - // Filter the functions by class - if ( !parts[1] && !event.exclusive || handler.type == parts[1] ) { - var ret = handler.apply( this, args ); - - if ( val !== false ) - val = ret; - - if ( ret === false ) { - event.preventDefault(); - event.stopPropagation(); - } - } - } - - // Clean up added properties in IE to prevent memory leak - if (jQuery.browser.msie) - event.target = event.preventDefault = event.stopPropagation = - event.handler = event.data = null; - - return val; - }, - - fix: function(event) { - // store a copy of the original event object - // and clone to set read-only properties - var originalEvent = event; - event = jQuery.extend({}, originalEvent); - - // add preventDefault and stopPropagation since - // they will not work on the clone - event.preventDefault = function() { - // if preventDefault exists run it on the original event - if (originalEvent.preventDefault) - originalEvent.preventDefault(); - // otherwise set the returnValue property of the original event to false (IE) - originalEvent.returnValue = false; - }; - event.stopPropagation = function() { - // if stopPropagation exists run it on the original event - if (originalEvent.stopPropagation) - originalEvent.stopPropagation(); - // otherwise set the cancelBubble property of the original event to true (IE) - originalEvent.cancelBubble = true; - }; - - // Fix target property, if necessary - if ( !event.target ) - event.target = event.srcElement || document; // Fixes #1925 where srcElement might not be defined either - - // check if target is a textnode (safari) - if ( event.target.nodeType == 3 ) - event.target = originalEvent.target.parentNode; - - // Add relatedTarget, if necessary - if ( !event.relatedTarget && event.fromElement ) - event.relatedTarget = event.fromElement == event.target ? event.toElement : event.fromElement; - - // Calculate pageX/Y if missing and clientX/Y available - if ( event.pageX == null && event.clientX != null ) { - var doc = document.documentElement, body = document.body; - event.pageX = event.clientX + (doc && doc.scrollLeft || body && body.scrollLeft || 0) - (doc.clientLeft || 0); - event.pageY = event.clientY + (doc && doc.scrollTop || body && body.scrollTop || 0) - (doc.clientTop || 0); - } - - // Add which for key events - if ( !event.which && ((event.charCode || event.charCode === 0) ? event.charCode : event.keyCode) ) - event.which = event.charCode || event.keyCode; - - // Add metaKey to non-Mac browsers (use ctrl for PC's and Meta for Macs) - if ( !event.metaKey && event.ctrlKey ) - event.metaKey = event.ctrlKey; - - // Add which for click: 1 == left; 2 == middle; 3 == right - // Note: button is not normalized, so don't use it - if ( !event.which && event.button ) - event.which = (event.button & 1 ? 1 : ( event.button & 2 ? 3 : ( event.button & 4 ? 2 : 0 ) )); - - return event; - }, - - special: { - ready: { - setup: function() { - // Make sure the ready event is setup - bindReady(); - return; - }, - - teardown: function() { return; } - }, - - mouseenter: { - setup: function() { - if ( jQuery.browser.msie ) return false; - jQuery(this).bind("mouseover", jQuery.event.special.mouseenter.handler); - return true; - }, - - teardown: function() { - if ( jQuery.browser.msie ) return false; - jQuery(this).unbind("mouseover", jQuery.event.special.mouseenter.handler); - return true; - }, - - handler: function(event) { - // If we actually just moused on to a sub-element, ignore it - if ( withinElement(event, this) ) return true; - // Execute the right handlers by setting the event type to mouseenter - arguments[0].type = "mouseenter"; - return jQuery.event.handle.apply(this, arguments); - } - }, - - mouseleave: { - setup: function() { - if ( jQuery.browser.msie ) return false; - jQuery(this).bind("mouseout", jQuery.event.special.mouseleave.handler); - return true; - }, - - teardown: function() { - if ( jQuery.browser.msie ) return false; - jQuery(this).unbind("mouseout", jQuery.event.special.mouseleave.handler); - return true; - }, - - handler: function(event) { - // If we actually just moused on to a sub-element, ignore it - if ( withinElement(event, this) ) return true; - // Execute the right handlers by setting the event type to mouseleave - arguments[0].type = "mouseleave"; - return jQuery.event.handle.apply(this, arguments); - } - } - } -}; - -jQuery.fn.extend({ - bind: function( type, data, fn ) { - return type == "unload" ? this.one(type, data, fn) : this.each(function(){ - jQuery.event.add( this, type, fn || data, fn && data ); - }); - }, - - one: function( type, data, fn ) { - return this.each(function(){ - jQuery.event.add( this, type, function(event) { - jQuery(this).unbind(event); - return (fn || data).apply( this, arguments); - }, fn && data); - }); - }, - - unbind: function( type, fn ) { - return this.each(function(){ - jQuery.event.remove( this, type, fn ); - }); - }, - - trigger: function( type, data, fn ) { - return this.each(function(){ - jQuery.event.trigger( type, data, this, true, fn ); - }); - }, - - triggerHandler: function( type, data, fn ) { - if ( this[0] ) - return jQuery.event.trigger( type, data, this[0], false, fn ); - return undefined; - }, - - toggle: function() { - // Save reference to arguments for access in closure - var args = arguments; - - return this.click(function(event) { - // Figure out which function to execute - this.lastToggle = 0 == this.lastToggle ? 1 : 0; - - // Make sure that clicks stop - event.preventDefault(); - - // and execute the function - return args[this.lastToggle].apply( this, arguments ) || false; - }); - }, - - hover: function(fnOver, fnOut) { - return this.bind('mouseenter', fnOver).bind('mouseleave', fnOut); - }, - - ready: function(fn) { - // Attach the listeners - bindReady(); - - // If the DOM is already ready - if ( jQuery.isReady ) - // Execute the function immediately - fn.call( document, jQuery ); - - // Otherwise, remember the function for later - else - // Add the function to the wait list - jQuery.readyList.push( function() { return fn.call(this, jQuery); } ); - - return this; - } -}); - -jQuery.extend({ - isReady: false, - readyList: [], - // Handle when the DOM is ready - ready: function() { - // Make sure that the DOM is not already loaded - if ( !jQuery.isReady ) { - // Remember that the DOM is ready - jQuery.isReady = true; - - // If there are functions bound, to execute - if ( jQuery.readyList ) { - // Execute all of them - jQuery.each( jQuery.readyList, function(){ - this.apply( document ); - }); - - // Reset the list of functions - jQuery.readyList = null; - } - - // Trigger any bound ready events - jQuery(document).triggerHandler("ready"); - } - } -}); - -var readyBound = false; - -function bindReady(){ - if ( readyBound ) return; - readyBound = true; - - // Mozilla, Opera (see further below for it) and webkit nightlies currently support this event - if ( document.addEventListener && !jQuery.browser.opera) - // Use the handy event callback - document.addEventListener( "DOMContentLoaded", jQuery.ready, false ); - - // If IE is used and is not in a frame - // Continually check to see if the document is ready - if ( jQuery.browser.msie && window == top ) (function(){ - if (jQuery.isReady) return; - try { - // If IE is used, use the trick by Diego Perini - // http://javascript.nwbox.com/IEContentLoaded/ - document.documentElement.doScroll("left"); - } catch( error ) { - setTimeout( arguments.callee, 0 ); - return; - } - // and execute any waiting functions - jQuery.ready(); - })(); - - if ( jQuery.browser.opera ) - document.addEventListener( "DOMContentLoaded", function () { - if (jQuery.isReady) return; - for (var i = 0; i < document.styleSheets.length; i++) - if (document.styleSheets[i].disabled) { - setTimeout( arguments.callee, 0 ); - return; - } - // and execute any waiting functions - jQuery.ready(); - }, false); - - if ( jQuery.browser.safari ) { - var numStyles; - (function(){ - if (jQuery.isReady) return; - if ( document.readyState != "loaded" && document.readyState != "complete" ) { - setTimeout( arguments.callee, 0 ); - return; - } - if ( numStyles === undefined ) - numStyles = jQuery("style, link[rel=stylesheet]").length; - if ( document.styleSheets.length != numStyles ) { - setTimeout( arguments.callee, 0 ); - return; - } - // and execute any waiting functions - jQuery.ready(); - })(); - } - - // A fallback to window.onload, that will always work - jQuery.event.add( window, "load", jQuery.ready ); -} - -jQuery.each( ("blur,focus,load,resize,scroll,unload,click,dblclick," + - "mousedown,mouseup,mousemove,mouseover,mouseout,change,select," + - "submit,keydown,keypress,keyup,error").split(","), function(i, name){ - - // Handle event binding - jQuery.fn[name] = function(fn){ - return fn ? this.bind(name, fn) : this.trigger(name); - }; -}); - -// Checks if an event happened on an element within another element -// Used in jQuery.event.special.mouseenter and mouseleave handlers -var withinElement = function(event, elem) { - // Check if mouse(over|out) are still within the same parent element - var parent = event.relatedTarget; - // Traverse up the tree - while ( parent && parent != elem ) try { parent = parent.parentNode; } catch(error) { parent = elem; } - // Return true if we actually just moused on to a sub-element - return parent == elem; -}; - -// Prevent memory leaks in IE -// And prevent errors on refresh with events like mouseover in other browsers -// Window isn't included so as not to unbind existing unload events -jQuery(window).bind("unload", function() { - jQuery("*").add(document).unbind(); -}); -jQuery.fn.extend({ - load: function( url, params, callback ) { - if ( jQuery.isFunction( url ) ) - return this.bind("load", url); - - var off = url.indexOf(" "); - if ( off >= 0 ) { - var selector = url.slice(off, url.length); - url = url.slice(0, off); - } - - callback = callback || function(){}; - - // Default to a GET request - var type = "GET"; - - // If the second parameter was provided - if ( params ) - // If it's a function - if ( jQuery.isFunction( params ) ) { - // We assume that it's the callback - callback = params; - params = null; - - // Otherwise, build a param string - } else { - params = jQuery.param( params ); - type = "POST"; - } - - var self = this; - - // Request the remote document - jQuery.ajax({ - url: url, - type: type, - dataType: "html", - data: params, - complete: function(res, status){ - // If successful, inject the HTML into all the matched elements - if ( status == "success" || status == "notmodified" ) - // See if a selector was specified - self.html( selector ? - // Create a dummy div to hold the results - jQuery("<div/>") - // inject the contents of the document in, removing the scripts - // to avoid any 'Permission Denied' errors in IE - .append(res.responseText.replace(/<script(.|\s)*?\/script>/g, "")) - - // Locate the specified elements - .find(selector) : - - // If not, just inject the full result - res.responseText ); - - self.each( callback, [res.responseText, status, res] ); - } - }); - return this; - }, - - serialize: function() { - return jQuery.param(this.serializeArray()); - }, - serializeArray: function() { - return this.map(function(){ - return jQuery.nodeName(this, "form") ? - jQuery.makeArray(this.elements) : this; - }) - .filter(function(){ - return this.name && !this.disabled && - (this.checked || /select|textarea/i.test(this.nodeName) || - /text|hidden|password/i.test(this.type)); - }) - .map(function(i, elem){ - var val = jQuery(this).val(); - return val == null ? null : - val.constructor == Array ? - jQuery.map( val, function(val, i){ - return {name: elem.name, value: val}; - }) : - {name: elem.name, value: val}; - }).get(); - } -}); - -// Attach a bunch of functions for handling common AJAX events -jQuery.each( "ajaxStart,ajaxStop,ajaxComplete,ajaxError,ajaxSuccess,ajaxSend".split(","), function(i,o){ - jQuery.fn[o] = function(f){ - return this.bind(o, f); - }; -}); - -var jsc = (new Date).getTime(); - -jQuery.extend({ - get: function( url, data, callback, type ) { - // shift arguments if data argument was ommited - if ( jQuery.isFunction( data ) ) { - callback = data; - data = null; - } - - return jQuery.ajax({ - type: "GET", - url: url, - data: data, - success: callback, - dataType: type - }); - }, - - getScript: function( url, callback ) { - return jQuery.get(url, null, callback, "script"); - }, - - getJSON: function( url, data, callback ) { - return jQuery.get(url, data, callback, "json"); - }, - - post: function( url, data, callback, type ) { - if ( jQuery.isFunction( data ) ) { - callback = data; - data = {}; - } - - return jQuery.ajax({ - type: "POST", - url: url, - data: data, - success: callback, - dataType: type - }); - }, - - ajaxSetup: function( settings ) { - jQuery.extend( jQuery.ajaxSettings, settings ); - }, - - ajaxSettings: { - global: true, - type: "GET", - timeout: 0, - contentType: "application/x-www-form-urlencoded", - processData: true, - async: true, - data: null, - username: null, - password: null, - accepts: { - xml: "application/xml, text/xml", - html: "text/html", - script: "text/javascript, application/javascript", - json: "application/json, text/javascript", - text: "text/plain", - _default: "*/*" - } - }, - - // Last-Modified header cache for next request - lastModified: {}, - - ajax: function( s ) { - var jsonp, jsre = /=\?(&|$)/g, status, data; - - // Extend the settings, but re-extend 's' so that it can be - // checked again later (in the test suite, specifically) - s = jQuery.extend(true, s, jQuery.extend(true, {}, jQuery.ajaxSettings, s)); - - // convert data if not already a string - if ( s.data && s.processData && typeof s.data != "string" ) - s.data = jQuery.param(s.data); - - // Handle JSONP Parameter Callbacks - if ( s.dataType == "jsonp" ) { - if ( s.type.toLowerCase() == "get" ) { - if ( !s.url.match(jsre) ) - s.url += (s.url.match(/\?/) ? "&" : "?") + (s.jsonp || "callback") + "=?"; - } else if ( !s.data || !s.data.match(jsre) ) - s.data = (s.data ? s.data + "&" : "") + (s.jsonp || "callback") + "=?"; - s.dataType = "json"; - } - - // Build temporary JSONP function - if ( s.dataType == "json" && (s.data && s.data.match(jsre) || s.url.match(jsre)) ) { - jsonp = "jsonp" + jsc++; - - // Replace the =? sequence both in the query string and the data - if ( s.data ) - s.data = (s.data + "").replace(jsre, "=" + jsonp + "$1"); - s.url = s.url.replace(jsre, "=" + jsonp + "$1"); - - // We need to make sure - // that a JSONP style response is executed properly - s.dataType = "script"; - - // Handle JSONP-style loading - window[ jsonp ] = function(tmp){ - data = tmp; - success(); - complete(); - // Garbage collect - window[ jsonp ] = undefined; - try{ delete window[ jsonp ]; } catch(e){} - if ( head ) - head.removeChild( script ); - }; - } - - if ( s.dataType == "script" && s.cache == null ) - s.cache = false; - - if ( s.cache === false && s.type.toLowerCase() == "get" ) { - var ts = (new Date()).getTime(); - // try replacing _= if it is there - var ret = s.url.replace(/(\?|&)_=.*?(&|$)/, "$1_=" + ts + "$2"); - // if nothing was replaced, add timestamp to the end - s.url = ret + ((ret == s.url) ? (s.url.match(/\?/) ? "&" : "?") + "_=" + ts : ""); - } - - // If data is available, append data to url for get requests - if ( s.data && s.type.toLowerCase() == "get" ) { - s.url += (s.url.match(/\?/) ? "&" : "?") + s.data; - - // IE likes to send both get and post data, prevent this - s.data = null; - } - - // Watch for a new set of requests - if ( s.global && ! jQuery.active++ ) - jQuery.event.trigger( "ajaxStart" ); - - // If we're requesting a remote document - // and trying to load JSON or Script with a GET - if ( (!s.url.indexOf("http") || !s.url.indexOf("//")) && s.dataType == "script" && s.type.toLowerCase() == "get" ) { - var head = document.getElementsByTagName("head")[0]; - var script = document.createElement("script"); - script.src = s.url; - if (s.scriptCharset) - script.charset = s.scriptCharset; - - // Handle Script loading - if ( !jsonp ) { - var done = false; - - // Attach handlers for all browsers - script.onload = script.onreadystatechange = function(){ - if ( !done && (!this.readyState || - this.readyState == "loaded" || this.readyState == "complete") ) { - done = true; - success(); - complete(); - head.removeChild( script ); - } - }; - } - - head.appendChild(script); - - // We handle everything using the script element injection - return undefined; - } - - var requestDone = false; - - // Create the request object; Microsoft failed to properly - // implement the XMLHttpRequest in IE7, so we use the ActiveXObject when it is available - var xml = window.ActiveXObject ? new ActiveXObject("Microsoft.XMLHTTP") : new XMLHttpRequest(); - - // Open the socket - xml.open(s.type, s.url, s.async, s.username, s.password); - - // Need an extra try/catch for cross domain requests in Firefox 3 - try { - // Set the correct header, if data is being sent - if ( s.data ) - xml.setRequestHeader("Content-Type", s.contentType); - - // Set the If-Modified-Since header, if ifModified mode. - if ( s.ifModified ) - xml.setRequestHeader("If-Modified-Since", - jQuery.lastModified[s.url] || "Thu, 01 Jan 1970 00:00:00 GMT" ); - - // Set header so the called script knows that it's an XMLHttpRequest - xml.setRequestHeader("X-Requested-With", "XMLHttpRequest"); - - // Set the Accepts header for the server, depending on the dataType - xml.setRequestHeader("Accept", s.dataType && s.accepts[ s.dataType ] ? - s.accepts[ s.dataType ] + ", */*" : - s.accepts._default ); - } catch(e){} - - // Allow custom headers/mimetypes - if ( s.beforeSend ) - s.beforeSend(xml); - - if ( s.global ) - jQuery.event.trigger("ajaxSend", [xml, s]); - - // Wait for a response to come back - var onreadystatechange = function(isTimeout){ - // The transfer is complete and the data is available, or the request timed out - if ( !requestDone && xml && (xml.readyState == 4 || isTimeout == "timeout") ) { - requestDone = true; - - // clear poll interval - if (ival) { - clearInterval(ival); - ival = null; - } - - status = isTimeout == "timeout" && "timeout" || - !jQuery.httpSuccess( xml ) && "error" || - s.ifModified && jQuery.httpNotModified( xml, s.url ) && "notmodified" || - "success"; - - if ( status == "success" ) { - // Watch for, and catch, XML document parse errors - try { - // process the data (runs the xml through httpData regardless of callback) - data = jQuery.httpData( xml, s.dataType ); - } catch(e) { - status = "parsererror"; - } - } - - // Make sure that the request was successful or notmodified - if ( status == "success" ) { - // Cache Last-Modified header, if ifModified mode. - var modRes; - try { - modRes = xml.getResponseHeader("Last-Modified"); - } catch(e) {} // swallow exception thrown by FF if header is not available - - if ( s.ifModified && modRes ) - jQuery.lastModified[s.url] = modRes; - - // JSONP handles its own success callback - if ( !jsonp ) - success(); - } else - jQuery.handleError(s, xml, status); - - // Fire the complete handlers - complete(); - - // Stop memory leaks - if ( s.async ) - xml = null; - } - }; - - if ( s.async ) { - // don't attach the handler to the request, just poll it instead - var ival = setInterval(onreadystatechange, 13); - - // Timeout checker - if ( s.timeout > 0 ) - setTimeout(function(){ - // Check to see if the request is still happening - if ( xml ) { - // Cancel the request - xml.abort(); - - if( !requestDone ) - onreadystatechange( "timeout" ); - } - }, s.timeout); - } - - // Send the data - try { - xml.send(s.data); - } catch(e) { - jQuery.handleError(s, xml, null, e); - } - - // firefox 1.5 doesn't fire statechange for sync requests - if ( !s.async ) - onreadystatechange(); - - function success(){ - // If a local callback was specified, fire it and pass it the data - if ( s.success ) - s.success( data, status ); - - // Fire the global callback - if ( s.global ) - jQuery.event.trigger( "ajaxSuccess", [xml, s] ); - } - - function complete(){ - // Process result - if ( s.complete ) - s.complete(xml, status); - - // The request was completed - if ( s.global ) - jQuery.event.trigger( "ajaxComplete", [xml, s] ); - - // Handle the global AJAX counter - if ( s.global && ! --jQuery.active ) - jQuery.event.trigger( "ajaxStop" ); - } - - // return XMLHttpRequest to allow aborting the request etc. - return xml; - }, - - handleError: function( s, xml, status, e ) { - // If a local callback was specified, fire it - if ( s.error ) s.error( xml, status, e ); - - // Fire the global callback - if ( s.global ) - jQuery.event.trigger( "ajaxError", [xml, s, e] ); - }, - - // Counter for holding the number of active queries - active: 0, - - // Determines if an XMLHttpRequest was successful or not - httpSuccess: function( r ) { - try { - // IE error sometimes returns 1223 when it should be 204 so treat it as success, see #1450 - return !r.status && location.protocol == "file:" || - ( r.status >= 200 && r.status < 300 ) || r.status == 304 || r.status == 1223 || - jQuery.browser.safari && r.status == undefined; - } catch(e){} - return false; - }, - - // Determines if an XMLHttpRequest returns NotModified - httpNotModified: function( xml, url ) { - try { - var xmlRes = xml.getResponseHeader("Last-Modified"); - - // Firefox always returns 200. check Last-Modified date - return xml.status == 304 || xmlRes == jQuery.lastModified[url] || - jQuery.browser.safari && xml.status == undefined; - } catch(e){} - return false; - }, - - httpData: function( r, type ) { - var ct = r.getResponseHeader("content-type"); - var xml = type == "xml" || !type && ct && ct.indexOf("xml") >= 0; - var data = xml ? r.responseXML : r.responseText; - - if ( xml && data.documentElement.tagName == "parsererror" ) - throw "parsererror"; - - // If the type is "script", eval it in global context - if ( type == "script" ) - jQuery.globalEval( data ); - - // Get the JavaScript object, if JSON is used. - if ( type == "json" ) - data = eval("(" + data + ")"); - - return data; - }, - - // Serialize an array of form elements or a set of - // key/values into a query string - param: function( a ) { - var s = []; - - // If an array was passed in, assume that it is an array - // of form elements - if ( a.constructor == Array || a.jquery ) - // Serialize the form elements - jQuery.each( a, function(){ - s.push( encodeURIComponent(this.name) + "=" + encodeURIComponent( this.value ) ); - }); - - // Otherwise, assume that it's an object of key/value pairs - else - // Serialize the key/values - for ( var j in a ) - // If the value is an array then the key names need to be repeated - if ( a[j] && a[j].constructor == Array ) - jQuery.each( a[j], function(){ - s.push( encodeURIComponent(j) + "=" + encodeURIComponent( this ) ); - }); - else - s.push( encodeURIComponent(j) + "=" + encodeURIComponent( a[j] ) ); - - // Return the resulting serialization - return s.join("&").replace(/%20/g, "+"); - } - -}); -jQuery.fn.extend({ - show: function(speed,callback){ - return speed ? - this.animate({ - height: "show", width: "show", opacity: "show" - }, speed, callback) : - - this.filter(":hidden").each(function(){ - this.style.display = this.oldblock || ""; - if ( jQuery.css(this,"display") == "none" ) { - var elem = jQuery("<" + this.tagName + " />").appendTo("body"); - this.style.display = elem.css("display"); - // handle an edge condition where css is - div { display:none; } or similar - if (this.style.display == "none") - this.style.display = "block"; - elem.remove(); - } - }).end(); - }, - - hide: function(speed,callback){ - return speed ? - this.animate({ - height: "hide", width: "hide", opacity: "hide" - }, speed, callback) : - - this.filter(":visible").each(function(){ - this.oldblock = this.oldblock || jQuery.css(this,"display"); - this.style.display = "none"; - }).end(); - }, - - // Save the old toggle function - _toggle: jQuery.fn.toggle, - - toggle: function( fn, fn2 ){ - return jQuery.isFunction(fn) && jQuery.isFunction(fn2) ? - this._toggle( fn, fn2 ) : - fn ? - this.animate({ - height: "toggle", width: "toggle", opacity: "toggle" - }, fn, fn2) : - this.each(function(){ - jQuery(this)[ jQuery(this).is(":hidden") ? "show" : "hide" ](); - }); - }, - - slideDown: function(speed,callback){ - return this.animate({height: "show"}, speed, callback); - }, - - slideUp: function(speed,callback){ - return this.animate({height: "hide"}, speed, callback); - }, - - slideToggle: function(speed, callback){ - return this.animate({height: "toggle"}, speed, callback); - }, - - fadeIn: function(speed, callback){ - return this.animate({opacity: "show"}, speed, callback); - }, - - fadeOut: function(speed, callback){ - return this.animate({opacity: "hide"}, speed, callback); - }, - - fadeTo: function(speed,to,callback){ - return this.animate({opacity: to}, speed, callback); - }, - - animate: function( prop, speed, easing, callback ) { - var optall = jQuery.speed(speed, easing, callback); - - return this[ optall.queue === false ? "each" : "queue" ](function(){ - if ( this.nodeType != 1) - return false; - - var opt = jQuery.extend({}, optall); - var hidden = jQuery(this).is(":hidden"), self = this; - - for ( var p in prop ) { - if ( prop[p] == "hide" && hidden || prop[p] == "show" && !hidden ) - return jQuery.isFunction(opt.complete) && opt.complete.apply(this); - - if ( p == "height" || p == "width" ) { - // Store display property - opt.display = jQuery.css(this, "display"); - - // Make sure that nothing sneaks out - opt.overflow = this.style.overflow; - } - } - - if ( opt.overflow != null ) - this.style.overflow = "hidden"; - - opt.curAnim = jQuery.extend({}, prop); - - jQuery.each( prop, function(name, val){ - var e = new jQuery.fx( self, opt, name ); - - if ( /toggle|show|hide/.test(val) ) - e[ val == "toggle" ? hidden ? "show" : "hide" : val ]( prop ); - else { - var parts = val.toString().match(/^([+-]=)?([\d+-.]+)(.*)$/), - start = e.cur(true) || 0; - - if ( parts ) { - var end = parseFloat(parts[2]), - unit = parts[3] || "px"; - - // We need to compute starting value - if ( unit != "px" ) { - self.style[ name ] = (end || 1) + unit; - start = ((end || 1) / e.cur(true)) * start; - self.style[ name ] = start + unit; - } - - // If a +=/-= token was provided, we're doing a relative animation - if ( parts[1] ) - end = ((parts[1] == "-=" ? -1 : 1) * end) + start; - - e.custom( start, end, unit ); - } else - e.custom( start, val, "" ); - } - }); - - // For JS strict compliance - return true; - }); - }, - - queue: function(type, fn){ - if ( jQuery.isFunction(type) || ( type && type.constructor == Array )) { - fn = type; - type = "fx"; - } - - if ( !type || (typeof type == "string" && !fn) ) - return queue( this[0], type ); - - return this.each(function(){ - if ( fn.constructor == Array ) - queue(this, type, fn); - else { - queue(this, type).push( fn ); - - if ( queue(this, type).length == 1 ) - fn.apply(this); - } - }); - }, - - stop: function(clearQueue, gotoEnd){ - var timers = jQuery.timers; - - if (clearQueue) - this.queue([]); - - this.each(function(){ - // go in reverse order so anything added to the queue during the loop is ignored - for ( var i = timers.length - 1; i >= 0; i-- ) - if ( timers[i].elem == this ) { - if (gotoEnd) - // force the next step to be the last - timers[i](true); - timers.splice(i, 1); - } - }); - - // start the next in the queue if the last step wasn't forced - if (!gotoEnd) - this.dequeue(); - - return this; - } - -}); - -var queue = function( elem, type, array ) { - if ( !elem ) - return undefined; - - type = type || "fx"; - - var q = jQuery.data( elem, type + "queue" ); - - if ( !q || array ) - q = jQuery.data( elem, type + "queue", - array ? jQuery.makeArray(array) : [] ); - - return q; -}; - -jQuery.fn.dequeue = function(type){ - type = type || "fx"; - - return this.each(function(){ - var q = queue(this, type); - - q.shift(); - - if ( q.length ) - q[0].apply( this ); - }); -}; - -jQuery.extend({ - - speed: function(speed, easing, fn) { - var opt = speed && speed.constructor == Object ? speed : { - complete: fn || !fn && easing || - jQuery.isFunction( speed ) && speed, - duration: speed, - easing: fn && easing || easing && easing.constructor != Function && easing - }; - - opt.duration = (opt.duration && opt.duration.constructor == Number ? - opt.duration : - { slow: 600, fast: 200 }[opt.duration]) || 400; - - // Queueing - opt.old = opt.complete; - opt.complete = function(){ - if ( opt.queue !== false ) - jQuery(this).dequeue(); - if ( jQuery.isFunction( opt.old ) ) - opt.old.apply( this ); - }; - - return opt; - }, - - easing: { - linear: function( p, n, firstNum, diff ) { - return firstNum + diff * p; - }, - swing: function( p, n, firstNum, diff ) { - return ((-Math.cos(p*Math.PI)/2) + 0.5) * diff + firstNum; - } - }, - - timers: [], - timerId: null, - - fx: function( elem, options, prop ){ - this.options = options; - this.elem = elem; - this.prop = prop; - - if ( !options.orig ) - options.orig = {}; - } - -}); - -jQuery.fx.prototype = { - - // Simple function for setting a style value - update: function(){ - if ( this.options.step ) - this.options.step.apply( this.elem, [ this.now, this ] ); - - (jQuery.fx.step[this.prop] || jQuery.fx.step._default)( this ); - - // Set display property to block for height/width animations - if ( this.prop == "height" || this.prop == "width" ) - this.elem.style.display = "block"; - }, - - // Get the current size - cur: function(force){ - if ( this.elem[this.prop] != null && this.elem.style[this.prop] == null ) - return this.elem[ this.prop ]; - - var r = parseFloat(jQuery.css(this.elem, this.prop, force)); - return r && r > -10000 ? r : parseFloat(jQuery.curCSS(this.elem, this.prop)) || 0; - }, - - // Start an animation from one number to another - custom: function(from, to, unit){ - this.startTime = (new Date()).getTime(); - this.start = from; - this.end = to; - this.unit = unit || this.unit || "px"; - this.now = this.start; - this.pos = this.state = 0; - this.update(); - - var self = this; - function t(gotoEnd){ - return self.step(gotoEnd); - } - - t.elem = this.elem; - - jQuery.timers.push(t); - - if ( jQuery.timerId == null ) { - jQuery.timerId = setInterval(function(){ - var timers = jQuery.timers; - - for ( var i = 0; i < timers.length; i++ ) - if ( !timers[i]() ) - timers.splice(i--, 1); - - if ( !timers.length ) { - clearInterval( jQuery.timerId ); - jQuery.timerId = null; - } - }, 13); - } - }, - - // Simple 'show' function - show: function(){ - // Remember where we started, so that we can go back to it later - this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop ); - this.options.show = true; - - // Begin the animation - this.custom(0, this.cur()); - - // Make sure that we start at a small width/height to avoid any - // flash of content - if ( this.prop == "width" || this.prop == "height" ) - this.elem.style[this.prop] = "1px"; - - // Start by showing the element - jQuery(this.elem).show(); - }, - - // Simple 'hide' function - hide: function(){ - // Remember where we started, so that we can go back to it later - this.options.orig[this.prop] = jQuery.attr( this.elem.style, this.prop ); - this.options.hide = true; - - // Begin the animation - this.custom(this.cur(), 0); - }, - - // Each step of an animation - step: function(gotoEnd){ - var t = (new Date()).getTime(); - - if ( gotoEnd || t > this.options.duration + this.startTime ) { - this.now = this.end; - this.pos = this.state = 1; - this.update(); - - this.options.curAnim[ this.prop ] = true; - - var done = true; - for ( var i in this.options.curAnim ) - if ( this.options.curAnim[i] !== true ) - done = false; - - if ( done ) { - if ( this.options.display != null ) { - // Reset the overflow - this.elem.style.overflow = this.options.overflow; - - // Reset the display - this.elem.style.display = this.options.display; - if ( jQuery.css(this.elem, "display") == "none" ) - this.elem.style.display = "block"; - } - - // Hide the element if the "hide" operation was done - if ( this.options.hide ) - this.elem.style.display = "none"; - - // Reset the properties, if the item has been hidden or shown - if ( this.options.hide || this.options.show ) - for ( var p in this.options.curAnim ) - jQuery.attr(this.elem.style, p, this.options.orig[p]); - } - - // If a callback was provided, execute it - if ( done && jQuery.isFunction( this.options.complete ) ) - // Execute the complete function - this.options.complete.apply( this.elem ); - - return false; - } else { - var n = t - this.startTime; - this.state = n / this.options.duration; - - // Perform the easing function, defaults to swing - this.pos = jQuery.easing[this.options.easing || (jQuery.easing.swing ? "swing" : "linear")](this.state, n, 0, 1, this.options.duration); - this.now = this.start + ((this.end - this.start) * this.pos); - - // Perform the next step of the animation - this.update(); - } - - return true; - } - -}; - -jQuery.fx.step = { - scrollLeft: function(fx){ - fx.elem.scrollLeft = fx.now; - }, - - scrollTop: function(fx){ - fx.elem.scrollTop = fx.now; - }, - - opacity: function(fx){ - jQuery.attr(fx.elem.style, "opacity", fx.now); - }, - - _default: function(fx){ - fx.elem.style[ fx.prop ] = fx.now + fx.unit; - } -}; -// The Offset Method -// Originally By Brandon Aaron, part of the Dimension Plugin -// http://jquery.com/plugins/project/dimensions -jQuery.fn.offset = function() { - var left = 0, top = 0, elem = this[0], results; - - if ( elem ) with ( jQuery.browser ) { - var parent = elem.parentNode, - offsetChild = elem, - offsetParent = elem.offsetParent, - doc = elem.ownerDocument, - safari2 = safari && parseInt(version) < 522 && !/adobeair/i.test(userAgent), - fixed = jQuery.css(elem, "position") == "fixed"; - - // Use getBoundingClientRect if available - if ( elem.getBoundingClientRect ) { - var box = elem.getBoundingClientRect(); - - // Add the document scroll offsets - add(box.left + Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft), - box.top + Math.max(doc.documentElement.scrollTop, doc.body.scrollTop)); - - // IE adds the HTML element's border, by default it is medium which is 2px - // IE 6 and 7 quirks mode the border width is overwritable by the following css html { border: 0; } - // IE 7 standards mode, the border is always 2px - // This border/offset is typically represented by the clientLeft and clientTop properties - // However, in IE6 and 7 quirks mode the clientLeft and clientTop properties are not updated when overwriting it via CSS - // Therefore this method will be off by 2px in IE while in quirksmode - add( -doc.documentElement.clientLeft, -doc.documentElement.clientTop ); - - // Otherwise loop through the offsetParents and parentNodes - } else { - - // Initial element offsets - add( elem.offsetLeft, elem.offsetTop ); - - // Get parent offsets - while ( offsetParent ) { - // Add offsetParent offsets - add( offsetParent.offsetLeft, offsetParent.offsetTop ); - - // Mozilla and Safari > 2 does not include the border on offset parents - // However Mozilla adds the border for table or table cells - if ( mozilla && !/^t(able|d|h)$/i.test(offsetParent.tagName) || safari && !safari2 ) - border( offsetParent ); - - // Add the document scroll offsets if position is fixed on any offsetParent - if ( !fixed && jQuery.css(offsetParent, "position") == "fixed" ) - fixed = true; - - // Set offsetChild to previous offsetParent unless it is the body element - offsetChild = /^body$/i.test(offsetParent.tagName) ? offsetChild : offsetParent; - // Get next offsetParent - offsetParent = offsetParent.offsetParent; - } - - // Get parent scroll offsets - while ( parent && parent.tagName && !/^body|html$/i.test(parent.tagName) ) { - // Remove parent scroll UNLESS that parent is inline or a table to work around Opera inline/table scrollLeft/Top bug - if ( !/^inline|table.*$/i.test(jQuery.css(parent, "display")) ) - // Subtract parent scroll offsets - add( -parent.scrollLeft, -parent.scrollTop ); - - // Mozilla does not add the border for a parent that has overflow != visible - if ( mozilla && jQuery.css(parent, "overflow") != "visible" ) - border( parent ); - - // Get next parent - parent = parent.parentNode; - } - - // Safari <= 2 doubles body offsets with a fixed position element/offsetParent or absolutely positioned offsetChild - // Mozilla doubles body offsets with a non-absolutely positioned offsetChild - if ( (safari2 && (fixed || jQuery.css(offsetChild, "position") == "absolute")) || - (mozilla && jQuery.css(offsetChild, "position") != "absolute") ) - add( -doc.body.offsetLeft, -doc.body.offsetTop ); - - // Add the document scroll offsets if position is fixed - if ( fixed ) - add(Math.max(doc.documentElement.scrollLeft, doc.body.scrollLeft), - Math.max(doc.documentElement.scrollTop, doc.body.scrollTop)); - } - - // Return an object with top and left properties - results = { top: top, left: left }; - } - - function border(elem) { - add( jQuery.curCSS(elem, "borderLeftWidth", true), jQuery.curCSS(elem, "borderTopWidth", true) ); - } - - function add(l, t) { - left += parseInt(l) || 0; - top += parseInt(t) || 0; - } - - return results; -}; -})(); diff -Nru lua-cgi-5.1.4+dfsg/rockspec/cgilua-5.1.4-1.rockspec lua-cgi-5.2~alpha2/rockspec/cgilua-5.1.4-1.rockspec --- lua-cgi-5.1.4+dfsg/rockspec/cgilua-5.1.4-1.rockspec 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/rockspec/cgilua-5.1.4-1.rockspec 2013-08-09 13:09:14.000000000 +0000 @@ -36,10 +36,12 @@ "src/cgilua/urlcode.lua" } build = { - type = "module", + type = "builtin", modules = { cgilua = "src/cgilua/cgilua.lua" - } + }, + copy_directories = { "examples", "doc", "tests" }, + install = { bin = { "src/launchers/cgilua.cgi", "src/launchers/cgilua.fcgi" } } } for i = 1, #CGILUA_LUAS do diff -Nru lua-cgi-5.1.4+dfsg/rockspec/cgilua-5.2-1.rockspec lua-cgi-5.2~alpha2/rockspec/cgilua-5.2-1.rockspec --- lua-cgi-5.1.4+dfsg/rockspec/cgilua-5.2-1.rockspec 1970-01-01 00:00:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/rockspec/cgilua-5.2-1.rockspec 2013-08-09 13:09:14.000000000 +0000 @@ -0,0 +1,51 @@ +package = "CGILua" + +version = "5.2-1" + +source = { + url = "http://github.com/downloads/keplerproject/cgilua/cgilua-5.2.tar.gz" +} + +description = { + summary = "Tool for creating dynamic Web pages and manipulating data from Web forms", + detailed = [[ + CGILua allows the separation of logic and data handling from the + generation of pages, making it easy to develop web applications with + Lua. CGILua can be used with a variety of Web servers and, for each + server, with different launchers. A launcher is responsible for the + interaction of CGILua and the Web server, for example using ISAPI on + IIS or mod_lua on Apache. + ]] +} + +dependencies = { + "lua >= 5.2", + "luafilesystem >= 1.6.0", +} + +local CGILUA_LUAS = { "src/cgilua/authentication.lua", + "src/cgilua/cookies.lua", + "src/cgilua/dispatcher.lua", + "src/cgilua/loader.lua", + "src/cgilua/lp.lua", + "src/cgilua/mime.lua", + "src/cgilua/post.lua", + "src/cgilua/readuntil.lua", + "src/cgilua/serialize.lua", + "src/cgilua/session.lua", + "src/cgilua/urlcode.lua" } + +build = { + type = "builtin", + modules = { + cgilua = "src/cgilua/cgilua.lua" + }, + copy_directories = { "examples", "doc", "tests" }, + install = { bin = { "src/launchers/cgilua.cgi", "src/launchers/cgilua.fcgi" } } +} + +for i = 1, #CGILUA_LUAS do + local file = CGILUA_LUAS[i] + local mod = "cgilua." .. file:match("^src/cgilua/([^%.]+)%.lua$") + build.modules[mod] = file +end diff -Nru lua-cgi-5.1.4+dfsg/rockspec/cgilua-cvs-4.rockspec lua-cgi-5.2~alpha2/rockspec/cgilua-cvs-4.rockspec --- lua-cgi-5.1.4+dfsg/rockspec/cgilua-cvs-4.rockspec 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/rockspec/cgilua-cvs-4.rockspec 2013-08-09 13:09:14.000000000 +0000 @@ -41,7 +41,7 @@ cgilua = "src/cgilua/cgilua.lua" }, install = { bin = { "src/launchers/cgilua.cgi", "src/launchers/cgilua.fcgi" } }, - copy_directories = { "examples" } + copy_directories = { "examples", "doc" } } for i = 1, #CGILUA_LUAS do diff -Nru lua-cgi-5.1.4+dfsg/src/cgilua/authentication.lua lua-cgi-5.2~alpha2/src/cgilua/authentication.lua --- lua-cgi-5.1.4+dfsg/src/cgilua/authentication.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/src/cgilua/authentication.lua 2013-08-09 13:09:14.000000000 +0000 @@ -19,14 +19,14 @@ local mime=require"mime" -- from LuaSocket local md5=require"md5" -require"cgilua.cookies" +local cookies = require"cgilua.cookies" -local cgilua = cgilua -local string = string -local math = math +local cgilua = require"cgilua" +local string = require"string" +local math = require"math" local error = error -module"cgilua.authentication" +local M = {} local authenticatedUser local configuration @@ -36,17 +36,17 @@ -- if not defined, CGILua standard URLs are assumed -- Returns the current token -function getToken() +function M.getToken() return cgilua.QUERY[configuration.tokenName] end -- Sets the current token -function setToken(token) +function M.setToken(token) cgilua.QUERY[configuration.tokenName] = token end -- Returns the current URL -function currentURL() +function M.currentURL() local script_name = cgilua.servervariable"SCRIPT_NAME" local path_info = cgilua.servervariable"PATH_INFO" or "" local query_string = cgilua.servervariable"QUERY_STRING" or "" @@ -61,7 +61,7 @@ -- -- '=' is replaced by '' -- '+' and '/' are respectively replaced by '*' and '-' -function encodeURLbase64(str) +function M.encodeURLbase64(str) local b64str = mime.b64(str) local urlb64str = string.gsub(b64str,"=","") urlb64str = string.gsub(urlb64str,"+","*") @@ -70,7 +70,7 @@ return urlb64str end -function decodeURLbase64(urlb64str) +function M.decodeURLbase64(urlb64str) local b64str = string.gsub(urlb64str,"*","+") b64str = string.gsub(b64str,"-","/") b64str = string.gsub(b64str,"_"," ") @@ -81,17 +81,17 @@ end -- Returns the authenticated username or nil if no user is authenticated -function username() +function M.username() if authenticatedUser == nil then local authenticatedUserData local token if configuration.tokenPersistence == "url" then - token = getToken() + token = M.getToken() elseif configuration.tokenPersistence == "cookie" then token = cgilua.cookies.get(configuration.tokenName) end if token then - authenticatedUserData = md5.decrypt(decodeURLbase64(token), configuration.criptKey) + authenticatedUserData = md5.decrypt(M.decodeURLbase64(token), configuration.criptKey) -- check if IP in crypted data match with client IP local authenticatedUserIP = authenticatedUserData and string.gsub(authenticatedUserData, ",.*$","") or nil if authenticatedUserIP ~= cgilua.servervariable("REMOTE_ADDR") then @@ -107,7 +107,7 @@ local function cryptUserData() if authenticatedUser then local userData = cgilua.servervariable("REMOTE_ADDR") ..",".. authenticatedUser - local cryptedUserData = encodeURLbase64(md5.crypt(userData, configuration.criptKey)) + local cryptedUserData = M.encodeURLbase64(md5.crypt(userData, configuration.criptKey)) return cryptedUserData end end @@ -118,20 +118,20 @@ if username then local cryptedUserData = cryptUserData() if configuration.tokenPersistence == "url" then - setToken(cryptedUserData) + M.setToken(cryptedUserData) cgilua.cookies.delete(configuration.tokenName) -- removes an eventual previous cookie token elseif configuration.tokenPersistence == "cookie" then cgilua.cookies.set(configuration.tokenName, cryptedUserData) - setToken() -- remove an eventual previous token from the URLs + M.setToken() -- remove an eventual previous token from the URLs end end end -- User logout, clear everything -function logout() +function M.logout() setUser() cgilua.cookies.delete(configuration.tokenName) - setToken() + M.setToken() cgilua.QUERY.logout = nil end @@ -139,7 +139,7 @@ -- if the user is authenticaded then login the user else logout the user -- returns true if the user has been succesfully authenticated or false plus -- an error message when the authentication fails -function check(name, pass) +function M.check(name, pass) name = name or cgilua.POST.user pass = pass or cgilua.POST.pass if name then @@ -149,14 +149,14 @@ setUser(name) return true else - logout() + M.logout() return false, errauth end else - local authuser = username() + local authuser = M.username() if authuser then if cgilua.QUERY.logout ~= nil then - logout() + M.logout() return false end end @@ -166,10 +166,10 @@ -- Returns a authentication URL with ref URL as a parameter, -- accepts an optional value for the logout action -function checkURL(ref, tologout) +function M.checkURL(ref, tologout) local token if configuration.tokenPersistence == "url" then - token = getToken() + token = M.getToken() elseif configuration.tokenPersistence == "cookie" then token = cgilua.cookies.get(configuration.tokenName) end @@ -179,8 +179,8 @@ -- Some proxy and firewall software will also filter out referer information, -- to avoid leaking the location of non-public websites. -- So we send the current URL as an URL parameter to the login URL. - setToken() - local args = {ref = ref or currentURL(), logout = tologout} + M.setToken() + local args = {ref = ref or M.currentURL(), logout = tologout} if string.find(configuration.checkURL, "^https?:") then local params = "?"..urlcode.encodetable(args) return configuration.checkURL..params @@ -189,12 +189,12 @@ end -- Returns the logout URL, based on the login URL -function logoutURL() - return checkURL(nil, 1) +function M.logoutURL() + return M.checkURL(nil, 1) end -- Returns the referenced URL, the one supposed to be offered only for authenticated users -function refURL() +function M.refURL() local url local baseURL = cgilua.QUERY.ref or configuration.checkURL if string.find(baseURL, "\?") then @@ -206,7 +206,7 @@ end -- Sets the current configuration -function configure(options, methods) +function M.configure(options, methods) configuration = options local method = methods[options.method] or {} @@ -216,4 +216,6 @@ if method.username then username = method.username end -end \ No newline at end of file +end + +return M diff -Nru lua-cgi-5.1.4+dfsg/src/cgilua/cgilua.lua lua-cgi-5.2~alpha2/src/cgilua/cgilua.lua --- lua-cgi-5.1.4+dfsg/src/cgilua/cgilua.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/src/cgilua/cgilua.lua 2013-08-09 13:09:14.000000000 +0000 @@ -4,7 +4,7 @@ -- @release $Id: cgilua.lua,v 1.85 2009/06/28 22:42:34 tomas Exp $ ---------------------------------------------------------------------------- -local _G, SAPI = _G, SAPI +local _G = assert(_G) local urlcode = require"cgilua.urlcode" local lp = require"cgilua.lp" local lfs = require"lfs" @@ -15,64 +15,66 @@ local setmetatable = setmetatable local _open = io.open local tinsert, tremove, concat = table.insert, table.remove, table.concat -local foreachi = table.foreachi local date = os.date local os_tmpname = os.tmpname local getenv = os.getenv local remove = os.remove local seeall = package.seeall -local setfenv = setfenv lp.setoutfunc ("cgilua.put") lp.setcompatmode (true) -module ("cgilua") -_COPYRIGHT = "Copyright (C) 2003-2010 Kepler Project" -_DESCRIPTION = "CGILua is a tool for creating dynamic Web pages and manipulating input data from forms" -_VERSION = "CGILua 5.1.4" +local M = { + _COPYRIGHT = "Copyright (C) 2003-2013 Kepler Project", + _DESCRIPTION = "CGILua is a tool for creating dynamic Web pages and manipulating input data from forms", + _VERSION = "CGILua 5.2", +} + -- -- Internal state variables. +local SAPI local _default_errorhandler = debug.traceback local _errorhandler = _default_errorhandler local _default_erroroutput = function (msg) - - if type(msg) ~= "string" and type(msg) ~= "number" then - msg = format ("bad argument #1 to 'error' (string expected, got %s)", type(msg)) - end + if type(msg) ~= "string" and type(msg) ~= "number" then + msg = format ("bad argument #1 to 'error' (string expected, got %s)", type(msg)) + end - -- Logging error - SAPI.Response.errorlog (msg) - SAPI.Response.errorlog (" ") - - SAPI.Response.errorlog (SAPI.Request.servervariable"REMOTE_ADDR") - SAPI.Response.errorlog (" ") - - SAPI.Response.errorlog (date()) - SAPI.Response.errorlog ("\n") - - -- Building user message - msg = gsub (gsub (msg, "\n", "<br>\n"), "\t", " ") - SAPI.Response.contenttype ("text/html") - SAPI.Response.write ("<html><head><title>CGILua Error</title></head><body>" .. msg .. "</body></html>") + -- Logging error + SAPI.Response.errorlog (msg) + SAPI.Response.errorlog (" ") + + SAPI.Response.errorlog (SAPI.Request.servervariable"REMOTE_ADDR") + SAPI.Response.errorlog (" ") + + SAPI.Response.errorlog (date()) + SAPI.Response.errorlog ("\n") + + -- Building user message + msg = gsub (gsub (msg, "\n", "<br>\n"), "\t", " ") + SAPI.Response.contenttype ("text/html") + SAPI.Response.write ("<html><head><title>CGILua Error</title></head><body>" .. msg .. "</body></html>") end local _erroroutput = _default_erroroutput local _default_maxfilesize = 512 * 1024 local _maxfilesize = _default_maxfilesize local _default_maxinput = 1024 * 1024 local _maxinput = _default_maxinput -script_path = false +M.script_path = false -- -- Header functions ---------------------------------------------------------------------------- -- Sends a header. +-- @name header +-- @class function -- @param header String with the header. -- @param value String with the corresponding value. ---------------------------------------------------------------------------- -function header(...) - return SAPI.Response.header(...) +function M.header (...) + return SAPI.Response.header (...) end ---------------------------------------------------------------------------- @@ -80,42 +82,43 @@ -- @param type String with the type of the header. -- @param subtype String with the subtype of the header. ---------------------------------------------------------------------------- -function contentheader (type, subtype) - SAPI.Response.contenttype (type..'/'..subtype) +function M.contentheader (type, subtype) + SAPI.Response.contenttype (type..'/'..subtype) end ---------------------------------------------------------------------------- -- Sends the HTTP header "text/html". ---------------------------------------------------------------------------- -function htmlheader() - SAPI.Response.contenttype ("text/html") +function M.htmlheader() + SAPI.Response.contenttype ("text/html") end -local htmlheader = htmlheader ---------------------------------------------------------------------------- -- Sends an HTTP header redirecting the browser to another URL -- @param url String with the URL. -- @param args Table with the arguments (optional). ---------------------------------------------------------------------------- -function redirect (url, args) - if strfind(url,"^https?:") then - local params="" - if args then - params = "?"..urlcode.encodetable(args) - end - return SAPI.Response.redirect(url..params) - else - return SAPI.Response.redirect(mkabsoluteurl(mkurlpath(url,args))) - end +function M.redirect (url, args) + if strfind(url,"^https?:") then + local params="" + if args then + params = "?"..urlcode.encodetable(args) + end + return SAPI.Response.redirect(url..params) + else + return SAPI.Response.redirect(M.mkabsoluteurl(M.mkurlpath(url,args))) + end end ---------------------------------------------------------------------------- -- Returns a server variable +-- @name servervariable +-- @class function -- @param name String with the name of the server variable. -- @return String with the value of the server variable. ---------------------------------------------------------------------------- -function servervariable(...) - return SAPI.Request.servervariable(...) +function M.servervariable (...) + return SAPI.Request.servervariable (...) end ---------------------------------------------------------------------------- @@ -123,25 +126,25 @@ -- @param msg String (or number) with the message. -- @param level String with the error level (optional). ---------------------------------------------------------------------------- -function errorlog (msg, level) - local t = type(msg) - if t == "string" or t == "number" then - SAPI.Response.errorlog (msg, level) - else - error ("bad argument #1 to `cgilua.errorlog' (string expected, got "..t..")", 2) - end +function M.errorlog (msg, level) + local t = type(msg) + if t == "string" or t == "number" then + SAPI.Response.errorlog (msg, level) + else + error ("bad argument #1 to `cgilua.errorlog' (string expected, got "..t..")", 2) + end end ---------------------------------------------------------------------------- -- Converts all its arguments to strings before sending them to the server. ---------------------------------------------------------------------------- -function print (...) - local args = { ... } - for i = 1, select("#",...) do - args[i] = tostring(args[i]) - end - SAPI.Response.write (concat(args,"\t")) - SAPI.Response.write ("\n") +function M.print (...) + local args = { ... } + for i = 1, select("#",...) do + args[i] = tostring(args[i]) + end + SAPI.Response.write (concat(args,"\t")) + SAPI.Response.write ("\n") end ---------------------------------------------------------------------------- @@ -150,37 +153,39 @@ -- Its basic implementation is to use Lua function 'write', which writes -- each of its arguments (strings or numbers) to file _OUTPUT (a file -- handle initialized with the file descriptor for stdout) +-- @name put +-- @class function -- @param s String (or number) with output. ---------------------------------------------------------------------------- -function put (...) - return SAPI.Response.write(...) +function M.put (...) + return SAPI.Response.write (...) end -- Returns the current errorhandler -function _geterrorhandler(msg) - return _errorhandler(msg) +function M._geterrorhandler(msg) + return _errorhandler(msg) end --- +---------------------------------------------------------------------------- -- Executes a function using the CGILua error handler. -- @param f Function to be called. --- -function pcall (f) - local results = {xpcall (f, _geterrorhandler)} - local ok = results[1] - tremove(results, 1) - if ok then - if #results == 0 then results = { true } end - return unpack(results) - else - _erroroutput (unpack(results)) - end +---------------------------------------------------------------------------- +function M.pcall (f) + local results = {xpcall (f, _errorhandler)} + local ok = results[1] + tremove(results, 1) + if ok then + if #results == 0 then results = { true } end + return unpack(results) + else + _erroroutput (unpack(results)) + end end local function buildscriptenv() - local env = { print = _M.print, write = _M.put } - setmetatable(env, { __index = _G, __newindex = _G }) - return env + local env = { cgilua = M, print = M.print, write = M.put } + setmetatable(env, { __index = _G, __newindex = _G }) + return env end ---------------------------------------------------------------------------- @@ -190,15 +195,14 @@ -- @param filename String with the name of the file to be processed. -- @return The result of the execution of the file. ---------------------------------------------------------------------------- -function doscript (filename) - local f, err = _G.loadfile(filename) - if not f then - error (format ("Cannot execute `%s'. Exiting.\n%s", filename, err)) - else - local env = buildscriptenv() - setfenv(f, env) - return pcall(f) - end +function M.doscript (filename) + local env = buildscriptenv() + local f, err = loadfile(filename, "bt", env) + if not f then + error (format ("Cannot execute `%s'. Exiting.\n%s", filename, err)) + else + return M.pcall(f) + end end ---------------------------------------------------------------------------- @@ -210,19 +214,19 @@ -- file does not exists or if it cannot be opened). -- @return It could return an error message if the file cannot be opened. ---------------------------------------------------------------------------- -function doif (filename) +function M.doif (filename) if not filename then return end -- no file local f, err = _open(filename) if not f then return nil, err end -- no file (or unreadable file) f:close() - return doscript (filename) + return M.doscript (filename) end --------------------------------------------------------------------------- -- Set the maximum "total" input size allowed (in bytes) -- @param nbytes Number of the maximum size (in bytes) of the whole POST data. --------------------------------------------------------------------------- -function setmaxinput(nbytes) +function M.setmaxinput(nbytes) _maxinput = nbytes end @@ -231,17 +235,17 @@ -- Might be less or equal than _maxinput. -- @param nbytes Number of the maximum size (in bytes) of a file. --------------------------------------------------------------------------- -function setmaxfilesize(nbytes) +function M.setmaxfilesize(nbytes) _maxfilesize = nbytes end -- Default path for temporary files -tmp_path = _G.CGILUA_TMP or getenv("TEMP") or getenv ("TMP") or "/tmp" +M.tmp_path = CGILUA_TMP or getenv("TEMP") or getenv ("TMP") or "/tmp" -- Default function for temporary names -- @returns a temporay name using os.tmpname -tmpname = function() +function M.tmpname () local tempname = os_tmpname() -- Lua os.tmpname returns a full path in Unix, but not in Windows -- so we strip the eventual prefix @@ -256,16 +260,16 @@ -- @param dir Base directory for the temporary file -- @param namefunction Name generator function --------------------------------------------------------------------------- -function tmpfile(dir, namefunction) - dir = dir or tmp_path - namefunction = namefunction or tmpname - local tempname = namefunction() - local filename = dir.."/"..tempname - local file, err = _open(filename, "wb+") - if file then - tinsert(_tmpfiles, {name = filename, file = file}) - end - return file, err +function M.tmpfile(dir, namefunction) + dir = dir or M.tmp_path + namefunction = namefunction or M.tmpname + local tempname = namefunction() + local filename = dir.."/"..tempname + local file, err = _open(filename, "w+b") + if file then + tinsert(_tmpfiles, {name = filename, file = file}) + end + return file, err end @@ -276,10 +280,10 @@ -- @param filename String with the name of the file to be processed. -- @param env Optional environment ---------------------------------------------------------------------------- -function handlelp (filename, env) - env = env or buildscriptenv() - htmlheader () - lp.include (filename, env) +function M.handlelp (filename, env) + env = env or buildscriptenv() + M.htmlheader () + lp.include (filename, env) end ---------------------------------------------------------------------------- @@ -290,20 +294,20 @@ -- @return Function (which receives a filename as argument) that produces -- the header and copies the content of the given file. ---------------------------------------------------------------------------- -function buildplainhandler (type, subtype) - return function (filename) - local fh, err = _open (filename, "rb") - local contents = "" - if fh then - contents = fh:read("*a") - fh:close() - else - error(err) - end - header("Content-Lenght", #contents) - contentheader (type, subtype) - put (contents) - end +function M.buildplainhandler (type, subtype) + return function (filename) + local fh, err = _open (filename, "rb") + local contents = "" + if fh then + contents = fh:read("*a") + fh:close() + else + error(err) + end + M.header("Content-Lenght", #contents) + M.contentheader (type, subtype) + M.put (contents) + end end ---------------------------------------------------------------------------- @@ -314,23 +318,23 @@ -- @return Function (which receives a filename as argument) that produces -- the header and processes the given file. ---------------------------------------------------------------------------- -function buildprocesshandler (type, subtype) - return function (filename) - local env = buildscriptenv() - contentheader (type, subtype) - lp.include (filename, env) - end +function M.buildprocesshandler (type, subtype) + return function (filename) + local env = buildscriptenv() + M.contentheader (type, subtype) + lp.include (filename, env) + end end ---------------------------------------------------------------------------- -- Builds the default handler table from cgilua.mime ---------------------------------------------------------------------------- local function buildhandlers() - local mime = _G.require "cgilua.mime" - for ext, mediatype in pairs(mime) do - local t, st = match(mediatype, "([^/]*)/([^/]*)") - addscripthandler(ext, buildplainhandler(t, st)) - end + local mime = require "cgilua.mime" + for ext, mediatype in pairs(mime) do + local t, st = match(mediatype, "([^/]*)/([^/]*)") + M.addscripthandler(ext, M.buildplainhandler(t, st)) + end end ---------------------------------------------------------------------------- @@ -339,17 +343,17 @@ -- @param args Table with arguments to script (optional). -- @return String in URL format. ---------------------------------------------------------------------------- -function mkurlpath (script, args) - -- URL-encode the parameters to be passed do the script - local params = "" - if args then - params = "?"..urlcode.encodetable(args) - end - if strsub(script,1,1) == "/" then - return script .. params - else - return script_vdir .. script .. params - end +function M.mkurlpath (script, args) + -- URL-encode the parameters to be passed do the script + local params = "" + if args then + params = "?"..urlcode.encodetable(args) + end + if strsub(script,1,1) == '/' or M.script_vdir == '/' then + return script .. params + else + return M.script_vdir .. script .. params + end end ---------------------------------------------------------------------------- @@ -358,16 +362,16 @@ -- @param protocol String with the name of the protocol (default = "http"). -- @return String in URL format. ---------------------------------------------------------------------------- -function mkabsoluteurl (path, protocol) - protocol = protocol or "http" - if path:sub(1,1) ~= '/' then - path = '/'..path - end - return format("%s://%s:%s%s", - protocol, - servervariable"SERVER_NAME", - servervariable"SERVER_PORT", - path) +function M.mkabsoluteurl (path, protocol) + protocol = protocol or "http" + if path:sub(1,1) ~= '/' then + path = '/'..path + end + return format("%s://%s:%s%s", + protocol, + M.servervariable"SERVER_NAME", + M.servervariable"SERVER_PORT", + path) end ---------------------------------------------------------------------------- @@ -376,12 +380,12 @@ -- @return String with the directory part. -- @return String with the file part. ---------------------------------------------------------------------------- -function splitonlast (path, sep) - local dir,file = match(path,"^(.-)([^:/\\]*)$") - return dir,file +function M.splitonlast (path, sep) + local dir,file = match(path,"^(.-)([^:/\\]*)$") + return dir,file end -splitpath = splitonlast -- compatibility with previous versions +M.splitpath = M.splitonlast -- compatibility with previous versions ---------------------------------------------------------------------------- -- Extracts the first and remaining parts of a path @@ -389,32 +393,32 @@ -- @return String with the extracted part. -- @return String with the remaining path. ---------------------------------------------------------------------------- -function splitonfirst(path, sep) - local first, rest = match(path, "^/([^:/\\]*)(.*)") - return first, rest +function M.splitonfirst(path, sep) + local first, rest = match(path, "^/([^:/\\]*)(.*)") + return first, rest end -- -- Define variables and build the cgilua.POST, cgilua.GET tables. -- local function getparams () - requestmethod = servervariable"REQUEST_METHOD" - -- Fill in the POST table. - POST = {} - if requestmethod == "POST" then - post.parsedata { - read = SAPI.Request.getpostdata, - discardinput = ap and ap.discard_request_body, - content_type = servervariable"CONTENT_TYPE", - content_length = servervariable"CONTENT_LENGTH", - maxinput = _maxinput, - maxfilesize = _maxfilesize, - args = POST, - } - end - -- Fill in the QUERY table. - QUERY = {} - urlcode.parsequery (servervariable"QUERY_STRING", QUERY) + local requestmethod = M.servervariable"REQUEST_METHOD" + -- Fill in the POST table. + M.POST = {} + if requestmethod == "POST" then + M.post.parsedata { + read = SAPI.Request.getpostdata, + discardinput = ap and ap.discard_request_body, + content_type = M.servervariable"CONTENT_TYPE", + content_length = M.servervariable"CONTENT_LENGTH", + maxinput = _maxinput, + maxfilesize = _maxfilesize, + args = M.POST, + } + end + -- Fill in the QUERY table. + M.QUERY = {} + urlcode.parsequery (M.servervariable"QUERY_STRING", M.QUERY) end -- @@ -429,17 +433,17 @@ -- @param filename String with the name of the file. -- local function default_handler (filename) - local fh, err = _open (filename, "rb") - local contents - if fh then - contents = fh:read("*a") - fh:close() - else - error(err) - end - header("Content-Lenght", #contents) - put ("\n") - put (contents) + local fh, err = _open (filename, "rb") + local contents + if fh then + contents = fh:read("*a") + fh:close() + else + error(err) + end + M.header("Content-Lenght", #contents) + M.put ("\n") + M.put (contents) end ---------------------------------------------------------------------------- @@ -447,15 +451,15 @@ -- @param file_extension String with the lower-case extension of the script. -- @param func Function to handle this kind of scripts. ---------------------------------------------------------------------------- -function addscripthandler (file_extension, func) - assert (type(file_extension) == "string", "File extension must be a string") - if strfind (file_extension, '%.', 1) then - file_extension = strsub (file_extension, 2) - end - file_extension = strlower(file_extension) - assert (type(func) == "function", "Handler must be a function") +function M.addscripthandler (file_extension, func) + assert (type(file_extension) == "string", "File extension must be a string") + if strfind (file_extension, '%.', 1) then + file_extension = strsub (file_extension, 2) + end + file_extension = strlower(file_extension) + assert (type(func) == "function", "Handler must be a function") - _script_handlers[file_extension] = func + _script_handlers[file_extension] = func end --------------------------------------------------------------------------- @@ -463,9 +467,9 @@ -- @param path String with a script path. -- @return Function that handles it or nil. ---------------------------------------------------------------------------- -function getscripthandler (path) - local i,f, ext = strfind (path, "%.([^.]+)$") - return _script_handlers[strlower(ext or '')] +function M.getscripthandler (path) + local i,f, ext = strfind (path, "%.([^.]+)$") + return _script_handlers[strlower(ext or '')] end --------------------------------------------------------------------------- @@ -473,9 +477,9 @@ -- @param path String with a script path. -- @return The returned values from the script. --------------------------------------------------------------------------- -function handle (path) - local h = getscripthandler (path) or default_handler - return h (path) +function M.handle (path) + local h = M.getscripthandler (path) or default_handler + return h (path) end --------------------------------------------------------------------------- @@ -485,13 +489,13 @@ -- for the final message which should be returned. -- @param Function. --------------------------------------------------------------------------- -function seterrorhandler (f) - local tf = type(f) - if tf == "function" then - _errorhandler = f - else - error (format ("Invalid type: expected `function', got `%s'", tf)) - end +function M.seterrorhandler (f) + local tf = type(f) + if tf == "function" then + _errorhandler = f + else + error (format ("Invalid type: expected `function', got `%s'", tf)) + end end --------------------------------------------------------------------------- @@ -499,13 +503,13 @@ -- This function is called to generate the error output. -- @param Function. --------------------------------------------------------------------------- -function seterroroutput (f) - local tf = type(f) - if tf == "function" then - _erroroutput = f - else - error (format ("Invalid type: expected `function', got `%s'", tf)) - end +function M.seterroroutput (f) + local tf = type(f) + if tf == "function" then + _erroroutput = f + else + error (format ("Invalid type: expected `function', got `%s'", tf)) + end end -- @@ -517,22 +521,22 @@ -- Adds a function to be executed after the script. -- @param f Function to be registered. --------------------------------------------------------------------------- -function addclosefunction (f) - local tf = type(f) - if tf == "function" then - tinsert (_close_functions, f) - else - error (format ("Invalid type: expected `function', got `%s'", tf)) - end +function M.addclosefunction (f) + local tf = type(f) + if tf == "function" then + tinsert (_close_functions, f) + else + error (format ("Invalid type: expected `function', got `%s'", tf)) + end end -- -- Close function. -- local function close() - for i = #_close_functions, 1, -1 do - _close_functions[i]() - end + for i = #_close_functions, 1, -1 do + _close_functions[i]() + end end -- @@ -544,13 +548,13 @@ -- Adds a function to be executed before the script. -- @param f Function to be registered. --------------------------------------------------------------------------- -function addopenfunction (f) - local tf = type(f) - if tf == "function" then - tinsert (_open_functions, f) - else - error (format ("Invalid type: expected `function', got `%s'", tf)) - end +function M.addopenfunction (f) + local tf = type(f) + if tf == "function" then + tinsert (_open_functions, f) + else + error (format ("Invalid type: expected `function', got `%s'", tf)) + end end -- @@ -558,85 +562,87 @@ -- Call all defined open-functions in the order they were created. -- local function open() - for i = #_open_functions, 1, -1 do - _open_functions[i]() - end + for i = #_open_functions, 1, -1 do + _open_functions[i]() + end end -- -- Resets CGILua's state. -- local function reset () - script_path = false - script_vpath, pdir, use_executable_name, urlpath, script_vdir, script_pdir, - script_file, authentication, app_name = - nil, nil, nil, nil, nil, nil, nil, nil, nil - _maxfilesize = _default_maxfilesize - _maxinput = _default_maxinput - -- Error Handling - _errorhandler = _default_errorhandler - _erroroutput = _default_erroroutput - -- Handlers - _script_handlers = {} - _open_functions = {} - _close_functions = {} + M.script_path = false + M.script_vpath, M.pdir, M.use_executable_name, M.urlpath, M.script_vdir, M.script_pdir, + M.script_file, M.authentication, M.app_name = + nil, nil, nil, nil, nil, nil, nil, nil, nil + _maxfilesize = _default_maxfilesize + _maxinput = _default_maxinput + -- Error Handling + _errorhandler = _default_errorhandler + _erroroutput = _default_erroroutput + -- Handlers + _script_handlers = {} + _open_functions = {} + _close_functions = {} -- clean temporary files for i, v in ipairs(_tmpfiles) do - _tmpfiles[i] = nil - v.file:close() - local _, err = remove(v.name) - if err then - error(err) - end + _tmpfiles[i] = nil + v.file:close() + local _, err = remove(v.name) + if err then + error(err) + end end end --------------------------------------------------------------------------- -- Request processing. --------------------------------------------------------------------------- -function main () - SAPI = _G.SAPI - buildhandlers() - -- Default handler values - addscripthandler ("lua", doscript) - addscripthandler ("lp", handlelp) - -- Looks for an optional loader module - pcall (function () _G.require"cgilua.loader" end) - - -- post.lua needs to be loaded after cgilua.lua is compiled - pcall (function () _G.require"cgilua.post" end) - - if loader then - loader.init() - end +function M.main () + SAPI = _G.SAPI + buildhandlers() + -- Default handler values + M.addscripthandler ("lua", M.doscript) + M.addscripthandler ("lp", M.handlelp) + -- Looks for an optional loader module + M.pcall (function () M.loader = require"cgilua.loader" end) + + -- post.lua needs to be loaded after cgilua.lua is compiled + M.pcall (function () M.post = require"cgilua.post" end) + + if M.loader then + M.loader.init() + end - -- Build QUERY/POST tables - if not pcall (getparams) then return nil end + -- Build QUERY/POST tables + if not M.pcall (getparams) then return nil end - local result - -- Executes the optional loader module - if loader then - loader.run() - end - - -- Changing curent directory to the script's "physical" dir - local curr_dir = lfs.currentdir () - pcall (function () lfs.chdir (script_pdir) end) + local result + -- Executes the optional loader module + if M.loader then + M.loader.run() + end + + -- Changing curent directory to the script's "physical" dir + local curr_dir = lfs.currentdir () + M.pcall (function () lfs.chdir (M.script_pdir) end) - -- Opening functions - pcall (open) + -- Opening functions + M.pcall (open) - -- Executes the script - result, err = pcall (function () return handle (script_file) end) + -- Executes the script + result, err = M.pcall (function () return M.handle (M.script_file) end) - -- Closing functions - pcall (close) - -- Changing to original directory - pcall (function () lfs.chdir (curr_dir) end) - - -- Cleanup - reset () - if result then -- script executed ok! - return result - end + -- Closing functions + M.pcall (close) + -- Changing to original directory + M.pcall (function () lfs.chdir (curr_dir) end) + + -- Cleanup + reset () + if result then -- script executed ok! + return result + end end + +return M diff -Nru lua-cgi-5.1.4+dfsg/src/cgilua/cookies.lua lua-cgi-5.2~alpha2/src/cgilua/cookies.lua --- lua-cgi-5.1.4+dfsg/src/cgilua/cookies.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/src/cgilua/cookies.lua 2013-08-09 13:09:14.000000000 +0000 @@ -4,47 +4,45 @@ -- @release $Id: cookies.lua,v 1.8 2008/04/24 13:42:04 mascarenhas Exp $ ---------------------------------------------------------------------------- -require"cgilua.urlcode" +local cgilua = require"cgilua" +local os = require"os" +local string = require"string" +local urlcode = require"cgilua.urlcode" local error = error local format, gsub, strfind = string.format, string.gsub, string.find local date = os.date -local escape, unescape = cgilua.urlcode.escape, cgilua.urlcode.unescape -local function header(...) - return SAPI.Response.header(...) -end -local function write(...) - return SAPI.Response.write(...) -end -local function servervariable(...) - return SAPI.Request.servervariable(...) -end +local escape, unescape = urlcode.escape, urlcode.unescape -module ("cgilua.cookies") +local header = SAPI.Response.header +local write = SAPI.Response.write +local servervariable = SAPI.Request.servervariable + +local M = {} local function optional (what, name) - if name ~= nil and name ~= "" then - return format("; %s=%s", what, name) - else - return "" - end + if name ~= nil and name ~= "" then + return format("; %s=%s", what, name) + else + return "" + end end local function build (name, value, options) - if not name or not value then - error("cookie needs a name and a value") - end - local cookie = name .. "=" .. escape(value) - options = options or {} - if options.expires then - local t = date("!%A, %d-%b-%Y %H:%M:%S GMT", options.expires) - cookie = cookie .. optional("expires", t) - end - cookie = cookie .. optional("path", options.path) - cookie = cookie .. optional("domain", options.domain) - cookie = cookie .. optional("secure", options.secure) - return cookie + if not name or not value then + error("cookie needs a name and a value") + end + local cookie = name .. "=" .. escape(value) + options = options or {} + if options.expires then + local t = date("!%A, %d-%b-%Y %H:%M:%S GMT", options.expires) + cookie = cookie .. optional("expires", t) + end + cookie = cookie .. optional("path", options.path) + cookie = cookie .. optional("domain", options.domain) + cookie = cookie .. optional("secure", options.secure) + return cookie end @@ -55,8 +53,8 @@ -- @param value String with the value of the cookie. -- @param options Table with the options (optional). -function set (name, value, options) - header("Set-Cookie", build(name, value, options)) +function M.set (name, value, options) + header("Set-Cookie", build(name, value, options)) end @@ -67,9 +65,9 @@ -- @param value String with the value of the cookie. -- @param options Table with the options (optional). -function sethtml (name, value, options) - write(format('<meta http-equiv="Set-Cookie" content="%s">', - build(name, value, options))) +function M.sethtml (name, value, options) + write(format('<meta http-equiv="Set-Cookie" content="%s">', + build(name, value, options))) end @@ -78,13 +76,13 @@ -- @param name String with the name of the cookie. -- @return String with the value associated with the cookie. -function get (name) - local cookies = servervariable"HTTP_COOKIE" or "" - cookies = ";" .. cookies .. ";" - cookies = gsub(cookies, "%s*;%s*", ";") -- remove extra spaces - local pattern = ";" .. name .. "=(.-);" - local _, __, value = strfind(cookies, pattern) - return value and unescape(value) +function M.get (name) + local cookies = servervariable"HTTP_COOKIE" or "" + cookies = ";" .. cookies .. ";" + cookies = gsub(cookies, "%s*;%s*", ";") -- remove extra spaces + local pattern = ";" .. name .. "=(.-);" + local _, __, value = strfind(cookies, pattern) + return value and unescape(value) end @@ -93,8 +91,10 @@ -- @param name String with the name of the cookie. -- @param options Table with the options (optional). -function delete (name, options) - options = options or {} - options.expires = 1 - set(name, "xxx", options) +function M.delete (name, options) + options = options or {} + options.expires = 1 + M.set(name, "xxx", options) end + +return M diff -Nru lua-cgi-5.1.4+dfsg/src/cgilua/dispatcher.lua lua-cgi-5.2~alpha2/src/cgilua/dispatcher.lua --- lua-cgi-5.1.4+dfsg/src/cgilua/dispatcher.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/src/cgilua/dispatcher.lua 2013-08-09 13:09:14.000000000 +0000 @@ -1,7 +1,6 @@ -- CGILua dispatcher module -- @release $Id: dispatcher.lua,v 1.8 2007/12/07 18:49:49 carregal Exp $ -module(..., package.seeall) -- Checks if an URL matches a route pattern local function route_match(url, pattern) @@ -33,7 +32,7 @@ -- @param map_name Name associated with the map in the routed URL table. -- @param params Table of named parameters used in the URL map -- @param queryargs Optional table of named parameters used for the QUERY part of the URL -function route_url(map_name, params, queryargs) +local function route_url(map_name, params, queryargs) local queryparams = "" if queryargs then queryparams = "?"..cgilua.urlcode.encodetable(queryargs) @@ -53,7 +52,7 @@ -- a function to be called with the extracted parameters and -- a name for the map when used with route_url -- @param table of maps or a single map -function route(URLs) +local function route(URLs) URLs = URLs or {} if type(URLs[1]) == "string" then -- accepts a single map as the only entry in a map table @@ -67,4 +66,9 @@ else error("Missing page parameters") end -end \ No newline at end of file +end + +return { + route_url = route_url, + route = route, +} diff -Nru lua-cgi-5.1.4+dfsg/src/cgilua/loader.lua lua-cgi-5.2~alpha2/src/cgilua/loader.lua --- lua-cgi-5.1.4+dfsg/src/cgilua/loader.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/src/cgilua/loader.lua 2013-08-09 13:09:14.000000000 +0000 @@ -6,86 +6,89 @@ -- -- # $Id: loader.lua,v 1.7 2008/03/28 22:01:18 ignacio Exp $ -require "lfs" +local cgilua = require"cgilua" +local lfs = require "lfs" -module("cgilua.loader", package.seeall) +local M = {} -function init() - -- Loads the user configuration - cgilua.doif (CGILUA_CONF.."/config.lua") +function M.init() + -- Loads the user configuration + cgilua.doif (CGILUA_CONF.."/config.lua") end -function run() - local servervariable = cgilua.servervariable - cgilua.script_vpath = cgilua.script_vpath or servervariable"PATH_INFO" - - if cgilua.script_vpath == nil or cgilua.script_vpath == "" then - cgilua.script_vpath = "/" - end +function M.run() + local servervariable = cgilua.servervariable + cgilua.script_vpath = cgilua.script_vpath or servervariable"PATH_INFO" + + if cgilua.script_vpath == nil or cgilua.script_vpath == "" then + cgilua.script_vpath = "/" + end - local document_root = cgilua.pdir or servervariable"DOCUMENT_ROOT" + local document_root = cgilua.pdir or servervariable"DOCUMENT_ROOT" - if not cgilua.script_path then - if CGILUA_ISDIRECT then -- the launcher is associated with scripts (Xavante, mod_lua or isapi usually) + if not cgilua.script_path then + if CGILUA_ISDIRECT then -- the launcher is associated with scripts (Xavante, mod_lua or isapi usually) if servervariable"PATH_TRANSLATED" ~= "" then - cgilua.script_path = servervariable"PATH_TRANSLATED" + cgilua.script_path = servervariable"PATH_TRANSLATED" else - cgilua.script_path = servervariable"SCRIPT_FILENAME" + cgilua.script_path = servervariable"SCRIPT_FILENAME" end - else -- the launcher executable is present in the URL (CGI or FastCGI only) + else -- the launcher executable is present in the URL (CGI or FastCGI only) if document_root == nil or document_root == "" then - -- tries to obtain documents_root from the server - local path_info = cgilua.script_vpath - if path_info == nil or path_info == "" or path_info == "/" then - document_root = cgilua.pdir or servervariable"PATH_TRANSLATED" - else - if string.find(servervariable("SERVER_SOFTWARE"), "IIS") then + -- tries to obtain documents_root from the server + local path_info = cgilua.script_vpath + if path_info == nil or path_info == "" or path_info == "/" then + document_root = cgilua.pdir or servervariable"PATH_TRANSLATED" + else + if string.find(servervariable("SERVER_SOFTWARE"), "IIS") then path_info = string.gsub(path_info, "/", "\\") - end - document_root = cgilua.pdir or string.gsub(servervariable"PATH_TRANSLATED", path_info, "") - end + end + document_root = cgilua.pdir or string.gsub(servervariable"PATH_TRANSLATED", path_info, "") + end end if cgilua.use_executable_name then - -- looks for a Lua script with the same name as the executable - local _, name = cgilua.splitpath(servervariable"SCRIPT_NAME") - name = string.gsub(name, "%.[^%.]-$","") + -- looks for a Lua script with the same name as the executable + local _, name = cgilua.splitpath(servervariable"SCRIPT_NAME") + name = string.gsub(name, "%.[^%.]-$","") if name and lfs.attributes(document_root.."/"..name..".lua") then cgilua.script_path = document_root.."/"..name..".lua" end else - -- uses /index.lua then /index.lp as the default script - if cgilua.script_vpath == "/" then - if lfs.attributes(document_root.."/index.lua") then + -- uses /index.lua then /index.lp as the default script + if cgilua.script_vpath == "/" then + if lfs.attributes(document_root.."/index.lua") then cgilua.script_vpath = "/index.lua" - elseif lfs.attributes(document_root.."/index.lp") then + elseif lfs.attributes(document_root.."/index.lp") then cgilua.script_vpath = "/index.lp" - else + else error("Kepler is correctly configured, but you didn't provide a script!") - end - end - -- checks if PATH_INFO refers to a valid file and ajusts the settings accordingly - local filepath, path_info = string.match (cgilua.script_vpath, "^([^%.]-%.[^/]+)(.*)") - if filepath and lfs.attributes(document_root..filepath) then - -- if one is found use it - cgilua.script_path = document_root..filepath - cgilua.script_vpath = path_info - cgilua.urlpath = cgilua.urlpath or servervariable"SCRIPT_NAME"..filepath - else - -- otherwise go with the current PATH_INFO - cgilua.script_path = document_root..cgilua.script_vpath - end + end + end + -- checks if PATH_INFO refers to a valid file and ajusts the settings accordingly + local filepath, path_info = string.match (cgilua.script_vpath, "^([^%.]-%.[^/]+)(.*)") + if filepath and lfs.attributes(document_root..filepath) then + -- if one is found use it + cgilua.script_path = document_root..filepath + cgilua.script_vpath = path_info + cgilua.urlpath = cgilua.urlpath or servervariable"SCRIPT_NAME"..filepath + else + -- otherwise go with the current PATH_INFO + cgilua.script_path = document_root..cgilua.script_vpath + end end - end - end - - -- define other cgilua vars so mkurlpath can work correctly - if cgilua.script_vpath then - cgilua.script_vdir = cgilua.splitpath (cgilua.script_vpath) - cgilua.urlpath = cgilua.urlpath or servervariable"SCRIPT_NAME" - else - cgilua.script_vdir = cgilua.splitpath (servervariable"SCRIPT_NAME") - cgilua.urlpath = cgilua.urlpath or "" - end + end + end + + -- define other cgilua vars so mkurlpath can work correctly + if cgilua.script_vpath then + cgilua.script_vdir = cgilua.splitpath (cgilua.script_vpath) + cgilua.urlpath = cgilua.urlpath or servervariable"SCRIPT_NAME" + else + cgilua.script_vdir = cgilua.splitpath (servervariable"SCRIPT_NAME") + cgilua.urlpath = cgilua.urlpath or "" + end - cgilua.script_pdir, cgilua.script_file = cgilua.splitpath (cgilua.script_path) + cgilua.script_pdir, cgilua.script_file = cgilua.splitpath (cgilua.script_path) end + +return M diff -Nru lua-cgi-5.1.4+dfsg/src/cgilua/lp.lua lua-cgi-5.2~alpha2/src/cgilua/lp.lua --- lua-cgi-5.1.4+dfsg/src/cgilua/lp.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/src/cgilua/lp.lua 2013-08-09 13:09:14.000000000 +0000 @@ -4,12 +4,12 @@ -- @release $Id: lp.lua,v 1.15 2008/12/11 17:40:24 mascarenhas Exp $ ---------------------------------------------------------------------------- -local assert, error, getfenv, loadstring, setfenv = assert, error, getfenv, loadstring, setfenv +local assert, error, loadstring = assert, error, loadstring local find, format, gsub, strsub, char = string.find, string.format, string.gsub, string.sub, string.char local concat, tinsert = table.concat, table.insert local open = io.open -module (...) +local M = {} ---------------------------------------------------------------------------- -- function to do output @@ -40,8 +40,8 @@ -- @param s String to translate. -- @return String with translated code. ---------------------------------------------------------------------------- -function translate (s) - s = gsub(s, "^#![^\n]+\n", "") +function M.translate (s) + s = gsub(s, "^#![^\n]+\n", "") if compatmode then s = gsub(s, "$|(.-)|%$", "<?lua = %1 ?>") s = gsub(s, "<!%-%-$$(.-)$$%-%->", "<?lua %1 ?>") @@ -74,7 +74,7 @@ -- Defines the name of the output function. -- @param f String with the name of the function which produces output. -function setoutfunc (f) +function M.setoutfunc (f) outfunc = f end @@ -82,7 +82,7 @@ -- Turns on or off the compatibility with old CGILua 3.X behavior. -- @param c Boolean indicating if the compatibility mode should be used. -function setcompatmode (c) +function M.setcompatmode (c) compatmode = c end @@ -97,14 +97,17 @@ -- Uses a cache of templates. -- @param string String with the template to be translated. -- @param chunkname String with the name of the chunk, for debugging purposes. +-- @param env Table with the environment of the resulting function (optional). -- @return Function with the resulting translation. -function compile (string, chunkname) - local f, err = cache[string] - if f then return f end - f, err = loadstring (translate (string), chunkname) +function M.compile (string, chunkname, env) + local s, err = cache[string] + if not s then + s = M.translate (string) + cache[string] = s + end + f, err = load (s, chunkname, "bt", env) if not f then error (err, 3) end - cache[string] = f return f end @@ -116,18 +119,16 @@ -- @param env Table with the environment to run the resulting function. local BOM = char(239) .. char(187) .. char(191) -function include (filename, env) +function M.include (filename, env) -- read the whole contents of the file local fh = assert (open (filename)) local src = fh:read("*a") fh:close() + if src:sub(1,3) == BOM then src = src:sub(4) end -- translates the file into a function - local prog = compile (src, '@'..filename) - local _env - if env then - _env = getfenv (prog) - setfenv (prog, env) - end + local prog = M.compile (src, '@'..filename, env) prog () end + +return M diff -Nru lua-cgi-5.1.4+dfsg/src/cgilua/post.lua lua-cgi-5.2~alpha2/src/cgilua/post.lua --- lua-cgi-5.1.4+dfsg/src/cgilua/post.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/src/cgilua/post.lua 2013-08-09 13:09:14.000000000 +0000 @@ -17,16 +17,17 @@ -- @release $Id: post.lua,v 1.17 2008/04/03 21:55:28 mascarenhas Exp $ ---------------------------------------------------------------------------- -require"cgilua.readuntil" -require"cgilua.urlcode" +local iterate = require"cgilua.readuntil".iterate +local urlcode = require"cgilua.urlcode" +local tmpfile = require"cgilua".tmpfile local assert, error, pairs, tonumber, tostring, type = assert, error, pairs, tonumber, tostring, type local getn, tinsert = table.getn, table.insert local format, gsub, strfind, strlower, strlen = string.format, string.gsub, string.find, string.lower, string.len local min = math.min -local iterate = cgilua.readuntil.iterate -local urlcode = cgilua.urlcode -local tmpfile = cgilua.tmpfile +--local iterate = cgilua.readuntil.iterate +--local urlcode = cgilua.urlcode +--local tmpfile = cgilua.tmpfile -- environment for processing multipart/form-data input local boundary = nil -- boundary string that separates each 'part' of input @@ -40,7 +41,6 @@ local readuntil = nil -- read until delimiter local read = nil -- basic read function -module ("cgilua.post") -- -- Extract the boundary string from CONTENT_TYPE metavariable @@ -263,31 +263,33 @@ -- (defined by the metavariable CONTENT_LENGTH) exceeds the -- maximum input size allowed ---------------------------------------------------------------------------- -function parsedata (defs) - assert (type(defs.args) == "table", "field `args' must be a table") - init (defs) - -- get the "total" size of the incoming data - local inputsize = tonumber(defs.content_length) or 0 - if inputsize > maxinput then - -- some Web Servers (like IIS) require that all the incoming data is read - bytesleft = inputsize - discardinput(inputsize) - error(format("Total size of incoming data (%d KB) exceeds configured maximum (%d KB)", - inputsize /1024, maxinput / 1024)) - end +return { + parsedata = function (defs) + assert (type(defs.args) == "table", "field `args' must be a table") + init (defs) + -- get the "total" size of the incoming data + local inputsize = tonumber(defs.content_length) or 0 + if inputsize > maxinput then + -- some Web Servers (like IIS) require that all the incoming data is read + bytesleft = inputsize + discardinput(inputsize) + error(format("Total size of incoming data (%d KB) exceeds configured maximum (%d KB)", + inputsize /1024, maxinput / 1024)) + end - -- process the incoming data according to its content type - local contenttype = content_type - if not contenttype then - error("Undefined Media Type") - end - if strfind(contenttype, "x-www-form-urlencoded", 1, true) then - urlcode.parsequery (read (inputsize), defs.args) - elseif strfind(contenttype, "multipart/form-data", 1, true) then - Main (inputsize, defs.args) - elseif strfind (contenttype, "application/xml", 1, true) or strfind (contenttype, "text/xml", 1, true) or strfind (contenttype, "text/plain", 1, true) then - tinsert (defs.args, read (inputsize)) - else - error("Unsupported Media Type: "..contenttype) - end -end + -- process the incoming data according to its content type + local contenttype = content_type + if not contenttype then + error("Undefined Media Type") + end + if strfind(contenttype, "x-www-form-urlencoded", 1, true) then + urlcode.parsequery (read (inputsize), defs.args) + elseif strfind(contenttype, "multipart/form-data", 1, true) then + Main (inputsize, defs.args) + elseif strfind (contenttype, "application/xml", 1, true) or strfind (contenttype, "text/xml", 1, true) or strfind (contenttype, "text/plain", 1, true) then + tinsert (defs.args, read (inputsize)) + else + error("Unsupported Media Type: "..contenttype) + end + end, +} diff -Nru lua-cgi-5.1.4+dfsg/src/cgilua/readuntil.lua lua-cgi-5.2~alpha2/src/cgilua/readuntil.lua --- lua-cgi-5.1.4+dfsg/src/cgilua/readuntil.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/src/cgilua/readuntil.lua 2013-08-09 13:09:14.000000000 +0000 @@ -6,7 +6,6 @@ local strsub, strfind, strlen = string.sub, string.find, string.len -module ("cgilua.readuntil") ---------------------------------------------------------------------------- -- Creates a function which reads an input until a given character. @@ -14,31 +13,33 @@ -- @return Function which receives a delimiter character and an output -- function. ---------------------------------------------------------------------------- -function iterate (inp) - local current = "" - return function (del, out) - local dellen = strlen(del) - local i, e - while true do - i, e = strfind(current, del, 1, 1) - if i then break end - local new = inp() - if not new then break end - do -- handle borders - local endcurrent = strsub(current, -dellen+1) - local border = endcurrent .. strsub(new, 1, dellen-1) - if strlen(current) < dellen or strlen(new) < dellen or - strfind(border, del, 1, 1) then - -- move last part of `current' to new block - current = strsub(current, 1, -dellen) - new = endcurrent .. new +return { + iterate = function (inp) + local current = "" + return function (del, out) + local dellen = strlen(del) + local i, e + while true do + i, e = strfind(current, del, 1, 1) + if i then break end + local new = inp() + if not new then break end + do -- handle borders + local endcurrent = strsub(current, -dellen+1) + local border = endcurrent .. strsub(new, 1, dellen-1) + if strlen(current) < dellen or strlen(new) < dellen or + strfind(border, del, 1, 1) then + -- move last part of `current' to new block + current = strsub(current, 1, -dellen) + new = endcurrent .. new + end end + out(current) + current = new end - out(current) - current = new + out(strsub(current, 1, (i or 0) - 1)) + current = strsub(current, (e or strlen(current)) + 1) + return (i ~= nil) end - out(strsub(current, 1, (i or 0) - 1)) - current = strsub(current, (e or strlen(current)) + 1) - return (i ~= nil) - end -end + end, +} diff -Nru lua-cgi-5.1.4+dfsg/src/cgilua/serialize.lua lua-cgi-5.2~alpha2/src/cgilua/serialize.lua --- lua-cgi-5.1.4+dfsg/src/cgilua/serialize.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/src/cgilua/serialize.lua 2013-08-09 13:09:14.000000000 +0000 @@ -108,6 +108,6 @@ end ---------------------------------------------------------------------------- -cgilua.serialize = tabledump - -return tabledump +return { + serialize = tabledump, +} diff -Nru lua-cgi-5.1.4+dfsg/src/cgilua/session.lua lua-cgi-5.2~alpha2/src/cgilua/session.lua --- lua-cgi-5.1.4+dfsg/src/cgilua/session.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/src/cgilua/session.lua 2013-08-09 13:09:14.000000000 +0000 @@ -4,20 +4,23 @@ -- @release $Id: session.lua,v 1.29 2007/11/21 16:33:20 carregal Exp $ ---------------------------------------------------------------------------- +local cgilua = require"cgilua" local lfs = require"lfs" -local serialize = require"cgilua.serialize" +local serialize = require"cgilua.serialize".serialize -local assert, error, ipairs, _G, loadfile, next, tostring, type = assert, error, ipairs, _G, loadfile, next, tostring, type +local assert, error, ipairs, loadfile, next, tostring, type = assert, error, ipairs, loadfile, next, tostring, type local format, gsub, strfind, strsub = string.format, string.gsub, string.find, string.sub local tinsert = table.insert local _open = io.open local remove, time = os.remove, os.time -local mod, rand, randseed = math.mod, math.random, math.randomseed +local mod, rand, randseed = (math.mod or math.fmod), math.random, math.randomseed local attributes, dir, mkdir = lfs.attributes, lfs.dir, lfs.mkdir -module ("cgilua.session") +local M = {} +local RANGE = 999999999 local INVALID_SESSION_ID = "Invalid session identification" +randseed (mod (time(), RANGE)) ---------------------------------------------------------------------------- -- Internal state variables. @@ -44,7 +47,7 @@ -- Deletes a session. -- @param id Session identification. ---------------------------------------------------------------------------- -function delete (id) +function M.delete (id) if not check_id (id) then return nil, INVALID_SESSION_ID end @@ -69,20 +72,20 @@ -- @return New identifier. -- local function new_id () - return rand (999999999) + return rand (RANGE) end ---------------------------------------------------------------------------- -- Creates a new session identifier. -- @return Session identification. ---------------------------------------------------------------------------- -function new () +function M.new () local id = new_id () if find (id..".lua") then + randseed (mod (time(), RANGE)) repeat id = new_id (id) until not find (id..".lua") - randseed (mod (id, 999999999)) end return id end @@ -91,7 +94,7 @@ -- Changes the session identificator generator. -- @param func Function. ---------------------------------------------------------------------------- -function setidgenerator (func) +function M.setidgenerator (func) if type (func) == "function" then new_id = func end @@ -103,7 +106,7 @@ -- @return Table with session data or nil in case of error. -- @return In case of error, also returns the error message. ---------------------------------------------------------------------------- -function load (id) +function M.load (id) if not check_id (id) then return nil, INVALID_SESSION_ID end @@ -120,7 +123,7 @@ -- @param id Session identification. -- @param data Table with session data to be saved. ---------------------------------------------------------------------------- -function save (id, data) +function M.save (id, data) if not check_id (id) then return nil, INVALID_SESSION_ID end @@ -133,7 +136,7 @@ ---------------------------------------------------------------------------- -- Removes expired sessions. ---------------------------------------------------------------------------- -function cleanup () +function M.cleanup () local rem = {} local now = time () for file in dir (root_dir) do @@ -153,7 +156,7 @@ -- Changes the session timeout. -- @param t Number of seconds to maintain a session. ---------------------------------------------------------------------------- -function setsessiontimeout (t) +function M.setsessiontimeout (t) if type (t) == "number" then timeout = t end @@ -163,14 +166,14 @@ -- Changes the session directory. -- @param path String with the new session directory. ---------------------------------------------------------------------------- -function setsessiondir (path) +function M.setsessiondir (path) path = gsub (path, "[/\\]$", "") -- Make sure the given path is a directory if not attributes (path, "mode") then assert (mkdir (path)) end -- Make sure it can create a new file in the given directory - local test_file = path.."/".._G.cgilua.tmpname() + local test_file = path.."/"..cgilua.tmpname() local fh, err = _open (test_file, "w") if not fh then error ("Could not open a file in session directory: ".. @@ -188,19 +191,19 @@ ---------------------------------------------------------------------------- -- Destroys the session. ---------------------------------------------------------------------------- -function destroy () - data = {} -- removes data from session table to avoid recreation by `close' - delete (id) +function M.destroy () + M.data = {} -- removes data from session table to avoid recreation by `close' + M.delete (id) end ---------------------------------------------------------------------------- -- Open user session. -- This function should be called before the script is executed. ---------------------------------------------------------------------------- -function open () +function M.open () -- Redefine cgilua.mkurlpath to manage the session identification - local mkurlpath = _G.cgilua.mkurlpath - function _G.cgilua.mkurlpath (script, data) + local mkurlpath = cgilua.mkurlpath + function cgilua.mkurlpath (script, data) if not data then data = {} end @@ -208,12 +211,12 @@ return mkurlpath (script, data) end - cleanup() + M.cleanup() - id = _G.cgilua.QUERY[ID_NAME] or new() + id = cgilua.QUERY[ID_NAME] or M.new() if id then - _G.cgilua.QUERY[ID_NAME] = nil - _G.cgilua.session.data = load (id) or {} + cgilua.QUERY[ID_NAME] = nil + M.data = M.load (id) or {} end end @@ -221,9 +224,9 @@ -- Close user session. -- This function should be called after the script is executed. ---------------------------------------------------------------------------- -function close () - if next (_G.cgilua.session.data) then - save (id, _G.cgilua.session.data) +function M.close () + if next (cgilua.session.data) then + M.save (id, cgilua.session.data) id = nil end end @@ -235,13 +238,14 @@ -- It just calls the `open' function and register the `close' function -- to be called at the end of the execution. ---------------------------------------------------------------------------- -function _G.cgilua.enablesession () +function M.enablesession () if already_enabled then -- avoid misuse when a script calls another one return else already_enabled = true end - open () - _G.cgilua.addclosefunction (close) + M.open () + cgilua.addclosefunction (M.close) end +return M diff -Nru lua-cgi-5.1.4+dfsg/src/cgilua/urlcode.lua lua-cgi-5.2~alpha2/src/cgilua/urlcode.lua --- lua-cgi-5.1.4+dfsg/src/cgilua/urlcode.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/src/cgilua/urlcode.lua 2013-08-09 13:09:14.000000000 +0000 @@ -5,29 +5,40 @@ ---------------------------------------------------------------------------- local ipairs, next, pairs, tonumber, type = ipairs, next, pairs, tonumber, type -local string = string -local table = table - -module ("cgilua.urlcode") +local string = require"string" +local gsub = string.gsub +local strbyte, strchar, strformat, strsub = string.byte, string.char, string.format, string.sub +local tinsert = require"table".insert + +local M = {} + +-- Converts an hexadecimal code in the form %XX to a character +local function hexcode2char (h) + return strchar(tonumber(h,16)) +end ---------------------------------------------------------------------------- -- Decode an URL-encoded string (see RFC 2396) ---------------------------------------------------------------------------- -function unescape (str) - str = string.gsub (str, "+", " ") - str = string.gsub (str, "%%(%x%x)", function(h) return string.char(tonumber(h,16)) end) - str = string.gsub (str, "\r\n", "\n") +function M.unescape (str) + str = gsub (str, "+", " ") + str = gsub (str, "%%(%x%x)", hexcode2char) + str = gsub (str, "\r\n", "\n") return str end +-- Converts a character to an hexadecimal code in the form %XX +local function char2hexcode (c) + return strformat ("%%%02X", strbyte(c)) +end + ---------------------------------------------------------------------------- -- URL-encode a string (see RFC 2396) ---------------------------------------------------------------------------- -function escape (str) - str = string.gsub (str, "\n", "\r\n") - str = string.gsub (str, "([^0-9a-zA-Z ])", -- locale independent - function (c) return string.format ("%%%02X", string.byte(c)) end) - str = string.gsub (str, " ", "+") +function M.escape (str) + str = gsub (str, "\n", "\r\n") + str = gsub (str, "([^0-9a-zA-Z ])", char2hexcode) -- locale independent + str = gsub (str, " ", "+") return str end @@ -39,7 +50,7 @@ -- Multi-valued names will be represented as tables with numerical indexes -- (in the order they came). ---------------------------------------------------------------------------- -function insertfield (args, name, value) +function M.insertfield (args, name, value) if not args[name] then args[name] = value else @@ -50,7 +61,7 @@ value, } elseif t == "table" then - table.insert (args[name], value) + tinsert (args[name], value) else error ("CGILua fatal error (invalid args table)!") end @@ -65,12 +76,12 @@ -- @param query String to be parsed. -- @param args Table where to store the pairs. ---------------------------------------------------------------------------- -function parsequery (query, args) +function M.parsequery (query, args) if type(query) == "string" then - local insertfield, unescape = insertfield, unescape - string.gsub (query, "([^&=]+)=([^&=]*)&?", + local insertfield, unescape = M.insertfield, M.unescape + gsub (query, "([^&=]+)=([^&=]*)&?", function (key, val) - insertfield (args, unescape(key), unescape(val)) + M.insertfield (args, unescape(key), unescape(val)) end) end end @@ -81,20 +92,22 @@ -- @param args Table where to extract the pairs (name=value). -- @return String with the resulting encoding. ---------------------------------------------------------------------------- -function encodetable (args) - if args == nil or next(args) == nil then -- no args or empty args? - return "" - end - local strp = "" - for key, vals in pairs(args) do - if type(vals) ~= "table" then - vals = {vals} - end - for i,val in ipairs(vals) do - strp = strp.."&"..escape(key).."="..escape(val) - end - end - -- remove first & - return string.sub(strp,2) +function M.encodetable (args) + if args == nil or next(args) == nil then -- no args or empty args? + return "" + end + local escape = M.escape + local strp = "" + for key, vals in pairs(args) do + if type(vals) ~= "table" then + vals = {vals} + end + for i,val in ipairs(vals) do + strp = strp.."&"..escape(key).."="..escape(val) + end + end + -- remove first & + return strsub(strp,2) end +return M diff -Nru lua-cgi-5.1.4+dfsg/tests/env.lua lua-cgi-5.2~alpha2/tests/env.lua --- lua-cgi-5.1.4+dfsg/tests/env.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/tests/env.lua 2013-08-09 13:09:14.000000000 +0000 @@ -1,3 +1,4 @@ +#!/usr/bin/env cgilua.cgi -- This file should be executed before any script in this directory -- according to the configuration (cgilua/conf.lua). diff -Nru lua-cgi-5.1.4+dfsg/tests/overview.lp lua-cgi-5.2~alpha2/tests/overview.lp --- lua-cgi-5.1.4+dfsg/tests/overview.lp 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/tests/overview.lp 2013-08-09 13:09:14.000000000 +0000 @@ -1,14 +1,18 @@ +#!/usr/bin/env cgilua.cgi <?lua -- Tries to load known libraries for _, t in ipairs { "lxp", "luasql.postgres", "luasql.mysql", "luasql.oci8", "luasql.sqlite", "luasql.odbc", "socket", "xmlrpc", "soap", "lualdap", "logging", "md5", "zip", "stable", "copas", } do - pcall (require, t) + local ok, m = pcall (require, t) + if ok then + _G[t] = m + end end libraries = { "lxp", "luasql", "socket", "xmlrpc", "soap", "lualdap", "logging", "md5", "zip", "stable", "copas", } local colors = { "#999999", "#CCCCCC", "#FFFFFF", } local i = 0 -function color () i = math.mod (i + 1, 3) return colors[i + 1] end +function color () i = math.fmod (i + 1, 3) return colors[i + 1] end function pack_name (p) return string.gsub (p, "^([^.]+).-", "%1") end @@ -29,7 +33,7 @@ <?lua local support = { { "Lua", "_VERSION" }, - { "compat-5.1", "_COMPAT51" }, + --{ "compat-5.1", "_COMPAT51" }, } for _, l in ipairs (support) do bg = color() ?> diff -Nru lua-cgi-5.1.4+dfsg/tests/tcgi1.lua lua-cgi-5.2~alpha2/tests/tcgi1.lua --- lua-cgi-5.1.4+dfsg/tests/tcgi1.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/tests/tcgi1.lua 2013-08-09 13:09:14.000000000 +0000 @@ -1,3 +1,4 @@ +#!/usr/bin/env cgilua.cgi -- $Id: tcgi1.lua,v 1.1 2004/03/25 19:31:05 tomas Exp $ io.stdout:write"Content-type: text/html\n\n" diff -Nru lua-cgi-5.1.4+dfsg/tests/test_conc.lua lua-cgi-5.2~alpha2/tests/test_conc.lua --- lua-cgi-5.1.4+dfsg/tests/test_conc.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/tests/test_conc.lua 2013-08-09 13:09:14.000000000 +0000 @@ -1,3 +1,4 @@ +#!/usr/bin/env cgilua.cgi cgilua.htmlheader() if ap then local pid, ppid = ap.pid () diff -Nru lua-cgi-5.1.4+dfsg/tests/test_cookies.lp lua-cgi-5.2~alpha2/tests/test_cookies.lp --- lua-cgi-5.1.4+dfsg/tests/test_cookies.lp 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/tests/test_cookies.lp 2013-08-09 13:09:14.000000000 +0000 @@ -1,3 +1,4 @@ +#!/usr/bin/env cgilua.cgi <?lua local cookies = require"cgilua.cookies" CL_COOKIE = "cgilua_cookie" diff -Nru lua-cgi-5.1.4+dfsg/tests/test_cookies.lua lua-cgi-5.2~alpha2/tests/test_cookies.lua --- lua-cgi-5.1.4+dfsg/tests/test_cookies.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/tests/test_cookies.lua 2013-08-09 13:09:14.000000000 +0000 @@ -1,3 +1,4 @@ +#!/usr/bin/env cgilua.cgi local cookies = require"cgilua.cookies" CL_COOKIE = "cgilua_cookie" diff -Nru lua-cgi-5.1.4+dfsg/tests/test_err.lua lua-cgi-5.2~alpha2/tests/test_err.lua --- lua-cgi-5.1.4+dfsg/tests/test_err.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/tests/test_err.lua 2013-08-09 13:09:14.000000000 +0000 @@ -1,3 +1,4 @@ +#!/usr/bin/env cgilua.cgi cgilua.htmlheader() cgilua.put"Oi!" --io.write"something\n" diff -Nru lua-cgi-5.1.4+dfsg/tests/test_fs.lua lua-cgi-5.2~alpha2/tests/test_fs.lua --- lua-cgi-5.1.4+dfsg/tests/test_fs.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/tests/test_fs.lua 2013-08-09 13:09:14.000000000 +0000 @@ -1,3 +1,4 @@ +#!/usr/bin/env cgilua.cgi function link_dir (dir, base) local path = base.."/"..dir local mode = lfs.attributes (path).mode @@ -15,7 +16,7 @@ cgilua.put ("<table>\n") cgilua.put ("<tr><td colspan=2>Testing <b>dir</b></td></tr>\n") local i = 0 -local dir = cgi.dir or "." +local dir = cgilua.QUERY.dir or "." for file in lfs.dir (dir) do i = i+1 cgilua.put ("<tr><td>"..i.."</td><td>"..link_dir(file, dir).."</td></tr>\n") diff -Nru lua-cgi-5.1.4+dfsg/tests/test_htk.lua lua-cgi-5.2~alpha2/tests/test_htk.lua --- lua-cgi-5.1.4+dfsg/tests/test_htk.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/tests/test_htk.lua 2013-08-09 13:09:14.000000000 +0000 @@ -1,3 +1,4 @@ +#!/usr/bin/env cgilua.cgi require"htk" local a_table = {} diff -Nru lua-cgi-5.1.4+dfsg/tests/test_lib.lua lua-cgi-5.2~alpha2/tests/test_lib.lua --- lua-cgi-5.1.4+dfsg/tests/test_lib.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/tests/test_lib.lua 2013-08-09 13:09:14.000000000 +0000 @@ -1,3 +1,4 @@ +#!/usr/bin/env cgilua.cgi local function getfield (t, f) for w in string.gfind(f, "[%w_]+") do if not t then return nil end diff -Nru lua-cgi-5.1.4+dfsg/tests/test_main.lp lua-cgi-5.2~alpha2/tests/test_main.lp --- lua-cgi-5.1.4+dfsg/tests/test_main.lp 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/tests/test_main.lp 2013-08-09 13:09:14.000000000 +0000 @@ -1,23 +1,18 @@ +#!/usr/bin/env cgilua.cgi <html> <head><title>Embeded Lua Test</title></head> <body> -cgi = { +cgilua.QUERY = <?lua -for i,v in pairs (cgi) do - if type(v) == "table" then - local vv = "{" - for a,b in pairs(v) do - vv = string.format ("%s%s = %s<br>\n", vv, a, tostring(b)) - end - v = vv.."}" - end +cgilua.serialize = require"cgilua.serialize".serialize +cgilua.serialize (cgilua.QUERY, cgilua.put) +?> +<br> +cgilua.POST = +<?lua +cgilua.serialize (cgilua.POST, cgilua.put) ?> -<%= i %> = <%= tostring(v) %> <br> -<% -end -%> -} <br> Remote address: <%= cgilua.servervariable"REMOTE_ADDR" %> <br> diff -Nru lua-cgi-5.1.4+dfsg/tests/test_main.lua lua-cgi-5.2~alpha2/tests/test_main.lua --- lua-cgi-5.1.4+dfsg/tests/test_main.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/tests/test_main.lua 2013-08-09 13:09:14.000000000 +0000 @@ -1,24 +1,23 @@ +#!/usr/bin/env cgilua.cgi -- $Id: test_main.lua,v 1.11 2006/01/06 16:33:57 tomas Exp $ + +cgilua.serialize = require"cgilua.serialize".serialize + cgilua.htmlheader() cgilua.put[[ <html> <head><title>Script Lua Test</title></head> <body> -cgi = { +cgilua.QUERY = ]] - -for i,v in pairs (cgi) do - if type(v) == "table" then - local vv = "{" - for a,b in pairs(v) do - vv = string.format ("%s%s = %s<br>\n", vv, a, tostring(b)) - end - v = vv.."}" - end - cgilua.put (string.format ("%s = %s<br>\n", i, tostring(v))) -end -cgilua.put "}<br>\n" +cgilua.serialize (cgilua.QUERY, cgilua.put) +cgilua.put[[ +<br> +cgilua.POST = +]] +cgilua.serialize (cgilua.POST, cgilua.put) +cgilua.put "<br>\n" cgilua.put ("Remote address: "..cgilua.servervariable"REMOTE_ADDR") cgilua.put "<br>\n" cgilua.put ("Is persistent = "..tostring (SAPI.Info.ispersistent).."<br>\n") @@ -37,12 +36,12 @@ -- Checking require local status, err = pcall (function () require"unknown_module" end) assert (status == false, "<tt>unknown_module</tt> loaded!") -assert (package == nil, "Access to <tt>package</tt> table allowed!") +--assert (package == nil, "Access to <tt>package</tt> table allowed!") cgilua.put[[ <p> -</body> <small>$Id: test_main.lua,v 1.11 2006/01/06 16:33:57 tomas Exp $</small> +</body> </html> ]] cgilua = nil diff -Nru lua-cgi-5.1.4+dfsg/tests/test_session.lua lua-cgi-5.2~alpha2/tests/test_session.lua --- lua-cgi-5.1.4+dfsg/tests/test_session.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/tests/test_session.lua 2013-08-09 13:09:14.000000000 +0000 @@ -1,4 +1,7 @@ -cgilua.enablesession () +#!/usr/bin/env cgilua.cgi +cgilua.session = require"cgilua.session" +cgilua.session.setdir"/tmp/" +cgilua.session.enable () function pt (tab) for i, v in pairs (tab) do @@ -15,16 +18,16 @@ end -if cgi.field then +if cgilua.POST.field then if not cgilua.session.data.field then cgilua.session.data.field = {} end - table.insert (cgilua.session.data.field, cgi.field) + table.insert (cgilua.session.data.field, cgilua.POST.field) end cgilua.htmlheader() if cgilua.session then - cgilua.put "cgi = {<br>\n" - pt (cgi) + cgilua.put "cgilua.POST = {<br>\n" + pt (cgilua.POST) cgilua.put "}<br>\n" cgilua.put "cgilua.session.data = {<br>\n" pt (cgilua.session.data) @@ -34,7 +37,7 @@ cgilua.put (cgilua.mkurlpath"test_session.lua") cgilua.put [[" method="POST"> field: <input type="text" name="field" value="]] - cgilua.put (cgi.field or "") + cgilua.put (cgilua.POST.field or "") cgilua.put [["><br> <input type="submit"><br> </form>]] diff -Nru lua-cgi-5.1.4+dfsg/tests/test_sql.lua lua-cgi-5.2~alpha2/tests/test_sql.lua --- lua-cgi-5.1.4+dfsg/tests/test_sql.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/tests/test_sql.lua 2013-08-09 13:09:14.000000000 +0000 @@ -1,3 +1,4 @@ +#!/usr/bin/env cgilua.cgi local s = require"luasql.postgres" local env = assert (luasql.postgres ()) diff -Nru lua-cgi-5.1.4+dfsg/tests/test_sql2.lua lua-cgi-5.2~alpha2/tests/test_sql2.lua --- lua-cgi-5.1.4+dfsg/tests/test_sql2.lua 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/tests/test_sql2.lua 2013-08-09 13:09:14.000000000 +0000 @@ -1,3 +1,4 @@ +#!/usr/bin/env cgilua.cgi require"postgres" local env = assert (luasql.postgres ()) diff -Nru lua-cgi-5.1.4+dfsg/tests/test_variables.lp lua-cgi-5.2~alpha2/tests/test_variables.lp --- lua-cgi-5.1.4+dfsg/tests/test_variables.lp 2010-03-22 20:05:00.000000000 +0000 +++ lua-cgi-5.2~alpha2/tests/test_variables.lp 2013-08-09 13:09:14.000000000 +0000 @@ -1,3 +1,4 @@ +#!/usr/bin/env cgilua.cgi <table> <% for _, var in pairs { "SERVER_SOFTWARE", "SERVER_NAME", "GATEWAY_INTERFACE", "SERVER_PROTOCOL", "SERVER_PORT", "REQUEST_METHOD", "PATH_INFO", "PATH_TRANSLATED", "SCRIPT_NAME", "QUERY_STRING", "REMOTE_HOST", "REMOTE_ADDR", "AUTH_TYPE", "REMOTE_USER", "REMOTE_IDENT", "CONTENT_TYPE", "CONTENT_LENGTH", "HTTP_REFERER", "HTTP_COOKIE", "SCRIPT_FILENAME", "DOCUMENT_ROOT", } do %> <tr><td><%= var %><td>=<td>"<%= cgilua.servervariable(var) or "<i>not defined</i>"%>"</tr> @@ -12,3 +13,9 @@ </table> <p> +<% +url = cgilua.mkurlpath'test_variables.lp' +%> +<a href="<%= url %>"><%= url %></a><br> +<a href="test_main.html">test_main.html</a> +<p>