Changeset 21755 for branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php
- Timestamp:
- 2012/04/17 15:53:10 (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_12-dev/data/class/pages/admin/contents/LC_Page_Admin_Contents_FileManager.php
r21743 r21755 109 109 if (SC_Utils_Ex::isBlank($this->arrErr)) { 110 110 if ($this->tryView($objFormParam)) { 111 $file_url = htmlspecialchars(ereg_replace($objFormParam->getValue('top_dir'), '', $objFormParam->getValue('select_file'))); 111 $pattern = '/' . preg_quote($objFormParam->getValue('top_dir'), '/') . '/'; 112 $file_url = htmlspecialchars(preg_replace($pattern, '', $objFormParam->getValue('select_file'))); 112 113 $tpl_onload = "win02('./file_view.php?file=". $file_url ."', 'user_data', '600', '400');"; 113 114 $this->setTplOnLoad($tpl_onload); … … 317 318 function tryCreateDir($objFileManager, $objFormParam) { 318 319 $create_dir_flg = false; 319 $create_dir = ereg_replace("/$", '', $objFormParam->getValue('now_dir'));320 $create_dir = rtrim($objFormParam->getValue('now_dir'), '/'); 320 321 // ファイル作成 321 322 if ($objFileManager->sfCreateFile($create_dir.'/'.$objFormParam->getValue('create_file'), 0755)) { … … 425 426 function lfGetParentDir($dir) { 426 427 $parent_dir = ''; 427 $dir = ereg_replace("/$", '', $dir);428 $dir = rtrim($dir, '/'); 428 429 $arrDir = explode('/', $dir); 429 430 array_pop($arrDir); … … 431 432 $parent_dir .= "$val/"; 432 433 } 433 $parent_dir = ereg_replace("/$", '', $parent_dir);434 $parent_dir = rtrim($parent_dir, '/'); 434 435 return $parent_dir; 435 436 } … … 478 479 $is_top_dir = false; 479 480 // 末尾の/をとる 480 $top_dir_check = ereg_replace("/$", '', $objFormParam->getValue('top_dir'));481 $now_dir_check = ereg_replace("/$", '', $objFormParam->getValue('now_dir'));481 $top_dir_check = rtrim($objFormParam->getValue('top_dir'), '/'); 482 $now_dir_check = rtrim($objFormParam->getValue('now_dir'), '/'); 482 483 if ($top_dir_check == $now_dir_check) { 483 484 $is_top_dir = true;
Note: See TracChangeset
for help on using the changeset viewer.