Changeset 1804

Timestamp:

04/29/07 22:50:17 (1 year ago)

Author:

franck

Message:

Oublier les class :/

Files:

• alternc/branches/franck-desktop/bureau/class/config.php (modified) (5 diffs)
• alternc/branches/franck-desktop/bureau/class/db_mysql.php (modified) (3 diffs)
• alternc/branches/franck-desktop/bureau/class/error_handler.php (added)
• alternc/branches/franck-desktop/bureau/class/functions.php (modified) (3 diffs)
• alternc/branches/franck-desktop/bureau/class/lang_env.php (modified) (4 diffs)
• alternc/branches/franck-desktop/bureau/class/m_admin.php (modified) (5 diffs)
• alternc/branches/franck-desktop/bureau/class/m_bro.php (modified) (5 diffs)
• alternc/branches/franck-desktop/bureau/class/m_dom.php (modified) (1 diff)
• alternc/branches/franck-desktop/bureau/class/m_ftp.php (modified) (4 diffs)
• alternc/branches/franck-desktop/bureau/class/m_hta.php (modified) (2 diffs)
• alternc/branches/franck-desktop/bureau/class/m_mail.php (modified) (1 diff)
• alternc/branches/franck-desktop/bureau/class/m_mailman.php (modified) (9 diffs)
• alternc/branches/franck-desktop/bureau/class/m_mem.php (modified) (10 diffs)
• alternc/branches/franck-desktop/bureau/class/m_mysql.php (modified) (2 diffs)
• alternc/branches/franck-desktop/bureau/class/m_quota.php (modified) (3 diffs)
• alternc/branches/franck-desktop/bureau/class/m_sta2.php (modified) (12 diffs)
• alternc/branches/franck-desktop/bureau/class/variables.php (modified) (2 diffs)

alternc/branches/franck-desktop/bureau/class/config.php

@@ -45 +45 @@
-}
-*/
+error_reporting(E_ALL);
-
-// 1. Get a semaphore id for the alternc magic number (18577)
@@ -68 +69 @@
-}
-
+$error = "";
+
-/* PHPLIB inclusions : */
-$root="/var/alternc/bureau/";
-/* Server Domain Name */
-$host=getenv("HTTP_HOST");
+
+/* Custom PHP debugger */
+require_once($root."class/error_handler.php");
+$queryCount = 0;
-
-/* Global variables (AlternC configuration) */
@@ -78 +85 @@
-require_once($root."class/db_mysql.php");
-require_once($root."class/functions.php");
-require_once($root."class/functions2.php");
-require_once($root."class/variables.php");
-
+$tempsDebut = microtimeFloat();
+
-// Redirection si appel https://(!fqdn)/
-$_SERVER["HTTPS"] == "on" && $host !
+(empty($_SERVER["HTTPS"]) || $_SERVER["HTTPS"] != "on") && $host =
-{
-        header("Location: https://$L_FQDN/");
@@ -116 +124 @@
-
-
-=
+ = 
-/* CLASSES PHP4 : automatic include : */
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-}
-closedir($c);
@@ -136 +145 @@
-bindtextdomain("alternc", "/var/alternc/bureau/locales");
-
-$do_not_set_lang_env
+isset($do_not_set_lang_env)
-  include("lang_env.php");
-}
-
-=
-=
+ = 
+ = 
-
-/* Check the User identity (if required) */
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-}
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
-}
-

alternc/branches/franck-desktop/bureau/class/db_mysql.php

@@ -124 +124 @@
-  */
-  function query($Query_String) {
+    global $queryCount;
-    /* No empty queries, please, since PHP4 chokes on them. */
-    if ($Query_String == "")
@@ -137 +138 @@
-
-    # New query, discard previous result.
-$this->Query_ID
+is_resource($this->Query_ID)
-      $this->free();
-    }
@@ -153 +154 @@
-
-    # Will return nada if it fails. That's fine.
+    $queryCount++;
-    return $this->Query_ID;
-  }

