2.0.8; closes #23, #22

Author: benkeen

code/FormGenerator.class.php

@@ -604,8 +604,9 @@ public static function maybeTakeScheduledFormOffline($config)
         $db = Core::$db;
         $just_taken_offline = false;
 
-        // first, check the form shouldn't be taken offline right now
-        if ($config["is_online"] == "yes" && $config["offline_date"] != "0000-00-00 00:00:00") {
+
+        // take the form offline if it passed the offline date
+        if ($config["is_online"] == "yes" && !is_null($config["offline_date"])) {
             $default_timezone_offset = Settings::get("default_timezone_offset");
 
             $now = date("U");
@@ -619,7 +620,7 @@ public static function maybeTakeScheduledFormOffline($config)
                 $db->query("
                     UPDATE {PREFIX}module_form_builder_forms
                     SET    is_online = 'no',
-                           offline_date = '0000-00-00 00:00:00'
+                           offline_date = NULL
                     WHERE  published_form_id = :published_form_id
                 ");
                 $db->bind("published_form_id", $published_form_id);

code/Forms.class.php

@@ -714,16 +714,18 @@ public static function saveBuilderSettings($info)
         }
 
         try {
+
             if (empty($published_form_id)) {
                 $list_order = self::getNextPublishedFormOrder($info["form_id"]);
 
                 $db->query("
                     INSERT INTO {PREFIX}module_form_builder_forms (is_online, is_published, form_id, view_id,
                         set_id, filename, folder_path, folder_url, include_review_page, include_thanks_page_in_nav,
-                        thankyou_page_content, form_offline_page_content, review_page_title, thankyou_page_title, list_order)
+                        thankyou_page_content, form_offline_page_content, review_page_title, thankyou_page_title, list_order,
+                        offline_date)
                     VALUES (:is_online, :is_published, :form_id, :view_id, :set_id, :filename, :folder_path, :folder_url,
                         :include_review_page, :include_thanks_page_in_nav, :thankyou_page_content, :form_offline_page_content,
-                        :review_page_title, :thankyou_page_title, :list_order)
+                        :review_page_title, :thankyou_page_title, :list_order, :offline_date)
                 ");
                 $db->bindAll(array(
                     "is_online" => $is_online,
@@ -740,7 +742,8 @@ public static function saveBuilderSettings($info)
                     "form_offline_page_content" => $info["form_offline_page_content"],
                     "review_page_title" => $info["review_page_title"],
                     "thankyou_page_title" => $info["thankyou_page_title"],
-                    "list_order" => $list_order
+                    "list_order" => $list_order,
+                    "offline_date" => $offline_date
                 ));
                 $db->execute();
                 $published_form_id = $db->getInsertId();

code/Module.class.php

@@ -18,8 +18,8 @@ class Module extends CoreModule
     protected $author = "Ben Keen";
     protected $authorEmail = "ben.keen@gmail.com";
     protected $authorLink = "https://formtools.org";
-    protected $version = "2.0.7";
-    protected $date = "2018-05-13";
+    protected $version = "2.0.8";
+    protected $date = "2018-05-18";
     protected $originLanguage = "en_us";
 
     // important! This needs to be updated any time the default template set filename changes
@@ -215,7 +215,7 @@ public function upgrade($module_id, $old_module_version)
     {
         $this->resetHooks();
 
-        if ($this->version === "3.0.6") {
+        if ($this->version === "2.0.8") {
             $this->updateOfflineDateFieldAllowNulls();
         }
     }
@@ -410,7 +410,7 @@ public function displayPublishTab($location, $vars)
         // loop through each published form and take any offline that need it
         $at_least_one_form_just_taken_offline = false; // yes, this variable name ROCKS!!!!!
         foreach ($published_forms["results"] as $config) {
-            if ($config["is_online"] == "yes" && $config["offline_date"] != "0000-00-00 00:00:00") {
+            if ($config["is_online"] == "yes" && !is_null($config["offline_date"])) {
                 $taken_offline = FormGenerator::maybeTakeScheduledFormOffline($config);
                 if ($taken_offline) {
                     $at_least_one_form_just_taken_offline = true;
@@ -576,5 +576,12 @@ private function updateOfflineDateFieldAllowNulls()
         $db = Core::$db;
         $db->query("ALTER TABLE {PREFIX}module_form_builder_forms CHANGE offline_date offline_date DATETIME NULL");
         $db->execute();
+
+        $db->query("
+            UPDATE {PREFIX}module_form_builder_forms
+            SET offline_date = NULL
+            WHERE offline_date = '0000-00-00 00:00:00'
+        ");
+        $db->execute();
     }
 }

css/edit_form.css

@@ -27,7 +27,7 @@
 }
 .form_builder_form_list .header_row .col6 {
   width: 182px;
-  padding-left: 0px;
+  padding-left: 0;
 }
 .form_builder_form_list .col6 {
   width: 180px;
@@ -43,11 +43,11 @@ div.published_form_url {
 	white-space:nowrap;
 }
 .publish_tab_offline_date {
-	background: transparent url(../../../../global/images/clock.png) center center no-repeat;
+	background: transparent url(../../../global/images/clock.png) center center no-repeat;
 	width: 16px;
 	height: 20px;
 	margin-left: 3px;
 	display:inline-block;
 	text-indent: -9999px;
 	cursor: pointer;
-}
+}

preview.php

@@ -57,7 +57,7 @@
     $published_folder_url = $config_info["folder_url"];
     $published_folder_path = $config_info["folder_path"];
 
-    if ($config_info["offline_date"] != "0000-00-00 00:00:00") {
+    if (!is_null($config_info["offline_date"])) {
         // convert the datetime to a friendlier format
         list($date, $time) = explode(" ", $config_info["offline_date"]);
         list($year, $month, $day) = explode("-", $date);

templates/admin/tab_publish.tpl

@@ -78,7 +78,7 @@
 		                    <span class="light_grey">&#8212;</span>
 		                  {elseif $info.is_online == "yes"}
 		                    <span class="green">{$LANG.word_yes}</span>
-		                    {if $info.offline_date != "0000-00-00 00:00:00"}
+		                    {if !is_null($info.offline_date)}
 		                      {assign var=d value=$info.offline_date|replace:':':''}
 		                      {assign var=d value=$d|replace:' ':''}
 		                      {assign var=d value=$d|replace:'-':''}