extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-04 20:40:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

phpgw_nextid --> egw_nextid

Browse Source
This commit is contained in:
Ralf Becker 2005-11-13 10:13:16 +00:00
parent 1f37f024ca
commit 1b17b82ca8
4 changed files with 42 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
phpgwapi/inc/class.common.inc.php
View File

@ -113,7 +113,6 @@
if($debug) { echo ' - all equal.'; } if($debug) { echo ' - all equal.'; }
} }
// Convert an array into the format needed for the access column.
/** /**
* Convert an array into the format needed for the access column * Convert an array into the format needed for the access column
* *
@ -128,7 +127,7 @@
{ {
if (count($array)) if (count($array))
{ {
while ($t = each($array)) while (($t = each($array)))
{ {
$s .= ',' . $t[1]; $s .= ',' . $t[1];
} }
@ -143,7 +142,7 @@
} }
/** /**
* genrate a unique id, which can be used for syncronisation * generate a unique id, which can be used for syncronisation
* *
* @param string $_appName the appname * @param string $_appName the appname
* @param string $_eventID the id of the content * @param string $_eventID the id of the content
@ -446,36 +445,11 @@
} }
/** /**
* none yet * @deprecated use ACL instead
*
* @param $record ?
* @param $link ?
* @param $label ?
* @param $extravars
*/ */
// This is a depreciated function - use ACL instead (jengo)
function check_owner($record,$link,$label,$extravars = '') function check_owner($record,$link,$label,$extravars = '')
{ {
$this->debug_info[] = 'check_owner() is a depreciated function - use ACL instead'; $this->debug_info[] = 'check_owner() is a depreciated function - use ACL instead';
/*
$s = '<a href="' . $GLOBALS['egw']->link($link,$extravars) . '"> ' . lang($label) . ' </a>';
if (ereg('^[0-9]+$',$record))
{
if ($record != $GLOBALS['egw_info']['user']['account_id'])
{
$s = '&nbsp;';
}
}
else
{
if ($record != $GLOBALS['egw_info']['user']['userid'])
{
$s = '&nbsp';
}
}
return $s;
*/
} }
/** /**
@ -2001,10 +1975,15 @@
echo '</pre>'; echo '</pre>';
} }
// This will return a value for the next id an app/class may need to insert values into ldap. var $nextid_table = 'egw_nextid';
/** /**
* return the next higher value for an integer, and increment it in the db. * Return a value for the next id an app/class may need to insert values into LDAP
* *
* @param string $appname app-name
* @param int $min=0 if != 0 minimum id
* @param int $max=0 if != 0 maximum id allowed, if it would be exceeded we return false
* @return int/boolean the next id or false if $max given and exceeded
*/ */
function next_id($appname,$min=0,$max=0) function next_id($appname,$min=0,$max=0)
{ {
@ -2013,40 +1992,29 @@
return -1; return -1;
} }
$GLOBALS['egw']->db->query("SELECT id FROM phpgw_nextid WHERE appname='".$appname."'",__LINE__,__FILE__); $GLOBALS['egw']->db->select($this->nextid_table,'id',array('appname' => $appname),__LINE__,__FILE__);
while( $GLOBALS['egw']->db->next_record() ) $id = $GLOBALS['egw']->db->next_record() ? $GLOBALS['egw']->db->f('id') : 0;
{
$id = $GLOBALS['egw']->db->f('id');
}
if (empty($id) || !$id) if ($max && $id >= $max)
{
$id = 1;
$GLOBALS['egw']->db->query("INSERT INTO phpgw_nextid (appname,id) VALUES ('".$appname."',".$id.")",__LINE__,__FILE__);
}
elseif($id<$min)
{
$id = $min;
$GLOBALS['egw']->db->query("UPDATE phpgw_nextid SET id=".$id." WHERE appname='".$appname."'",__LINE__,__FILE__);
}
elseif ($max && ($id > $max))
{ {
return False; return False;
} }
else ++$id;
{
$id = $id + 1; if($id < $min) $id = $min;
$GLOBALS['egw']->db->query("UPDATE phpgw_nextid SET id=".$id." WHERE appname='".$appname."'",__LINE__,__FILE__);
} $GLOBALS['egw']->db->insert($this->nextid_table,array('id' => $id),array('appname' => $appname),__LINE__,__FILE__);
return (int)$id; return (int)$id;
} }
// This will return a value for the last id entered, which an app may need to check
// values for ldap.
/** /**
* return the current id in the next_id table for a particular app/class. * Return a value for the last id entered, which an app may need to check values for LDAP
* *
* @param string $appname app-name
* @param int $min=0 if != 0 minimum id
* @param int $max=0 if != 0 maximum id allowed, if it would be exceeded we return false
* @return int current id in the next_id table for a particular app/class or -1 for no app and false if $max is exceeded.
*/ */
function last_id($appname,$min=0,$max=0) function last_id($appname,$min=0,$max=0)
{ {
@ -2055,30 +2023,14 @@
return -1; return -1;
} }
$GLOBALS['egw']->db->query("SELECT id FROM phpgw_nextid WHERE appname='".$appname."'",__LINE__,__FILE__); $GLOBALS['egw']->db->select($this->nextid_table,'id',array('appname' => $appname),__LINE__,__FILE__);
while( $GLOBALS['egw']->db->next_record() ) $id = $GLOBALS['egw']->db->next_record() ? $GLOBALS['egw']->db->f('id') : 0;
{
$id = $GLOBALS['egw']->db->f('id');
}
if (empty($id) || !$id) if (!$id || $id < $min)
{ {
if($min) return $this->next_id($appname,$min,$max);
{
$id = $min;
}
else
{
$id = 1;
}
$GLOBALS['egw']->db->query("INSERT INTO phpgw_nextid (appname,id) VALUES ('".$appname."',".$id.")",__LINE__,__FILE__);
} }
elseif($id<$min) if ($max && $id > $max)
{
$id = $min;
$GLOBALS['egw']->db->query("UPDATE phpgw_nextid SET id=".$id." WHERE appname='".$appname."'",__LINE__,__FILE__);
}
elseif ($max && ($id > $max))
{ {
return False; return False;
} }

