|
| From: | Miles Lott <address@hidden> |
| Subject: | [Phpgroupware-cvs] CVS: phpgwapi/inc class.setup_process.inc.php,1.3,1.4 |
| Date: | Mon, 04 Mar 2002 02:18:49 -0500 |
Update of /cvsroot/phpgroupware/phpgwapi/inc
In directory subversions:/tmp/cvs-serv10143/phpgwapi/inc
Modified Files:
class.setup_process.inc.php
Log Message:
Use only the phpgw_setup->oProc object
Index: class.setup_process.inc.php
===================================================================
RCS file: /cvsroot/phpgroupware/phpgwapi/inc/class.setup_process.inc.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** class.setup_process.inc.php 4 Mar 2002 05:00:08 -0000 1.3
--- class.setup_process.inc.php 4 Mar 2002 07:18:46 -0000 1.4
***************
*** 37,43 ****
function init_process()
{
! $ConfigDomain =
$GLOBALS['HTTP_COOKIE_VARS']['ConfigDomain'] ?
$GLOBALS['HTTP_COOKIE_VARS']['ConfigDomain'] :
$GLOBALS['HTTP_POST_VARS']['ConfigDomain'];
$phpgw_domain = $GLOBALS['phpgw_domain'];
- $phpgw_info = $GLOBALS['phpgw_info'];
$GLOBALS['phpgw_setup']->oProc =
CreateObject('phpgwapi.schema_proc',$phpgw_domain[$ConfigDomain]['db_type']);
--- 37,42 ----
function init_process()
{
! $ConfigDomain =
get_var('ConfigDomain',array('COOKIE','POST'));
$phpgw_domain = $GLOBALS['phpgw_domain'];
$GLOBALS['phpgw_setup']->oProc =
CreateObject('phpgwapi.schema_proc',$phpgw_domain[$ConfigDomain]['db_type']);
***************
*** 49,54 ****
$GLOBALS['phpgw_setup']->oProc->m_odb->Halt_On_Error =
'report';
$GLOBALS['phpgw_setup']->oProc->m_odb->connect();
- /* Legacy - update table scripts */
- $this->oProc = $GLOBALS['phpgw_setup']->oProc;
}
--- 48,51 ----
***************
*** 63,67 ****
function
pass($setup_info,$method='new',$DEBUG=False,$force_en=False)
{
! if (!$method)
{
return False;
--- 60,64 ----
function
pass($setup_info,$method='new',$DEBUG=False,$force_en=False)
{
! if(!$method)
{
return False;
***************
*** 78,85 ****
$pass_string = implode (':', $pass);
$passing_string = implode (':', $passing);
! while ($pass_string != $passing_string)
{
$passing = array();
! if ($DEBUG) { echo '<br>process->pass(): #' .
$i . ' for ' . $method . ' processing' . "\n"; }
/* Check current versions and dependencies */
$setup_info =
$GLOBALS['phpgw_setup']->detection->get_db_versions($setup_info);
--- 75,82 ----
$pass_string = implode (':', $pass);
$passing_string = implode (':', $passing);
! while($pass_string != $passing_string)
{
$passing = array();
! if($DEBUG) { echo '<br>process->pass(): #' . $i
. ' for ' . $method . ' processing' . "\n"; }
/* Check current versions and dependencies */
$setup_info =
$GLOBALS['phpgw_setup']->detection->get_db_versions($setup_info);
***************
*** 92,98 ****
while(list($key,$value) = @each($setup_info))
{
! if (($value['name'] != 'phpgwapi') &&
($value['status'] == 'U'))
{
! if (
($passed[$value['name']]['status'] != 'F') &&
($passed[$value['name']]['status'] != 'C') )
{
$pass[$value['name']] =
$setup_info[$value['name']];
--- 89,95 ----
while(list($key,$value) = @each($setup_info))
{
! if(($value['name'] != 'phpgwapi') &&
($value['status'] == 'U'))
{
!
if(($passed[$value['name']]['status'] != 'F') &&
($passed[$value['name']]['status'] != 'C'))
{
$pass[$value['name']] =
$setup_info[$value['name']];
***************
*** 135,159 ****
{
$passed[$value['name']] =
$passing[$value['name']];
! if ($DEBUG) { echo
'<br>process->pass(): '.$passed[$value['name']]['name'] . ' install
completed'."\n"; }
}
elseif($value['status'] == 'F')
{
$setup_info[$value['name']] =
$passing[$value['name']];
! if ($DEBUG) { echo
'<br>process->pass(): '.$setup_info[$value['name']]['name'] . ' install
failed'."\n"; }
}
elseif($value['status'] == 'D')
{
$pass[$value['name']] =
$setup_info[$value['name']];
! if ($DEBUG) { echo
'<br>process->pass(): '.$pass[$value['name']]['name'] . ' fails dependency
check on this pass'."\n"; }
}
else
{
$tmp =
$passing[$value['name']]['name'];
! if ($DEBUG) { echo
'<br>process->pass(): '.$tmp . ' skipped on this pass'."\n"; }
}
}
$i++;
! if ($i == 20) /* Then oops it broke */
{
echo '<br>Setup failure: excess looping
in process->pass():'."\n";
--- 132,156 ----
{
$passed[$value['name']] =
$passing[$value['name']];
! if($DEBUG) { echo
'<br>process->pass(): '.$passed[$value['name']]['name'] . ' install
completed'."\n"; }
}
elseif($value['status'] == 'F')
{
$setup_info[$value['name']] =
$passing[$value['name']];
! if($DEBUG) { echo
'<br>process->pass(): '.$setup_info[$value['name']]['name'] . ' install
failed'."\n"; }
}
elseif($value['status'] == 'D')
{
$pass[$value['name']] =
$setup_info[$value['name']];
! if($DEBUG) { echo
'<br>process->pass(): '.$pass[$value['name']]['name'] . ' fails dependency
check on this pass'."\n"; }
}
else
{
$tmp =
$passing[$value['name']]['name'];
! if($DEBUG) { echo
'<br>process->pass(): '.$tmp . ' skipped on this pass'."\n"; }
}
}
$i++;
! if($i == 20) /* Then oops it broke */
{
echo '<br>Setup failure: excess looping
in process->pass():'."\n";
***************
*** 185,189 ****
function droptables($setup_info,$DEBUG=False)
{
! if (!$GLOBALS['phpgw_setup']->oProc)
{
$this->init_process();
--- 182,186 ----
function droptables($setup_info,$DEBUG=False)
{
! if(address@hidden'phpgw_setup']->oProc)
{
$this->init_process();
***************
*** 199,212 ****
@reset($setup_info);
! while (list($key,$null) = @each($setup_info))
{
! if ($setup_info[$key]['tables'])
{
! while (list($a,$table) =
@each($setup_info[$key]['tables']))
{
//echo $table;
! if (in_array($table,$tables))
{
! if ($DEBUG){ echo
'<br>process->droptables(): Dropping :'. $setup_info[$key]['name'] . ' table: '
. $table; }
$GLOBALS['phpgw_setup']->oProc->DropTable($table);
// Update the array
values for return below
--- 196,209 ----
@reset($setup_info);
! while(list($key,$null) = @each($setup_info))
{
! if($setup_info[$key]['tables'])
{
! while(list($a,$table) =
@each($setup_info[$key]['tables']))
{
//echo $table;
! if(in_array($table,$tables))
{
! if($DEBUG){ echo
'<br>process->droptables(): Dropping :'. $setup_info[$key]['name'] . ' table: '
. $table; }
$GLOBALS['phpgw_setup']->oProc->DropTable($table);
// Update the array
values for return below
***************
*** 229,233 ****
function current($setup_info,$DEBUG=False)
{
! if (!$GLOBALS['phpgw_setup']->oProc)
{
$this->init_process();
--- 226,230 ----
function current($setup_info,$DEBUG=False)
{
! if(address@hidden'phpgw_setup']->oProc)
{
$this->init_process();
***************
*** 236,240 ****
@reset($setup_info);
! while (list($key,$null) = @each($setup_info))
{
$enabled = False;
--- 233,237 ----
@reset($setup_info);
! while(list($key,$null) = @each($setup_info))
{
$enabled = False;
***************
*** 246,250 ****
$appdir = PHPGW_SERVER_ROOT . SEP . $appname .
SEP . 'setup' . SEP;
! if ($setup_info[$key]['tables'] &&
file_exists($appdir.'tables_current.inc.php'))
{
if($DEBUG) { echo
'<br>process->current(): Including: ' . $appdir.'tables_current.inc.php'; }
--- 243,247 ----
$appdir = PHPGW_SERVER_ROOT . SEP . $appname .
SEP . 'setup' . SEP;
! if($setup_info[$key]['tables'] &&
file_exists($appdir.'tables_current.inc.php'))
{
if($DEBUG) { echo
'<br>process->current(): Including: ' . $appdir.'tables_current.inc.php'; }
***************
*** 253,257 ****
if($ret)
{
! if
($GLOBALS['phpgw_setup']->app_registered($appname))
{
$GLOBALS['phpgw_setup']->update_app($appname);
--- 250,254 ----
if($ret)
{
!
if($GLOBALS['phpgw_setup']->app_registered($appname))
{
$GLOBALS['phpgw_setup']->update_app($appname);
***************
*** 281,289 ****
*/
$enabled = 99;
! if ($setup_info[$key]['tables'][0] !=
'')
{
$enabled = False;
}
! if
($GLOBALS['phpgw_setup']->app_registered($appname))
{
$GLOBALS['phpgw_setup']->update_app($appname);
--- 278,286 ----
*/
$enabled = 99;
! if($setup_info[$key]['tables'][0] != '')
{
$enabled = False;
}
!
if($GLOBALS['phpgw_setup']->app_registered($appname))
{
$GLOBALS['phpgw_setup']->update_app($appname);
***************
*** 311,330 ****
function default_records($setup_info,$DEBUG=False)
{
! if (!$GLOBALS['phpgw_setup']->oProc)
{
$this->init_process();
}
$GLOBALS['phpgw_setup']->oProc->m_bDeltaOnly = False;
! $oProc = $GLOBALS['phpgw_setup']->oProc;
@reset($setup_info);
! while (list($key,$null) = @each($setup_info))
{
$appname = $setup_info[$key]['name'];
$appdir = PHPGW_SERVER_ROOT . SEP . $appname .
SEP . 'setup' . SEP;
! if ($setup_info[$key]['tables'] &&
file_exists($appdir.'default_records.inc.php'))
{
! if ($DEBUG)
{
echo
'<br>process->default_records(): Including default records for ' . $appname .
"\n";
--- 308,327 ----
function default_records($setup_info,$DEBUG=False)
{
! if(address@hidden'phpgw_setup']->oProc)
{
$this->init_process();
}
$GLOBALS['phpgw_setup']->oProc->m_bDeltaOnly = False;
! // $oProc = $GLOBALS['phpgw_setup']->oProc;
@reset($setup_info);
! while(list($key,$null) = @each($setup_info))
{
$appname = $setup_info[$key]['name'];
$appdir = PHPGW_SERVER_ROOT . SEP . $appname .
SEP . 'setup' . SEP;
! if($setup_info[$key]['tables'] &&
file_exists($appdir.'default_records.inc.php'))
{
! if($DEBUG)
{
echo
'<br>process->default_records(): Including default records for ' . $appname .
"\n";
***************
*** 349,353 ****
{
@reset($setup_info);
! while (list($key,$null) = @each($setup_info))
{
$appname = $setup_info[$key]['name'];
--- 346,350 ----
{
@reset($setup_info);
! while(list($key,$null) = @each($setup_info))
{
$appname = $setup_info[$key]['name'];
***************
*** 371,375 ****
{
@reset($setup_info);
! while (list($key,$null) = @each($setup_info))
{
$appname = $setup_info[$key]['name'];
--- 368,372 ----
{
@reset($setup_info);
! while(list($key,$null) = @each($setup_info))
{
$appname = $setup_info[$key]['name'];
***************
*** 393,397 ****
{
@reset($setup_info);
! while (list($key,$null) = @each($setup_info))
{
/* Don't upgrade lang files in the middle of an
upgrade */
--- 390,394 ----
{
@reset($setup_info);
! while(list($key,$null) = @each($setup_info))
{
/* Don't upgrade lang files in the middle of an
upgrade */
***************
*** 420,439 ****
function test_data($setup_info,$DEBUG=False)
{
! if (!$GLOBALS['phpgw_setup']->oProc)
{
$this->init_process();
}
$GLOBALS['phpgw_setup']->oProc->m_bDeltaOnly = False;
! $oProc = $GLOBALS['phpgw_setup']->oProc;
@reset($setup_info);
! while (list($key,$null) = @each($setup_info))
{
$appname = $setup_info[$key]['name'];
$appdir = PHPGW_SERVER_ROOT . SEP . $appname .
SEP . 'setup' . SEP;
! if (file_exists($appdir.'test_data.inc.php'))
{
! if ($DEBUG)
{
echo '<br>process->test_data():
Including baseline test data for ' . $appname . "\n";
--- 417,436 ----
function test_data($setup_info,$DEBUG=False)
{
! if(address@hidden'phpgw_setup']->oProc)
{
$this->init_process();
}
$GLOBALS['phpgw_setup']->oProc->m_bDeltaOnly = False;
! // $oProc = $GLOBALS['phpgw_setup']->oProc;
@reset($setup_info);
! while(list($key,$null) = @each($setup_info))
{
$appname = $setup_info[$key]['name'];
$appdir = PHPGW_SERVER_ROOT . SEP . $appname .
SEP . 'setup' . SEP;
! if(file_exists($appdir.'test_data.inc.php'))
{
! if($DEBUG)
{
echo '<br>process->test_data():
Including baseline test data for ' . $appname . "\n";
***************
*** 456,460 ****
function baseline($setup_info,$DEBUG=False)
{
! if (!$GLOBALS['phpgw_setup']->oProc)
{
$this->init_process();
--- 453,457 ----
function baseline($setup_info,$DEBUG=False)
{
! if(address@hidden'phpgw_setup']->oProc)
{
$this->init_process();
***************
*** 462,473 ****
@reset($setup_info);
! while (list($key,$null) = @each($setup_info))
{
$appname = $setup_info[$key]['name'];
$appdir = PHPGW_SERVER_ROOT . SEP . $appname .
SEP . 'setup' . SEP;
! if
(file_exists($appdir.'tables_baseline.inc.php'))
{
! if ($DEBUG)
{
echo '<br>process->baseline():
Including baseline tables for ' . $appname . "\n";
--- 459,470 ----
@reset($setup_info);
! while(list($key,$null) = @each($setup_info))
{
$appname = $setup_info[$key]['name'];
$appdir = PHPGW_SERVER_ROOT . SEP . $appname .
SEP . 'setup' . SEP;
!
if(file_exists($appdir.'tables_baseline.inc.php'))
{
! if($DEBUG)
{
echo '<br>process->baseline():
Including baseline tables for ' . $appname . "\n";
***************
*** 482,486 ****
else
{
! if ($DEBUG)
{
echo '<br>process->baseline():
No baseline tables for ' . $appname . "\n";
--- 479,483 ----
else
{
! if($DEBUG)
{
echo '<br>process->baseline():
No baseline tables for ' . $appname . "\n";
***************
*** 501,505 ****
function upgrade($setup_info,$DEBUG=False)
{
! if (address@hidden'phpgw_setup']->oProc)
{
$this->init_process();
--- 498,502 ----
function upgrade($setup_info,$DEBUG=False)
{
! if(address@hidden'phpgw_setup']->oProc)
{
$this->init_process();
***************
*** 509,518 ****
@reset($setup_info);
! while (list($key,$null) = @each($setup_info))
{
/* Don't try to upgrade an app that is not
installed */
if(!$GLOBALS['phpgw_setup']->app_registered($setup_info[$key]['name']))
{
! if ($DEBUG)
{
echo '<br>process->upgrade():
Application not installed: ' . $appname . "\n";
--- 506,515 ----
@reset($setup_info);
! while(list($key,$null) = @each($setup_info))
{
/* Don't try to upgrade an app that is not
installed */
if(!$GLOBALS['phpgw_setup']->app_registered($setup_info[$key]['name']))
{
! if($DEBUG)
{
echo '<br>process->upgrade():
Application not installed: ' . $appname . "\n";
***************
*** 523,528 ****
/* if upgrade required, or if we are running
again after an upgrade or dependency failure */
! if ($DEBUG) { echo '<br>process->upgrade():
Incoming : appname: '.$setup_info[$key]['name'] . ' status: ' .
$setup_info[$key]['status']; }
! if ($setup_info[$key]['status'] == 'U' ||
$setup_info[$key]['status'] == 'D' ||
$setup_info[$key]['status'] == 'V' ||
--- 520,525 ----
/* if upgrade required, or if we are running
again after an upgrade or dependency failure */
! if($DEBUG) { echo '<br>process->upgrade():
Incoming : appname: '.$setup_info[$key]['name'] . ' status: ' .
$setup_info[$key]['status']; }
! if($setup_info[$key]['status'] == 'U' ||
$setup_info[$key]['status'] == 'D' ||
$setup_info[$key]['status'] == 'V' ||
***************
*** 549,555 ****
// either does not exist anymore, or
the baseline is being lost.
*/
! if ($setup_info[$key]['tables'] &&
file_exists($appdir.'tables_baseline.inc.php'))
{
! if ($DEBUG)
{
echo
'<br>process->baseline(): Including baseline tables for ' . $appname . "\n";
--- 546,552 ----
// either does not exist anymore, or
the baseline is being lost.
*/
! if($setup_info[$key]['tables'] &&
file_exists($appdir.'tables_baseline.inc.php'))
{
! if($DEBUG)
{
echo
'<br>process->baseline(): Including baseline tables for ' . $appname . "\n";
***************
*** 561,565 ****
else
{
! if ($DEBUG)
{
echo
'<br>process->baseline(): No baseline tables for ' . $appname . "\n";
--- 558,562 ----
else
{
! if($DEBUG)
{
echo
'<br>process->baseline(): No baseline tables for ' . $appname . "\n";
***************
*** 569,573 ****
*/
}
! if (file_exists($appdir .
'tables_update.inc.php') && address@hidden>updateincluded[$appname])
{
include ($appdir .
'tables_update.inc.php');
--- 566,570 ----
*/
}
! if(file_exists($appdir .
'tables_update.inc.php') && address@hidden>updateincluded[$appname])
{
include ($appdir .
'tables_update.inc.php');
***************
*** 576,580 ****
/* $test array comes from
update file. It is a list of available upgrade functions */
@reset($test);
! while (list($x,$value) =
@each($test))
{
$currentver =
$setup_info[$key]['currentver'];
--- 573,577 ----
/* $test array comes from
update file. It is a list of available upgrade functions */
@reset($test);
! while(list($x,$value) =
@each($test))
{
$currentver =
$setup_info[$key]['currentver'];
***************
*** 583,587 ****
$function = $appname .
'_upgrade' . ereg_replace("\.", '_', $value);
! if ($DEBUG)
{
echo
'<br>process->upgrade(): appname: ' . $appname;
--- 580,584 ----
$function = $appname .
'_upgrade' . ereg_replace("\.", '_', $value);
! if($DEBUG)
{
echo
'<br>process->upgrade(): appname: ' . $appname;
***************
*** 593,597 ****
}
! if ($value ==
$targetver)
{
$GLOBALS['phpgw_setup']->oProc->m_bDeltaOnly = False;
--- 590,594 ----
}
! if($value == $targetver)
{
$GLOBALS['phpgw_setup']->oProc->m_bDeltaOnly = False;
***************
*** 604,608 ****
$setup_info[$key]['status'] = $appstatus;
$setup_info[$key]['currentver'] = $targetver;
! if
($GLOBALS['phpgw_setup']->app_registered($appname))
{
$GLOBALS['phpgw_setup']->update_app($appname);
--- 601,605 ----
$setup_info[$key]['status'] = $appstatus;
$setup_info[$key]['currentver'] = $targetver;
!
if($GLOBALS['phpgw_setup']->app_registered($appname))
{
$GLOBALS['phpgw_setup']->update_app($appname);
***************
*** 616,630 ****
//break;
}
! elseif (($value ==
$currentver) || !$currentver)
{
/* start
upgrading db in addition to baseline */
$GLOBALS['phpgw_setup']->oProc->m_bDeltaOnly = False;
! if ($DEBUG) {
echo '<br>process->upgrade(): running ' . $function; }
/* run upgrade
function */
$success =
$function();
! if ($success !=
False)
{
$setup_info[$key]['currentver'] = $success;
! if
($DEBUG)
{
echo '<br>process->upgrade(): Upgrade of ' . $appname
--- 613,627 ----
//break;
}
! elseif(($value ==
$currentver) || !$currentver)
{
/* start
upgrading db in addition to baseline */
$GLOBALS['phpgw_setup']->oProc->m_bDeltaOnly = False;
! if($DEBUG) {
echo '<br>process->upgrade(): running ' . $function; }
/* run upgrade
function */
$success =
$function();
! if($success !=
False)
{
$setup_info[$key]['currentver'] = $success;
!
if($DEBUG)
{
echo '<br>process->upgrade(): Upgrade of ' . $appname
***************
*** 669,673 ****
elseif
($GLOBALS['phpgw_setup']->alessthanb($value,$currentver))
{
! if ($DEBUG) {
echo '<br>process->upgrade(): running baseline delta only: ' . $function .
'...'; }
$GLOBALS['phpgw_setup']->oProc->m_bDeltaOnly = True;
$success =
$function();
--- 666,670 ----
elseif
($GLOBALS['phpgw_setup']->alessthanb($value,$currentver))
{
! if($DEBUG) {
echo '<br>process->upgrade(): running baseline delta only: ' . $function .
'...'; }
$GLOBALS['phpgw_setup']->oProc->m_bDeltaOnly = True;
$success =
$function();
***************
*** 681,689 ****
else
{
! if
($setup_info[$appname]['tables'])
{
$appstatus = 'F';
! if ($DEBUG)
{
echo
'<br>process->upgrade(): No table upgrade available for ' . $appname . "\n";
--- 678,686 ----
else
{
!
if($setup_info[$appname]['tables'])
{
$appstatus = 'F';
! if($DEBUG)
{
echo
'<br>process->upgrade(): No table upgrade available for ' . $appname . "\n";
***************
*** 694,698 ****
$setup_info[$key]['currentver'] == $targetver;
$appstatus = 'C';
! if
($GLOBALS['phpgw_setup']->app_registered($appname))
{
$GLOBALS['phpgw_setup']->update_app($appname);
--- 691,695 ----
$setup_info[$key]['currentver'] == $targetver;
$appstatus = 'C';
!
if($GLOBALS['phpgw_setup']->app_registered($appname))
{
$GLOBALS['phpgw_setup']->update_app($appname);
***************
*** 705,709 ****
}
! if ($DEBUG)
{
echo
'<br>process->upgrade(): No table upgrade required for ' . $appname . "\n";
--- 702,706 ----
}
! if($DEBUG)
{
echo
'<br>process->upgrade(): No table upgrade required for ' . $appname . "\n";
***************
*** 715,719 ****
{
$appstatus = 'C';
! if ($DEBUG)
{
echo '<br>process->upgrade():
No upgrade required for ' . $appname . "\n";
--- 712,716 ----
{
$appstatus = 'C';
! if($DEBUG)
{
echo '<br>process->upgrade():
No upgrade required for ' . $appname . "\n";
***************
*** 723,727 ****
/* Done with this app, update status */
$setup_info[$key]['status'] = $appstatus;
! if ($DEBUG)
{
echo '<br>process->upgrade(): Outgoing
: appname: '.$setup_info[$key]['name'] . ' status: ' .
$setup_info[$key]['status'];
--- 720,724 ----
/* Done with this app, update status */
$setup_info[$key]['status'] = $appstatus;
! if($DEBUG)
{
echo '<br>process->upgrade(): Outgoing
: appname: '.$setup_info[$key]['name'] . ' status: ' .
$setup_info[$key]['status'];
***************
*** 739,743 ****
function post_process($tables,$DEBUG=False)
{
! if (!$tables)
{
return False;
--- 736,740 ----
function post_process($tables,$DEBUG=False)
{
! if(!$tables)
{
return False;
***************
*** 745,752 ****
$ret =
$GLOBALS['phpgw_setup']->oProc->GenerateScripts($tables,$DEBUG);
! if ($ret)
{
$oret =
$GLOBALS['phpgw_setup']->oProc->ExecuteScripts($tables,$DEBUG);
! if ($oret)
{
return True;
--- 742,749 ----
$ret =
$GLOBALS['phpgw_setup']->oProc->GenerateScripts($tables,$DEBUG);
! if($ret)
{
$oret =
$GLOBALS['phpgw_setup']->oProc->ExecuteScripts($tables,$DEBUG);
! if($oret)
{
return True;
***************
*** 770,779 ****
function sql_to_array($tablename='')
{
! if (!$tablename)
{
return False;
}
! if (!$GLOBALS['phpgw_setup']->oProc)
{
$this->init_process();
--- 767,776 ----
function sql_to_array($tablename='')
{
! if(!$tablename)
{
return False;
}
! if(!$GLOBALS['phpgw_setup']->oProc)
{
$this->init_process();
***************
*** 782,786 ****
$GLOBALS['phpgw_setup']->oProc->m_oTranslator->_GetColumns($GLOBALS['phpgw_setup']->oProc,
$tablename, $sColumns, $sColumnName);
! while (list($key,$tbldata) = each
($GLOBALS['phpgw_setup']->oProc->m_oTranslator->sCol))
{
$arr .= $tbldata;
--- 779,783 ----
$GLOBALS['phpgw_setup']->oProc->m_oTranslator->_GetColumns($GLOBALS['phpgw_setup']->oProc,
$tablename, $sColumns, $sColumnName);
! while(list($key,$tbldata) =
each($GLOBALS['phpgw_setup']->oProc->m_oTranslator->sCol))
{
$arr .= $tbldata;
| [Prev in Thread] | Current Thread | [Next in Thread] |