Merge pull request #607 from hollie/revert-599-ia7

Revert pull request 599 against stable branch
hollie · Jul 26, 2016 · 6042d03 · 6042d03
2 parents d272213 + 9ac2270
commit 6042d03
Show file tree

Hide file tree

Showing 29 changed files with 441 additions and 2,052 deletions.
diff --git a/code/common/ia7_collection_upgrader.pl b/code/common/ia7_collection_upgrader.pl
diff --git a/code/common/ia7_notifications.pl b/code/common/ia7_notifications.pl
diff --git a/data/web/collections.json b/data/web/collections.json
@@ -395,7 +395,6 @@
   "28" : {
      "link" : "/bin/set_parm_tv_provider.pl",
      "name" : "Setup TV Provider",
-     "mode" : "advanced",     
      "icon" : "fa-desktop"
   },
   "5" : {
@@ -488,7 +487,6 @@
   "26" : {
      "link" : "/ia5/house/irman.shtml",
      "name" : "Program IRMAN",
-     "mode" : "advanced",     
      "icon" : "fa-rss"
   },
   "57" : {
@@ -709,7 +707,6 @@
   "27" : {
      "icon" : "fa-wrench",
      "name" : "Header Control",
-     "mode" : "advanced",     
      "link" : "/bin/headercontrol.pl"
   },
   "78" : {
@@ -720,7 +717,7 @@
   "102" : {
      "name" : "Picture Frame",
      "icon" : "fa-desktop",
-     "external" : "$config_parms{html_dir}/misc/photos.shtml"
+     "external" : "http://home.krkeegan.com:8081/misc/photos.shtml"
   },
   "105" : {
      "link" : "/ia5/calendar/main.shtml",
@@ -775,12 +772,14 @@
      "icon" : "fa-home",
      "name" : "Gear Settings",
      "children" : [
-       700
+       501
 
      ]
    },
-   "700" : {
-     "user" : "$Authorized"
+   "501" : {
+     "link" : "/UNSET_PASSWORD?user=admin",
+     "name" : "Authorize",
+     "icon" : "fa-lock"
   },
    "600" : {
      "link" : "/ia7/#path=/objects&parents=ia7_status_items",

diff --git a/data/web/ia7_config.json b/data/web/ia7_config.json
@@ -7,9 +7,7 @@
      "fp_icon_size" : "32",
      "fp_state_popovers" : "yes",
      "substate_percentages" : "20",
-     "disable_current_state" : "yes",
-     "notifications" : "yes",
-     "speech_default" : "banner"
+     "disable_current_state" : "yes"
   },
   "objects" : {
   	  "example_object" : {

diff --git a/lib/ajax.pm b/lib/ajax.pm
@@ -101,10 +101,7 @@ sub checkForUpdate {
         &main::print_log("checkForUpdate sub ${$$self{sub}} returned $xml")
           if $main::Debug{ajax};
         &::print_socket_fork( ${ $$self{waitingSocket} }, $xml );
-        &main::print_log( "Closing Socket " . ${ $$self{waitingSocket} } )
-          if $main::Debug{ajax};
-        ${ $$self{waitingSocket} }->shutdown(2)
-          ; #Changed this from close() to shutdown(2). In some cases, the parent port wasn't being closed -- ie. speech events
+        ${ $$self{waitingSocket} }->close;
         ${ $$self{changed} } = 1;
     }
     else {