--- cck_private_fields/includes/node_form.inc	2009-11-02 15:01:04.000000000 +0800
+++ jact/cck_private_fields/includes/node_form.inc	2010-11-22 13:22:02.000000000 +0800
@@ -24,35 +24,35 @@
 
   // Configure privacy options for fields in this node form.
   $privacy_status_options = array(
-    CCK_FIELDS_PRIVACY_STATUS_PUBLIC => array(
+    CCK_FIELDS_PRIVACY_STATUS_PUBLIC => t('Public'),/*array(
       'name' => t('Public'),
       'class' => 'cck-private-field-status-icon-public',
       'label' => t('Public - visible to everyone.'),
-    ),
-    CCK_FIELDS_PRIVACY_STATUS_HIDDEN => array(
+    ),*/
+    CCK_FIELDS_PRIVACY_STATUS_HIDDEN => t('Hidden'),/*array(
       'name' => t('Hidden'),
       'class' => 'cck-private-field-status-icon-hidden',
       'label' => t('Hidden - visible to you, hidden from everyone else.'),
-    ),
+    ),*/
   );
 
   // Enable 'Private' option, only if supported.
   if (cck_private_fields_get_private_field_access_module()) {
-    $privacy_status_options[CCK_FIELDS_PRIVACY_STATUS_PRIVATE] = array(
+    $privacy_status_options[CCK_FIELDS_PRIVACY_STATUS_PRIVATE] = t('Private'); /*array(
       'name' => t('Private'),
       'class' => 'cck-private-field-status-icon-private',
       'label' => t('Private - visible to you and your friends.'),
-    );
+    );*/
   }
 
   // Make sure Drupal settings are not sent more than once per page.
-  if (!isset($js_settings_processed)) {
+  /*if (!isset($js_settings_processed)) {
     $js_settings = array(
       'privacyStatusOptions' => $privacy_status_options,
       'privacyStatusForm' => drupal_get_form('cck_private_field_privacy_settings_dialog', $privacy_status_options),
       'privateFields' => array(),
     );
-  }
+  }*/
 
   // Grab information about the fields we are interested in.
   $type_name = $form['type']['#value'];
@@ -104,21 +104,20 @@
     '#tree' => TRUE,
     '#weight' => 100,
   );
-
   // Scan the form recursively to find fields with privacy options enabled.
-  _cck_private_fields_node_form_recursive($form, $form, $form_state);
-
+  _cck_private_fields_node_form_recursive($form, $form, $form_state, $privacy_status_options);
+  
   // Send our javascript and stylesheets to the page.
-  $module_path = drupal_get_path('module', 'cck_private_fields');
-  drupal_add_css($module_path .'/css/privacy_status_dialog.css');
-  drupal_add_js($module_path .'/js/privacy_status_dialog.js');
-  jquery_ui_add(array('ui.dialog', 'ui.draggable'));
+  //$module_path = drupal_get_path('module', 'cck_private_fields');
+  //drupal_add_css($module_path .'/css/privacy_status_dialog.css');
+  //drupal_add_js($module_path .'/js/privacy_status_dialog.js');
+  //jquery_ui_add(array('ui.dialog', 'ui.draggable'));
 
   // Make sure Drupal settings are not sent more than once per page.
-  if (!isset($js_settings_processed)) {
+  /*if (!isset($js_settings_processed)) {
     drupal_add_js(array('CCKPrivateFields' => $js_settings), 'setting');
     $js_settings_processed = TRUE;
-  }
+  }*/
 }
 
 /**
@@ -135,7 +134,7 @@
  * @see node_save()
  * @see cck_private_fields_nodeapi()
  */
-function _cck_private_fields_node_form_recursive(&$form, &$elements, &$form_state) {
+function _cck_private_fields_node_form_recursive(&$form, &$elements, &$form_state, $privacy_status_options) {
   foreach (element_children($elements) as $field_name) {
     if (isset($elements[$field_name]) && $elements[$field_name]) {
 
@@ -178,7 +177,9 @@
         else {
           // Send the privacy status for this field as a hidden form element.
           $form['cck_private_fields'][$field_name] = array(
-            '#type' => 'hidden',
+            //'#type' => 'hidden',
+            '#type' => 'select',
+            '#options' => $privacy_status_options,
             '#default_value' => $field_privacy_status,
           );
 
@@ -208,7 +209,7 @@
       }
       else {
         // Recurse through all children elements.
-        _cck_private_fields_node_form_recursive($form, $elements[$field_name], $form_state);
+        _cck_private_fields_node_form_recursive($form, $elements[$field_name], $form_state, $privacy_status_options);
       }
     }
   }
@@ -219,7 +220,7 @@
  *
  * This form is processed client-side.
  */
-function cck_private_field_privacy_settings_dialog(&$form_state, $privacy_status_options) {
+/*function cck_private_field_privacy_settings_dialog(&$form_state, $privacy_status_options) {
   $form = array(
     '#method' => 'get',
   );
@@ -251,4 +252,4 @@
     '#weight' => 10,
   );
   return $form;
-}
+}*/