|
| From: | Sigurd Nes |
| Subject: | [Fmsystem-commits] [7113] API: fix support for windows and non-pdo-systems |
| Date: | Fri, 11 Mar 2011 23:31:47 +0000 |
Revision: 7113
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=7113
Author: sigurdne
Date: 2011-03-11 23:31:45 +0000 (Fri, 11 Mar 2011)
Log Message:
-----------
API: fix support for windows and non-pdo-systems
Modified Paths:
--------------
trunk/phpgwapi/inc/class.acl.inc.php
trunk/phpgwapi/inc/class.db_adodb.inc.php
trunk/phpgwapi/inc/class.shm.inc.php
Modified: trunk/phpgwapi/inc/class.acl.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.acl.inc.php 2011-03-11 12:46:45 UTC (rev
7112)
+++ trunk/phpgwapi/inc/class.acl.inc.php 2011-03-11 23:31:45 UTC (rev
7113)
@@ -499,37 +499,37 @@
1 => array
(
'value' =>
$acct_id,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
2 => array
(
'value' =>
$rights,
- 'type' =>
PDO::PARAM_INT
+ 'type' =>
1 //PDO::PARAM_INT
),
3 => array
(
'value' =>
$grantor,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
4 => array
(
'value' =>
$mask,
- 'type' =>
PDO::PARAM_INT
+ 'type' =>
1 //PDO::PARAM_INT
),
5 => array
(
'value' =>
$loc_id,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
6 => array
(
'value' => $now,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
7 => array
(
'value' =>
$mod_account,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
)
);
}
@@ -565,37 +565,37 @@
1 => array
(
'value' =>
$_acl_account,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
2 => array
(
'value' => $_acl_rights,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
3 => array
(
'value' =>
$_acl_grantor,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
4 => array
(
'value' => $_acl_type,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
5 => array
(
'value' =>
$_location_id,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
6 => array
(
'value' => $now,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
7 => array
(
'value' => $mod_account,
- 'type' =>
PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
)
);
}
@@ -684,37 +684,37 @@
1 => array
(
'value' =>
$this->_db->f('acl_account'),
- 'type' => PDO::PARAM_INT
+ 'type' => 1 //PDO::PARAM_INT
),
2 => array
(
'value' =>
$this->_db->f('acl_rights'),
- 'type' => PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
3 => array
(
'value' =>
$this->_db->f('acl_grantor'),
- 'type' => PDO::PARAM_INT
+ 'type' => 1 //PDO::PARAM_INT
),
4 => array
(
'value' => (int)
$this->_db->f('acl_type'),
- 'type' => PDO::PARAM_INT
+ 'type' => 1
//PDO::PARAM_INT
),
5 => array
(
'value' =>
$this->_db->f('location_id'),
- 'type' => PDO::PARAM_INT
+ 'type' => 1 //PDO::PARAM_INT
),
6 => array
(
'value' => $now,
- 'type' => PDO::PARAM_INT
+ 'type' => 1 //PDO::PARAM_INT
),
7 => array
(
'value' => $mod_account,
- 'type' => PDO::PARAM_INT
+ 'type' => 1 //PDO::PARAM_INT
)
);
}
Modified: trunk/phpgwapi/inc/class.db_adodb.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.db_adodb.inc.php 2011-03-11 12:46:45 UTC (rev
7112)
+++ trunk/phpgwapi/inc/class.db_adodb.inc.php 2011-03-11 23:31:45 UTC (rev
7113)
@@ -265,7 +265,7 @@
* @param integer $num_rows number of rows to return (optional),
if unset will use
$GLOBALS['phpgw_info']['user']['preferences']['common']['maxmatchs']
* @return integer current query id if sucesful and null if fails
*/
- public function limit_query($Query_String, $offset = -1, $line
= '', $file = '', $num_rows = -1)
+ public function limit_query($Query_String, $offset = -1, $line
= '', $file = '', $num_rows = 0)
{
if ( (int) $num_rows <= 0 )
{
@@ -607,7 +607,7 @@
* @param boolean $upper optional, default False. If $upper is
true, then the table names (array keys) are upper-cased.
* @return array Table meta data
*/
- public function MetaForeignKeys($table = '', $owner=false,
$upper=false)
+ public function MetaForeignKeys($table, $owner=false,
$upper=false)
{
if(!$this->adodb->IsConnected())
{
Modified: trunk/phpgwapi/inc/class.shm.inc.php
===================================================================
--- trunk/phpgwapi/inc/class.shm.inc.php 2011-03-11 12:46:45 UTC (rev
7112)
+++ trunk/phpgwapi/inc/class.shm.inc.php 2011-03-11 23:31:45 UTC (rev
7113)
@@ -70,7 +70,7 @@
if ( !isset($GLOBALS['phpgw_info']['server']['temp_dir'])
||
!is_dir($GLOBALS['phpgw_info']['server']['temp_dir']) )
{
- if ( substr(PHP_OS, 3) == 'WIN' )
+ if ( substr(PHP_OS,0, 3) == 'WIN' )
{
$GLOBALS['phpgw_info']['server']['temp_dir'] =
'c:/temp';
}
| [Prev in Thread] | Current Thread | [Next in Thread] |