[Quickfw-git] SF.net Git: quickfw branch, master, updated. fb0aa4c74502b2d656a98eb8c16fb465963e6e4d

[Ivan1986 <iva...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "quickfw".

The branch, master has been updated
       via  fb0aa4c74502b2d656a98eb8c16fb465963e6e4d (commit)
       via  aaee7e590312bd59b05c425bee783d01354b81d7 (commit)
       via  84d9cf7c13fcca8c457412ecc8ad9bf2bafe5622 (commit)
       via  e996d7c3810a43f33cc667e60ba25e491ace1652 (commit)
       via  d5b4db669724c89690a43cac2046fd893c9f45b3 (commit)
       via  164b60b852927cf4b6306be3502ec073be342a20 (commit)
       via  24a1c0f7768e3392fda6d800b58371a7f9de7de9 (commit)
       via  2cf7e7e92599b147fc4f810aab30ae629dfd7b30 (commit)
       via  0b194a53c25c71167f7227ec241b3e431b8d7b45 (commit)
       via  9341fc470422a1341ff3d33dfe410d43c177d1fb (commit)
       via  d2b9ff6fbd589a7df0e12231264503af66fa0913 (commit)
       via  d68c403adbbbf7a2c31829b3269791f0796162d3 (commit)
       via  f2b22e35d85b5c02958a78078454b25582cf358b (commit)
       via  1543b37e58d269a15839bf8b3112a6a416c50647 (commit)
       via  4745d25c13011fb82bc434009ed54efeb96fddd3 (commit)
       via  cdaad2053edfd4c57e5f967bfa53a077743838bf (commit)
       via  0874793107893068c9285a7e7588ebe1c15ee062 (commit)
       via  14ebf70babc4f73bd4842001d0b117d32bb4a5aa (commit)
       via  02c1ce7134b0c7d4c76bf85651811c383de63464 (commit)
       via  8f52174992938653d7cfc0fe0c59aeb97f6229a7 (commit)
       via  9751ab7543c8831dbe9673bd7f9ecc1701464b31 (commit)
      from  918448b68383ddb83ce0dd896c89fdff8dfab517 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit fb0aa4c74502b2d656a98eb8c16fb465963e6e4d
Author: Ivan Borzenkov <iva...@li...>
Date:   Mon Nov 22 14:11:57 2010 +0300

    Автолоал для Hlp

diff --git a/QFW/QuickFW/Autoload.php b/QFW/QuickFW/Autoload.php
index ad3c73f..a0cf4d4 100644
--- a/QFW/QuickFW/Autoload.php
+++ b/QFW/QuickFW/Autoload.php
@@ -58,6 +58,7 @@ class Autoload
 			self::$classes = array(
 				'ScaffoldController' => LIBPATH.'/Modules/Scaffold/ScaffoldController.php',
 				'QuickFW_Auth' => QFWPATH.'/QuickFW/Auth.php',
+				'Hlp' => QFWPATH.'/QuickFW/Helpers.php',
 			);
 		if (empty(self::$classes[$class]))
 			return false;

commit aaee7e590312bd59b05c425bee783d01354b81d7
Author: Ivan Borzenkov <iva...@li...>
Date:   Mon Nov 22 13:43:55 2010 +0300

    Поправил скрипты с учетом новых папок

diff --git a/perm.sh b/perm.sh
index a4174e4..ddfa5ac 100755
--- a/perm.sh
+++ b/perm.sh
@@ -5,5 +5,4 @@ cd `dirname $0`
 
 test -z "$1" && echo "usage prem.sh <rights>" && exit 1
 
-chmod $1 -R tmp
-chmod $1 log
+chmod $1 -R var
diff --git a/release.sh b/release.sh
index d3398bb..b37648f 100755
--- a/release.sh
+++ b/release.sh
@@ -14,17 +14,12 @@ git archive --format=tar master | ( cd "../$1" ; tar xf - )
 cd ../$1
 
 find ./doc/* -type d | grep -v asciidoc | xargs rm -rf $1
-find ./tmp/* -type f | xargs rm -rf $1
+find ./var/* -type f | xargs rm -rf $1
 rm -rf addons
 ./perm.sh 777
 rm -f release.sh
 rm -f .gitignore
 
-#cd doc/asciidoc
-#make quickfw.pdf
-#mv quickfw.pdf ../
-#cd ../..
-
 cd ..
 rm -f $1.tar.bz2
 tar -cjf $1.tar.bz2 $1

commit 84d9cf7c13fcca8c457412ecc8ad9bf2bafe5622
Author: Ivan Borzenkov <iva...@li...>
Date:   Mon Nov 22 13:36:54 2010 +0300

    Преведены в порядок тесты

diff --git a/QFW/config.php b/QFW/config.php
index bd25f46..b0ff7cf 100644
--- a/QFW/config.php
+++ b/QFW/config.php
@@ -85,7 +85,7 @@ $config['cache'] = array(
 
 $config['templater'] = array(
 	'name'    => 'PlainView',
-	'def_tpl' => 'main.html',
+	'def_tpl' => 'main.php',
 );
 
 ?>
\ No newline at end of file
diff --git a/tests/QFWTests.php b/tests/QFWTests.php
index 5b1a6b1..12e4ac4 100644
--- a/tests/QFWTests.php
+++ b/tests/QFWTests.php
@@ -2,7 +2,7 @@
 	define ('ROOTPATH', dirname(dirname(__FILE__)));
 	define ('DOC_ROOT', ROOTPATH . '/www');
 	define ('APPPATH',  ROOTPATH . '/tests/testapp');
-	define ('TMPPATH',  ROOTPATH . '/tmp');
+	define ('VARPATH',  ROOTPATH . '/vap');
 	define ('QFWPATH',  ROOTPATH . '/QFW');
 	define ('LIBPATH',  ROOTPATH . '/lib');
 	define ('MODPATH',  APPPATH  . '/_common/models');
diff --git a/tests/app/010_http_host.phpt b/tests/app/010_http_host.phpt
index f5a7605..3284915 100644
--- a/tests/app/010_http_host.phpt
+++ b/tests/app/010_http_host.phpt
@@ -9,7 +9,6 @@ define ('APPPATH', ROOTPATH . '/application');
 define ('VARPATH', ROOTPATH . '/var');
 define ('QFWPATH', ROOTPATH . '/QFW');
 define ('LIBPATH', ROOTPATH . '/lib');
-define ('MODPATH', APPPATH  . '/_common/models');
 
 require (QFWPATH.'/Init.php');
 
diff --git a/tests/app/030_init_time.phpt_ b/tests/app/030_init_time.phpt_
index 199940c..dbc734c 100644
--- a/tests/app/030_init_time.phpt_
+++ b/tests/app/030_init_time.phpt_
@@ -6,7 +6,7 @@ QFW: init time (may faild - rerun)
 define ('DOC_ROOT', dirname(__FILE__));
 define ('ROOTPATH', dirname(dirname(dirname(__FILE__))));
 define ('APPPATH', ROOTPATH . '/application');
-define ('TMPPATH', ROOTPATH . '/tmp');
+define ('VARPATH', ROOTPATH . '/var');
 define ('QFWPATH', ROOTPATH . '/QFW');
 define ('LIBPATH', ROOTPATH . '/lib');
 define ('MODPATH', APPPATH  . '/_common/models');
diff --git a/tests/app/init.php b/tests/app/init.php
index f0003c5..8ef2207 100644
--- a/tests/app/init.php
+++ b/tests/app/init.php
@@ -5,7 +5,6 @@
 	define ('VARPATH', ROOTPATH . '/var');
 	define ('QFWPATH', ROOTPATH . '/QFW');
 	define ('LIBPATH', ROOTPATH . '/lib');
-	define ('MODPATH', APPPATH  . '/_common/models');
 
 	$_SERVER['HTTP_HOST'] = 'test';
 
diff --git a/tests/testapp/default/templates/main.html b/tests/testapp/default/templates/main.php
similarity index 100%
rename from tests/testapp/default/templates/main.html
rename to tests/testapp/default/templates/main.php

commit e996d7c3810a43f33cc667e60ba25e491ace1652
Author: Ivan Borzenkov <iva...@li...>
Date:   Mon Nov 22 13:30:50 2010 +0300

    Поправил тесты

diff --git a/tests/app/010_http_host.phpt b/tests/app/010_http_host.phpt
index 372ea73..f5a7605 100644
--- a/tests/app/010_http_host.phpt
+++ b/tests/app/010_http_host.phpt
@@ -6,7 +6,7 @@ QFW: test _SERVER HTTP_HOST
 define ('DOC_ROOT', dirname(__FILE__));
 define ('ROOTPATH', dirname(dirname(dirname(__FILE__))));
 define ('APPPATH', ROOTPATH . '/application');
-define ('TMPPATH', ROOTPATH . '/tmp');
+define ('VARPATH', ROOTPATH . '/var');
 define ('QFWPATH', ROOTPATH . '/QFW');
 define ('LIBPATH', ROOTPATH . '/lib');
 define ('MODPATH', APPPATH  . '/_common/models');
diff --git a/tests/app/init.php b/tests/app/init.php
index f0c28f0..f0003c5 100644
--- a/tests/app/init.php
+++ b/tests/app/init.php
@@ -3,8 +3,6 @@
 	define ('ROOTPATH', dirname(dirname(dirname(__FILE__))));
 	define ('APPPATH', dirname(dirname(__FILE__)).'/testapp');
 	define ('VARPATH', ROOTPATH . '/var');
-	define ('TMPPATH', VARPATH  . '/tmp');
-	define ('LOGPATH', VARPATH  . '/log');
 	define ('QFWPATH', ROOTPATH . '/QFW');
 	define ('LIBPATH', ROOTPATH . '/lib');
 	define ('MODPATH', APPPATH  . '/_common/models');

commit d5b4db669724c89690a43cac2046fd893c9f45b3
Author: Ivan Borzenkov <iva...@li...>
Date:   Mon Nov 22 13:27:15 2010 +0300

    Исправлена ошибка в show404

diff --git a/QFW/QuickFW/Router.php b/QFW/QuickFW/Router.php
index 37425c5..1d7d62d 100644
--- a/QFW/QuickFW/Router.php
+++ b/QFW/QuickFW/Router.php
@@ -225,9 +225,9 @@ class QuickFW_Router
 			header ('Status: 404 Not Found');
 		else*/
 		header((empty($_SERVER['SERVER_PROTOCOL']) ? 'HTTP/1.1 ' : $_SERVER['SERVER_PROTOCOL']).' 404 Not Found');
-		if (!is_file(QFW::$view->getScriptPath().'/404.html'))
+		if (!is_file(QFW::$view->getScriptPath().'/404.php'))
 			QFW::$view->setScriptPath(APPPATH.'/default/templates/');
-		die(QFW::$view->render('404.html'));
+		die(QFW::$view->render('404.php'));
 	}
 
 	/**

commit 164b60b852927cf4b6306be3502ec073be342a20
Author: Ivan Borzenkov <iva...@li...>
Date:   Mon Nov 22 13:26:55 2010 +0300

    Убрана инициализация лишних переменных

diff --git a/application/default/controllers/CssController.php b/application/default/controllers/CssController.php
index d05eed9..4374492 100644
--- a/application/default/controllers/CssController.php
+++ b/application/default/controllers/CssController.php
@@ -35,11 +35,11 @@ class CssController
 			QFW::$router->show404();
 
 		header('Content-Type: text/css');
-		$out = array();
-		$ret = false;
 		QFW::$view->setScriptPath($this->path);
 		$text = QFW::$view->fetch($scss);
 		//запускаем преобразования - по умолчанию без кеша и выводим ошибки в основной поток
+		$out = array();
+		$ret = false;
 		exec('echo '.escapeshellarg($text).' | '.self::SASS.' 2>&1 ', $out, $ret);
 		$out = implode("\n", $out);
 
diff --git a/application/default/controllers/JsController.php b/application/default/controllers/JsController.php
index 4da4df7..798906f 100644
--- a/application/default/controllers/JsController.php
+++ b/application/default/controllers/JsController.php
@@ -29,8 +29,6 @@ class JsController
 			QFW::$router->show404();
 
 		header('Content-Type: application/javascript');
-		$out = array();
-		$ret = false;
 		QFW::$view->setScriptPath($this->path);
 		$text = QFW::$view->fetch($js);
 

commit 24a1c0f7768e3392fda6d800b58371a7f9de7de9
Author: Ivan Borzenkov <iva...@li...>
Date:   Mon Nov 22 13:18:06 2010 +0300

    Поправлен вызов крона

diff --git a/cron/cruise.php b/cron/cruise.php
index 52e1c8a..3da151c 100644
--- a/cron/cruise.php
+++ b/cron/cruise.php
@@ -2,10 +2,14 @@
 	define ('DOC_ROOT', realpath(dirname(__FILE__).'../www'));
 	define ('ROOTPATH', realpath(dirname(__FILE__).'/../'));
 	define ('APPPATH', ROOTPATH . '/application');
-	define ('TMPPATH', ROOTPATH . '/tmp');
+	define ('VARPATH', ROOTPATH . '/var');
 	define ('QFWPATH', ROOTPATH . '/QFW');
 	define ('LIBPATH', ROOTPATH . '/lib');
-	define ('MODPATH', APPPATH . '/_common/models');
+
+//Настройки по умолчанию, если нужно - измените
+//	define ('TMPPATH', VARPATH  . '/tmp');
+//	define ('LOGPATH', VARPATH  . '/log');
+//	define ('MODPATH', APPPATH  . '/_common/models');
 
 	//TODO: Выкинуть gethostbyaddr после перехода на PHP 5.3
 	if (empty($_SERVER['HTTP_HOST']))
diff --git a/cron/start.php b/cron/start.php
index b1cbc95..34453ab 100644
--- a/cron/start.php
+++ b/cron/start.php
@@ -1,11 +1,15 @@
 <?php
-	define ('DOC_ROOT', dirname(dirname(__FILE__)).'/www');
-	define ('ROOTPATH', dirname(dirname(__FILE__)));
+	define ('DOC_ROOT', realpath(dirname(__FILE__).'../www'));
+	define ('ROOTPATH', realpath(dirname(__FILE__).'/../'));
 	define ('APPPATH', ROOTPATH . '/application');
-	define ('TMPPATH', ROOTPATH . '/tmp');
+	define ('VARPATH', ROOTPATH . '/var');
 	define ('QFWPATH', ROOTPATH . '/QFW');
 	define ('LIBPATH', ROOTPATH . '/lib');
-	define ('MODPATH', APPPATH . '/_common/models');
+
+//Настройки по умолчанию, если нужно - измените
+//	define ('TMPPATH', VARPATH  . '/tmp');
+//	define ('LOGPATH', VARPATH  . '/log');
+//	define ('MODPATH', APPPATH  . '/_common/models');
 
 	//TODO: Выкинуть gethostbyaddr после перехода на PHP 5.3
 	if (empty($_SERVER['HTTP_HOST']))

commit 2cf7e7e92599b147fc4f810aab30ae629dfd7b30
Author: Ivan Borzenkov <iva...@li...>
Date:   Mon Nov 22 12:44:58 2010 +0300

    Пофиксил доку - у action нет ucfirst

diff --git a/doc/asciidoc/mvc.txt b/doc/asciidoc/mvc.txt
index 98c04f4..16f5f78 100644
--- a/doc/asciidoc/mvc.txt
+++ b/doc/asciidoc/mvc.txt
@@ -14,7 +14,7 @@ MVC и преобразование адресов в контроллеры
   * Контроллер - в текущем модуле в папке +controllers+ проверяется наличие файла +NameСontroller+, если его нет, то используется файл +IndexСontroller+.
   * После подключения файла контроллера проверяется наличие класса +NameСontroller+, а если его нет, то проверяется его наличие в пространстве имен с именем модуля.
   * Если класс не найден, а файл существует, то выводится сообщение об ошибке.
-  * В классе ищется функция +Аction(Action|Cli|Block|...)+ в зависимости от способа вызова. Если функции нет, то вызывается функция +index+ с указанным суффиксом.
+  * В классе ищется функция +action(Action|Cli|Block|...)+ в зависимости от способа вызова. Если функции нет, то вызывается функция +index+ с указанным суффиксом.
   * Остальные компоненты передаются как параметры функции.
   * У контроллера по умолчанию в действие по умолчанию (+index/index+) не может быть параметров - если они есть, то выдается 404
 

commit 0b194a53c25c71167f7227ec241b3e431b8d7b45
Author: Ivan Borzenkov <iva...@li...>
Date:   Mon Nov 22 12:41:04 2010 +0300

    Объединил в одну

diff --git a/www/index.php b/www/index.php
index 17f9e16..797f30d 100644
--- a/www/index.php
+++ b/www/index.php
@@ -3,12 +3,12 @@
 	define ('ROOTPATH', dirname(dirname(__FILE__)));
 	define ('APPPATH', ROOTPATH . '/application');
 	define ('VARPATH', ROOTPATH . '/var');
-//Настройки по умолчанию, если нужно - измените
-//	define ('TMPPATH', VARPATH  . '/tmp');
-//	define ('LOGPATH', VARPATH  . '/log');
 	define ('QFWPATH', ROOTPATH . '/QFW');
 	define ('LIBPATH', ROOTPATH . '/lib');
+
 //Настройки по умолчанию, если нужно - измените
+//	define ('TMPPATH', VARPATH  . '/tmp');
+//	define ('LOGPATH', VARPATH  . '/log');
 //	define ('MODPATH', APPPATH  . '/_common/models');
 	
 	require (QFWPATH.'/Init.php');

commit 9341fc470422a1341ff3d33dfe410d43c177d1fb
Author: Ivan Borzenkov <iva...@li...>
Date:   Mon Nov 22 12:39:03 2010 +0300

    Автоинициализация еще одной константы

diff --git a/QFW/Init.php b/QFW/Init.php
index 34acaa2..e5e6c82 100644
--- a/QFW/Init.php
+++ b/QFW/Init.php
@@ -177,6 +177,8 @@ if (!defined('TMPPATH'))
 	define('TMPPATH', VARPATH.'/tmp');
 if (!defined('LOGPATH'))
 	define('LOGPATH', VARPATH.'/log');
+if (!defined('MODPATH'))
+	define ('MODPATH', APPPATH  . '/_common/models');
 
 QFW::Init();
 
diff --git a/www/index.php b/www/index.php
index 25069df..17f9e16 100644
--- a/www/index.php
+++ b/www/index.php
@@ -8,7 +8,8 @@
 //	define ('LOGPATH', VARPATH  . '/log');
 	define ('QFWPATH', ROOTPATH . '/QFW');
 	define ('LIBPATH', ROOTPATH . '/lib');
-	define ('MODPATH', APPPATH  . '/_common/models');
+//Настройки по умолчанию, если нужно - измените
+//	define ('MODPATH', APPPATH  . '/_common/models');
 	
 	require (QFWPATH.'/Init.php');
 	

commit d2b9ff6fbd589a7df0e12231264503af66fa0913
Author: Ivan Borzenkov <iva...@li...>
Date:   Mon Nov 22 12:35:30 2010 +0300

    Убрал logpath из конфига, значения по умолчанию для путей

diff --git a/QFW/Init.php b/QFW/Init.php
index 72dfd73..34acaa2 100644
--- a/QFW/Init.php
+++ b/QFW/Init.php
@@ -173,6 +173,11 @@ class QFW
 
 }
 
+if (!defined('TMPPATH'))
+	define('TMPPATH', VARPATH.'/tmp');
+if (!defined('LOGPATH'))
+	define('LOGPATH', VARPATH.'/log');
+
 QFW::Init();
 
 ?>
diff --git a/QFW/config.php b/QFW/config.php
index 8e29a95..bd25f46 100644
--- a/QFW/config.php
+++ b/QFW/config.php
@@ -5,7 +5,6 @@ $config=array();
 $config['host']=array(
 	'encoding' => 'utf-8',
 	'lang' => '',
-	'logpath' => ROOTPATH.'/log',
 );
 
 $config['default']=array(
diff --git a/application/default.php b/application/default.php
index ab00071..14c650c 100644
--- a/application/default.php
+++ b/application/default.php
@@ -7,7 +7,6 @@ mb_internal_encoding("UTF-8");
 $config['host']=array(
 	'encoding' => 'utf-8',
 	'lang' => 'ru_RU',
-	'logpath' => ROOTPATH.'/log',
 );
 
 /* Настройки дефолтового MCA */
