Commit ad283049 authored by Bertrand Gorge's avatar Bertrand Gorge

Fixed deprecated includes

parent 5290db29
...@@ -19,10 +19,10 @@ class qa_email_notifications_event { ...@@ -19,10 +19,10 @@ class qa_email_notifications_event {
public $log_file_name, $log_file_exists, $log_file; public $log_file_name, $log_file_exists, $log_file;
function process_event($event, $userid, $handle, $cookieid, $params) { function process_event($event, $userid, $handle, $cookieid, $params) {
if ($this->plugin_enabled_from_admin_panel()) { //proceed only if the plugin is enabled if ($this->plugin_enabled_from_admin_panel()) { //proceed only if the plugin is enabled
require_once QA_INCLUDE_DIR . 'qa-app-emails.php'; require_once QA_INCLUDE_DIR . 'app/emails.php';
require_once QA_INCLUDE_DIR . 'qa-app-format.php'; require_once QA_INCLUDE_DIR . 'app/format.php';
require_once QA_INCLUDE_DIR . 'qa-util-string.php'; require_once QA_INCLUDE_DIR . 'util/string.php';
switch ($event) { switch ($event) {
case 'q_post': case 'q_post':
...@@ -37,7 +37,7 @@ class qa_email_notifications_event { ...@@ -37,7 +37,7 @@ class qa_email_notifications_event {
$bcclist[] = $emails[$i]['email']; $bcclist[] = $emails[$i]['email'];
} }
$this->category_email_notification_send_notification($bcclist, null, null, qa_lang('emails/q_posted_subject'), qa_lang('notify/q_posted_body'), $this->category_email_notification_send_notification($bcclist, null, null, qa_lang('emails/q_posted_subject'), qa_lang('notify/q_posted_body'),
array( array(
'^q_handle' => isset($handle) ? $handle : qa_lang('main/anonymous'), '^q_handle' => isset($handle) ? $handle : qa_lang('main/anonymous'),
'^q_title' => $params['title'], // don't censor title or content here since we want the admin to see bad words '^q_title' => $params['title'], // don't censor title or content here since we want the admin to see bad words
...@@ -48,8 +48,8 @@ class qa_email_notifications_event { ...@@ -48,8 +48,8 @@ class qa_email_notifications_event {
); );
} }
break; break;
} //switch } //switch
}//if }//if
} }
function qa_db_notificaton_emails_selectspec($userid, $tags, $categoryid) { function qa_db_notificaton_emails_selectspec($userid, $tags, $categoryid) {
...@@ -66,7 +66,7 @@ class qa_email_notifications_event { ...@@ -66,7 +66,7 @@ class qa_email_notifications_event {
} }
if (!!qa_opt('ami_email_notf_allow_tag_follower') && !!$tags) { if (!!qa_opt('ami_email_notf_allow_tag_follower') && !!$tags) {
$source .= (!!$source) ? ' UNION ' : ''; $source .= (!!$source) ? ' UNION ' : '';
$source .= "( SELECT ^users.email , 'T' as favorited , ^userpoints.points from ^users JOIN ^userpoints ON ^users.userid=^userpoints.userid JOIN ^userfavorites ON ^userfavorites.userid=^users.userid WHERE ^userfavorites.entityid IN $source .= "( SELECT ^users.email , 'T' as favorited , ^userpoints.points from ^users JOIN ^userpoints ON ^users.userid=^userpoints.userid JOIN ^userfavorites ON ^userfavorites.userid=^users.userid WHERE ^userfavorites.entityid IN
( SELECT wordid from ^words where ^words.word IN ($) ) AND ^userfavorites.entitytype=$ AND ^users.email !=$ )"; ( SELECT wordid from ^words where ^words.word IN ($) ) AND ^userfavorites.entitytype=$ AND ^users.email !=$ )";
$args = array(qa_tagstring_to_tags($tags), QA_ENTITY_TAG, qa_get_logged_in_user_field('email')); $args = array(qa_tagstring_to_tags($tags), QA_ENTITY_TAG, qa_get_logged_in_user_field('email'));
$arguments = array_merge($arguments, $args); $arguments = array_merge($arguments, $args);
...@@ -80,7 +80,7 @@ class qa_email_notifications_event { ...@@ -80,7 +80,7 @@ class qa_email_notifications_event {
} }
$where_clause = ''; $where_clause = '';
if (!!qa_opt('ami_email_notf_min_point')) { if (!!qa_opt('ami_email_notf_min_point')) {
//generate where clause //generate where clause
$min_user_points = qa_opt('ami_email_notf_min_point_val'); $min_user_points = qa_opt('ami_email_notf_min_point_val');
$where_clause = ((!!$min_user_points && ( $min_user_points > 0) )) ? 'where result.points > ' . $min_user_points : ''; $where_clause = ((!!$min_user_points && ( $min_user_points > 0) )) ? 'where result.points > ' . $min_user_points : '';
} }
...@@ -90,7 +90,7 @@ class qa_email_notifications_event { ...@@ -90,7 +90,7 @@ class qa_email_notifications_event {
'arguments' => $arguments, 'arguments' => $arguments,
'sortasc' => 'title', 'sortasc' => 'title',
); );
} //if plugin is enabled } //if plugin is enabled
} }
//qa_db_notificaton_emails_selectspec //qa_db_notificaton_emails_selectspec
...@@ -191,7 +191,7 @@ class qa_email_notifications_event { ...@@ -191,7 +191,7 @@ class qa_email_notifications_event {
function admin_form(&$qa_content) { function admin_form(&$qa_content) {
//add the functions //add the functions
require_once EMAIL_NOTF_PLUGIN_DIR . '/functions.php'; require_once EMAIL_NOTF_PLUGIN_DIR . '/functions.php';
// Process form input // Process form input
...@@ -201,11 +201,11 @@ class qa_email_notifications_event { ...@@ -201,11 +201,11 @@ class qa_email_notifications_event {
$enable_plugin = !!qa_post_text('ami_email_notf_enable_plugin'); $enable_plugin = !!qa_post_text('ami_email_notf_enable_plugin');
qa_opt('ami_email_notf_enable_plugin', $enable_plugin); qa_opt('ami_email_notf_enable_plugin', $enable_plugin);
if (!$enable_plugin) { if (!$enable_plugin) {
//if the plugin is disabled then turn off all features //if the plugin is disabled then turn off all features
ami_reset_all_notification_options(); ami_reset_all_notification_options();
} else { } else {
$response = ami_set_all_notification_options(); $response = ami_set_all_notification_options();
//$error will be false if the //$error will be false if the
$error = (isset($response) && is_array($response) && !empty($response)) ? true : false; $error = (isset($response) && is_array($response) && !empty($response)) ? true : false;
} }
...@@ -273,7 +273,7 @@ class qa_email_notifications_event { ...@@ -273,7 +273,7 @@ class qa_email_notifications_event {
'tags' => 'name="ami_email_notf_min_point_val" id="ami_email_notf_min_point_val" ', 'tags' => 'name="ami_email_notf_min_point_val" id="ami_email_notf_min_point_val" ',
'error' => qa_html(@$err_enter_point_value), 'error' => qa_html(@$err_enter_point_value),
), ),
), ),
'buttons' => array( 'buttons' => array(
array( array(
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment