X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=lms-PLD.patch;h=9e1fd6a463ebed42aa3ee7fd19f01bf5630ecd16;hb=d09bbc923a218ec42f98cfce96818518114d0b31;hp=c5796563debd5f013f36f8012915f241ebc9b495;hpb=587d057a7be57a79b632d5b2ea44830e8b0d5617;p=packages%2Flms.git

diff --git a/lms-PLD.patch b/lms-PLD.patch
index c579656..9e1fd6a 100644
--- a/lms-PLD.patch
+++ b/lms-PLD.patch
@@ -1,35 +1,61 @@
-diff -urP lms.orig/index.php lms/index.php
---- lms.orig/index.php	Tue Apr 15 00:56:57 2003
-+++ lms/index.php	Tue Apr 15 00:57:20 2003
-@@ -53,14 +53,14 @@
- 									
- // Define directories and configuration vars
- 
--$_SYSTEM_DIR = (! $_CONFIG[directories]['sys_dir'] ? getcwd() : $_CONFIG[directories]['sys_dir']);
--$_BACKUP_DIR = (! $_CONFIG[directories]['backup_dir'] ? $_SYSTEM_DIR."/backups/" : $_CONFIG[directories]['backup_dir']);
--$_LIB_DIR = (! $_CONFIG[directories]['lib_dir'] ? $_SYSTEM_DIR."/lib/" : $_CONFIG[directories]['lib_dir']);
--$_MODULES_DIR = (! $_CONFIG[directories]['modules_dir'] ? $_SYSTEM_DIR."/modules/" : $_CONFIG[directories]['modules_dir']);
--$_SMARTY_DIR = (! $_CONFIG[directories]['smarty_dir'] ? $_LIB_DIR."/Smarty/" : $_CONFIG[directories]['smarty_dir']);
--$_SMARTY_COMPILE_DIR = (! $_CONFIG[directories]['smarty_compile_dir'] ? $_SYSTEM_DIR."/templates_c" : $_CONFIG[directories]['smarty_compile_dir']);
--$_SMARTY_TEMPLATES_DIR = (! $_CONFIG[directories]['smarty_templates_dir'] ? $_SYSTEM_DIR."/templates" : $_CONFIG[directories]['smarty_templates_dir']);
--$_ADODB_DIR = (! $_CONFIG[directories]['adodb_dir'] ? $_LIB_DIR."/adodb/" : $_CONFIG[directories]['adodb_dir']);
-+$_SYSTEM_DIR = (! $_CONFIG[directories]['sys_dir'] ? '/usr/lib/lms/' : $_CONFIG[directories]['sys_dir']);
-+$_BACKUP_DIR = (! $_CONFIG[directories]['backup_dir'] ? '/var/lib/lms/backups/' : $_CONFIG[directories]['backup_dir']);
-+$_LIB_DIR = (! $_CONFIG[directories]['lib_dir'] ? $_SYSTEM_DIR.'/lib/' : $_CONFIG[directories]['lib_dir']);
-+$_MODULES_DIR = (! $_CONFIG[directories]['modules_dir'] ? $_SYSTEM_DIR.'/modules/' : $_CONFIG[directories]['modules_dir']);
-+$_SMARTY_DIR = (! $_CONFIG[directories]['smarty_dir'] ? '/usr/share/pear/Smarty/' : $_CONFIG[directories]['smarty_dir']);
-+$_SMARTY_COMPILE_DIR = (! $_CONFIG[directories]['smarty_compile_dir'] ? '/var/lib/lms/templates_c/' : $_CONFIG[directories]['smarty_compile_dir']);
-+$_SMARTY_TEMPLATES_DIR = (! $_CONFIG[directories]['smarty_templates_dir'] ? $_SYSTEM_DIR.'/templates/' : $_CONFIG[directories]['smarty_templates_dir']);
-+$_ADODB_DIR = (! $_CONFIG[directories]['adodb_dir'] ? '/usr/share/php/adodb/' : $_CONFIG[directories]['adodb_dir']);
- $_TIMEOUT = (! $_CONFIG[phpui]['timeout'] ? 600 : $_CONFIG[phpui]['timeout']);
- $_FORCE_SSL = chkconfig($_CONFIG[phpui]['force_ssl']);
- 
-@@ -76,7 +76,7 @@
- 
- $_DBTYPE = (! $_CONFIG[database]['type'] ? "mysql" : $_CONFIG[database]['type']);
- $_DBHOST = (! $_CONFIG[database]['host'] ? "localhost" : $_CONFIG[database]['host']);
--$_DBUSER = (! $_CONFIG[database]['user'] ? "root" : $_CONFIG[database]['user']);
-+$_DBUSER = (! $_CONFIG[database]['user'] ? "mysql" : $_CONFIG[database]['user']);
- $_DBPASS = (! $_CONFIG[database]['password'] ? "" : $_CONFIG[database]['password']);
- $_DBNAME = (! $_CONFIG[database]['database'] ? "lms" : $_CONFIG[database]['database']);
+--- lms/index.php.orig	2007-05-09 10:36:59.000000000 +0200
++++ lms/index.php	2007-06-23 09:36:38.000000000 +0200
+@@ -93,13 +93,13 @@
+ 	$CONFIG[$key] = $val;
  
