Author: ornicar2
Date: 2010-02-05 17:54:15 +0100 (Fri, 05 Feb 2010)
New Revision: 27598
Added:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/lib/BasedmAuthAdminActions.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/templates/layout.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/lib/dmGroupAdminGeneratorConfiguration.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/lib/dmGroupAdminGeneratorHelper.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/lib/dmPermissionAdminGeneratorConfiguration.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/lib/dmPermissionAdminGeneratorHelper.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/BasedmUserAdminActions.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/dmUserAdminGeneratorConfiguration.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/dmUserAdminGeneratorHelper.class.php
Removed:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuth/
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/lib/BasedmAuthActions.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/lib/dmAuthLayoutHelper.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/templates/layout.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroup/
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/lib/dmGroupGeneratorConfiguration.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/lib/dmGroupGeneratorHelper.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermission/
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/lib/dmPermissionGeneratorConfiguration.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/lib/dmPermissionGeneratorHelper.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUser/
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/BasedmUserActions.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/dmUserGeneratorConfiguration.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/dmUserGeneratorHelper.class.php
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/actions/actions.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/config/view.yml
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/templates/secureSuccess.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/templates/signinBrowser.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/templates/signinSuccess.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/actions/actions.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/actions/actions.class.php
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/actions/actions.class.php
Log:
[Diem]
- dmUserPlugin now declare its modules and assets
- renamed dmUserPlugin modules by adding the "Admin" suffix
- removed deprecated auth_layout service
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/actions/actions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuth/actions/actions.class.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/actions/actions.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -8,7 +8,7 @@
* file that was distributed with this source code.
*/
-require_once(sfConfig::get('dm_core_dir').'/plugins/dmUserPlugin/modules/dmAuth/lib/BasedmAuthActions.class.php');
+require_once dirname(__FILE__).'/../lib/BasedmAuthAdminActions.class.php';
/**
*
@@ -17,6 +17,6 @@
* @author Fabien Potencier <[email protected]>
* @version SVN: $Id: actions.class.php 23319 2009-10-25 12:22:23Z
Kris.Wallsmith $
*/
-class dmAuthActions extends BasedmAuthActions
+class dmAuthAdminActions extends BasedmAuthAdminActions
{
}
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/config/view.yml
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuth/config/view.yml
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/config/view.yml
2010-02-05 16:54:15 UTC (rev 27598)
@@ -1,5 +1,7 @@
signinSuccess:
- stylesheets: [ core.auth ]
+ stylesheets: [ dmUserPlugin.adminAuth ]
+
signinBrowser:
- stylesheets: [ core.auth ]
\ No newline at end of file
+
+ stylesheets: [ dmUserPlugin.adminAuth ]
\ No newline at end of file
Deleted:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/lib/BasedmAuthActions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuth/lib/BasedmAuthActions.class.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/lib/BasedmAuthActions.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -1,118 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <[email protected]>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- *
- * @package symfony
- * @subpackage plugin
- * @author Fabien Potencier <[email protected]>
- * @version SVN: $Id: BasesfGuardAuthActions.class.php 23319 2009-10-25
12:22:23Z Kris.Wallsmith $
- */
-class BasedmAuthActions extends dmBaseActions
-{
- public function executeSignin(dmWebRequest $request)
- {
- $user = $this->getUser();
-
- if ($user->isAuthenticated())
- {
- return $this->redirect('@homepage');
- }
-
- $this->setLayout(dmOs::join(sfConfig::get('dm_core_dir'),
'plugins/dmUserPlugin/modules/dmAuth/templates/layout'));
-
- if($request->getParameter('skip_browser_detection'))
- {
- $this->getService('browser_check')->markAsChecked();
- }
- elseif(!$this->getService('browser_check')->check())
- {
- return 'Browser';
- }
-
- $class = sfConfig::get('dm_security_signin_form', 'DmFormSignin');
- $this->form = new $class();
-
- $this->form->changeToHidden('remember')->setDefault('remember', true);
-
- if ($request->isMethod('post'))
- {
- $this->form->bind($request->getParameter('signin'));
- if ($this->form->isValid())
- {
- $values = $this->form->getValues();
- $this->getUser()->signin($values['user'], array_key_exists('remember',
$values) ? $values['remember'] : true);
-
- // always redirect to a URL set in app.yml
- // or to the referer
- // or to the homepage
- if ($this->getUser()->can('admin'))
- {
- $signinUrl = sfConfig::get('dm_security_success_signin_url',
$user->getReferer($request->getReferer()));
- }
- else
- {
- try
- {
- $signinUrl =
$this->context->get('script_name_resolver')->get('front');
- }
- catch(dmException $e)
- {
- // user can't go in admin, and front script_name can't be found.
- }
- }
-
- return $this->redirect('' != $signinUrl ? $signinUrl : '@homepage');
- }
- }
- else
- {
- if ($request->isXmlHttpRequest())
- {
- $this->getResponse()->setHeaderOnly(true);
- $this->getResponse()->setStatusCode(401);
-
- return sfView::NONE;
- }
-
- // if we have been forwarded, then the referer is the current URL
- // if not, this is the referer of the current request
- $user->setReferer($this->getContext()->getActionStack()->getSize() > 1 ?
$request->getUri() : $request->getReferer());
-
- $module = sfConfig::get('sf_login_module');
- if ($this->getModuleName() != $module)
- {
- return $this->redirect($module.'/'.sfConfig::get('sf_login_action'));
- }
-
- $this->getResponse()->setStatusCode(401);
- }
- }
-
- public function executeSignout($request)
- {
- $this->getUser()->signOut();
-
- $signoutUrl = sfConfig::get('dm_security_success_signout_url',
$request->getReferer());
-
- $this->redirect('' != $signoutUrl ? $signoutUrl : '@homepage');
- }
-
- public function executeSecure()
- {
- $this->getResponse()->setStatusCode(403);
- }
-
- public function executePassword()
- {
- throw new sfException('This method is not yet implemented.');
- }
-
-}
Copied:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/lib/BasedmAuthAdminActions.class.php
(from rev 27414,
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuth/lib/BasedmAuthActions.class.php)
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/lib/BasedmAuthAdminActions.class.php
(rev 0)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/lib/BasedmAuthAdminActions.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -0,0 +1,118 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) 2004-2006 Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ *
+ * @package symfony
+ * @subpackage plugin
+ * @author Fabien Potencier <[email protected]>
+ * @version SVN: $Id: BasesfGuardAuthActions.class.php 23319 2009-10-25
12:22:23Z Kris.Wallsmith $
+ */
+class BasedmAuthAdminActions extends dmBaseActions
+{
+ public function executeSignin(dmWebRequest $request)
+ {
+ $user = $this->getUser();
+
+ if ($user->isAuthenticated())
+ {
+ return $this->redirect('@homepage');
+ }
+
+ $this->setLayout(realpath(dirname(__FILE__).'/..').'/templates/layout');
+
+ if($request->getParameter('skip_browser_detection'))
+ {
+ $this->getService('browser_check')->markAsChecked();
+ }
+ elseif(!$this->getService('browser_check')->check())
+ {
+ return 'Browser';
+ }
+
+ $class = sfConfig::get('dm_security_signin_form', 'DmFormSignin');
+ $this->form = new $class();
+
+ $this->form->changeToHidden('remember')->setDefault('remember', true);
+
+ if ($request->isMethod('post'))
+ {
+ $this->form->bind($request->getParameter('signin'));
+ if ($this->form->isValid())
+ {
+ $values = $this->form->getValues();
+ $this->getUser()->signin($values['user'], array_key_exists('remember',
$values) ? $values['remember'] : true);
+
+ // always redirect to a URL set in app.yml
+ // or to the referer
+ // or to the homepage
+ if ($this->getUser()->can('admin'))
+ {
+ $signinUrl = sfConfig::get('dm_security_success_signin_url',
$user->getReferer($request->getReferer()));
+ }
+ else
+ {
+ try
+ {
+ $signinUrl =
$this->getService('script_name_resolver')->get('front');
+ }
+ catch(dmException $e)
+ {
+ // user can't go in admin, and front script_name can't be found.
+ }
+ }
+
+ return $this->redirect('' != $signinUrl ? $signinUrl : '@homepage');
+ }
+ }
+ else
+ {
+ if ($request->isXmlHttpRequest())
+ {
+ $this->getResponse()->setHeaderOnly(true);
+ $this->getResponse()->setStatusCode(401);
+
+ return sfView::NONE;
+ }
+
+ // if we have been forwarded, then the referer is the current URL
+ // if not, this is the referer of the current request
+ $user->setReferer($this->getContext()->getActionStack()->getSize() > 1 ?
$request->getUri() : $request->getReferer());
+
+ $module = sfConfig::get('sf_login_module');
+ if ($this->getModuleName() != $module)
+ {
+ return $this->redirect($module.'/'.sfConfig::get('sf_login_action'));
+ }
+
+ $this->getResponse()->setStatusCode(401);
+ }
+ }
+
+ public function executeSignout($request)
+ {
+ $this->getUser()->signOut();
+
+ $signoutUrl = sfConfig::get('dm_security_success_signout_url',
$request->getReferer());
+
+ $this->redirect('' != $signoutUrl ? $signoutUrl : '@homepage');
+ }
+
+ public function executeSecure()
+ {
+ $this->getResponse()->setStatusCode(403);
+ }
+
+ public function executePassword()
+ {
+ throw new sfException('This method is not yet implemented.');
+ }
+
+}
Deleted:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/lib/dmAuthLayoutHelper.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuth/lib/dmAuthLayoutHelper.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/lib/dmAuthLayoutHelper.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -1,12 +0,0 @@
-<?php
-
-class dmAuthLayoutHelper extends dmCoreLayoutHelper
-{
-
- public function renderBodyTag($class = null)
- {
- return sprintf('<body class="dm%s">',
- $class ? ' '.$class : ''
- );
- }
-}
\ No newline at end of file
Deleted:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/templates/layout.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuth/templates/layout.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/templates/layout.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -1,25 +0,0 @@
-<?php
-
-$helper = $sf_context->get('auth_layout_helper');
-
-echo
-$helper->renderDoctype(),
-$helper->renderHtmlTag(),
-
- "\n<head>\n",
- $helper->renderHttpMetas(),
- $helper->renderMetas(),
- $helper->renderStylesheets(),
- $helper->renderFavicon(),
- "\n</head>\n",
-
- $helper->renderBodyTag('bg_2'),
-
- $sf_content,
-
- $helper->renderJavascriptConfig(),
-
- $helper->renderJavascripts(),
-
- '</body>',
-'</html>';
\ No newline at end of file
Copied:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/templates/layout.php
(from rev 27582,
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuth/templates/layout.php)
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/templates/layout.php
(rev 0)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/templates/layout.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -0,0 +1,22 @@
+<?php
+
+$helper = $sf_context->get('layout_helper');
+
+echo
+$helper->renderDoctype(),
+$helper->renderHtmlTag(),
+
+ "\n<head>\n",
+ $helper->renderHead(),
+ "\n</head>\n",
+
+ $helper->renderBodyTag('.dm.bg_2'),
+
+ $sf_content,
+
+ $helper->renderJavascriptConfig(),
+
+ $helper->renderJavascripts(),
+
+ '</body>',
+'</html>';
\ No newline at end of file
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/templates/secureSuccess.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuth/templates/secureSuccess.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/templates/secureSuccess.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -9,9 +9,9 @@
<?php
-echo _tag('div.dm_box.little.secure.mt20', _tag('div.title', _tag('h2', 'You
don\'t have the required permission to access this
page.'))._tag('div.dm_box_inner',
+echo _tag('div.dm_box.little.secure.mt20', _tag('div.title', _tag('h2',
__("You don't have the required permission to access this
page.")))._tag('div.dm_box_inner',
_tag('ul.choices',
- _tag('li', _link('dmAuth/signout')->text(__('Logout'))).
+ _tag('li', _link('dmAuthAdmin/signout')->text(__('Logout'))).
_tag('li', _link('@homepage')->text(__('Back to admin homepage'))).
_tag('li', _link('app:front')->text(__('Back to front homepage')))
)
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/templates/signinBrowser.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuth/templates/signinBrowser.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/templates/signinBrowser.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -5,15 +5,15 @@
echo _tag('h1.site_name', dmConfig::get('site_name'));
echo _tag('div.message',
- _tag('p.dm_browser_unsupported.mt10', "Sorry, it looks like you're using a
browser that isn't supported.").
- _tag('p.dm_browser_suggestion.mt10', "We suggest that you use one of these
browsers:").
+ _tag('p.dm_browser_unsupported.mt10', __("Sorry, it looks like you're using
a browser that isn't supported.")).
+ _tag('p.dm_browser_suggestion.mt10', __("We suggest that you use one of
these browsers:")).
_tag('div.dm_suggested_browsers.clearfix',
_link('http://www.mozilla.com/firefox/')->text(_media('dmCore/images/64/firefox.png')->size(64,
64).'Firefox').
_link('http://www.google.com/chrome')->text(_media('dmCore/images/64/chrome.png')->size(64,
64).'Chrome').
_link('http://www.apple.com/safari/')->text(_media('dmCore/images/64/safari.png')->size(64,
64).'Safari <em>not yet</em>')->set('.not_ready')
).
_tag('div.dm_skip_browser_detection',
- _link('+/dmAuth/signin?skip_browser_detection=1')->text(__('Or continue at
your own peril'))
+ _link('+/dmAuthAdmin/signin?skip_browser_detection=1')->text(__('Or
continue at your own peril'))
)
);
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/templates/signinSuccess.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuth/templates/signinSuccess.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmAuthAdmin/templates/signinSuccess.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -5,7 +5,7 @@
echo _tag('h1.site_name', dmConfig::get('site_name'));
echo _tag('div.message',
- $form->open('.dm_form.list.little.clearfix action=+/dmAuth/signin').
+ $form->open('.dm_form.list.little.clearfix action=+/dmAuthAdmin/signin').
_tag('ul',
_tag('li.dm_form_element.clearfix',
$form['username']->error()->label(__('Username'))->field()
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/actions/actions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroup/actions/actions.class.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/actions/actions.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -1,8 +1,8 @@
<?php
-require_once
dirname(__FILE__).'/../lib/dmGroupGeneratorConfiguration.class.php';
-require_once dirname(__FILE__).'/../lib/dmGroupGeneratorHelper.class.php';
+require_once
dirname(__FILE__).'/../lib/dmGroupAdminGeneratorConfiguration.class.php';
+require_once dirname(__FILE__).'/../lib/dmGroupAdminGeneratorHelper.class.php';
-class dmGroupActions extends autodmGroupActions
+class dmGroupAdminActions extends autodmGroupAdminActions
{
}
Copied:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/lib/dmGroupAdminGeneratorConfiguration.class.php
(from rev 27414,
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroup/lib/dmGroupGeneratorConfiguration.class.php)
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/lib/dmGroupAdminGeneratorConfiguration.class.php
(rev 0)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/lib/dmGroupAdminGeneratorConfiguration.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * dmGroup module configuration.
+ *
+ * @package dmPlugin
+ * @subpackage dmGroup
+ * @author Fabien Potencier
+ * @version SVN: $Id: dmGroupGeneratorConfiguration.class.php 23319
2009-10-25 12:22:23Z Kris.Wallsmith $
+ */
+class dmGroupAdminGeneratorConfiguration extends
BasedmGroupAdminGeneratorConfiguration
+{
+}
Copied:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/lib/dmGroupAdminGeneratorHelper.class.php
(from rev 27414,
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroup/lib/dmGroupGeneratorHelper.class.php)
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/lib/dmGroupAdminGeneratorHelper.class.php
(rev 0)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/lib/dmGroupAdminGeneratorHelper.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * sfGuardGroup module helper.
+ *
+ * @package sfGuardPlugin
+ * @subpackage sfGuardGroup
+ * @author Fabien Potencier
+ * @version SVN: $Id: sfGuardGroupGeneratorHelper.class.php 23319
2009-10-25 12:22:23Z Kris.Wallsmith $
+ */
+class dmGroupAdminGeneratorHelper extends BasedmGroupAdminGeneratorHelper
+{
+}
Deleted:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/lib/dmGroupGeneratorConfiguration.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroup/lib/dmGroupGeneratorConfiguration.class.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/lib/dmGroupGeneratorConfiguration.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * dmGroup module configuration.
- *
- * @package dmPlugin
- * @subpackage dmGroup
- * @author Fabien Potencier
- * @version SVN: $Id: dmGroupGeneratorConfiguration.class.php 23319
2009-10-25 12:22:23Z Kris.Wallsmith $
- */
-class dmGroupGeneratorConfiguration extends BasedmGroupGeneratorConfiguration
-{
-}
Deleted:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/lib/dmGroupGeneratorHelper.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroup/lib/dmGroupGeneratorHelper.class.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmGroupAdmin/lib/dmGroupGeneratorHelper.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * sfGuardGroup module helper.
- *
- * @package sfGuardPlugin
- * @subpackage sfGuardGroup
- * @author Fabien Potencier
- * @version SVN: $Id: sfGuardGroupGeneratorHelper.class.php 23319
2009-10-25 12:22:23Z Kris.Wallsmith $
- */
-class dmGroupGeneratorHelper extends BasedmGroupGeneratorHelper
-{
-}
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/actions/actions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermission/actions/actions.class.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/actions/actions.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -1,8 +1,8 @@
<?php
-require_once
dirname(__FILE__).'/../lib/dmPermissionGeneratorConfiguration.class.php';
-require_once dirname(__FILE__).'/../lib/dmPermissionGeneratorHelper.class.php';
+require_once
dirname(__FILE__).'/../lib/dmPermissionAdminGeneratorConfiguration.class.php';
+require_once
dirname(__FILE__).'/../lib/dmPermissionAdminGeneratorHelper.class.php';
-class dmPermissionActions extends autodmPermissionActions
+class dmPermissionAdminActions extends autodmPermissionAdminActions
{
}
Copied:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/lib/dmPermissionAdminGeneratorConfiguration.class.php
(from rev 27414,
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermission/lib/dmPermissionGeneratorConfiguration.class.php)
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/lib/dmPermissionAdminGeneratorConfiguration.class.php
(rev 0)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/lib/dmPermissionAdminGeneratorConfiguration.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * sfGuardPermission module configuration.
+ *
+ * @package sfGuardPlugin
+ * @subpackage sfGuardPermission
+ * @author Fabien Potencier
+ * @version SVN: $Id: sfGuardPermissionGeneratorConfiguration.class.php
23319 2009-10-25 12:22:23Z Kris.Wallsmith $
+ */
+class dmPermissionAdminGeneratorConfiguration extends
BasedmPermissionAdminGeneratorConfiguration
+{
+}
Copied:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/lib/dmPermissionAdminGeneratorHelper.class.php
(from rev 27414,
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermission/lib/dmPermissionGeneratorHelper.class.php)
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/lib/dmPermissionAdminGeneratorHelper.class.php
(rev 0)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/lib/dmPermissionAdminGeneratorHelper.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * sfGuardPermission module helper.
+ *
+ * @package sfGuardPlugin
+ * @subpackage sfGuardPermission
+ * @author Fabien Potencier
+ * @version SVN: $Id: sfGuardPermissionGeneratorHelper.class.php 23319
2009-10-25 12:22:23Z Kris.Wallsmith $
+ */
+class dmPermissionAdminGeneratorHelper extends
BasedmPermissionAdminGeneratorHelper
+{
+}
Deleted:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/lib/dmPermissionGeneratorConfiguration.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermission/lib/dmPermissionGeneratorConfiguration.class.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/lib/dmPermissionGeneratorConfiguration.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * sfGuardPermission module configuration.
- *
- * @package sfGuardPlugin
- * @subpackage sfGuardPermission
- * @author Fabien Potencier
- * @version SVN: $Id: sfGuardPermissionGeneratorConfiguration.class.php
23319 2009-10-25 12:22:23Z Kris.Wallsmith $
- */
-class dmPermissionGeneratorConfiguration extends
BasedmPermissionGeneratorConfiguration
-{
-}
Deleted:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/lib/dmPermissionGeneratorHelper.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermission/lib/dmPermissionGeneratorHelper.class.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmPermissionAdmin/lib/dmPermissionGeneratorHelper.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * sfGuardPermission module helper.
- *
- * @package sfGuardPlugin
- * @subpackage sfGuardPermission
- * @author Fabien Potencier
- * @version SVN: $Id: sfGuardPermissionGeneratorHelper.class.php 23319
2009-10-25 12:22:23Z Kris.Wallsmith $
- */
-class dmPermissionGeneratorHelper extends BasedmPermissionGeneratorHelper
-{
-}
Modified:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/actions/actions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUser/actions/actions.class.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/actions/actions.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -1,9 +1,9 @@
<?php
-require_once
dirname(__FILE__).'/../lib/dmUserGeneratorConfiguration.class.php';
-require_once dirname(__FILE__).'/../lib/dmUserGeneratorHelper.class.php';
-require_once dirname(__FILE__).'/../lib/BasedmUserActions.class.php';
+require_once
dirname(__FILE__).'/../lib/dmUserAdminGeneratorConfiguration.class.php';
+require_once dirname(__FILE__).'/../lib/dmUserAdminGeneratorHelper.class.php';
+require_once dirname(__FILE__).'/../lib/BasedmUserAdminActions.class.php';
-class dmUserActions extends BasedmUserActions
+class dmUserAdminActions extends BasedmUserAdminActions
{
}
Deleted:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/BasedmUserActions.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUser/lib/BasedmUserActions.class.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/BasedmUserActions.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -1,34 +0,0 @@
-<?php
-
-/*
- * This file is part of the symfony package.
- * (c) 2004-2006 Fabien Potencier <[email protected]>
- *
- * For the full copyright and license information, please view the LICENSE
- * file that was distributed with this source code.
- */
-
-/**
- *
- * @package symfony
- * @subpackage plugin
- * @author Fabien Potencier <[email protected]>
- * @version SVN: $Id: BasedmUserActions.class.php 23319 2009-10-25
12:22:23Z Kris.Wallsmith $
- */
-class BasedmUserActions extends autodmUserActions
-{
- public function validateEdit()
- {
- if ($this->getRequest()->getMethod() == sfRequest::POST &&
!$this->getRequestParameter('id'))
- {
- if ($this->getRequestParameter('dm_user[password]') == '')
- {
- $this->getRequest()->setError('dm_user{password}',
$this->getContext()->getI18N()->__('Password is mandatory'));
-
- return false;
- }
- }
-
- return true;
- }
-}
Copied:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/BasedmUserAdminActions.class.php
(from rev 27414,
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUser/lib/BasedmUserActions.class.php)
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/BasedmUserAdminActions.class.php
(rev 0)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/BasedmUserAdminActions.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -0,0 +1,34 @@
+<?php
+
+/*
+ * This file is part of the symfony package.
+ * (c) 2004-2006 Fabien Potencier <[email protected]>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
+/**
+ *
+ * @package symfony
+ * @subpackage plugin
+ * @author Fabien Potencier <[email protected]>
+ * @version SVN: $Id: BasedmUserActions.class.php 23319 2009-10-25
12:22:23Z Kris.Wallsmith $
+ */
+class BasedmUserAdminActions extends autodmUserAdminActions
+{
+ public function validateEdit()
+ {
+ if ($this->getRequest()->getMethod() == sfRequest::POST &&
!$this->getRequestParameter('id'))
+ {
+ if ($this->getRequestParameter('dm_user[password]') == '')
+ {
+ $this->getRequest()->setError('dm_user{password}',
$this->getContext()->getI18N()->__('Password is mandatory'));
+
+ return false;
+ }
+ }
+
+ return true;
+ }
+}
Copied:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/dmUserAdminGeneratorConfiguration.class.php
(from rev 27414,
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUser/lib/dmUserGeneratorConfiguration.class.php)
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/dmUserAdminGeneratorConfiguration.class.php
(rev 0)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/dmUserAdminGeneratorConfiguration.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * sfGuardUser module configuration.
+ *
+ * @package sfGuardPlugin
+ * @subpackage sfGuardUser
+ * @author Fabien Potencier
+ * @version SVN: $Id: sfGuardUserGeneratorConfiguration.class.php 23319
2009-10-25 12:22:23Z Kris.Wallsmith $
+ */
+class dmUserAdminGeneratorConfiguration extends
BasedmUserAdminGeneratorConfiguration
+{
+}
Copied:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/dmUserAdminGeneratorHelper.class.php
(from rev 27414,
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUser/lib/dmUserGeneratorHelper.class.php)
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/dmUserAdminGeneratorHelper.class.php
(rev 0)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/dmUserAdminGeneratorHelper.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -0,0 +1,13 @@
+<?php
+
+/**
+ * sfGuardUser module helper.
+ *
+ * @package sfGuardPlugin
+ * @subpackage sfGuardUser
+ * @author Fabien Potencier
+ * @version SVN: $Id: sfGuardUserGeneratorHelper.class.php 23319 2009-10-25
12:22:23Z Kris.Wallsmith $
+ */
+class dmUserAdminGeneratorHelper extends BasedmUserAdminGeneratorHelper
+{
+}
Deleted:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/dmUserGeneratorConfiguration.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUser/lib/dmUserGeneratorConfiguration.class.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/dmUserGeneratorConfiguration.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * sfGuardUser module configuration.
- *
- * @package sfGuardPlugin
- * @subpackage sfGuardUser
- * @author Fabien Potencier
- * @version SVN: $Id: sfGuardUserGeneratorConfiguration.class.php 23319
2009-10-25 12:22:23Z Kris.Wallsmith $
- */
-class dmUserGeneratorConfiguration extends BasedmUserGeneratorConfiguration
-{
-}
Deleted:
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/dmUserGeneratorHelper.class.php
===================================================================
---
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUser/lib/dmUserGeneratorHelper.class.php
2010-02-02 12:27:07 UTC (rev 27414)
+++
plugins/diemPlugin/trunk/dmCorePlugin/plugins/dmUserPlugin/modules/dmUserAdmin/lib/dmUserGeneratorHelper.class.php
2010-02-05 16:54:15 UTC (rev 27598)
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * sfGuardUser module helper.
- *
- * @package sfGuardPlugin
- * @subpackage sfGuardUser
- * @author Fabien Potencier
- * @version SVN: $Id: sfGuardUserGeneratorHelper.class.php 23319 2009-10-25
12:22:23Z Kris.Wallsmith $
- */
-class dmUserGeneratorHelper extends BasedmUserGeneratorHelper
-{
-}
--
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.
