packages: lms/lms-PLD.patch - includes user and userpanel packages
gzohop
gzohop at pld-linux.org
Sun Mar 20 15:38:31 CET 2011
Author: gzohop Date: Sun Mar 20 14:38:31 2011 GMT
Module: packages Tag: HEAD
---- Log message:
- includes user and userpanel packages
---- Files affected:
packages/lms:
lms-PLD.patch (1.16 -> 1.17)
---- Diffs:
================================================================
Index: packages/lms/lms-PLD.patch
diff -u packages/lms/lms-PLD.patch:1.16 packages/lms/lms-PLD.patch:1.17
--- packages/lms/lms-PLD.patch:1.16 Thu Sep 9 13:48:18 2010
+++ packages/lms/lms-PLD.patch Sun Mar 20 15:38:26 2011
@@ -1,7 +1,7 @@
---- 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;
+--- lms-orig/index.php 2011-03-18 09:59:23.000000000 +0100
++++ lms/index.php 2011-03-20 15:11:25.781918286 +0100
+@@ -47,13 +47,13 @@
+ $CONFIG = (array) parse_ini_file($CONFIG_FILE, true);
// Check for configuration vars and set default values
-$CONFIG['directories']['sys_dir'] = (!isset($CONFIG['directories']['sys_dir']) ? getcwd() : $CONFIG['directories']['sys_dir']);
@@ -17,10 +17,10 @@
+$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 @@
+ define('SYS_DIR', $CONFIG['directories']['sys_dir']);
+--- lms-orig/sample/lms.ini 2009-04-08 13:59:42.000000000 +0200
++++ lms/sample/lms.ini 2011-03-20 15:11:25.785251771 +0100
+@@ -228,7 +228,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:
@@ -29,7 +29,7 @@
; Directory with "modules" of LMS. That is content of /modules directory.
; By default it is subdirectory modules in sys_dir
-@@ -274,7 +274,7 @@
+@@ -245,7 +245,7 @@
; If directory with backups will be accessible from WWW level, then anybody will
; can to access them without authorization.
@@ -38,7 +38,7 @@
; In that directory LMS will store uploaded documents (files).
; By default it is subdirectory documents in sys_dir.
-@@ -282,17 +282,17 @@
+@@ -253,17 +253,17 @@
; can to access them without authorization. Those files are renamed to their
; md5 sums.
@@ -57,5 +57,62 @@
-; smarty_templates_dir = /usr/share/lms/templates
+; smarty_templates_dir = /usr/share/lms/templates/
- ; ---------------------------------------------------------------------------
- ; Konfiguracja skryptu do logowania ruchu na iptables -
+ [mail]
+
+--- lms-orig/contrib/customer/index.php 2011-03-18 09:59:23.000000000 +0100
++++ lms/contrib/customer/index.php 2011-03-20 15:12:00.340164058 +0100
+@@ -36,11 +36,11 @@
+ $CONFIG = (array) parse_ini_file($CONFIG_FILE, true);
+
+ // Check for configuration vars and set default values
+-$CONFIG['directories']['sys_dir'] = (! $CONFIG['directories']['sys_dir'] ? getcwd() : $CONFIG['directories']['sys_dir']);
+-$CONFIG['directories']['backup_dir'] = (! $CONFIG['directories']['backup_dir'] ? $CONFIG['directories']['sys_dir'].'/backups' : $CONFIG['directories']['backup_dir']);
++$CONFIG['directories']['sys_dir'] = (! $CONFIG['directories']['sys_dir'] ? '/usr/share/lms' : $CONFIG['directories']['sys_dir']);
++$CONFIG['directories']['backup_dir'] = (! $CONFIG['directories']['backup_dir'] ? '/var/lib/lms/backups' : $CONFIG['directories']['backup_dir']);
+ $CONFIG['directories']['lib_dir'] = (! $CONFIG['directories']['lib_dir'] ? $CONFIG['directories']['sys_dir'].'/lib' : $CONFIG['directories']['lib_dir']);
+ $CONFIG['directories']['modules_dir'] = (! $CONFIG['directories']['modules_dir'] ? $CONFIG['directories']['sys_dir'].'/modules' : $CONFIG['directories']['modules_dir']);
+-$CONFIG['directories']['smarty_compile_dir'] = (! $CONFIG['directories']['smarty_compile_dir'] ? $CONFIG['directories']['sys_dir'].'/templates_c' : $CONFIG['directories']['smarty_compile_dir']);
++$CONFIG['directories']['smarty_compile_dir'] = (! $CONFIG['directories']['smarty_compile_dir'] ? '/var/lib/lms/templates_c' : $CONFIG['directories']['smarty_compile_dir']);
+ $CONFIG['directories']['smarty_templates_dir'] = (! $CONFIG['directories']['smarty_templates_dir'] ? $CONFIG['directories']['sys_dir'].'/templates' : $CONFIG['directories']['smarty_templates_dir']);
+
+ define('SYS_DIR', $CONFIG['directories']['sys_dir']);
+@@ -74,7 +74,7 @@
+
+ // Initialize templates engine
+
+-require_once(LIB_DIR.'/Smarty/Smarty.class.php');
++require_once(LIB_DIR.'/Smarty/Smarty.class.php');
+
+ $SMARTY = new Smarty;
+
+@@ -98,7 +98,7 @@
+ $SMARTY->assign_by_ref('LANGDEFS', $LANGDEFS);
+ $SMARTY->assign_by_ref('_ui_language', $LMS->ui_lang);
+ $SMARTY->assign_by_ref('_language', $LMS->lang);
+-$SMARTY->template_dir = getcwd();
++$SMARTY->template_dir = SMARTY_TEMPLATES_DIR;
+ $SMARTY->compile_dir = SMARTY_COMPILE_DIR;
+ @include('locale/'.$LMS->ui_lang.'/strings.php');
+
+--- lms-orig/userpanel/index.php 2011-03-18 09:59:24.000000000 +0100
++++ lms/userpanel/index.php 2011-03-20 15:11:25.788585257 +0100
+@@ -45,8 +45,8 @@
+ $CONFIG['directories']['sys_dir'] = $CONFIG['directories']['sys_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']['userpanel_dir'] = (!isset($CONFIG['directories']['userpanel_dir']) ? getcwd() : $CONFIG['directories']['userpanel_dir']);
+-$CONFIG['directories']['smarty_compile_dir'] = $CONFIG['directories']['userpanel_dir'].'/templates_c';
++$CONFIG['directories']['userpanel_dir'] = (!isset($CONFIG['directories']['userpanel_dir']) ? $CONFIG['directories']['sys_dir'].'/userpanel' : $CONFIG['directories']['userpanel_dir']);
++$CONFIG['directories']['smarty_compile_dir'] = '/var/lib/lms/userpanel/templates_c';
+
+ define('USERPANEL_DIR', $CONFIG['directories']['userpanel_dir']);
+ define('USERPANEL_LIB_DIR', USERPANEL_DIR.'/lib/');
+@@ -77,7 +77,7 @@
+
+ // Initialize templates engine (must be before locale settings)
+
+-require_once(LIB_DIR.'/Smarty/Smarty.class.php');
++require_once('/usr/share/php/Smarty/Smarty.class.php');
+
+ $SMARTY = new Smarty;
+
================================================================
---- CVS-web:
http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/lms/lms-PLD.patch?r1=1.16&r2=1.17&f=u
More information about the pld-cvs-commit
mailing list