[gentoo-commits] gentoo-projects commit in forums/htdocs/includes: db.php functions_post.php usercp_register.php

[gentoo-commits] gentoo-projects commit in forums/htdocs/includes: db.php functions_post.php usercp_register.php

[Tom Knight (tomk)]

tomk        11/06/23 10:33:45

  Modified:             db.php functions_post.php usercp_register.php
  Log:
  workaround for 'Could not obtain topic watch information' error

Revision  Changes    Path
1.3                  forums/htdocs/includes/db.php

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/db.php?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/db.php?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/db.php?r1=1.2&r2=1.3

Index: db.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/db.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- db.php	1 Nov 2005 12:00:03 -0000	1.2
+++ db.php	23 Jun 2011 10:33:45 -0000	1.3
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: db.php,v 1.2 2005/11/01 12:00:03 tomk Exp $
+ *   $Id: db.php,v 1.3 2011/06/23 10:33:45 tomk Exp $
  *
  *
  ***************************************************************************/
@@ -28,31 +28,31 @@
 switch($dbms)
 {
 	case 'mysql':
-		include($phpbb_root_path . 'db/mysql.'.$phpEx);
+		include_once($phpbb_root_path . 'db/mysql.'.$phpEx);
 		break;
 
 	case 'mysql4':
-		include($phpbb_root_path . 'db/mysql4.'.$phpEx);
+		include_once($phpbb_root_path . 'db/mysql4.'.$phpEx);
 		break;
 
 	case 'postgres':
-		include($phpbb_root_path . 'db/postgres7.'.$phpEx);
+		include_once($phpbb_root_path . 'db/postgres7.'.$phpEx);
 		break;
 
 	case 'mssql':
-		include($phpbb_root_path . 'db/mssql.'.$phpEx);
+		include_once($phpbb_root_path . 'db/mssql.'.$phpEx);
 		break;
 
 	case 'oracle':
-		include($phpbb_root_path . 'db/oracle.'.$phpEx);
+		include_once($phpbb_root_path . 'db/oracle.'.$phpEx);
 		break;
 
 	case 'msaccess':
-		include($phpbb_root_path . 'db/msaccess.'.$phpEx);
+		include_once($phpbb_root_path . 'db/msaccess.'.$phpEx);
 		break;
 
 	case 'mssql-odbc':
-		include($phpbb_root_path . 'db/mssql-odbc.'.$phpEx);
+		include_once($phpbb_root_path . 'db/mssql-odbc.'.$phpEx);
 		break;
 }
 



1.20                 forums/htdocs/includes/functions_post.php

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions_post.php?rev=1.20&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions_post.php?rev=1.20&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/functions_post.php?r1=1.19&r2=1.20

Index: functions_post.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/functions_post.php,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- functions_post.php	30 Oct 2006 22:46:13 -0000	1.19
+++ functions_post.php	23 Jun 2011 10:33:45 -0000	1.20
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: functions_post.php,v 1.19 2006/10/30 22:46:13 maedhros Exp $
+ *   $Id: functions_post.php,v 1.20 2011/06/23 10:33:45 tomk Exp $
  *
  *
  ***************************************************************************/
@@ -740,6 +740,13 @@
 					}
 				}
 			}
+			// 2011-06-23 tomk - workaround for "Could not obtain topic watch information" error
+			// the mail code seems to be taking too long causing the connection timeout to kick in so reconnect to DB
+			include($phpbb_root_path . 'config.'.$phpEx);
+			include($phpbb_root_path . 'includes/db.'.$phpEx);
+			// no longer needed
+			unset($dbpasswd);
+
 			$db->sql_freeresult($result);
 
 			if ($update_watched_sql != '')
@@ -784,6 +791,8 @@
 		}
 	}
 	
+	// TODO: do this if it's an edit too
+
 	// 2005-12-29 tomk - check user watches
 	if (($mode == 'reply' || $mode == 'newtopic') && $board_config['allow_notifications'])
 	{



1.39                 forums/htdocs/includes/usercp_register.php

file : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/usercp_register.php?rev=1.39&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/usercp_register.php?rev=1.39&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-projects/forums/htdocs/includes/usercp_register.php?r1=1.38&r2=1.39

Index: usercp_register.php
===================================================================
RCS file: /var/cvsroot/gentoo-projects/forums/htdocs/includes/usercp_register.php,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- usercp_register.php	20 Feb 2011 12:58:50 -0000	1.38
+++ usercp_register.php	23 Jun 2011 10:33:45 -0000	1.39
@@ -6,7 +6,7 @@
  *   copyright            : (C) 2001 The phpBB Group
  *   email                : support@phpbb.com
  *
- *   $Id: usercp_register.php,v 1.38 2011/02/20 12:58:50 tomk Exp $
+ *   $Id: usercp_register.php,v 1.39 2011/06/23 10:33:45 tomk Exp $
  *
  *
  ***************************************************************************/
@@ -791,6 +791,13 @@
 						$emailer->send();
 						$emailer->reset();
 
+						// 2011-06-23 tomk - workaround for "Could not obtain topic watch information" error
+						// the mail code seems to be taking too long causing the connection timeout to kick in so reconnect to DB
+						include($phpbb_root_path . 'config.'.$phpEx);
+						include($phpbb_root_path . 'includes/db.'.$phpEx);
+						// no longer needed
+						unset($dbpasswd);
+
 						// update last_spammer_email
 						$sql = "UPDATE " . CONFIG_TABLE  . "
 								SET config_value = " . $now . "