Changeset 167 for trunk

Timestamp:

04/23/2006 12:54:45 AM (6 years ago)

Author:

Winner

Message:

Bug fix: SET NAMES executes after load_info() in userdata. (workaround found)
Bug fix: Node contact e-mail sent without checking if logged in.
Bug fix: Node contact e-mail owner only option now is working.

Location:

trunk/includes

Files:

• main.php (modified) (1 diff)
• pages/nodes/nodes_contact.php (modified) (2 diffs)

trunk/includes/main.php

@@ -53 +53 @@
                 if (get('session_lang') != '') $_SESSION['lang'] = get('session_lang');
                 language_set($this->userdata->info['language']);
+                // Reload user info from database using SET NAMES (workaround)
+                $this->userdata->load_info();
                 
                 $this->html->head->add_title($lang['site_title']);

trunk/includes/pages/nodes/nodes_contact.php

@@ -38 +38 @@
 
         function output() {
-                if ($_SERVER['REQUEST_METHOD'] == 'POST' && method_exists($this, 'output_onpost_'.$_POST['form_name'])) return call_user_func(array($this, 'output_onpost_'.$_POST['form_name']));
                 global $construct, $db, $main;
                 $main->header->hide = TRUE;
                 $main->menu->hide = TRUE;
                 $main->footer->hide = TRUE;
+                if (!$main->userdata->logged) {
+                        $main->message->set_fromlang('error', 'not_logged_in');
+                        return;
+                }
+                if ($_SERVER['REQUEST_METHOD'] == 'POST' && method_exists($this, 'output_onpost_'.$_POST['form_name'])) return call_user_func(array($this, 'output_onpost_'.$_POST['form_name']));
                 $this->tpl['form_contact'] = $construct->form($this->form_contact(), __FILE__);
                 $t = $db->get('id, name', 'nodes', "id = ".intval(get('node')));
                 $this->tpl['node_name'] = $t[0]['name'];
                 $this->tpl['node_id'] = $t[0]['id'];
-                if (!$main->userdata->logged) {
-                        $main->message->set_fromlang('error', 'not_logged_in');
-                }
                 return template($this->tpl, __FILE__);
         }
@@ -59 +60 @@
                 $main->footer->hide = TRUE;
                 $from = $db->get('username, email', 'users', "id = '".$main->userdata->user."'");
-                $to_db = $db->get('email', 'users INNER JOIN users_nodes ON users_nodes.user_id = users.id', "users_nodes.node_id = ".intval(get('node')).($POST['email_to_type']=='owner'?" AND users_nodes.owner = 'Y'":""));
+                $to_db = $db->get('email', 'users INNER JOIN users_nodes ON users_nodes.user_id = users.id', "users_nodes.node_id = ".intval(get('node')).($_POST['email_to_type']=='owner'?" AND users_nodes.owner = 'Y'":""));
                 $node = $db->get('name, id', 'nodes', "id = ".intval(get('node')));
                 $to = array();