Author: ornicar2
Date: 2010-01-29 16:37:37 +0100 (Fri, 29 Jan 2010)
New Revision: 27304
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/lib/response/asset/dmAdminAssetConfig.php
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_toolBar.php
plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
plugins/diemPlugin/trunk/dmCorePlugin/config/dm/config.yml
plugins/diemPlugin/trunk/dmCorePlugin/lib/filter/dmInitFilter.php
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmLockTable.class.php
Log:
[Diem]
- disabled real-time resource locks when sf_debug = true
- added dm_locks_enabled && dm_locks_timeout configuration options
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/lib/response/asset/dmAdminAssetConfig.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/lib/response/asset/dmAdminAssetConfig.php
2010-01-29 15:07:43 UTC (rev 27303)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/lib/response/asset/dmAdminAssetConfig.php
2010-01-29 15:37:37 UTC (rev 27304)
@@ -49,12 +49,12 @@
'core.toolBar',
'core.pageBar',
'core.mediaBar',
- 'core.ping',
+ sfConfig::get('dm_locks_enabled') ? 'core.ping' : null,
'admin.ctrl',
'admin.toolBar',
'admin.pageBar',
'admin.mediaBar',
- 'admin.ping'
+ sfConfig::get('dm_locks_enabled') ? 'admin.ping' : null
);
}
}
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_toolBar.php
===================================================================
---
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_toolBar.php
2010-01-29 15:07:43 UTC (rev 27303)
+++
plugins/diemPlugin/trunk/dmAdminPlugin/modules/dmInterface/templates/_toolBar.php
2010-01-29 15:37:37 UTC (rev 27304)
@@ -27,7 +27,10 @@
echo £link('app:front')->textTitle(__('Go to site'))->set('.widget16.ml10');
- echo £('div.dm_active_users', £('span',
$sf_user->getUser()->get('username')));
+ if(sfConfig::get('dm_locks_enabled'))
+ {
+ echo £('div.dm_active_users', £('span',
$sf_user->getUser()->get('username')));
+ }
if (sfConfig::get('sf_web_debug'))
{
Modified: plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
===================================================================
--- plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
2010-01-29 15:07:43 UTC (rev 27303)
+++ plugins/diemPlugin/trunk/dmAdminPlugin/web/js/dmAdminCtrl.js
2010-01-29 15:37:37 UTC (rev 27304)
@@ -30,7 +30,7 @@
this.checkVersion();
- if(this.options.authenticated)
+ if($.dm.ping && this.options.authenticated)
{
this.launchPing();
}
Modified: plugins/diemPlugin/trunk/dmCorePlugin/config/dm/config.yml
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/config/dm/config.yml 2010-01-29
15:07:43 UTC (rev 27303)
+++ plugins/diemPlugin/trunk/dmCorePlugin/config/dm/config.yml 2010-01-29
15:37:37 UTC (rev 27304)
@@ -50,7 +50,10 @@
security:
remember_cookie_name: # defaults to
"dm_remember_%project_name%"
remember_key_expiration_age: # defaults to 15 days
- active_user_timeout: 10 # time in seconds to consider a user
is no more active
+
+ locks: # whether to enable real time resource
locks
+ enabled: <?php echo sfConfig::get('sf_debug') ? "false\n" :
"true\n"; ?>
+ timeout: 10 # time in seconds to consider a user
is no more active on the page
###### dm internal config ######
Modified: plugins/diemPlugin/trunk/dmCorePlugin/lib/filter/dmInitFilter.php
===================================================================
--- plugins/diemPlugin/trunk/dmCorePlugin/lib/filter/dmInitFilter.php
2010-01-29 15:07:43 UTC (rev 27303)
+++ plugins/diemPlugin/trunk/dmCorePlugin/lib/filter/dmInitFilter.php
2010-01-29 15:37:37 UTC (rev 27304)
@@ -5,7 +5,7 @@
protected function updateLock()
{
- if(class_exists('DmLock') && $this->user->can('admin') &&
$this->response->isHtmlForHuman())
+ if(sfConfig::get('dm_locks_enabled') && $this->user->can('admin') &&
$this->response->isHtmlForHuman())
{
dmDb::table('DmLock')->update(array(
'user_id' => $this->user->getUserId(),
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmLockTable.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmLockTable.class.php
2010-01-29 15:07:43 UTC (rev 27303)
+++
plugins/diemPlugin/trunk/dmCorePlugin/lib/model/doctrine/PluginDmLockTable.class.php
2010-01-29 15:37:37 UTC (rev 27304)
@@ -82,7 +82,7 @@
{
dmDb::pdo(
sprintf('DELETE FROM %s WHERE time < ?', $this->getTableName()),
- array($_SERVER['REQUEST_TIME'] -
sfConfig::get('dm_security_active_user_timeout', 10))
+ array($_SERVER['REQUEST_TIME'] - sfConfig::get('dm_locks_timeout', 10))
);
}
--
You received this message because you are subscribed to the Google Groups
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/symfony-svn?hl=en.
