diff -Nur syscp.orig/admin_customers.php syscp/admin_customers.php --- syscp.orig/admin_customers.php 2005-08-11 23:28:10.000000000 +0200 +++ syscp/admin_customers.php 2005-10-23 03:31:04.055737852 +0200 @@ -270,7 +270,8 @@ $loginname = $settings['customer']['accountprefix'].$accountnumber; } - $guid=intval($settings['system']['lastguid'])+1; +// $guid=intval($settings['system']['lastguid'])+1; + $guid=intval($settings['system']['www-data_uid']); $documentroot = $settings['system']['documentroot_prefix'].$loginname; if($createstdsubdomain != '1') @@ -322,11 +323,11 @@ $admin_update_query .= " WHERE `adminid` = '{$userinfo['adminid']}'"; $db->query( $admin_update_query ); - $db->query( - "UPDATE `".TABLE_PANEL_SETTINGS."` " . - "SET `value`='$guid' " . - "WHERE `settinggroup`='system' AND `varname`='lastguid'" - ); +// $db->query( +// "UPDATE `".TABLE_PANEL_SETTINGS."` " . +// "SET `value`='$guid' " . +// "WHERE `settinggroup`='system' AND `varname`='lastguid'" +// ); $db->query( "UPDATE `".TABLE_PANEL_SETTINGS."` " . "SET `value`='$accountnumber' " . diff -Nur syscp.orig/customer_email.php syscp/customer_email.php --- syscp.orig/customer_email.php 2005-09-29 18:58:02.000000000 +0200 +++ syscp/customer_email.php 2005-10-05 00:40:32.631481618 +0200 @@ -285,7 +285,7 @@ else { - $db->query("INSERT INTO `".TABLE_MAIL_USERS."` (`customerid`, `email`, `username`, `password`, `password_enc`, `homedir`, `maildir`, `uid`, `gid`, `domainid`, `postfix`) VALUES ('".$userinfo['customerid']."', '$email_full', '$username', '$password', ENCRYPT('$password'), '".$settings['system']['vmail_homedir']."', '".$userinfo['loginname']."/$email_full/', '".$settings['system']['vmail_uid']."', '".$settings['system']['vmail_gid']."', '".$result['domainid']."', 'y')"); + $db->query("INSERT INTO `".TABLE_MAIL_USERS."` (`customerid`, `email`, `username`, `password_enc`, `homedir`, `maildir`, `uid`, `gid`, `domainid`, `postfix`) VALUES ('".$userinfo['customerid']."', '$email_full', '$username', ENCRYPT('$password', CONCAT('$1$', LEFT(MD5(UNIX_TIMESTAMP()),8),'$')), '".$settings['system']['vmail_homedir']."', '".$userinfo['loginname']."/$email_full/', '".$settings['system']['vmail_uid']."', '".$settings['system']['vmail_gid']."', '".$result['domainid']."', 'y')"); $popaccountid = $db->insert_id(); $result['destination'] .= ' ' . $email_full; $db->query("UPDATE `".TABLE_MAIL_VIRTUAL."` SET `destination` = '".makeCorrectDestination($result['destination'])."', `popaccountid` = '$popaccountid' WHERE `customerid`='".$userinfo['customerid']."' AND `id`='$id'"); @@ -333,7 +333,7 @@ } else { - $result=$db->query("UPDATE `".TABLE_MAIL_USERS."` SET `password` = '$password', `password_enc`=ENCRYPT('$password') WHERE `customerid`='".$userinfo['customerid']."' AND `id`='".$result['popaccountid']."'"); + $result=$db->query("UPDATE `".TABLE_MAIL_USERS."` SET `password_enc`=ENCRYPT('$password', CONCAT('$1$', LEFT(MD5(UNIX_TIMESTAMP()),8),'$')) WHERE `customerid`='".$userinfo['customerid']."' AND `id`='".$result['popaccountid']."'"); redirectTo ( $filename , Array ( 'page' => 'emails' , 'action' => 'edit' , 'id' => $id , 's' => $s ) ) ; } } diff -Nur syscp.orig/lib/modules/maildrop/tables.inc.php syscp/lib/modules/maildrop/tables.inc.php --- syscp.orig/lib/modules/maildrop/tables.inc.php 1970-01-01 01:00:00.000000000 +0100 +++ syscp/lib/modules/maildrop/tables.inc.php 2004-12-17 21:34:39.000000000 +0100 @@ -0,0 +1,3 @@ + diff -Nur syscp.orig/lib/modules/webdav/functions.php syscp/lib/modules/webdav/functions.php --- syscp.orig/lib/modules/webdav/functions.php 1970-01-01 01:00:00.000000000 +0100 +++ syscp/lib/modules/webdav/functions.php 2005-10-23 18:08:09.038422335 +0200 @@ -0,0 +1,126 @@ + + * @copyright (C) 2005 Marcel Naziri + * @package Functions + * @version $Id: functions.php,v 1.0 2005/10/23 02:33:00 zwobbl Exp $ + */ + + /** + * Inserts a webdav task into the PANEL_TASKS-Table + * + * @param int Type of task + * @param string Parameter 1 + * @param string Parameter 2 + * @param string Parameter 3 + * @author Marcel Naziri + */ + function webdav_inserttask($type,$param1='',$param2='',$param3='') + { + global $db; + + if($type=='10' && $param1!='') + { + $data=Array(); + $data['path']=$param1; + $data=serialize($data); + + $result=$db->query_first( + 'SELECT `type` ' . + 'FROM `' . TABLE_PANEL_TASKS . '` ' . + 'WHERE `type`="10" ' . + 'AND `data`="' . addslashes($data) .'"' + ); + + if($result['type']=='') + { + $db->query( + 'INSERT INTO `' . TABLE_PANEL_TASKS . '` ' . + '(`type`, `data`) ' . + 'VALUES ' . + '("10", "' . addslashes($data) . '")' + ); + } + } + } + + /****************************************************** + * Wrapper around the exec command. + * + * @author Martin Burchert + * @version 1.2 + * @param string exec_string String to be executed + * @return string The result of the exec() + * + * History: + ****************************************************** + * 1.0 : Initial Version + * 1.1 : Added |,&,>,<,`,*,$,~,? as security breaks. + * 1.2 : Removed * as security break + ******************************************************/ + function webdav_safe_exec($exec_string) + { + global $settings; + // + // define allowed system commands + // + $allowed_commands = array( + $settings['system']['apache-sslreload_command']); + // + // check for ; in execute command + // + if ((stristr($exec_string,';')) or + (stristr($exec_string,'|')) or + (stristr($exec_string,'&')) or + (stristr($exec_string,'>')) or + (stristr($exec_string,'<')) or + (stristr($exec_string,'`')) or + (stristr($exec_string,'$')) or + (stristr($exec_string,'~')) or + (stristr($exec_string,'?')) ) + { + die ("SECURITY CHECK FAILED!\n' The execute string $exec_string is a possible security risk!\nPlease check your whole server for security problems by hand!\n"); + } + // + // check if command is allowed here + // + $allowed = false; + foreach ($allowed_commands as $key => $value) + { + if ($allowed == false) + { + $allowed = stristr($exec_string, $value); + } + } + if ($allowed == false) + { + die("SECURITY CHECK FAILED!\nYour command '$exec_string' is not allowed!\nPlease check your whole server for security problems by hand!\n"); + } + // + // execute the command and return output + // + + // --- martin @ 08.08.2005 ------------------------------------------------------- + // fixing usage of uninitialised variable + $return = ''; + // ------------------------------------------------------------------------------- + exec($exec_string, $return); + return $return; + } + + function webdav_digestMD5($user, $password) + { + global $settings; + return md5($user.":".$settings['webdav']['realm'].":".$password); + } +?> diff -Nur syscp.orig/lib/modules/webdav/tables.inc.php syscp/lib/modules/webdav/tables.inc.php --- syscp.orig/lib/modules/webdav/tables.inc.php 1970-01-01 01:00:00.000000000 +0100 +++ syscp/lib/modules/webdav/tables.inc.php 2005-10-23 00:20:32.325877414 +0200 @@ -0,0 +1,3 @@ + diff -Nur syscp.orig/lng/modules/services/english.lng.php syscp/lng/modules/services/english.lng.php --- syscp.orig/lng/modules/services/english.lng.php 1970-01-01 01:00:00.000000000 +0100 +++ syscp/lng/modules/services/english.lng.php 2005-10-20 00:09:34.663140719 +0200 @@ -0,0 +1,15 @@ + diff -Nur syscp.orig/lng/modules/services/german.lng.php syscp/lng/modules/services/german.lng.php --- syscp.orig/lng/modules/services/german.lng.php 1970-01-01 01:00:00.000000000 +0100 +++ syscp/lng/modules/services/german.lng.php 2005-10-20 00:19:07.151030685 +0200 @@ -0,0 +1,9 @@ + diff -Nur syscp.orig/lng/modules/stats/english.lng.php syscp/lng/modules/stats/english.lng.php --- syscp.orig/lng/modules/stats/english.lng.php 1970-01-01 01:00:00.000000000 +0100 +++ syscp/lng/modules/stats/english.lng.php 2005-10-23 22:00:42.398123639 +0200 @@ -0,0 +1,9 @@ + diff -Nur syscp.orig/lng/modules/stats/german.lng.php syscp/lng/modules/stats/german.lng.php --- syscp.orig/lng/modules/stats/german.lng.php 1970-01-01 01:00:00.000000000 +0100 +++ syscp/lng/modules/stats/german.lng.php 2005-10-23 22:00:13.805328006 +0200 @@ -0,0 +1,9 @@ + diff -Nur syscp.orig/lng/modules/webdav/english.lng.php syscp/lng/modules/webdav/english.lng.php --- syscp.orig/lng/modules/webdav/english.lng.php 1970-01-01 01:00:00.000000000 +0100 +++ syscp/lng/modules/webdav/english.lng.php 2005-10-19 18:29:32.408641238 +0200 @@ -0,0 +1,15 @@ + diff -Nur syscp.orig/lng/modules/webdav/german.lng.php syscp/lng/modules/webdav/german.lng.php --- syscp.orig/lng/modules/webdav/german.lng.php 1970-01-01 01:00:00.000000000 +0100 +++ syscp/lng/modules/webdav/german.lng.php 2005-10-23 03:07:03.583718484 +0200 @@ -0,0 +1,11 @@ +Die Änderungen sind erst nach einer bestimmten Zeit wirksam.'; +$lng['webdav']['account_add'] = 'WebDAV-Account hinzufügen'; + +$lng['question']['webdav_reallydelete'] = 'Wollen Sie den WebDAV-Account für %s wirklich löschen?'; + +?> diff -Nur syscp.orig/modules_customer_webdav.php syscp/modules_customer_webdav.php --- syscp.orig/modules_customer_webdav.php 1970-01-01 01:00:00.000000000 +0100 +++ syscp/modules_customer_webdav.php 2005-10-23 18:07:53.125980405 +0200 @@ -0,0 +1,154 @@ + + * @copyright (C) 2003-2004 Florian Lippert + * @package Panel + * @version $Id: customer_extras.php,v 1.11 2005/09/07 15:04:26 martin Exp $ + */ + + define('AREA', 'customer'); + + require("./lib/modules/webdav/tables.inc.php"); + require("./lib/modules/webdav/functions.php"); + + /** + * Include our init.php, which manages Sessions, Language etc. + */ + require("./lib/init.php"); + + if(isset($_POST['id'])) + { + $id=intval($_POST['id']); + } + elseif(isset($_GET['id'])) + { + $id=intval($_GET['id']); + } + + if($page=='overview') + { + eval("echo \"".getTemplate("modules/webdav/webdav")."\";"); + } + elseif($page=='htpasswds') + { + if($action=='') + { + $result=$db->query("SELECT `id`, `username`, `path` FROM `".TABLE_MODULES_WEBDAV_PASSWD."` WHERE `customerid`='".$userinfo['customerid']."' ORDER BY `username` ASC"); + $htpasswds=''; + while($row=$db->fetch_array($result)) + { + $row['path']=str_replace($userinfo['documentroot'],'',$row['path']); + eval("\$htpasswds.=\"".getTemplate("modules/webdav/htpasswds_htpasswd")."\";"); + } + eval("echo \"".getTemplate("modules/webdav/htpasswds")."\";"); + } + + elseif($action=='delete' && $id!=0) + { + $result=$db->query_first("SELECT `id`, `customerid`, `username`, `path` FROM `".TABLE_MODULES_WEBDAV_PASSWD."` WHERE `customerid`='".$userinfo['customerid']."' AND `id`='$id'"); + if(isset($result['username']) && $result['username']!='') + { + if(isset($_POST['send']) && $_POST['send']=='send') + { + $db->query("DELETE FROM `".TABLE_MODULES_WEBDAV_PASSWD."` WHERE `customerid`='".$userinfo['customerid']."' AND `id`='$id'"); + webdav_inserttask('10',$result['path']); + redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; + } + else + { + ask_yesno('webdav_reallydelete', $filename, "id=$id;page=$page;action=$action", $result['username'] . ' (' . str_replace($userinfo['documentroot'],'',$result['path']) . ')' ); + } + } + } + + elseif($action=='add') + { + if(isset($_POST['send']) && $_POST['send']=='send') + { + $path=makeCorrectDir(addslashes($_POST['path'])); + $userpath=$path; + $path=$userinfo['documentroot'].$path; + $username=addslashes($_POST['username']); + $username_path_check=$db->query_first("SELECT `id`, `username`, `path` FROM `".TABLE_MODULES_WEBDAV_PASSWD."` WHERE `username`='$username' AND `path`='$path' AND `customerid`='".$userinfo['customerid']."'"); + $password=webdav_digestMD5($_POST['username'], $_POST['password']); + $passwordtest=$_POST['password']; + + if(!$_POST['path']) + { + standard_error('invalidpath'); + } + if(!is_dir($path)) + { + standard_error('directorymustexist',$userpath); + } + elseif($username=='') + { + standard_error(array('stringisempty','myloginname')); + } + elseif($username_path_check['username'] == $username && $username_path_check['path'] == $path) + { + standard_error('userpathcombinationdupe'); + } + elseif($passwordtest=='') + { + standard_error(array('stringisempty','mypassword')); + } + elseif($path=='') + { + standard_error('patherror'); + } + else + { + $db->query("INSERT INTO `".TABLE_MODULES_WEBDAV_PASSWD."` (`customerid`, `username`, `password`, `path`) VALUES ('".$userinfo['customerid']."', '$username', '$password', '$path')"); + webdav_inserttask('10',$path); + redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; + } + } + else + { + $pathSelect = makePathfield( $userinfo['documentroot'], $userinfo['guid'], + $userinfo['guid'], $settings['panel']['pathedit'] ); + eval("echo \"".getTemplate("modules/webdav/htpasswds_add")."\";"); + } + } + + elseif($action=='edit' && $id!=0) + { + $result=$db->query_first("SELECT `id`, `username`, `path` FROM `".TABLE_MODULES_WEBDAV_PASSWD."` WHERE `customerid`='".$userinfo['customerid']."' AND `id`='$id'"); + if(isset($result['username']) && $result['username']!='') + { + if(isset($_POST['send']) && $_POST['send']=='send') + { + $password=webdav_digestMD5($result['username'], $_POST['password']); + $passwordtest=$_POST['password']; + if ($passwordtest=='') + { + standard_error(array('stringisempty','mypassword')); + } + else + { + $db->query("UPDATE `".TABLE_MODULES_WEBDAV_PASSWD."` SET `password`='$password' WHERE `customerid`='".$userinfo['customerid']."' AND `id`='$id'"); + webdav_inserttask('10',$result['path']); + redirectTo ( $filename , Array ( 'page' => $page , 's' => $s ) ) ; + } + } + else + { + $result['path']=str_replace($userinfo['documentroot'],'',$result['path']); + eval("echo \"".getTemplate("modules/webdav/htpasswds_edit")."\";"); + } + } + } + } +?> \ No newline at end of file diff -Nur syscp.orig/scripts/cron_tasks.php syscp/scripts/cron_tasks.php --- syscp.orig/scripts/cron_tasks.php 2005-09-07 17:04:26.000000000 +0200 +++ syscp/scripts/cron_tasks.php 2005-10-23 16:38:26.736937971 +0200 @@ -26,8 +26,11 @@ */ $debugMsg[] = ' cron_tasks: Searching for tasks to do'; $result_tasks=$db->query("SELECT `id`, `type`, `data` FROM `".TABLE_PANEL_TASKS."` ORDER BY `type` ASC"); + $max_task_id = 0; while($row=$db->fetch_array($result_tasks)) { + if ($row['id'] > $max_task_id) + $max_task_id = $row['id']; if($row['data'] != '') { $row['data']=unserialize($row['data']); @@ -329,7 +332,7 @@ } if($db->num_rows($result_tasks) != 0) { - $db->query("DELETE FROM `".TABLE_PANEL_TASKS."`"); + $db->query("DELETE FROM `".TABLE_PANEL_TASKS."` WHERE `id` <= '".$max_task_id."'"); } ?> diff -Nur syscp.orig/scripts/modules/webdav/cron_tasks.php syscp/scripts/modules/webdav/cron_tasks.php --- syscp.orig/scripts/modules/webdav/cron_tasks.php 1970-01-01 01:00:00.000000000 +0100 +++ syscp/scripts/modules/webdav/cron_tasks.php 2005-10-23 19:11:03.318652536 +0200 @@ -0,0 +1,164 @@ + + * @copyright (C) 2003-2004 Florian Lippert + * @package System + * @version $Id: cron_tasks.php,v 1.23 2005/09/07 15:04:26 martin Exp $ + */ + if(@php_sapi_name() != 'cli' && @php_sapi_name() != 'cgi') + { + die('This script will only work in the shell.'); + } + + require("$pathtophpfiles/lib/modules/webdav/tables.inc.php"); + require("$pathtophpfiles/lib/modules/webdav/functions.php"); + + $apache_reload = false; + + /** + * LOOK INTO TASKS TABLE TO SEE IF THERE ARE ANY UNDONE JOBS + */ + $debugMsg[] = ' cron_tasks: Searching for tasks to do'; + $result_tasks=$db->query("SELECT `id`, `type`, `data` FROM `".TABLE_PANEL_TASKS."` ORDER BY `type` ASC"); + while($row=$db->fetch_array($result_tasks)) + { + if($row['data'] != '') + { + $row['data']=unserialize($row['data']); + } + + /** + * TYPE=10 MEANS TO CREATE/CHANGE/DELETE A WEBDAV PASSWD + */ + if($row['type'] == '10') + { + $debugMsg[] = ' cron_tasks: Task10 started - create/change/del webdav passwd'; + if ( is_array($row['data']) ) + { + $path = $row['data']['path']; + $debugMsg[] = ' cron_tasks: Task10 - Path: '.$path; + + if (!is_dir($path)) + { + $db->query( + 'DELETE FROM `'.TABLE_MODULES_WEBDAV_PASSWD.'` ' . + 'WHERE `path` = "'.$path.'"' + ); + } + + $diroptions_file = ''; + $diroptions_file = '# '.$settings['system']['apacheconf_directory'].'webdav.conf'."\n".'# Created '.date('d.m.Y H:i')."\n".'# Do NOT manually edit this file, all changes will be deleted after the next dir options change at the panel.'."\n"."\n"; + + $result = $db->query( + 'SELECT `loginname`, `documentroot` ' . + 'FROM `'.TABLE_PANEL_CUSTOMERS.'` ' . + 'ORDER BY `loginname`' + ); + while($row_alias=$db->fetch_array($result)) + $diroptions_file .= 'Alias /user/'.$row_alias['loginname'].' '.$row_alias['documentroot']."\n\n"; + + $diroptions = array(); + $result = $db->query( + 'SELECT * ' . + 'FROM `'.TABLE_MODULES_WEBDAV_PASSWD.'` ' . + 'ORDER BY `path`, `username`' + ); + while($row_htpasswds=$db->fetch_array($result)) + { + $diroptions[$row_htpasswds['path']]['path'] = $row_htpasswds['path']; + $diroptions[$row_htpasswds['path']]['customerid'] = $row_htpasswds['customerid']; + $diroptions[$row_htpasswds['path']]['htpasswds'][] = $row_htpasswds; + } + + $htpasswd_files = array(); + foreach($diroptions as $row_diroptions) + { + $diroptions_file .= ''."\n Dav on\n"; + if(count($row_diroptions['htpasswds']) > 0) + { + $htpasswd_file = ''; + $htpasswd_filename = ''; + foreach($row_diroptions['htpasswds'] as $row_htpasswd) + { + if($htpasswd_filename == '') + { + $htpasswd_filename = $settings['system']['apacheconf_directory'].'webdav/'.$row_diroptions['customerid'].'-'.$row_htpasswd['id'].'-'.md5($row_diroptions['path']).'.webdav.htdigest'; + $htpasswd_files[] = basename($htpasswd_filename); + } + $htpasswd_file .= $row_htpasswd['username'].':Restricted WebDAV Area:'.$row_htpasswd['password']."\n"; + } + $debugMsg[] = ' cron_tasks: Task10 - Setting Password'; + $diroptions_file .= ' AuthType Digest'."\n"; + $diroptions_file .= ' AuthName "'.$settings['webdav']['realm'].'"'."\n"; + $diroptions_file .= ' AuthDigestFile '.$htpasswd_filename."\n"; + $diroptions_file .= ' require valid-user'."\n"; + + if(!file_exists($settings['system']['apacheconf_directory'].'webdav/')) + { + // --- martin @ 05.05.2005 ------------------------- + // added umask get,set for proper creation of the dir + $umask = umask(); + umask( 0000 ); + mkdir($settings['system']['apacheconf_directory'].'webdav/',0751); + umask( $umask ); + //-------------------------------------------------- + } + // --- flo @ 15.06.2005 ---------------------------- + // added is_dir conditions to prevent unwanted php-errors if /etc/apache/htpasswd is a normal file and no directory (bug #66) + elseif(!is_dir($settings['system']['apacheconf_directory'].'webdav/')) + { + $debugMsg[] = ' cron_tasks: WARNING!!! ' . $settings['system']['apacheconf_directory'].'webdav/ is not a directory. htpasswd directory protection is disabled!!!'; + echo 'WARNING!!! ' . $settings['system']['apacheconf_directory'].'webdav/ is not a directory. htpasswd directory protection is disabled!!!' ; + } + + if(file_exists($settings['system']['apacheconf_directory'].'webdav/') && is_dir($settings['system']['apacheconf_directory'].'webdav/')) + { + $htpasswd_file_handler = fopen($htpasswd_filename, 'w'); + fwrite($htpasswd_file_handler, $htpasswd_file); + fclose($htpasswd_file_handler); + } + //-------------------------------------------------- + } + $diroptions_file .= ''."\n\n"; + } + $diroptions_file_handler = fopen($settings['system']['apacheconf_directory'].'webdav.conf', 'w'); + fwrite($diroptions_file_handler, $diroptions_file); + fclose($diroptions_file_handler); + $apache_reload = true; + + if(file_exists($settings['system']['apacheconf_directory'].'webdav/') && is_dir($settings['system']['apacheconf_directory'].'webdav/')) + { + $htpasswd_file_dirhandle = opendir($settings['system']['apacheconf_directory'].'webdav/'); + while(false !== ($htpasswd_filename = readdir($htpasswd_file_dirhandle))) + { + if($htpasswd_filename != '.' && $htpasswd_filename != '..' && !in_array($htpasswd_filename,$htpasswd_files) && file_exists($settings['system']['apacheconf_directory'].'webdav/'.$htpasswd_filename)) + { + unlink($settings['system']['apacheconf_directory'].'webdav/'.$htpasswd_filename); + } + } + } + } + } + } + if ($apache_reload) { + safe_exec($settings['system']['apachereload_command']); + webdav_safe_exec($settings['system']['apache-sslreload_command']); + } + + if($db->num_rows($result_tasks) != 0) + { + $db->query("DELETE FROM `".TABLE_MODULES_WEBDAV_PASSWD."` WHERE `id` = 10"); + } + +?> diff -Nur syscp.orig/system.php syscp/system.php --- syscp.orig/system.php 1970-01-01 01:00:00.000000000 +0100 +++ syscp/system.php 2005-10-23 22:23:55.888909359 +0200 @@ -0,0 +1,42 @@ + + * @copyright (C) 2003-2004 Florian Lippert + * @package Panel + * @version $Id: index.php,v 1.7 2005/08/11 21:28:10 flo Exp $ + */ + + define('AREA', 'login'); + + /** + * Include our init.php, which manages Sessions, Language etc. + */ + require("./lib/init.php"); + + $uptime=exec("uptime"); + + if($page=='overview') + eval("echo \"".getTemplate("modules/stats/stats")."\";"); + elseif($page=='traffic') + eval("echo \"".getTemplate("modules/stats/traffic")."\";"); + elseif($page=='cpu') + eval("echo \"".getTemplate("modules/stats/cpu")."\";"); + elseif($page=='mem') + eval("echo \"".getTemplate("modules/stats/mem")."\";"); + elseif($page=='swap') + eval("echo \"".getTemplate("modules/stats/swap")."\";"); + else + eval("echo \"".getTemplate("modules/stats/stats")."\";"); + +?> diff -Nur syscp.orig/templates/customer/modules/webdav/htpasswds.tpl syscp/templates/customer/modules/webdav/htpasswds.tpl --- syscp.orig/templates/customer/modules/webdav/htpasswds.tpl 1970-01-01 01:00:00.000000000 +0100 +++ syscp/templates/customer/modules/webdav/htpasswds.tpl 2005-10-22 22:57:38.799620167 +0200 @@ -0,0 +1,14 @@ +$header + + + + + + + + $htpasswds + + + +
{$lng['menue']['webdav']['title']}
{$lng['login']['username']}{$lng['panel']['path']} 
{$lng['webdav']['account_add']}
+$footer diff -Nur syscp.orig/templates/customer/modules/webdav/htpasswds_add.tpl syscp/templates/customer/modules/webdav/htpasswds_add.tpl --- syscp.orig/templates/customer/modules/webdav/htpasswds_add.tpl 1970-01-01 01:00:00.000000000 +0100 +++ syscp/templates/customer/modules/webdav/htpasswds_add.tpl 2005-10-22 23:02:35.015863574 +0200 @@ -0,0 +1,27 @@ +$header +
+ + + + + + + + + + + + + + + + + + + + + + +
{$lng['webdav']['account_add']}
{$lng['panel']['path']}:{$pathSelect}
{$lng['login']['username']}:
{$lng['login']['password']}:
+
+$footer diff -Nur syscp.orig/templates/customer/modules/webdav/htpasswds_edit.tpl syscp/templates/customer/modules/webdav/htpasswds_edit.tpl --- syscp.orig/templates/customer/modules/webdav/htpasswds_edit.tpl 1970-01-01 01:00:00.000000000 +0100 +++ syscp/templates/customer/modules/webdav/htpasswds_edit.tpl 2005-10-22 22:46:32.217071871 +0200 @@ -0,0 +1,28 @@ +$header +
+ + + + + + + + + + + + + + + + + + + + + + + +
{$lng['menue']['main']['changepassword']}
{$lng['panel']['path']}:{$result['path']}
{$lng['login']['username']}:{$result['username']}
{$lng['login']['password']}:
+
+$footer diff -Nur syscp.orig/templates/customer/modules/webdav/htpasswds_htpasswd.tpl syscp/templates/customer/modules/webdav/htpasswds_htpasswd.tpl --- syscp.orig/templates/customer/modules/webdav/htpasswds_htpasswd.tpl 1970-01-01 01:00:00.000000000 +0100 +++ syscp/templates/customer/modules/webdav/htpasswds_htpasswd.tpl 2005-10-22 22:46:31.997065753 +0200 @@ -0,0 +1,7 @@ + + {$row['username']} + {$row['path']} + {$lng['menue']['main']['changepassword']} + {$lng['panel']['delete']} + + diff -Nur syscp.orig/templates/customer/modules/webdav/webdav.tpl syscp/templates/customer/modules/webdav/webdav.tpl --- syscp.orig/templates/customer/modules/webdav/webdav.tpl 1970-01-01 01:00:00.000000000 +0100 +++ syscp/templates/customer/modules/webdav/webdav.tpl 2005-10-22 22:53:27.796634708 +0200 @@ -0,0 +1,10 @@ +$header + + + + + + + +
{$lng['menue']['webdav']['title']}
{$lng['webdav']['description']}
+$footer diff -Nur syscp.orig/templates/header.tpl syscp/templates/header.tpl --- syscp.orig/templates/header.tpl 2005-01-05 14:41:11.000000000 +0100 +++ syscp/templates/header.tpl 2005-10-23 23:29:03.725649769 +0200 @@ -1,26 +1,27 @@ - - - -SysCP - - - -
SysCP $version © 2003-2005 by the SysCP Team
- - - - - -
 
