[evolvis-commits] r16854: Use foreach() rather than for(; ; ) to avoid problems with arrays where keys are not contiguous
mirabilos at evolvis.org
mirabilos at evolvis.org
Tue Mar 1 01:44:07 CET 2011
Author: mirabilos
Date: 2011-03-01 01:44:07 +0100 (Tue, 01 Mar 2011)
New Revision: 16854
Modified:
trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php
trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php
Log:
Use foreach() rather than for(;;) to avoid problems with arrays where keys are not contiguous
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php 2011-03-01 00:44:03 UTC (rev 16853)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/Group.class.php 2011-03-01 00:44:07 UTC (rev 16854)
@@ -118,17 +118,17 @@
$fetch = array();
$return = array();
- for ($i=0; $i<count($id_arr); $i++) {
+ foreach ($id_arr as $id) {
+ if (!$id) {
+ continue;
+ }
//
// See if this ID already has been fetched in the cache
//
- if (!$id_arr[$i]) {
- continue;
- }
- if (!isset($GROUP_OBJ["_".$id_arr[$i]."_"])) {
- $fetch[]=$id_arr[$i];
+ if (!isset($GROUP_OBJ["_".$id."_"])) {
+ $fetch[]=$id;
} else {
- $return[] =& $GROUP_OBJ["_".$id_arr[$i]."_"];
+ $return[] =& $GROUP_OBJ["_".$id."_"];
}
}
if (count($fetch) > 0) {
@@ -1464,8 +1464,8 @@
// Remove all the members
//
$members =& $this->getMembers();
- for ($i=0; $i<count($members); $i++) {
- $this->removeUser($members[$i]->getID());
+ foreach ($members as $i) {
+ $this->removeUser($i->getID());
}
// Failsafe until user_group table is gone
$res = db_query_params ('DELETE FROM user_group WHERE group_id=$1',
@@ -1485,36 +1485,33 @@
//
$atf = new ArtifactTypeFactory($this);
$at_arr =& $atf->getArtifactTypes();
- for ($i=0; $i<count($at_arr); $i++) {
- if (!is_object($at_arr[$i])) {
- printf (_("Not Object: ArtifactType: %d"),$i);
+ foreach ($at_arr as $i) {
+ if (!is_object($i)) {
continue;
}
- $at_arr[$i]->delete(1,1);
+ $i->delete(1,1);
}
//
// Delete Forums
//
$ff = new ForumFactory($this);
$f_arr =& $ff->getForums();
- for ($i=0; $i<count($f_arr); $i++) {
- if (!is_object($f_arr[$i])) {
- printf (_("Not Object: Forum: %d"),$i);
+ foreach ($f_arr as $i) {
+ if (!is_object($i)) {
continue;
}
- $f_arr[$i]->delete(1,1);
+ $i->delete(1,1);
}
//
// Delete Subprojects
//
$pgf = new ProjectGroupFactory($this);
$pg_arr =& $pgf->getProjectGroups();
- for ($i=0; $i<count($pg_arr); $i++) {
- if (!is_object($pg_arr[$i])) {
- printf (_("Not Object: ProjectGroup: %d"),$i);
+ foreach ($pg_arr as $i) {
+ if (!is_object($i)) {
continue;
}
- $pg_arr[$i]->delete(1,1);
+ $i->delete(1,1);
}
//
// Delete FRS Packages
@@ -1625,36 +1622,33 @@
//
$sf = new SurveyFactory($this);
$s_arr =& $sf->getSurveys();
- for ($i=0; $i<count($s_arr); $i++) {
- if (!is_object($s_arr[$i])) {
- printf (_("Not Object: Survey: %d"),$i);
+ foreach ($s_arr as $i) {
+ if (!is_object($i)) {
continue;
}
- $s_arr[$i]->delete();
+ $i->delete();
}
//
// Delete SurveyQuestions
//
$sqf = new SurveyQuestionFactory($this);
$sq_arr =& $sqf->getSurveyQuestions();
- for ($i=0; $i<count($sq_arr); $i++) {
- if (!is_object($sq_arr[$i])) {
- printf (_("Not Object: SurveyQuestion: %d"),$i);
+ foreach ($sq_arr as $i) {
+ if (!is_object($i)) {
continue;
}
- $sq_arr[$i]->delete();
+ $i->delete();
}
//
// Delete Mailing List Factory
//
$mlf = new MailingListFactory($this);
$ml_arr =& $mlf->getMailingLists();
- for ($i=0; $i<count($ml_arr); $i++) {
- if (!is_object($ml_arr[$i])) {
- printf (_("Not Object: MailingList: %d"),$i);
+ foreach ($ml_arr as $i) {
+ if (!is_object($i)) {
continue;
}
- if (!$ml_arr[$i]->delete(1,1)) {
+ if (!$i->delete(1,1)) {
$this->setError(_('Could not properly delete the mailing list'));
}
}
Modified: trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php 2011-03-01 00:44:03 UTC (rev 16853)
+++ trunk/gforge_base/evolvisforge-5.1/src/common/include/User.class.php 2011-03-01 00:44:07 UTC (rev 16854)
@@ -104,17 +104,17 @@
$fetch = array();
$return = array();
- for ($i=0; $i<count($id_arr); $i++) {
+ foreach ($id_arr as $id) {
+ if (!$id) {
+ continue ;
+ }
//
// See if this ID already has been fetched in the cache
//
- if (!isset($id_arr[$i]) || !$id_arr[$i]) {
- continue;
- }
- if (!isset($USER_OBJ["_".$id_arr[$i]."_"])) {
- $fetch[]=$id_arr[$i];
+ if (!isset($USER_OBJ["_".$id."_"])) {
+ $fetch[]=$id;
} else {
- $return[] =& $USER_OBJ["_".$id_arr[$i]."_"];
+ $return[] =& $USER_OBJ["_".$id."_"];
}
}
if (count($fetch) > 0) {
More information about the evolvis-commits
mailing list