Author: chomar Date: Sun Nov 6 00:18:08 2005 GMT Module: SOURCES Tag: HEAD ---- Log message: - updated to 1.7.4
---- Files affected: SOURCES: lms-PLD.patch (1.7 -> 1.8) ---- Diffs: ================================================================ Index: SOURCES/lms-PLD.patch diff -u SOURCES/lms-PLD.patch:1.7 SOURCES/lms-PLD.patch:1.8 --- SOURCES/lms-PLD.patch:1.7 Wed Jun 15 23:07:13 2005 +++ SOURCES/lms-PLD.patch Sun Nov 6 01:18:03 2005 @@ -1,58 +1,62 @@ ---- lms/index.php-u 2005-06-15 22:48:13.000000000 +0200 -+++ lms/index.php 2005-06-15 22:53:52.000000000 +0200 -@@ -85,13 +85,13 @@ - $_CONFIG[$key] = $val; +diff -urN lms.orig/index.php lms/index.php +--- lms.orig/index.php 2005-11-05 22:03:05.000000000 +0000 ++++ lms/index.php 2005-11-05 22:10:16.000000000 +0000 +@@ -82,14 +82,15 @@ + $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']['backup_dir'] = (!isset($_CONFIG['directories']['backup_dir']) ? $_CONFIG['directories']['sys_dir'].'/backups' : $_CONFIG['directories']['backup_dir']); +-$CONFIG['directories']['sys_dir'] = (!isset($CONFIG['directories']['sys_dir']) ? getcwd() : $CONFIG['directories']['sys_dir']); +-$CONFIG['directories']['backup_dir'] = (!isset($CONFIG['directories']['backup_dir']) ? $CONFIG['directories']['sys_dir'].'/backups' : $CONFIG['directories']['backup_dir']); +$_CONFIG['directories']['sys_dir'] = (!isset($_CONFIG['directories']['sys_dir']) ? '/usr/share/lms' : $_CONFIG['directories']['sys_dir']); +$_CONFIG['directories']['backup_dir'] = (!isset($_CONFIG['directories']['backup_dir']) ? '/var/lib/lms/backups' : $_CONFIG['directories']['backup_dir']); - $_CONFIG['directories']['lib_dir'] = (!isset($_CONFIG['directories']['lib_dir']) ? $_CONFIG['directories']['sys_dir'].'/lib' : $_CONFIG['directories']['lib_dir']); - $_CONFIG['directories']['modules_dir'] = (!isset($_CONFIG['directories']['modules_dir']) ? $_CONFIG['directories']['sys_dir'].'/modules' : $_CONFIG['directories']['modules_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_dir'] = (!isset($_CONFIG['directories']['smarty_dir']) ? (is_readable('/usr/share/php/smarty/libs/Smarty.class.php') ? '/usr/share/php/smarty/libs' : $_CONFIG['directories']['lib_dir'].'/Smarty') : $_CONFIG['directories']['smarty_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']['doc_dir'] = (!isset($CONFIG['directories']['doc_dir']) ? $CONFIG['directories']['sys_dir'].'/documents' : $CONFIG['directories']['doc_dir']); + $CONFIG['directories']['lib_dir'] = (!isset($CONFIG['directories']['lib_dir']) ? $CONFIG['directories']['sys_dir'].'/lib' : $CONFIG['directories']['lib_dir']); + $CONFIG['directories']['modules_dir'] = (!isset($CONFIG['directories']['modules_dir']) ? $CONFIG['directories']['sys_dir'].'/modules' : $CONFIG['directories']['modules_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_dir'] = (!isset($CONFIG['directories']['smarty_dir']) ? (is_readable('/usr/share/php/smarty/libs/Smarty.class.php') ? '/usr/share/php/smarty/libs' : $CONFIG['directories']['lib_dir'].'/Smarty') : $CONFIG['directories']['smarty_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_dir'] = (!isset($_CONFIG['directories']['smarty_dir']) ? '/usr/share/pear/Smarty' : $_CONFIG['directories']['smarty_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']); ++ + $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 2005-05-13 13:36:19.000000000 +0200 -+++ lms/sample/lms.ini 2005-06-15 23:04:30.000000000 +0200 -@@ -253,7 +253,7 @@ + foreach(lms_parse_ini_file($CONFIG['directories']['lib_dir'].'/config_defaults.ini', TRUE) as $section => $values) +diff -urN lms.orig/sample/lms.ini lms/sample/lms.ini +--- lms.orig/sample/lms.ini 2005-11-05 22:03:05.000000000 +0000 ++++ lms/sample/lms.ini 2005-11-06 00:05:04.000000000 +0000 +@@ -268,7 +268,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/ ++; 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 -@@ -270,13 +270,14 @@ +@@ -285,7 +285,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/backups/ ++; backup_dir = /var/lib/lms/backups/ - ; Directory with Smarty library + ; In that directory LMS will store uploaded documents (files). + ; By default it is subdirectory documents in sys_dir. +@@ -299,7 +299,7 @@ ; By default, subdirectory Smarty in lib_dir ; http://smarty.php.net -; smarty_dir = /usr/lib/php/Smarty -+; smarty_dir = /usr/share/pear/Smarty -+ ++; smarty_dir = /usr/share/pear/Smarty ; W pld jest domyślnie tutaj: (nie zapomnij o "poldek -i Smarty"); - ; smarty_dir = /usr/share/pear/Smarty -@@ -284,7 +285,7 @@ + ; In PLD-linux distribution it's here: (and don't forget about "poldek -i Smarty") +@@ -309,7 +309,7 @@ ; 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 ++; smarty_compile_dir = /var/lib/lms/templates_c ; Directory with Smarty's templates. ; By default it is subdirectory templates in sys_dir. ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SOURCES/lms-PLD.patch?r1=1.7&r2=1.8&f=u _______________________________________________ pld-cvs-commit mailing list pld-cvs-commit@lists.pld-linux.org http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit