Browse Source

Minor tweaks, bypass minifier

Timothy J. Warren 1 year ago
parent
commit
b4e470704a

+ 2 - 2
application/config/autoload.php View File

@@ -40,12 +40,12 @@
40 40
 */
41 41
 
42 42
 $autoload['libraries'] = [
43
+	'validation_callbacks',
43 44
 	'database',
44 45
 	'page',
45 46
 	'todo',
46 47
 	'session',
47 48
 	'form_validation',
48
-	'validation_callbacks'
49 49
 ];
50 50
 
51 51
 
@@ -97,7 +97,7 @@ $autoload['config'] = array('sites');
97 97
 |
98 98
 |	$autoload['language'] = array('lang1', 'lang2');
99 99
 |
100
-| NOTE: Do not include the "_lang" part of your file.  For example 
100
+| NOTE: Do not include the "_lang" part of your file.  For example
101 101
 | "codeigniter_lang.php" would be referenced as array('codeigniter');
102 102
 |
103 103
 */

+ 8 - 8
application/config/min_groupsConfig.php View File

@@ -3,15 +3,15 @@
3 3
  * Groups configuration for default Minify implementation
4 4
  * @package Minify
5 5
  */
6
- 
6
+
7 7
 $root = "//";
8 8
 
9 9
 return array(
10
-	
10
+
11 11
 	/*-----
12
-			Css				
12
+			Css	
13 13
 					-----*/
14
-	
14
+
15 15
 	'css' => array(
16 16
 		$root. 'fonts/Puritan/stylesheet.css',
17 17
 		$root. 'css/todo.css',
@@ -19,18 +19,18 @@ return array(
19 19
 		$root. 'js/CLEditor/jquery.cleditor.css',
20 20
 		$root. 'css/jquery-ui.min.css'
21 21
 	),
22
-	
22
+
23 23
 	/*-----
24
-		  Javascript			
24
+		  Javascript
25 25
 					-----*/
26 26
 	'js' => array(
27 27
 		$root. 'js/CLEditor/jquery.cleditor.js',
28 28
 		$root. 'js/CLEditor/jquery.cleditor.xhtml.js',
29 29
 		$root. 'js/todo.js',
30 30
 	),
31
-	
31
+
32 32
 	'js_mobile' => array(
33 33
 		$root. 'js/todo.js',
34 34
 	),
35 35
 
36
-);
36
+);

+ 1 - 1
application/hooks/pre-controller.php View File

@@ -9,7 +9,7 @@
9 9
  */
10 10
 function check_session()
