From f599d79cf6bf53ad8e4e3164bc01c9b55ecc199f Mon Sep 17 00:00:00 2001 From: Dylan Lloyd Date: Sun, 10 Apr 2011 02:45:11 -0400 Subject: [PATCH] Merged branch 'dev' into rss --- .htaccess | 6 + captcha.php | 19 + images/dylansserver.png | Bin 0 -> 139364 bytes includes/comment.js | 210 +++++++++ includes/comment_validation.js | 56 +++ includes/{all.js => index.js} | 0 includes/recaptchalib.php | 277 ++++++++++++ includes/style.css | 91 +++- index.php | 764 +++++++++++++++++++++------------ notes/notes.php | 70 --- projects/drawcss.html | 17 - projects/i_like_pandora.html | 17 - projects/peepshow.html | 16 - projects/readoo.html | 13 - projects/repthis.html | 17 - projects/youtube_backup.html | 16 - publish_notes.py | 1 + publish_projects.py | 10 +- sample.ini | 10 + 19 files changed, 1165 insertions(+), 445 deletions(-) create mode 100644 captcha.php create mode 100644 images/dylansserver.png create mode 100644 includes/comment.js create mode 100644 includes/comment_validation.js rename includes/{all.js => index.js} (100%) create mode 100644 includes/recaptchalib.php delete mode 100644 notes/notes.php delete mode 100644 projects/drawcss.html delete mode 100644 projects/i_like_pandora.html delete mode 100644 projects/peepshow.html delete mode 100644 projects/readoo.html delete mode 100644 projects/repthis.html delete mode 100644 projects/youtube_backup.html diff --git a/.htaccess b/.htaccess index ce9fed8..9bd010b 100644 --- a/.htaccess +++ b/.htaccess @@ -5,7 +5,13 @@ RewriteEngine on RewriteRule ^notes/rss/?$ /index.php?rss=true [L] +RewriteRule ^git/?$ /git/gitweb.cgi%{REQUESTURI} [L] + +RewriteRule ^captcha/?$ /index.php [L] + RewriteRule ^note/([^/\.]+)?/?$ /index.php?note=$1 [L] +RewriteRule ^note/([^/\.]+)?/comments/?$ /index.php?comments=true¬e=$1 [L] +RewriteRule ^note/([^/\.]+)?/(comments/)?verify/?$ /index.php?comments=true&verify=true¬e=$1 [L] RewriteRule ^notes/?$ notes/page/1 RewriteRule ^notes/page/?$ notes/page/1 diff --git a/captcha.php b/captcha.php new file mode 100644 index 0000000..f7335b6 --- /dev/null +++ b/captcha.php @@ -0,0 +1,19 @@ +recaptcha_privatekey, + $_SERVER["REMOTE_ADDR"], + $_POST["recaptcha_challenge_field"], + $_POST["recaptcha_response_field"]); +if (!$resp->is_valid) { + die ("The reCAPTCHA wasn't entered correctly. Go back and try it again." . + "(reCAPTCHA said: " . $resp->error . ")"); +} else { + echo "success!"; +} + +?> diff --git a/images/dylansserver.png b/images/dylansserver.png new file mode 100644 index 0000000000000000000000000000000000000000..5943542a7b1e7728a5bd267c35349a22dcdeaa66 GIT binary patch literal 139364 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 literal 0 HcmV?d00001 diff --git a/includes/comment.js b/includes/comment.js new file mode 100644 index 0000000..5a31910 --- /dev/null +++ b/includes/comment.js @@ -0,0 +1,210 @@ +/*! + * jQuery JavaScript Library v1.4.2 + * http://jquery.com/ + * + * Copyright 2010, John Resig + * Dual licensed under the MIT or GPL Version 2 licenses. + * http://jquery.org/license + * + * Includes Sizzle.js + * http://sizzlejs.com/ + * Copyright 2010, The Dojo Foundation + * Released under the MIT, BSD, and GPL Licenses. + * + * Date: Sat Feb 13 22:33:48 2010 -0500 + */ +(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/, +Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&& +(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this, +a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b=== +"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this, +function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b
a"; +var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected, +parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent= +false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n= +s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true, +applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando]; +else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this, +a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b=== +w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i, +cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected= +c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed"); +a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g, +function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split("."); +k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a), +C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B=0){a.type= +e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&& +f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive; +if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data", +e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a, +"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a, +d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, +e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift(); +t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D|| +g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()}, +CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m, +g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)}, +text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}}, +setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return hl[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h= +h[3];l=0;for(m=h.length;l=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m=== +"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g, +h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&& +q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML=""; +if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="

";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}(); +(function(){var g=s.createElement("div");g.innerHTML="
";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}: +function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f0)for(var j=d;j0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j= +{},i;if(f&&a.length){e=0;for(var o=a.length;e-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a=== +"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode", +d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")? +a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType=== +1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/"},F={option:[1,""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div
","
"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d= +c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this}, +wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})}, +prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b, +this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild); +return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja, +""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]); +return this}else{e=0;for(var j=d.length;e0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["", +""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]===""&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e= +c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]? +c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja= +function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter= +Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a, +"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f= +a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b= +a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=//gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!== +"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("
").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this}, +serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), +function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href, +global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&& +e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)? +"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache=== +false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B= +false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since", +c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E|| +d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x); +g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status=== +1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b=== +"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional; +if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration=== +"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]|| +c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start; +this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now= +this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem, +e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b
"; +a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b); +c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a, +d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top- +f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset": +"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in +e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window); +$(document).ready(function() { + $('#recaptcha_widget').show(); + $('.submit').click(function() { + $('#not_human').hide(); + $('#blank_comment').hide(); + $('#comment_text').css('border', '1px solid grey') + $('#recaptcha_response_field').css('border', '1px solid grey') + if ($('#comment_text').val() != '') { + var challenge = Recaptcha.get_challenge(); + var response = Recaptcha.get_response(); + var captcha_data = { "challenge" : challenge, + "response" : response}; + $.ajax({ + type: "GET", + url: "/captcha", + data: captcha_data, + success: function(data) { + if (data.split('\n')[0] == 'true') { + var name = $("#comment_name").val(); + var text = $("#comment_text").val(); + if (name == '') { name = "anon" } + var comment_data = { "captcha" : "passed", + "name" : name, + "text" : text}; + $.ajax({ + type: "POST", + // the url may need to be adjusted for + // trailing slashes + url: "verify", + data: comment_data, + success: function() { + var new_post = "

" + name + "

" + + text + "

"; + $('#comments').prepend(new_post); + $('#comment').hide(); + } + }); + } else { + $('#not_human').show(); + $('#recaptcha_response_field').css('border', '2px solid red') + } + }, + error: function() { + console.log('error'); + }, + complete: function() { + Recaptcha.reload(); + } + }); + } else { + $('#blank_comment').show(); + $('#comment_text').css('border', '2px solid red') + } + return false; + }); +}); diff --git a/includes/comment_validation.js b/includes/comment_validation.js new file mode 100644 index 0000000..6e94941 --- /dev/null +++ b/includes/comment_validation.js @@ -0,0 +1,56 @@ +$(document).ready(function() { + $('#recaptcha_widget').show(); + $('.submit').click(function() { + $('#not_human').hide(); + $('#blank_comment').hide(); + $('#comment_text').css('border', '1px solid grey') + $('#recaptcha_response_field').css('border', '1px solid grey') + if ($('#comment_text').val() != '') { + var challenge = Recaptcha.get_challenge(); + var response = Recaptcha.get_response(); + var captcha_data = { "challenge" : challenge, + "response" : response}; + $.ajax({ + type: "GET", + url: "/captcha", + data: captcha_data, + success: function(data) { + if (data.split('\n')[0] == 'true') { + var name = $("#comment_name").val(); + var text = $("#comment_text").val(); + if (name == '') { name = "anon" } + var comment_data = { "captcha" : "passed", + "name" : name, + "text" : text}; + $.ajax({ + type: "POST", + // the url may need to be adjusted for + // trailing slashes + url: "verify", + data: comment_data, + success: function() { + var new_post = "

" + name + "

" + + text + "

"; + $('#comments').prepend(new_post); + $('#comment').hide(); + } + }); + } else { + $('#not_human').show(); + $('#recaptcha_response_field').css('border', '2px solid red') + } + }, + error: function() { + console.log('error'); + }, + complete: function() { + Recaptcha.reload(); + } + }); + } else { + $('#blank_comment').show(); + $('#comment_text').css('border', '2px solid red') + } + return false; + }); +}); diff --git a/includes/all.js b/includes/index.js similarity index 100% rename from includes/all.js rename to includes/index.js diff --git a/includes/recaptchalib.php b/includes/recaptchalib.php new file mode 100644 index 0000000..32c4f4d --- /dev/null +++ b/includes/recaptchalib.php @@ -0,0 +1,277 @@ + $value ) + $req .= $key . '=' . urlencode( stripslashes($value) ) . '&'; + + // Cut the last '&' + $req=substr($req,0,strlen($req)-1); + return $req; +} + + + +/** + * Submits an HTTP POST to a reCAPTCHA server + * @param string $host + * @param string $path + * @param array $data + * @param int port + * @return array response + */ +function _recaptcha_http_post($host, $path, $data, $port = 80) { + + $req = _recaptcha_qsencode ($data); + + $http_request = "POST $path HTTP/1.0\r\n"; + $http_request .= "Host: $host\r\n"; + $http_request .= "Content-Type: application/x-www-form-urlencoded;\r\n"; + $http_request .= "Content-Length: " . strlen($req) . "\r\n"; + $http_request .= "User-Agent: reCAPTCHA/PHP\r\n"; + $http_request .= "\r\n"; + $http_request .= $req; + + $response = ''; + if( false == ( $fs = @fsockopen($host, $port, $errno, $errstr, 10) ) ) { + die ('Could not open socket'); + } + + fwrite($fs, $http_request); + + while ( !feof($fs) ) + $response .= fgets($fs, 1160); // One TCP-IP packet + fclose($fs); + $response = explode("\r\n\r\n", $response, 2); + + return $response; +} + + + +/** + * Gets the challenge HTML (javascript and non-javascript version). + * This is called from the browser, and the resulting reCAPTCHA HTML widget + * is embedded within the HTML form it was called from. + * @param string $pubkey A public key for reCAPTCHA + * @param string $error The error given by reCAPTCHA (optional, default is null) + * @param boolean $use_ssl Should the request be made over ssl? (optional, default is false) + + * @return string - The HTML to be embedded in the user's form. + */ +function recaptcha_get_html ($pubkey, $error = null, $use_ssl = false) +{ + if ($pubkey == null || $pubkey == '') { + die ("To use reCAPTCHA you must get an API key from https://www.google.com/recaptcha/admin/create"); + } + + if ($use_ssl) { + $server = RECAPTCHA_API_SECURE_SERVER; + } else { + $server = RECAPTCHA_API_SERVER; + } + + $errorpart = ""; + if ($error) { + $errorpart = "&error=" . $error; + } + return ' + + '; +} + + + + +/** + * A ReCaptchaResponse is returned from recaptcha_check_answer() + */ +class ReCaptchaResponse { + var $is_valid; + var $error; +} + + +/** + * Calls an HTTP POST function to verify if the user's guess was correct + * @param string $privkey + * @param string $remoteip + * @param string $challenge + * @param string $response + * @param array $extra_params an array of extra variables to post to the server + * @return ReCaptchaResponse + */ +function recaptcha_check_answer ($privkey, $remoteip, $challenge, $response, $extra_params = array()) +{ + if ($privkey == null || $privkey == '') { + die ("To use reCAPTCHA you must get an API key from https://www.google.com/recaptcha/admin/create"); + } + + if ($remoteip == null || $remoteip == '') { + die ("For security reasons, you must pass the remote ip to reCAPTCHA"); + } + + + + //discard spam submissions + if ($challenge == null || strlen($challenge) == 0 || $response == null || strlen($response) == 0) { + $recaptcha_response = new ReCaptchaResponse(); + $recaptcha_response->is_valid = false; + $recaptcha_response->error = 'incorrect-captcha-sol'; + return $recaptcha_response; + } + + $response = _recaptcha_http_post (RECAPTCHA_VERIFY_SERVER, "/recaptcha/api/verify", + array ( + 'privatekey' => $privkey, + 'remoteip' => $remoteip, + 'challenge' => $challenge, + 'response' => $response + ) + $extra_params + ); + + $answers = explode ("\n", $response [1]); + $recaptcha_response = new ReCaptchaResponse(); + + if (trim ($answers [0]) == 'true') { + $recaptcha_response->is_valid = true; + } + else { + $recaptcha_response->is_valid = false; + $recaptcha_response->error = $answers [1]; + } + return $recaptcha_response; + +} + +/** + * gets a URL where the user can sign up for reCAPTCHA. If your application + * has a configuration page where you enter a key, you should provide a link + * using this function. + * @param string $domain The domain where the page is hosted + * @param string $appname The name of your application + */ +function recaptcha_get_signup_url ($domain = null, $appname = null) { + return "https://www.google.com/recaptcha/admin/create?" . _recaptcha_qsencode (array ('domains' => $domain, 'app' => $appname)); +} + +function _recaptcha_aes_pad($val) { + $block_size = 16; + $numpad = $block_size - (strlen ($val) % $block_size); + return str_pad($val, strlen ($val) + $numpad, chr($numpad)); +} + +/* Mailhide related code */ + +function _recaptcha_aes_encrypt($val,$ky) { + if (! function_exists ("mcrypt_encrypt")) { + die ("To use reCAPTCHA Mailhide, you need to have the mcrypt php module installed."); + } + $mode=MCRYPT_MODE_CBC; + $enc=MCRYPT_RIJNDAEL_128; + $val=_recaptcha_aes_pad($val); + return mcrypt_encrypt($enc, $ky, $val, $mode, "\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0\0"); +} + + +function _recaptcha_mailhide_urlbase64 ($x) { + return strtr(base64_encode ($x), '+/', '-_'); +} + +/* gets the reCAPTCHA Mailhide url for a given email, public key and private key */ +function recaptcha_mailhide_url($pubkey, $privkey, $email) { + if ($pubkey == '' || $pubkey == null || $privkey == "" || $privkey == null) { + die ("To use reCAPTCHA Mailhide, you have to sign up for a public and private key, " . + "you can do so at http://www.google.com/recaptcha/mailhide/apikey"); + } + + + $ky = pack('H*', $privkey); + $cryptmail = _recaptcha_aes_encrypt ($email, $ky); + + return "http://www.google.com/recaptcha/mailhide/d?k=" . $pubkey . "&c=" . _recaptcha_mailhide_urlbase64 ($cryptmail); +} + +/** + * gets the parts of the email to expose to the user. + * eg, given johndoe@example,com return ["john", "example.com"]. + * the email is then displayed as john...@example.com + */ +function _recaptcha_mailhide_email_parts ($email) { + $arr = preg_split("/@/", $email ); + + if (strlen ($arr[0]) <= 4) { + $arr[0] = substr ($arr[0], 0, 1); + } else if (strlen ($arr[0]) <= 6) { + $arr[0] = substr ($arr[0], 0, 3); + } else { + $arr[0] = substr ($arr[0], 0, 4); + } + return $arr; +} + +/** + * Gets html to display an email address given a public an private key. + * to get a key, go to: + * + * http://www.google.com/recaptcha/mailhide/apikey + */ +function recaptcha_mailhide_html($pubkey, $privkey, $email) { + $emailparts = _recaptcha_mailhide_email_parts ($email); + $url = recaptcha_mailhide_url ($pubkey, $privkey, $email); + + return htmlentities($emailparts[0]) . "...@" . htmlentities ($emailparts [1]); + +} + + +?> diff --git a/includes/style.css b/includes/style.css index 1af153d..3613b69 100644 --- a/includes/style.css +++ b/includes/style.css @@ -5,6 +5,12 @@ h3 { margin-top:15px; + font-family:sans-serif; +} + +h1, h2 { + font-family:sans-serif; + font-size:150%; } a { @@ -134,28 +140,101 @@ li { /* notes */ #notes, #note { - float:right; text-align:right; margin-top:20px; } -#notes h2, #note h2 { +#notes h1 { margin-bottom:10px; - font-family:sans-serif; +} + + +.date { + color:grey; +} + +#comment_link { + font-size:80%; } .note { margin-bottom:40px; } -.note p { - margin-bottom:5px; +p { + margin-top:15px; } pre { - margin-top:10px; + margin-top:20px; + margin-bottom:20px; } #navigation { text-align:right; + font-family:sans-serif; +} + +#comments { + border-right:1px solid black; + padding-right:15px; +} + +.comment { + margin-bottom:30px; +} + +#comment { + padding-right:15px; + border-right:1px solid black; + margin-top:15px; + text-align:right; +} + +#comment input { + border:1px solid grey; +} + +#comment textarea { + border:1px solid grey; +} + +#comment .submit { + background:#FFF; + border:1px solid white; + color:blue; + cursor:pointer; + font-size:120%; + font-weight:bold; +} + +#recaptcha_widget { + position:relative; +} + +#recaptcha_image { + position:absolute; + top:0px; + right:0px; +} + +#recaptcha_widget { + display:none; +} + +#not_human { + display:none; + font-weight:bold; + font-family:sans-serif; + color:red; + margin-top:15px; + margin-bottom:15px; +} + +#blank_comment { display:none; + font-weight:bold; + font-family:sans-serif; + color:red; + margin-top:15px; + margin-bottom:15px; } diff --git a/index.php b/index.php index 8fe0432..1a495ac 100644 --- a/index.php +++ b/index.php @@ -1,74 +1,83 @@ config_file); + $config = parse_ini_file($this->config_file, true); $this->db = new mysqli( - $config['domain'], - $config['user'], - $config['password'], - $config['database']); - if (mysqli_connect_errno()) { - echo "Problem connecting to database: "; - echo mysqli_connect_error(); - exit(); - } - ob_start(); + $config[database]['domain'], + $config[database]['user'], + $config[database]['password'], + $config[database]['database']); + if (mysqli_connect_errno()) { + echo "Problem connecting to database: "; + echo mysqli_connect_error(); + exit(); + } + $this->recaptcha_publickey = $config['recaptcha']['publickey']; + $this->recaptcha_privatekey = $config['recaptcha']['privatekey']; + $this->title = $config['site']['default_title']; + $this->home_link = $config['site']['home_link']; + ob_start(); } public static function determine_type() { if (isset($_GET['page']) && is_numeric($_GET['page'])) { - return 'page'; - } else if (isset($_GET['year'])) { - return 'archive'; - } else if (isset($_GET['note'])) { - return 'note'; - } else if ($_SERVER['REQUEST_URI'] == '/') { + return 'page'; + } else if (isset($_GET['year'])) { + return 'archive'; + } else if (isset($_GET['note'])) { + return 'note'; + } else if ($_SERVER['REQUEST_URI'] == '/') { return 'index'; - } else if (isset($_GET['project'])) { + } else if (isset($_GET['project'])) { return 'project'; } else if (isset($_GET['rss'])) { return 'rss'; - } + } else if (isset($_GET['challenge'])) { + return 'captcha'; + } } public function query() { $args = func_get_args(); - $statement = $this->db->prepare($args[0]); - $args = array_slice($args, 1); - call_user_func_array(array($statement, 'bind_param'), &$args); - $statement->execute(); - $return = array(); - $statement->store_result(); - $row = array(); - $data = $statement->result_metadata(); - $fields = array(); - $fields[0] = &$statement; - while($field = $data->fetch_field()) { - $fields[] = &$row[$field->name]; - } - call_user_func_array("mysqli_stmt_bind_result", $fields); - $i = 0; - while ($statement->fetch()) { - foreach ($row as $key1=>$value1) $return[$i][$key1] = $value1; - $i++; - } - $statement->free_result(); - return $return; - } - - public function display_head($title = "dylanstestserver", - $home_link = "/") { - $scripts = ""; - $stylesheets = ""; - if (cms::determine_type() == "index") { - $scripts = ""; - $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylanstestserver.com&ucn_task=conformance#"; - } - echo <<db->prepare($args[0]); + $args = array_slice($args, 1); + call_user_func_array(array($statement, 'bind_param'), &$args); + $statement->execute(); + $return = array(); + $statement->store_result(); + $row = array(); + $data = $statement->result_metadata(); + $fields = array(); + $fields[0] = &$statement; + while($field = $data->fetch_field()) { + $fields[] = &$row[$field->name]; + } + call_user_func_array("mysqli_stmt_bind_result", $fields); + $i = 0; + while ($statement->fetch()) { + foreach ($row as $key=>$value) $return[$i][$key] = $value; + $i++; + } + $statement->free_result(); + return $return; + } + + public function display_head($title = "dylansserver", + $home_link = "/") { + $scripts = $this->scripts; + $stylesheets = ""; + $home_link = "http://validator.w3.org/unicorn/check?ucn_uri=dylansserver.com&ucn_task=conformance#"; + echo << @@ -78,8 +87,8 @@ abstract class cms { "HTML Tidy for Linux (vers 25 March 2009), see www.w3.org"> - $title - + $this->title + $stylesheets $scripts @@ -87,8 +96,8 @@ abstract class cms {
@@ -101,34 +110,37 @@ END_OF_HEAD; +
END_OF_CONTACT; } public function display_close($show_contact = true) { if ($show_contact) { - $this->display_contact(); - } + $this->display_contact(); + } echo << -
+

