Skip to content
Browse files

Cleanup

  • Loading branch information...
1 parent 59701f4 commit 462789c909f386b27a4ab69ee87aff644d9b6e47 @tijsverkoyen tijsverkoyen committed
Showing with 6 additions and 50 deletions.
  1. +5 −5 .htaccess
  2. +0 −1 core/classes/site.php
  3. +1 −37 core/js/script.js
  4. +0 −5 index.php
  5. +0 −2 modules/users/model/model.php
View
10 .htaccess
@@ -5,7 +5,7 @@ FileETag MTime Size
<IfModule mod_expires.c>
ExpiresActive On
<FilesMatch "\.(ico|gif|jpe?g|png|svg|svgz|js|css|swf|ttf|otf|woff|eot)$">
- ExpiresDefault "access plus 1 month"
+ ExpiresDefault "access plus 1 month"
</FilesMatch>
</IfModule>
@@ -14,14 +14,14 @@ FileETag MTime Size
AddOutputFilterByType DEFLATE text/html text/plain text/xml application/xml text/javascript text/css application/x-javascript application/xhtml+xml application/javascript
# these browsers do not support deflate
- BrowserMatch ^Mozilla/4 gzip-only-text/html
+ BrowserMatch ^Mozilla/4 gzip-only-text/html
BrowserMatch ^Mozilla/4.0[678] no-gzip
BrowserMatch bMSIE !no-gzip !gzip-only-text/html
SetEnvIf User-Agent ".*MSIE.*" nokeepalive ssl-unclean-shutdown downgrade-1.0 force
</IfModule>
-# options
+# options
Options -Indexes
Options +FollowSymlinks
@@ -31,12 +31,12 @@ RewriteBase /
# only one base url
#RewriteCond %{HTTP_HOST} !^url\.ld [NC]
-#RewriteCond %{HTTP_HOST} !.*\.local [NC]
#RewriteCond %{HTTP_HOST} !.*\.dev [NC]
+#RewriteCond %{HTTP_HOST} !.*\.xip.io [NC]
#RewriteRule ^(.*)$ http://url.ld/$1 [R=301,L]
# handle urls
RewriteCond %{REQUEST_URI} !^$
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
-RewriteRule . index.php [NC,L]
+RewriteRule . /index.php [NC,L]
View
1 core/classes/site.php
@@ -199,7 +199,6 @@ public static function setSetting($key, $value)
self::$settings = null;
}
-
/**
* Get the thumbnail folders
*
View
38 core/js/script.js
@@ -43,7 +43,7 @@ var jsSite = {
},
// set defaults for AJAX
initAjax: function() {
- $.ajaxSetup({ cache: false, type: 'POST', dataType: 'json', imeout: 5000 });
+ $.ajaxSetup({ cache: false, type: 'POST', dataType: 'json', timeout: 5000 });
// global error handler
$(document).ajaxError(function(event, XMLHttpRequest, ajaxOptions) {
@@ -377,40 +377,4 @@ jsSite.search = {
}
}
-jsSite.prestations =
-{
- init: function()
- {
- $('#userId').multipleSelectbox({ emptyMessage: 'Geen personen gekozen.', addLabel: 'toevoegen', removeLabel: 'verwijderen', showIconOnly: true });
-
- $('#quickNav').change(function(e) {
- // replace
- var newDate = $(this).val().replace(new RegExp('/', 'g'), '-');
-
- // alter url
- document.location.href = '/'+ jsSite.current.module + '/' + jsSite.current.action +'/'+ newDate;
- });
-
- $('#addAndAddAnother').click(function(e)
- {
- // prevent default
- e.preventDefault();
-
- // search form
- var form = $($(this).parents('form')[0]);
-
- // append new field and submit
- form.append('<input type="hidden" name="next" value="add_another" />').submit();
- });
-
- $('td.dont_invoice input:checkbox').change(function() { $('#dontInvoice').attr('checked', ($('td.dont_invoice input:checkbox').length == $('td.dont_invoice input:checked').length) ? 'checked' : ''); })
- $('td.dont_send input:checkbox:first').change();
- $('#dontInvoice').change(function() { $('td.dont_invoice input:checkbox').attr('checked', $(this).attr('checked')); });
-
- $('td.is_invoiced input:checkbox').change(function() { $('#isInvoiced').attr('checked', ($('td.is_invoiced input:checkbox').length == $('td.is_invoiced input:checked').length) ? 'checked' : ''); })
- $('td.is_invoiced input:checkbox:first').change();
- $('#isInvoiced').change(function() { $('td.is_invoiced input:checkbox').attr('checked', $(this).attr('checked')); });
- }
-}
-
$(jsSite.init);
View
5 index.php
@@ -1,12 +1,7 @@
<?php
require_once 'vendor/autoload.php';
-
-/** require init */
require_once 'init.php';
-// initialize components
new Init();
-
-// create site
new Site();
View
2 modules/users/model/model.php
@@ -18,7 +18,6 @@ class User
*/
public $id;
-
/**
* Textual properties
*
@@ -26,7 +25,6 @@ class User
*/
public $name, $email, $secret, $rawPassword, $password, $type;
-
/**
* Boolean properties
*/

0 comments on commit 462789c

Please sign in to comment.
Something went wrong with that request. Please try again.