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

Test CKEditor

Browse Source
This commit is contained in:
Regis Houssin 2011-01-31 16:35:55 +00:00
parent d3710434cb
commit 10ded212d0
3 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
htdocs/comm/propal.php
View File

@ -29,6 +29,8 @@
* \version $Id$
*/
if (! defined('REQUIRE_CKEDITOR')) define('REQUIRE_CKEDITOR','1');
require("../main.inc.php");
require_once(DOL_DOCUMENT_ROOT.'/comm/propal/class/propal.class.php');
require_once(DOL_DOCUMENT_ROOT."/includes/modules/propale/modules_propale.php");
@ -45,12 +47,11 @@ $langs->load('bills');
$langs->load('orders');
$langs->load('products');
$sall=isset($_GET["sall"])?$_GET["sall"]:$_POST["sall"];
if (isset($_GET["msg"])) { $mesg=$_GET["mesg"]; }
$year=isset($_GET["year"])?$_GET["year"]:"";
$month=isset($_GET["month"])?$_GET["month"]:"";
$socid=isset($_GET['socid'])?$_GET['socid']:$_POST['socid'];
$mesg=isset($_GET['mesg'])?$_GET['mesg']:'';
$sall=GETPOST("sall");
$mesg=GETPOST("mesg");
$year=GETPOST("year");
$month=GETPOST("month");
$socid=GETPOST('socid');
// Security check
$module='propale';
@ -370,11 +371,11 @@ if ($_GET["action"] == 'classifybilled')
/*
* Cloture de la propale
*/
if ($_REQUEST['action'] == 'setstatut' && $user->rights->propale->cloturer)
if (GETPOST('action') == 'setstatut' && $user->rights->propale->cloturer)
{
if (! $_POST['cancel'])
{
if (empty($_REQUEST['statut']))
if (! GETPOST('statut'))
{
$mesg='<div class="error">'.$langs->trans("ErrorFieldRequired",$langs->transnoentities("CloseAs")).'</div>';
$_REQUEST['action']='statut';
@ -964,8 +965,8 @@ $companystatic=new Societe($db);
$now=dol_now();
$id = $_REQUEST['id']?$_REQUEST['id']:$_REQUEST['id'];
$ref= $_REQUEST['ref'];
$id = GETPOST('id');
$ref= GETPOST('ref');
if ($id > 0 || ! empty($ref))
{

13
htdocs/lib/doleditor.class.php
View File

@ -21,7 +21,7 @@
* \file htdocs/lib/doleditor.class.php
* \brief Class to manage a WYSIWYG editor
* \version $Id$
*/
*/
/**
* \class DolEditor
@ -68,12 +68,11 @@ class DolEditor
$this->tool='fckeditor'; // By default
// Check fckeditor is ok
if ($this->tool == 'fckeditor' && (empty($conf->fckeditor->enabled) || ! $okforextandededitor))
if ($this->tool == 'fckeditor' && (empty($conf->fckeditor->enabled) || ! $okforextandededitor || $conf->global->MAIN_USE_CKEDITOR))
{
$this->tool = 'textarea';
}
if ($this->tool == 'fckeditor')
{
require_once(DOL_DOCUMENT_ROOT."/includes/fckeditor/fckeditor.php");
@ -120,17 +119,21 @@ class DolEditor
*/
function Create()
{
global $conf;
$found=0;
if ($this->tool == 'fckeditor')
{
$found=1;
$this->editor->Create();
$this->editor->Create();
}
if ($this->tool == 'textarea')
{
$found=1;
print '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'" cols="'.$this->cols.'" class="flat">';
$cssclass='flat';
if ($conf->global->MAIN_USE_CKEDITOR) $cssclass='ckeditor';
print '<textarea id="'.$this->htmlname.'" name="'.$this->htmlname.'" rows="'.$this->rows.'" cols="'.$this->cols.'" class="'.$cssclass.'">';
print $this->content;
print '</textarea>';
}

6
htdocs/main.inc.php
View File

@ -886,6 +886,12 @@ function top_htmlhead($head, $title='', $disablejs=0, $disablehead=0, $arrayofjs
{
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/jquery/plugins/layout/jquery.layout-latest'.$ext.'"></script>'."\n";
}
// CKEditor
if ($conf->global->MAIN_USE_CKEDITOR && defined('REQUIRE_CKEDITOR'))
{
print '<script type="text/javascript" src="'.DOL_URL_ROOT.'/includes/ckeditor/ckeditor.js"></script>'."\n";
}
}
// Output module javascript