@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | } ?></h2> |
149 | 149 | <p><strong>Posted:</strong> <?php echo $row['dateFormatted']; ?> <strong>by</strong> <?php echo $row['name']; ?></p> |
150 | 150 | <?php |
151 | - $latestpostsql = "SELECT *, |
|
151 | + $latestpostsql = "SELECT *, |
|
152 | 152 | (SELECT CONCAT(`firstname`, ' ', `lastname`) FROM cr_users WHERE `cr_users`.id = `cr_discussion`.`userID` ) AS `name`, |
153 | 153 | (SELECT id FROM cr_discussion WHERE cr_discussion.CategoryParent = '$areaid' ORDER BY cr_discussion.id DESC LIMIT 0,1) AS `postid`, |
154 | 154 | (SELECT DATE_FORMAT(date,'%W, %M %e @ %h:%i %p') FROM cr_discussion WHERE cr_discussion.CategoryParent = '$areaid' ORDER BY cr_discussion.id DESC |
@@ -212,7 +212,7 @@ discard block |
||
212 | 212 | </div> |
213 | 213 | <?php |
214 | 214 | } // End the admin loop |
215 | - ?> |
|
215 | + ?> |
|
216 | 216 | <div id="right"> |
217 | 217 | <?php echo $subscribe; |
218 | 218 |
@@ -15,10 +15,10 @@ |
||
15 | 15 | session_start(); |
16 | 16 | |
17 | 17 | $fb = new Facebook\Facebook([ |
18 | - 'app_id' => $config['auth']['facebook']['appId'], |
|
19 | - 'app_secret' => $config['auth']['facebook']['appSecret'], |
|
20 | - 'default_graph_version' => 'v2.2', |
|
21 | - ]); |
|
18 | + 'app_id' => $config['auth']['facebook']['appId'], |
|
19 | + 'app_secret' => $config['auth']['facebook']['appSecret'], |
|
20 | + 'default_graph_version' => 'v2.2', |
|
21 | + ]); |
|
22 | 22 | |
23 | 23 | $helper = $fb->getRedirectLoginHelper(); |
24 | 24 |
@@ -54,8 +54,8 @@ discard block |
||
54 | 54 | } |
55 | 55 | |
56 | 56 | // After we have inserted the data, we want to head back to the main users page |
57 | - header('Location: locations.php'); // Move to the home page of the admin section |
|
58 | - exit; |
|
57 | + header('Location: locations.php'); // Move to the home page of the admin section |
|
58 | + exit; |
|
59 | 59 | } |
60 | 60 | } |
61 | 61 | |
@@ -121,10 +121,10 @@ discard block |
||
121 | 121 | </form> |
122 | 122 | </div><!-- /.box --> |
123 | 123 | <?php |
124 | - if (isAdmin()) { |
|
125 | - ?> |
|
124 | + if (isAdmin()) { |
|
125 | + ?> |
|
126 | 126 | <div id="right"> |
127 | 127 | <div class="item"><a href="settings.php">Back to settings</a></div> |
128 | 128 | <?php |
129 | - } ?> |
|
129 | + } ?> |
|
130 | 130 | <?php include 'includes/footer.php'; ?> |
@@ -28,13 +28,13 @@ |
||
28 | 28 | $currentTimestamp = $date = strftime('%F %T', time()); |
29 | 29 | |
30 | 30 | $data = [ |
31 | - ['field' => 'name', 'type' => 'string', 'value' => $this->name], |
|
32 | - ['field' => 'date', 'type' => 'string', 'value' => $this->datetime], |
|
33 | - ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()], |
|
34 | - ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()], |
|
35 | - ['field' => 'subType', 'type' => 'int', 'value' => $this->sub_type->getId()], |
|
36 | - ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()], |
|
37 | - ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp], |
|
31 | + ['field' => 'name', 'type' => 'string', 'value' => $this->name], |
|
32 | + ['field' => 'date', 'type' => 'string', 'value' => $this->datetime], |
|
33 | + ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()], |
|
34 | + ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()], |
|
35 | + ['field' => 'subType', 'type' => 'int', 'value' => $this->sub_type->getId()], |
|
36 | + ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()], |
|
37 | + ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp], |
|
38 | 38 | ]; |
39 | 39 | |
40 | 40 | if (isset($this->notes)) { |
@@ -272,8 +272,8 @@ |
||
272 | 272 | public function count($table, $column, $where = null) |
273 | 273 | { |
274 | 274 | $columns = [ |
275 | - 'COUNT('.$column.') AS count', |
|
276 | - ]; |
|
275 | + 'COUNT('.$column.') AS count', |
|
276 | + ]; |
|
277 | 277 | $statement = $this->selectStatement($table, $columns, $where); |
278 | 278 | |
279 | 279 | return $statement->fetchObject()->count; |
@@ -131,13 +131,13 @@ discard block |
||
131 | 131 | $currentTimestamp = $date = strftime('%F %T', time()); |
132 | 132 | |
133 | 133 | $data = [ |
134 | - ['field' => 'name', 'type' => 'string', 'value' => $this->name], |
|
135 | - ['field' => 'date', 'type' => 'string', 'value' => $this->datetime], |
|
136 | - ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()], |
|
137 | - ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()], |
|
138 | - ['field' => 'subType', 'type' => 'int', 'value' => $this->subType->getId()], |
|
139 | - ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()], |
|
140 | - ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp], |
|
134 | + ['field' => 'name', 'type' => 'string', 'value' => $this->name], |
|
135 | + ['field' => 'date', 'type' => 'string', 'value' => $this->datetime], |
|
136 | + ['field' => 'eventGroup', 'type' => 'int', 'value' => $this->series->getId()], |
|
137 | + ['field' => 'type', 'type' => 'int', 'value' => $this->type->getId()], |
|
138 | + ['field' => 'subType', 'type' => 'int', 'value' => $this->subType->getId()], |
|
139 | + ['field' => 'location', 'type' => 'int', 'value' => $this->location->getId()], |
|
140 | + ['field' => 'created', 'type' => 'datetime', 'value' => $currentTimestamp], |
|
141 | 141 | ]; |
142 | 142 | |
143 | 143 | if (isset($this->notes)) { |
@@ -164,23 +164,23 @@ discard block |
||
164 | 164 | } |
165 | 165 | |
166 | 166 | $columns = [ |
167 | - 'id', |
|
168 | - 'name', |
|
169 | - 'date', |
|
170 | - 'eventGroup', |
|
171 | - 'type', |
|
172 | - 'subType', |
|
173 | - 'location', |
|
174 | - 'comment', |
|
175 | - 'sermonTitle', |
|
176 | - 'bibleVerse', |
|
177 | - 'deleted', |
|
178 | - 'created', |
|
179 | - 'updated', |
|
167 | + 'id', |
|
168 | + 'name', |
|
169 | + 'date', |
|
170 | + 'eventGroup', |
|
171 | + 'type', |
|
172 | + 'subType', |
|
173 | + 'location', |
|
174 | + 'comment', |
|
175 | + 'sermonTitle', |
|
176 | + 'bibleVerse', |
|
177 | + 'deleted', |
|
178 | + 'created', |
|
179 | + 'updated', |
|
180 | 180 | ]; |
181 | 181 | |
182 | 182 | $where = [ |
183 | - 'id = '.$id, |
|
183 | + 'id = '.$id, |
|
184 | 184 | ]; |
185 | 185 | |
186 | 186 | $result = $db->selectSingle('Event', $this->db_table, $columns, $where); |
@@ -34,7 +34,7 @@ |
||
34 | 34 | if (!password_verify($v, $this->password)) { |
35 | 35 | $bcrypt_options = [ |
36 | 36 | 'cost' => 12, |
37 | - ]; |
|
37 | + ]; |
|
38 | 38 | $this->password = password_hash($v, PASSWORD_BCRYPT, $bcrypt_options); |
39 | 39 | |
40 | 40 | $this->modifiedColumns[UserTableMap::COL_PASSWORD] = true; |