ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZoneMinder/ZoneMinder

This commit is contained in:
Kyle Johnson 2014-06-23 14:21:04 -04:00
parent 5e7cdc44a8 924e65f42c
commit 89209fbe4b
3 changed files with 32 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
db/zm_update-1.27.0.sql
View File

@ -13,11 +13,39 @@ ALTER TABLE Monitors modify column Type enum('Local','Remote','File','Ffmpeg','L
-- --
-- Add required fields for cURL authenication -- Add required fields for cURL authenication
-- --
ALTER TABLE `Monitors` ADD `User` VARCHAR(32) NOT NULL AFTER `SubPath`;
ALTER TABLE `Monitors` ADD `Pass` VARCHAR(32) NOT NULL AFTER `User`; SET @s = (SELECT IF(
(SELECT COUNT(*)
FROM INFORMATION_SCHEMA.COLUMNS
WHERE table_name = 'Monitors'
AND table_schema = DATABASE()
AND column_name = 'User'
) > 0,
"SELECT 'Column User exists in Monitors'",
"ALTER TABLE `Monitors` ADD `User` VARCHAR(32) NOT NULL AFTER `SubPath`"
));
PREPARE stmt FROM @s;
EXECUTE stmt;
SET @s = (SELECT IF(
(SELECT COUNT(*)
FROM INFORMATION_SCHEMA.COLUMNS
WHERE table_name = 'Monitors'
AND table_schema = DATABASE()
AND column_name = 'Pass'
) > 0,
"SELECT 'Column Pass exists in Monitors'",
"ALTER TABLE `Monitors` ADD `Pass` VARCHAR(32) NOT NULL AFTER `User`"
));
PREPARE stmt FROM @s;
EXECUTE stmt;
-- --
-- Add default zone preset -- Add default zone preset
-- --
INSERT INTO ZonePresets VALUES (NULL,'Default','Active','Percent','Blobs',25,NULL,3,75,3,3,3,75,2,NULL,1,NULL,0); INSERT INTO ZonePresets VALUES (NULL,'Default','Active','Percent','Blobs',25,NULL,3,75,3,3,3,75,2,NULL,1,NULL,0);

2
web/skins/classic/includes/timeline_functions.php
View File

@ -232,7 +232,7 @@ function parseFilterToTree( $filter )
$value = "'$value'"; $value = "'$value'";
break; break;
case 'DateTime': case 'DateTime':
$value = strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) ); $value = "'".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."'";
break; break;
case 'Date': case 'Date':
$value = "to_days( '".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."' )"; $value = "to_days( '".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."' )";

2
web/skins/flat/includes/timeline_functions.php
View File

@ -232,7 +232,7 @@ function parseFilterToTree( $filter )
$value = "'$value'"; $value = "'$value'";
break; break;
case 'DateTime': case 'DateTime':
$value = strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) ); $value = "'".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."'";
break; break;
case 'Date': case 'Date':
$value = "to_days( '".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."' )"; $value = "to_days( '".strftime( STRF_FMT_DATETIME_DB, strtotime( $value ) )."' )";