From d81faa31dcab9ce5efa7f7a840b596f9e7367e35 Mon Sep 17 00:00:00 2001
From: Kevin Cozens <kevin@ve3syb.ca>
Date: Wed, 13 Jan 2016 15:10:52 -0500
Subject: [PATCH] Fixed bad commit that was sending wrong day value to PHP for
 upcoming events. Fixed dir_events_query in PHP file: always get current time
 in UTC, simplified timezone handling, and include in-progress events when
 passed "u" for day number. Updated pre-built OpenSimSearch.dll file.

---
 .../Modules/SearchModule/OpenSearch.cs        |   4 +++-
 bin/OpenSimSearch.Modules.dll                 | Bin 17408 -> 17408 bytes
 webroot/query.php                             |  10 +++++-----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/OpenSimSearch/Modules/SearchModule/OpenSearch.cs b/OpenSimSearch/Modules/SearchModule/OpenSearch.cs
index 54adeca..f1d92bf 100644
--- a/OpenSimSearch/Modules/SearchModule/OpenSearch.cs
+++ b/OpenSimSearch/Modules/SearchModule/OpenSearch.cs
@@ -658,9 +658,10 @@ namespace OpenSimSearch.Modules.OpenSearch
                 //The flags are: SortAsc (1 << 15), PerMeterSort (1 << 17)
                 maturity |= 163840;
 
+                //When character before | is a u get upcoming/in-progress events
                 //Character before | is number of days before/after current date
                 //Characters after | is the number for a category
-                ReqHash["text"] = "0|0";
+                ReqHash["text"] = "u|0";
                 ReqHash["flags"] = maturity.ToString();
                 ReqHash["query_start"] = "0";
 
@@ -689,6 +690,7 @@ namespace OpenSimSearch.Modules.OpenSearch
 
                     mapItemReply mapitem = new mapItemReply();
 
+                    //Events use a comma separator in the landing point
                     landingpoint = d["landing_point"].ToString().Split(',');
                     mapitem.x = Convert.ToUInt32(landingpoint[0]);
                     mapitem.y = Convert.ToUInt32(landingpoint[1]);
diff --git a/bin/OpenSimSearch.Modules.dll b/bin/OpenSimSearch.Modules.dll
index 849defe6a63960db68530a18291b4264cf55e697..a9282d6fa5fb1cb28d88b3bbbd587389e29b5710 100755
GIT binary patch
delta 724
zcmXxiO-NKx6bJDCIroj@ozxshX&lYWF}0={M;-7Z%hDhv(ZD1UN+k!I@FUa6pcthb
zX5qr=Mnqp=v}seqlQuz{Toly077^4UXcYyLwCcWj&&#`Tf9ITg-#eGLkfwz+t)va;
zky$RM7n$d0XhabuX<aQ+(z`NbrGRcd87`!impjx0uGs<jq6S{-IH~vinpiD~$F)|J
z;L%Y5cv0+W(M#kU@W6VkT!FTsX1J`-WmW9jt^mwB<GVkZ@_&X8g!xKq=MUP-?PEf0
zuPq_ZGGonAzLvlzM*%GZUu?-**~u>aadJncPk;TUqyDV6oXSDzB^QdTtT&{Rx##6E
z&4XDkVn)vBV?H>#DX(!3)~l`3+vwqkoQsW`>_*(@4c>{~I$Lk}Cl{eEWNV(wL@9b5
z-H~OY0%Ku2_mw+E5O?csHF(4&u^%@YY&MFd2qD&FYgOJ8VN7K2G=*2XizZB)trc$#
zd76iLj1xSmT)|L&j=p||)GaeS>TvL+A&?qZ%fS|dackUs7aWo5T)5sCkIxOOj!22`
z)b#9J&s1VAF*=c$jiYN~dRBFWE6mmKQ%P6V@#gNra7_IDwsfK^)An(5Fx0-seAL{>
zRjx{+qEf?6MJ3r~zTxI_w%jV*RG_Ds*Y=F^8Y2zSNDSCV@T;|I|893Q(h|{8AV4VT
zzZ{<$NK6jIN3UGCSUIVF9~ur=O>d91^CMb*GNio60<>aYZ(ky_;K)D0Yi*{t^A}~J
F?*HUciI4yQ

delta 662
zcmXxiO=uHA6ae7&-fWsopt0K&ZIe=MQ$uaKc4H4s8>=RIND*s5q}U3!2c<E=Qc^Gn
zOA?471+j@EMHD5{Uc9KV{u~6Y=%EKMdh#U2LqHFD5{f5hcjK@#v){Zo%goLcDp;ss
zwW9poPM@#c>c&U4C)1b|h<V%;Ma-*(8L&!1wge6+36+lbdUXW196<mTI@}R6rDYJn
z9QT-+0u{f9nbCd!qasN`?$s4|CKD7<q&Mgg6YOD&8wTZL3@P6`^9{c1iW9=Z0ht61
zu5uL-N|wqlACF1hx7GO-ymA3smKvz>Svl`Uubc)AjPNT&u-jBzioyOqJ9bt|fxf0L
za<AOhL0frDTO6=hgeAU24%lvLg<q!@c;0V*rUaApfLyQ@G*yOs^pW;JV!+m0`a$i`
zAF`DrKkI@-Q+K$Z^}w8F$G%aV1)w@?E9_=h*&)b<Z60BH76N_5)?>cTG+3~Hb{SsD
zg^oblnCSVS@F_Y+(=<;R!2_XI1SZeQJS_qyVu8~N!ppj-1|st1Y2Ek~nB!tr>k_M4
zw;0lfy~)Mw^5nJDa%w)4%3g+(nZ>NJp>1;1MPfA3_HO<2%8M__Q)};clncJKyGDI<
zidq#XwvRC<dSoT>YizHfj&C3fAJ)a|Xwd3+q8)ff{E1%j<eJyW+{x`3p~iezFjkM=
WL~#P!49~H@jOyct8vl(o-T4ozOoh(?

diff --git a/webroot/query.php b/webroot/query.php
index 128fc87..affb746 100644
--- a/webroot/query.php
+++ b/webroot/query.php
@@ -319,9 +319,8 @@ function dir_events_query($method_name, $params, $app_data)
 
     $terms = array();
 
-    //The date and time for events are in UTC
-    $time_info = gettimeofday();
-    $now = $time_info['sec'];
+    //Event times are in UTC so we need to get the current time in UTC.
+    $now = time();
 
     if ($day == "u")    //Searching for current or ongoing events?
     {
@@ -331,7 +330,8 @@ function dir_events_query($method_name, $params, $app_data)
     else
     {
         //For events in a given day we need to determine the days start time
-        $now -= ($now % 86400);
+        $now -= idate("Z");     //Adjust for timezone
+        $now -= ($now % 86400); //Adjust to start of day
 
         //Is $day a number of days before or after current date?
         if ($day != 0)
@@ -505,7 +505,7 @@ function event_info_query($method_name, $params, $app_data)
     $data = array();
     while (($row = mysql_fetch_assoc($result)))
     {
-        $date = strftime("%G-%m-%d %H:%M:%S",$row["dateUTC"]);
+        $date = strftime("%G-%m-%d %H:%M:%S", $row["dateUTC"]);
 
         $category = "*Unspecified*";
         if ($row['category'] == 18)    $category = "Discussion";