Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fix for get class name by path.

Browse Source
This commit is contained in:
wangyidong
2023-03-03 17:34:05 +08:00
parent 4d400723ce
commit 3aa7bc5a1b
2 changed files with 57 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/editor/model.php
+53 -29
View File
@@ -55,16 +55,24 @@ class editorModel extends model
foreach($this->config->editor->extSort as $ext)
{
$extModulePaths = $this->app->getModuleExtPath('', $moduleName, $ext);
foreach($extModulePaths as $extensionFullDir)
foreach($extModulePaths as $extType => $extensionFullDir)
{
if(!is_dir($extensionFullDir)) continue;
if(empty($extensionFullDir) or !is_dir($extensionFullDir)) continue;
if($extType == 'common') $extType = $this->config->edition;
if($ext == 'lang' or $ext == 'js' or $ext == 'css')
{
$extensionList[$extensionFullDir] = $this->getTwoGradeFiles($extensionFullDir);
continue;
$extensionList[$extType][$extensionFullDir] = $this->getTwoGradeFiles($extensionFullDir);
}
else
{
foreach(glob($extensionFullDir . '*') as $extensionFullFile)
{
$fileName = basename($extensionFullFile);
if($fileName == 'index.html') continue;
$extensionList[$extType][$extensionFullDir][$extensionFullFile] = $fileName;
}
}
foreach(glob($extensionFullDir . '*') as $extensionFullFile) $extensionList[$extensionFullDir][$extensionFullFile] = basename($extensionFullFile);
}
}
return $extensionList;
@@ -79,18 +87,19 @@ class editorModel extends model
*/
public function getTwoGradeFiles($extensionFullDir)
{
$zfile = $this->app->loadClass('zfile');
$fileList = array();
$langDirs = $zfile->readDir($extensionFullDir);
$langDirs = scandir($extensionFullDir);
foreach($langDirs as $langDir)
{
$langFullDir = $extensionFullDir . DS . $langDir;
if($langDir == '.' or $langDir == '..' or $langDir == '.svn' or $langDir == 'index.html') continue;
$langFullDir = $extensionFullDir . $langDir;
$fileList[$langFullDir] = array();
if(is_dir($langFullDir))
{
$langFiles = $zfile->readDir($langFullDir);
$langFiles = scandir($langFullDir);
foreach($langFiles as $langFile)
{
if($langFile == '.' or $langFile == '..' or $langFile == '.svn' or $langFile == 'index.html') continue;
$langFullFile = $langFullDir . DS . $langFile;
$fileList[$langFullDir][$langFullFile] = $langFile;
}
@@ -109,19 +118,7 @@ class editorModel extends model
public function analysis($fileName)
{
$classMethod = array();
$class = strstr($fileName, DS . 'module' . DS);
if(empty($class))
{
$class = strstr($fileName, DS . 'extension' . DS);
$class = str_replace(DS . 'extension' . DS, '', $class);
$class = ltrim(strstr($class, DS), DS);
}
else
{
$class = str_replace(DS . 'module' . DS, '', $class);
}
$class = dirname($class);
$class = $this->getClassNameByPath($fileName);
if(strpos($fileName, 'model.php') !== false) $class .= 'Model';
if(!class_exists($class)) include $fileName;
$reflection = new ReflectionClass($class);
@@ -159,8 +156,8 @@ class editorModel extends model
}
$this->module = '';
if(isset($lang->$module)) $this->module = $lang->$module;
if(isset($this->lang->$module)) $this->module = $this->lang->$module;
if(isset($lang->$module)) $this->module = $lang->$module;
if(empty($this->module) and isset($this->lang->$module)) $this->module = $this->lang->$module;
}
foreach($files as $key => $file)
@@ -393,8 +390,7 @@ EOD;
*/
public function newControl($filePath)
{
$className = substr($filePath, 0, strpos($filePath, DS . 'ext' . DS . 'control' . DS));
$className = basename($className);
$className = $this->getClassNameByPath($filePath);
$methodName = basename($filePath, '.php');
return <<<EOD
<?php
@@ -475,9 +471,7 @@ EOD;
if(strpos($sourceFileName, '.') !== false) $fileExtension = substr($sourceFileName, strpos($sourceFileName, '.') + 1);
$fileName = empty($_POST['fileName']) ? '' : trim($this->post->fileName);
$moduleName = strstr($filePath, DS . 'module' . DS);
$moduleName = substr($moduleName, 0, strpos($moduleName, DS, 9));
$moduleName = basename($moduleName);
$moduleName = $this->getClassNameByPath($filePath);
$extPath = $this->app->getExtensionRoot() . 'custom' . DS . $moduleName . DS . 'ext' . DS;
if($fileName and (strpos($fileName, '.' . $fileExtension) !== (strlen($fileName) - strlen($fileExtension) - 1))) $fileName .= '.' . $fileExtension;
switch($action)
@@ -510,4 +504,34 @@ EOD;
return $extPath . 'lang' . DS . str_replace('_', '-', $action) . DS . $fileName;
}
}
/**
* Get class name by path.
*
* @param string $filePath
* @access public
* @return string
*/
public function getClassNameByPath($filePath)
{
$className = '';
if(strpos($filePath, DS . 'module' . DS) !== false)
{
$className = strstr($filePath, DS . 'module' . DS);
$className = substr($className, 0, strpos($className, DS, 9));
}
elseif(strpos($filePath, DS . 'ext' . DS) !== false)
{
$className = substr($filePath, 0, strpos($filePath, DS . 'ext' . DS));
}
elseif(strpos($filePath, DS . 'extension' . DS) !== false)
{
$className = strstr($filePath, DS . 'extension' . DS);
$className = str_replace(DS . 'extension' . DS, '', $className);
$className = substr($className, 0, strpos($className, DS, strpos($className, DS) + 1));
}
$className = basename($className);
return $className;
}
}
module/editor/view/extend.html.php
+4 -1
View File
@@ -12,7 +12,10 @@
?>
<?php include $app->getModuleRoot() . 'common/view/header.lite.html.php';?>
<div class='main-header'>
<div class='heading'><i class='icon-list-ul'></i> <strong><?php echo isset($lang->editor->modules[$module])? $lang->editor->modules[$module] : $module;?></strong></div>
<div class='heading'>
<i class='icon-list-ul'></i>
<strong><?php echo zget($lang->editor->modules, $module, isset($lang->{$module}->common) ? $lang->{$module}->common : $module);?></strong>
</div>
</div>
<div class='main-content'>
<?php echo $tree?>