- - - - -
$navigation 

\ No newline at end of file + + + +SysCP + + + +
SysCP $version © 2003-2005 by the SysCP Team +
skin © by zwobbl

www.cacert.org
+ + + + + +
 
+ + + + +
$navigation 

diff -Nur syscp.orig/templates/login/modules/stats/cpu.tpl syscp/templates/login/modules/stats/cpu.tpl --- syscp.orig/templates/login/modules/stats/cpu.tpl 1970-01-01 01:00:00.000000000 +0100 +++ syscp/templates/login/modules/stats/cpu.tpl 2005-10-23 22:24:19.473565820 +0200 @@ -0,0 +1,14 @@ +$header +
+{$lng['login']['stats']['title']}
+

$uptime

+ +{$lng['login']['stats']['cpu']} +

+

+

+

+ +
+
+$footer \ No newline at end of file diff -Nur syscp.orig/templates/login/modules/stats/mem.tpl syscp/templates/login/modules/stats/mem.tpl --- syscp.orig/templates/login/modules/stats/mem.tpl 1970-01-01 01:00:00.000000000 +0100 +++ syscp/templates/login/modules/stats/mem.tpl 2005-10-23 22:26:50.841778273 +0200 @@ -0,0 +1,14 @@ +$header +
+{$lng['login']['stats']['title']}
+

