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

Fix: Minot miscellanous fix

Browse Source
This commit is contained in:
Laurent Destailleur 2012-09-03 10:17:58 +02:00
parent fdf787fca4
commit 9eb21c3d9f
8 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/core/class/commondocgenerator.class.php
View File

@ -54,7 +54,7 @@ abstract class CommonDocGenerator
'myuser_fax'=>$user->office_fax,
'myuser_mobile'=>$user->user_mobile,
'myuser_email'=>$user->email,
//'myuser_web'=>$user->url // FIXME url not exist in $user object
'myuser_web'=>'' // url not exist in $user object
);
}

2
htdocs/core/class/conf.class.php
View File

@ -383,7 +383,7 @@ class Conf
if (! isset($this->global->MAIN_MAX_DECIMALS_SHOWN)) $this->global->MAIN_MAX_DECIMALS_SHOWN=8;
// Default max file size for upload
$this->maxfilesize = (! empty($this->global->MAIN_UPLOAD_DOC) ? $this->global->MAIN_UPLOAD_DOC * 1024 : 2097152);
$this->maxfilesize = (! empty($this->global->MAIN_UPLOAD_DOC) ? $this->global->MAIN_UPLOAD_DOC * 1024 : 0);
// Timeouts
if (empty($this->global->MAIN_USE_CONNECT_TIMEOUT)) $this->global->MAIN_USE_CONNECT_TIMEOUT=10;

6
htdocs/core/db/mysql.class.php
View File

@ -714,10 +714,10 @@ class DoliDBMysql
global $conf;
// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
$cryptType = (isset($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
$cryptType = (! empty($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
//Encryption key
$cryptKey = (! empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
$return = ($withQuotes?"'":"").$this->escape($fieldorvalue).($withQuotes?"'":"");
@ -747,7 +747,7 @@ class DoliDBMysql
global $conf;
// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
$cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
$cryptType = (!empty($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
//Encryption key
$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');

6
htdocs/core/db/mysqli.class.php
View File

@ -709,10 +709,10 @@ class DoliDBMysqli
global $conf;
// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
$cryptType = (isset($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
$cryptType = (!empty($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
//Encryption key
$cryptKey = (! empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');
$return = ($withQuotes?"'":"").$this->escape($fieldorvalue).($withQuotes?"'":"");
@ -742,7 +742,7 @@ class DoliDBMysqli
global $conf;
// Type of encryption (2: AES (recommended), 1: DES , 0: no encryption)
$cryptType = ($conf->db->dolibarr_main_db_encryption?$conf->db->dolibarr_main_db_encryption:0);
$cryptType = (!empty($conf->db->dolibarr_main_db_encryption)?$conf->db->dolibarr_main_db_encryption:0);
//Encryption key
$cryptKey = (!empty($conf->db->dolibarr_main_db_cryptkey)?$conf->db->dolibarr_main_db_cryptkey:'');

4
htdocs/core/lib/functions.lib.php
View File

@ -3034,12 +3034,12 @@ function get_exdir($num,$level=3,$alpha=0,$withoutslash=0)
* Creation of a directory (this can create recursive subdir)
*
* @param string $dir Directory to create (Separator must be '/'. Example: '/mydir/mysubdir')
* @param string $dataroot Data root directory (to avoid having the data root in the loop)
* @param string $dataroot Data root directory (To avoid having the data root in the loop. Using this will also lost the warning on first dir PHP has no permission when open_basedir is used)
* @return int < 0 if KO, 0 = already exists, > 0 if OK
*/
function dol_mkdir($dir, $dataroot='')
{
global $db, $conf;
global $conf;
dol_syslog("functions.lib::dol_mkdir: dir=".$dir,LOG_INFO);

2
htdocs/core/modules/DolibarrModules.class.php
View File

@ -1170,7 +1170,7 @@ abstract class DolibarrModules
$err=0;
if (isset($this->dirs) && is_array($this->dirs) && ! empty($this->dirs))
if (isset($this->dirs) && is_array($this->dirs))
{
foreach ($this->dirs as $key => $value)
{

10
htdocs/core/modules/import/modules_import.php
View File

@ -94,12 +94,12 @@ class ModeleImports
// Picto
$this->picto[$module->id]=$module->picto;
// Driver properties
$this->_driverlabel[$module->id]=$module->getDriverLabel();
$this->_driverdesc[$module->id]=$module->getDriverDesc();
$this->_driverversion[$module->id]=$module->getDriverVersion();
$this->_driverlabel[$module->id]=$module->getDriverLabel('');
$this->_driverdesc[$module->id]=$module->getDriverDesc('');
$this->_driverversion[$module->id]=$module->getDriverVersion('');
// If use an external lib
$this->_liblabel[$module->id]=$module->getLibLabel();
$this->_libversion[$module->id]=$module->getLibVersion();
$this->_liblabel[$module->id]=$module->getLibLabel('');
$this->_libversion[$module->id]=$module->getLibVersion('');
$i++;
}

2
htdocs/main.inc.php
View File

@ -1000,7 +1000,7 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/jeditable/jquery.jeditable.ckeditor.js"></script>'."\n";
}
// jQuery File Upload
if (! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) || defined('REQUIRE_JQUERY_FILEUPLOAD'))
if (! empty($conf->global->MAIN_USE_JQUERY_FILEUPLOAD) || (defined('REQUIRE_JQUERY_FILEUPLOAD') && constant('REQUIRE_JQUERY_FILEUPLOAD')))
{
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/template/tmpl.min.js"></script>'."\n";
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/fileupload/js/jquery.iframe-transport.js"></script>'."\n";