Ticket #6: cookie_helper.patch

cookie_helper.php

@@ -36 +36 @@
  * @access      public
  * @param       mixed
  * @param       string  the value of the cookie
- * @param       string  the number of seconds until expiration
+ * @param       int             the number of seconds until expiration
  * @param       string  the cookie domain.  Usually:  .yourdomain.com
  * @param       string  the cookie path
  * @param       string  the cookie prefix
+ * @param       bool    whether the cookie should be sent ONLY over SSL
  * @return      void
  */
-function set_cookie($name = '', $value = '', $expire = '', $domain = '', $path = '/', $prefix = '')
+function set_cookie($name, $value = '', $expire = 0, $domain = null, $path = null, $prefix = null, $secure = false)
 {
         if (is_array($name))
-        {               
-                foreach (array('value', 'expire', 'domain', 'path', 'prefix', 'name') as $item)
+        {
+                foreach (array('value', 'expire', 'domain', 'path', 'prefix', 'secure', 'name') as $item)
                 {
                         if (isset($name[$item]))
                         {
@@ -54 +55 @@
                         }
                 }
         }
-        
+
         // Set the config file options
         $CI =& get_instance();
-        
-        if ($prefix == '' AND $CI->config->item('cookie_prefix') != '')
+        if ( ! is_numeric($expire))
         {
-                $CI->config->item('cookie_prefix');
+                $default_cookie_lifetime = $CI->config->item('cookie_lifetime');
+                $expire =
+                        (! is_numeric($default_cookie_lifetime) || $default_cookie_lifetime<=0) ?
+                                0 :
+                                (time() + $default_cookie_lifetime);
         }
-        if ($domain == '' AND $CI->config->item('cookie_domain') != '')
+        else
         {
-                $CI->config->item('cookie_domain');
+                $expire =
+                        ($expire==0) ?
+                                $expire :
+                                (time() + $expire);
         }
-        if ($prefix == '/' AND $CI->config->item('cookie_path') != '/')
+        $default_domain = $CI->config->item('cookie_domain');
+        if (is_null($domain) AND !empty($default_domain))
         {
-                $CI->config->item('cookie_path');
+                $domain = $default_domain;
         }
-                
-        if ( ! is_numeric($expire))
+        $default_path = $CI->config->item('cookie_path');
+        if (is_null($path) AND ! empty($default_path))
         {
-                $expire = time() - 86500;
+                $path = $default_path;
         }
-        else
+        $default_prefix = $CI->config->item('cookie_prefix');
+        if (is_null($prefix) AND ! empty($default_prefix))
         {
-                if ($expire > 0)
-                {
-                        $expire = time() + $expire;
-                }
-                else
-                {
-                        $expire = 0;
-                }
+                $prefix = $default_prefix;
         }
-        
-        setcookie($prefix.$name, $value, $expire, $path, $domain, 0);
+        $secure = is_bool($secure) ? $secure : false;
+
+        setcookie($prefix.$name, $value, $expire, $path, $domain, $secure);
 }
-        
+
 // --------------------------------------------------------------------
 
 /**
@@ -97 +100 @@
  *
  * @access      public
  * @param       string
+ * @param       string
  * @param       bool
  * @return      mixed
  */
-function get_cookie($index = '', $xss_clean = FALSE)
+function get_cookie($name = '', $prefix=null, $xss_clean = FALSE)
 {
         $CI =& get_instance();
-        return $CI->input->cookie($index, $xss_clean);
+        $default_prefix = $CI->config->item('cookie_prefix');
+        if (is_null($prefix) AND ! empty($default_prefix))
+        {
+                $prefix = $default_prefix;
+        }
+        return $CI->input->cookie($prefix.$name, $xss_clean);
 }
 
 // --------------------------------------------------------------------
@@ -111 +120 @@
 /**
  * Delete a COOKIE
  *
+ * @access      public
  * @param       mixed
  * @param       string  the cookie domain.  Usually:  .yourdomain.com
  * @param       string  the cookie path
  * @param       string  the cookie prefix
+ * @param       bool
  * @return      void
  */
-function delete_cookie($name = '', $domain = '', $path = '/', $prefix = '')
+function delete_cookie($name = '', $domain = null, $path = null, $prefix = null, $remove_live = TRUE)
 {
-        set_cookie($name, '', '', $domain, $path, $prefix);
+        if($remove_live===TRUE)
+        {
+                $CI =& get_instance();
+                $default_prefix = $CI->config->item('cookie_prefix');
+                if (is_null($prefix) AND ! empty($default_prefix))
+                {
+                        $prefix = $default_prefix;
+                }
+                $cIndex = is_array($name) ? $name['name'] : $name;
+                if(isset($_COOKIE[$prefix.$cIndex]))
+                {
+                        unset($_COOKIE[$prefix.$cIndex]);
+                }
+        }
+        set_cookie($name, '', -86500, $domain, $path, $prefix);
 }