Description: Use Debian packaged libraries
Author: Jean-Michel Vourgère <nirgal@debian.org>
Forwarded: not-needed
Last-Update: 2016-05-08

Index: ocsinventory-server/ocsreports/css/dataTables-custom.css
===================================================================
--- ocsinventory-server.orig/ocsreports/css/dataTables-custom.css
+++ ocsinventory-server/ocsreports/css/dataTables-custom.css
@@ -42,19 +42,19 @@ div.tableContainer {
 	text-align: center;
 }
 table.dataTable thead .sorting {
-	background: #f0f0f0 url('../libraries/datatable/media/images/sort_both.png') no-repeat center right !important; 
+	background: #f0f0f0 url('/javascript/jquery-datatables/media/images/sort_both.png') no-repeat center right !important;
 }
 table.dataTable thead .sorting_asc { 
-	background: #f0f0f0 url('../libraries/datatable/media/images/sort_asc.png') no-repeat center right !important; 
+	background: #f0f0f0 url('/javascript/jquery-datatables/media/images/sort_asc.png') no-repeat center right !important;
 }
 table.dataTable thead .sorting_desc { 
-	background: #f0f0f0 url('../libraries/datatable/media/images/sort_desc.png') no-repeat center right !important; 
+	background: #f0f0f0 url('/javascript/jquery-datatables/media/images/sort_desc.png') no-repeat center right !important;
 }
 table.dataTable thead .sorting_asc_disabled { 
-	background: #f0f0f0 url('../libraries/datatable/media/images/sort_asc_disabled.png') no-repeat center right !important; 
+	background: #f0f0f0 url('/javascript/jquery-datatables/media/images/sort_asc_disabled.png') no-repeat center right !important;
 }
 table.dataTable thead .sorting_desc_disabled { 
-	background: #f0f0f0 url('../libraries/datatable/media/images/sort_desc_disabled.png') no-repeat center right !important; 
+	background: #f0f0f0 url('/javascript/jquery-datatables/media/images/sort_desc_disabled.png') no-repeat center right !important;
 }
 
 
@@ -93,4 +93,4 @@ table.dataTable thead>tr>th.CHECK{
 	padding: 20px 50px;
 	margin-bottom: 20px;
 	text-align: center;
-}
\ No newline at end of file
+}
Index: ocsinventory-server/ocsreports/plugins/main_sections/ms_computer/ms_qrcode.php
===================================================================
--- ocsinventory-server.orig/ocsreports/plugins/main_sections/ms_computer/ms_qrcode.php
+++ ocsinventory-server/ocsreports/plugins/main_sections/ms_computer/ms_qrcode.php
@@ -8,7 +8,7 @@
 // code is always made freely available.
 // Please refer to the General Public Licence http://www.gnu.org/ or Licence.txt
 //====================================================================================
