Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Resolve showing 16 ties for teams During Pre-Season #31

Open
wants to merge 97 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
4f16a59
Add support for setting a point spread
gammadean Aug 30, 2015
12e2c32
Merge pull request #1 from gammadean/spread
gammadean Aug 30, 2015
d90ef75
Added best bet tie breaker
gammadean Sep 5, 2015
56597b2
Merge pull request #2 from gammadean/bestbet
gammadean Sep 5, 2015
c3c4b14
Add Monday Night Football tie breaker
gammadean Sep 5, 2015
7d4d7d1
Merge pull request #3 from gammadean/mnf
gammadean Sep 5, 2015
3d354ed
Made .htaccess and config.php sample files so they won't conflict wit…
gammadean Sep 5, 2015
dedbd52
Change wins display to show overall ranking. This needs to be made c…
gammadean Sep 5, 2015
c2e933b
Add site name setting
gammadean Sep 6, 2015
0fa60e1
Added option to generate email when user makes a pick
gammadean Sep 6, 2015
b6ea99a
Fix pick email
gammadean Sep 6, 2015
b6a1732
Remove hardcoded email addresses. Genralize mailing list support. A…
gammadean Nov 13, 2015
9bd767e
Modified entry_form to add tiebreaker for bragging rights, doesn't a…
Aug 18, 2016
bbe31d8
Removed comment from entry_form.php
Aug 18, 2016
13e4020
Resolve showing 16 ties for teams During Pre-Season
bislewl Aug 29, 2016
4b06455
FIX broken image for LA Rams
bislewl Aug 29, 2016
d8d71da
Merge remote-tracking branch 'origin/pr/1'
bislewl Aug 30, 2016
20169c0
dos2unix
Sep 5, 2016
d1ee788
replaced hardcoded timezone name with timezone abbreviation
Sep 5, 2016
8fba55d
added real-time scoring
Sep 5, 2016
3c99b85
Merged upstream 2016 changes
gammadean Sep 6, 2016
ec1fe02
Merge origin
gammadean Sep 6, 2016
e8727fb
Fixed constructors
gammadean Sep 6, 2016
74fd3d3
Fix results display and add row showing winning picks
gammadean Sep 7, 2016
5e7ece4
Wording change
gammadean Sep 7, 2016
ae77376
renamed from images/helmets_big/stl1.gif
Sep 7, 2016
2352641
renamed to images/helmets_big/la1.gif
Sep 7, 2016
845f076
renamed from images/helmets_big/stl2.gif
Sep 7, 2016
7f5df1b
renamed to images/helmets_big/la2.gif
Sep 7, 2016
80c8d0e
renamed from images/helmets_small/STLL.gif
Sep 7, 2016
e1a57d6
renamed to images/helmets_small/LAL.gif
Sep 7, 2016
8d7dfa2
renamed from images/helmets_small/STLR.gif
Sep 7, 2016
7c59848
renamed to images/helmets_small/LAR.gif
Sep 7, 2016
b133a81
renamed from images/logos/STL.gif
Sep 7, 2016
726faba
renamed to images/logos/LA.gif
Sep 7, 2016
c734c06
renamed from images/logos/STL.svg
Sep 7, 2016
1ca3648
renamed to images/logos/LA.svg
Sep 7, 2016
82e35d0
renamed to includes/config.php.sample
Sep 7, 2016
4fe9f4e
renamed from includes/config.php
Sep 7, 2016
701bc2b
initial commit
Sep 7, 2016
aeb893b
my changes
Sep 8, 2016
af8c9c5
ignore local config file
Sep 8, 2016
f155aee
merged changes from https://github.com/rothkj1022/phppickem
Sep 11, 2016
d03b7a5
merged changes from https://github.com/rothkj1022/phppickem
Sep 11, 2016
598a330
merged changes from https://github.com/rothkj1022/phppickem
Sep 11, 2016
e778a46
moved sections into separate files
Sep 11, 2016
8d07ffc
merged changes from https://github.com/rothkj1022/phppickem
Sep 11, 2016
1f5c258
merged changes from https://github.com/rothkj1022/phppickem
Sep 11, 2016
99340e2
added final column and values to nflp_schedule table
Sep 11, 2016
47f2d5a
merged changes from https://github.com/rothkj1022/phppickem and added…
Sep 11, 2016
677d03a
merged changes from https://github.com/rothkj1022/phppickem
Sep 11, 2016
3332bac
from includes/column_right.php
Sep 11, 2016
575c732
from includes/column_right.php
Sep 11, 2016
b14d0ae
initial commit
Sep 11, 2016
ea08509
initial commit
Sep 11, 2016
7d05df1
added ..bak
Sep 11, 2016
159f6a3
added Refresh header
Sep 11, 2016
89dc5a1
fixed OT final
Sep 19, 2016
d8ce2dc
added arg to calls to getTeamRecord and getTeamStreak
Sep 19, 2016
9385cb7
added arg to calls to getTeamRecord and getTeamStreak and fixed brok…
Sep 19, 2016
e353690
added countdown column if allScoresIn is false
Sep 22, 2016
68c6db2
initial commit
Sep 22, 2016
cd2b2db
fix for ONLY_FULL_GROUP_BY setting change
Sep 23, 2016
b9e6025
added SERVER_TIMEZONE_OFFSET and changed date format for First game a…
Sep 23, 2016
cbd1be8
fixes to get firstGameTime to work accross subsequent weeks with corr…
Sep 23, 2016
71716df
added background-color:#1CE1DF to winner class
Sep 23, 2016
f493699
changes to display helmets_small gifs for picks and no_pick gif for m…
Sep 23, 2016
d9625ce
Fix email
gammadean Dec 25, 2016
f6db930
initial changes, mainly logos, after first dev install
gregostrowski Dec 30, 2016
82ef685
adding new admin entry form to update picks. adding in start of tiebr…
gregostrowski Mar 17, 2017
ed51c81
Merge branch 'refs/heads/pr/3'
bislewl May 2, 2017
1957859
updating tiebreaker code and logic
gregostrowski May 14, 2017
862dd4a
adding start of survivor support
gregostrowski Jun 16, 2017
9b07ab5
ui cleanup, fixing final status when grabbing scores, new user creation
gregostrowski Aug 6, 2017
10101ae
new season schedules, adding news page
gregostrowski Aug 6, 2017
cf5c2eb
set up for preseason, renamed SD to LAC, LA to LAR
gregostrowski Aug 8, 2017
9c7ec2a
fixing email
gregostrowski Aug 9, 2017
e276d56
default to hide picks
gregostrowski Aug 9, 2017
be05da3
style change for winner, fixing get scores for preseason/LAR, hiding …
gregostrowski Aug 16, 2017
219ab6d
hiding survivor picks that shouldnt be shown yet
gregostrowski Aug 16, 2017
4f26381
fixed assinine RewriteBase
Aug 20, 2017
24b8e5c
initial_commit
Aug 20, 2017
5725cca
fixed constructor error in PHP 7+
Aug 20, 2017
8512dee
fixed constructor error in PHP 7+
Aug 21, 2017
a622ce5
fixed constructor error in PHP 7+
Aug 21, 2017
8147f7b
fixed constructor error in PHP 7+
Aug 21, 2017
6aeff2d
removed to development baranch
Aug 21, 2017
9cb7c5d
renamed from SD/sd to LAC/lac
Aug 21, 2017
6ef932a
renamed to LAC/lac from SD/sd
Aug 21, 2017
83e8b1f
updated for 2017 season
Aug 21, 2017
cb22de8
fixed presentation of Current Time and changed date format from Y_m_d…
Aug 21, 2017
5483e6d
changed date format from Y_m_d to Y-m-d
Aug 21, 2017
0f78b10
Merge branch 'refs/heads/pr/4'
bislewl Aug 21, 2017
55e52bc
Merge branch 'pr/4'
bislewl Aug 21, 2017
6187e09
Merge remote-tracking branch 'gregostrowski/master'
bislewl Aug 21, 2017
8af491e
Merge branch 'refs/heads/pr/3'
bislewl Aug 21, 2017
d0116c9
added the option to make a user an admin
mixke1 Sep 7, 2016
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
..bak
includes/config.php
.DS_Store
198 changes: 99 additions & 99 deletions .htaccess → .htaccess.sample
Original file line number Diff line number Diff line change
@@ -1,99 +1,99 @@
# COMPRESSION
<IfModule mod_deflate.c>
# Force compression for mangled headers.
# http://developer.yahoo.com/blogs/ydn/posts/2010/12/pushing-beyond-gzipping
<IfModule mod_setenvif.c>
<IfModule mod_headers.c>
SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding
RequestHeader append Accept-Encoding "gzip,deflate" env=HAVE_Accept-Encoding
</IfModule>
</IfModule>
# Compress all output labeled with one of the following MIME-types
# (for Apache versions below 2.3.7, you don't need to enable `mod_filter`
# and can remove the `<IfModule mod_filter.c>` and `</IfModule>` lines
# as `AddOutputFilterByType` is still in the core directives).
<IfModule mod_filter.c>
AddOutputFilterByType DEFLATE application/atom+xml \
application/javascript \
application/json \
application/ld+json \
application/rss+xml \
application/vnd.ms-fontobject \
application/x-font-ttf \
application/x-web-app-manifest+json \
application/xhtml+xml \
application/xml \
font/opentype \
image/svg+xml \
image/x-icon \
text/css \
text/html \
text/plain \
text/x-component \
text/xml
</IfModule>
</IfModule>
# MAIN OPTIONS
Options +FollowSymLinks -Indexes -Multiviews
DefaultLanguage en-US
AddDefaultCharset UTF-8
# PHP OPTIONS
php_flag display_errors on
php_value error_reporting 'E_ALL & ~E_NOTICE'
php_flag register_globals off
# php_value memory_limit 128M
# php_value post_max_size 2000M
# php_value upload_max_filesize 2000M
# MIME TYPES
AddType video/ogg .ogv
AddType video/webm .webm
AddType video/mp4 MPEG-4 media mp4
AddType video/x-m4v MPEG-4 media m4v
AddType application/x-font-ttf .ttf
AddType application/vnd.ms-fontobject .eot
AddType application/x-font-otf .otf
AddType application/x-font-woff .woff
AddType application/vnd.ms-fontobject .svg
AddType image/svg+xml svg svgz
AddEncoding gzip svgz
RewriteEngine On
RewriteBase /personal/applications/phppickem/
# 301 REDIRECTS
# redirect 301 /links.php http://www.domain.com/api-companies.php
# RewriteRule ^links.php$ api-companies.php [L,R=301]
# rewrite all index files to folder root
RewriteCond %{THE_REQUEST} /index\.html [NC]
RewriteRule ^(.*/)?index\.html$ $1 [R=301,L]
RewriteCond %{THE_REQUEST} /index\.php [NC]
RewriteRule ^(.*/)?index\.php$ $1 [R=301,L]
# strip php file extensions
# RewriteRule ^admin - [L,NC]
# RewriteRule ^os2 - [L,NC]
# RewriteCond %{THE_REQUEST} ^[A-Z]{3,9}\ /([^.]+\.)+php?\ HTTP
# RewriteRule ^(.*)\.php$ $1 [R=301,L]
# redirect all traffic to the www domain (if applicable)
# RewriteCond %{HTTP_HOST} !^www\.
# RewriteRule ^(.*)$ http://www.%{HTTP_HOST}/$1 [R=301,L]
# redirect all traffic to the primary domain (if applicable)
# RewriteCond %{HTTP_HOST} !^www\.domain\.com
# RewriteRule ^(.*)$ http://www\.domain\.com/$1 [R=301,L]
# display php files without file extensions
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME}\.php -f
RewriteRule ^(.*)$ $1.php
# ERROR DOCUMENTS
# ErrorDocument 404 /404.php
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)$ 404.php [L]
# COMPRESSION
<IfModule mod_deflate.c>
# Force compression for mangled headers.
# http://developer.yahoo.com/blogs/ydn/posts/2010/12/pushing-beyond-gzipping
<IfModule mod_setenvif.c>
<IfModule mod_headers.c>
SetEnvIfNoCase ^(Accept-EncodXng|X-cept-Encoding|X{15}|~{15}|-{15})$ ^((gzip|deflate)\s*,?\s*)+|[X~-]{4,13}$ HAVE_Accept-Encoding
RequestHeader append Accept-Encoding "gzip,deflate" env=HAVE_Accept-Encoding
</IfModule>
</IfModule>

