[Fmsystem-commits] [9089] registration

[Sigurd Nes]

Revision: 9089
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9089
Author:   sigurdne
Date:     2012-04-03 07:07:08 +0000 (Tue, 03 Apr 2012)
Log Message:
-----------
registration

Modified Paths:
--------------
    trunk/registration/inc/class.uicommon.inc.php
    trunk/registration/inc/hook_logout.inc.php

Modified: trunk/registration/inc/class.uicommon.inc.php
===================================================================
--- trunk/registration/inc/class.uicommon.inc.php       2012-04-02 16:04:25 UTC 
(rev 9088)
+++ trunk/registration/inc/class.uicommon.inc.php       2012-04-03 07:07:08 UTC 
(rev 9089)
@@ -393,11 +393,11 @@
 
                public function add_yui_translation(&$data)
                {
-                       $this->add_template_file('yui_booking_i18n');
+                       $this->add_template_file('yui_phpgw_i18n');
                        $previous = lang('prev');
                        $next = lang('next');
                        
-                       $data['yui_booking_i18n'] = array(
+                       $data['yui_phpgw_i18n'] = array(
                                'Calendar' => array(
                                        'WEEKDAYS_SHORT' => 
json_encode(lang_array('Su', 'Mo', 'Tu', 'We', 'Th', 'Fr', 'Sa')),
                                        'WEEKDAYS_FULL' => 
json_encode(lang_array('Sunday', 'Monday', 'Tuesday', 'Wednesday', 'Thursday', 
'Friday', 'Saturday')),

Modified: trunk/registration/inc/hook_logout.inc.php
===================================================================
--- trunk/registration/inc/hook_logout.inc.php  2012-04-02 16:04:25 UTC (rev 
9088)
+++ trunk/registration/inc/hook_logout.inc.php  2012-04-03 07:07:08 UTC (rev 
9089)
@@ -14,5 +14,11 @@
 
        /* $Id$ */
 
-       $GLOBALS['phpgw']->db->query("delete from phpgw_reg_accounts where 
reg_dla <= '"
+       $c = createobject('phpgwapi.config','registration');
+       $c->read();
+
+       if(!$c->config_data['activate_account'] == 'pending_approval')
+       {
+               $GLOBALS['phpgw']->db->query("DELETE FROM phpgw_reg_accounts 
WHERE reg_dla <= '"
                . (time() - 7200) . "'",__LINE__,__FILE__);
+       }