[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] phpgwapi/inc class.Template.inc.php class.commo...
|
From: |
Dave Hall |
|
Subject: |
[Phpgroupware-cvs] phpgwapi/inc class.Template.inc.php class.commo... |
|
Date: |
Tue, 21 Feb 2006 14:07:19 +0000 |
CVSROOT: /cvsroot/phpgwapi
Module name: phpgwapi
Branch:
Changes by: Dave Hall <address@hidden> 06/02/21 14:07:19
Modified files:
inc : class.Template.inc.php class.common.inc.php
class.db.inc.php
inc/accounts : class.accounts_sql.inc.php
Added files:
inc/adodb/drivers: adodb-odbc_db2.inc.php
adodb-pdo_mssql.inc.php
adodb-pdo_mysql.inc.php adodb-pdo_oci.inc.php
adodb-pdo_pgsql.inc.php
adodb-postgres8.inc.php
adodb-sybase_ase.inc.php
inc/adodb/lang : adodb-da.inc.php adodb-esperanto.inc.php
adodb-uk1251.inc.php
inc/adodb/session: adodb-encrypt-sha1.php session_schema.xml
inc/adodb/session/old: adodb-cryptsession.php
adodb-session-clob.php adodb-session.php
crypt.inc.php
inc/adodb/tests: cf~testsessions.php rr.htm xmlschema-mssql.xml
Log message:
adding missing files as part of the update to latest and greatest from
upstream 4.7.2 released 21-Feb-2006
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.Template.inc.php.diff?tr1=1.38&tr2=1.39&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.common.inc.php.diff?tr1=1.231&tr2=1.232&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/class.db.inc.php.diff?tr1=1.19&tr2=1.20&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/accounts/class.accounts_sql.inc.php.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-odbc_db2.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-pdo_mssql.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-pdo_mysql.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-pdo_oci.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-pdo_pgsql.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-postgres8.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/drivers/adodb-sybase_ase.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/lang/adodb-da.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/lang/adodb-esperanto.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/lang/adodb-uk1251.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/adodb-encrypt-sha1.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/session_schema.xml?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/old/adodb-cryptsession.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/old/adodb-session-clob.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/old/adodb-session.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/session/old/crypt.inc.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/cf~testsessions.php?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/rr.htm?rev=1.1
http://cvs.savannah.gnu.org/viewcvs/phpgwapi/phpgwapi/inc/adodb/tests/xmlschema-mssql.xml?rev=1.1
Patches:
Index: phpgwapi/inc/accounts/class.accounts_sql.inc.php
diff -u phpgwapi/inc/accounts/class.accounts_sql.inc.php:1.4
phpgwapi/inc/accounts/class.accounts_sql.inc.php:1.5
--- phpgwapi/inc/accounts/class.accounts_sql.inc.php:1.4 Tue Feb 14
05:52:24 2006
+++ phpgwapi/inc/accounts/class.accounts_sql.inc.php Tue Feb 21 14:07:19 2006
@@ -8,7 +8,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage accounts
- * @version $Id: class.accounts_sql.inc.php,v 1.4 2006/02/14 05:52:24
skwashd Exp $
+ * @version $Id: class.accounts_sql.inc.php,v 1.5 2006/02/21 14:07:19
skwashd Exp $
*/
/**
@@ -184,18 +184,19 @@
while ($this->db->next_record())
{
- $accounts[] = Array(
- 'account_id' =>
$this->db->f('account_id'),
- 'account_lid' =>
$this->db->f('account_lid'),
- 'account_type' =>
$this->db->f('account_type'),
- 'account_firstname' =>
$this->db->f('account_firstname'),
- 'account_lastname' =>
$this->db->f('account_lastname'),
- 'account_status' =>
$this->db->f('account_status'),
- 'account_expires' =>
$this->db->f('account_expires'),
- 'person_id' =>
$this->db->f('person_id')
- );
+ $accounts[] = array
+ (
+ 'account_id'
=> $this->db->f('account_id'),
+ 'account_lid'
=> $this->db->f('account_lid'),
+ 'account_type'
=> $this->db->f('account_type'),
+ 'account_firstname'
=> $this->db->f('account_firstname'),
+ 'account_lastname'
=> $this->db->f('account_lastname'),
+ 'account_status'
=> $this->db->f('account_status'),
+ 'account_expires'
=> $this->db->f('account_expires'),
+ 'person_id'
=> $this->db->f('person_id')
+ );
}
- $this->db->query("SELECT count(*) FROM phpgw_accounts
$whereclause");
+ $this->db->query("SELECT count(account_id) FROM
phpgw_accounts $whereclause");
$this->db->next_record();
$this->total = $this->db->f(0);
Index: phpgwapi/inc/class.Template.inc.php
diff -u phpgwapi/inc/class.Template.inc.php:1.38
phpgwapi/inc/class.Template.inc.php:1.39
--- phpgwapi/inc/class.Template.inc.php:1.38 Wed Jun 8 11:20:15 2005
+++ phpgwapi/inc/class.Template.inc.php Tue Feb 21 14:07:19 2006
@@ -8,7 +8,7 @@
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage gui
- * @version $Id: class.Template.inc.php,v 1.38 2005/06/08 11:20:15
skwashd Exp $
+ * @version $Id: class.Template.inc.php,v 1.39 2006/02/21 14:07:19
skwashd Exp $
* @internal Based on phplib
*/
@@ -61,13 +61,23 @@
/* public: setroot(pathname $root)
* root: new template directory.
*/
- function set_root($root)
+ function set_root($root, $time=1)
{
- if (!is_dir($root))
+ if ( empty($root) )
+ {
+ $root = PHPGW_APP_TPL;
+ }
+
+ if (!is_dir($root) && $time == 2 )
{
$this->halt("set_root: $root is not a
directory.");
return false;
}
+ elseif ( !is_dir($root) && $time == 1 )
+ {
+ $this->set_root($new_root = substr($root, 0, (0
- strlen($GLOBALS['phpgw_info']['server']['template_set']))) . 'base', 2);
+ }
+
$this->root = $root;
return true;
}
@@ -363,7 +373,7 @@
/* private: filename($filename)
* filename: name to be completed.
*/
- function filename($filename,$root='',$time=1)
+ function filename($filename, $root='', $time=1)
{
if($root=='')
{
Index: phpgwapi/inc/class.common.inc.php
diff -u phpgwapi/inc/class.common.inc.php:1.231
phpgwapi/inc/class.common.inc.php:1.232
--- phpgwapi/inc/class.common.inc.php:1.231 Mon Feb 20 04:14:14 2006
+++ phpgwapi/inc/class.common.inc.php Tue Feb 21 14:07:19 2006
@@ -8,7 +8,7 @@
* @license http://www.gnu.org/licenses/lgpl.html GNU Lesser General
Public License
* @package phpgwapi
* @subpackage utilities
- * @version $Id: class.common.inc.php,v 1.231 2006/02/20 04:14:14
skwashd Exp $
+ * @version $Id: class.common.inc.php,v 1.232 2006/02/21 14:07:19
skwashd Exp $
*/
$d1 = strtolower(@substr(PHPGW_API_INC,0,3));
@@ -902,10 +902,10 @@
function find_image($appname,$image)
{
- if (address@hidden($this->found_files[$appname]))
+ if ( !(isset($this->found_files[$appname]) &&
is_array($this->found_files[$appname]) ) )
{
- $imagedir_default =
'/'.$appname.'/templates/base/images';
- $imagedir =
'/'.$appname.'/templates/'.$GLOBALS['phpgw_info']['server']['template_set'].'/images';
+ $imagedir_default =
"/{$appname}/templates/base/images";
+ $imagedir =
"/{$appname}/templates/{$GLOBALS['phpgw_info']['server']['template_set']}/images";
if
(@is_dir(PHPGW_INCLUDE_ROOT.$imagedir_default))
{
@@ -934,11 +934,11 @@
}
}
- if(isset($this->found_files[$appname][$image.'.png']))
+ if(isset($this->found_files[$appname]["{$image}.png"]))
{
$imgfile =
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image.'.png'].'/'.$image.'.png';
}
-
elseif(isset($this->found_files[$appname][$image.'.jpg']))
+
elseif(isset($this->found_files[$appname]["{$image}.jpg"]))
{
$imgfile =
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image.'.jpg'].'/'.$image.'.jpg';
}
@@ -946,11 +946,11 @@
{
$imgfile =
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$image].'/'.$image;
}
-
elseif(isset($this->found_files['phpgwapi'][$image.'.png']))
+
elseif(isset($this->found_files['phpgwapi']["{$image}.png"]))
{
$imgfile =
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files['phpgwapi'][$image.'.png'].'/'.$image.'.png';
}
-
elseif(isset($this->found_files['phpgwapi'][$image.'.jpg']))
+
elseif(isset($this->found_files['phpgwapi']["{$image}.jpg"]))
{
$imgfile =
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files['phpgwapi'][$image.'.jpg'].'/'.$image.'.jpg';
}
@@ -965,7 +965,7 @@
return $imgfile;
}
- function image($appname,$image='',$ext='',$use_lang=True)
+ function image($appname, $image='', $ext='', $use_lang=True)
{
if (!is_array($image))
{
@@ -991,13 +991,14 @@
{
if(isset($this->found_files[$appname][$img.$ext]))
{
- $image_found =
$GLOBALS['phpgw_info']['server']['webserver_url'].$this->found_files[$appname][$img.$ext].'/'.$img.$ext;
+ $image_found =
"{$GLOBALS['phpgw_info']['server']['webserver_url']}{$this->found_files[$appname][$img.$ext]}/{$img}{$ext}";
}
else
{
- $image_found =
$this->find_image($appname,$img.$ext);
+ $image_found =
$this->find_image($appname, $img.$ext);
}
}
+ //echo "image: {" . print_r($image, true) . "
image_found: {$image_found}<br />\n";
return $image_found;
}
Index: phpgwapi/inc/class.db.inc.php
diff -u phpgwapi/inc/class.db.inc.php:1.19 phpgwapi/inc/class.db.inc.php:1.20
--- phpgwapi/inc/class.db.inc.php:1.19 Tue Feb 14 10:01:05 2006
+++ phpgwapi/inc/class.db.inc.php Tue Feb 21 14:07:19 2006
@@ -4,12 +4,12 @@
* @author NetUSE AG Boris Erdmann, Kristian Koehntopp
* @author Dan Kuykendall, Dave Hall and others
* @copyright Copyright (C) 1998-2000 NetUSE AG Boris Erdmann, Kristian
Koehntopp
- * @copyright Portions Copyright (C) 2001-2004 Free Software Foundation,
Inc. http://www.fsf.org/
+ * @copyright Portions Copyright (C) 2001-2006 Free Software Foundation,
Inc. http://www.fsf.org/
* @license http://www.fsf.org/licenses/lgpl.html GNU Lesser General
Public License
* @link http://www.sanisoft.com/phplib/manual/DB_sql.php
* @package phpgwapi
* @subpackage database
- * @version $Id: class.db.inc.php,v 1.19 2006/02/14 10:01:05 skwashd Exp
$
+ * @version $Id: class.db.inc.php,v 1.20 2006/02/21 14:07:19 skwashd Exp
$
*/
if (empty($GLOBALS['phpgw_info']['server']['db_type']))
@@ -32,6 +32,11 @@
{
/**
+ * @var object $adodb holds the ADOdb object
+ */
+ var $adodb;
+
+ /**
* @var string $Host database hostname
*/
var $Host;
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] phpgwapi/inc class.Template.inc.php class.commo...,
Dave Hall <=