X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;f=bin%2Fcron%2Fphones.check.php;h=92707ee5a4f8f4aac226e9f3b19ba7a91665ef1c;hb=fdf0eca063baf13cb3f30b1c276d65f9687d5527;hp=6f8e14d46c7225dc8c0a1820490dbac9c3783652;hpb=7f12e3b4113791f3372f11572a205925d7bb6b97;p=platal.git

diff --git a/bin/cron/phones.check.php b/bin/cron/phones.check.php
index 6f8e14d..92707ee 100755
--- a/bin/cron/phones.check.php
+++ b/bin/cron/phones.check.php
@@ -1,16 +1,10 @@
 #!/usr/bin/php5
 <?php
 
-require('./connect.db.inc.php');
-
-//next two are required to include 'profil.func.inc.php'
-require_once('xorg.inc.php');
-$page = new XorgPage(null);
-
-require_once('profil.func.inc.php');
-
-$globals->debug = 0; //do not store backtraces
+require './connect.db.inc.php';
 
+$globals->debug = 0; // do not store backtraces
+// TODO: Improve this using Phone::iterate.
 
 function do_update_by_block($values)
 {
@@ -18,17 +12,20 @@ function do_update_by_block($values)
     // Because there is no mysql update syntax for multiple updates in one query
     // we use a multiple insert syntax which will fail because the key already exist
     // and then update the display_tel
-    XDB::execute("INSERT INTO  profile_phones (uid, link_type, link_id, tel_id ,tel_type,
+    XDB::execute("INSERT INTO  profile_phones (pid, link_type, link_id, tel_id ,tel_type,
                                           search_tel, display_tel, pub, comment)
                        VALUES  " . $values . "
       ON DUPLICATE KEY UPDATE  display_tel = VALUES(display_tel)");
 }
 
-$res = XDB::query("SELECT DISTINCT g.phoneprf FROM geoloc_pays AS g WHERE g.phoneprf IS NOT NULL");
+$res = XDB::query("SELECT DISTINCT  phonePrefix
+                              FROM  geoloc_countries
+                             WHERE  phonePrefix IS NOT NULL");
 $prefixes = $res->fetchColumn();
 foreach ($prefixes as $i => $prefix) {
-    $res = XDB::query("SELECT g.phoneformat FROM geoloc_pays AS g
-                        WHERE g.phoneprf = {?} AND g.phoneformat != '' LIMIT 1",
+    $res = XDB::query("SELECT  phoneFormat
+                         FROM  geoloc_countries
+                        WHERE  phonePrefix = {?} AND phoneFormat != '' LIMIT 1",
                       $prefix);
     if ($res->numRows() > 0) {
         $format = $res->fetchOneCell();
@@ -67,7 +64,7 @@ foreach ($prefixes as $i => $prefix) {
             $regexp .= ')?';
         }
         $regexp .= '$';
-        $res = XDB::iterator("SELECT uid, link_type, link_id, tel_id, tel_type, search_tel,
+        $res = XDB::iterator("SELECT pid, link_type, link_id, tel_id, tel_type, search_tel,
                                      display_tel, pub, comment
                                 FROM profile_phones
                                WHERE search_tel LIKE {?} AND display_tel NOT REGEXP {?}",
@@ -78,14 +75,15 @@ foreach ($prefixes as $i => $prefix) {
             $values = '';
             $i = 0;
             while ($phone = $res->next()) {
-                $disp = format_display_number($phone['search_tel'], $error, array('format' => $format, 'phoneprf' => $prefix));
+                $phone = new Phone(array('display' => $phone['display_tel']));
+                $phone->format(array('format' => $format, 'phoneprf' => $prefix));
                 if ($values != '') {
                     $values .= ",\n";
                 }
-                $values .= "('"   . addslashes($phone['uid']) . "', '" . addslashes($phone['link_type'])
+                $values .= "('"   . addslashes($phone['pid']) . "', '" . addslashes($phone['link_type'])
                     . "', '" . addslashes($phone['link_id'])
                     . "', '" . addslashes($phone['tel_id']) . "', '" . addslashes($phone['tel_type'])
-                    . "', '" . addslashes($phone['search_tel']) . "', '" . addslashes($disp)
+                    . "', '" . addslashes($phone['search_tel']) . "', '" . addslashes($phone->display)
                     . "', '" . addslashes($phone['pub']) . "', '" . addslashes($phone['comment']) . "')";
                 $i++;
                 if ($i == 1000) {