# Compress all output labeled with one of the following MIME-types
# (for Apache versions below 2.3.7, you don't need to enable `mod_filter`
# and can remove the `<IfModule mod_filter.c>` and `</IfModule>` lines
# as `AddOutputFilterByType` is still in the core directives).
<IfModule mod_filter.c>
AddOutputFilterByType DEFLATE application/atom+xml \
application/javascript \
application/json \
application/ld+json \
application/rss+xml \
application/vnd.ms-fontobject \
application/x-font-ttf \
application/x-web-app-manifest+json \
application/xhtml+xml \
application/xml \
font/opentype \
image/svg+xml \
image/x-icon \
text/css \
text/html \
text/plain \
text/x-component \
text/xml
</IfModule>
</IfModule>

# MAIN OPTIONS
Options +FollowSymLinks -Indexes -Multiviews
DefaultLanguage en-US
AddDefaultCharset UTF-8

# PHP OPTIONS
php_flag display_errors on
php_value error_reporting 'E_ALL & ~E_NOTICE'
php_flag register_globals off
# php_value memory_limit 128M
# php_value post_max_size 2000M
# php_value upload_max_filesize 2000M

# MIME TYPES
AddType video/ogg .ogv
AddType video/webm .webm
AddType video/mp4 MPEG-4 media mp4
AddType video/x-m4v MPEG-4 media m4v
AddType application/x-font-ttf .ttf
AddType application/vnd.ms-fontobject .eot
AddType application/x-font-otf .otf
AddType application/x-font-woff .woff
AddType application/vnd.ms-fontobject .svg
AddType image/svg+xml svg svgz
AddEncoding gzip svgz

