[Fmsystem-commits] [7332] Fixed installation of module

[Erik Holm-Larsen]

Revision: 7332
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7332
Author:   erikhl
Date:     2011-05-31 05:10:21 +0000 (Tue, 31 May 2011)
Log Message:
-----------
Fixed installation of module
added 'secret' column to activity

Modified Paths:
--------------
    trunk/activitycalendar/inc/class.soactivity.inc.php
    trunk/activitycalendar/inc/class.socommon.inc.php
    trunk/activitycalendar/inc/class.uicommon.inc.php
    trunk/activitycalendar/setup/setup.inc.php
    trunk/activitycalendar/setup/tables_current.inc.php
    trunk/activitycalendar/setup/tables_update.inc.php

Modified: trunk/activitycalendar/inc/class.soactivity.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-30 20:05:55 UTC 
(rev 7331)
+++ trunk/activitycalendar/inc/class.soactivity.inc.php 2011-05-31 05:10:21 UTC 
(rev 7332)
@@ -219,7 +219,8 @@
        {
                // Insert a new activity
                $ts_now = strtotime('now');
-               $q ="INSERT INTO activity_activity (title, create_date) VALUES 
('tmptitle', $ts_now)";
+               $secret = $this->generate_secret();
+               $q ="INSERT INTO activity_activity (title, create_date,secret) 
VALUES ('tmptitle', $ts_now, '{$secret}')";
                $result = $this->db->query($q, __LINE__,__FILE__);
 
                if(isset($result)) {
@@ -289,6 +290,7 @@
                        'create_date',
                        'contact_person_1',
                        'contact_person_2',
+                       'secret',
                        'special_adaptation'
                );
                        
@@ -308,6 +310,7 @@
                        $this->marshal($ts_now, 'int'),
                        $this->marshal($activity->get_contact_person_1(), 
'int'),
                        $this->marshal($activity->get_contact_person_2(), 
'int'),
+                       $this->marshal($this->generate_secret(),'string'),
                        ($activity->get_special_adaptation() ? "true" : "false")
                );
                

Modified: trunk/activitycalendar/inc/class.socommon.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.socommon.inc.php   2011-05-30 20:05:55 UTC 
(rev 7331)
+++ trunk/activitycalendar/inc/class.socommon.inc.php   2011-05-31 05:10:21 UTC 
(rev 7332)
@@ -314,5 +314,10 @@
                // The object did not validate
                return false;
        }
+       
+       protected function generate_secret($length = 10)
+       {
+               return substr(base64_encode(rand(1000000000,9999999999)),0, 
$length);
+       }
 }
 ?>
\ No newline at end of file

Modified: trunk/activitycalendar/inc/class.uicommon.inc.php
===================================================================
--- trunk/activitycalendar/inc/class.uicommon.inc.php   2011-05-30 20:05:55 UTC 
(rev 7331)
+++ trunk/activitycalendar/inc/class.uicommon.inc.php   2011-05-31 05:10:21 UTC 
(rev 7332)
@@ -485,5 +485,10 @@
                        return array('table_name', 'fields');
                }
                
+               protected function generate_secret($length = 10)
+               {
+                       return 
substr(base64_encode(rand(1000000000,9999999999)),0, $length);
+               }
+               
        }
 ?>

Modified: trunk/activitycalendar/setup/setup.inc.php
===================================================================
--- trunk/activitycalendar/setup/setup.inc.php  2011-05-30 20:05:55 UTC (rev 
7331)
+++ trunk/activitycalendar/setup/setup.inc.php  2011-05-31 05:10:21 UTC (rev 
7332)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['activitycalendar']['name'] = 'activitycalendar';
-       $setup_info['activitycalendar']['version'] = '0.1.2';
+       $setup_info['activitycalendar']['version'] = '0.1.3';
        $setup_info['activitycalendar']['app_order'] = 60;
        $setup_info['activitycalendar']['enable'] = 1;
        $setup_info['activitycalendar']['app_group']    = 'office';

Modified: trunk/activitycalendar/setup/tables_current.inc.php
===================================================================
--- trunk/activitycalendar/setup/tables_current.inc.php 2011-05-30 20:05:55 UTC 
(rev 7331)
+++ trunk/activitycalendar/setup/tables_current.inc.php 2011-05-31 05:10:21 UTC 
(rev 7332)
@@ -18,6 +18,7 @@
                                'last_change_date' => array('type' => 'int', 
'precision' => 4, 'precision' => '8', 'nullable' => true),
                                'contact_person_1' => array('type' => 
'varchar','precision' => '255'),
                                'contact_person_2' => array('type' => 
'varchar','precision' => '255'),
+                               'secret' => array('type' => 'text','nullable' 
=> False),
                                'special_adaptation' => array('type' => 
'bool','nullable' => true,'default' => 'false')
                        ),
                        'pk' => array('id'),
@@ -31,7 +32,7 @@
                                'internal_arena_id' => array('type' => 'int', 
'precision' => 4, 'nullable' => True),
                                'arena_name' => array('type' => 
'varchar','precision' => '255','nullable' => false),
                                'address' => array('type' => 
'varchar','precision' => '255','nullable' => True),
-                               'active' => array('type' => 'bool','nullable' 
=> true,'default' => True)
+                               'active' => array('type' => 'bool','nullable' 
=> true,'default' => 'true')
                        ),
                        'pk' => array('id'),
                        'fk' => array(),

Modified: trunk/activitycalendar/setup/tables_update.inc.php
===================================================================
--- trunk/activitycalendar/setup/tables_update.inc.php  2011-05-30 20:05:55 UTC 
(rev 7331)
+++ trunk/activitycalendar/setup/tables_update.inc.php  2011-05-31 05:10:21 UTC 
(rev 7332)
@@ -27,4 +27,18 @@
                $GLOBALS['setup_info']['activitycalendar']['currentver'] = 
'0.1.2';
                return $GLOBALS['setup_info']['activitycalendar']['currentver'];
        }
+       
+       $test[] = '0.1.2';
+       function activitycalendar_upgrade0_1_2()
+       {
+               $def_val = substr(base64_encode(rand(1000000000,9999999999)),0, 
10);
+               
$GLOBALS['phpgw_setup']->oProc->AddColumn('activity_activity','secret',array(
+                       'type' => 'text',
+                       'default' => $def_val,
+                       'nullable' => 'False'
+               ));
+               
+               $GLOBALS['setup_info']['activitycalendar']['currentver'] = 
'0.1.3';
+               return $GLOBALS['setup_info']['activitycalendar']['currentver'];
+       }
 ?>
\ No newline at end of file