projects / packages / lms.git / blame
| Commit | Line | Data |
|---|---|---|
| 6d034faa GP |
1 | --- lms-orig/index.php 2011-03-18 09:59:23.000000000 +0100 |
| 2 | +++ lms/index.php 2011-03-20 15:11:25.781918286 +0100 | |
| 3 | @@ -47,13 +47,13 @@ | |
| 4 | $CONFIG = (array) parse_ini_file($CONFIG_FILE, true); | |
| 82638c16 | 5 | |
| 6 | // Check for configuration vars and set default values | |
| ab4f73d4 | 7 | -$CONFIG['directories']['sys_dir'] = (!isset($CONFIG['directories']['sys_dir']) ? getcwd() : $CONFIG['directories']['sys_dir']); |
| ab4f73d4 | 8 | +$CONFIG['directories']['sys_dir'] = (!isset($CONFIG['directories']['sys_dir']) ? '/usr/share/lms' : $CONFIG['directories']['sys_dir']); |
| ab4f73d4 | 9 | $CONFIG['directories']['lib_dir'] = (!isset($CONFIG['directories']['lib_dir']) ? $CONFIG['directories']['sys_dir'].'/lib' : $CONFIG['directories']['lib_dir']); |
| 8670b6bc | 10 | -$CONFIG['directories']['doc_dir'] = (!isset($CONFIG['directories']['doc_dir']) ? $CONFIG['directories']['sys_dir'].'/documents' : $CONFIG['directories']['doc_dir']); |
| 11 | +$CONFIG['directories']['doc_dir'] = (!isset($CONFIG['directories']['doc_dir']) ? '/var/lib/lms/documents': $CONFIG['directories']['doc_dir']); | |
| ab4f73d4 | 12 | $CONFIG['directories']['modules_dir'] = (!isset($CONFIG['directories']['modules_dir']) ? $CONFIG['directories']['sys_dir'].'/modules' : $CONFIG['directories']['modules_dir']); |
| 8670b6bc | 13 | -$CONFIG['directories']['backup_dir'] = (!isset($CONFIG['directories']['backup_dir']) ? $CONFIG['directories']['sys_dir'].'/backups' : $CONFIG['directories']['backup_dir']); |
| 14 | +$CONFIG['directories']['backup_dir'] = (!isset($CONFIG['directories']['backup_dir']) ? '/var/lib/lms/backups' : $CONFIG['directories']['backup_dir']); | |
| ab4f73d4 | 15 | $CONFIG['directories']['config_templates_dir'] = (!isset($CONFIG['directories']['config_templates_dir']) ? $CONFIG['directories']['sys_dir'].'/config_templates' : $CONFIG['directories']['config_templates_dir']); |
| 8670b6bc | 16 | -$CONFIG['directories']['smarty_compile_dir'] = (!isset($CONFIG['directories']['smarty_compile_dir']) ? $CONFIG['directories']['sys_dir'].'/templates_c' : $CONFIG['directories']['smarty_compile_dir']); |
| 17 | +$CONFIG['directories']['smarty_compile_dir'] = (!isset($CONFIG['directories']['smarty_compile_dir']) ? '/var/lib/lms/templates_c' : $CONFIG['directories']['smarty_compile_dir']); | |
| 18 | $CONFIG['directories']['smarty_templates_dir'] = (!isset($CONFIG['directories']['smarty_templates_dir']) ? $CONFIG['directories']['sys_dir'].'/templates' : $CONFIG['directories']['smarty_templates_dir']); | |
| 82638c16 | 19 | |
| 6d034faa GP |
20 | define('SYS_DIR', $CONFIG['directories']['sys_dir']); |
| 21 | --- lms-orig/sample/lms.ini 2009-04-08 13:59:42.000000000 +0200 | |
| 22 | +++ lms/sample/lms.ini 2011-03-20 15:11:25.785251771 +0100 | |
| 23 | @@ -228,7 +228,7 @@ | |
| 236f2b62 | 24 | ; index.php, graphics, templates and the rest. By default index.php seek in filesystem |
| 25 | ; using getcwd(), but better is to say him where hi is: | |
| 26 | ||
| 27 | -; sys_dir = /var/www/htdocs/lms/ | |
| 601a3fe2 | 28 | +; sys_dir = /usr/share/lms/ |
| 236f2b62 | 29 | |
| 30 | ; Directory with "modules" of LMS. That is content of /modules directory. | |
| 31 | ; By default it is subdirectory modules in sys_dir | |
| 6d034faa | 32 | @@ -245,7 +245,7 @@ |
| 236f2b62 | 33 | ; If directory with backups will be accessible from WWW level, then anybody will |
| 34 | ; can to access them without authorization. | |
| 35 | ||
| 36 | -; backup_dir = /var/backup/lms/ | |
| f2e4bd63 | 37 | +; backup_dir = /var/lib/lms/backups/ |
| 236f2b62 | 38 | |
| 39 | ; In that directory LMS will store uploaded documents (files). | |
| 40 | ; By default it is subdirectory documents in sys_dir. | |
| 6d034faa | 41 | @@ -253,17 +253,17 @@ |
| 236f2b62 | 42 | ; can to access them without authorization. Those files are renamed to their |
| 43 | ; md5 sums. | |
| 44 | ||
| 45 | -; doc_dir = /usr/share/lms/documents/ | |
| 46 | +; doc_dir = /var/lib/lms/documents/ | |
| 47 | ||
| 48 | ; Smarty's compilation directory. Place where Smarty compile templates. | |
| 49 | ; By default it is subdirectory templates_c in sys_dir. | |
| 50 | ||
| 51 | -; smarty_compile_dir = /var/smarty/compile/lms | |
| 52 | +; smarty_compile_dir = /var/lib/lms/templates_c/ | |
| 53 | ||
| 54 | ; Directory with Smarty's templates. | |
| 55 | ; By default it is subdirectory templates in sys_dir. | |
| 56 | ||
| 57 | -; smarty_templates_dir = /usr/share/lms/templates | |
| 58 | +; smarty_templates_dir = /usr/share/lms/templates/ | |
| 59 | ||
| 6d034faa GP |
60 | [mail] |
| 61 | ||
| 62 | --- lms-orig/contrib/customer/index.php 2011-03-18 09:59:23.000000000 +0100 | |
| 63 | +++ lms/contrib/customer/index.php 2011-03-20 15:12:00.340164058 +0100 | |
| 64 | @@ -36,11 +36,11 @@ | |
| 65 | $CONFIG = (array) parse_ini_file($CONFIG_FILE, true); | |
| 66 | ||
| 67 | // Check for configuration vars and set default values | |
| 68 | -$CONFIG['directories']['sys_dir'] = (! $CONFIG['directories']['sys_dir'] ? getcwd() : $CONFIG['directories']['sys_dir']); | |
| 69 | -$CONFIG['directories']['backup_dir'] = (! $CONFIG['directories']['backup_dir'] ? $CONFIG['directories']['sys_dir'].'/backups' : $CONFIG['directories']['backup_dir']); | |
| 70 | +$CONFIG['directories']['sys_dir'] = (! $CONFIG['directories']['sys_dir'] ? '/usr/share/lms' : $CONFIG['directories']['sys_dir']); | |
| 71 | +$CONFIG['directories']['backup_dir'] = (! $CONFIG['directories']['backup_dir'] ? '/var/lib/lms/backups' : $CONFIG['directories']['backup_dir']); | |
| 72 | $CONFIG['directories']['lib_dir'] = (! $CONFIG['directories']['lib_dir'] ? $CONFIG['directories']['sys_dir'].'/lib' : $CONFIG['directories']['lib_dir']); | |
| 73 | $CONFIG['directories']['modules_dir'] = (! $CONFIG['directories']['modules_dir'] ? $CONFIG['directories']['sys_dir'].'/modules' : $CONFIG['directories']['modules_dir']); | |
| 74 | -$CONFIG['directories']['smarty_compile_dir'] = (! $CONFIG['directories']['smarty_compile_dir'] ? $CONFIG['directories']['sys_dir'].'/templates_c' : $CONFIG['directories']['smarty_compile_dir']); | |
| 75 | +$CONFIG['directories']['smarty_compile_dir'] = (! $CONFIG['directories']['smarty_compile_dir'] ? '/var/lib/lms/templates_c' : $CONFIG['directories']['smarty_compile_dir']); | |
| 76 | $CONFIG['directories']['smarty_templates_dir'] = (! $CONFIG['directories']['smarty_templates_dir'] ? $CONFIG['directories']['sys_dir'].'/templates' : $CONFIG['directories']['smarty_templates_dir']); | |
| 77 | ||
| 78 | define('SYS_DIR', $CONFIG['directories']['sys_dir']); | |
| 79 | @@ -74,7 +74,7 @@ | |
| 80 | ||
| 81 | // Initialize templates engine | |
| 82 | ||
| 83 | -require_once(LIB_DIR.'/Smarty/Smarty.class.php'); | |
| 84 | +require_once(LIB_DIR.'/Smarty/Smarty.class.php'); | |
| 85 | ||
| 86 | $SMARTY = new Smarty; | |
| 87 | ||
| 88 | @@ -98,7 +98,7 @@ | |
| 89 | $SMARTY->assign_by_ref('LANGDEFS', $LANGDEFS); | |
| 90 | $SMARTY->assign_by_ref('_ui_language', $LMS->ui_lang); | |
| 91 | $SMARTY->assign_by_ref('_language', $LMS->lang); | |
| 92 | -$SMARTY->template_dir = getcwd(); | |
| 601a3fe2 | 93 | +$SMARTY->template_dir = getcwd(); |
| 6d034faa GP |
94 | $SMARTY->compile_dir = SMARTY_COMPILE_DIR; |
| 95 | @include('locale/'.$LMS->ui_lang.'/strings.php'); | |
| 96 | ||
| 97 | --- lms-orig/userpanel/index.php 2011-03-18 09:59:24.000000000 +0100 | |
| 98 | +++ lms/userpanel/index.php 2011-03-20 15:11:25.788585257 +0100 | |
| 99 | @@ -45,8 +45,8 @@ | |
| 100 | $CONFIG['directories']['sys_dir'] = $CONFIG['directories']['sys_dir']; | |
| 101 | $CONFIG['directories']['lib_dir'] = (!isset($CONFIG['directories']['lib_dir']) ? $CONFIG['directories']['sys_dir'].'/lib' : $CONFIG['directories']['lib_dir']); | |
| 102 | $CONFIG['directories']['modules_dir'] = (!isset($CONFIG['directories']['modules_dir']) ? $CONFIG['directories']['sys_dir'].'/modules' : $CONFIG['directories']['modules_dir']); | |
| 103 | -$CONFIG['directories']['userpanel_dir'] = (!isset($CONFIG['directories']['userpanel_dir']) ? getcwd() : $CONFIG['directories']['userpanel_dir']); | |
| 104 | -$CONFIG['directories']['smarty_compile_dir'] = $CONFIG['directories']['userpanel_dir'].'/templates_c'; | |
| 601a3fe2 | 105 | +$CONFIG['directories']['userpanel_dir'] = (!isset($CONFIG['directories']['userpanel_dir']) ? '/usr/share/lms/userpanel' : $CONFIG['directories']['userpanel_dir']); |
| 6d034faa GP |
106 | +$CONFIG['directories']['smarty_compile_dir'] = '/var/lib/lms/userpanel/templates_c'; |
| 107 | ||
| 108 | define('USERPANEL_DIR', $CONFIG['directories']['userpanel_dir']); | |
| 109 | define('USERPANEL_LIB_DIR', USERPANEL_DIR.'/lib/'); | |
| 110 | @@ -77,7 +77,7 @@ | |
| 111 | ||
| 112 | // Initialize templates engine (must be before locale settings) | |
| 113 | ||
| 114 | -require_once(LIB_DIR.'/Smarty/Smarty.class.php'); | |
| 115 | +require_once('/usr/share/php/Smarty/Smarty.class.php'); | |
| 116 | ||
| 117 | $SMARTY = new Smarty; | |
| 118 |