RubyGems - webroar - Versions diffs - 0.2.2 → 0.2.3 - Mend

webroar 0.2.2 → 0.2.3

Files changed (1735) hide show

data/src/admin_panel/vendor/plugins/open_flash_chart_2/requirements/VERSION.txt ADDED Viewed

	@@ -0,0 +1,2 @@
1	+ VERSION: open-flash-chart-2-ichor
2	+ DATE: 02.05.2009

data/src/admin_panel/vendor/plugins/open_flash_chart_2/requirements/open-flash-chart.swf CHANGED Viewed

Binary file

data/src/admin_panel/vendor/plugins/open_flash_chart_2/requirements/swfobject.js CHANGED Viewed

@@ -1,5 +1,5 @@
-/*	SWFObject v2.0 <http://code.google.com/p/swfobject/>
-	Copyright (c) 2007 Geoff Stearns, Michael Williams, and Bobby van der Sluis
-	This software is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>
+/* SWFObject v2.1 <http://code.google.com/p/swfobject/>
+  Copyright (c) 2007-2008 Geoff Stearns, Michael Williams, and Bobby van der Sluis
+  This software is released under the MIT License <http://www.opensource.org/licenses/mit-license.php>
 */
-var swfobject=function(){var Z="undefined",P="object",B="Shockwave Flash",h="ShockwaveFlash.ShockwaveFlash",W="application/x-shockwave-flash",K="SWFObjectExprInst",G=window,g=document,N=navigator,f=[],H=[],Q=null,L=null,T=null,S=false,C=false;var a=function(){var l=typeof g.getElementById!=Z&&typeof g.getElementsByTagName!=Z&&typeof g.createElement!=Z&&typeof g.appendChild!=Z&&typeof g.replaceChild!=Z&&typeof g.removeChild!=Z&&typeof g.cloneNode!=Z,t=[0,0,0],n=null;if(typeof N.plugins!=Z&&typeof N.plugins[B]==P){n=N.plugins[B].description;if(n){n=n.replace(/^.*\s+(\S+\s+\S+$)/,"$1");t[0]=parseInt(n.replace(/^(.*)\..*$/,"$1"),10);t[1]=parseInt(n.replace(/^.*\.(.*)\s.*$/,"$1"),10);t[2]=/r/.test(n)?parseInt(n.replace(/^.*r(.*)$/,"$1"),10):0}}else{if(typeof G.ActiveXObject!=Z){var o=null,s=false;try{o=new ActiveXObject(h+".7")}catch(k){try{o=new ActiveXObject(h+".6");t=[6,0,21];o.AllowScriptAccess="always"}catch(k){if(t[0]==6){s=true}}if(!s){try{o=new ActiveXObject(h)}catch(k){}}}if(!s&&o){try{n=o.GetVariable("$version");if(n){n=n.split(" ")[1].split(",");t=[parseInt(n[0],10),parseInt(n[1],10),parseInt(n[2],10)]}}catch(k){}}}}var v=N.userAgent.toLowerCase(),j=N.platform.toLowerCase(),r=/webkit/.test(v)?parseFloat(v.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,i=false,q=j?/win/.test(j):/win/.test(v),m=j?/mac/.test(j):/mac/.test(v);/*@cc_on i=true;@if(@_win32)q=true;@elif(@_mac)m=true;@end@*/return{w3cdom:l,pv:t,webkit:r,ie:i,win:q,mac:m}}();var e=function(){if(!a.w3cdom){return }J(I);if(a.ie&&a.win){try{g.write("<script id=__ie_ondomload defer=true src=//:><\/script>");var i=c("__ie_ondomload");if(i){i.onreadystatechange=function(){if(this.readyState=="complete"){this.parentNode.removeChild(this);V()}}}}catch(j){}}if(a.webkit&&typeof g.readyState!=Z){Q=setInterval(function(){if(/loaded|complete/.test(g.readyState)){V()}},10)}if(typeof g.addEventListener!=Z){g.addEventListener("DOMContentLoaded",V,null)}M(V)}();function V(){if(S){return }if(a.ie&&a.win){var m=Y("span");try{var l=g.getElementsByTagName("body")[0].appendChild(m);l.parentNode.removeChild(l)}catch(n){return }}S=true;if(Q){clearInterval(Q);Q=null}var j=f.length;for(var k=0;k<j;k++){f[k]()}}function J(i){if(S){i()}else{f[f.length]=i}}function M(j){if(typeof G.addEventListener!=Z){G.addEventListener("load",j,false)}else{if(typeof g.addEventListener!=Z){g.addEventListener("load",j,false)}else{if(typeof G.attachEvent!=Z){G.attachEvent("onload",j)}else{if(typeof G.onload=="function"){var i=G.onload;G.onload=function(){i();j()}}else{G.onload=j}}}}}function I(){var l=H.length;for(var j=0;j<l;j++){var m=H[j].id;if(a.pv[0]>0){var k=c(m);if(k){H[j].width=k.getAttribute("width")?k.getAttribute("width"):"0";H[j].height=k.getAttribute("height")?k.getAttribute("height"):"0";if(O(H[j].swfVersion)){if(a.webkit&&a.webkit<312){U(k)}X(m,true)}else{if(H[j].expressInstall&&!C&&O("6.0.65")&&(a.win||a.mac)){D(H[j])}else{d(k)}}}}else{X(m,true)}}}function U(m){var k=m.getElementsByTagName(P)[0];if(k){var p=Y("embed"),r=k.attributes;if(r){var o=r.length;for(var n=0;n<o;n++){if(r[n].nodeName.toLowerCase()=="data"){p.setAttribute("src",r[n].nodeValue)}else{p.setAttribute(r[n].nodeName,r[n].nodeValue)}}}var q=k.childNodes;if(q){var s=q.length;for(var l=0;l<s;l++){if(q[l].nodeType==1&&q[l].nodeName.toLowerCase()=="param"){p.setAttribute(q[l].getAttribute("name"),q[l].getAttribute("value"))}}}m.parentNode.replaceChild(p,m)}}function F(i){if(a.ie&&a.win&&O("8.0.0")){G.attachEvent("onunload",function(){var k=c(i);if(k){for(var j in k){if(typeof k[j]=="function"){k[j]=function(){}}}k.parentNode.removeChild(k)}})}}function D(j){C=true;var o=c(j.id);if(o){if(j.altContentId){var l=c(j.altContentId);if(l){L=l;T=j.altContentId}}else{L=b(o)}if(!(/%$/.test(j.width))&&parseInt(j.width,10)<310){j.width="310"}if(!(/%$/.test(j.height))&&parseInt(j.height,10)<137){j.height="137"}g.title=g.title.slice(0,47)+" - Flash Player Installation";var n=a.ie&&a.win?"ActiveX":"PlugIn",k=g.title,m="MMredirectURL="+G.location+"&MMplayerType="+n+"&MMdoctitle="+k,p=j.id;if(a.ie&&a.win&&o.readyState!=4){var i=Y("div");p+="SWFObjectNew";i.setAttribute("id",p);o.parentNode.insertBefore(i,o);o.style.display="none";G.attachEvent("onload",function(){o.parentNode.removeChild(o)})}R({data:j.expressInstall,id:K,width:j.width,height:j.height},{flashvars:m},p)}}function d(j){if(a.ie&&a.win&&j.readyState!=4){var i=Y("div");j.parentNode.insertBefore(i,j);i.parentNode.replaceChild(b(j),i);j.style.display="none";G.attachEvent("onload",function(){j.parentNode.removeChild(j)})}else{j.parentNode.replaceChild(b(j),j)}}function b(n){var m=Y("div");if(a.win&&a.ie){m.innerHTML=n.innerHTML}else{var k=n.getElementsByTagName(P)[0];if(k){var o=k.childNodes;if(o){var j=o.length;for(var l=0;l<j;l++){if(!(o[l].nodeType==1&&o[l].nodeName.toLowerCase()=="param")&&!(o[l].nodeType==8)){m.appendChild(o[l].cloneNode(true))}}}}}return m}function R(AE,AC,q){var p,t=c(q);if(typeof AE.id==Z){AE.id=q}if(a.ie&&a.win){var AD="";for(var z in AE){if(AE[z]!=Object.prototype[z]){if(z=="data"){AC.movie=AE[z]}else{if(z.toLowerCase()=="styleclass"){AD+=' class="'+AE[z]+'"'}else{if(z!="classid"){AD+=" "+z+'="'+AE[z]+'"'}}}}}var AB="";for(var y in AC){if(AC[y]!=Object.prototype[y]){AB+='<param name="'+y+'" value="'+AC[y]+'" />'}}t.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+AD+">"+AB+"</object>";F(AE.id);p=c(AE.id)}else{if(a.webkit&&a.webkit<312){var AA=Y("embed");AA.setAttribute("type",W);for(var x in AE){if(AE[x]!=Object.prototype[x]){if(x=="data"){AA.setAttribute("src",AE[x])}else{if(x.toLowerCase()=="styleclass"){AA.setAttribute("class",AE[x])}else{if(x!="classid"){AA.setAttribute(x,AE[x])}}}}}for(var w in AC){if(AC[w]!=Object.prototype[w]){if(w!="movie"){AA.setAttribute(w,AC[w])}}}t.parentNode.replaceChild(AA,t);p=AA}else{var s=Y(P);s.setAttribute("type",W);for(var v in AE){if(AE[v]!=Object.prototype[v]){if(v.toLowerCase()=="styleclass"){s.setAttribute("class",AE[v])}else{if(v!="classid"){s.setAttribute(v,AE[v])}}}}for(var u in AC){if(AC[u]!=Object.prototype[u]&&u!="movie"){E(s,u,AC[u])}}t.parentNode.replaceChild(s,t);p=s}}return p}function E(k,i,j){var l=Y("param");l.setAttribute("name",i);l.setAttribute("value",j);k.appendChild(l)}function c(i){return g.getElementById(i)}function Y(i){return g.createElement(i)}function O(k){var j=a.pv,i=k.split(".");i[0]=parseInt(i[0],10);i[1]=parseInt(i[1],10);i[2]=parseInt(i[2],10);return(j[0]>i[0]||(j[0]==i[0]&&j[1]>i[1])||(j[0]==i[0]&&j[1]==i[1]&&j[2]>=i[2]))?true:false}function A(m,j){if(a.ie&&a.mac){return }var l=g.getElementsByTagName("head")[0],k=Y("style");k.setAttribute("type","text/css");k.setAttribute("media","screen");if(!(a.ie&&a.win)&&typeof g.createTextNode!=Z){k.appendChild(g.createTextNode(m+" {"+j+"}"))}l.appendChild(k);if(a.ie&&a.win&&typeof g.styleSheets!=Z&&g.styleSheets.length>0){var i=g.styleSheets[g.styleSheets.length-1];if(typeof i.addRule==P){i.addRule(m,j)}}}function X(k,i){var j=i?"visible":"hidden";if(S){c(k).style.visibility=j}else{A("#"+k,"visibility:"+j)}}return{registerObject:function(l,i,k){if(!a.w3cdom||!l||!i){return }var j={};j.id=l;j.swfVersion=i;j.expressInstall=k?k:false;H[H.length]=j;X(l,false)},getObjectById:function(l){var i=null;if(a.w3cdom&&S){var j=c(l);if(j){var k=j.getElementsByTagName(P)[0];if(!k||(k&&typeof j.SetVariable!=Z)){i=j}else{if(typeof k.SetVariable!=Z){i=k}}}}return i},embedSWF:function(n,u,r,t,j,m,k,p,s){if(!a.w3cdom||!n||!u||!r||!t||!j){return }r+="";t+="";if(O(j)){X(u,false);var q=(typeof s==P)?s:{};q.data=n;q.width=r;q.height=t;var o=(typeof p==P)?p:{};if(typeof k==P){for(var l in k){if(k[l]!=Object.prototype[l]){if(typeof o.flashvars!=Z){o.flashvars+="&"+l+"="+k[l]}else{o.flashvars=l+"="+k[l]}}}}J(function(){R(q,o,u);if(q.id==u){X(u,true)}})}else{if(m&&!C&&O("6.0.65")&&(a.win||a.mac)){X(u,false);J(function(){var i={};i.id=i.altContentId=u;i.width=r;i.height=t;i.expressInstall=m;D(i)})}}},getFlashPlayerVersion:function(){return{major:a.pv[0],minor:a.pv[1],release:a.pv[2]}},hasFlashPlayerVersion:O,createSWF:function(k,j,i){if(a.w3cdom&&S){return R(k,j,i)}else{return undefined}},createCSS:function(j,i){if(a.w3cdom){A(j,i)}},addDomLoadEvent:J,addLoadEvent:M,getQueryParamValue:function(m){var l=g.location.search||g.location.hash;if(m==null){return l}if(l){var k=l.substring(1).split("&");for(var j=0;j<k.length;j++){if(k[j].substring(0,k[j].indexOf("="))==m){return k[j].substring((k[j].indexOf("=")+1))}}}return""},expressInstallCallback:function(){if(C&&L){var i=c(K);if(i){i.parentNode.replaceChild(L,i);if(T){X(T,true);if(a.ie&&a.win){L.style.display="block"}}L=null;T=null;C=false}}}}}();
+var swfobject=function(){var b="undefined",Q="object",n="Shockwave Flash",p="ShockwaveFlash.ShockwaveFlash",P="application/x-shockwave-flash",m="SWFObjectExprInst",j=window,K=document,T=navigator,o=[],N=[],i=[],d=[],J,Z=null,M=null,l=null,e=false,A=false;var h=function(){var v=typeof K.getElementById!=b&&typeof K.getElementsByTagName!=b&&typeof K.createElement!=b,AC=[0,0,0],x=null;if(typeof T.plugins!=b&&typeof T.plugins[n]==Q){x=T.plugins[n].description;if(x&&!(typeof T.mimeTypes!=b&&T.mimeTypes[P]&&!T.mimeTypes[P].enabledPlugin)){x=x.replace(/^.*\s+(\S+\s+\S+$)/,"$1");AC[0]=parseInt(x.replace(/^(.*)\..*$/,"$1"),10);AC[1]=parseInt(x.replace(/^.*\.(.*)\s.*$/,"$1"),10);AC[2]=/r/.test(x)?parseInt(x.replace(/^.*r(.*)$/,"$1"),10):0}}else{if(typeof j.ActiveXObject!=b){var y=null,AB=false;try{y=new ActiveXObject(p+".7")}catch(t){try{y=new ActiveXObject(p+".6");AC=[6,0,21];y.AllowScriptAccess="always"}catch(t){if(AC[0]==6){AB=true}}if(!AB){try{y=new ActiveXObject(p)}catch(t){}}}if(!AB&&y){try{x=y.GetVariable("$version");if(x){x=x.split(" ")[1].split(",");AC=[parseInt(x[0],10),parseInt(x[1],10),parseInt(x[2],10)]}}catch(t){}}}}var AD=T.userAgent.toLowerCase(),r=T.platform.toLowerCase(),AA=/webkit/.test(AD)?parseFloat(AD.replace(/^.*webkit\/(\d+(\.\d+)?).*$/,"$1")):false,q=false,z=r?/win/.test(r):/win/.test(AD),w=r?/mac/.test(r):/mac/.test(AD);/*@cc_on q=true;@if(@_win32)z=true;@elif(@_mac)w=true;@end@*/return{w3cdom:v,pv:AC,webkit:AA,ie:q,win:z,mac:w}}();var L=function(){if(!h.w3cdom){return }f(H);if(h.ie&&h.win){try{K.write("<script id=__ie_ondomload defer=true src=//:><\/script>");J=C("__ie_ondomload");if(J){I(J,"onreadystatechange",S)}}catch(q){}}if(h.webkit&&typeof K.readyState!=b){Z=setInterval(function(){if(/loaded|complete/.test(K.readyState)){E()}},10)}if(typeof K.addEventListener!=b){K.addEventListener("DOMContentLoaded",E,null)}R(E)}();function S(){if(J.readyState=="complete"){J.parentNode.removeChild(J);E()}}function E(){if(e){return }if(h.ie&&h.win){var v=a("span");try{var u=K.getElementsByTagName("body")[0].appendChild(v);u.parentNode.removeChild(u)}catch(w){return }}e=true;if(Z){clearInterval(Z);Z=null}var q=o.length;for(var r=0;r<q;r++){o[r]()}}function f(q){if(e){q()}else{o[o.length]=q}}function R(r){if(typeof j.addEventListener!=b){j.addEventListener("load",r,false)}else{if(typeof K.addEventListener!=b){K.addEventListener("load",r,false)}else{if(typeof j.attachEvent!=b){I(j,"onload",r)}else{if(typeof j.onload=="function"){var q=j.onload;j.onload=function(){q();r()}}else{j.onload=r}}}}}function H(){var t=N.length;for(var q=0;q<t;q++){var u=N[q].id;if(h.pv[0]>0){var r=C(u);if(r){N[q].width=r.getAttribute("width")?r.getAttribute("width"):"0";N[q].height=r.getAttribute("height")?r.getAttribute("height"):"0";if(c(N[q].swfVersion)){if(h.webkit&&h.webkit<312){Y(r)}W(u,true)}else{if(N[q].expressInstall&&!A&&c("6.0.65")&&(h.win||h.mac)){k(N[q])}else{O(r)}}}}else{W(u,true)}}}function Y(t){var q=t.getElementsByTagName(Q)[0];if(q){var w=a("embed"),y=q.attributes;if(y){var v=y.length;for(var u=0;u<v;u++){if(y[u].nodeName=="DATA"){w.setAttribute("src",y[u].nodeValue)}else{w.setAttribute(y[u].nodeName,y[u].nodeValue)}}}var x=q.childNodes;if(x){var z=x.length;for(var r=0;r<z;r++){if(x[r].nodeType==1&&x[r].nodeName=="PARAM"){w.setAttribute(x[r].getAttribute("name"),x[r].getAttribute("value"))}}}t.parentNode.replaceChild(w,t)}}function k(w){A=true;var u=C(w.id);if(u){if(w.altContentId){var y=C(w.altContentId);if(y){M=y;l=w.altContentId}}else{M=G(u)}if(!(/%$/.test(w.width))&&parseInt(w.width,10)<310){w.width="310"}if(!(/%$/.test(w.height))&&parseInt(w.height,10)<137){w.height="137"}K.title=K.title.slice(0,47)+" - Flash Player Installation";var z=h.ie&&h.win?"ActiveX":"PlugIn",q=K.title,r="MMredirectURL="+j.location+"&MMplayerType="+z+"&MMdoctitle="+q,x=w.id;if(h.ie&&h.win&&u.readyState!=4){var t=a("div");x+="SWFObjectNew";t.setAttribute("id",x);u.parentNode.insertBefore(t,u);u.style.display="none";var v=function(){u.parentNode.removeChild(u)};I(j,"onload",v)}U({data:w.expressInstall,id:m,width:w.width,height:w.height},{flashvars:r},x)}}function O(t){if(h.ie&&h.win&&t.readyState!=4){var r=a("div");t.parentNode.insertBefore(r,t);r.parentNode.replaceChild(G(t),r);t.style.display="none";var q=function(){t.parentNode.removeChild(t)};I(j,"onload",q)}else{t.parentNode.replaceChild(G(t),t)}}function G(v){var u=a("div");if(h.win&&h.ie){u.innerHTML=v.innerHTML}else{var r=v.getElementsByTagName(Q)[0];if(r){var w=r.childNodes;if(w){var q=w.length;for(var t=0;t<q;t++){if(!(w[t].nodeType==1&&w[t].nodeName=="PARAM")&&!(w[t].nodeType==8)){u.appendChild(w[t].cloneNode(true))}}}}}return u}function U(AG,AE,t){var q,v=C(t);if(v){if(typeof AG.id==b){AG.id=t}if(h.ie&&h.win){var AF="";for(var AB in AG){if(AG[AB]!=Object.prototype[AB]){if(AB.toLowerCase()=="data"){AE.movie=AG[AB]}else{if(AB.toLowerCase()=="styleclass"){AF+=' class="'+AG[AB]+'"'}else{if(AB.toLowerCase()!="classid"){AF+=" "+AB+'="'+AG[AB]+'"'}}}}}var AD="";for(var AA in AE){if(AE[AA]!=Object.prototype[AA]){AD+='<param name="'+AA+'" value="'+AE[AA]+'" />'}}v.outerHTML='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000"'+AF+">"+AD+"</object>";i[i.length]=AG.id;q=C(AG.id)}else{if(h.webkit&&h.webkit<312){var AC=a("embed");AC.setAttribute("type",P);for(var z in AG){if(AG[z]!=Object.prototype[z]){if(z.toLowerCase()=="data"){AC.setAttribute("src",AG[z])}else{if(z.toLowerCase()=="styleclass"){AC.setAttribute("class",AG[z])}else{if(z.toLowerCase()!="classid"){AC.setAttribute(z,AG[z])}}}}}for(var y in AE){if(AE[y]!=Object.prototype[y]){if(y.toLowerCase()!="movie"){AC.setAttribute(y,AE[y])}}}v.parentNode.replaceChild(AC,v);q=AC}else{var u=a(Q);u.setAttribute("type",P);for(var x in AG){if(AG[x]!=Object.prototype[x]){if(x.toLowerCase()=="styleclass"){u.setAttribute("class",AG[x])}else{if(x.toLowerCase()!="classid"){u.setAttribute(x,AG[x])}}}}for(var w in AE){if(AE[w]!=Object.prototype[w]&&w.toLowerCase()!="movie"){F(u,w,AE[w])}}v.parentNode.replaceChild(u,v);q=u}}}return q}function F(t,q,r){var u=a("param");u.setAttribute("name",q);u.setAttribute("value",r);t.appendChild(u)}function X(r){var q=C(r);if(q&&(q.nodeName=="OBJECT"||q.nodeName=="EMBED")){if(h.ie&&h.win){if(q.readyState==4){B(r)}else{j.attachEvent("onload",function(){B(r)})}}else{q.parentNode.removeChild(q)}}}function B(t){var r=C(t);if(r){for(var q in r){if(typeof r[q]=="function"){r[q]=null}}r.parentNode.removeChild(r)}}function C(t){var q=null;try{q=K.getElementById(t)}catch(r){}return q}function a(q){return K.createElement(q)}function I(t,q,r){t.attachEvent(q,r);d[d.length]=[t,q,r]}function c(t){var r=h.pv,q=t.split(".");q[0]=parseInt(q[0],10);q[1]=parseInt(q[1],10)||0;q[2]=parseInt(q[2],10)||0;return(r[0]>q[0]||(r[0]==q[0]&&r[1]>q[1])||(r[0]==q[0]&&r[1]==q[1]&&r[2]>=q[2]))?true:false}function V(v,r){if(h.ie&&h.mac){return }var u=K.getElementsByTagName("head")[0],t=a("style");t.setAttribute("type","text/css");t.setAttribute("media","screen");if(!(h.ie&&h.win)&&typeof K.createTextNode!=b){t.appendChild(K.createTextNode(v+" {"+r+"}"))}u.appendChild(t);if(h.ie&&h.win&&typeof K.styleSheets!=b&&K.styleSheets.length>0){var q=K.styleSheets[K.styleSheets.length-1];if(typeof q.addRule==Q){q.addRule(v,r)}}}function W(t,q){var r=q?"visible":"hidden";if(e&&C(t)){C(t).style.visibility=r}else{V("#"+t,"visibility:"+r)}}function g(s){var r=/[\\\"<>\.;]/;var q=r.exec(s)!=null;return q?encodeURIComponent(s):s}var D=function(){if(h.ie&&h.win){window.attachEvent("onunload",function(){var w=d.length;for(var v=0;v<w;v++){d[v][0].detachEvent(d[v][1],d[v][2])}var t=i.length;for(var u=0;u<t;u++){X(i[u])}for(var r in h){h[r]=null}h=null;for(var q in swfobject){swfobject[q]=null}swfobject=null})}}();return{registerObject:function(u,q,t){if(!h.w3cdom||!u||!q){return }var r={};r.id=u;r.swfVersion=q;r.expressInstall=t?t:false;N[N.length]=r;W(u,false)},getObjectById:function(v){var q=null;if(h.w3cdom){var t=C(v);if(t){var u=t.getElementsByTagName(Q)[0];if(!u||(u&&typeof t.SetVariable!=b)){q=t}else{if(typeof u.SetVariable!=b){q=u}}}}return q},embedSWF:function(x,AE,AB,AD,q,w,r,z,AC){if(!h.w3cdom||!x||!AE||!AB||!AD||!q){return }AB+="";AD+="";if(c(q)){W(AE,false);var AA={};if(AC&&typeof AC===Q){for(var v in AC){if(AC[v]!=Object.prototype[v]){AA[v]=AC[v]}}}AA.data=x;AA.width=AB;AA.height=AD;var y={};if(z&&typeof z===Q){for(var u in z){if(z[u]!=Object.prototype[u]){y[u]=z[u]}}}if(r&&typeof r===Q){for(var t in r){if(r[t]!=Object.prototype[t]){if(typeof y.flashvars!=b){y.flashvars+="&"+t+"="+r[t]}else{y.flashvars=t+"="+r[t]}}}}f(function(){U(AA,y,AE);if(AA.id==AE){W(AE,true)}})}else{if(w&&!A&&c("6.0.65")&&(h.win||h.mac)){A=true;W(AE,false);f(function(){var AF={};AF.id=AF.altContentId=AE;AF.width=AB;AF.height=AD;AF.expressInstall=w;k(AF)})}}},getFlashPlayerVersion:function(){return{major:h.pv[0],minor:h.pv[1],release:h.pv[2]}},hasFlashPlayerVersion:c,createSWF:function(t,r,q){if(h.w3cdom){return U(t,r,q)}else{return undefined}},removeSWF:function(q){if(h.w3cdom){X(q)}},createCSS:function(r,q){if(h.w3cdom){V(r,q)}},addDomLoadEvent:f,addLoadEvent:R,getQueryParamValue:function(v){var u=K.location.search||K.location.hash;if(v==null){return g(u)}if(u){var t=u.substring(1).split("&");for(var r=0;r<t.length;r++){if(t[r].substring(0,t[r].indexOf("="))==v){return g(t[r].substring((t[r].indexOf("=")+1)))}}}return""},expressInstallCallback:function(){if(A&&M){var q=C(m);if(q){q.parentNode.replaceChild(M,q);if(l){W(l,true);if(h.ie&&h.win){M.style.display="block"}}M=null;l=null;A=false}}}}}();

data/src/admin_panel/vendor/plugins/open_flash_chart_2/tasks/open_flash_chart_tasks.rake CHANGED Viewed

@@ -3,14 +3,22 @@ namespace :open_flash_chart_2 do
   desc 'Installs required swf in public/ and javascript files to the public/javascripts directory.'
   task :install do
-    FileUtils.cp "#{PLUGIN_ROOT}requirements/open-flash-chart.swf", "#{RAILS_ROOT}/public", :verbose => true
-    FileUtils.cp "#{PLUGIN_ROOT}requirements/swfobject.js", "#{RAILS_ROOT}/public/javascripts", :verbose => true
-    # don't copy json.js file, it's seems tjat everything works without that file
-    #    FileUtils.cp "#{PLUGIN_ROOT}/requirements/json/*.js", "#{RAILS_ROOT}/public/javascripts", :verbose => true
+    FileUtils.cp "#{PLUGIN_ROOT}requirements/open-flash-chart.swf", "#{RAILS_ROOT}/public/", :verbose => true
+    FileUtils.cp "#{PLUGIN_ROOT}requirements/swfobject.js", "#{RAILS_ROOT}/public/javascripts/", :verbose => true
   end
   desc 'Removes the swf and javascripts for the plugin.'
   task :uninstall do
-    FileUtils.rm "#{RAILS_ROOT}/public/javascripts/swfobject.js"
-    FileUtils.rm "#{RAILS_ROOT}/public/open-flash-chart.swf"
+    FileUtils.rm "#{RAILS_ROOT}/public/javascripts/swfobject.js", :force => true, :verbose => true
+    FileUtils.rm "#{RAILS_ROOT}/public/open-flash-chart.swf", :force => true, :verbose => true
+  end
+  desc 'Removes the old swf and javascripts for the plugin and copy new one to public direcory.'
+  task :reinstall do
+    FileUtils.rm "#{RAILS_ROOT}/public/javascripts/swfobject.js", :force => true, :verbose => true
+    FileUtils.rm "#{RAILS_ROOT}/public/open-flash-chart.swf", :force => true, :verbose => true
+    FileUtils.cp "#{PLUGIN_ROOT}requirements/open-flash-chart.swf", "#{RAILS_ROOT}/public/", :verbose => true
+    FileUtils.cp "#{PLUGIN_ROOT}requirements/swfobject.js", "#{RAILS_ROOT}/public/javascripts/", :verbose => true
   end
 end

data/src/head/wr_access_log.c CHANGED Viewed

@@ -1,5 +1,5 @@
 /* WebROaR - Ruby Application Server - http://webroar.in/
- * Copyright (C) 2009  WebROaR
+ * Copyright (C) 2009  Goonj LLC
  *
  * This file is part of WebROaR.
  *
@@ -42,11 +42,11 @@ int wr_access_log(wr_req_t* req) {
   if(fp) {
     char str_time[32];
     get_date_time(str_time, 32);
-    const char *method       = scgi_request_header_get(req->scgi_req, WR_EBB_REQ_METHOD);
-    const char *uri           = scgi_request_header_get(req->scgi_req, WR_EBB_REQ_URI);
-    const char *http_version   = scgi_request_header_get(req->scgi_req, WR_EBB_HTTP_VER);
-    const char *referer       = scgi_request_header_get(req->scgi_req, WR_REQ_REFERER);
-    const char *user_agent   = scgi_request_header_get(req->scgi_req, WR_REQ_USER_AGENT);
+    const char *method = scgi_header_value_get(req->scgi, WR_EBB_REQ_METHOD);
+    const char *uri = scgi_header_value_get(req->scgi, WR_EBB_REQ_URI);
+    const char *http_version = scgi_header_value_get(req->scgi, WR_EBB_HTTP_VER);
+    const char *referer = scgi_header_value_get(req->scgi, WR_REQ_REFERER);
+    const char *user_agent = scgi_header_value_get(req->scgi, WR_REQ_USER_AGENT);
     fprintf(fp,"%s - - [%s] \"%s %s %s\" %d %d \"%s\" \"%s\"\r\n",

data/src/head/wr_access_log.h CHANGED Viewed

@@ -1,5 +1,5 @@
 /* WebROaR - Ruby Application Server - http://webroar.in/
- * Copyright (C) 2009  WebROaR
+ * Copyright (C) 2009  Goonj LLC
  *
  * This file is part of WebROaR.
  *

data/src/head/wr_application.c CHANGED Viewed

@@ -1,5 +1,5 @@
 /* WebROaR - Ruby Application Server - http://webroar.in/
- * Copyright (C) 2009  WebROaR
+ * Copyright (C) 2009  Goonj LLC
  *
  * This file is part of WebROaR.
  *
@@ -78,9 +78,9 @@ void wr_app_wrk_add_timeout_cb(struct ev_loop *loop, ev_timer *w, int revents) {
   // For timebeing sending OK even if some worker failed to connect.
   if(app->in_use == FALSE && app->ctl && app->pending_wkr == 0) {
     LOG_DEBUG(DEBUG,"Some problem occurred while starting Application %s.", app->conf->name.str);
-    scgi_request_add_header(app->ctl->scgi_resp, "STATUS", "ERROR");
+    scgi_header_add(app->ctl->scgi, "STATUS", strlen("STATUS"), "ERROR", strlen("ERROR"));
     err_msg_len = sprintf(err_msg,"The application could not be started due to an error. Please refer '/var/log/webroar/%s.log' and the application log file for details.", app->conf->name.str);
-    scgi_request_add_body(app->ctl->scgi_resp, err_msg, err_msg_len);
+    scgi_body_add(app->ctl->scgi, err_msg, err_msg_len);
     wr_ctl_resp_write(app->ctl);
     app->ctl = NULL;
   } else if(app->in_use == TRUE && TOTAL_WORKER_COUNT(app) < app->conf->min_worker) {
@@ -120,6 +120,24 @@ void wr_app_wrk_remove_cb(struct ev_loop *loop, ev_timer *w, int revents) {
     i = 0;
     index = (app->wkr_que->q_front + i) % app->wkr_que->q_max_size;
     wr_wkr_t *tmp_worker = (wr_wkr_t*)app->wkr_que->q_elements[index];
+    // Get pid of the worker consuming more resident memory
+#ifdef __APPLE__
+    //sprintf(cmd,"ps -o pid -m -p %s | head -n2 | tail -n1 | cut -c-6 > %s",pid_list, WR_HIGH_RSS_PID_FILE);
+	/* TODO: when any shell command is executed using system(), process goes into wait state. It is
+	 observed on only Mac. When tried calling syste() at various interval like after port binding,
+	 controller initialization, forking required worker, daemonizing, activating event loop etc, in all
+	 cases it was working fine. But after dynamically created worker added into service, call to system()
+	 goes into infinite wait.
+	 In this case we would simply pick the first worker from queue and remove it.
+	 */
+    FILE *wfp = fopen(WR_HIGH_RSS_PID_FILE, "w");
+    if(wfp) {
+      fprintf(wfp,"%d", tmp_worker->pid);
+      fclose(wfp);
+	}
+#else
     sprintf(pid_c,"%d",tmp_worker->pid);
     strcpy(pid_list, pid_c);
     i++;
@@ -129,14 +147,15 @@ void wr_app_wrk_remove_cb(struct ev_loop *loop, ev_timer *w, int revents) {
       sprintf(pid_c,",%d", tmp_worker->pid);
       strcat(pid_list, pid_c);
     }
-    // Get pid of the worker consuming more resident memory
     sprintf(cmd,"ps -o pid --sort=rss -p %s | tail -n1 | cut -c-6 > %s",pid_list, WR_HIGH_RSS_PID_FILE);
     LOG_DEBUG(DEBUG,"Formed command to remove worker is %s",cmd);
     system(cmd);
+#endif
     // Read pid from file
     FILE *fp = fopen(WR_HIGH_RSS_PID_FILE, "r");
     if(fp) {
-      unsigned pid;
+      unsigned pid = 0;
       fscanf(fp, "%u", &pid);
       fclose(fp);
       remove(WR_HIGH_RSS_PID_FILE);
@@ -256,12 +275,17 @@ int wr_app_wkr_add(wr_app_t *app) {
 static int wr_app_insert(wr_svr_t* server, wr_app_conf_t* config, wr_ctl_t *ctl) {
   LOG_FUNCTION
   wr_app_t* app = wr_malloc(wr_app_t);
+  short is_static_server = 0;
   if(!app) {
     LOG_ERROR(WARN, "%s() application object allocation failed. Returning ...", __FUNCTION__);
     return -1;
   }
+  if(strcmp(config->name.str, WR_STATIC_FILE_SERVER_NAME) == 0){
+    is_static_server = 1;
+  }
   app->free_wkr_que = wr_queue_new(config->max_worker);
   app->wkr_que = wr_queue_new(config->max_worker);
   app->msg_que = wr_queue_new(WR_MSG_QUE_SIZE);
@@ -277,7 +301,14 @@ static int wr_app_insert(wr_svr_t* server, wr_app_conf_t* config, wr_ctl_t *ctl)
   app->svr = server;
   app->conf = config;
   app->ctl = ctl;
-  wr_req_resolver_add(server, app, config);
+  if(!is_static_server){
+    wr_req_resolver_add(server, app, config);
+    app->next = server->apps;
+    server->apps = app;
+  }else{
+    app->next = NULL;
+    server->static_app = app;
+  }
   app->t_add.data = app->t_remove.data = app->t_add_timeout.data = app;
@@ -285,8 +316,8 @@ static int wr_app_insert(wr_svr_t* server, wr_app_conf_t* config, wr_ctl_t *ctl)
   ev_timer_init (&app->t_remove, wr_app_wrk_remove_cb, 0., WR_LOW_LOAD_LIMIT);
   ev_timer_init (&app->t_add_timeout, wr_app_wrk_add_timeout_cb, 0., WR_WKR_ADD_TIMEOUT);
-  app->next = server->apps;
-  server->apps = app;
+  //app->next = server->apps;
+  //server->apps = app;
   LOG_DEBUG(4,"%s() Application Added:%s", __FUNCTION__, config->name.str);
   app->pending_wkr = 0;
@@ -315,12 +346,16 @@ int wr_app_wrk_insert(wr_svr_t *server, wr_wkr_t *worker,const wr_ctl_msg_t *ctl
   LOG_FUNCTION
   wr_app_t* app = server->apps;
   const char* app_name = ctl_msg->msg.wkr.app_name.str;
+  if(strcmp(app_name, WR_STATIC_FILE_SERVER_NAME) == 0){
+    app = server->static_app;
+  }
   while(app) {
     LOG_DEBUG(DEBUG,"app->a_config->max_worker = %d, app->wkr_que->q_count =%d", app->conf->max_worker, WR_QUEUE_SIZE(app->wkr_que));
     LOG_DEBUG(DEBUG, "Application name = %s, Application->config->name =%s", app_name, app->conf->name.str );
     if(app->conf->max_worker > WR_QUEUE_SIZE(app->wkr_que)
-        && strcmp(app_name, app->conf->name.str)==0) {
+        && strcmp(app_name, app->conf->name.str) == 0) {
       int i;
       for(i = 0; i < app->pending_wkr ; i++) {
         if(app->last_wkr_pid[i] == worker->pid)
@@ -328,7 +363,7 @@ int wr_app_wrk_insert(wr_svr_t *server, wr_wkr_t *worker,const wr_ctl_msg_t *ctl
       }
       if(i == app->pending_wkr) {
-        scgi_request_add_body(worker->ctl->scgi_resp, "Either worker add timeout or worker PID does not match.",
+        scgi_body_add(worker->ctl->scgi, "Either worker add timeout or worker PID does not match.",
                               strlen("Either worker add timeout or worker PID does not match."));
         return -1;
       }
@@ -352,7 +387,7 @@ int wr_app_wrk_insert(wr_svr_t *server, wr_wkr_t *worker,const wr_ctl_msg_t *ctl
         app->in_use = TRUE;
         if(app->ctl) {
           LOG_DEBUG(DEBUG,"Send OK status");
-          scgi_request_add_header(app->ctl->scgi_resp, "STATUS", "OK");
+          scgi_header_add(app->ctl->scgi, "STATUS", strlen("STATUS"), "OK", strlen("OK"));
           wr_ctl_resp_write(app->ctl);
           app->ctl = NULL;
         }
@@ -362,7 +397,7 @@ int wr_app_wrk_insert(wr_svr_t *server, wr_wkr_t *worker,const wr_ctl_msg_t *ctl
     app = app->next;
   }
   LOG_ERROR(SEVERE, "Either queue is full or Baseuri is not matched");
-  scgi_request_add_body(worker->ctl->scgi_resp, "Either queue is full or Baseuri is not matched.",
+  scgi_body_add(worker->ctl->scgi, "Either queue is full or Baseuri is not matched.",
                         strlen("Either queue is full or Baseuri is not matched."));
   return -1;
 }
@@ -373,7 +408,7 @@ int wr_app_remove(wr_svr_t* server, const char* app_name) {
   wr_app_t* app = server->apps, *tmp_app = NULL;
   LOG_DEBUG(DEBUG, "Removing application %s", app_name);
   while(app) {
     if(strcmp(app_name, app->conf->name.str)==0)
       break;
@@ -381,7 +416,7 @@ int wr_app_remove(wr_svr_t* server, const char* app_name) {
     app = app->next;
   }
   if(app) {
-    if(tmp_app) {
+    if(tmp_app) {
       tmp_app->next = app->next;
     } else {
       server->apps = app->next;
@@ -471,8 +506,8 @@ void wr_app_add_cb(wr_ctl_t *ctl, const wr_ctl_msg_t *ctl_msg) {
     }
   }
-  scgi_request_add_header(ctl->scgi_resp, "STATUS", "ERROR");
-  scgi_request_add_body(ctl->scgi_resp, ctl->svr->err_msg, strlen(ctl->svr->err_msg));
+  scgi_header_add(ctl->scgi, "STATUS", strlen("STATUS"), "ERROR", strlen("ERROR"));
+  scgi_body_add(ctl->scgi, ctl->svr->err_msg, strlen(ctl->svr->err_msg));
   wr_ctl_resp_write(ctl);
 }
@@ -480,10 +515,10 @@ void wr_app_add_cb(wr_ctl_t *ctl, const wr_ctl_msg_t *ctl_msg) {
 void wr_app_remove_cb(wr_ctl_t *ctl, const wr_ctl_msg_t *ctl_msg) {
   LOG_FUNCTION
   if(wr_app_remove(ctl->svr, ctl_msg->msg.app.app_name.str) >=0) {
-    scgi_request_add_header(ctl->scgi_resp, "STATUS", "OK");
+    scgi_header_add(ctl->scgi, "STATUS", strlen("STATUS"), "OK", strlen("OK"));
   } else {
-    scgi_request_add_header(ctl->scgi_resp, "STATUS", "ERROR");
-    scgi_request_add_body(ctl->scgi_resp, ctl->svr->err_msg, strlen(ctl->svr->err_msg));
+    scgi_header_add(ctl->scgi, "STATUS", strlen("STATUS"), "ERROR", strlen("ERROR"));
+    scgi_body_add(ctl->scgi, ctl->svr->err_msg, strlen(ctl->svr->err_msg));
   }
   wr_ctl_resp_write(ctl);
 }
@@ -492,7 +527,7 @@ void wr_app_remove_cb(wr_ctl_t *ctl, const wr_ctl_msg_t *ctl_msg) {
 void wr_app_reload_cb(wr_ctl_t *ctl, const wr_ctl_msg_t *ctl_msg) {
   LOG_FUNCTION
   if(wr_app_remove(ctl->svr, ctl_msg->msg.app.app_name.str) < 0) {
-    scgi_request_add_body(ctl->scgi_resp,
+    scgi_body_add(ctl->scgi,
                           "Couldn't remove application. But trying to start appliaction.",
                           strlen("Couldn't remove application. But trying to start appliaction."));
   }
@@ -506,9 +541,8 @@ void wr_app_reload_cb(wr_ctl_t *ctl, const wr_ctl_msg_t *ctl_msg) {
       return;
   } else {
     LOG_DEBUG(WARN, "Error: %s",ctl->svr->err_msg);
-    scgi_request_add_body(ctl->scgi_resp, ctl->svr->err_msg, strlen(ctl->svr->err_msg));
+    scgi_body_add(ctl->scgi, ctl->svr->err_msg, strlen(ctl->svr->err_msg));
   }
-  scgi_request_add_header(ctl->scgi_resp, "STATUS", "ERROR");
+  scgi_header_add(ctl->scgi, "STATUS", strlen("STATUS"), "ERROR", strlen("ERROR"));
   wr_ctl_resp_write(ctl);
 }

data/src/head/wr_application.h CHANGED Viewed

@@ -1,5 +1,5 @@
 /* WebROaR - Ruby Application Server - http://webroar.in/
- * Copyright (C) 2009  WebROaR
+ * Copyright (C) 2009  Goonj LLC
  *
  * This file is part of WebROaR.
  *

data/src/head/wr_config.h CHANGED Viewed

@@ -1,5 +1,5 @@
 /* WebROaR - Ruby Application Server - http://webroar.in/
- * Copyright (C) 2009  WebROaR
+ * Copyright (C) 2009  Goonj LLC
  *
  * This file is part of WebROaR.
  *
@@ -40,6 +40,19 @@
 // Parameter value to enable application analytics
 #define WR_ANALYTICS_ON "enabled"
+// Appliction to serve static files
+#define WR_STATIC_FILE_SERVER_NAME "static-worker"
+// Minimum number of worker to serve static content
+#define WR_STATIC_SVR_MIN_WKR 4
+// Maximum number of worker to serve static content
+#define WR_STATIC_SVR_MAX_WKR 8
+#define WR_HTTP_FILE_PATH        "FILE_PATH"
+#define WR_HTTP_FILE_PATH_LEN      9
+#define RESP_CODE               "RESP_CODE"
+#define RESP_CONTENT_LENGTH   "RESP_CONTENT_LEN"
+#define SCGI_CONTENT_LENGTH "CONTENT_LENGTH"
 /** Folder and file related macros */
 // Server control sock path
 #define WR_CTL_SOCK_PATH "/tmp/webroar_controller_sock"
@@ -68,7 +81,10 @@
 // File to store Server process id
 #define WR_PID_FILE  "/var/run/webroar.pid"
 #define WR_SERVER "WebROaR"
-#define WR_VERSION "0.2.2"
+#define WR_VERSION "0.2.3"
+#define WR_MIME_TYPE_PATH "/conf/mime_type.yml"
+#define WR_CONF_PATH "/conf/config.yml"
+#define WR_SERVER_INTERNAL_CONF_PATH "/conf/server_internal_config.yml"
 /** Private macros */
 /** Application level macros */
@@ -83,7 +99,7 @@
 // Number of seconds with ratio lower than WR_MIN_REQ_RATIO to remove worker.
 #define WR_LOW_LOAD_LIMIT 600.
 // Number of seconds to wait for add signal from worker after incrementing the active worker count
-#define WR_WKR_ADD_TIMEOUT 15.
+#define WR_WKR_ADD_TIMEOUT 25.
 // Number of seconds to wait for response before killing worker.
 #define WR_WKR_KILL_TIMEOUT 10.
@@ -125,4 +141,13 @@
 #define WR_MAX_REQ_HEADER_LEN        112640  /* (1024 * (80 + 32)) */
 #define WR_MAX_REQ_HEADER_NO          40
+#define WR_STACKTRACE_SIZE 50
+#ifdef L_DEBUG
+#define WR_CONN_ID      "CONNECTION_ID"
+#define WR_CONN_ID_LEN    19
+#define WR_REQ_ID        "REQ_ID"
+#define WR_REQ_ID_LEN      12
+#endif
 #endif /*WR_CONFIG_H_*/

data/src/head/wr_configurator.c CHANGED Viewed

@@ -1,5 +1,5 @@
 /* WebROaR - Ruby Application Server - http://webroar.in/
- * Copyright (C) 2009  WebROaR
+ * Copyright (C) 2009  Goonj LLC
  *
  * This file is part of WebROaR.
  *
@@ -23,6 +23,7 @@
 #include <wr_configurator.h>
 #include <wr_config.h>
 #include <sys/stat.h>
+#include <sys/socket.h>
 #include <pwd.h>
 /*********************************************************
@@ -100,10 +101,9 @@ static inline wr_conf_t* wr_conf_new() {
   //Setting default values, can be override by specifying into config.yml
   //conf->no_of_application = 0;
   // Check for POSIX system and set UDS flag
-#ifdef _POSIX_C_SOURCE
+#ifdef AF_UNIX
   conf->uds = 1;
 #else
   conf->uds = 0;
 #endif
   //conf->uds = WR_CONF_UDS;
@@ -726,7 +726,7 @@ static inline int wr_chk_host_within_list(wr_host_name_t *list) {
   while(list) {
     tmp = list->next;
     while(tmp) {
-      if(strncmp(list->name.str, tmp->name.str, tmp->name.len)== 0) {
+      if(list->name.len == tmp->name.len && strncmp(list->name.str, tmp->name.str, tmp->name.len) == 0) {
         return -1;
       }
       tmp = tmp->next;
@@ -741,7 +741,7 @@ static inline int wr_chk_host_lists(wr_host_name_t *list1, wr_host_name_t *list2
   while(list1) {
     while(list2) {
-      if(strncmp(list1->name.str, list2->name.str, list1->name.len)==0) {
+      if(list1->name.len == list2->name.len && strncmp(list1->name.str, list2->name.str, list1->name.len)==0) {
         return -1;
       }
       list2 = list2->next;
@@ -848,6 +848,45 @@ static inline wr_app_conf_t* wr_conf_admin_panel_read(wr_conf_t* conf) {
   return NULL;
 }
+/** Create application configuration for static content server */
+static inline wr_app_conf_t* wr_conf_static_server_read(wr_conf_t* conf) {
+  LOG_FUNCTION
+  struct passwd *user_info=NULL;
+  size_t len;
+  user_info = getpwnam("root");
+  // Check for user privilege
+  if(user_info) {
+    if(geteuid() == user_info->pw_uid && getegid() == user_info->pw_gid) {
+      wr_app_conf_t* app = wr_app_conf_new(conf->server);
+      if(app == NULL) {
+        return NULL;
+      }
+      // Set application name
+      len = strlen(WR_STATIC_FILE_SERVER_NAME);
+      wr_string_new(app->name,WR_STATIC_FILE_SERVER_NAME,len);
+      //Set user & group id
+      app->cgid = user_info->pw_gid;
+      app->cuid = user_info->pw_uid;
+      // Set all other parameter to app name
+      wr_string_dump(app->env,app->name);
+      wr_string_dump(app->baseuri,app->name);
+      wr_string_dump(app->path,app->name);
+      wr_string_dump(app->type,app->name);
+      //Set max_worker & min_processsor
+      app->max_worker = WR_STATIC_SVR_MAX_WKR;
+      app->min_worker = WR_STATIC_SVR_MIN_WKR;
+      return app;
+    }
+  }
+  return NULL;
+}
 /***********************************************************
  *     Configurator API definitions
  ************************************************************/
@@ -860,7 +899,7 @@ int wr_app_conf_remove(wr_conf_t* conf, const char *app_name) {
   LOG_DEBUG(DEBUG, "Removing application %s", app_name);
   // Iterate application nodes
   while(app) {
-    if(strncmp(app_name, app->name.str, app->name.len)==0) //Compare application name
+    if(strcmp(app_name, app->name.str) == 0) //Compare application name
       break;
     tmp_app = app;
     app = app->next;
@@ -874,6 +913,7 @@ int wr_app_conf_remove(wr_conf_t* conf, const char *app_name) {
     }
     app->next = NULL;
     //Destroy application configuration
+    LOG_DEBUG(DEBUG, "Removed application %s", app->name.str);
     wr_app_conf_free(app);
     return 0;
   } else
@@ -891,7 +931,7 @@ wr_app_conf_t* wr_conf_app_read(wr_conf_t* conf, const char *app_name, char* err
   app = conf->apps;
   while(app) {
-    if(strncmp(app->name.str, app_name,app->name.len)==0) {
+    if(strcmp(app->name.str, app_name) == 0) {
       if(err_msg)
         sprintf(err_msg, "Appliation '%s' is already exists", app_name);
       return NULL;
@@ -1112,3 +1152,17 @@ int wr_conf_admin_panel_add(wr_conf_t* conf) {
   return -1;
 }
+/** Add the configuration for static content server */
+int wr_conf_static_server_add(wr_conf_t* conf) {
+  LOG_FUNCTION
+  wr_app_conf_t* app = wr_conf_static_server_read(conf);
+  if(app != NULL) {
+    app->next = conf->apps;
+    conf->apps = app;
+    return 0;
+  }
+  return -1;
+}

data/src/head/wr_configurator.h CHANGED Viewed

@@ -1,5 +1,5 @@
 /* WebROaR - Ruby Application Server - http://webroar.in/
- * Copyright (C) 2009  WebROaR
+ * Copyright (C) 2009  Goonj LLC
  *
  * This file is part of WebROaR.
  *
@@ -52,7 +52,7 @@
 #define WR_CONF_MAX_LEN_APP_NAME  30
 #define WR_CONF_MAX_LEN_USR_NAME  30
-// using '_POSIX_C_SOURCE' macro to identify UDS support.
+// using 'AF_UNIX' macro to identify UDS support.
 //#define WR_CONF_UDS    1
 typedef enum wr_host_type_e{
@@ -138,5 +138,6 @@ void wr_conf_free(wr_conf_t*);
 void wr_conf_display(wr_conf_t*);
 /** Add Admin Panel to configuration data structure */
 int wr_conf_admin_panel_add(wr_conf_t*);
+/** Add the configuration for static content server */
+int wr_conf_static_server_add(wr_conf_t*);
 #endif /*WR_CONFIGURATOR_H_*/