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

remove debug

pull/2077/head
Isaac Connor 2017-10-05 10:48:04 -04:00
parent b56a976d7a
commit 40972383c1
2 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
web/includes/Group.php
View File

@ -164,12 +164,10 @@ public $defaults = array(
if ( $group['MonitorIds'] ) if ( $group['MonitorIds'] )
$groupIds = explode( ',', $group['MonitorIds'] ); $groupIds = explode( ',', $group['MonitorIds'] );
Warning("Group ids" . implode(',',$groupIds) );
foreach ( dbFetchAll( 'SELECT MonitorIds FROM Groups WHERE ParentId = ?', NULL, array($group_id) ) as $group ) foreach ( dbFetchAll( 'SELECT MonitorIds FROM Groups WHERE ParentId = ?', NULL, array($group_id) ) as $group )
if ( $group['MonitorIds'] ) if ( $group['MonitorIds'] )
$groupIds = array_merge( $groupIds, explode( ',', $group['MonitorIds'] ) ); $groupIds = array_merge( $groupIds, explode( ',', $group['MonitorIds'] ) );
} }
Warning("Group ids" . implode(',',$groupIds) );
$groupSql = " find_in_set( Id, '".implode( ',', $groupIds )."' )"; $groupSql = " find_in_set( Id, '".implode( ',', $groupIds )."' )";
} }
return $groupSql; return $groupSql;

8
web/includes/database.php
View File

@ -127,10 +127,10 @@ function dbQuery( $sql, $params=NULL ) {
} else { } else {
$result = $dbConn->query( $sql ); $result = $dbConn->query( $sql );
} }
if ( $params ) //if ( $params )
Warning("SQL: $sql" . implode(',',$params)); //Warning("SQL: $sql" . implode(',',$params));
else //else
Warning("SQL: $sql" ); //Warning("SQL: $sql" );
} catch(PDOException $e) { } catch(PDOException $e) {
Fatal( "SQL-ERR '".$e->getMessage()."', statement was '".$sql."'" ); Fatal( "SQL-ERR '".$e->getMessage()."', statement was '".$sql."'" );
} }