mirror of
https://github.com/EGroupware/egroupware.git
synced 2025-06-21 10:27:52 +02:00
"update to fck 2.6"
This commit is contained in:
parent
e4401d7f41
commit
be2fa1c923
@ -431,19 +431,10 @@ class html
|
|||||||
*/
|
*/
|
||||||
static function htmlarea_availible()
|
static function htmlarea_availible()
|
||||||
{
|
{
|
||||||
switch(self::$user_agent)
|
require_once(EGW_INCLUDE_ROOT.'/phpgwapi/js/fckeditor/fckeditor.php');
|
||||||
{
|
|
||||||
case 'msie':
|
// use FCKeditor's own check
|
||||||
return self::$ua_version >= 5.5;
|
return FCKeditor_IsCompatibleBrowser();
|
||||||
case 'mozilla':
|
|
||||||
return self::$ua_version >= 1.3;
|
|
||||||
case 'safari':
|
|
||||||
return self::$ua_version >= 523.12;
|
|
||||||
case 'opera':
|
|
||||||
return self::$ua_version >= 9.5;
|
|
||||||
default:
|
|
||||||
return False;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -496,6 +487,10 @@ class html
|
|||||||
if ($_base_href && is_dir($_SERVER['DOCUMENT_ROOT'].$_base_href) && file_exists($_SERVER['DOCUMENT_ROOT'].$_base_href.'/.'))
|
if ($_base_href && is_dir($_SERVER['DOCUMENT_ROOT'].$_base_href) && file_exists($_SERVER['DOCUMENT_ROOT'].$_base_href.'/.'))
|
||||||
{
|
{
|
||||||
// Only images for now
|
// Only images for now
|
||||||
|
if (substr($_base_href,-1) != '/') $_base_href .= '/' ;
|
||||||
|
// store the path and application in the session, to make sure it can't be called with arbitrary pathes
|
||||||
|
$GLOBALS['egw']->session->appsession($_base_href,'FCKeditor',$GLOBALS['egw_info']['flags']['currentapp']);
|
||||||
|
|
||||||
$oFCKeditor->Config['ImageBrowserURL'] = $oFCKeditor->BasePath.'editor/filemanager/browser/default/browser.html?ServerPath='.$_base_href.'&Type=Image&Connector='.$oFCKeditor->BasePath.'editor/filemanager/connectors/php/connector.php';
|
$oFCKeditor->Config['ImageBrowserURL'] = $oFCKeditor->BasePath.'editor/filemanager/browser/default/browser.html?ServerPath='.$_base_href.'&Type=Image&Connector='.$oFCKeditor->BasePath.'editor/filemanager/connectors/php/connector.php';
|
||||||
$oFCKeditor->Config['ImageBrowser'] = true;
|
$oFCKeditor->Config['ImageBrowser'] = true;
|
||||||
$oFCKeditor->Config['ImageUpload'] = is_writable($_SERVER['DOCUMENT_ROOT'].$_base_href);
|
$oFCKeditor->Config['ImageUpload'] = is_writable($_SERVER['DOCUMENT_ROOT'].$_base_href);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user