Merge pull request #686 from engelnyst/errors

Errors

install/upgrade_elk_1-0_mysql.sql

@@ -481,7 +481,7 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}postby_emails_error (
 	email_from varchar(50) NOT NULL default '',
 	message_type char(10) NOT NULL default '',
 	message mediumtext NOT NULL default '',
-	PRIMARY KEY (id_email),
+	PRIMARY KEY (id_email)
 ) ENGINE=MyISAM{$db_collation};
 ---#
 
@@ -493,7 +493,7 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}postby_emails_filters (
 	filter_to varchar(255) NOT NULL default '',
 	filter_from varchar(255) NOT NULL default '',
 	filter_name varchar(255) NOT NULL default '',
-	PRIMARY KEY (id_filter),
+	PRIMARY KEY (id_filter)
 ) ENGINE=MyISAM{$db_collation};
 ---#
 
@@ -533,7 +533,7 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}log_likes (
 CREATE TABLE IF NOT EXISTS {$db_prefix}message_likes (
   id_member mediumint(8) unsigned NOT NULL default '0',
   id_msg mediumint(8) unsigned NOT NULL default '0',
-  PRIMARY KEY (id_msg, id_member) 
+  PRIMARY KEY (id_msg, id_member)
 ) ENGINE=MyISAM;
 ---#
 

install/upgrade_elk_1-0_postgresql.sql

@@ -509,7 +509,7 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}antispam_questions (
   language varchar(50) NOT NULL default '',
   PRIMARY KEY (id_question),
   KEY language (language(30))
-) ENGINE=MyISAM;
+);
 ---#
 
 ---# Move existing values...
@@ -606,7 +606,7 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}postby_emails (
 	time_sent int NOT NULL default '0',
 	email_to varchar(50) NOT NULL,
 	PRIMARY KEY (id_email)
-) ENGINE=MyISAM{$db_collation};
+);
 ---#
 
 ---# Creating postby_emails_error table
@@ -620,8 +620,8 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}postby_emails_error (
 	email_from varchar(50) NOT NULL default '',
 	message_type char(10) NOT NULL default '',
 	message mediumtext NOT NULL default '',
-	PRIMARY KEY (id_email),
-) ENGINE=MyISAM{$db_collation};
+	PRIMARY KEY (id_email)
+);
 ---#
 
 ---# Creating postby_emails_filters table
@@ -632,8 +632,8 @@ CREATE TABLE IF NOT EXISTS {$db_prefix}postby_emails_filters (
 	filter_to varchar(255) NOT NULL default '',
 	filter_from varchar(255) NOT NULL default '',
 	filter_name varchar(255) NOT NULL default '',
-	PRIMARY KEY (id_filter),
-) ENGINE=MyISAM{$db_collation};
+	PRIMARY KEY (id_filter)
+);
 ---#
 
 ---# Adding new columns to log_activity...

sources/admin/Packages.php

@@ -1483,7 +1483,7 @@ public function action_showoperations()
 
 		// Load the required file.
 		require_once(SUBSDIR . '/Package.subs.php');
-		require_once(SUBSDIR . 'Themes.subs.php');
+		require_once(SUBSDIR . '/Themes.subs.php');
 
 		// Uninstalling the mod?
 		$reverse = isset($_REQUEST['reverse']) ? true : false;

sources/database/DbTable-mysql.php

