diff --git a/.eslintrc.js b/.eslintrc.js new file mode 100644 index 00000000..48fa262f --- /dev/null +++ b/.eslintrc.js @@ -0,0 +1,43 @@ +module.exports = { + 'env': { + 'browser': true, + 'es6': true, + 'commonjs': true, + 'jquery': true + }, + 'extends': 'eslint:recommended', + 'parserOptions': { + 'ecmaVersion': 6 + }, + 'rules': { + 'indent': [ + 'error', + 'tab', + { + 'SwitchCase': 1 + } + ], + 'linebreak-style': [ + 'error', + 'unix' + ], + 'quotes': [ + 'error', + 'single' + ], + 'semi': [ + 'error', + 'always' + ], + 'no-console': 'off', + 'no-unused-vars': [ + 'error', { + 'vars': 'all', + 'args': 'after-used', + 'ignoreRestSiblings': false + } + ], + // Requires eslint >= v8.14.0 + 'no-constant-binary-expression': 'error' + } +}; diff --git a/4dev/bin/mo_to_js.sh b/4dev/bin/mo_to_js.sh index 71d150ea..34472ab6 100755 --- a/4dev/bin/mo_to_js.sh +++ b/4dev/bin/mo_to_js.sh @@ -28,7 +28,7 @@ if [ "${target}" == '' ]; then # default is admin TEXTDOMAIN=admin; fi; -js_folder="layout/${TEXTDOMAIN}/javascript/"; +js_folder="${TEXTDOMAIN}/layout/javascript/"; error=0; # this checks if the TEXTDOMAIN target actually exists diff --git a/4dev/checking/phpunit.sh b/4dev/checking/phpunit.sh index 50badb6f..931afd11 100755 --- a/4dev/checking/phpunit.sh +++ b/4dev/checking/phpunit.sh @@ -19,6 +19,7 @@ if [ ! -z "${1}" ]; then # "8.0") php_bin="/usr/bin/php8.0 "; ;; # "8.1") php_bin="/usr/bin/php8.1 "; ;; "8.2") php_bin="/usr/bin/php8.2 "; ;; + "8.3") php_bin="/usr/bin/php8.4 "; ;; *) echo "Not support PHP: ${1}"; exit; ;; esac; fi; @@ -29,6 +30,7 @@ if [ ! -z "${2}" ] && [ -z "${php_bin}" ]; then # "8.0") php_bin="/usr/bin/php8.0 "; ;; # "8.1") php_bin="/usr/bin/php8.1 "; ;; "8.2") php_bin="/usr/bin/php8.2 "; ;; + "8.3") php_bin="/usr/bin/php8.3 "; ;; *) echo "Not support PHP: ${1}"; exit; ;; esac; fi; diff --git a/4dev/tests/Check/CoreLibsCheckFileTest.php b/4dev/tests/Check/CoreLibsCheckFileTest.php index c94ad943..56141aa2 100644 --- a/4dev/tests/Check/CoreLibsCheckFileTest.php +++ b/4dev/tests/Check/CoreLibsCheckFileTest.php @@ -28,10 +28,10 @@ final class CoreLibsCheckFileTest extends TestCase public function filesList(): array { return [ - ['filename.txt', 'txt', 5], - ['filename.csv', 'csv', 15], - ['filename.tsv', 'tsv', 0], - ['file_does_not_exits', '', -1], + ['filename.txt', 'txt', 5, 'text/plain'], + ['filename.csv', 'csv', 15, 'text/csv'], + ['filename.tsv', 'tsv', 0, 'text/plain'], + ['file_does_not_exits', '', -1, ''], ]; } @@ -63,6 +63,15 @@ final class CoreLibsCheckFileTest extends TestCase return $list; } + public function mimeTypeProvider(): array + { + $list = []; + foreach ($this->filesList() as $row) { + $list[$row[0] . ' must be mime type ' . $row[3]] = [$row[0], $row[3]]; + } + return $list; + } + /** * Tests if file extension matches * @@ -115,6 +124,51 @@ final class CoreLibsCheckFileTest extends TestCase unlink($this->base_folder . $input); } } + + /** + * Undocumented function + * + * @covers ::getMimeType + * @dataProvider mimeTypeProvider + * @testdox getMimeType $input must be mime type $expected [$_dataName] + * + * @param string $input + * @param string $expected + * @return void + */ + public function testGetMimeType(string $input, string $expected): void + { + if (!empty($expected)) { + $file = $this->base_folder . $input; + $fp = fopen($file, 'w'); + switch ($expected) { + case 'text/csv': + for ($i = 1; $i <= 10; $i++) { + fwrite($fp, '"This is row","' . $expected . '",' . $i . PHP_EOL); + } + break; + case 'text/tsv': + for ($i = 1; $i <= 10; $i++) { + fwrite($fp, "\"This is row\"\t\"" . $expected . "\"\t\"" . $i . PHP_EOL); + } + break; + case 'text/plain': + fwrite($fp, 'This is mime type: ' . $expected . PHP_EOL); + break; + } + fclose($fp); + } else { + $this->expectException(\UnexpectedValueException::class); + } + $this->assertEquals( + $expected, + \CoreLibs\Check\File::getMimeType($this->base_folder . $input) + ); + // unlink file + if (is_file($this->base_folder . $input)) { + unlink($this->base_folder . $input); + } + } } // __END__ diff --git a/4dev/tests/Combined/CoreLibsCombinedArrayHandlerTest.php b/4dev/tests/Combined/CoreLibsCombinedArrayHandlerTest.php index 25ade3a5..8dc5729a 100644 --- a/4dev/tests/Combined/CoreLibsCombinedArrayHandlerTest.php +++ b/4dev/tests/Combined/CoreLibsCombinedArrayHandlerTest.php @@ -1098,16 +1098,109 @@ final class CoreLibsCombinedArrayHandlerTest extends TestCase * @testdox arrayFlatForKey array $input will be $expected [$_dataName] * * @param array $input + * @param string $search * @param array $expected * @return void */ - public function testArrayFlatForKey(array $input, $search, array $expected): void + public function testArrayFlatForKey(array $input, string $search, array $expected): void { $this->assertEquals( $expected, \CoreLibs\Combined\ArrayHandler::arrayFlatForKey($input, $search) ); } + + /** + * Undocumented function + * + * @return array + */ + public function providerArrayGetNextPrevKey(): array + { + return [ + 'find, ok' => [ + 'input' => [ + 'a' => 'First', + 'b' => 'Second', + 'c' => 'Third', + ], + 'b', + 'a', + 'c' + ], + 'find, first' => [ + 'input' => [ + 'a' => 'First', + 'b' => 'Second', + 'c' => 'Third', + ], + 'a', + null, + 'b' + ], + 'find, last' => [ + 'input' => [ + 'a' => 'First', + 'b' => 'Second', + 'c' => 'Third', + ], + 'c', + 'b', + null + ], + 'find, not found' => [ + 'input' => [ + 'a' => 'First', + 'b' => 'Second', + 'c' => 'Third', + ], + 'z', + null, + null + ], + 'int, index' => [ + 'input' => [ + 'a', + 'b', + 'c' + ], + 1, + 0, + 2 + ] + ]; + } + + /** + * Undocumented function + * + * @covers ::arrayGetPrevKey, ::arrayGetNextKey + * @dataProvider providerArrayGetNextPrevKey + * @testdox arrayGetNextPrevKey get next/prev key for $search wtih $expected_prev/$expected_next [$_dataName] + * + * @param array $input + * @param int|string $search + * @param int|string|null $expected_prev + * @param int|string|null $expected_next + * @return void + */ + public function testArrayGetNextPrevKey( + array $input, + int|string $search, + int|string|null $expected_prev, + int|string|null $expected_next + ): void { + $this->assertEquals( + $expected_prev, + \CoreLibs\Combined\ArrayHandler::arrayGetPrevKey($input, $search), + 'Find prev key in array' + ); + $this->assertEquals( + $expected_next, + \CoreLibs\Combined\ArrayHandler::arrayGetNextKey($input, $search), + 'Find next key in array' + ); + } } // __END__ diff --git a/4dev/tests/Combined/CoreLibsCombinedDateTimeTest.php b/4dev/tests/Combined/CoreLibsCombinedDateTimeTest.php index 7bd68d6a..d7efa9b7 100644 --- a/4dev/tests/Combined/CoreLibsCombinedDateTimeTest.php +++ b/4dev/tests/Combined/CoreLibsCombinedDateTimeTest.php @@ -66,6 +66,34 @@ final class CoreLibsCombinedDateTimeTest extends TestCase ]; } + /** + * date string convert test + * + * @covers ::dateStringFormat + * @dataProvider timestampProvider + * @testdox dateStringFormat $input (microtime $flag) will be $expected [$_dataName] + * + * @param int|float $input + * @param bool $flag + * @param string $expected + * @return void + */ + public function testDateStringFormat( + $input, + bool $flag_show_micro, + bool $flag_micro_as_float, + string $expected + ): void { + $this->assertEquals( + $expected, + \CoreLibs\Combined\DateTime::dateStringFormat( + $input, + $flag_show_micro, + $flag_micro_as_float + ) + ); + } + /** * interval for both directions * @@ -74,6 +102,11 @@ final class CoreLibsCombinedDateTimeTest extends TestCase public function intervalProvider(): array { return [ + 'on hour' => [ + 3600, + false, + '1h 0m 0s' + ], 'interval no microtime' => [ 1641515890, false, @@ -82,7 +115,7 @@ final class CoreLibsCombinedDateTimeTest extends TestCase 'interval with microtime' => [ 1641515890, true, - '18999d 0h 38m 10s', + '18999d 0h 38m 10s 0ms', ], 'micro interval no microtime' => [ 1641515890.123456, @@ -92,7 +125,7 @@ final class CoreLibsCombinedDateTimeTest extends TestCase 'micro interval with microtime' => [ 1641515890.123456, true, - '18999d 0h 38m 10s 1235ms', + '18999d 0h 38m 10s 124ms', ], 'negative interval no microtime' => [ -1641515890, @@ -103,27 +136,27 @@ final class CoreLibsCombinedDateTimeTest extends TestCase 'microtime only' => [ 0.123456, true, - '0s 1235ms', + '0s 123ms', ], 'seconds only' => [ 30.123456, true, - '30s 1235ms', + '30s 123ms', ], 'minutes only' => [ 90.123456, true, - '1m 30s 1235ms', + '1m 30s 123ms', ], 'hours only' => [ 3690.123456, true, - '1h 1m 30s 1235ms', + '1h 1m 30s 123ms', ], 'days only' => [ 90090.123456, true, - '1d 1h 1m 30s 1235ms', + '1d 1h 1m 30s 123ms', ], 'already set' => [ '1d 1h 1m 30s 1235ms', @@ -143,6 +176,306 @@ final class CoreLibsCombinedDateTimeTest extends TestCase ]; } + /** + * time seconds convert test + * + * @covers ::timeStringFormat + * @dataProvider intervalProvider + * @testdox timeStringFormat $input (microtime $flag) will be $expected [$_dataName] + * + * @param string|int|float $input + * @param bool $flag + * @param string $expected + * @return void + */ + public function testTimeStringFormat(string|int|float $input, bool $flag, string $expected): void + { + $this->assertEquals( + $expected, + \CoreLibs\Combined\DateTime::timeStringFormat($input, $flag) + ); + } + + /** + * interval seconds convert + * + * @covers ::intervalStringFormat + * @dataProvider intervalProvider + * @testdox intervalStringFormat $input (microtime $show_micro) will be $expected [$_dataName] + * + * @param string|int|float $input + * @param bool $show_micro + * @param string $expected + * @return void + */ + public function testIntervalStringFormat(string|int|float $input, bool $show_micro, string $expected): void + { + // we skip string input, that is not allowed + if (is_string($input)) { + $this->assertTrue(true, 'Skip strings'); + return; + } + // invalid values throw exception in default + if ($input == 999999999999999) { + $this->expectException(\LengthException::class); + } + // below is equal to timeStringFormat + $this->assertEquals( + $expected, + \CoreLibs\Combined\DateTime::intervalStringFormat( + $input, + show_microseconds: $show_micro, + show_only_days: true, + skip_zero: false, + skip_last_zero: false, + truncate_nanoseconds: true, + truncate_zero_seconds_if_microseconds: false + ) + ); + } + + /** + * Undocumented function + * + * @return array + */ + public function intervalExtendedProvider(): array + { + return [ + // A + '(60) default value' => [ + [ + 'seconds' => 60, + ], + 'expected' => '1m', + 'exception' => null + ], + '(60) default value, skip_last_zero:false' => [ + [ + 'seconds' => 60, + 'skip_last_zero' => false, + ], + 'expected' => '1m 0s 0ms', + 'exception' => null + ], + // B + '(120.1) default value' => [ + [ + 'seconds' => 120.1, + ], + 'expected' => '2m 100ms', + 'exception' => null + ], + '(120.1) default value, skip_zero:false' => [ + [ + 'seconds' => 120.1, + 'skip_zero' => false, + ], + 'expected' => '2m 0s 100ms', + 'exception' => null + ], + '(120.1) default value, skip_last_zero:false' => [ + [ + 'seconds' => 120.1, + 'skip_last_zero' => false, + ], + 'expected' => '2m 100ms', + 'exception' => null + ], + // C + '(3601) default value' => [ + [ + 'seconds' => 3601, + ], + 'expected' => '1h 1s', + 'exception' => null + ], + '(3601) default value, skip_zero:false' => [ + [ + 'seconds' => 3601, + 'skip_zero' => false, + ], + 'expected' => '1h 0m 1s', + 'exception' => null + ], + '(3601) default value, skip_last_zero:false' => [ + [ + 'seconds' => 3601, + 'skip_last_zero' => false, + ], + 'expected' => '1h 1s 0ms', + 'exception' => null + ], + // TODO create unit tests for ALL edge cases + // CREATE abort tests, simple, all others are handled in exception tests + 'exception: \UnexpectedValueException:1' => [ + [ + 'seconds' => 99999999999999999999999 + ], + 'expected' => null, + 'exception' => [ + 'class' => \UnexpectedValueException::class, + 'code' => 1, + ], + ] + ]; + } + + /** + * test all options for interval conversion + * + * @covers ::intervalStringFormat + * @dataProvider intervalExtendedProvider + * @testdox intervalStringFormat $input will be $expected / $exception [$_dataName] + * + * @param array $parameter_list + * @param string $expected + * @param array $exception + * @return void + */ + public function testExtendedIntervalStringFormat( + array $parameter_list, + ?string $expected, + ?array $exception + ): void { + if ($expected === null && $exception === null) { + $this->assertFalse(true, 'Cannot have expected and exception null in test data'); + } + $parameters = []; + foreach ( + [ + 'seconds' => null, + 'truncate_after' => '', + 'natural_seperator' => false, + 'name_space_seperator' => false, + 'show_microseconds' => true, + 'short_time_name' => true, + 'skip_last_zero' => true, + 'skip_zero' => true, + 'show_only_days' => false, + 'auto_fix_microseconds' => false, + 'truncate_nanoseconds' => false, + 'truncate_zero_seconds_if_microseconds' => true, + ] as $param => $default + ) { + if (empty($parameter_list[$param]) && $default === null) { + $this->assertFalse(true, 'Parameter ' . $param . ' is mandatory '); + } elseif (!isset($parameter_list[$param]) || $parameter_list[$param] === null) { + $parameters[] = $default; + } else { + $parameters[] = $parameter_list[$param]; + } + } + if ($expected !== null) { + $this->assertEquals( + $expected, + call_user_func_array('CoreLibs\Combined\DateTime::intervalStringFormat', $parameters) + ); + } else { + if (empty($exception['class']) || empty($exception['code'])) { + $this->assertFalse(true, 'Exception tests need Exception name and Code'); + } + $this->expectException($exception['class']); + $this->expectExceptionCode($exception['code']); + // if we have a message, must be regex + if (!empty($exception['message'])) { + $this->expectExceptionMessageMatches($exception['message']); + } + call_user_func_array('CoreLibs\Combined\DateTime::intervalStringFormat', $parameters); + } + } + + /** + * Undocumented function + * + * @return array + */ + public function exceptionsIntervalProvider(): array + { + return [ + 'UnexpectedValueException: 1 A' => [ + 'seconds' => 99999999999999999999999, + 'params' => [], + 'exception' => \UnexpectedValueException::class, + 'exception_message' => "/^Seconds value is invalid, too large or more than six decimals: /", + 'excpetion_code' => 1, + ], + 'UnexpectedValueException: 1 B' => [ + 'seconds' => 123.1234567, + 'params' => [], + 'exception' => \UnexpectedValueException::class, + 'exception_message' => "/^Seconds value is invalid, too large or more than six decimals: /", + 'excpetion_code' => 1, + ], + // exception 2 is very likely covered by exception 1 + 'LengthException: 3' => [ + 'seconds' => 999999999999999999, + 'params' => [ + 'show_only_days', + ], + 'exception' => \LengthException::class, + 'exception_message' => "/^Input seconds value is too large for days output: /", + 'excpetion_code' => 3, + ], + 'UnexpectedValueException: 4' => [ + 'seconds' => 1234567, + 'params' => [ + 'truncate_after' + ], + 'exception' => \UnexpectedValueException::class, + 'exception_message' => "/^truncate_after has an invalid value: /", + 'excpetion_code' => 4, + ], + 'UnexpectedValueException: 5' => [ + 'seconds' => 1234567, + 'params' => [ + 'show_only_days:truncate_after' + ], + 'exception' => \UnexpectedValueException::class, + 'exception_message' => + "/^If show_only_days is turned on, the truncate_after cannot be years or months: /", + 'excpetion_code' => 5, + ] + ]; + } + + /** + * Test all exceptions + * + * @covers ::intervalStringFormat + * @dataProvider exceptionsIntervalProvider + * @testdox intervalStringFormat: test Exceptions + * + * @param int|float $seconds + * @param array $params + * @param string $exception + * @param string $exception_message + * @param int $excpetion_code + * @return void + */ + public function testExceptionsIntervalStringFormat( + int|float $seconds, + array $params, + string $exception, + string $exception_message, + int $excpetion_code, + ): void { + $this->expectException($exception); + $this->expectExceptionMessageMatches($exception_message); + $this->expectExceptionCode($excpetion_code); + if (empty($params)) { + \CoreLibs\Combined\DateTime::intervalStringFormat($seconds); + } else { + if (in_array('show_only_days', $params)) { + \CoreLibs\Combined\DateTime::intervalStringFormat($seconds, show_only_days:true); + } elseif (in_array('truncate_after', $params)) { + \CoreLibs\Combined\DateTime::intervalStringFormat($seconds, truncate_after: 'v'); + } elseif (in_array('show_only_days:truncate_after', $params)) { + \CoreLibs\Combined\DateTime::intervalStringFormat($seconds, show_only_days:true, truncate_after: 'y'); + } + } + } + /** * Undocumented function * @@ -203,6 +536,25 @@ final class CoreLibsCombinedDateTimeTest extends TestCase ]; } + /** + * Undocumented function + * + * @covers ::stringToTime + * @dataProvider reverseIntervalProvider + * @testdox stringToTime $input will be $expected [$_dataName] + * + * @param string|int|float $input + * @param string|int|float $expected + * @return void + */ + public function testStringToTime($input, $expected): void + { + $this->assertEquals( + $expected, + \CoreLibs\Combined\DateTime::stringToTime($input) + ); + } + /** * Undocumented function * @@ -238,6 +590,25 @@ final class CoreLibsCombinedDateTimeTest extends TestCase ]; } + /** + * Undocumented function + * + * @covers ::checkDate + * @dataProvider dateProvider + * @testdox checkDate $input will be $expected [$_dataName] + * + * @param string $input + * @param bool $expected + * @return void + */ + public function testCheckDate(string $input, bool $expected): void + { + $this->assertEquals( + $expected, + \CoreLibs\Combined\DateTime::checkDate($input) + ); + } + /** * Undocumented function * @@ -297,6 +668,25 @@ final class CoreLibsCombinedDateTimeTest extends TestCase ]; } + /** + * Undocumented function + * + * @covers ::checkDateTime + * @dataProvider dateTimeProvider + * @testdox checkDateTime $input will be $expected [$_dataName] + * + * @param string $input + * @param bool $expected + * @return void + */ + public function testCheckDateTime(string $input, bool $expected): void + { + $this->assertEquals( + $expected, + \CoreLibs\Combined\DateTime::checkDateTime($input) + ); + } + /** * Undocumented function * @@ -371,6 +761,37 @@ final class CoreLibsCombinedDateTimeTest extends TestCase ]; } + /** + * Undocumented function + * + * @covers ::compareDate + * @dataProvider dateCompareProvider + * @testdox compareDate $input_a compared to $input_b will be $expected [$_dataName] + * + * @param string $input_a + * @param string $input_b + * @param int|bool $expected + * @param string|null $exception + * @param int|null $exception_code + * @return void + */ + public function testCompareDate( + string $input_a, + string $input_b, + int|bool $expected, + ?string $exception, + ?int $exception_code + ): void { + if ($expected === false) { + $this->expectException($exception); + $this->expectExceptionCode($exception_code); + } + $this->assertEquals( + $expected, + \CoreLibs\Combined\DateTime::compareDate($input_a, $input_b) + ); + } + /** * Undocumented function * @@ -466,6 +887,37 @@ final class CoreLibsCombinedDateTimeTest extends TestCase ]; } + /** + * Undocumented function + * + * @covers ::compareDateTime + * @dataProvider dateTimeCompareProvider + * @testdox compareDateTime $input_a compared to $input_b will be $expected [$_dataName] + * + * @param string $input_a + * @param string $input_b + * @param int|bool $expected + * @param string|null $exception + * @param int|null $exception_code + * @return void + */ + public function testCompareDateTime( + string $input_a, + string $input_b, + int|bool $expected, + ?string $exception, + ?int $exception_code + ): void { + if ($expected === false) { + $this->expectException($exception); + $this->expectExceptionCode($exception_code); + } + $this->assertEquals( + $expected, + \CoreLibs\Combined\DateTime::compareDateTime($input_a, $input_b) + ); + } + /** * Undocumented function * @@ -520,214 +972,6 @@ final class CoreLibsCombinedDateTimeTest extends TestCase ]; } - /** - * Undocumented function - * - * @return array - */ - public function dateRangeHasWeekendProvider(): array - { - return [ - 'no weekend' => [ - '2023-07-03', - '2023-07-04', - false - ], - 'start weekend sat' => [ - '2023-07-01', - '2023-07-04', - true - ], - 'start weekend sun' => [ - '2023-07-02', - '2023-07-04', - true - ], - 'end weekend sat' => [ - '2023-07-03', - '2023-07-08', - true - ], - 'end weekend sun' => [ - '2023-07-03', - '2023-07-09', - true - ], - 'long period > 6 days' => [ - '2023-07-03', - '2023-07-27', - true - ] - ]; - } - - /** - * date string convert test - * - * @covers ::dateStringFormat - * @dataProvider timestampProvider - * @testdox dateStringFormat $input (microtime $flag) will be $expected [$_dataName] - * - * @param int|float $input - * @param bool $flag - * @param string $expected - * @return void - */ - public function testDateStringFormat( - $input, - bool $flag_show_micro, - bool $flag_micro_as_float, - string $expected - ): void { - $this->assertEquals( - $expected, - \CoreLibs\Combined\DateTime::dateStringFormat( - $input, - $flag_show_micro, - $flag_micro_as_float - ) - ); - } - - /** - * interval convert test - * - * @covers ::timeStringFormat - * @dataProvider intervalProvider - * @testdox timeStringFormat $input (microtime $flag) will be $expected [$_dataName] - * - * @param int|float $input - * @param bool $flag - * @param string $expected - * @return void - */ - public function testTimeStringFormat($input, bool $flag, string $expected): void - { - $this->assertEquals( - $expected, - \CoreLibs\Combined\DateTime::timeStringFormat($input, $flag) - ); - } - - /** - * Undocumented function - * - * @covers ::stringToTime - * @dataProvider reverseIntervalProvider - * @testdox stringToTime $input will be $expected [$_dataName] - * - * @param string|int|float $input - * @param string|int|float $expected - * @return void - */ - public function testStringToTime($input, $expected): void - { - $this->assertEquals( - $expected, - \CoreLibs\Combined\DateTime::stringToTime($input) - ); - } - - /** - * Undocumented function - * - * @covers ::checkDate - * @dataProvider dateProvider - * @testdox checkDate $input will be $expected [$_dataName] - * - * @param string $input - * @param bool $expected - * @return void - */ - public function testCheckDate(string $input, bool $expected): void - { - $this->assertEquals( - $expected, - \CoreLibs\Combined\DateTime::checkDate($input) - ); - } - - /** - * Undocumented function - * - * @covers ::checkDateTime - * @dataProvider dateTimeProvider - * @testdox checkDateTime $input will be $expected [$_dataName] - * - * @param string $input - * @param bool $expected - * @return void - */ - public function testCheckDateTime(string $input, bool $expected): void - { - $this->assertEquals( - $expected, - \CoreLibs\Combined\DateTime::checkDateTime($input) - ); - } - - /** - * Undocumented function - * - * @covers ::compareDate - * @dataProvider dateCompareProvider - * @testdox compareDate $input_a compared to $input_b will be $expected [$_dataName] - * - * @param string $input_a - * @param string $input_b - * @param int|bool $expected - * @param string|null $exception - * @param int|null $exception_code - * @return void - */ - public function testCompareDate( - string $input_a, - string $input_b, - int|bool $expected, - ?string $exception, - ?int $exception_code - ): void { - if ($expected === false) { - $this->expectException($exception); - $this->expectExceptionCode($exception_code); - } - $this->assertEquals( - $expected, - \CoreLibs\Combined\DateTime::compareDate($input_a, $input_b) - ); - } - - /** - * Undocumented function - * - * @covers ::compareDateTime - * @dataProvider dateTimeCompareProvider - * @testdox compareDateTime $input_a compared to $input_b will be $expected [$_dataName] - * - * @param string $input_a - * @param string $input_b - * @param int|bool $expected - * @param string|null $exception - * @param int|null $exception_code - * @return void - */ - public function testCompareDateTime( - string $input_a, - string $input_b, - int|bool $expected, - ?string $exception, - ?int $exception_code - ): void { - if ($expected === false) { - $this->expectException($exception); - $this->expectExceptionCode($exception_code); - } - $this->assertEquals( - $expected, - \CoreLibs\Combined\DateTime::compareDateTime($input_a, $input_b) - ); - } - /** * Undocumented function * @@ -906,6 +1150,47 @@ final class CoreLibsCombinedDateTimeTest extends TestCase ); } + /** + * Undocumented function + * + * @return array + */ + public function dateRangeHasWeekendProvider(): array + { + return [ + 'no weekend' => [ + '2023-07-03', + '2023-07-04', + false + ], + 'start weekend sat' => [ + '2023-07-01', + '2023-07-04', + true + ], + 'start weekend sun' => [ + '2023-07-02', + '2023-07-04', + true + ], + 'end weekend sat' => [ + '2023-07-03', + '2023-07-08', + true + ], + 'end weekend sun' => [ + '2023-07-03', + '2023-07-09', + true + ], + 'long period > 6 days' => [ + '2023-07-03', + '2023-07-27', + true + ] + ]; + } + /** * Undocumented function * diff --git a/4dev/tests/Convert/CoreLibsConvertByteTest.php b/4dev/tests/Convert/CoreLibsConvertByteTest.php index bf49af3b..95838889 100644 --- a/4dev/tests/Convert/CoreLibsConvertByteTest.php +++ b/4dev/tests/Convert/CoreLibsConvertByteTest.php @@ -253,7 +253,8 @@ final class CoreLibsConvertByteTest extends TestCase */ public function testHumanReadableByteFormatException(int $flag): void { - $this->expectException(\Exception::class); + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionCode(1); \CoreLibs\Convert\Byte::humanReadableByteFormat(12, $flag); } @@ -272,7 +273,8 @@ final class CoreLibsConvertByteTest extends TestCase */ public function testStringByteFormatException(int $flag): void { - $this->expectException(\Exception::class); + $this->expectException(\InvalidArgumentException::class); + $this->expectExceptionCode(1); \CoreLibs\Convert\Byte::stringByteFormat(12, $flag); } } diff --git a/4dev/tests/Convert/CoreLibsConvertMimeEncodeTest.php b/4dev/tests/Convert/CoreLibsConvertMimeEncodeTest.php index 00b1055e..1c2c47c7 100644 --- a/4dev/tests/Convert/CoreLibsConvertMimeEncodeTest.php +++ b/4dev/tests/Convert/CoreLibsConvertMimeEncodeTest.php @@ -33,15 +33,14 @@ final class CoreLibsConvertMimeEncodeTest extends TestCase 'The quick brown fox jumps over the lazy sheep that sleeps in the ravine ' . 'and has no idea what is going on here', 'UTF-8', - 'The quick brown fox jumps over the lazy sheep that sleeps in the ravine ' - . 'and has no idea what is going on here' + "The quick brown fox jumps over the lazy sheep that sleeps in the ravine and\r\n" + . ' has no idea what is going on here' ], 'standard with special chars UTF-8' => [ 'This is ümläßtと漢字もカタカナ！!^$%&', 'UTF-8', - 'This is =?UTF-8?B?w7xtbMOkw59044Go5ryi5a2X44KC44Kr44K/44Kr44OK77yBIV4k?=' - . "\r\n" - . ' =?UTF-8?B?JQ==?=&' + "This is =?UTF-8?B?w7xtbMOkw59044Go5ryi5a2X44KC44Kr44K/44Kr44OK77yBIV4k?=\r\n" + . ' =?UTF-8?B?JSY=?=' ], '35 chars and space at the end UTF-8' => [ '12345678901234567890123456789012345 ' @@ -62,9 +61,8 @@ final class CoreLibsConvertMimeEncodeTest extends TestCase . 'is there a space?', 'UTF-8', "=?UTF-8?B?44Kr44K/44Kr44OK44Kr44K/44Kr44OK44GL44Gq44Kr44K/44Kr44OK44Kr?=\r\n" - . " =?UTF-8?B?44K/44Kr44OK?=\r\n" - . " =?UTF-8?B?44GL44Gq44Kr44K/44Kr44OK44Kr44K/44Kr44OK44GL44Gq44Kr44K/44Kr?=\r\n" - . " =?UTF-8?B?44OK44Kr44K/?= is there a =?UTF-8?B?c3BhY2U/?=" + . " =?UTF-8?B?44K/44Kr44OK44GL44Gq44Kr44K/44Kr44OK44Kr44K/44Kr44OK44GL44Gq?=\r\n" + . " =?UTF-8?B?44Kr44K/44Kr44OK44Kr44K/IGlzIHRoZXJlIGEgc3BhY2U/?=" ] ]; } @@ -85,16 +83,28 @@ final class CoreLibsConvertMimeEncodeTest extends TestCase // print "MIME: -" . $encoded . "-\n"; $this->assertEquals( $expected, - $encoded + $encoded, + "__mbMimeEncode" ); $decoded = mb_decode_mimeheader($encoded); - // print "INPUT : " . $input . "\n"; - // print "DECODED: " . $decoded . "\n"; + // print "ENCODED: " . $encoded . "\n"; + // print "INPUT : " . $input . " | " . mb_strlen($input) . "\n"; + // print "DECODED: " . $decoded . " | " . mb_strlen($decoded) . "\n"; + // $test_enc = mb_encode_mimeheader($input, $encoding); + // $test_dec = mb_decode_mimeheader($test_enc); + // print "TEST ENC: " . $test_enc . "\n"; // back compare decoded $this->assertEquals( $input, - $decoded + $decoded, + "mb_decode_mimeheader" ); + + // $this->assertEquals( + // $input, + // $test_dec, + // 'mb_encode_to_decode' + // ); } } diff --git a/4dev/tests/Convert/CoreLibsConvertStringsTest.php b/4dev/tests/Convert/CoreLibsConvertStringsTest.php index 90415d20..0b2f79a5 100644 --- a/4dev/tests/Convert/CoreLibsConvertStringsTest.php +++ b/4dev/tests/Convert/CoreLibsConvertStringsTest.php @@ -256,6 +256,80 @@ final class CoreLibsConvertStringsTest extends TestCase $output ); } + + /** + * provider for testStripMultiplePathSlashes + * + * @return array + */ + public function stripMultiplePathSlashesProvider(): array + { + return [ + 'no slahses' => [ + 'input' => 'string_abc', + 'expected' => 'string_abc', + ], + 'one slash' => [ + 'input' => 'some/foo', + 'expected' => 'some/foo', + ], + 'two slashes' => [ + 'input' => 'some//foo', + 'expected' => 'some/foo', + ], + 'three slashes' => [ + 'input' => 'some///foo', + 'expected' => 'some/foo', + ], + 'slashes in front' => [ + 'input' => '/foo', + 'expected' => '/foo', + ], + 'two slashes in front' => [ + 'input' => '//foo', + 'expected' => '/foo', + ], + 'thee slashes in front' => [ + 'input' => '///foo', + 'expected' => '/foo', + ], + 'slashes in back' => [ + 'input' => 'foo/', + 'expected' => 'foo/', + ], + 'two slashes in back' => [ + 'input' => 'foo//', + 'expected' => 'foo/', + ], + 'thee slashes in back' => [ + 'input' => 'foo///', + 'expected' => 'foo/', + ], + 'multiple slashes' => [ + 'input' => '/foo//bar///string/end_times', + 'expected' => '/foo/bar/string/end_times', + ] + ]; + } + + /** + * test multiple slashes clean up + * + * @covers ::stripMultiplePathSlashes + * @dataProvider stripMultiplePathSlashesProvider + * @testdox stripMultiplePathSlashes $input will be $expected [$_dataName] + * + * @param string $input + * @param string $expected + * @return void + */ + public function testStripMultiplePathSlashes(string $input, string $expected): void + { + $this->assertEquals( + $expected, + \CoreLibs\Convert\Strings::stripMultiplePathSlashes($input) + ); + } } // __END__ diff --git a/4dev/tests/Debug/CoreLibsDebugSupportTest.php b/4dev/tests/Debug/CoreLibsDebugSupportTest.php index ab74df7d..74ed67ed 100644 --- a/4dev/tests/Debug/CoreLibsDebugSupportTest.php +++ b/4dev/tests/Debug/CoreLibsDebugSupportTest.php @@ -513,7 +513,7 @@ final class CoreLibsDebugSupportTest extends TestCase public function testGetCallerMethodList(array $expected): void { $compare = Support::getCallerMethodList(); - // 10: legact + // 10: legacy // 11: direct // 12: full call switch (count($compare)) { @@ -571,6 +571,31 @@ final class CoreLibsDebugSupportTest extends TestCase } } + /** + * Undocumented function + * + * @cover ::getCallStack + * @testdox getCallStack check if it returns data [$_dataName] + * + * @return void + */ + public function testGetCallStack(): void + { + $call_stack = Support::getCallStack(); + // print "Get CALL: " . print_r(Support::getCallStack(), true) . "\n"; + if ($call_stack < 8) { + $this->assertFalse(true, 'getCallStack too low: 8'); + } else { + $this->assertTrue(true, 'getCallSteck ok'); + } + // just test top entry + $first = array_shift($call_stack); + $this->assertStringEndsWith( + ':tests\CoreLibsDebugSupportTest->testGetCallStack', + $first, + ); + } + /** * test the lowest one (one above base) * diff --git a/README.Exceptions.md b/README.Exceptions.md new file mode 100644 index 00000000..41559f08 --- /dev/null +++ b/README.Exceptions.md @@ -0,0 +1,43 @@ +# Exception rules + +What exceptions to use for what + +NOTE: There will be custom Excpetions creaed and so some rules will change + +NOTE: For catching: always catch \Exception at the end to avoid missing some changed exceptions + +NOTE: Changed exceptions will have marked as critical API change + +## \Exception + +if there is nothing else matching, use this one + +## \InvalidArgumentException + +if argument to a function is not expected type + +## \UnexpectedValueException + +If the value is not matching to what we expect + +## \LengthException + +Given value is out of range + +## \RuntimeException + +Missing php modules or external programs + +## \OutOfRangeException + +Not in range of given expression (array or other) + +## Below are ERRORs + +### \ArgumentCountError [ERROR] + +If we have dynamic argument methods and we are missing a certain arguemnt count + +### \TypeError + +Invalid type diff --git a/jsconfig.json b/jsconfig.json new file mode 100644 index 00000000..9a284483 --- /dev/null +++ b/jsconfig.json @@ -0,0 +1,15 @@ +{ + "compilerOptions": { + "module": "ESNext", + "moduleResolution": "Node", + "target": "ES2020", + "jsx": "react", + "allowImportingTsExtensions": true, + "strictNullChecks": true, + "strictFunctionTypes": true + }, + "exclude": [ + "node_modules", + "**/node_modules/*" + ] +} diff --git a/phpcs.xml b/phpcs.xml new file mode 100644 index 00000000..cfc7a3dc --- /dev/null +++ b/phpcs.xml @@ -0,0 +1,18 @@ + + + PSR12 override rules (strict, standard). Switch spaces indent to tab. + + + + + + + + + + + + + + + diff --git a/www/admin/class_test.array.php b/www/admin/class_test.array.php index eef96c21..cc1789b3 100644 --- a/www/admin/class_test.array.php +++ b/www/admin/class_test.array.php @@ -21,6 +21,7 @@ ob_end_flush(); use CoreLibs\Combined\ArrayHandler; use CoreLibs\Debug\Support as DgS; use CoreLibs\Convert\SetVarType; +use PHPUnit\Framework\Constraint\ArrayHasKey; $log = new CoreLibs\Logging\Logging([ 'log_folder' => BASE . LOG, @@ -236,6 +237,22 @@ $flag = false; $output = \CoreLibs\Combined\ArrayHandler::genAssocArray($db_array, $key, $value, $flag); print "OUTPUT: " . \CoreLibs\Debug\Support::printAr($output) . "
"; + +print "
"; +$array = [ + 'a' => 'First', + 'b' => 'Second', + 'c' => 'Third', +]; + +foreach (array_keys($array) as $search) { + print "Result[" . $search . "]: " + . "next: " . DgS::printAr(ArrayHandler::arrayGetNextKey($array, $search)) . ", " + . "prev: " . DgS::printAr(ArrayHandler::arrayGetPrevKey($array, $search)) + . "
"; +} +print "Key not exists: " . DgS::printAr(ArrayHandler::arrayGetNextKey($array, 'z')) . "
"; + print ""; // __END__ diff --git a/www/admin/class_test.datetime.php b/www/admin/class_test.datetime.php index a20fb41c..7255c368 100644 --- a/www/admin/class_test.datetime.php +++ b/www/admin/class_test.datetime.php @@ -51,10 +51,7 @@ if (round($timestamp, 4) == DateTime::stringToTime($time_string)) { } else { print "REVERSE TRIME STRING DO NOT MATCH
"; } -print "ZERO TIME STRING: " . DateTime::timeStringFormat(0, true) . "
"; -print "ZERO TIME STRING: " . DateTime::timeStringFormat(0.0, true) . "
"; -print "ZERO TIME STRING: " . DateTime::timeStringFormat(1.005, true) . "
"; - +print "
"; $timestamps = [ 1622788315.123456, -1622788315.456789 @@ -64,6 +61,159 @@ foreach ($timestamps as $timestamp) { print "DATESTRINGFORMAT(sm:1:0): $timestamp: " . DateTime::dateStringFormat($timestamp, true) . "
"; print "DATESTRINGFORMAT(sm:1:1): $timestamp: " . DateTime::dateStringFormat($timestamp, true, true) . "
"; } +print "
"; +// $interval = 0; +// $interval = 1000000; +// $interval = 123456; +// $interval = 3600; +$interval = 3601; +// $interval = 86400; +// $interval = 86401; +// $interval = (86400 * 606) + 16434.5; +// $interval = 1.5; +// $interval = 123456; +// $interval = 120.1; +// $interval = 1641515890; +// $interval = 0.123456; +// $interval = 1641515890; +// $interval = 999999999999999999; +// $interval = 60; +try { + // print "Test-DEP: [$interval] " + // . intervalStringFormatDeprecated( + // $interval, + // truncate_after: '', + // natural_seperator: false, + // name_space_seperator: false, + // show_microseconds: true, + // short_time_name: true, + // skip_last_zero: true, + // skip_zero: false, + // show_only_days: false, + // auto_fix_microseconds: false, + // truncate_nanoseconds: false, + // truncate_zero_seconds_if_microseconds: true, + // ) + // // . " => " + // // . DateTime::intervalStringFormat($interval) + // . "
"; + print "Test-ACT: [$interval] " + . DateTime::intervalStringFormat( + $interval, + truncate_after: '', + natural_seperator: false, + name_space_seperator: false, + show_microseconds: true, + short_time_name: true, + skip_last_zero: true, + skip_zero: false, + show_only_days: false, + auto_fix_microseconds: false, + truncate_nanoseconds: false, + truncate_zero_seconds_if_microseconds: true, + ) + . " => " + . DateTime::intervalStringFormat($interval) + . "
"; + print "DEFAULT-DEP: " . intervalStringFormatDeprecated($interval) . "
"; + print "DEFAULT-ACT: " . DateTime::intervalStringFormat($interval) . "
"; + $show_micro = true; + // print "COMPATIBLE Test-DEP: " . + // intervalStringFormatDeprecated( + // $interval, + // show_microseconds: $show_micro, + // show_only_days: true, + // skip_zero: false, + // skip_last_zero: false, + // truncate_nanoseconds: true, + // truncate_zero_seconds_if_microseconds: false + // ) . "
"; + print "COMPATIBLE Test-ACT: " . + DateTime::intervalStringFormat( + $interval, + show_microseconds: $show_micro, + show_only_days: true, + skip_zero: false, + skip_last_zero: false, + truncate_nanoseconds: true, + truncate_zero_seconds_if_microseconds: false + ) . "
"; + print "ORIGINAL: " . DateTime::timeStringFormat($interval, $show_micro) . "
"; +} catch (\UnexpectedValueException $e) { + print "ERROR: " . $e->getMessage() . "
" . $e . "

"; +} catch (\LengthException $e) { + print "ERROR interval: " . $e->getMessage() . "
" . $e . "

"; +} +print "
"; +$intervals = [ + ['i' => 0, 'sm' => true], + ['i' => 0.0, 'sm' => true], + ['i' => 1.5, 'sm' => true], + ['i' => 1.05, 'sm' => true], + ['i' => 1.005, 'sm' => true], + ['i' => 1.0005, 'sm' => true], +]; +foreach ($intervals as $int) { + $info = 'ts:' . $int['i'] . '|' . 'sm:' . $int['sm']; + print "[tsf] ZERO TIME STRING [$info]: " + . DateTime::timeStringFormat($int['i'], $int['sm']) . "
"; + print "[isf] ZERO TIME STRING [$info]: " + . DateTime::intervalStringFormat($int['i'], show_microseconds:$int['sm']) . "
"; +} +print "
"; +$intervals = [ + [ + 'i' => 788315.123456, + 'truncate_after' => '', + 'natural_seperator' => false, + 'name_space_seperator' => false, + 'show_microseconds' => true, + 'short_time_name' => true, + 'skip_last_zero' => false, + 'skip_zero' => true, + 'show_only_days' => false, + 'auto_fix_microseconds' => false, + 'truncate_nanoseconds' => false + ], + [ + 'i' => 788315.123456, + 'truncate_after' => '', + 'natural_seperator' => true, + 'name_space_seperator' => true, + 'show_microseconds' => true, + 'short_time_name' => true, + 'skip_last_zero' => false, + 'skip_zero' => true, + 'show_only_days' => false, + 'auto_fix_microseconds' => false, + 'truncate_nanoseconds' => false + ], +]; +foreach ($intervals as $int) { + $info = $int['i']; + try { + print "INTRVALSTRINGFORMAT(sm:0): $info: " + . DateTime::intervalStringFormat( + $int['i'], + truncate_after: (string)$int['truncate_after'], + natural_seperator: $int['natural_seperator'], + name_space_seperator: $int['name_space_seperator'], + show_microseconds: $int['show_microseconds'], + short_time_name: $int['short_time_name'], + skip_last_zero: $int['skip_last_zero'], + skip_zero: $int['skip_zero'], + show_only_days: $int['show_only_days'], + auto_fix_microseconds: $int['auto_fix_microseconds'], + truncate_nanoseconds: $int['truncate_nanoseconds'], + ) . "
"; + } catch (\UnexpectedValueException $e) { + print "ERROR: " . $e->getMessage() . "
" . $e . "

"; + } catch (\LengthException $e) { + print "ERROR interval: " . $e->getMessage() . "
" . $e . "

"; + } +} +print "
"; +// convert and reverste tests $intervals = [ 788315.123456, -123.456 @@ -74,6 +224,7 @@ foreach ($intervals as $interval) { print "TIMESTRINGFORMAT(sm:1): $interval: " . $reverse_interval . "
"; print "STRINGTOTIME: $reverse_interval: " . DateTime::stringToTime($reverse_interval) . "
"; } +print "
"; $check_dates = [ '2021-05-01', '2021-05-40' @@ -81,6 +232,7 @@ $check_dates = [ foreach ($check_dates as $check_date) { print "CHECKDATE: $check_date: " . (string)DateTime::checkDate($check_date) . "
"; } +print "
"; $check_datetimes = [ '2021-05-01', '2021-05-40', @@ -91,6 +243,7 @@ $check_datetimes = [ foreach ($check_datetimes as $check_datetime) { print "CHECKDATETIME: $check_datetime: " . (string)DateTime::checkDateTime($check_datetime) . "
"; } +print "
"; $compare_dates = [ [ '2021-05-01', '2021-05-02', ], [ '2021-05-02', '2021-05-01', ], @@ -102,6 +255,7 @@ foreach ($compare_dates as $compare_date) { print "COMPAREDATE: $compare_date[0] = $compare_date[1]: " . (string)DateTime::compareDate($compare_date[0], $compare_date[1]) . "
"; } +print "
"; $compare_datetimes = [ [ '2021-05-01', '2021-05-02', ], [ '2021-05-02', '2021-05-01', ], @@ -114,6 +268,7 @@ foreach ($compare_datetimes as $compare_datetime) { print "COMPAREDATE: $compare_datetime[0] = $compare_datetime[1]: " . (string)DateTime::compareDateTime($compare_datetime[0], $compare_datetime[1]) . "
"; } +print "
"; $compare_dates = [ [ '2021-05-01', '2021-05-10', ], [ '2021-05-10', '2021-05-01', ], @@ -126,7 +281,7 @@ foreach ($compare_dates as $compare_date) { print "CALCDAYSINTERVAL(named): $compare_date[0] = $compare_date[1]: " . DgS::printAr(DateTime::calcDaysInterval($compare_date[0], $compare_date[1], true)) . "
"; } - +print "
"; // test date conversion $dow = 2; print "DOW[$dow]: " . DateTime::setWeekdayNameFromIsoDow($dow) . "
"; @@ -142,7 +297,7 @@ $date = '2022-70-242'; print "DATE-dow[$date];invalid: " . DateTime::setWeekdayNameFromDate($date) . "
"; print "DATE-dow[$date],long;invalid: " . DateTime::setWeekdayNameFromDate($date, true) . "
"; print "DOW-date[$date];invalid: " . DateTime::setWeekdayNumberFromDate($date) . "
"; - +print "
"; // check date range includes a weekend // does not: $start_date = '2023-07-03'; @@ -165,4 +320,237 @@ print "Has Weekend: " . $start_date . " ~ " . $end_date . ": " print ""; +/** + * DEPREACTED, original rewrite, do not use + * + * update timeStringFormat with year and month support + * + * The following flags have to be set to be timeStringFormat compatible. + * Not that on seconds overflow this method will throw an exception, timeStringFormat returned -1s + * show_only_days: true, + * skip_zero: false, + * skip_last_zero: false, + * truncate_nanoseconds: true, + * truncate_zero_seconds_if_microseconds: false + * + * @param int|float $seconds Seconds to convert, maxium 6 decimals, + * else \UnexpectedValueException will be thrown + * if days too large or years too large \LengthException is thrown + * @param string $truncate_after [=''] Truncate after which time name, will not round, hard end + * values are parts names or interval short names (y, d, f, ...) + * if illegal value \UnexpectedValueException is thrown + * @param bool $natural_seperator [=false] use ',' and 'and', if off use space + * @param bool $name_space_seperator [=false] add a space between the number and the time name + * @param bool $show_microseconds [=true] show microseconds + * @param bool $short_time_name [=true] use the short time names (eg s instead of seconds) + * @param bool $skip_last_zero [=true] skip all trailing zero values, eg 5m 0s => 5m + * @param bool $skip_zero [=true] do not show zero values anywhere, eg 1h 0m 20s => 1h 20s + * @param bool $show_only_days [=false] do not show years or months, show only days + * if truncate after is set to year or month + * throws \UnexpectedValueException + * @param bool $auto_fix_microseconds [=false] if the micro seconds decimals are more than 6, round them + * on defaul throw \UnexpectedValueException + * @param bool $truncate_nanoseconds [=false] if microseconds decimals >3 then normal we show 123.4ms + * cut the .4 is set to true + * @param bool $truncate_zero_seconds_if_microseconds [=true] if we have 0.123 seconds then if true no seconds + * will be shown + * @return string + * @throws \UnexpectedValueException if seconds has more than 6 decimals + * if truncate has an illegal value + * if truncate is set to year or month and show_only_days is turned on + * @throws \LengthException if seconds is too large and show_days_only is selected and days is negetive + * or if years is negativ + */ +function intervalStringFormatDeprecated( + int|float $seconds, + string $truncate_after = '', + bool $natural_seperator = false, + bool $name_space_seperator = false, + bool $show_microseconds = true, + bool $short_time_name = true, + bool $skip_last_zero = true, + bool $skip_zero = true, + bool $show_only_days = false, + bool $auto_fix_microseconds = false, + bool $truncate_nanoseconds = false, + bool $truncate_zero_seconds_if_microseconds = true, +): string { + // auto fix long seconds, else \UnexpectedValueException will be thrown on error + // check if we have float and -> round to 6 + if ($auto_fix_microseconds === true && is_float($seconds)) { + $seconds = round($seconds, 6); + } + // flag negative + set abs + $negative = $seconds < 0 ? '-' : ''; + $seconds = abs($seconds); + // create base time + $date_now = new \DateTime("@0"); + try { + $date_seconds = new \DateTime("@$seconds"); + } catch (\Exception $e) { + throw new \UnexpectedValueException( + 'Seconds value is invalid, too large or more than six decimals: ' . $seconds, + 1, + $e + ); + } + $interval = date_diff($date_now, $date_seconds); + // if show_only_days and negative but input postive alert that this has to be done in y/m/d ... + if ($interval->y < 0) { + throw new \LengthException('Input seconds value is too large for years output: ' . $seconds, 2); + } elseif ($interval->days < 0 && $show_only_days === true) { + throw new \LengthException('Input seconds value is too large for days output: ' . $seconds, 3); + } + // array order is important, small too large + $parts = [ + 'microseconds' => 'f', + 'seconds' => 's', 'minutes' => 'i', 'hours' => 'h', + 'days' => 'd', 'months' => 'm', 'years' => 'y', + ]; + $short_name = [ + 'years' => 'y', 'months' => 'm', 'days' => 'd', + 'hours' => 'h', 'minutes' => 'm', 'seconds' => 's', + 'microseconds' => 'ms' + ]; + $skip = false; + if (!empty($truncate_after)) { + // if truncate after not in key or value in parts + if (!in_array($truncate_after, array_keys($parts)) && !in_array($truncate_after, array_values($parts))) { + throw new \UnexpectedValueException( + 'truncate_after has an invalid value: ' . $truncate_after, + 4 + ); + } + // if truncate after is y or m and we have show_only_days, throw exception + if ($show_only_days === true && in_array($truncate_after, ['y', 'years', 'm', 'months'])) { + throw new \UnexpectedValueException( + 'If show_only_days is turned on, the truncate_after cannot be years or months: ' + . $truncate_after, + 5 + ); + } + $skip = true; + } + $formatted = []; + $zero_list = []; + $zero_last_list = []; + $add_zero_seconds = false; + foreach ($parts as $time_name => $part) { + // end for micro seconds + if ($show_microseconds === false && $time_name == 'microseconds') { + continue; + } + // skip at this time position + if ($part == $truncate_after || $truncate_after == $time_name) { + $skip = false; + } + if ($skip === true) { + continue; + } + if ($show_only_days === true && $part == 'd') { + $value = $interval->days; + $skip = true; + } else { + $value = $interval->$part; + } + if ($value == 0 && $skip_last_zero === true) { + continue; + } + // print "-> V: $value | $part, $time_name | I: " . is_int($value) . " | F: " . is_float($value) + // . " | " . ($value != 0 ? 'Not zero' : 'ZERO') . "
"; + // var_dump($skip_last_zero); + if ($value != 0 || $skip_zero === false || $skip_last_zero === false) { + if ($part == 'f') { + if ($truncate_nanoseconds === true) { + $value = round($value, 3); + } + $value *= 1000; + // anything above that is nano seconds? + } + // on first hit turn off (full off) + if ($value) { + $skip_last_zero = null; + } elseif ($skip_last_zero === false) { + $zero_last_list[] = $part; + } + // build format + $format = "$value"; + if ($name_space_seperator) { + $format .= " "; + } + if ($short_time_name) { + $format .= $short_name[$time_name]; + } elseif ($value == 1) { + $format .= substr($time_name, 0, -1); + } else { + $format .= $time_name; + } + $formatted[] = $format; + } + // if we have 0 value, but only for skip zero condition + if ($skip_zero === false) { + if ($value == 0) { + $zero_list[] = $part; + } else { + $zero_list = []; + } + } + if ( + $part == 's' && $value == 0 && + $show_microseconds === true && + $truncate_zero_seconds_if_microseconds === false + ) { + $add_zero_seconds = true; + } + } + // if there is a zero list, strip that from the beginning, this is done always + if (count($zero_list)) { + // strip + $formatted = array_slice($formatted, 0, count($zero_list) * -1); + } elseif (count($zero_last_list) == count($formatted)) { + // if we have all skip empty last, then we do not have any value + $formatted = []; + } + $formatted = array_reverse($formatted); + // print "=> F: " . print_r($formatted, true) + // . " | Z: " . print_r($zero_list, true) + // . " | ZL: " . print_r($zero_last_list, true) + // . "
"; + if (count($formatted) == 0) { + // if we have truncate on, then we assume nothing was found + $str = "0"; + if ($name_space_seperator) { + $str .= " "; + } + // if truncate is on, we assume we found nothing + if (!empty($truncate_after)) { + if (in_array($truncate_after, array_values($parts))) { + $truncate_after = array_flip($parts)[$truncate_after]; + } + $str .= ($short_time_name ? $short_name[$truncate_after] : $truncate_after); + } else { + $str .= ($short_time_name ? $short_name['seconds'] : 'seconds'); + } + return $str; + } elseif (count($formatted) == 1) { + return $negative . + ($add_zero_seconds ? + '0' + . ($name_space_seperator ? ' ' : '') + . ($short_time_name ? $short_name['seconds'] : 'seconds') + . ' ' + : '' + ) + . $formatted[0]; + } elseif ($natural_seperator === false) { + return $negative . implode(' ', $formatted); + } else { + $str = implode(', ', array_slice($formatted, 0, -1)); + if (!empty($formatted[count($formatted) - 1])) { + $str .= ' and ' . $formatted[count($formatted) - 1]; + } + return $negative . $str; + } +} + // __END__ diff --git a/www/admin/class_test.db.dbReturn.php b/www/admin/class_test.db.dbReturn.php index c9d5a219..ec35ba26 100644 --- a/www/admin/class_test.db.dbReturn.php +++ b/www/admin/class_test.db.dbReturn.php @@ -56,7 +56,9 @@ print "dbReturn CACHE tests
"; $db->dbExec("DELETE FROM test_db_return"); $db->dbExec("INSERT INTO test_db_return (uid, data) VALUES ('A1', 'Test A'), ('B1', 'Test B')"); // read query to use -$q_db_ret = "SELECT * FROM test_db_return ORDER BY uid"; +$q_db_ret = <<dbCacheReset($q_db_ret); print "
"; print "Overall Run time: " . RunningTime::hrRunningTimeFromStart() . "
"; +print "
"; +print "PARAM TEST RUN
"; +// PARAM +$q_db_ret = <<dbReturnParams($q_db_ret, ['A1'], $db::NO_CACHE, true))) { + print "ROW: " . Support::printAr($res) . "
"; +} + // __END__ diff --git a/www/admin/class_test.db.query-placeholder.php b/www/admin/class_test.db.query-placeholder.php index 6da93482..da052c4e 100644 --- a/www/admin/class_test.db.query-placeholder.php +++ b/www/admin/class_test.db.query-placeholder.php @@ -115,6 +115,8 @@ echo "INSERT ALL COLUMN TYPES: " . "ERROR: " . $db->dbGetLastError(true) . "
"; echo "
"; +// test connectors: = , <> () for query detection + // convert placeholder tests // ? -> $n // :name -> $n diff --git a/www/admin/class_test.debug.php b/www/admin/class_test.debug.php index a19d8b9c..8141d383 100644 --- a/www/admin/class_test.debug.php +++ b/www/admin/class_test.debug.php @@ -170,6 +170,8 @@ class TestL { print "* GETCALLERCLASS(INSIDE CLASS): " . \CoreLibs\Debug\Support::getCallerClass() . "
"; print "* GETCALLERTOPCLASS(INSIDE CLASS): " . \CoreLibs\Debug\Support::getCallerTopLevelClass() . "
"; + print "* GETCALLSTACK(INSIDE CLASS): 
"
+			. DebugSupport::prAr(\CoreLibs\Debug\Support::getCallStack()) . "

"; $this->log->debug('TESTL', 'Logging in class testL' . ($ts !== null ? ': ' . $ts : '')); $this->log->debug('TESTL', 'Some other message'); return true; @@ -193,6 +195,8 @@ class TestR extends TestL { print "** GETCALLERCLASS(INSIDE EXTND CLASS): " . \CoreLibs\Debug\Support::getCallerClass() . "
"; print "** GETCALLERTOPCLASS(INSIDE EXTND CLASS): " . \CoreLibs\Debug\Support::getCallerTopLevelClass() . "
"; + print "** GETCALLSTACK(INSIDE EXTND CLASS): 
"
+			. DebugSupport::prAr(\CoreLibs\Debug\Support::getCallStack()) . "

"; $this->log->debug('TESTR', 'Logging in class testR (extends testL)'); $this->test('TESTR INSIDE'); $this->log->debug('TESTR', 'Array: ' diff --git a/www/admin/class_test.encryption.php b/www/admin/class_test.encryption.php index 77e16e23..60d16c7a 100644 --- a/www/admin/class_test.encryption.php +++ b/www/admin/class_test.encryption.php @@ -98,6 +98,13 @@ try { print "Error: " . $e->getMessage() . "
"; } +// echo "
"; +// $key = CreateKey::generateRandomKey(); +// $se = new SymmetricEncryption($key); +// $string = "I a some deep secret"; +// $encrypted = $se->encrypt($string); +// $decrypted = $se->decrypt($encrypted); + print ""; // __END__ diff --git a/www/admin/class_test.file.php b/www/admin/class_test.file.php index f2c26c17..0844c4bf 100644 --- a/www/admin/class_test.file.php +++ b/www/admin/class_test.file.php @@ -37,6 +37,7 @@ $file = '/some/path/to/some/file.txt'; print "GETFILENAMEENDING: $file: " . File::getFilenameEnding($file) . "
"; $file = getcwd() . DIRECTORY_SEPARATOR . 'class_test.file.php'; print "GETLINESFROMFILE: $file: " . File::getLinesFromFile($file) . "
"; +print "MIMEINFO: $file: " . File::getMimeType($file) . "
"; print ""; diff --git a/www/admin/class_test.image.php b/www/admin/class_test.image.php index 0ae756ba..21e8ee71 100644 --- a/www/admin/class_test.image.php +++ b/www/admin/class_test.image.php @@ -41,9 +41,9 @@ print '

' . $PAGE_NAME . '

'; $thumb_width = 250; $thumb_height = 300; // class -$image = BASE . LAYOUT . CONTENT_PATH . IMAGES . 'no_picture_square.jpg'; +$image = BASE . CONTENT_PATH . LAYOUT . IMAGES . 'no_picture_square.jpg'; // folders -$cache_folder = BASE . LAYOUT . CONTENT_PATH . CACHE . IMAGES; +$cache_folder = BASE . CONTENT_PATH . LAYOUT . CACHE . IMAGES; $web_folder = LAYOUT . CACHE . IMAGES; // rotate image first try { @@ -58,7 +58,7 @@ echo "
CLASS->CREATETHUMBNAILSIMPLE: " . basename($image) . ": WIDTH: $thumb_width
"; // static -$image = BASE . LAYOUT . CONTENT_PATH . IMAGES . 'no_picture.jpg'; +$image = BASE . CONTENT_PATH . LAYOUT . IMAGES . 'no_picture.jpg'; // rotate image first try { $image_class::correctImageOrientation($image); @@ -94,7 +94,7 @@ $images = array( // return mime type ala mimetype $finfo = new finfo(FILEINFO_MIME_TYPE); foreach ($images as $image) { - $image = BASE . LAYOUT . CONTENT_PATH . IMAGES . $image; + $image = BASE . CONTENT_PATH . LAYOUT . IMAGES . $image; list ($height, $width, $img_type) = \CoreLibs\Convert\SetVarType::setArray(getimagesize($image)); echo "
IMAGE INFO: " . $height . "x" . $width . ", TYPE: " . \CoreLibs\Debug\Support::dumpVar($img_type) . " [" . $finfo->file($image) . "]
"; diff --git a/www/admin/edit_base_page_test.php b/www/admin/edit_base_page_test.php index dd4fc48d..0ecc3bb3 100644 --- a/www/admin/edit_base_page_test.php +++ b/www/admin/edit_base_page_test.php @@ -3,4 +3,3 @@ // empty file for add and remove test // __END__ - diff --git a/www/admin/layout b/www/admin/layout deleted file mode 120000 index 1ee50f67..00000000 --- a/www/admin/layout +++ /dev/null @@ -1 +0,0 @@ -../layout/admin/ \ No newline at end of file diff --git a/www/layout/admin/cache/.gitignore b/www/admin/layout/cache/.gitignore similarity index 100% rename from www/layout/admin/cache/.gitignore rename to www/admin/layout/cache/.gitignore diff --git a/www/layout/admin/css/edit.css b/www/admin/layout/css/edit.css similarity index 100% rename from www/layout/admin/css/edit.css rename to www/admin/layout/css/edit.css diff --git a/www/layout/admin/css/file-uploader/fileuploader.css b/www/admin/layout/css/file-uploader/fileuploader.css similarity index 100% rename from www/layout/admin/css/file-uploader/fileuploader.css rename to www/admin/layout/css/file-uploader/fileuploader.css diff --git a/www/layout/admin/css/smarty_test.css b/www/admin/layout/css/smarty_test.css similarity index 100% rename from www/layout/admin/css/smarty_test.css rename to www/admin/layout/css/smarty_test.css diff --git a/www/layout/admin/images/img_2145.heic b/www/admin/layout/images/img_2145.heic similarity index 100% rename from www/layout/admin/images/img_2145.heic rename to www/admin/layout/images/img_2145.heic diff --git a/www/layout/admin/images/jpeg_a.jpg b/www/admin/layout/images/jpeg_a.jpg similarity index 100% rename from www/layout/admin/images/jpeg_a.jpg rename to www/admin/layout/images/jpeg_a.jpg diff --git a/www/layout/admin/images/jpeg_b.jpg b/www/admin/layout/images/jpeg_b.jpg similarity index 100% rename from www/layout/admin/images/jpeg_b.jpg rename to www/admin/layout/images/jpeg_b.jpg diff --git a/www/layout/admin/images/jpeg_c.jpg b/www/admin/layout/images/jpeg_c.jpg similarity index 100% rename from www/layout/admin/images/jpeg_c.jpg rename to www/admin/layout/images/jpeg_c.jpg diff --git a/www/layout/admin/images/no_picture.jpg b/www/admin/layout/images/no_picture.jpg similarity index 100% rename from www/layout/admin/images/no_picture.jpg rename to www/admin/layout/images/no_picture.jpg diff --git a/www/layout/admin/images/no_picture.png b/www/admin/layout/images/no_picture.png similarity index 100% rename from www/layout/admin/images/no_picture.png rename to www/admin/layout/images/no_picture.png diff --git a/www/layout/admin/images/no_picture_square.jpg b/www/admin/layout/images/no_picture_square.jpg similarity index 100% rename from www/layout/admin/images/no_picture_square.jpg rename to www/admin/layout/images/no_picture_square.jpg diff --git a/www/layout/admin/images/no_picture_square.png b/www/admin/layout/images/no_picture_square.png similarity index 100% rename from www/layout/admin/images/no_picture_square.png rename to www/admin/layout/images/no_picture_square.png diff --git a/www/layout/admin/images/no_picture_width_bigger.jpg b/www/admin/layout/images/no_picture_width_bigger.jpg similarity index 100% rename from www/layout/admin/images/no_picture_width_bigger.jpg rename to www/admin/layout/images/no_picture_width_bigger.jpg diff --git a/www/layout/admin/images/no_picture_width_bigger.png b/www/admin/layout/images/no_picture_width_bigger.png similarity index 100% rename from www/layout/admin/images/no_picture_width_bigger.png rename to www/admin/layout/images/no_picture_width_bigger.png diff --git a/www/layout/admin/images/photoshop_test.psd b/www/admin/layout/images/photoshop_test.psd similarity index 100% rename from www/layout/admin/images/photoshop_test.psd rename to www/admin/layout/images/photoshop_test.psd diff --git a/www/layout/admin/images/tiff_compressed_lzw.tif b/www/admin/layout/images/tiff_compressed_lzw.tif similarity index 100% rename from www/layout/admin/images/tiff_compressed_lzw.tif rename to www/admin/layout/images/tiff_compressed_lzw.tif diff --git a/www/layout/admin/images/tiff_compressed_zip.tif b/www/admin/layout/images/tiff_compressed_zip.tif similarity index 100% rename from www/layout/admin/images/tiff_compressed_zip.tif rename to www/admin/layout/images/tiff_compressed_zip.tif diff --git a/www/layout/admin/images/tiff_uncompressed.tif b/www/admin/layout/images/tiff_uncompressed.tif similarity index 100% rename from www/layout/admin/images/tiff_uncompressed.tif rename to www/admin/layout/images/tiff_uncompressed.tif diff --git a/www/layout/admin/javascript/calendar/dhtmlgoodies_calendar.css b/www/admin/layout/javascript/calendar/dhtmlgoodies_calendar.css similarity index 100% rename from www/layout/admin/javascript/calendar/dhtmlgoodies_calendar.css rename to www/admin/layout/javascript/calendar/dhtmlgoodies_calendar.css diff --git a/www/layout/admin/javascript/calendar/dhtmlgoodies_calendar.js b/www/admin/layout/javascript/calendar/dhtmlgoodies_calendar.js similarity index 100% rename from www/layout/admin/javascript/calendar/dhtmlgoodies_calendar.js rename to www/admin/layout/javascript/calendar/dhtmlgoodies_calendar.js diff --git a/www/layout/admin/javascript/datepickr/datepickr.init.js b/www/admin/layout/javascript/datepickr/datepickr.init.js similarity index 100% rename from www/layout/admin/javascript/datepickr/datepickr.init.js rename to www/admin/layout/javascript/datepickr/datepickr.init.js diff --git a/www/layout/admin/javascript/datepickr/datepickr.min.css b/www/admin/layout/javascript/datepickr/datepickr.min.css similarity index 100% rename from www/layout/admin/javascript/datepickr/datepickr.min.css rename to www/admin/layout/javascript/datepickr/datepickr.min.css diff --git a/www/layout/admin/javascript/datepickr/datepickr.min.js b/www/admin/layout/javascript/datepickr/datepickr.min.js similarity index 100% rename from www/layout/admin/javascript/datepickr/datepickr.min.js rename to www/admin/layout/javascript/datepickr/datepickr.min.js diff --git a/www/layout/admin/javascript/debug.js b/www/admin/layout/javascript/debug.js similarity index 100% rename from www/layout/admin/javascript/debug.js rename to www/admin/layout/javascript/debug.js diff --git a/www/layout/admin/javascript/dhtmlxTree/dhtmlxcommon.js b/www/admin/layout/javascript/dhtmlxTree/dhtmlxcommon.js similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/dhtmlxcommon.js rename to www/admin/layout/javascript/dhtmlxTree/dhtmlxcommon.js diff --git a/www/layout/admin/javascript/dhtmlxTree/dhtmlxtree.css b/www/admin/layout/javascript/dhtmlxTree/dhtmlxtree.css similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/dhtmlxtree.css rename to www/admin/layout/javascript/dhtmlxTree/dhtmlxtree.css diff --git a/www/layout/admin/javascript/dhtmlxTree/dhtmlxtree.js b/www/admin/layout/javascript/dhtmlxTree/dhtmlxtree.js similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/dhtmlxtree.js rename to www/admin/layout/javascript/dhtmlxTree/dhtmlxtree.js diff --git a/www/layout/admin/javascript/dhtmlxTree/ext/dhtmlxtree_dragin.js b/www/admin/layout/javascript/dhtmlxTree/ext/dhtmlxtree_dragin.js similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/ext/dhtmlxtree_dragin.js rename to www/admin/layout/javascript/dhtmlxTree/ext/dhtmlxtree_dragin.js diff --git a/www/layout/admin/javascript/dhtmlxTree/ext/dhtmlxtree_ed.js b/www/admin/layout/javascript/dhtmlxTree/ext/dhtmlxtree_ed.js similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/ext/dhtmlxtree_ed.js rename to www/admin/layout/javascript/dhtmlxTree/ext/dhtmlxtree_ed.js diff --git a/www/layout/admin/javascript/dhtmlxTree/ext/dhtmlxtree_er.js b/www/admin/layout/javascript/dhtmlxTree/ext/dhtmlxtree_er.js similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/ext/dhtmlxtree_er.js rename to www/admin/layout/javascript/dhtmlxTree/ext/dhtmlxtree_er.js diff --git a/www/layout/admin/javascript/dhtmlxTree/ext/dhtmlxtree_json.js b/www/admin/layout/javascript/dhtmlxTree/ext/dhtmlxtree_json.js similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/ext/dhtmlxtree_json.js rename to www/admin/layout/javascript/dhtmlxTree/ext/dhtmlxtree_json.js diff --git a/www/layout/admin/javascript/dhtmlxTree/ext/dhtmlxtree_start.js b/www/admin/layout/javascript/dhtmlxTree/ext/dhtmlxtree_start.js similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/ext/dhtmlxtree_start.js rename to www/admin/layout/javascript/dhtmlxTree/ext/dhtmlxtree_start.js diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/blank.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/blank.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/blank.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/blank.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/but_cut.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/but_cut.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/but_cut.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/but_cut.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/blank.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/blank.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/blank.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/blank.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/book.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/book.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/book.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/book.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/book_titel.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/book_titel.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/book_titel.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/book_titel.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/but_cut.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/but_cut.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/but_cut.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/but_cut.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/close2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/close2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/close2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/close2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/folderClosed.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/folderClosed.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/folderClosed.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/folderClosed.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/folderOpen.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/folderOpen.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/folderOpen.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/folderOpen.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/iconCheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/iconCheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/iconCheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/iconCheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/iconCheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/iconCheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/iconCheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/iconCheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/iconCheckGray.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/iconCheckGray.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/iconCheckGray.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/iconCheckGray.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/iconChecked.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/iconChecked.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/iconChecked.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/iconChecked.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/iconSafe.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/iconSafe.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/iconSafe.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/iconSafe.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/iconText.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/iconText.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/iconText.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/iconText.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/iconUncheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/iconUncheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/iconUncheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/iconUncheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/iconUncheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/iconUncheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/iconUncheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/iconUncheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/leaf.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/leaf.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/leaf.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/leaf.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line1_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line1_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line1_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line1_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line2_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line2_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line2_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line2_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line3_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line3_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line3_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line3_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line4_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line4_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/line4_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/line4_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/lock.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/lock.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/lock.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/lock.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus2_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus2_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus2_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus2_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus3_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus3_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus3_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus3_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus4_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus4_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus4_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus4_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus5_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus5_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/minus5_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/minus5_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus2_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus2_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus2_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus2_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus3_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus3_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus3_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus3_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus4_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus4_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus4_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus4_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus5_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus5_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/plus5_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/plus5_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/radio_off.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/radio_off.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/radio_off.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/radio_off.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/radio_on.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/radio_on.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/radio_on.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/radio_on.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/tombs.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/tombs.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluebooks/tombs.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluebooks/tombs.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/blank.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/blank.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/blank.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/blank.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/folderClosed.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/folderClosed.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/folderClosed.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/folderClosed.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/folderOpen.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/folderOpen.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/folderOpen.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/folderOpen.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconCheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconCheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconCheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconCheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconCheckAll_2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconCheckAll_2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconCheckAll_2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconCheckAll_2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconCheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconCheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconCheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconCheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconCheckGray.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconCheckGray.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconCheckGray.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconCheckGray.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconChecked.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconChecked.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconChecked.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconChecked.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconFlag.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconFlag.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconFlag.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconFlag.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconGraph.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconGraph.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconGraph.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconGraph.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconSound.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconSound.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconSound.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconSound.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconText.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconText.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconText.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconText.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconTexts.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconTexts.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconTexts.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconTexts.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconUncheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconUncheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconUncheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconUncheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconUncheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconUncheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconUncheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconUncheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconWrite1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconWrite1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconWrite1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconWrite1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconWrite2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconWrite2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/iconWrite2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/iconWrite2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/leaf.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/leaf.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/leaf.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/leaf.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/line.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/line.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/line.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/line.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/line1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/line1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/line1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/line1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/line2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/line2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/line2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/line2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/line3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/line3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/line3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/line3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/line4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/line4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/line4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/line4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/lock.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/lock.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/lock.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/lock.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/minus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/minus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/minus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/minus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/minus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/minus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/minus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/minus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/minus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/minus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/minus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/minus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/minus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/minus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/minus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/minus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/minus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/minus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/minus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/minus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/minus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/minus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/minus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/minus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/plus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/plus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/plus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/plus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/plus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/plus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/plus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/plus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/plus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/plus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/plus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/plus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/plus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/plus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/plus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/plus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/plus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/plus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/plus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/plus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/plus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/plus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/plus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/plus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/radio_off.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/radio_off.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/radio_off.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/radio_off.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/radio_on.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/radio_on.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_bluefolders/radio_on.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_bluefolders/radio_on.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/blank.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/blank.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/blank.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/blank.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/folderClosed.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/folderClosed.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/folderClosed.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/folderClosed.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/folderOpen.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/folderOpen.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/folderOpen.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/folderOpen.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/iconCheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/iconCheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/iconCheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/iconCheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/iconCheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/iconCheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/iconCheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/iconCheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/iconCheckGray.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/iconCheckGray.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/iconCheckGray.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/iconCheckGray.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/iconUncheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/iconUncheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/iconUncheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/iconUncheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/iconUncheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/iconUncheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/iconUncheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/iconUncheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/leaf.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/leaf.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/leaf.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/leaf.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/line.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/line.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/line.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/line.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/line1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/line1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/line1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/line1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/line2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/line2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/line2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/line2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/line3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/line3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/line3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/line3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/line4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/line4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/line4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/line4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/lock.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/lock.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/lock.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/lock.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/minus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/minus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/minus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/minus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/minus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/minus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/minus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/minus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/minus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/minus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/minus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/minus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/minus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/minus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/minus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/minus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/minus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/minus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/minus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/minus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/minus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/minus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/minus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/minus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/plus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/plus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/plus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/plus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/plus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/plus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/plus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/plus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/plus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/plus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/plus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/plus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/plus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/plus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/plus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/plus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/plus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/plus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/plus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/plus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/plus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/plus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/plus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/plus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/radio_off.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/radio_off.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/radio_off.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/radio_off.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/radio_on.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/radio_on.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/radio_on.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/radio_on.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/tombs.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/tombs.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/tombs.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/tombs.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/tombs_open.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/tombs_open.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_books/tombs_open.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_books/tombs_open.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/blank.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/blank.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/blank.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/blank.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/folderClosed.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/folderClosed.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/folderClosed.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/folderClosed.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/folderOpen.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/folderOpen.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/folderOpen.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/folderOpen.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconCheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconCheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconCheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconCheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconCheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconCheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconCheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconCheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconCheckGray.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconCheckGray.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconCheckGray.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconCheckGray.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconChecked.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconChecked.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconChecked.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconChecked.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconFlag.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconFlag.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconFlag.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconFlag.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconGraph.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconGraph.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconGraph.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconGraph.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconSound.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconSound.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconSound.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconSound.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconText.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconText.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconText.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconText.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconTexts.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconTexts.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconTexts.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconTexts.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconUncheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconUncheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconUncheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconUncheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconUncheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconUncheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconUncheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconUncheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconWrite1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconWrite1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconWrite1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconWrite1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconWrite2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconWrite2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconWrite2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/iconWrite2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/leaf.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/leaf.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/leaf.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/leaf.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/line4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/lock.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/lock.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/lock.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/lock.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/minus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/plus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/radio_off.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/radio_off.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/radio_off.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/radio_off.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/radio_on.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/radio_on.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/radio_on.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_dhx_skyblue/radio_on.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/blank.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/blank.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/blank.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/blank.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/folderClosed.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/folderClosed.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/folderClosed.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/folderClosed.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/folderOpen.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/folderOpen.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/folderOpen.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/folderOpen.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconCheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconCheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconCheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconCheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconCheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconCheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconCheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconCheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconCheckGray.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconCheckGray.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconCheckGray.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconCheckGray.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconChecked.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconChecked.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconChecked.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconChecked.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconFlag.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconFlag.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconFlag.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconFlag.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconGraph.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconGraph.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconGraph.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconGraph.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconSound.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconSound.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconSound.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconSound.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconText.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconText.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconText.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconText.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconTexts.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconTexts.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconTexts.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconTexts.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconUncheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconUncheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconUncheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconUncheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconUncheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconUncheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconUncheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconUncheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconWrite1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconWrite1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconWrite1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconWrite1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconWrite2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconWrite2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/iconWrite2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/iconWrite2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/leaf.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/leaf.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/leaf.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/leaf.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/line.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/line.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/line.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/line.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/line1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/line1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/line1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/line1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/line2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/line2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/line2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/line2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/line3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/line3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/line3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/line3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/line4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/line4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/line4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/line4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/lock.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/lock.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/lock.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/lock.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/minus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/minus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/minus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/minus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/minus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/minus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/minus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/minus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/minus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/minus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/minus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/minus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/minus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/minus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/minus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/minus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/minus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/minus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/minus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/minus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/minus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/minus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/minus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/minus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/plus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/plus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/plus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/plus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/plus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/plus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/plus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/plus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/plus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/plus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/plus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/plus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/plus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/plus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/plus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/plus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/plus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/plus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/plus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/plus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/plus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/plus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/plus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/plus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/radio_off.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/radio_off.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/radio_off.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/radio_off.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/radio_on.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/radio_on.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/radio_on.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/radio_on.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/safe_close.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/safe_close.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/safe_close.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/safe_close.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/safe_open.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/safe_open.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_scbrblue/safe_open.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_scbrblue/safe_open.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/blank.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/blank.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/blank.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/blank.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fc.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fc.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fc.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fc.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fc_change.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fc_change.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fc_change.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fc_change.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fc_delete.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fc_delete.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fc_delete.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fc_delete.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fc_info.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fc_info.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fc_info.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fc_info.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fc_new.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fc_new.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fc_new.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fc_new.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fc_sync.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fc_sync.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fc_sync.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fc_sync.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fc_sync_del.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fc_sync_del.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fc_sync_del.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fc_sync_del.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fo.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fo.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fo.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fo.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fo_change.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fo_change.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fo_change.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fo_change.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fo_delete.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fo_delete.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fo_delete.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fo_delete.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fo_info.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fo_info.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fo_info.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fo_info.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fo_new.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fo_new.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fo_new.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fo_new.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fo_sync.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fo_sync.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fo_sync.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fo_sync.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fo_sync_del.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fo_sync_del.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/fo_sync_del.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/fo_sync_del.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderClosed.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderClosed.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderClosed.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderClosed.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_change.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_change.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_change.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_change.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_delete.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_delete.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_delete.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_delete.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_info.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_info.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_info.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_info.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_new.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_new.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_new.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_new.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_sync.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_sync.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_sync.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_sync.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_sync_del.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_sync_del.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_sync_del.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderClosed_sync_del.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderOpen.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderOpen.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderOpen.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderOpen.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_change.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_change.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_change.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_change.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_delete.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_delete.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_delete.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_delete.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_info.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_info.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_info.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_info.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_new.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_new.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_new.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_new.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_sync.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_sync.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_sync.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_sync.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_sync_del.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_sync_del.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_sync_del.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/folderOpen_sync_del.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconCheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconCheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconCheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconCheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconCheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconCheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconCheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconCheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconCheckGray.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconCheckGray.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconCheckGray.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconCheckGray.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconChecked.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconChecked.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconChecked.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconChecked.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconFlag.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconFlag.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconFlag.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconFlag.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconGraph.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconGraph.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconGraph.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconGraph.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconSound.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconSound.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconSound.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconSound.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconText.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconText.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconText.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconText.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconTexts.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconTexts.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconTexts.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconTexts.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconUncheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconUncheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconUncheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconUncheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconUncheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconUncheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconUncheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconUncheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconWrite1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconWrite1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconWrite1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconWrite1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconWrite2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconWrite2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/iconWrite2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/iconWrite2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/leaf.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/leaf.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/leaf.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/leaf.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/leaf_change.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/leaf_change.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/leaf_change.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/leaf_change.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/leaf_delete.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/leaf_delete.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/leaf_delete.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/leaf_delete.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/leaf_new.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/leaf_new.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/leaf_new.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/leaf_new.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/leaf_sync.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/leaf_sync.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/leaf_sync.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/leaf_sync.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/leaf_sync_del.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/leaf_sync_del.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/leaf_sync_del.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/leaf_sync_del.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/line.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/line.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/line.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/line.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/line1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/line1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/line1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/line1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/line2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/line2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/line2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/line2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/line3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/line3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/line3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/line3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/line4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/line4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/line4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/line4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/lock.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/lock.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/lock.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/lock.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/minus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/minus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/minus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/minus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/minus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/minus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/minus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/minus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/minus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/minus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/minus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/minus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/minus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/minus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/minus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/minus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/minus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/minus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/minus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/minus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/minus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/minus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/minus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/minus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/plus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/plus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/plus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/plus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/plus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/plus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/plus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/plus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/plus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/plus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/plus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/plus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/plus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/plus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/plus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/plus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/plus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/plus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/plus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/plus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/plus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/plus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/plus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/plus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/radio_off.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/radio_off.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/radio_off.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/radio_off.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/radio_on.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/radio_on.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_vista/radio_on.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_vista/radio_on.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/blank.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/blank.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/blank.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/blank.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/folderClosed.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/folderClosed.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/folderClosed.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/folderClosed.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/folderOpen.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/folderOpen.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/folderOpen.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/folderOpen.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconCheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconCheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconCheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconCheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconCheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconCheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconCheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconCheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconCheckGray.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconCheckGray.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconCheckGray.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconCheckGray.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconChecked.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconChecked.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconChecked.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconChecked.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconFlag.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconFlag.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconFlag.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconFlag.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconGraph.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconGraph.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconGraph.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconGraph.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconSound.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconSound.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconSound.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconSound.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconText.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconText.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconText.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconText.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconTexts.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconTexts.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconTexts.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconTexts.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconUncheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconUncheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconUncheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconUncheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconUncheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconUncheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconUncheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconUncheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconWrite1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconWrite1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconWrite1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconWrite1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconWrite2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconWrite2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/iconWrite2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/iconWrite2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/leaf.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/leaf.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/leaf.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/leaf.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/leaves.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/leaves.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/leaves.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/leaves.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/line.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/line.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/line.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/line.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/line1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/line1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/line1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/line1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/line2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/line2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/line2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/line2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/line3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/line3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/line3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/line3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/line4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/line4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/line4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/line4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/lock.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/lock.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/lock.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/lock.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/minus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/minus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/minus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/minus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/minus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/minus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/minus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/minus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/minus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/minus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/minus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/minus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/minus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/minus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/minus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/minus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/minus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/minus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/minus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/minus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/minus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/minus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/minus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/minus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/plus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/plus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/plus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/plus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/plus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/plus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/plus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/plus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/plus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/plus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/plus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/plus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/plus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/plus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/plus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/plus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/plus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/plus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/plus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/plus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/plus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/plus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/plus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/plus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/radio_off.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/radio_off.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/radio_off.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/radio_off.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/radio_on.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/radio_on.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_winstyle/radio_on.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_winstyle/radio_on.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/blank.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/blank.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/blank.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/blank.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/books_close.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/books_close.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/books_close.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/books_close.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/books_open.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/books_open.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/books_open.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/books_open.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/folderClosed.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/folderClosed.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/folderClosed.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/folderClosed.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/folderOpen.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/folderOpen.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/folderOpen.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/folderOpen.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconCheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconCheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconCheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconCheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconCheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconCheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconCheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconCheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconCheckGray.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconCheckGray.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconCheckGray.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconCheckGray.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconText.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconText.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconText.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconText.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconUncheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconUncheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconUncheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconUncheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconUncheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconUncheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconUncheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/iconUncheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/leaf.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/leaf.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/leaf.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/leaf.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/leaf2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/leaf2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/leaf2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/leaf2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/leaf3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/leaf3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/leaf3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/leaf3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/leaf_2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/leaf_2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/leaf_2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/leaf_2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/line.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/line.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/line.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/line.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/line1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/line1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/line1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/line1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/line2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/line2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/line2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/line2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/line3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/line3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/line3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/line3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/line4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/line4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/line4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/line4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/lock.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/lock.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/lock.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/lock.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/minus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/plus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/radio_off.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/radio_off.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/radio_off.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/radio_off.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/radio_on.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/radio_on.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/radio_on.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/radio_on.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/tombs.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/tombs.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/tombs.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/tombs.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/tombs_open.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/tombs_open.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/csh_yellowbooks/tombs_open.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/csh_yellowbooks/tombs_open.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/folderClosed.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/folderClosed.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/folderClosed.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/folderClosed.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/folderOpen.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/folderOpen.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/folderOpen.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/folderOpen.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/iconCheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/iconCheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/iconCheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/iconCheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/iconCheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/iconCheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/iconCheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/iconCheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/iconCheckGray.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/iconCheckGray.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/iconCheckGray.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/iconCheckGray.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/iconUncheckAll.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/iconUncheckAll.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/iconUncheckAll.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/iconUncheckAll.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/iconUncheckDis.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/iconUncheckDis.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/iconUncheckDis.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/iconUncheckDis.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/leaf.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/leaf.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/leaf.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/leaf.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/line.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/line.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/line.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/line.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/line1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/line1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/line1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/line1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/line1_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/line1_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/line1_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/line1_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/line2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/line2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/line2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/line2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/line2_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/line2_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/line2_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/line2_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/line3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/line3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/line3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/line3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/line3_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/line3_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/line3_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/line3_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/line4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/line4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/line4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/line4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/line4_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/line4_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/line4_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/line4_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/lock.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/lock.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/lock.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/lock.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/minus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/minus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/minus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/minus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/minus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/minus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/minus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/minus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/minus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/minus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/minus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/minus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/minus2_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/minus2_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/minus2_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/minus2_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/minus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/minus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/minus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/minus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/minus3_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/minus3_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/minus3_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/minus3_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/minus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/minus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/minus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/minus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/minus4_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/minus4_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/minus4_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/minus4_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/minus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/minus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/minus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/minus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/minus5_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/minus5_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/minus5_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/minus5_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/minus_ar.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/minus_ar.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/minus_ar.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/minus_ar.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/plus.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/plus.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/plus.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/plus.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/plus1.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/plus1.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/plus1.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/plus1.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/plus2.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/plus2.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/plus2.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/plus2.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/plus2_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/plus2_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/plus2_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/plus2_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/plus3.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/plus3.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/plus3.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/plus3.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/plus3_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/plus3_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/plus3_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/plus3_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/plus4.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/plus4.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/plus4.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/plus4.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/plus4_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/plus4_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/plus4_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/plus4_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/plus5.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/plus5.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/plus5.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/plus5.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/plus5_rtl.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/plus5_rtl.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/plus5_rtl.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/plus5_rtl.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/plus_ar.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/plus_ar.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/plus_ar.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/plus_ar.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/radio_off.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/radio_off.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/radio_off.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/radio_off.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/radio_on.gif b/www/admin/layout/javascript/dhtmlxTree/imgs/radio_on.gif similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/radio_on.gif rename to www/admin/layout/javascript/dhtmlxTree/imgs/radio_on.gif diff --git a/www/layout/admin/javascript/dhtmlxTree/imgs/sky_blue_sel_tree.png b/www/admin/layout/javascript/dhtmlxTree/imgs/sky_blue_sel_tree.png similarity index 100% rename from www/layout/admin/javascript/dhtmlxTree/imgs/sky_blue_sel_tree.png rename to www/admin/layout/javascript/dhtmlxTree/imgs/sky_blue_sel_tree.png diff --git a/www/layout/admin/javascript/edit.jq.js b/www/admin/layout/javascript/edit.jq.js similarity index 100% rename from www/layout/admin/javascript/edit.jq.js rename to www/admin/layout/javascript/edit.jq.js diff --git a/www/layout/admin/javascript/edit.js b/www/admin/layout/javascript/edit.js similarity index 100% rename from www/layout/admin/javascript/edit.js rename to www/admin/layout/javascript/edit.js diff --git a/www/layout/admin/javascript/edit.pt.js b/www/admin/layout/javascript/edit.pt.js similarity index 100% rename from www/layout/admin/javascript/edit.pt.js rename to www/admin/layout/javascript/edit.pt.js diff --git a/www/layout/admin/javascript/file-uploader/fileuploader.js b/www/admin/layout/javascript/file-uploader/fileuploader.js similarity index 100% rename from www/layout/admin/javascript/file-uploader/fileuploader.js rename to www/admin/layout/javascript/file-uploader/fileuploader.js diff --git a/www/layout/admin/javascript/fineuploader/s3/LICENSE b/www/admin/layout/javascript/fineuploader/s3/LICENSE similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/LICENSE rename to www/admin/layout/javascript/fineuploader/s3/LICENSE diff --git a/www/layout/admin/javascript/fineuploader/s3/_build/fine-uploader-new.css b/www/admin/layout/javascript/fineuploader/s3/_build/fine-uploader-new.css similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/_build/fine-uploader-new.css rename to www/admin/layout/javascript/fineuploader/s3/_build/fine-uploader-new.css diff --git a/www/layout/admin/javascript/fineuploader/s3/continue.gif b/www/admin/layout/javascript/fineuploader/s3/continue.gif similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/continue.gif rename to www/admin/layout/javascript/fineuploader/s3/continue.gif diff --git a/www/layout/admin/javascript/fineuploader/s3/dnd.js b/www/admin/layout/javascript/fineuploader/s3/dnd.js similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/dnd.js rename to www/admin/layout/javascript/fineuploader/s3/dnd.js diff --git a/www/layout/admin/javascript/fineuploader/s3/dnd.js.map b/www/admin/layout/javascript/fineuploader/s3/dnd.js.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/dnd.js.map rename to www/admin/layout/javascript/fineuploader/s3/dnd.js.map diff --git a/www/layout/admin/javascript/fineuploader/s3/dnd.min.js b/www/admin/layout/javascript/fineuploader/s3/dnd.min.js similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/dnd.min.js rename to www/admin/layout/javascript/fineuploader/s3/dnd.min.js diff --git a/www/layout/admin/javascript/fineuploader/s3/dnd.min.js.map b/www/admin/layout/javascript/fineuploader/s3/dnd.min.js.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/dnd.min.js.map rename to www/admin/layout/javascript/fineuploader/s3/dnd.min.js.map diff --git a/www/layout/admin/javascript/fineuploader/s3/edit.gif b/www/admin/layout/javascript/fineuploader/s3/edit.gif similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/edit.gif rename to www/admin/layout/javascript/fineuploader/s3/edit.gif diff --git a/www/layout/admin/javascript/fineuploader/s3/fine-uploader-gallery.css b/www/admin/layout/javascript/fineuploader/s3/fine-uploader-gallery.css similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/fine-uploader-gallery.css rename to www/admin/layout/javascript/fineuploader/s3/fine-uploader-gallery.css diff --git a/www/layout/admin/javascript/fineuploader/s3/fine-uploader-gallery.min.css b/www/admin/layout/javascript/fineuploader/s3/fine-uploader-gallery.min.css similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/fine-uploader-gallery.min.css rename to www/admin/layout/javascript/fineuploader/s3/fine-uploader-gallery.min.css diff --git a/www/layout/admin/javascript/fineuploader/s3/fine-uploader-gallery.min.css.map b/www/admin/layout/javascript/fineuploader/s3/fine-uploader-gallery.min.css.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/fine-uploader-gallery.min.css.map rename to www/admin/layout/javascript/fineuploader/s3/fine-uploader-gallery.min.css.map diff --git a/www/layout/admin/javascript/fineuploader/s3/fine-uploader-new.css b/www/admin/layout/javascript/fineuploader/s3/fine-uploader-new.css similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/fine-uploader-new.css rename to www/admin/layout/javascript/fineuploader/s3/fine-uploader-new.css diff --git a/www/layout/admin/javascript/fineuploader/s3/fine-uploader-new.min.css b/www/admin/layout/javascript/fineuploader/s3/fine-uploader-new.min.css similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/fine-uploader-new.min.css rename to www/admin/layout/javascript/fineuploader/s3/fine-uploader-new.min.css diff --git a/www/layout/admin/javascript/fineuploader/s3/fine-uploader-new.min.css.map b/www/admin/layout/javascript/fineuploader/s3/fine-uploader-new.min.css.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/fine-uploader-new.min.css.map rename to www/admin/layout/javascript/fineuploader/s3/fine-uploader-new.min.css.map diff --git a/www/layout/admin/javascript/fineuploader/s3/fine-uploader.css b/www/admin/layout/javascript/fineuploader/s3/fine-uploader.css similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/fine-uploader.css rename to www/admin/layout/javascript/fineuploader/s3/fine-uploader.css diff --git a/www/layout/admin/javascript/fineuploader/s3/fine-uploader.min.css b/www/admin/layout/javascript/fineuploader/s3/fine-uploader.min.css similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/fine-uploader.min.css rename to www/admin/layout/javascript/fineuploader/s3/fine-uploader.min.css diff --git a/www/layout/admin/javascript/fineuploader/s3/fine-uploader.min.css.map b/www/admin/layout/javascript/fineuploader/s3/fine-uploader.min.css.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/fine-uploader.min.css.map rename to www/admin/layout/javascript/fineuploader/s3/fine-uploader.min.css.map diff --git a/www/layout/admin/javascript/fineuploader/s3/loading.gif b/www/admin/layout/javascript/fineuploader/s3/loading.gif similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/loading.gif rename to www/admin/layout/javascript/fineuploader/s3/loading.gif diff --git a/www/layout/admin/javascript/fineuploader/s3/pause.gif b/www/admin/layout/javascript/fineuploader/s3/pause.gif similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/pause.gif rename to www/admin/layout/javascript/fineuploader/s3/pause.gif diff --git a/www/layout/admin/javascript/fineuploader/s3/placeholders/not_available-generic.png b/www/admin/layout/javascript/fineuploader/s3/placeholders/not_available-generic.png similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/placeholders/not_available-generic.png rename to www/admin/layout/javascript/fineuploader/s3/placeholders/not_available-generic.png diff --git a/www/layout/admin/javascript/fineuploader/s3/placeholders/waiting-generic.png b/www/admin/layout/javascript/fineuploader/s3/placeholders/waiting-generic.png similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/placeholders/waiting-generic.png rename to www/admin/layout/javascript/fineuploader/s3/placeholders/waiting-generic.png diff --git a/www/layout/admin/javascript/fineuploader/s3/processing.gif b/www/admin/layout/javascript/fineuploader/s3/processing.gif similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/processing.gif rename to www/admin/layout/javascript/fineuploader/s3/processing.gif diff --git a/www/layout/admin/javascript/fineuploader/s3/retry.gif b/www/admin/layout/javascript/fineuploader/s3/retry.gif similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/retry.gif rename to www/admin/layout/javascript/fineuploader/s3/retry.gif diff --git a/www/layout/admin/javascript/fineuploader/s3/s3.fine-uploader.core.js b/www/admin/layout/javascript/fineuploader/s3/s3.fine-uploader.core.js similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/s3.fine-uploader.core.js rename to www/admin/layout/javascript/fineuploader/s3/s3.fine-uploader.core.js diff --git a/www/layout/admin/javascript/fineuploader/s3/s3.fine-uploader.core.js.map b/www/admin/layout/javascript/fineuploader/s3/s3.fine-uploader.core.js.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/s3.fine-uploader.core.js.map rename to www/admin/layout/javascript/fineuploader/s3/s3.fine-uploader.core.js.map diff --git a/www/layout/admin/javascript/fineuploader/s3/s3.fine-uploader.core.min.js b/www/admin/layout/javascript/fineuploader/s3/s3.fine-uploader.core.min.js similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/s3.fine-uploader.core.min.js rename to www/admin/layout/javascript/fineuploader/s3/s3.fine-uploader.core.min.js diff --git a/www/layout/admin/javascript/fineuploader/s3/s3.fine-uploader.core.min.js.map b/www/admin/layout/javascript/fineuploader/s3/s3.fine-uploader.core.min.js.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/s3.fine-uploader.core.min.js.map rename to www/admin/layout/javascript/fineuploader/s3/s3.fine-uploader.core.min.js.map diff --git a/www/layout/admin/javascript/fineuploader/s3/s3.fine-uploader.js b/www/admin/layout/javascript/fineuploader/s3/s3.fine-uploader.js similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/s3.fine-uploader.js rename to www/admin/layout/javascript/fineuploader/s3/s3.fine-uploader.js diff --git a/www/layout/admin/javascript/fineuploader/s3/s3.fine-uploader.js.map b/www/admin/layout/javascript/fineuploader/s3/s3.fine-uploader.js.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/s3.fine-uploader.js.map rename to www/admin/layout/javascript/fineuploader/s3/s3.fine-uploader.js.map diff --git a/www/layout/admin/javascript/fineuploader/s3/s3.fine-uploader.min.js b/www/admin/layout/javascript/fineuploader/s3/s3.fine-uploader.min.js similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/s3.fine-uploader.min.js rename to www/admin/layout/javascript/fineuploader/s3/s3.fine-uploader.min.js diff --git a/www/layout/admin/javascript/fineuploader/s3/s3.fine-uploader.min.js.map b/www/admin/layout/javascript/fineuploader/s3/s3.fine-uploader.min.js.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/s3.fine-uploader.min.js.map rename to www/admin/layout/javascript/fineuploader/s3/s3.fine-uploader.min.js.map diff --git a/www/layout/admin/javascript/fineuploader/s3/s3.jquery.fine-uploader.js b/www/admin/layout/javascript/fineuploader/s3/s3.jquery.fine-uploader.js similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/s3.jquery.fine-uploader.js rename to www/admin/layout/javascript/fineuploader/s3/s3.jquery.fine-uploader.js diff --git a/www/layout/admin/javascript/fineuploader/s3/s3.jquery.fine-uploader.js.map b/www/admin/layout/javascript/fineuploader/s3/s3.jquery.fine-uploader.js.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/s3.jquery.fine-uploader.js.map rename to www/admin/layout/javascript/fineuploader/s3/s3.jquery.fine-uploader.js.map diff --git a/www/layout/admin/javascript/fineuploader/s3/s3.jquery.fine-uploader.min.js b/www/admin/layout/javascript/fineuploader/s3/s3.jquery.fine-uploader.min.js similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/s3.jquery.fine-uploader.min.js rename to www/admin/layout/javascript/fineuploader/s3/s3.jquery.fine-uploader.min.js diff --git a/www/layout/admin/javascript/fineuploader/s3/s3.jquery.fine-uploader.min.js.map b/www/admin/layout/javascript/fineuploader/s3/s3.jquery.fine-uploader.min.js.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/s3.jquery.fine-uploader.min.js.map rename to www/admin/layout/javascript/fineuploader/s3/s3.jquery.fine-uploader.min.js.map diff --git a/www/layout/admin/javascript/fineuploader/s3/templates/default.html b/www/admin/layout/javascript/fineuploader/s3/templates/default.html similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/templates/default.html rename to www/admin/layout/javascript/fineuploader/s3/templates/default.html diff --git a/www/layout/admin/javascript/fineuploader/s3/templates/gallery.html b/www/admin/layout/javascript/fineuploader/s3/templates/gallery.html similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/templates/gallery.html rename to www/admin/layout/javascript/fineuploader/s3/templates/gallery.html diff --git a/www/layout/admin/javascript/fineuploader/s3/templates/simple-thumbnails.html b/www/admin/layout/javascript/fineuploader/s3/templates/simple-thumbnails.html similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/templates/simple-thumbnails.html rename to www/admin/layout/javascript/fineuploader/s3/templates/simple-thumbnails.html diff --git a/www/layout/admin/javascript/fineuploader/s3/trash.gif b/www/admin/layout/javascript/fineuploader/s3/trash.gif similarity index 100% rename from www/layout/admin/javascript/fineuploader/s3/trash.gif rename to www/admin/layout/javascript/fineuploader/s3/trash.gif diff --git a/www/layout/admin/javascript/fineuploader/traditional/LICENSE b/www/admin/layout/javascript/fineuploader/traditional/LICENSE similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/LICENSE rename to www/admin/layout/javascript/fineuploader/traditional/LICENSE diff --git a/www/layout/admin/javascript/fineuploader/traditional/continue.gif b/www/admin/layout/javascript/fineuploader/traditional/continue.gif similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/continue.gif rename to www/admin/layout/javascript/fineuploader/traditional/continue.gif diff --git a/www/layout/admin/javascript/fineuploader/traditional/dnd.js b/www/admin/layout/javascript/fineuploader/traditional/dnd.js similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/dnd.js rename to www/admin/layout/javascript/fineuploader/traditional/dnd.js diff --git a/www/layout/admin/javascript/fineuploader/traditional/dnd.js.map b/www/admin/layout/javascript/fineuploader/traditional/dnd.js.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/dnd.js.map rename to www/admin/layout/javascript/fineuploader/traditional/dnd.js.map diff --git a/www/layout/admin/javascript/fineuploader/traditional/dnd.min.js b/www/admin/layout/javascript/fineuploader/traditional/dnd.min.js similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/dnd.min.js rename to www/admin/layout/javascript/fineuploader/traditional/dnd.min.js diff --git a/www/layout/admin/javascript/fineuploader/traditional/dnd.min.js.map b/www/admin/layout/javascript/fineuploader/traditional/dnd.min.js.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/dnd.min.js.map rename to www/admin/layout/javascript/fineuploader/traditional/dnd.min.js.map diff --git a/www/layout/admin/javascript/fineuploader/traditional/edit.gif b/www/admin/layout/javascript/fineuploader/traditional/edit.gif similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/edit.gif rename to www/admin/layout/javascript/fineuploader/traditional/edit.gif diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader-gallery.css b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader-gallery.css similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader-gallery.css rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader-gallery.css diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader-gallery.min.css b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader-gallery.min.css similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader-gallery.min.css rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader-gallery.min.css diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader-gallery.min.css.map b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader-gallery.min.css.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader-gallery.min.css.map rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader-gallery.min.css.map diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader-new.css b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader-new.css similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader-new.css rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader-new.css diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader-new.min.css b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader-new.min.css similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader-new.min.css rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader-new.min.css diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader-new.min.css.map b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader-new.min.css.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader-new.min.css.map rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader-new.min.css.map diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader.core.js b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader.core.js similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader.core.js rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader.core.js diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader.core.js.map b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader.core.js.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader.core.js.map rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader.core.js.map diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader.core.min.js b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader.core.min.js similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader.core.min.js rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader.core.min.js diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader.core.min.js.map b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader.core.min.js.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader.core.min.js.map rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader.core.min.js.map diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader.css b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader.css similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader.css rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader.css diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader.js b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader.js similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader.js rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader.js diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader.js.map b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader.js.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader.js.map rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader.js.map diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader.min.css b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader.min.css similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader.min.css rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader.min.css diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader.min.css.map b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader.min.css.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader.min.css.map rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader.min.css.map diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader.min.js b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader.min.js similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader.min.js rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader.min.js diff --git a/www/layout/admin/javascript/fineuploader/traditional/fine-uploader.min.js.map b/www/admin/layout/javascript/fineuploader/traditional/fine-uploader.min.js.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/fine-uploader.min.js.map rename to www/admin/layout/javascript/fineuploader/traditional/fine-uploader.min.js.map diff --git a/www/layout/admin/javascript/fineuploader/traditional/jquery.fine-uploader.js b/www/admin/layout/javascript/fineuploader/traditional/jquery.fine-uploader.js similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/jquery.fine-uploader.js rename to www/admin/layout/javascript/fineuploader/traditional/jquery.fine-uploader.js diff --git a/www/layout/admin/javascript/fineuploader/traditional/jquery.fine-uploader.js.map b/www/admin/layout/javascript/fineuploader/traditional/jquery.fine-uploader.js.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/jquery.fine-uploader.js.map rename to www/admin/layout/javascript/fineuploader/traditional/jquery.fine-uploader.js.map diff --git a/www/layout/admin/javascript/fineuploader/traditional/jquery.fine-uploader.min.js b/www/admin/layout/javascript/fineuploader/traditional/jquery.fine-uploader.min.js similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/jquery.fine-uploader.min.js rename to www/admin/layout/javascript/fineuploader/traditional/jquery.fine-uploader.min.js diff --git a/www/layout/admin/javascript/fineuploader/traditional/jquery.fine-uploader.min.js.map b/www/admin/layout/javascript/fineuploader/traditional/jquery.fine-uploader.min.js.map similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/jquery.fine-uploader.min.js.map rename to www/admin/layout/javascript/fineuploader/traditional/jquery.fine-uploader.min.js.map diff --git a/www/layout/admin/javascript/fineuploader/traditional/loading.gif b/www/admin/layout/javascript/fineuploader/traditional/loading.gif similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/loading.gif rename to www/admin/layout/javascript/fineuploader/traditional/loading.gif diff --git a/www/layout/admin/javascript/fineuploader/traditional/pause.gif b/www/admin/layout/javascript/fineuploader/traditional/pause.gif similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/pause.gif rename to www/admin/layout/javascript/fineuploader/traditional/pause.gif diff --git a/www/layout/admin/javascript/fineuploader/traditional/placeholders/not_available-generic.png b/www/admin/layout/javascript/fineuploader/traditional/placeholders/not_available-generic.png similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/placeholders/not_available-generic.png rename to www/admin/layout/javascript/fineuploader/traditional/placeholders/not_available-generic.png diff --git a/www/layout/admin/javascript/fineuploader/traditional/placeholders/waiting-generic.png b/www/admin/layout/javascript/fineuploader/traditional/placeholders/waiting-generic.png similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/placeholders/waiting-generic.png rename to www/admin/layout/javascript/fineuploader/traditional/placeholders/waiting-generic.png diff --git a/www/layout/admin/javascript/fineuploader/traditional/processing.gif b/www/admin/layout/javascript/fineuploader/traditional/processing.gif similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/processing.gif rename to www/admin/layout/javascript/fineuploader/traditional/processing.gif diff --git a/www/layout/admin/javascript/fineuploader/traditional/retry.gif b/www/admin/layout/javascript/fineuploader/traditional/retry.gif similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/retry.gif rename to www/admin/layout/javascript/fineuploader/traditional/retry.gif diff --git a/www/layout/admin/javascript/fineuploader/traditional/templates/default.html b/www/admin/layout/javascript/fineuploader/traditional/templates/default.html similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/templates/default.html rename to www/admin/layout/javascript/fineuploader/traditional/templates/default.html diff --git a/www/layout/admin/javascript/fineuploader/traditional/templates/gallery.html b/www/admin/layout/javascript/fineuploader/traditional/templates/gallery.html similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/templates/gallery.html rename to www/admin/layout/javascript/fineuploader/traditional/templates/gallery.html diff --git a/www/layout/admin/javascript/fineuploader/traditional/templates/simple-thumbnails.html b/www/admin/layout/javascript/fineuploader/traditional/templates/simple-thumbnails.html similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/templates/simple-thumbnails.html rename to www/admin/layout/javascript/fineuploader/traditional/templates/simple-thumbnails.html diff --git a/www/layout/admin/javascript/fineuploader/traditional/trash.gif b/www/admin/layout/javascript/fineuploader/traditional/trash.gif similarity index 100% rename from www/layout/admin/javascript/fineuploader/traditional/trash.gif rename to www/admin/layout/javascript/fineuploader/traditional/trash.gif diff --git a/www/layout/admin/javascript/firebug.js b/www/admin/layout/javascript/firebug.js similarity index 100% rename from www/layout/admin/javascript/firebug.js rename to www/admin/layout/javascript/firebug.js diff --git a/www/layout/admin/javascript/flatpickr/flatpickr.ja.js b/www/admin/layout/javascript/flatpickr/flatpickr.ja.js similarity index 100% rename from www/layout/admin/javascript/flatpickr/flatpickr.ja.js rename to www/admin/layout/javascript/flatpickr/flatpickr.ja.js diff --git a/www/layout/admin/javascript/flatpickr/flatpickr.min.css b/www/admin/layout/javascript/flatpickr/flatpickr.min.css similarity index 100% rename from www/layout/admin/javascript/flatpickr/flatpickr.min.css rename to www/admin/layout/javascript/flatpickr/flatpickr.min.css diff --git a/www/layout/admin/javascript/flatpickr/flatpickr.min.js b/www/admin/layout/javascript/flatpickr/flatpickr.min.js similarity index 100% rename from www/layout/admin/javascript/flatpickr/flatpickr.min.js rename to www/admin/layout/javascript/flatpickr/flatpickr.min.js diff --git a/www/layout/admin/javascript/jquery-3.6.0.js b/www/admin/layout/javascript/jquery-3.6.0.js similarity index 100% rename from www/layout/admin/javascript/jquery-3.6.0.js rename to www/admin/layout/javascript/jquery-3.6.0.js diff --git a/www/layout/admin/javascript/jquery-3.6.0.min.js b/www/admin/layout/javascript/jquery-3.6.0.min.js similarity index 100% rename from www/layout/admin/javascript/jquery-3.6.0.min.js rename to www/admin/layout/javascript/jquery-3.6.0.min.js diff --git a/www/layout/admin/javascript/jquery.js b/www/admin/layout/javascript/jquery.js similarity index 100% rename from www/layout/admin/javascript/jquery.js rename to www/admin/layout/javascript/jquery.js diff --git a/www/layout/admin/javascript/jquery.min.js b/www/admin/layout/javascript/jquery.min.js similarity index 100% rename from www/layout/admin/javascript/jquery.min.js rename to www/admin/layout/javascript/jquery.min.js diff --git a/www/layout/admin/javascript/jquery.test.js b/www/admin/layout/javascript/jquery.test.js similarity index 100% rename from www/layout/admin/javascript/jquery.test.js rename to www/admin/layout/javascript/jquery.test.js diff --git a/www/layout/admin/javascript/jscal2/css/border-radius.css b/www/admin/layout/javascript/jscal2/css/border-radius.css similarity index 100% rename from www/layout/admin/javascript/jscal2/css/border-radius.css rename to www/admin/layout/javascript/jscal2/css/border-radius.css diff --git a/www/layout/admin/javascript/jscal2/css/gold/brushed-steel.jpg b/www/admin/layout/javascript/jscal2/css/gold/brushed-steel.jpg similarity index 100% rename from www/layout/admin/javascript/jscal2/css/gold/brushed-steel.jpg rename to www/admin/layout/javascript/jscal2/css/gold/brushed-steel.jpg diff --git a/www/layout/admin/javascript/jscal2/css/gold/coolbg.png b/www/admin/layout/javascript/jscal2/css/gold/coolbg.png similarity index 100% rename from www/layout/admin/javascript/jscal2/css/gold/coolbg.png rename to www/admin/layout/javascript/jscal2/css/gold/coolbg.png diff --git a/www/layout/admin/javascript/jscal2/css/gold/gold.css b/www/admin/layout/javascript/jscal2/css/gold/gold.css similarity index 100% rename from www/layout/admin/javascript/jscal2/css/gold/gold.css rename to www/admin/layout/javascript/jscal2/css/gold/gold.css diff --git a/www/layout/admin/javascript/jscal2/css/gold/gold.jpg b/www/admin/layout/javascript/jscal2/css/gold/gold.jpg similarity index 100% rename from www/layout/admin/javascript/jscal2/css/gold/gold.jpg rename to www/admin/layout/javascript/jscal2/css/gold/gold.jpg diff --git a/www/layout/admin/javascript/jscal2/css/img/cool-bg-hard-inv.png b/www/admin/layout/javascript/jscal2/css/img/cool-bg-hard-inv.png similarity index 100% rename from www/layout/admin/javascript/jscal2/css/img/cool-bg-hard-inv.png rename to www/admin/layout/javascript/jscal2/css/img/cool-bg-hard-inv.png diff --git a/www/layout/admin/javascript/jscal2/css/img/cool-bg-hard.png b/www/admin/layout/javascript/jscal2/css/img/cool-bg-hard.png similarity index 100% rename from www/layout/admin/javascript/jscal2/css/img/cool-bg-hard.png rename to www/admin/layout/javascript/jscal2/css/img/cool-bg-hard.png diff --git a/www/layout/admin/javascript/jscal2/css/img/cool-bg-inv.png b/www/admin/layout/javascript/jscal2/css/img/cool-bg-inv.png similarity index 100% rename from www/layout/admin/javascript/jscal2/css/img/cool-bg-inv.png rename to www/admin/layout/javascript/jscal2/css/img/cool-bg-inv.png diff --git a/www/layout/admin/javascript/jscal2/css/img/cool-bg.png b/www/admin/layout/javascript/jscal2/css/img/cool-bg.png similarity index 100% rename from www/layout/admin/javascript/jscal2/css/img/cool-bg.png rename to www/admin/layout/javascript/jscal2/css/img/cool-bg.png diff --git a/www/layout/admin/javascript/jscal2/css/img/drop-down.gif b/www/admin/layout/javascript/jscal2/css/img/drop-down.gif similarity index 100% rename from www/layout/admin/javascript/jscal2/css/img/drop-down.gif rename to www/admin/layout/javascript/jscal2/css/img/drop-down.gif diff --git a/www/layout/admin/javascript/jscal2/css/img/drop-up.gif b/www/admin/layout/javascript/jscal2/css/img/drop-up.gif similarity index 100% rename from www/layout/admin/javascript/jscal2/css/img/drop-up.gif rename to www/admin/layout/javascript/jscal2/css/img/drop-up.gif diff --git a/www/layout/admin/javascript/jscal2/css/img/nav-left-x2.gif b/www/admin/layout/javascript/jscal2/css/img/nav-left-x2.gif similarity index 100% rename from www/layout/admin/javascript/jscal2/css/img/nav-left-x2.gif rename to www/admin/layout/javascript/jscal2/css/img/nav-left-x2.gif diff --git a/www/layout/admin/javascript/jscal2/css/img/nav-left.gif b/www/admin/layout/javascript/jscal2/css/img/nav-left.gif similarity index 100% rename from www/layout/admin/javascript/jscal2/css/img/nav-left.gif rename to www/admin/layout/javascript/jscal2/css/img/nav-left.gif diff --git a/www/layout/admin/javascript/jscal2/css/img/nav-right-x2.gif b/www/admin/layout/javascript/jscal2/css/img/nav-right-x2.gif similarity index 100% rename from www/layout/admin/javascript/jscal2/css/img/nav-right-x2.gif rename to www/admin/layout/javascript/jscal2/css/img/nav-right-x2.gif diff --git a/www/layout/admin/javascript/jscal2/css/img/nav-right.gif b/www/admin/layout/javascript/jscal2/css/img/nav-right.gif similarity index 100% rename from www/layout/admin/javascript/jscal2/css/img/nav-right.gif rename to www/admin/layout/javascript/jscal2/css/img/nav-right.gif diff --git a/www/layout/admin/javascript/jscal2/css/img/time-down.png b/www/admin/layout/javascript/jscal2/css/img/time-down.png similarity index 100% rename from www/layout/admin/javascript/jscal2/css/img/time-down.png rename to www/admin/layout/javascript/jscal2/css/img/time-down.png diff --git a/www/layout/admin/javascript/jscal2/css/img/time-up.png b/www/admin/layout/javascript/jscal2/css/img/time-up.png similarity index 100% rename from www/layout/admin/javascript/jscal2/css/img/time-up.png rename to www/admin/layout/javascript/jscal2/css/img/time-up.png diff --git a/www/layout/admin/javascript/jscal2/css/jscal2.css b/www/admin/layout/javascript/jscal2/css/jscal2.css similarity index 100% rename from www/layout/admin/javascript/jscal2/css/jscal2.css rename to www/admin/layout/javascript/jscal2/css/jscal2.css diff --git a/www/layout/admin/javascript/jscal2/css/matrix/matrix.css b/www/admin/layout/javascript/jscal2/css/matrix/matrix.css similarity index 100% rename from www/layout/admin/javascript/jscal2/css/matrix/matrix.css rename to www/admin/layout/javascript/jscal2/css/matrix/matrix.css diff --git a/www/layout/admin/javascript/jscal2/css/matrix/nav-left-x2.gif b/www/admin/layout/javascript/jscal2/css/matrix/nav-left-x2.gif similarity index 100% rename from www/layout/admin/javascript/jscal2/css/matrix/nav-left-x2.gif rename to www/admin/layout/javascript/jscal2/css/matrix/nav-left-x2.gif diff --git a/www/layout/admin/javascript/jscal2/css/matrix/nav-left.gif b/www/admin/layout/javascript/jscal2/css/matrix/nav-left.gif similarity index 100% rename from www/layout/admin/javascript/jscal2/css/matrix/nav-left.gif rename to www/admin/layout/javascript/jscal2/css/matrix/nav-left.gif diff --git a/www/layout/admin/javascript/jscal2/css/matrix/nav-right-x2.gif b/www/admin/layout/javascript/jscal2/css/matrix/nav-right-x2.gif similarity index 100% rename from www/layout/admin/javascript/jscal2/css/matrix/nav-right-x2.gif rename to www/admin/layout/javascript/jscal2/css/matrix/nav-right-x2.gif diff --git a/www/layout/admin/javascript/jscal2/css/matrix/nav-right.gif b/www/admin/layout/javascript/jscal2/css/matrix/nav-right.gif similarity index 100% rename from www/layout/admin/javascript/jscal2/css/matrix/nav-right.gif rename to www/admin/layout/javascript/jscal2/css/matrix/nav-right.gif diff --git a/www/layout/admin/javascript/jscal2/css/reduce-spacing.css b/www/admin/layout/javascript/jscal2/css/reduce-spacing.css similarity index 100% rename from www/layout/admin/javascript/jscal2/css/reduce-spacing.css rename to www/admin/layout/javascript/jscal2/css/reduce-spacing.css diff --git a/www/layout/admin/javascript/jscal2/css/shadow-b.png b/www/admin/layout/javascript/jscal2/css/shadow-b.png similarity index 100% rename from www/layout/admin/javascript/jscal2/css/shadow-b.png rename to www/admin/layout/javascript/jscal2/css/shadow-b.png diff --git a/www/layout/admin/javascript/jscal2/css/steel/brushed-steel.jpg b/www/admin/layout/javascript/jscal2/css/steel/brushed-steel.jpg similarity index 100% rename from www/layout/admin/javascript/jscal2/css/steel/brushed-steel.jpg rename to www/admin/layout/javascript/jscal2/css/steel/brushed-steel.jpg diff --git a/www/layout/admin/javascript/jscal2/css/steel/brushed-steel.png b/www/admin/layout/javascript/jscal2/css/steel/brushed-steel.png similarity index 100% rename from www/layout/admin/javascript/jscal2/css/steel/brushed-steel.png rename to www/admin/layout/javascript/jscal2/css/steel/brushed-steel.png diff --git a/www/layout/admin/javascript/jscal2/css/steel/coolbg.png b/www/admin/layout/javascript/jscal2/css/steel/coolbg.png similarity index 100% rename from www/layout/admin/javascript/jscal2/css/steel/coolbg.png rename to www/admin/layout/javascript/jscal2/css/steel/coolbg.png diff --git a/www/layout/admin/javascript/jscal2/css/steel/steel.css b/www/admin/layout/javascript/jscal2/css/steel/steel.css similarity index 100% rename from www/layout/admin/javascript/jscal2/css/steel/steel.css rename to www/admin/layout/javascript/jscal2/css/steel/steel.css diff --git a/www/layout/admin/javascript/jscal2/css/steel/steel.jpg b/www/admin/layout/javascript/jscal2/css/steel/steel.jpg similarity index 100% rename from www/layout/admin/javascript/jscal2/css/steel/steel.jpg rename to www/admin/layout/javascript/jscal2/css/steel/steel.jpg diff --git a/www/layout/admin/javascript/jscal2/css/win2k/win2k.css b/www/admin/layout/javascript/jscal2/css/win2k/win2k.css similarity index 100% rename from www/layout/admin/javascript/jscal2/css/win2k/win2k.css rename to www/admin/layout/javascript/jscal2/css/win2k/win2k.css diff --git a/www/layout/admin/javascript/jscal2/js/jscal2.js b/www/admin/layout/javascript/jscal2/js/jscal2.js similarity index 100% rename from www/layout/admin/javascript/jscal2/js/jscal2.js rename to www/admin/layout/javascript/jscal2/js/jscal2.js diff --git a/www/layout/admin/javascript/jscal2/js/lang/ca.js b/www/admin/layout/javascript/jscal2/js/lang/ca.js similarity index 100% rename from www/layout/admin/javascript/jscal2/js/lang/ca.js rename to www/admin/layout/javascript/jscal2/js/lang/ca.js diff --git a/www/layout/admin/javascript/jscal2/js/lang/cn.js b/www/admin/layout/javascript/jscal2/js/lang/cn.js similarity index 100% rename from www/layout/admin/javascript/jscal2/js/lang/cn.js rename to www/admin/layout/javascript/jscal2/js/lang/cn.js diff --git a/www/layout/admin/javascript/jscal2/js/lang/cz.js b/www/admin/layout/javascript/jscal2/js/lang/cz.js similarity index 100% rename from www/layout/admin/javascript/jscal2/js/lang/cz.js rename to www/admin/layout/javascript/jscal2/js/lang/cz.js diff --git a/www/layout/admin/javascript/jscal2/js/lang/de.js b/www/admin/layout/javascript/jscal2/js/lang/de.js similarity index 100% rename from www/layout/admin/javascript/jscal2/js/lang/de.js rename to www/admin/layout/javascript/jscal2/js/lang/de.js diff --git a/www/layout/admin/javascript/jscal2/js/lang/en.js b/www/admin/layout/javascript/jscal2/js/lang/en.js similarity index 100% rename from www/layout/admin/javascript/jscal2/js/lang/en.js rename to www/admin/layout/javascript/jscal2/js/lang/en.js diff --git a/www/layout/admin/javascript/jscal2/js/lang/es.js b/www/admin/layout/javascript/jscal2/js/lang/es.js similarity index 100% rename from www/layout/admin/javascript/jscal2/js/lang/es.js rename to www/admin/layout/javascript/jscal2/js/lang/es.js diff --git a/www/layout/admin/javascript/jscal2/js/lang/fr.js b/www/admin/layout/javascript/jscal2/js/lang/fr.js similarity index 100% rename from www/layout/admin/javascript/jscal2/js/lang/fr.js rename to www/admin/layout/javascript/jscal2/js/lang/fr.js diff --git a/www/layout/admin/javascript/jscal2/js/lang/it.js b/www/admin/layout/javascript/jscal2/js/lang/it.js similarity index 100% rename from www/layout/admin/javascript/jscal2/js/lang/it.js rename to www/admin/layout/javascript/jscal2/js/lang/it.js diff --git a/www/layout/admin/javascript/jscal2/js/lang/jp.js b/www/admin/layout/javascript/jscal2/js/lang/jp.js similarity index 100% rename from www/layout/admin/javascript/jscal2/js/lang/jp.js rename to www/admin/layout/javascript/jscal2/js/lang/jp.js diff --git a/www/layout/admin/javascript/jscal2/js/lang/nl.js b/www/admin/layout/javascript/jscal2/js/lang/nl.js similarity index 100% rename from www/layout/admin/javascript/jscal2/js/lang/nl.js rename to www/admin/layout/javascript/jscal2/js/lang/nl.js diff --git a/www/layout/admin/javascript/jscal2/js/lang/pl.js b/www/admin/layout/javascript/jscal2/js/lang/pl.js similarity index 100% rename from www/layout/admin/javascript/jscal2/js/lang/pl.js rename to www/admin/layout/javascript/jscal2/js/lang/pl.js diff --git a/www/layout/admin/javascript/jscal2/js/lang/pt.js b/www/admin/layout/javascript/jscal2/js/lang/pt.js similarity index 100% rename from www/layout/admin/javascript/jscal2/js/lang/pt.js rename to www/admin/layout/javascript/jscal2/js/lang/pt.js diff --git a/www/layout/admin/javascript/jscal2/js/lang/ro.js b/www/admin/layout/javascript/jscal2/js/lang/ro.js similarity index 100% rename from www/layout/admin/javascript/jscal2/js/lang/ro.js rename to www/admin/layout/javascript/jscal2/js/lang/ro.js diff --git a/www/layout/admin/javascript/jscal2/js/lang/ru.js b/www/admin/layout/javascript/jscal2/js/lang/ru.js similarity index 100% rename from www/layout/admin/javascript/jscal2/js/lang/ru.js rename to www/admin/layout/javascript/jscal2/js/lang/ru.js diff --git a/www/layout/admin/javascript/jscal2/js/lang/sv.js b/www/admin/layout/javascript/jscal2/js/lang/sv.js similarity index 100% rename from www/layout/admin/javascript/jscal2/js/lang/sv.js rename to www/admin/layout/javascript/jscal2/js/lang/sv.js diff --git a/www/layout/admin/javascript/overlib/overlib.js b/www/admin/layout/javascript/overlib/overlib.js similarity index 100% rename from www/layout/admin/javascript/overlib/overlib.js rename to www/admin/layout/javascript/overlib/overlib.js diff --git a/www/layout/admin/javascript/prototype.js b/www/admin/layout/javascript/prototype.js similarity index 100% rename from www/layout/admin/javascript/prototype.js rename to www/admin/layout/javascript/prototype.js diff --git a/www/layout/admin/javascript/scriptaculous/builder.js b/www/admin/layout/javascript/scriptaculous/builder.js similarity index 100% rename from www/layout/admin/javascript/scriptaculous/builder.js rename to www/admin/layout/javascript/scriptaculous/builder.js diff --git a/www/layout/admin/javascript/scriptaculous/controls.js b/www/admin/layout/javascript/scriptaculous/controls.js similarity index 100% rename from www/layout/admin/javascript/scriptaculous/controls.js rename to www/admin/layout/javascript/scriptaculous/controls.js diff --git a/www/layout/admin/javascript/scriptaculous/dragdrop.js b/www/admin/layout/javascript/scriptaculous/dragdrop.js similarity index 100% rename from www/layout/admin/javascript/scriptaculous/dragdrop.js rename to www/admin/layout/javascript/scriptaculous/dragdrop.js diff --git a/www/layout/admin/javascript/scriptaculous/effects.js b/www/admin/layout/javascript/scriptaculous/effects.js similarity index 100% rename from www/layout/admin/javascript/scriptaculous/effects.js rename to www/admin/layout/javascript/scriptaculous/effects.js diff --git a/www/layout/admin/javascript/scriptaculous/prototype-1.7.3.0.js b/www/admin/layout/javascript/scriptaculous/prototype-1.7.3.0.js similarity index 100% rename from www/layout/admin/javascript/scriptaculous/prototype-1.7.3.0.js rename to www/admin/layout/javascript/scriptaculous/prototype-1.7.3.0.js diff --git a/www/layout/admin/javascript/scriptaculous/prototype.js b/www/admin/layout/javascript/scriptaculous/prototype.js similarity index 100% rename from www/layout/admin/javascript/scriptaculous/prototype.js rename to www/admin/layout/javascript/scriptaculous/prototype.js diff --git a/www/layout/admin/javascript/scriptaculous/scriptaculous.js b/www/admin/layout/javascript/scriptaculous/scriptaculous.js similarity index 100% rename from www/layout/admin/javascript/scriptaculous/scriptaculous.js rename to www/admin/layout/javascript/scriptaculous/scriptaculous.js diff --git a/www/layout/admin/javascript/scriptaculous/slider.js b/www/admin/layout/javascript/scriptaculous/slider.js similarity index 100% rename from www/layout/admin/javascript/scriptaculous/slider.js rename to www/admin/layout/javascript/scriptaculous/slider.js diff --git a/www/layout/admin/javascript/scriptaculous/sound.js b/www/admin/layout/javascript/scriptaculous/sound.js similarity index 100% rename from www/layout/admin/javascript/scriptaculous/sound.js rename to www/admin/layout/javascript/scriptaculous/sound.js diff --git a/www/layout/admin/javascript/scriptaculous/unittest.js b/www/admin/layout/javascript/scriptaculous/unittest.js similarity index 100% rename from www/layout/admin/javascript/scriptaculous/unittest.js rename to www/admin/layout/javascript/scriptaculous/unittest.js diff --git a/www/layout/admin/javascript/tiny_mce/langs/en.js b/www/admin/layout/javascript/tiny_mce/langs/en.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/langs/en.js rename to www/admin/layout/javascript/tiny_mce/langs/en.js diff --git a/www/layout/admin/javascript/tiny_mce/langs/ja.js b/www/admin/layout/javascript/tiny_mce/langs/ja.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/langs/ja.js rename to www/admin/layout/javascript/tiny_mce/langs/ja.js diff --git a/www/layout/admin/javascript/tiny_mce/license.txt b/www/admin/layout/javascript/tiny_mce/license.txt similarity index 100% rename from www/layout/admin/javascript/tiny_mce/license.txt rename to www/admin/layout/javascript/tiny_mce/license.txt diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advhr/css/advhr.css b/www/admin/layout/javascript/tiny_mce/plugins/advhr/css/advhr.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advhr/css/advhr.css rename to www/admin/layout/javascript/tiny_mce/plugins/advhr/css/advhr.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advhr/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/advhr/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advhr/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/advhr/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advhr/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/advhr/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advhr/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/advhr/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advhr/js/rule.js b/www/admin/layout/javascript/tiny_mce/plugins/advhr/js/rule.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advhr/js/rule.js rename to www/admin/layout/javascript/tiny_mce/plugins/advhr/js/rule.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advhr/langs/en_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/advhr/langs/en_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advhr/langs/en_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/advhr/langs/en_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advhr/langs/ja_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/advhr/langs/ja_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advhr/langs/ja_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/advhr/langs/ja_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advhr/rule.htm b/www/admin/layout/javascript/tiny_mce/plugins/advhr/rule.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advhr/rule.htm rename to www/admin/layout/javascript/tiny_mce/plugins/advhr/rule.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advimage/css/advimage.css b/www/admin/layout/javascript/tiny_mce/plugins/advimage/css/advimage.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advimage/css/advimage.css rename to www/admin/layout/javascript/tiny_mce/plugins/advimage/css/advimage.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advimage/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/advimage/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advimage/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/advimage/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advimage/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/advimage/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advimage/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/advimage/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advimage/image.htm b/www/admin/layout/javascript/tiny_mce/plugins/advimage/image.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advimage/image.htm rename to www/admin/layout/javascript/tiny_mce/plugins/advimage/image.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advimage/img/sample.gif b/www/admin/layout/javascript/tiny_mce/plugins/advimage/img/sample.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advimage/img/sample.gif rename to www/admin/layout/javascript/tiny_mce/plugins/advimage/img/sample.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advimage/js/image.js b/www/admin/layout/javascript/tiny_mce/plugins/advimage/js/image.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advimage/js/image.js rename to www/admin/layout/javascript/tiny_mce/plugins/advimage/js/image.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advimage/langs/en_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/advimage/langs/en_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advimage/langs/en_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/advimage/langs/en_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advimage/langs/ja_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/advimage/langs/ja_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advimage/langs/ja_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/advimage/langs/ja_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advlink/css/advlink.css b/www/admin/layout/javascript/tiny_mce/plugins/advlink/css/advlink.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advlink/css/advlink.css rename to www/admin/layout/javascript/tiny_mce/plugins/advlink/css/advlink.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advlink/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/advlink/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advlink/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/advlink/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advlink/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/advlink/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advlink/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/advlink/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advlink/js/advlink.js b/www/admin/layout/javascript/tiny_mce/plugins/advlink/js/advlink.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advlink/js/advlink.js rename to www/admin/layout/javascript/tiny_mce/plugins/advlink/js/advlink.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advlink/langs/en_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/advlink/langs/en_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advlink/langs/en_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/advlink/langs/en_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advlink/langs/ja_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/advlink/langs/ja_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advlink/langs/ja_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/advlink/langs/ja_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/advlink/link.htm b/www/admin/layout/javascript/tiny_mce/plugins/advlink/link.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/advlink/link.htm rename to www/admin/layout/javascript/tiny_mce/plugins/advlink/link.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/autosave/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/autosave/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/autosave/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/autosave/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/autosave/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/autosave/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/autosave/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/autosave/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/bbcode/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/bbcode/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/bbcode/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/bbcode/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/bbcode/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/bbcode/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/bbcode/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/bbcode/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/compat2x/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/compat2x/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/compat2x/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/compat2x/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/compat2x/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/compat2x/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/compat2x/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/compat2x/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/contextmenu/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/contextmenu/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/contextmenu/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/contextmenu/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/contextmenu/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/contextmenu/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/contextmenu/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/contextmenu/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/directionality/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/directionality/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/directionality/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/directionality/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/directionality/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/directionality/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/directionality/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/directionality/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/emotions/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/emotions/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/emotions.htm b/www/admin/layout/javascript/tiny_mce/plugins/emotions/emotions.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/emotions.htm rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/emotions.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-cool.gif b/www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-cool.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-cool.gif rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-cool.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-cry.gif b/www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-cry.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-cry.gif rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-cry.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-embarassed.gif b/www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-embarassed.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-embarassed.gif rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-embarassed.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif b/www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-foot-in-mouth.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-frown.gif b/www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-frown.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-frown.gif rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-frown.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-innocent.gif b/www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-innocent.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-innocent.gif rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-innocent.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-kiss.gif b/www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-kiss.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-kiss.gif rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-kiss.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-laughing.gif b/www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-laughing.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-laughing.gif rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-laughing.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif b/www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-money-mouth.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-sealed.gif b/www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-sealed.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-sealed.gif rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-sealed.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-smile.gif b/www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-smile.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-smile.gif rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-smile.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-surprised.gif b/www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-surprised.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-surprised.gif rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-surprised.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif b/www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-tongue-out.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-undecided.gif b/www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-undecided.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-undecided.gif rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-undecided.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-wink.gif b/www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-wink.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-wink.gif rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-wink.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-yell.gif b/www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-yell.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/img/smiley-yell.gif rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/img/smiley-yell.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/js/emotions.js b/www/admin/layout/javascript/tiny_mce/plugins/emotions/js/emotions.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/js/emotions.js rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/js/emotions.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/langs/en_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/emotions/langs/en_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/langs/en_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/langs/en_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/emotions/langs/ja_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/emotions/langs/ja_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/emotions/langs/ja_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/emotions/langs/ja_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/example/dialog.htm b/www/admin/layout/javascript/tiny_mce/plugins/example/dialog.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/example/dialog.htm rename to www/admin/layout/javascript/tiny_mce/plugins/example/dialog.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/example/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/example/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/example/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/example/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/example/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/example/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/example/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/example/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/example/img/example.gif b/www/admin/layout/javascript/tiny_mce/plugins/example/img/example.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/example/img/example.gif rename to www/admin/layout/javascript/tiny_mce/plugins/example/img/example.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/example/js/dialog.js b/www/admin/layout/javascript/tiny_mce/plugins/example/js/dialog.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/example/js/dialog.js rename to www/admin/layout/javascript/tiny_mce/plugins/example/js/dialog.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/example/langs/en.js b/www/admin/layout/javascript/tiny_mce/plugins/example/langs/en.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/example/langs/en.js rename to www/admin/layout/javascript/tiny_mce/plugins/example/langs/en.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/example/langs/en_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/example/langs/en_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/example/langs/en_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/example/langs/en_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/fullpage/css/fullpage.css b/www/admin/layout/javascript/tiny_mce/plugins/fullpage/css/fullpage.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/fullpage/css/fullpage.css rename to www/admin/layout/javascript/tiny_mce/plugins/fullpage/css/fullpage.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/fullpage/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/fullpage/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/fullpage/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/fullpage/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/fullpage/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/fullpage/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/fullpage/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/fullpage/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/fullpage/fullpage.htm b/www/admin/layout/javascript/tiny_mce/plugins/fullpage/fullpage.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/fullpage/fullpage.htm rename to www/admin/layout/javascript/tiny_mce/plugins/fullpage/fullpage.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/fullpage/js/fullpage.js b/www/admin/layout/javascript/tiny_mce/plugins/fullpage/js/fullpage.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/fullpage/js/fullpage.js rename to www/admin/layout/javascript/tiny_mce/plugins/fullpage/js/fullpage.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/fullpage/langs/en_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/fullpage/langs/en_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/fullpage/langs/en_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/fullpage/langs/en_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/fullpage/langs/ja_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/fullpage/langs/ja_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/fullpage/langs/ja_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/fullpage/langs/ja_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/fullscreen/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/fullscreen/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/fullscreen/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/fullscreen/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/fullscreen/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/fullscreen/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/fullscreen/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/fullscreen/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/fullscreen/fullscreen.htm b/www/admin/layout/javascript/tiny_mce/plugins/fullscreen/fullscreen.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/fullscreen/fullscreen.htm rename to www/admin/layout/javascript/tiny_mce/plugins/fullscreen/fullscreen.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/iespell/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/iespell/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/iespell/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/iespell/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/iespell/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/iespell/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/iespell/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/iespell/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif b/www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif rename to www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/alert.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif b/www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif rename to www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/button.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif b/www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif rename to www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/buttons.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif b/www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif rename to www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/confirm.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif b/www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif rename to www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/corners.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif b/www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif rename to www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/horizontal.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif b/www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif rename to www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/img/vertical.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css b/www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css rename to www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/skins/clearlooks2/window.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/template.htm b/www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/template.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/inlinepopups/template.htm rename to www/admin/layout/javascript/tiny_mce/plugins/inlinepopups/template.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/insertdatetime/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/insertdatetime/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/insertdatetime/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/insertdatetime/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/insertdatetime/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/insertdatetime/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/insertdatetime/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/insertdatetime/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/layer/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/layer/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/layer/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/layer/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/layer/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/layer/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/layer/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/layer/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/media/css/content.css b/www/admin/layout/javascript/tiny_mce/plugins/media/css/content.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/media/css/content.css rename to www/admin/layout/javascript/tiny_mce/plugins/media/css/content.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/media/css/media.css b/www/admin/layout/javascript/tiny_mce/plugins/media/css/media.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/media/css/media.css rename to www/admin/layout/javascript/tiny_mce/plugins/media/css/media.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/media/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/media/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/media/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/media/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/media/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/media/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/media/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/media/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/media/img/flash.gif b/www/admin/layout/javascript/tiny_mce/plugins/media/img/flash.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/media/img/flash.gif rename to www/admin/layout/javascript/tiny_mce/plugins/media/img/flash.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/media/img/flv_player.swf b/www/admin/layout/javascript/tiny_mce/plugins/media/img/flv_player.swf similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/media/img/flv_player.swf rename to www/admin/layout/javascript/tiny_mce/plugins/media/img/flv_player.swf diff --git a/www/layout/admin/javascript/tiny_mce/plugins/media/img/quicktime.gif b/www/admin/layout/javascript/tiny_mce/plugins/media/img/quicktime.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/media/img/quicktime.gif rename to www/admin/layout/javascript/tiny_mce/plugins/media/img/quicktime.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/media/img/realmedia.gif b/www/admin/layout/javascript/tiny_mce/plugins/media/img/realmedia.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/media/img/realmedia.gif rename to www/admin/layout/javascript/tiny_mce/plugins/media/img/realmedia.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/media/img/shockwave.gif b/www/admin/layout/javascript/tiny_mce/plugins/media/img/shockwave.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/media/img/shockwave.gif rename to www/admin/layout/javascript/tiny_mce/plugins/media/img/shockwave.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/media/img/trans.gif b/www/admin/layout/javascript/tiny_mce/plugins/media/img/trans.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/media/img/trans.gif rename to www/admin/layout/javascript/tiny_mce/plugins/media/img/trans.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/media/img/windowsmedia.gif b/www/admin/layout/javascript/tiny_mce/plugins/media/img/windowsmedia.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/media/img/windowsmedia.gif rename to www/admin/layout/javascript/tiny_mce/plugins/media/img/windowsmedia.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/media/js/embed.js b/www/admin/layout/javascript/tiny_mce/plugins/media/js/embed.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/media/js/embed.js rename to www/admin/layout/javascript/tiny_mce/plugins/media/js/embed.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/media/js/media.js b/www/admin/layout/javascript/tiny_mce/plugins/media/js/media.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/media/js/media.js rename to www/admin/layout/javascript/tiny_mce/plugins/media/js/media.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/media/langs/en_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/media/langs/en_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/media/langs/en_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/media/langs/en_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/media/langs/ja_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/media/langs/ja_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/media/langs/ja_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/media/langs/ja_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/media/media.htm b/www/admin/layout/javascript/tiny_mce/plugins/media/media.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/media/media.htm rename to www/admin/layout/javascript/tiny_mce/plugins/media/media.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/nonbreaking/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/nonbreaking/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/nonbreaking/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/nonbreaking/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/nonbreaking/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/nonbreaking/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/nonbreaking/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/nonbreaking/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/noneditable/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/noneditable/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/noneditable/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/noneditable/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/noneditable/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/noneditable/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/noneditable/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/noneditable/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/pagebreak/css/content.css b/www/admin/layout/javascript/tiny_mce/plugins/pagebreak/css/content.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/pagebreak/css/content.css rename to www/admin/layout/javascript/tiny_mce/plugins/pagebreak/css/content.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/pagebreak/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/pagebreak/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/pagebreak/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/pagebreak/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/pagebreak/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/pagebreak/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/pagebreak/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/pagebreak/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/pagebreak/img/pagebreak.gif b/www/admin/layout/javascript/tiny_mce/plugins/pagebreak/img/pagebreak.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/pagebreak/img/pagebreak.gif rename to www/admin/layout/javascript/tiny_mce/plugins/pagebreak/img/pagebreak.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/pagebreak/img/trans.gif b/www/admin/layout/javascript/tiny_mce/plugins/pagebreak/img/trans.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/pagebreak/img/trans.gif rename to www/admin/layout/javascript/tiny_mce/plugins/pagebreak/img/trans.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/paste/blank.htm b/www/admin/layout/javascript/tiny_mce/plugins/paste/blank.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/paste/blank.htm rename to www/admin/layout/javascript/tiny_mce/plugins/paste/blank.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/paste/css/blank.css b/www/admin/layout/javascript/tiny_mce/plugins/paste/css/blank.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/paste/css/blank.css rename to www/admin/layout/javascript/tiny_mce/plugins/paste/css/blank.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/paste/css/pasteword.css b/www/admin/layout/javascript/tiny_mce/plugins/paste/css/pasteword.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/paste/css/pasteword.css rename to www/admin/layout/javascript/tiny_mce/plugins/paste/css/pasteword.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/paste/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/paste/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/paste/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/paste/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/paste/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/paste/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/paste/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/paste/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/paste/js/pastetext.js b/www/admin/layout/javascript/tiny_mce/plugins/paste/js/pastetext.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/paste/js/pastetext.js rename to www/admin/layout/javascript/tiny_mce/plugins/paste/js/pastetext.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/paste/js/pasteword.js b/www/admin/layout/javascript/tiny_mce/plugins/paste/js/pasteword.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/paste/js/pasteword.js rename to www/admin/layout/javascript/tiny_mce/plugins/paste/js/pasteword.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/paste/langs/en_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/paste/langs/en_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/paste/langs/en_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/paste/langs/en_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/paste/langs/ja_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/paste/langs/ja_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/paste/langs/ja_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/paste/langs/ja_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/paste/pastetext.htm b/www/admin/layout/javascript/tiny_mce/plugins/paste/pastetext.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/paste/pastetext.htm rename to www/admin/layout/javascript/tiny_mce/plugins/paste/pastetext.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/paste/pasteword.htm b/www/admin/layout/javascript/tiny_mce/plugins/paste/pasteword.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/paste/pasteword.htm rename to www/admin/layout/javascript/tiny_mce/plugins/paste/pasteword.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/preview/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/preview/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/preview/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/preview/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/preview/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/preview/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/preview/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/preview/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/preview/example.html b/www/admin/layout/javascript/tiny_mce/plugins/preview/example.html similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/preview/example.html rename to www/admin/layout/javascript/tiny_mce/plugins/preview/example.html diff --git a/www/layout/admin/javascript/tiny_mce/plugins/preview/jscripts/embed.js b/www/admin/layout/javascript/tiny_mce/plugins/preview/jscripts/embed.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/preview/jscripts/embed.js rename to www/admin/layout/javascript/tiny_mce/plugins/preview/jscripts/embed.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/preview/preview.html b/www/admin/layout/javascript/tiny_mce/plugins/preview/preview.html similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/preview/preview.html rename to www/admin/layout/javascript/tiny_mce/plugins/preview/preview.html diff --git a/www/layout/admin/javascript/tiny_mce/plugins/print/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/print/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/print/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/print/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/print/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/print/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/print/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/print/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/safari/blank.htm b/www/admin/layout/javascript/tiny_mce/plugins/safari/blank.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/safari/blank.htm rename to www/admin/layout/javascript/tiny_mce/plugins/safari/blank.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/safari/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/safari/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/safari/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/safari/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/safari/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/safari/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/safari/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/safari/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/save/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/save/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/save/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/save/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/save/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/save/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/save/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/save/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/searchreplace/css/searchreplace.css b/www/admin/layout/javascript/tiny_mce/plugins/searchreplace/css/searchreplace.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/searchreplace/css/searchreplace.css rename to www/admin/layout/javascript/tiny_mce/plugins/searchreplace/css/searchreplace.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/searchreplace/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/searchreplace/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/searchreplace/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/searchreplace/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/searchreplace/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/searchreplace/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/searchreplace/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/searchreplace/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/searchreplace/js/searchreplace.js b/www/admin/layout/javascript/tiny_mce/plugins/searchreplace/js/searchreplace.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/searchreplace/js/searchreplace.js rename to www/admin/layout/javascript/tiny_mce/plugins/searchreplace/js/searchreplace.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/searchreplace/langs/en_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/searchreplace/langs/en_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/searchreplace/langs/en_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/searchreplace/langs/en_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/searchreplace/langs/ja_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/searchreplace/langs/ja_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/searchreplace/langs/ja_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/searchreplace/langs/ja_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/searchreplace/searchreplace.htm b/www/admin/layout/javascript/tiny_mce/plugins/searchreplace/searchreplace.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/searchreplace/searchreplace.htm rename to www/admin/layout/javascript/tiny_mce/plugins/searchreplace/searchreplace.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/spellchecker/css/content.css b/www/admin/layout/javascript/tiny_mce/plugins/spellchecker/css/content.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/spellchecker/css/content.css rename to www/admin/layout/javascript/tiny_mce/plugins/spellchecker/css/content.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/spellchecker/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/spellchecker/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/spellchecker/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/spellchecker/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/spellchecker/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/spellchecker/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/spellchecker/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/spellchecker/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/spellchecker/img/wline.gif b/www/admin/layout/javascript/tiny_mce/plugins/spellchecker/img/wline.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/spellchecker/img/wline.gif rename to www/admin/layout/javascript/tiny_mce/plugins/spellchecker/img/wline.gif diff --git a/www/layout/admin/javascript/tiny_mce/plugins/style/css/props.css b/www/admin/layout/javascript/tiny_mce/plugins/style/css/props.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/style/css/props.css rename to www/admin/layout/javascript/tiny_mce/plugins/style/css/props.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/style/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/style/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/style/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/style/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/style/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/style/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/style/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/style/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/style/js/props.js b/www/admin/layout/javascript/tiny_mce/plugins/style/js/props.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/style/js/props.js rename to www/admin/layout/javascript/tiny_mce/plugins/style/js/props.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/style/langs/en_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/style/langs/en_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/style/langs/en_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/style/langs/en_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/style/langs/ja_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/style/langs/ja_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/style/langs/ja_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/style/langs/ja_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/style/props.htm b/www/admin/layout/javascript/tiny_mce/plugins/style/props.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/style/props.htm rename to www/admin/layout/javascript/tiny_mce/plugins/style/props.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/table/cell.htm b/www/admin/layout/javascript/tiny_mce/plugins/table/cell.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/table/cell.htm rename to www/admin/layout/javascript/tiny_mce/plugins/table/cell.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/table/css/cell.css b/www/admin/layout/javascript/tiny_mce/plugins/table/css/cell.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/table/css/cell.css rename to www/admin/layout/javascript/tiny_mce/plugins/table/css/cell.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/table/css/row.css b/www/admin/layout/javascript/tiny_mce/plugins/table/css/row.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/table/css/row.css rename to www/admin/layout/javascript/tiny_mce/plugins/table/css/row.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/table/css/table.css b/www/admin/layout/javascript/tiny_mce/plugins/table/css/table.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/table/css/table.css rename to www/admin/layout/javascript/tiny_mce/plugins/table/css/table.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/table/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/table/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/table/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/table/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/table/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/table/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/table/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/table/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/table/js/cell.js b/www/admin/layout/javascript/tiny_mce/plugins/table/js/cell.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/table/js/cell.js rename to www/admin/layout/javascript/tiny_mce/plugins/table/js/cell.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/table/js/merge_cells.js b/www/admin/layout/javascript/tiny_mce/plugins/table/js/merge_cells.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/table/js/merge_cells.js rename to www/admin/layout/javascript/tiny_mce/plugins/table/js/merge_cells.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/table/js/row.js b/www/admin/layout/javascript/tiny_mce/plugins/table/js/row.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/table/js/row.js rename to www/admin/layout/javascript/tiny_mce/plugins/table/js/row.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/table/js/table.js b/www/admin/layout/javascript/tiny_mce/plugins/table/js/table.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/table/js/table.js rename to www/admin/layout/javascript/tiny_mce/plugins/table/js/table.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/table/langs/en_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/table/langs/en_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/table/langs/en_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/table/langs/en_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/table/langs/ja_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/table/langs/ja_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/table/langs/ja_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/table/langs/ja_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/table/merge_cells.htm b/www/admin/layout/javascript/tiny_mce/plugins/table/merge_cells.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/table/merge_cells.htm rename to www/admin/layout/javascript/tiny_mce/plugins/table/merge_cells.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/table/row.htm b/www/admin/layout/javascript/tiny_mce/plugins/table/row.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/table/row.htm rename to www/admin/layout/javascript/tiny_mce/plugins/table/row.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/table/table.htm b/www/admin/layout/javascript/tiny_mce/plugins/table/table.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/table/table.htm rename to www/admin/layout/javascript/tiny_mce/plugins/table/table.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/template/blank.htm b/www/admin/layout/javascript/tiny_mce/plugins/template/blank.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/template/blank.htm rename to www/admin/layout/javascript/tiny_mce/plugins/template/blank.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/template/css/template.css b/www/admin/layout/javascript/tiny_mce/plugins/template/css/template.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/template/css/template.css rename to www/admin/layout/javascript/tiny_mce/plugins/template/css/template.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/template/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/template/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/template/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/template/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/template/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/template/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/template/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/template/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/template/js/template.js b/www/admin/layout/javascript/tiny_mce/plugins/template/js/template.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/template/js/template.js rename to www/admin/layout/javascript/tiny_mce/plugins/template/js/template.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/template/langs/en_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/template/langs/en_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/template/langs/en_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/template/langs/en_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/template/langs/ja_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/template/langs/ja_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/template/langs/ja_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/template/langs/ja_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/template/template.htm b/www/admin/layout/javascript/tiny_mce/plugins/template/template.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/template/template.htm rename to www/admin/layout/javascript/tiny_mce/plugins/template/template.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/visualchars/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/visualchars/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/visualchars/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/visualchars/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/visualchars/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/visualchars/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/visualchars/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/visualchars/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/abbr.htm b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/abbr.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/abbr.htm rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/abbr.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/acronym.htm b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/acronym.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/acronym.htm rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/acronym.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/attributes.htm b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/attributes.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/attributes.htm rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/attributes.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/cite.htm b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/cite.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/cite.htm rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/cite.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/css/attributes.css b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/css/attributes.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/css/attributes.css rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/css/attributes.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/css/popup.css b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/css/popup.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/css/popup.css rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/css/popup.css diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/del.htm b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/del.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/del.htm rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/del.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/editor_plugin.js b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/editor_plugin.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/editor_plugin.js rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/editor_plugin.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/editor_plugin_src.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/ins.htm b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/ins.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/ins.htm rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/ins.htm diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/js/abbr.js b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/js/abbr.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/js/abbr.js rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/js/abbr.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/js/acronym.js b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/js/acronym.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/js/acronym.js rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/js/acronym.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/js/attributes.js b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/js/attributes.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/js/attributes.js rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/js/attributes.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/js/cite.js b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/js/cite.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/js/cite.js rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/js/cite.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/js/del.js b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/js/del.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/js/del.js rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/js/del.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/js/element_common.js b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/js/element_common.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/js/element_common.js rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/js/element_common.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/js/ins.js b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/js/ins.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/js/ins.js rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/js/ins.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/langs/en_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/langs/ja_dlg.js b/www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/langs/ja_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/plugins/xhtmlxtras/langs/ja_dlg.js rename to www/admin/layout/javascript/tiny_mce/plugins/xhtmlxtras/langs/ja_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/about.htm b/www/admin/layout/javascript/tiny_mce/themes/advanced/about.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/about.htm rename to www/admin/layout/javascript/tiny_mce/themes/advanced/about.htm diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/anchor.htm b/www/admin/layout/javascript/tiny_mce/themes/advanced/anchor.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/anchor.htm rename to www/admin/layout/javascript/tiny_mce/themes/advanced/anchor.htm diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/charmap.htm b/www/admin/layout/javascript/tiny_mce/themes/advanced/charmap.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/charmap.htm rename to www/admin/layout/javascript/tiny_mce/themes/advanced/charmap.htm diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/color_picker.htm b/www/admin/layout/javascript/tiny_mce/themes/advanced/color_picker.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/color_picker.htm rename to www/admin/layout/javascript/tiny_mce/themes/advanced/color_picker.htm diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/editor_template.js b/www/admin/layout/javascript/tiny_mce/themes/advanced/editor_template.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/editor_template.js rename to www/admin/layout/javascript/tiny_mce/themes/advanced/editor_template.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/editor_template_src.js b/www/admin/layout/javascript/tiny_mce/themes/advanced/editor_template_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/editor_template_src.js rename to www/admin/layout/javascript/tiny_mce/themes/advanced/editor_template_src.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/image.htm b/www/admin/layout/javascript/tiny_mce/themes/advanced/image.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/image.htm rename to www/admin/layout/javascript/tiny_mce/themes/advanced/image.htm diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/img/colorpicker.jpg b/www/admin/layout/javascript/tiny_mce/themes/advanced/img/colorpicker.jpg similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/img/colorpicker.jpg rename to www/admin/layout/javascript/tiny_mce/themes/advanced/img/colorpicker.jpg diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/img/icons.gif b/www/admin/layout/javascript/tiny_mce/themes/advanced/img/icons.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/img/icons.gif rename to www/admin/layout/javascript/tiny_mce/themes/advanced/img/icons.gif diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/js/about.js b/www/admin/layout/javascript/tiny_mce/themes/advanced/js/about.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/js/about.js rename to www/admin/layout/javascript/tiny_mce/themes/advanced/js/about.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/js/anchor.js b/www/admin/layout/javascript/tiny_mce/themes/advanced/js/anchor.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/js/anchor.js rename to www/admin/layout/javascript/tiny_mce/themes/advanced/js/anchor.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/js/charmap.js b/www/admin/layout/javascript/tiny_mce/themes/advanced/js/charmap.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/js/charmap.js rename to www/admin/layout/javascript/tiny_mce/themes/advanced/js/charmap.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/js/color_picker.js b/www/admin/layout/javascript/tiny_mce/themes/advanced/js/color_picker.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/js/color_picker.js rename to www/admin/layout/javascript/tiny_mce/themes/advanced/js/color_picker.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/js/image.js b/www/admin/layout/javascript/tiny_mce/themes/advanced/js/image.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/js/image.js rename to www/admin/layout/javascript/tiny_mce/themes/advanced/js/image.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/js/link.js b/www/admin/layout/javascript/tiny_mce/themes/advanced/js/link.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/js/link.js rename to www/admin/layout/javascript/tiny_mce/themes/advanced/js/link.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/js/source_editor.js b/www/admin/layout/javascript/tiny_mce/themes/advanced/js/source_editor.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/js/source_editor.js rename to www/admin/layout/javascript/tiny_mce/themes/advanced/js/source_editor.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/langs/en.js b/www/admin/layout/javascript/tiny_mce/themes/advanced/langs/en.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/langs/en.js rename to www/admin/layout/javascript/tiny_mce/themes/advanced/langs/en.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/langs/en_dlg.js b/www/admin/layout/javascript/tiny_mce/themes/advanced/langs/en_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/langs/en_dlg.js rename to www/admin/layout/javascript/tiny_mce/themes/advanced/langs/en_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/langs/ja.js b/www/admin/layout/javascript/tiny_mce/themes/advanced/langs/ja.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/langs/ja.js rename to www/admin/layout/javascript/tiny_mce/themes/advanced/langs/ja.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/langs/ja_dlg.js b/www/admin/layout/javascript/tiny_mce/themes/advanced/langs/ja_dlg.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/langs/ja_dlg.js rename to www/admin/layout/javascript/tiny_mce/themes/advanced/langs/ja_dlg.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/link.htm b/www/admin/layout/javascript/tiny_mce/themes/advanced/link.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/link.htm rename to www/admin/layout/javascript/tiny_mce/themes/advanced/link.htm diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/content.css b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/content.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/content.css rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/content.css diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/dialog.css b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/dialog.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/dialog.css rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/dialog.css diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/img/buttons.png b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/img/buttons.png similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/img/buttons.png rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/img/buttons.png diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/img/items.gif b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/img/items.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/img/items.gif rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/img/items.gif diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/img/menu_arrow.gif diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/img/menu_check.gif b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/img/menu_check.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/img/menu_check.gif rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/img/menu_check.gif diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/img/progress.gif b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/img/progress.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/img/progress.gif rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/img/progress.gif diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/img/tabs.gif b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/img/tabs.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/img/tabs.gif rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/img/tabs.gif diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/ui.css b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/ui.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/default/ui.css rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/default/ui.css diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/o2k7/content.css b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/o2k7/content.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/o2k7/content.css rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/o2k7/content.css diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/o2k7/dialog.css b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/o2k7/dialog.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/o2k7/dialog.css rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/o2k7/dialog.css diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/o2k7/img/button_bg.png diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_black.png diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/o2k7/img/button_bg_silver.png diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/o2k7/ui.css b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/o2k7/ui.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/o2k7/ui.css rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/o2k7/ui.css diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/o2k7/ui_black.css b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/o2k7/ui_black.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/o2k7/ui_black.css rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/o2k7/ui_black.css diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css b/www/admin/layout/javascript/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css rename to www/admin/layout/javascript/tiny_mce/themes/advanced/skins/o2k7/ui_silver.css diff --git a/www/layout/admin/javascript/tiny_mce/themes/advanced/source_editor.htm b/www/admin/layout/javascript/tiny_mce/themes/advanced/source_editor.htm similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/advanced/source_editor.htm rename to www/admin/layout/javascript/tiny_mce/themes/advanced/source_editor.htm diff --git a/www/layout/admin/javascript/tiny_mce/themes/simple/editor_template.js b/www/admin/layout/javascript/tiny_mce/themes/simple/editor_template.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/simple/editor_template.js rename to www/admin/layout/javascript/tiny_mce/themes/simple/editor_template.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/simple/editor_template_src.js b/www/admin/layout/javascript/tiny_mce/themes/simple/editor_template_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/simple/editor_template_src.js rename to www/admin/layout/javascript/tiny_mce/themes/simple/editor_template_src.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/simple/img/icons.gif b/www/admin/layout/javascript/tiny_mce/themes/simple/img/icons.gif similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/simple/img/icons.gif rename to www/admin/layout/javascript/tiny_mce/themes/simple/img/icons.gif diff --git a/www/layout/admin/javascript/tiny_mce/themes/simple/langs/en.js b/www/admin/layout/javascript/tiny_mce/themes/simple/langs/en.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/simple/langs/en.js rename to www/admin/layout/javascript/tiny_mce/themes/simple/langs/en.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/simple/langs/ja.js b/www/admin/layout/javascript/tiny_mce/themes/simple/langs/ja.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/simple/langs/ja.js rename to www/admin/layout/javascript/tiny_mce/themes/simple/langs/ja.js diff --git a/www/layout/admin/javascript/tiny_mce/themes/simple/skins/default/content.css b/www/admin/layout/javascript/tiny_mce/themes/simple/skins/default/content.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/simple/skins/default/content.css rename to www/admin/layout/javascript/tiny_mce/themes/simple/skins/default/content.css diff --git a/www/layout/admin/javascript/tiny_mce/themes/simple/skins/default/ui.css b/www/admin/layout/javascript/tiny_mce/themes/simple/skins/default/ui.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/simple/skins/default/ui.css rename to www/admin/layout/javascript/tiny_mce/themes/simple/skins/default/ui.css diff --git a/www/layout/admin/javascript/tiny_mce/themes/simple/skins/o2k7/content.css b/www/admin/layout/javascript/tiny_mce/themes/simple/skins/o2k7/content.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/simple/skins/o2k7/content.css rename to www/admin/layout/javascript/tiny_mce/themes/simple/skins/o2k7/content.css diff --git a/www/layout/admin/javascript/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png b/www/admin/layout/javascript/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png rename to www/admin/layout/javascript/tiny_mce/themes/simple/skins/o2k7/img/button_bg.png diff --git a/www/layout/admin/javascript/tiny_mce/themes/simple/skins/o2k7/ui.css b/www/admin/layout/javascript/tiny_mce/themes/simple/skins/o2k7/ui.css similarity index 100% rename from www/layout/admin/javascript/tiny_mce/themes/simple/skins/o2k7/ui.css rename to www/admin/layout/javascript/tiny_mce/themes/simple/skins/o2k7/ui.css diff --git a/www/layout/admin/javascript/tiny_mce/tiny_mce.js b/www/admin/layout/javascript/tiny_mce/tiny_mce.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/tiny_mce.js rename to www/admin/layout/javascript/tiny_mce/tiny_mce.js diff --git a/www/layout/admin/javascript/tiny_mce/tiny_mce_popup.js b/www/admin/layout/javascript/tiny_mce/tiny_mce_popup.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/tiny_mce_popup.js rename to www/admin/layout/javascript/tiny_mce/tiny_mce_popup.js diff --git a/www/layout/admin/javascript/tiny_mce/tiny_mce_src.js b/www/admin/layout/javascript/tiny_mce/tiny_mce_src.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/tiny_mce_src.js rename to www/admin/layout/javascript/tiny_mce/tiny_mce_src.js diff --git a/www/layout/admin/javascript/tiny_mce/utils/editable_selects.js b/www/admin/layout/javascript/tiny_mce/utils/editable_selects.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/utils/editable_selects.js rename to www/admin/layout/javascript/tiny_mce/utils/editable_selects.js diff --git a/www/layout/admin/javascript/tiny_mce/utils/form_utils.js b/www/admin/layout/javascript/tiny_mce/utils/form_utils.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/utils/form_utils.js rename to www/admin/layout/javascript/tiny_mce/utils/form_utils.js diff --git a/www/layout/admin/javascript/tiny_mce/utils/mctabs.js b/www/admin/layout/javascript/tiny_mce/utils/mctabs.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/utils/mctabs.js rename to www/admin/layout/javascript/tiny_mce/utils/mctabs.js diff --git a/www/layout/admin/javascript/tiny_mce/utils/validate.js b/www/admin/layout/javascript/tiny_mce/utils/validate.js similarity index 100% rename from www/layout/admin/javascript/tiny_mce/utils/validate.js rename to www/admin/layout/javascript/tiny_mce/utils/validate.js diff --git a/www/composer.lock b/www/composer.lock index 2c946264..faecd3f1 100644 --- a/www/composer.lock +++ b/www/composer.lock @@ -8,11 +8,11 @@ "packages": [ { "name": "egrajp/smarty-extended", - "version": "4.3.0", + "version": "4.5.2", "dist": { "type": "zip", - "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.3.0/egrajp-smarty-extended.4.3.0.zip", - "shasum": "d41bda35c0d52da35cf911ab0b018655a09f072b" + "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.5.2/egrajp-smarty-extended.4.5.2.zip", + "shasum": "a2c67a5047aad349a2cfa54240a44da449df9c4c" }, "type": "library", "autoload": { @@ -34,7 +34,7 @@ "keywords": [ "templating" ], - "time": "2023-02-17T14:14:10+09:00" + "time": "2024-04-16T18:25:27+09:00" }, { "name": "gullevek/dotenv", @@ -151,5 +151,5 @@ "php": ">=8.1" }, "platform-dev": [], - "plugin-api-version": "2.3.0" + "plugin-api-version": "2.6.0" } diff --git a/www/layout/admin/cache/images/.gitignore b/www/frontend/layout/cache/.gitignore similarity index 100% rename from www/layout/admin/cache/images/.gitignore rename to www/frontend/layout/cache/.gitignore diff --git a/www/layout/frontend/css/frontend.css b/www/frontend/layout/css/frontend.css similarity index 100% rename from www/layout/frontend/css/frontend.css rename to www/frontend/layout/css/frontend.css diff --git a/www/frontend/layout/javascript/debug.js b/www/frontend/layout/javascript/debug.js new file mode 120000 index 00000000..d00263c0 --- /dev/null +++ b/www/frontend/layout/javascript/debug.js @@ -0,0 +1 @@ +../../../admin/layout/javascript/debug.js \ No newline at end of file diff --git a/www/frontend/layout/javascript/fineuploader b/www/frontend/layout/javascript/fineuploader new file mode 120000 index 00000000..199e4515 --- /dev/null +++ b/www/frontend/layout/javascript/fineuploader @@ -0,0 +1 @@ +../../../admin/layout/javascript/fineuploader/ \ No newline at end of file diff --git a/www/frontend/layout/javascript/firebug.js b/www/frontend/layout/javascript/firebug.js new file mode 120000 index 00000000..e456b399 --- /dev/null +++ b/www/frontend/layout/javascript/firebug.js @@ -0,0 +1 @@ +../../../admin/layout/javascript/firebug.js \ No newline at end of file diff --git a/www/layout/frontend/javascript/frontend.js b/www/frontend/layout/javascript/frontend.js similarity index 100% rename from www/layout/frontend/javascript/frontend.js rename to www/frontend/layout/javascript/frontend.js diff --git a/www/layout/frontend/cache/.gitignore b/www/layout/frontend/cache/.gitignore deleted file mode 100644 index d6b7ef32..00000000 --- a/www/layout/frontend/cache/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/www/layout/frontend/cache/images/.gitignore b/www/layout/frontend/cache/images/.gitignore deleted file mode 100644 index d6b7ef32..00000000 --- a/www/layout/frontend/cache/images/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -* -!.gitignore diff --git a/www/layout/frontend/javascript/debug.js b/www/layout/frontend/javascript/debug.js deleted file mode 120000 index 96920d52..00000000 --- a/www/layout/frontend/javascript/debug.js +++ /dev/null @@ -1 +0,0 @@ -../../admin/javascript/debug.js \ No newline at end of file diff --git a/www/layout/frontend/javascript/fineuploader b/www/layout/frontend/javascript/fineuploader deleted file mode 120000 index b5ae5f03..00000000 --- a/www/layout/frontend/javascript/fineuploader +++ /dev/null @@ -1 +0,0 @@ -../../admin/javascript/fineuploader/ \ No newline at end of file diff --git a/www/layout/frontend/javascript/firebug.js b/www/layout/frontend/javascript/firebug.js deleted file mode 120000 index d77cb4bd..00000000 --- a/www/layout/frontend/javascript/firebug.js +++ /dev/null @@ -1 +0,0 @@ -../../admin/javascript/firebug.js \ No newline at end of file diff --git a/www/lib/CoreLibs/Check/File.php b/www/lib/CoreLibs/Check/File.php index 36b4bfc8..c8bdc531 100644 --- a/www/lib/CoreLibs/Check/File.php +++ b/www/lib/CoreLibs/Check/File.php @@ -51,6 +51,23 @@ class File // return lines in file return $lines; } + + /** + * get the mime type of a file via finfo + * if file not found, throws exception + * else returns '' for any other finfo read problem + * + * @param string $read_file File to read, relative or absolute path + * @return string + */ + public static function getMimeType(string $read_file): string + { + $finfo = new \finfo(FILEINFO_MIME_TYPE); + if (!is_file($read_file)) { + throw new \UnexpectedValueException('[getMimeType] File not found: ' . $read_file); + } + return $finfo->file($read_file) ?: ''; + } } // __END__ diff --git a/www/lib/CoreLibs/Combined/ArrayHandler.php b/www/lib/CoreLibs/Combined/ArrayHandler.php index d664310c..bbe3943f 100644 --- a/www/lib/CoreLibs/Combined/ArrayHandler.php +++ b/www/lib/CoreLibs/Combined/ArrayHandler.php @@ -236,6 +236,54 @@ class ArrayHandler return $hit_list; } + /** + * main wrapper function for next/prev key + * + * @param array $array array to search in + * @param int|string $key key for next/prev + * @param bool $next [=true] if to search next or prev + * @return int|string|null Next/prev key or null for end/first + */ + private static function arrayGetKey(array $array, int|string $key, bool $next = true): int|string|null + { + $keys = array_keys($array); + if (($position = array_search($key, $keys, true)) === false) { + return null; + } + $next_position = $next ? $position + 1 : $position - 1; + + if (!isset($keys[$next_position])) { + return null; + } + return $keys[$next_position]; + } + + /** + * Get previous array key from an array + * null on not found + * + * @param array $array + * @param int|string $key + * @return int|string|null Next key, or null for not found + */ + public static function arrayGetPrevKey(array $array, int|string $key): int|string|null + { + return self::arrayGetKey($array, $key, false); + } + + /** + * Get next array key from an array + * null on not found + * + * @param array $array + * @param int|string $key + * @return int|string|null Next key, or null for not found + */ + public static function arrayGetNextKey(array $array, int|string $key): int|string|null + { + return self::arrayGetKey($array, $key, true); + } + /** * correctly recursive merges as an array as array_merge_recursive * just glues things together diff --git a/www/lib/CoreLibs/Combined/DateTime.php b/www/lib/CoreLibs/Combined/DateTime.php index a807a39d..d46619c5 100644 --- a/www/lib/CoreLibs/Combined/DateTime.php +++ b/www/lib/CoreLibs/Combined/DateTime.php @@ -108,7 +108,12 @@ class DateTime if (preg_match("/(h|m|s|ms)/", (string)$timestamp)) { return (string)$timestamp; } - list($timestamp, $ms) = array_pad(explode('.', (string)round((float)$timestamp, 4)), 2, null); + // split to 6 (nano seconds) + list($timestamp, $ms) = array_pad(explode('.', (string)round((float)$timestamp, 6)), 2, null); + // if micro seconds is on and we have none, set to 0 + if ($show_micro && $ms === null) { + $ms = 0; + } // if negative remember $negative = false; if ((int)$timestamp < 0) { @@ -120,6 +125,10 @@ class DateTime $time_string = ''; // if timestamp is zero, return zero string if ($timestamp == 0) { + // if no seconds and we have no microseconds either, show no micro seconds + if ($ms == 0) { + $ms = null; + } $time_string = '0s'; } else { for ($i = 0, $iMax = count($timegroups); $i < $iMax; $i++) { @@ -133,11 +142,8 @@ class DateTime } // only add ms if we have an ms value if ($ms !== null) { - // if we have ms and it has leading zeros, remove them, but only if it is nut just 0 - $ms = preg_replace("/^0+(\d+)$/", '${1}', $ms); - if (!is_string($ms) || empty($ms)) { - $ms = '0'; - } + // prefix the milliseoncds with 0. and round it max 3 digits and then convert to int + $ms = round((float)('0.' . $ms), 3) * 1000; // add ms if there if ($show_micro) { $time_string .= ' ' . $ms . 'ms'; @@ -151,6 +157,240 @@ class DateTime return (string)$time_string; } + /** + * update timeStringFormat with year and month support + * + * The following flags have to be set to be timeStringFormat compatible. + * Not that on seconds overflow this method will throw an exception, timeStringFormat returned -1s + * show_only_days: true, + * skip_zero: false, + * skip_last_zero: false, + * truncate_nanoseconds: true, + * truncate_zero_seconds_if_microseconds: false + * + * @param int|float $seconds Seconds to convert, maxium 6 decimals, + * else \UnexpectedValueException will be thrown + * if days too large or years too large \LengthException is thrown + * @param string $truncate_after [=''] Truncate after which time name, will not round, hard end + * values are parts names or interval short names (y, d, f, ...) + * if illegal value \UnexpectedValueException is thrown + * @param bool $natural_seperator [=false] use ',' and 'and', if off use space + * @param bool $name_space_seperator [=false] add a space between the number and the time name + * @param bool $show_microseconds [=true] show microseconds + * @param bool $short_time_name [=true] use the short time names (eg s instead of seconds) + * @param bool $skip_last_zero [=true] skip all trailing zero values, eg 5m 0s => 5m + * @param bool $skip_zero [=true] do not show zero values anywhere, eg 1h 0m 20s => 1h 20s + * @param bool $show_only_days [=false] do not show years or months, show only days + * if truncate after is set to year or month + * throws \UnexpectedValueException + * @param bool $auto_fix_microseconds [=false] if the micro seconds decimals are more than 6, round them + * on defaul throw \UnexpectedValueException + * @param bool $truncate_nanoseconds [=false] if microseconds decimals >3 then normal we show 123.4ms + * cut the .4 is set to true + * @param bool $truncate_zero_seconds_if_microseconds [=true] if we have 0.123 seconds then if true no seconds + * will be shown + * @return string + * @throws \UnexpectedValueException if seconds has more than 6 decimals + * if truncate has an illegal value + * if truncate is set to year or month and show_only_days is turned on + * @throws \LengthException if seconds is too large and show_days_only is selected and days is negetive + * or if years is negativ + */ + public static function intervalStringFormat( + int|float $seconds, + string $truncate_after = '', + bool $natural_seperator = false, + bool $name_space_seperator = false, + bool $show_microseconds = true, + bool $short_time_name = true, + bool $skip_last_zero = true, + bool $skip_zero = true, + bool $show_only_days = false, + bool $auto_fix_microseconds = false, + bool $truncate_nanoseconds = false, + bool $truncate_zero_seconds_if_microseconds = true, + ): string { + // auto fix long seconds, else \UnexpectedValueException will be thrown on error + // check if we have float and -> round to 6 + if ($auto_fix_microseconds === true && is_float($seconds)) { + $seconds = round($seconds, 6); + } + // flag negative + set abs + $negative = $seconds < 0 ? '-' : ''; + $seconds = abs($seconds); + // create base time + $date_now = new \DateTime("@0"); + try { + $date_seconds = new \DateTime("@$seconds"); + } catch (\Exception $e) { + throw new \UnexpectedValueException( + 'Seconds value is invalid, too large or more than six decimals: ' . $seconds, + 1, + $e + ); + } + $interval = date_diff($date_now, $date_seconds); + // if show_only_days and negative but input postive alert that this has to be done in y/m/d ... + if ($interval->y < 0) { + throw new \LengthException('Input seconds value is too large for years output: ' . $seconds, 2); + } elseif ($interval->days < 0 && $show_only_days === true) { + throw new \LengthException('Input seconds value is too large for days output: ' . $seconds, 3); + } + $parts = [ + 'years' => 'y', + 'months' => 'm', + 'days' => 'd', + 'hours' => 'h', + 'minutes' => 'i', + 'seconds' => 's', + 'microseconds' => 'f', + ]; + $short_name = [ + 'years' => 'y', 'months' => 'm', 'days' => 'd', + 'hours' => 'h', 'minutes' => 'm', 'seconds' => 's', + 'microseconds' => 'ms' + ]; + // $skip = false; + if (!empty($truncate_after)) { + // if truncate after not in key or value in parts + if (!in_array($truncate_after, array_keys($parts)) && !in_array($truncate_after, array_values($parts))) { + throw new \UnexpectedValueException( + 'truncate_after has an invalid value: ' . $truncate_after, + 4 + ); + } + // if truncate after is y or m and we have show_only_days, throw exception + if ($show_only_days === true && in_array($truncate_after, ['y', 'years', 'm', 'months'])) { + throw new \UnexpectedValueException( + 'If show_only_days is turned on, the truncate_after cannot be years or months: ' + . $truncate_after, + 5 + ); + } + // $skip = true; + } + $formatted = []; + $zero_formatted = []; + $value_set = false; + $add_zero_seconds = false; + foreach ($parts as $time_name => $part) { + if ( + // skip for micro seconds + ($show_microseconds === false && $part == 'f') || + // skip for if days only and we have year or month + ($show_only_days === true && in_array($part, ['y', 'm'])) + ) { + continue; + } + $add_value = 0; + if ($show_only_days === true && $part == 'd') { + $value = $interval->days; + } else { + $value = $interval->$part; + } + // print "-> V: $value | $part, $time_name" + // . " | Set: " . ($value_set ? 'Y' : 'N') . ", SkipZ: " . ($skip_zero ? 'Y' : 'N') + // . " | SkipLZ: " . ($skip_last_zero ? 'Y' : 'N') + // . " | " . ($value != 0 ? 'Not zero' : 'ZERO') . "
"; + if ($value != 0) { + if ($part == 'f') { + if ($truncate_nanoseconds === true) { + $value = round($value, 3); + } + $value *= 1000; + // anything above that is nano seconds? + } + if ($value) { + $value_set = true; + } + $add_value = 1; + } elseif ( + $value == 0 && + $value_set === true && ( + $skip_last_zero === false || + $skip_zero === false + ) + ) { + $add_value = 2; + } + // echo "ADD VALUE: $add_value
"; + if ($add_value) { + // build format + $format = "$value"; + if ($name_space_seperator) { + $format .= " "; + } + if ($short_time_name) { + $format .= $short_name[$time_name]; + } elseif ($value == 1) { + $format .= substr($time_name, 0, -1); + } else { + $format .= $time_name; + } + if ($add_value == 1) { + if (count($zero_formatted) && $skip_zero === false) { + $formatted = array_merge($formatted, $zero_formatted); + } + $zero_formatted = []; + $formatted[] = $format; + } elseif ($add_value == 2) { + $zero_formatted[] = $format; + } + } + // if seconds is zero + if ( + $part == 's' && $value == 0 && + $show_microseconds === true && + $truncate_zero_seconds_if_microseconds === false + ) { + $add_zero_seconds = true; + } + // stop after a truncate is matching + if ($part == $truncate_after || $truncate_after == $time_name) { + break; + } + } + // add all zero entries if we have skip last off + if (count($zero_formatted) && $skip_last_zero === false) { + $formatted = array_merge($formatted, $zero_formatted); + } + // print "=> F: " . print_r($formatted, true) + // . " | Z: " . print_r($zero_list, true) + // . " | ZL: " . print_r($zero_last_list, true) + // . "
"; + if (count($formatted) == 0) { + // if we have truncate on, then we assume nothing was found + if (!empty($truncate_after)) { + if (in_array($truncate_after, array_values($parts))) { + $truncate_after = array_flip($parts)[$truncate_after]; + } + $time_name = $truncate_after; + } else { + $time_name = 'seconds'; + } + return '0' . ($name_space_seperator ? ' ' : '') + . ($short_time_name ? $short_name[$time_name] : $time_name); + } elseif (count($formatted) == 1) { + return $negative . + ($add_zero_seconds ? + '0' + . ($name_space_seperator ? ' ' : '') + . ($short_time_name ? $short_name['seconds'] : 'seconds') + . ' ' + : '' + ) + . $formatted[0]; + } elseif ($natural_seperator === false) { + return $negative . implode(' ', $formatted); + } else { + $str = implode(', ', array_slice($formatted, 0, -1)); + if (!empty($formatted[count($formatted) - 1])) { + $str .= ' and ' . (string)array_pop($formatted); + } + return $negative . $str; + } + } + /** * does a reverse of the timeStringFormat and converts the string from * xd xh xm xs xms to a timestamp.microtime format @@ -435,9 +675,9 @@ class DateTime foreach ($period as $dt) { $curr = $dt->format('D'); if ($curr == 'Sat' || $curr == 'Sun') { - $days[2] ++; + $days[2]++; } else { - $days[1] ++; + $days[1]++; } } if ($return_named === true) { diff --git a/www/lib/CoreLibs/Convert/Byte.php b/www/lib/CoreLibs/Convert/Byte.php index ebec727a..b0d05ece 100644 --- a/www/lib/CoreLibs/Convert/Byte.php +++ b/www/lib/CoreLibs/Convert/Byte.php @@ -37,7 +37,7 @@ class Byte * BYTE_FORMAT_ADJUST: sprintf adjusted two 2 decimals * BYTE_FORMAT_SI: use 1000 instead of 1024 * @return string converted byte number (float) with suffix - * @throws \Exception 1: no valid flag set + * @throws \InvalidArgumentException 1: no valid flag set */ public static function humanReadableByteFormat(string|int|float $bytes, int $flags = 0): string { @@ -63,7 +63,7 @@ class Byte $si = false; } if ($flags > 7) { - throw new \Exception("Invalid flags parameter: $flags", 1); + throw new \InvalidArgumentException("Invalid flags parameter: $flags", 1); } // si or normal @@ -119,7 +119,7 @@ class Byte * @param int $flags bitwise flag with use space turned on * BYTE_FORMAT_SI: use 1000 instead of 1024 * @return string|int|float converted value or original value - * @throws \Exception 1: no valid flag set + * @throws \InvalidArgumentException 1: no valid flag set */ public static function stringByteFormat(string|int|float $number, int $flags = 0): string|int|float { @@ -130,7 +130,7 @@ class Byte $si = false; } if ($flags != 0 && $flags != 4) { - throw new \Exception("Invalid flags parameter: $flags", 1); + throw new \InvalidArgumentException("Invalid flags parameter: $flags", 1); } // matches in regex $matches = []; diff --git a/www/lib/CoreLibs/Convert/MimeEncode.php b/www/lib/CoreLibs/Convert/MimeEncode.php index 73a3254d..013b27ee 100644 --- a/www/lib/CoreLibs/Convert/MimeEncode.php +++ b/www/lib/CoreLibs/Convert/MimeEncode.php @@ -15,6 +15,7 @@ class MimeEncode /** * wrapper function for mb mime convert * for correct conversion with long strings + * NOTE: This is only a wrapper for mb_encode_mimeheader to stay compatible * * @param string $string string to encode * @param string $encoding target encoding @@ -29,38 +30,9 @@ class MimeEncode $current_internal_encoding = mb_internal_encoding(); // set internal encoding, so the mimeheader encode works correctly mb_internal_encoding($encoding); - // if a subject, make a work around for the broken mb_mimencode - $pos = 0; - // after 36 single bytes characters, - // if then comes MB, it is broken - // has to 2 x 36 < 74 so the mb_encode_mimeheader - // 74 hardcoded split does not get triggered - $split = 36; - $_string = ''; - while ($pos < mb_strlen($string, $encoding)) { - $output = mb_strimwidth($string, $pos, $split, "", $encoding); - $pos += mb_strlen($output, $encoding); - // if the strinlen is 0 here, get out of the loop - if (!mb_strlen($output, $encoding)) { - $pos += mb_strlen($string, $encoding); - } - $_string_encoded = mb_encode_mimeheader($output, $encoding); - // only make linebreaks if we have mime encoded code inside - // the space only belongs in the second line - if ($_string && preg_match("/^=\?/", $_string_encoded)) { - $_string .= $line_break . " "; - } elseif ( - // hack for plain text with space at the end - mb_strlen($output, $encoding) == $split && - mb_substr($output, -1, 1, $encoding) == " " - ) { - // if output ends with space, add one more - $_string_encoded .= " "; - } - $_string .= $_string_encoded; - } - // strip out any spaces BEFORE a line break - $string = str_replace(" " . $line_break, $line_break, $_string); + // use the internal convert to mime header + // it works from PHP 8.2 on + $string = mb_encode_mimeheader($string, $encoding, 'B', $line_break); // before we end, reset internal encoding mb_internal_encoding($current_internal_encoding); // return mime encoded string diff --git a/www/lib/CoreLibs/Convert/Strings.php b/www/lib/CoreLibs/Convert/Strings.php index bcbaf058..2935e26d 100644 --- a/www/lib/CoreLibs/Convert/Strings.php +++ b/www/lib/CoreLibs/Convert/Strings.php @@ -118,6 +118,22 @@ class Strings return $value; } } + + /** + * Strip any duplicated slahes from a path + * eg: //foo///bar/foo.inc -> /foo/bar/foo.inc + * + * @param string $path Path to strip slashes from + * @return string Clean path, on error returns original path + */ + public static function stripMultiplePathSlashes(string $path): string + { + return preg_replace( + '#/+#', + '/', + $path + ) ?? $path; + } } // __END__ diff --git a/www/lib/CoreLibs/DB/Extended/ArrayIO.php b/www/lib/CoreLibs/DB/Extended/ArrayIO.php index 2f19e9df..d40b71b4 100644 --- a/www/lib/CoreLibs/DB/Extended/ArrayIO.php +++ b/www/lib/CoreLibs/DB/Extended/ArrayIO.php @@ -236,7 +236,7 @@ class ArrayIO extends \CoreLibs\DB\IO */ public function getPkId(): int|string|null { - return $this->pk_id; + return $this->pk_id ?? null; } /** diff --git a/www/lib/CoreLibs/DB/IO.php b/www/lib/CoreLibs/DB/IO.php index f0e8173b..efe3901c 100644 --- a/www/lib/CoreLibs/DB/IO.php +++ b/www/lib/CoreLibs/DB/IO.php @@ -1186,7 +1186,7 @@ class IO */ private function __dbDebugPrepareContext(string $query, array $params = []): array { - if ($this->params === []) { + if ($params === []) { return []; } $error_data = [ @@ -1302,7 +1302,7 @@ class IO } } } - $this->cursor_ext[$query_hash]['pos'] ++; + $this->cursor_ext[$query_hash]['pos']++; return $return; } @@ -1318,14 +1318,14 @@ class IO // regex for params: only stand alone $number allowed // exclude all '' enclosed strings, ignore all numbers [note must start with digit] // can have space/tab/new line - // must have = , ( [equal, comma, opening round bracket] + // must have <> = , ( [not equal, equal, comma, opening round bracket] // can have space/tab/new line // $ number with 1-9 for first and 0-9 for further digits // /s for matching new line in . list // [disabled, we don't used ^ or $] /m for multi line match // Matches in 1:, must be array_filtered to remove empty, count with array_unique preg_match_all( - '/(?:\'.*?\')?\s*(?:\?\?|[(=,])\s*(?:\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))/s', + '/(?:\'.*?\')?\s*(?:\?\?|<>|[(=,])\s*(?:\d+|(?:\'.*?\')|(\$[1-9]{1}(?:[0-9]{1,})?))/s', $query, $match ); @@ -1519,7 +1519,7 @@ class IO ]); return false; } - $this->query_called[$query_hash] ++; + $this->query_called[$query_hash]++; // return hash return $query_hash; } @@ -2411,6 +2411,8 @@ class IO // set the query $this->cursor_ext[$query_hash]['query'] = $query; + // set the query parameters + $this->cursor_ext[$query_hash]['params'] = $params; // before doing ANYTHING check if query is "SELECT ..." everything else does not work if (!$this->dbCheckQueryForSelect($this->cursor_ext[$query_hash]['query'])) { $this->__dbError(17, false, context: [ @@ -2420,8 +2422,6 @@ class IO ]); return false; } - // set the query parameters - $this->cursor_ext[$query_hash]['params'] = $params; // QUERY PARAMS: run query params check and rewrite if ($this->dbGetConvertPlaceholder() === true) { try { @@ -2469,7 +2469,7 @@ class IO return false; } } else { - $this->cursor_ext[$query_hash]['log_pos'] ++; + $this->cursor_ext[$query_hash]['log_pos']++; } // reset log for each read $this->cursor_ext[$query_hash]['log'] = []; @@ -2668,8 +2668,8 @@ class IO if ($return) { $this->cursor_ext[$query_hash]['log'][] = 'Return Data'; // internal position counter - $this->cursor_ext[$query_hash]['pos'] ++; - $this->cursor_ext[$query_hash]['read_rows'] ++; + $this->cursor_ext[$query_hash]['pos']++; + $this->cursor_ext[$query_hash]['read_rows']++; // read is finished if ( $this->cursor_ext[$query_hash]['read_rows'] == diff --git a/www/lib/CoreLibs/Debug/Support.php b/www/lib/CoreLibs/Debug/Support.php index 456be11c..affec0f7 100644 --- a/www/lib/CoreLibs/Debug/Support.php +++ b/www/lib/CoreLibs/Debug/Support.php @@ -295,8 +295,7 @@ class Support * Will start with start_level to skip unwanted from stack * Defaults to skip level 0 wich is this methid * - * @param integer $start_level From what level on, as defaul starts with 1 - * to exclude self + * @param integer $start_level [=1] From what level on, starts with 1 to exclude self * @return array All method names in list where max is last called */ public static function getCallerMethodList(int $start_level = 1): array @@ -304,15 +303,46 @@ class Support $traces = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); $methods = []; foreach ($traces as $level => $data) { - if ($level >= $start_level) { - if (!empty($data['function'])) { - array_unshift($methods, $data['function']); - } + if ($level < $start_level) { + continue; + } + if (!empty($data['function'])) { + array_unshift($methods, $data['function']); } } return $methods; } + /** + * Get the full call stack from a certain starting level + * The return string is + * file:line:class->method + * + * Note that '::' is used for static calls + * + * @param int $start_level [=1] starts with 1 to exclude itself + * @return array string with file, line, class and method + */ + public static function getCallStack(int $start_level = 1): array + { + $call_stack = []; + $backtrace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS); + foreach ($backtrace as $level => $call_trace) { + if ($level < $start_level) { + continue; + } + $call_stack[] = + ($call_trace['file'] ?? 'n/f') . ':' + . ($call_trace['line'] ?? '-') . ':' + . (!empty($call_trace['class']) ? + $call_trace['class'] . ($call_trace['type'] ?? '') : + '' + ) + . $call_trace['function']; + } + return $call_stack; + } + /** * Get the current class where this function is called * Is mostly used in debug log statements to get the class where the debug diff --git a/www/lib/CoreLibs/Output/Form/Generate.php b/www/lib/CoreLibs/Output/Form/Generate.php index 85531874..62ca7370 100644 --- a/www/lib/CoreLibs/Output/Form/Generate.php +++ b/www/lib/CoreLibs/Output/Form/Generate.php @@ -826,27 +826,28 @@ class Generate $pk_selected = $res[$this->int_pk_name]; } $t_string = ''; - foreach ($this->field_array as $i => $field_array) { + foreach ($this->field_array as $field_array) { if ($t_string) { $t_string .= ', '; } - if (isset($field_array['before_value'])) { - $t_string .= $field_array['before_value']; + if (!empty($field_array['before_value'])) { + $t_string .= $this->l->__($field_array['before_value']); } // must have res element set if ( - isset($field_array['name']) && + !empty($field_array['name']) && isset($res[$field_array['name']]) ) { - if (isset($field_array['binary'])) { - if (isset($field_array['binary'][0])) { - $t_string .= $field_array['binary'][0]; - } elseif (isset($field_array['binary'][1])) { - $t_string .= $field_array['binary'][1]; - } + $_t_value = ''; + // if we have a binary set, where 0 = YES and 1 = NO + if (!empty($field_array['binary'])) { + $_t_value = !empty($res[$field_array['name']]) ? + ($field_array['binary'][0] ?? 'Yes') : + ($field_array['binary'][1] ?? 'No'); } else { - $t_string .= $res[$field_array['name']]; + $_t_value = $res[$field_array['name']]; } + $t_string .= $this->l->__($_t_value); } } $pk_names[] = $t_string; @@ -1506,7 +1507,7 @@ class Generate } if ( !empty($this->reference_array[$key]['mandatory']) && - !$this->reference_array[$key]['selected'][0] + empty($this->reference_array[$key]['selected'][0]) ) { $this->msg .= sprintf( $this->l->__('Please select at least one Element from field %s!
'), diff --git a/www/lib/CoreLibs/Output/Form/TableArrays/EditPages.php b/www/lib/CoreLibs/Output/Form/TableArrays/EditPages.php index 1ac90390..ef293f79 100644 --- a/www/lib/CoreLibs/Output/Form/TableArrays/EditPages.php +++ b/www/lib/CoreLibs/Output/Form/TableArrays/EditPages.php @@ -53,6 +53,7 @@ class EditPages implements Interface\TableArraysInterface 'value' => $_POST['name'] ?? '', 'output_name' => 'Page name', 'mandatory' => 1, + 'error_check' => 'unique', 'type' => 'text' ], 'order_number' => [ diff --git a/www/lib/CoreLibs/Output/Image.php b/www/lib/CoreLibs/Output/Image.php index 897e6495..9fd82619 100644 --- a/www/lib/CoreLibs/Output/Image.php +++ b/www/lib/CoreLibs/Output/Image.php @@ -78,7 +78,7 @@ class Image if (!empty($dummy) && file_exists($filename) && is_file($filename)) { $return_data = $filename; } else { - throw new \Exception('Could not set dummy return file: ' . $dummy . ' in ' . $filename); + throw new \RuntimeException('Could not set dummy return file: ' . $dummy . ' in ' . $filename); } } else { $return_data = $dummy; @@ -204,11 +204,11 @@ class Image E_USER_DEPRECATED ); // NOTE: we need to depracte this - $cache_folder = BASE . LAYOUT . CONTENT_PATH . CACHE . IMAGES; + $cache_folder = BASE . CONTENT_PATH . LAYOUT . CACHE . IMAGES; $web_folder = LAYOUT . CACHE . IMAGES; if (!is_dir($cache_folder)) { if (false === mkdir($cache_folder)) { - $cache_folder = BASE . LAYOUT . CONTENT_PATH . CACHE; + $cache_folder = BASE . CONTENT_PATH . LAYOUT . CACHE; $web_folder = LAYOUT . CACHE; } } diff --git a/www/lib/CoreLibs/Output/ProgressBar.php b/www/lib/CoreLibs/Output/ProgressBar.php index 6affd992..5c4f9c76 100644 --- a/www/lib/CoreLibs/Output/ProgressBar.php +++ b/www/lib/CoreLibs/Output/ProgressBar.php @@ -156,7 +156,7 @@ class ProgressBar { // avoid divison through 0 if ($this->max - $this->min == 0) { - $this->max ++; + $this->max++; } $percent = round(($step - $this->min) / ($this->max - $this->min) * 100); if ($percent > 100) { @@ -186,7 +186,7 @@ class ProgressBar } // avoid divison through 0 if ($this->max - $this->min == 0) { - $this->max ++; + $this->max++; } $pixel = round(($step - $this->min) * ($bar - ($this->pedding * 2)) / ($this->max - $this->min)); if ($step <= $this->min) { diff --git a/www/vendor/composer/ClassLoader.php b/www/vendor/composer/ClassLoader.php index fd56bd7d..7824d8f7 100644 --- a/www/vendor/composer/ClassLoader.php +++ b/www/vendor/composer/ClassLoader.php @@ -45,35 +45,34 @@ class ClassLoader /** @var \Closure(string):void */ private static $includeFile; - /** @var ?string */ + /** @var string|null */ private $vendorDir; // PSR-4 /** - * @var array[] - * @psalm-var array> + * @var array> */ private $prefixLengthsPsr4 = array(); /** - * @var array[] - * @psalm-var array> + * @var array> */ private $prefixDirsPsr4 = array(); /** - * @var array[] - * @psalm-var array + * @var list */ private $fallbackDirsPsr4 = array(); // PSR-0 /** - * @var array[] - * @psalm-var array> + * List of PSR-0 prefixes + * + * Structured as array('F (first letter)' => array('Foo\Bar (full prefix)' => array('path', 'path2'))) + * + * @var array>> */ private $prefixesPsr0 = array(); /** - * @var array[] - * @psalm-var array + * @var list */ private $fallbackDirsPsr0 = array(); @@ -81,8 +80,7 @@ class ClassLoader private $useIncludePath = false; /** - * @var string[] - * @psalm-var array + * @var array */ private $classMap = array(); @@ -90,21 +88,20 @@ class ClassLoader private $classMapAuthoritative = false; /** - * @var bool[] - * @psalm-var array + * @var array */ private $missingClasses = array(); - /** @var ?string */ + /** @var string|null */ private $apcuPrefix; /** - * @var self[] + * @var array */ private static $registeredLoaders = array(); /** - * @param ?string $vendorDir + * @param string|null $vendorDir */ public function __construct($vendorDir = null) { @@ -113,7 +110,7 @@ class ClassLoader } /** - * @return string[] + * @return array> */ public function getPrefixes() { @@ -125,8 +122,7 @@ class ClassLoader } /** - * @return array[] - * @psalm-return array> + * @return array> */ public function getPrefixesPsr4() { @@ -134,8 +130,7 @@ class ClassLoader } /** - * @return array[] - * @psalm-return array + * @return list */ public function getFallbackDirs() { @@ -143,8 +138,7 @@ class ClassLoader } /** - * @return array[] - * @psalm-return array + * @return list */ public function getFallbackDirsPsr4() { @@ -152,8 +146,7 @@ class ClassLoader } /** - * @return string[] Array of classname => path - * @psalm-return array + * @return array Array of classname => path */ public function getClassMap() { @@ -161,8 +154,7 @@ class ClassLoader } /** - * @param string[] $classMap Class to filename map - * @psalm-param array $classMap + * @param array $classMap Class to filename map * * @return void */ @@ -179,24 +171,25 @@ class ClassLoader * Registers a set of PSR-0 directories for a given prefix, either * appending or prepending to the ones previously set for this prefix. * - * @param string $prefix The prefix - * @param string[]|string $paths The PSR-0 root directories - * @param bool $prepend Whether to prepend the directories + * @param string $prefix The prefix + * @param list|string $paths The PSR-0 root directories + * @param bool $prepend Whether to prepend the directories * * @return void */ public function add($prefix, $paths, $prepend = false) { + $paths = (array) $paths; if (!$prefix) { if ($prepend) { $this->fallbackDirsPsr0 = array_merge( - (array) $paths, + $paths, $this->fallbackDirsPsr0 ); } else { $this->fallbackDirsPsr0 = array_merge( $this->fallbackDirsPsr0, - (array) $paths + $paths ); } @@ -205,19 +198,19 @@ class ClassLoader $first = $prefix[0]; if (!isset($this->prefixesPsr0[$first][$prefix])) { - $this->prefixesPsr0[$first][$prefix] = (array) $paths; + $this->prefixesPsr0[$first][$prefix] = $paths; return; } if ($prepend) { $this->prefixesPsr0[$first][$prefix] = array_merge( - (array) $paths, + $paths, $this->prefixesPsr0[$first][$prefix] ); } else { $this->prefixesPsr0[$first][$prefix] = array_merge( $this->prefixesPsr0[$first][$prefix], - (array) $paths + $paths ); } } @@ -226,9 +219,9 @@ class ClassLoader * Registers a set of PSR-4 directories for a given namespace, either * appending or prepending to the ones previously set for this namespace. * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param string[]|string $paths The PSR-4 base directories - * @param bool $prepend Whether to prepend the directories + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param list|string $paths The PSR-4 base directories + * @param bool $prepend Whether to prepend the directories * * @throws \InvalidArgumentException * @@ -236,17 +229,18 @@ class ClassLoader */ public function addPsr4($prefix, $paths, $prepend = false) { + $paths = (array) $paths; if (!$prefix) { // Register directories for the root namespace. if ($prepend) { $this->fallbackDirsPsr4 = array_merge( - (array) $paths, + $paths, $this->fallbackDirsPsr4 ); } else { $this->fallbackDirsPsr4 = array_merge( $this->fallbackDirsPsr4, - (array) $paths + $paths ); } } elseif (!isset($this->prefixDirsPsr4[$prefix])) { @@ -256,18 +250,18 @@ class ClassLoader throw new \InvalidArgumentException("A non-empty PSR-4 prefix must end with a namespace separator."); } $this->prefixLengthsPsr4[$prefix[0]][$prefix] = $length; - $this->prefixDirsPsr4[$prefix] = (array) $paths; + $this->prefixDirsPsr4[$prefix] = $paths; } elseif ($prepend) { // Prepend directories for an already registered namespace. $this->prefixDirsPsr4[$prefix] = array_merge( - (array) $paths, + $paths, $this->prefixDirsPsr4[$prefix] ); } else { // Append directories for an already registered namespace. $this->prefixDirsPsr4[$prefix] = array_merge( $this->prefixDirsPsr4[$prefix], - (array) $paths + $paths ); } } @@ -276,8 +270,8 @@ class ClassLoader * Registers a set of PSR-0 directories for a given prefix, * replacing any others previously set for this prefix. * - * @param string $prefix The prefix - * @param string[]|string $paths The PSR-0 base directories + * @param string $prefix The prefix + * @param list|string $paths The PSR-0 base directories * * @return void */ @@ -294,8 +288,8 @@ class ClassLoader * Registers a set of PSR-4 directories for a given namespace, * replacing any others previously set for this namespace. * - * @param string $prefix The prefix/namespace, with trailing '\\' - * @param string[]|string $paths The PSR-4 base directories + * @param string $prefix The prefix/namespace, with trailing '\\' + * @param list|string $paths The PSR-4 base directories * * @throws \InvalidArgumentException * @@ -429,7 +423,8 @@ class ClassLoader public function loadClass($class) { if ($file = $this->findFile($class)) { - (self::$includeFile)($file); + $includeFile = self::$includeFile; + $includeFile($file); return true; } @@ -480,9 +475,9 @@ class ClassLoader } /** - * Returns the currently registered loaders indexed by their corresponding vendor directories. + * Returns the currently registered loaders keyed by their corresponding vendor directories. * - * @return self[] + * @return array */ public static function getRegisteredLoaders() { @@ -560,7 +555,10 @@ class ClassLoader return false; } - private static function initializeIncludeClosure(): void + /** + * @return void + */ + private static function initializeIncludeClosure() { if (self::$includeFile !== null) { return; @@ -574,8 +572,8 @@ class ClassLoader * @param string $file * @return void */ - self::$includeFile = static function($file) { + self::$includeFile = \Closure::bind(static function($file) { include $file; - }; + }, null, null); } } diff --git a/www/vendor/composer/InstalledVersions.php b/www/vendor/composer/InstalledVersions.php index c6b54af7..51e734a7 100644 --- a/www/vendor/composer/InstalledVersions.php +++ b/www/vendor/composer/InstalledVersions.php @@ -98,7 +98,7 @@ class InstalledVersions { foreach (self::getInstalled() as $installed) { if (isset($installed['versions'][$packageName])) { - return $includeDevRequirements || empty($installed['versions'][$packageName]['dev_requirement']); + return $includeDevRequirements || !isset($installed['versions'][$packageName]['dev_requirement']) || $installed['versions'][$packageName]['dev_requirement'] === false; } } @@ -119,7 +119,7 @@ class InstalledVersions */ public static function satisfies(VersionParser $parser, $packageName, $constraint) { - $constraint = $parser->parseConstraints($constraint); + $constraint = $parser->parseConstraints((string) $constraint); $provided = $parser->parseConstraints(self::getVersionRanges($packageName)); return $provided->matches($constraint); @@ -328,7 +328,9 @@ class InstalledVersions if (isset(self::$installedByVendor[$vendorDir])) { $installed[] = self::$installedByVendor[$vendorDir]; } elseif (is_file($vendorDir.'/composer/installed.php')) { - $installed[] = self::$installedByVendor[$vendorDir] = require $vendorDir.'/composer/installed.php'; + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ + $required = require $vendorDir.'/composer/installed.php'; + $installed[] = self::$installedByVendor[$vendorDir] = $required; if (null === self::$installed && strtr($vendorDir.'/composer', '\\', '/') === strtr(__DIR__, '\\', '/')) { self::$installed = $installed[count($installed) - 1]; } @@ -340,12 +342,17 @@ class InstalledVersions // only require the installed.php file if this file is loaded from its dumped location, // and not from its source location in the composer/composer package, see https://github.com/composer/composer/issues/9937 if (substr(__DIR__, -8, 1) !== 'C') { - self::$installed = require __DIR__ . '/installed.php'; + /** @var array{root: array{name: string, pretty_version: string, version: string, reference: string|null, type: string, install_path: string, aliases: string[], dev: bool}, versions: array} $required */ + $required = require __DIR__ . '/installed.php'; + self::$installed = $required; } else { self::$installed = array(); } } - $installed[] = self::$installed; + + if (self::$installed !== array()) { + $installed[] = self::$installed; + } return $installed; } diff --git a/www/vendor/composer/installed.json b/www/vendor/composer/installed.json index dc7144b6..fee99149 100644 --- a/www/vendor/composer/installed.json +++ b/www/vendor/composer/installed.json @@ -2,14 +2,14 @@ "packages": [ { "name": "egrajp/smarty-extended", - "version": "4.3.0", - "version_normalized": "4.3.0.0", + "version": "4.5.2", + "version_normalized": "4.5.2.0", "dist": { "type": "zip", - "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.3.0/egrajp-smarty-extended.4.3.0.zip", - "shasum": "d41bda35c0d52da35cf911ab0b018655a09f072b" + "url": "https://git.egplusww.jp/api/packages/Composer/composer/files/egrajp%2Fsmarty-extended/4.5.2/egrajp-smarty-extended.4.5.2.zip", + "shasum": "a2c67a5047aad349a2cfa54240a44da449df9c4c" }, - "time": "2023-02-17T14:14:10+09:00", + "time": "2024-04-16T18:25:27+09:00", "type": "library", "installation-source": "dist", "autoload": { diff --git a/www/vendor/composer/installed.php b/www/vendor/composer/installed.php index 3d9e8833..ab34286a 100644 --- a/www/vendor/composer/installed.php +++ b/www/vendor/composer/installed.php @@ -3,7 +3,7 @@ 'name' => 'egrajp/corelibs-dev', 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => NULL, + 'reference' => null, 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), @@ -13,16 +13,16 @@ 'egrajp/corelibs-dev' => array( 'pretty_version' => 'dev-master', 'version' => 'dev-master', - 'reference' => NULL, + 'reference' => null, 'type' => 'library', 'install_path' => __DIR__ . '/../../', 'aliases' => array(), 'dev_requirement' => false, ), 'egrajp/smarty-extended' => array( - 'pretty_version' => '4.3.0', - 'version' => '4.3.0.0', - 'reference' => NULL, + 'pretty_version' => '4.5.2', + 'version' => '4.5.2.0', + 'reference' => null, 'type' => 'library', 'install_path' => __DIR__ . '/../egrajp/smarty-extended', 'aliases' => array(), diff --git a/www/vendor/egrajp/smarty-extended/ReadMe.md b/www/vendor/egrajp/smarty-extended/ReadMe.md index f3b5c5f8..ded4fcec 100644 --- a/www/vendor/egrajp/smarty-extended/ReadMe.md +++ b/www/vendor/egrajp/smarty-extended/ReadMe.md @@ -11,45 +11,36 @@ For local install only ## Setup from central composer -| Host | Location | Type | -| - | - | - | -| composer.tokyo.tequila.jp | soba-local | Local test | -| composer-local.tokyo.tequila.jp | udon-local | Local Live, no https | -| composer.egplusww.jp | udon | General Live (use this) | +Setup from gitea internal servers -composer.json: - -For Local test, note that secure-http has to be turned off: - -```json -{ - "repositories": [ - { - "type": "composer", - "url": "http://composer.tokyo.tequila.jp" - } - ], - "require": { - "egrajp/smarty-extended": "@dev" - }, - "config": { - "secure-http": false - } -} +```sh +composer config repositories.git.egplusww.jp.Composer composer https://git.egplusww.jp/api/packages/Composer/composer ``` -For live settings +Alternative setup composer local zip file repot: +`composer config repositories.composer.egplusww.jp composer http://composer.egplusww.jp` -```json -{ - "repositories": [ - { - "type": "composer", - "url": "https://composer.egplusww.jp" - } - ], - "require": { - "egrajp/smarty-extended": "@dev" - } -} -``` +## Install package + +`composer require egrajp/smarty-extended:^4.3` + +## How to update + +1) update the original composer for ^4.3 +2) copy over the src/sysplugins and all base files in src/ +3) check either function.html_checkboxes.php and function.html_options.php have changed +4) copy src/plugins except the above two files, be sure to keep the block.t.php and function_popup*.php +5) Create new release version as official relase number + +## Updated files (different from master) + +### New + +`src/plugins/block.t.php` +`src/plugins/function_popup.php` +`src/plugins/function_popup.init.php` + +### Changed + +`src/plugins/function.html_checkboxes.php` +`src/plugins/function.html_options.php` diff --git a/www/vendor/egrajp/smarty-extended/publish/.gitignore b/www/vendor/egrajp/smarty-extended/publish/.gitignore new file mode 100644 index 00000000..81a38be6 --- /dev/null +++ b/www/vendor/egrajp/smarty-extended/publish/.gitignore @@ -0,0 +1 @@ +.env* diff --git a/www/vendor/egrajp/smarty-extended/publish/last.published b/www/vendor/egrajp/smarty-extended/publish/last.published new file mode 100644 index 00000000..4404a17b --- /dev/null +++ b/www/vendor/egrajp/smarty-extended/publish/last.published @@ -0,0 +1 @@ +4.5.1 diff --git a/www/vendor/egrajp/smarty-extended/publish/package-download/.gitignore b/www/vendor/egrajp/smarty-extended/publish/package-download/.gitignore new file mode 100644 index 00000000..c4c4ffc6 --- /dev/null +++ b/www/vendor/egrajp/smarty-extended/publish/package-download/.gitignore @@ -0,0 +1 @@ +*.zip diff --git a/www/vendor/egrajp/smarty-extended/publish/publish.sh b/www/vendor/egrajp/smarty-extended/publish/publish.sh new file mode 100755 index 00000000..e74a53db --- /dev/null +++ b/www/vendor/egrajp/smarty-extended/publish/publish.sh @@ -0,0 +1,90 @@ +#!/usr/bin/env bash + +BASE_FOLDER=$(dirname $(readlink -f $0))"/"; +PACKAGE_DOWNLOAD="${BASE_FOLDER}package-download/"; +if [ ! -d "${PACKAGE_DOWNLOAD}" ]; then + mkdir "${PACKAGE_DOWNLOAD}"; +fi; +VERSION=$(git tag --list | sort -V | tail -n1 | sed -e "s/^v//"); +file_last_published="${BASE_FOLDER}last.published"; +go_flag="$1"; + +if [ -z "${VERSION}" ]; then + echo "Version must be set in the form x.y.z without any leading characters"; + exit; +fi; +# compare version, if different or newer, deploy +if [ -f "${file_last_published}" ]; then + LAST_PUBLISHED_VERSION=$(cat ${file_last_published}); + if $(dpkg --compare-versions "${VERSION}" le "${LAST_PUBLISHED_VERSION}"); then + echo "git tag version ${VERSION} is not newer than previous published version ${LAST_PUBLISHED_VERSION}"; + exit; + fi; +fi; + +# read in the .env.deploy file and we must have +# GITEA_UPLOAD_FILENAME +# GITLAB_USER +# GITLAB_TOKEN +# GITLAB_URL +# GITEA_USER +# GITEA_DEPLOY_TOKEN +# GITEA_URL_DL +# GITEA_URL_PUSH +if [ ! -f "${BASE_FOLDER}.env.deploy" ]; then + echo "Deploy enviroment file .env.deploy is missing"; + exit; +fi; +set -o allexport; +cd ${BASE_FOLDER}; +source .env.deploy; +cd -; +set +o allexport; + +if [ "${go_flag}" != "go" ]; then + echo "No go flag given"; + echo "Would publish ${VERSION}"; + echo "[END]"; + exit; +fi; + +echo "[START]"; + +# gitea +if [ ! -z "${GITEA_UPLOAD_FILENAME}" ] && + [ ! -z "${GITEA_URL_DL}" ] && [ ! -z "${GITEA_URL_PUSH}" ] && + [ ! -z "${GITEA_USER}" ] && [ ! -z "${GITEA_TOKEN}" ]; then + curl -LJO \ + --output-dir "${PACKAGE_DOWNLOAD}" \ + ${GITEA_URL_DL}/v${VERSION}.zip; + # echo "curl -LJO \ + # --output-dir "${PACKAGE_DOWNLOAD}" \ + # ${GITEA_URL_DL}/v${VERSION}.zip;" + curl --user ${GITEA_USER}:${GITEA_TOKEN} \ + --upload-file "${PACKAGE_DOWNLOAD}${GITEA_UPLOAD_FILENAME}-v${VERSION}.zip" \ + ${GITEA_URL_PUSH}?version=${VERSION}; + # echo "curl --user ${GITEA_USER}:${GITEA_TOKEN} \ + # --upload-file "${PACKAGE_DOWNLOAD}${GITEA_UPLOAD_FILENAME}-v${VERSION}.zip" \ + # ${GITEA_URL_PUSH}?version=${VERSION};" + echo "${VERSION}" > "${file_last_published}"; +else + echo "Missing either GITEA_UPLOAD_FILENAME, GITEA_URL_DL, GITEA_URL_PUSH, GITEA_USER or GITEA_TOKEN environment variable"; +fi; + +# gitlab +if [ ! -z "${GITLAB_URL}" ] && [ ! -z "${GITLAB_DEPLOY_TOKEN}" ]; then + curl --data tag=v${VERSION} \ + --header "Deploy-Token: ${GITLAB_DEPLOY_TOKEN}" \ + "${GITLAB_URL}"; + curl --data branch=master \ + --header "Deploy-Token: ${GITLAB_DEPLOY_TOKEN}" \ + "${GITLAB_URL}"; + echo "${VERSION}" > "${file_last_published}"; +else + echo "Missing GITLAB_DEPLOY_TOKEN environment variable"; +fi; + +echo ""; +echo "[DONE]"; + +# __END__ diff --git a/www/vendor/egrajp/smarty-extended/src/Smarty.class.php b/www/vendor/egrajp/smarty-extended/src/Smarty.class.php index 5351b579..1bfc5646 100644 --- a/www/vendor/egrajp/smarty-extended/src/Smarty.class.php +++ b/www/vendor/egrajp/smarty-extended/src/Smarty.class.php @@ -107,7 +107,7 @@ class Smarty extends Smarty_Internal_TemplateBase /** * smarty version */ - const SMARTY_VERSION = '4.3.0'; + const SMARTY_VERSION = '4.5.1'; /** * define variable scopes */ diff --git a/www/vendor/egrajp/smarty-extended/src/debug.tpl b/www/vendor/egrajp/smarty-extended/src/debug.tpl index 4f82a582..cd932566 100644 --- a/www/vendor/egrajp/smarty-extended/src/debug.tpl +++ b/www/vendor/egrajp/smarty-extended/src/debug.tpl @@ -167,9 +167,7 @@ {/capture} diff --git a/www/vendor/egrajp/smarty-extended/src/plugins/function.math.php b/www/vendor/egrajp/smarty-extended/src/plugins/function.math.php index f9cf67fe..34912d23 100644 --- a/www/vendor/egrajp/smarty-extended/src/plugins/function.math.php +++ b/www/vendor/egrajp/smarty-extended/src/plugins/function.math.php @@ -67,7 +67,7 @@ function smarty_function_math($params, $template) $equation = preg_replace('/\s+/', '', $equation); // Adapted from https://www.php.net/manual/en/function.eval.php#107377 - $number = '(?:\d+(?:[,.]\d+)?|pi|π)'; // What is a number + $number = '-?(?:\d+(?:[,.]\d+)?|pi|π)'; // What is a number $functionsOrVars = '((?:0x[a-fA-F0-9]+)|([a-zA-Z_\x7f-\xff][a-zA-Z0-9_\x7f-\xff]*))'; $operators = '[,+\/*\^%-]'; // Allowed math operators $regexp = '/^(('.$number.'|'.$functionsOrVars.'|('.$functionsOrVars.'\s*\((?1)*\)|\((?1)*\)))(?:'.$operators.'(?1))?)+$/'; diff --git a/www/vendor/egrajp/smarty-extended/src/plugins/modifier.escape.php b/www/vendor/egrajp/smarty-extended/src/plugins/modifier.escape.php index 11e44682..e168679c 100644 --- a/www/vendor/egrajp/smarty-extended/src/plugins/modifier.escape.php +++ b/www/vendor/egrajp/smarty-extended/src/plugins/modifier.escape.php @@ -115,7 +115,9 @@ function smarty_modifier_escape($string, $esc_type = 'html', $char_set = null, $ // see https://html.spec.whatwg.org/multipage/scripting.html#restrictions-for-contents-of-script-elements '