*** empty log message ***
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1424 e3e1d417-86f3-4887-817a-d78f3d33393f
This commit is contained in:
parent
c20d73e95b
commit
7d633737f5
|
@ -843,6 +843,10 @@ if ( isset($action) )
|
||||||
$control = 'preset_goto';
|
$control = 'preset_goto';
|
||||||
$ctrl_command .= " --preset ".$matches[1];
|
$ctrl_command .= " --preset ".$matches[1];
|
||||||
}
|
}
|
||||||
|
elseif ( $control == "preset_set" )
|
||||||
|
{
|
||||||
|
$ctrl_command .= " --preset ".$preset;
|
||||||
|
}
|
||||||
elseif ( $control == "move_map" )
|
elseif ( $control == "move_map" )
|
||||||
{
|
{
|
||||||
$ctrl_command .= " -xcoord $x -ycoord $y";
|
$ctrl_command .= " -xcoord $x -ycoord $y";
|
||||||
|
|
|
@ -130,7 +130,7 @@ function loadConfig()
|
||||||
$config = array();
|
$config = array();
|
||||||
$config_cat = array();
|
$config_cat = array();
|
||||||
|
|
||||||
$sql = "select * from Config";
|
$sql = "select * from Config order by Id asc";
|
||||||
$result = mysql_query( $sql );
|
$result = mysql_query( $sql );
|
||||||
if ( !$result )
|
if ( !$result )
|
||||||
echo mysql_error();
|
echo mysql_error();
|
||||||
|
|
Loading…
Reference in New Issue