=== modified file 'role_expire/role_expire.rules.inc'
--- old/role_expire/role_expire.rules.inc	2012-01-08 05:49:21 +0000
+++ new/role_expire/role_expire.rules.inc	2012-01-19 04:50:15 +0000
@@ -10,28 +10,86 @@
  */
 function role_expire_rules_action_info() {
   $items['role_expire_rules_action_set_role_expire'] = array(
-    'label' => t('Add expire time to role'),
+    'label' => t('Set expire time for role'),
+    'group' => t('Role Expire'),
     'help' => t('Add an expiration time to a role a user has. This action does not add the role, only the expiration time.'),
-    'arguments' => array(
-      'user' => array(
-        'type' => 'user',
-        'label' => t('The user which the expiration time will be added'),
-      ),
-    ),
-    'eval input' => array('timestamp'),
-    'module' => 'Role expire',
-  );
-
+    'parameter' => array(
+      'user' => array(
+        'type' => 'user',
+        'label' => t('User'),
+        'description' => t('The user which the expiration time will be added'),
+      ),
+      'role' => array(
+        'type' => 'integer',
+        'label' => t('Role'),
+        'options list' => 'rules_user_roles_options_list',
+      ),
+      'timestamp' => array(
+        'type' => 'date',
+        'label' => t('Expiration'),
+        'description' => t('The expiration time to be added'),
+      ),
+    ),
+    'module' => 'role_expire',
+  );
+  $items['role_expire_rules_action_set_role_expire_to_longest'] = array(
+    'label' => t('Set expire time to longest for this user'),
+    'group' => t('Role Expire'),
+    'help' => t('Set an expiration time to the longest attached to a role this user has. This action does not add the role, but only sets the expiration time.'),
+    'parameter' => array(
+      'user' => array(
+        'type' => 'user',
+        'label' => t('User'),
+        'description' => t('The user for which the expiration time will be set'),
+      ),
+      'role' => array(
+        'type' => 'integer',
+        'label' => t('Role'),
+        'options list' => 'rules_user_roles_options_list',
+      ),
+    ),
+    'module' => 'role_expire',
+  );
+  $items['role_expire_rules_action_extend_role_expire'] = array(
+    'label' => t('Extend expire time for role'),
+    'group' => t('Role Expire'),
+    'help' => t('Extend the expiration time for a role a user has. This action does not add the role, it only extends the expiration time. If no time was set, the current time when the action fires is used as a base.'),
+    'parameter' => array(
+      'user' => array(
+        'type' => 'user',
+        'label' => t('User'),
+        'description' => t('The user which the expiration time will be added'),
+      ),
+      'role' => array(
+        'type' => 'integer',
+        'label' => t('Role'),
+        'options list' => 'rules_user_roles_options_list',
+      ),
+      'timestamp' => array(
+        'type' => 'date',
+        'label' => t('Expiration'),
+        'description' => t('The relative amount of time to be added.'),
+      ),
+    ),
+    'module' => 'role_expire',
+  );
   $items['role_expire_rules_action_remove_role_expire'] = array(
     'label' => t('Remove expire time from role'),
+    'group' => t('Role Expire'),
     'help' => t('Remove an expiration time to a role a user has. This action does not remove the role, only the expiration time.'),
-    'arguments' => array(
+    'parameter' => array(
       'user' => array(
         'type' => 'user',
-        'label' => t('The user which the expiration time will be removed'),
+        'label' => t('User'),
+        'description' => t('The user from which the expiration time will be removed'),
+      ),
+      'role' => array(
+        'type' => 'integer',
+        'label' => t('Role'),
+        'options list' => 'rules_user_roles_options_list',
       ),
     ),
-    'module' => 'Role expire',
+    'module' => 'role_expire',
   );
 
   return $items;
@@ -40,63 +98,49 @@
 /**
  * Action: Add expire time to role.
  */
-function role_expire_rules_action_set_role_expire($account, $settings) {
-  role_expire_write_record($account->uid, $settings['rid'], strtotime($settings['timestamp']));
-}
-
-/**
- * Action: Add expire time to role form configuration.
- */
-function role_expire_rules_action_set_role_expire_form($settings = array(), &$form) {
-  $settings += array('rid' => '', 'timestamp' => '');
-
-
-  // The role ID.
-  $form['settings']['rid'] = _role_expire_get_rids($settings);
-
-  //The timestamp.
-  $form['settings']['timestamp'] = array(
-    '#type' => 'textfield',
-    '#title' => t('Expiration time'),
-    '#required' => TRUE,
-    '#description' => t('Enter the time the role will expire. Enter date and time in format: <em>dd-mm-yyyy hh:mm:ss</em> or use relative time i.e. now, 1 day, 2 months, 1 year, 3 years.'),
-    '#default_value' => $settings['timestamp'],
-  );
+function role_expire_rules_action_set_role_expire($account, $rid, $timestamp) {
+  role_expire_write_record($account->uid, $rid, $timestamp);
+}
+
+/**
+ * Action: Set expire time for role to longest attached to this user. Defaults 
+ * to the current time.
+ */
+function role_expire_rules_action_set_role_expire_to_longest($account, $rid, $timestamp) {
+  // Set an invalid timestamp to allow for comparisons without warnings.
+  $timestamp = -1;
+  foreach($account->roles as $id => $name) {
+    $this_ts = role_expire_get_user_role_expiry_time($account->uid, $id);    
+    if (!empty($this_ts)) {
+      $timestamp = ($this_ts > $timestamp) ? $this_ts : $timestamp;
+    }
+  }
+  // If there were no valid timestamps for comparison, use the current time.
+  if ($timestamp == -1) {
+    $timestamp = time();
+  }
+  role_expire_write_record($account->uid, $rid, $timestamp);
+}
+
+/**
+ * Action: Extend expire time for role. Defaults to the current time.
+ */
+function role_expire_rules_action_extend_role_expire($account, $rid, $extend) {
+  $now = time();
+
+  // $extend comes in as relative to now. We just want the difference.
+  $diff = $extend - $now;
+
+  $timestamp = role_expire_get_user_role_expiry_time($account->uid, $rid);
+  $base = (!empty($timestamp)) ? $timestamp : time();
+  $new_ts = $base + $diff;
+
+  role_expire_write_record($account->uid, $rid, $new_ts);
 }
 
 /**
  * Action: Remove expire time from role
  */
-function role_expire_rules_action_remove_role_expire($account, $settings) {
-  role_expire_delete_record($account->uid, $settings['rid']);
-}
-
-/**
- * Action: Add expire time to role form configuration.
- */
-function role_expire_rules_action_remove_role_expire_form($settings = array(), &$form) {
-  $settings += array('rid' => '');
-
-  // The role ID.
-  $form['settings']['rid'] = _role_expire_get_rids($settings);
-}
-
-
-/**
- * Helper function; Return a form element with the valid roles.
- * @return unknown_type
- */
-function _role_expire_get_rids($settings) {
-  // Get valid roles.
-  $roles = user_roles(TRUE);
-  unset($roles[DRUPAL_AUTHENTICATED_RID]);
-  // The role ID.
-  return array(
-    '#type' => 'select',
-    '#options' => $roles,
-    '#title' => t('Role'),
-    '#required' => TRUE,
-    '#description' => t('Select a role.'),
-    '#default_value' => $settings['rid'],
-  );
-}
\ No newline at end of file
+function role_expire_rules_action_remove_role_expire($account, $rid) {
+  role_expire_delete_record($account->uid, $rid);
+}