Skip to content

T
tl_estate
Commit adb6a1dc authored by clone's avatar clone
Browse files
Options

BUG

parent 5e1fca10
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 131 deletions
application/common.php
View file @ adb6a1dc
......@@ -19,7 +19,8 @@ if (!function_exists('create_editor')) {
if (!empty($config)) {
$_config = array_merge($_config, $config);
}
$CKEditor->editor("describe", $value, $_config);
//$CKEditor->editor("describe", $value, $_config);
$CKEditor->editor($id,$value,$_config);
}
}
......
application/index/view/news/new_text.html
View file @ adb6a1dc
......@@ -324,7 +324,7 @@
<!--<label for="" style="width: 100%;">内容</label>-->
<div class="input-group" style="width: 100%;" id="dajiangtang">
<?php
create_editor('describe');
create_editor('goods_sup_id','');
?>
</div>
</div>
......@@ -434,7 +434,7 @@
<!--<label for="" style="width: 100%;">内容</label>-->
<div class="input-group" style="width: 100%;" id="dajiangtang">
<?php
create_editor('describe');
create_editor('goods_sup_id','');
?>
</div>
</div>
......
public/resource/js/schoolBusiness.js
View file @ adb6a1dc
......@@ -402,7 +402,9 @@ define (['doT', 'text!temp/schoolBusiness_template_tpl.html','ckfinder','ckfinde
var _urlCut = location.origin + '/resource/lib/Attachments/images/';//要截取的部分url
var _dajiangtangObj = $('#dajiangtang'); //大讲堂
var _dajiangtangVal = _dajiangtangObj.find('iframe').contents().find('body').html();
console.log(_dajiangtangVal);
console.log( getCKeditorValue("goods_sup_id"));
return false;
if(_liebiaoPicObj.length < 1) {
alert('列表页封面图需要上传');
......
public/resource/lib/Ckfinder/core/connector/php/php5/Core/Config.php
View file @ adb6a1dc
......@@ -42,7 +42,7 @@ require_once CKFINDER_CONNECTOR_LIB_DIR . "/Core/ImagesConfig.php";
* @package CKFinder
* @subpackage Config
* @copyright CKSource - Frederico Knabben
* @global string $GLOBALS['config']
* @global string $GLOBALS ['config']
*/
class CKFinder_Connector_Core_Config
{
......@@ -62,11 +62,11 @@ class CKFinder_Connector_Core_Config
*/
private $_isEnabled = false;
/**
* License Name
*
* @var string
* @access private
*/
* License Name
*
* @var string
* @access private
*/
private $_licenseName = "";
/**
* License Key
......@@ -157,7 +157,7 @@ class CKFinder_Connector_Core_Config
* @var array
* @access private
*/
private $_htmlExtensions = array('html', 'htm', 'xml', 'xsd', 'txt', 'js');
private $_htmlExtensions = array( 'html', 'htm', 'xml', 'xsd', 'txt', 'js' );
/**
* Chmod files after upload to the following permission
*
......@@ -178,14 +178,14 @@ class CKFinder_Connector_Core_Config
* @var array
* @access private
*/
private $_hideFolders = array(".svn", "CVS");
private $_hideFolders = array( ".svn", "CVS" );
/**
* Hide files
*
* @var integer
* @access private
*/
private $_hideFiles = array(".*");
private $_hideFiles = array( ".*" );
/**
* If set to true, force ASCII names
*
......@@ -202,13 +202,13 @@ class CKFinder_Connector_Core_Config
private $_tempDirectory = '';
/**
* If set to true send files using X-Sendfile server module
* @var bool $_xsendfile
* @var bool $_xsendfile
*/
private $_xsendfile = false;
/**
* Additional Nginx X-Sendfile configuration
*
* @var array $_xsendfileNginx Configuration for location => root
* @var array $_xsendfileNginx Configuration for location => root
*/
private $_xsendfileNginx = array();
......@@ -218,66 +218,66 @@ class CKFinder_Connector_Core_Config
}
/**
* Get file system encoding, returns null if encoding is not set
*
* @access public
* @return string
*/
* Get file system encoding, returns null if encoding is not set
*
* @access public
* @return string
*/
public function getFilesystemEncoding()
{
return $this->_filesystemEncoding;
}
/**
* Get "secureImageUploads" value
*
* @access public
* @return boolean
*/
* Get "secureImageUploads" value
*
* @access public
* @return boolean
*/
public function getSecureImageUploads()
{
return $this->_secureImageUploads;
}
/**
* Get "checkSizeAfterScaling" value
*
* @access public
* @return boolean
*/
* Get "checkSizeAfterScaling" value
*
* @access public
* @return boolean
*/
public function checkSizeAfterScaling()
{
return $this->_checkSizeAfterScaling;
}
/**
* Get "htmlExtensions" value
*
* @access public
* @return array
*/
* Get "htmlExtensions" value
*
* @access public
* @return array
*/
public function getHtmlExtensions()
{
return $this->_htmlExtensions;
}
/**
* Get "forceAscii" value
*
* @access public
* @return array
*/
* Get "forceAscii" value
*
* @access public
* @return array
*/
public function forceAscii()
{
return $this->_forceAscii;
}
/**
* Get regular expression to hide folders
*
* @access public
* @return array
*/
* Get regular expression to hide folders
*
* @access public
* @return array
*/
public function getHideFoldersRegex()
{
static $folderRegex;
......@@ -285,12 +285,11 @@ class CKFinder_Connector_Core_Config
if (!isset($folderRegex)) {
if (is_array($this->_hideFolders) && $this->_hideFolders) {
$folderRegex = join("|", $this->_hideFolders);
$folderRegex = strtr($folderRegex, array("?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__"));
$folderRegex = strtr($folderRegex, array( "?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__" ));
$folderRegex = preg_quote($folderRegex, "/");
$folderRegex = strtr($folderRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
$folderRegex = strtr($folderRegex, array( "__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|" ));
$folderRegex = "/^(?:" . $folderRegex . ")$/uim";
}
else {
} else {
$folderRegex = "";
}
}
......@@ -299,11 +298,11 @@ class CKFinder_Connector_Core_Config
}
/**
* Get regular expression to hide files
*
* @access public
* @return array
*/
* Get regular expression to hide files
*
* @access public
* @return array
*/
public function getHideFilesRegex()
{
static $fileRegex;
......@@ -311,12 +310,11 @@ class CKFinder_Connector_Core_Config
if (!isset($fileRegex)) {
if (is_array($this->_hideFiles) && $this->_hideFiles) {
$fileRegex = join("|", $this->_hideFiles);
$fileRegex = strtr($fileRegex, array("?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__"));
$fileRegex = strtr($fileRegex, array( "?" => "__QMK__", "*" => "__AST__", "|" => "__PIP__" ));
$fileRegex = preg_quote($fileRegex, "/");
$fileRegex = strtr($fileRegex, array("__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|"));
$fileRegex = strtr($fileRegex, array( "__QMK__" => ".", "__AST__" => ".*", "__PIP__" => "|" ));
$fileRegex = "/^(?:" . $fileRegex . ")$/uim";
}
else {
} else {
$fileRegex = "";
}
}
......@@ -325,44 +323,44 @@ class CKFinder_Connector_Core_Config
}
/**
* Get "Check double extension" value
*
* @access public
* @return boolean
*/
* Get "Check double extension" value
*
* @access public
* @return boolean
*/
public function getCheckDoubleExtension()
{
return $this->_checkDoubleExtension;
}
/**
* Get "Disallow unsafe characters" value
*
* @access public
* @return boolean
*/
* Get "Disallow unsafe characters" value
*
* @access public
* @return boolean
*/
public function getDisallowUnsafeCharacters()
{
return $this->_disallowUnsafeCharacters;
}
/**
* Get default resource types
*
* @access public
* @return array()
*/
* Get default resource types
*
* @access public
* @return array()
*/
public function getDefaultResourceTypes()
{
return $this->_defaultResourceTypes;
}
/**
* Is CKFinder enabled
*
* @access public
* @return boolean
*/
* Is CKFinder enabled
*
* @access public
* @return boolean
*/
public function getIsEnabled()
{
return $this->_isEnabled;
......@@ -391,67 +389,67 @@ class CKFinder_Connector_Core_Config
}
/**
* Get license key
*
* @access public
* @return string
*/
* Get license key
*
* @access public
* @return string
*/
public function getLicenseKey()
{
return $this->_licenseKey;
}
/**
* Get license name
*
* @access public
* @return string
*/
* Get license name
*
* @access public
* @return string
*/
public function getLicenseName()
{
return $this->_licenseName;
}
/**
* Get chmod settings for uploaded files
*
* @access public
* @return integer
*/
* Get chmod settings for uploaded files
*
* @access public
* @return integer
*/
public function getChmodFiles()
{
return $this->_chmodFiles;
}
/**
* Get chmod settings for created directories
*
* @access public
* @return integer
*/
* Get chmod settings for created directories
*
* @access public
* @return integer
*/
public function getChmodFolders()
{
return $this->_chmodFolders;
}
/**
* Get role sesion variable name
*
* @access public
* @return string
*/
* Get role sesion variable name
*
* @access public
* @return string
*/
public function getRoleSessionVar()
{
return $this->_roleSessionVar;
}
/**
* Get resourceTypeName config
*
* @param string $resourceTypeName
* @return CKFinder_Connector_Core_ResourceTypeConfig|null
* @access public
*/
* Get resourceTypeName config
*
* @param string $resourceTypeName
* @return CKFinder_Connector_Core_ResourceTypeConfig|null
* @access public
*/
public function &getResourceTypeConfig($resourceTypeName)
{
$_null = null;
......@@ -465,7 +463,15 @@ class CKFinder_Connector_Core_Config
}
reset($GLOBALS['config']['ResourceType']);
while (list($_key,$_resourceTypeNode) = each($GLOBALS['config']['ResourceType'])) {
/* while (list($_key,$_resourceTypeNode) = each($GLOBALS['config']['ResourceType'])) {
if ($_resourceTypeNode['name'] === $resourceTypeName) {
$this->_resourceTypeConfigCache[$resourceTypeName] = new CKFinder_Connector_Core_ResourceTypeConfig($_resourceTypeNode);
return $this->_resourceTypeConfigCache[$resourceTypeName];
}
}*/
foreach ($GLOBALS['config']['ResourceType'] as $_key => $_resourceTypeNode) {
if ($_resourceTypeNode['name'] === $resourceTypeName) {
$this->_resourceTypeConfigCache[$resourceTypeName] = new CKFinder_Connector_Core_ResourceTypeConfig($_resourceTypeNode);
......@@ -531,10 +537,10 @@ class CKFinder_Connector_Core_Config
if (function_exists('CheckAuthentication')) {
$this->_isEnabled = CheckAuthentication();
}
if(isset($GLOBALS['config']['Resource_Root_Dir'])){
if (isset($GLOBALS['config']['Resource_Root_Dir'])) {
$this->_resource_root_dir = (string)$GLOBALS['config']['Resource_Root_Dir'];
}
if(isset($GLOBALS['config']['Resource_Space_Size'])){
if (isset($GLOBALS['config']['Resource_Space_Size'])) {
$this->_resource_space_size = (array)$GLOBALS['config']['Resource_Space_Size'];
}
if (isset($GLOBALS['config']['LicenseName'])) {
......@@ -586,13 +592,13 @@ class CKFinder_Connector_Core_Config
}
}
if (isset($GLOBALS['config']['TempDirectory'])) {
$this->_tempDirectory = $GLOBALS['config']['TempDirectory'];
$this->_tempDirectory = $GLOBALS['config']['TempDirectory'];
}
if (isset($GLOBALS['config']['XSendfile'])) {
$this->_xsendfile = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['XSendfile']);
$this->_xsendfile = CKFinder_Connector_Utils_Misc::booleanValue($GLOBALS['config']['XSendfile']);
}
if (isset($GLOBALS['config']['XSendfileNginx'])) {
$this->_xsendfileNginx = (array)$GLOBALS['config']['XSendfileNginx'];
$this->_xsendfileNginx = (array)$GLOBALS['config']['XSendfileNginx'];
}
}
......@@ -625,32 +631,34 @@ class CKFinder_Connector_Core_Config
*/
public function getTempDirectory()
{
return $this->_tempDirectory;
return $this->_tempDirectory;
}
/**
* Get X-Sendfile option
*/
public function getXSendfile(){
return $this->_xsendfile;
public function getXSendfile()
{
return $this->_xsendfile;
}
/**
* Get the dditional Nginx X-Sendfile configuration (location => root)
*/
public function getXSendfileNginx(){
$xsendfileNginx = array();
foreach ( $this->_xsendfileNginx as $location => $root ){
$root = (string)$root;
$location = rtrim((string)$location,'/').'/';
if ( substr($root,-1,1) != '/' && substr($root,-1,1) != '\\') {
// root and location paths are concatenated
// @see http://wiki.nginx.org/XSendfile
$root = CKFinder_Connector_Utils_FileSystem::combinePaths(rtrim($root,'/'),$location);
}
$xsendfileNginx[$location] = $root;
}
return $xsendfileNginx;
public function getXSendfileNginx()
{
$xsendfileNginx = array();
foreach ($this->_xsendfileNginx as $location => $root) {
$root = (string)$root;
$location = rtrim((string)$location, '/') . '/';
if (substr($root, -1, 1) != '/' && substr($root, -1, 1) != '\\') {
// root and location paths are concatenated
// @see http://wiki.nginx.org/XSendfile
$root = CKFinder_Connector_Utils_FileSystem::combinePaths(rtrim($root, '/'), $location);
}
$xsendfileNginx[$location] = $root;
}
return $xsendfileNginx;
}
}
public/resource/lib/js/ckfinderStart.js
View file @ adb6a1dc
var global = {
'attach_prefix' : '/public/resource/lib/Attachments/'
}
function BrowseServer(input_image,fun )
{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment