From cvs w lms.org.pl  Mon Feb 14 15:53:28 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Mon, 14 Feb 2011 15:53:28 +0100 (CET)
Subject: [lms-commits] CVS update of lms/lib (dns.php)
Message-ID: <20110214145329.0203E30278BD@eftep.altec.pl>

Date: Monday, February 14, 2011 @ 15:53:28
Author: chilek
Path: /cvsroot/lms/lib

Modified: dns.php

- PTR records are accepted in zones
- fixed dot insertion with name '0'


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/lib/dns.php.diff?&r1=1.6&r2=1.7


Index: lms/lib/dns.php
diff -u lms/lib/dns.php:1.6 lms/lib/dns.php:1.7
--- lms/lib/dns.php:1.6	Tue Jan 18 09:12:05 2011
+++ lms/lib/dns.php	Mon Feb 14 15:53:28 2011
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  *
- *  $Id: dns.php,v 1.6 2011/01/18 08:12:05 alec Exp $
+ *  $Id: dns.php,v 1.7 2011/02/14 14:53:28 chilek Exp $
  */
 
 $valid_tlds = array(
@@ -228,8 +228,6 @@
 	        if (!in_array($record['type'], $arpa_records))
 			$error['type'] = trans('Wrong record type!');
 	}
-	else if ($record['type'] == 'PTR')
-	        $error['type'] = trans('You can\'t add PTR record to this domain!');
 
 	if ($error)
 		return;
@@ -282,11 +280,8 @@
 				$error['desc'] = trans('Field cannot be empty!');
 		break;
 		case 'PTR':
-    			if (preg_match('/in-addr\.arpa$/', $record['domainname']))
-			{
-		    		if ($errorcontent = check_hostname_fqdn($record['domain'], false, true))
-		            		$error['domain'] = $errorcontent;
-			}
+			if ($errorcontent = check_hostname_fqdn($record['domain'], false, true))
+				$error['domain'] = $errorcontent;
 		break;
 		case 'SOA':
 			foreach (array('serial', 'refresh', 'retry', 'expire', 'minttl') as $idx)

From cvs w lms.org.pl  Mon Feb 14 15:53:29 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Mon, 14 Feb 2011 15:53:29 +0100 (CET)
Subject: [lms-commits] CVS update of lms/modules (recordadd.php,
	recordedit.php)
Message-ID: <20110214145329.1BF9E30278CE@eftep.altec.pl>

Date: Monday, February 14, 2011 @ 15:53:29
Author: chilek
Path: /cvsroot/lms/modules

Modified: recordadd.php recordedit.php

- PTR records are accepted in zones
- fixed dot insertion with name '0'


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/modules/recordadd.php.diff?&r1=1.14&r2=1.15
http://cvs.lms.org.pl/viewvc/Development/lms/modules/recordedit.php.diff?&r1=1.13&r2=1.14


