[limb-svn] r6382 - 2.x/trunk/shared/FCKeditorNew
svn at limb-project.com
svn at limb-project.com
Fri Oct 5 13:22:52 MSD 2007
Author: momental
Date: 2007-10-05 13:22:51 +0400 (Fri, 05 Oct 2007)
New Revision: 6382
URL: http://fisheye.limb-project.com/changelog/limb/?cs=6382
Modified:
2.x/trunk/shared/FCKeditorNew/fckeditor_php4.php
2.x/trunk/shared/FCKeditorNew/fckeditor_php5.php
Log:
FCKeditor will be work now in Opera at version 8.0
Modified: 2.x/trunk/shared/FCKeditorNew/fckeditor_php4.php
===================================================================
--- 2.x/trunk/shared/FCKeditorNew/fckeditor_php4.php 2007-10-05 09:16:40 UTC (rev 6381)
+++ 2.x/trunk/shared/FCKeditorNew/fckeditor_php4.php 2007-10-05 09:22:51 UTC (rev 6382)
@@ -27,154 +27,154 @@
class FCKeditor
{
- var $InstanceName ;
- var $BasePath ;
- var $Width ;
- var $Height ;
- var $ToolbarSet ;
- var $Value ;
- var $Config ;
+ var $InstanceName ;
+ var $BasePath ;
+ var $Width ;
+ var $Height ;
+ var $ToolbarSet ;
+ var $Value ;
+ var $Config ;
- // PHP 4 Constructor
- function FCKeditor( $instanceName )
- {
- $this->InstanceName = $instanceName ;
- $this->BasePath = '/fckeditor/' ;
- $this->Width = '100%' ;
- $this->Height = '200' ;
- $this->ToolbarSet = 'Default' ;
- $this->Value = '' ;
+ // PHP 4 Constructor
+ function FCKeditor( $instanceName )
+ {
+ $this->InstanceName = $instanceName ;
+ $this->BasePath = '/fckeditor/' ;
+ $this->Width = '100%' ;
+ $this->Height = '200' ;
+ $this->ToolbarSet = 'Default' ;
+ $this->Value = '' ;
- $this->Config = array() ;
- }
+ $this->Config = array() ;
+ }
- function Create()
- {
- echo $this->CreateHtml() ;
- }
+ function Create()
+ {
+ echo $this->CreateHtml() ;
+ }
- function CreateHtml()
- {
- $HtmlValue = htmlspecialchars( $this->Value ) ;
+ function CreateHtml()
+ {
+ $HtmlValue = htmlspecialchars( $this->Value ) ;
- $Html = '<div>' ;
-
- if ( !isset( $_GET ) ) {
- global $HTTP_GET_VARS ;
- $_GET = $HTTP_GET_VARS ;
- }
+ $Html = '<div>' ;
- if ( $this->IsCompatible() )
- {
- if ( isset( $_GET['fcksource'] ) && $_GET['fcksource'] == "true" )
- $File = 'fckeditor.original.html' ;
- else
- $File = 'fckeditor.html' ;
+ if ( !isset( $_GET ) ) {
+ global $HTTP_GET_VARS ;
+ $_GET = $HTTP_GET_VARS ;
+ }
- $Link = "{$this->BasePath}editor/{$File}?InstanceName={$this->InstanceName}" ;
+ if ( $this->IsCompatible() )
+ {
+ if ( isset( $_GET['fcksource'] ) && $_GET['fcksource'] == "true" )
+ $File = 'fckeditor.original.html' ;
+ else
+ $File = 'fckeditor.html' ;
- if ( $this->ToolbarSet != '' )
- $Link .= "&Toolbar={$this->ToolbarSet}" ;
+ $Link = "{$this->BasePath}editor/{$File}?InstanceName={$this->InstanceName}" ;
- // Render the linked hidden field.
- $Html .= "<input type=\"hidden\" id=\"{$this->InstanceName}\" name=\"{$this->InstanceName}\" value=\"{$HtmlValue}\" style=\"display:none\" />" ;
+ if ( $this->ToolbarSet != '' )
+ $Link .= "&Toolbar={$this->ToolbarSet}" ;
- // Render the configurations hidden field.
- $Html .= "<input type=\"hidden\" id=\"{$this->InstanceName}___Config\" value=\"" . $this->GetConfigFieldString() . "\" style=\"display:none\" />" ;
+ // Render the linked hidden field.
+ $Html .= "<input type=\"hidden\" id=\"{$this->InstanceName}\" name=\"{$this->InstanceName}\" value=\"{$HtmlValue}\" style=\"display:none\" />" ;
- // Render the editor IFRAME.
- $Html .= "<iframe id=\"{$this->InstanceName}___Frame\" src=\"{$Link}\" width=\"{$this->Width}\" height=\"{$this->Height}\" frameborder=\"0\" scrolling=\"no\"></iframe>" ;
- }
- else
- {
- if ( strpos( $this->Width, '%' ) === false )
- $WidthCSS = $this->Width . 'px' ;
- else
- $WidthCSS = $this->Width ;
+ // Render the configurations hidden field.
+ $Html .= "<input type=\"hidden\" id=\"{$this->InstanceName}___Config\" value=\"" . $this->GetConfigFieldString() . "\" style=\"display:none\" />" ;
- if ( strpos( $this->Height, '%' ) === false )
- $HeightCSS = $this->Height . 'px' ;
- else
- $HeightCSS = $this->Height ;
+ // Render the editor IFRAME.
+ $Html .= "<iframe id=\"{$this->InstanceName}___Frame\" src=\"{$Link}\" width=\"{$this->Width}\" height=\"{$this->Height}\" frameborder=\"0\" scrolling=\"no\"></iframe>" ;
+ }
+ else
+ {
+ if ( strpos( $this->Width, '%' ) === false )
+ $WidthCSS = $this->Width . 'px' ;
+ else
+ $WidthCSS = $this->Width ;
- $Html .= "<textarea name=\"{$this->InstanceName}\" rows=\"4\" cols=\"40\" style=\"width: {$WidthCSS}; height: {$HeightCSS}\">{$HtmlValue}</textarea>" ;
- }
+ if ( strpos( $this->Height, '%' ) === false )
+ $HeightCSS = $this->Height . 'px' ;
+ else
+ $HeightCSS = $this->Height ;
- $Html .= '</div>' ;
+ $Html .= "<textarea name=\"{$this->InstanceName}\" rows=\"4\" cols=\"40\" style=\"width: {$WidthCSS}; height: {$HeightCSS}\">{$HtmlValue}</textarea>" ;
+ }
- return $Html ;
- }
+ $Html .= '</div>' ;
- function IsCompatible()
- {
- global $HTTP_USER_AGENT ;
+ return $Html ;
+ }
- if ( !isset( $_SERVER ) ) {
- global $HTTP_SERVER_VARS ;
- $_SERVER = $HTTP_SERVER_VARS ;
- }
-
- if ( isset( $HTTP_USER_AGENT ) )
- $sAgent = $HTTP_USER_AGENT ;
- else
- $sAgent = $_SERVER['HTTP_USER_AGENT'] ;
+ function IsCompatible()
+ {
+ global $HTTP_USER_AGENT ;
- if ( strpos($sAgent, 'MSIE') !== false && strpos($sAgent, 'mac') === false && strpos($sAgent, 'Opera') === false )
- {
- $iVersion = (float)substr($sAgent, strpos($sAgent, 'MSIE') + 5, 3) ;
- return ($iVersion >= 5.5) ;
- }
- else if ( strpos($sAgent, 'Gecko/') !== false )
- {
- $iVersion = (int)substr($sAgent, strpos($sAgent, 'Gecko/') + 6, 8) ;
- return ($iVersion >= 20030210) ;
- }
- else if ( strpos($sAgent, 'Opera/') !== false )
- {
- $fVersion = (float)substr($sAgent, strpos($sAgent, 'Opera/') + 6, 4) ;
- return ($fVersion >= 9.5) ;
- }
- else if ( preg_match( "|AppleWebKit/(\d+)|i", $sAgent, $matches ) )
- {
- $iVersion = $matches[1] ;
- return ( $matches[1] >= 522 ) ;
- }
- else
- return false ;
- }
+ if ( !isset( $_SERVER ) ) {
+ global $HTTP_SERVER_VARS ;
+ $_SERVER = $HTTP_SERVER_VARS ;
+ }
- function GetConfigFieldString()
- {
- $sParams = '' ;
- $bFirst = true ;
+ if ( isset( $HTTP_USER_AGENT ) )
+ $sAgent = $HTTP_USER_AGENT ;
+ else
+ $sAgent = $_SERVER['HTTP_USER_AGENT'] ;
- foreach ( $this->Config as $sKey => $sValue )
- {
- if ( $bFirst == false )
- $sParams .= '&' ;
- else
- $bFirst = false ;
+ if ( strpos($sAgent, 'MSIE') !== false && strpos($sAgent, 'mac') === false && strpos($sAgent, 'Opera') === false )
+ {
+ $iVersion = (float)substr($sAgent, strpos($sAgent, 'MSIE') + 5, 3) ;
+ return ($iVersion >= 5.5) ;
+ }
+ else if ( strpos($sAgent, 'Gecko/') !== false )
+ {
+ $iVersion = (int)substr($sAgent, strpos($sAgent, 'Gecko/') + 6, 8) ;
+ return ($iVersion >= 20030210) ;
+ }
+ else if ( strpos($sAgent, 'Opera/') !== false )
+ {
+ $fVersion = (float)substr($sAgent, strpos($sAgent, 'Opera/') + 6, 4) ;
+ return ($fVersion >= 8.0) ;
+ }
+ else if ( preg_match( "|AppleWebKit/(\d+)|i", $sAgent, $matches ) )
+ {
+ $iVersion = $matches[1] ;
+ return ( $matches[1] >= 522 ) ;
+ }
+ else
+ return false ;
+ }
- if ( $sValue === true )
- $sParams .= $this->EncodeConfig( $sKey ) . '=true' ;
- else if ( $sValue === false )
- $sParams .= $this->EncodeConfig( $sKey ) . '=false' ;
- else
- $sParams .= $this->EncodeConfig( $sKey ) . '=' . $this->EncodeConfig( $sValue ) ;
- }
+ function GetConfigFieldString()
+ {
+ $sParams = '' ;
+ $bFirst = true ;
- return $sParams ;
- }
+ foreach ( $this->Config as $sKey => $sValue )
+ {
+ if ( $bFirst == false )
+ $sParams .= '&' ;
+ else
+ $bFirst = false ;
- function EncodeConfig( $valueToEncode )
- {
- $chars = array(
- '&' => '%26',
- '=' => '%3D',
- '"' => '%22' ) ;
+ if ( $sValue === true )
+ $sParams .= $this->EncodeConfig( $sKey ) . '=true' ;
+ else if ( $sValue === false )
+ $sParams .= $this->EncodeConfig( $sKey ) . '=false' ;
+ else
+ $sParams .= $this->EncodeConfig( $sKey ) . '=' . $this->EncodeConfig( $sValue ) ;
+ }
- return strtr( $valueToEncode, $chars ) ;
- }
+ return $sParams ;
+ }
+
+ function EncodeConfig( $valueToEncode )
+ {
+ $chars = array(
+ '&' => '%26',
+ '=' => '%3D',
+ '"' => '%22' ) ;
+
+ return strtr( $valueToEncode, $chars ) ;
+ }
}
?>
Modified: 2.x/trunk/shared/FCKeditorNew/fckeditor_php5.php
===================================================================
--- 2.x/trunk/shared/FCKeditorNew/fckeditor_php5.php 2007-10-05 09:16:40 UTC (rev 6381)
+++ 2.x/trunk/shared/FCKeditorNew/fckeditor_php5.php 2007-10-05 09:22:51 UTC (rev 6382)
@@ -27,144 +27,144 @@
class FCKeditor
{
- var $InstanceName ;
- var $BasePath ;
- var $Width ;
- var $Height ;
- var $ToolbarSet ;
- var $Value ;
- var $Config ;
+ var $InstanceName ;
+ var $BasePath ;
+ var $Width ;
+ var $Height ;
+ var $ToolbarSet ;
+ var $Value ;
+ var $Config ;
- // PHP 5 Constructor (by Marcus Bointon <coolbru at users.sourceforge.net>)
- function __construct( $instanceName )
- {
- $this->InstanceName = $instanceName ;
- $this->BasePath = '/fckeditor/' ;
- $this->Width = '100%' ;
- $this->Height = '200' ;
- $this->ToolbarSet = 'Default' ;
- $this->Value = '' ;
+ // PHP 5 Constructor (by Marcus Bointon <coolbru at users.sourceforge.net>)
+ function __construct( $instanceName )
+ {
+ $this->InstanceName = $instanceName ;
+ $this->BasePath = '/fckeditor/' ;
+ $this->Width = '100%' ;
+ $this->Height = '200' ;
+ $this->ToolbarSet = 'Default' ;
+ $this->Value = '' ;
- $this->Config = array() ;
- }
+ $this->Config = array() ;
+ }
- function Create()
- {
- echo $this->CreateHtml() ;
- }
+ function Create()
+ {
+ echo $this->CreateHtml() ;
+ }
- function CreateHtml()
- {
- $HtmlValue = htmlspecialchars( $this->Value ) ;
+ function CreateHtml()
+ {
+ $HtmlValue = htmlspecialchars( $this->Value ) ;
- $Html = '<div>' ;
+ $Html = '<div>' ;
- if ( $this->IsCompatible() )
- {
- if ( isset( $_GET['fcksource'] ) && $_GET['fcksource'] == "true" )
- $File = 'fckeditor.original.html' ;
- else
- $File = 'fckeditor.html' ;
+ if ( $this->IsCompatible() )
+ {
+ if ( isset( $_GET['fcksource'] ) && $_GET['fcksource'] == "true" )
+ $File = 'fckeditor.original.html' ;
+ else
+ $File = 'fckeditor.html' ;
- $Link = "{$this->BasePath}editor/{$File}?InstanceName={$this->InstanceName}" ;
+ $Link = "{$this->BasePath}editor/{$File}?InstanceName={$this->InstanceName}" ;
- if ( $this->ToolbarSet != '' )
- $Link .= "&Toolbar={$this->ToolbarSet}" ;
+ if ( $this->ToolbarSet != '' )
+ $Link .= "&Toolbar={$this->ToolbarSet}" ;
- // Render the linked hidden field.
- $Html .= "<input type=\"hidden\" id=\"{$this->InstanceName}\" name=\"{$this->InstanceName}\" value=\"{$HtmlValue}\" style=\"display:none\" />" ;
+ // Render the linked hidden field.
+ $Html .= "<input type=\"hidden\" id=\"{$this->InstanceName}\" name=\"{$this->InstanceName}\" value=\"{$HtmlValue}\" style=\"display:none\" />" ;
- // Render the configurations hidden field.
- $Html .= "<input type=\"hidden\" id=\"{$this->InstanceName}___Config\" value=\"" . $this->GetConfigFieldString() . "\" style=\"display:none\" />" ;
+ // Render the configurations hidden field.
+ $Html .= "<input type=\"hidden\" id=\"{$this->InstanceName}___Config\" value=\"" . $this->GetConfigFieldString() . "\" style=\"display:none\" />" ;
- // Render the editor IFRAME.
- $Html .= "<iframe id=\"{$this->InstanceName}___Frame\" src=\"{$Link}\" width=\"{$this->Width}\" height=\"{$this->Height}\" frameborder=\"0\" scrolling=\"no\"></iframe>" ;
- }
- else
- {
- if ( strpos( $this->Width, '%' ) === false )
- $WidthCSS = $this->Width . 'px' ;
- else
- $WidthCSS = $this->Width ;
+ // Render the editor IFRAME.
+ $Html .= "<iframe id=\"{$this->InstanceName}___Frame\" src=\"{$Link}\" width=\"{$this->Width}\" height=\"{$this->Height}\" frameborder=\"0\" scrolling=\"no\"></iframe>" ;
+ }
+ else
+ {
+ if ( strpos( $this->Width, '%' ) === false )
+ $WidthCSS = $this->Width . 'px' ;
+ else
+ $WidthCSS = $this->Width ;
- if ( strpos( $this->Height, '%' ) === false )
- $HeightCSS = $this->Height . 'px' ;
- else
- $HeightCSS = $this->Height ;
+ if ( strpos( $this->Height, '%' ) === false )
+ $HeightCSS = $this->Height . 'px' ;
+ else
+ $HeightCSS = $this->Height ;
- $Html .= "<textarea name=\"{$this->InstanceName}\" rows=\"4\" cols=\"40\" style=\"width: {$WidthCSS}; height: {$HeightCSS}\">{$HtmlValue}</textarea>" ;
- }
+ $Html .= "<textarea name=\"{$this->InstanceName}\" rows=\"4\" cols=\"40\" style=\"width: {$WidthCSS}; height: {$HeightCSS}\">{$HtmlValue}</textarea>" ;
+ }
- $Html .= '</div>' ;
+ $Html .= '</div>' ;
- return $Html ;
- }
+ return $Html ;
+ }
- function IsCompatible()
- {
- global $HTTP_USER_AGENT ;
+ function IsCompatible()
+ {
+ global $HTTP_USER_AGENT ;
- if ( isset( $HTTP_USER_AGENT ) )
- $sAgent = $HTTP_USER_AGENT ;
- else
- $sAgent = $_SERVER['HTTP_USER_AGENT'] ;
+ if ( isset( $HTTP_USER_AGENT ) )
+ $sAgent = $HTTP_USER_AGENT ;
+ else
+ $sAgent = $_SERVER['HTTP_USER_AGENT'] ;
- if ( strpos($sAgent, 'MSIE') !== false && strpos($sAgent, 'mac') === false && strpos($sAgent, 'Opera') === false )
- {
- $iVersion = (float)substr($sAgent, strpos($sAgent, 'MSIE') + 5, 3) ;
- return ($iVersion >= 5.5) ;
- }
- else if ( strpos($sAgent, 'Gecko/') !== false )
- {
- $iVersion = (int)substr($sAgent, strpos($sAgent, 'Gecko/') + 6, 8) ;
- return ($iVersion >= 20030210) ;
- }
- else if ( strpos($sAgent, 'Opera/') !== false )
- {
- $fVersion = (float)substr($sAgent, strpos($sAgent, 'Opera/') + 6, 4) ;
- return ($fVersion >= 9.5) ;
- }
- else if ( preg_match( "|AppleWebKit/(\d+)|i", $sAgent, $matches ) )
- {
- $iVersion = $matches[1] ;
- return ( $matches[1] >= 522 ) ;
- }
- else
- return false ;
- }
+ if ( strpos($sAgent, 'MSIE') !== false && strpos($sAgent, 'mac') === false && strpos($sAgent, 'Opera') === false )
+ {
+ $iVersion = (float)substr($sAgent, strpos($sAgent, 'MSIE') + 5, 3) ;
+ return ($iVersion >= 5.5) ;
+ }
+ else if ( strpos($sAgent, 'Gecko/') !== false )
+ {
+ $iVersion = (int)substr($sAgent, strpos($sAgent, 'Gecko/') + 6, 8) ;
+ return ($iVersion >= 20030210) ;
+ }
+ else if ( strpos($sAgent, 'Opera/') !== false )
+ {
+ $fVersion = (float)substr($sAgent, strpos($sAgent, 'Opera/') + 6, 4) ;
+ return ($fVersion >= 8.0) ;
+ }
+ else if ( preg_match( "|AppleWebKit/(\d+)|i", $sAgent, $matches ) )
+ {
+ $iVersion = $matches[1] ;
+ return ( $matches[1] >= 522 ) ;
+ }
+ else
+ return false ;
+ }
- function GetConfigFieldString()
- {
- $sParams = '' ;
- $bFirst = true ;
+ function GetConfigFieldString()
+ {
+ $sParams = '' ;
+ $bFirst = true ;
- foreach ( $this->Config as $sKey => $sValue )
- {
- if ( $bFirst == false )
- $sParams .= '&' ;
- else
- $bFirst = false ;
+ foreach ( $this->Config as $sKey => $sValue )
+ {
+ if ( $bFirst == false )
+ $sParams .= '&' ;
+ else
+ $bFirst = false ;
- if ( $sValue === true )
- $sParams .= $this->EncodeConfig( $sKey ) . '=true' ;
- else if ( $sValue === false )
- $sParams .= $this->EncodeConfig( $sKey ) . '=false' ;
- else
- $sParams .= $this->EncodeConfig( $sKey ) . '=' . $this->EncodeConfig( $sValue ) ;
- }
+ if ( $sValue === true )
+ $sParams .= $this->EncodeConfig( $sKey ) . '=true' ;
+ else if ( $sValue === false )
+ $sParams .= $this->EncodeConfig( $sKey ) . '=false' ;
+ else
+ $sParams .= $this->EncodeConfig( $sKey ) . '=' . $this->EncodeConfig( $sValue ) ;
+ }
- return $sParams ;
- }
+ return $sParams ;
+ }
- function EncodeConfig( $valueToEncode )
- {
- $chars = array(
- '&' => '%26',
- '=' => '%3D',
- '"' => '%22' ) ;
+ function EncodeConfig( $valueToEncode )
+ {
+ $chars = array(
+ '&' => '%26',
+ '=' => '%3D',
+ '"' => '%22' ) ;
- return strtr( $valueToEncode, $chars ) ;
- }
+ return strtr( $valueToEncode, $chars ) ;
+ }
}
?>
\ No newline at end of file
More information about the limb-svn
mailing list