@@ -19,7 +19,7 @@ |
||
19 | 19 | |
20 | 20 | <div class="row"> |
21 | 21 | <div class="col-xs-12 col-md-12"> |
22 | - <?=form_submit($form_submit);?> |
|
22 | + <?=form_submit($form_submit); ?> |
|
23 | 23 | </div> |
24 | 24 | </div> |
25 | 25 | </form> |
@@ -25,7 +25,7 @@ |
||
25 | 25 | |
26 | 26 | <div class="row"> |
27 | 27 | <div class="col-xs-6 col-sm-6 col-md-6"> |
28 | - <?=form_submit($form_submit);?> |
|
28 | + <?=form_submit($form_submit); ?> |
|
29 | 29 | </div> |
30 | 30 | <div class="col-xs-6 col-sm-6 col-md-6"> |
31 | 31 | <a href="<?=base_url('user/signup')?>" class="btn btn-lg btn-primary btn-block">Create an account</a> |
@@ -11,12 +11,12 @@ |
||
11 | 11 | <p>Filename: <?php echo $filepath; ?></p> |
12 | 12 | <p>Line Number: <?php echo $line; ?></p> |
13 | 13 | |
14 | -<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?> |
|
14 | +<?php if(defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?> |
|
15 | 15 | |
16 | 16 | <p>Backtrace:</p> |
17 | - <?php foreach (debug_backtrace() as $error): ?> |
|
17 | + <?php foreach(debug_backtrace() as $error): ?> |
|
18 | 18 | |
19 | - <?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?> |
|
19 | + <?php if(isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?> |
|
20 | 20 | |
21 | 21 | <p style="margin-left:10px"> |
22 | 22 | File: <?php echo $error['file'] ?><br /> |
@@ -11,12 +11,12 @@ |
||
11 | 11 | <p>Filename: <?php echo $exception->getFile(); ?></p> |
12 | 12 | <p>Line Number: <?php echo $exception->getLine(); ?></p> |
13 | 13 | |
14 | -<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?> |
|
14 | +<?php if(defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?> |
|
15 | 15 | |
16 | 16 | <p>Backtrace:</p> |
17 | - <?php foreach ($exception->getTrace() as $error): ?> |
|
17 | + <?php foreach($exception->getTrace() as $error): ?> |
|
18 | 18 | |
19 | - <?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?> |
|
19 | + <?php if(isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?> |
|
20 | 20 | |
21 | 21 | <p style="margin-left:10px"> |
22 | 22 | File: <?php echo $error['file']; ?><br /> |
@@ -7,11 +7,11 @@ |
||
7 | 7 | Filename: <?php echo $filepath, "\n"; ?> |
8 | 8 | Line Number: <?php echo $line; ?> |
9 | 9 | |
10 | -<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?> |
|
10 | +<?php if(defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?> |
|
11 | 11 | |
12 | 12 | Backtrace: |
13 | -<?php foreach (debug_backtrace() as $error): ?> |
|
14 | -<?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?> |
|
13 | +<?php foreach(debug_backtrace() as $error): ?> |
|
14 | +<?php if(isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?> |
|
15 | 15 | File: <?php echo $error['file'], "\n"; ?> |
16 | 16 | Line: <?php echo $error['line'], "\n"; ?> |
17 | 17 | Function: <?php echo $error['function'], "\n\n"; ?> |
@@ -7,11 +7,11 @@ |
||
7 | 7 | Filename: <?php echo $exception->getFile(), "\n"; ?> |
8 | 8 | Line Number: <?php echo $exception->getLine(); ?> |
9 | 9 | |
10 | -<?php if (defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?> |
|
10 | +<?php if(defined('SHOW_DEBUG_BACKTRACE') && SHOW_DEBUG_BACKTRACE === TRUE): ?> |
|
11 | 11 | |
12 | 12 | Backtrace: |
13 | -<?php foreach ($exception->getTrace() as $error): ?> |
|
14 | -<?php if (isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?> |
|
13 | +<?php foreach($exception->getTrace() as $error): ?> |
|
14 | +<?php if(isset($error['file']) && strpos($error['file'], realpath(BASEPATH)) !== 0): ?> |
|
15 | 15 | File: <?php echo $error['file'], "\n"; ?> |
16 | 16 | Line: <?php echo $error['line'], "\n"; ?> |
17 | 17 | Function: <?php echo $error['function'], "\n\n"; ?> |
@@ -76,7 +76,7 @@ |
||
76 | 76 | 'jpeg' => array('image/jpeg', 'image/pjpeg'), |
77 | 77 | 'jpg' => array('image/jpeg', 'image/pjpeg'), |
78 | 78 | 'jpe' => array('image/jpeg', 'image/pjpeg'), |
79 | - 'png' => array('image/png', 'image/x-png'), |
|
79 | + 'png' => array('image/png', 'image/x-png'), |
|
80 | 80 | 'tiff' => 'image/tiff', |
81 | 81 | 'tif' => 'image/tiff', |
82 | 82 | 'css' => array('text/css', 'text/plain'), |
@@ -17,48 +17,48 @@ |
||
17 | 17 | |
18 | 18 | // smiley image name width height alt |
19 | 19 | |
20 | - ':-)' => array('grin.gif', '19', '19', 'grin'), |
|
21 | - ':lol:' => array('lol.gif', '19', '19', 'LOL'), |
|
22 | - ':cheese:' => array('cheese.gif', '19', '19', 'cheese'), |
|
23 | - ':)' => array('smile.gif', '19', '19', 'smile'), |
|
24 | - ';-)' => array('wink.gif', '19', '19', 'wink'), |
|
25 | - ';)' => array('wink.gif', '19', '19', 'wink'), |
|
26 | - ':smirk:' => array('smirk.gif', '19', '19', 'smirk'), |
|
27 | - ':roll:' => array('rolleyes.gif', '19', '19', 'rolleyes'), |
|
28 | - ':-S' => array('confused.gif', '19', '19', 'confused'), |
|
29 | - ':wow:' => array('surprise.gif', '19', '19', 'surprised'), |
|
30 | - ':bug:' => array('bigsurprise.gif', '19', '19', 'big surprise'), |
|
31 | - ':-P' => array('tongue_laugh.gif', '19', '19', 'tongue laugh'), |
|
32 | - '%-P' => array('tongue_rolleye.gif', '19', '19', 'tongue rolleye'), |
|
33 | - ';-P' => array('tongue_wink.gif', '19', '19', 'tongue wink'), |
|
34 | - ':P' => array('raspberry.gif', '19', '19', 'raspberry'), |
|
35 | - ':blank:' => array('blank.gif', '19', '19', 'blank stare'), |
|
36 | - ':long:' => array('longface.gif', '19', '19', 'long face'), |
|
37 | - ':ohh:' => array('ohh.gif', '19', '19', 'ohh'), |
|
38 | - ':grrr:' => array('grrr.gif', '19', '19', 'grrr'), |
|
39 | - ':gulp:' => array('gulp.gif', '19', '19', 'gulp'), |
|
40 | - '8-/' => array('ohoh.gif', '19', '19', 'oh oh'), |
|
41 | - ':down:' => array('downer.gif', '19', '19', 'downer'), |
|
42 | - ':red:' => array('embarrassed.gif', '19', '19', 'red face'), |
|
43 | - ':sick:' => array('sick.gif', '19', '19', 'sick'), |
|
44 | - ':shut:' => array('shuteye.gif', '19', '19', 'shut eye'), |
|
45 | - ':-/' => array('hmm.gif', '19', '19', 'hmmm'), |
|
46 | - '>:(' => array('mad.gif', '19', '19', 'mad'), |
|
47 | - ':mad:' => array('mad.gif', '19', '19', 'mad'), |
|
48 | - '>:-(' => array('angry.gif', '19', '19', 'angry'), |
|
49 | - ':angry:' => array('angry.gif', '19', '19', 'angry'), |
|
50 | - ':zip:' => array('zip.gif', '19', '19', 'zipper'), |
|
51 | - ':kiss:' => array('kiss.gif', '19', '19', 'kiss'), |
|
52 | - ':ahhh:' => array('shock.gif', '19', '19', 'shock'), |
|
53 | - ':coolsmile:' => array('shade_smile.gif', '19', '19', 'cool smile'), |
|
54 | - ':coolsmirk:' => array('shade_smirk.gif', '19', '19', 'cool smirk'), |
|
55 | - ':coolgrin:' => array('shade_grin.gif', '19', '19', 'cool grin'), |
|
56 | - ':coolhmm:' => array('shade_hmm.gif', '19', '19', 'cool hmm'), |
|
57 | - ':coolmad:' => array('shade_mad.gif', '19', '19', 'cool mad'), |
|
58 | - ':coolcheese:' => array('shade_cheese.gif', '19', '19', 'cool cheese'), |
|
59 | - ':vampire:' => array('vampire.gif', '19', '19', 'vampire'), |
|
60 | - ':snake:' => array('snake.gif', '19', '19', 'snake'), |
|
61 | - ':exclaim:' => array('exclaim.gif', '19', '19', 'exclaim'), |
|
62 | - ':question:' => array('question.gif', '19', '19', 'question') |
|
20 | + ':-)' => array('grin.gif', '19', '19', 'grin'), |
|
21 | + ':lol:' => array('lol.gif', '19', '19', 'LOL'), |
|
22 | + ':cheese:' => array('cheese.gif', '19', '19', 'cheese'), |
|
23 | + ':)' => array('smile.gif', '19', '19', 'smile'), |
|
24 | + ';-)' => array('wink.gif', '19', '19', 'wink'), |
|
25 | + ';)' => array('wink.gif', '19', '19', 'wink'), |
|
26 | + ':smirk:' => array('smirk.gif', '19', '19', 'smirk'), |
|
27 | + ':roll:' => array('rolleyes.gif', '19', '19', 'rolleyes'), |
|
28 | + ':-S' => array('confused.gif', '19', '19', 'confused'), |
|
29 | + ':wow:' => array('surprise.gif', '19', '19', 'surprised'), |
|
30 | + ':bug:' => array('bigsurprise.gif', '19', '19', 'big surprise'), |
|
31 | + ':-P' => array('tongue_laugh.gif', '19', '19', 'tongue laugh'), |
|
32 | + '%-P' => array('tongue_rolleye.gif', '19', '19', 'tongue rolleye'), |
|
33 | + ';-P' => array('tongue_wink.gif', '19', '19', 'tongue wink'), |
|
34 | + ':P' => array('raspberry.gif', '19', '19', 'raspberry'), |
|
35 | + ':blank:' => array('blank.gif', '19', '19', 'blank stare'), |
|
36 | + ':long:' => array('longface.gif', '19', '19', 'long face'), |
|
37 | + ':ohh:' => array('ohh.gif', '19', '19', 'ohh'), |
|
38 | + ':grrr:' => array('grrr.gif', '19', '19', 'grrr'), |
|
39 | + ':gulp:' => array('gulp.gif', '19', '19', 'gulp'), |
|
40 | + '8-/' => array('ohoh.gif', '19', '19', 'oh oh'), |
|
41 | + ':down:' => array('downer.gif', '19', '19', 'downer'), |
|
42 | + ':red:' => array('embarrassed.gif', '19', '19', 'red face'), |
|
43 | + ':sick:' => array('sick.gif', '19', '19', 'sick'), |
|
44 | + ':shut:' => array('shuteye.gif', '19', '19', 'shut eye'), |
|
45 | + ':-/' => array('hmm.gif', '19', '19', 'hmmm'), |
|
46 | + '>:(' => array('mad.gif', '19', '19', 'mad'), |
|
47 | + ':mad:' => array('mad.gif', '19', '19', 'mad'), |
|
48 | + '>:-(' => array('angry.gif', '19', '19', 'angry'), |
|
49 | + ':angry:' => array('angry.gif', '19', '19', 'angry'), |
|
50 | + ':zip:' => array('zip.gif', '19', '19', 'zipper'), |
|
51 | + ':kiss:' => array('kiss.gif', '19', '19', 'kiss'), |
|
52 | + ':ahhh:' => array('shock.gif', '19', '19', 'shock'), |
|
53 | + ':coolsmile:' => array('shade_smile.gif', '19', '19', 'cool smile'), |
|
54 | + ':coolsmirk:' => array('shade_smirk.gif', '19', '19', 'cool smirk'), |
|
55 | + ':coolgrin:' => array('shade_grin.gif', '19', '19', 'cool grin'), |
|
56 | + ':coolhmm:' => array('shade_hmm.gif', '19', '19', 'cool hmm'), |
|
57 | + ':coolmad:' => array('shade_mad.gif', '19', '19', 'cool mad'), |
|
58 | + ':coolcheese:' => array('shade_cheese.gif', '19', '19', 'cool cheese'), |
|
59 | + ':vampire:' => array('vampire.gif', '19', '19', 'vampire'), |
|
60 | + ':snake:' => array('snake.gif', '19', '19', 'snake'), |
|
61 | + ':exclaim:' => array('exclaim.gif', '19', '19', 'exclaim'), |
|
62 | + ':question:' => array('question.gif', '19', '19', 'question') |
|
63 | 63 | |
64 | 64 | ); |
@@ -245,7 +245,7 @@ |
||
245 | 245 | } |
246 | 246 | |
247 | 247 | /** |
248 | - * @param $md5 |
|
248 | + * @param string $md5 |
|
249 | 249 | * |
250 | 250 | * @return array |
251 | 251 | */ |
@@ -74,8 +74,8 @@ discard block |
||
74 | 74 | */ |
75 | 75 | public function __construct(&$db) { |
76 | 76 | // Assign the main CI object to $this->CI and load the file helper since we use it a lot |
77 | - $this->CI =& get_instance(); |
|
78 | - $this->db =& $db; |
|
77 | + $this->CI = & get_instance(); |
|
78 | + $this->db = & $db; |
|
79 | 79 | $this->CI->load->helper('file'); |
80 | 80 | |
81 | 81 | $this->check_path(); |
@@ -102,18 +102,18 @@ discard block |
||
102 | 102 | |
103 | 103 | // Add a trailing slash to the path if needed |
104 | 104 | $path = realpath($path) |
105 | - ? rtrim(realpath($path), DIRECTORY_SEPARATOR) . DIRECTORY_SEPARATOR |
|
106 | - : rtrim($path, '/') . '/'; |
|
105 | + ? rtrim(realpath($path), DIRECTORY_SEPARATOR).DIRECTORY_SEPARATOR |
|
106 | + : rtrim($path, '/').'/'; |
|
107 | 107 | |
108 | 108 | if(!is_dir($path)) { |
109 | - log_message('debug', 'DB cache path error: ' . $path); |
|
109 | + log_message('debug', 'DB cache path error: '.$path); |
|
110 | 110 | |
111 | 111 | // If the path is wrong we'll turn off caching |
112 | 112 | return $this->db->cache_off(); |
113 | 113 | } |
114 | 114 | |
115 | 115 | if(!is_really_writable($path)) { |
116 | - log_message('debug', 'DB cache dir not writable: ' . $path); |
|
116 | + log_message('debug', 'DB cache dir not writable: '.$path); |
|
117 | 117 | |
118 | 118 | // If the path is not really writable we'll turn off caching |
119 | 119 | return $this->db->cache_off(); |
@@ -143,11 +143,11 @@ discard block |
||
143 | 143 | // BEGIN --- modification for supporting multi-level cache folders |
144 | 144 | |
145 | 145 | if(is_array($this->CI->config->item('multi_level_cache_folders'))) { |
146 | - $uri_md5 = md5($segment_one . '+' . $segment_two); |
|
146 | + $uri_md5 = md5($segment_one.'+'.$segment_two); |
|
147 | 147 | $layer = $this->get_folder_layers($uri_md5); |
148 | - $filepath = $this->db->cachedir . $segment_one . '/' . $segment_two . '/' . trim(implode('/', $layer), '/') . '/' . $uri_md5; |
|
148 | + $filepath = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.trim(implode('/', $layer), '/').'/'.$uri_md5; |
|
149 | 149 | } else { |
150 | - $filepath = $this->db->cachedir . $segment_one . '/' . $segment_two . '/' . md5($sql); |
|
150 | + $filepath = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.md5($sql); |
|
151 | 151 | } |
152 | 152 | |
153 | 153 | // END --- modification for supporting multi-level cache folders |
@@ -178,9 +178,9 @@ discard block |
||
178 | 178 | // BEGIN --- modification for supporting multi-level cache folders |
179 | 179 | |
180 | 180 | if(is_array($this->CI->config->item('multi_level_cache_folders'))) { |
181 | - $uri_md5 = md5($segment_one . '+' . $segment_two); |
|
181 | + $uri_md5 = md5($segment_one.'+'.$segment_two); |
|
182 | 182 | $layer = $this->get_folder_layers($uri_md5); |
183 | - $dir_path = $this->db->cachedir . $segment_one . '/' . $segment_two . '/' . trim(implode('/', $layer), '/') . '/'; |
|
183 | + $dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.trim(implode('/', $layer), '/').'/'; |
|
184 | 184 | |
185 | 185 | if(!is_dir($dir_path)) { |
186 | 186 | $old = umask(0); |
@@ -188,18 +188,18 @@ discard block |
||
188 | 188 | umask($old); |
189 | 189 | } |
190 | 190 | } else { |
191 | - $dir_path = $this->db->cachedir . $segment_one . '/' . $segment_two . '/'; |
|
191 | + $dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'; |
|
192 | 192 | } |
193 | 193 | |
194 | 194 | $filename = md5($sql); |
195 | 195 | |
196 | 196 | // END --- modification for supporting multi-level cache folders |
197 | 197 | |
198 | - if(write_file($dir_path . $filename, serialize($object)) === FALSE) { |
|
198 | + if(write_file($dir_path.$filename, serialize($object)) === FALSE) { |
|
199 | 199 | return FALSE; |
200 | 200 | } |
201 | 201 | |
202 | - chmod($dir_path . $filename, 0640); |
|
202 | + chmod($dir_path.$filename, 0640); |
|
203 | 203 | return TRUE; |
204 | 204 | } |
205 | 205 | |
@@ -223,11 +223,11 @@ discard block |
||
223 | 223 | } |
224 | 224 | |
225 | 225 | if(is_array($this->CI->config->item('multi_level_cache_folders'))) { |
226 | - $uri_md5 = md5($segment_one . '+' . $segment_two); |
|
226 | + $uri_md5 = md5($segment_one.'+'.$segment_two); |
|
227 | 227 | $layer = $this->get_folder_layers($uri_md5); |
228 | - $dir_path = $this->db->cachedir . $segment_one . '/' . $segment_two . '/' . trim(implode('/', $layer), '/') . '/'; |
|
228 | + $dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'.trim(implode('/', $layer), '/').'/'; |
|
229 | 229 | } else { |
230 | - $dir_path = $this->db->cachedir . $segment_one . '/' . $segment_two . '/'; |
|
230 | + $dir_path = $this->db->cachedir.$segment_one.'/'.$segment_two.'/'; |
|
231 | 231 | } |
232 | 232 | delete_files($dir_path, TRUE); |
233 | 233 | } |