Index: lms/modules/recordadd.php
diff -u lms/modules/recordadd.php:1.14 lms/modules/recordadd.php:1.15
--- lms/modules/recordadd.php:1.14	Fri Apr  9 19:01:32 2010
+++ lms/modules/recordadd.php	Mon Feb 14 15:53:28 2011
@@ -52,7 +52,7 @@
 
 	if (!$error)
 	{
-		if (!empty($record['name']))
+		if (strlen($record['name']))
 			$record['name'] = trim($record['name'], '.').'.';
 		$record['name'] .= $record['domainname'];
 
Index: lms/modules/recordedit.php
diff -u lms/modules/recordedit.php:1.13 lms/modules/recordedit.php:1.14
--- lms/modules/recordedit.php:1.13	Tue Apr 13 14:40:10 2010
+++ lms/modules/recordedit.php	Mon Feb 14 15:53:28 2011
@@ -48,7 +48,7 @@
 
 	if (!$error)
 	{
-		if (!empty($record['name']))
+		if (strlen($record['name']))
 			$record['name'] = trim($record['name'],'.').'.';
 		$record['name'] .= $record['domainname'];
 

From cvs w lms.org.pl  Wed Feb 16 11:34:11 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Wed, 16 Feb 2011 11:34:11 +0100 (CET)
Subject: [lms-commits] CVS update of lms/doc (ChangeLog)
Message-ID: <20110216103411.1760E30278CE@eftep.altec.pl>

Date: Wednesday, February 16, 2011 @ 11:34:11
Author: alec
Path: /cvsroot/lms/doc

Modified: ChangeLog

- Fixed SQL query


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/doc/ChangeLog.diff?&r1=1.1537&r2=1.1538


Index: lms/doc/ChangeLog
diff -u lms/doc/ChangeLog:1.1537 lms/doc/ChangeLog:1.1538
--- lms/doc/ChangeLog:1.1537	Sun Feb  6 10:41:37 2011
+++ lms/doc/ChangeLog	Wed Feb 16 11:34:10 2011
@@ -1,4 +1,4 @@
-$Id: ChangeLog,v 1.1537 2011/02/06 09:41:37 alec Exp $
+$Id: ChangeLog,v 1.1538 2011/02/16 10:34:10 alec Exp $
 
 version ? (????-??-??)
 
@@ -8,6 +8,7 @@
     instead of cash operation date (alec)
   - Fixed goto feature of the second scroller on the page (alec)
   - BTS#0000848: Fixed cash import history report when source is selected (alec)
+  - Fixed SQL query in lms-makewarnings (alec)
 
 version 1.11.11 Bray (2011-01-17)
 

From cvs w lms.org.pl  Wed Feb 16 11:34:10 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Wed, 16 Feb 2011 11:34:10 +0100 (CET)
Subject: [lms-commits] CVS update of lms/bin (lms-makewarnings)
Message-ID: <20110216103410.D4AE230278BD@eftep.altec.pl>

Date: Wednesday, February 16, 2011 @ 11:34:10
Author: alec
Path: /cvsroot/lms/bin

Modified: lms-makewarnings

- Fixed SQL query


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/bin/lms-makewarnings.diff?&r1=1.39&r2=1.40


Index: lms/bin/lms-makewarnings
diff -u lms/bin/lms-makewarnings:1.39 lms/bin/lms-makewarnings:1.40
--- lms/bin/lms-makewarnings:1.39	Tue Jan 18 09:11:58 2011
+++ lms/bin/lms-makewarnings	Wed Feb 16 11:34:10 2011
@@ -20,7 +20,7 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 #  USA.
 #
-#  $Id: lms-makewarnings,v 1.39 2011/01/18 08:11:58 alec Exp $
+#  $Id: lms-makewarnings,v 1.40 2011/02/16 10:34:10 alec Exp $
 
 use strict;
 use DBI;
@@ -283,7 +283,15 @@
 	if($customergroupscount || !$inicustomergroups)
 	{
 		my $balance = $row->{'balance'};
-		my $sdbq = $dbase->prepare("SELECT MAX(at) AS at, SUM((value * (100 - discount)) / 100) AS value FROM assignments, tariffs WHERE tariffid = tariffs.id AND period = ".MONTH." AND (datefrom <= $currtime OR datefrom = 0) AND (dateto >= $currtime OR dateto = 0) AND customerid = $row->{'id'} GROUP BY customerid HAVING SUM(value * ((100 - discount) / 100)) > 0");
+		my $sdbq = $dbase->prepare("SELECT MAX(a.at) AS at, SUM((t.value * (100 - a.discount)) / 100) AS value
+		    FROM assignments a, tariffs t
+		    WHERE a.tariffid = t.id
+		        AND a.customerid = $row->{'id'}
+		        AND a.period = ".MONTH."
+		        AND (a.datefrom <= $currtime OR a.datefrom = 0)
+		        AND (a.dateto >= $currtime OR a.dateto = 0)
+		        GROUP BY a.customerid
+		        HAVING SUM(t.value * ((100 - t.discount) / 100)) > 0");
 		$sdbq->execute();
 		$srow = $sdbq->fetchrow_hashref();
 		$sdbq->finish();

From cvs w lms.org.pl  Wed Feb 16 11:42:45 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Wed, 16 Feb 2011 11:42:45 +0100 (CET)
Subject: [lms-commits] CVS update of lms/bin (lms-makewarnings)
Message-ID: <20110216104245.D7A0B30278BD@eftep.altec.pl>

Date: Wednesday, February 16, 2011 @ 11:42:45
Author: alec
Path: /cvsroot/lms/bin

Modified: lms-makewarnings

- Fix SQL query again


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/bin/lms-makewarnings.diff?&r1=1.40&r2=1.41


Index: lms/bin/lms-makewarnings
diff -u lms/bin/lms-makewarnings:1.40 lms/bin/lms-makewarnings:1.41
--- lms/bin/lms-makewarnings:1.40	Wed Feb 16 11:34:10 2011
+++ lms/bin/lms-makewarnings	Wed Feb 16 11:42:45 2011
@@ -20,7 +20,7 @@
 #  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
 #  USA.
 #
-#  $Id: lms-makewarnings,v 1.40 2011/02/16 10:34:10 alec Exp $
+#  $Id: lms-makewarnings,v 1.41 2011/02/16 10:42:45 alec Exp $
 
 use strict;
 use DBI;
@@ -291,7 +291,7 @@
 		        AND (a.datefrom <= $currtime OR a.datefrom = 0)
 		        AND (a.dateto >= $currtime OR a.dateto = 0)
 		        GROUP BY a.customerid
-		        HAVING SUM(t.value * ((100 - t.discount) / 100)) > 0");
+		        HAVING SUM(t.value * ((100 - a.discount) / 100)) > 0");
 		$sdbq->execute();
 		$srow = $sdbq->fetchrow_hashref();
 		$sdbq->finish();

From cvs w lms.org.pl  Wed Feb 16 13:37:35 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Wed, 16 Feb 2011 13:37:35 +0100 (CET)
Subject: [lms-commits] CVS update of lms/doc (ChangeLog)
Message-ID: <20110216123735.4490930278BD@eftep.altec.pl>

Date: Wednesday, February 16, 2011 @ 13:37:35
Author: alec
Path: /cvsroot/lms/doc

Modified: ChangeLog

- Fixed order of tables in database backup
- Fixed printing of DB errors while recovering database backup


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/doc/ChangeLog.diff?&r1=1.1538&r2=1.1539


Index: lms/doc/ChangeLog
diff -u lms/doc/ChangeLog:1.1538 lms/doc/ChangeLog:1.1539
--- lms/doc/ChangeLog:1.1538	Wed Feb 16 11:34:10 2011
+++ lms/doc/ChangeLog	Wed Feb 16 13:37:34 2011
@@ -1,4 +1,4 @@
-$Id: ChangeLog,v 1.1538 2011/02/16 10:34:10 alec Exp $
+$Id: ChangeLog,v 1.1539 2011/02/16 12:37:34 alec Exp $
 
 version ? (????-??-??)
 
@@ -9,6 +9,8 @@
   - Fixed goto feature of the second scroller on the page (alec)
   - BTS#0000848: Fixed cash import history report when source is selected (alec)
   - Fixed SQL query in lms-makewarnings (alec)
+  - Fixed order of tables in database backup (alec)
+  - Fixed printing of DB errors while recovering database backup (alec)
 
 version 1.11.11 Bray (2011-01-17)
 

From cvs w lms.org.pl  Wed Feb 16 13:37:35 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Wed, 16 Feb 2011 13:37:35 +0100 (CET)
Subject: [lms-commits] CVS update of lms/modules (dbrecover.php)
Message-ID: <20110216123735.A08B830278CF@eftep.altec.pl>

Date: Wednesday, February 16, 2011 @ 13:37:35
Author: alec
Path: /cvsroot/lms/modules

Modified: dbrecover.php

- Fixed order of tables in database backup
- Fixed printing of DB errors while recovering database backup


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/modules/dbrecover.php.diff?&r1=1.57&r2=1.58


Index: lms/modules/dbrecover.php
diff -u lms/modules/dbrecover.php:1.57 lms/modules/dbrecover.php:1.58
--- lms/modules/dbrecover.php:1.57	Tue Jan 18 09:12:22 2011
+++ lms/modules/dbrecover.php	Wed Feb 16 13:37:35 2011
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  *
- *  $Id: dbrecover.php,v 1.57 2011/01/18 08:12:22 alec Exp $
+ *  $Id: dbrecover.php,v 1.58 2011/02/16 12:37:35 alec Exp $
  */
 
 function DBLoad($filename=NULL)
@@ -33,12 +33,12 @@
 	$finfo = pathinfo($filename);
 	$ext = $finfo['extension'];
 
-	if ((extension_loaded('zlib'))&&($ext=='gz'))
+	if ($ext == 'gz' && extension_loaded('zlib'))
 		$file = gzopen($filename,'r'); //jezeli chcemy gz to plik najpierw trzeba rozpakowac
 	else
 		$file = fopen($filename,'r');
 
-	$DB->BeginTrans(); // przyspieszmy działanie jeżeli baza danych obsługuje transakcje
+	$DB->BeginTrans(); // przyspieszmy działanie jeżeli baza danych obsługuje transakcje
 	while(!feof($file))
 	{
 		$line = fgets($file, 8192);
@@ -55,9 +55,9 @@
 	else
 		fclose($file);
 
-	// Okej, zróbmy parę bzdurek db depend :S
+	// Okej, zrĂłbmy parÄ™ bzdurek db depend :S
 	// Postgres sux ! (warden)
-	// Tak, a łyżka na to 'niemożliwe' i poleciała za wann± potr±caj±c bannanem musztardę (lukasz)
+	// Tak, a łyżka na to 'niemożliwe' i poleciała za wanną potrącając bannanem musztardę (lukasz)
 
 	switch($CONFIG['database']['type'])
 	{
@@ -94,13 +94,15 @@
 	{
 		DBLoad($CONFIG['directories']['backup_dir'].'/lms-'.$db.'.sql');
 	}
-	elseif ((extension_loaded('zlib'))&&(file_exists($CONFIG['directories']['backup_dir'].'/lms-'.$db.'.sql.gz')))
+	elseif (extension_loaded('zlib') && file_exists($CONFIG['directories']['backup_dir'].'/lms-'.$db.'.sql.gz'))
 	{
 		DBLoad($CONFIG['directories']['backup_dir'].'/lms-'.$db.'.sql.gz');
 	}
-	
-	$SESSION->redirect('?m='.$SESSION->get('lastmodule'));
-}else{
+
+    include(MODULES_DIR . '/dblist.php');
+//	$SESSION->redirect('?m='.$SESSION->get('lastmodule'));
+}
+else {
 	$layout['pagetitle'] = trans('Database Backup Recovery');
 	$SMARTY->display('header.html');
 	echo '<H1>'.trans('Database Backup Recovery').'</H1>';

From cvs w lms.org.pl  Wed Feb 16 13:37:35 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Wed, 16 Feb 2011 13:37:35 +0100 (CET)
Subject: [lms-commits] CVS update of lms/lib (LMS.class.php)
Message-ID: <20110216123735.7F9DC30278CE@eftep.altec.pl>

Date: Wednesday, February 16, 2011 @ 13:37:35
Author: alec
Path: /cvsroot/lms/lib

Modified: LMS.class.php

- Fixed order of tables in database backup
- Fixed printing of DB errors while recovering database backup


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/lib/LMS.class.php.diff?&r1=1.1049&r2=1.1050


Index: lms/lib/LMS.class.php
diff -u lms/lib/LMS.class.php:1.1049 lms/lib/LMS.class.php:1.1050
--- lms/lib/LMS.class.php:1.1049	Tue Jan 18 09:12:05 2011
+++ lms/lib/LMS.class.php	Wed Feb 16 13:37:35 2011
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  *
- *  $Id: LMS.class.php,v 1.1049 2011/01/18 08:12:05 alec Exp $
+ *  $Id: LMS.class.php,v 1.1050 2011/02/16 12:37:35 alec Exp $
  */
 
 // LMS Class - contains internal LMS database functions used
@@ -34,7 +34,7 @@
 	var $CONFIG;			// table including lms.ini options
 	var $cache = array();		// internal cache
 	var $_version = '1.11-cvs';	// class version
-	var $_revision = '$Revision: 1.1049 $';
+	var $_revision = '$Revision: 1.1050 $';
 
 	function LMS(&$DB, &$AUTH, &$CONFIG) // class variables setting
 	{
@@ -65,7 +65,7 @@
                                 $this->DB->Execute('SET @lms_current_user=?', array($this->AUTH->id));
                         break;
                 }
-        }                    
+        }
 
 	/*
 	 *  Logging
@@ -91,26 +91,51 @@
 
 	function DBDump($filename=NULL, $gzipped=FALSE, $stats=FALSE) // dump database to file
 	{
-		if(! $filename)
+		if (!$filename)
 			return FALSE;
-		if (($gzipped)&&(extension_loaded('zlib')))
+
+		if ($gzipped && extension_loaded('zlib'))
 			$dumpfile = gzopen($filename,'w');
 		else
 			$dumpfile = fopen($filename,'w');
 
 		if($dumpfile)
 		{
-			foreach($this->DB->ListTables() as $tablename)
+		    $tables = $this->DB->ListTables();
+
+			foreach ($tables as $tablename)
+			{
+				// skip sessions table for security
+				if($tablename == 'sessions' || ($tablename == 'stats' && $stats == FALSE))
+					continue;
+
+				fputs($dumpfile, "DELETE FROM $tablename;\n");
+            }
+
+            // Since we're using foreign keys, order of tables is important
+            // Note: add all referenced tables to the list
+            $order = array('users', 'customers', 'customergroups', 'nodes', 'numberplans',
+                'assignments', 'rtqueues', 'rttickets', 'rtmessages', 'domains',
+                'cashsources', 'sourcefiles', 'ewx_channels');
+
+            foreach ($tables as $idx => $table) {
+                if (in_array($table, $order)) {
+                    unset($tables[$idx]);
+                }
+            }
+
+            $tables = array_merge($order, $tables);
+
+			foreach ($tables as $tablename)
 			{
-				// skip sessions table for security 
+				// skip sessions table for security
 				if($tablename == 'sessions' || ($tablename == 'stats' && $stats == FALSE))
 					continue;
-					
-				fputs($dumpfile,"DELETE FROM $tablename;\n");
+
 				$this->DB->Execute('SELECT * FROM '.$tablename);
 				while($row = $this->DB->_driver_fetchrow_assoc())
 				{
-					fputs($dumpfile,"INSERT INTO $tablename (");
+					fputs($dumpfile, "INSERT INTO $tablename (");
 					foreach($row as $field => $value)
 					{
 						$fields[] = $field;
@@ -127,7 +152,8 @@
 					unset($values);
 				}
 			}
-			if (($gzipped)&&(extension_loaded('zlib')))
+
+			if ($gzipped && extension_loaded('zlib'))
 				gzclose($dumpfile);
 			else
 				fclose($dumpfile);

From cvs w lms.org.pl  Thu Feb 17 13:08:43 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Thu, 17 Feb 2011 13:08:43 +0100 (CET)
Subject: [lms-commits] CVS update of lms/lib/locale/pl (strings.php)
Message-ID: <20110217120843.F2EC930278CF@eftep.altec.pl>

Date: Thursday, February 17, 2011 @ 13:08:43
Author: alec
Path: /cvsroot/lms/lib/locale/pl

Modified: strings.php

- Use tariff name+value as a unique key instead of just a name


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/lib/locale/pl/strings.php.diff?&r1=1.374&r2=1.375


Index: lms/lib/locale/pl/strings.php
diff -u lms/lib/locale/pl/strings.php:1.374 lms/lib/locale/pl/strings.php:1.375
--- lms/lib/locale/pl/strings.php:1.374	Tue Jan 18 09:12:07 2011
+++ lms/lib/locale/pl/strings.php	Thu Feb 17 13:08:43 2011
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  *
- *  $Id: strings.php,v 1.374 2011/01/18 08:12:07 alec Exp $
+ *  $Id: strings.php,v 1.375 2011/02/17 12:08:43 alec Exp $
  */
 
 $_LANG['$0 ($1 addresses)'] = '$0 ($1 adresów)';
@@ -1243,7 +1243,6 @@
 $_LANG['System information and management'] = 'Informacje o systemie i administracja';
 $_LANG['System version:'] = 'Wersja systemu:';
 $_LANG['Table of financial operations'] = 'Tabela operacji finansowych';
-$_LANG['Subscription $0 already exists!'] = 'Taryfa $0 już istnieje!';
 $_LANG['Subscription Edit: $0'] = 'Edycja taryfy: $0';
 $_LANG['Subscription Info: $0'] = 'Informacje o taryfie: $0';
 $_LANG['Subscription List'] = 'Lista taryf';
@@ -1251,7 +1250,7 @@
 $_LANG['Subscriptions and Network Finances Management'] = 'Taryfy i zarz±dzanie finansami sieci';
 $_LANG['Subscriptions List'] = 'Lista taryf';
 $_LANG['Subscription with assigned customers cannot be deleted!'] = 'Taryfa z przypisanymi klientami nie może zostać usunięta!';
-$_LANG['Subscription with specified name already exists!'] = 'Taryfa o okre¶lonej nazwie już istnieje!';
+$_LANG['Subscription with specified name and value already exists!'] = 'Taryfa o okre¶lonej nazwie i kwocie już istnieje!';
 $_LANG['summaries hiding'] = 'ukrywanie zestawień';
 $_LANG['Tax:'] = 'PTU:';
 $_LANG['Tax Rate:'] = 'St. PTU:';
@@ -1357,7 +1356,6 @@
 $_LANG['Value and description:'] = 'Warto¶ć i opis:';
 $_LANG['Value of tax rate which will be selected by default on tax rates lists. Default: 22.0'] = 'Warto¶ć stawki procentowej, która ma być domy¶lnie zaznaczona na listach wyboru stawki. Domy¶lnie: 22.0';
 $_LANG['Value of option "$0" must be a number grater than zero!'] = 'Warto¶ć opcji "$0" musi być większa od zera!';
-$_LANG['Value required!'] = 'Warto¶ć wymagana!';
 $_LANG['View'] = 'Podgl±d';
 $_LANG['waiting'] = 'oczekuj±cy';
 $_LANG['Waiting:'] = 'Oczekuj±cy:';

From cvs w lms.org.pl  Thu Feb 17 13:08:43 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Thu, 17 Feb 2011 13:08:43 +0100 (CET)
Subject: [lms-commits] CVS update of lms/doc (ChangeLog, lms.mysql,
	lms.pgsql)
Message-ID: <20110217120843.8229B30278BD@eftep.altec.pl>

Date: Thursday, February 17, 2011 @ 13:08:43
Author: alec
Path: /cvsroot/lms/doc

Modified: ChangeLog lms.mysql lms.pgsql

- Use tariff name+value as a unique key instead of just a name


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/doc/ChangeLog.diff?&r1=1.1539&r2=1.1540
http://cvs.lms.org.pl/viewvc/Development/lms/doc/lms.mysql.diff?&r1=1.180&r2=1.181
http://cvs.lms.org.pl/viewvc/Development/lms/doc/lms.pgsql.diff?&r1=1.176&r2=1.177


Index: lms/doc/ChangeLog
diff -u lms/doc/ChangeLog:1.1539 lms/doc/ChangeLog:1.1540
--- lms/doc/ChangeLog:1.1539	Wed Feb 16 13:37:34 2011
+++ lms/doc/ChangeLog	Thu Feb 17 13:08:42 2011
@@ -1,4 +1,4 @@
-$Id: ChangeLog,v 1.1539 2011/02/16 12:37:34 alec Exp $
+$Id: ChangeLog,v 1.1540 2011/02/17 12:08:42 alec Exp $
 
 version ? (????-??-??)
 
@@ -11,6 +11,7 @@
   - Fixed SQL query in lms-makewarnings (alec)
   - Fixed order of tables in database backup (alec)
   - Fixed printing of DB errors while recovering database backup (alec)
+  - Use tariff name+value as a unique key instead of just a name (alec)
 
 version 1.11.11 Bray (2011-01-17)
 
Index: lms/doc/lms.mysql
diff -u lms/doc/lms.mysql:1.180 lms/doc/lms.mysql:1.181
--- lms/doc/lms.mysql:1.180	Thu Dec 30 11:22:21 2010
+++ lms/doc/lms.mysql	Thu Feb 17 13:08:42 2011
@@ -1,5 +1,5 @@
 # --------------------------------------------------------
-# $Id: lms.mysql,v 1.180 2010/12/30 10:22:21 alec Exp $
+# $Id: lms.mysql,v 1.181 2011/02/17 12:08:42 alec Exp $
 # --------------------------------------------------------
 
 # -- Drop tables first, MySQL doesn't support CASCADE
@@ -728,7 +728,7 @@
   quota_sql_limit int(11) 	DEFAULT NULL,
   description text 	NOT NULL,
   PRIMARY KEY  (id),
-  UNIQUE KEY name (name),
+  UNIQUE KEY name (name, value),
   INDEX type (type)
 ) ENGINE=InnoDB;
 
@@ -1425,4 +1425,4 @@
 
 
 # --------------------------------------------------------
-INSERT INTO dbinfo (keytype, keyvalue) VALUES ('dbversion', '2010122700');
+INSERT INTO dbinfo (keytype, keyvalue) VALUES ('dbversion', '2011021700');
Index: lms/doc/lms.pgsql
diff -u lms/doc/lms.pgsql:1.176 lms/doc/lms.pgsql:1.177
--- lms/doc/lms.pgsql:1.176	Thu Dec 30 14:52:07 2010
+++ lms/doc/lms.pgsql	Thu Feb 17 13:08:42 2011
@@ -1,4 +1,4 @@
-/* $Id: lms.pgsql,v 1.176 2010/12/30 13:52:07 alec Exp $ */ 
+/* $Id: lms.pgsql,v 1.177 2011/02/17 12:08:42 alec Exp $ */ 
 
 /* -------------------------------------------------------- 
   Structure of table "users" 
@@ -311,7 +311,7 @@
 	quota_sql_limit integer	DEFAULT NULL,
 	description text	DEFAULT '' NOT NULL,
 	PRIMARY KEY (id),
-	UNIQUE (name)
+	UNIQUE (name, value)
 );
 CREATE INDEX tariffs_type_idx ON tariffs (type);
 
@@ -1519,4 +1519,4 @@
 INSERT INTO nastypes (name) VALUES ('usrhiper');
 INSERT INTO nastypes (name) VALUES ('other');
 
-INSERT INTO dbinfo (keytype, keyvalue) VALUES ('dbversion', '2010122700');
+INSERT INTO dbinfo (keytype, keyvalue) VALUES ('dbversion', '2011021700');

From cvs w lms.org.pl  Thu Feb 17 13:08:44 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Thu, 17 Feb 2011 13:08:44 +0100 (CET)
Subject: [lms-commits] CVS update of lms/lib/upgradedb (2 files)
Message-ID: <20110217120844.1C77E30278D0@eftep.altec.pl>

Date: Thursday, February 17, 2011 @ 13:08:44
Author: alec
Path: /cvsroot/lms/lib/upgradedb

   Added: mysql.2011021700.php postgres.2011021700.php

- Use tariff name+value as a unique key instead of just a name


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/lib/upgradedb/mysql.2011021700.php?rev=1.1
http://cvs.lms.org.pl/viewvc/Development/lms/lib/upgradedb/postgres.2011021700.php?rev=1.1


Index: lms/lib/upgradedb/mysql.2011021700.php
diff -u /dev/null lms/lib/upgradedb/mysql.2011021700.php:1.1
--- /dev/null	Thu Feb 17 13:08:44 2011
+++ lms/lib/upgradedb/mysql.2011021700.php	Thu Feb 17 13:08:43 2011
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * LMS version 1.11-cvs
+ *
+ *  (C) Copyright 2001-2011 LMS Developers
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License Version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ *  USA.
+ *
+ */
+
+$DB->BeginTrans();
+
+$DB->Execute("ALTER TABLE tariffs DROP KEY name");
+$DB->Execute("ALTER TABLE tariffs ADD UNIQUE KEY name (name, value)");
+
+$DB->Execute("UPDATE dbinfo SET keyvalue = ? WHERE keytype = ?", array('2011021700', 'dbversion'));
+
+$DB->CommitTrans();
+
+?>
Index: lms/lib/upgradedb/postgres.2011021700.php
diff -u /dev/null lms/lib/upgradedb/postgres.2011021700.php:1.1
--- /dev/null	Thu Feb 17 13:08:44 2011
+++ lms/lib/upgradedb/postgres.2011021700.php	Thu Feb 17 13:08:43 2011
@@ -0,0 +1,33 @@
+<?php
+
+/*
+ * LMS version 1.11-cvs
+ *
+ *  (C) Copyright 2001-2011 LMS Developers
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License Version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
+ *  USA.
+ *
+ */
+
+$DB->BeginTrans();
+
+$DB->Execute("ALTER TABLE tariffs DROP CONSTRAINT tariffs_name_key");
+$DB->Execute("ALTER TABLE tariffs ADD UNIQUE(name, value)");
+
+$DB->Execute("UPDATE dbinfo SET keyvalue = ? WHERE keytype = ?", array('2011021700', 'dbversion'));
+
+$DB->CommitTrans();
+
+?>

From cvs w lms.org.pl  Thu Feb 17 13:08:43 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Thu, 17 Feb 2011 13:08:43 +0100 (CET)
Subject: [lms-commits] CVS update of lms/lib (LMS.class.php, upgradedb.php)
Message-ID: <20110217120843.C6C8730278CE@eftep.altec.pl>

Date: Thursday, February 17, 2011 @ 13:08:43
Author: alec
Path: /cvsroot/lms/lib

Modified: LMS.class.php upgradedb.php

- Use tariff name+value as a unique key instead of just a name


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/lib/LMS.class.php.diff?&r1=1.1050&r2=1.1051
http://cvs.lms.org.pl/viewvc/Development/lms/lib/upgradedb.php.diff?&r1=1.185&r2=1.186


Index: lms/lib/LMS.class.php
diff -u lms/lib/LMS.class.php:1.1050 lms/lib/LMS.class.php:1.1051
--- lms/lib/LMS.class.php:1.1050	Wed Feb 16 13:37:35 2011
+++ lms/lib/LMS.class.php	Thu Feb 17 13:08:43 2011
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  *
- *  $Id: LMS.class.php,v 1.1050 2011/02/16 12:37:35 alec Exp $
+ *  $Id: LMS.class.php,v 1.1051 2011/02/17 12:08:43 alec Exp $
  */
 
 // LMS Class - contains internal LMS database functions used
@@ -34,7 +34,7 @@
 	var $CONFIG;			// table including lms.ini options
 	var $cache = array();		// internal cache
 	var $_version = '1.11-cvs';	// class version
-	var $_revision = '$Revision: 1.1050 $';
+	var $_revision = '$Revision: 1.1051 $';
 
 	function LMS(&$DB, &$AUTH, &$CONFIG) // class variables setting
 	{
@@ -2246,9 +2246,10 @@
 			return FALSE;
 	}
 
-	function GetTariffIDByName($name)
+	function GetTariffIDByNameAndValue($name, $value)
 	{
-		return $this->DB->GetOne('SELECT id FROM tariffs WHERE name=?', array($name));
+		return $this->DB->GetOne('SELECT id FROM tariffs WHERE name = ? AND value = ?',
+		    array($name, str_replace(',', '.', $value)));
 	}
 
 	function TariffAdd($tariff)
Index: lms/lib/upgradedb.php
diff -u lms/lib/upgradedb.php:1.185 lms/lib/upgradedb.php:1.186
--- lms/lib/upgradedb.php:1.185	Tue Jan 18 09:12:05 2011
+++ lms/lib/upgradedb.php	Thu Feb 17 13:08:43 2011
@@ -21,10 +21,10 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  *
- *  $Id: upgradedb.php,v 1.185 2011/01/18 08:12:05 alec Exp $
+ *  $Id: upgradedb.php,v 1.186 2011/02/17 12:08:43 alec Exp $
  */
 
-define('DBVERSION', '2010122700'); // here should be always the newest version of database!
+define('DBVERSION', '2011021700'); // here should be always the newest version of database!
 				 // it placed here to avoid read disk every time when we call this file.
 
 /*

From cvs w lms.org.pl  Thu Feb 17 13:08:44 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Thu, 17 Feb 2011 13:08:44 +0100 (CET)
Subject: [lms-commits] CVS update of lms/modules (3 files)
Message-ID: <20110217120844.4BBD230278D1@eftep.altec.pl>

Date: Thursday, February 17, 2011 @ 13:08:44
Author: alec
Path: /cvsroot/lms/modules

Modified: tariffadd.php tariffedit.php tarifflist.php

- Use tariff name+value as a unique key instead of just a name


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/modules/tariffadd.php.diff?&r1=1.67&r2=1.68
http://cvs.lms.org.pl/viewvc/Development/lms/modules/tariffedit.php.diff?&r1=1.53&r2=1.54
http://cvs.lms.org.pl/viewvc/Development/lms/modules/tarifflist.php.diff?&r1=1.43&r2=1.44


Index: lms/modules/tariffadd.php
diff -u lms/modules/tariffadd.php:1.67 lms/modules/tariffadd.php:1.68
--- lms/modules/tariffadd.php:1.67	Tue Jan 18 09:12:25 2011
+++ lms/modules/tariffadd.php	Thu Feb 17 13:08:44 2011
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  *
- *  $Id: tariffadd.php,v 1.67 2011/01/18 08:12:25 alec Exp $
+ *  $Id: tariffadd.php,v 1.68 2011/02/17 12:08:44 alec Exp $
  */
 
 if(isset($_POST['tariff']))
@@ -39,14 +39,15 @@
 
 	$tariff['value'] = str_replace(',','.',$tariff['value']);
 
-	if(!preg_match('/^[-]?[0-9.,]+$/', $tariff['value']))
+	if (!preg_match('/^[-]?[0-9.,]+$/', $tariff['value']))
 		$error['value'] = trans('Incorrect subscription value!');
 
-	if($tariff['name'] == '')
+	if ($tariff['name'] == '')
 		$error['name'] = trans('Subscription name required!');
-	else
-		if($LMS->GetTariffIDByName($tariff['name']))
-			$error['name'] = trans('Subscription $0 already exists!',$tariff['name']);
+	else if (!$error) {
+		if ($LMS->GetTariffIDByNameAndValue($tariff['name'], $tariff['value']))
+			$error['name'] = trans('Subscription with specified name and value already exists!');
+    }
 
 	$items = array('uprate', 'downrate', 'upceil', 'downceil', 'climit', 'plimit', 'dlimit');
 
Index: lms/modules/tariffedit.php
diff -u lms/modules/tariffedit.php:1.53 lms/modules/tariffedit.php:1.54
--- lms/modules/tariffedit.php:1.53	Tue Jan 18 09:12:25 2011
+++ lms/modules/tariffedit.php	Thu Feb 17 13:08:44 2011
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  *
- *  $Id: tariffedit.php,v 1.53 2011/01/18 08:12:25 alec Exp $
+ *  $Id: tariffedit.php,v 1.54 2011/02/17 12:08:44 alec Exp $
  */
 
 if(!$LMS->TariffExists($_GET['id']))
@@ -37,23 +37,23 @@
 	foreach($tariff as $key => $value)
 		$tariff[$key] = trim($value);
 
+	$tariff['id'] = $_GET['id'];
 	$tariff['value'] = str_replace(',','.',$tariff['value']);
-	
-	if($tariff['value'] == '')
-		$error['value'] = trans('Value required!');
-	elseif(!preg_match('/^[-]?[0-9.,]+$/', $tariff['value']))
+
+	if (!preg_match('/^[-]?[0-9.,]+$/', $tariff['value']))
 		$error['value'] = trans('Incorrect value!');
 
-	if($tariff['name'] == '')
+	if ($tariff['name'] == '')
 		$error['name'] = trans('Subscription name required!');
-	elseif($LMS->GetTariffIDByName($tariff['name']) 
-		&& $tariff['name'] != $DB->GetOne('SELECT name FROM tariffs WHERE id=?', array($_GET['id'])))
-	{
-		$error['name'] = trans('Subscription with specified name already exists!');
+	else if (!$error
+	    && ($found_id = $LMS->GetTariffIDByNameAndValue($tariff['name'], $tariff['value']))
+		&& $found_id != $tariff['id']
+    ) {
+	    $error['name'] = trans('Subscription with specified name and value already exists!');
 	}
 
 	$items = array('uprate', 'downrate', 'upceil', 'downceil', 'climit', 'plimit', 'dlimit');
-	
+
 	foreach($items as $item)
 	{
 	        if($tariff[$item]=='')
@@ -98,7 +98,7 @@
 	                'quota_sh_limit', 'quota_mail_limit', 'quota_www_limit',
 	                'quota_ftp_limit', 'quota_sql_limit',
 	);
-										
+
 	foreach($items as $item)
 	{
 	        if(isset($limit[$item]))
@@ -107,8 +107,6 @@
 	                $error[$item] = trans('Integer value expected!');
 	}
 
-	$tariff['id'] = $_GET['id'];
-
 	if(!$error)
 	{
 		$LMS->TariffUpdate($tariff);
@@ -117,7 +115,7 @@
 }
 else
 	$tariff = $LMS->GetTariff($_GET['id']);
-	
+
 $layout['pagetitle'] = trans('Subscription Edit: $0',$tariff['name']);
 
 $SMARTY->assign('tariff',$tariff);
Index: lms/modules/tarifflist.php
diff -u lms/modules/tarifflist.php:1.43 lms/modules/tarifflist.php:1.44
--- lms/modules/tarifflist.php:1.43	Tue Jan 18 09:12:25 2011
+++ lms/modules/tarifflist.php	Thu Feb 17 13:08:44 2011
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  *
- *  $Id: tarifflist.php,v 1.43 2011/01/18 08:12:25 alec Exp $
+ *  $Id: tarifflist.php,v 1.44 2011/02/17 12:08:44 alec Exp $
  */
 
 function GetTariffList($order='name,asc', $type=NULL, $customergroupid=NULL)
@@ -38,31 +38,31 @@
 	switch($order)
 	{
 		case 'id':
-			$sqlord = ' ORDER BY id';
+			$sqlord = " ORDER BY id $direction";
 		break;
 		case 'description':
-		        $sqlord = ' ORDER BY t.description';
+		        $sqlord = " ORDER BY t.description $direction, t.name";
 		break;
 		case 'value':
-		        $sqlord = ' ORDER BY t.value';
+		        $sqlord = " ORDER BY t.value $direction, t.name";
 		break;
 		case 'downrate':
-		        $sqlord = ' ORDER BY t.downrate';
+		        $sqlord = " ORDER BY t.downrate $direction, t.name";
 		break;
 		case 'downceil':
-		        $sqlord = ' ORDER BY t.downceil';
+		        $sqlord = " ORDER BY t.downceil $direction, t.name";
 		break;
 		case 'uprate':
-		        $sqlord = ' ORDER BY t.uprate';
+		        $sqlord = " ORDER BY t.uprate $direction, t.name";
 		break;
 		case 'upceil':
-		        $sqlord = ' ORDER BY t.upceil';
+		        $sqlord = " ORDER BY t.upceil $direction, t.name";
 		break;
 		case 'count':
-		        $sqlord = ' ORDER BY customerscount';
+		        $sqlord = " ORDER BY customerscount $direction, t.name";
 		break;
 		default:
-	                $sqlord = ' ORDER BY t.name';
+                $sqlord = " ORDER BY t.name, t.value DESC";
 		break;
 	}
 	
@@ -100,7 +100,7 @@
 			) a ON (a.tariffid = t.id)
 			LEFT JOIN taxes ON (t.taxid = taxes.id)'
 			.($type ? ' WHERE t.type = '.intval($type) : '')
-			.($sqlord != '' ? $sqlord.' '.$direction : '')))
+			.($sqlord != '' ? $sqlord : '')))
 	{
 		$unactive = $DB->GetAllByKey('SELECT tariffid, COUNT(*) AS count,
 			SUM(CASE x.period

From cvs w lms.org.pl  Thu Feb 17 13:08:44 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Thu, 17 Feb 2011 13:08:44 +0100 (CET)
Subject: [lms-commits] CVS update of lms/templates (3 files)
Message-ID: <20110217120844.7C9FE30278D2@eftep.altec.pl>

Date: Thursday, February 17, 2011 @ 13:08:44
Author: alec
Path: /cvsroot/lms/templates

Modified: tariffadd.html tariffedit.html tarifflist.html

- Use tariff name+value as a unique key instead of just a name


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/templates/tariffadd.html.diff?&r1=1.54&r2=1.55
http://cvs.lms.org.pl/viewvc/Development/lms/templates/tariffedit.html.diff?&r1=1.58&r2=1.59
http://cvs.lms.org.pl/viewvc/Development/lms/templates/tarifflist.html.diff?&r1=1.67&r2=1.68


Index: lms/templates/tariffadd.html
diff -u lms/templates/tariffadd.html:1.54 lms/templates/tariffadd.html:1.55
--- lms/templates/tariffadd.html:1.54	Mon Dec 27 13:35:17 2010
+++ lms/templates/tariffadd.html	Thu Feb 17 13:08:44 2011
@@ -1,5 +1,5 @@
 {include file="header.html"}
-<!--// $Id: tariffadd.html,v 1.54 2010/12/27 12:35:17 alec Exp $ //-->
+<!--// $Id: tariffadd.html,v 1.55 2011/02/17 12:08:44 alec Exp $ //-->
 <SCRIPT type="text/javascript">
 <!--{literal}
 	function checklimit(name)
@@ -31,7 +31,7 @@
 	    </TD>
 	    <TD WIDTH="1%" CLASS="fbt"><B>{t}Name:{/t}</B></TD>
 	    <TD WIDTH="98%" CLASS="frightu">
-		<INPUT TYPE="TEXT" NAME="tariff[name]" VALUE="{$tariff.name|escape}" size="45" {tip trigger="name" bold=1}>
+		<INPUT TYPE="TEXT" NAME="tariff[name]" VALUE="{$tariff.name|escape}" size="45" {tip trigger="name" text="Enter name" bold=1}>
 	    </TD>
 	</TR>
 	<TR class="LIGHT">
Index: lms/templates/tariffedit.html
diff -u lms/templates/tariffedit.html:1.58 lms/templates/tariffedit.html:1.59
--- lms/templates/tariffedit.html:1.58	Mon Dec 27 13:35:17 2010
+++ lms/templates/tariffedit.html	Thu Feb 17 13:08:44 2011
@@ -1,5 +1,5 @@
 {include file="header.html"}
-<!-- //$Id: tariffedit.html,v 1.58 2010/12/27 12:35:17 alec Exp $ //-->
+<!-- //$Id: tariffedit.html,v 1.59 2011/02/17 12:08:44 alec Exp $ //-->
 <SCRIPT type="text/javascript">
 <!--{literal}
 	function checklimit(name)
@@ -33,7 +33,7 @@
 			<B>{t}Name:{/t}</B>
 		</TD>
 		<TD WIDTH="98%" CLASS="frightu">
-			<INPUT TYPE="TEXT" VALUE="{$tariff.name|escape}" NAME="tariff[name]" size="45" {tip trigger="name" bold=1}>
+			<INPUT TYPE="TEXT" VALUE="{$tariff.name|escape}" NAME="tariff[name]" size="45" {tip trigger="name" text="Enter name" bold=1}>
 			<B>&nbsp;({$tariff.id|string_format:"%04d"})</B>
 		</TD>
 	</TR>
Index: lms/templates/tarifflist.html
diff -u lms/templates/tarifflist.html:1.67 lms/templates/tarifflist.html:1.68
--- lms/templates/tarifflist.html:1.67	Fri Oct 16 12:34:11 2009
+++ lms/templates/tarifflist.html	Thu Feb 17 13:08:44 2011
@@ -1,5 +1,5 @@
 {include file="header.html"}
-<!--// $Id: tarifflist.html,v 1.67 2009/10/16 10:34:11 alec Exp $ //-->
+<!--// $Id: tarifflist.html,v 1.68 2011/02/17 12:08:44 alec Exp $ //-->
 <H1>{$layout.pagetitle}</H1>
 <TABLE WIDTH="100%" CELLPADDING="3">
 	<TR class="dark" {tip text="Click on column name to change sorting order"}>
@@ -13,15 +13,15 @@
 		<TD WIDTH="1%" CLASS="fbt" align="right" NOWRAP>
 			<A href="?m=tarifflist&o=downrate{if $listdata.direction eq "asc" && $listdata.order eq "downrate"},desc{/if}">{t}Downrate:{/t}</A> {if $listdata.order eq "downrate"}<IMG SRC="img/{if $listdata.direction eq "desc"}asc{else}desc{/if}_order.gif" alt="">{/if}<BR>
 			<A href="?m=tarifflist&o=uprate{if $listdata.direction eq "asc" && $listdata.order eq "uprate"},desc{/if}">{t}Uprate{/t}:</A> {if $listdata.order eq "uprate"}<IMG SRC="img/{if $listdata.direction eq "desc"}asc{else}desc{/if}_order.gif" alt="">{/if}
-		</TD>	
+		</TD>
 		<TD WIDTH="1%" CLASS="fbt" align="right" NOWRAP>
 			<A href="?m=tarifflist&o=uprate{if $listdata.direction eq "asc" && $listdata.order eq "downceil"},desc{/if}">{t}Downceil:{/t}</A> {if $listdata.order eq "downceil"}<IMG SRC="img/{if $listdata.direction eq "desc"}asc{else}desc{/if}_order.gif" alt="">{/if}<BR>
 			<A href="?m=tarifflist&o=upceil{if $listdata.direction eq "asc" && $listdata.order eq "upceil"},desc{/if}">{t}Upceil:{/t}</A> {if $listdata.order eq "upceil"}<IMG SRC="img/{if $listdata.direction eq "desc"}asc{else}desc{/if}_order.gif" alt="">{/if}
-		</TD>	
+		</TD>
 		<TD NOWRAP WIDTH="1%" CLASS="fbt" align="right" NOWRAP>
-			<A href="?m=tarifflist&o=value{if $listdata.direction eq "asc" && $listdata.order eq "value"},desc{/if}">{t}Value:{/t}</A> {if $listdata.order eq "value"}<IMG SRC="img/{if $listdata.direction eq "desc"}asc{else}desc{/if}_order.gif" alt="">{/if}<BR>
+			<A href="?m=tarifflist&o=value{if $listdata.direction eq "asc" && $listdata.order eq "value"},desc{/if}"><B>{t}Value:{/t}</B></A> {if $listdata.order eq "value"}<IMG SRC="img/{if $listdata.direction eq "desc"}asc{else}desc{/if}_order.gif" alt="">{/if}<BR>
 			{t}Tax:{/t}
-		</TD>	
+		</TD>
 		<TD WIDTH="1%" CLASS="fbt" align="right" NOWRAP>
 			<A href="?m=tarifflist&o=count{if $listdata.direction eq "asc" && $listdata.order eq "count"},desc{/if}">{t}Assigned:{/t}</A> {if $listdata.order eq "count"}<IMG SRC="img/{if $listdata.direction eq "desc"}asc{else}desc{/if}_order.gif" alt="">{/if}
 		</TD>
@@ -86,7 +86,7 @@
 		</TD>
 		<TD WIDTH="1%" align="right" onClick="return self.location.href='?m=tariffinfo&id={$tarifflist[tariffs].id}';">
 			<NOBR>
-			{$tarifflist[tariffs].value|money_format} <BR>
+			<B>{$tarifflist[tariffs].value|money_format}</B><BR>
 			{$tarifflist[tariffs].tax}
 			</NOBR>
 		</TD>

From cvs w lms.org.pl  Fri Feb 18 15:08:09 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Fri, 18 Feb 2011 15:08:09 +0100 (CET)
Subject: [lms-commits] CVS update of lms/lib/plugins [new]
Message-ID: <20110218140809.3BEFC30278BD@eftep.altec.pl>

Date: Friday, February 18, 2011 @ 15:08:09
Author: alec
Path: /cvsroot/lms/lib/plugins

Directory /cvsroot/lms/lib/plugins added to the repository

From cvs w lms.org.pl  Fri Feb 18 15:32:45 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Fri, 18 Feb 2011 15:32:45 +0100 (CET)
Subject: [lms-commits] CVS update of lms (index.php)
Message-ID: <20110218143245.E396430278BD@eftep.altec.pl>

Date: Friday, February 18, 2011 @ 15:32:45
Author: alec
Path: /cvsroot/lms

Modified: index.php

- Added simple plugin API with some hooks on node actions


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/index.php.diff?&r1=1.222&r2=1.223


Index: lms/index.php
diff -u lms/index.php:1.222 lms/index.php:1.223
--- lms/index.php:1.222	Tue Jan 18 09:11:57 2011
+++ lms/index.php	Fri Feb 18 15:32:45 2011
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
  *  USA.
  *
- *  $Id: index.php,v 1.222 2011/01/18 08:11:57 alec Exp $
+ *  $Id: index.php,v 1.223 2011/02/18 14:32:45 alec Exp $
  */
 
 // REPLACE THIS WITH PATH TO YOUR CONFIG FILE
@@ -174,7 +174,6 @@
 header('X-Powered-By: LMS/'.$layout['lmsv']);
 
 // Check privileges and execute modules
-
 if($AUTH->islogged)
 {
 	$module = isset($_GET['m']) ? preg_replace('/[^a-zA-Z0-9_-]/', '', $_GET['m']) : '';
@@ -185,6 +184,14 @@
 		$module = $CONFIG['phpui']['default_module'];
 	}
 
+    // Load plugin files and register hook callbacks
+    $plugins = preg_split('/[;,\s\t\n]+/', $CONFIG['phpui']['plugins'], -1, PREG_SPLIT_NO_EMPTY);
+    if (!empty($plugins)) {
+        foreach ($plugins as $plugin_name) {
+            require LIB_DIR . '/plugins/' . $plugin_name . '.php';
+        }
+    }
+
 	if(file_exists(MODULES_DIR.'/'.$module.'.php'))
 	{
 		$allow = !$AUTH->id || (!empty($access['allow']) && preg_match('/'.$access['allow'].'/i', $module));

From cvs w lms.org.pl  Fri Feb 18 15:32:46 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Fri, 18 Feb 2011 15:32:46 +0100 (CET)
Subject: [lms-commits] CVS update of lms/doc (ChangeLog)
Message-ID: <20110218143246.15ABE30278CE@eftep.altec.pl>

Date: Friday, February 18, 2011 @ 15:32:46
Author: alec
Path: /cvsroot/lms/doc

Modified: ChangeLog

- Added simple plugin API with some hooks on node actions


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/doc/ChangeLog.diff?&r1=1.1540&r2=1.1541


Index: lms/doc/ChangeLog
diff -u lms/doc/ChangeLog:1.1540 lms/doc/ChangeLog:1.1541
--- lms/doc/ChangeLog:1.1540	Thu Feb 17 13:08:42 2011
+++ lms/doc/ChangeLog	Fri Feb 18 15:32:45 2011
@@ -1,4 +1,4 @@
-$Id: ChangeLog,v 1.1540 2011/02/17 12:08:42 alec Exp $
+$Id: ChangeLog,v 1.1541 2011/02/18 14:32:45 alec Exp $
 
 version ? (????-??-??)
 
@@ -12,6 +12,7 @@
   - Fixed order of tables in database backup (alec)
   - Fixed printing of DB errors while recovering database backup (alec)
   - Use tariff name+value as a unique key instead of just a name (alec)
+  - Added simple plugin API with some hooks on node actions (alec)
 
 version 1.11.11 Bray (2011-01-17)
 

From cvs w lms.org.pl  Fri Feb 18 15:32:46 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Fri, 18 Feb 2011 15:32:46 +0100 (CET)
Subject: [lms-commits] CVS update of lms/lib (LMS.class.php)
Message-ID: <20110218143246.4343730278CF@eftep.altec.pl>

Date: Friday, February 18, 2011 @ 15:32:46
Author: alec
Path: /cvsroot/lms/lib

Modified: LMS.class.php

- Added simple plugin API with some hooks on node actions


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/lib/LMS.class.php.diff?&r1=1.1051&r2=1.1052


Index: lms/lib/LMS.class.php
diff -u lms/lib/LMS.class.php:1.1051 lms/lib/LMS.class.php:1.1052
--- lms/lib/LMS.class.php:1.1051	Thu Feb 17 13:08:43 2011
+++ lms/lib/LMS.class.php	Fri Feb 18 15:32:46 2011
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  *
- *  $Id: LMS.class.php,v 1.1051 2011/02/17 12:08:43 alec Exp $
+ *  $Id: LMS.class.php,v 1.1052 2011/02/18 14:32:46 alec Exp $
  */
 
 // LMS Class - contains internal LMS database functions used
@@ -33,8 +33,9 @@
 	var $AUTH;			// object from Session.class.php (session management)
 	var $CONFIG;			// table including lms.ini options
 	var $cache = array();		// internal cache
+	var $hooks = array();       // registered plugin hooks
 	var $_version = '1.11-cvs';	// class version
-	var $_revision = '$Revision: 1.1051 $';
+	var $_revision = '$Revision: 1.1052 $';
 
 	function LMS(&$DB, &$AUTH, &$CONFIG) // class variables setting
 	{
@@ -85,6 +86,31 @@
 		}
 	}
 */
+
+    /*
+     * Plugins
+     */
+
+    function RegisterHook($hook_name, $callback)
+    {
+        $this->hooks[] = array(
+            'name'     => $hook_name,
+            'callback' => $callback,
+        );
+    }
+
+    function ExecHook($hook_name, $vars=null)
+    {
+        foreach ($this->hooks as $hook) {
+            if ($hook['name'] == $hook_name) {
+                $vars = call_user_func($hook['callback'], $vars);
+            }
+        }
+
+        return $vars;
+    }
+
+
 	/*
 	 *  Database functions (backups)
 	 */

From cvs w lms.org.pl  Fri Feb 18 15:32:46 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Fri, 18 Feb 2011 15:32:46 +0100 (CET)
Subject: [lms-commits] CVS update of lms/lib/plugins (example.php)
Message-ID: <20110218143246.63D3630278D0@eftep.altec.pl>

Date: Friday, February 18, 2011 @ 15:32:46
Author: alec
Path: /cvsroot/lms/lib/plugins

   Added: example.php

- Added simple plugin API with some hooks on node actions


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/lib/plugins/example.php?rev=1.1


Index: lms/lib/plugins/example.php
diff -u /dev/null lms/lib/plugins/example.php:1.1
--- /dev/null	Fri Feb 18 15:32:46 2011
+++ lms/lib/plugins/example.php	Fri Feb 18 15:32:46 2011
@@ -0,0 +1,85 @@
+<?php
+
+/*
+ * LMS version 1.11-cvs
+ *
+ *  (C) Copyright 2001-2011 LMS Developers
+ *
+ *  Please, see the doc/AUTHORS for more information about authors!
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License Version 2 as
+ *  published by the Free Software Foundation.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program; if not, write to the Free Software
+ *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 
+ *  USA.
+ *
+ *  $Id: example.php,v 1.1 2011/02/18 14:32:46 alec Exp $
+ */
+
+/**
+ * Example LMS plugin class. PHP5 only.
+ */
+class example_lms_plugin
+{
+    private $lms;
+
+    /**
+     * Class constructor
+     *
+     * @param object $LMS LMS object
+     */
+    function __construct($LMS)
+    {
+        $this->lms = $LMS;
+    }
+
+    /**
+     * Action after node addition
+     *
+     * @param array $vars Node data
+     *
+     * @return array Node data
+     */
+    function node_after($vars)
+    {
+        // exec("lmsd -q");
+
+        // always return $vars
+        return $vars;
+    }
+}
+
+// Initialize plugin
+$example_plugin = new example_lms_plugin($LMS);
+
+// Register plugin actions:
+$LMS->RegisterHook('node_add_after', array($example_plugin, 'node_after'));
+$LMS->RegisterHook('node_edit_after', array($example_plugin, 'node_after'));
+$LMS->RegisterHook('node_del_after', array($example_plugin, 'node_after'));
+
+
+/*
+ List of supported actions:
+
+ node_info_init  - Just before displaying nodeinfo.html
+
+ node_add_before - Before node creation (just before executing SQL insert queries)
+ node_add_after  - After node creation
+ node_add_init   - Just before displaying nodeadd.html
+
+ node_edit_before - Before node edition (just before executing SQL update queries)
+ node_edit_after  - After node edition
+ node_edit_init   - Just before displaying nodeedit.html
+
+ node_del_before - Before node deletion (just before executing SQL delete queries)
+ node_del_after  - After node deletion
+
+*/

From cvs w lms.org.pl  Fri Feb 18 15:32:46 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Fri, 18 Feb 2011 15:32:46 +0100 (CET)
Subject: [lms-commits] CVS update of lms/modules (4 files)
Message-ID: <20110218143246.978CD30278D1@eftep.altec.pl>

Date: Friday, February 18, 2011 @ 15:32:46
Author: alec
Path: /cvsroot/lms/modules

Modified: nodeadd.php nodedel.php nodeedit.php nodeinfo.php

- Added simple plugin API with some hooks on node actions


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/modules/nodeadd.php.diff?&r1=1.97&r2=1.98
http://cvs.lms.org.pl/viewvc/Development/lms/modules/nodedel.php.diff?&r1=1.43&r2=1.44
http://cvs.lms.org.pl/viewvc/Development/lms/modules/nodeedit.php.diff?&r1=1.117&r2=1.118
http://cvs.lms.org.pl/viewvc/Development/lms/modules/nodeinfo.php.diff?&r1=1.71&r2=1.72


Index: lms/modules/nodeadd.php
diff -u lms/modules/nodeadd.php:1.97 lms/modules/nodeadd.php:1.98
--- lms/modules/nodeadd.php:1.97	Tue Jan 18 09:12:23 2011
+++ lms/modules/nodeadd.php	Fri Feb 18 15:32:46 2011
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  *
- *  $Id: nodeadd.php,v 1.97 2011/01/18 08:12:23 alec Exp $
+ *  $Id: nodeadd.php,v 1.98 2011/02/18 14:32:46 alec Exp $
  */
 
 if(isset($_GET['ajax'])) 
@@ -220,6 +220,8 @@
 
 	if(!$error)
 	{
+        $nodedata = $LMS->ExecHook('node_add_before', $nodedata);
+
 		$nodeid = $LMS->NodeAdd($nodedata);
 
 		if($nodedata['nodegroup'] != '0')
@@ -228,6 +230,9 @@
 				VALUES (?, ?)', array($nodeid, intval($nodedata['nodegroup'])));
 		}
 
+        $nodedata['id'] = $nodeid;
+        $nodedata = $LMS->ExecHook('node_add_after', $nodedata);
+
 		if(!isset($nodedata['reuse']))
 		{
 			$SESSION->redirect('?m=nodeinfo&id='.$nodeid);
@@ -239,9 +244,10 @@
 		$nodedata['ownerid'] = $ownerid;
 		$nodedata['reuse'] = '1';
 	}
-	else
+	else {
 		if($nodedata['ipaddr_pub']=='0.0.0.0')
 			$nodedata['ipaddr_pub'] = '';
+    }
 }
 else
 {
@@ -271,6 +277,8 @@
     $SMARTY->assign('customers', $LMS->GetCustomerNames());
 }
 
+$nodedata = $LMS->ExecHook('node_add_init', $nodedata);
+
 $SMARTY->assign('cstateslist',$LMS->GetCountryStates());
 $SMARTY->assign('netdevices', $LMS->GetNetDevNames());
 $SMARTY->assign('error', $error);
@@ -278,4 +286,3 @@
 $SMARTY->display('nodeadd.html');
 
 ?>
-
Index: lms/modules/nodedel.php
diff -u lms/modules/nodedel.php:1.43 lms/modules/nodedel.php:1.44
--- lms/modules/nodedel.php:1.43	Tue Jan 18 09:12:23 2011
+++ lms/modules/nodedel.php	Fri Feb 18 15:32:46 2011
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  *
- *  $Id: nodedel.php,v 1.43 2011/01/18 08:12:23 alec Exp $
+ *  $Id: nodedel.php,v 1.44 2011/02/18 14:32:46 alec Exp $
  */
 
 $nodeid = intval($_GET['id']);
@@ -35,19 +35,29 @@
 	$nodename = $LMS->GetNodeName($nodeid);
 
 	$layout['pagetitle'] = trans('Delete Node $0', $nodename);
-		
+
 	$body = '<P>'.trans('Are you sure, you want to delete node $0?', $nodename).'</P>'; 
 	$body .= '<P><A HREF="?m=nodedel&id='.$nodeid.'&is_sure=1">'.trans('Yes, I am sure.').'</A></P>';
-	
+
 	$SMARTY->assign('body',$body);
 	$SMARTY->display('dialog.html');
 }
 else
 {
 	$owner = $LMS->GetNodeOwner($nodeid);
+
+    $plugin_data = array(
+        'id'      => $nodeid,
+        'ownerid' => $owner,
+    );
+
+    $LMS->ExecHook('node_del_before', $plugin_data);
+
 	$LMS->DeleteNode($nodeid);
 
-	if($SESSION->is_set('backto'))
+    $LMS->ExecHook('node_del_after', $plugin_data);
+
+	if ($SESSION->is_set('backto'))
 		header('Location: ?'.$SESSION->get('backto'));
 	else
 		header('Location: ?m=customerinfo&id='.$owner);
Index: lms/modules/nodeedit.php
diff -u lms/modules/nodeedit.php:1.117 lms/modules/nodeedit.php:1.118
--- lms/modules/nodeedit.php:1.117	Tue Jan 18 09:12:23 2011
+++ lms/modules/nodeedit.php	Fri Feb 18 15:32:46 2011
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  *
- *  $Id: nodeedit.php,v 1.117 2011/01/18 08:12:23 alec Exp $
+ *  $Id: nodeedit.php,v 1.118 2011/02/18 14:32:46 alec Exp $
  */
 
 $action = isset($_GET['action']) ? $_GET['action'] : '';
@@ -210,7 +210,12 @@
 
 	if(!$error)
 	{
+        $nodeedit = $LMS->ExecHook('node_edit_before', $nodeedit);
+
 		$LMS->NodeUpdate($nodeedit, ($customerid != $nodeedit['ownerid']));
+
+        $nodeedit = $LMS->ExecHook('node_edit_after', $nodeedit);
+
 		$SESSION->redirect('?m=nodeinfo&id='.$nodeedit['id']);
 	}
 
@@ -253,6 +258,8 @@
     $SMARTY->assign('customers', $LMS->GetCustomerNames());
 }
 
+$nodeinfo = $LMS->ExecHook('node_edit_init', $nodeinfo);
+
 $SMARTY->assign('cstateslist',$LMS->GetCountryStates());
 $SMARTY->assign('netdevices', $LMS->GetNetDevNames());
 $SMARTY->assign('nodegroups', $LMS->GetNodeGroupNamesByNode($nodeid));
Index: lms/modules/nodeinfo.php
diff -u lms/modules/nodeinfo.php:1.71 lms/modules/nodeinfo.php:1.72
--- lms/modules/nodeinfo.php:1.71	Tue Jan 18 09:12:24 2011
+++ lms/modules/nodeinfo.php	Fri Feb 18 15:32:46 2011
@@ -21,7 +21,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
  *  USA.
  *
- *  $Id: nodeinfo.php,v 1.71 2011/01/18 08:12:24 alec Exp $
+ *  $Id: nodeinfo.php,v 1.72 2011/02/18 14:32:46 alec Exp $
  */
 
 function NodeStats($id, $dt)
@@ -96,11 +96,13 @@
 
 $layout['pagetitle'] = trans('Node Info: $0',$nodeinfo['name']);
 
+$nodeinfo = $LMS->ExecHook('node_info_init', $nodeinfo);
+
 $SMARTY->assign('netdevices',$netdevices);
-$SMARTY->assign('nodeinfo',$nodeinfo);
 $SMARTY->assign('nodestats',$nodestats);
 $SMARTY->assign('nodegroups',$nodegroups);
 $SMARTY->assign('othernodegroups',$othernodegroups);
+$SMARTY->assign('nodeinfo',$nodeinfo);
 $SMARTY->display('nodeinfo.html');
 
 ?>

From cvs w lms.org.pl  Thu Feb 24 15:53:41 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Thu, 24 Feb 2011 15:53:41 +0100 (CET)
Subject: [lms-commits] CVS update of lms/templates (customerassignments.html)
Message-ID: <20110224145341.78789302B611@eftep.altec.pl>

Date: Thursday, February 24, 2011 @ 15:53:41
Author: alec
Path: /cvsroot/lms/templates

Modified: customerassignments.html

- BTS#856: Fixed Hide/Show expired link on node* page


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lms/templates/customerassignments.html.diff?&r1=1.41&r2=1.42


Index: lms/templates/customerassignments.html
diff -u lms/templates/customerassignments.html:1.41 lms/templates/customerassignments.html:1.42
--- lms/templates/customerassignments.html:1.41	Fri Jan 14 10:22:55 2011
+++ lms/templates/customerassignments.html	Thu Feb 24 15:53:41 2011
@@ -1,4 +1,4 @@
-<!--// $Id: customerassignments.html,v 1.41 2011/01/14 09:22:55 alec Exp $ //-->
+<!--// $Id: customerassignments.html,v 1.42 2011/02/24 14:53:41 alec Exp $ //-->
 {assign var=today value=$smarty.now|date_format:"%x 00:00:00"}{assign var=today value=$today|date_format:"%s"}
 <TABLE WIDTH="100%" CELLPADDING="3">
 	<TR CLASS="DARK">
@@ -11,7 +11,7 @@
 			{if $layout.module == 'customerassignmentedit'}
 		        <A href="?m={$layout.module}&expired={if $expired}0{else}1{/if}&id={$assignment.id}">{if $expired}{t}Hide expired{/t}{else}{t}Show expired{/t}{/if} &raquo;</A>&nbsp;
 			{else}
-			    <A href="?m={$layout.module}&expired={if $expired}0{else}1{/if}&id={$customerinfo.id}">{if $expired}{t}Hide expired{/t}{else}{t}Show expired{/t}{/if} &raquo;</A>&nbsp;
+			    <A href="?m={$layout.module}&expired={if $expired}0{else}1{/if}&id={if $nodeinfo}{$nodeinfo.id}{else}{$customerinfo.id}{/if}">{if $expired}{t}Hide expired{/t}{else}{t}Show expired{/t}{/if} &raquo;</A>&nbsp;
 			{/if}
 		</TD>
 	</TR>

From cvs w lms.org.pl  Fri Feb 25 12:28:20 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Fri, 25 Feb 2011 12:28:20 +0100 (CET)
Subject: [lms-commits] CVS update of lmsweb/doc (4 files)
Message-ID: <20110225112820.B8CF7302B611@eftep.altec.pl>

Date: Friday, February 25, 2011 @ 12:28:20
Author: alec
Path: /cvsroot/lmsweb/doc

   Added: menu-hosting.html menu-messages.html
 Removed: menu-accounts.html menu-mailing.html

- Added lost documentation files


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lmsweb/doc/menu-accounts.html?rev=1.9
http://cvs.lms.org.pl/viewvc/Development/lmsweb/doc/menu-hosting.html?rev=1.1
http://cvs.lms.org.pl/viewvc/Development/lmsweb/doc/menu-mailing.html?rev=1.14
http://cvs.lms.org.pl/viewvc/Development/lmsweb/doc/menu-messages.html?rev=1.1


Index: lmsweb/doc/menu-accounts.html
diff -u lmsweb/doc/menu-accounts.html:1.9 lmsweb/doc/menu-accounts.html:removed
--- lmsweb/doc/menu-accounts.html:1.9	Mon Oct  8 15:48:12 2007
+++ lmsweb/doc/menu-accounts.html	Fri Feb 25 12:28:20 2011
@@ -1,482 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Konta</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="LMS - LAN Management System 1.10-cvs"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Interfejs Użytkownika (LMS-UI)"
-HREF="user.html"><LINK
-REL="PREVIOUS"
-TITLE="Dokumenty"
-HREF="menu-documents.html"><LINK
-REL="NEXT"
-TITLE="Mailing"
-HREF="menu-mailing.html"><LINK
-REL="STYLESHEET"
-TYPE="text/css"
-HREF="../images/style.css"><META
-HTTP-EQUIV="Content-Type"
-CONTENT="text/html; charset=ISO-8859-2"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#EBE4D6"
-TEXT="#000000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->LMS - LAN Management System 1.10-cvs</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="menu-documents.html"
-ACCESSKEY="P"
->Poprzedni</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Rozdzia&#322; 3. Interfejs Użytkownika (LMS-UI)</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="menu-mailing.html"
-ACCESSKEY="N"
->Nast&#281;pny</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="MENU-ACCOUNTS"
->3.9. Konta</A
-></H1
-><P
->Zarz±dzanie kontami różnych usług na serwerze jest teraz
-	możliwe. Funkcjonalno¶ć ta jest przeznaczona dla zaawansowanych 
-	użytkowników. Wymaga znajomo¶ci tych usług i ich konfiguracji
-	w celu korzystania z bazy danych.</P
-><P
->W LMSie można utworzyć pięć rodzajów kont: shell (1), poczta (2),
-	www (4), ftp (8) i sql (16). W nawiasach podano numeryczne wewnętrzne oznaczenie
-	typu konta w bazie. Konta mog± być wielotypowe. Przykładowo, je¶li 
-	zdefiniujesz konto shell+poczta+ftp w bazie zostanie zapisana cyfra 11.
-	Oznacza to, że do rozpoznawania typu konta w warunkach WHERE zapytań
-	SQL należy stosować sumowanie binarne (jak na przykładach w dalszej
-	czę¶ci rozdziału).</P
-><P
->Masz także możliwo¶ć definiowania domen i aliasów.</P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="ACCOUNTS-ACCOUNTS"
->3.9.1. Konta</A
-></H2
-><P
->Na li¶cie przedstawione s± podstawowe informacje o kontach.
-	    Możliwe jest dowolne sortowanie listy poprzez kliknięcie nazwy
-	    kolumny oraz filtrowanie wg zadanych kryteriów. Przej¶cie do edycji 
-	    danych konta następuje po wybraniu ikony [Edytuj]. Użytkownik ma 
-	    także prawo do zmiany hasła.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="ACCOUNTS-NEW"
->3.9.2. Nowe konto</A
-></H2
-><P
->Definiuj±c dane konto musisz podać login, hasło i
-	    wybrać typ konta oraz przypisać klienta (lub utworzyć tzw. konto
-	    systemowe). Nazwa domeny jest wymagana tylko dla kont mailowych. Data 
-	    ważno¶ci konta jest opcjonalna. Pozostawienie pustego pola z dat± 
-	    oznacza, że konto nigdy nie wygasa.</P
-><P
->Masz możliwo¶ć zdefiniować dowolny katalog domowy użytkownika (konta).
-	    Opcja konfiguracyjna <TT
-CLASS="FILENAME"
->homedir_prefix</TT
-> w sekcji 
-	    <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->[phpui]</I
-></SPAN
-> zawiera prefix katalogu domowego, domy¶lnie
-	    ustawiony na warto¶ć "/home/".</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="ACCOUNTS-ALIASES"
->3.9.3. Aliasy</A
-></H2
-><P
->Konta (głównie mailowe) mog± posiadać dowoln± ilo¶ć aliasów.
-	    Administrator serwera pocztowego może przekierować (lokalnie) pocztę
-	    z wszystkich aliasów do jednego kota. Na li¶cie aliasów przedstawione 
-	    s± podstawowe informacje o nich i o kontach na które aliasy te wskazuj±.
-	    Możliwe jest dowolne sortowanie listy poprzez kliknięcie nazwy
-	    kolumny oraz filtrowanie wg zadanych kryteriów. Nie ma możliwo¶ci
-	    edycji aliasu, należy go usun±ć i utworzyć nowy.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="ACCOUNTS-DOMAINS"
->3.9.4. Domeny</A
-></H2
-><P
->Na li¶cie przedstawione s± podstawowe informacje o zdefiniowanych
-	    domenach. Możliwe jest dowolne sortowanie listy poprzez kliknięcie nazwy
-	    kolumny. Możliwa jest edycja danych domeny po wybraniu ikony [Edytuj].</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="ACCOUNTS-EXAMPLES"
->3.9.5. Przykłady</A
-></H2
-><P
->Poniższy listing zawiera istotne fragmenty pliku konfiguracyjnego
-	    demona proftpd (w wersji 1.2.10) umożliwiaj±cy przechowywanie danych
-	    o kontach ftp w bazie LMSa. Przykład zawiera konfigurację dla bazy
-	    danych PostgreSQL, w komentarzach podano rozwi±zania dla MySQLa:
-	    <DIV
-CLASS="EXAMPLE"
-><A
-NAME="ACCOUNTS-E1"
-></A
-><P
-><B
->Przyk&#322;ad 3-1. Konta. Konfiguracja proftpd.</B
-></P
-><PRE
-CLASS="SCREEN"
->  ServerName	"LMS FTP Server"
-  
-  #nazwa_bazy w host:port klient hasło
-  SQLConnectInfo lms w localhost:5432 lms mypassword
-  
-  SQLAuthTypes Crypt Plaintext
-  SQLUserInfo passwd login password uid NULL home NULL
-  RequireValidShell off
-  SQLAuthenticate users
-  
-  # utworzenie katalogu domowego gdy nie istnieje
-  SQLHomedirOnDemand on
-  
-  # komunikat przy logowaniu
-  SQLShowInfo PASS "230" "Last login: %{getlastlogin}"
-  SQLLog PASS setlastlogin
-  
-  # SQLNamedQuery getlastlogin SELECT "CASE lastlogin WHEN 0 THEN '' ELSE FROM_UNIXTIME(lastlogin) END FROM passwd WHERE login='%u'"
-  # SQLNamedQuery setlastlogin UPDATE "lastlogin=UNIX_TIMESTAMP() WHERE login='%u'" passwd 
-  SQLNamedQuery getlastlogin SELECT "CASE lastlogin WHEN 0 THEN '' ELSE lastlogin::abstime::timestamp::text END FROM passwd WHERE login='%u'"
-  SQLNamedQuery setlastlogin UPDATE "lastlogin=EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)) WHERE login='%u'" passwd
-  
-  # Sprawdzamy datę ważno¶ci konta oraz ograniczamy szukanie do kont ftp
-  # SQLUserWhereClause "type &#38; 8 = 8 AND (expdate = 0 OR expdate &gt; UNIX_TIMESTAMP())"
-  SQLUserWhereClause "type &#38; 8 = 8 AND (expdate = 0 OR expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))"</PRE
-></DIV
-></P
-><P
->W kolejnym przykładzie przedstawimy jak skonfigurować serwer
-	    Postfix 2.1.1 oraz Cyrus-SASL 2.1.19, Courier-IMAP/POP3 3.0.4, aby korzystały
-	    z bazy danych LMSa. LMS'owe konta będ± kontami wirtualnymi, a poczta
-	    przechowywana będzie w formacie Maildir.</P
-><P
->Ponieważ hasła w LMS'ie s± szyfrowane, wymagane jest zainstalowanie
-	    SASL'a z łat± pozwalaj±c± na to. W komentarzach podano warto¶ci opcji
-	    charakterystycznych dla bazy MySQL. Listing zawiera tylko opcje bezpo¶rednio
-	    zwi±zane z baz± danych:
-	    <DIV
-CLASS="EXAMPLE"
-><A
-NAME="ACCOUNTS-E2"
-></A
-><P
-><B
->Przyk&#322;ad 3-2. Konta. Konfiguracja serwera pocztowego (postfix+sasl+courier).</B
-></P
-><PRE
-CLASS="SCREEN"
-># Plik smtpd.conf (Cyrus-SASL):
-
-pwcheck_method: auxprop
-#sql_engine: mysql
-sql_engine: pgsql
-sql_user: lms
-sql_passwd: hasło
-sql_hostnames: localhost
-sql_database: lms
-#sql_select: SELECT password FROM passwd, domains WHERE domainid = domains.id
-#       AND login='%u' AND domains.name ='%r' AND type &#38; 2 = 2 
-#	AND (expdate = 0 OR expdate &gt; UNIX_TIMESTAMP())
-sql_select: SELECT password FROM passwd, domains WHERE domainid = domains.id
-	AND login='%u' AND domains.name ='%r' AND type &#38; 2 = 2 
-	AND (expdate = 0 OR expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))
-password_format: crypt
-mech_list: login plain
-
-# authpgsqlrc (lub authmysqlrc) (Courier):
-
-# użytkownik postfix (wła¶ciciel katalogu z poczt±)
-#MYSQL_UID_FIELD '1004'
-PGSQL_UID_FIELD '1004'
-# grupa postfix (wła¶ciciel katalogu z poczt±)
-#MYSQL_GID_FIELD '1004'
-PGSQL_GID_FIELD '1004'
-#MYSQL_PORT		3306
-PGSQL_PORT		5432
-#MYSQL_USERNAME		lms
-PGSQL_USERNAME		lms
-#MYSQL_PASSWORD		hasło
-PGSQL_PASSWORD		hasło
-#MYSQL_DATABASE		lms
-PGSQL_DATABASE		lms
-#MYSQL_SELECT_CLAUSE SELECT login, \
-#       password, '', 104, 104, '/var/spool/mail/virtual', \
-#       CONCAT(domains.name,'/',login,'/'), '', login, '' \
-#       FROM passwd, domains WHERE domainid = domains.id \
-#       AND login = '$(local_part)' AND domains.name = '$(domain)' \
-#       AND type &#38; 2 = 2 AND (expdate = 0 OR expdate &gt; UNIX_TIMESTAMP())
-PGSQL_SELECT_CLAUSE SELECT login, \
-        password, '', 104, 104, '/var/spool/mail/virtual', \
-        domains.name || '/' || login ||'/', '', login, '' \
-        FROM passwd, domains WHERE domainid = domains.id 
-        AND login = '$(local_part)' AND domains.name = '$(domain)' \
-        AND type &#38; 2 = 2 \
-        AND (expdate = 0 OR expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))
-
-# main.cf (Postfix):
-
-virtual_mailbox_base = /var/spool/mail/virtual
-virtual_mailbox_domains = pgsql:/etc/postfix/pgsql_virtual_domains_maps.cf
-virtual_mailbox_maps = pgsql:/etc/postfix/pgsql_virtual_mailbox_maps.cf
-virtual_alias_maps = pgsql:/etc/postfix/pgsql_virtual_alias_maps.cf
-
-# pgsql_virtual_domains_maps.cf (Postfix):
-
-user = lms
-password = hasło
-hosts = localhost
-dbname = lms
-#MySQL nie obsługuje opcji query, dlatego budujemy zapytanie w inny sposób
-#select_field = name
-#table = domains
-#where_field = name
-query = SELECT name FROM domains WHERE name = '%s'
-
-# pgsql_virtual_mailbox_maps.cf (Postfix):
-
-user = lms
-password = hasło
-hosts = localhost
-dbname = lms
-#table = passwd, domains
-#select_field = CONCAT(domains.name,'/',login,'/')
-#where_field = CONCAT(login,'@',domains.name)
-additional_conditions = AND domainid = domains.id 
-#       AND type &#38; 2 = 2 AND (expdate = 0 OR expdate &gt; UNIX_TIMESTAMP())
-query = SELECT domains.name || '/' || login || '/' 
-	FROM passwd, domains WHERE domainid = domains.id
-        AND login = '%u' AND domains.name = '%d' 
-        AND type &#38; 2 = 2 
-        AND (expdate = 0 OR expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))
-
-# pgsql_virtual_alias_maps.cf (Postfix):
-
-user = lms
-password = hasło
-hosts = localhost
-dbname = lms
-#table = passwd, domains, aliases
-#select_field = CONCAT(passwd.login,'@',domains.name)
-#where_field = CONCAT(aliases.login,'@',domains.name)
-#additional_conditions = AND  passwd.domainid = domains.id AND passwd.id = aliases.accountid
-query = SELECT passwd.login || '@' || domains.name FROM passwd, domains, aliases 
-        WHERE passwd.domainid = domains.id AND passwd.id = aliases.accountid
-        AND aliases.login = '%u' AND domains.name = '%d' </PRE
-></DIV
-></P
-><P
->Następny przykład podesłany przez bart'a przedstawia instalację i konfigurację
-		serwera pure-ftpd w dystrybucji Gentoo z wykorzystaniem bazy danych MySQL.
-		<DIV
-CLASS="EXAMPLE"
-><A
-NAME="ACCOUNTS-E3"
-></A
-><P
-><B
->Przyk&#322;ad 3-3. Konta. Konfiguracja pure-ftpd.</B
-></P
-><P
->No to zaczynamy od instalacji serwera pure-ftpd. Pod Gentoo wygl±da to tak:
-<PRE
-CLASS="SCREEN"
->bart # emerge pure-ftpd -av
-These are the packages that I would merge, in order:
-Calculating dependencies ...done!
-[ebuild   R   ] net-ftp/pure-ftpd-1.0.20-r1  -caps -ldap +mysql +pam -postgres +ssl +vchroot 459 kB
-Total size of downloads: 459 kB</PRE
->
-			Co do innych systemów to każdy chyba wie jak się instaluje pakiety w
-			swoim systemie, a jeżeli nie to pozostaje kompilacja ze Ľródeł.
-			Po zainstalowaniu przechodzimy do stworzenia pliku, który będzie
-			odpowiadał za ł±czenie się z baz± LMS'a.
-			Tworzymy plik <TT
-CLASS="FILENAME"
->/etc/pureftpd-mysql.conf</TT
->, który to 
-			powinien zawierać minimum:
-<PRE
-CLASS="SCREEN"
->MYSQLServer     localhost (adres serwera bazy danych - domy¶lnie 'localhost')
-MYSQLPort       3306 (port na którym działa serwer MySql - domy¶lnie '3306')
-MYSQLSocket     /var/run/mysqld/mysqld.sock (
-MYSQLUser       lms (nazwa usera z dostępem do bazy)
-MYSQLPassword   hasło (tutaj należy podać hasło)
-MYSQLDatabase   lms (nazwa bazy danych)
-MYSQLCrypt      crypt (sposób przechowywania haseł)
-MYSQLGetPW      SELECT password FROM passwd WHERE login="\L" (pobieranie hasła dla usera)
-MYSQLGetUID     SELECT uid FROM passwd WHERE login="\L" (pobieranie uid dla usera)
-MYSQLGetGID     SELECT gid FROM passwd WHERE login="\L" (pobieranie gid dla usera)
-MYSQLGetDir     SELECT home FROM passwd WHERE login="\L" (pobieranie nazwy katalogu domowego dla usera)
-MySQLGetQTASZ   SELECT quota_ftp FROM passwd WHERE login="\L" (quota czyli pojemno¶ć konta w MB - podaj±c w lms-ui 10 oznacza to pojemno¶ć 10MB)</PRE
->
-			Teraz pozostaje nam już tylko konfiguracja serwera pure-ftpd. (w gentoo
-			plik konfiguracyjny mie¶ci się w <TT
-CLASS="FILENAME"
->/etc/conf.d/pure-ftpd</TT
->) 
-			a więc:
-<PRE
-CLASS="SCREEN"
->## Najpierw odkomentujmy tę linię, ponieważ inaczej serwer nie będzie chciał wystartować
-IS_CONFIGURED="yes"
-## Tutaj podajemy adres naszego serwera i port na którym ma nasłuchiwać
-SERVER="-S www.nasza.domena.pl,21"
-## Okre¶lamy ilo¶ć jednoczesnych poł±czeń do serwera oraz ilo¶ć poł±czeń z tego samego IP
-## To już chyba każdy według potrzeb
-MAX_CONN="-c 50"
-MAX_CONN_IP="-C 2"
-## Startujemy daemona w tle
-DAEMON="-B"
-## Ustalamy procentow± zajęto¶ć dysku/partycji kiedy serwer powinien przestać zezwalać na przyjmowanie danych
-DISK_FULL="-k 90%"
-## Jeżeli serwer jest za NATem odkomentuj tę linię
-#USE_NAT="-N"
-## Autoryzacja ma być pobierana z bazy LMS'a - podajemy ¶cieżkę do stworzonego przez nas wcze¶niej pliku
-AUTH="-l mysql:/etc/pureftpd-mysql.conf"
-## Pozostałe opcje w moim wypadku s± takie
-MISC_OTHER="-A -x -j"</PRE
-></P
-></DIV
-></P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="menu-documents.html"
-ACCESSKEY="P"
->Poprzedni</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Spis tre&#347;ci</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="menu-mailing.html"
-ACCESSKEY="N"
->Nast&#281;pny</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Dokumenty</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="user.html"
-ACCESSKEY="U"
->Pocz&#261;tek rozdzia&#322;u</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Mailing</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
Index: lmsweb/doc/menu-hosting.html
diff -u /dev/null lmsweb/doc/menu-hosting.html:1.1
--- /dev/null	Fri Feb 25 12:28:20 2011
+++ lmsweb/doc/menu-hosting.html	Fri Feb 25 12:28:20 2011
@@ -0,0 +1,661 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Hosting</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="LMS - LAN Management System 1.11-cvs"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Interfejs UĹĽytkownika (LMS-UI)"
+HREF="user.html"><LINK
+REL="PREVIOUS"
+TITLE="Dokumenty"
+HREF="menu-documents.html"><LINK
+REL="NEXT"
+TITLE="Wiadomości"
+HREF="menu-messages.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="../images/style.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=UTF-8"></HEAD
+><BODY
+CLASS="SECT1"
+BGCOLOR="#EBE4D6"
+TEXT="#000000"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>LMS - LAN Management System 1.11-cvs</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="menu-documents.html"
+ACCESSKEY="P"
+>Poprzedni</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Rozdzia&#322; 3. Interfejs UĹĽytkownika (LMS-UI)</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="menu-messages.html"
+ACCESSKEY="N"
+>Nast&#281;pny</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="MENU-HOSTING"
+>3.9. Hosting</A
+></H1
+><P
+>Zarządzanie różnymi usługami na serwerze jest teraz
+	możliwe. Funkcjonalność ta jest przeznaczona dla zaawansowanych 
+	użytkowników. Wymaga znajomości tych usług i ich konfiguracji
+	w celu korzystania z bazy danych.</P
+><P
+>W LMSie można utworzyć pięć rodzajów kont: shell (1), poczta (2),
+	www (4), ftp (8) i sql (16). W nawiasach podano numeryczne wewnętrzne oznaczenie
+	typu konta w bazie. Konta mogą być wielotypowe. Przykładowo, jeśli 
+	zdefiniujesz konto shell+poczta+ftp w bazie zostanie zapisana cyfra 11.
+	Oznacza to, że do rozpoznawania typu konta w warunkach WHERE zapytań
+	SQL należy stosować sumowanie binarne (jak na przykładach w dalszej
+	części rozdziału).</P
+><P
+>Masz także możliwość definiowania domen i aliasów.</P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-HOSTING-ACCOUNTS"
+>3.9.1. Konta</A
+></H2
+><P
+>Na liście przedstawione są podstawowe informacje o kontach.
+	    Możliwe jest dowolne sortowanie listy poprzez kliknięcie nazwy
+	    kolumny oraz filtrowanie wg zadanych kryteriów. Przejście do edycji 
+	    danych konta następuje po wybraniu ikony [Edytuj]. Użytkownik ma 
+	    także prawo do zmiany hasła.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-HOSTING-NEW-ACCOUNT"
+>3.9.2. Nowe konto</A
+></H2
+><P
+>Definiując dane konto musisz podać login, hasło, wybrać domenę,
+	    wybrać typ konta oraz przypisać klienta (lub utworzyć tzw. konto
+	    systemowe). Data ważności konta jest opcjonalna. Pozostawienie pustego pola z datą 
+	    oznacza, ĹĽe konto nigdy nie wygasa. </P
+><P
+>Masz możliwość zdefiniować dowolny katalog domowy użytkownika (konta).
+	    Opcja konfiguracyjna <TT
+CLASS="FILENAME"
+>homedir_prefix</TT
+> w sekcji 
+	    <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>[phpui]</I
+></SPAN
+> zawiera prefix katalogu domowego, domyślnie
+	    ustawiony na wartość "/home/".</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-HOSTING-ALIASES"
+>3.9.3. Aliasy</A
+></H2
+><P
+>Konta (głównie mailowe) mogą posiadać dowolną ilość aliasów.
+	    Administrator serwera pocztowego może przekierować (lokalnie) pocztę
+	    z wszystkich aliasów do jednego konta. Na liście aliasów przedstawione 
+	    sÄ… podstawowe informacje o nich i o kontach na ktĂłre aliasy te wskazujÄ….
+	    Możliwe jest dowolne sortowanie listy poprzez kliknięcie nazwy
+	    kolumny oraz filtrowanie wg zadanych kryteriĂłw.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-HOSTING-NEW-ALIAS"
+>3.9.4. Nowy alias</A
+></H2
+><P
+>TworzÄ…c alias definiujesz dla niego login i domenÄ™ oraz cel. Celem moĹĽe 
+		być jedno lub więcej istniejących kont. Uwaga: aby utworzyć alias do konta,
+		które znajduje się na obcym serwerze należy utworzyć konto i podać adres przekierowania.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-HOSTING-DOMAINS"
+>3.9.5. Domeny</A
+></H2
+><P
+>Obecnie LMS może bezpośrednio zarządzać serwerem PowerDNS z mysql/pqsl backend.
+		LMS teraz posiada pełne wsparcie dla większości funkcji serwera PowerDNS. Ma pełnie wsparcie 
+		dla domen typu: master, slave i native. Na liście domen przedstawione są podstawowe informacje 
+		o zdefiniowanych domenach jak nazwa, typ, właściciel. Możliwe jest dowolne sortowanie listy 
+		poprzez kliknięcie nazwy kolumny lub poprzez pierwszą literę nazwy domeny. Możliwa jest edycja 
+		podstawowych danych domeny po wybraniu ikony [Edytuj]. Zaawansowana edycja rekordĂłw domeny 
+		odbywa się poprzez wybranie ikony [Informacje] a następnie [Rekordy]. Możliwa wtedy jest pełna 
+		konfiguracja wszystkich rekordĂłw opisujÄ…cych danÄ… domenÄ™. KaĹĽda zmiana rekordu zapisana w bazie 
+		danych LMS np.: edycja, dodanie lub usunięcie rekordu automatycznie zwiększa licznik domeny o 1.
+		Każda zmiana jest także automatycznie dostrzegana przez serwer PowerDNS. Aby taka wspópraca była 
+		możliwa należy w bazie danych LMS założyć dodatkowego użytkownika z uprawieniami SELECT, INSERT,
+		UPDATE, DELETE dla tabel domains, records oraz SELECT dla tabeli supermaster.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-HOSTING-NEW-DOMAIN"
+>3.9.6. Nowa domena</A
+></H2
+><P
+>Dane domeny zawierajÄ… nazwÄ™, opis, typ (master, slave, native), adres ip serwera www, 
+		adres ip serwera pocztowego, adres ip głównego serwera nazw (jeśli wybrano typ slave) i inne
+		parametry, których wartości domyślne ustawione są w sekcji [zones]. Domena może zostać przypisana 
+		do klienta.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-HOSTING-SEARCH"
+>3.9.7. Szukaj</A
+></H2
+><P
+>Wyszukiwanie kont, aliasów i domen według zadanych kryteriów.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="HOSTING-EXAMPLES"
+>3.9.8. Przykłady</A
+></H2
+><P
+>PoniĹĽej opisano sposĂłb intergracji LMS z serwerem PowerDNS.
+	    <DIV
+CLASS="EXAMPLE"
+><A
+NAME="HOSTING-E0"
+></A
+><P
+><B
+>Przyk&#322;ad 3-1. Domeny. Konfiguracja PowerDNS.</B
+></P
+><PRE
+CLASS="SCREEN"
+>Przygotowanie bazy danych na której działa LMS do współpracy z serwerem PowerDNS.  
+
+Dodajemy uĹĽytkownika powerdns o uprawnieniach ograniczonych do tabel domains i records.
+
+GRANT SELECT, INSERT, UPDATE, DELETE ON lms.domains TO 'powerdns'@'adres-serwera-dns' IDENTIFIED BY 'hasło';
+GRANT SELECT, INSERT, UPDATE, DELETE ON lms.records TO 'powerdns'@'adres-serwera-dns' IDENTIFIED BY 'hasło';
+
+Instalujemy pakiety: pdns, pdns-backend, pdns-recursor.
+
+W dystrybucjach Centos, Fedora, RedHat:
+
+yum install pdns pdns-backend pdns-recursor
+
+Edytujemy plik /etc/pdns/pdns.conf dodajÄ…c:
+
+launch=gmysql
+gmysql-dbname=lms #wpisz właściwą nazwę bazy danych na której pracuje lms
+gmysql-host=adres-serwera-sql #podaj adres ip lub nazwÄ™ serwera na ktĂłrym pracuje bazy danych
+gmysql-password=hasło
+gmysql-user=powerdns
+master=yes 
+slave=yes
+recursor=127.0.0.1:5300
+allow-recursion=127.0.0.0/8, 192.168.0.1/24 
+
+Gdzie 192.168.0.1 to przykładowa sieć. Po przecinku należy dodać własne sieci z których
+serwer ma obsługiwać zapytania rekurencyjne.
+
+Edytujemy plik /etc/pdns-recursor/recursor.conf	dodajÄ…c:
+
+allow-from=127.0.0.0/8 
+local-address=127.0.0.1
+local-port=5300
+
+Następnie:
+
+chkconfig --levels 235 pdns-recursor on
+chkconfig --levels 235 pdns on
+
+service pdns-recursor start
+service pdns start
+
+Na Debianie:
+
+apt-get install pdns-server pdns-backend-mysql pdns-recursor
+
+Edytujemy plik  /etc/powerdns/pdns.conf dodajÄ…c:
+
+launch=gmysql
+
+Edytujemy /etc/powerdns/pdns.d/pdns.local dodajÄ…c: 
+
+gmysql-dbname=lms #wpisz właściwą nazwę bazy danych na której pracuje lms
+gmysql-host=adres-serwera-sql #podaj adres ip lub nazwÄ™ serwera na ktĂłrym pracuje bazy danych
+gmysql-password=hasło
+gmysql-user=powerdns
+master=yes 
+slave=yes
+
+Edytujemy plik /etc/powerdns/recursor.conf	dodajÄ…c:
+
+allow-from=127.0.0.0/8 
+local-address=127.0.0.1
+local-port=5300
+
+Następnie 
+
+/etc/init.d/pdns start
+/etc/init.d/pdns-recursor start&#13;</PRE
+></DIV
+></P
+><P
+>PoniĹĽszy listing zawiera istotne fragmenty pliku konfiguracyjnego
+	    demona proftpd (w wersji 1.2.10) umoĹĽliwiajÄ…cy przechowywanie danych
+	    o kontach ftp w bazie LMSa. Przykład zawiera konfigurację dla bazy
+	    danych PostgreSQL, w komentarzach podano rozwiÄ…zania dla MySQLa:
+	    <DIV
+CLASS="EXAMPLE"
+><A
+NAME="HOSTING-E1"
+></A
+><P
+><B
+>Przyk&#322;ad 3-2. Hosting. Konfiguracja proftpd.</B
+></P
+><PRE
+CLASS="SCREEN"
+>  ServerName	"LMS FTP Server"
+  
+  #nazwa_bazy w host:port klient hasło
+  SQLConnectInfo lms w localhost:5432 lms mypassword
+  
+  SQLAuthTypes Crypt Plaintext
+  SQLUserInfo passwd login password uid NULL home NULL
+  RequireValidShell off
+  SQLAuthenticate users
+  
+  # utworzenie katalogu domowego gdy nie istnieje
+  SQLHomedirOnDemand on
+  
+  # komunikat przy logowaniu
+  SQLShowInfo PASS "230" "Last login: %{getlastlogin}"
+  SQLLog PASS setlastlogin
+  
+  # SQLNamedQuery getlastlogin SELECT "CASE lastlogin WHEN 0 THEN '' ELSE FROM_UNIXTIME(lastlogin) END FROM passwd WHERE login='%u'"
+  # SQLNamedQuery setlastlogin UPDATE "lastlogin=UNIX_TIMESTAMP() WHERE login='%u'" passwd 
+  SQLNamedQuery getlastlogin SELECT "CASE lastlogin WHEN 0 THEN '' ELSE lastlogin::abstime::timestamp::text END FROM passwd WHERE login='%u'"
+  SQLNamedQuery setlastlogin UPDATE "lastlogin=EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)) WHERE login='%u'" passwd
+  
+  # Sprawdzamy datę ważności konta oraz ograniczamy szukanie do kont ftp
+  # SQLUserWhereClause "type &#38; 8 = 8 AND (expdate = 0 OR expdate &gt; UNIX_TIMESTAMP())"
+  SQLUserWhereClause "type &#38; 8 = 8 AND (expdate = 0 OR expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))"</PRE
+></DIV
+></P
+><P
+>W kolejnym przykładzie przedstawimy jak skonfigurować serwer
+	    Postfix 2.1.1 oraz Cyrus-SASL 2.1.19, Courier-IMAP/POP3 3.0.4, aby korzystały
+	    z bazy danych LMSa. LMS'owe konta będą kontami wirtualnymi, a poczta
+	    przechowywana będzie w formacie Maildir.</P
+><P
+>Ponieważ hasła w LMS'ie są szyfrowane, wymagane jest zainstalowanie
+	    SASL'a z łatą pozwalającą na to. W komentarzach podano wartości opcji
+	    charakterystycznych dla bazy MySQL. Listing zawiera tylko opcje bezpośrednio
+	    zwiÄ…zane z bazÄ… danych:
+	    <DIV
+CLASS="EXAMPLE"
+><A
+NAME="HOSTING-E2"
+></A
+><P
+><B
+>Przyk&#322;ad 3-3. Konta. Konfiguracja serwera pocztowego (postfix+sasl+courier).</B
+></P
+><PRE
+CLASS="SCREEN"
+># Plik smtpd.conf (Cyrus-SASL):
+
+pwcheck_method: auxprop
+password_format: crypt
+mech_list: login plain
+sql_user: lms
+sql_passwd: hasło
+sql_hostnames: localhost
+sql_database: lms
+# MySQL
+#sql_engine: mysql
+#sql_select: SELECT p.password FROM passwd p, domains d WHERE p.domainid = d.id
+#       AND p.login='%u' AND d.name ='%r' AND p.type &#38; 2 = 2 
+#	AND (p.expdate = 0 OR p.expdate &gt; UNIX_TIMESTAMP())
+# PostgreSQL
+sql_engine: pgsql
+sql_select: SELECT p.password FROM passwd p, domains d WHERE p.domainid = d.id
+	AND p.login='%u' AND d.name ='%r' AND p.type &#38; 2 = 2 
+	AND (p.expdate = 0 OR p.expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))
+
+# authpgsqlrc (lub authmysqlrc) (Courier):
+
+# użytkownik postfix (właściciel katalogu z pocztą)
+#MYSQL_UID_FIELD '1004'
+PGSQL_UID_FIELD '1004'
+# grupa postfix (właściciel katalogu z pocztą)
+#MYSQL_GID_FIELD '1004'
+PGSQL_GID_FIELD '1004'
+#MYSQL_PORT		3306
+PGSQL_PORT		5432
+#MYSQL_USERNAME		lms
+PGSQL_USERNAME		lms
+#MYSQL_PASSWORD		hasło
+PGSQL_PASSWORD		hasło
+#MYSQL_DATABASE		lms
+PGSQL_DATABASE		lms
+#MYSQL_SELECT_CLAUSE SELECT p.login, \
+#       p.password, '', 104, 104, '/var/spool/mail/virtual', \
+#       CONCAT(d.name,'/', p.login, '/'), '', p.login, '' \
+#       FROM passwd p, domains d WHERE p.domainid = d.id \
+#       AND p.login = '$(local_part)' AND d.name = '$(domain)' \
+#       AND p.type &#38; 2 = 2 AND (p.expdate = 0 OR p.expdate &gt; UNIX_TIMESTAMP())
+PGSQL_SELECT_CLAUSE SELECT p.login, \
+        p.password, '', 104, 104, '/var/spool/mail/virtual', \
+        d.name || '/' || p.login ||'/', '', p.login, '' \
+        FROM passwd p, domains d WHERE p.domainid = d.id 
+        AND p.login = '$(local_part)' AND d.name = '$(domain)' \
+        AND p.type &#38; 2 = 2 \
+        AND (p.expdate = 0 OR p.expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))
+
+# main.cf (Postfix):
+
+virtual_mailbox_base = /var/spool/mail/virtual
+virtual_mailbox_domains = pgsql:/etc/postfix/virtual_domains_maps.cf
+virtual_mailbox_maps = pgsql:/etc/postfix/virtual_mailbox_maps.cf
+virtual_alias_maps = pgsql:/etc/postfix/virtual_alias_maps.cf
+recipient_bcc_maps = pgsql:/etc/postfix/recipient_bcc_maps.cf
+
+# virtual_domains_maps.cf (Postfix):
+
+user = lms
+password = hasło
+hosts = localhost
+dbname = lms
+#pgSQL i MySQL
+query = SELECT name FROM domains WHERE name = '%s'
+
+# virtual_mailbox_maps.cf (Postfix):
+
+user = lms
+password = hasło
+hosts = localhost
+dbname = lms
+
+# MySQL
+#query = SELECT CONCAT(d.name,'/', p.login, '/') 
+#	FROM passwd p, domains d WHERE p.domainid = d.id
+#	AND p.login = '%u' AND d.name = '%d' 
+#	AND p.type &#38; 2 = 2 AND (p.expdate = 0 OR p.expdate &gt; UNIX_TIMESTAMP())
+# PostgresSQL
+query = SELECT d.name || '/' || p.login || '/' 
+	FROM passwd p, domains d WHERE p.domainid = d.id
+        AND p.login = '%u' AND d.name = '%d' 
+        AND p.type &#38; 2 = 2 
+        AND (p.expdate = 0 OR p.expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))
+
+# virtual_alias_maps.cf (Postfix):
+
+user = lms
+password = hasło
+hosts = localhost
+dbname = lms
+# MySQL
+#query = SELECT p.mail_forward
+#	FROM passwd p
+#	JOIN domains d ON (p.domainid = d.id)
+#	WHERE p.login = '%u' AND d.name = '%d'
+#		AND p.type &#38; 2 = 2 AND p.mail_forward != ''
+#		AND (p.expdate = 0 OR p.expdate &gt; UNIX_TIMESTAMP())
+#	UNION
+#       SELECT CASE WHEN aa.mail_forward != '' THEN aa.mail_forward ELSE CONCAT(p.login, '@', pd.name) END
+#	FROM aliases a
+#	JOIN domains ad ON (a.domainid = ad.id)
+#	JOIN aliasassignments aa ON (aa.aliasid = a.id)
+#	LEFT JOIN passwd p ON (aa.accountid = p.id AND (p.expdate = 0 OR p.expdate &gt; UNIX_TIMESTAMP()))
+#	LEFT JOIN domains pd ON (p.domainid = pd.id)
+#	WHERE a.login = '%u' AND ad.name = '%d'
+#		AND (aa.mail_forward != '' OR p.id IS NOT NULL)
+# PostgreSQL	
+query = SELECT p.mail_forward
+	FROM passwd p
+	JOIN domains d ON (p.domainid = d.id)
+	WHERE p.login = '%u' AND d.name = '%d'
+		AND p.type &#38; 2 = 2 AND p.mail_forward != ''
+		AND (p.expdate = 0 OR p.expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))
+	UNION
+	SELECT CASE WHEN aa.mail_forward != '' THEN aa.mail_forward ELSE p.login || '@' || pd.name END
+	FROM aliases a
+	JOIN domains ad ON (a.domainid = ad.id)
+	JOIN aliasassignments aa ON (aa.aliasid = a.id)
+	LEFT JOIN passwd p ON (aa.accountid = p.id
+		AND (p.expdate = 0 OR p.expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0))))
+	LEFT JOIN domains pd ON (p.domainid = pd.id)
+	WHERE a.login = '%u' AND ad.name = '%d'
+		AND (aa.mail_forward != '' OR p.id IS NOT NULL)
+
+# recipient_bcc_maps.cf (Postfix):
+
+user = lms
+password = hasło
+hosts = localhost
+dbname = lms
+# MySQL
+#query = SELECT p.mail_bcc FROM passwd p, domains d 
+#	WHERE p.domainid = d.id
+#	    AND p.login = '%u' AND d.name = '%d'
+#		AND p.type &#38; 2 = 2
+#		AND p.mail_bcc != ''
+#		AND (p.expdate = 0 OR p.expdate &gt; UNIX_TIMESTAMP())
+# PostgreSQL
+query = SELECT p.mail_bcc FROM passwd p, domains d 
+	WHERE p.domainid = d.id
+	        AND p.login = '%u' AND d.name = '%d'
+		AND p.type &#38; 2 = 2
+		AND p.mail_bcc != ''
+		AND (p.expdate = 0 OR p.expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))
+					</PRE
+></DIV
+></P
+><P
+>Następny przykład podesłany przez bart'a przedstawia instalację i konfigurację
+		serwera pure-ftpd w dystrybucji Gentoo z wykorzystaniem bazy danych MySQL.
+		<DIV
+CLASS="EXAMPLE"
+><A
+NAME="ACCOUNTS-E3"
+></A
+><P
+><B
+>Przyk&#322;ad 3-4. Konta. Konfiguracja pure-ftpd.</B
+></P
+><P
+>No to zaczynamy od instalacji serwera pure-ftpd. Pod Gentoo wyglÄ…da to tak:
+<PRE
+CLASS="SCREEN"
+>bart # emerge pure-ftpd -av
+These are the packages that I would merge, in order:
+Calculating dependencies ...done!
+[ebuild   R   ] net-ftp/pure-ftpd-1.0.20-r1  -caps -ldap +mysql +pam -postgres +ssl +vchroot 459 kB
+Total size of downloads: 459 kB</PRE
+>
+			Co do innych systemĂłw to kaĹĽdy chyba wie jak siÄ™ instaluje pakiety w
+			swoim systemie, a jeżeli nie to pozostaje kompilacja ze źródeł.
+			Po zainstalowaniu przechodzimy do stworzenia pliku, który będzie
+			odpowiadał za łączenie się z bazą LMS'a.
+			Tworzymy plik <TT
+CLASS="FILENAME"
+>/etc/pureftpd-mysql.conf</TT
+>, ktĂłry to 
+			powinien zawierać minimum:
+<PRE
+CLASS="SCREEN"
+>MYSQLServer     localhost (adres serwera bazy danych - domyślnie 'localhost')
+MYSQLPort       3306 (port na którym działa serwer MySql - domyślnie '3306')
+MYSQLSocket     /var/run/mysqld/mysqld.sock (
+MYSQLUser       lms (nazwa usera z dostępem do bazy)
+MYSQLPassword   hasło (tutaj należy podać hasło)
+MYSQLDatabase   lms (nazwa bazy danych)
+MYSQLCrypt      crypt (sposób przechowywania haseł)
+MYSQLGetPW      SELECT password FROM passwd WHERE login="\L" (pobieranie hasła dla usera)
+MYSQLGetUID     SELECT uid FROM passwd WHERE login="\L" (pobieranie uid dla usera)
+MYSQLGetGID     SELECT gid FROM passwd WHERE login="\L" (pobieranie gid dla usera)
+MYSQLGetDir     SELECT home FROM passwd WHERE login="\L" (pobieranie nazwy katalogu domowego dla usera)
+MySQLGetQTASZ   SELECT quota_ftp FROM passwd WHERE login="\L" (quota czyli pojemność konta w MB - podając w lms-ui 10 oznacza to pojemność 10MB)</PRE
+>
+			Teraz pozostaje nam juĹĽ tylko konfiguracja serwera pure-ftpd. (w gentoo
+			plik konfiguracyjny mieści się w <TT
+CLASS="FILENAME"
+>/etc/conf.d/pure-ftpd</TT
+>) 
+			a więc:
+<PRE
+CLASS="SCREEN"
+>## Najpierw odkomentujmy tę linię, ponieważ inaczej serwer nie będzie chciał wystartować
+IS_CONFIGURED="yes"
+## Tutaj podajemy adres naszego serwera i port na którym ma nasłuchiwać
+SERVER="-S www.nasza.domena.pl,21"
+## Określamy ilość jednoczesnych połączeń do serwera oraz ilość połączeń z tego samego IP
+## To już chyba każdy według potrzeb
+MAX_CONN="-c 50"
+MAX_CONN_IP="-C 2"
+## Startujemy daemona w tle
+DAEMON="-B"
+## Ustalamy procentową zajętość dysku/partycji kiedy serwer powinien przestać zezwalać na przyjmowanie danych
+DISK_FULL="-k 90%"
+## JeĹĽeli serwer jest za NATem odkomentuj tÄ™ liniÄ™
+#USE_NAT="-N"
+## Autoryzacja ma być pobierana z bazy LMS'a - podajemy ścieżkę do stworzonego przez nas wcześniej pliku
+AUTH="-l mysql:/etc/pureftpd-mysql.conf"
+## Pozostałe opcje w moim wypadku są takie
+MISC_OTHER="-A -x -j"</PRE
+></P
+></DIV
+></P
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="menu-documents.html"
+ACCESSKEY="P"
+>Poprzedni</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Spis tre&#347;ci</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="menu-messages.html"
+ACCESSKEY="N"
+>Nast&#281;pny</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Dokumenty</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="user.html"
+ACCESSKEY="U"
+>Pocz&#261;tek rozdzia&#322;u</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Wiadomości</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
Index: lmsweb/doc/menu-mailing.html
diff -u lmsweb/doc/menu-mailing.html:1.14 lmsweb/doc/menu-mailing.html:removed
--- lmsweb/doc/menu-mailing.html:1.14	Mon Oct  8 15:48:12 2007
+++ lmsweb/doc/menu-mailing.html	Fri Feb 25 12:28:20 2011
@@ -1,256 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Mailing</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="LMS - LAN Management System 1.10-cvs"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="Interfejs Użytkownika (LMS-UI)"
-HREF="user.html"><LINK
-REL="PREVIOUS"
-TITLE="Konta"
-HREF="menu-accounts.html"><LINK
-REL="NEXT"
-TITLE="Przeładowanie"
-HREF="menu-reload.html"><LINK
-REL="STYLESHEET"
-TYPE="text/css"
-HREF="../images/style.css"><META
-HTTP-EQUIV="Content-Type"
-CONTENT="text/html; charset=ISO-8859-2"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#EBE4D6"
-TEXT="#000000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->LMS - LAN Management System 1.10-cvs</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="menu-accounts.html"
-ACCESSKEY="P"
->Poprzedni</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Rozdzia&#322; 3. Interfejs Użytkownika (LMS-UI)</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="menu-reload.html"
-ACCESSKEY="N"
->Nast&#281;pny</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="MENU-MAILING"
->3.10. Mailing</A
-></H1
-><P
->Mailing, czyli Korespondencja Seryjna umożliwia wysyłanie wiadomo¶ci do grupy
-	klientów twojej sieci. Podajesz dane nadawcy, tre¶ć wiadomo¶ci oraz wybierasz grupę
-	odbiorców, do której zostanie wysłany e-mail. Grupę adresatów można okre¶lić
-	wg statusu oraz sieci lub grup klientów do których należ±. Jeżeli korzystasz z serwera
-	pocztowego na zdalnym ho¶cie będziesz musiał ustawić opcje smtp_host, smtp_port,
-	smtp_username, smtp_password w sekcji [phpui].</P
-><P
->W tre¶ci wiadomo¶ci można używać zmiennych, w miejsce których zostan±
-	podstawione dane wła¶ciwe dla każdego z klientów:
-	<TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
-><SAMP
-CLASS="PROMPT"
->%customer</SAMP
-> - nazwisko/nazwa i imię klienta</TD
-></TR
-><TR
-><TD
-><SAMP
-CLASS="PROMPT"
->%balance</SAMP
-> - kwota bilansu (ze znakiem)</TD
-></TR
-><TR
-><TD
-><SAMP
-CLASS="PROMPT"
->%cid</SAMP
-> - ID klienta</TD
-></TR
-><TR
-><TD
-><SAMP
-CLASS="PROMPT"
->%pin</SAMP
-> - PIN klienta</TD
-></TR
-><TR
-><TD
-><SAMP
-CLASS="PROMPT"
->%last_10_in_a_table</SAMP
-> - lista ostatnich 10 operacji na koncie klienta</TD
-></TR
-></TBODY
-></TABLE
->
-	</P
-><P
-><DIV
-CLASS="NOTE"
-><TABLE
-CLASS="NOTE"
-WIDTH="100%"
-BORDER="0"
-><TR
-><TD
-WIDTH="25"
-ALIGN="CENTER"
-VALIGN="TOP"
-><IMG
-SRC="../images/note.gif"
-HSPACE="5"
-ALT="Notatka"></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->Serwer musi być odpowiednio skonfigurowany do użycia PEAR::Mail.</P
-></TD
-></TR
-></TABLE
-></DIV
->
-	<DIV
-CLASS="NOTE"
-><TABLE
-CLASS="NOTE"
-WIDTH="100%"
-BORDER="0"
-><TR
-><TD
-WIDTH="25"
-ALIGN="CENTER"
-VALIGN="TOP"
-><IMG
-SRC="../images/note.gif"
-HSPACE="5"
-ALT="Notatka"></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->Do automatycznego wysyłania upomnień do klientów zalegaj±cych z opłatami można
-	wykorzystać skrypt lms-notify lub moduł notify demona <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->lmsd</I
-></SPAN
->.</P
-></TD
-></TR
-></TABLE
-></DIV
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="menu-accounts.html"
-ACCESSKEY="P"
->Poprzedni</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Spis tre&#347;ci</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="menu-reload.html"
-ACCESSKEY="N"
->Nast&#281;pny</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Konta</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="user.html"
-ACCESSKEY="U"
->Pocz&#261;tek rozdzia&#322;u</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Przeładowanie</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
Index: lmsweb/doc/menu-messages.html
diff -u /dev/null lmsweb/doc/menu-messages.html:1.1
--- /dev/null	Fri Feb 25 12:28:20 2011
+++ lmsweb/doc/menu-messages.html	Fri Feb 25 12:28:20 2011
@@ -0,0 +1,381 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Wiadomości</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="LMS - LAN Management System 1.11-cvs"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="Interfejs UĹĽytkownika (LMS-UI)"
+HREF="user.html"><LINK
+REL="PREVIOUS"
+TITLE="Hosting"
+HREF="menu-hosting.html"><LINK
+REL="NEXT"
+TITLE="Przeładowanie"
+HREF="menu-reload.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="../images/style.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=UTF-8"></HEAD
+><BODY
+CLASS="SECT1"
+BGCOLOR="#EBE4D6"
+TEXT="#000000"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>LMS - LAN Management System 1.11-cvs</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="menu-hosting.html"
+ACCESSKEY="P"
+>Poprzedni</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Rozdzia&#322; 3. Interfejs UĹĽytkownika (LMS-UI)</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="menu-reload.html"
+ACCESSKEY="N"
+>Nast&#281;pny</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="MENU-MESSAGES"
+>3.10. Wiadomości</A
+></H1
+><P
+>Wiadomości to miejsce z którego możesz rozsyłać do klientów spam w postaci
+	wiadomości e-mail lub sms. </P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-MESSAGES-LIST"
+>3.10.1. Lista</A
+></H2
+><P
+>Lista wiadomości zawiera historię wysłanych wiadomości. Możesz
+		ją dowolnie przeszukiwać korzystając z filtra. Kliknięcie wiersza
+		wiadomości powoduje przejście do strony ze szczegółowymi informacjami
+		o wiadomości tj. treści, nadawcy. Strona ta zawiera również listę
+		odbiorców wiadomości wraz ze statusem wysyłki.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-MESSAGES-NEW"
+>3.10.2. Nowa wiadomość</A
+></H2
+><P
+>Aby wysłać wiadomość należy wybrać grupę docelową przy pomocy
+		dostępnych filtrów określających status klienta, sieć, grupę, typ łącza, itp. 
+		Należy również wybrać typ wiadomości, podać jej temat (wymagany również dla smsów) i treść.</P
+><P
+>W treści wiadomości można używać zmiennych, w miejsce których zostaną
+		podstawione dane właściwe dla każdego z odbiorców:
+		<TABLE
+BORDER="0"
+><TBODY
+><TR
+><TD
+><SAMP
+CLASS="PROMPT"
+>%customer</SAMP
+> - nazwisko/nazwa i imiÄ™ klienta</TD
+></TR
+><TR
+><TD
+><SAMP
+CLASS="PROMPT"
+>%balance</SAMP
+> - kwota bilansu (ze znakiem)</TD
+></TR
+><TR
+><TD
+><SAMP
+CLASS="PROMPT"
+>%cid</SAMP
+> - ID klienta</TD
+></TR
+><TR
+><TD
+><SAMP
+CLASS="PROMPT"
+>%pin</SAMP
+> - PIN klienta</TD
+></TR
+><TR
+><TD
+><SAMP
+CLASS="PROMPT"
+>%last_10_in_a_table</SAMP
+> - lista ostatnich 10 operacji na koncie klienta</TD
+></TR
+></TBODY
+></TABLE
+>
+		</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-MESSAGES-CONF"
+>3.10.3. Konfiguracja</A
+></H2
+><P
+>Serwer musi być odpowiednio skonfigurowany do użycia PEAR::Mail dla mailingu. 
+		Jeżeli korzystasz z serwera pocztowego na zdalnym hoście będziesz musiał ustawić 
+		opcje smtp_host, smtp_port, smtp_username, smtp_password.</P
+><P
+>PoniĹĽej znajduje siÄ™ lista opcji konfiguracyjnych zwiÄ…zanych
+		z wysyłaniem wiadomości pocztowych. Opcje te umieszczone są w sekcji
+		<SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>[mail]</I
+></SPAN
+>
+		<UL
+><LI
+><P
+>debug_email</P
+><P
+>Adres e-mail do debugowania - pod ten adres będą szły wiadomości wysyłane z sekcji 'Wiadomości' LMS'a, 
+				zamiast do właściwych klientów.</P
+><P
+>Przykład:     <SAMP
+CLASS="PROMPT"
+>debug_email = root w localhost</SAMP
+></P
+></LI
+><LI
+><P
+>smtp_host, smtp_port, smtp_username, smtp_password</P
+><P
+>Parametry połączenia SMTP. LMS umożliwia korzystanie ze
+				zdalnego serwera pocztowego z autoryzacją, wykorzystując do tego moduł
+				PEAR::Mail. Domyślnie: 127.0.0.1:25.</P
+><P
+>Przykład:     <SAMP
+CLASS="PROMPT"
+>smtp_host = poczta.domena.pl</SAMP
+></P
+></LI
+><LI
+><P
+>smtp_auth_type</P
+><P
+>Metoda autoryzacji SMTP w mailingu. Przy ustawieniach domyślnych
+				zostanie użyta najlepsza z dostępnych metod. Domyślnie: nie ustawiona.</P
+><P
+>Przykład:     <SAMP
+CLASS="PROMPT"
+>smtp_auth_type = DIGEST-MD5</SAMP
+></P
+></LI
+></UL
+>
+		</P
+><P
+>Konfiguracja wiadomości SMS jest bardziej rozbudowana. Przede wszystkim 
+		należy zdefiniować z jakiej usługi będziemy korzystać. Czy będzie to bramka smsowa,
+		czy jakieĹ› oprogramowanie zainstalowane na serwerze (np. gnokii, smstools). Konfiguracji
+		dokonujemy w sekcji <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>[sms]</I
+></SPAN
+>:
+		<UL
+><LI
+><P
+>service</P
+><P
+>Usługa używana do wysyłania smsów. Dozwolone wartości to 'smstools' i 'smscenter'</P
+><P
+>Przykład:     <SAMP
+CLASS="PROMPT"
+>service = smstools</SAMP
+></P
+></LI
+><LI
+><P
+>prefix</P
+><P
+>Telefoniczny prefix kraju. Domyślnie: 48 (Polska)</P
+><P
+>Przykład:     <SAMP
+CLASS="PROMPT"
+>prefix = 49</SAMP
+></P
+></LI
+><LI
+><P
+>from</P
+><P
+>Nadawca wiadomości. Domyślnie: pusta.</P
+><P
+>Przykład:     <SAMP
+CLASS="PROMPT"
+>from = ISP Sp. z o.o.</SAMP
+></P
+></LI
+><LI
+><P
+>username</P
+><P
+>Nazwa użytkownika bramki smsowej. Domyślnie: pusta.</P
+><P
+>Przykład:     <SAMP
+CLASS="PROMPT"
+>username = isp</SAMP
+></P
+></LI
+><LI
+><P
+>password</P
+><P
+>Hasło do bramki smsowej. Domyślnie: puste.</P
+><P
+>Przykład:     <SAMP
+CLASS="PROMPT"
+>password = haslo</SAMP
+></P
+></LI
+><LI
+><P
+>smscenter_type</P
+><P
+>Typ konta w usłudze smscenter. Jeśli wybrano 'static' LMS doda nazwę
+				nadawcy na końcu wiadomości. Domyślnie: dynamic.</P
+><P
+>Przykład:     <SAMP
+CLASS="PROMPT"
+>smscenter_type = static</SAMP
+></P
+></LI
+><LI
+><P
+>smstools_outdir</P
+><P
+>Katalog na pliki wiadomości do wysłania dla demona smsd z pakietu smstools.
+				Serwer HTTP musi mieć prawa do zapisu w tym katalogu.
+				Domyślnie: /var/spool/sms/outgoing.</P
+><P
+>Przykład:     <SAMP
+CLASS="PROMPT"
+>smstools_outdir = /home/smsd/outgoing</SAMP
+></P
+></LI
+></UL
+>
+		</P
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="menu-hosting.html"
+ACCESSKEY="P"
+>Poprzedni</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Spis tre&#347;ci</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="menu-reload.html"
+ACCESSKEY="N"
+>Nast&#281;pny</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Hosting</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="user.html"
+ACCESSKEY="U"
+>Pocz&#261;tek rozdzia&#322;u</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Przeładowanie</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file

From cvs w lms.org.pl  Fri Feb 25 12:28:20 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Fri, 25 Feb 2011 12:28:20 +0100 (CET)
Subject: [lms-commits] CVS update of lmsweb/doc_en (4 files)
Message-ID: <20110225112820.DFE66302B612@eftep.altec.pl>

Date: Friday, February 25, 2011 @ 12:28:20
Author: alec
Path: /cvsroot/lmsweb/doc_en

   Added: menu-hosting.html menu-messages.html
 Removed: menu-accounts.html menu-mailing.html

- Added lost documentation files


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lmsweb/doc_en/menu-accounts.html?rev=1.9
http://cvs.lms.org.pl/viewvc/Development/lmsweb/doc_en/menu-hosting.html?rev=1.1
http://cvs.lms.org.pl/viewvc/Development/lmsweb/doc_en/menu-mailing.html?rev=1.9
http://cvs.lms.org.pl/viewvc/Development/lmsweb/doc_en/menu-messages.html?rev=1.1


Index: lmsweb/doc_en/menu-accounts.html
diff -u lmsweb/doc_en/menu-accounts.html:1.9 lmsweb/doc_en/menu-accounts.html:removed
--- lmsweb/doc_en/menu-accounts.html:1.9	Mon Oct  8 15:48:15 2007
+++ lmsweb/doc_en/menu-accounts.html	Fri Feb 25 12:28:20 2011
@@ -1,408 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Accounts</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="LMS - LAN Management System 1.10-cvs"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="User Interface (LMS-UI)"
-HREF="user.html"><LINK
-REL="PREVIOUS"
-TITLE="Documents"
-HREF="menu-documents.html"><LINK
-REL="NEXT"
-TITLE="Mailing"
-HREF="menu-mailing.html"><LINK
-REL="STYLESHEET"
-TYPE="text/css"
-HREF="../images/style.css"><META
-HTTP-EQUIV="Content-Type"
-CONTENT="text/html; charset=ISO-8859-1"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#EBE4D6"
-TEXT="#000000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->LMS - LAN Management System 1.10-cvs</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="menu-documents.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 3. User Interface (LMS-UI)</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="menu-mailing.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="MENU-ACCOUNTS"
->3.9. Accounts</A
-></H1
-><P
->It's now possible to manage accounts from your services using LMS.
-This functionality is provided for advanced system administrators, because it
-requires in-depth knowledge of services running on server in order to configure
-them to use LMS database.</P
-><P
->You can create five types of accounts now: shell (1), email (2),
-www (4), ftp (8) and sql (16). Decimal values for internal representation of those accounts
-are given in parenthesis. This approach enables to provide multi-type accounts,
-eg. if you define shell+email+ftp account it will be given number 11 in
-database. This means that for recognition of account type you should use binary
-sums in WHERE clauses of your SQL queries (few examples are written
-below).</P
-><P
->You have also possibility to define domains and aliases.</P
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="ACCOUNTS-ACCOUNTS"
->3.9.1. Accounts</A
-></H2
-><P
->Account list contains basic information about your customer
-accounts. It's possible to sort it by any highlighted column title and to filter
-it for given criteria. You can edit any account clicking 'Edit' icon.
-Administrator (LMS user) is also able to change account passwords.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="ACCOUNTS-NEW"
->3.9.2. New Account</A
-></H2
-><P
->To create new account you have to provide its login, password,
-	    choose at least one account type and assign customer to it. Domain name is
-	    optional and you'll need it only if you want to support email accounts.
-	    Expiration date is also optional, leave it empty to make new account valid
-	    forever.</P
-><P
->You can define any home directory for account. Option
-	    <TT
-CLASS="FILENAME"
->homedir_prefix</TT
-> from section <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->[phpui]</I
-></SPAN
->
-	    consists default prefix "/home/".</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="ACCOUNTS-ALIASES"
->3.9.3. Aliases</A
-></H2
-><P
->Every account (email type mainly) might have any number of
-aliases that is needed. Mail server administrator might redirect mail locally
-from all those aliases to one physical existing account. Basic information about
-alias and accompanying account is provided on the list. It's possible to sort
-this list by any highlighted column name and to filter list for given criteria.
-It's not possible to edit an alias - if it's not desirable anymore you have to
-erase (remove) it and create new if needed. Add new aliases at the bottom of the
-list.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="ACCOUNTS-DOMAINS"
->3.9.4. Domains</A
-></H2
-><P
->You're able to see basic informations about domains on the
-list. It's possible to sort
-this list by any highlighted column name and to filter list for given criteria.
-You can edit domain data by clicking 'Edit' icon. Add new domain at the bottom
-of the list.</P
-></DIV
-><DIV
-CLASS="SECT2"
-><H2
-CLASS="SECT2"
-><A
-NAME="ACCOUNTS-EXAMPLES"
->3.9.5. Examples</A
-></H2
-><P
->The following section contains fragments of proftpd daemon
-configuration (version 1.2.10) relevant to process of authentication with using
-data available in LMS database. This example contains Postgres configuration and
-optional MySQL configuration in comments, followed by pound (hash) sign.
-	    <DIV
-CLASS="EXAMPLE"
-><A
-NAME="ACCOUNTS-E1"
-></A
-><P
-><B
->Example 3-1. Accounts. Proftpd configuration.</B
-></P
-><PRE
-CLASS="SCREEN"
->  ServerName	"LMS FTP Server"
-  
-  #dbname w host:port dbuser dbpass
-  SQLConnectInfo lms w localhost:5432 lms mypassword
-  
-  SQLAuthTypes Crypt Plaintext
-  SQLUserInfo passwd login password uid NULL home NULL
-  RequireValidShell off
-  SQLAuthenticate users
-  
-  # create user home directory if it doesn't exists yet
-  SQLHomedirOnDemand on
-  
-  # login message
-  SQLShowInfo PASS "230" "Last login: %{getlastlogin}"
-  SQLLog PASS setlastlogin
-  
-  # SQLNamedQuery getlastlogin SELECT "CASE lastlogin WHEN 0 THEN '' ELSE FROM_UNIXTIME(lastlogin) END FROM passwd WHERE login='%u'"
-  # SQLNamedQuery setlastlogin UPDATE "lastlogin=UNIX_TIMESTAMP() WHERE login='%u'" passwd 
-  SQLNamedQuery getlastlogin SELECT "CASE lastlogin WHEN 0 THEN '' ELSE lastlogin::abstime::timestamp::text END FROM passwd WHERE login='%u'"
-  SQLNamedQuery setlastlogin UPDATE "lastlogin=EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)) WHERE login='%u'" passwd
-  
-  # We limit access to valid (not expired) accounts with ftp type
-  # SQLUserWhereClause "type &#38; 8 = 8 AND (expdate = 0 OR expdate &gt; UNIX_TIMESTAMP())"
-  SQLUserWhereClause "type &#38; 8 = 8 AND (expdate = 0 OR expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))"</PRE
-></DIV
-></P
-><P
->Next example will show us how to configure Postfix 2.1.1 mail
-server with Cyrus-SASL 2.1.19 and Courier-IMAP/POP3 3.0.4, so that they use LMS
-database. LMS accounts will be virtual, which means that they will be all
-maintained by one uid on server with mail stored in Maildir format.</P
-><P
->You'll need to patch your SASL for encrypted passwords,
-because LMS database contains them only in this form. In comments we have
-provided MySQL specific options. Only fragments relevant to database setup are
-shown below:
-	    <DIV
-CLASS="EXAMPLE"
-><A
-NAME="ACCOUNTS-E2"
-></A
-><P
-><B
->Example 3-2. Accounts. Mail server configuration (postfix+sasl+courier).</B
-></P
-><PRE
-CLASS="SCREEN"
-># smtpd.conf file (Cyrus-SASL):
-
-pwcheck_method: auxprop
-#sql_engine: mysql
-sql_engine: pgsql
-sql_user: lms
-sql_passwd: dbpass
-sql_hostnames: localhost
-sql_database: lms
-#sql_select: SELECT password FROM passwd, domains WHERE domainid = domains.id
-#       AND login='%u' AND domains.name ='%r' AND type &#38; 2 = 2 
-#	AND (expdate = 0 OR expdate &gt; UNIX_TIMESTAMP())
-sql_select: SELECT password FROM passwd, domains WHERE domainid = domains.id
-	AND login='%u' AND domains.name ='%r' AND type &#38; 2 = 2 
-	AND (expdate = 0 OR expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))
-password_format: crypt
-mech_list: login plain
-
-# authpgsqlrc (or authmysqlrc) (Courier):
-
-# user postfix (owner of mail directory)
-#MYSQL_UID_FIELD '1004'
-PGSQL_UID_FIELD '1004'
-# group postfix (owner of mail directory)
-#MYSQL_GID_FIELD '1004'
-PGSQL_GID_FIELD '1004'
-#MYSQL_PORT		3306
-PGSQL_PORT		5432
-#MYSQL_USERNAME		lms
-PGSQL_USERNAME		lms
-#MYSQL_PASSWORD		dbpass
-PGSQL_PASSWORD		dbpass
-#MYSQL_DATABASE		lms
-PGSQL_DATABASE		lms
-#MYSQL_SELECT_CLAUSE SELECT login, \
-#       password, '', 104, 104, '/var/spool/mail/virtual', \
-#       CONCAT(domains.name,'/',login,'/'), '', login, '' \
-#       FROM passwd, domains WHERE domainid = domains.id \
-#       AND login = '$(local_part)' AND domains.name = '$(domain)' \
-#       AND type &#38; 2 = 2 AND (expdate = 0 OR expdate &gt; UNIX_TIMESTAMP())
-PGSQL_SELECT_CLAUSE SELECT login, \
-        password, '', 104, 104, '/var/spool/mail/virtual', \
-        domains.name || '/' || login ||'/', '', login, '' \
-        FROM passwd, domains WHERE domainid = domains.id 
-        AND login = '$(local_part)' AND domains.name = '$(domain)' \
-        AND type &#38; 2 = 2 \
-        AND (expdate = 0 OR expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))
-
-# main.cf (Postfix):
-
-virtual_mailbox_base = /var/spool/mail/virtual
-virtual_mailbox_domains = pgsql:/etc/postfix/pgsql_virtual_domains_maps.cf
-virtual_mailbox_maps = pgsql:/etc/postfix/pgsql_virtual_mailbox_maps.cf
-virtual_alias_maps = pgsql:/etc/postfix/pgsql_virtual_alias_maps.cf
-
-# pgsql_virtual_domains_maps.cf (Postfix):
-
-user = lms
-password = dbpass
-hosts = localhost
-dbname = lms
-#MySQL plugin doesn't support query option, thus we build query differently
-#select_field = name
-#table = domains
-#where_field = name
-query = SELECT name FROM domains WHERE name = '%s'
-
-# pgsql_virtual_mailbox_maps.cf (Postfix):
-
-user = lms
-password = dbpass
-hosts = localhost
-dbname = lms
-#table = passwd, domains
-#select_field = CONCAT(domains.name,'/',login,'/')
-#where_field = CONCAT(login,'@',domains.name)
-additional_conditions = AND domainid = domains.id 
-#       AND type &#38; 2 = 2 AND (expdate = 0 OR expdate &gt; UNIX_TIMESTAMP())
-query = SELECT domains.name || '/' || login || '/' 
-	FROM passwd, domains WHERE domainid = domains.id
-        AND login = '%u' AND domains.name = '%d' 
-        AND type &#38; 2 = 2 
-        AND (expdate = 0 OR expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))
-
-# pgsql_virtual_alias_maps.cf (Postfix):
-
-user = lms
-password = dbpass
-hosts = localhost
-dbname = lms
-#table = passwd, domains, aliases
-#select_field = CONCAT(passwd.login,'@',domains.name)
-#where_field = CONCAT(aliases.login,'@',domains.name)
-#additional_conditions = AND  passwd.domainid = domains.id AND passwd.id = aliases.accountid
-query = SELECT passwd.login || '@' || domains.name FROM passwd, domains, aliases 
-        WHERE passwd.domainid = domains.id AND passwd.id = aliases.accountid
-        AND aliases.login = '%u' AND domains.name = '%d' </PRE
-></DIV
-></P
-></DIV
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="menu-documents.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="menu-mailing.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Documents</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="user.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Mailing</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
Index: lmsweb/doc_en/menu-hosting.html
diff -u /dev/null lmsweb/doc_en/menu-hosting.html:1.1
--- /dev/null	Fri Feb 25 12:28:20 2011
+++ lmsweb/doc_en/menu-hosting.html	Fri Feb 25 12:28:20 2011
@@ -0,0 +1,489 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Hosting</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="LMS - LAN Management System 1.11-cvs"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="User Interface (LMS-UI)"
+HREF="user.html"><LINK
+REL="PREVIOUS"
+TITLE="Documents"
+HREF="menu-documents.html"><LINK
+REL="NEXT"
+TITLE="Messages"
+HREF="menu-messages.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="../images/style.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"></HEAD
+><BODY
+CLASS="SECT1"
+BGCOLOR="#EBE4D6"
+TEXT="#000000"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>LMS - LAN Management System 1.11-cvs</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="menu-documents.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Chapter 3. User Interface (LMS-UI)</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="menu-messages.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="MENU-HOSTING"
+>3.9. Hosting</A
+></H1
+><P
+>It's now possible to manage accounts from your services using LMS.
+This functionality is provided for advanced system administrators, because it
+requires in-depth knowledge of services running on server in order to configure
+them to use LMS database.</P
+><P
+>You can create five types of accounts now: shell (1), email (2),
+www (4), ftp (8) and sql (16). Decimal values for internal representation of those accounts
+are given in parenthesis. This approach enables to provide multi-type accounts,
+eg. if you define shell+email+ftp account it will be given number 11 in
+database. This means that for recognition of account type you should use binary
+sums in WHERE clauses of your SQL queries (few examples are written
+below).</P
+><P
+>You have also possibility to define domains and aliases.</P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-HOSTING-ACCOUNTS"
+>3.9.1. Accounts</A
+></H2
+><P
+>Account list contains basic information about your customer
+accounts. It's possible to sort it by any highlighted column title and to filter
+it for given criteria. You can edit any account clicking 'Edit' icon.
+Administrator (LMS user) is also able to change account passwords.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-HOSTING-NEW-ACCOUNT"
+>3.9.2. New Account</A
+></H2
+><P
+>To create new account you have to provide its login, password,
+	    choose domain, at least one account type and assign customer to it.</P
+><P
+>You can define any home directory for account. Option
+	    <TT
+CLASS="FILENAME"
+>homedir_prefix</TT
+> from section <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>[phpui]</I
+></SPAN
+>
+	    consists default prefix "/home/".</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-HOSTING-ALIASES"
+>3.9.3. Aliases</A
+></H2
+><P
+>Every account (email type mainly) might have any number of
+	    aliases that is needed. Mail server administrator might redirect mail locally
+	    from all those aliases to physical existing account(s). Basic information about
+	    alias and accompanying account is provided on the list. It's possible to sort
+	    this list by any highlighted column name and to filter list for given criteria.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-HOSTING-NEW-ALIAS"
+>3.9.4. New Alias</A
+></H2
+><P
+>Creating alias you have to define login, domain and destination account(s).
+	    Destination accounts must exists in LMS. If you need alias for external account, 
+	    you should create an account with redirect address.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-HOSTING-DOMAINS"
+>3.9.5. Domains</A
+></H2
+><P
+>Currently LMS can directly manage PowerDNS server with mysql/pqsql backend.
+	    LMS now has full support for most of the features of PowerDNS server.
+	    It has full support for zone types: master,  native and  slave.
+	    You're able to see basic information about domains on the list such as: name, type, owner. 
+	    It's possible to sort this list by any highlighted column name and to filter 
+	    list for given criteria and by first letter of domain name. You can edit domain 
+	    data by clicking 'Edit' icon. Add new domain at the bottom and at the top of the list.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-HOSTING-NEW-DOMAIN"
+>3.9.6. New Domain</A
+></H2
+><P
+>Domain data consists of name, description, type (master,slave,native), IP address of webserver,
+	    IP address of mailserver, IP address of master NS (when type slave is selected) and other 
+	    parameter which have default values stored in "zones" section. 
+	    Domain can be assigned to customer. </P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-HOSTING-SEARCH"
+>3.9.7. Search</A
+></H2
+><P
+>You can search for accounts, aliases and domains here by any given criteria.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="HOSTING-EXAMPLES"
+>3.9.8. Examples</A
+></H2
+><P
+>The following section contains fragments of proftpd daemon
+configuration (version 1.2.10) relevant to process of authentication with using
+data available in LMS database. This example contains Postgres configuration and
+optional MySQL configuration in comments, followed by pound (hash) sign.
+	    <DIV
+CLASS="EXAMPLE"
+><A
+NAME="HOSTING-E1"
+></A
+><P
+><B
+>Example 3-1. Accounts. Proftpd configuration.</B
+></P
+><PRE
+CLASS="SCREEN"
+>  ServerName	"LMS FTP Server"
+  
+  #dbname w host:port dbuser dbpass
+  SQLConnectInfo lms w localhost:5432 lms mypassword
+  
+  SQLAuthTypes Crypt Plaintext
+  SQLUserInfo passwd login password uid NULL home NULL
+  RequireValidShell off
+  SQLAuthenticate users
+  
+  # create user home directory if it doesn't exists yet
+  SQLHomedirOnDemand on
+  
+  # login message
+  SQLShowInfo PASS "230" "Last login: %{getlastlogin}"
+  SQLLog PASS setlastlogin
+  
+  # SQLNamedQuery getlastlogin SELECT "CASE lastlogin WHEN 0 THEN '' ELSE FROM_UNIXTIME(lastlogin) END FROM passwd WHERE login='%u'"
+  # SQLNamedQuery setlastlogin UPDATE "lastlogin=UNIX_TIMESTAMP() WHERE login='%u'" passwd 
+  SQLNamedQuery getlastlogin SELECT "CASE lastlogin WHEN 0 THEN '' ELSE lastlogin::abstime::timestamp::text END FROM passwd WHERE login='%u'"
+  SQLNamedQuery setlastlogin UPDATE "lastlogin=EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)) WHERE login='%u'" passwd
+  
+  # We limit access to valid (not expired) accounts with ftp type
+  # SQLUserWhereClause "type &#38; 8 = 8 AND (expdate = 0 OR expdate &gt; UNIX_TIMESTAMP())"
+  SQLUserWhereClause "type &#38; 8 = 8 AND (expdate = 0 OR expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))"</PRE
+></DIV
+></P
+><P
+>Next example will show us how to configure Postfix 2.1.1 mail
+server with Cyrus-SASL 2.1.19 and Courier-IMAP/POP3 3.0.4, so that they use LMS
+database. LMS accounts will be virtual, which means that they will be all
+maintained by one uid on server with mail stored in Maildir format.</P
+><P
+>You'll need to patch your SASL for encrypted passwords,
+because LMS database contains them only in this form. In comments we have
+provided MySQL specific options. Only fragments relevant to database setup are
+shown below:
+	    <DIV
+CLASS="EXAMPLE"
+><A
+NAME="HOSTING-E2"
+></A
+><P
+><B
+>Example 3-2. Accounts. Mail server configuration (postfix+sasl+courier).</B
+></P
+><PRE
+CLASS="SCREEN"
+># smtpd.conf file (Cyrus-SASL):
+
+pwcheck_method: auxprop
+#sql_engine: mysql
+sql_engine: pgsql
+sql_user: lms
+sql_passwd: dbpass
+sql_hostnames: localhost
+sql_database: lms
+#sql_select: SELECT p.password FROM passwd p, domains d WHERE p.domainid = d.id
+#   AND p.login='%u' AND d.name ='%r' AND p.type &#38; 2 = 2 
+#	AND (p.expdate = 0 OR p.expdate &gt; UNIX_TIMESTAMP())
+sql_select: SELECT p.password FROM passwd p, domains d WHERE p.domainid = d.id
+	AND p.login='%u' AND d.name ='%r' AND p.type &#38; 2 = 2 
+	AND (p.expdate = 0 OR p.expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))
+password_format: crypt
+mech_list: login plain
+
+# authpgsqlrc (or authmysqlrc) (Courier):
+
+# user postfix (owner of mail directory)
+#MYSQL_UID_FIELD '1004'
+PGSQL_UID_FIELD '1004'
+# group postfix (owner of mail directory)
+#MYSQL_GID_FIELD '1004'
+PGSQL_GID_FIELD '1004'
+#MYSQL_PORT		3306
+PGSQL_PORT		5432
+#MYSQL_USERNAME		lms
+PGSQL_USERNAME		lms
+#MYSQL_PASSWORD		dbpass
+PGSQL_PASSWORD		dbpass
+#MYSQL_DATABASE		lms
+PGSQL_DATABASE		lms
+#MYSQL_SELECT_CLAUSE SELECT p.login, \
+#       p.password, '', 104, 104, '/var/spool/mail/virtual', \
+#       CONCAT(d.name,'/', p.login, '/'), '', p.login, '' \
+#       FROM passwd p, domains d WHERE p.domainid = d.id \
+#       AND p.login = '$(local_part)' AND d.name = '$(domain)' \
+#       AND p.type &#38; 2 = 2 AND (p.expdate = 0 OR p.expdate &gt; UNIX_TIMESTAMP())
+PGSQL_SELECT_CLAUSE SELECT p.login, \
+        p.password, '', 104, 104, '/var/spool/mail/virtual', \
+        d.name || '/' || p.login ||'/', '', p.login, '' \
+        FROM passwd p, domains d WHERE p.domainid = d.id 
+        AND p.login = '$(local_part)' AND d.name = '$(domain)' \
+        AND p.type &#38; 2 = 2 \
+        AND (p.expdate = 0 OR p.expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))
+
+# main.cf (Postfix):
+
+virtual_mailbox_base = /var/spool/mail/virtual
+virtual_mailbox_domains = pgsql:/etc/postfix/virtual_domains_maps.cf
+virtual_mailbox_maps = pgsql:/etc/postfix/virtual_mailbox_maps.cf
+virtual_alias_maps = pgsql:/etc/postfix/virtual_alias_maps.cf
+recipient_bcc_maps = pgsql:/etc/postfix/recipient_bcc_maps.cf
+
+# virtual_domains_maps.cf (Postfix):
+
+user = lms
+password = dbpass
+hosts = localhost
+dbname = lms
+query = SELECT name FROM domains WHERE name = '%s'
+
+# virtual_mailbox_maps.cf (Postfix):
+
+user = lms
+password = dbpass
+hosts = localhost
+dbname = lms
+# MySQL
+#query = SELECT CONCAT(d.name, '/', p.login, '/') 
+#	FROM passwd p, domains d WHERE p.domainid = d.id
+#       AND p.login = '%u' AND d.name = '%d' 
+#       AND p.type &#38; 2 = 2 
+#       AND (p.expdate = 0 OR p.expdate &gt; UNIX_TIMESTAMP())
+# PostgreSQL
+query = SELECT d.name || '/' || p.login || '/' 
+	FROM passwd p, domains d WHERE p.domainid = d.id
+        AND p.login = '%u' AND d.name = '%d' 
+        AND p.type &#38; 2 = 2 
+        AND (p.expdate = 0 OR p.expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))
+
+# virtual_alias_maps.cf (Postfix):
+
+user = lms
+password = dbpass
+hosts = localhost
+dbname = lms
+# MySQL
+# MySQL
+#query = SELECT p.mail_forward
+#	FROM passwd p
+#	JOIN domains d ON (p.domainid = d.id)
+#	WHERE p.login = '%u' AND d.name = '%d'
+#		AND p.type &#38; 2 = 2 AND p.mail_forward != ''
+#		AND (p.expdate = 0 OR p.expdate &gt; UNIX_TIMESTAMP())
+#	UNION
+#   SELECT CASE WHEN aa.mail_forward != '' THEN aa.mail_forward ELSE CONCAT(p.login, '@', pd.name) END
+#	FROM aliases a
+#	JOIN domains ad ON (a.domainid = ad.id)
+#	JOIN aliasassignments aa ON (aa.aliasid = a.id)
+#	LEFT JOIN passwd p ON (aa.accountid = p.id AND (p.expdate = 0 OR p.expdate &gt; UNIX_TIMESTAMP()))
+#	LEFT JOIN domains pd ON (p.domainid = pd.id)
+#	WHERE a.login = '%u' AND ad.name = '%d'
+#		AND (aa.mail_forward != '' OR p.id IS NOT NULL)
+# PostgreSQL	
+query = SELECT p.mail_forward
+	FROM passwd p
+	JOIN domains d ON (p.domainid = d.id)
+	WHERE p.login = '%u' AND d.name = '%d'
+		AND p.type &#38; 2 = 2 AND p.mail_forward != ''
+		AND (p.expdate = 0 OR p.expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))
+	UNION
+	SELECT CASE WHEN aa.mail_forward != '' THEN aa.mail_forward ELSE p.login || '@' || pd.name END
+	FROM aliases a
+	JOIN domains ad ON (a.domainid = ad.id)
+	JOIN aliasassignments aa ON (aa.aliasid = a.id)
+	LEFT JOIN passwd p ON (aa.accountid = p.id
+		AND (p.expdate = 0 OR p.expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0))))
+	LEFT JOIN domains pd ON (p.domainid = pd.id)
+	WHERE a.login = '%u' AND ad.name = '%d'
+		AND (aa.mail_forward != '' OR p.id IS NOT NULL)
+
+# recipient_bcc_maps.cf (Postfix):
+
+user = lms
+password = dbpass
+hosts = localhost
+dbname = lms
+# MySQL
+#query = SELECT p.mail_bcc
+#        FROM passwd p, domains d WHERE p.domainid = d.id
+#		AND p.login = '%u' AND d.name = '%d'
+#		AND p.type &#38; 2 = 2
+#		AND p.mail_bcc != ''
+#		AND (p.expdate = 0 OR p.expdate &gt; UNIX_TIMESTAMP())
+# PostgreSQL
+query = SELECT p.mail_bcc
+        FROM passwd p, domains d WHERE p.domainid = d.id
+		AND p.login = '%u' AND d.name = '%d'
+		AND p.type &#38; 2 = 2
+		AND p.mail_bcc != ''
+		AND (p.expdate = 0 OR p.expdate &gt; EXTRACT(EPOCH FROM CURRENT_TIMESTAMP(0)))</PRE
+></DIV
+></P
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="menu-documents.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="menu-messages.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Documents</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="user.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Messages</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file
Index: lmsweb/doc_en/menu-mailing.html
diff -u lmsweb/doc_en/menu-mailing.html:1.9 lmsweb/doc_en/menu-mailing.html:removed
--- lmsweb/doc_en/menu-mailing.html:1.9	Mon Oct  8 15:48:16 2007
+++ lmsweb/doc_en/menu-mailing.html	Fri Feb 25 12:28:20 2011
@@ -1,258 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
-<HTML
-><HEAD
-><TITLE
->Mailing</TITLE
-><META
-NAME="GENERATOR"
-CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
-REL="HOME"
-TITLE="LMS - LAN Management System 1.10-cvs"
-HREF="index.html"><LINK
-REL="UP"
-TITLE="User Interface (LMS-UI)"
-HREF="user.html"><LINK
-REL="PREVIOUS"
-TITLE="Accounts"
-HREF="menu-accounts.html"><LINK
-REL="NEXT"
-TITLE="Reload"
-HREF="menu-reload.html"><LINK
-REL="STYLESHEET"
-TYPE="text/css"
-HREF="../images/style.css"><META
-HTTP-EQUIV="Content-Type"
-CONTENT="text/html; charset=ISO-8859-1"></HEAD
-><BODY
-CLASS="SECT1"
-BGCOLOR="#EBE4D6"
-TEXT="#000000"
-><DIV
-CLASS="NAVHEADER"
-><TABLE
-SUMMARY="Header navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TH
-COLSPAN="3"
-ALIGN="center"
->LMS - LAN Management System 1.10-cvs</TH
-></TR
-><TR
-><TD
-WIDTH="10%"
-ALIGN="left"
-VALIGN="bottom"
-><A
-HREF="menu-accounts.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="80%"
-ALIGN="center"
-VALIGN="bottom"
->Chapter 3. User Interface (LMS-UI)</TD
-><TD
-WIDTH="10%"
-ALIGN="right"
-VALIGN="bottom"
-><A
-HREF="menu-reload.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-></TABLE
-><HR
-ALIGN="LEFT"
-WIDTH="100%"></DIV
-><DIV
-CLASS="SECT1"
-><H1
-CLASS="SECT1"
-><A
-NAME="MENU-MAILING"
->3.10. Mailing</A
-></H1
-><P
->Mailing is component where you can spam groups of your customers
-	if you have to communicate something to them. Obviously you need to specify
-	sender name and address, write your message in text box and select appropriate
-	group of recipients. Your attendance can be grouped by status, network or customer
-	groups. If you use mail server on remote host, you will need to set options
-	smtp_host, smtp_port, smtp_username, smtp_password in [phpui] section.</P
-><P
->In message body you can use variables, which will be replaced by
-	customer data:
-	<TABLE
-BORDER="0"
-><TBODY
-><TR
-><TD
-><SAMP
-CLASS="PROMPT"
->%customer</SAMP
-> - name/lastname and forename</TD
-></TR
-><TR
-><TD
-><SAMP
-CLASS="PROMPT"
->%balance</SAMP
-> - balance value (with sign)</TD
-></TR
-><TR
-><TD
-><SAMP
-CLASS="PROMPT"
->%cid</SAMP
-> - customer ID</TD
-></TR
-><TR
-><TD
-><SAMP
-CLASS="PROMPT"
->%pin</SAMP
-> - customer PIN</TD
-></TR
-><TR
-><TD
-><SAMP
-CLASS="PROMPT"
->%last_10_in_a_table</SAMP
-> - last 10 operations on customer account</TD
-></TR
-></TBODY
-></TABLE
->
-	</P
-><P
-><DIV
-CLASS="NOTE"
-><TABLE
-CLASS="NOTE"
-WIDTH="100%"
-BORDER="0"
-><TR
-><TD
-WIDTH="25"
-ALIGN="CENTER"
-VALIGN="TOP"
-><IMG
-SRC="../images/note.gif"
-HSPACE="5"
-ALT="Note"></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->Your server has to support PEAR::Mail for this to
-work.</P
-></TD
-></TR
-></TABLE
-></DIV
->
-	<DIV
-CLASS="NOTE"
-><TABLE
-CLASS="NOTE"
-WIDTH="100%"
-BORDER="0"
-><TR
-><TD
-WIDTH="25"
-ALIGN="CENTER"
-VALIGN="TOP"
-><IMG
-SRC="../images/note.gif"
-HSPACE="5"
-ALT="Note"></TD
-><TD
-ALIGN="LEFT"
-VALIGN="TOP"
-><P
->It's best to use lms-notify Perl script or notify
-module of <SPAN
-CLASS="emphasis"
-><I
-CLASS="EMPHASIS"
->lmsd</I
-></SPAN
-> daemon to send emails
-automatically whenever customer is in debt.</P
-></TD
-></TR
-></TABLE
-></DIV
-></P
-></DIV
-><DIV
-CLASS="NAVFOOTER"
-><HR
-ALIGN="LEFT"
-WIDTH="100%"><TABLE
-SUMMARY="Footer navigation table"
-WIDTH="100%"
-BORDER="0"
-CELLPADDING="0"
-CELLSPACING="0"
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
-><A
-HREF="menu-accounts.html"
-ACCESSKEY="P"
->Prev</A
-></TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="index.html"
-ACCESSKEY="H"
->Home</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
-><A
-HREF="menu-reload.html"
-ACCESSKEY="N"
->Next</A
-></TD
-></TR
-><TR
-><TD
-WIDTH="33%"
-ALIGN="left"
-VALIGN="top"
->Accounts</TD
-><TD
-WIDTH="34%"
-ALIGN="center"
-VALIGN="top"
-><A
-HREF="user.html"
-ACCESSKEY="U"
->Up</A
-></TD
-><TD
-WIDTH="33%"
-ALIGN="right"
-VALIGN="top"
->Reload</TD
-></TR
-></TABLE
-></DIV
-></BODY
-></HTML
->
\ No newline at end of file
Index: lmsweb/doc_en/menu-messages.html
diff -u /dev/null lmsweb/doc_en/menu-messages.html:1.1
--- /dev/null	Fri Feb 25 12:28:20 2011
+++ lmsweb/doc_en/menu-messages.html	Fri Feb 25 12:28:20 2011
@@ -0,0 +1,377 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN""http://www.w3.org/TR/html4/loose.dtd">
+<HTML
+><HEAD
+><TITLE
+>Messages</TITLE
+><META
+NAME="GENERATOR"
+CONTENT="Modular DocBook HTML Stylesheet Version 1.79"><LINK
+REL="HOME"
+TITLE="LMS - LAN Management System 1.11-cvs"
+HREF="index.html"><LINK
+REL="UP"
+TITLE="User Interface (LMS-UI)"
+HREF="user.html"><LINK
+REL="PREVIOUS"
+TITLE="Hosting"
+HREF="menu-hosting.html"><LINK
+REL="NEXT"
+TITLE="Reload"
+HREF="menu-reload.html"><LINK
+REL="STYLESHEET"
+TYPE="text/css"
+HREF="../images/style.css"><META
+HTTP-EQUIV="Content-Type"
+CONTENT="text/html; charset=ISO-8859-1"></HEAD
+><BODY
+CLASS="SECT1"
+BGCOLOR="#EBE4D6"
+TEXT="#000000"
+><DIV
+CLASS="NAVHEADER"
+><TABLE
+SUMMARY="Header navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TH
+COLSPAN="3"
+ALIGN="center"
+>LMS - LAN Management System 1.11-cvs</TH
+></TR
+><TR
+><TD
+WIDTH="10%"
+ALIGN="left"
+VALIGN="bottom"
+><A
+HREF="menu-hosting.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="80%"
+ALIGN="center"
+VALIGN="bottom"
+>Chapter 3. User Interface (LMS-UI)</TD
+><TD
+WIDTH="10%"
+ALIGN="right"
+VALIGN="bottom"
+><A
+HREF="menu-reload.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+></TABLE
+><HR
+ALIGN="LEFT"
+WIDTH="100%"></DIV
+><DIV
+CLASS="SECT1"
+><H1
+CLASS="SECT1"
+><A
+NAME="MENU-MESSAGES"
+>3.10. Messages</A
+></H1
+><P
+>Messages is a component where you can spam groups of your customers
+	with email or sms messages.</P
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-MESSAGES-LIST"
+>3.10.1. List</A
+></H2
+><P
+>On the list you have a history of sent messages. You can sort them
+	    	using filter. Clicking on the message record moves you to information page
+	    	with message content and list of recipients. On the list you have 
+	    	delivery status of every (sub)message.</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-MESSAGES-NEW"
+>3.10.2. New message</A
+></H2
+><P
+>To send a message you should specify appropriate
+	    	group of recipients, type of message (email/sms). Your attendance can be
+	    	grouped by status, network or customer/node groups, etc.</P
+><P
+>In message body you can use variables, which will be replaced by
+	    	customer data:
+	    	<TABLE
+BORDER="0"
+><TBODY
+><TR
+><TD
+><SAMP
+CLASS="PROMPT"
+>%customer</SAMP
+> - name/lastname and forename</TD
+></TR
+><TR
+><TD
+><SAMP
+CLASS="PROMPT"
+>%balance</SAMP
+> - balance value (with sign)</TD
+></TR
+><TR
+><TD
+><SAMP
+CLASS="PROMPT"
+>%cid</SAMP
+> - customer ID</TD
+></TR
+><TR
+><TD
+><SAMP
+CLASS="PROMPT"
+>%pin</SAMP
+> - customer PIN</TD
+></TR
+><TR
+><TD
+><SAMP
+CLASS="PROMPT"
+>%last_10_in_a_table</SAMP
+> - last 10 operations on customer account</TD
+></TR
+></TBODY
+></TABLE
+>
+		</P
+></DIV
+><DIV
+CLASS="SECT2"
+><H2
+CLASS="SECT2"
+><A
+NAME="MENU-MESSAGES-CONF"
+>3.10.3. Configuration</A
+></H2
+><P
+>Your server has to support PEAR::Mail for this to send email messages.
+		If you use mail server on remote host, you will need to set options
+	    	smtp_host, smtp_port, smtp_username, smtp_password in [mail] section.</P
+><P
+>Here we've got the list of configuration options for mailing. These options
+	    	should be placed in <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>[mail]</I
+></SPAN
+> section.
+    	    	<UL
+><LI
+><P
+>debug_email</P
+><P
+>E-mail address for debugging - messages sent from module 'Messages' will be delivered
+        		to this address instead of sending them to real users. </P
+><P
+>Example:     <SAMP
+CLASS="PROMPT"
+>debug_email = root w localhost</SAMP
+></P
+></LI
+><LI
+><P
+>smtp_host, smtp_port, smtp_username, smtp_password</P
+><P
+>Parameters for smtp authorization in mailing. Default: 127.0.0.1:25.</P
+><P
+>Example:     <SAMP
+CLASS="PROMPT"
+>smtp_host = mail.domain.pl</SAMP
+></P
+></LI
+><LI
+><P
+>smtp_auth_type</P
+><P
+>Smtp authorization method in mailing. By default LMS (exactly PEAR::Net_SMTP) 
+    			will use the best supported method. Default: none.</P
+><P
+>Example:     <SAMP
+CLASS="PROMPT"
+>smtp_auth_type = DIGEST-MD5</SAMP
+></P
+></LI
+></UL
+>
+	    	</P
+><P
+>SMS configuration is more complex. Forst of all you have to define
+		a service type to use. This could be a SMS gateway or some software installed
+		on LMS server (e.g. gnokii, smstools). For SMS configuration options <SPAN
+CLASS="emphasis"
+><I
+CLASS="EMPHASIS"
+>[sms]</I
+></SPAN
+>
+		section is intended:
+		<UL
+><LI
+><P
+>service</P
+><P
+>service type for sending text messages. Supported values: 'smstools' and 'smscenter'.</P
+><P
+>Example:     <SAMP
+CLASS="PROMPT"
+>service = smstools</SAMP
+></P
+></LI
+><LI
+><P
+>prefix</P
+><P
+>Phone country code. Default: 48 (Poland)</P
+><P
+>Example:     <SAMP
+CLASS="PROMPT"
+>prefix = 49</SAMP
+></P
+></LI
+><LI
+><P
+>from</P
+><P
+>Message sender. Default empty.</P
+><P
+>Example:     <SAMP
+CLASS="PROMPT"
+>from = ISP Co.</SAMP
+></P
+></LI
+><LI
+><P
+>username</P
+><P
+>Username for sms gateway. Default: empty.</P
+><P
+>Example:     <SAMP
+CLASS="PROMPT"
+>username = isp</SAMP
+></P
+></LI
+><LI
+><P
+>password</P
+><P
+>Password for sms gateway. Default: empty.</P
+><P
+>Example:     <SAMP
+CLASS="PROMPT"
+>password = haslo</SAMP
+></P
+></LI
+><LI
+><P
+>smscenter_type</P
+><P
+>Type of account you have at smscenter service. LMS will add sender at 
+				the end of message, when static type has been set. 
+				Correct values are: static and dynamic. Default: dynamic.</P
+><P
+>Example:     <SAMP
+CLASS="PROMPT"
+>smscenter_type = static</SAMP
+></P
+></LI
+><LI
+><P
+>smstools_outdir</P
+><P
+>Directory with outgoing message files for smsd (smstools).
+				HTTP server must have a write access to it. Deafault: /var/spool/sms/outgoing.</P
+><P
+>Example:     <SAMP
+CLASS="PROMPT"
+>smstools_outdir = /home/smsd/outgoing</SAMP
+></P
+></LI
+></UL
+>
+		</P
+></DIV
+></DIV
+><DIV
+CLASS="NAVFOOTER"
+><HR
+ALIGN="LEFT"
+WIDTH="100%"><TABLE
+SUMMARY="Footer navigation table"
+WIDTH="100%"
+BORDER="0"
+CELLPADDING="0"
+CELLSPACING="0"
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+><A
+HREF="menu-hosting.html"
+ACCESSKEY="P"
+>Prev</A
+></TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="index.html"
+ACCESSKEY="H"
+>Home</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+><A
+HREF="menu-reload.html"
+ACCESSKEY="N"
+>Next</A
+></TD
+></TR
+><TR
+><TD
+WIDTH="33%"
+ALIGN="left"
+VALIGN="top"
+>Hosting</TD
+><TD
+WIDTH="34%"
+ALIGN="center"
+VALIGN="top"
+><A
+HREF="user.html"
+ACCESSKEY="U"
+>Up</A
+></TD
+><TD
+WIDTH="33%"
+ALIGN="right"
+VALIGN="top"
+>Reload</TD
+></TR
+></TABLE
+></DIV
+></BODY
+></HTML
+>
\ No newline at end of file

