|
Index: branches/5.2.x/core/units/selectors/selectors_item.php
===================================================================
diff -u -N -r14244 -r14699
--- branches/5.2.x/core/units/selectors/selectors_item.php (.../selectors_item.php) (revision 14244)
+++ branches/5.2.x/core/units/selectors/selectors_item.php (.../selectors_item.php) (revision 14699)
@@ -1,6 +1,6 @@
themesFolder.'/');
- while (($filename = readdir($fh))) {
- if (in_array($filename, $skip_filenames)) {
- continue;
- }
+ $iterator = new DirectoryIterator($this->themesFolder . '/');
+ /* @var $file_info DirectoryIterator */
- if (is_dir($this->themesFolder.'/'.$filename)) {
+ foreach ($iterator as $file_info) {
+ $filename = $file_info->getFilename();
+
+ if ( $file_info->isDir() && !$file_info->isDot() && $filename != '.svn' && $filename != 'CVS' ) {
$theme_id = $this->refreshTheme($filename);
+
if ($theme_id) {
$themes_found[] = $theme_id;
// increment serial of updated themes
Index: branches/5.2.x/core/kernel/managers/cache_manager.php
===================================================================
diff -u -N -r14628 -r14699
--- branches/5.2.x/core/kernel/managers/cache_manager.php (.../cache_manager.php) (revision 14628)
+++ branches/5.2.x/core/kernel/managers/cache_manager.php (.../cache_manager.php) (revision 14699)
@@ -1,6 +1,6 @@
DeleteUnitCache();
}
-
+
/**
* Loads data, that was cached during unit config parsing
*
@@ -442,7 +442,8 @@
/**
* Returns caching type (none, memory, temporary)
*
- * @return int
+ * @param int $caching_type
+ * @return bool
* @access public
*/
public function isCachingType($caching_type)
@@ -480,6 +481,7 @@
* @param int $key key name to add to cache
* @param mixed $value value of chached record
* @param int $expiration when value expires (0 - doesn't expire)
+ * @return bool
* @access public
*/
public function setCache($key, $value, $expiration = 0)
Index: branches/5.2.x/core/install.php
===================================================================
diff -u -N -r14692 -r14699
--- branches/5.2.x/core/install.php (.../install.php) (revision 14692)
+++ branches/5.2.x/core/install.php (.../install.php) (revision 14699)
@@ -1,6 +1,6 @@
ScanModules();
foreach ($modules as $module_path) {
- $contants_file = MODULES_PATH . '/' . $module_path . '/constants.php';
+ $constants_file = MODULES_PATH . '/' . $module_path . '/constants.php';
- if ( file_exists($contants_file) ) {
- kUtil::includeOnce($contants_file);
+ if ( file_exists($constants_file) ) {
+ kUtil::includeOnce($constants_file);
}
}
}
@@ -1392,23 +1392,14 @@
{
static $modules = null;
- if (!isset($modules)) {
- $modules = Array();
- $fh = opendir(MODULES_PATH);
- while ( ($sub_folder = readdir($fh)) ) {
- $folder_path = MODULES_PATH . '/'.$sub_folder;
- if ($sub_folder != '.' && $sub_folder != '..' && is_dir($folder_path)) {
- // this is folder in MODULES_PATH directory
- if (file_exists($folder_path.'/install.php') && file_exists($folder_path.'/install/install_schema.sql')) {
- $install_order = trim( file_get_contents($folder_path . '/install/install_order.txt') );
- $modules[$install_order] = $sub_folder;
- }
- }
- }
+ if ( !isset($modules) ) {
+ // use direct include, because it's called before kApplication::Init, that creates class factory
+ kUtil::includeOnce( KERNEL_PATH . kApplication::MODULE_HELPER_PATH );
+
+ $modules_helper = new kModulesHelper();
+ $modules = $modules_helper->getModules();
}
- // allows to control module install order
- ksort($modules, SORT_NUMERIC);
return $modules;
}
Index: branches/5.2.x/core/kernel/globals.php
===================================================================
diff -u -N -r14664 -r14699
--- branches/5.2.x/core/kernel/globals.php (.../globals.php) (revision 14664)
+++ branches/5.2.x/core/kernel/globals.php (.../globals.php) (revision 14699)
@@ -1,6 +1,6 @@
cache[$type])) $this->cache[$type] = Array();
+ /*if ( !isset($this->cache[$type]) ) {
+ $this->cache[$type] = Array ();
+ }*/
+
$this->cache[$type][$key] = $value;
- if ($is_new) {
+
+ if ( $is_new ) {
$this->cacheStatus[$type][$key] = true;
}
}
@@ -146,7 +151,7 @@
/**
* Fill required fields with dummy values
*
- * @param kEvent $event
+ * @param kEvent|bool $event
* @param kCatDBItem|bool $object
* @param bool $set_status
*/
@@ -856,6 +861,8 @@
* Enter description here...
*
* @param kEvent $event
+ * @param Array $record_data
+ * @return bool
*/
function processCurrentItem(&$event, $record_data)
{
@@ -1222,7 +1229,7 @@
* Loads import/export options
*
* @param kEvent $event
- * @return void
+ * @return Array
*/
function loadOptions(&$event)
{
@@ -1376,30 +1383,29 @@
return ;
}
- $object =& $event->getObject();
-
- $import_filenames = Array ();
-
$file_helper =& $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
+ $import_filenames = Array ();
$file_helper->CheckFolder(EXPORT_PATH);
- if ( $folder_handle = opendir(EXPORT_PATH) ) {
- while ( false !== ($file = readdir($folder_handle)) ) {
- if ( is_dir(EXPORT_PATH . '/' . $file) || substr($file, 0, 1) == '.' || strtolower($file) == 'cvs' || strtolower($file) == 'dummy' || filesize(EXPORT_PATH . '/' . $file) == 0 ) {
- continue;
- }
+ $iterator = new DirectoryIterator(EXPORT_PATH);
+ /* @var $file_info DirectoryIterator */
- $file_size = kUtil::formatSize(filesize(EXPORT_PATH . '/' . $file));
- $import_filenames[$file] = $file . ' (' . $file_size . ')';
+ foreach ($iterator as $file_info) {
+ $file = $file_info->getFilename();
+
+ if ( $file_info->isDir() || $file == 'dummy' || $file_info->getSize() == 0 ) {
+ continue;
}
- closedir($folder_handle);
+
+ $import_filenames[$file] = $file . ' (' . kUtil::formatSize( $file_info->getSize() ) . ')';
}
- $options = $object->GetFieldOptions('ImportLocalFilename');
- $options['options'] = $import_filenames;
- $object->SetFieldOptions('ImportLocalFilename', $options);
+ $object =& $event->getObject();
+ /* @var $object kDBItem */
+
+ $object->SetFieldOption('ImportLocalFilename', 'options', $import_filenames);
}
/**
Index: branches/5.2.x/core/units/statistics/statistics_tag_processor.php
===================================================================
diff -u -N -r14628 -r14699
--- branches/5.2.x/core/units/statistics/statistics_tag_processor.php (.../statistics_tag_processor.php) (revision 14628)
+++ branches/5.2.x/core/units/statistics/statistics_tag_processor.php (.../statistics_tag_processor.php) (revision 14699)
@@ -1,6 +1,6 @@
Application->recallObject('lang.current');
/* @var $lang LanguagesItem */
-
+
$value = $lang->formatNumber($value, $this->PostFormattingParams['precision']);
break;
@@ -124,7 +124,7 @@
// m:post_format field="" type="" precision="2"
$lang =& $this->Application->recallObject('lang.current');
/* @var $lang LanguagesItem */
-
+
switch ($tag_params['type']) {
case 'date':
$this->PostFormatting = $lang->GetDBField('DateFormat');
@@ -196,6 +196,8 @@
}
+
+ return '';
}
function getLastRecord($sql, $field)
Index: branches/5.2.x/core/units/admin/admin_tag_processor.php
===================================================================
diff -u -N -r14628 -r14699
--- branches/5.2.x/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 14628)
+++ branches/5.2.x/core/units/admin/admin_tag_processor.php (.../admin_tag_processor.php) (revision 14699)
@@ -1,6 +1,6 @@
Application->recallObject('SectionsHelper');
/* @var $sections_helper kSectionsHelper */
-
+
$section_data =& $sections_helper->getSectionData($params['section_name']);
$ret = '';
@@ -567,7 +567,7 @@
$format = $lang->GetDBField($regs[1]);
}
-
+
return adodb_date($format, $timestamp);
}
@@ -921,56 +921,44 @@
*/
function PrintBackupDates($params)
{
- $datearray = $this->getDirList($this->Application->ConfigValue('Backup_Path'));
$ret = '';
- foreach($datearray as $key => $value)
- {
- $params['backuptimestamp'] = $value['filedate'];
- $params['backuptime'] = date('F j, Y, g:i a', $value['filedate']);
- $params['backupsize'] = round($value['filesize']/1024/1024, 2); // MBytes
- $ret .= $this->Application->ParseBlock($params);
- }
+ $datearray = $this->getBackupFiles();
+
+ foreach ($datearray as $value) {
+ $params['backuptimestamp'] = $value['filedate'];
+ $params['backuptime'] = date('F j, Y, g:i a', $value['filedate']);
+ $params['backupsize'] = round($value['filesize'] / 1024 / 1024, 2); // MBytes
+ $ret .= $this->Application->ParseBlock($params);
+ }
+
return $ret;
}
- function getDirList ($dirName)
+ function getBackupFiles()
{
- $file_helper =& $this->Application->recallObject('FileHelper');
+ $file_helper =& $this->Application->recallObject('FileHelper');
/* @var $file_helper FileHelper */
- $file_helper->CheckFolder($dirName);
+ $ret = Array ();
+ $backup_path = $this->Application->ConfigValue('Backup_Path');
+ $file_helper->CheckFolder($backup_path);
+ $backup_files = glob($backup_path . DIRECTORY_SEPARATOR . 'dump*.txt');
- $fileinfo = array();
- $d = dir($dirName);
+ if ( !$backup_files ) {
+ return Array ();
+ }
- while($entry = $d->read())
- {
- if ($entry != "." && $entry != "..")
- {
- if (!is_dir($dirName."/".$entry) && strpos($entry, 'dump') !== false)
- {
- $fileinfo[]= Array('filedate' => $this->chopchop($entry),
- 'filesize' => filesize($dirName. '/'. $entry)
- );
- }
- }
- }
- $d->close();
- rsort($fileinfo);
+ foreach ($backup_files as $backup_file) {
+ $ret[] = Array (
+ 'filedate' => preg_replace('/^dump([\d]+)\.txt$/', '\\1', basename($backup_file)),
+ 'filesize' => filesize($backup_file)
+ );
+ }
- return $fileinfo;
+ rsort($ret);
- }
+ return $ret;
- function chopchop ($filename)
- {
- $p = pathinfo($filename);
- $ext = '.'.$p['extension'];
- $filename;
- $filename = str_replace('dump', '',$filename);
- $filename = str_replace($ext, '', $filename);
-
- return $filename;
}
/**
Index: branches/5.2.x/core/units/helpers/clipboard_helper.php
===================================================================
diff -u -N -r14244 -r14699
--- branches/5.2.x/core/units/helpers/clipboard_helper.php (.../clipboard_helper.php) (revision 14244)
+++ branches/5.2.x/core/units/helpers/clipboard_helper.php (.../clipboard_helper.php) (revision 14699)
@@ -1,6 +1,6 @@
Application->recallObject('lang.current');
/* @var $language LanguagesItem */
@@ -1956,10 +1956,10 @@
/**
* Performs mail delivery (supports delayed delivery)
*
- * @param string $mesasge message, if not given, then use composed one
+ * @param string $message message, if not given, then use composed one
* @param bool $immediate_send send message now or MailingId
* @param bool $immediate_clear clear message parts after message is sent
- *
+ * @return bool
*/
function Deliver($message = null, $immediate_send = true, $immediate_clear = true)
{
Index: branches/5.2.x/core/units/helpers/pop3_helper.php
===================================================================
diff -u -N -r14244 -r14699
--- branches/5.2.x/core/units/helpers/pop3_helper.php (.../pop3_helper.php) (revision 14244)
+++ branches/5.2.x/core/units/helpers/pop3_helper.php (.../pop3_helper.php) (revision 14699)
@@ -1,6 +1,6 @@
processed ) {
+ return;
+ }
+
+ $this->dumpRequest();
$this->processOpener();
$events = $this->getEvents();
@@ -52,9 +65,27 @@
$this->Application->SetVar('events', $events);
$this->Application->SetVar('passed', implode(',', $all_passed));
+
+ $this->Application->EventManager->runAgents(reBEFORE);
+
+ $this->processed = true;
}
/**
+ * Dumps user request to debugger (only when enabled)
+ *
+ * @return void
+ * @access protected
+ */
+ protected function dumpRequest()
+ {
+ if ( defined('DEBUG_MODE') && $this->Application->isDebugMode() && kUtil::constOn('DBG_SHOW_HTTPQUERY') ) {
+ $this->Application->Debugger->appendHTML('HTTPQuery:');
+ $this->Application->Debugger->dumpVars($this->Application->HttpQuery->_Params);
+ }
+ }
+
+ /**
* Returns event names, given in request (post, get)
*
* @return Array
Index: branches/5.2.x/core/kernel/processors/main_processor.php
===================================================================
diff -u -N -r14638 -r14699
--- branches/5.2.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 14638)
+++ branches/5.2.x/core/kernel/processors/main_processor.php (.../main_processor.php) (revision 14699)
@@ -1,6 +1,6 @@
HTML tag for all templates
* affects future css, js files and href params of links
*
+ * @param Array $params
* @return string
- * @access public
+ * @access protected
*/
- function Base_Ref($params)
+ protected function Base_Ref($params)
{
- return '';
+ return '';
}
/**
@@ -805,7 +806,9 @@
function RequireLogin($params)
{
$t = $this->Application->GetVar('t');
- if ($next_t = getArrayValue($params, 'next_template')) {
+ $next_t = getArrayValue($params, 'next_template');
+
+ if ( $next_t ) {
$t = $next_t;
}
Index: branches/5.2.x/core/kernel/utility/http_query.php
===================================================================
diff -u -N -r14663 -r14699
--- branches/5.2.x/core/kernel/utility/http_query.php (.../http_query.php) (revision 14663)
+++ branches/5.2.x/core/kernel/utility/http_query.php (.../http_query.php) (revision 14699)
@@ -1,6 +1,6 @@
CheckFolder($destination);
- if (!$result || !is_resource($dir)) {
- // failed to create target directory OR failed to open source directory
- return false;
- }
-
- while ( false !== ($file = readdir($dir)) ) {
- if ($file == '.' || $file == '..') {
+ foreach ($iterator as $file_info) {
+ if ( $file_info->isDot() ) {
continue;
}
- if ( is_dir($source . DIRECTORY_SEPARATOR . $file) ) {
- $result = $this->copyFolderRecursive($source . DIRECTORY_SEPARATOR . $file, $destination . DIRECTORY_SEPARATOR . $file);
+ $file = $file_info->getFilename();
+
+ if ( $file_info->isDir() ) {
+ $result = $this->copyFolderRecursive($file_info->getPathname(), $destination . DIRECTORY_SEPARATOR . $file);
}
else {
- $result = copy($source . DIRECTORY_SEPARATOR . $file, $destination . DIRECTORY_SEPARATOR . $file);
+ $result = copy($file_info->getPathname(), $destination . DIRECTORY_SEPARATOR . $file);
}
if (!$result) {
@@ -340,8 +339,6 @@
}
}
- closedir($dir);
-
return $result;
}
@@ -360,29 +357,26 @@
$destination .= DIRECTORY_SEPARATOR . basename($source);
}
- $dir = opendir($source);
+ $iterator = new DirectoryIterator($source);
+ /* @var $file_info DirectoryIterator */
+
$result = $this->CheckFolder($destination);
- if (!$result || !is_resource($dir)) {
- // failed to create target directory OR failed to open source directory
- return false;
- }
-
- while ( false !== ($file = readdir($dir)) ) {
- if ($file == '.' || $file == '..' || !is_file($source . DIRECTORY_SEPARATOR . $file)) {
+ foreach ($iterator as $file_info) {
+ if ( $file_info->isDot() || !$file_info->isFile() ) {
continue;
}
- $result = copy($source . DIRECTORY_SEPARATOR . $file, $destination . DIRECTORY_SEPARATOR . $file);
+ $file = $file_info->getFilename();
- if (!$result) {
+ $result = copy($file_info->getPathname(), $destination . DIRECTORY_SEPARATOR . $file);
+
+ if ( !$result ) {
trigger_error('Cannot create file "' . $destination . DIRECTORY_SEPARATOR . $file . '"', E_USER_WARNING);
break;
}
}
- closedir($dir);
-
return $result;
}
Index: branches/5.2.x/core/units/helpers/fck_helper.php
===================================================================
diff -u -N -r14244 -r14699
--- branches/5.2.x/core/units/helpers/fck_helper.php (.../fck_helper.php) (revision 14244)
+++ branches/5.2.x/core/units/helpers/fck_helper.php (.../fck_helper.php) (revision 14699)
@@ -1,6 +1,6 @@
folder = $this->Application->GetVar('folder');
+ $this->sortField = $this->Application->GetVar('sort_by');
+ $this->sortDirection = $this->Application->GetVar('order_by');
+
$this->Config['AllowedExtensions']['Files'] = Array('jpg','gif','jpeg','png','swf','fla','jpg','gif','jpeg','png','avi','mpg','mpeg','zip','rar','arj','gz','tar','doc','pdf','ppt','rdp','swf','swt','txt','vsd','xls','csv','odt');
$this->Config['DeniedExtensions']['Files'] = Array('php','asp','aspx','ascx','jsp','cfm','cfc','pl','bat','exe','dll','reg');
$this->Config['AllowedExtensions']['Images'] = Array('jpg','gif','jpeg','png', 'bmp');
@@ -38,176 +66,243 @@
function CreateFolder($folder = '')
{
- if (!$folder) {
+ if ( !$folder ) {
return false;
}
$folderPath = WRITEABLE . '/user_files/' . $folder;
- if (file_exists($folderPath) && is_dir($folderPath)) {
+ if ( file_exists($folderPath) && is_dir($folderPath) ) {
return true;
}
- $permissions = defined('FCK_FOLDERS_PERMISSIONS') ? FCK_FOLDERS_PERMISSIONS : '0777';
- return mkdir($folderPath); // , $permissions
+ /*$permissions = defined('FCK_FOLDERS_PERMISSIONS') ? FCK_FOLDERS_PERMISSIONS : '0777';
+ return mkdir($folderPath, $permissions);*/
+
+ return mkdir($folderPath);
}
function IsAllowedExtension($folder, $file_name)
{
- $base_folder = $this->getBaseFolder($folder);
$ext = strtolower( pathinfo($file_name, PATHINFO_EXTENSION) );
- if (isset($this->Config['DeniedExtensions'][$folder])) {
- if (in_array($ext, $this->Config['DeniedExtensions'][$folder])) {
+
+ if ( isset($this->Config['DeniedExtensions'][$folder]) ) {
+ if ( in_array($ext, $this->Config['DeniedExtensions'][$folder]) ) {
return false;
}
}
- if (isset($this->Config['AllowedExtensions'][$folder])) {
- if (!in_array($ext, $this->Config['AllowedExtensions'][$folder])) {
+
+ if ( isset($this->Config['AllowedExtensions'][$folder]) ) {
+ if ( !in_array($ext, $this->Config['AllowedExtensions'][$folder]) ) {
return false;
}
}
+
return true;
}
- function getBaseFolder($folder)
+ /**
+ * Returns list of sub-folders from given folder (automatically excludes system folders)
+ *
+ * @param string $files_dir
+ * @return Array
+ * @access public
+ */
+ public function ReadFolders($files_dir)
{
- $end = strpos('/', $folder);
- if ($end) {
- return substr($folder, 0, $end);
+ $iterator = new DirectoryIterator($files_dir);
+ /* @var $file_info DirectoryIterator */
+
+ $ret = Array ();
+ $system_folders = defined('KERNEL_SYSTEM_FOLDERS') ? KERNEL_SYSTEM_FOLDERS : Array ('icons', 'CVS', '.svn');
+
+ foreach ($iterator as $file_info) {
+ $filename = $file_info->getFilename();
+
+ if ( $file_info->isDir() && !$file_info->isDot() ) {
+ $ret[] = $filename;
+ }
}
- return $folder;
+
+ return array_diff($ret, $system_folders);
}
- function ReadFolders($files_dir)
+ /**
+ * Returns list of files in given folder
+ *
+ * @param string $files_dir
+ * @return Array
+ * @access public
+ */
+ public function ReadFiles($files_dir)
{
- $aFolders = array();
- $oCurrentFolder = opendir($files_dir) ;
- $KernelSystemFolders = defined('KERNEL_SYSTEM_FOLDERS') ? KERNEL_SYSTEM_FOLDERS : array('icons', 'CVS', '.svn');
- while ( $sFile = readdir( $oCurrentFolder ) )
- {
- if (is_dir($files_dir . $sFile ) && !in_array($sFile,$KernelSystemFolders) && $sFile != '.' && $sFile != '..') {
- $aFolders[] = $sFile;
+ $ret = Array ();
+
+ $iterator = new DirectoryIterator($files_dir);
+ /* @var $file_info DirectoryIterator */
+
+ foreach ($iterator as $file_info) {
+ if ( !$file_info->isDir() ) {
+ $ret[] = $file_info->getFilename();
}
}
- closedir( $oCurrentFolder ) ;
- return $aFolders;
+
+ return $ret;
}
- function ReadFiles($files_dir)
+ /**
+ * Returns xml containing list of folders in current folder
+ *
+ * @return string
+ * @access public
+ */
+ public function PrintFolders()
{
- $aFiles = array();
- $oCurrentFolder = opendir($files_dir) ;
- while ( $sFile = readdir( $oCurrentFolder ) )
- {
- if (!is_dir($files_dir . $sFile )) {
- $aFiles[] = $sFile;
- }
+ $files_dir = WRITEABLE . '/user_files/' . $this->folder . '/';
+
+ $sub_folders = $this->ReadFolders($files_dir);
+ natcasesort($sub_folders);
+
+ $ret = $this->_buildFoldersXML($sub_folders, 'folder2');
+
+ if ( $this->sortField == 'name' && $this->sortDirection == '_desc' ) {
+ $sub_folders = array_reverse($sub_folders);
}
- closedir( $oCurrentFolder ) ;
- return $aFiles;
+
+ $ret .= $this->_buildFoldersXML($sub_folders, 'folder');
+
+ return $ret;
}
- function PrintFolders()
+ /**
+ * Build XML, that will output folders for FCKEditor
+ *
+ * @param Array $sub_folders
+ * @param string $xml_node
+ * @return string
+ */
+ protected function _buildFoldersXML($sub_folders, $xml_node)
{
- $order_by = $this->Application->GetVar('order_by');
- $sort_by = $this->Application->GetVar('sort_by');
- $folder = $this->Application->GetVar('folder');
- $files_dir = WRITEABLE . '/user_files/' . $folder . '/';
- $aFolders = $this->ReadFolders($files_dir);
- $order_by = $this->Application->GetVar('order_by');
- $sort_by = $this->Application->GetVar('sort_by');
- natcasesort($aFolders);
-
$ret = '';
- foreach ($aFolders as $k => $v) {
- $ret .= ''.$v.''."\n";
- }
- if ($sort_by == 'name' && $order_by == '_desc') {
- $aFolders = array_reverse($aFolders);
+ foreach ($sub_folders as $sub_folder) {
+ $ret .= '<' . $xml_node . ' path="' . $this->folder . "/" . $sub_folder . '">' . $sub_folder . '' . "\n";
}
- foreach ($aFolders as $k => $v) {
- $ret .= ''.$v.''."\n";
- }
return $ret;
}
- function CalculateFileSize($size)
+ /**
+ * Transforms filesize in bytes into kilobytes
+ *
+ * @param int $size
+ * @return int
+ * @access protected
+ */
+ protected function CalculateFileSize($size)
{
if ( $size > 0 ) {
- $size = round( $size / 1024 );
- $size = ($size < 1)? 1:$size;// round( $iFileSize / 1024 ) ;
+ $size = round($size / 1024);
+ $size = ($size < 1) ? 1 : $size;
}
+
return $size;
}
- function CheckIconType($v)
+ /**
+ * Detects icon for given file extension
+ *
+ * @param string $file
+ * @return string
+ * @access protected
+ */
+ protected function CheckIconType($file)
{
- $ext = strtolower( pathinfo($v, PATHINFO_EXTENSION) );
- return ($ext && in_array($ext, $this->Config['ExtensionIcons']))? $ext : 'default.icon';
+ $ext = strtolower( pathinfo($file, PATHINFO_EXTENSION) );
+
+ return $ext && in_array($ext, $this->Config['ExtensionIcons']) ? $ext : 'default.icon';
}
- function GetXmlString($size,$url,$icon,$date,$file_name)
+ /**
+ * Build one file xml node
+ *
+ * @param int $size
+ * @param string $url
+ * @param string $icon
+ * @param string $date
+ * @param string $file_name
+ * @return string
+ */
+ protected function _buildFileXml($size,$url,$icon,$date,$file_name)
{
- return ''.$file_name.''."\n";
+ return '' . $file_name . '' . "\n";
}
- function PrintFiles()
+ /**
+ * Returns xml containing list of files in current folder
+ *
+ * @return string
+ * @access public
+ */
+ public function PrintFiles()
{
- $order_by = $this->Application->GetVar('order_by');
- $sort_by = $this->Application->GetVar('sort_by');
-
- $folder = $this->Application->GetVar('folder');
- $files_dir = WRITEABLE . '/user_files/' . $folder . '/';
- $files_url = BASE_PATH . str_replace(DIRECTORY_SEPARATOR, '/', WRITEBALE_BASE) . '/user_files/' . $folder . '/';
+ $files_dir = WRITEABLE . '/user_files/' . $this->folder . '/';
+ $files_url = BASE_PATH . str_replace(DIRECTORY_SEPARATOR, '/', WRITEBALE_BASE) . '/user_files/' . $this->folder . '/';
$aFiles = $this->ReadFiles($files_dir);
$ret = '';
$date_format = "m/d/Y h:i A";
natcasesort($aFiles);
- if ($sort_by == 'name' && $order_by == '_desc') {
+
+ if ( $this->sortField == 'name' && $this->sortDirection == '_desc' ) {
$aFiles = array_reverse($aFiles, TRUE);
}
- foreach ($aFiles as $k => $v)
- {
- $aFilesSize[$k] = filesize( $files_dir . $v);
- $aFilesDate[$k] = filectime( $files_dir . $v);
+ $aFilesSize = $aFilesDate = Array ();
+
+ foreach ($aFiles as $k => $v) {
+ $aFilesSize[$k] = filesize($files_dir . $v);
+ $aFilesDate[$k] = filectime($files_dir . $v);
}
- if ($sort_by == 'name') {
+
+ if ( $this->sortField == 'name' ) {
foreach ($aFiles as $k => $file) {
$size = $this->CalculateFileSize($aFilesSize[$k]);
$date = date($date_format, $aFilesDate[$k]);
$icon = $this->CheckIconType($file);
- $ret .= $this->GetXmlString($size,$files_url.$file,$icon,$date,$file);
+ $ret .= $this->_buildFileXml($size, $files_url . $file, $icon, $date, $file);
}
}
- if ($sort_by == 'date') {
+
+ if ( $this->sortField == 'date' ) {
asort($aFilesDate);
- if($order_by == '_desc') {
- $aFilesDate = array_reverse($aFilesDate,TRUE);
- }
+ if ( $this->sortDirection == '_desc' ) {
+ $aFilesDate = array_reverse($aFilesDate, TRUE);
+ }
+
foreach ($aFilesDate as $k => $date) {
$size = $this->CalculateFileSize($aFilesSize[$k]);
$file = $aFiles[$k];
$date = date($date_format, $date);
$icon = $this->CheckIconType($file);
- $ret .= $this->GetXmlString($size,$files_url.$file,$icon,$date,$file);
+ $ret .= $this->_buildFileXml($size, $files_url . $file, $icon, $date, $file);
}
}
- if ($sort_by == 'size') {
+
+ if ( $this->sortField == 'size' ) {
asort($aFilesSize);
- if($order_by == '_desc') {
- $aFilesSize = array_reverse($aFilesSize,TRUE);
- }
+ if ( $this->sortDirection == '_desc' ) {
+ $aFilesSize = array_reverse($aFilesSize, TRUE);
+ }
+
foreach ($aFilesSize as $k => $size) {
$size = $this->CalculateFileSize($size);
$file = $aFiles[$k];
$date = date($date_format, $aFilesDate[$k]);
$icon = $this->CheckIconType($file);
- $ret .= $this->GetXmlString($size,$files_url.$file,$icon,$date,$file);
+ $ret .= $this->_buildFileXml($size, $files_url . $file, $icon, $date, $file);
}
}
+
return $ret;
}
@@ -223,6 +318,7 @@
$sOriginalFileName = $aUpFile['name'];
$sExtension = strtolower(substr( $sFileName, ( strrpos($sFileName, '.') + 1 ) ) );
$sErrorNumber = 0;
+
if ( isset( $_FILES['NewFile'] ) && !is_null( $_FILES['NewFile']['tmp_name'] ) )
{
if (in_array($sExtension, $this->Config['AllowedExtensions'][$type]))
@@ -270,6 +366,7 @@
else {
$sErrorNumber = '202' ;
}
+
echo '' ;
Index: branches/5.2.x/core/kernel/kbase.php
===================================================================
diff -u -N -r14673 -r14699
--- branches/5.2.x/core/kernel/kbase.php (.../kbase.php) (revision 14673)
+++ branches/5.2.x/core/kernel/kbase.php (.../kbase.php) (revision 14699)
@@ -1,6 +1,6 @@
_getDivPairs($data, 'movable-area');
-
+
foreach ($areas as $area_index => $area) {
// 1.1. get locations of all movable elements inside given area
$area_content = substr($area['data'], $area['open_len'], -$area['close_len']);
@@ -276,7 +276,7 @@
/**
* Returns information about parser element locations in template
*
- * @param Array $params
+ * @param string $info_type
* @return mixed
*/
function blockInfo($info_type)
@@ -329,6 +329,8 @@
/**
* Returns filename, that contains template, where block is located
*
+ * @param bool $relative
+ * @param string $extension
* @return string
*/
function _getTemplateFile($relative = false, $extension = '.tpl')
Index: branches/5.2.x/core/admin_templates/browser/frmupload.tpl
===================================================================
diff -u -N -r14244 -r14699
--- branches/5.2.x/core/admin_templates/browser/frmupload.tpl (.../frmupload.tpl) (revision 14244)
+++ branches/5.2.x/core/admin_templates/browser/frmupload.tpl (.../frmupload.tpl) (revision 14699)
@@ -32,13 +32,13 @@
{
// Reset the Upload Worker Frame.
window.parent.frames['frmUploadWorker'].location = 'about:blank' ;
-
+
// Reset the upload form (On IE we must do a little trick to avout problems).
if ( document.all )
document.getElementById('NewFile').outerHTML = '' ;
else
document.getElementById('frmUpload').reset() ;
-
+
// Reset the interface elements.
document.getElementById('eUploadMessage').innerHTML = 'Upload a new file in this folder' ;
document.getElementById('btnUpload').disabled = false ;
@@ -52,16 +52,16 @@
function UploadNewFile()
{
- var file_name = document.frmUpload.elements['NewFile'].value;
+ var file_name = document.frmUpload.elements['NewFile'].value;
if (file_name.length > 0) {
-
+
var ret = window.parent.frames['frmResourcesList'].ValidateFileName(file_name);
if (!ret)
return false;
else {
//document.frmUpload.elements['fck_event'].value = 'OnUploadFile';
document.frmUpload.elements['upload_dir'].value = window.top.current_folder;
- document.frmUpload.submit();
+ document.frmUpload.submit();
}
} return false;
}
@@ -121,7 +121,7 @@
|
