? cck-php-227951-1.patch
? cck_php_1st_pass.patch
? cck_problem_post.patch
? cck_xss_php_1st_pass.patch
Index: content.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/cck/content.module,v
retrieving revision 1.301
diff -u -p -r1.301 content.module
--- content.module	3 Jun 2008 12:52:23 -0000	1.301
+++ content.module	12 Jun 2008 18:01:22 -0000
@@ -86,6 +86,13 @@ function content_init() {
 }
 
 /**
+ * Implementation of hook_perm().
+ */
+function content_perm() {
+  return array('Use dangerous PHP for CCK default and allowed values');
+}
+
+/**
  * Flag / unflag the menus for rebuilding, or read the current
  * value of the flag.
  *
Index: includes/content.admin.inc
===================================================================
RCS file: /cvs/drupal/contributions/modules/cck/includes/content.admin.inc,v
retrieving revision 1.181
diff -u -p -r1.181 content.admin.inc
--- includes/content.admin.inc	3 Jun 2008 12:25:44 -0000	1.181
+++ includes/content.admin.inc	12 Jun 2008 18:01:23 -0000
@@ -895,6 +895,7 @@ function _content_admin_field(&$form_sta
     $form['widget']['default_value_fieldset']['advanced_options']['default_value_php'] = array(
       '#type' => 'textarea',
       '#title' => t('Code'),
+      '#access' => user_access('Use dangerous PHP for CCK default and allowed values'),
       '#default_value' => isset($field['widget']['default_value_php']) ? $field['widget']['default_value_php'] : '',
       '#rows' => 6,
       '#tree' => TRUE,
@@ -903,6 +904,13 @@ function _content_admin_field(&$form_sta
         '!link_devel' => l('devel.module', 'http://www.drupal.org/project/devel'),
         '%type' => $type_name)),
     );
+    $form['widget']['default_value_fieldset']['advanced_options']['markup_default_value_php'] = array(
+      '#type' => 'item',
+      '#title' => t('Code'),
+      '#access' => !user_access('Use dangerous PHP for CCK default and allowed values'),
+      '#value' => isset($field['widget']['default_value_php']) ? '<code>'. check_plain($field['widget']['default_value_php']) .'</code>' : t('<none>'),
+      '#description' => t('This PHP code was set by an administrator and may override other values.')
+      );
   }
 
   $form['field'] = array(
Index: modules/text/text.module
===================================================================
RCS file: /cvs/drupal/contributions/modules/cck/modules/text/text.module,v
retrieving revision 1.95
diff -u -p -r1.95 text.module
--- modules/text/text.module	1 Jun 2008 21:59:56 -0000	1.95
+++ modules/text/text.module	12 Jun 2008 18:01:23 -0000
@@ -100,10 +100,18 @@ function text_field_settings($op, $field
       $form['allowed_values_fieldset']['advanced_options']['allowed_values_php'] = array(
         '#type' => 'textarea',
         '#title' => t('Code'),
+        '#access' => user_access('Use dangerous PHP for CCK default and allowed values'),
         '#default_value' => !empty($field['allowed_values_php']) ? $field['allowed_values_php'] : '',
         '#rows' => 6,
         '#description' => t('Advanced usage only: PHP code that returns a keyed array of allowed values. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the array returned by this code will override the allowed values list above.'),
       );
+      $form['allowed_values_fieldset']['advanced_options']['markup_allowed_values_php'] = array(
+        '#type' => 'item',
+        '#title' => t('Code'),
+        '#access' => !user_access('Use dangerous PHP for CCK default and allowed values'),
+        '#value' => !empty($field['allowed_values_php']) ? '<code>'. check_plain($field['allowed_values_php']) .'</code>' : t('<none>'),
+        '#description' => t('This PHP code was set by an administrator and may override other values.')
+      );
       return $form;
 
     case 'save':