Index: index.php =================================================================== RCS file: /cvsroot/phpgroupware/fudforum/index.php,v retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1.2.1 index.php --- index.php 27 Feb 2004 03:35:02 -0000 1.1.1.1.2.1 +++ index.php 16 Mar 2004 08:59:00 -0000 @@ -211,7 +211,7 @@ $login = $GLOBALS['phpgw']->db->db_addslashes($row['account_lid']); $users_opt = 2|4|16|32|64|128|256|512|2048|4096|8192|16384|131072|4194304; if ($row['account_status'] != 'A') { - $user_opts |= 2097152; + $users_opt |= 2097152; } $GLOBALS['phpgw']->db->query("INSERT INTO phpgw_fud_users (last_visit, join_date, theme, alias, login, email, passwd, name, users_opt, phpgw_id) VALUES(".time().", ".time().", {$theme}, '{$alias}', '{$login}', '{$email}', '{$row['account_pwd']}', '{$name}', {$users_opt}, {$phpgw_id})"); } Index: inc/class.ufud.inc.php =================================================================== RCS file: /cvsroot/phpgroupware/fudforum/inc/class.ufud.inc.php,v retrieving revision 1.1.1.1.2.2 diff -u -r1.1.1.1.2.2 class.ufud.inc.php --- inc/class.ufud.inc.php 9 Mar 2004 14:32:45 -0000 1.1.1.1.2.2 +++ inc/class.ufud.inc.php 16 Mar 2004 08:59:00 -0000 @@ -42,7 +42,7 @@ $login = addslashes($row['account_lid']); $users_opt = 2|4|16|32|64|128|256|512|2048|4096|8192|16384|131072|4194304; if ($row['account_status'] != 'A') { - $user_opts |= 2097152; + $users_opt |= 2097152; } } else Index: setup/index.php =================================================================== RCS file: /cvsroot/phpgroupware/fudforum/setup/index.php,v retrieving revision 1.1.1.1.2.1 diff -u -r1.1.1.1.2.1 index.php --- setup/index.php 27 Feb 2004 03:35:02 -0000 1.1.1.1.2.1 +++ setup/index.php 16 Mar 2004 08:59:00 -0000 @@ -211,7 +211,7 @@ $login = $GLOBALS['phpgw']->db->db_addslashes($row['account_lid']); $users_opt = 2|4|16|32|64|128|256|512|2048|4096|8192|16384|131072|4194304; if ($row['account_status'] != 'A') { - $user_opts |= 2097152; + $users_opt |= 2097152; } $GLOBALS['phpgw']->db->query("INSERT INTO phpgw_fud_users (last_visit, join_date, theme, alias, login, email, passwd, name, users_opt, phpgw_id) VALUES(".time().", ".time().", {$theme}, '{$alias}', '{$login}', '{$email}', '{$row['account_pwd']}', '{$name}', {$users_opt}, {$phpgw_id})"); } Index: setup/base/include/core.inc =================================================================== RCS file: /cvsroot/phpgroupware/fudforum/setup/base/include/core.inc,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 core.inc --- setup/base/include/core.inc 1 Nov 2003 22:58:45 -0000 1.1.1.1 +++ setup/base/include/core.inc 16 Mar 2004 08:59:00 -0000 @@ -42,8 +42,8 @@ if (@count($_POST)) { array_walk($_POST, 'strip_quotes'); } - if (@count($_COOKIES)) { - array_walk($_COOKIES, 'strip_quotes'); + if (@count($_COOKIE)) { + array_walk($_COOKIE, 'strip_quotes'); } if (@count($_FILES)) { array_walk($_FILES, 'strip_quotes'); Index: setup/base/include/nntp.inc =================================================================== RCS file: /cvsroot/phpgroupware/fudforum/setup/base/include/nntp.inc,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 nntp.inc --- setup/base/include/nntp.inc 1 Nov 2003 22:58:46 -0000 1.1.1.1 +++ setup/base/include/nntp.inc 16 Mar 2004 08:59:00 -0000 @@ -44,7 +44,6 @@ switch ($this->cmd('AUTHINFO user '.$this->user, false)) { case 281: return true; - break 2; case 381: if ($this->cmd('AUTHINFO pass '.$this->pass, false) != 281) { $this->error = "Authentication failed\n"; @@ -52,10 +51,8 @@ } else { return true; } - break; default: return false; - break; } } else if (!($this->nntp_opt & 64)) { if ($this->cmd('AUTHINFO SIMPLE', false) != 350) { @@ -411,7 +414,7 @@ // Handle File Attachments if (isset($this->attachments) && is_array($this->attachments)) { foreach($this->attachments as $key => $val) { - if (!($nntp_adm->nntp_opt & 8) && (strlen($val) > $frm->max_attach_size || (isset($attach_list) && count($attach_list) > $frm->max_file_attachments) || filter_ext($key))) { + if (!($nntp_adm->nntp_opt & 8) && ((strlen($val) > $frm->max_attach_size) || (isset($attach_list) && (count($attach_list) > $frm->max_file_attachments)) || filter_ext($key))) { continue; } Index: setup/base/include/scripts_common.inc =================================================================== RCS file: /cvsroot/phpgroupware/fudforum/setup/base/include/scripts_common.inc,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 scripts_common.inc --- setup/base/include/scripts_common.inc 1 Nov 2003 22:58:46 -0000 1.1.1.1 +++ setup/base/include/scripts_common.inc 16 Mar 2004 08:59:00 -0000 @@ -65,13 +67,10 @@ case 'quoted-printable': // Remove soft line breaks & decode return quoted_printable_decode(preg_replace("!=\r?\n!", '', $str)); - break; case 'base64': return base64_decode($str); - break; default: return $str; - break; } } Index: setup/base/www_root/adm/admcat.php =================================================================== RCS file: /cvsroot/phpgroupware/fudforum/setup/base/www_root/adm/admcat.php,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 admcat.php --- setup/base/www_root/adm/admcat.php 1 Nov 2003 22:58:39 -0000 1.1.1.1 +++ setup/base/www_root/adm/admcat.php 16 Mar 2004 08:59:02 -0000 @@ -10,6 +10,8 @@ * (at your option) any later version. ***************************************************************************/ +// $cat_description,$cat_name are undefined - incoming from FORM + require('./GLOBALS.php'); fud_phpgw(); fud_use('adm.inc', true); Index: setup/base/www_root/adm/admforum.php =================================================================== RCS file: /cvsroot/phpgroupware/fudforum/setup/base/www_root/adm/admforum.php,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 admforum.php --- setup/base/www_root/adm/admforum.php 1 Nov 2003 22:58:40 -0000 1.1.1.1 +++ setup/base/www_root/adm/admforum.php 16 Mar 2004 08:59:02 -0000 @@ -10,6 +10,8 @@ * (at your option) any later version. ***************************************************************************/ +// $frm_name, $frm_descr, $frm_post_passwds, $frm_forum_icon is undefined; incoming from FORM + function get_max_upload_size() { $us = strtolower(ini_get('upload_max_filesize')); Index: setup/base/www_root/adm/admglobal.php =================================================================== RCS file: /cvsroot/phpgroupware/fudforum/setup/base/www_root/adm/admglobal.php,v retrieving revision 1.1.1.1 diff -u -r1.1.1.1 admglobal.php --- setup/base/www_root/adm/admglobal.php 1 Nov 2003 22:58:40 -0000 1.1.1.1 +++ setup/base/www_root/adm/admglobal.php 16 Mar 2004 08:59:02 -0000 @@ -224,7 +224,7 @@ print_reg_field('Flood Trigger (seconds)', 'FLOOD_CHECK_TIME', 1); print_reg_field('Moved Topic Pointer Expiry', 'MOVED_THR_PTR_EXPIRY', 1); ?> -