alternc/branches/franck-desktop/bureau/class/functions.php

@@ -75 +75 @@
-}
-
- 
- 
+
+
-*/
-function checkhostallow_nodns($domain) {
@@ -328 +328 @@
-
-/* ----------------------------------------------------------------- */
- 
+
- * @param string $string Chaine de caractère à encoder en valeur xml.
- * @return string Retourne la chaîne modifiée si besoin.
@@ -382 +382 @@
-}
-
+/* ---------------------- */
+
+function getFields($fields, $requestOnly = false)
+{
+        $vars = array();
+        $methodType = array ("get", "post", "request", "files");
+
+        foreach ($fields AS $name => $options)
+        {
+                if (in_array($options[0], $methodType) === false)
+                        die ("Illegal method type used for field " . $name . " : " . $options[0]);
+
+                if ($requestOnly === true)
+                        $method = "_REQUEST";
+                else
+                        $method = "_" . strtoupper($options[0]);
+
+                switch ($options[1])
+                {
+                        case "integer":
+
+                                $vars[$name] = (isset($GLOBALS[$method][$name]) && is_numeric($GLOBALS[$method][$name]) ? intval($GLOBALS[$method][$name]) : $options[2]);
+                                break;
+
+                        case "float":
+
+                                $vars[$name] = (isset($GLOBALS[$method][$name]) && is_numeric($GLOBALS[$method][$name]) ? floatval($GLOBALS[$method][$name]) : $options[2]);
+                                break;
+
+                        case "string":
+
+                                $vars[$name] = (isset($GLOBALS[$method][$name]) ? trim($GLOBALS[$method][$name]) : $options[2]);
+                                break;
+
+                        case "array":
+
+                                $vars[$name] = (isset($GLOBALS[$method][$name]) && is_array($GLOBALS[$method][$name]) ? $GLOBALS[$method][$name] : $options[2]);
+                                break;
+
+                        case "boolean":
+
+                                $vars[$name] = (isset($GLOBALS[$method][$name]) ? $GLOBALS[$method][$name] : $options[2]);
+                                break;
+
+                        case "file":
+
+                                $vars[$name] = (isset($GLOBALS[$method][$name]) ? $GLOBALS[$method][$name] : $options[2]);
+                                break;
+
+                        default:
+                    die ("Illegal method type used for field " . $name . " : " . $options[1]);
+                }
+        }
+
+        // Insert into $GLOBALS
+        foreach ($vars AS $var => $value)
+                $GLOBALS[$var] = $value;
+
+        return $vars;
+}
+
+function printVar($array)
+{
+        echo "<pre style=\"border: 1px solid black; text-align: left; font-size: 9px\">\n";
+        print_r($array);
+        echo "</pre>\n";
+}
+
+function startBox($boxClass)
+{
+        echo "<table class=\"" . $boxClass . "\">";
+        echo "<tr>";
+        echo "<td class=\"boxTopLeft\"></td>";
+        echo "<td class=\"boxTop\"></td>";
+        echo "<td class=\"boxTopRight\"></td>";
+        echo "</tr>";
+        echo "<tr>";
+        echo "<td class=\"boxLeft\"></td>";
+        echo "<td class=\"boxContent\">";
+}
+
+function endBox()
+{
+        echo "</td>";
+        echo "<td class=\"boxRight\"></td>";
+        echo "</tr>";
+        echo "<tr>";
+        echo "<td class=\"boxBottomLeft\"></td>";
+        echo "<td class=\"boxBottom\"></td>";
+        echo "<td class=\"boxBottomRight\"></td>";
+        echo "</tr>";
+        echo "</table>";
+}
+
+function microtimeFloat()
+{
+        return array_sum(explode(" ", microtime()));
+}
+
-?>

alternc/branches/franck-desktop/bureau/class/lang_env.php

