From 983ea87ebf2ab059d616802b746226084e58725a Mon Sep 17 00:00:00 2001
From: Laurent Destailleur <eldy@destailleur.fr>
Date: Sun, 27 Nov 2011 02:23:55 +0100
Subject: [PATCH] Qual: Removed specific change into external lib.

---
 htdocs/core/lib/functions.lib.php             | 28 ++++++--
 htdocs/includes/dolibarr_changes.txt          | 70 -------------------
 htdocs/includes/tcpdf/config/tcpdf_config.php |  8 ---
 3 files changed, 21 insertions(+), 85 deletions(-)

diff --git a/htdocs/core/lib/functions.lib.php b/htdocs/core/lib/functions.lib.php
index 39fc2b599d9..e05708a4300 100644
--- a/htdocs/core/lib/functions.lib.php
+++ b/htdocs/core/lib/functions.lib.php
@@ -189,7 +189,7 @@ function GETPOST($paramname,$check='',$method=0)
 	elseif ($method==1) $out = isset($_GET[$paramname])?$_GET[$paramname]:'';
 	elseif ($method==2) $out = isset($_POST[$paramname])?$_POST[$paramname]:'';
 	elseif ($method==3) $out = isset($_POST[$paramname])?$_POST[$paramname]:(isset($_GET[$paramname])?$_GET[$paramname]:'');
-	
+
 	if (! empty($check))
 	{
 		// Check if numeric
@@ -199,7 +199,7 @@ function GETPOST($paramname,$check='',$method=0)
 		// '"' is dangerous because param in url can close the href= or src= and add javascript functions.
 		if ($check == 'alpha' && preg_match('/"/',trim($out))) $out='';
 	}
-	
+
 	return $out;
 }
 
@@ -1500,7 +1500,7 @@ function dolibarr_trunc($string,$size=40,$trunc='right',$stringencoding='')
 
 /**
  *  Show a javascript graph
- *  
+ *
  *  @param		string	$htmlid			Html id name
  *  @param		int		$width			Width in pixel
  *  @param		int		$height			Height in pixel
@@ -1518,7 +1518,7 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',
 	if (empty($conf->use_javascript_ajax)) return;
 	$jsgraphlib='flot';
 	$datacolor=array();
-	
+
 	// Load colors of theme into $datacolor array
 	$color_file = DOL_DOCUMENT_ROOT."/theme/".$conf->theme."/graph-color.php";
 	if (is_readable($color_file))
@@ -1534,7 +1534,7 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',
 		}
 	}
 	print '<div id="'.$htmlid.'" style="width:'.$width.'px;height:'.$height.'px;"></div>';
-	
+
 	// We use Flot js lib
 	if ($jsgraphlib == 'flot')
 	{
@@ -1549,7 +1549,7 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',
 			<script type="text/javascript">
 			$(function () {
 				var data = '.json_encode($data['series']).';
-				
+
 				function plotWithOptions() {
 					$.plot($("#'.$htmlid.'"), data,
 					{
@@ -1628,7 +1628,7 @@ function dol_print_graph($htmlid,$width,$height,$data,$showlegend=0,$type='pie',
 				}
 				print '];
 				var dataticks = '.json_encode($data['xlabel']).'
-				
+
 				function plotWithOptions() {
 					$.plot(jQuery("#'.$htmlid.'"), data,
 					{
@@ -4477,4 +4477,18 @@ function printCommonFooter($zone='private')
 
 }
 
+
+if (! function_exists('getmypid'))
+{
+    /**
+     * Return PID
+     *
+     * @return	void
+     */
+    function getmypid()
+    {
+        return rand(1,32768);
+    }
+}
+
 ?>