RewriteEngine On
RewriteBase /phppickem/

# 301 REDIRECTS
# redirect 301 /links.php http://www.domain.com/api-companies.php
# RewriteRule ^links.php$ api-companies.php [L,R=301]

# rewrite all index files to folder root
RewriteCond %{THE_REQUEST} /index\.html [NC]
RewriteRule ^(.*/)?index\.html$ $1 [R=301,L]
RewriteCond %{THE_REQUEST} /index\.php [NC]
RewriteRule ^(.*/)?index\.php$ $1 [R=301,L]

# strip php file extensions
# RewriteRule ^admin - [L,NC]
# RewriteRule ^os2 - [L,NC]
# RewriteCond %{THE_REQUEST} ^[A-Z]{3,9}\ /([^.]+\.)+php?\ HTTP
# RewriteRule ^(.*)\.php$ $1 [R=301,L]

# redirect all traffic to the www domain (if applicable)
# RewriteCond %{HTTP_HOST} !^www\.
# RewriteRule ^(.*)$ http://www.%{HTTP_HOST}/$1 [R=301,L]
# redirect all traffic to the primary domain (if applicable)
# RewriteCond %{HTTP_HOST} !^www\.domain\.com
# RewriteRule ^(.*)$ http://www\.domain\.com/$1 [R=301,L]

