cvs: bugtracker /includes functions.php /template/generic/report index.php report.php

bcarlyon Thu Jul 31 13:27:30 2008 UTC Modified files: /bugtracker/includes functions.php /bugtracker/template/generic/report index.php report.php Log: Sent reporting through the sanitzier http://cvs.php.net/viewvc.cgi/bugtracker/includes/functions.php?r1=1.14&r2=1.15&diff_format=u Index: bugtracker/includes/functions.php diff -u bugtracker/includes/functions.php:1.14 bugtracker/includes/functions.php:1.15 --- bugtracker/includes/functions.php:1.14 Thu Jul 31 13:11:04 2008 +++ bugtracker/includes/functions.php Thu Jul 31 13:27:30 2008 @@ -115,6 +115,7 @@ } else { + $replace = htmlentities($form_data[$ref], ENT_QUOTES, 'UTF-8'); if ($ref == 'form_error' && !empty($replace)) { //check for div @@ -123,6 +124,7 @@ $replace = '<div id="error">' . $replace . '</div>'; } } + $html = str_replace('{' . strtoupper($ref) . '}',$replace,$html); } } http://cvs.php.net/viewvc.cgi/bugtracker/template/generic/report/index.php?r1=1.7&r2=1.8&diff_format=u Index: bugtracker/template/generic/report/index.php diff -u bugtracker/template/generic/report/index.php:1.7 bugtracker/template/generic/report/index.php:1.8 --- bugtracker/template/generic/report/index.php:1.7 Thu Jul 31 13:11:05 2008 +++ bugtracker/template/generic/report/index.php Thu Jul 31 13:27:30 2008 @@ -17,6 +17,7 @@ $form_data['actual'] = isset($form_data['actual']) ? $form_data['actual'] : ''; $form_data['recap_error'] = isset($form_data['recap_error']) ? $form_data['recap_error'] : ''; $form_data['captcha'] = '';//to blank the template varible :-) +$form_data['form_error'] = isset($form_data['form_error']) ? $form_data['form_error'] : ''; foreach($form_data as $ref => $data) { @@ -40,16 +41,6 @@ } } -/* -$php_version = $cache->php_version; -unset($php_version[0]); -$bug_type = $cache->bug_type; -$os_version = $cache->os_version; - -$form_data['php_versions'] = cache_convert($php_version, 'select', $form_data['php_version']); -$form_data['bug_types'] = cache_convert($bug_type, 'select', $form_data['bug_type']); -$form_data['os_versions'] = cache_convert($os_version, 'select', $form_data['os_version']); -*/ $form_data['php_versions'] = $cache->convert('php_version', 'select', $form_data['php_version'], '1'); $form_data['bug_types'] = $cache->convert('bug_type', 'select', $form_data['bug_type']); $form_data['os_versions'] = $cache->convert('os_version', 'select', $form_data['os_version']); @@ -73,6 +64,8 @@ <strong>If you feel this bug concerns a security issue, eg a buffer overflow, weak encryption, etc, then email <script type="text/javascript" src="/elements/email.php?e=security"></script> who will assess the situation.</strong> <br /><br /> </p> + +{FORM_ERROR} '; //commence form http://cvs.php.net/viewvc.cgi/bugtracker/template/generic/report/report.php?r1=1.5&r2=1.6&diff_format=u Index: bugtracker/template/generic/report/report.php diff -u bugtracker/template/generic/report/report.php:1.5 bugtracker/template/generic/report/report.php:1.6 --- bugtracker/template/generic/report/report.php:1.5 Sat Jul 26 02:33:43 2008 +++ bugtracker/template/generic/report/report.php Thu Jul 31 13:27:30 2008 @@ -88,6 +88,7 @@ if ($errors) { + $form_data['form_error']= 'Please correct the errors shown'; $content .= '<h2>Errors</h2>'; include($_SERVER['DOCUMENT_ROOT'] . '../template/generic/report/index.php'); }