lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch '6.0' of git@github.com:Dolibarr/dolibarr.git into develop

Browse Source
This commit is contained in:
Laurent Destailleur 2017-07-17 20:21:35 +02:00
commit ae7f2ac253
11 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dev/dolibarr_changes.txt
View File

@ -5,7 +5,7 @@ in Dolibarr root.
ALL:
----
Check "DOL_CHANGE"
Check "@CHANGE"
CKEDITOR (4.6.2):

18
htdocs/core/class/smtps.class.php
View File

@ -221,7 +221,7 @@ class SMTPs
var $_debug = false;
// DOL_CHANGE LDR
// @CHANGE LDR
var $log = '';
var $_errorsTo = '';
var $_deliveryReceipt = 0;
@ -361,7 +361,7 @@ class SMTPs
$host=preg_replace('@tcp://@i','',$host); // Remove prefix
$host=preg_replace('@ssl://@i','',$host); // Remove prefix
// DOL_CHANGE LDR
// @CHANGE LDR
include_once DOL_DOCUMENT_ROOT.'/core/lib/functions2.lib.php';
if ( (! is_ip($host)) && ((gethostbyname($host)) == $host))
@ -393,7 +393,7 @@ class SMTPs
// This connection attempt failed.
else
{
// DOL_CHANGE LDR
// @CHANGE LDR
if (empty($this->errstr)) $this->errstr='Failed to connect with fsockopen host='.$this->getHost().' port='.$this->getPort();
$this->_setErr($this->errno, $this->errstr);
$_retVal = false;
@ -1093,7 +1093,7 @@ class SMTPs
{
foreach ( $this->_msgRecipients[$_host][$_which] as $_addr => $_realName )
{
if ( $_realName ) // DOL_CHANGE LDR
if ( $_realName ) // @CHANGE LDR
{
$_realName = '"' . $_realName . '"';
$_RCPT_list[] = $_realName . ' <' . $_addr . '@' . $_host . '>';
@ -1270,7 +1270,7 @@ class SMTPs
$_header .= $this->getPriority();
// DOL_CHANGE LDR
// @CHANGE LDR
if ( $this->getDeliveryReceipt() )
$_header .= 'Disposition-Notification-To: '.$this->getFrom('addr') . "\r\n";
if ( $this->getErrorsTo() )
@ -1414,7 +1414,7 @@ class SMTPs
$content .= "\r\n" . $_data['data'] . "\r\n\r\n";
}
}
// DOL_CHANGE LDR
// @CHANGE LDR
else if ( $type == 'image' )
{
// loop through all images
@ -1521,7 +1521,7 @@ class SMTPs
}
// DOL_CHANGE LDR
// @CHANGE LDR
/**
* Image attachments are added to the content array as sub-arrays,
@ -1546,7 +1546,7 @@ class SMTPs
$this->_msgContent['image'][$strImageName]['md5'] = dol_hash($strContent, 3);
}
}
// END DOL_CHANGE LDR
// END @CHANGE LDR
/**
@ -1740,7 +1740,7 @@ class SMTPs
*/
function socket_send_str( $_strSend, $_returnCode = null, $CRLF = "\r\n" )
{
if ($this->_debug) $this->log.=$_strSend; // DOL_CHANGE LDR for log
if ($this->_debug) $this->log.=$_strSend; // @CHANGE LDR for log
fputs($this->socket, $_strSend . $CRLF);
if ($this->_debug) $this->log.=' ('.$_returnCode.')' . $CRLF;

4
htdocs/core/filemanagerdol/connectors/php/commands.php
View File

@ -183,7 +183,7 @@ function CreateFolder( $resourceType, $currentFolder )
echo '<Error number="' . $sErrorNumber . '" />' ;
}
// DOL_CHANGE
// @CHANGE
//function FileUpload( $resourceType, $currentFolder, $sCommand )
/**
* FileUpload
@ -308,7 +308,7 @@ function FileUpload($resourceType, $currentFolder, $sCommand, $CKEcallback = '')
$sFileUrl = CombinePaths($sFileUrl, $sFileName);
// DOL_CHANGE
// @CHANGE
//SendUploadResults( $sErrorNumber, $sFileUrl, $sFileName );
if($CKEcallback == '')
{

2
htdocs/core/filemanagerdol/connectors/php/io.php
View File

@ -388,7 +388,7 @@ EOF;
}
// DOL_CHANGE
// @CHANGE
// This is the function that sends the results of the uploading process to CKE.
/**

2
htdocs/core/filemanagerdol/connectors/php/upload.php
View File

@ -60,7 +60,7 @@ if (! IsAllowedType($sType))
SendUploadResults(1, '', '', 'Invalid type specified');
// DOL_CHANGE
// @CHANGE
//FileUpload( $sType, $sCurrentFolder, $sCommand )
// Get the CKEditor Callback

2
htdocs/core/lib/barcode.lib.php
View File

@ -37,7 +37,7 @@ $text_color=Array(0,0,0);
/* ******************************************************************** */
if (defined('DOL_DEFAULT_TTF_BOLD')) $font_loc=constant('DOL_DEFAULT_TTF_BOLD');
// Automatic-Detection of Font if running Windows
// DOL_CHANGE LDR
// @CHANGE LDR
if (isset($_SERVER['WINDIR']) && @file_exists($_SERVER['WINDIR'])) $font_loc=$_SERVER['WINDIR'].'\Fonts\arialbd.ttf';
if (empty($font_loc)) die('DOL_DEFAULT_TTF_BOLD must de defined with full path to a TTF font.');

4
htdocs/includes/jquery/plugins/jqueryFileTree/jqueryFileTree.js vendored
View File

@ -60,7 +60,7 @@ if(jQuery) (function($){
}
function bindTree(t) {
/* DOL_CHANGE Replace LI A by LI A.jqft */
/* @CHANGE Replace LI A by LI A.jqft */
$(t).find('LI A.jqft').bind(o.folderEvent, function() {
if( $(this).parent().hasClass('directory') ) {
if( $(this).parent().hasClass('collapsed') ) {
@ -85,7 +85,7 @@ if(jQuery) (function($){
return false;
});
// Prevent A from triggering the # on non-click events
/* DOL_CHANGE Replace LI A by LI A.jqft */
/* @CHANGE Replace LI A by LI A.jqft */
if( o.folderEvent.toLowerCase != 'click' ) $(t).find('LI A.jqft').bind('click', function() { return false; });
}
// Loading message

4
htdocs/includes/nusoap/lib/nusoap.php
View File

@ -573,7 +573,7 @@ class nusoap_base {
}
$array_types[$tt] = 1;
// TODO: for literal, the name should be $name
// DOL_CHANGE This is to have tag name with name reported by wsdl and not "item"
// @CHANGE This is to have tag name with name reported by wsdl and not "item"
//$xml .= $this->serialize_val($v,'item',false,false,false,false,$use);
$tmp=preg_replace('/s$/i','',$name);
$xml .= $this->serialize_val($v,$tmp?$tmp:'item',false,false,false,false,$use);
@ -6128,7 +6128,7 @@ class wsdl extends nusoap_base {
if (!in_array($typeDef['arrayType'],$this->typemap['http://www.w3.org/2001/XMLSchema'])) {
$contents .= $this->serializeType('item', $typeDef['arrayType'], $v, $use);
} else {
// DOL_CHANGE This is to have tag name with name reported by wsdl and not "item"
// @CHANGE This is to have tag name with name reported by wsdl and not "item"
//$contents .= $this->serialize_val($v, 'itemzzzz', $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);
$tmp=array_keys($typeDef['elements']); //var_dump($tmp[0]);
$contents .= $this->serialize_val($v, ($tmp[0]?$tmp[0]:'item'), $typeDef['arrayType'], null, $this->XMLSchemaVersion, false, $use);

4
htdocs/includes/restler/framework/Luracast/Restler/AutoLoader.php
View File

@ -263,7 +263,7 @@ class AutoLoader
* @return bool false unless className now exists
*/
private function loadLastResort($className, $loader = null) {
// DOL_CHANGE LDR Add protection to avoid conflict with other autoloader
// @CHANGE LDR Add protection to avoid conflict with other autoloader
/*print 'Try to load '.$className."\n";
if (in_array($className, array('Google_Client')))
{
@ -307,7 +307,7 @@ class AutoLoader
*/
private function alias($className, $currentClass)
{
// DOL_CHANGE LDR
// @CHANGE LDR
if ($className == 'Luracast\Restler\string') return;
if ($className == 'Luracast\Restler\mixed') return;

6
htdocs/includes/restler/framework/Luracast/Restler/explorer/index.html
View File

@ -2,7 +2,7 @@
<html>
<head>
<title>Api Explorer</title>
<!-- DOL_CHANGE LDR Remove external links <link href='//fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>-->
<!-- @CHANGE LDR Remove external links <link href='//fonts.googleapis.com/css?family=Droid+Sans:400,700' rel='stylesheet' type='text/css'/>-->
<link href='css/reset.css' media='screen' rel='stylesheet' type='text/css'/>
<link href='css/screen.css' media='screen' rel='stylesheet' type='text/css'/>
<link href='css/reset.css' media='print' rel='stylesheet' type='text/css'/>
@ -59,7 +59,7 @@
var key = $('#input_apiKey')[0].value;
log("key: " + key);
if(key && key.trim() != "") {
/* DOL_CHANGE LDR We set DOLAPIKEY into header */
/* @CHANGE LDR We set DOLAPIKEY into header */
log("added key " + key);
/* Disabled for security reason. We keep only param in header
@ -87,7 +87,7 @@
<div class="swagger-ui-wrap">
<a id="logo" href="#">API Explorer</a>
<form id='api_selector'>
<!-- DOL_CHANGE LDR
<!-- @CHANGE LDR
<div class='input icon-btn'>
<img id="show-pet-store-icon" src="images/pet_store_api.png" title="Show Swagger Petstore Example Apis">
</div>

2
htdocs/includes/restler/framework/Luracast/Restler/explorer/swagger-ui.js
View File

@ -1539,7 +1539,7 @@ helpers = this.merge(helpers, Handlebars.helpers); data = data || {};
}
$('.toggleEndpointList', this.el).click(this.callDocs.bind(this, 'toggleEndpointListForResource'));
$('.collapseResource', this.el).click(this.callDocs.bind(this, 'collapseOperationsForResource'));
/* DOL_CHANGE LDR Fix typo error that break expand */
/* @CHANGE LDR Fix typo error that break expand */
$('.expandResource', this.el).click(this.callDocs.bind(this, 'expandOperationsForResource'));
return this;
};