$uptime

+ +{$lng['login']['stats']['mem']} +

+

+

+

+ +
+
+$footer \ No newline at end of file diff -Nur syscp.orig/templates/login/modules/stats/stats.tpl syscp/templates/login/modules/stats/stats.tpl --- syscp.orig/templates/login/modules/stats/stats.tpl 1970-01-01 01:00:00.000000000 +0100 +++ syscp/templates/login/modules/stats/stats.tpl 2005-10-23 22:21:33.200937641 +0200 @@ -0,0 +1,19 @@ +$header +
+{$lng['login']['stats']['title']}
+

$uptime

+ +Traffic Diagramm +

+ +CPU Diagramm +

+ +Memory Diagramm +

+ +Swap Diagramm +

+
+
+$footer \ No newline at end of file diff -Nur syscp.orig/templates/login/modules/stats/swap.tpl syscp/templates/login/modules/stats/swap.tpl --- syscp.orig/templates/login/modules/stats/swap.tpl 1970-01-01 01:00:00.000000000 +0100 +++ syscp/templates/login/modules/stats/swap.tpl 2005-10-23 22:25:09.562960006 +0200 @@ -0,0 +1,14 @@ +$header +
+{$lng['login']['stats']['title']}
+

$uptime

+ +{$lng['login']['stats']['swap']} +

+

+

+

+ +
+
+$footer \ No newline at end of file diff -Nur syscp.orig/templates/login/modules/stats/traffic.tpl syscp/templates/login/modules/stats/traffic.tpl --- syscp.orig/templates/login/modules/stats/traffic.tpl 1970-01-01 01:00:00.000000000 +0100 +++ syscp/templates/login/modules/stats/traffic.tpl 2005-10-23 22:22:55.999242352 +0200 @@ -0,0 +1,14 @@ +$header +
+{$lng['login']['stats']['title']}
+

$uptime

+ +{$lng['login']['stats']['traffic']} +

+

+

+

+ +
+
+$footer \ No newline at end of file