From cvs w lms.org.pl  Mon Feb 28 11:31:22 2011
From: cvs w lms.org.pl (LMS CVS)
Date: Mon, 28 Feb 2011 11:31:22 +0100 (CET)
Subject: [lms-commits] CVS update of lmsweb (lms.org.pl.zone)
Message-ID: <20110228103122.32C62302B611@eftep.altec.pl>

Date: Monday, February 28, 2011 @ 11:31:22
Author: chilek
Path: /cvsroot/lmsweb

Modified: lms.org.pl.zone

- updated lms.org.pl. zone after mailman server location change


Diff URLs:
http://cvs.lms.org.pl/viewvc/Development/lmsweb/lms.org.pl.zone.diff?&r1=1.12&r2=1.13


Index: lmsweb/lms.org.pl.zone
diff -u lmsweb/lms.org.pl.zone:1.12 lmsweb/lms.org.pl.zone:1.13
--- lmsweb/lms.org.pl.zone:1.12	Sun Jul 18 10:42:20 2010
+++ lmsweb/lms.org.pl.zone	Mon Feb 28 11:31:21 2011
@@ -1,12 +1,11 @@
-; $Id: lms.org.pl.zone,v 1.12 2010/07/18 08:42:20 lukasz Exp $
+; $Id: lms.org.pl.zone,v 1.13 2011/02/28 10:31:21 chilek Exp $
 
 $TTL	86400
 $ORIGIN	lms.org.pl.
 
-; Chilek, mógłby¶ wstawić tutaj odpowiednie rekordy dla SPF?
-; @	IN	TXT	"v=spf1 a mx ip4:212.75.103.72/29 ip4:212.180.138.10/32 ip4:217.153.56.160/29 ip4:212.180.180.0/23 -all"
+@	IN	TXT	"v=spf1 a mx ip4:109.231.62.5/32 -all"
 
-@	IN	SOA	netserv.baseciq.org. baseciq.baseciq.org. 2010052400 1200 3600 1728000 172800
+@	IN	SOA	netserv.baseciq.org. baseciq.baseciq.org. 2011022800 1200 3600 1728000 172800
 @	IN	NS	netserv.baseciq.org.
 @	IN	NS	fns1.42.pl.
 @	IN	NS	fns2.42.pl.
@@ -20,7 +19,7 @@
 
 $ORIGIN lists.lms.org.pl.
 
-@	IN	A	212.33.90.184
+@	IN	A	109.231.62.7
 @	IN	MX	10	mail.chilan.com.
 
 $ORIGIN cvs.lms.org.pl.