1 --- bacula-web-5.2.11/core/global.inc.php 2013-01-24 19:43:27.543708741 +0200
2 +++ bacula-web-5.2.11/core/global.inc.php 2013-01-24 19:43:27.543708741 +0200
4 define('BW_LIBS', BW_ROOT . '/application/libs/');
5 define('BW_EXTERNAL', BW_OBJ . 'external');
7 -define('BW_PHPLOT', BW_EXTERNAL . '/phplot/');
8 -define('BW_SMARTY', BW_EXTERNAL . '/smarty/libs/');
9 -define('BW_SMARTY_GETTEXT', BW_EXTERNAL . '/smarty-gettext/');
10 +define('BW_PHPLOT', '/usr/share/php/phplot/');
11 +define('BW_SMARTY', '/usr/share/php/Smarty/');
14 -define('CONFIG_DIR', BW_ROOT . "/application/config/");
15 +define('CONFIG_DIR', '/etc/webapps/bacula-web/');
16 define('CONFIG_FILE', CONFIG_DIR . "config.php");
22 require_once( BW_SMARTY . "Smarty.class.php");
23 -require_once( BW_SMARTY_GETTEXT . "smarty_gettext.php" );
26 require_once( BW_PHPLOT . "phplot.php");
30 define('VIEW_DIR', BW_ROOT . "/application/view/");
31 -define('VIEW_CACHE_DIR', "application/view/cache");
32 +define('VIEW_CACHE_DIR', '/var/cache/bacula-web');
33 +define('VIEW_CACHE_URL', 'cache');
36 define('LOCALE_DIR', BW_ROOT . '/application/locale');
37 --- bacula-web-5.2.11/core/i18n/ctranslation.class.php~ 2012-08-11 13:14:04.000000000 +0300
38 +++ bacula-web-5.2.11/core/i18n/ctranslation.class.php 2013-01-24 19:38:38.147079534 +0200
42 function set_Language(&$template) {
43 - // Template engine block registration
44 - $template->register_block('t', 'smarty_translate');
46 // Setting up language
47 putenv("LANGUAGE=" . $this->language . '.' . $this->charset);
48 putenv("LANG=" . $this->language . '.' . $this->charset);
49 --- bacula-web-5.2.11/core/graph/cgraph.class.php 2012-12-14 06:56:54.000000000 +0200
50 +++ bacula-web-5.2.11/core/graph/cgraph.class.php 2013-01-24 19:51:05.000000000 +0200
53 function __construct($filename = "graph.png") {
54 $this->img_filename = VIEW_CACHE_DIR . '/' . $filename;
55 + $this->img_fileurl = VIEW_CACHE_URL . '/' . $filename;
58 public function SetData($data_in, $graph_type) {
62 private function get_Filepath() {
63 - return $this->img_filename;
64 + return $this->img_fileurl;
67 // ==================================================================================