+ // Check for configuration vars and set default values
+-$CONFIG['directories']['sys_dir'] = (!isset($CONFIG['directories']['sys_dir']) ? getcwd() : $CONFIG['directories']['sys_dir']);
++$CONFIG['directories']['sys_dir'] = (!isset($CONFIG['directories']['sys_dir']) ? '/usr/share/lms' : $CONFIG['directories']['sys_dir']);
+ $CONFIG['directories']['lib_dir'] = (!isset($CONFIG['directories']['lib_dir']) ? $CONFIG['directories']['sys_dir'].'/lib' : $CONFIG['directories']['lib_dir']);
+-$CONFIG['directories']['doc_dir'] = (!isset($CONFIG['directories']['doc_dir']) ? $CONFIG['directories']['sys_dir'].'/documents' : $CONFIG['directories']['doc_dir']);
++$CONFIG['directories']['doc_dir'] = (!isset($CONFIG['directories']['doc_dir']) ? '/var/lib/lms/documents': $CONFIG['directories']['doc_dir']);
+ $CONFIG['directories']['modules_dir'] = (!isset($CONFIG['directories']['modules_dir']) ? $CONFIG['directories']['sys_dir'].'/modules' : $CONFIG['directories']['modules_dir']);
+-$CONFIG['directories']['backup_dir'] = (!isset($CONFIG['directories']['backup_dir']) ? $CONFIG['directories']['sys_dir'].'/backups' : $CONFIG['directories']['backup_dir']);
++$CONFIG['directories']['backup_dir'] = (!isset($CONFIG['directories']['backup_dir']) ? '/var/lib/lms/backups' : $CONFIG['directories']['backup_dir']);
+ $CONFIG['directories']['config_templates_dir'] = (!isset($CONFIG['directories']['config_templates_dir']) ? $CONFIG['directories']['sys_dir'].'/config_templates' : $CONFIG['directories']['config_templates_dir']);
+-$CONFIG['directories']['smarty_compile_dir'] = (!isset($CONFIG['directories']['smarty_compile_dir']) ? $CONFIG['directories']['sys_dir'].'/templates_c' : $CONFIG['directories']['smarty_compile_dir']);
++$CONFIG['directories']['smarty_compile_dir'] = (!isset($CONFIG['directories']['smarty_compile_dir']) ? '/var/lib/lms/templates_c' : $CONFIG['directories']['smarty_compile_dir']);
+ $CONFIG['directories']['smarty_templates_dir'] = (!isset($CONFIG['directories']['smarty_templates_dir']) ? $CONFIG['directories']['sys_dir'].'/templates' : $CONFIG['directories']['smarty_templates_dir']);
+ 
+ foreach(lms_parse_ini_file($CONFIG['directories']['lib_dir'].'/config_defaults.ini', TRUE) as $section => $values)
+--- lms/sample/lms.ini.orig	2007-06-23 09:58:42.000000000 +0200
++++ lms/sample/lms.ini	2007-06-23 10:00:35.000000000 +0200
+@@ -257,7 +257,7 @@
+ ; index.php, graphics, templates and the rest. By default index.php seek in filesystem
+ ; using getcwd(), but better is to say him where hi is:
+ 
+-; sys_dir          = /var/www/htdocs/lms/
++; sys_dir          = /usr/share/lms/www/
+ 
+ ; Directory with "modules" of LMS. That is content of /modules directory.
+ ; By default it is subdirectory modules in sys_dir
+@@ -274,7 +274,7 @@
+ ; If directory with backups will be accessible from WWW level, then anybody will
+ ; can to access them without authorization.
+ 
+-; backup_dir          = /var/backup/lms/
++; backup_dir          = /var/lib/lms/backup/
+ 
+ ; In that directory LMS will store uploaded documents (files). 
+ ; By default it is subdirectory documents in sys_dir.
+@@ -282,17 +282,17 @@
+ ; can to access them without authorization. Those files are renamed to their
+ ; md5 sums.
+ 
+-; doc_dir          = /usr/share/lms/documents/
++; doc_dir          = /var/lib/lms/documents/
+ 
+ ; Smarty's compilation directory. Place where Smarty compile templates.
+ ; By default it is subdirectory templates_c in sys_dir.
+ 
+-; smarty_compile_dir     = /var/smarty/compile/lms
++; smarty_compile_dir     = /var/lib/lms/templates_c/
+ 
+ ; Directory with Smarty's templates.
+ ; By default it is subdirectory templates in sys_dir.
+ 
+-; smarty_templates_dir     = /usr/share/lms/templates
++; smarty_templates_dir     = /usr/share/lms/templates/
+ 
+ ; ---------------------------------------------------------------------------
+ ; Konfiguracja skryptu do logowania ruchu na iptables -