diff --git a/app/main/controller/setup.php b/app/main/controller/setup.php index 9a76a161..a0fbe519 100644 --- a/app/main/controller/setup.php +++ b/app/main/controller/setup.php @@ -211,7 +211,7 @@ class Setup extends Controller { $environmentData[$var] = [ 'label' => $var, - 'value' => ((empty($value)) ? ' ' : $value), + 'value' => ((empty($value) && !is_int($value)) ? ' ' : $value), 'check' => $check ]; } diff --git a/app/main/lib/web.php b/app/main/lib/web.php index 86a0b4b0..99871ac8 100644 --- a/app/main/lib/web.php +++ b/app/main/lib/web.php @@ -113,6 +113,7 @@ class Web extends \Web { $statusCode = $this->getStatusCodeFromHeaders( $result['headers'] ); switch($statusCode){ + case 100: case 200: // request succeeded -> check if response should be cached $ttl = $this->getCacheTimeFromHeaders( $result['headers'] ); diff --git a/app/pathfinder.ini b/app/pathfinder.ini index 0b187e92..2702bb04 100644 --- a/app/pathfinder.ini +++ b/app/pathfinder.ini @@ -3,7 +3,7 @@ [PATHFINDER] NAME = PATHFINDER ; installed version (used for CSS/JS cache busting) -VERSION = v1.0.0RC3 +VERSION = v1.0.0 ; contact information (DO NOT CHANGE) CONTACT = https://github.com/exodus4d ; source code (DO NOT CHANGE) diff --git a/public/js/v1.0.0/app.js b/public/js/v1.0.0/app.js new file mode 100644 index 00000000..12510b02 --- /dev/null +++ b/public/js/v1.0.0/app.js @@ -0,0 +1,2 @@ +var mainScriptPath=document.body.getAttribute("data-script"),jsBaseUrl=document.body.getAttribute("data-js-path");requirejs.config({baseUrl:"js",paths:{layout:"layout",config:"app/config",dialog:"app/ui/dialog",templates:"../../templates",img:"../../img",login:"./app/login",mappage:"./app/mappage",setup:"./app/setup",jquery:"lib/jquery-1.11.3.min",bootstrap:"lib/bootstrap.min",text:"lib/requirejs/text",mustache:"lib/mustache.min",velocity:"lib/velocity.min",velocityUI:"lib/velocity.ui.min",slidebars:"lib/slidebars",jsPlumb:"lib/dom.jsPlumb-1.7.6",farahey:"lib/farahey-0.5",customScrollbar:"lib/jquery.mCustomScrollbar.concat.min",datatables:"lib/datatables/jquery.dataTables.min",datatablesResponsive:"lib/datatables/extensions/responsive/dataTables.responsive",datatablesTableTools:"lib/datatables/extensions/tabletools/js/dataTables.tableTools",xEditable:"lib/bootstrap-editable.min",morris:"lib/morris.min",raphael:"lib/raphael-min",bootbox:"lib/bootbox.min",easyPieChart:"lib/jquery.easypiechart.min",dragToSelect:"lib/jquery.dragToSelect",hoverIntent:"lib/jquery.hoverIntent.minified",fullScreen:"lib/jquery.fullscreen.min",select2:"lib/select2.min",validator:"lib/validator.min",lazylinepainter:"lib/jquery.lazylinepainter-1.5.1.min",blueImpGallery:"lib/blueimp-gallery",blueImpGalleryHelper:"lib/blueimp-helper",blueImpGalleryBootstrap:"lib/bootstrap-image-gallery",bootstrapConfirmation:"lib/bootstrap-confirmation",bootstrapToggle:"lib/bootstrap2-toggle.min",lazyload:"lib/jquery.lazyload.min",easePack:"lib/EasePack.min",tweenLite:"lib/TweenLite.min",pnotify:"lib/pnotify/pnotify.core","pnotify.buttons":"lib/pnotify/pnotify.buttons","pnotify.confirm":"lib/pnotify/pnotify.confirm","pnotify.nonblock":"lib/pnotify/pnotify.nonblock","pnotify.desktop":"lib/pnotify/pnotify.desktop","pnotify.history":"lib/pnotify/pnotify.history","pnotify.callbacks":"lib/pnotify/pnotify.callbacks","pnotify.reference":"lib/pnotify/pnotify.reference"},shim:{bootstrap:{deps:["jquery"]},farahey:{deps:["jsPlumb"]},velocity:{deps:["jquery"]},velocityUI:{deps:["velocity"]},slidebars:{deps:["jquery"]},customScrollbar:{deps:["jquery"]},datatables:{deps:["jquery"]},datatablesBootstrap:{deps:["datatables"]},datatablesResponsive:{deps:["datatables"]},datatablesTableTools:{deps:["datatables"]},xEditable:{deps:["bootstrap"]},bootbox:{deps:["jquery","bootstrap"],exports:"bootbox"},morris:{deps:["jquery","raphael"],exports:"Morris"},pnotify:{deps:["jquery"]},easyPieChart:{deps:["jquery"]},dragToSelect:{deps:["jquery"]},hoverIntent:{deps:["jquery"]},fullScreen:{deps:["jquery"]},select2:{deps:["jquery"],exports:"Select2"},validator:{deps:["jquery","bootstrap"]},lazylinepainter:{deps:["jquery","bootstrap"]},blueImpGallery:{deps:["jquery"]},bootstrapConfirmation:{deps:["bootstrap"]},bootstrapToggle:{deps:["jquery"]},lazyload:{deps:["jquery"]}}});require.config({baseUrl:jsBaseUrl});requirejs([mainScriptPath]); +//# sourceMappingURL=app.js.map \ No newline at end of file diff --git a/public/js/v1.0.0/app.js.map b/public/js/v1.0.0/app.js.map new file mode 100644 index 00000000..e22651fd --- /dev/null +++ b/public/js/v1.0.0/app.js.map @@ -0,0 +1 @@ +{"version":3,"sources":["app.js.src.js"],"names":["mainScriptPath","document","body","getAttribute","jsBaseUrl","requirejs","config","baseUrl","paths","layout","dialog","templates","img","login","mappage","setup","jquery","bootstrap","text","mustache","velocity","velocityUI","slidebars","jsPlumb","farahey","customScrollbar","datatables","datatablesResponsive","datatablesTableTools","xEditable","morris","raphael","bootbox","easyPieChart","dragToSelect","hoverIntent","fullScreen","select2","validator","lazylinepainter","blueImpGallery","blueImpGalleryHelper","blueImpGalleryBootstrap","bootstrapConfirmation","bootstrapToggle","lazyload","easePack","tweenLite","pnotify","pnotify.buttons","pnotify.confirm","pnotify.nonblock","pnotify.desktop","pnotify.history","pnotify.callbacks","pnotify.reference","shim","deps","datatablesBootstrap","exports","require"],"mappings":"AACA,GAAIA,gBAAiBC,SAASC,KAAKC,aAAa,eAI5CC,UAAYH,SAASC,KAAKC,aAAa,eAG3CE,WAAUC,QACNC,QAAS,KAETC,OACIC,OAAQ,SACRH,OAAQ,aACRI,OAAQ,gBACRC,UAAW,kBACXC,IAAK,YAGLC,MAAO,cACPC,QAAS,gBACTC,MAAO,cAEPC,OAAQ,wBACRC,UAAW,oBACXC,KAAM,qBACNC,SAAU,mBACVC,SAAU,mBACVC,WAAY,sBACZC,UAAW,gBACXC,QAAS,wBACTC,QAAS,kBACTC,gBAAiB,yCACjBC,WAAY,uCAEZC,qBAAsB,6DAEtBC,qBAAsB,gEACtBC,UAAW,6BACXC,OAAQ,iBACRC,QAAS,kBACTC,QAAS,kBACTC,aAAc,8BACdC,aAAc,0BACdC,YAAa,kCACbC,WAAY,4BACZC,QAAS,kBACTC,UAAW,oBACXC,gBAAiB,uCACjBC,eAAgB,sBAChBC,qBAAsB,qBACtBC,wBAAyB,8BACzBC,sBAAuB,6BACvBC,gBAAiB,4BACjBC,SAAU,0BAGVC,SAAU,mBACVC,UAAW,oBAGXC,QAAS,2BACTC,kBAAmB,8BACnBC,kBAAmB,8BACnBC,mBAAoB,+BACpBC,kBAAmB,8BACnBC,kBAAmB,8BACnBC,oBAAqB,gCACrBC,oBAAqB,iCAGzBC,MACIvC,WACIwC,MAAO,WAEXjC,SACIiC,MAAO,YAEXrC,UACIqC,MAAO,WAEXpC,YACIoC,MAAO,aAEXnC,WACImC,MAAO,WAEXhC,iBACIgC,MAAO,WAEX/B,YACI+B,MAAO,WAEXC,qBACID,MAAO,eAEX9B,sBACI8B,MAAO,eAEX7B,sBACI6B,MAAO,eAEX5B,WACI4B,MAAO,cAEXzB,SACIyB,MAAO,SAAU,aACjBE,QAAS,WAEb7B,QACI2B,MAAO,SAAU,WACjBE,QAAS,UAEbX,SACIS,MAAQ,WAEZxB,cACIwB,MAAQ,WAEZvB,cACIuB,MAAQ,WAEZtB,aACIsB,MAAQ,WAEZrB,YACIqB,MAAQ,WAEZpB,SACIoB,MAAQ,UACRE,QAAS,WAEbrB,WACImB,MAAQ,SAAU,cAEtBlB,iBACIkB,MAAQ,SAAU,cAEtBjB,gBACIiB,MAAQ,WAEZd,uBACIc,MAAQ,cAEZb,iBACIa,MAAQ,WAEZZ,UACIY,MAAQ,aAQpBG,SAAQtD,QACJC,QAASH,WAIbC,YAAYL","file":"app.js.map"} \ No newline at end of file diff --git a/public/js/v1.0.0RC3/app.js b/public/js/v1.0.0/app.js.src.js similarity index 100% rename from public/js/v1.0.0RC3/app.js rename to public/js/v1.0.0/app.js.src.js diff --git a/public/js/v1.0.0/app/login.js b/public/js/v1.0.0/app/login.js new file mode 100644 index 00000000..d7c8232b --- /dev/null +++ b/public/js/v1.0.0/app/login.js @@ -0,0 +1,16 @@ +!function(t,e){"object"==typeof module&&"object"==typeof module.exports?module.exports=t.document?e(t,!0):function(t){if(!t.document)throw new Error("jQuery requires a window with a document");return e(t)}:e(t)}("undefined"!=typeof window?window:this,function(t,e){function i(t){var e="length"in t&&t.length,i=at.type(t);return"function"===i||at.isWindow(t)?!1:1===t.nodeType&&e?!0:"array"===i||0===e||"number"==typeof e&&e>0&&e-1 in t}function n(t,e,i){if(at.isFunction(e))return at.grep(t,function(t,n){return!!e.call(t,n,t)!==i});if(e.nodeType)return at.grep(t,function(t){return t===e!==i});if("string"==typeof e){if(ht.test(e))return at.filter(e,t,i);e=at.filter(e,t)}return at.grep(t,function(t){return at.inArray(t,e)>=0!==i})}function a(t,e){do t=t[e];while(t&&1!==t.nodeType);return t}function o(t){var e=wt[t]={};return at.each(t.match(bt)||[],function(t,i){e[i]=!0}),e}function r(){ft.addEventListener?(ft.removeEventListener("DOMContentLoaded",s,!1),t.removeEventListener("load",s,!1)):(ft.detachEvent("onreadystatechange",s),t.detachEvent("onload",s))}function s(){(ft.addEventListener||"load"===event.type||"complete"===ft.readyState)&&(r(),at.ready())}function l(t,e,i){if(void 0===i&&1===t.nodeType){var n="data-"+e.replace(kt,"-$1").toLowerCase();if(i=t.getAttribute(n),"string"==typeof i){try{i="true"===i?!0:"false"===i?!1:"null"===i?null:+i+""===i?+i:Tt.test(i)?at.parseJSON(i):i}catch(a){}at.data(t,e,i)}else i=void 0}return i}function c(t){var e;for(e in t)if(("data"!==e||!at.isEmptyObject(t[e]))&&"toJSON"!==e)return!1;return!0}function u(t,e,i,n){if(at.acceptData(t)){var a,o,r=at.expando,s=t.nodeType,l=s?at.cache:t,c=s?t[r]:t[r]&&r;if(c&&l[c]&&(n||l[c].data)||void 0!==i||"string"!=typeof e)return c||(c=s?t[r]=X.pop()||at.guid++:r),l[c]||(l[c]=s?{}:{toJSON:at.noop}),("object"==typeof e||"function"==typeof e)&&(n?l[c]=at.extend(l[c],e):l[c].data=at.extend(l[c].data,e)),o=l[c],n||(o.data||(o.data={}),o=o.data),void 0!==i&&(o[at.camelCase(e)]=i),"string"==typeof e?(a=o[e],null==a&&(a=o[at.camelCase(e)])):a=o,a}}function d(t,e,i){if(at.acceptData(t)){var n,a,o=t.nodeType,r=o?at.cache:t,s=o?t[at.expando]:at.expando;if(r[s]){if(e&&(n=i?r[s]:r[s].data)){at.isArray(e)?e=e.concat(at.map(e,at.camelCase)):e in n?e=[e]:(e=at.camelCase(e),e=e in n?[e]:e.split(" ")),a=e.length;for(;a--;)delete n[e[a]];if(i?!c(n):!at.isEmptyObject(n))return}(i||(delete r[s].data,c(r[s])))&&(o?at.cleanData([t],!0):it.deleteExpando||r!=r.window?delete r[s]:r[s]=null)}}}function h(){return!0}function p(){return!1}function f(){try{return ft.activeElement}catch(t){}}function m(t){var e=Rt.split("|"),i=t.createDocumentFragment();if(i.createElement)for(;e.length;)i.createElement(e.pop());return i}function g(t,e){var i,n,a=0,o=typeof t.getElementsByTagName!==St?t.getElementsByTagName(e||"*"):typeof t.querySelectorAll!==St?t.querySelectorAll(e||"*"):void 0;if(!o)for(o=[],i=t.childNodes||t;null!=(n=i[a]);a++)!e||at.nodeName(n,e)?o.push(n):at.merge(o,g(n,e));return void 0===e||e&&at.nodeName(t,e)?at.merge([t],o):o}function v(t){At.test(t.type)&&(t.defaultChecked=t.checked)}function y(t,e){return at.nodeName(t,"table")&&at.nodeName(11!==e.nodeType?e:e.firstChild,"tr")?t.getElementsByTagName("tbody")[0]||t.appendChild(t.ownerDocument.createElement("tbody")):t}function b(t){return t.type=(null!==at.find.attr(t,"type"))+"/"+t.type,t}function w(t){var e=Yt.exec(t.type);return e?t.type=e[1]:t.removeAttribute("type"),t}function C(t,e){for(var i,n=0;null!=(i=t[n]);n++)at._data(i,"globalEval",!e||at._data(e[n],"globalEval"))}function x(t,e){if(1===e.nodeType&&at.hasData(t)){var i,n,a,o=at._data(t),r=at._data(e,o),s=o.events;if(s){delete r.handle,r.events={};for(i in s)for(n=0,a=s[i].length;a>n;n++)at.event.add(e,i,s[i][n])}r.data&&(r.data=at.extend({},r.data))}}function S(t,e){var i,n,a;if(1===e.nodeType){if(i=e.nodeName.toLowerCase(),!it.noCloneEvent&&e[at.expando]){a=at._data(e);for(n in a.events)at.removeEvent(e,n,a.handle);e.removeAttribute(at.expando)}"script"===i&&e.text!==t.text?(b(e).text=t.text,w(e)):"object"===i?(e.parentNode&&(e.outerHTML=t.outerHTML),it.html5Clone&&t.innerHTML&&!at.trim(e.innerHTML)&&(e.innerHTML=t.innerHTML)):"input"===i&&At.test(t.type)?(e.defaultChecked=e.checked=t.checked,e.value!==t.value&&(e.value=t.value)):"option"===i?e.defaultSelected=e.selected=t.defaultSelected:("input"===i||"textarea"===i)&&(e.defaultValue=t.defaultValue)}}function T(e,i){var n,a=at(i.createElement(e)).appendTo(i.body),o=t.getDefaultComputedStyle&&(n=t.getDefaultComputedStyle(a[0]))?n.display:at.css(a[0],"display");return a.detach(),o}function k(t){var e=ft,i=Jt[t];return i||(i=T(t,e),"none"!==i&&i||(Zt=(Zt||at("