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

Fix: problem with image in emailing

Browse Source 
Fix: use the same image path of fckeditor default path
This commit is contained in:
Regis Houssin 2011-03-23 17:24:26 +00:00
parent 11c2a7c076
commit 2af2280006
2 changed files with 18 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/includes/modules/modFckeditor.class.php
View File

@ -1,7 +1,7 @@
<?php <?php
/* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org> /* Copyright (C) 2004 Rodolphe Quiedeville <rodolphe@quiedeville.org>
* Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net> * Copyright (C) 2004-2007 Laurent Destailleur <eldy@users.sourceforge.net>
* Copyright (C) 2005-2009 Regis Houssin <regis@dolibarr.fr> * Copyright (C) 2005-2011 Regis Houssin <regis@dolibarr.fr>
* *
* This program is free software; you can redistribute it and/or modify * This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by * it under the terms of the GNU General Public License as published by
@ -19,22 +19,23 @@
*/ */
/** /**
\defgroup fckeditor Module fckeditor * \defgroup fckeditor Module fckeditor
\brief Module pour mettre en page les zones de saisie de texte * \brief Module pour mettre en page les zones de saisie de texte
\version $Id$ * \version $Id$
*/ */
/** /**
\file htdocs/includes/modules/modFckeditor.class.php * \file htdocs/includes/modules/modFckeditor.class.php
\ingroup fckeditor * \ingroup fckeditor
\brief Fichier de description et activation du module Fckeditor * \brief Fichier de description et activation du module Fckeditor
*/ */
include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php"); include_once(DOL_DOCUMENT_ROOT ."/includes/modules/DolibarrModules.class.php");
/** \class modFckeditor /**
\brief Classe de description et activation du module Fckeditor * \class modFckeditor
* \brief Classe de description et activation du module Fckeditor
*/ */
class modFckeditor extends DolibarrModules class modFckeditor extends DolibarrModules
@ -60,7 +61,7 @@ class modFckeditor extends DolibarrModules
$this->picto='list'; $this->picto='list';
// Data directories to create when module is enabled // Data directories to create when module is enabled
$this->dirs = array("/fckeditor/temp","/fckeditor/images"); $this->dirs = array("/fckeditor/temp","/fckeditor/image");
// Config pages // Config pages
$this->config_page_url = array("fckeditor.php"); $this->config_page_url = array("fckeditor.php");

7
htdocs/viewimage.php
View File

@ -277,6 +277,13 @@ if ($modulepart)
$original_file=$conf->scanner->dir_temp.'/'.$user->id.'/'.$original_file; $original_file=$conf->scanner->dir_temp.'/'.$user->id.'/'.$original_file;
} }
// Wrapping pour les images fckeditor
elseif ($modulepart == 'fckeditor')
{
$accessallowed=1;
$original_file=$conf->fckeditor->dir_output.'/'.$original_file;
}
// GENERIC Wrapping // GENERIC Wrapping
// If modulepart=module_user_temp Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser // If modulepart=module_user_temp Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp/iduser
// If modulepart=module_temp Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp // If modulepart=module_temp Allows any module to open a file if file is in directory called DOL_DATA_ROOT/modulepart/temp