@@ -18 +18 @@
-// setlang is on the link at the login page
-if (isset($_REQUEST["setlang"])) {
-=
+ = 
-}
-
@@ -25 +25 @@
-update_locale();
-
-$lang
-HTTP_ACCEPT_LANGUAGE
+isset($lang)
+_SERVER["HTTP_ACCEPT_LANGUAGE"]
-}
-
-
-
+
-  // treat special cases such as en_AU or fr_BF : use the language only, not the country.
-  $ll=substr($lang,0,2);
@@ -41 +40 @@
-}
-
-
+
+
-
-
-
+
+
+
-}
-
@@ -51 +52 @@
-
-/* Language ok, set the locale environment */
-$lang"
-$lang"
-$lang"
+" . $lang
+" . $lang
+" . $lang
-// this locale MUST be selected in "dpkg-reconfigure locales"
-
+ 
-textdomain("alternc");
-

alternc/branches/franck-desktop/bureau/class/m_admin.php

@@ -128 +128 @@
-
-  /* ----------------------------------------------------------------- */
+  /** Retourne la liste des lettres pour lesquelles un utilisateur a
+   * des membres
+   * Retourne un tableau indexé où se trouvent les lettres
+   * @return array Tableau de lettres ou FALSE si erreur
+   */
+  function get_letters() {
+    global $err,$mem,$cuid,$db;
+    $err->log("admin","get_letters");
+    if ($mem->user["uid"]==2000)
+        $db->query("SELECT LEFT(login,1) as letter FROM membres GROUP BY letter ORDER BY letter;");
+    else
+        $db->query("SELECT LEFT(login,1) as letter FROM membres where uid='$cuid' GROUP BY letter ORDER BY letter;");
+    $res=array();
+    while($db->next_record()) {
+      $res[]=$db->f("letter");
+    }
+    return $res;
+  }
+
+  /* ----------------------------------------------------------------- */
-  /**
-   * Returns the list of the hosted accounts
@@ -147 +167 @@
-   *
-   */
-
+, $letter = ""
-    // PATCHBEN pour ne voir que les comptes que l'on a créé (sauf admin)
-    global $err,$mem,$cuid;
@@ -156 +176 @@
-    }
-    $db=new DB_System();
-
-
+
+
+
+
+
-    } else {
-='".$cuid."'
+ = '" . $cuid . "'" . $letterQuery . "
-    }
-    if ($db->num_rows()) {
@@ -343 +366 @@
-    if (($db->query("UPDATE local SET nom='$nom', prenom='$prenom' WHERE uid='$uid';"))
-        &&($db->query("UPDATE membres SET mail='$mail', canpass='$canpass', enabled='$enabled', type='$type' $ssq WHERE uid='$uid';"))){
-$_POST['reset_quotas'
+isset($_POST['reset_quotas']) && $_POST["reset_quotas"
-        $quota->addquotas();
-      $this->renew_update($uid, $duration);
@@ -573 +596 @@
-  function renew_get_expiring_accounts() {
-    global $db;
-
+
-    if(!$db->query("SELECT *, m.renewed + INTERVAL duration MONTH 'expiry'," .
-                   " CASE WHEN m.duration IS NULL THEN 0" .

alternc/branches/franck-desktop/bureau/class/m_bro.php

@@ -128 +128 @@
-  function filelist($dir="") {
-    global $db,$cuid;
+    $c = array();
-    $db->query("UPDATE browser SET lastdir='$dir' WHERE uid='$cuid';");
-    $absolute=$this->convertabsolute($dir,0);
@@ -393 +394 @@
-   */
-  function UploadFile($R) {
-_FILES,$
+
-    $absolute=$this->convertabsolute($R,0);
-    if (!$absolute) {
@@ -424 +425 @@
-   */
-  function PathList($path,$action) {
+    $c = "";
+    $R = "";
-    $path=$this->convertabsolute($path,1);
-    $a=explode("/",$path);
@@ -482 +485 @@
-    if (substr($dir,0,1)=="/") $dir=substr($dir,1);
-    if (substr($dir,-1)=="/") $dir=substr($dir,0,-1);
-$this->cacheurl["d".$dir]
+isset($this->cacheurl["d".$dir])
-      // On parcours $dir en remontant les /
-      $end="";  $beg=$dir;      $tofind=true;
@@ -507 +510 @@
-      }
-    }
-$this->cacheurl["d".$dir]
+isset($this->cacheurl["d".$dir])
-      return $this->cacheurl["d".$dir]."/".$name;
-    } else {

alternc/branches/franck-desktop/bureau/class/m_dom.php

@@ -572 +572 @@
-    $r["mail"]=$db->Record["gesmx"];
-    $r["mx"]=$db->Record["mx"];
-noerase]=$db->Record[noerase
+"noerase"]=$db->Record["noerase"
-    $db->free();
-    $db->query("select count(*) as cnt from sub_domaines where compte='$cuid' and domaine='$dom'");

alternc/branches/franck-desktop/bureau/class/m_ftp.php

@@ -99 +99 @@
-      }
-      return array(
-=>
-
-=>$lg[1]
-=>
+      => 
+ 
+   => isset($lg[1]) ? $lg[1] : ""
+     => 
-                   );
-    } else {
@@ -311 +311 @@
-
-  /* ----------------------------------------------------------------- */
- 
+
-   * Returns the used quota for the $name service for the current user.
- 
+
-   * @return integer the number of service used or false if an error occured
-   * @access private
@@ -332 +332 @@
-   * Exporte toutes les informations ftp du compte AlternC
-   * @access private
- 
+
-   */
-  function alternc_export() {
@@ -349 +349 @@
-    return $str;
-  }
-
-
+
+
-} /* Class m_ftp */
-

alternc/branches/franck-desktop/bureau/class/m_hta.php

@@ -96 +96 @@
-    for ($i=0;$i<count($sortie);$i++){
-      preg_match("/^\/var\/alternc\/html\/.\/[^\/]*\/(.*)\/\.htpasswd/", $sortie[$i], $matches);
-=$matches[1].
+ = (isset($matches[1]) ? $matches[1] : "") . 
-    }
-    return $r;
@@ -205 +205 @@
-      }
-      fseek($file,SEEK_END);
-
+isset($t[1]) && 
-        fwrite($file,"\n");
-      }

alternc/branches/franck-desktop/bureau/class/m_mail.php

@@ -182 +182 @@
-      $account=str_replace($login,"",$db->f("alias"));
-    } else {
+        $login = "";
-      $account=$db->f("alias");
-    }

alternc/branches/franck-desktop/bureau/class/m_mailman.php

@@ -29 +29 @@
-*/
-class m_mailman {
-
+
-  /* ----------------------------------------------------------------- */
-  function m_mailman() {
-  }
-
+
-  /* ----------------------------------------------------------------- */
-  /**
@@ -63 +63 @@
-    return $mls;
-  }
-
+
-  /*****************************************************************************/
-  function prefix_list() {
@@ -85 +85 @@
-    return true;
-  }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  /*****************************************************************************/
-  /** Create a new list for this member : */
@@ -91 +111 @@
-    global $db,$err,$quota,$mail,$cuid;
-    $err->log("mailman","add_lst",$login."@".$domain." - ".$owner);
-
+
-    if ($login=="") {
-      $err->raise("mailman",2);
@@ -116 +136 @@
-    }
-    // Prefixe OK, on verifie la non-existence des mails que l'on va créer...
- 
- 
- 
- 
- 
- 
- 
- 
- 
+
+
+
+
+
+
+
+
+
-        !$mail->available($login."-unsubscribe@".$domain)) {
-      // This is a mail account already !!!
@@ -132 +152 @@
-    // Le compte n'existe pas, on vérifie le quota et on le créé.
-    if ($quota->cancreate("mailman")) {
- 
+
-      // CA NE MARCHE PAS !
- 
+
-      $db->query("INSERT INTO mailman (uid,list,domain,name) VALUES ('$cuid','$login','$domain','$name');");
- 
- 
- 
- 
- 
- 
+
+
+
+
+
+
-          !$mail->add_wrapper($login."-join",$domain,"/var/lib/mailman/mail/mailman join $name","mailman") ||
- 
- 
+
+
-          !$mail->add_wrapper($login."-unsubscribe",$domain,"/var/lib/mailman/mail/mailman unsubscribe $name","mailman")
-          ) {
-        $mail->del_wrapper($login,$domain);             $mail->del_wrapper($login."-request",$domain);
-        $mail->del_wrapper($login."-owner",$domain);    $mail->del_wrapper($login."-admin",$domain);
- 
+
-        $mail->del_wrapper($login."-join",$domain);     $mail->del_wrapper($login."-leave",$domain);
-        $mail->del_wrapper($login."-subscribe",$domain);        $mail->del_wrapper($login."-unsubscribe",$domain);
@@ -163 +183 @@
-    }
-  }
-
+
-  /*****************************************************************************/
-  function delete_lst($id) {
-    global $db,$err,$mail,$cuid;
-    $err->log("mailman","delete_lst",$id);
-
+
-    $db->query("SELECT * FROM mailman WHERE id=$id and uid='$cuid';");
-    $db->next_record();
@@ -181 +201 @@
-    $mail->del_wrapper($login,$domain);         $mail->del_wrapper($login."-request",$domain);
-    $mail->del_wrapper($login."-owner",$domain);        $mail->del_wrapper($login."-admin",$domain);
- 
+
-    $mail->del_wrapper($login."-join",$domain); $mail->del_wrapper($login."-leave",$domain);
-    $mail->del_wrapper($login."-subscribe",$domain);    $mail->del_wrapper($login."-unsubscribe",$domain);
@@ -188 +208 @@
-
-  /* ----------------------------------------------------------------- */
- 
- 
+
+
-   */
- function members($id) {

alternc/branches/franck-desktop/bureau/class/m_mem.php

@@ -33 +33 @@
-  /** Original uid for the temporary uid swapping (for administrators) */
-  var $olduid=0;
-
+
-  /** This array contains the Tableau contenant les champs de la table "membres" du membre courant
-   * Ce tableau est utilisable globalement par toutes les classes filles.
@@ -67 +67 @@
-   * @return boolean TRUE if the user has been successfully connected, or FALSE if an error occured.
-   */
-$password,$restrictip=
-$session,$err,
-"login",
+ $password, $restrictip = 
+ $err, 
+ "login", 
-    //    $username=addslashes($username);
-    //    $password=addslashes($password);
-select * from membres where login='$username
+SELECT * FROM membres WHERE login = '" . $username . "
-    if ($db->num_rows()==0) {
-      $err->raise("mem",1);
@@ -82 +82 @@
-      $err->raise("mem",1);
-      return false;
- 
+
-    if (!$db->f("enabled")) {
-      $err->raise("mem",2);
@@ -95 +95 @@
-    $db->query("DELETE FROM sessions WHERE DATE_ADD(ts,INTERVAL 2 DAY)<NOW();");
-    /* Open the session : */
-=
+ = 
-    $db->query("insert into sessions (sid,ip,uid) values ('$session',$ip,'$cuid');");
-    setcookie("session",$session,0,"/");
@@ -113 +113 @@
-   * account (for good), and su allow any user to become another account for some commands only.
-   * (del_user, add_user ...) and allow to bring back admin rights with unsu
- 
+
-   * @param $id integer User id where we will connect to.
-   * @return boolean TRUE if the user has been successfully connected, FALSE else.
-   */
-  function setid($id) {
-session,$
+
-    $err->log("mem","setid",$username);
-    $db->query("select * from membres where uid='$id';");
@@ -162 +162 @@
-   * @return TRUE si la session est correcte, FALSE sinon.
-   */
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-  /* ----------------------------------------------------------------- */
@@ -238 +242 @@
-   */
-  function del_session() {
-session,$
+
-    $err->log("mem","del_session");
-=addslashes($session)
+ = isset($_COOKIE["session"]) ? addslashes($_COOKIE["session"]) : ""
-    setcookie("session","",0,"/");
-    if ($session=="") {
@@ -355 +359 @@
-Note : si vous n'avez pas fait cette demande, cela signifie que
-quelqu'un l'a faite pour vous. Vous pouvez donc ignorer ce message.
- 
+
-de votre serveur.
-
@@ -466 +470 @@
-  function show_help($file) {
-    global $err;
-,$show
+
-    if ($this->user["show_help"]) {
-      $hlp=_("hlp_$file");
@@ -487 +491 @@
-   * Exports all the personnal user related information for an account.
-   * @access private
- 
+
-   */
-  function alternc_export($tmpdir) {

alternc/branches/franck-desktop/bureau/class/m_mysql.php

@@ -517 +517 @@
-        $r[]=array("db"=>$dblist[$i]["name"], "select"=>$db->f("Select_priv"), "insert"=>$db->f("Insert_priv"), "update"=>$db->f("Update_priv"), "delete"=>$db->f("Delete_priv"), "create"=>$db->f("Create_priv"), "drop"=>$db->f("Drop_priv"), "references"=>$db->f("References_priv"), "index"=>$db->f("Index_priv"), "alter"=>$db->f("Alter_priv"), "create_tmp"=>$db->f("Create_tmp_table_priv"), "lock"=>$db->f("Lock_tables_priv"));
-      else
-C
+c
-    }
-
@@ -525 +525 @@
-  function set_user_rights($user,$dbn,$rights) {
-    global $mem, $db;
-
+
-    $usern=addslashes($mem->user["login"].($user?"_":"").$user);
-    $dbname=addslashes($mem->user["login"].($dbn?"_":"").$dbn);

alternc/branches/franck-desktop/bureau/class/m_quota.php

@@ -130 +130 @@
-    } else {
-      while ($db->next_record()) {
-
+               
-      }
-      foreach ($ttmp as $tt) {
-        $g=array("t"=>$tt["total"],"u"=>0);
-
-
-
+
+
+
+
+
+
+
+
-        $this->quotas[$tt["name"]]=$g;
-      }
@@ -144 +149 @@
-      $a=array();
-      exec("/usr/lib/alternc/quota_get ".$cuid." ".$val,$a);
-
+
+
+
+
+
-    }
-
@@ -163 +172 @@
-    $err->log("quota","setquota",$ressource."/".$size);
-    if (intval($size)==0) $size="0";
-$this->disk[$ressource]
+isset($this->disk[$ressource])
-      // It's a disk resource, update it with shell command
-      exec("/usr/lib/alternc/quota_edit $cuid $size");
-      // Now we check that the value has been written properly :
-      exec("/usr/lib/alternc/quota_get ".$cuid,$a);
-$size!=
+isset($a[1]) && $size != 
-                                $err->raise("quota",1);
-                                return false;

alternc/branches/franck-desktop/bureau/class/m_sta2.php

@@ -31 +31 @@
-/**
-* This class manages raw Apache log file for the end users.
- 
- 
+
+
-* file put in its user space every day. <br>
-* The file is stored in the user space and will grow from time to time...
- 
+
-* @copyright    AlternC's Team 2002-2005 http://alternc.org/
- 
+
-*/
-class m_sta2 {
@@ -50 +50 @@
-  /* ----------------------------------------------------------------- */
-  /** Hook function that returns the quota names for this class
- 
+
-   * @return string the quota names for this class
-   */
-  function alternc_quota_names() {
-    return "sta2";
- 
+