From dcaeec583ca5e99941a725c0784a382ed29bd529 Mon Sep 17 00:00:00 2001 From: Patrick Davison Date: Mon, 27 May 2013 20:29:58 -0700 Subject: Removed no-longer neccessary .htaccess - i'll keep a backup incase we ever use apache again. --- .htaccess | 49 ------------------------------------------------- changelog/.htaccess | 1 - images/.htaccess | 7 ------- images/marks/.htaccess | 1 - includes/.htaccess | 1 - pages/.htaccess | 1 - sounds/.htaccess | 15 --------------- 7 files changed, 75 deletions(-) delete mode 100644 .htaccess delete mode 100644 changelog/.htaccess delete mode 100644 images/.htaccess delete mode 100644 images/marks/.htaccess delete mode 100644 includes/.htaccess delete mode 100644 pages/.htaccess delete mode 100644 sounds/.htaccess diff --git a/.htaccess b/.htaccess deleted file mode 100644 index 4ee5960..0000000 --- a/.htaccess +++ /dev/null @@ -1,49 +0,0 @@ -AddHandler x-mapp-php6 .php - -ErrorDocument 400 http://www.mazetd.4xg.net/errors.php?error=400 -ErrorDocument 401 http://www.mazetd.4xg.net/errors.php?error=401 -ErrorDocument 403 http://www.mazetd.4xg.net/errors.php?error=403 -ErrorDocument 404 http://www.mazetd.4xg.net/errors.php?error=404 -ErrorDocument 500 http://www.mazetd.4xg.net/errors.php?error=500 - -RewriteEngine on -RewriteBase / -# Incase someone randomly put .html at the end. -RewriteRule ^([a-z]+)\.html$ /?page=$1 [R,L] - -# Maintains www -RewriteCond %{HTTP_HOST} ^mazetd.4xg\.net -RewriteRule (.*) http://www.mazetd.4xg.net/$1 [R,L] -RewriteRule ^([a-z]+)$ /index\.php?page=$1 [QSA,NC] - -# GetMap Re-write -RewriteRule ^a/map/(.*)$ /ajax/maps\.ajax\.php?mapid=$1 [QSA,NC] - -RewriteRule ^a/mapsbydate/(.*)$ /ajax/maps\.ajax\.php?getmapidsbydate=$1 [QSA,NC] - -RewriteRule ^challenge/(.*)$ /ajax/challenges\.ajax\.php?challengeid=$1 [QSA,NC] -RewriteRule ^a/challenge/(.*)$ /ajax/challenges\.ajax\.php?challengeid=$1 [QSA,NC] - -RewriteRule ^user/(.*)$ /ajax/users\.ajax\.php?userid=$1 [QSA,NC] -RewriteRule ^a/user/(.*)$ /ajax/users\.ajax\.php?userid=$1 [QSA,NC] - -RewriteRule ^a/score/(.*)$ /ajax/scores\.ajax\.php?r=$1 [QSA,NC] - - - -# CSS and JS cache for 480 weeks - -Header set Cache-Control "max-age=290304000, public" - - - - - mod_gzip_on Yes - mod_gzip_dechunk Yes - mod_gzip_item_include file \.(txt|css|js)$ - mod_gzip_item_include handler ^cgi-script$ - mod_gzip_item_include mime ^text/.* - mod_gzip_item_include mime ^application/x-javascript.* - mod_gzip_item_exclude mime ^image/.* - mod_gzip_item_exclude rspheader ^Content-Encoding:.*gzip.* - \ No newline at end of file diff --git a/changelog/.htaccess b/changelog/.htaccess deleted file mode 100644 index 3418e55..0000000 --- a/changelog/.htaccess +++ /dev/null @@ -1 +0,0 @@ -deny from all \ No newline at end of file diff --git a/images/.htaccess b/images/.htaccess deleted file mode 100644 index c9d7886..0000000 --- a/images/.htaccess +++ /dev/null @@ -1,7 +0,0 @@ -# 480 weeks - -Header set Cache-Control "max-age=290304000, public" - - -# Incase of missing images -ErrorDocument 404 http://www.pathery.com/images/blank.png?error404=true \ No newline at end of file diff --git a/images/marks/.htaccess b/images/marks/.htaccess deleted file mode 100644 index 04bc913..0000000 --- a/images/marks/.htaccess +++ /dev/null @@ -1 +0,0 @@ -DirectoryIndex blank.png \ No newline at end of file diff --git a/includes/.htaccess b/includes/.htaccess deleted file mode 100644 index 3418e55..0000000 --- a/includes/.htaccess +++ /dev/null @@ -1 +0,0 @@ -deny from all \ No newline at end of file diff --git a/pages/.htaccess b/pages/.htaccess deleted file mode 100644 index 3418e55..0000000 --- a/pages/.htaccess +++ /dev/null @@ -1 +0,0 @@ -deny from all \ No newline at end of file diff --git a/sounds/.htaccess b/sounds/.htaccess deleted file mode 100644 index 657e345..0000000 --- a/sounds/.htaccess +++ /dev/null @@ -1,15 +0,0 @@ -# 480 weeks - -Header set Cache-Control "max-age=290304000, public" - - - - mod_gzip_on Yes - mod_gzip_dechunk Yes - mod_gzip_item_include file \.(swf|txt|css|js)$ - mod_gzip_item_include handler ^cgi-script$ - mod_gzip_item_include mime ^text/.* - mod_gzip_item_include mime ^application/x-javascript.* - mod_gzip_item_exclude mime ^image/.* - mod_gzip_item_exclude rspheader ^Content-Encoding:.*gzip.* - \ No newline at end of file -- cgit v1.2.3 From 048138970237ac1a0784ac779bc74b73b04d49be Mon Sep 17 00:00:00 2001 From: Patrick Davison Date: Mon, 27 May 2013 23:56:53 -0700 Subject: Netbeans meta and minor changes. --- .gitignore | 3 ++- globe.php | 7 +------ index.php | 6 ++++-- nbproject/project.properties | 7 +++++++ nbproject/project.xml | 9 +++++++++ pages/login.php | 1 + 6 files changed, 24 insertions(+), 9 deletions(-) create mode 100644 nbproject/project.properties create mode 100644 nbproject/project.xml diff --git a/.gitignore b/.gitignore index fcedbc3..c28716e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ -/motdLockFile +/motdLockFile +/nbproject/private/ \ No newline at end of file diff --git a/globe.php b/globe.php index 526d306..87218a5 100644 --- a/globe.php +++ b/globe.php @@ -1,9 +1,5 @@ + + org.netbeans.modules.php.project + + + BetaPathery + + + diff --git a/pages/login.php b/pages/login.php index f73ca8c..8a0bfe8 100644 --- a/pages/login.php +++ b/pages/login.php @@ -149,6 +149,7 @@ try { $_SESSION['dateJoined'] = $dateJoined; //The below is me hashing the claimedID. + //TODO: Store these values in a single location... $salt = "33qs5d4j6z98gt1a7n6b5d4x1c66f5nuh8a6d8g9j09aphgf56z5745"; $pepper = "chilis baby-back ribss! I want my baby back, baby back, baby back, baby back, baby back, I want my, baby backTREE3!"; $one = MD5($claimedid); -- cgit v1.2.3