cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor security update, adjust my patches

Browse Source
This commit is contained in:
espie 2009-10-23 10:18:35 +00:00
parent fab88b2db6
commit ab14a17d91
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/drupal6/webform/Makefile
View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.5 2009/10/10 10:48:17 espie Exp $
# $OpenBSD: Makefile,v 1.6 2009/10/23 10:18:35 espie Exp $
COMMENT = webform
DISTNAME = webform-6.x-2.7
PKGNAME = drupal6-webform-2.7p1
DISTNAME = webform-6.x-2.8
PKGNAME = drupal6-webform-2.8
.include <bsd.port.mk>

10
www/drupal6/webform/distinfo
View File

@ -1,5 +1,5 @@
MD5 (drupal6/webform-6.x-2.7.tar.gz) = e9FjTsHkrCOTy9p/ovxu7A==
RMD160 (drupal6/webform-6.x-2.7.tar.gz) = CGMWaQPuVnvtJkbiFRCg4rDYQH4=
SHA1 (drupal6/webform-6.x-2.7.tar.gz) = D77kjxjubSwBlEizYan2XJ8iI0Y=
SHA256 (drupal6/webform-6.x-2.7.tar.gz) = xICMI3dEN4D1PYKMa32K3bJ3e0ywGdXif08LWlNQjvQ=
SIZE (drupal6/webform-6.x-2.7.tar.gz) = 254954
MD5 (drupal6/webform-6.x-2.8.tar.gz) = yQgwah7w7m2SlPeHd3WxdQ==
RMD160 (drupal6/webform-6.x-2.8.tar.gz) = YLjfAf5ddqgQgrDRSq1Tp4ev3JM=
SHA1 (drupal6/webform-6.x-2.8.tar.gz) = w3uipP/H1lYjLKQdk79mZUJhSMw=
SHA256 (drupal6/webform-6.x-2.8.tar.gz) = vdP32oCu/3Mk996i7Hrwkp3Dvk5lvDc4LxudKXdQwmw=
SIZE (drupal6/webform-6.x-2.8.tar.gz) = 265930

32
www/drupal6/webform/patches/patch-webform_module
View File

@ -1,6 +1,6 @@
$OpenBSD: patch-webform_module,v 1.2 2009/10/10 10:48:17 espie Exp $
--- webform.module.orig Fri Feb 27 23:35:15 2009
+++ webform.module Sat Oct 10 12:32:16 2009
$OpenBSD: patch-webform_module,v 1.3 2009/10/23 10:18:35 espie Exp $
--- webform.module.orig Thu Oct 15 03:26:46 2009
+++ webform.module Fri Oct 23 12:17:56 2009
@@ -249,6 +249,17 @@ function webform_menu() {
'weight' => 2,
'type' => MENU_LOCAL_TASK,
@ -19,22 +19,22 @@ $OpenBSD: patch-webform_module,v 1.2 2009/10/10 10:48:17 espie Exp $
return $items;
}
@@ -2099,6 +2110,7 @@ function theme_webform_mail_headers($form_values, $nod
@@ -2117,6 +2128,7 @@ function theme_webform_mail_headers($form_values, $nod
*/
function _webform_filter_values($string, $node = NULL, $submission = NULL, $strict = TRUE) {
function _webform_filter_values($string, $node = NULL, $submission = NULL, $strict = TRUE, $allow_anonymous = FALSE) {
global $user;
+ global $webform_uid_cached;
static $replacements;
// Setup default token replacements.
$find = array('%site', '%date');
@@ -2123,8 +2135,9 @@ function _webform_filter_values($string, $node = NULL,
$find[] = '%useremail';
$replace[] = isset($user->name) ? $user->name : '';
$replace[] = isset($user->mail) ? $user->mail : '';
- if ($user->uid && module_exists('profile')) {
+ if ($user->uid && module_exists('profile') && $webform_uid_cached != $user->uid) {
profile_load_profile($user);
+ $webform_uid_cached = $user->uid;
}
@@ -2157,8 +2169,9 @@ function _webform_filter_values($string, $node = NULL,
$replacements['unsafe']['%username'] = isset($user->name) ? $user->name : '';
$replacements['unsafe']['%useremail'] = isset($user->mail) ? $user->mail : '';
$replacements['unsafe']['%ip_address'] = ip_address();
- if ($user->uid && module_exists('profile')) {
+ if ($user->uid && module_exists('profile') && $webform_uid_cached != $user->uid) {
profile_load_profile($user);
+ $webform_uid_cached = $user->uid;
}
$special_tokens['unsafe']['%profile'] = $user;
// Provide a list of candidates for token replacement.