|
From: Ivan1986 <iva...@us...> - 2010-07-12 11:09:56
|
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 05c5b029943576e1c42048c50e4fb404e7229f35 (commit)
via 5bdcff0e0cf23a0a282bab84fc6ac0abeca33cad (commit)
via a8b089cfa2bc8970c4a313292d4619873bd515a4 (commit)
via 303799b5b75a464df8f341f4e9e6b6dfa2cc0002 (commit)
from 1cd640bfeecb15c185847348752dcaea762d08db (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 05c5b029943576e1c42048c50e4fb404e7229f35
Author: Ivan1986 <iva...@li...>
Date: Mon Jul 12 15:06:26 2010 +0400
Функциии инициализации бибилиотек в QFW
diff --git a/QFW/Init.php b/QFW/Init.php
index 1d831e3..be198cb 100644
--- a/QFW/Init.php
+++ b/QFW/Init.php
@@ -93,11 +93,8 @@ class QFW
{
//Включаем обработку фатальных ошибок, если в конфиге указано
if (!empty(self::$config['error']))
- {
- require_once QFWPATH.'/QuickFW/Error.php';
foreach(self::$config['error'] as $handler)
- QFW_Error::addFromConfig($handler);
- }
+ self::ErrorFromConfig($handler);
//автолоад
if (!empty(self::$config['QFW']['autoload']))
@@ -117,6 +114,63 @@ class QFW
self::$view->mainTemplate = '';
}
}
+
+ /**
+ * Вспомогательные функции инициализации библиотек
+ */
+
+ /** @var Debug_ErrorHook_Listener Обработчик ошибок */
+ static private $ErrorHook = false;
+
+ /**
+ * Инициализация обработчика ошибок из конфига
+ *
+ * @param array $handler информация об обработчике ошибок
+ */
+ static private function ErrorFromConfig($handler)
+ {
+ require_once LIBPATH.'/Debug/ErrorHook/Listener.php';
+ if (!self::$ErrorHook)
+ self::$ErrorHook = new Debug_ErrorHook_Listener();;
+
+ $name = ucfirst($handler['name']);
+ require_once LIBPATH.'/Debug/ErrorHook/'.$name.'Notifier.php';
+ //пока так, потом возможно придется переделать
+ if ($name == 'Mail')
+ {
+ $i = new Debug_ErrorHook_MailNotifier(
+ $handler['options']['to'], $handler['options']['whatToSend'],
+ $handler['options']['subjPrefix'], $handler['options']['charset']);
+ }
+ else
+ {
+ $class = 'Debug_ErrorHook_'.$name.'Notifier';
+ $i = new $class($handler['options']['whatToSend']);
+ }
+ if ($handler['RemoveDups'])
+ {
+ require_once LIBPATH.'/Debug/ErrorHook/RemoveDupsWrapper.php';
+ $i = new Debug_ErrorHook_RemoveDupsWrapper($i,
+ TMPPATH.'/errors', $handler['RemoveDups']);
+ }
+ self::$ErrorHook->addNotifier($i);
+ }
+
+ /**
+ * Создание класса джаббера из конфига
+ *
+ * @return XMPPHP_XMPP класс jabbera
+ */
+ static public function JabberFromConfig()
+ {
+ require_once LIBPATH.'/XMPPHP/XMPP.php';
+ new XMPPHP_XMPP(
+ QFW::$config['jabber']['host'], QFW::$config['jabber']['port'],
+ QFW::$config['jabber']['user'], QFW::$config['jabber']['pass'],
+ QFW::$config['jabber']['resource'], QFW::$config['jabber']['server'],
+ !QFW::$config['QFW']['release'], XMPPHP_Log::LEVEL_INFO);
+ }
+
}
QFW::Init();
diff --git a/QFW/QuickFW/Error.php b/QFW/QuickFW/Error.php
deleted file mode 100644
index e8a440a..0000000
--- a/QFW/QuickFW/Error.php
+++ /dev/null
@@ -1,44 +0,0 @@
-<?php
-
-require_once LIBPATH.'/Debug/ErrorHook/Listener.php';
-
-class QFW_Error extends Debug_ErrorHook_Listener
-{
- private static $Instance;
-
- /**
- * Добавляет обработчик из конфига
- *
- * @param array $handler данные из конфига
- */
- public static function addFromConfig($handler)
- {
- if (!self::$Instance)
- self::$Instance = new self();;
-
- $name = ucfirst($handler['name']);
- require_once LIBPATH.'/Debug/ErrorHook/'.$name.'Notifier.php';
- //пока так, потом возможно придется переделать
- if ($name == 'Mail')
- {
- $i = new Debug_ErrorHook_MailNotifier(
- $handler['options']['to'], $handler['options']['whatToSend'],
- $handler['options']['subjPrefix'], $handler['options']['charset']);
- }
- else
- {
- $class = 'Debug_ErrorHook_'.$name.'Notifier';
- $i = new $class($handler['options']['whatToSend']);
- }
- if ($handler['RemoveDups'])
- {
- require_once LIBPATH.'/Debug/ErrorHook/RemoveDupsWrapper.php';
- $i = new Debug_ErrorHook_RemoveDupsWrapper($i,
- TMPPATH.'/errors', $handler['RemoveDups']);
- }
- self::$Instance->addNotifier($i);
-
- }
-}
-
-?>
\ No newline at end of file
diff --git a/lib/Log.php b/lib/Log.php
index ee110fb..a5dcfb0 100644
--- a/lib/Log.php
+++ b/lib/Log.php
@@ -50,11 +50,7 @@ class Log
error_log('Jabber не настроен ');
else
{
- require_once LIBPATH.'/jabber/XMPPHP/XMPP.php';
- $J = new XMPPHP_XMPP(QFW::$config['jabber']['host'], QFW::$config['jabber']['port'],
- QFW::$config['jabber']['user'], QFW::$config['jabber']['pass'],
- QFW::$config['jabber']['resource'], QFW::$config['jabber']['server'],
- !QFW::$config['QFW']['release'], XMPPHP_Log::LEVEL_ERROR);
+ $J = QFW::JabberFromConfig();
$J->connect();
$J->processUntil('session_start',10);
$J->presence();
diff --git a/lib/Log52.php b/lib/Log52.php
index 8429474..4f28952 100644
--- a/lib/Log52.php
+++ b/lib/Log52.php
@@ -55,11 +55,7 @@ class Log
error_log('Jabber не настроен ');
else
{
- require_once LIBPATH.'/jabber/XMPPHP/XMPP.php';
- $J = new XMPPHP_XMPP(QFW::$config['jabber']['host'], QFW::$config['jabber']['port'],
- QFW::$config['jabber']['user'], QFW::$config['jabber']['pass'],
- QFW::$config['jabber']['resource'], QFW::$config['jabber']['server'],
- !QFW::$config['QFW']['release'], XMPPHP_Log::LEVEL_ERROR);
+ $J = QFW::JabberFromConfig();
$J->connect();
$J->processUntil('session_start',10);
$J->presence();
commit 5bdcff0e0cf23a0a282bab84fc6ac0abeca33cad
Author: Ivan1986 <iva...@li...>
Date: Mon Jul 12 15:05:08 2010 +0400
Перенес библиотеку jabbera
diff --git a/lib/jabber/cli_longrun_example.php b/doc/Examples/jabber/cli_longrun_example.php
similarity index 100%
rename from lib/jabber/cli_longrun_example.php
rename to doc/Examples/jabber/cli_longrun_example.php
diff --git a/lib/jabber/cli_longrun_example_bosh.php b/doc/Examples/jabber/cli_longrun_example_bosh.php
similarity index 100%
rename from lib/jabber/cli_longrun_example_bosh.php
rename to doc/Examples/jabber/cli_longrun_example_bosh.php
diff --git a/lib/jabber/sendmessage_example.php b/doc/Examples/jabber/sendmessage_example.php
similarity index 100%
rename from lib/jabber/sendmessage_example.php
rename to doc/Examples/jabber/sendmessage_example.php
diff --git a/lib/jabber/webclient_example.php b/doc/Examples/jabber/webclient_example.php
similarity index 100%
rename from lib/jabber/webclient_example.php
rename to doc/Examples/jabber/webclient_example.php
diff --git a/lib/jabber/XMPPHP/BOSH.php b/lib/XMPPHP/BOSH.php
similarity index 100%
rename from lib/jabber/XMPPHP/BOSH.php
rename to lib/XMPPHP/BOSH.php
diff --git a/lib/jabber/XMPPHP/Exception.php b/lib/XMPPHP/Exception.php
similarity index 100%
rename from lib/jabber/XMPPHP/Exception.php
rename to lib/XMPPHP/Exception.php
diff --git a/lib/jabber/XMPPHP/Log.php b/lib/XMPPHP/Log.php
similarity index 100%
rename from lib/jabber/XMPPHP/Log.php
rename to lib/XMPPHP/Log.php
diff --git a/lib/jabber/XMPPHP/Roster.php b/lib/XMPPHP/Roster.php
similarity index 100%
rename from lib/jabber/XMPPHP/Roster.php
rename to lib/XMPPHP/Roster.php
diff --git a/lib/jabber/XMPPHP/XMLObj.php b/lib/XMPPHP/XMLObj.php
similarity index 100%
rename from lib/jabber/XMPPHP/XMLObj.php
rename to lib/XMPPHP/XMLObj.php
diff --git a/lib/jabber/XMPPHP/XMLStream.php b/lib/XMPPHP/XMLStream.php
similarity index 100%
rename from lib/jabber/XMPPHP/XMLStream.php
rename to lib/XMPPHP/XMLStream.php
diff --git a/lib/jabber/XMPPHP/XMPP.php b/lib/XMPPHP/XMPP.php
similarity index 100%
rename from lib/jabber/XMPPHP/XMPP.php
rename to lib/XMPPHP/XMPP.php
diff --git a/lib/jabber/XMPPHP/XMPP_Old.php b/lib/XMPPHP/XMPP_Old.php
similarity index 100%
rename from lib/jabber/XMPPHP/XMPP_Old.php
rename to lib/XMPPHP/XMPP_Old.php
diff --git a/lib/jabber/jabber.php b/lib/jabber/jabber.php
deleted file mode 100644
index 3c331f6..0000000
--- a/lib/jabber/jabber.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-require_once 'XMPPHP/XMPP.php';
-
-QFW::$libs['jabber'] = new XMPPHP_XMPP(
- QFW::$config['jabber']['host'], QFW::$config['jabber']['port'],
- QFW::$config['jabber']['user'], QFW::$config['jabber']['pass'],
- QFW::$config['jabber']['resource'], QFW::$config['jabber']['server'],
- !QFW::$config['QFW']['release'], XMPPHP_Log::LEVEL_INFO);
-
-?>
\ No newline at end of file
commit a8b089cfa2bc8970c4a313292d4619873bd515a4
Author: Ivan1986 <iva...@li...>
Date: Mon Jul 12 14:33:32 2010 +0400
Перенес метаформы
diff --git a/application/default/controllers/IndexController.php b/application/default/controllers/IndexController.php
index f26e242..75cc6dd 100644
--- a/application/default/controllers/IndexController.php
+++ b/application/default/controllers/IndexController.php
@@ -12,9 +12,9 @@ class IndexController extends QuickFW_Auth
public function indexAction()
{
/*print_r($_POST);
- require_once LIBPATH.'/MetaForm/MetaFormAction.php';
- require_once LIBPATH.'/MetaForm/MetaForm.php';
- require_once LIBPATH.'/MetaForm/FormPersister.php';
+ require_once LIBPATH.'/HTML/MetaFormAction.php';
+ require_once LIBPATH.'/HTML/MetaForm.php';
+ require_once LIBPATH.'/HTML/FormPersister.php';
$SemiParser = new HTML_SemiParser();
ob_start(array(&$SemiParser, 'process'));
diff --git a/lib/MetaForm/FormPersister.php b/lib/HTML/FormPersister.php
similarity index 100%
rename from lib/MetaForm/FormPersister.php
rename to lib/HTML/FormPersister.php
diff --git a/lib/MetaForm/MetaForm.php b/lib/HTML/MetaForm.php
similarity index 100%
rename from lib/MetaForm/MetaForm.php
rename to lib/HTML/MetaForm.php
diff --git a/lib/MetaForm/MetaFormAction.php b/lib/HTML/MetaFormAction.php
similarity index 100%
rename from lib/MetaForm/MetaFormAction.php
rename to lib/HTML/MetaFormAction.php
diff --git a/lib/MetaForm/SemiParser.php b/lib/HTML/SemiParser.php
similarity index 100%
rename from lib/MetaForm/SemiParser.php
rename to lib/HTML/SemiParser.php
commit 303799b5b75a464df8f341f4e9e6b6dfa2cc0002
Author: Ivan1986 <iva...@li...>
Date: Mon Jul 12 14:23:58 2010 +0400
Переименован и перемещен обработчик ошибок
diff --git a/QFW/Init.php b/QFW/Init.php
index c1b108c..1d831e3 100644
--- a/QFW/Init.php
+++ b/QFW/Init.php
@@ -96,7 +96,7 @@ class QFW
{
require_once QFWPATH.'/QuickFW/Error.php';
foreach(self::$config['error'] as $handler)
- QFW_Listener::addFromConfig($handler);
+ QFW_Error::addFromConfig($handler);
}
//автолоад
diff --git a/QFW/QuickFW/Error.php b/QFW/QuickFW/Error.php
index d25e409..e8a440a 100644
--- a/QFW/QuickFW/Error.php
+++ b/QFW/QuickFW/Error.php
@@ -1,8 +1,8 @@
<?php
-require_once LIBPATH.'/ErrorHook/Listener.php';
+require_once LIBPATH.'/Debug/ErrorHook/Listener.php';
-class QFW_Listener extends Debug_ErrorHook_Listener
+class QFW_Error extends Debug_ErrorHook_Listener
{
private static $Instance;
@@ -17,7 +17,7 @@ class QFW_Listener extends Debug_ErrorHook_Listener
self::$Instance = new self();;
$name = ucfirst($handler['name']);
- require_once LIBPATH.'/ErrorHook/'.$name.'Notifier.php';
+ require_once LIBPATH.'/Debug/ErrorHook/'.$name.'Notifier.php';
//пока так, потом возможно придется переделать
if ($name == 'Mail')
{
@@ -32,7 +32,7 @@ class QFW_Listener extends Debug_ErrorHook_Listener
}
if ($handler['RemoveDups'])
{
- require_once LIBPATH.'/ErrorHook/RemoveDupsWrapper.php';
+ require_once LIBPATH.'/Debug/ErrorHook/RemoveDupsWrapper.php';
$i = new Debug_ErrorHook_RemoveDupsWrapper($i,
TMPPATH.'/errors', $handler['RemoveDups']);
}
diff --git a/lib/ErrorHook/Catcher.php b/lib/Debug/ErrorHook/Catcher.php
similarity index 100%
rename from lib/ErrorHook/Catcher.php
rename to lib/Debug/ErrorHook/Catcher.php
diff --git a/lib/ErrorHook/INotifier.php b/lib/Debug/ErrorHook/INotifier.php
similarity index 100%
rename from lib/ErrorHook/INotifier.php
rename to lib/Debug/ErrorHook/INotifier.php
diff --git a/lib/ErrorHook/Listener.php b/lib/Debug/ErrorHook/Listener.php
similarity index 100%
rename from lib/ErrorHook/Listener.php
rename to lib/Debug/ErrorHook/Listener.php
diff --git a/lib/ErrorHook/MailNotifier.php b/lib/Debug/ErrorHook/MailNotifier.php
similarity index 100%
rename from lib/ErrorHook/MailNotifier.php
rename to lib/Debug/ErrorHook/MailNotifier.php
diff --git a/lib/ErrorHook/RemoveDupsWrapper.php b/lib/Debug/ErrorHook/RemoveDupsWrapper.php
similarity index 100%
rename from lib/ErrorHook/RemoveDupsWrapper.php
rename to lib/Debug/ErrorHook/RemoveDupsWrapper.php
diff --git a/lib/ErrorHook/TextNotifier.php b/lib/Debug/ErrorHook/TextNotifier.php
similarity index 100%
rename from lib/ErrorHook/TextNotifier.php
rename to lib/Debug/ErrorHook/TextNotifier.php
diff --git a/lib/ErrorHook/Util.php b/lib/Debug/ErrorHook/Util.php
similarity index 100%
rename from lib/ErrorHook/Util.php
rename to lib/Debug/ErrorHook/Util.php
-----------------------------------------------------------------------
Summary of changes:
QFW/Init.php | 62 ++++++++++++++++++-
QFW/QuickFW/Error.php | 44 --------------
.../default/controllers/IndexController.php | 6 +-
.../Examples}/jabber/cli_longrun_example.php | 0
.../Examples}/jabber/cli_longrun_example_bosh.php | 0
.../Examples}/jabber/sendmessage_example.php | 0
{lib => doc/Examples}/jabber/webclient_example.php | 0
lib/{ => Debug}/ErrorHook/Catcher.php | 0
lib/{ => Debug}/ErrorHook/INotifier.php | 0
lib/{ => Debug}/ErrorHook/Listener.php | 0
lib/{ => Debug}/ErrorHook/MailNotifier.php | 0
lib/{ => Debug}/ErrorHook/RemoveDupsWrapper.php | 0
lib/{ => Debug}/ErrorHook/TextNotifier.php | 0
lib/{ => Debug}/ErrorHook/Util.php | 0
lib/{MetaForm => HTML}/FormPersister.php | 0
lib/{MetaForm => HTML}/MetaForm.php | 0
lib/{MetaForm => HTML}/MetaFormAction.php | 0
lib/{MetaForm => HTML}/SemiParser.php | 0
lib/Log.php | 6 +--
lib/Log52.php | 6 +--
lib/{jabber => }/XMPPHP/BOSH.php | 0
lib/{jabber => }/XMPPHP/Exception.php | 0
lib/{jabber => }/XMPPHP/Log.php | 0
lib/{jabber => }/XMPPHP/Roster.php | 0
lib/{jabber => }/XMPPHP/XMLObj.php | 0
lib/{jabber => }/XMPPHP/XMLStream.php | 0
lib/{jabber => }/XMPPHP/XMPP.php | 0
lib/{jabber => }/XMPPHP/XMPP_Old.php | 0
lib/jabber/jabber.php | 11 ----
29 files changed, 63 insertions(+), 72 deletions(-)
delete mode 100644 QFW/QuickFW/Error.php
rename {lib => doc/Examples}/jabber/cli_longrun_example.php (100%)
rename {lib => doc/Examples}/jabber/cli_longrun_example_bosh.php (100%)
rename {lib => doc/Examples}/jabber/sendmessage_example.php (100%)
rename {lib => doc/Examples}/jabber/webclient_example.php (100%)
rename lib/{ => Debug}/ErrorHook/Catcher.php (100%)
rename lib/{ => Debug}/ErrorHook/INotifier.php (100%)
rename lib/{ => Debug}/ErrorHook/Listener.php (100%)
rename lib/{ => Debug}/ErrorHook/MailNotifier.php (100%)
rename lib/{ => Debug}/ErrorHook/RemoveDupsWrapper.php (100%)
rename lib/{ => Debug}/ErrorHook/TextNotifier.php (100%)
rename lib/{ => Debug}/ErrorHook/Util.php (100%)
rename lib/{MetaForm => HTML}/FormPersister.php (100%)
rename lib/{MetaForm => HTML}/MetaForm.php (100%)
rename lib/{MetaForm => HTML}/MetaFormAction.php (100%)
rename lib/{MetaForm => HTML}/SemiParser.php (100%)
rename lib/{jabber => }/XMPPHP/BOSH.php (100%)
rename lib/{jabber => }/XMPPHP/Exception.php (100%)
rename lib/{jabber => }/XMPPHP/Log.php (100%)
rename lib/{jabber => }/XMPPHP/Roster.php (100%)
rename lib/{jabber => }/XMPPHP/XMLObj.php (100%)
rename lib/{jabber => }/XMPPHP/XMLStream.php (100%)
rename lib/{jabber => }/XMPPHP/XMPP.php (100%)
rename lib/{jabber => }/XMPPHP/XMPP_Old.php (100%)
delete mode 100644 lib/jabber/jabber.php
hooks/post-receive
--
quickfw
|