-require_once(TC_LIB_BARCODE);
+require_once('/usr/share/phpqrcode/phpqrcode.php');
 require_once('require/function_admininfo.php');
 if (is_numeric($protectedGet['systemid']) and array_key_exists($protectedGet['default_value'],$array_qr_action)){
 	if ($array_qr_action[$protectedGet['default_value']]['TYPE'] == 'url')
@@ -26,7 +26,5 @@ if (is_numeric($protectedGet['systemid']
 		$msg=$val[$fields_info[1]];
 	}
 
-	$barcode = new \Com\Tecnick\Barcode\Barcode();
-	$qrcode = $barcode->getBarcodeObj('QRCODE,H', $msg, 400, 400, 'black',array(20,20,20,20));
-	$qrcode->getPng();
+	QRcode::png($msg, false, QR_ECLEVEL_H, 10, 2);
 }
Index: ocsinventory-server/ocsreports/require/function_commun.php
===================================================================
--- ocsinventory-server.orig/ocsreports/require/function_commun.php
+++ ocsinventory-server/ocsreports/require/function_commun.php
@@ -351,11 +351,11 @@ function html_header($no_java=false){
 			<head>
 				<TITLE>OCS Inventory</TITLE>
 				<LINK REL='shortcut icon' HREF='favicon.ico' />
-				<LINK REL='StyleSheet' TYPE='text/css' HREF='css/bootstrap.min.css'>
-				<LINK REL='StyleSheet' TYPE='text/css' HREF='css/bootstrap-theme.min.css'>
+				<LINK REL='StyleSheet' TYPE='text/css' HREF='/javascript/bootstrap/css/bootstrap.min.css'>
+				<LINK REL='StyleSheet' TYPE='text/css' HREF='/javascript/bootstrap/css/bootstrap-theme.min.css'>
 				<LINK REL='StyleSheet' TYPE='text/css' HREF='css/bootstrap-custom.css'>
 				<LINK REL='StyleSheet' TYPE='text/css' HREF='css/dataTables-custom.css'>
-				<LINK REL='StyleSheet' TYPE='text/css' HREF='css/dataTables.bootstrap.css'>
+				<LINK REL='StyleSheet' TYPE='text/css' HREF='/javascript/jquery-datatables/css/dataTables.bootstrap.min.css'>
 				<LINK REL='StyleSheet' TYPE='text/css' HREF='css/ocsreports.css'>
 				<LINK REL='StyleSheet' TYPE='text/css' HREF='css/header.css'>
 				<LINK REL='StyleSheet' TYPE='text/css' HREF='css/computer_details.css'>
@@ -365,21 +365,21 @@ function html_header($no_java=false){
 		incPicker(); 
 		
 		//js for graph
-		echo "<script src='js/jquery-1.11.0.js' type='text/javascript'></script>";
-		echo "<script src='js/jquery-migrate-1.2.1.min.js' type='text/javascript'></script>";
-		echo "<script src='js/jquery.ui.widget.js'></script>";
+		echo "<script src='/javascript/jquery/jquery.min.js' type='text/javascript'></script>";
+		echo "<script src='/javascript/jquery-migrate-1.min.js' type='text/javascript'></script>";
+		echo "<script src='/javascript/jquery-ui/ui/jquery.ui.widget.min.js'></script>";
 		echo "<script src='js/jquery.iframe-transport.js'></script>";
 		echo "<script src='js/jquery.fileupload.js'></script>";
 		
-		echo "<script src='js/bootstrap.min.js' type='text/javascript'></script>";
+		echo "<script src='/javascript/bootstrap/js/bootstrap.min.js' type='text/javascript'></script>";
 		echo "<script src='js/bootstrap-custom.js' type='text/javascript'></script>";
 		
-  		echo "<script src='js/graph/raphael.js' type='text/javascript'></script>";
-  		echo "<script src='js/graph/elycharts.js' type='text/javascript'></script>";
+		echo "<script src='/javascript/raphael/raphael.min.js' type='text/javascript'></script>";
+		echo "<script src='/javascript/elycharts/elycharts.min.js' type='text/javascript'></script>";
   		
   		//js for Datatables 
-  		echo "<script src='libraries/datatable/media/js/jquery.dataTables.js' type='text/javascript'></script>";
-  		echo "<script src='js/dataTables.bootstrap.js' type='text/javascript'></script>";
+		echo "<script src='/javascript/jquery-datatables/jquery.dataTables.min.js' type='text/javascript'></script>";
+		echo "<script src='/javascript/jquery-datatables/dataTables.bootstrap.min.js' type='text/javascript'></script>";
 
   		echo "<script language='javascript' type='text/javascript' src='js/function.js'></script>";
   			
Index: ocsinventory-server/ocsreports/var.php
===================================================================
--- ocsinventory-server.orig/ocsreports/var.php
+++ ocsinventory-server/ocsreports/var.php
@@ -15,7 +15,7 @@ define('DOCUMENT_ROOT', $_SERVER['DOCUME
 
 define("GUI_VER", "7009");												// Version of the database
 define("GUI_VER_SHOW","2.2");        								    // Version of the GUI
-define("MAC_FILE", __DIR__ . '/files/oui.txt');									// File containing MAC database
+define("MAC_FILE", '/usr/share/ieee-data/oui.txt');									// File containing MAC database
 define("DEFAULT_LANGUAGE","english");    								// Default language
 define("PAG_INDEX","function");         								// define name in url (like multi=32)
 define("DEMO",false);			        								// Define if we use demo version or not (for OCS TEAM, other=> DO NOT USE IT)
@@ -26,7 +26,7 @@ define("DFT_DB_PSWD",'ocs');											/
 define("DFT_GUI_CMPT",'admin');											// Define default login to connect to GUI
 define("DFT_GUI_PSWD",'admin');											// Define default password to connect to GUI
 define('BACKEND',__DIR__ . '/backend/');									   	 	// Define backend Directory
-define('PHPCAS', __DIR__ . '/libraries/phpcas/CAS.php');				// Path to CAS (change to use system provided library)
+define('PHPCAS', '/usr/share/php/CAS.php');				// Path to CAS (change to use system provided library)
 define('TC_LIB_BARCODE',  __DIR__ . '/libraries/tclib/Barcode/autoload.php'); // Path to tc-lib-barcode library, change to use system library
 define('PASSWORD_COMPAT', __DIR__ . '/libraries/password_compat/password.php'); // Path to tc-lib-barcode library, change to use system library
 define('PLUGINS_DL_DIR', __DIR__ . '/download/');
@@ -42,8 +42,8 @@ define('DEV_OPTION',false);												/
 define('PC4PAGE',20);													// Define result by page MUST in (5,10,15,20,50,100,200,1000000);
 define('CSRF',1000);														// max number of csrf session 
 define('ETC_DIR', DOCUMENT_REAL_ROOT);									// Configuration dir
-define('VARLIB_DIR', DOCUMENT_ROOT);									// Data default dir
-define('VARLOG_DIR', DOCUMENT_ROOT);									// Log defaut dir
+define('VARLIB_DIR', '/var/lib/ocsinventory-reports');									// Data default dir
+define('VARLOG_DIR', '/var/log/ocsinventory-reports');									// Log defaut dir
 define('CONF_MYSQL', ETC_DIR.'/dbconfig.inc.php');						// Define dbconf file
 
 
