add TableAcls class ans use it in refresh

1 files changed, 13 insertions, 43 deletions

diff --git a/refresh.php b/refresh.php
index 4ab482a..117af84 100644
--- a/refresh.php
+++ b/refresh.php
@@ -477,26 +477,7 @@ try {
     // -------------------------------------------------------------------
     if ($_SERVER['argc']==1 || in_array('owner', $_SERVER['argv'])) {
 
-        $sql="CREATE TABLE IF NOT EXISTS `acls` (
-            `ID` int(11) NOT NULL AUTO_INCREMENT,
-            `collection` varchar(100) NOT NULL,
-            `name` varchar(100) NOT NULL,
-            `summary` varchar(200) NOT NULL,
-            `owner` varchar(50) DEFAULT NULL,
-            `qa` varchar(50) DEFAULT NULL,
-            `cc` varchar(100) DEFAULT NULL,
-            PRIMARY KEY (`ID`),
-            KEY `name` (`name`),
-            KEY `collection` (`collection`),
-            KEY `owner` (`owner`)) ENGINE=MyISAM";
-
-        if ($db->exec($sql)!==false) {
-            echo date("r : ") . "Check table 'acls' ok\n";
-        } else {
-            echo date("r : ") . "SQL ERROR = " .
-                implode(" ", $db->errorInfo()) . "\n";
-        }
-
+        $acls = new TableAcls($db);
         $fic=fopen(
             "https://admin.fedoraproject.org/pkgdb/lists/bugzilla?tg_format=plain",
             "r"
@@ -504,42 +485,31 @@ try {
         if (!$fic) {
             echo date("r : ") . "ERROR reading pkgdb\n";
         } else {
-            $sql="TRUNCATE `acls`";
-            $nb=$db->exec($sql);
-            if ($nb===false) {
-                echo date("r : ") . "SQL ERROR = " .
-                    implode(" ", $db->errorInfo()) . "\n";
-            } else {
-                echo date("r : ") . "Delete $nb packages\n";
-            }
+            $nb = $acls->getCount();
+            $acls->truncate();
+            echo date("r : ") . "Delete $nb owners\n";
 
             for ($tot=0 ; $line=fgetcsv($fic, 1024, '|'); ) {
                 if (count($line)>5 && substr($line[0], 0, 1)!='#') {
                     for ($i=0; $i<6; $i++) {
                         $line[$i]=trim($line[$i]);
                     }
-                    $sql=sprintf(
-                        "INSERT INTO `acls`
-                         SET collection='%s', name='%s', summary='%s'",
-                        $line[0],
-                        $line[1],
-                        addslashes($line[2])
+                    $input = array(
+                        'collection'    => $line[0],
+                        'name'          => $line[1],
+                        'summary'       => $line[2],
                     );
                     if (!empty($line[3])) {
-                        $sql .= sprintf(", owner='%s'", $line[3]);
+                        $input['owner'] = $line[3];
                     }
                     if (!empty($line[4])) {
-                        $sql .= sprintf(", qa='%s'", $line[4]);
+                        $input['qa'] = $line[3];
                     }
                     if (!empty($line[5])) {
-                        $sql .= sprintf(", cc='%s'", $line[5]);
+                        $input['cc'] = $line[3];
                     }
-                    $nb=$db->exec($sql);
-                    if ($nb) {
-                        $tot+=$nb;
-                    } else {
-                        echo date("r : ") . "SQL ERROR = " .
-                            implode(" ", $db->errorInfo()) . "\n";
+                    if ($acls->add($input)) {
+                        $tot++;
                     }
                 }
             }