diff --git a/www/index.php b/www/index.php
index 26e5166..25069df 100644
--- a/www/index.php
+++ b/www/index.php
@@ -3,8 +3,9 @@
 	define ('ROOTPATH', dirname(dirname(__FILE__)));
 	define ('APPPATH', ROOTPATH . '/application');
 	define ('VARPATH', ROOTPATH . '/var');
-	define ('TMPPATH', VARPATH  . '/tmp');
-	define ('LOGPATH', VARPATH  . '/log');
+//Настройки по умолчанию, если нужно - измените
+//	define ('TMPPATH', VARPATH  . '/tmp');
+//	define ('LOGPATH', VARPATH  . '/log');
 	define ('QFWPATH', ROOTPATH . '/QFW');
 	define ('LIBPATH', ROOTPATH . '/lib');
 	define ('MODPATH', APPPATH  . '/_common/models');

commit d68c403adbbbf7a2c31829b3269791f0796162d3
Author: Ivan Borzenkov <iva...@li...>
Date:   Mon Nov 22 12:30:42 2010 +0300

    Завел папку var, в которую поместил все изменяемое

diff --git a/.gitignore b/.gitignore
index 9d81ed1..b0da8fc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/tmp/doc
\ No newline at end of file
+/var/tmp/doc
\ No newline at end of file
diff --git a/QFW/Cacher/File.php b/QFW/Cacher/File.php
index 1a07e4e..0ac20e5 100644
--- a/QFW/Cacher/File.php
+++ b/QFW/Cacher/File.php
@@ -29,7 +29,7 @@ class Cacher_File implements Zend_Cache_Backend_Interface
 
 	function __construct($options = array(NULL))
 	{
-		$this->options['cacheDir']=TMPPATH.'/cache/';
+		$this->options['cacheDir'] = VARPATH.'/cache/';
 		$this->options=array_merge($this->options, $options);
 	}
 
