From 2f1e6cbd6b5e21ee5c4a2685e707fcf595204c10 Mon Sep 17 00:00:00 2001 From: Isaac Connor Date: Mon, 2 May 2016 17:44:52 -0400 Subject: [PATCH] finish merge --- db/zm_update-1.29.1.sql | 58 ----------- src/Makefile.am | 137 -------------------------- web/skins/classic/views/console.php | 2 - web/skins/classic/views/js/console.js | 7 +- 4 files changed, 1 insertion(+), 203 deletions(-) delete mode 100644 src/Makefile.am diff --git a/db/zm_update-1.29.1.sql b/db/zm_update-1.29.1.sql index e0f4fc77f..c21767649 100644 --- a/db/zm_update-1.29.1.sql +++ b/db/zm_update-1.29.1.sql @@ -1,64 +1,6 @@ -- -- This updates a 1.29.0 database to 1.29.1 -- -<<<<<<< HEAD --- -======= - -SET @s = (SELECT IF( - (SELECT COUNT(*) - FROM INFORMATION_SCHEMA.TABLES - WHERE table_name = 'Storage' - AND table_schema = DATABASE() - ) > 0, -"SELECT 'Storage table exists'", -"CREATE TABLE `Storage` ( - `Id` smallint(5) unsigned NOT NULL auto_increment, - `Path` varchar(64) NOT NULL default '', - `Name` varchar(64) NOT NULL default '', - PRIMARY KEY (`Id`) -)" -)); - -PREPARE stmt FROM @s; -EXECUTE stmt; - --- --- Add StorageId column to Monitors --- - -SET @s = (SELECT IF( - (SELECT COUNT(*) - FROM INFORMATION_SCHEMA.COLUMNS - WHERE table_name = 'Monitors' - AND table_schema = DATABASE() - AND column_name = 'StorageId' - ) > 0, -"SELECT 'Column StorageId exists in Monitors'", -"ALTER TABLE Monitors ADD `StorageId` smallint(5) unsigned AFTER `ServerId`" -)); - -PREPARE stmt FROM @s; -EXECUTE stmt; - --- --- Add StorageId column to Eventss --- - -SET @s = (SELECT IF( - (SELECT COUNT(*) - FROM INFORMATION_SCHEMA.COLUMNS - WHERE table_name = 'Events' - AND table_schema = DATABASE() - AND column_name = 'StorageId' - ) > 0, -"SELECT 'Column StorageId exists in Events'", -"ALTER TABLE Events ADD `StorageId` smallint(5) unsigned AFTER `MonitorId`" -)); - -PREPARE stmt FROM @s; -EXECUTE stmt; ->>>>>>> storageareas -- Increase the size of the Pid field for FreeBSD ALTER TABLE Logs MODIFY Pid int(10); diff --git a/src/Makefile.am b/src/Makefile.am deleted file mode 100644 index 586a33fa6..000000000 --- a/src/Makefile.am +++ /dev/null @@ -1,137 +0,0 @@ -AUTOMAKE_OPTIONS = gnu - -AM_CPPFLAGS = @MYSQL_CFLAGS@ @MARIADB_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -finline-functions -fomit-frame-pointer -#AM_CXXFLAGS = -frepo - -CLEANFILES = *.rpo - -# This should be set to your CGI directory -cgidir = @CGI_PREFIX@ -# And these to the user and group of your webserver -webuser = @WEB_USER@ -webgroup = @WEB_GROUP@ - -bin_PROGRAMS = \ - zmc \ - zma \ - zmu \ - zms \ - zmf \ - zmstreamer - -zm_SOURCES = \ - zm_storage.cpp \ - zm_box.cpp \ - zm_buffer.cpp \ - zm_camera.cpp \ - zm_comms.cpp \ - zm_config.cpp \ - zm_coord.cpp \ - zm_curl_camera.cpp \ - zm.cpp \ - zm_db.cpp \ - zm_logger.cpp \ - zm_event.cpp \ - zm_exception.cpp \ - zm_file_camera.cpp \ - zm_ffmpeg_camera.cpp \ - zm_image.cpp \ - zm_jpeg.cpp \ - zm_libvlc_camera.cpp \ - zm_local_camera.cpp \ - zm_monitor.cpp \ - zm_ffmpeg.cpp \ - zm_mpeg.cpp \ - zm_poly.cpp \ - zm_regexp.cpp \ - zm_remote_camera.cpp \ - zm_remote_camera_http.cpp \ - zm_remote_camera_rtsp.cpp \ - zm_rtp.cpp \ - zm_rtp_ctrl.cpp \ - zm_rtp_data.cpp \ - zm_rtp_source.cpp \ - zm_rtsp.cpp \ - zm_rtsp_auth.cpp \ - zm_sdp.cpp \ - zm_signal.cpp \ - zm_stream.cpp \ - zm_thread.cpp \ - zm_time.cpp \ - zm_timer.cpp \ - zm_user.cpp \ - zm_utils.cpp \ - zm_zone.cpp - -zmc_SOURCES = zmc.cpp $(zm_SOURCES) -zma_SOURCES = zma.cpp $(zm_SOURCES) -zms_SOURCES = zms.cpp $(zm_SOURCES) -zmu_SOURCES = zmu.cpp $(zm_SOURCES) -zmf_SOURCES = zmf.cpp $(zm_SOURCES) -zmstreamer_SOURCES = zmstreamer.cpp $(zm_SOURCES) - -noinst_HEADERS = \ - jinclude.h \ - zm_storage.h \ - zm_box.h \ - zm_buffer.h \ - zm_camera.h \ - zm_comms.h \ - zm_config_defines.h \ - zm_config.h \ - zm_coord.h \ - zm_curl_camera.h \ - zm_db.h \ - zm_logger.h \ - zm_event.h \ - zm_exception.h \ - zmf.h \ - zm_file_camera.h \ - zm_ffmpeg_camera.h \ - zm_font.h \ - zm_font.h \ - zm.h \ - zm_image.h \ - zm_jpeg.h \ - zm_libvlc_camera.h \ - zm_local_camera.h \ - zm_mem_utils.h \ - zm_monitor.h \ - zm_ffmpeg.h \ - zm_mpeg.h \ - zm_poly.h \ - zm_regexp.h \ - zm_remote_camera.h \ - zm_remote_camera_http.h \ - zm_remote_camera_rtsp.h \ - zm_rgb.h \ - zm_rtp_ctrl.h \ - zm_rtp_data.h \ - zm_rtp.h \ - zm_rtp_source.h \ - zm_rtsp.h \ - zm_sdp.h \ - zm_signal.h \ - zm_stream.h \ - zm_thread.h \ - zm_time.h \ - zm_timer.h \ - zm_user.h \ - zm_utils.h \ - zm_zone.h - -EXTRA_DIST = \ - zm_config.h.in \ - zm_threaddata.cpp - -dist-hook: - @( rm $(distdir)/zm_config.h ) - -# Yes, you are correct. This is a HACK! -install-exec-hook: - ( cd $(DESTDIR)@bindir@; mkdir -p $(DESTDIR)$(cgidir); mv zms $(DESTDIR)$(cgidir) ) - ( cd $(DESTDIR)$(cgidir); chown $(webuser):$(webgroup) zms; ln -f zms nph-zms ) - -uninstall-hook: - ( cd $(DESTDIR)$(cgidir); rm -f zms nph-zms ) - diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php index 07ec9a7a2..d58043650 100644 --- a/web/skins/classic/views/console.php +++ b/web/skins/classic/views/console.php @@ -1,9 +1,7 @@ 1 and canEdit( 'System' ) ? 1 : 0; xhtmlHeaders( __FILE__, translate('Console') ); diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js index 6ab86a091..6cd1a45db 100644 --- a/web/skins/classic/views/js/console.js +++ b/web/skins/classic/views/js/console.js @@ -1,12 +1,7 @@ -<<<<<<< HEAD -function setButtonStates( element ) { -======= var jsTranslatedAddText; var jsTranslatedCloneText; -function setButtonStates( element ) -{ ->>>>>>> master +function setButtonStates( element ) { var form = element.form; var checked = 0; for ( var i = 0, i_length=form.elements.length; i < i_length; i++ ) {