diff --git a/htdocs/includes/dolibarr_changes.txt b/htdocs/includes/dolibarr_changes.txt
index d3caf076520..ae46dc295e9 100644
--- a/htdocs/includes/dolibarr_changes.txt
+++ b/htdocs/includes/dolibarr_changes.txt
@@ -30,14 +30,6 @@ public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=
 by
 public function MultiCell($w, $h, $txt, $border=0, $align='J', $fill=false, $ln=1, $x='', $y='', $reseth=true, $stretch=0, $ishtml=false, $autopadding=false, $maxh=0, $valign='T', $fitcell=false) {
 
-* Open /tcpdf/config/tcpdf_config.php and add this function :
-
-if (! function_exists('getmypid')) {
-	function getmypid() {
-		return rand(1,32768);
-	}
-}
-
 
 
 JSGANTT:
@@ -68,65 +60,3 @@ If files are replaced by new version, following changes must be done:
     {
 		imagepng($im,$filebarcode);
 	// End DOLCHANGE LDR
-	
-
-
-FCKEDITOR:
-----------
-If files are replaced by new version, following changes must be done:
-
-* Edit file fckeditor/editor/filemanager/browser/default/browser.css
-**********************************************************
-Edit this file to put neutral colors (this theme is used for all themes)
-
-* Replace files and images in themes/fckeditor directories
-**********************************************************
-Replace in themes, files in fckeditor by new ones. Then edit them
-to get back colors that match the theme.
-
-* Edit fckconfig.js to set:
-***************************
-(Rem: Not required as already in the managed file fckconfig.js which is in the directory of the theme)
-FCKConfig.LinkUpload = false ;
-FCKConfig.ImageUpload = false ;
-FCKConfig.FlashUpload = false ;
-
-* Edit htdocs\includes\fckeditor\editor\filemanager\connectors\php\config.php to set:
-*****************************************************************************************************
-
-define('NOTOKENRENEWAL',1); // Disables token renewal
-
-// We must include the main because this page is
-// a web page that require security controls and
-// is a security hole if anybody can access without
-// being an authenticated user.
-require_once("../../../../../../main.inc.php");	
-$uri=preg_replace('/^http(s?):\/\//i','',$dolibarr_main_url_root);
-$pos = strstr ($uri, '/');      // $pos contient alors url sans nom domaine
-if ($pos == '/') $pos = '';     // si $pos vaut /, on le met a ''
-define('DOL_URL_ROOT', $pos);
-
-// SECURITY: You must explicitelly enable this "connector". (Set it to "true").
-$Config['Enabled'] = true ;
-
-// Path to user files relative to the document root.
-$Config['UserFilesPath'] = DOL_URL_ROOT.'/viewimage.php?modulepart=fckeditor&file=' ;
-
-// Fill the following value it you prefer to specify the absolute path for the
-// user files directory. Usefull if you are using a virtual directory, symbolic
-// link or alias. Examples: 'C:\\MySite\\UserFiles\\' or '/root/mysite/UserFiles/'.
-// Attention: The above 'UserFilesPath' must point to the same directory.
-
-//$Config['UserFilesAbsolutePath'] = $conf->fckeditor->dir_output; // ne fonctionne pas
-$Config['UserFilesAbsolutePath'] = $dolibarr_main_data_root.'/fckeditor/';
-
-// After file is uploaded, sometimes it is required to change its permissions
-// so that it was possible to access it at the later time.
-// If possible, it is recommended to set more restrictive permissions, like 0755.
-// Set to 0 to disable this feature.
-// Note: not needed on Windows-based servers.
-$Config['ChmodOnUpload'] = 0775 ;
-
-// See comments above.
-// Used when creating folders that does not exist.
-$Config['ChmodOnFolderCreate'] = 0775 ;
diff --git a/htdocs/includes/tcpdf/config/tcpdf_config.php b/htdocs/includes/tcpdf/config/tcpdf_config.php
index 8dfb4029e2b..811145f7671 100644
--- a/htdocs/includes/tcpdf/config/tcpdf_config.php
+++ b/htdocs/includes/tcpdf/config/tcpdf_config.php
@@ -26,14 +26,6 @@
  * @since 2004-10-27
  */
 
-// DOLCHANGE RH
-if (! function_exists('getmypid')) {
-	function getmypid() {
-		return rand(1,32768);
-	}
-}
-// END DOLCHANGE
-
 // If you define the constant K_TCPDF_EXTERNAL_CONFIG, the following settings will be ignored.
 
 if (!defined('K_TCPDF_EXTERNAL_CONFIG')) {