[Fmsystem-commits] [9806] Removed

[Alexander Stevenson]

Revision: 9806
          http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=9806
Author:   andvare
Date:     2012-07-17 14:42:46 +0000 (Tue, 17 Jul 2012)
Log Message:
-----------
Removed

Modified Paths:
--------------
    branches/svgvartxt/booking/inc/class.menu.inc.php
    branches/svgvartxt/booking/inc/class.sodocumentation.inc.php
    branches/svgvartxt/booking/setup/setup.inc.php
    branches/svgvartxt/booking/setup/tables_current.inc.php
    branches/svgvartxt/booking/setup/tables_update.inc.php

Removed Paths:
-------------
    branches/svgvartxt/stavangerkommune/

Modified: branches/svgvartxt/booking/inc/class.menu.inc.php
===================================================================
--- branches/svgvartxt/booking/inc/class.menu.inc.php   2012-07-16 13:39:22 UTC 
(rev 9805)
+++ branches/svgvartxt/booking/inc/class.menu.inc.php   2012-07-17 14:42:46 UTC 
(rev 9806)
@@ -278,6 +278,11 @@
                                                                        )
                                                                )
                                                        ),
+                                                       'strings'       => array
+                                                       (
+                                                               'text'  => 
lang('Strings'),
+                                                               'url'   => 
$GLOBALS['phpgw']->link('/index.php', array('menuaction' => 
'booking.strings.index', 'appname' => 'booking') )
+                                                       ),
                                                )
                                        );
                                        if ($manual !== null)

Modified: branches/svgvartxt/booking/inc/class.sodocumentation.inc.php
===================================================================
--- branches/svgvartxt/booking/inc/class.sodocumentation.inc.php        
2012-07-16 13:39:22 UTC (rev 9805)
+++ branches/svgvartxt/booking/inc/class.sodocumentation.inc.php        
2012-07-17 14:42:46 UTC (rev 9806)
@@ -26,6 +26,7 @@
                        );
                        $this->account  = 
$GLOBALS['phpgw_info']['user']['account_id'];
                        
+                       error_log( var_export( 
$GLOBALS['phpgw_info']['server']['files_dir'], true ) );
                        $server_files_dir = 
$this->_chomp_dir_sep($GLOBALS['phpgw_info']['server']['files_dir']);
                        
                        if (!file_exists($server_files_dir) || 
!is_dir($server_files_dir)) {

Modified: branches/svgvartxt/booking/setup/setup.inc.php
===================================================================
--- branches/svgvartxt/booking/setup/setup.inc.php      2012-07-16 13:39:22 UTC 
(rev 9805)
+++ branches/svgvartxt/booking/setup/setup.inc.php      2012-07-17 14:42:46 UTC 
(rev 9806)
@@ -1,6 +1,6 @@
 <?php
        $setup_info['booking']['name'] = 'booking';
-       $setup_info['booking']['version'] = '0.2.09';
+       $setup_info['booking']['version'] = '0.2.10';
        $setup_info['booking']['app_order'] = 9;
        $setup_info['booking']['enable'] = 1;
        $setup_info['booking']['app_group'] = 'office';
@@ -55,7 +55,8 @@
                'bb_system_message',
                'bb_office',
                'bb_office_user',
-               'bb_documentation'
+               'bb_documentation',
+               'bb_string'
        );
 
        $setup_info['booking']['description'] = 'Bergen kommune booking';

Modified: branches/svgvartxt/booking/setup/tables_current.inc.php
===================================================================
--- branches/svgvartxt/booking/setup/tables_current.inc.php     2012-07-16 
13:39:22 UTC (rev 9805)
+++ branches/svgvartxt/booking/setup/tables_current.inc.php     2012-07-17 
14:42:46 UTC (rev 9806)
@@ -807,5 +807,16 @@
                        'fk' => array(),
                        'ix' => array(),
                        'uc' => array()
-               )
+               ),
+               'bb_string' => array(
+                       'fd' => array(
+                               'id' => array('type' => 'varchar', 'precision' 
=> '255', 'nullable' => false),
+                               'name' => array('type' => 'varchar', 
'precision' => '255', 'nullable' => false),
+                               'contents' => array('type' => 'text', 
'nullable' => true),
+                       ),
+                       'pk' => array('id'),
+                       'fk' => array(),
+                       'ix' => array(),
+                       'uc' => array()
+               ),
        );

Modified: branches/svgvartxt/booking/setup/tables_update.inc.php
===================================================================
--- branches/svgvartxt/booking/setup/tables_update.inc.php      2012-07-16 
13:39:22 UTC (rev 9805)
+++ branches/svgvartxt/booking/setup/tables_update.inc.php      2012-07-17 
14:42:46 UTC (rev 9806)
@@ -2635,3 +2635,35 @@
        }
 
 
+       $test[] = '0.2.09';
+       /**
+       * Update booking version from 0.2.09 to 0.2.10
+       * Add table for replacable booking strings
+       * 
+       */
+       function booking_upgrade0_2_09()
+       {
+               $GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
+
+
+               $GLOBALS['phpgw_setup']->oProc->CreateTable(
+                       'bb_string', array(
+                               'fd' => array(
+                                       'id' => array('type' => 'varchar', 
'precision' => '255', 'nullable' => false),
+                                       'name' => array('type' => 'varchar', 
'precision' => '255', 'nullable' => false),
+                                       'contents' => array('type' => 'text', 
'nullable' => true),
+                               ),
+                               'pk' => array('id'),
+                               'fk' => array(),
+                               'ix' => array(),
+                               'uc' => array()
+                       )
+               );
+       
+               if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
+               {
+                       $GLOBALS['setup_info']['booking']['currentver'] = 
'0.2.10';
+                       return $GLOBALS['setup_info']['booking']['currentver'];
+               }
+       }
+