[packages/bacula-web.git] / sys-libs.patch

--- bacula-web-5.2.2/config/global.inc.php~	2011-12-04 15:14:21.000000000 +0200
+++ bacula-web-5.2.2/config/global.inc.php	2012-04-07 14:43:17.230952000 +0300
@@ -18,8 +18,8 @@
  define( 'BW_OBJ', BW_ROOT . '/core/' ); 
  define( 'BW_EXTERNAL', BW_OBJ . 'external' );
  
- define( 'BW_PHPLOT', BW_EXTERNAL . '/phplot/'  );					
- define( 'BW_SMARTY', BW_EXTERNAL . '/smarty/libs/' );				
+ define( 'BW_PHPLOT', '/usr/share/php/phplot/'  );					
+ define( 'BW_SMARTY', '/usr/share/php/Smarty/' );				
  define( 'BW_SMARTY_GETTEXT', BW_EXTERNAL . '/smarty_gettext-0.9/' );
  
  
@@ -27,8 +27,7 @@
  require_once BW_OBJ . "bweb.inc.php";
  
  // Template engine
- require_once( BW_SMARTY . "Smarty.class.php");			
- require_once( BW_SMARTY_GETTEXT . "smarty_gettext.php" );		
+ require_once( "Smarty.class.php");			
  
  // Configuration 
  require_once BW_OBJ . "cfg/config.class.php";
--- bacula-web-5.2.2/core/i18n/ctranslation.class.php~	2011-11-29 20:55:31.000000000 +0200
+++ bacula-web-5.2.2/core/i18n/ctranslation.class.php	2013-01-24 19:22:23.942340613 +0200
@@ -30,9 +30,6 @@
 	}
 
 	function set_Language( &$template ) {
-		// Template engine block registration
-		$template->register_block('t','smarty_translate');
-
 		// Setting up language
 		putenv("LANGUAGE=" . $this->language . '.' . $this->charset );
 		putenv("LANG=" . $this->language . '.' . $this->charset );
Commit	Line	Data
138953e5 ER	1	--- bacula-web-5.2.2/config/global.inc.php~ 2011-12-04 15:14:21.000000000 +0200
	2	+++ bacula-web-5.2.2/config/global.inc.php 2012-04-07 14:43:17.230952000 +0300
	3	@@ -18,8 +18,8 @@
	4	define( 'BW_OBJ', BW_ROOT . '/core/' );
	5	define( 'BW_EXTERNAL', BW_OBJ . 'external' );
	6
	7	- define( 'BW_PHPLOT', BW_EXTERNAL . '/phplot/' );
	8	- define( 'BW_SMARTY', BW_EXTERNAL . '/smarty/libs/' );
	9	+ define( 'BW_PHPLOT', '/usr/share/php/phplot/' );
	10	+ define( 'BW_SMARTY', '/usr/share/php/Smarty/' );
	11	define( 'BW_SMARTY_GETTEXT', BW_EXTERNAL . '/smarty_gettext-0.9/' );
	12
	13
	14	@@ -27,8 +27,7 @@
	15	require_once BW_OBJ . "bweb.inc.php";
	16
	17	// Template engine
	18	- require_once( BW_SMARTY . "Smarty.class.php");
	19	- require_once( BW_SMARTY_GETTEXT . "smarty_gettext.php" );
	20	+ require_once( "Smarty.class.php");
	21
	22	// Configuration
	23	require_once BW_OBJ . "cfg/config.class.php";
e6d218cb ER	24	--- bacula-web-5.2.2/core/i18n/ctranslation.class.php~ 2011-11-29 20:55:31.000000000 +0200
	25	+++ bacula-web-5.2.2/core/i18n/ctranslation.class.php 2013-01-24 19:22:23.942340613 +0200
	26	@@ -30,9 +30,6 @@
	27	}
	28
	29	function set_Language( &$template ) {
	30	- // Template engine block registration
	31	- $template->register_block('t','smarty_translate');
	32	-
	33	// Setting up language
	34	putenv("LANGUAGE=" . $this->language . '.' . $this->charset );
	35	putenv("LANG=" . $this->language . '.' . $this->charset );