[21007] Fix: sync latest from official trunk on varables 4580:4682
Sigurd Nes <[email protected]> Sat, 30 Jan 2010 17:13:27 +0000
| Newsgroups | gmane.comp.web.phpgroupware.cvs |
|---|---|
| Message-ID | <[email protected]> |
Revision: 21007
http://svn.sv.gnu.org/viewvc/?view=rev&root=phpgroupware&revision=21007
Author: sigurdne
Date: 2010-01-30 17:13:27 +0000 (Sat, 30 Jan 2010)
Log Message:
-----------
Fix: sync latest from official trunk on varables 4580:4682
Modified Paths:
--------------
people/sigurdne/modules/phpgwapi/trunk/inc/class.Template.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/class.acl.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/class.http_svn_client.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/class.net_http_client.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/class.nextmatchs.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/class.sessions.inc.php
people/sigurdne/modules/phpgwapi/trunk/inc/class.sql_entity.inc.php
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/class.Template.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/class.Template.inc.php 2010-01-30 17:10:52 UTC (rev 21006)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/class.Template.inc.php 2010-01-30 17:13:27 UTC (rev 21007)
@@ -422,7 +422,7 @@
}
} else {
reset($varname);
- while (list($k, $v) = each($varname)) {
+ while (list(, $v) = each($varname)) {
if (!empty($v)) {
if ($this->debug & 1) {
printf("<b>clear_var:</b> (with array) <b>%s</b><br>\n", $v);
@@ -464,7 +464,7 @@
}
} else {
reset($varname);
- while (list($k, $v) = each($varname)) {
+ while (list(, $v) = each($varname)) {
if (!empty($v)) {
if ($this->debug & 1) {
printf("<b>unset_var:</b> (with array) <b>%s</b><br>\n", $v);
@@ -660,7 +660,7 @@
echo "<p><b>get_vars:</b> constructing array of vars...</p>\n";
}
reset($this->varkeys);
- while (list($k, $v) = each($this->varkeys)) {
+ while (list($k, ) = each($this->varkeys)) {
$result[$k] = $this->get_var($k);
}
return $result;
@@ -698,7 +698,7 @@
return $str;
} else {
reset($varname);
- while (list($k, $v) = each($varname)) {
+ while (list(, $v) = each($varname)) {
if (isset($this->varvals[$v])) {
$str = $this->varvals[$v];
} else {
@@ -745,7 +745,7 @@
}
reset($m);
- while (list($k, $v) = each($m)) {
+ while (list(, $v) = each($m)) {
if (!isset($this->varkeys[$v])) {
if ($this->debug & 4) {
echo "<p><b>get_undefined:</b> undefined: $v</p>\n";
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/class.acl.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/class.acl.inc.php 2010-01-30 17:10:52 UTC (rev 21006)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/class.acl.inc.php 2010-01-30 17:13:27 UTC (rev 21007)
@@ -752,9 +752,6 @@
$this->_read_repository($account_type, $app_id, $location_id);
}
-
-
- // $count = (isset($this->_data[$this->_account_id])?count($this->_data[$this->_account_id]):0);
$rights = 0;
if(isset($this->_data[$this->_account_id][$app_id][$location_id]) && is_array($this->_data[$this->_account_id][$app_id][$location_id]))
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/class.http_svn_client.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/class.http_svn_client.inc.php 2010-01-30 17:10:52 UTC (rev 21006)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/class.http_svn_client.inc.php 2010-01-30 17:13:27 UTC (rev 21007)
@@ -247,7 +247,7 @@
$numofentry=0;
$rjournal=array();
- while(list ($num, $entry_journal) = each ($journal))
+ while(list (, $entry_journal) = each ($journal))
{
++$numofentry;
$rjournal[]=$entry_journal;
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/class.net_http_client.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/class.net_http_client.inc.php 2010-01-30 17:10:52 UTC (rev 21006)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/class.net_http_client.inc.php 2010-01-30 17:13:27 UTC (rev 21007)
@@ -789,7 +789,7 @@
$counter = 0;
socket_set_blocking( $this->socket, true );
socket_set_timeout($this->socket,2);
- $ts1=time();
+ //$ts1=time();
do{
$status = socket_get_status( $this->socket );
/* if( $this->debug & DBGSOCK )
@@ -802,7 +802,7 @@
$buffer = @fread( $this->socket, $status['unread_bytes'] );
$counter = 0;
} else {
- $ts=time();
+ //$ts=time();
$buffer = @fread( $this->socket, 1024 );
sleep(0.1);
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/class.nextmatchs.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/class.nextmatchs.inc.php 2010-01-30 17:10:52 UTC (rev 21006)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/class.nextmatchs.inc.php 2010-01-30 17:13:27 UTC (rev 21007)
@@ -379,7 +379,7 @@
{
list($filter,$qfield,$start,$order,$sort,$query) = $this->_get_var();
- $start = $localstart;
+ //$start = $localstart;
$var = array(
'form_action' => ($this->action ? $this->page($extra) : $GLOBALS['phpgw']->link($sn, $extra)),
'filter_value' => $filter,
@@ -405,7 +405,7 @@
{
list($filter,$qfield,$start,$order,$sort,$query) = $this->_get_var();
- $start = $localstart;
+ //$start = $localstart;
$cats = createObject('phpgwapi.categories');
$var = array(
'form_action' => ($this->action?$this->page($extra):$GLOBALS['phpgw']->link($sn, $extra)),
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/class.sessions.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/class.sessions.inc.php 2010-01-30 17:10:52 UTC (rev 21006)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/class.sessions.inc.php 2010-01-30 17:13:27 UTC (rev 21007)
@@ -232,7 +232,7 @@
$now = time();
- $lid_parts = $this->_set_login($login);
+ $this->_set_login($login);
$user_ip = $this->_get_user_ip();
if ( $this->_login_blocked($login, $this->_get_user_ip()) )
@@ -1194,7 +1194,7 @@
{
$GLOBALS['phpgw']->log->message(array(
'text' => 'W-VerifySession, the domains %1 and %2 don\'t match',
- 'p1' => $userid_array[1],
+ 'p1' => $this->_account_domain,
'p2' => $GLOBALS['phpgw_info']['user']['domain'],
'line' => __LINE__,
'file' => __FILE__
Modified: people/sigurdne/modules/phpgwapi/trunk/inc/class.sql_entity.inc.php
===================================================================
--- people/sigurdne/modules/phpgwapi/trunk/inc/class.sql_entity.inc.php 2010-01-30 17:10:52 UTC (rev 21006)
+++ people/sigurdne/modules/phpgwapi/trunk/inc/class.sql_entity.inc.php 2010-01-30 17:13:27 UTC (rev 21007)
@@ -491,7 +491,7 @@
array_walk($this->inserts[$index]['data'],array(&$this,'set_fields_insert'),$index);
reset($this->inserts[$index]['data']);
array_walk($field_to_prototype,array(&$this,'set_field_inserts_prototyped'),$index);
- $inserts[$index] = $this->insert($idx);
+ $inserts[$index] = $this->insert($index);
}
return $inserts;
}