Changeset 340


Ignore:
Timestamp:
02/22/06 00:08:34 (7 years ago)
Author:
anarcat
Message:

[project @ alternc: changeset 2004-06-02 13:03:13 by anonymous]
ajout de la gestion des comptes d'esclaves DNS correction sql : ajout
de if exists

Original author: anonymous
Date: 2004-06-02 13:03:13

Files:
2 added
5 edited

Legend:

Unmodified
Added
Removed

  • bureau/admin/adm_slaveip.php

    r338 r340  
    11<?php 
    22/* 
    3  $Id: adm_slaveip.php,v 1.1 2004/06/02 12:21:04 anonymous Exp $ 
     3 $Id: adm_slaveip.php,v 1.2 2004/06/02 13:03:13 anonymous Exp $ 
    44 ---------------------------------------------------------------------- 
    55 AlternC - Web Hosting System 
    … …  
    3737if ($delip) { 
    3838        // Delete an ip address/class 
    39         if ($adm->del_slave_ip($delip)) { 
     39        if ($dom->del_slave_ip($delip)) { 
    4040                $error=_("The requested ip address has been deleted. It will be denied in one hour."); 
    4141        } 
    … …  
    4343if ($newip) { 
    4444        // Add an ip address/class 
    45         if ($adm->add_slave_ip($newip,$newclass)) { 
     45        if ($dom->add_slave_ip($newip,$newclass)) { 
    4646                $error=_("The requested ip address has been added to the list. It will be allowed in one hour."); 
     47                unset($newip); unset($newclass); 
    4748        } 
    4849} 
     50 
     51if (!$newclass) $newclass=32; 
    4952 
    5053include("head.php"); 
    … …  
    5861        } 
    5962 
    60 $c=$admin->enum_slave_ip(); 
     63$c=$dom->enum_slave_ip(); 
     64 
     65if (is_array($c)) { 
    6166 
    6267?> 
    … …  
    7580<tr class="lst<?php echo $col; ?>"> 
    7681<td><a href="adm_slaveip.php?delip=<?php echo urlencode($c[$i][ip]); ?>"><?php __("Delete"); ?></a></td> 
    77 <td><?php echo $c[$i][ip]."/".$c[$i][class]; ?></td> 
     82<td><?php echo $c[$i]["ip"]."/".$c[$i]["class"]; ?></td> 
    7883</tr> 
    7984<?php 
    … …  
    8186?> 
    8287</table> 
     88    <?php } ?> 
    8389<p><?php __("If you want to allow an ip address or class to connect to your dns server, enter it here. Choose 32 as a prefix for single ip address."); ?></p> 
    8490<form method="post" action="adm_slaveip.php"> 
    … …  
    8692<tr><th><label for="newip"><?php __("IP Address"); ?></label></th><th><label for="newclass"><?php __("Prefix"); ?></label></th></tr> 
    8793<tr> 
    88         <td style="text-align: right"><input type="text" class="int" value="<?php echo urlencode($newip); ?>" id="newip" name="newip" maxlength="15" size="20" /></td> 
     94        <td style="text-align: right"><input type="text" class="int" value="<?php echo urlencode($newip); ?>" id="newip" name="newip" maxlength="15" size="20" style="text-align:right" /> / </td> 
    8995        <td><input type="text" class="int" value="<?php echo urlencode($newclass); ?>" id="newclass" name="newclass" maxlength="2" size="3" /></td> 
    9096</tr> 
    9197<tr><td colspan="2"> 
    92         <input type="submit" value="<?php __("Add this ip to the slave list"); ?>" /> 
     98        <input type="submit" value="<?php __("Add this ip to the slave list"); ?>" class="inb" /> 
    9399</table> 
    94100 

  • bureau/class/m_dom.php

    r338 r340  
    11<?php 
    22/* 
    3  $Id: m_dom.php,v 1.8 2004/06/02 12:21:04 anonymous Exp $ 
     3 $Id: m_dom.php,v 1.9 2004/06/02 13:03:13 anonymous Exp $ 
    44 ---------------------------------------------------------------------- 
    55 LICENSE 
    … …  
    745745        global $db,$err; 
    746746        $db->query("SELECT * FROM slaveip;"); 
    747         $res=array(); 
    748         while ($db->next_record()) { 
    749                 $res[]=$db->Record; 
    750         } 
    751         if (!count($res)) return false; 
     747        if (!$db->next_record()) { 
     748          return false; 
     749        } 
     750        do { 
     751          $res[]=$db->Record; 
     752        } while ($db->next_record()); 
    752753        return $res; 
    753754  } 
    … …  
    765766        $class=intval($class); 
    766767        if ($class<8 || $class>32) $class=32; 
    767         $db->query("INSERT INTO slaveip (ip,class) VALUES ('$ip','$class'); 
     768        $db->query("SELECT * FROM slaveip WHERE ip='$ip' AND class='$class';"); 
     769        if ($db->next_record()) { 
     770          $err->raise("err",22); 
     771          return false; 
     772        } 
     773        $db->query("INSERT INTO slaveip (ip,class) VALUES ('$ip','$class');"); 
    768774        $f=fopen("/etc/alternc/refresh_slave","w"); 
    769775        fputs($f,"yopla"); 
    … …  
    776782   * Remove an ip address (or a ip class) from the list of allowed slave ip access list. 
    777783   */ 
    778   function remove_slave_ip($ip) { 
     784  function del_slave_ip($ip) { 
    779785        global $db,$err; 
    780786        if (!checkip($ip)) { 
    … …  
    782788                return false; 
    783789        } 
    784         $db->query("DELETE FROM slaveip WHERE ip='$ip'); 
     790        $db->query("DELETE FROM slaveip WHERE ip='$ip'"); 
    785791        $f=fopen("/etc/alternc/refresh_slave","w"); 
    786792        fputs($f,"yopla"); 
    787793        fclose($f);      
     794        return true; 
     795  } 
     796 
     797 
     798 
     799  /* ----------------------------------------------------------------- */ 
     800  /** 
     801   * Return the list of allowed slave accounts  
     802   */ 
     803  function enum_slave_account() { 
     804        global $db,$err; 
     805        $db->query("SELECT * FROM slaveaccount;"); 
     806        $res=array(); 
     807        while ($db->next_record()) { 
     808                $res[]=$db->Record; 
     809        } 
     810        if (!count($res)) return false; 
     811        return $res; 
     812  } 
     813 
     814  /* ----------------------------------------------------------------- */ 
     815  /** 
     816   * Add a slave account that will be allowed to access the domain list 
     817   */ 
     818  function add_slave_account($login,$pass) { 
     819        global $db,$err; 
     820        $db->query("SELECT * FROM slaveaccount WHERE login='$login'"); 
     821        if ($db->next_record()) { 
     822          $err->raise("err",23); 
     823          return false; 
     824        } 
     825        $db->query("INSERT INTO slaveaccount (login,pass) VALUES ('$login','$pass')"); 
     826        return true; 
     827  } 
     828 
     829  /* ----------------------------------------------------------------- */ 
     830  /** 
     831   * Remove a slave account 
     832   */ 
     833  function del_slave_account($login) { 
     834        global $db,$err; 
     835        $db->query("DELETE FROM slaveaccount WHERE login='$login')"); 
    788836        return true; 
    789837  } 

  • install/scripts/mysql.sql

    r339 r340  
    11# 
    2 # $Id: mysql.sql,v 1.21 2004/06/02 12:40:08 anonymous Exp $ 
     2# $Id: mysql.sql,v 1.22 2004/06/02 13:03:13 anonymous Exp $ 
    33# ---------------------------------------------------------------------- 
    44# AlternC - Web Hosting System 
    … …  
    3939###################################################################### 
    4040 
    41 CREATE TABLE `slaveip` ( 
     41CREATE TABLE IF NOT EXISTS `slaveip` ( 
    4242`ip` VARCHAR( 15 ) NOT NULL , 
    4343`class` TINYINT NOT NULL , 
    … …  
    4545) COMMENT = 'Allowed ip for slave dns managment'; 
    4646 
     47CREATE TABLE IF NOT EXISTS `slaveaccount` ( 
     48`login` VARCHAR( 64 ) NOT NULL , 
     49`pass`  VARCHAR( 64 ) NOT NULL , 
     50PRIMARY KEY ( `login` ) 
     51) COMMENT = 'Allowed account for slave dns managment'; 
    4752 
    4853#  
    … …  
    5055#  
    5156 
    52 CREATE TABLE `mail_alias` ( 
     57CREATE TABLE IF NOT EXISTS `mail_alias` ( 
    5358  `mail` varchar(255) NOT NULL default '',      # Adresse email LOCALE 
    5459  `alias`, varchar(255) NOT NULL default ''     # WRAPPER  
    … …  
    6873 
    6974 
    70 CREATE TABLE `mail_domain` ( 
     75CREATE TABLE IF NOT EXISTS `mail_domain` ( 
    7176  `mail` varchar(255) NOT NULL default '',      # Adresse email COMPLETE (login@domaine) 
    7277  `alias` text NOT NULL,                        # Alias intermédiaire (login_domaine) pour référence dans users 

  • install/scripts/upgrades/0.9.1.sql

    r339 r340  
    11DROP TABLE `mime`; 
    22 
    3 CREATE TABLE `slaveip` ( 
     3CREATE TABLE IF NOT EXISTS `slaveip` ( 
    44`ip` VARCHAR( 15 ) NOT NULL , 
    55`class` TINYINT NOT NULL , 
    … …  
    77) COMMENT = 'Allowed ip for slave dns managment'; 
    88 
    9 CREATE TABLE `mail_alias` ( 
     9CREATE TABLE IF NOT EXISTS `slaveaccount` ( 
     10`login` VARCHAR( 64 ) NOT NULL , 
     11`pass`  VARCHAR( 64 ) NOT NULL , 
     12PRIMARY KEY ( `login` ) 
     13) COMMENT = 'Allowed account for slave dns managment'; 
     14 
     15CREATE TABLE IF NOT EXISTS `mail_alias` ( 
    1016  `mail` varchar(255) NOT NULL default '',      # Adresse email LOCALE 
    1117  `alias`, varchar(255) NOT NULL default ''     # WRAPPER  
    … …  
    2531 
    2632 
    27 CREATE TABLE `mail_domain` ( 
     33CREATE TABLE IF NOT EXISTS `mail_domain` ( 
    2834  `mail` varchar(255) NOT NULL default '',      # Adresse email COMPLETE (login@domaine) 
    2935  `alias` text NOT NULL,                        # Alias intermédiaire (login_domaine) pour référence dans users 

  • modules/dom

    r257 r340  
    1010admin/dom_subdoedit.php 
    1111admin/dom_subedit.php 
     12admin/adm_slaveip.php 
     13admin/adm_slaveaccount.php 
Note: See TracChangeset for help on using the changeset viewer.