Merge branch 'master' of gitlab.pcloud.com:pcloud/synclib

Author: virco

pbusinessaccount.c

@@ -611,3 +611,65 @@ int api_error_result(binresult* res) {
   }
   return 0;
 }
+
+
+void psync_update_cryptostatus(){
+  binresult *res;
+  const binresult *cres;
+  psync_sql_res *q;
+  uint64_t u, crexp, crsub = 0, is_business = 0;
+  int crst = 0,crstat;
+  
+  binparam params[] = { P_STR("auth", psync_my_auth) };
+  res = psync_api_run_command("userinfo", params);
+  if (!res) {
+    debug(D_WARNING, "Send command returned invalid result.\n");
+    return;
+  }
+  
+  if (api_error_result(res))
+    return;
+  
+  q=psync_sql_prep_statement("REPLACE INTO setting (id, value) VALUES (?, ?)");
+  
+  is_business=psync_find_result(res, "business", PARAM_BOOL)->num;
+  
+  u=psync_find_result(res, "cryptosetup", PARAM_BOOL)->num;
+  psync_sql_bind_string(q, 1, "cryptosetup");
+  psync_sql_bind_uint(q, 2, u);
+  psync_sql_run(q);
+  if (u)
+    crst = 1;
+  psync_sql_bind_string(q, 1, "cryptosubscription");
+  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, crexp);
+  psync_sql_run(q);
+
+  if (is_business || crsub){
+    if (crst)
+      crstat = 5;
+    else  crstat = 4;
+  } else {
+    if (!crst)
+      crstat = 1;
+    else 
+    {
+      if (psync_time() > 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);
+
+  
+}

plibs.c

@@ -365,8 +365,7 @@ int psync_sql_connect(const char *db){
   int code;
 
   assert(sqlite3_libversion_number()==SQLITE_VERSION_NUMBER);
-  const char * sourcdid = sqlite3_sourceid();
-  assert(!strcmp(sourcdid, SQLITE_SOURCE_ID));
+  assert(!strcmp(sqlite3_sourceid(), SQLITE_SOURCE_ID));
   assert(!strcmp(sqlite3_libversion(), SQLITE_VERSION));
   debug(D_NOTICE, "Using sqlite version %s source %s", sqlite3_libversion(), sqlite3_sourceid());
   if (!sqlite3_threadsafe()){

psynclib.h

@@ -1174,6 +1174,10 @@ void psync_start_overlay_callbacks();
 
 int psync_setlanguage(const char *language, char **err);
 
+
+// Update crypto status information from userinfo.
+void psync_update_cryptostatus();
+
 #ifdef __cplusplus
 }
 #endif