phpftpadmin-cvs — Automatic mail on cvs change (commitlog)

[Phpftpadmin-cvs] phpFTPAdmin/include config.php,1.1,1.2 database.php,1.1,1.2 domain.php,1.1,1.2 pre.php,1.2,1.3

[<cn...@us...>]

Update of /cvsroot/phpftpadmin/phpFTPAdmin/include
In directory sc8-pr-cvs1:/tmp/cvs-serv1642/include

Modified Files:
	config.php database.php domain.php pre.php 
Log Message:


Index: config.php
===================================================================
RCS file: /cvsroot/phpftpadmin/phpFTPAdmin/include/config.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** config.php	11 Sep 2002 20:18:32 -0000	1.1
--- config.php	27 Apr 2003 11:06:46 -0000	1.2
***************
*** 1,7 ****
  <?php
  
! // $Id$
! 
! // vim: set fdm=marker:
  
  define('PFA_CONFIG', '/etc/pureftpd-mysql.conf');
--- 1,5 ----
  <?php
  
! /* $Id$ */
  
  define('PFA_CONFIG', '/etc/pureftpd-mysql.conf');
***************
*** 9,20 ****
  define('PFA_FTP_HOME', '/home/pureftpd');
  
! define('PFA_QUOTAFILES_DEFAULT', '5000');
! define('PFA_QUOTASIZE_DEFAULT', '50000');
! 
! define('PFA_ULRATIO_DEFAULT', '5');
! define('PFA_DLRATIO_DEFAULT', '5');
  
! define('PFA_ULBANDWIDTH_DEFAULT', '5');
! define('PFA_DLBANDWIDTH_DEFAULT', '5');
  
  ?>
--- 7,25 ----
  define('PFA_FTP_HOME', '/home/pureftpd');
  
! /* {{{ defaults */
! /**
! * Defaults
! */
! define('PFA_DEFAULT_QUOTAFILES' , '5000');
! define('PFA_DEFAULT_QUOTASIZE'  , '50000');
! define('PFA_DEFAULT_ULRATIO'    , '5');
! define('PFA_DEFAULT_DLRATIO'    , '5');
! define('PFA_DEFAULT_ULBANDWIDTH', '5');
! define('PFA_DEFAULT_DLBANDWIDTH', '5');
! define('PFA_DEFAULT_UID'        , '1000');
! define('PFA_DEFAULT_GID'        , '1000');
! /* }}} */
  
! define('SMARTY_DIR', '/home/cnb/lib/php/smarty/');
  
  ?>

Index: database.php
===================================================================
RCS file: /cvsroot/phpftpadmin/phpFTPAdmin/include/database.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** database.php	11 Sep 2002 20:11:36 -0000	1.1
--- database.php	27 Apr 2003 11:06:46 -0000	1.2
***************
*** 3,15 ****
  // $Id$
  
! require('/home/cnb/lib/php/adodb/adodb.inc.php');
! 
! $Table_MailStats = 'mailstats';
  
! $DB = NewADOConnection('mysql');
  
! $DB->SetFetchMode(ADODB_FETCH_ASSOC);
  
! $DB->PConnect('localhost', 'root', '', 'qmailstats') or die($DB->ErrorMsg());
  
  ?>
--- 3,15 ----
  // $Id$
  
! require 'DB.php';
  
! $dsn = 'mysql://root@localhost/pureftpd';
  
! if (DB::isError($db = DB::connect($dsn, true))) {
! 	die($db->getMessage());
! }
  
! $db->setFetchMode(DB_FETCHMODE_ASSOC);
  
  ?>

Index: domain.php
===================================================================
RCS file: /cvsroot/phpftpadmin/phpFTPAdmin/include/domain.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** domain.php	12 Sep 2002 10:46:28 -0000	1.1
--- domain.php	27 Apr 2003 11:06:46 -0000	1.2
***************
*** 52,53 ****
--- 52,79 ----
  
  // }}}
+ // {{{ user_list()
+ /**
+ * Gets all users in a domain
+ *
+ * @param int $domain_id
+ * @return mixed
+ */
+ function user_list($domain_id)
+ {
+         $sql = "SELECT
+                         *
+                 FROM
+                         users
+                 WHERE
+                         domain_id='$domain_id'";
+ 
+         $rows = $GLOBALS['db']->getAll($sql);
+ 
+         if (DB::isError($rows)) {
+                 die($rs->getMessage());
+         }
+ 	
+ 	return $rows;
+ }
+ 
+ // }}}

