Merging

seantomburke · Feb 19, 2013 · 22a3d85 · 22a3d85
2 parents 8541908 + 9437a54
commit 22a3d85
Show file tree

Hide file tree

Showing 11 changed files with 28 additions and 17,778 deletions.
diff --git a/ESCan Requirements Document.docx b/ESCan Requirements Document.docx
diff --git a/images/MacBook_register.psd b/images/MacBook_register.psd
diff --git a/images/attend_events.jpg b/images/attend_events.jpg
diff --git a/images/attend_events.psd b/images/attend_events.psd
diff --git a/images/scanner.psd b/images/scanner.psd
diff --git a/images/splash_bg.psd b/images/splash_bg.psd
diff --git a/images/wristband.psd b/images/wristband.psd
diff --git a/images/wristband_model.psd b/images/wristband_model.psd
diff --git a/inc/setup/ESCan_data_2012.sql b/inc/setup/ESCan_data_2012.sql
diff --git a/inc/setup/_config.php b/inc/setup/_config.php
@@ -3,11 +3,11 @@
 
 function define_basic()
 {
-define(PRODUCT,'ESCan');
-define(ORGANIZATION, 'The Engineering Student Council');
-define(EMAIL, '[email protected]');
-define(WEBSITE, 'http://escan.site90.com/escan');
-define(DESCRIPTION, 'ESCan Description');
+define(PRODUCT,'ESCan');									//Name of Product
+define(ORGANIZATION, 'The Engineering Student Council');	//Name of Organization or Company
+define(EMAIL, '[email protected]');							//Email seen by users when notified
+define(WEBSITE, 'http://yoursite.com/');					//url of your site where this application is hosted
+define(DESCRIPTION, 'ESCan Description');					//Description of the system
 }
 
 

diff --git a/inc/setup/setup.sql b/inc/setup/setup.sql
@@ -54,6 +54,7 @@ CREATE TABLE IF NOT EXISTS `pages` (
   `description` mediumtext COLLATE latin1_general_ci NOT NULL,
   PRIMARY KEY (`ID`)
 ) ENGINE=MyISAM  DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci AUTO_INCREMENT=57 ;
+<<<<<<< HEAD
 INSERT IGNORE INTO `pages` VALUES(37, 'index', 'Home', '0', '/index.php', 1397, 0, 'index', 'ESCan-Electronic tracking system for E-Week. In order to win prizes, attend events, and compete in competitions, you must register your UCInetID with a wristband.');
 INSERT IGNORE INTO `pages` VALUES(39, 'error', 'Error', '0', '/error.php', 848, 0, 'index', '');
 INSERT IGNORE INTO `pages` VALUES(50, 'scan', 'Scan', '', '/scan.php', 4647, 4, 'scan', '');
@@ -72,6 +73,23 @@ INSERT IGNORE INTO `pages` VALUES(51, 'graph', 'Statistics', '', '/graph.php', 1
 INSERT IGNORE INTO `pages` VALUES(55, 'instructions', 'Instructions', '', '/instructions.php', 200, 0, 'instructions', '');
 INSERT IGNORE INTO `pages` VALUES(54, 'ucinet', 'Ucinet', '', '/ucinet.php', 39, 8, '', '');
 
+=======
+INSERT IGNORE INTO `pages` VALUES(1, 'index', 'Home', '0', '/index.php', 0, 0, 'index', 'ESCan-Electronic tracking system for E-Week. In order to win prizes, attend events, and compete in competitions, you must register your UCInetID with a wristband.');
+INSERT IGNORE INTO `pages` VALUES(2, 'error', 'Error', '0', '/error.php', 0, 0, 'index', '');
+INSERT IGNORE INTO `pages` VALUES(3, 'scan', 'Scan', '', '/scan.php', 0, 4, 'Scan', '');
+INSERT IGNORE INTO `pages` VALUES(4, 'webmaster', 'Webmaster', '', '/webmaster.php', 0, 8, 'WebMaster', '');
+INSERT IGNORE INTO `pages` VALUES(5, 'login', 'Sign In', '0', '/login.php', 0, 0, 'login', '');
+INSERT IGNORE INTO `pages` VALUES(6, 'signup', 'Sign Up', '0', '/signup.php', 0, 0, 'Sign Up', '');
+INSERT IGNORE INTO `pages` VALUES(7, 'logout', 'Logout', '0', '/logout.php', 0, 2, '', '');
+INSERT IGNORE INTO `pages` VALUES(8, 'events', 'Events', '0', '/events.php', 0, 0, 'events', '');
+INSERT IGNORE INTO `pages` VALUES(9, 'iforgot', 'Forgot Password', '0', '/iforgot.php', 0, 0, '', '');
+INSERT IGNORE INTO `pages` VALUES(10, 'recover', 'Recover', '0', '/recover.php', 0, 2, '', '');
+INSERT IGNORE INTO `pages` VALUES(11, 'settings', 'Settings', '0', '/settings.php', 0, 2, '', '');
+INSERT IGNORE INTO `pages` VALUES(12, 'register', 'Register', '', '/register.php', 0, 0, 'Register', '');
+INSERT IGNORE INTO `pages` VALUES(13, 'admin', 'Admin', '0', '/admin.php', 0, 6, 'admin', '');
+INSERT IGNORE INTO `pages` VALUES(14, 'statistics', 'Statistics', '', '/statistics.php', 0, 0, 'Statistics', '');
+INSERT IGNORE INTO `pages` VALUES(15, 'instructions', 'Instructions', '', '/instructions.php', 0, 0, 'instructions', '');
+>>>>>>> ESCan-2012
 CREATE TABLE IF NOT EXISTS `reset` (
   `ucinetid` varchar(8) COLLATE latin1_general_ci NOT NULL,
   `secret` varchar(32) COLLATE latin1_general_ci NOT NULL,
@@ -103,9 +121,13 @@ INSERT IGNORE INTO `tabs` VALUES(5, 'scan', 'Scan', 3, 0);
 INSERT IGNORE INTO `tabs` VALUES(6, 'statistics', 'Statistics', 0, 0);
 INSERT IGNORE INTO `tabs` VALUES(7, 'admin', 'Admin', 6, 0);
 INSERT IGNORE INTO `tabs` VALUES(11, 'instructions', 'Instructions', 0, 0);
+<<<<<<< HEAD
 INSERT IGNORE INTO `tabs` VALUES(12, 'webMaster', 'Webmaster', 8, 0);
 
 
+=======
+INSERT IGNORE INTO `tabs` VALUES(12, 'webmaster', 'Webmaster', 8, 0);
+>>>>>>> ESCan-2012
 CREATE TABLE IF NOT EXISTS `users` (
   `ucinetid` varchar(8) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL,
   `barcode` varchar(32) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL COMMENT 'barcode id',
@@ -115,7 +137,7 @@ CREATE TABLE IF NOT EXISTS `users` (
   `level` varchar(20) CHARACTER SET latin1 COLLATE latin1_general_ci NOT NULL COMMENT 'Year Level',
   `opt` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'opt-out mail',
   `access` tinyint(1) NOT NULL DEFAULT '0' COMMENT 'access level',
-  `elig` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'prize eligible',
+  `elig` tinyint(1) NOT NULL DEFAULT '1' COMMENT 'prize eligiblility',
   `date` date NOT NULL,
   `time` time NOT NULL,
   `volunteer` varchar(8) NOT NULL,