--- creativecommons.module.org	2009-11-10 04:29:31.000000000 -0700
+++ creativecommons.module	2010-05-02 20:44:00.000000000 -0600
@@ -40,7 +40,7 @@ require_once 'creativecommons.actions.in
  * Implementation of hook_perm().
  */
 function creativecommons_perm() {
-  return array('administer creative commons', 'attach creative commons');
+  return array('administer creative commons', 'attach creative commons', 'set own creative commons default');
 }
 
 
@@ -239,6 +239,14 @@ function creativecommons_settings() {
     '#default_value' => variable_get('creativecommons_node_license_redundant_display', TRUE),
     '#description' => t('Note: if not displayed, node specific metadata won\'t be displayed either.'),
   );
+  
+  $form['creativecommons_advanced']['creativecommons_user_message'] = array(
+    '#type' => 'textarea',
+    '#title' => t('Custom Message'),
+    '#rows' => 10,
+    '#default_value' => variable_get('creativecommons_user_message', ''),
+    '#description' => t('Cusomize the message displayed to users when adding a license.  HTML allowed.  This message overrides both the main message and the public domain message when public domain is enabled'),
+  );
   }
   return system_settings_form($form);
 
@@ -1730,12 +1738,17 @@ function creativecommons_node_form($node
     '@think-about-url' => 'http://creativecommons.org/about/think',
   );
 
-  // Creative Commons license description
-  $description = '<p>'. t('With a Creative Commons license, <em>you keep your	copyright</em> but allow people to <a href="@about-licenses-url">copy and distribute your work</a> provided they <a href="@attribution-wiki-url">give you credit</a> -- and only on the conditions you specify here. For those new to Creative Commons licensing, visit the website for <a href="@think-about-url">a list of things to think about</a>.', $description_args) .'</p>';
-
-  // Public Domain tools description
-  $description .= '<p>'. t('If you want to offer your work with no conditions or you want to certify a work as public domain, choose one of the <a href="@public-domain-url">public domain tools</a>.', array('@public-domain-url' => 'http://creativecommons.org/publicdomain/')) .'</p>';
+  if(variable_get('creativecommons_user_message', '')){
+  // Custom Creative Commons license description
+   $description = variable_get('creativecommons_user_message', '');
+  }
+  else {
+    // Creative Commons license description
+    $description = '<p>'. t('With a Creative Commons license, <em>you keep your	copyright</em> but allow people to <a href="@about-licenses-url">copy and distribute your work</a> provided they <a href="@attribution-wiki-url">give you credit</a> -- and only on the conditions you specify here. For those new to Creative Commons licensing, visit the website for <a href="@think-about-url">a list of things to think about</a>.', $description_args) .'</p>';
 
+    // Public Domain tools description
+    $description .= '<p>'. t('If you want to offer your work with no conditions or you want to certify a work as public domain, choose one of the <a href="@public-domain-url">public domain tools</a>.', array('@public-domain-url' => 'http://creativecommons.org/publicdomain/')) .'</p>';
+  }
 
   // required metadata
   $required_metadata = variable_get('creativecommons_required_metadata', array());
@@ -1921,6 +1934,7 @@ function creativecommons_count_by_licens
 function creativecommons_user($op, &$edit, &$account, $category = NULL) {
   switch ($op) {
     case 'view':
+      
       $site_license = creativecommons_get_default_license();
       $account->content['creativecommons'] = array(
         '#type' => 'user_profile_category',
@@ -1964,6 +1978,7 @@ function creativecommons_user($op, &$edi
 
       return $account;
     case 'form':
+      if(user_access('set own creative commons default')){
       $site_license = creativecommons_get_default_license();
       $available_license_types = creativecommons_get_available_license_list(NULL, TRUE);
 
@@ -2017,7 +2032,7 @@ function creativecommons_user($op, &$edi
         }
       }
       return $form;
-
+      }
     case 'update':
     case 'insert':
       // Delete old entry from database