@@ -125,7 +125,7 @@ function db_create_table($table_name, $columns, $indexes = array(), $parameters
 		// Righty - let's do the damn thing!
 		$table_query = 'CREATE TABLE ' . $table_name . "\n" . '(';
 		foreach ($columns as $column)
-			$table_query .= "\n\t" . elk_db_create_query_column($column)  . ',';
+			$table_query .= "\n\t" . $this->db_create_query_column($column)  . ',';
 
 		// Loop through the indexes next...
 		foreach ($indexes as $index)
@@ -246,7 +246,7 @@ function db_add_column($table_name, $column_info, $parameters = array(), $if_exi
 		// Now add the thing!
 		$query = '
 			ALTER TABLE ' . $table_name . '
-			ADD ' . elk_db_create_query_column($column_info) . (empty($column_info['auto']) ? '' : ' primary key');
+			ADD ' . $this->db_create_query_column($column_info) . (empty($column_info['auto']) ? '' : ' primary key');
 
 		$db->query('', $query,
 			array(

themes/default/languages/ManageScheduledTasks.english.php

@@ -31,10 +31,16 @@
 $txt['scheduled_task_desc_weekly_maintenance'] = 'Runs essential weekly maintenance on the forum - should not be disabled.';
 $txt['scheduled_task_paid_subscriptions'] = 'Paid Subscription Checks';
 $txt['scheduled_task_desc_paid_subscriptions'] = 'Sends out any necessary paid subscription reminders and removes expired member subscriptions.';
-$txt['scheduled_task_remove_topic_redirect'] = 'Remove MOVED: redirection topics';
+$txt['scheduled_task_remove_topic_redirect'] = 'Remove MOVED: Redirection Topics';
 $txt['scheduled_task_desc_remove_topic_redirect'] = 'Deletes "MOVED:" topic notifications as specified when the moved notice was created.';
-$txt['scheduled_task_remove_temp_attachments'] = 'Remove temporary attachment files';
+$txt['scheduled_task_remove_temp_attachments'] = 'Remove Temporary Attachment Files';
 $txt['scheduled_task_desc_remove_temp_attachments'] = 'Deletes temporary files created while attaching a file to a post that for any reason weren\'t renamed or deleted before.';
+$txt['scheduled_task_remove_old_drafts'] = 'Remove Old Drafts';
+$txt['scheduled_task_desc_remove_old_drafts'] = 'Deletes drafts older than the number of days defined in the draft settings in the admin panel.';
+$txt['scheduled_task_remove_old_followups'] = 'Remove Old Follow-ups';
+$txt['scheduled_task_desc_remove_old_followups'] = 'Deletes follow-up entries still present in the database, but pointing to non-existent topics.';
+$txt['scheduled_task_maillist_fetch_IMAP'] = 'Fetch Emails from IMAP';
+$txt['scheduled_task_desc_maillist_fetch_IMAP'] = 'Fetches emails for the mailing list feature from an IMAP box and processes them.';
 
 $txt['scheduled_task_reg_starting'] = 'Starting at %1$s';
 $txt['scheduled_task_reg_repeating'] = 'repeating every %1$d %2$s';
@@ -58,9 +64,3 @@
 $txt['scheduled_log_time_taken_seconds'] = '%1$d seconds';
 $txt['scheduled_log_empty_log'] = 'Clear Log';
 $txt['scheduled_log_empty_log_confirm'] = 'Are you sure you want to completely clear the log?';
-
-$txt['scheduled_task_remove_old_drafts'] = 'Remove old drafts';
-$txt['scheduled_task_desc_remove_old_drafts'] = 'Deletes drafts older than the number of days defined in the draft settings in the admin panel.';
-
-$txt['scheduled_task_remove_old_followups'] = 'Remove old follow-ups';
-$txt['scheduled_task_desc_remove_old_followups'] = 'Deletes follow-up entries still present in the database, but pointing to non-existent topics.';

themes/default/languages/ManageSettings.english.php

@@ -371,7 +371,7 @@
 $txt['core_settings_item_pe'] = 'Post by Email Management';
 $txt['core_settings_item_pe_desc'] = 'This will allow users of your forum to reply to emailed notifications and personal messages and have them post directly as a reply to the appropriate thread or PM.  This provides a familiar mailist feel.  Use of this functionality will require additional setup steps on your hosting provider.';
 $txt['core_settings_item_l'] = 'Likes';
-$txt['core_settings_item_l_desc'] = 'Likes is a feature that allows members to like a post to show thier approval and popularity of the message content.';
+$txt['core_settings_item_l_desc'] = 'Likes is a feature that allows members to like a post to show their approval and popularity of the message content.';
 $txt['core_settings_item_pe'] = 'Post by Email Management';
 $txt['core_settings_item_pe_desc'] = 'This will allow users of your forum to reply to emailed notifications and personal messages and have them post directly as a reply to the appropriate thread or PM.  This provides a familiar mailist feel.  Use of this functionality will require additional setup steps on your hosting provider.';
 $txt['core_settings_item_ml'] = 'Moderation, Administration and User Logs';