Skip flag flashed in session

The skip flag is now stored in the session using the flash function

Author: kevinorriss

README.md

@@ -56,13 +56,17 @@ CSRF token.
 
 ## Example
 
+### Carbon
+
 ClientTimezone is best used with Carbon to display the users current time.
 
 ```
 $carbon = Carbon::now();
 $carbon->addMinutes(ClientTimezone::getOffset());
 ```
 
+### Skipping
+
 There may be times when you do not want javascript to check the client timezone. An example
 of this is when the client creates a new session on your application by following a URL
 to verify their email address, this page displays a flash message, but will be shown briefly
@@ -73,6 +77,17 @@ just add this line to your controller before returning a view.
 
 `ClientTimezone::skip();`
 
+### Overrides
+
+You can override any of the ClientTimezone constant values by simply adding a value of the same
+name inside the .env file, for example:
+
+```
+CLIENT_TIMEZONE_SESSION=myexample
+CLIENT_TIMEZONE_POST=newurl
+CLIENT_TIMEZONE_SKIP=skipkey
+```
+
 ## Authors
 
 * **Kevin Orriss** - [Website](http://kevinorriss.com)

src/ClientTimezone.php

@@ -31,11 +31,11 @@ class ClientTimezone
 	const CLIENT_TIMEZONE_POST = "clienttimezone";
 
 	/**
-	 * Flag to skip getting the client timezone
+	 * The session key for if checking the client timezone should be skipped
 	 *
-	 * @var boolean
+	 * @var string
 	 */
-	protected static $skip = FALSE;
+	const CLIENT_TIMEZONE_SKIP = "clienttimezoneskip";
 
 
 	/**
@@ -45,7 +45,7 @@ class ClientTimezone
 	*
 	* @return string
 	*/
-	protected static function getSessionKey()
+	protected static function getOffsetSessionKey()
 	{
 		return env('CLIENT_TIMEZONE_SESSION', self::CLIENT_TIMEZONE_SESSION);
 	}
@@ -62,14 +62,24 @@ public static function getPostUrl()
 		return env('CLIENT_TIMEZONE_POST', self::CLIENT_TIMEZONE_POST);
 	}
 
+	/**
+	 * Returns the session key where the skip flag is stored
+	 *
+	 * @return string
+	 */
+	protected static function getSkipSessionKey()
+	{
+		return env('CLIENT_TIMEZONE_SKIP', static::CLIENT_TIMEZONE_SKIP);
+	}
+
 	/**
 	 * Returns if the client timezone is stored in session or not
 	 *
 	 * @return boolean
 	 */
-	public static function hasOffset()
+	protected static function hasOffset()
 	{
-		return Session::has(static::getSessionKey());
+		return Session::has(static::getOffsetSessionKey());
 	}
 
 	/**
@@ -82,7 +92,7 @@ public static function getOffset()
 	{
 		if (static::hasOffset())
 		{
-			return intval(Session::get(static::getSessionKey()));
+			return intval(Session::get(static::getOffsetSessionKey()));
 		}
 		return NULL;
 	}
@@ -94,32 +104,42 @@ public static function getOffset()
 	 */
 	public static function setOffset($offset)
 	{
-		Session::put(static::getSessionKey(), intval($offset));
+		Session::put(static::getOffsetSessionKey(), intval($offset));
 	}
 
 	/**
 	 * Removes the timezone offset from the session
 	 */
 	public static function forget()
 	{
-		Session::forget(static::getSessionKey());
+		Session::forget(static::getOffsetSessionKey());
 	}
 
 	/**
 	 * Sets the skip flag to true, meaning that the javascript will not check for the client timezone
 	 */
 	public static function skip()
 	{
-		static::$skip = TRUE;
+		Session::flash(static::getSkipSessionKey(), TRUE);
+	}
+
+	/**
+	 * Returns if checking the client timezone is going to be skipped or not
+	 *
+	 * @return boolean
+	 */
+	protected static function skipping()
+	{
+		return Session::has(static::getSkipSessionKey()) && Session::get(static::getSkipSessionKey()) == TRUE;
 	}
 
 	/**
-	 * Returns if the client timezone should be checked or not
+	 * Returns if the client timezone will be checked or not
 	 *
 	 * @return boolean
 	 */
-	public static function check()
+	public static function checking()
 	{
-		return !static::$skip && is_null(static::getOffset());
+		return !static::skipping() && is_null(static::getOffset());
 	}
 }

src/views/javascript.blade.php

@@ -1,14 +1,14 @@
 <script>
     $(document).ready(function()
     {
-        if({{ (ClientTimezone::check() ? "true" : "false") }})
+        if({{ ClientTimezone::checking() ? "true" : "false" }})
         {
             var clienttime = new Date();
             var clienttimezone = -clienttime.getTimezoneOffset();
             $.ajax(
             {
                 type: "POST",
-                url: "{{ url(env('CLIENT_TIMEZONE_POST', ClientTimezone::CLIENT_TIMEZONE_POST)) }}",
+                url: "{{url(ClientTimezone::getPostUrl()) }}",
                 data:
                 {
                     timezoneoffset: clienttimezone