From f3da8c18e6ec1b5ad948c325141806f1228c0677 Mon Sep 17 00:00:00 2001
From: "Matteo Nastasi (mop)" <nastasi@alternativeoutput.it>
Date: Wed, 28 Oct 2015 07:45:06 +0100
Subject: [PATCH] better manage of G_selfreg_tout and G_selfreg_mask vars

---
 TODO.txt                     | 8 +++++++-
 web/Obj/brisk.conf-templ.pho | 4 ++++
 web/Obj/sac-a-push.phh       | 5 ++++-
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/TODO.txt b/TODO.txt
index 73c3b2e..2768eb3 100644
--- a/TODO.txt
+++ b/TODO.txt
@@ -5,6 +5,11 @@
  ----------+
    - APPRENTICE
      Phase1
+     DONE - correggere email per apprentice
+     DONE - verificare la variabile per tout IP ban apprentice
+     - correggere minuta giornaliera
+     - chat ban for apprentice
+
      DONE - ip check and time limit
        DONE . sql
          DONE . temporary table limitation
@@ -20,7 +25,8 @@
          DONE - require command/info
          DONE - fix fiverank table
          DONE - fix bug with bitwise
-         - fix layout of tables
+         DONE - fix layout of tables
+     DONE - aggiungere books.png
 
      Phase2
      - match counters (part 2)
diff --git a/web/Obj/brisk.conf-templ.pho b/web/Obj/brisk.conf-templ.pho
index 8f99fc4..8d4858c 100644
--- a/web/Obj/brisk.conf-templ.pho
+++ b/web/Obj/brisk.conf-templ.pho
@@ -14,6 +14,10 @@ else {
     $G_provider_proxy = array();
 }
 
+// 26 hours between 2 successive registration from this area
+$G_selfreg_mask = 0xfffff000;
+$G_selfreg_tout = 93600;
+
 // G_dbasetype value can be "pgsql" or "file"
 $G_dbasetype="pgsql";
 
diff --git a/web/Obj/sac-a-push.phh b/web/Obj/sac-a-push.phh
index 1d55c3e..f674d3b 100644
--- a/web/Obj/sac-a-push.phh
+++ b/web/Obj/sac-a-push.phh
@@ -40,7 +40,7 @@ function global_dump()
     GLOBAL $G_splash_h, $G_splash_idx, $G_splash_interval, $G_splash_timeout;
     GLOBAL $G_splash_w, $G_topbanner, $G_with_donors, $G_with_poll;
     GLOBAL $G_with_splash, $G_sidebanner, $G_sidebanner_idx;
-    GLOBAL $G_with_topbanner;
+    GLOBAL $G_with_topbanner, $G_selfreg_tout;
 
     fprintf(STDERR, "G_alarm_passwd = [%s]\n", print_r($G_alarm_passwd, TRUE));
     fprintf(STDERR, "G_ban_list = [%s]\n", print_r($G_ban_list, TRUE));
@@ -73,6 +73,9 @@ function global_dump()
     fprintf(STDERR, "G_sidebanner_idx = [%s]\n", print_r($G_sidebanner_idx, TRUE));
     fprintf(STDERR, "G_with_splash = [%s]\n", print_r($G_with_splash, TRUE));
     fprintf(STDERR, "G_with_topbanner = [%s]\n", print_r($G_with_topbanner, TRUE));
+    fprintf(STDERR, "G_selfreg_mask = [%x]\n", print_r($G_selfreg_mask, TRUE));
+    fprintf(STDERR, "G_selfreg_tout = [%s]\n", print_r($G_selfreg_tout, TRUE));
+
 }
 
 function pid_save()
-- 
2.17.1