TechWilk /
rota
@@ -567,7 +567,8 @@ discard block |
||
| 567 | 567 | <?php if (!$userRole->getReserve()): ?> |
| 568 | 568 | <?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?> |
| 569 | 569 | <option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option> |
| 570 | - <?php else: ?> |
|
| 570 | + <?php else { |
|
| 571 | + : ?> |
|
| 571 | 572 | <?php $countReserve += 1 ?> |
| 572 | 573 | <?php endif //!userRole->getReserve?> |
| 573 | 574 | <?php endforeach //users?> |
@@ -646,4 +647,6 @@ discard block |
||
| 646 | 647 | </div><!-- /.createSeries --> |
| 647 | 648 | |
| 648 | 649 | |
| 649 | -<?php include 'includes/footer.php'; ?> |
|
| 650 | +<?php include 'includes/footer.php'; |
|
| 651 | +} |
|
| 652 | +?> |
|
@@ -45,7 +45,7 @@ discard block |
||
| 45 | 45 | if (($userisBandAdmin) || ($userisEventEditor) || (isAdmin())) { |
| 46 | 46 | // Just continue the code |
| 47 | 47 | } else { |
| 48 | - header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 48 | + header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 49 | 49 | } |
| 50 | 50 | |
| 51 | 51 | if ($userisBandAdmin) { |
@@ -82,7 +82,7 @@ discard block |
||
| 82 | 82 | $location = $row['location']; |
| 83 | 83 | $locationname = $row['locationname']; |
| 84 | 84 | if ($action == 'edit') { |
| 85 | - $formaction = '?action=edit&id='.$id; |
|
| 85 | + $formaction = '?action=edit&id=' . $id; |
|
| 86 | 86 | } else { |
| 87 | 87 | $formaction = ''; |
| 88 | 88 | } |
@@ -136,8 +136,8 @@ discard block |
||
| 136 | 136 | |
| 137 | 137 | // convert format of date |
| 138 | 138 | $date = str_replace('/', '-', $date); // ensure it isn't read as mm/dd/yyyy |
| 139 | - $date = strftime('%Y-%m-%d', strtotime($date.' 00:00:00')); |
|
| 140 | - $date = $date.' '.$time.':00'; |
|
| 139 | + $date = strftime('%Y-%m-%d', strtotime($date . ' 00:00:00')); |
|
| 140 | + $date = $date . ' ' . $time . ':00'; |
|
| 141 | 141 | $date = mysqli_real_escape_string(db(), $date); |
| 142 | 142 | |
| 143 | 143 | if ($action == 'edit') { |
@@ -207,10 +207,10 @@ discard block |
||
| 207 | 207 | //if ($userisBandAdmin) $delete_all_sql = $delete_all_sql . " and skillID in (select skillID from skills where groupid=2)"; |
| 208 | 208 | //if ($userisEventEditor) $delete_all_sql = $delete_all_sql . " and skillID in (select skillID from skills where groupid!=2)"; |
| 209 | 209 | if ($userisBandAdmin) { |
| 210 | - $delete_all_sql = $delete_all_sql.' and skillID in (select skillID from skills where groupid in (2,3,4))'; |
|
| 210 | + $delete_all_sql = $delete_all_sql . ' and skillID in (select skillID from skills where groupid in (2,3,4))'; |
|
| 211 | 211 | } |
| 212 | 212 | if ($userisEventEditor) { |
| 213 | - $delete_all_sql = $delete_all_sql.' and skillID in (select skillID from skills where not (groupid in (2,3,4)))'; |
|
| 213 | + $delete_all_sql = $delete_all_sql . ' and skillID in (select skillID from skills where not (groupid in (2,3,4)))'; |
|
| 214 | 214 | } |
| 215 | 215 | mysqli_query(db(), $delete_all_sql) or die(mysqli_error(db())); |
| 216 | 216 | } |
@@ -218,9 +218,9 @@ discard block |
||
| 218 | 218 | // redirect |
| 219 | 219 | if (isset($_SESSION['lastEventsFilter'])) { |
| 220 | 220 | $type = $_SESSION['lastEventsFilter']; |
| 221 | - header('Location: events.php?view=all&filter='.$type.'#event'.$eventID); |
|
| 221 | + header('Location: events.php?view=all&filter=' . $type . '#event' . $eventID); |
|
| 222 | 222 | } else { |
| 223 | - header('Location: events.php?view=all#event'.$eventID); |
|
| 223 | + header('Location: events.php?view=all#event' . $eventID); |
|
| 224 | 224 | } |
| 225 | 225 | exit; |
| 226 | 226 | } |
@@ -297,7 +297,7 @@ discard block |
||
| 297 | 297 | while ($ob = mysqli_fetch_object($result)) { |
| 298 | 298 | if (!(isset($type) && $ob->id == $type)) { |
| 299 | 299 | $defaultTime = strftime('%H:%M', strtotime($ob->defaultTime)); |
| 300 | - echo "<option value='".$ob->id."' title='".$ob->description."' data-time='".($defaultTime == '00:00' ? '' : $defaultTime)."' data-location='".(is_null($ob->defaultLocationId) ? '' : $ob->defaultLocationId)."'>".$ob->name.'</option>'; |
|
| 300 | + echo "<option value='" . $ob->id . "' title='" . $ob->description . "' data-time='" . ($defaultTime == '00:00' ? '' : $defaultTime) . "' data-location='" . (is_null($ob->defaultLocationId) ? '' : $ob->defaultLocationId) . "'>" . $ob->name . '</option>'; |
|
| 301 | 301 | } |
| 302 | 302 | } ?> |
| 303 | 303 | </select> |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
| 324 | 324 | if (isset($subtype) && $row['id'] == $subtype) { |
| 325 | 325 | } else { |
| 326 | - echo "<option value='".$row['id']."' title='".$row['description']."'>".$row['name'].'</option>'; |
|
| 326 | + echo "<option value='" . $row['id'] . "' title='" . $row['description'] . "'>" . $row['name'] . '</option>'; |
|
| 327 | 327 | } |
| 328 | 328 | } ?> |
| 329 | 329 | </select> |
@@ -351,7 +351,7 @@ discard block |
||
| 351 | 351 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
| 352 | 352 | if (isset($location) && $row['id'] == $location) { |
| 353 | 353 | } else { |
| 354 | - echo "<option value='".$row['id']."'>".$row['name'].'</option>'; |
|
| 354 | + echo "<option value='" . $row['id'] . "'>" . $row['name'] . '</option>'; |
|
| 355 | 355 | } |
| 356 | 356 | } ?> |
| 357 | 357 | </select> |
@@ -482,7 +482,7 @@ discard block |
||
| 482 | 482 | while ($row = mysqli_fetch_array($result, MYSQLI_ASSOC)) { |
| 483 | 483 | if (isset($type) && $row['id'] == $type) { |
| 484 | 484 | } else { |
| 485 | - echo "<option value='".$row['id']."' title='".$row['description']."'>".$row['name'].'</option>'; |
|
| 485 | + echo "<option value='" . $row['id'] . "' title='" . $row['description'] . "'>" . $row['name'] . '</option>'; |
|
| 486 | 486 | } |
| 487 | 487 | } ?> |
| 488 | 488 | </select> |
@@ -552,8 +552,8 @@ discard block |
||
| 552 | 552 | <?php foreach ($role->getUserRoles() as $userRole): ?> |
| 553 | 553 | <?php if (!$userRole->getReserve()): ?> |
| 554 | 554 | <?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?> |
| 555 | - <option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option> |
|
| 556 | - <?php else: ?> |
|
| 555 | + <option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName() . ' ' . $userRole->getUser()->getLastName() ?></option> |
|
| 556 | + <?php else : ?> |
|
| 557 | 557 | <?php $countReserve += 1 ?> |
| 558 | 558 | <?php endif //!userRole->getReserve?> |
| 559 | 559 | <?php endforeach //users?> |
@@ -563,7 +563,7 @@ discard block |
||
| 563 | 563 | <?php foreach ($role->getUserRoles() as $userRole): ?> |
| 564 | 564 | <?php if ($userRole->getReserve()): ?> |
| 565 | 565 | <?php $isInEvent = in_array($userRole->getId(), $usersInEvent) ?> |
| 566 | - <option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName().' '.$userRole->getUser()->getLastName() ?></option> |
|
| 566 | + <option value="<?php echo $userRole->getId() ?>" <?php echo $isInEvent ? 'selected="selected"' : '' ?>><?php echo $userRole->getUser()->getFirstName() . ' ' . $userRole->getUser()->getLastName() ?></option> |
|
| 567 | 567 | <?php endif ?> |
| 568 | 568 | <?php endforeach //users?> |
| 569 | 569 | </optgroup> |
@@ -34,7 +34,7 @@ |
||
| 34 | 34 | } |
| 35 | 35 | |
| 36 | 36 | if (!isAdmin()) { |
| 37 | - header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 37 | + header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 38 | 38 | exit; |
| 39 | 39 | } |
| 40 | 40 | |
@@ -14,7 +14,7 @@ |
||
| 14 | 14 | exit; |
| 15 | 15 | } |
| 16 | 16 | if (!isAdmin()) { |
| 17 | - header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 17 | + header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 18 | 18 | exit; |
| 19 | 19 | } |
| 20 | 20 | |
@@ -30,24 +30,24 @@ |
||
| 30 | 30 | switch ($_POST['action']) { |
| 31 | 31 | case 'approve': |
| 32 | 32 | $userId = approvePendingUser($id); |
| 33 | - mailNewUser($userId); |
|
| 34 | - header('Location: addUser.php?action=edit&user='.$userId); |
|
| 35 | - break; |
|
| 33 | + mailNewUser($userId); |
|
| 34 | + header('Location: addUser.php?action=edit&user='.$userId); |
|
| 35 | + break; |
|
| 36 | 36 | case 'merge': |
| 37 | 37 | $existingUserId = $_POST['existingUser']; |
| 38 | - $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT); |
|
| 39 | - mergePendingUserWithUserId($id, $existingUserId); |
|
| 40 | - mailNewUser($existingUserId); |
|
| 41 | - header('Location: addUser.php?action=edit&user='.$existingUserId); |
|
| 42 | - break; |
|
| 38 | + $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT); |
|
| 39 | + mergePendingUserWithUserId($id, $existingUserId); |
|
| 40 | + mailNewUser($existingUserId); |
|
| 41 | + header('Location: addUser.php?action=edit&user='.$existingUserId); |
|
| 42 | + break; |
|
| 43 | 43 | case 'decline': |
| 44 | 44 | declinePendingUser($id); |
| 45 | - break; |
|
| 45 | + break; |
|
| 46 | 46 | |
| 47 | 47 | default: |
| 48 | 48 | // code... |
| 49 | 49 | break; |
| 50 | - } |
|
| 50 | + } |
|
| 51 | 51 | } |
| 52 | 52 | |
| 53 | 53 | if (empty($id)) { |
@@ -28,25 +28,25 @@ |
||
| 28 | 28 | $id = filter_var($id, FILTER_SANITIZE_NUMBER_INT); |
| 29 | 29 | |
| 30 | 30 | switch ($_POST['action']) { |
| 31 | - case 'approve': |
|
| 32 | - $userId = approvePendingUser($id); |
|
| 33 | - mailNewUser($userId); |
|
| 34 | - header('Location: addUser.php?action=edit&user='.$userId); |
|
| 35 | - break; |
|
| 36 | - case 'merge': |
|
| 37 | - $existingUserId = $_POST['existingUser']; |
|
| 38 | - $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT); |
|
| 39 | - mergePendingUserWithUserId($id, $existingUserId); |
|
| 40 | - mailNewUser($existingUserId); |
|
| 41 | - header('Location: addUser.php?action=edit&user='.$existingUserId); |
|
| 42 | - break; |
|
| 43 | - case 'decline': |
|
| 44 | - declinePendingUser($id); |
|
| 45 | - break; |
|
| 46 | - |
|
| 47 | - default: |
|
| 48 | - // code... |
|
| 49 | - break; |
|
| 31 | + case 'approve': |
|
| 32 | + $userId = approvePendingUser($id); |
|
| 33 | + mailNewUser($userId); |
|
| 34 | + header('Location: addUser.php?action=edit&user='.$userId); |
|
| 35 | + break; |
|
| 36 | + case 'merge': |
|
| 37 | + $existingUserId = $_POST['existingUser']; |
|
| 38 | + $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT); |
|
| 39 | + mergePendingUserWithUserId($id, $existingUserId); |
|
| 40 | + mailNewUser($existingUserId); |
|
| 41 | + header('Location: addUser.php?action=edit&user='.$existingUserId); |
|
| 42 | + break; |
|
| 43 | + case 'decline': |
|
| 44 | + declinePendingUser($id); |
|
| 45 | + break; |
|
| 46 | + |
|
| 47 | + default: |
|
| 48 | + // code... |
|
| 49 | + break; |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | |
@@ -14,7 +14,7 @@ discard block |
||
| 14 | 14 | exit; |
| 15 | 15 | } |
| 16 | 16 | if (!isAdmin()) { |
| 17 | - header('Location: error.php?no=100&page='.basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 17 | + header('Location: error.php?no=100&page=' . basename($_SERVER['SCRIPT_FILENAME'])); |
|
| 18 | 18 | exit; |
| 19 | 19 | } |
| 20 | 20 | |
@@ -31,14 +31,14 @@ discard block |
||
| 31 | 31 | case 'approve': |
| 32 | 32 | $userId = approvePendingUser($id); |
| 33 | 33 | mailNewUser($userId); |
| 34 | - header('Location: addUser.php?action=edit&user='.$userId); |
|
| 34 | + header('Location: addUser.php?action=edit&user=' . $userId); |
|
| 35 | 35 | break; |
| 36 | 36 | case 'merge': |
| 37 | 37 | $existingUserId = $_POST['existingUser']; |
| 38 | 38 | $existingUserId = filter_var($existingUserId, FILTER_SANITIZE_NUMBER_INT); |
| 39 | 39 | mergePendingUserWithUserId($id, $existingUserId); |
| 40 | 40 | mailNewUser($existingUserId); |
| 41 | - header('Location: addUser.php?action=edit&user='.$existingUserId); |
|
| 41 | + header('Location: addUser.php?action=edit&user=' . $existingUserId); |
|
| 42 | 42 | break; |
| 43 | 43 | case 'decline': |
| 44 | 44 | declinePendingUser($id); |
@@ -90,7 +90,7 @@ discard block |
||
| 90 | 90 | <div class="box box-primary"> |
| 91 | 91 | <div class="box-header"> |
| 92 | 92 | <h2 class="box-title"> |
| 93 | - <?php echo $user->approved ? 'Approved' : ($user->declined ? 'Declined' : 'Pending') ?>: <?php echo $user->firstName.' '.$user->lastName ?> |
|
| 93 | + <?php echo $user->approved ? 'Approved' : ($user->declined ? 'Declined' : 'Pending') ?>: <?php echo $user->firstName . ' ' . $user->lastName ?> |
|
| 94 | 94 | </h2> |
| 95 | 95 | </div> |
| 96 | 96 | <div class="box-body"> |
@@ -131,7 +131,7 @@ discard block |
||
| 131 | 131 | <?php |
| 132 | 132 | $users = allUsersNames(); |
| 133 | 133 | foreach ($users as $existingUser): ?> |
| 134 | - <option value="<?php echo $existingUser->id?>" <?php echo($existingUser->firstName == $user->firstName) && ($existingUser->lastName == $user->lastName) ? "selected='selected'" : '' ?>><?php echo $existingUser->firstName.' '.$existingUser->lastName ?></option> |
|
| 134 | + <option value="<?php echo $existingUser->id?>" <?php echo($existingUser->firstName == $user->firstName) && ($existingUser->lastName == $user->lastName) ? "selected='selected'" : '' ?>><?php echo $existingUser->firstName . ' ' . $existingUser->lastName ?></option> |
|
| 135 | 135 | <?php endforeach; ?> |
| 136 | 136 | </select> |
| 137 | 137 | </div> |
@@ -2,6 +2,6 @@ |
||
| 2 | 2 | |
| 3 | 3 | namespace TechWilk\Rota; |
| 4 | 4 | |
| 5 | -ini_set('display_errors', false); // set on for development, off for production |
|
| 5 | +ini_set('display_errors', false); // set on for development, off for production |
|
| 6 | 6 | ini_set('log_errors', true); |
| 7 | 7 | error_reporting(E_ALL); |
@@ -2,10 +2,10 @@ discard block |
||
| 2 | 2 | |
| 3 | 3 | namespace TechWilk\Rota; |
| 4 | 4 | |
| 5 | -include __DIR__.'/../../../config/database.php'; |
|
| 6 | -include __DIR__.'/../../../config/auth.php'; |
|
| 7 | -include __DIR__.'/../../../config/email.php'; |
|
| 8 | -include __DIR__.'/../../../config/recording.php'; |
|
| 5 | +include __DIR__ . '/../../../config/database.php'; |
|
| 6 | +include __DIR__ . '/../../../config/auth.php'; |
|
| 7 | +include __DIR__ . '/../../../config/email.php'; |
|
| 8 | +include __DIR__ . '/../../../config/recording.php'; |
|
| 9 | 9 | |
| 10 | 10 | // -- Setup database -- |
| 11 | 11 | |
@@ -17,10 +17,10 @@ discard block |
||
| 17 | 17 | } |
| 18 | 18 | |
| 19 | 19 | // Connect to the database server |
| 20 | -$dbh = @mysqli_connect($config['db']['host'], $config['db']['user'], $config['db']['pass']) or die('Connection to '.$config['db']['host']." with login '".$config['db']['user']."'/'$pwdMasked' failed."); |
|
| 20 | +$dbh = @mysqli_connect($config['db']['host'], $config['db']['user'], $config['db']['pass']) or die('Connection to ' . $config['db']['host'] . " with login '" . $config['db']['user'] . "'/'$pwdMasked' failed."); |
|
| 21 | 21 | |
| 22 | 22 | // Choose the right database |
| 23 | -$db = @mysqli_select_db($dbh, $config['db']['dbname']) or die("Connection made, but database '".$config['db']['dbname']."' was not found."); |
|
| 23 | +$db = @mysqli_select_db($dbh, $config['db']['dbname']) or die("Connection made, but database '" . $config['db']['dbname'] . "' was not found."); |
|
| 24 | 24 | |
| 25 | 25 | // allow config to be fetched in functions |
| 26 | 26 | |
@@ -266,8 +266,10 @@ discard block |
||
| 266 | 266 | if (is_array($rotaoutput)): |
| 267 | 267 | foreach ($rotaoutput as $key => $skill): |
| 268 | 268 | $skillfinal = $skillfinal.$skill.' '; |
| 269 | - endforeach; else: |
|
| 269 | + endforeach; else { |
|
| 270 | + : |
|
| 270 | 271 | $skillfinal = $rotaoutput; |
| 272 | + } |
|
| 271 | 273 | endif; |
| 272 | 274 | $message = str_replace('[rotaoutput]', $skillfinal, $message); |
| 273 | 275 | $message = str_replace('[siteurl]', $siteurl, $message); |
@@ -445,8 +447,10 @@ discard block |
||
| 445 | 447 | $roles = []; |
| 446 | 448 | while ($roleRow = mysqli_fetch_array($roleResult, MYSQLI_ASSOC)) { |
| 447 | 449 | if (($roleRow['name'] == '') || ($roleRow['name'] == $roleRow['description'])): |
| 448 | - $roles[] = $roleRow['description']; else: |
|
| 450 | + $roles[] = $roleRow['description']; else { |
|
| 451 | + : |
|
| 449 | 452 | $roles[] = $roleRow['description'].' - '.$roleRow['name']; |
| 453 | + } |
|
| 450 | 454 | endif; |
| 451 | 455 | } |
| 452 | 456 | |
@@ -27,12 +27,12 @@ discard block |
||
| 27 | 27 | { |
| 28 | 28 | $dbMailId = mailToDb($to, $subject, $message, $from, $bcc); |
| 29 | 29 | |
| 30 | - $subject = '[rota] '.$subject; |
|
| 30 | + $subject = '[rota] ' . $subject; |
|
| 31 | 31 | |
| 32 | 32 | $message .= "\n\n"; |
| 33 | - $message .= siteSettings()->getOwner()."\n"; |
|
| 34 | - $message .= 'Mail generated with ChurchRota V.'.siteSettings()->getVersion()."\n"; |
|
| 35 | - $message .= siteSettings()->getSiteUrl()."\n"; |
|
| 33 | + $message .= siteSettings()->getOwner() . "\n"; |
|
| 34 | + $message .= 'Mail generated with ChurchRota V.' . siteSettings()->getVersion() . "\n"; |
|
| 35 | + $message .= siteSettings()->getSiteUrl() . "\n"; |
|
| 36 | 36 | |
| 37 | 37 | $mailSentOk = false; |
| 38 | 38 | |
@@ -76,14 +76,14 @@ discard block |
||
| 76 | 76 | //rfc sais \r\n, but this makes trouble in outlook. several spaces plus \n works fine in outlook and thunderbird. |
| 77 | 77 | //spaces to suppress automatic removal of "unnecessary linefeeds" in outlook 2003 |
| 78 | 78 | $crlf = " \n"; |
| 79 | - $message = str_replace("\r\n", $crlf, $message); //replace crlf's |
|
| 79 | + $message = str_replace("\r\n", $crlf, $message); //replace crlf's |
|
| 80 | 80 | |
| 81 | 81 | //-------------------------------------------------------------------------------- |
| 82 | - $headers = 'From: '.$from.$crlf. |
|
| 83 | - 'Reply-To: '.$from.$crlf. |
|
| 84 | - 'Mime-Version: 1.0'.$crlf. |
|
| 85 | - 'Content-Type: text/plain; charset=ISO-8859-1'.$crlf; |
|
| 86 | - 'Content-Transfer-Encoding: quoted-printable'.$crlf; |
|
| 82 | + $headers = 'From: ' . $from . $crlf . |
|
| 83 | + 'Reply-To: ' . $from . $crlf . |
|
| 84 | + 'Mime-Version: 1.0' . $crlf . |
|
| 85 | + 'Content-Type: text/plain; charset=ISO-8859-1' . $crlf; |
|
| 86 | + 'Content-Transfer-Encoding: quoted-printable' . $crlf; |
|
| 87 | 87 | $headerSimple = $headers; |
| 88 | 88 | |
| 89 | 89 | //-------------------------------------------------------------------------------- |
@@ -92,8 +92,8 @@ discard block |
||
| 92 | 92 | $to = str_replace(';', ',', $to); |
| 93 | 93 | |
| 94 | 94 | if ($mail_dbg) { |
| 95 | - $subject = ' - Mail Debug: '.$subject; //debug output |
|
| 96 | - $message .= $crlf.'To: '.$to.$crlf; //debug move to to end of message |
|
| 95 | + $subject = ' - Mail Debug: ' . $subject; //debug output |
|
| 96 | + $message .= $crlf . 'To: ' . $to . $crlf; //debug move to to end of message |
|
| 97 | 97 | } |
| 98 | 98 | |
| 99 | 99 | //-------------------------------------------------------------------------------- |
@@ -105,13 +105,13 @@ discard block |
||
| 105 | 105 | foreach ($teile as $adr) { |
| 106 | 106 | if (preg_replace("/([a-zA-Z0-9._%+-]+)(@)([a-zA-Z0-9.-]+)(\.)([a-zA-Z]+)/i", '# # #', trim($adr)) == '# # #') { |
| 107 | 107 | if ($mail_dbg) { |
| 108 | - $message .= 'Bcc: '.trim($adr).$crlf; |
|
| 108 | + $message .= 'Bcc: ' . trim($adr) . $crlf; |
|
| 109 | 109 | } else { |
| 110 | - $headers .= 'Bcc: '.trim($adr).$crlf; |
|
| 110 | + $headers .= 'Bcc: ' . trim($adr) . $crlf; |
|
| 111 | 111 | } |
| 112 | 112 | $i = $i + 1; |
| 113 | 113 | } else { |
| 114 | - $bcc_err .= $adr.$crlf; |
|
| 114 | + $bcc_err .= $adr . $crlf; |
|
| 115 | 115 | $err .= +1; |
| 116 | 116 | } |
| 117 | 117 | } |
@@ -144,10 +144,10 @@ discard block |
||
| 144 | 144 | if ($mailOk) { |
| 145 | 145 | //mail($from, "[ChurchRota] Mail status - OK", "address ok: " . $i, $headerSimple); |
| 146 | 146 | } else { |
| 147 | - mail($from, '[Rota] Mail status - ERROR', 'to: '.$to.$crlf.'address ok: '.$i.$crlf.'address errors: '.$err.$crlf.$bcc_err, $headerSimple); |
|
| 147 | + mail($from, '[Rota] Mail status - ERROR', 'to: ' . $to . $crlf . 'address ok: ' . $i . $crlf . 'address errors: ' . $err . $crlf . $bcc_err, $headerSimple); |
|
| 148 | 148 | |
| 149 | 149 | return false; |
| 150 | - logFailedMailWithId($dbMailId, 'address ok: '.$i.$crlf.'address errors: '.$err.$crlf.$bcc_err, $headerSimple); |
|
| 150 | + logFailedMailWithId($dbMailId, 'address ok: ' . $i . $crlf . 'address errors: ' . $err . $crlf . $bcc_err, $headerSimple); |
|
| 151 | 151 | } |
| 152 | 152 | } |
| 153 | 153 | |
@@ -204,9 +204,9 @@ discard block |
||
| 204 | 204 | } |
| 205 | 205 | $categoryname = $row['categoryname']; |
| 206 | 206 | $to = $row['email']; |
| 207 | - $subject = 'New post: '.$objectname; |
|
| 207 | + $subject = 'New post: ' . $objectname; |
|
| 208 | 208 | |
| 209 | - $finalmessage = 'Dear '.$postname."\n \n".$message.$objectname."\n \n". |
|
| 209 | + $finalmessage = 'Dear ' . $postname . "\n \n" . $message . $objectname . "\n \n" . |
|
| 210 | 210 | 'To see the post, please login using your username and password'; |
| 211 | 211 | |
| 212 | 212 | sendMail($to, $subject, $finalmessage, $row['siteadmin']); |
@@ -226,19 +226,19 @@ discard block |
||
| 226 | 226 | |
| 227 | 227 | $message = siteSettings()->getNewUserMessage(); |
| 228 | 228 | |
| 229 | - $name = $user->firstName.' '.$user->lastName; |
|
| 229 | + $name = $user->firstName . ' ' . $user->lastName; |
|
| 230 | 230 | $message = str_replace('[name]', $name, $message); |
| 231 | 231 | $message = str_replace('[username]', $user->username, $message); |
| 232 | 232 | $message = str_replace('[password]', $password, $message); |
| 233 | 233 | $message = str_replace('[siteurl]', siteSettings()->getSiteUrl(), $message); |
| 234 | 234 | |
| 235 | - $subject = 'Account created for '.$name; |
|
| 235 | + $subject = 'Account created for ' . $name; |
|
| 236 | 236 | |
| 237 | - $to = $name.' <'.$user->email.'>'; |
|
| 238 | - $from = siteSettings()->getOwner().' <'.siteSettings()->getAdminEmailAddress().'>'; |
|
| 237 | + $to = $name . ' <' . $user->email . '>'; |
|
| 238 | + $from = siteSettings()->getOwner() . ' <' . siteSettings()->getAdminEmailAddress() . '>'; |
|
| 239 | 239 | |
| 240 | 240 | sendMail($to, $subject, $message, $from); |
| 241 | - sendMail($from, 'ADMIN COPY: '.$subject, $message, $from); |
|
| 241 | + sendMail($from, 'ADMIN COPY: ' . $subject, $message, $from); |
|
| 242 | 242 | } |
| 243 | 243 | |
| 244 | 244 | function parseEmailTemplate($message, $values) |
@@ -249,7 +249,7 @@ discard block |
||
| 249 | 249 | $values['siteemail'] = siteSettings()->getAdminEmailAddress(); |
| 250 | 250 | |
| 251 | 251 | foreach ($values as $template_field => $value) { |
| 252 | - $message = str_ireplace('['.$template_field.']', trim($value), $message); |
|
| 252 | + $message = str_ireplace('[' . $template_field . ']', trim($value), $message); |
|
| 253 | 253 | } |
| 254 | 254 | $message = trim($message); |
| 255 | 255 | |
@@ -265,7 +265,7 @@ discard block |
||
| 265 | 265 | $message = str_replace('[rehearsal]', $rehearsal, $message); |
| 266 | 266 | if (is_array($rotaoutput)): |
| 267 | 267 | foreach ($rotaoutput as $key => $skill): |
| 268 | - $skillfinal = $skillfinal.$skill.' '; |
|
| 268 | + $skillfinal = $skillfinal . $skill . ' '; |
|
| 269 | 269 | endforeach; else: |
| 270 | 270 | $skillfinal = $rotaoutput; |
| 271 | 271 | endif; |
@@ -283,7 +283,7 @@ discard block |
||
| 283 | 283 | function notifyIndividual($userID, $eventID, $skillID) |
| 284 | 284 | { |
| 285 | 285 | notifyEveryoneForEvent($eventID, $skillID, $userID); |
| 286 | - $eventID = 0; //disables following code through empty sql result |
|
| 286 | + $eventID = 0; //disables following code through empty sql result |
|
| 287 | 287 | |
| 288 | 288 | $sql = "SELECT *, |
| 289 | 289 | (SELECT CONCAT(`firstname`, ' ', `lastname`) FROM users WHERE `users`.id = `skills`.`userID` ORDER BY `users`.firstname) AS `name`, |
@@ -324,13 +324,13 @@ discard block |
||
| 324 | 324 | if (($row['eventRehearsal'] == '0') or ($row['eventRehearsalChange'] == '1')) { |
| 325 | 325 | $rehearsal = $row['norehearsalemail']; |
| 326 | 326 | } else { |
| 327 | - $rehearsal = $row['yesrehearsal'].' on '.$rehearsaldate.' at '.$location; |
|
| 327 | + $rehearsal = $row['yesrehearsal'] . ' on ' . $rehearsaldate . ' at ' . $location; |
|
| 328 | 328 | } |
| 329 | 329 | } |
| 330 | 330 | |
| 331 | 331 | $skill = $row['category']; |
| 332 | 332 | if ($row['joinedskill'] != '') { |
| 333 | - $skill = $skill.' - '.$row['joinedskill']; |
|
| 333 | + $skill = $skill . ' - ' . $row['joinedskill']; |
|
| 334 | 334 | } else { |
| 335 | 335 | // If there is no skill, then we don't need to mention this fact. |
| 336 | 336 | } |
@@ -346,7 +346,7 @@ discard block |
||
| 346 | 346 | $location = $row['eventLocationFormatted']; |
| 347 | 347 | $rotaoutput = $skill; |
| 348 | 348 | $to = $row['email']; |
| 349 | - $subject = 'Rota reminder: '.$date; |
|
| 349 | + $subject = 'Rota reminder: ' . $date; |
|
| 350 | 350 | |
| 351 | 351 | $message = emailTemplate($message, $name, $date, $location, $rehearsal, $rotaoutput, $username, $siteurl); |
| 352 | 352 | |
@@ -417,9 +417,9 @@ discard block |
||
| 417 | 417 | |
| 418 | 418 | $type = $ob->eventType; |
| 419 | 419 | |
| 420 | - $eventdetails = $eventrow['eventGroup'].': '.$eventrow['sermonTitle']; |
|
| 420 | + $eventdetails = $eventrow['eventGroup'] . ': ' . $eventrow['sermonTitle']; |
|
| 421 | 421 | if (!empty($eventrow['bibleVerse'])) { |
| 422 | - $eventdetails .= ' ('.$eventrow['bibleVerse'].')'; |
|
| 422 | + $eventdetails .= ' (' . $eventrow['bibleVerse'] . ')'; |
|
| 423 | 423 | } |
| 424 | 424 | } |
| 425 | 425 | |
@@ -442,7 +442,7 @@ discard block |
||
| 442 | 442 | while ($roleRow = mysqli_fetch_array($roleResult, MYSQLI_ASSOC)) { |
| 443 | 443 | if (($roleRow['name'] == '') || ($roleRow['name'] == $roleRow['description'])): |
| 444 | 444 | $roles[] = $roleRow['description']; else: |
| 445 | - $roles[] = $roleRow['description'].' - '.$roleRow['name']; |
|
| 445 | + $roles[] = $roleRow['description'] . ' - ' . $roleRow['name']; |
|
| 446 | 446 | endif; |
| 447 | 447 | } |
| 448 | 448 | |
@@ -462,11 +462,11 @@ discard block |
||
| 462 | 462 | $message = siteSettings()->getNotificationEmail(); |
| 463 | 463 | $rotaoutput = implode(', ', $roles); |
| 464 | 464 | |
| 465 | - $to = $ob->name.' <'.$ob->email.'>'; |
|
| 466 | - $from = siteSettings()->getOwner().' <'.siteSettings()->getAdminEmailAddress().'>'; |
|
| 465 | + $to = $ob->name . ' <' . $ob->email . '>'; |
|
| 466 | + $from = siteSettings()->getOwner() . ' <' . siteSettings()->getAdminEmailAddress() . '>'; |
|
| 467 | 467 | |
| 468 | 468 | //$subject = "Rota reminder: " . $date; |
| 469 | - $subject = 'Reminder: '.implode(', ', $roles).' - '.$type.': '.$date; |
|
| 469 | + $subject = 'Reminder: ' . implode(', ', $roles) . ' - ' . $type . ': ' . $date; |
|
| 470 | 470 | |
| 471 | 471 | $rotadetails = getEventDetails($eventId, "\r\n", 0, false, "\t"); |
| 472 | 472 | |
@@ -501,7 +501,7 @@ discard block |
||
| 501 | 501 | ep.notified = 1 |
| 502 | 502 | WHERE |
| 503 | 503 | ep.eventId = '$eventId' |
| 504 | - AND ur.userId IN (".implode(', ', $countarray).')'; |
|
| 504 | + AND ur.userId IN (" . implode(', ', $countarray) . ')'; |
|
| 505 | 505 | |
| 506 | 506 | mysqli_query(db(), $sql) or die(mysqli_error(db())); |
| 507 | 507 | } |
@@ -530,14 +530,14 @@ discard block |
||
| 530 | 530 | $user = mysqli_fetch_object($result); |
| 531 | 531 | |
| 532 | 532 | if (!$user->email) { |
| 533 | - return 'No email address present for '.$user->firstName.' '.$user->lastName; |
|
| 533 | + return 'No email address present for ' . $user->firstName . ' ' . $user->lastName; |
|
| 534 | 534 | } |
| 535 | 535 | |
| 536 | 536 | if (!$user->recieveReminderEmails) { |
| 537 | - return $user->firstName.' '.$user->lastName.' opted not to recieve reminder emails'; |
|
| 537 | + return $user->firstName . ' ' . $user->lastName . ' opted not to recieve reminder emails'; |
|
| 538 | 538 | } |
| 539 | 539 | |
| 540 | - $name = $user->firstName.' '.$user->lastName; |
|
| 540 | + $name = $user->firstName . ' ' . $user->lastName; |
|
| 541 | 541 | |
| 542 | 542 | //line seperator for mails |
| 543 | 543 | //rfc sais \r\n, but this makes trouble in outlook. several spaces plus \n works fine in outlook and thunderbird. |
@@ -570,7 +570,7 @@ discard block |
||
| 570 | 570 | $eventDetails .= ' - '; |
| 571 | 571 | $eventDetails .= "\r\n"; |
| 572 | 572 | $eventDetails .= $event->type; |
| 573 | - $eventDetails .= $event->eventGroup.': '.$event->sermonTitle.' ('.$event->bibleVerse.')'; |
|
| 573 | + $eventDetails .= $event->eventGroup . ': ' . $event->sermonTitle . ' (' . $event->bibleVerse . ')'; |
|
| 574 | 574 | $eventDetails .= "\r\n"; |
| 575 | 575 | $eventDetails .= "\r\n"; |
| 576 | 576 | |
@@ -594,7 +594,7 @@ discard block |
||
| 594 | 594 | 'event.type' => $event->type, |
| 595 | 595 | 'event.location' => $event->location, |
| 596 | 596 | |
| 597 | - 'event.sermon' => $event->eventGroup.': '.$event->sermonTitle.' ('.$event->bibleVerse.')', |
|
| 597 | + 'event.sermon' => $event->eventGroup . ': ' . $event->sermonTitle . ' (' . $event->bibleVerse . ')', |
|
| 598 | 598 | 'event.sermon.name' => $event->sermonTitle, |
| 599 | 599 | 'event.sermon.series' => $event->eventGroup, |
| 600 | 600 | 'event.sermon.verse' => $event->bibleVerse, |
@@ -608,8 +608,8 @@ discard block |
||
| 608 | 608 | |
| 609 | 609 | //$message = str_replace("\r\n",$crlf,$message); |
| 610 | 610 | |
| 611 | - $to = $name.' <'.$user->email.'>'; |
|
| 612 | - $from = siteSettings()->getOwner().' <'.$siteSettings()->getAdminEmailAddress().'>'; |
|
| 611 | + $to = $name . ' <' . $user->email . '>'; |
|
| 612 | + $from = siteSettings()->getOwner() . ' <' . $siteSettings()->getAdminEmailAddress() . '>'; |
|
| 613 | 613 | |
| 614 | 614 | $sent = false; |
| 615 | 615 | $sent = sendMail($to, $subject, $message, $from); |
@@ -617,10 +617,10 @@ discard block |
||
| 617 | 617 | if ($sent == true) { |
| 618 | 618 | return true; |
| 619 | 619 | } else { |
| 620 | - return 'Error while sending mail to '.$user->firstName.' '.$user->lastName; |
|
| 620 | + return 'Error while sending mail to ' . $user->firstName . ' ' . $user->lastName; |
|
| 621 | 621 | } |
| 622 | 622 | |
| 623 | - return 'Unknown error for '.$user->firstName.' '.$user->lastName; |
|
| 623 | + return 'Unknown error for ' . $user->firstName . ' ' . $user->lastName; |
|
| 624 | 624 | } |
| 625 | 625 | |
| 626 | 626 | function getEventEmailSubject($eventId) |
@@ -667,16 +667,16 @@ discard block |
||
| 667 | 667 | $result = mysqli_query(db(), $sql) or die(mysqli_error(db())); |
| 668 | 668 | $groupNames = ''; |
| 669 | 669 | while ($group = mysqli_fetch_object($result)) { |
| 670 | - $groupNames .= $group->name.', '; |
|
| 670 | + $groupNames .= $group->name . ', '; |
|
| 671 | 671 | } |
| 672 | 672 | |
| 673 | 673 | if (isset($errors)) { |
| 674 | - createNotificationForUser($_SESSION['userid'], 'Email sent with warnings', 'Email sent to '.$groupNames.' groups with errors: '.implode(', ', $errors), 'email'); |
|
| 674 | + createNotificationForUser($_SESSION['userid'], 'Email sent with warnings', 'Email sent to ' . $groupNames . ' groups with errors: ' . implode(', ', $errors), 'email'); |
|
| 675 | 675 | |
| 676 | 676 | return $errors; |
| 677 | 677 | } |
| 678 | 678 | |
| 679 | - createNotificationForUser($_SESSION['userid'], 'Group email sent', 'Email sent successfully to '.$groupNames, 'email'); |
|
| 679 | + createNotificationForUser($_SESSION['userid'], 'Group email sent', 'Email sent successfully to ' . $groupNames, 'email'); |
|
| 680 | 680 | |
| 681 | 681 | return $true; |
| 682 | 682 | } |
@@ -728,16 +728,16 @@ discard block |
||
| 728 | 728 | $result = mysqli_query(db(), $sql) or die(mysqli_error(db())); |
| 729 | 729 | $groupNames = ''; |
| 730 | 730 | while ($group = mysqli_fetch_object($result)) { |
| 731 | - $groupNames .= $group->name.', '; |
|
| 731 | + $groupNames .= $group->name . ', '; |
|
| 732 | 732 | } |
| 733 | 733 | |
| 734 | 734 | if (isset($errors)) { |
| 735 | - createNotificationForUser($_SESSION['userid'], 'Email sent with warnings', 'Email sent to '.$groupNames." groups with errors: \n- ".implode("\n- ", $errors), 'email'); |
|
| 735 | + createNotificationForUser($_SESSION['userid'], 'Email sent with warnings', 'Email sent to ' . $groupNames . " groups with errors: \n- " . implode("\n- ", $errors), 'email'); |
|
| 736 | 736 | |
| 737 | 737 | return $errors; |
| 738 | 738 | } |
| 739 | 739 | |
| 740 | - createNotificationForUser($_SESSION['userid'], 'Group email sent', 'Email sent successfully to '.$groupNames, 'email'); |
|
| 740 | + createNotificationForUser($_SESSION['userid'], 'Group email sent', 'Email sent successfully to ' . $groupNames, 'email'); |
|
| 741 | 741 | |
| 742 | 742 | return $true; |
| 743 | 743 | } |
@@ -753,14 +753,14 @@ discard block |
||
| 753 | 753 | $user = mysqli_fetch_object($result); |
| 754 | 754 | |
| 755 | 755 | if (!$user->email) { |
| 756 | - return 'No email address present for '.$user->firstName.' '.$user->lastName; |
|
| 756 | + return 'No email address present for ' . $user->firstName . ' ' . $user->lastName; |
|
| 757 | 757 | } |
| 758 | 758 | |
| 759 | 759 | if (!$user->isOverviewRecipient) { |
| 760 | - return $user->firstName.' '.$user->lastName.' opted not to recieve group emails'; |
|
| 760 | + return $user->firstName . ' ' . $user->lastName . ' opted not to recieve group emails'; |
|
| 761 | 761 | } |
| 762 | 762 | |
| 763 | - $name = $user->firstName.' '.$user->lastName; |
|
| 763 | + $name = $user->firstName . ' ' . $user->lastName; |
|
| 764 | 764 | |
| 765 | 765 | //line seperator for mails |
| 766 | 766 | //rfc sais \r\n, but this makes trouble in outlook. several spaces plus \n works fine in outlook and thunderbird. |
@@ -823,8 +823,8 @@ discard block |
||
| 823 | 823 | |
| 824 | 824 | //$message = str_replace("\r\n",$crlf,$message); |
| 825 | 825 | |
| 826 | - $to = $name.' <'.$user->email.'>'; |
|
| 827 | - $from = siteSettings()->getOwner().' <'.$siteadmin.'>'; |
|
| 826 | + $to = $name . ' <' . $user->email . '>'; |
|
| 827 | + $from = siteSettings()->getOwner() . ' <' . $siteadmin . '>'; |
|
| 828 | 828 | |
| 829 | 829 | $sent = false; |
| 830 | 830 | $sent = sendMail($to, $subject, $message, $from); |
@@ -832,10 +832,10 @@ discard block |
||
| 832 | 832 | if ($sent == true) { |
| 833 | 833 | return true; |
| 834 | 834 | } else { |
| 835 | - return 'Error while sending mail to '.$user->firstName.' '.$user->lastName; |
|
| 835 | + return 'Error while sending mail to ' . $user->firstName . ' ' . $user->lastName; |
|
| 836 | 836 | } |
| 837 | 837 | |
| 838 | - return 'Unknown error for '.$user->firstName.' '.$user->lastName; |
|
| 838 | + return 'Unknown error for ' . $user->firstName . ' ' . $user->lastName; |
|
| 839 | 839 | } |
| 840 | 840 | |
| 841 | 841 | // returns either true, or error message string |
@@ -848,14 +848,14 @@ discard block |
||
| 848 | 848 | $user = mysqli_fetch_object($result); |
| 849 | 849 | |
| 850 | 850 | if (!$user->email) { |
| 851 | - return 'No email address present for '.$user->firstName.' '.$user->lastName; |
|
| 851 | + return 'No email address present for ' . $user->firstName . ' ' . $user->lastName; |
|
| 852 | 852 | } |
| 853 | 853 | |
| 854 | 854 | if (!$user->isOverviewRecipient) { |
| 855 | - return $user->firstName.' '.$user->lastName.' opted not to recieve group emails'; |
|
| 855 | + return $user->firstName . ' ' . $user->lastName . ' opted not to recieve group emails'; |
|
| 856 | 856 | } |
| 857 | 857 | |
| 858 | - $name = $user->firstName.' '.$user->lastName; |
|
| 858 | + $name = $user->firstName . ' ' . $user->lastName; |
|
| 859 | 859 | |
| 860 | 860 | //line seperator for mails |
| 861 | 861 | //rfc sais \r\n, but this makes trouble in outlook. several spaces plus \n works fine in outlook and thunderbird. |
@@ -888,7 +888,7 @@ discard block |
||
| 888 | 888 | } |
| 889 | 889 | |
| 890 | 890 | if (!isset($events)) { |
| 891 | - return $name.' has no events in the upcoming rota'; |
|
| 891 | + return $name . ' has no events in the upcoming rota'; |
|
| 892 | 892 | } |
| 893 | 893 | |
| 894 | 894 | $events = implode(', ', $events); |
@@ -941,7 +941,7 @@ discard block |
||
| 941 | 941 | |
| 942 | 942 | $eventDetails .= $row['joinedskills']; |
| 943 | 943 | $eventDetails .= "\r\n"; |
| 944 | - $eventDetails .= 'Notes: '.$row['comment']; |
|
| 944 | + $eventDetails .= 'Notes: ' . $row['comment']; |
|
| 945 | 945 | $eventDetails .= "\r\n"; |
| 946 | 946 | $eventDetails .= "\r\n"; |
| 947 | 947 | } |
@@ -957,8 +957,8 @@ discard block |
||
| 957 | 957 | |
| 958 | 958 | //$message = str_replace("\r\n",$crlf,$message); |
| 959 | 959 | |
| 960 | - $to = $name.' <'.$user->email.'>'; |
|
| 961 | - $from = siteSettings()->getOwner().' <'.$siteadmin.'>'; |
|
| 960 | + $to = $name . ' <' . $user->email . '>'; |
|
| 961 | + $from = siteSettings()->getOwner() . ' <' . $siteadmin . '>'; |
|
| 962 | 962 | |
| 963 | 963 | $sent = false; |
| 964 | 964 | $sent = sendMail($to, $subject, $message, $from); |
@@ -966,10 +966,10 @@ discard block |
||
| 966 | 966 | if ($sent == true) { |
| 967 | 967 | return true; |
| 968 | 968 | } else { |
| 969 | - return 'Error while sending mail to '.$user->firstName.' '.$user->lastName; |
|
| 969 | + return 'Error while sending mail to ' . $user->firstName . ' ' . $user->lastName; |
|
| 970 | 970 | } |
| 971 | 971 | |
| 972 | - return 'Unknown error for '.$user->firstName.' '.$user->lastName; |
|
| 972 | + return 'Unknown error for ' . $user->firstName . ' ' . $user->lastName; |
|
| 973 | 973 | } |
| 974 | 974 | |
| 975 | 975 | function notifyAttack($fileName, $attackType, $attackerID) |
@@ -984,10 +984,10 @@ discard block |
||
| 984 | 984 | |
| 985 | 985 | while ($row = mysqli_fetch_array($userresult, MYSQLI_ASSOC)) { |
| 986 | 986 | $subject = 'SECURITY-ALERT - Attack blocked successfully'; |
| 987 | - $message = "Type:\t\t ".$attackType."<br>\r\n". |
|
| 988 | - "Attacker:\t ".$row[name]."<br>\r\n". |
|
| 989 | - "Date:\t\t ".date('Y-m-d H:i:s')."<br>\r\n". |
|
| 990 | - "Script:\t\t ".$fileName."\r\n "."<br>\r\n"; |
|
| 987 | + $message = "Type:\t\t " . $attackType . "<br>\r\n" . |
|
| 988 | + "Attacker:\t " . $row[name] . "<br>\r\n" . |
|
| 989 | + "Date:\t\t " . date('Y-m-d H:i:s') . "<br>\r\n" . |
|
| 990 | + "Script:\t\t " . $fileName . "\r\n " . "<br>\r\n"; |
|
| 991 | 991 | |
| 992 | 992 | //$headers = 'From: ' . $row['siteadmin'] . "\r\n" . |
| 993 | 993 | //'Reply-To: ' . $row['siteadmin'] . "\r\n"; |
@@ -997,8 +997,8 @@ discard block |
||
| 997 | 997 | //mail($to, $subject, strip_tags($message), $headers); |
| 998 | 998 | sendMail($to, $subject, strip_tags($message), $to); |
| 999 | 999 | |
| 1000 | - echo $subject.'<br><br>'; |
|
| 1001 | - echo $message.'<br>'; |
|
| 1000 | + echo $subject . '<br><br>'; |
|
| 1001 | + echo $message . '<br>'; |
|
| 1002 | 1002 | echo 'An email about this incident was sent to administrator!'; |
| 1003 | 1003 | } |
| 1004 | 1004 | } |
@@ -1013,11 +1013,11 @@ discard block |
||
| 1013 | 1013 | $userresult = mysqli_query(db(), $sql) or die(mysqli_error(db())); |
| 1014 | 1014 | |
| 1015 | 1015 | while ($row = mysqli_fetch_array($userresult, MYSQLI_ASSOC)) { |
| 1016 | - $subject = 'Info - '.$infoMsg.' - '.$row[name]; |
|
| 1017 | - $message = "Type:\t\t ".$infoMsg."<br>\r\n". |
|
| 1018 | - "User:\t\t ".$row[name]."<br>\r\n". |
|
| 1019 | - "Date:\t\t ".date('Y-m-d H:i:s')."<br>\r\n". |
|
| 1020 | - "Script:\t\t ".$fileName."\r\n "."<br>\r\n"; |
|
| 1016 | + $subject = 'Info - ' . $infoMsg . ' - ' . $row[name]; |
|
| 1017 | + $message = "Type:\t\t " . $infoMsg . "<br>\r\n" . |
|
| 1018 | + "User:\t\t " . $row[name] . "<br>\r\n" . |
|
| 1019 | + "Date:\t\t " . date('Y-m-d H:i:s') . "<br>\r\n" . |
|
| 1020 | + "Script:\t\t " . $fileName . "\r\n " . "<br>\r\n"; |
|
| 1021 | 1021 | |
| 1022 | 1022 | //$headers = 'From: ' . $row['siteadmin'] . "\r\n" . |
| 1023 | 1023 | //'Reply-To: ' . $row['siteadmin'] . "\r\n"; |
@@ -1034,7 +1034,7 @@ discard block |
||
| 1034 | 1034 | if (preg_match("/(\{\{)((.)+){1}(\}\})/", $message, $matches) == 1) { |
| 1035 | 1035 | $defaultSubject = $matches[2]; |
| 1036 | 1036 | //$subject = str_replace(array("{{","}}"),"",$matches[0]); |
| 1037 | - $message = str_replace($matches[1].$matches[2].$matches[4], '', $message); |
|
| 1037 | + $message = str_replace($matches[1] . $matches[2] . $matches[4], '', $message); |
|
| 1038 | 1038 | //$message = $matches[4]; |
| 1039 | 1039 | |
| 1040 | 1040 | //$message = $message . "\r\n\r\n"; |
@@ -46,7 +46,7 @@ |
||
| 46 | 46 | '#(http://(www.)?youtube.com)?/(v/|watch\?v\=)([-|~_0-9A-Za-z]+)&?.*?#i', |
| 47 | 47 | '<iframe title="YouTube Video" width="560" height="340" src="http://www.youtube.com/embed/$4" frameborder="0" allowfullscreen></iframe>', |
| 48 | 48 | $string |
| 49 | - ); |
|
| 49 | + ); |
|
| 50 | 50 | |
| 51 | 51 | return $string; |
| 52 | 52 | } |
@@ -15,7 +15,7 @@ |
||
| 15 | 15 | 7 => 'swap-pending', |
| 16 | 16 | 8 => 'swap-approved', |
| 17 | 17 | 9 => 'email', |
| 18 | - ]; |
|
| 18 | + ]; |
|
| 19 | 19 | } |
| 20 | 20 | |
| 21 | 21 | function createNotificationForUser($userId, $summary, $body, $typeName, $link = null) |