11 11
 {
12
-	$CI =& get_instance();
12
+	$CI = get_instance();
13 13
 
14 14
 	if($CI->session->userdata('uid') == FALSE)
15 15
 	{

+ 33 - 33
application/libraries/MY_Form_validation.php View File

@@ -1,34 +1,34 @@
1
-<?php
2
-
3
-/**
4
- * Add some convenience methods to form_validation library
5
- */
6
-class MY_Form_validation extends CI_Form_validation {
7
-
8
-	/**
9
-	 * Returns an array of errors for the current form
10
-	 *
11
-	 * @return array
12
-	 */
13
-	public function get_error_array()
14
-	{
15
-		return array_values($this->_error_array);
16
-	}
17
-
18
-	/**
19
-	 * Clears out object data
20
-	 *
21
-	 * @return void
22
-	 */
23
-	public function reset()
24
-	{
25
-		foreach([
26
-			'_field_data',
27
-			'_error_array',
28
-			'_error_messages'
29
-		] as $var) {
30
-			$this->$var = array();
31
-		}
32
-	}
33
-}
1
+<?php
2
+
3
+/**
4
+ * Add some convenience methods to form_validation library
5
+ */
6
+class MY_Form_validation extends CI_Form_validation {
7
+
8
+	/**
9
+	 * Returns an array of errors for the current form
10
+	 *
11
+	 * @return array
12
+	 */
13
+	public function get_error_array()
14
+	{
15
+		return array_values($this->_error_array);
16
+	}
17
+
18
+	/**
19
+	 * Clears out object data
20
+	 *
21
+	 * @return void
22
+	 */
23
+	public function reset()
24
+	{
25
+		foreach([
26
+			'_field_data',
27
+			'_error_array',
28
+			'_error_messages'
29
+		] as $var) {
30
+			$this->$var = array();
31
+		}
32
+	}
33
+}
34 34
 // End of libraries/MY_Form_validation.php

+ 8 - 1
application/models/task_model.php View File

@@ -605,12 +605,19 @@ class Task_model extends CI_Model {
605 605
 	 */
606 606
 	public function update_task()
607 607
 	{
608
+
609
+		$due_timestamp = $this->input->post('due') . ' ' .
610
+			$this->input->post('due_hour') . ':' .
611
+			$this->input->post('due_minute');
612
+
613
+		$unix_due = strtotime($due_timestamp);
614
+
608 615
 		$title = $this->input->post('title');;
609 616
 		$desc = str_replace('<br>', '<br />', $this->input->post('desc'));
610 617
 		$category = $this->input->post('category');
611 618
 		$priority = $this->input->post('priority');
612 619
 		$status = $this->input->post('status');
613
-		$due = $this->input->post('due');
620
+		$due = $unix_due;
614 621
 		$uid = $this->user_id;
615 622
 		$task_id = $this->task_id;
616 623
 

+ 9 - 9
application/third_party/CIUnit/core/CIU_Loader.php View File

@@ -69,7 +69,7 @@ class CIU_Loader extends CI_Loader {
69 69
 					// return a new instance of the object
70 70
 					if ( ! is_null($object_name))
71 71
 					{
72
-						$CI =& get_instance();
72
+						$CI = get_instance();
73 73
 						if ( ! isset($CI->$object_name))
74 74
 						{
75 75
 							return $this->_ci_init_class($class, config_item('ciu_subclass_prefix'), $params, $object_name);
@@ -82,12 +82,12 @@ class CIU_Loader extends CI_Loader {
82 82
 				}
83 83
 
84 84
 				include_once($baseclass);
85
-				
85
+
86 86
 				if (file_exists($subclass))
87 87
 				{
88 88
 					include_once($subclass);
89 89
 				}
90
-				
90
+
91 91
 				include_once($ciu_subclass);
92 92
 				$this->_ci_loaded_files[] = $ciu_subclass;
93 93
 
@@ -113,7 +113,7 @@ class CIU_Loader extends CI_Loader {
113 113
 					// return a new instance of the object
114 114
 					if ( ! is_null($object_name))
115 115
 					{
116
-						$CI =& get_instance();
116
+						$CI = get_instance();
117 117
 						if ( ! isset($CI->$object_name))
118 118
 						{
119 119
 							return $this->_ci_init_class($class, config_item('subclass_prefix'), $params, $object_name);
@@ -152,7 +152,7 @@ class CIU_Loader extends CI_Loader {
152 152
 					// return a new instance of the object
153 153
 					if ( ! is_null($object_name))
154 154
 					{
155
-						$CI =& get_instance();
155
+						$CI = get_instance();
156 156
 						if ( ! isset($CI->$object_name))
157 157
 						{
158 158
 							return $this->_ci_init_class($class, '', $params, $object_name);
@@ -281,7 +281,7 @@ class CIU_Loader extends CI_Loader {
281 281
 		// Save the class name and object name
282 282
 		$this->_ci_classes[$class] = $classvar;
283 283
 		// Instantiate the class
284
-		$CI =& get_instance();
284
+		$CI = get_instance();
285 285
 		if ($config !== NULL)
286 286
 		{
287 287
 			if ( ! defined('CIUnit_Version'))
@@ -334,7 +334,7 @@ class CIU_Loader extends CI_Loader {
334 334
 		}
335 335
 
336 336
 		$output = $this->_ci_load(array('_ci_view' => $view, '_ci_vars' => $this->_ci_object_to_array($vars), '_ci_return' => TRUE));
337
-		$CI =& get_instance();
337
+		$CI = get_instance();
338 338
 		$CI->output->add_output($output);
339 339
 	}
340 340
 
@@ -358,12 +358,12 @@ class CIU_Loader extends CI_Loader {
358 358
 			}
359 359
 
360 360
 			$ciu_helper = CIUPATH.'helpers/'.config_item('ciu_subclass_prefix').$helper.'.php';
361
-			
361
+
362 362
 			if (file_exists($ciu_helper))
363 363
 			{
364 364
 				include_once($ciu_helper);
365 365
 			}
366
-			
366
+
367 367
 			$ext_helper = APPPATH.'helpers/'.config_item('subclass_prefix').$helper.'.php';
368 368
 
369 369
 			// Is this a helper extension request?

+ 4 - 4
application/third_party/CIUnit/core/CIU_Output.php View File

@@ -9,7 +9,7 @@
9 9
 
10 10
 /*
11 11
 * CodeIgniter source modified for fooStack / CIUnit
12
-* 
12
+*
13 13
 * If you use MY_Output, change the paraent class.
14 14
 */
15 15
 
@@ -64,7 +64,7 @@ class CIU_Output extends CI_Output {
64 64
 	function set_no_cache_headers()
65 65
 	{
66 66
 		//somehow $this can't be used as headers are not set in that case
67
-		$CI =& get_instance();
67
+		$CI = get_instance();
68 68
 		$CI->output->soft_set_header('Content-type: text/html; charset=utf-8');
69 69
 		$CI->output->soft_set_header('Cache-Control: no-cache');
70 70
 		log_message('debug', 'no cache headers set in output class');
@@ -116,7 +116,7 @@ class CIU_Output extends CI_Output {
116 116
 	*/
117 117
 	function ob_flush_clean()
118 118
 	{
119
-		$CI =& get_instance();
119
+		$CI = get_instance();
120 120
 		if (ob_get_level() > $this->_ci_ob_level + 1)
121 121
 		{
122 122
 			ob_end_flush();
@@ -152,7 +152,7 @@ class CIU_Output extends CI_Output {
152 152
 		// Grab the super object if we can.
153 153
 		if (class_exists('CI_Controller'))
154 154
 		{
155
-			$CI =& get_instance();
155
+			$CI = get_instance();
156 156
 		}
157 157
 
158 158
 		// --------------------------------------------------------------------

+ 19 - 19
application/third_party/CIUnit/core/CodeIgniter.php View File

@@ -113,8 +113,8 @@
113 113
  *  Start the timer... tick tock tick tock...
114 114
  * ------------------------------------------------------
115 115
  */
116
-	$BM =& load_class('Benchmark', 'core');
117
-	$GLOBALS['BM'] =& $BM;
116
+	$BM = load_class('Benchmark', 'core');
117
+	$GLOBALS['BM'] = $BM;
118 118
 
119 119
 	$BM->mark('total_execution_time_start');
120 120
 	$BM->mark('loading_time:_base_classes_start');
@@ -124,8 +124,8 @@
124 124
  *  Instantiate the hooks class
125 125
  * ------------------------------------------------------
126 126
  */
127
-	$EXT =& load_class('Hooks', 'core');
128
-	$GLOBALS['EXT'] =& $EXT;
127
+	$EXT = load_class('Hooks', 'core');
128
+	$GLOBALS['EXT'] = $EXT;
129 129
 
130 130
 /*
131 131
  * ------------------------------------------------------
@@ -139,8 +139,8 @@
139 139
  *  Instantiate the config class
140 140
  * ------------------------------------------------------
141 141
  */
142
-	$CFG =& load_class('Config', 'core');
143
-	$GLOBALS['CFG'] =& $CFG;
142
+	$CFG = load_class('Config', 'core');
143
+	$GLOBALS['CFG'] = $CFG;
144 144
 
145 145
 	// Do we have any manually set config items in the index.php file?
146 146
 	if (isset($assign_to_config))
@@ -160,24 +160,24 @@
160 160
  *
161 161
  */
162 162
 
163
-	$UNI =& load_class('Utf8', 'core');
164
-	$GLOBALS['UNI'] =& $UNI;
163
+	$UNI = load_class('Utf8', 'core');
164
+	$GLOBALS['UNI'] = $UNI;
165 165
 
166 166
 /*
167 167
  * ------------------------------------------------------
168 168
  *  Instantiate the URI class
169 169
  * ------------------------------------------------------
170 170
  */
171
-	$URI =& load_class('URI', 'core');
172
-	$GLOBALS['URI'] =& $URI;
171
+	$URI = load_class('URI', 'core');
172
+	$GLOBALS['URI'] = $URI;
173 173
 
174 174
 /*
175 175
  * ------------------------------------------------------
176 176
  *  Instantiate the routing class and set the routing
177 177
  * ------------------------------------------------------
178 178
  */
179
-	$RTR =& load_class('Router', 'core');
180
-	$GLOBALS['RTR'] =& $RTR;
179
+	$RTR = load_class('Router', 'core');
180
+	$GLOBALS['RTR'] = $RTR;
181 181
 	//$RTR->_set_routing();
182 182
 
183 183
 	// Set any routing overrides that may exist in the main index file
@@ -191,8 +191,8 @@
191 191
  *  Instantiate the output class
192 192
  * ------------------------------------------------------
193 193
  */
194
-	$OUT =& load_class('Output', 'core');
195
-	$GLOBALS['OUT'] =& $OUT;
194
+	$OUT = load_class('Output', 'core');
195
+	$GLOBALS['OUT'] = $OUT;
196 196
 
197 197
 /*
198 198
  * ------------------------------------------------------
@@ -215,23 +215,23 @@
215 215
  * Load the security class for xss and csrf support
216 216
  * -----------------------------------------------------
217 217
  */
218
-	$SEC =& load_class('Security', 'core');
219
-	$GLOBALS['SEC'] =& $SEC;
218
+	$SEC = load_class('Security', 'core');
219
+	$GLOBALS['SEC'] = $SEC;
220 220
 
221 221
 /*
222 222
  * ------------------------------------------------------
223 223
  *  Load the Input class and sanitize globals
224 224
  * ------------------------------------------------------
225 225
  */
226
-	$IN =& load_class('Input', 'core');
227
-	$GLOBALS['IN'] =& $IN;
226
+	$IN = load_class('Input', 'core');
227
+	$GLOBALS['IN'] = $IN;
228 228
 
229 229
 /*
230 230
  * ------------------------------------------------------
231 231
  *  Load the Language class
232 232
  * ------------------------------------------------------
233 233
  */
234
-	$LANG =& load_class('Lang', 'core');
234
+	$LANG = load_class('Lang', 'core');
235 235
 
236 236
 /*
237 237
  * ------------------------------------------------------

+ 13 - 13
application/third_party/CIUnit/libraries/CIUnit.php View File

@@ -41,7 +41,7 @@ class CIUnit {
41 41
 
42 42
 	public static $spyc;
43 43
 	public static $fixture;
44
-	
44
+
45 45
 	/**
46 46
 	 * If this class is suppose to be a Singleton shouldn't the constructor be private?
47 47
 	 * Correct me if I am wrong but this doesn't prevent multiple instances of this class.
@@ -69,16 +69,16 @@ class CIUnit {
69 69
 			viewvars();
70 70
 			return self::$controller;
71 71
 		}
72
-		
72
+
73 73
 		// the current controller must be archieved before littered
74
-		$loader =& load_class('Loader', 'core');
74
+		$loader = load_class('Loader', 'core');
75 75
 
76 76
 		// reset all loaded data
77 77
 		$loader->reset();
78
-		
78
+
79 79
 		//echo 'Var Dump of self::$controllers -- ';
80 80
 		//var_dump(self::$controllers);
81
-		
81
+
82 82
 		/*
83 83
 		=========================================================
84 84
 		I don't understand this section of code.
@@ -94,7 +94,7 @@ class CIUnit {
94 94
 			//'components' => $loader->_ci_components,
95 95
 			//'classes' => $loader->_ci_classes
96 96
 		}
97
-		
97
+
98 98
 		===================================================
99 99
 		I don't understand why this code is clearing out
100 100
 		all the loaded components such as autoloaded models
@@ -108,14 +108,14 @@ class CIUnit {
108 108
 		//reset saved queries
109 109
 		self::$controller->db->queries = array();
110 110
 		*/
111
-		
111
+
112 112
 		//clean output / viewvars as well;
113 113
 		if (isset(self::$controller->output))
114 114
 		{
115 115
 			output();
116 116
 			viewvars();
117 117
 		}
118
-		
118
+
119 119
 		//the requested controller was loaded before?
120 120
 		if (isset(self::$controllers[$controller_name]))
121 121
 		{
@@ -143,7 +143,7 @@ class CIUnit {
143 143
 					include_once(APPPATH . 'controllers/' . $controller . EXT);
144 144
 				}
145 145
 			}
146
-			
146
+
147 147
 			self::$current = $controller_name;
148 148
 			self::$controllers[$controller_name] = array(
149 149
 														'address' => new $controller_name(),
@@ -151,12 +151,12 @@ class CIUnit {
151 151
 													);
152 152
 			self::$controller =& self::$controllers[$controller_name]['address'];
153 153
 		}
154
-		
154
+
155 155
 //		var_dump(self::$controllers); die();
156
-		
157
-		
156
+
157
+
158 158
 //		var_dump(self::$controller); die();
159
-		
159
+
160 160
 		//CI_Base::$instance = &self::$controller; //so get_instance() provides the correct controller
161 161
 		return self::$controller;
162 162
 	}

+ 23 - 23
application/third_party/CIUnit/libraries/CIUnitTestCase.php View File

@@ -14,10 +14,10 @@
14 14
 class CIUnit_TestCase extends PHPUnit_Framework_TestCase
15 15
 {
16 16
 	// ------------------------------------------------------------------------
17
-	
17
+
18 18
 	/**
19 19
 	 * An associative array of table names. The order of the fixtures
20
-	 * determines the loading and unloading sequence of the fixtures. This is 
20
+	 * determines the loading and unloading sequence of the fixtures. This is
21 21
 	 * to help account for foreign key restraints in databases.
22 22
 	 *
23 23
 	 * For example:
@@ -39,33 +39,33 @@ class CIUnit_TestCase extends PHPUnit_Framework_TestCase
39 39
 	 * @var array
40 40
 	 */
41 41
 	protected $tables = array();
42
-	
42
+
43 43
 	// ------------------------------------------------------------------------
44
-	
44
+
45 45
 	/**
46 46
 	 * The CodeIgniter Framework Instance
47 47
 	 *
48 48
 	 * @var object
49 49
 	 */
50 50
 	public $CI;
51
-	
51
+
52 52
 	// ------------------------------------------------------------------------
53
-	
53
+
54 54
 	/**
55 55
 	 * Constructor
56 56
 	 *
57
-	 * @param	string	$name 
58
-	 * @param	array	$data 
59
-	 * @param	string	$dataName 
57
+	 * @param	string	$name
58
+	 * @param	array	$data
59
+	 * @param	string	$dataName
60 60
 	 */
61 61
 	public function __construct($name = NULL, array $data = array(), $dataName = '')
62 62
 	{
63 63
 		parent::__construct($name, $data, $dataName);
64
-		$this->CI =& get_instance();
65
-		
64
+		$this->CI = get_instance();
65
+
66 66
 		log_message('debug', get_class($this).' CIUnit_TestCase initialized');
67 67
 	}
68
-	
68
+
69 69
 	/**
70 70
 	 * Set Up
71 71
 	 *
@@ -83,12 +83,12 @@ class CIUnit_TestCase extends PHPUnit_Framework_TestCase
83 83
 			$this->dbfixt($this->tables);
84 84
 		}
85 85
 	}
86
-	
86
+
87 87
 	/**
88 88
 	 * Tear Down
89
-	 * 
89
+	 *
90 90
 	 * This method will run after every test.
91
-	 * 
91
+	 *
92 92
 	 * @return void
93 93
 	 *
94 94
 	 * @author Eric Jones
@@ -101,7 +101,7 @@ class CIUnit_TestCase extends PHPUnit_Framework_TestCase
101 101
 			$this->dbfixt_unload($this->tables);
102 102
 		}
103 103
 	}
104
-	
104
+
105 105
 	/**
106 106
 	 * loads a database fixture
107 107
 	 * for each given fixture, we look up the yaml file and insert that into the corresponding table
@@ -122,7 +122,7 @@ class CIUnit_TestCase extends PHPUnit_Framework_TestCase
122 122
 			$table_fixtures = func_get_args();
123 123
 			$this->load_fixt($table_fixtures);
124 124
 		}
125
-		
125
+
126 126
 		/**
127 127
 		 * This is to allow the Unit Tester to specifiy different fixutre files for
128 128
 		 * a given table. An example would be the testing of two different senarios
@@ -134,7 +134,7 @@ class CIUnit_TestCase extends PHPUnit_Framework_TestCase
134 134
 		{
135 135
 			$fixt_name = $fixt . '_fixt';
136 136
 			$table = is_int($table) ? $fixt : $table;
137
-			
137
+
138 138
 			if (!empty($this->$fixt_name))
139 139
 			{
140 140
 				CIUnit::$fixture->load($table, $this->$fixt_name);
@@ -143,12 +143,12 @@ class CIUnit_TestCase extends PHPUnit_Framework_TestCase
143 143
 			{
144 144
 				die("The fixture {$fixt_name} failed to load properly\n");
145 145
 			}
146
-			
146
+
147 147
 		}
148
-		
148
+
149 149
 		log_message('debug', 'Table fixtures "' . join('", "', $table_fixtures) . '" loaded');
150 150
 	}
151
-	
151
+
152 152
 	/**
153 153
 	 * DBFixt Unload
154 154
 	 *
@@ -180,7 +180,7 @@ class CIUnit_TestCase extends PHPUnit_Framework_TestCase
180 180
 			// of the database load. Right??
181 181
 			$table_fixtures = array_reverse($table_fixtures, true);
182 182
 		}
183
-	
183
+
184 184
 		// Iterate over the array unloading the tables
185 185
 		foreach ($table_fixtures as $table => $fixture)
186 186
 		{
@@ -206,7 +206,7 @@ class CIUnit_TestCase extends PHPUnit_Framework_TestCase
206 206
 		foreach ( $fixts as $fixt )
207 207
 		{
208 208
 			$fixt_name = $fixt . '_fixt';
209
-			
209
+
210 210
 			if (file_exists(TESTSPATH . 'fixtures/' . $fixt . '_fixt.yml')) {
211 211
 				$this->$fixt_name = CIUnit::$spyc->loadFile(TESTSPATH . 'fixtures/' . $fixt . '_fixt.yml');
212 212
 			}

+ 4 - 17
application/views/footer.php View File

@@ -4,25 +4,12 @@
4 4
 <footer class="footer">
5 5
 	Generated in <?= $this->benchmark->elapsed_time();?> seconds, <?= $q_num ?> quer<?= ($q_num == 1) ? "y": "ies" ?>
6 6
 </footer>
7
-<!-- Piwik -->
8
-<script type="text/javascript"> 
9
-  var _paq = _paq || [];
10
-  _paq.push(['trackPageView']);
11
-  _paq.push(['enableLinkTracking']);
12
-  (function() {
13
-    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://static.timshomepage.net/piwik/";
14
-    _paq.push(['setTrackerUrl', u+'piwik.php']);
15
-    _paq.push(['setSiteId', 1]);
16
-    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
17
-    g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
18
-  })();
19
-
20
-</script>
21
-<noscript><p><img src="http://static.timshomepage.net/piwik/piwik.php?idsite=1" style="border:0" alt="" /></p></noscript>
22
-<!-- End Piwik Code -->
23 7
 <?php  if($this->session->userdata('uid') == 1){$this->output->enable_profiler(TRUE);} ?>
24 8
 <script src="/js/jquery.js"></script>
25 9
 <script src="/js/jquery-ui.min.js"></script>
26
-<?= $foot_js ?>
10
+<script src="/js/CLEditor/jquery.cleditor.js"></script>
11
+<script src="/js/CLEditor/jquery.cleditor.xhtml.js"></script>
12
+<script src="/js/todo.js"></script>
13
+<?php /*<?= $foot_js ?>*/ ?>
27 14
 </body>
28 15
 </html>

+ 8 - 2
application/views/header.php View File

@@ -1,9 +1,15 @@
1 1
 
2 2
 <head>
3 3
 <?= $meta ?>
4
+<title><?= $title ?></title>
4 5
 	<link rel="icon" href="//todo.timshomepage.net/images/favicon.ico" type="image/x-icon" />
5
-<?= $css ?>
6
-	<title><?= $title ?></title>
6
+	<link rel="stylesheet" href="/fonts/Puritan/stylesheet.css" />
7
+	<link rel="stylesheet" href="/css/todo.css" />
8
+	<link rel="stylesheet" href="/css/message.css" />
9
+	<link rel="stylesheet" href="/js/CLEditor/jquery.cleditor.css" />
10
+	<link rel="stylesheet" href="/css/jquery-ui.min.css" />
11
+<?php /* <?=  $css  ?> */ ?>
12
+
7 13
 <?= $head_js ?>
8 14
 </head>
9 15
 <body <?= (!empty($body_id)) ? " id=\"" . $body_id . "\"" : ""; ?>>

+ 2 - 2
application/views/task/view.php View File

@@ -10,9 +10,9 @@
10 10
 
11 11
 	<?php if($user_perms > PERM_CHECKLIST_ACCESS): ?>
12 12
 	<p id="editTask">
13
-		<?php if($user_perms == PERM_ADMIN_ACCESS){ ?>
13
+		<?php if($user_perms == PERM_ADMIN_ACCESS): ?>
14 14
 		<a href="#" id="delTask" onclick="if(confirm('Are you sure you want to delete this task')){window.location='<?= site_url('task/delete').'/'.$this->security->xss_clean($this->uri->segment('3')) ?>'}">Delete Task</a>
15
-		<?php } ?>
15
+		<?php endif ?>
16 16
 		<a id="editTaskIcon" href="<?= site_url('task/edit').'/'.$task ?>">Edit Task</a>
17 17
 
18 18
 	</p>

+ 277 - 277
web/index.php View File

@@ -1,278 +1,278 @@
1
-<?php
2
-/**
3
- * CodeIgniter
4
- *
5
- * An open source application development framework for PHP 5.2.4 or newer
6
- *
7
- * NOTICE OF LICENSE
8
- *
9
- * Licensed under the Open Software License version 3.0
10
- *
11
- * This source file is subject to the Open Software License (OSL 3.0) that is
12
- * bundled with this package in the files license.txt / license.rst.  It is
13
- * also available through the world wide web at this URL:
14
- * http://opensource.org/licenses/OSL-3.0
15
- * If you did not receive a copy of the license and are unable to obtain it
16
- * through the world wide web, please send an email to
17
- * licensing@ellislab.com so we can send you a copy immediately.
18
- *
19
- * @package		CodeIgniter
20
- * @author		EllisLab Dev Team
21
- * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
22
- * @license		http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
23
- * @link		http://codeigniter.com
24
- * @since		Version 1.0
25
- * @filesource
26
- */
27
-
28
-/*
29
- *---------------------------------------------------------------
30
- * APPLICATION ENVIRONMENT
31
- *---------------------------------------------------------------
32
- *
33
- * You can load different configurations depending on your
34
- * current environment. Setting the environment also influences
35
- * things like logging and error reporting.
36
- *
37
- * This can be set to anything, but default usage is:
38
- *
39
- *     development
40
- *     testing
41
- *     production
42
- *
43
- * NOTE: If you change these, also change the error_reporting() code below
44
- */
45
-define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'development');
46
-
47
-/*
48
- *---------------------------------------------------------------
49
- * ERROR REPORTING
50
- *---------------------------------------------------------------
51
- *
52
- * Different environments will require different levels of error reporting.
53
- * By default development will show errors but testing and live will hide them.
54
- */
55
-switch (ENVIRONMENT)
56
-{
57
-	case 'development':
58
-		error_reporting(-1);
59
-		ini_set('display_errors', 1);
60
-		break;
61
-
62
-	case 'testing':
63
-	case 'production':
64
-		error_reporting(-1);
65
-		ini_set('display_errors', 0);
66
-		break;
67
-
68
-	default:
69
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
70
-		echo 'The application environment is not set correctly.';
71
-		exit(1); // EXIT_ERROR
72
-}
73
-
74
-/*
75
- *---------------------------------------------------------------
76
- * SYSTEM FOLDER NAME
77
- *---------------------------------------------------------------
78
- *
79
- * This variable must contain the name of your "system" folder.
80
- * Include the path if the folder is not in the same directory
81
- * as this file.
82
- */
83
-$system_path = '../system';
84
-
85
-/*
86
- *---------------------------------------------------------------
87
- * APPLICATION FOLDER NAME
88
- *---------------------------------------------------------------
89
- *
90
- * If you want this front controller to use a different "application"
91
- * folder than the default one you can set its name here. The folder
92
- * can also be renamed or relocated anywhere on your server. If
93
- * you do, use a full server path. For more info please see the user guide:
94
- * http://codeigniter.com/user_guide/general/managing_apps.html
95
- *
96
- * NO TRAILING SLASH!
97
- */
98
-$application_folder = '../application';
99
-
100
-/*
101
- *---------------------------------------------------------------
102
- * VIEW FOLDER NAME
103
- *---------------------------------------------------------------
104
- *
105
- * If you want to move the view folder out of the application
106
- * folder set the path to the folder here. The folder can be renamed
107
- * and relocated anywhere on your server. If blank, it will default
108
- * to the standard location inside your application folder. If you
109
- * do move this, use the full server path to this folder.
110
- *
111
- * NO TRAILING SLASH!
112
- */
113
-$view_folder = '';
114
-
115
-
116
-/*
117
- * --------------------------------------------------------------------
118
- * DEFAULT CONTROLLER
119
- * --------------------------------------------------------------------
120
- *
121
- * Normally you will set your default controller in the routes.php file.
122
- * You can, however, force a custom routing by hard-coding a
123
- * specific controller class/function here. For most applications, you
124
- * WILL NOT set your routing here, but it's an option for those
125
- * special instances where you might want to override the standard
126
- * routing in a specific front controller that shares a common CI installation.
127
- *
128
- * IMPORTANT: If you set the routing here, NO OTHER controller will be
129
- * callable. In essence, this preference limits your application to ONE
130
- * specific controller. Leave the function name blank if you need
131
- * to call functions dynamically via the URI.
132
- *
133
- * Un-comment the $routing array below to use this feature
134
- */
135
-// The directory name, relative to the "controllers" folder.  Leave blank
136
-// if your controller is not in a sub-folder within the "controllers" folder
137
-// $routing['directory'] = '';
138
-
139
-// The controller class file name.  Example:  mycontroller
140
-// $routing['controller'] = '';
141
-
142
-// The controller function you wish to be called.
143
-// $routing['function']	= '';
144
-
145
-
146
-/*
147
- * -------------------------------------------------------------------
148
- *  CUSTOM CONFIG VALUES
149
- * -------------------------------------------------------------------
150
- *
151
- * The $assign_to_config array below will be passed dynamically to the
152
- * config class when initialized. This allows you to set custom config
153
- * items or override any default config values found in the config.php file.
154
- * This can be handy as it permits you to share one application between
155
- * multiple front controller files, with each file containing different
156
- * config values.
157
- *
158
- * Un-comment the $assign_to_config array below to use this feature
159
- */
160
-// $assign_to_config['name_of_config_item'] = 'value of config item';
161
-
162
-
163
-
164
-// --------------------------------------------------------------------
165
-// END OF USER CONFIGURABLE SETTINGS.  DO NOT EDIT BELOW THIS LINE
166
-// --------------------------------------------------------------------
167
-
168
-/*
169
- * ---------------------------------------------------------------
170
- *  Resolve the system path for increased reliability
171
- * ---------------------------------------------------------------
172
- */
173
-
174
-// Set the current directory correctly for CLI requests
175
-if (defined('STDIN'))
176
-{
177
-	chdir(dirname(__FILE__));
178
-}
179
-
180
-if (($_temp = realpath($system_path)) !== FALSE)
181
-{
182
-	$system_path = $_temp.'/';
183
-}
184
-else
185
-{
186
-	// Ensure there's a trailing slash
187
-	$system_path = rtrim($system_path, '/').'/';
188
-}
189
-
190
-// Is the system path correct?
191
-if ( ! is_dir($system_path))
192
-{
193
-	header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
194
-	echo 'Your system folder path does not appear to be set correctly. Please open the following file and correct this: '.pathinfo(__FILE__, PATHINFO_BASENAME);
195
-	exit(3); // EXIT_CONFIG
196
-}
197
-
198
-/*
199
- * -------------------------------------------------------------------
200
- *  Now that we know the path, set the main path constants
201
- * -------------------------------------------------------------------
202
- */
203
-// The name of THIS file
204
-define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
205
-
206
-// Path to the system folder
207
-define('BASEPATH', str_replace('\\', '/', $system_path));
208
-
209
-// Path to the front controller (this file)
210
-define('FCPATH', str_replace(SELF, '', __FILE__));
211
-
212
-// Name of the "system folder"
213
-define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/'));
214
-
215
-// The path to the "application" folder
216
-if (is_dir($application_folder))
217
-{
218
-	if (($_temp = realpath($application_folder)) !== FALSE)
219
-	{
220
-		$application_folder = $_temp;
221
-	}
222
-
223
-	define('APPPATH', $application_folder.DIRECTORY_SEPARATOR);
224
-}
225
-else
226
-{
227
-	if ( ! is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
228
-	{
229
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
230
-		echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
231
-		exit(3); // EXIT_CONFIG
232
-	}
233
-
234
-	define('APPPATH', BASEPATH.$application_folder.DIRECTORY_SEPARATOR);
235
-}
236
-
237
-// The path to the "views" folder
238
-if ( ! is_dir($view_folder))
239
-{
240
-	if ( ! empty($view_folder) && is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
241
-	{
242
-		$view_folder = APPPATH.$view_folder;
243
-	}
244
-	elseif ( ! is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
245
-	{
246
-		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
247
-		echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
248
-		exit(3); // EXIT_CONFIG
249
-	}
250
-	else
251
-	{
252
-		$view_folder = APPPATH.'views';
253
-	}
254
-}
255
-
256
-if (($_temp = realpath($view_folder)) !== FALSE)
257
-{
258
-	$view_folder = $_temp.DIRECTORY_SEPARATOR;
259
-}
260
-else
261
-{
262
-	$view_folder = rtrim($view_folder, '/\\').DIRECTORY_SEPARATOR;
263
-}
264
-
265
-define('VIEWPATH', $view_folder);
266
-
267
-/*
268
- * --------------------------------------------------------------------
269
- * LOAD THE BOOTSTRAP FILE
270
- * --------------------------------------------------------------------
271
- *
272
- * And away we go...
273
- */
274
-require_once '../vendor/autoload.php';
275
-require_once BASEPATH.'core/CodeIgniter.php';
276
-
277
-/* End of file index.php */
1
+<?php
2
+/**
3
+ * CodeIgniter
4
+ *
5
+ * An open source application development framework for PHP 5.2.4 or newer
6
+ *
7
+ * NOTICE OF LICENSE
8
+ *
9
+ * Licensed under the Open Software License version 3.0
10
+ *
11
+ * This source file is subject to the Open Software License (OSL 3.0) that is
12
+ * bundled with this package in the files license.txt / license.rst.  It is
13
+ * also available through the world wide web at this URL:
14
+ * http://opensource.org/licenses/OSL-3.0
15
+ * If you did not receive a copy of the license and are unable to obtain it
16
+ * through the world wide web, please send an email to
17
+ * licensing@ellislab.com so we can send you a copy immediately.
18
+ *
19
+ * @package		CodeIgniter
20
+ * @author		EllisLab Dev Team
21
+ * @copyright	Copyright (c) 2008 - 2014, EllisLab, Inc. (http://ellislab.com/)
22
+ * @license		http://opensource.org/licenses/OSL-3.0 Open Software License (OSL 3.0)
23
+ * @link		http://codeigniter.com
24
+ * @since		Version 1.0
25
+ * @filesource
26
+ */
27
+
28
+/*
29
+ *---------------------------------------------------------------
30
+ * APPLICATION ENVIRONMENT
31
+ *---------------------------------------------------------------
32
+ *
33
+ * You can load different configurations depending on your
34
+ * current environment. Setting the environment also influences
35
+ * things like logging and error reporting.
36
+ *
37
+ * This can be set to anything, but default usage is:
38
+ *
39
+ *     development
40
+ *     testing
41
+ *     production
42
+ *
43
+ * NOTE: If you change these, also change the error_reporting() code below
44
+ */
45
+define('ENVIRONMENT', isset($_SERVER['CI_ENV']) ? $_SERVER['CI_ENV'] : 'development');
46
+
47
+/*
48
+ *---------------------------------------------------------------
49
+ * ERROR REPORTING
50
+ *---------------------------------------------------------------
51
+ *
52
+ * Different environments will require different levels of error reporting.
53
+ * By default development will show errors but testing and live will hide them.
54
+ */
55
+switch (ENVIRONMENT)
56
+{
57
+	case 'development':
58
+		error_reporting(-1);
59
+		ini_set('display_errors', 1);
60
+		break;
61
+
62
+	case 'testing':
63
+	case 'production':
64
+		error_reporting(-1);
65
+		ini_set('display_errors', 0);
66
+		break;
67
+
68
+	default:
69
+		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
70
+		echo 'The application environment is not set correctly.';
71
+		exit(1); // EXIT_ERROR
72
+}
73
+
74
+/*
75
+ *---------------------------------------------------------------
76
+ * SYSTEM FOLDER NAME
77
+ *---------------------------------------------------------------
78
+ *
79
+ * This variable must contain the name of your "system" folder.
80
+ * Include the path if the folder is not in the same directory
81
+ * as this file.
82
+ */
83
+$system_path = '../system';
84
+
85
+/*
86
+ *---------------------------------------------------------------
87
+ * APPLICATION FOLDER NAME
88
+ *---------------------------------------------------------------
89
+ *
90
+ * If you want this front controller to use a different "application"
91
+ * folder than the default one you can set its name here. The folder
92
+ * can also be renamed or relocated anywhere on your server. If
93
+ * you do, use a full server path. For more info please see the user guide:
94
+ * http://codeigniter.com/user_guide/general/managing_apps.html
95
+ *
96
+ * NO TRAILING SLASH!
97
+ */
98
+$application_folder = '../application';
99
+
100
+/*
101
+ *---------------------------------------------------------------
102
+ * VIEW FOLDER NAME
103
+ *---------------------------------------------------------------
104
+ *
105
+ * If you want to move the view folder out of the application
106
+ * folder set the path to the folder here. The folder can be renamed
107
+ * and relocated anywhere on your server. If blank, it will default
108
+ * to the standard location inside your application folder. If you
109
+ * do move this, use the full server path to this folder.
110
+ *
111
+ * NO TRAILING SLASH!
112
+ */
113
+$view_folder = '';
114
+
115
+
116
+/*
117
+ * --------------------------------------------------------------------
118
+ * DEFAULT CONTROLLER
119
+ * --------------------------------------------------------------------
120
+ *
121
+ * Normally you will set your default controller in the routes.php file.
122
+ * You can, however, force a custom routing by hard-coding a
123
+ * specific controller class/function here. For most applications, you
124
+ * WILL NOT set your routing here, but it's an option for those
125
+ * special instances where you might want to override the standard
126
+ * routing in a specific front controller that shares a common CI installation.
127
+ *
128
+ * IMPORTANT: If you set the routing here, NO OTHER controller will be
129
+ * callable. In essence, this preference limits your application to ONE
130
+ * specific controller. Leave the function name blank if you need
131
+ * to call functions dynamically via the URI.
132
+ *
133
+ * Un-comment the $routing array below to use this feature
134
+ */
135
+// The directory name, relative to the "controllers" folder.  Leave blank
136
+// if your controller is not in a sub-folder within the "controllers" folder
137
+// $routing['directory'] = '';
138
+
139
+// The controller class file name.  Example:  mycontroller
140
+// $routing['controller'] = '';
141
+
142
+// The controller function you wish to be called.
143
+// $routing['function']	= '';
144
+
145
+
146
+/*
147
+ * -------------------------------------------------------------------
148
+ *  CUSTOM CONFIG VALUES
149
+ * -------------------------------------------------------------------
150
+ *
151
+ * The $assign_to_config array below will be passed dynamically to the
152
+ * config class when initialized. This allows you to set custom config
153
+ * items or override any default config values found in the config.php file.
154
+ * This can be handy as it permits you to share one application between
155
+ * multiple front controller files, with each file containing different
156
+ * config values.
157
+ *
158
+ * Un-comment the $assign_to_config array below to use this feature
159
+ */
160
+// $assign_to_config['name_of_config_item'] = 'value of config item';
161
+
162
+
163
+
164
+// --------------------------------------------------------------------
165
+// END OF USER CONFIGURABLE SETTINGS.  DO NOT EDIT BELOW THIS LINE
166
+// --------------------------------------------------------------------
167
+
168
+/*
169
+ * ---------------------------------------------------------------
170
+ *  Resolve the system path for increased reliability
171
+ * ---------------------------------------------------------------
172
+ */
173
+
174
+// Set the current directory correctly for CLI requests
175
+if (defined('STDIN'))
176
+{
177
+	chdir(dirname(__FILE__));
178
+}
179
+
180
+if (($_temp = realpath($system_path)) !== FALSE)
181
+{
182
+	$system_path = $_temp.'/';
183
+}
184
+else
185
+{
186
+	// Ensure there's a trailing slash
187
+	$system_path = rtrim($system_path, '/').'/';
188
+}
189
+
190
+// Is the system path correct?
191
+if ( ! is_dir($system_path))
192
+{
193
+	header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
194
+	echo 'Your system folder path does not appear to be set correctly. Please open the following file and correct this: '.pathinfo(__FILE__, PATHINFO_BASENAME);
195
+	exit(3); // EXIT_CONFIG
196
+}
197
+
198
+/*
199
+ * -------------------------------------------------------------------
200
+ *  Now that we know the path, set the main path constants
201
+ * -------------------------------------------------------------------
202
+ */
203
+// The name of THIS file
204
+define('SELF', pathinfo(__FILE__, PATHINFO_BASENAME));
205
+
206
+// Path to the system folder
207
+define('BASEPATH', str_replace('\\', '/', $system_path));
208
+
209
+// Path to the front controller (this file)
210
+define('FCPATH', str_replace(SELF, '', __FILE__));
211
+
212
+// Name of the "system folder"
213
+define('SYSDIR', trim(strrchr(trim(BASEPATH, '/'), '/'), '/'));
214
+
215
+// The path to the "application" folder
216
+if (is_dir($application_folder))
217
+{
218
+	if (($_temp = realpath($application_folder)) !== FALSE)
219
+	{
220
+		$application_folder = $_temp;
221
+	}
222
+
223
+	define('APPPATH', $application_folder.DIRECTORY_SEPARATOR);
224
+}
225
+else
226
+{
227
+	if ( ! is_dir(BASEPATH.$application_folder.DIRECTORY_SEPARATOR))
228
+	{
229
+		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
230
+		echo 'Your application folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
231
+		exit(3); // EXIT_CONFIG
232
+	}
233
+
234
+	define('APPPATH', BASEPATH.$application_folder.DIRECTORY_SEPARATOR);
235
+}
236
+
237
+// The path to the "views" folder
238
+if ( ! is_dir($view_folder))
239
+{
240
+	if ( ! empty($view_folder) && is_dir(APPPATH.$view_folder.DIRECTORY_SEPARATOR))
241
+	{
242
+		$view_folder = APPPATH.$view_folder;
243
+	}
244
+	elseif ( ! is_dir(APPPATH.'views'.DIRECTORY_SEPARATOR))
245
+	{
246
+		header('HTTP/1.1 503 Service Unavailable.', TRUE, 503);
247
+		echo 'Your view folder path does not appear to be set correctly. Please open the following file and correct this: '.SELF;
248
+		exit(3); // EXIT_CONFIG
249
+	}
250
+	else
251
+	{
252
+		$view_folder = APPPATH.'views';
253
+	}
254
+}
255
+
256
+if (($_temp = realpath($view_folder)) !== FALSE)
257
+{
258
+	$view_folder = $_temp.DIRECTORY_SEPARATOR;
259
+}
260
+else
261
+{
262
+	$view_folder = rtrim($view_folder, '/\\').DIRECTORY_SEPARATOR;
263
+}
264
+
265
+define('VIEWPATH', $view_folder);
266
+
267
+/*
268
+ * --------------------------------------------------------------------
269
+ * LOAD THE BOOTSTRAP FILE
270
+ * --------------------------------------------------------------------
271
+ *
272
+ * And away we go...
273
+ */
274
+require_once '../vendor/autoload.php';
275
+require_once BASEPATH.'core/CodeIgniter.php';
276
+
277
+/* End of file index.php */
278 278
 /* Location: ./index.php */