Changeset 904

Timestamp:

03/16/06 11:53:07 (3 years ago)

Author:

benjamin

Message:

Misc code cleanup and alternc_export follow-up

Files:

• trunk/bureau/class/export_account.php (modified) (1 diff)
• trunk/bureau/class/m_admin.php (modified) (2 diffs)
• trunk/bureau/class/m_dom.php (modified) (4 diffs)
• trunk/bureau/class/m_mem.php (modified) (1 diff)
• trunk/bureau/class/m_mysql.php (modified) (1 diff)
• trunk/bureau/class/m_quota.php (modified) (2 diffs)
• trunk/src/sqlbackup.sh (modified) (1 diff)

trunk/bureau/class/export_account.php

@@ -10 +10 @@
-
-$dom->lock();
-
-
-
+
+
+
+
+
+
+
-$dom->unlock();
-

trunk/bureau/class/m_admin.php

@@ -274 +274 @@
-      // Declenchons les autres classes.
-      $mem->su($uid);
-($i=0;$i<count($classes);$i++
-lasses[$i]
-lasses[$i]
+each($classes as $c
+
+
-        }
-      }
@@ -441 +441 @@
-
-      // Send the event to the other classes : 
-($i=0;$i<count($classes);$i++
-lasses[$i]],"alternc_del_member") && $classes[$i]!="dom"
-lasses[$i]
+each($classes as $c
+],"alternc_del_member")
+
-        }
-      }
-
-
-      
-      
-      
-
-      
-      
-      
-
+  
+  
+       
+       
+       
+  
+       
+       
+       
+  
-  }
-

trunk/bureau/class/m_dom.php

@@ -145 +145 @@
-    // Lancement de del_dom sur les classes domain_sensitive :
-    // Declenchons les autres classes.
-($i=0;$i<count($classes);$i++
-lasses[$i]
-lasses[$i]
-
-
-($i=0;$i<count($classes);$i++
-lasses[$i]
-lasses[$i]
+each($classes as $c
+
+
+
+
+each($classes as $c
+
+
-      }
-    }
@@ -259 +259 @@
-    // Lancement de add_dom sur les classes domain_sensitive :
-     // Declenchons les autres classes.    
-($i=0;$i<count($classes);$i++
-lasses[$i]
-lasses[$i]
-
-
-($i=0;$i<count($classes);$i++
-lasses[$i]
-lasses[$i]
+each($classes as $c
+
+
+
+
+each($classes as $c
+
+
-      }
-    }
@@ -756 +756 @@
-    if ($gesmx && !$r["mail"]) { // on a associé le MX : on cree donc l'entree dans LDAP
-      // Lancement de add_dom sur les classes domain_sensitive :
-for($i=0;$i<count($classes);$i++
-      if (method_exists($GLOBALS[$classes[$i]
-lasses[$i]
-      
-       
-
-
-       
+ foreach($classes as $c
+       if (method_exists($GLOBALS[$c
+
+       
+      
+
+
+    
-      // Lancement de del_dom sur les classes domain_sensitive :
-for($i=0;$i<count($classes);$i++
-      if (method_exists($GLOBALS[$classes[$i]
-$GLOBALS[$classes[$i]
-      
-       
-
-
+ foreach($classes as $c
+       if (method_exists($GLOBALS[$c
+  $GLOBALS[$c
+       
+      
+
+
-    $db->query("update domaines set gesdns='$dns', mx='$mx', gesmx='$gesmx' where domaine='$dom'");
-    $db->query("insert into domaines_standby (compte,domaine,mx,gesdns,gesmx,action) values ('$cuid','$dom','$mx','$dns','$gesmx',1);"); 
@@ -777 +777 @@
-    return true;
-  } // edit_domain
-
+
-
-

trunk/bureau/class/m_mem.php

@@ -483 +483 @@
-  }
-
+
+  /* ----------------------------------------------------------------- */
+  /**
+   * Exports all the personnal user related information for an account.
+   * @access private
+   * EXPERIMENTAL 'sid' function ;) 
+   */
+  function alternc_export($tmpdir) {
+    global $db,$err;
+    $err->log("mem","export");
+    $str="<mem>\n";
+
+    foreach ($this->user as $k=>$v) {
+      $str.="   <$k>".xml_entities($v)."</$k>\n";
+    }
+    $str.="</mem>\n";
+    return $str;
+  }
+
+
+
+
-} /* Classe Membre */
-

trunk/bureau/class/m_mysql.php

@@ -394 +394 @@
-        // Do the dump : 
-        $filename=$tmpdir."/mysql.".$db->Record["db"].".sql.gz";
-quote-names
+allow-keywords -Q -f -q -a
-        $str.="  <db>\n";
-        $str.="    <name>".xml_entities($db->Record["db"])."</name>\n";

trunk/bureau/class/m_quota.php

@@ -97 +97 @@
-      $qlist[$key]=_("quota_".$key); // those are specific disks quotas.
-    }
-($i=0;$i<count($classes);$i++
-lasses[$i]
-lasses[$i]
+each($classes as $c
+
+
-        if($res != "") {
-          if (is_array($res)) {
-            foreach($res as $k) {
-              $qlist[$k]=_("quota_".$k);
-lasses[$i]
+
-            }
-          } else {
-            $qlist[$res]=_("quota_".$res);
-lasses[$i]
+
-          }
-        }
@@ -356 +356 @@
-  }
-
+
+  /* ----------------------------------------------------------------- */
+  /**
+   * Exports all the quota related information for an account.
+   * @access private
+   * EXPERIMENTAL 'sid' function ;) 
+   */
+  function alternc_export($tmpdir) {
+    global $db,$err;
+    $err->log("quota","export");
+    $str="<quota>\n";
+
+    $q=$this->getquota();
+    foreach ($q as $k=>$v) {
+      $str.="  <service>\n    <name>".xml_entities($k)."</name>\n";
+      $str.="    <total>".xml_entities($v)."</total>\n  </service>\n";
+    }
+    $str.="</quota>\n";
+    return $str;
+  }
+
+
-} /* Class m_quota */
-

trunk/src/sqlbackup.sh

@@ -60 +60 @@
-              "${target_dir}/${db}.sql.${i}${ext}" 2>/dev/null
-        if [ "$compressed" -eq 1 ]; then
-
+ --add-drop-table --allow-keywords -Q -f -q -a -e 
-                gzip -c > "${target_dir}/${db}.sql${ext}"
-        else
-
+ --add-drop-table --allow-keywords -Q -f -q -a -e 
-                > "${target_dir}/${db}.sql"
-        fi