END_OF_CLOSE; - ob_flush(); - } + ob_flush(); + } } + class index extends cms { - public function display() { - $this->display_head(); - $this->display_exhibits(); - echo "
    "; - $this->list_projects(); - echo <<scripts = ""; + $this->display_head(); + $this->display_exhibits(); + echo "
      "; + $this->list_projects(); + echo <<

      things i've done for others:

      @@ -150,7 +162,8 @@ class index extends cms {

      my repositories:

      -
    • git://dylanstestserver.com
    • +
    • git://dylansserver.com
    • some notes:

      @@ -162,57 +175,63 @@ class index extends cms {
    • OTHER_PROJECTS; - // Because of the CSS necessary for the animations, - // the contact link needs to be in #portfolio to clear - // the floats. - echo "
    • "; - $this->display_contact(); - echo "
    • "; - echo "
    "; - $this->display_close($show_contact = false); - } + // Because of the CSS necessary for the animations, + // the contact link needs to be in #portfolio to clear + // the floats. + echo "
  • "; + $this->display_contact(); + echo "
  • "; + echo "
"; + $this->display_close($show_contact = false); + } - protected function display_exhibits() { - echo "
"; - $sql = "SELECT text FROM projects"; - $result = $this->db->query($sql); - while ($entry = $result->fetch_object()) { - echo $entry->text; - } - echo "
"; - } + protected function display_exhibits() { + echo "
"; + $sql = "SELECT text FROM projects"; + $result = $this->db->query($sql); + while ($entry = $result->fetch_object()) { + echo $entry->text; + } + echo "
"; + } - private function list_projects() { - echo <<

my projects:

HEREDOC; - $sql = "SELECT title FROM projects"; - $result = $this->db->query($sql); - while ($entry = $result->fetch_object()) { - echo "
  • title\">$entry->title
  • "; - } - } + $sql = "SELECT title FROM projects"; + $result = $this->db->query($sql); + while ($entry = $result->fetch_object()) { + echo "
  • $entry->title
  • "; + } + } + } + class project extends index { - protected function display_exhibits() { - echo "
    "; - $sql = "SELECT text FROM projects - WHERE title = ?"; - $result = $this->query($sql, "s", $_GET['project']); - if ($result = $result[0]['text']) { - $text = str_replace("class=\"exhibit\"", "class=\"exhibit\" style=\"display:block;\"", $result); - echo $text; - echo "
    "; - } else { - throw new notFound(); - } - } + + protected function display_exhibits() { + echo "
    "; + $sql = "SELECT text FROM projects + WHERE title = ?"; + $result = $this->query($sql, "s", $_GET['project']); + if ($result = $result[0]['text']) { + $text = str_replace("class='exhibit'", "class='exhibit' style='display:block;'", $result); + echo $text; + echo "
    "; + } else { + throw new notFound(); + } + } + } + class page extends cms { + private $page = 1; private $offset = 0; private $notes_per_page = 4; @@ -220,116 +239,301 @@ class page extends cms { public function __construct() { parent::__construct(); - $this->page_offset(); + $this->page_offset(); } private function page_offset() { - $sql = "SELECT COUNT(*) FROM notes"; - $result = $this->db->query($sql); - $result = $result->fetch_array(); - $this->number_of_pages = ceil($result[0] / $this->notes_per_page); - if (isset($_GET['page']) && is_numeric($_GET['page'])) { - $this->page = (int) $_GET['page']; - } else { - throw new notFound(); - } - if ($this->page > $this->number_of_pages) { - throw new notFound(); - } - if ($this->page < 1) { - throw new notFound(); - } - $this->offset = ($this->page - 1) * $this->notes_per_page; + $sql = "SELECT COUNT(*) FROM notes"; + $result = $this->db->query($sql); + $result = $result->fetch_array(); + $this->number_of_pages = ceil($result[0] / $this->notes_per_page); + if (isset($_GET['page']) && is_numeric($_GET['page'])) { + $this->page = (int) $_GET['page']; + } else { + throw new notFound(); + } + if ($this->page > $this->number_of_pages) { + throw new notFound(); + } + if ($this->page < 1) { + throw new notFound(); + } + $this->offset = ($this->page - 1) * $this->notes_per_page; } public function display() { $this->display_head(); - echo "
    "; + echo "
    "; $sql = "SELECT date_posted, title, url, text FROM notes ORDER BY date_posted DESC - LIMIT ?, ?"; - $result = $this->query($sql, "ii", - $this->offset, - $this->notes_per_page); - foreach ($result as $row => $entry) { - $title = $entry['title']; - $url = '/note/' . $entry['url']; - $date_posted = explode("-", $entry['date_posted']); - $year_posted = $date_posted[0]; - $month_posted = $date_posted[1]; - $datetime_posted = explode(' ', $date_posted[2]); - $day_posted = $datetime_posted[0]; - echo "
    "; - echo "

    $year_posted/$month_posted/$day_posted/$title

    "; - echo $entry['text']; - echo "
    "; - } - echo "
    "; - $this->write_navigation(); + LIMIT ?, ?"; + $result = $this->query($sql, "ii", + $this->offset, + $this->notes_per_page); + foreach ($result as $row => $entry) { + $title = $entry['title']; + $url = '/note/' . $entry['url']; + $date_posted = explode("-", $entry['date_posted']); + $year_posted = $date_posted[0]; + $month_posted = $date_posted[1]; + $datetime_posted = explode(' ', $date_posted[2]); + $day_posted = $datetime_posted[0]; + $text = $entry['text']; + echo << +

    + $year_posted/$month_posted/$day_posted/$title +

    + $text +
    +END_NOTE; + } + echo ""; + $this->write_navigation(); $this->display_close(); } private function write_navigation() { - echo "
    "; - echo "

    "; + echo "

    "; echo "
    "; } } + class note extends cms { + private $id; + private $comments_enabled = false; + private $failed_captcha; + public $url; + public $title; + public $year_posted; + public $month_posted; + public $day_posted; + public $text; + public $number_of_comments; + public function __construct() { + if (isset($_GET['comments'])) { + $this->scripts = " + + "; + } parent::__construct(); - $this->check_exists(); - } - - private function check_exists() { - $sql = "SELECT COUNT(*) FROM notes - WHERE url = ?"; - $results = $this->query($sql, "s", $_GET['note']); - if ($results[0]["COUNT(*)"] != 1) { - throw new notFound(); - } + if (isset($_GET['comments'])) { + $this->comments_enabled = true; + } + $url = htmlspecialchars($_SERVER['REQUEST_URI']); + if (isset($_GET['verify'])) { + $url = substr($url, 0, (strlen($url)-6)); + } + $this->url = $url; + $sql = "SELECT title, date_posted, text, id + FROM notes WHERE url = ?"; + $result = $this->query($sql, "s", + $_GET['note']); + if ($result) { + $entry = $result[0]; + $this->id = $entry["id"]; + $this->title = $entry["title"]; + $date_posted = explode("-", $entry["date_posted"]); + $this->year_posted = $date_posted[0]; + $this->month_posted = $date_posted[1]; + $datetime_posted = explode(' ', $date_posted[2]); + $this->day_posted = $datetime_posted[0]; + $this->text = $entry["text"]; + } else { + throw new notFound(); + } + $sql = "SELECT COUNT(*) FROM comments + WHERE note = $this->id"; + $result = $this->db->query($sql); + $result = $result->fetch_array(); + $this->number_of_comments = $result[0]; + if (isset($_GET['verify'])) { + $this->verify(); + } } public function display() { - $this->display_head(); - $sql = "SELECT title, date_posted, text - FROM notes WHERE url = ?"; - $result = $this->query($sql, "s", - $_GET['note']); - $entry = $result[0]; - $title = $entry["title"]; - $date_posted = explode("-", $entry["date_posted"]); - $year_posted = $date_posted[0]; - $month_posted = $date_posted[1]; - $datetime_posted = explode(' ', $date_posted[2]); - $day_posted = $datetime_posted[0]; - echo "
    "; - echo "

    $year_posted/$month_posted/$day_posted/$title

    "; - echo $entry['text']; - $this->write_navigation(); + $this->display_head(); + $this->display_note(); + if ($this->comments_enabled) { + $this->display_comments(); + $this->display_comment_form(); + } + $this->write_navigation(); $this->display_close(); } + private function verify() { + if (!isset($_POST['captcha'])) { + require_once('includes/recaptchalib.php'); + echo "
    "; + $resp = recaptcha_check_answer ($this->recaptcha_privatekey, + $_SERVER["REMOTE_ADDR"], + $_POST["recaptcha_challenge_field"], + $_POST["recaptcha_response_field"]); + if (!$resp->is_valid) { + $this->failed_captcha = true; + } + } + if (isset($_POST['captcha']) || $resp->is_valid) { + $sql = ("INSERT INTO comments (date_posted, author, + text, note) + VALUES(NOW(), ?, ?, ?)"); + $stmt = $this->db->prepare($sql); + // Checks are needed here (no blank text, + // and a default author needs to be set + // for no-javascript users. + $stmt->bind_param('sss', + htmlspecialchars($_POST['name']), + htmlspecialchars($_POST['text']), + $this->id); + $stmt->execute(); + } + } + + private function display_note() { + echo << +

    $this->year_posted/$this->month_posted/$this->day_posted/$this->title

    + $this->text +
    +END_OF_NOTE; + } + private function write_navigation() { - echo "
    "; - echo "
    "; - echo "

    "; - echo "notes/"; - echo "

    "; + echo << + +END_OF_NAVIGATION; + } + + private function display_comment_link() { + if ($this->number_of_comments > 0) { + $anchor_text = "comments($this->number_of_comments)/"; + } else { + $anchor_text = "comment?"; + } + if (substr($this->url, (strlen($this->url)-1), strlen($this->url)) == '/') { + $url = $this->url . 'comments/'; + } else { + $url = $this->url . '/comments/'; + } + echo "$anchor_text"; + } + + private function display_comments() { + echo "
    "; + $sql= "SELECT date_posted, author, text + FROM comments WHERE note = ? + ORDER BY date_posted DESC"; + $result = $this->query($sql, 'd', $this->id); + foreach ($result as $row => $entry) { + $date_posted = $entry['date_posted']; + $author = $entry['author']; + $text = htmlspecialchars($entry['text']); + $head = "

    $author

    "; + echo << + $head + $text +
    +END_OF_COMMENT; + } echo "
    "; } + + private function display_comment_form() { + $publickey = $this->recaptcha_publickey; + echo << +Recaptcha.create("$publickey", + "recaptcha_div", + { + theme : 'custom', + custom_theme_widget: 'recaptcha_widget', + callback: Recaptcha.focus_response_field + }); + +END_CAPTCHA_STYLE; + require_once('includes/recaptchalib.php'); + $url = $this->url . "verify"; + echo "
    "; + echo << +

    comment:

    + +

    name:

    + + + +
    +

    what's this say?

    +

    enter the numbers you hear:

    + + ( another / + audio / + imagehelp ) + +

    + +

    +
    +
    +
    +



    +
    +END_OF_FORM; + echo recaptcha_get_html($this->recaptcha_publickey); + if ($this->failed_captcha) { + echo << + reCAPTCHA said you're not human,
    + try again? + + + + +END_OF_ERRORS; + } else { + echo << + reCAPTCHA said you're not human,
    + try again? + +
    + but you didn't write anything!
    +
    +END_OF_ERRORS; + } + echo << + + +END_OF_FORM; + } } @@ -341,80 +545,79 @@ class archive extends cms { private function check_exists() { $sql = "SELECT COUNT(*) FROM notes - WHERE url = ?"; - $results = $this->query($sql, "s", $_GET['note']); - if ($results[0]["COUNT(*)"] != 1) { - $this->not_found(); - } + WHERE url = ?"; + $results = $this->query($sql, "s", $_GET['note']); + if ($results[0]["COUNT(*)"] != 1) { + $this->not_found(); + } } public function display() { - // this really needs its own pagination... - // there should be a class for that. - $this->display_head(); - switch (true) { - case (isset($_GET['year']) && !isset($_GET['month']) - && !isset($_GET['day'])): - $sql = "SELECT title, url, date_posted, text - FROM notes WHERE YEAR(date_posted) = ? - ORDER BY date_posted DESC"; - $result = $this->query($sql, "d", - $_GET['year']); - break; - case (isset($_GET['year']) && isset($_GET['month']) - && !isset($_GET['day'])): - $sql = "SELECT title, url, date_posted, text - FROM notes WHERE YEAR(date_posted) = ? - AND MONTH(date_posted) = ? - ORDER BY date_posted DESC"; - $result = $this->query($sql, "dd", - $_GET['year'], $_GET['month']); - break; - case (isset($_GET['year']) && isset($_GET['month']) - && isset($_GET['day'])): - $sql = "SELECT title, url, date_posted, text - FROM notes WHERE YEAR(date_posted) = ? - AND MONTH(date_posted) = ? - AND DAY(date_posted) = ? - ORDER BY date_posted DESC"; - $result = $this->query($sql, "ddd", - $_GET['year'], $_GET['month'], - $_GET['day']); - break; - } - if (count($result) >= 1) { - echo "
    "; - foreach ($result as $row => $entry) { - $title = $entry['title']; - $url = '/note/' . $entry['url']; - $date_posted = explode("-", $entry['date_posted']); - $year_posted = $date_posted[0]; - $month_posted = $date_posted[1]; - $datetime_posted = explode(' ', $date_posted[2]); - $day_posted = $datetime_posted[0]; - echo "
    "; - echo "

    $year_posted/$month_posted/$day_posted/$title

    "; - echo $entry['text']; - echo "
    "; - } - echo "
    "; - $this->write_navigation(); - } else { - echo "
    "; - echo "

    sorry, nothing here

    "; - echo "
    Empty set (0.00 sec)
    "; - } + $this->display_head(); + switch (true) { + case (isset($_GET['year']) && !isset($_GET['month']) + && !isset($_GET['day'])): + $sql = "SELECT title, url, date_posted, text + FROM notes WHERE YEAR(date_posted) = ? + ORDER BY date_posted DESC"; + $result = $this->query($sql, "d", + $_GET['year']); + break; + case (isset($_GET['year']) && isset($_GET['month']) + && !isset($_GET['day'])): + $sql = "SELECT title, url, date_posted, text + FROM notes WHERE YEAR(date_posted) = ? + AND MONTH(date_posted) = ? + ORDER BY date_posted DESC"; + $result = $this->query($sql, "dd", + $_GET['year'], $_GET['month']); + break; + case (isset($_GET['year']) && isset($_GET['month']) + && isset($_GET['day'])): + $sql = "SELECT title, url, date_posted, text + FROM notes WHERE YEAR(date_posted) = ? + AND MONTH(date_posted) = ? + AND DAY(date_posted) = ? + ORDER BY date_posted DESC"; + $result = $this->query($sql, "ddd", + $_GET['year'], $_GET['month'], + $_GET['day']); + break; + } + if (count($result) >= 1) { + echo "
    "; + foreach ($result as $row => $entry) { + $title = $entry['title']; + $url = '/note/' . $entry['url']; + $date_posted = explode("-", $entry['date_posted']); + $year_posted = $date_posted[0]; + $month_posted = $date_posted[1]; + $datetime_posted = explode(' ', $date_posted[2]); + $day_posted = $datetime_posted[0]; + echo "
    "; + echo "

    "; + echo "$year_posted/$month_posted/$day_posted/"; + echo "$title

    "; + echo $entry['text']; + echo "
    "; + } + echo "
    "; + $this->write_navigation(); + } else { + echo "
    "; + echo "

    sorry, nothing here

    "; + echo "
    Empty set (0.00 sec)
    "; + } $this->display_close(); } private function write_navigation() { - echo "
    "; - echo "
    "; - echo "

    "; - // fill me in! - echo "

    "; + echo "
    "; + echo ""; } + } @@ -463,39 +666,62 @@ END_OF_ENTRY; class notFound extends Exception { - public function __construct() { - header("HTTP/1.0 404 Not Found"); - ob_end_clean(); - include("404.php"); - exit(); - } + + public function __construct() { + header('HTTP/1.0 404 Not Found'); + ob_end_clean(); + include('404.php'); + exit(); + } + +} + + +class captcha extends cms { + + public function display() { + $challenge = $_GET['challenge']; + $response = $_GET['response']; + $remoteip = $_SERVER['REMOTE_ADDR']; + $curl = curl_init('http://api-verify.recaptcha.net/verify?'); + curl_setopt ($curl, CURLOPT_POST, 4); + curl_setopt ($curl, CURLOPT_POSTFIELDS, "privatekey=$this->recaptcha_privatekey&remoteip=$remoteip&challenge=$challenge&response=$response"); + $result = curl_exec ($curl); + curl_close ($curl); + } + } + ## now actually do something: switch (cms::determine_type()) { - case "index": + case 'index': $index = new index(); - $index->display(); - break; - case "project": + $index->display(); + break; + case 'project': $project = new project(); - $project->display(); - break; - case "note": + $project->display(); + break; + case 'note': $note = new note; - $note->display(); - break; - case "page": + $note->display(); + break; + case 'page': $page = new page; - $page->display(); - break; - case "archive": - $archive = new archive; - $archive->display(); - break; + $page->display(); + break; case "rss": $rss = new rss(); $rss->display(); + case 'archive': + $archive = new archive; + $archive->display(); + break; + case "captcha": + $captcha = new captcha; + $captcha->display(); + break; } ?> diff --git a/notes/notes.php b/notes/notes.php deleted file mode 100644 index e71ae69..0000000 --- a/notes/notes.php +++ /dev/null @@ -1,70 +0,0 @@ -"; - $title = $note['title']; - $date_posted = explode("-", $note['date_posted']); - $year_posted = $date_posted[0]; - $month_posted = $date_posted[1]; - $day_posted = $date_posted[2]; - echo "

    $year_posted/$month_posted/$day_posted/$title

    "; - echo $note['text']; - echo "
    "; - } - } else { - if (isset($_GET['page']) && is_numeric($_GET['page'])) { - $page = (int) $_GET['page']; - } else { - $page = 1; - } - if ($page < 1) { - $page = 1; - } else if ($page > $total_number_of_pages) { - $page = $total_number_of_pages; - } - $page_offset = ($page - 1) * $notes_per_page; - $notes = mysql_query("SELECT title, date_posted, text, url - FROM notes ORDER BY date_posted DESC - LIMIT $page_offset, $notes_per_page"); - while($note = mysql_fetch_array($notes)) { - echo "
    "; - $title = $note['title']; - $date_posted = explode("-", $note['date_posted']); - $year_posted = $date_posted[0]; - $month_posted = $date_posted[1]; - $day_posted = $date_posted[2]; - $url = $note['url']; - echo "

    $year_posted/$month_posted/$day_posted/$title

    "; - echo $note['text']; - echo "
    "; - } - echo "

    "; - if($page != 1){ - if(!$page == 2 && $total_number_of_pages == 2) - echo "first / "; - $previous_page = $page - 1; - echo "prev"; - } - if($page < $total_number_of_pages) { - $forward_page = $page + 1; - echo "next"; - } - if($page != $total_number_of_pages && (!$page == 1 && $total_number_of_pages == 2)){ - echo " / last"; - } - echo "

    "; - } -?> diff --git a/projects/drawcss.html b/projects/drawcss.html deleted file mode 100644 index e5f8bdd..0000000 --- a/projects/drawcss.html +++ /dev/null @@ -1,17 +0,0 @@ -
    -

    drawcss

    writing markup for website wireframes - always seemed silly.
    - -
    - this is a tool to draw them (it's not done).
    -
    - check - out the invisible elements this page is built on.
    -
    - then get the - code.
    - -
    diff --git a/projects/i_like_pandora.html b/projects/i_like_pandora.html deleted file mode 100644 index 0a615cc..0000000 --- a/projects/i_like_pandora.html +++ /dev/null @@ -1,17 +0,0 @@ -
    -

    i_like_pandora

    searches - youtube for what you - like on pandora.
    - -
    - then it downloads the first video.
    -
    - it's working, but i'm still making it better.
    -
    -
    - the code is free (as in freedom), here.
    - -
    -
    diff --git a/projects/peepshow.html b/projects/peepshow.html deleted file mode 100644 index 08156c5..0000000 --- a/projects/peepshow.html +++ /dev/null @@ -1,16 +0,0 @@ -
    -

    foxy-addons/

    - -

    peepshow

    a - firefox - addon, to load linked images inline (like on reddit).
    - -
    - here's the repo - for the source code.
    -
    diff --git a/projects/readoo.html b/projects/readoo.html deleted file mode 100644 index 1c1919c..0000000 --- a/projects/readoo.html +++ /dev/null @@ -1,13 +0,0 @@ -
    -

    readoo

    helps - you find search keywords to target.
    -
    - it reads your IIS logs, and finds successful keywords - worth focusing on.
    -
    - it's not done yet! here's the source - code.
    - -
    diff --git a/projects/repthis.html b/projects/repthis.html deleted file mode 100644 index c395d49..0000000 --- a/projects/repthis.html +++ /dev/null @@ -1,17 +0,0 @@ -
    - 3D printing is a form of additive - manufacturing technology where a three dimensional object - is created by successive layers of material. [1]:http://en.wikipedia.org/wiki/3D_printing
    - -
    - reprap is a free - - desktop 3D printer capable of printing plastic - objects.
    -
    - repthis.info is the - account of a friend and I learning to build our own.
    -
    -
    diff --git a/projects/youtube_backup.html b/projects/youtube_backup.html deleted file mode 100644 index 8f7767e..0000000 --- a/projects/youtube_backup.html +++ /dev/null @@ -1,16 +0,0 @@ -
    - -

    youtube_backup

    backs - up all the youtube - videos in a users favorites list.
    -
    - this is my fork of the original - youtube_backup which adds asynchronous alerts after - successful downloads.
    -
    - - it's written in python.
    -
    diff --git a/publish_notes.py b/publish_notes.py index 2f99dc6..331030c 100755 --- a/publish_notes.py +++ b/publish_notes.py @@ -25,6 +25,7 @@ for row in results: existing_titles.append(row[0]) for note in notes: + if note[:1] == '.': continue if note == 'index.php' or note == 'notes.php': continue url = note[:note.index('.')] f = open(os.path.join(NOTES_DIRECTORY, note)) diff --git a/publish_projects.py b/publish_projects.py index 7e5535c..14a5772 100755 --- a/publish_projects.py +++ b/publish_projects.py @@ -1,5 +1,7 @@ #!/usr/bin/python +PROJECTS_DIRECTORY = '/home/dylan/docs/projects' + import os import time import MySQLdb as db @@ -11,10 +13,9 @@ domain = config.get('database', 'domain') user = config.get('database', 'user') password = config.get('database', 'password').replace('"', '') database = config.get('database', 'database') -print domain, user, password, database cursor = db.connect(domain, user, password, database).cursor() -notes = os.listdir('projects') +notes = os.listdir(PROJECTS_DIRECTORY) sql = "SELECT title FROM projects" cursor.execute(sql) @@ -24,9 +25,10 @@ for row in results: existing_titles.append(row[0]) for note in notes: + if (note[:1] == '.'): continue title = note[:note.index('.')] - f = open(os.path.join('projects', note)) + f = open(os.path.join(PROJECTS_DIRECTORY, note)) if title in existing_titles: continue text = f.read() cursor.execute("INSERT INTO projects (title, text)\ - VALUES (%s, %s)", (title, text)) + VALUES (%s, %s)", (title, text)) diff --git a/sample.ini b/sample.ini index 67e4350..cb1b244 100644 --- a/sample.ini +++ b/sample.ini @@ -5,3 +5,13 @@ domain = localhost user = dylanstestuser password = "dylanstestpassword" database = dylanstestserver + +[recaptcha] +# sign up here: +# https://www.google.com/recaptcha/admin/create +publickey = +privatekey = + +[site] +default_title = dylanstestserver +home_link = / -- 2.30.2