Index: pre.php
===================================================================
RCS file: /cvsroot/phpftpadmin/phpFTPAdmin/include/pre.php,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** pre.php	11 Sep 2002 20:19:25 -0000	1.2
--- pre.php	27 Apr 2003 11:06:47 -0000	1.3
***************
*** 1,15 ****
  <?php
  
! // $Id$
! 
! // vim: set fdm=marker:
  
  /**
  * Included in every page before anything else
  */
! require('session.php');
! require('config.php');
! require('database.php');
! require('smarty.php');
  
  ?>
--- 1,15 ----
  <?php
  
! /* $Id$ */
  
  /**
  * Included in every page before anything else
  */
! require 'session.php';
! require 'config.php';
! require 'database.php';
! require 'smarty.php';
! 
! require 'domain.php';
  
  ?>

[Phpftpadmin-cvs] phpFTPAdmin domain_add.php,1.1,1.2 domains.php,1.1,1.2 users.php,1.1,1.2 user_add.php,1.2,NONE user_del.php,1.1,NONE user_edit.php,1.1,NONE

[<cn...@us...>]

Update of /cvsroot/phpftpadmin/phpFTPAdmin
In directory sc8-pr-cvs1:/tmp/cvs-serv1642

Modified Files:
	domain_add.php domains.php users.php 
Removed Files:
	user_add.php user_del.php user_edit.php 
Log Message:


Index: domain_add.php
===================================================================
RCS file: /cvsroot/phpftpadmin/phpFTPAdmin/domain_add.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** domain_add.php	11 Sep 2002 19:54:03 -0000	1.1
--- domain_add.php	27 Apr 2003 11:06:44 -0000	1.2
***************
*** 4,5 ****
--- 4,20 ----
  
  // vim: set fdm=marker:
+ 
+ require 'pre.php';
+ 
+ if (isset($_POST['submit'])) {
+ 
+ 	domain_add($_POST['domain'], $_POST['quota']);
+ 
+ } else {
+ 
+ 	$s = new Smarty_MY;
+ 
+ 	$s->display('domain_add.tpl');
+ }
+ 
+ ?>

Index: domains.php
===================================================================
RCS file: /cvsroot/phpftpadmin/phpFTPAdmin/domains.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** domains.php	11 Sep 2002 19:54:03 -0000	1.1
--- domains.php	27 Apr 2003 11:06:45 -0000	1.2
***************
*** 4,5 ****
--- 4,17 ----
  
  // vim: set fdm=marker:
+ 
+ require 'pre.php';
+ 
+ $rows = domain_list();
+ 
+ $s = new Smarty_MY;
+ 
+ $s->assign('rows', $rows);
+ 
+ $s->display('domain_list.tpl');
+ 
+ ?>

Index: users.php
===================================================================
RCS file: /cvsroot/phpftpadmin/phpFTPAdmin/users.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** users.php	11 Sep 2002 19:54:03 -0000	1.1
--- users.php	27 Apr 2003 11:06:45 -0000	1.2
***************
*** 1,5 ****
  <?php
  
! // $Id$
  
! // vim: set fdm=marker:
--- 1,69 ----
  <?php
  
! /* $Id$ */
  
! define('PFA_BASE', dirname(__FILE__));
! 
! require PFA_BASE . '/include/pre.php';
! require PFA_BASE . '/include/Driver.php';
! 
! // {{{ get actionID
! if (empty($_GET['actionID'])) {
! 
!     $action = $_POST['actionID'];
! 
! } else {
! 
!         $action = $_GET['actionID'];
! } // }}}
!         
! $p = PFA_Driver::factory('sql');
! 
! $s = new Smarty_MY;
! 
! switch ($actionID) {
!     
!     case 'listUsers': // {{{
!     
!         $s->assign('users', $p->listUsers());
! 
!         $s->display('users.tpl');
! 
!         break; // }}}
! 
!     case 'user_add': // {{{
!     
!         $s->display('user_add.tpl');
! 
!         if ($_POST['submit']) {
! 
!             $p->addUser($_POST['user']);
!         }
! 
!         break; // }}}
! 
!     case 'user_del': // {{{
!     
!         $p->delUser($_GET['User']);
! 
!         header('Location: users.php');
! 
!         break; // }}}
! 
!     case 'user_edit': // {{{
! 
!         break; // }}}
! 
!     case 'user_detail': // {{{
! 
!         $s->assign('users', $p->listUsers());
! 
!         $s->display('users.tpl');
! 
!         break; // }}}
! 
!     default:   // {{{
! 
!         break; // }}}
! 
! }

--- user_add.php DELETED ---

--- user_del.php DELETED ---

--- user_edit.php DELETED ---