ZoneMinder
/
zoneminder
mirror of https://github.com/ZoneMinder/zoneminder.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change depth function to be 0-based.

pull/2362/head
Isaac Connor 2018-12-24 09:38:55 -05:00
parent 0cce0a642b
commit 63199289ad
1 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
web/includes/Group.php
View File

@ -120,12 +120,13 @@ class Group {
} else {
return null;
}
}
} # end function find_one
public function delete() {
if ( array_key_exists('Id', $this) ) {
dbQuery( 'DELETE FROM Groups_Monitors WHERE GroupId=?', array($this->{'Id'}) );
dbQuery( 'DELETE FROM Groups WHERE Id=?', array($this->{'Id'}) );
dbQuery('DELETE FROM Groups_Monitors WHERE GroupId=?', array($this->{'Id'}));
dbQuery('UPDATE Groups SET ParentId=NULL WHERE ParentId=?', array($this->{'Id'}));
dbQuery('DELETE FROM Groups WHERE Id=?', array($this->{'Id'}));
if ( isset($_COOKIE['zmGroup']) ) {
if ( $this->{'Id'} == $_COOKIE['zmGroup'] ) {
unset($_COOKIE['zmGroup']);
@ -150,16 +151,17 @@ class Group {
$this->{$k} = $v;
}
}
}
} # end function set
public function depth( $new = null ) {
if ( isset($new) ) {
$this->{'depth'} = $new;
}
if ( ! array_key_exists('depth', $this) or ($this->{'depth'} == null) ) {
$this->{'depth'} = 1;
if ( !array_key_exists('depth', $this) or ($this->{'depth'} === null) ) {
$this->{'depth'} = 0;
if ( $this->{'ParentId'} != null ) {
$Parent = Group::find_one(array('Id'=>$this->{'ParentId'}));
$this->{'depth'} += $Parent->depth();
$this->{'depth'} += $Parent->depth()+1;
}
}
return $this->{'depth'};
@ -210,7 +212,7 @@ class Group {
$children[$Group->ParentId()] = array();
$children[$Group->ParentId()][] = $Group;
}
}
} # end foreach
function get_options($Group) {
global $children;
@ -221,7 +223,8 @@ class Group {
}
}
return $options;
}
} # end function get_options
$group_options = array();
foreach ( $Groups as $id=>$Group ) {
if ( ! $Group->ParentId() ) {
@ -229,7 +232,7 @@ class Group {
}
}
return $group_options;
}
} # end function get_dropdown_options
public static function get_group_sql($group_id) {
$groupSql = '';