some fixes and new crypto status.

Author: Ivan Stoev

pdiff.c

@@ -1206,7 +1206,9 @@ static void stop_crypto_thread(){
 static void process_modifyuserinfo(const binresult *entry){
   const binresult *res, *cres;
   psync_sql_res *q;
-  uint64_t u;
+  uint64_t u, crexp, crsub = 0;
+  int crst = 0,crstat;
+  
   if (!entry)
     return;
   res=psync_find_result(entry, "userinfo", PARAM_HASH);
@@ -1244,15 +1246,39 @@ static void process_modifyuserinfo(const binresult *entry){
   psync_sql_run(q);
   if (!u)
     psync_run_thread("stop crypto moduserinfo", stop_crypto_thread);
+  else 
+    crst = 1;
   psync_sql_bind_string(q, 1, "cryptosubscription");
-  psync_sql_bind_uint(q, 2, psync_find_result(res, "cryptosubscription", PARAM_BOOL)->num);
+  crsub =  psync_find_result(res, "cryptosubscription", PARAM_BOOL)->num;
+  psync_sql_bind_uint(q, 2, crsub);
   psync_sql_run(q);
   cres=psync_check_result(res, "cryptoexpires", PARAM_NUM);
+  crexp = cres?cres->num:0;
   psync_sql_bind_string(q, 1, "cryptoexpires");
-  psync_sql_bind_uint(q, 2, cres?cres->num:0);
+  psync_sql_bind_uint(q, 2, crexp);
+  psync_sql_run(q);
+  if (psync_is_business || crsub){
+    if (crst)
+      crstat = 5;
+    else  crstat = 4;
+  } else {
+    if (!crst)
+      crstat = 1;
+    else 
+    {
+      if (psync_millitime() > crexp)
+        crstat = 3;
+      else 
+        crstat = 2;
+    }
+  }
+  psync_sql_bind_string(q, 1, "cryptostatus");
+  psync_sql_bind_uint(q, 2, crstat);
   psync_sql_run(q);
   psync_sql_free_result(q);
   psync_send_eventid(PEVENT_USERINFO_CHANGED);
+  
+  
 }
 
 #define fill_str(f, s, sl)\

poverlay.c

@@ -77,11 +77,14 @@ static int get_item_from_cache(const char* key, external_status* stat){
     now = psync_millitime();
     if ((now - rec->timestamp) < 100) {
       *stat = rec->stat;
+      psync_cache_add(reckey, rec, 1, psync_free, 1);
+      psync_free(reckey);
       return 1;
     } else {
       psync_free(rec);
     }
   }
+  psync_free(reckey);
   return 0;
 }
 
@@ -95,7 +98,8 @@ static void add_item_to_cache(const char* key, external_status* stat){
 
   rec->stat = *stat;
   rec->timestamp = psync_millitime();
-  psync_cache_add(key, rec, 1, psync_free, 1);
+  psync_cache_add(reckey, rec, 1, psync_free, 1);
+  psync_free(reckey);
 }
 
 

psynclib.h

@@ -262,6 +262,12 @@ typedef struct pstatus_struct_ {
 #define PSYNC_CRYPTO_FOLDER_NOT_ENCRYPTED  -7
 #define PSYNC_CRYPTO_INTERNAL_ERROR        -8
 
+#define PSYNC_CRYPTO_STATUS_NEW 1
+#define PSYNC_CRYPTO_STATUS_TRIAL 2
+#define PSYNC_CRYPTO_STATUS_EXPIRED 3
+#define PSYNC_CRYPTO_STATUS_ACTIVE 4
+#define PSYNC_CRYPTO_STATUS_SETUP 5
+
 #define PSYNC_CRYPTO_INVALID_FOLDERID      ((psync_folderid_t)-1)
 
 #ifndef DEFAULT_FUSE_VOLUME_NAME
@@ -1148,7 +1154,6 @@ void psync_start_overlay_callbacks();
 
 int psync_setlanguage(const char *language, char **err);
 
-
 #ifdef __cplusplus
 }
 #endif