Changeset 5388

Timestamp:

09/13/11 13:32:17 (21 months ago)

Author:

naudefj

Message:

Fix error: fud_smtp.inc missing when approving users and SMTP server is configured.

Location:

trunk/install

Files:

• forum_data/include/core.inc (modified) (1 diff)
• www_root/adm/admuserapr.php (modified) (4 diffs)

trunk/install/forum_data/include/core.inc

@@ -85 +85 @@
 /** Auto load a class. */
 function __autoload( $className ) {
-        require_once($GLOBALS['INCLUDE'] . $className .'.inc');
+        $inc = $GLOBALS['INCLUDE'] . $className .'.inc';
+        if (file_exists($inc)) {
+                require_once($inc);
+        }
 }
 

trunk/install/www_root/adm/admuserapr.php

@@ -1 +1 @@
 <?php
 /**
-* copyright            : (C) 2001-2010 Advanced Internet Designs Inc.
+* copyright            : (C) 2001-2011 Advanced Internet Designs Inc.
 * email                : forum@prohost.org
 * $Id$
@@ -10 +10 @@
 **/
 
+/** Print a user property if it has a value. */
+function print_if_avail($descr, $value, $no_html=1)
+{
+        if (!empty($value)) {
+                if ($no_html) {
+                        $value = htmlspecialchars($value);
+                }
+                return '<tr><td>'. $descr .':</td><td>'. $value .'</td></tr>';
+        }
+}
+
+/* main */
         require('./GLOBALS.php');
         fud_use('adm.inc', true);
         fud_use('users_adm.inc', true);
+
+        require($WWW_ROOT_DISK .'adm/header.php');
 
         if (isset($_GET['apr'])) {
@@ -18 +32 @@
                         fud_use('adm_acc.inc');
                         fud_use('iemail.inc');
-                        q('UPDATE '. $DBHOST_TBL_PREFIX .'users SET users_opt='. q_bitand(users_opt, ~2097152) .' WHERE id='. (int)$_GET['apr']);
+                        q('UPDATE '. $DBHOST_TBL_PREFIX .'users SET users_opt='. q_bitand('users_opt', ~2097152) .' WHERE id='. (int)$_GET['apr']);
                         send_email($NOTIFY_FROM, $r->email, $account_accepted_s, $account_accepted);
                 }
@@ -29 +43 @@
                 }
         }
-
-function print_if_avail($descr, $value, $no_html=1)
-{
-        if (!empty($value)) {
-                if ($no_html) {
-                        $value = htmlspecialchars($value);
-                }
-                return '<tr><td>'. $descr .':</td><td>'. $value .'</td></tr>';
-        }
-}
-
-        require($WWW_ROOT_DISK .'adm/header.php');
 ?>
 <h2>Account Approval</h2>