4
phpgwapi/setup/setup.inc.php
View File

@ -14,7 +14,7 @@
/* Basic information about this app */ /* Basic information about this app */
$setup_info['phpgwapi']['name'] = 'phpgwapi'; $setup_info['phpgwapi']['name'] = 'phpgwapi';
$setup_info['phpgwapi']['title'] = 'eGroupWare API'; $setup_info['phpgwapi']['title'] = 'eGroupWare API';
$setup_info['phpgwapi']['version'] = '1.0.1.025'; $setup_info['phpgwapi']['version'] = '1.0.1.026';
$setup_info['phpgwapi']['versions']['current_header'] = '1.28'; $setup_info['phpgwapi']['versions']['current_header'] = '1.28';
$setup_info['phpgwapi']['enable'] = 3; $setup_info['phpgwapi']['enable'] = 3;
$setup_info['phpgwapi']['app_order'] = 1; $setup_info['phpgwapi']['app_order'] = 1;
@ -31,7 +31,7 @@
$setup_info['phpgwapi']['tables'][] = 'egw_hooks'; $setup_info['phpgwapi']['tables'][] = 'egw_hooks';
$setup_info['phpgwapi']['tables'][] = 'egw_languages'; $setup_info['phpgwapi']['tables'][] = 'egw_languages';
$setup_info['phpgwapi']['tables'][] = 'egw_lang'; $setup_info['phpgwapi']['tables'][] = 'egw_lang';
$setup_info['phpgwapi']['tables'][] = 'phpgw_nextid'; $setup_info['phpgwapi']['tables'][] = 'egw_nextid';
$setup_info['phpgwapi']['tables'][] = 'egw_categories'; $setup_info['phpgwapi']['tables'][] = 'egw_categories';
$setup_info['phpgwapi']['tables'][] = 'phpgw_addressbook'; $setup_info['phpgwapi']['tables'][] = 'phpgw_addressbook';
$setup_info['phpgwapi']['tables'][] = 'phpgw_addressbook_extra'; $setup_info['phpgwapi']['tables'][] = 'phpgw_addressbook_extra';

6
phpgwapi/setup/tables_current.inc.php
View File

@ -160,15 +160,15 @@
'ix' => array(), 'ix' => array(),
'uc' => array() 'uc' => array()
), ),
'phpgw_nextid' => array( 'egw_nextid' => array(
'fd' => array( 'fd' => array(
'id' => array('type' => 'int','precision' => '4','nullable' => True), 'id' => array('type' => 'int','precision' => '4','nullable' => True),
'appname' => array('type' => 'varchar','precision' => '25','nullable' => False) 'appname' => array('type' => 'varchar','precision' => '25','nullable' => False)
), ),
'pk' => array(), 'pk' => array('appname'),
'fk' => array(), 'fk' => array(),
'ix' => array(), 'ix' => array(),
'uc' => array('appname') 'uc' => array()
), ),
'egw_categories' => array( 'egw_categories' => array(
'fd' => array( 'fd' => array(

9
phpgwapi/setup/tables_update.inc.php
View File

@ -870,4 +870,13 @@
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.025'; return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.025';
} }
$test[] = '1.0.1.025';
function phpgwapi_upgrade1_0_1_025()
{
$GLOBALS['egw_setup']->oProc->RenameTable('phpgw_nextid','egw_nextid');
return $GLOBALS['setup_info']['phpgwapi']['currentver'] = '1.0.1.026';
}
?> ?>