[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] [18471] more stuff missing from the merge
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] [18471] more stuff missing from the merge |
|
Date: |
Mon, 04 Feb 2008 04:50:15 +0000 |
Revision: 18471
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=18471
Author: skwashd
Date: 2008-02-04 04:50:14 +0000 (Mon, 04 Feb 2008)
Log Message:
-----------
more stuff missing from the merge
Modified Paths:
--------------
trunk/phpgwapi/setup/tables_update.inc.php
Added Paths:
-----------
trunk/phpgwapi/templates/probusiness/images/logo.png
Modified: trunk/phpgwapi/setup/tables_update.inc.php
===================================================================
--- trunk/phpgwapi/setup/tables_update.inc.php 2008-02-02 14:02:04 UTC (rev
18470)
+++ trunk/phpgwapi/setup/tables_update.inc.php 2008-02-04 04:50:14 UTC (rev
18471)
@@ -1693,8 +1693,7 @@
$GLOBALS['setup_info']['phpgwapi']['currentver'] = '0.9.17.512';
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
}
- }
-
+
$test[] = '0.9.17.512';
function phpgwapi_upgrade0_9_17_512()
{
@@ -1730,14 +1729,11 @@
}
}
- /*
$test[] = '0.9.17.513';
function phpgwapi_upgrade0_9_17_513()
{
$GLOBALS['phpgw_setup']->oProc->m_odb->transaction_begin();
-// -- fix addressbook : insertion of organisation
-
$GLOBALS['phpgw_setup']->oProc->AlterColumn('phpgw_contact_addr','addr_type_id',array(
'type' => 'int',
'precision' => '4',
@@ -1750,195 +1746,10 @@
'nullable' => True,
'default' => 'Y'
));
-//--
-//-- setting default log_level to N (Notice)
-
- $GLOBALS['phpgw_setup']->oProc->query("SELECT config_value FROM
phpgw_config WHERE config_app = 'phpgwapi' AND config_name = 'log_levels' ");
- if ( $GLOBALS['phpgw_setup']->oProc->next_record() )
- {
- $log_levels =>
unserialize($GLOBALS['phpgw_setup']->oProc->f('config_value'));
- $log_levels['global_level'] = 'N';
- $GLOBALS['phpgw_setup']->oProc->query("UPDATE
phpgw_config SET config_value ='" . serialize($log_levels) . "' WHERE
config_app = 'phpgwapi' AND config_name = 'log_levels' ");
- }
- else
- {
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
phpgw_config (config_app, config_name, config_value) VALUES
('phpgwapi','log_levels', '" . serialize(array( 'global_level' => 'N', 'module'
=> array(), 'user' => array())) ."')");
- }
-//--
-
-
-//-- phpgw_acl_location : new table due to change in pk
-
-
$GLOBALS['phpgw_setup']->oProc->RenameTable('phpgw_acl_location','phpgw_acl_location_old');
-
-
$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_acl_location',array
- (
- 'fd' => array
- (
- 'id' => array('type' => 'auto','precision' =>
'4','nullable' => False),
- 'app_id' => array('type' => 'int','precision'
=> '4','nullable' => False),
- 'name' => array('type' => 'varchar','precision'
=> '50','nullable' => False),
- 'descr' => array('type' =>
'varchar','precision' => '100','nullable' => False),
- 'allow_grant' => array('type' =>
'int','precision' => '2','nullable' => True),
- 'allow_c_attrib' => array('type' =>
'int','precision' => '2','nullable' => True),
- 'c_attrib_table' => array('type' =>
'varchar','precision' => '25','nullable' => True)
- ),
- 'pk' => array('id'),
- 'fk' => array(),
- 'ix' => array(),
- 'uc' => array()
- ));
-
-// add records
-
- $location = array();
- $GLOBALS['phpgw_setup']->oProc->query("SELECT
phpgw_acl_location_old.*,phpgw_applications.app_id FROM phpgw_acl_location_old
$GLOBALS['phpgw_setup']->oProc->m_odb->join phpgw_applications ON
phpgw_acl_location_old.appname = phpgw_applications.app_name");
- while ( $GLOBALS['phpgw_setup']->oProc->next_record() )
- {
- $location[]=array
- (
- 'app_id' =>
$GLOBALS['phpgw_setup']->oProc->f('app_id'),
- 'name' =>
$GLOBALS['phpgw_setup']->oProc->f('id'),
- 'descr' =>
$GLOBALS['phpgw_setup']->oProc->f('descr'),
- 'allow_grant' =>
$GLOBALS['phpgw_setup']->oProc->f('allow_grant'),
- 'allow_c_attrib' =>
$GLOBALS['phpgw_setup']->oProc->f('allow_c_attrib'),
- 'c_attrib_table' =>
$GLOBALS['phpgw_setup']->oProc->f('c_attrib_table'),
- );
- }
-
- foreach ($location as $entry)
- {
- $GLOBALS['phpgw_setup']->oProc->query('INSERT INTO
phpgw_acl_location (' . implode(',',array_keys($entry)) . ') VALUES (' .
$GLOBALS['phpgw_setup']->oProc->validate_insert(array_values($entry)) . ')');
- }
-
- unset($location);
-
-
$GLOBALS['phpgw_setup']->oProc->DropTable('fphpgw_acl_location_old');
-//-------------------
-
-
-
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_acl','acl_app_id',array
- (
- 'type' => 'int',
- 'precision' => '4',
- 'nullable' => True
- ));
-
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_acl','acl_location_id',array
- (
- 'type' => 'int',
- 'precision' => '4',
- 'nullable' => True
- ));
-
- $GLOBALS['phpgw_setup']->oProc->query("SELECT
phpgw_acl.acl_appname, phpgw_applications.app_id FROM phpgw_acl
$GLOBALS['phpgw_setup']->oProc->m_odb->join phpgw_applications ON
phpgw_acl.acl_appname = phpgw_applications.app_name GROUP BY
phpgw_acl.acl_appname");
- while ( $GLOBALS['phpgw_setup']->oProc->next_record() )
- {
- $app[]=array
- (
- 'app_id' =>
$GLOBALS['phpgw_setup']->oProc->f('app_id'),
- 'acl_appname' =>
$GLOBALS['phpgw_setup']->oProc->f('acl_appname')
- );
- }
-
- foreach ($app as $entry)
- {
- $GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_acl
SET acl_app_id ='" $entry['app_id'] . "' WHERE acl_appname = '" .
$entry['acl_appname'] . "'");
- }
-
- unset($app);
-
$GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_acl',null,'acl_appname');
-
-
- $location = array();
- $GLOBALS['phpgw_setup']->oProc->query("SELECT
phpgw_acl.acl_location, phpgw_acl_location.id FROM phpgw_acl
$GLOBALS['phpgw_setup']->oProc->m_odb->join phpgw_acl_location ON
phpgw_acl.acl_location = phpgw_acl_location.name GROUP BY
phpgw_acl.acl_location");
- while ( $GLOBALS['phpgw_setup']->oProc->next_record() )
- {
- $location[]=array
- (
- 'location_id' =>
$GLOBALS['phpgw_setup']->oProc->f('id'),
- 'acl_location' =>
$GLOBALS['phpgw_setup']->oProc->f('acl_location')
- );
- }
-
- foreach ($app as $entry)
- {
- $GLOBALS['phpgw_setup']->oProc->query("UPDATE phpgw_acl
SET acl_location_id ='" $entry['location_id'] . "' WHERE acl_location = '" .
$entry['acl_location'] . "'");
- }
-
- unset($location);
-
-
$GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_acl',null,'acl_location');
-
-//---------- history_log
-
-
-
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_history_log','history_app_id',array
- (
- 'type' => 'int',
- 'precision' => '4',
- 'nullable' => True
- ));
-
$GLOBALS['phpgw_setup']->oProc->AddColumn('phpgw_history_log','history_location_id',array
- (
- 'type' => 'int',
- 'precision' => '4',
- 'nullable' => True
- ));
-
- $GLOBALS['phpgw_setup']->oProc->query("SELECT
phpgw_history_log.history_appname, phpgw_applications.app_id FROM
phpgw_history_log $GLOBALS['phpgw_setup']->oProc->m_odb->join
phpgw_applications ON phpgw_acl.history_appname = phpgw_applications.app_name
GROUP BY history_appname");
- while ( $GLOBALS['phpgw_setup']->oProc->next_record() )
- {
- $app[]=array
- (
- 'app_id'
=> $GLOBALS['phpgw_setup']->oProc->f('app_id'),
- 'history_appname' =>
$GLOBALS['phpgw_setup']->oProc->f('history_appname')
- );
- }
-
- foreach ( $app as $entry )
- {
- $GLOBALS['phpgw_setup']->oProc->query("UPDATE
phpgw_history_log SET history_app_id ='" $entry['app_id'] . "' WHERE
history_appname = '" . $entry['history_appname'] . "'");
- }
-
- unset($app);
-
$GLOBALS['phpgw_setup']->oProc->DropColumn('phpgw_history_log',null,'history_appname');
-
-
-//-------------interlink
-
-
-
$GLOBALS['phpgw_setup']->oProc->CreateTable('phpgw_interlink',array
- (
- 'fd' => array
- (
- 'interlink_id' => array('type' =>
'auto','precision' => '4','nullable' => False),
- 'location1_id' => array('type' =>
'int','precision' => '4','nullable' => False),
- 'location1_item_id' => array('type' =>
'int','precision' => '4','nullable' => False),
- 'location2_id' => array('type' =>
'int','precision' => '4','nullable' => False),
- 'location2_item_id' => array('type' =>
'int','precision' => '4','nullable' => False),
- 'is_private' => array('type' =>
'int','precision' => '2','nullable' => False),
- 'account_id' => array('type' =>
'int','precision' => '4','nullable' => False),
- 'entry_date' => array('type' =>
'int','precision' => '4','nullable' => False),
- 'start_date' => array('type' =>
'int','precision' => '4','nullable' => False),
- 'end_date' => array('type'
=> 'int','precision' => '4','nullable' => False),
- ),
- 'pk' => array('interlink_id'), // not sure about the pk
- 'fk' => array(),
- 'ix' => array(),
- 'uc' => array()
- ));
-
-// TODO:
-//# phpgw_cust_attribute
-//# phpgw_cust_choice
-//# phpgw_cust_function
-
if($GLOBALS['phpgw_setup']->oProc->m_odb->transaction_commit())
{
$GLOBALS['setup_info']['phpgwapi']['currentver'] =
'0.9.17.514';
return $GLOBALS['setup_info']['phpgwapi']['currentver'];
}
}
-*/
-?>
Added: trunk/phpgwapi/templates/probusiness/images/logo.png
===================================================================
(Binary files differ)
Property changes on: trunk/phpgwapi/templates/probusiness/images/logo.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] [18471] more stuff missing from the merge,
Dave Hall <=