]>
Commit | Line | Data |
---|---|---|
5e3bbf5d JK |
1 | diff -dur bacula-web-6.0.0.orig/core/global.inc.php bacula-web-6.0.0/core/global.inc.php |
2 | --- bacula-web-6.0.0.orig/core/global.inc.php 2013-11-11 17:06:40.000000000 +0100 | |
3 | +++ bacula-web-6.0.0/core/global.inc.php 2013-12-06 09:45:58.000000000 +0100 | |
4 | @@ -31,20 +31,21 @@ | |
5 | // Views path | |
6 | define('BW_ROOT', getcwd()); | |
7 | define('VIEW_DIR', BW_ROOT . "/application/view/"); | |
8 | - define('VIEW_CACHE_DIR', "application/view/cache"); | |
9 | + define('VIEW_CACHE_DIR', '/var/cache/bacula-web'); | |
10 | + define('VIEW_CACHE_URL', 'cache'); | |
11 | ||
12 | // Configuration | |
13 | - define('CONFIG_DIR', BW_ROOT . "/application/config/"); | |
14 | + define('CONFIG_DIR', '/etc/webapps/bacula-web/'); | |
15 | define('CONFIG_FILE', CONFIG_DIR . "config.php"); | |
16 | ||
17 | // Locales | |
18 | define('LOCALE_DIR', BW_ROOT . '/application/locale'); | |
19 | ||
20 | // Smarty | |
21 | - require_once(BW_ROOT . '/core/external/smarty-gettext/smarty-gettext.php'); | |
22 | + require_once('/usr/share/php/Smarty/Smarty.class.php'); | |
23 | ||
24 | // PHPLot | |
25 | - require_once(BW_ROOT . '/core/external/phplot/phplot.php'); | |
26 | + require_once('/usr/share/php/phplot/phplot.php'); | |
27 | ||
28 | // Constants | |
29 | require_once(BW_ROOT . '/core/const.inc.php'); | |
30 | diff -dur bacula-web-6.0.0.orig/core/graph/cgraph.class.php bacula-web-6.0.0/core/graph/cgraph.class.php | |
31 | --- bacula-web-6.0.0.orig/core/graph/cgraph.class.php 2013-11-11 17:06:40.000000000 +0100 | |
32 | +++ bacula-web-6.0.0/core/graph/cgraph.class.php 2013-12-06 09:40:53.000000000 +0100 | |
33 | @@ -32,6 +32,7 @@ | |
97184a12 ER |
34 | |
35 | function __construct($filename = "graph.png") { | |
36 | $this->img_filename = VIEW_CACHE_DIR . '/' . $filename; | |
37 | + $this->img_fileurl = VIEW_CACHE_URL . '/' . $filename; | |
38 | } | |
39 | ||
40 | public function SetData($data_in, $graph_type) { | |
5e3bbf5d | 41 | @@ -52,7 +53,7 @@ |
97184a12 ER |
42 | } |
43 | ||
44 | private function get_Filepath() { | |
45 | - return $this->img_filename; | |
46 | + return $this->img_fileurl; | |
47 | } | |
48 | ||
49 | // ================================================================================== | |
5e3bbf5d JK |
50 | Only in bacula-web-6.0.0/core/graph: cgraph.class.php.orig |
51 | diff -dur bacula-web-6.0.0.orig/core/i18n/ctranslation.class.php bacula-web-6.0.0/core/i18n/ctranslation.class.php | |
52 | --- bacula-web-6.0.0.orig/core/i18n/ctranslation.class.php 2013-11-11 17:06:40.000000000 +0100 | |
53 | +++ bacula-web-6.0.0/core/i18n/ctranslation.class.php 2013-12-06 09:40:53.000000000 +0100 | |
54 | @@ -32,9 +32,6 @@ | |
55 | } | |
56 | ||
57 | function set_Language(&$template) { | |
58 | - // Template engine block registration | |
59 | - $template->register_block('t', 'smarty_translate'); | |
60 | - | |
61 | // Setting up language | |
62 | putenv("LANGUAGE=" . $this->language . '.' . $this->charset); | |
63 | putenv("LANG=" . $this->language . '.' . $this->charset); |