Update deprecated notices in various files

qa-include/qa-app-admin.php

@@ -574,14 +574,13 @@
 	}
 
 
+	/**
+	 * Retrieve metadata information from the $contents of a qa-theme.php or qa-plugin.php file, mapping via $fields.
+	 *
+	 * @deprecated Deprecated from 1.7; use `qa_addon_metadata($contents, $type)` instead.
+	 */
 	function qa_admin_addon_metadata($contents, $fields)
-/*
-	Retrieve metadata information from the $contents of a qa-theme.php or qa-plugin.php file, mapping via $fields.
-	This function is now DEPRECATED.
-*/
 	{
-		trigger_error('Function qa_admin_addon_metadata is deprecated; use qa_addon_metadata instead', E_USER_NOTICE);
-
 		$metadata=array();
 
 		foreach ($fields as $key => $field)

qa-include/qa-app-format.php

@@ -1336,11 +1336,12 @@
 	}
 
 
+	/**
+	 * Return the sub navigation structure for user account pages.
+	 *
+	 * @deprecated Deprecated from 1.6.3; use `qa_user_sub_navigation()` instead.
+	 */
 	function qa_account_sub_navigation()
-/*
-	Return the sub navigation structure for user account pages.
-	RETIRED FROM USE IN Q2A 1.6.3 BUT RETAINED FOR BACKWARDS COMPATIBILITY
-*/
 	{
 		return array(
 			'account' => array(

qa-include/qa-app-limits.php

@@ -55,11 +55,12 @@
 	}
 
 
+	/**
+	 * Return how many more times user $userid and/or the requesting IP can perform $action (a QA_LIMIT_* constant) this hour.
+	 *
+	 * @deprecated Deprecated from 1.6.0; use `qa_user_limits_remaining($action)` instead.
+	 */
 	function qa_limits_remaining($userid, $action)
-/*
-	Return how many more times user $userid and/or the requesting IP can perform $action this hour, where $action is one
-	of the QA_LIMIT_* constants above. This function is no longer used and only included for backwards compatibility.
-*/
 	{
 		if (qa_to_override(__FUNCTION__)) { $args=func_get_args(); return qa_call_override(__FUNCTION__, $args); }
 

qa-include/qa-app-options.php

@@ -108,12 +108,10 @@
 	}
 
 
-	function qa_options_set_pending($names)
-/*
-	This is deprecated since Q2A 1.3 now that all options are retrieved together.
-	Function kept for backwards compatibility with modified Q2A code bases.
-*/
-	{}
+	/**
+	 * @deprecated Deprecated since Q2A 1.3 now that all options are retrieved together.
+	 */
+	function qa_options_set_pending($names) {}
 
 
 	function qa_preload_options()

qa-include/qa-app-posts.php

@@ -328,13 +328,13 @@
 	}
 
 
+	/**
+	 * Return the handle corresponding to $userid, unless it is null in which case return null.
+	 *
+	 * @deprecated Deprecated from 1.7; use `qa_userid_to_handle($userid)` instead.
+	 */
 	function qa_post_userid_to_handle($userid)
-/*
-	Return the handle corresponding to $userid, unless it is null in which case return null.
-	This function is now DEPRECATED.
-*/
 	{
-		trigger_error('Function qa_post_userid_to_handle is deprecated; use qa_userid_to_handle instead', E_USER_NOTICE);
 		return qa_userid_to_handle($userid);
 	}
 

qa-include/qa-class.phpmailer.php

 <?php
-trigger_error('File qa-class.phpmailer.php is deprecated; please use Q2A built-in functions for sending emails', E_USER_NOTICE);
-
-/*~ class.phpmailer.php
-.---------------------------------------------------------------------------.
-|  Software: PHPMailer - PHP email class                                    |
-|   Version: 2.0.4                                                          |
-|   Contact: via sourceforge.net support pages (also www.codeworxtech.com)  |
-|      Info: http://phpmailer.sourceforge.net                               |
-|   Support: http://sourceforge.net/projects/phpmailer/                     |
-| ------------------------------------------------------------------------- |
-|    Author: Andy Prevost (project admininistrator)                         |
-|    Author: Brent R. Matzelle (original founder)                           |
-| Copyright (c) 2004-2007, Andy Prevost. All Rights Reserved.               |
-| Copyright (c) 2001-2003, Brent R. Matzelle                                |
-| ------------------------------------------------------------------------- |
-|   License: Distributed under the Lesser General Public License (LGPL)     |
-|            http://www.gnu.org/copyleft/lesser.html                        |
-| This program is distributed in the hope that it will be useful - WITHOUT  |
-| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or     |
-| FITNESS FOR A PARTICULAR PURPOSE.                                         |
-| ------------------------------------------------------------------------- |
-| We offer a number of paid services (www.codeworxtech.com):                |
-| - Web Hosting on highly optimized fast and secure servers                 |
-| - Technology Consulting                                                   |
-| - Oursourcing (highly qualified programmers and graphic designers)        |
-'---------------------------------------------------------------------------'
-
 /**
  * PHPMailer - PHP email transport class
  * @package PHPMailer
  * @author Andy Prevost
  * @copyright 2004 - 2009 Andy Prevost
+ * @deprecated This file is deprecated; please use Q2A built-in functions for sending emails.
  */
 
 class PHPMailer {

qa-include/qa-class.smtp.php

 <?php
-trigger_error('File qa-class.smtp.php is deprecated; please use Q2A built-in functions for sending emails', E_USER_NOTICE);
-
-/*~ class.smtp.php
-.---------------------------------------------------------------------------.
-|  Software: PHPMailer - PHP email class                                    |
-|   Version: 2.0.4                                                          |
-|   Contact: via sourceforge.net support pages (also www.codeworxtech.com)  |
-|      Info: http://phpmailer.sourceforge.net                               |
-|   Support: http://sourceforge.net/projects/phpmailer/                     |
-| ------------------------------------------------------------------------- |
-|    Author: Andy Prevost (project admininistrator)                         |
-|    Author: Brent R. Matzelle (original founder)                           |
-| Copyright (c) 2004-2007, Andy Prevost. All Rights Reserved.               |
-| Copyright (c) 2001-2003, Brent R. Matzelle                                |
-| ------------------------------------------------------------------------- |
-|   License: Distributed under the Lesser General Public License (LGPL)     |
-|            http://www.gnu.org/copyleft/lesser.html                        |
-| This program is distributed in the hope that it will be useful - WITHOUT  |
-| ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or     |
-| FITNESS FOR A PARTICULAR PURPOSE.                                         |
-| ------------------------------------------------------------------------- |
-| We offer a number of paid services (www.codeworxtech.com):                |
-| - Web Hosting on highly optimized fast and secure servers                 |
-| - Technology Consulting                                                   |
-| - Oursourcing (highly qualified programmers and graphic designers)        |
-'---------------------------------------------------------------------------'
-
 /**
  * SMTP is rfc 821 compliant and implements all the rfc 821 SMTP
  * commands except TURN which will always return a not implemented
@@ -33,6 +6,7 @@ trigger_error('File qa-class.smtp.php is deprecated; please use Q2A built-in fun
  * to an SMTP server.
  * @package PHPMailer
  * @author Chris Ryan
+ * @deprecated This file is deprecated; please use Q2A built-in functions for sending emails.
  */
 
 class SMTP

qa-include/qa-db-post-update.php

@@ -116,7 +116,7 @@
 	function qa_db_post_set_content($postid, $title, $content, $format, $tagstring, $notify, $lastuserid=null, $lastip=null, $updatetype=QA_UPDATE_CONTENT, $name=null)
 /*
 	Set the text fields in the database of $postid to $title, $content, $tagstring, $notify and $name, and record that
-	$lastuserid did it from $lastip (if at least one is specified) with $updatetype. or backwards compatibility if $name
+	$lastuserid did it from $lastip (if at least one is specified) with $updatetype. For backwards compatibility if $name
 	is null then the name will not be changed.
 */
 	{

qa-include/qa-htmLawed.php

 <?php
-trigger_error('File qa-htmLawed.php is deprecated; please use vendor/htmLawed.php instead.', E_USER_NOTICE);
+/**
+ * @deprecated This file is deprecated from Q2A 1.7; use vendor/htmLawed.php instead.
+ */
 
 /*
 htmLawed 1.1.14, 8 August 2012