Skip to content

Commit

Permalink
Merge branch 'develop'
Browse files Browse the repository at this point in the history
  • Loading branch information
Joshua Parker committed Jul 19, 2017
2 parents 318b87f + 40db7e0 commit bc7f34d
Show file tree
Hide file tree
Showing 9 changed files with 3,927 additions and 1,309 deletions.
2 changes: 1 addition & 1 deletion RELEASE
View file
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6.3.1
6.3.2
4 changes: 4 additions & 0 deletions app/functions/db-function.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -267,6 +267,8 @@ function web_reg_check()
$options->meta_value = 1;
$options->where('meta_key = "open_registration"')
->update();

etsis_cache_flush_namespace('option');
}
}

Expand All @@ -276,6 +278,8 @@ function web_reg_check()
$options->meta_value = 0;
$options->where('meta_key = "open_registration"')
->update();

etsis_cache_flush_namespace('option');
}
}
} catch (NotFoundException $e) {
Expand Down
7 changes: 3 additions & 4 deletions app/functions/hook-function.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -837,7 +837,7 @@ function dashboard_course_count()
$count = $app->db->course()
->where('course.currStatus = "A"')->_and_()
->where('course.endDate IS NULL')->_or_()
->whereLte('course.endDate','0000-00-00')
->whereLte('course.endDate', '0000-00-00')
->count('course.courseID');

$crseCount = '<div class="col-md-4">';
Expand Down Expand Up @@ -872,7 +872,7 @@ function dashboard_acadProg_count()
$count = $app->db->acad_program()
->where('acad_program.currStatus = "A"')->_and_()
->where('acad_program.endDate IS NULL')->_or_()
->whereLte('acad_program.endDate','0000-00-00')
->whereLte('acad_program.endDate', '0000-00-00')
->count('acad_program.id');

$progCount = '<div class="col-md-4">';
Expand Down Expand Up @@ -1839,7 +1839,7 @@ function etsis_enqueue_script()
function etsis_dev_mode()
{
if (APP_ENV === 'DEV') {
echo '<div class="alert dismissable alert-danger center sticky">'._t('Your system is currently in DEV mode. Please remember to set your system back to PROD mode after testing. When PROD mode is set, this warning message will disappear.').'</div>';
echo '<div class="alert dismissable alert-danger center sticky">' . _t('Your system is currently in DEV mode. Please remember to set your system back to PROD mode after testing. When PROD mode is set, this warning message will disappear.') . '</div>';
}
}
$app->hook->add_action('etsis_dashboard_head', 'head_release_meta', 5);
Expand All @@ -1864,7 +1864,6 @@ function etsis_dev_mode()
$app->hook->add_action('post_brgn_stu_crse_reg', 'create_update_sttr_record', 5, 1);
$app->hook->add_action('dashboard_admin_notices', 'etsis_dev_mode', 5);
$app->hook->add_action('myetsis_admin_notices', 'etsis_dev_mode', 5);
$app->hook->add_action('stu_acct_rule', 'etsis_reg_btrl_rule', 5, 3);
$app->hook->add_action('execute_webreg_check', 'web_reg_check', 5);
$app->hook->add_filter('the_myetsis_page_content', 'etsis_autop');
$app->hook->add_filter('the_myetsis_page_content', 'parsecode_unautop');
Expand Down
24 changes: 24 additions & 0 deletions app/functions/nodeq-function.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,10 @@ function etsis_nodeq_login_details()
$message = str_replace('#mailaddr#', _h(get_option('mailing_address')), $message);
$message = process_email_html($message, _t("myetSIS Login Details"));
$headers[] = sprintf("From: %s <auto-reply@%s>", _t('myetSIS :: ') . _h(get_option('institution_name')), get_domain_name());
if (!function_exists('etsis_smtp')) {
$headers[] = 'Content-Type: text/html; charset="UTF-8"';
$headers[] = sprintf("X-Mailer: eduTrac SIS %s", RELEASE_TAG);
}

try {
_etsis_email()->etsisMail(_h($r->email), _t("myetSIS Login Details"), $message, $headers);
Expand Down Expand Up @@ -119,6 +123,10 @@ function etsis_nodeq_reset_password()
$message = str_replace('#password#', _h($r->password), $message);
$message = process_email_html($message, _t('Reset Password'));
$headers[] = sprintf("From: %s <auto-reply@%s>", $from, get_domain_name());
if (!function_exists('etsis_smtp')) {
$headers[] = 'Content-Type: text/html; charset="UTF-8"';
$headers[] = sprintf("X-Mailer: eduTrac SIS %s", RELEASE_TAG);
}

try {
_etsis_email()->etsisMail(_h($r->email), _t('Reset Password'), $message, $headers);
Expand Down Expand Up @@ -172,6 +180,10 @@ function etsis_nodeq_csv_email()
foreach ($sql as $r) {
$message = process_email_html(_escape($r->message), _h($r->subject));
$headers[] = sprintf("From: %s <auto-reply@%s>", _h(get_option('institution_name')), get_domain_name());
if (!function_exists('etsis_smtp')) {
$headers[] = 'Content-Type: text/html; charset="UTF-8"';
$headers[] = sprintf("X-Mailer: eduTrac SIS %s", RELEASE_TAG);
}

$attachment = $app->config('file.savepath') . _h($r->filename);

Expand Down Expand Up @@ -248,6 +260,10 @@ function etsis_nodeq_change_address()
$message = str_replace('#mailaddr#', _h(get_option('mailing_address')), $message);
$message = process_email_html($message, _t('Change of Address Request'));
$headers[] = sprintf("From: %s <auto-reply@%s>", _t('myetSIS :: ') . _h(get_option('institution_name')), get_domain_name());
if (!function_exists('etsis_smtp')) {
$headers[] = 'Content-Type: text/html; charset="UTF-8"';
$headers[] = sprintf("X-Mailer: eduTrac SIS %s", RELEASE_TAG);
}

try {
_etsis_email()->etsisMail(_h(get_option('contact_email')), _t('Change of Address Request'), $message, $headers);
Expand Down Expand Up @@ -317,6 +333,10 @@ function etsis_nodeq_acceptance_letter()
$message = str_replace('#mailaddr#', _h(get_option('mailing_address')), $message);
$message = process_email_html($message, _h(get_option('institution_name')) . ' ' . _t('Decision Notification'));
$headers[] = sprintf("From: %s <auto-reply@%s>", _h(get_option('institution_name')), get_domain_name());
if (!function_exists('etsis_smtp')) {
$headers[] = 'Content-Type: text/html; charset="UTF-8"';
$headers[] = sprintf("X-Mailer: eduTrac SIS %s", RELEASE_TAG);
}

try {
_etsis_email()->etsisMail(_h(get_option('contact_email')), _h(get_option('institution_name')) . ' ' . _t('Decision Notification'), $message, $headers);
Expand Down Expand Up @@ -466,6 +486,10 @@ function etsis_nodeq_student_email()
$headers[] = sprintf("Bcc: %s", _h($r->bcc));
}
$headers[] = sprintf("Reply-to: %s", _h($from->email));
if (!function_exists('etsis_smtp')) {
$headers[] = 'Content-Type: text/html; charset="UTF-8"';
$headers[] = sprintf("X-Mailer: eduTrac SIS %s", RELEASE_TAG);
}

try {
_etsis_email()->etsisMail(_h($to->email), _h($r->subject), $message, $headers, _h($r->attachment) != '' ? [_h($r->attachment)] : []);
Expand Down
Loading

0 comments on commit bc7f34d

Please sign in to comment.