# display php files without file extensions
RewriteCond %{REQUEST_FILENAME} !-d
RewriteCond %{REQUEST_FILENAME}\.php -f
RewriteRule ^(.*)$ $1.php

# ERROR DOCUMENTS
# ErrorDocument 404 /404.php
RewriteCond %{REQUEST_FILENAME} !-f
RewriteCond %{REQUEST_FILENAME} !-d
RewriteRule ^(.*)$ 404.php [L]
12 changes: 12 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,18 @@
# Change Log
All notable changes to this project will be documented in this file.

## 2.2.3 - 9/5/2016
### Changed
- Updated README.md with new minimum requirements

### Fixed
- LA Rams Logo was not displaying
- Results showed week 1 winners before any games have been played
- Team record and team streak are no longer displayed for week 1 until scores have been entered

### Removed
- Removed old helmet logos

## 2.2.2 - 7/12/2016
### Changed/Fixed
- Time zone offset is now set automatically, based on new SERVER_TIMEZONE constant. This should fix [issue #2](https://github.com/rothkj1022/phppickem/issues/2) and [issue #16](https://github.com/rothkj1022/phppickem/issues/16)
Expand Down
50 changes: 25 additions & 25 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
# PHP Pick 'Em
PHP Pick 'Em is a free php web application that allows you to host a weekly NFL pick 'em football pool on your website.
## Minimum Requirements
* PHP version 4.3 or greater
* MySQL version 4.0 or greater with mysqli enabled
* Mcrypt module for password encryption
## Installation Instructions
1. Extract files
2. Create a MySQL database on your web server, as well as a MySQL user who has all privileges for accessing and modifying it.
3. Edit /includes/config.php and update database connection variables accordingly
4. Upload files to your web server
5. Run installer script at http://www.your-domain.com/phppickem/install. The installer will assist you with the rest.
## Logging In
Log in for the first time with admin / admin123. You may change your password once you are logged in.
## Troubleshooting
For help, please visit: http://www.phppickem.com/
# PHP Pick 'Em

PHP Pick 'Em is a free php web application that allows you to host a weekly NFL pick 'em football pool on your website.

## Minimum Requirements

* PHP version 5.2 or greater
* MySQL version 5.0 or greater with mysqli enabled
* Mcrypt module for password encryption


## Installation Instructions

1. Extract files
2. Create a MySQL database on your web server, as well as a MySQL user who has all privileges for accessing and modifying it.
3. Edit /includes/config.php and update database connection variables accordingly
4. Upload files to your web server
5. Run installer script at http://www.your-domain.com/phppickem/install. The installer will assist you with the rest.

## Logging In

Log in for the first time with admin / admin123. You may change your password once you are logged in.

## Troubleshooting
For help, please visit: http://www.phppickem.com/
Loading