From 82aac8f6092dbe7a60a8cd01593d46d754075ee2 Mon Sep 17 00:00:00 2001
From: Marton Juhasz <m@juhaszmarton.hu>
Date: Thu, 19 Apr 2012 12:35:55 +0200
Subject: [PATCH 1/2] #7 - 5205300

---
 shrtr.info   | 11 +++++++----
 shrtr.module | 18 ++++++++----------
 2 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/shrtr.info b/shrtr.info
index 1f4a76a..92a6cca 100644
--- a/shrtr.info
+++ b/shrtr.info
@@ -1,4 +1,7 @@
-name = ShrtR
-core = 7.x
-package = dCourse
-description = URL shortener module
+name = ShrtR
+core = 7.x
+package = dCourse
+description = URL shortener module
+dependencies[] = date
+dependencies[] = date_api
+dependencies[] = date_popup
\ No newline at end of file
diff --git a/shrtr.module b/shrtr.module
index f6acb0e..ae6c403 100644
--- a/shrtr.module
+++ b/shrtr.module
@@ -36,16 +36,14 @@ function shrtr_new_form($form = array(), &$form_state) {
     '#size' => 30,
   );
   $form['expire'] = array(
-    '#type' => 'select',
     '#title' => t('Expire'),
-    '#options' => array(
-      0 => t('Never'),
-      600 => '10' . t('min'),
-      1200 => '20' . t('min'),
-    ),
-    '#default_value' => 0,
-    '#description' => t('Time to expire'),
-  );
+    '#type' => 'date_popup',
+    '#required' => FALSE,
+    '#date_format' => 'Y-m-d H:i',
+    '#date_year_range' => '-0:+1',
+	'#default_value' => 0,
+	'#description' => t('Time to expire')
+);  
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Submit'),
@@ -76,7 +74,7 @@ function shrtr_new_form_submit($form, &$form_state) {
   variable_set('shrtr_alias', $alias);
 
   if ($form_state['values']['expire'] != 0) {
-    $expire = REQUEST_TIME + $form_state['values']['expire'];
+    $expire = strtotime($form_state['values']['expire']);
   }
   else {
     $expire = 0;

From 8937b2303d2d760c159c7a498043847935b11b26 Mon Sep 17 00:00:00 2001
From: Marton Juhasz <m@juhaszmarton.hu>
Date: Thu, 26 Apr 2012 11:06:25 +0200
Subject: [PATCH 2/2] #7 - 5351873

---
 shrtr.info   | 11 ++++-------
 shrtr.module | 46 ++++++++++++++++++++++++++++++++++++----------
 2 files changed, 40 insertions(+), 17 deletions(-)

diff --git a/shrtr.info b/shrtr.info
index 92a6cca..1f4a76a 100644
--- a/shrtr.info
+++ b/shrtr.info
@@ -1,7 +1,4 @@
-name = ShrtR
-core = 7.x
-package = dCourse
-description = URL shortener module
-dependencies[] = date
-dependencies[] = date_api
-dependencies[] = date_popup
\ No newline at end of file
+name = ShrtR
+core = 7.x
+package = dCourse
+description = URL shortener module
diff --git a/shrtr.module b/shrtr.module
index ae6c403..0109826 100644
--- a/shrtr.module
+++ b/shrtr.module
@@ -35,15 +35,34 @@ function shrtr_new_form($form = array(), &$form_state) {
     '#title' => t('URL'),
     '#size' => 30,
   );
-  $form['expire'] = array(
-    '#title' => t('Expire'),
-    '#type' => 'date_popup',
-    '#required' => FALSE,
-    '#date_format' => 'Y-m-d H:i',
-    '#date_year_range' => '-0:+1',
+  $form['expire_type'] = array(
+    '#type' => 'radios',
+    '#title' => t('Expire type'),
+    '#description' => t('Choose a method of expiry.'),
+    '#options' => array(
+    'remain'=>t('Remain'),
+    'date'=>t('Date'),
+    ),
+	'#default_value' => 'remain',
+  );
+  $form['expire_remain'] = array(
+    '#type' => 'select',
+    '#title' => t('Expire remain'),
+    '#options' => array(
+      0 => t('Never'),
+      600 => '10' . t('min'),
+      1200 => '20' . t('min'),
+    ),
+    '#default_value' => 0,
+    '#description' => t('Time to expire'),
+  );
+  $form['expire_date'] = array(
+    '#type' => 'date',
+    '#title' => t('Expire date'),
 	'#default_value' => 0,
-	'#description' => t('Time to expire')
-);  
+	'#description' => t('Time to expire'),
+    '#required' => FALSE,
+  );
   $form['submit'] = array(
     '#type' => 'submit',
     '#value' => t('Submit'),
@@ -73,8 +92,11 @@ function shrtr_new_form_submit($form, &$form_state) {
   } while (!empty($result));
   variable_set('shrtr_alias', $alias);
 
-  if ($form_state['values']['expire'] != 0) {
-    $expire = strtotime($form_state['values']['expire']);
+  if (($form_state['values']['expire_type'] == 'remain') && ($form_state['values']['expire_remain'] != 0)) {
+	$expire = REQUEST_TIME + $form_state['values']['expire_remain'];
+  }
+  else if ($form_state['values']['expire_type'] == 'date') {
+    $expire = date_to_timestamp($form_state['values']['expire_date']);
   }
   else {
     $expire = 0;
@@ -177,3 +199,7 @@ function shrtr_list_page() {
 
   return $content;
 }
+
+function date_to_timestamp($expire_date) {
+  return mktime(0, 0, 0, $expire_date['month'], $expire_date['day'], $expire_date['year']);
+}