diff --git a/doc/asciidoc/Makefile b/doc/asciidoc/Makefile
index ef12398..f39af5f 100644
--- a/doc/asciidoc/Makefile
+++ b/doc/asciidoc/Makefile
@@ -13,17 +13,17 @@ quickfw.pdf: $(TEXTS)
 quickfw.html: $(TEXTS)
 	a2x -f xhtml -v quickfw.txt -a lang=ru
 
-site: ../../tmp/doc/quickfw.html $(TEXTS)
+site: ../../var/tmp/doc/quickfw.html $(TEXTS)
 
-../../tmp/doc/quickfw.html: $(TEXTS)
-	rm -rf ../../tmp/doc
-	mkdir -p ../../tmp/doc
-	a2x -f xhtml -v quickfw.txt -D ../../tmp/doc -a lang=ru
+../../var/tmp/doc/quickfw.html: $(TEXTS)
+	rm -rf ../../var/tmp/doc
+	mkdir -p ../../var/tmp/doc
+	a2x -f xhtml -v quickfw.txt -D ../../var/tmp/doc -a lang=ru
 
 clean:
 	rm -rf quickfw.pdf
 	rm -rf quickfw.html docbook-xsl.css
-	rm -rf ../../tmp/doc
+	rm -rf ../../var/tmp/doc
 
 install:
 	sudo aptitude install asciidoc texlive-xetex source-highlight
diff --git a/doc/asciidoc/directory.txt b/doc/asciidoc/directory.txt
index ccd66d9..d01b0d0 100644
--- a/doc/asciidoc/directory.txt
+++ b/doc/asciidoc/directory.txt
@@ -43,8 +43,6 @@
 *lib*::
 	Папка с различными дополнительными библиотеками
 	*Не готово*
-*log*::
-	Папка для сохранения логов по умолчанию (должна быть разрешена запись)
 *QFW*::
 	Общие классы фреймворка
 	*QuickFW*;;
@@ -76,9 +74,13 @@
 
 *tests*::
 	Тесты для PHPUnit
-*tmp*::
-	Папка для временных файлов (должна быть разрешена запись)
+*var*::
+	Изменяемые файлы - для корректной работы запись должна быть разрешена
+	*tmp*;;
+		Папка для временных файлов
 	cache;;
 		Файловый кеш
+	*log*;;
+		Папка для сохранения логов
 *www*::
 	DOCUMENT ROOT
\ No newline at end of file
diff --git a/lib/Log.php b/lib/Log.php
index a5dcfb0..5626a2f 100644
--- a/lib/Log.php
+++ b/lib/Log.php
@@ -66,7 +66,7 @@ class Log
 	private function email($str, $to) { self::$messages['email'][$to][]=$str; }
 	private static function f($str, $to)
 	{
-		error_log(date('Y-m-d H:i:s').': '.$str."\n", 3, QFW::$config['host']['logpath'].'/'.$to.'.log');
+		error_log(date('Y-m-d H:i:s').': '.$str."\n", 3, LOGPATH.'/'.$to.'.log');
 	}
 
 	public function __destruct()
diff --git a/lib/Log52.php b/lib/Log52.php
index 4f28952..c903358 100644
--- a/lib/Log52.php
+++ b/lib/Log52.php
@@ -71,7 +71,7 @@ class Log
 	private function email($str, $to) { self::$messages['email'][$to][]=$str; }
 	private static function f($str, $to)
 	{
-		error_log(date('Y-m-d H:i:s').': '.$str."\n", 3, QFW::$config['host']['logpath'].'/'.$to.'.log');
+		error_log(date('Y-m-d H:i:s').': '.$str."\n", 3, LOGPATH.'/'.$to.'.log');
 	}
 
 	public function __destruct()
diff --git a/tests/app/init.php b/tests/app/init.php
index a0c53bc..f0c28f0 100644
--- a/tests/app/init.php
+++ b/tests/app/init.php
@@ -2,7 +2,9 @@
 	define ('DOC_ROOT', dirname(__FILE__));
 	define ('ROOTPATH', dirname(dirname(dirname(__FILE__))));
 	define ('APPPATH', dirname(dirname(__FILE__)).'/testapp');
-	define ('TMPPATH', ROOTPATH . '/tmp');
+	define ('VARPATH', ROOTPATH . '/var');
+	define ('TM