Commit Graph

3091 Commits

Author SHA1 Message Date
Kyle Johnson c8ad6ae656 Fixes #107 for real this time. 2013-09-05 20:31:52 -04:00
Kyle Johnson 96b5887e69 Include missing make and configure files. Fixes #107 2013-09-05 20:08:22 -04:00
Kyle Johnson 4cc878e930 Merge branch 'release-1.26' into develop
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm
2013-09-05 11:40:38 -04:00
Kyle Johnson f00372ee94 Merge branch 'release-1.26' 2013-09-05 11:33:08 -04:00
Kyle Johnson a4c399a217 Pointed the ChangeLog to the commits url 2013-09-05 11:32:48 -04:00
Kyle Johnson c02d496d23 More CakePHP cleanup - missed it in 2c04d0774f 2013-09-05 10:52:55 -04:00
Chris Wiggins d6440ca70e Change repo to ZoneMinder for pull request 2013-09-05 23:50:51 +12:00
Chris Wiggins e792c8eb44 Move version check from zoneminder.com to repository 2013-09-05 23:40:03 +12:00
Kyle Johnson d47aaec775 Merge pull request #92 from knnniggett/patch-9
Update getBrowser() to match IE10
2013-09-03 06:38:13 -07:00
Kyle Johnson c5196407a9 Moved all of the Monitors HTML to elements 2013-09-01 17:50:26 -04:00
Kyle Johnson 93631c0ac4 Fixing AM_CONFIG_HEADER is deprecated in automake > 1.13. Should fix #94. 2013-08-30 21:57:52 -04:00
Kyle Johnson 2f92689d7e Resolving CVE-2013-0232 - this should fix #93. 2013-08-30 21:53:19 -04:00
Kyle Johnson c9dce2363b Merge pull request #95 from knnniggett/patch-10
Fix "Can't stat : No such file or directory" message
2013-08-30 18:48:48 -07:00
Kyle Johnson 52116f9642 Merge pull request #84 from knnniggett/patch-5
Update zmupdate.pl.in to give option to convert to InnoDB tables
2013-08-30 18:47:34 -07:00
Andy 3764000f81 Fix "Can't stat : No such file or directory" message
Many zoneminder systems have a "Can't stat : No such file or directory" in their logs each time zmfix is run. The problem was traced back to the sql query, which looked for a ControlDevice field that was not null.  However, the ControlDevice field is empty, rather than null, when there is no control device.
2013-08-30 14:30:47 -05:00
Andy de51926434 Update getBrowser() to match IE10
Updates the preg_match expression to match Internet Explorer 10. The previous pattern would not detect IE10, and hence zoneminder would not attempt to stream via Cambozola, which leaves IE10 users looking at a broken link.

NOTE: There is another file in the zoneminder source tree, AssetDispatcher.php, that also uses the same pattern match expression.  It is part of the Cake folder, which I am not familiar with.  Please advise if we should edit that file as well.
2013-08-29 17:41:20 -05:00
Kyle Johnson 396dedc21a Merge pull request #90 from knnniggett/patch-8
zms crashes with hashed authentication - fixes #88

Previously, systems without gnutls were computing auth_md5 to be twice the size of what it was defined to be, thus causing zms to crash. The for loop at line 227 builds auth_md5 by looping every "2j", which means the upper limit (md5len) should be half the desired size of auth_md5.
2013-08-28 05:32:01 -07:00
Andy 4e9698ae13 Fix for Issue #88 - ZMS crashing
Previously, systems without gnutls were computing auth_md5 to be twice the size of what it was defined to be, thus causing zms to crash. The for loop at line 227 builds auth_md5 by looping every "2j", which means the upper limit (md5len) should be half the desired size of auth_md5.
2013-08-28 07:22:41 -05:00
Kyle Johnson a33ddcb307 Merge pull request #89 from knnniggett/patch-7
Fixed typo
2013-08-27 17:36:30 -07:00
Andy e18c08356e Fixed typo
line 614 was missing a trailing semicolon
2013-08-27 18:35:27 -05:00
Kyle Johnson 69f31d9e90 Merge pull request #85 from knnniggett/addptzcameras
Add PTZ control files and presets for FOSCAM FI8608W PT, FI8620 PTZ, 9821W PTZ and Loftek Sentinel IP
2013-08-26 09:48:37 -07:00
Knniggett bac2d89a8d Add PTZ control files and camera presets for specific ptz cameras 2013-08-25 18:52:09 -05:00
Kyle Johnson 362ceaebd7 Merge pull request #87 from knnniggett/patch-6
edit zmupdate function in init script
2013-08-25 13:29:47 -07:00
Andy 2f456967f4 edit zmupdate function in init script
Noticed the init script was looking for a zm_update, which doesn't exist.  My best guess is that this should be changed to zmupdate.pl. This causes zoneminder to reload its configuration from the database prior to startup. Thoughts?
2013-08-22 14:13:22 -05:00
Knniggett 8608250b06 This adds PTZ control files and camera presets for specific ptz cameras. 2013-08-22 13:20:38 -05:00
Knniggett 2263793b49 Adds PTZ controls & camera presets for specific cameras. (NOTE TO SELF: remove ~ files) 2013-08-22 13:14:28 -05:00
Andy 594a44cbbb Update zmupdate.pl.in to give option to convert to InnoDB tables
When upgrading the zoneminder database to 1.26, this proposed change will ask the user to convert existing MyISAM tables over InnoDB.  It first scans for existing MyISAM tables and will skip over any tables that are already converted to InnoDB.

I've tested this on (a copy of) a production database server and have verified it doesn't alter existing tables from a different schema.

And I'm done messing with the zmupdate script. I promise.
I understand if this change is considered outside the scope of a current bug fix release.
2013-08-20 19:49:02 -05:00
Isaac Connor 3afad1a0a8 have to override ZoneMinder::Database::ZM_DB_USER, etc instead of just ZM_DB_USER. 2013-08-20 15:13:50 -04:00
Kyle Johnson 35c36bd769 Merge pull request #80 from knnniggett/corruptjpeg
Suppresses erroneous Corrupt Jpeg messages sent from the jpeg library
2013-08-20 06:24:20 -07:00
Kyle Johnson de9b1af1a1 Merge pull request #79 from knnniggett/frameserver
Added frameserver patch from Zoneminder Wiki

Changes the socket reader in zmf from a single read, to a loop read.
Incomplete reads would be reported even though the image writer wrote
the whole image to the socket. The problem was when the read went to
read the image frame from the socket, all the data had not yet been written
to the socket by the writer, so the reader thought there was a problem.
The loop reads from the socket until a full image frame is read, or there is
an error.

Originally at http://www.zoneminder.com/wiki/index.php/1.24.2_Patches
2013-08-20 06:23:34 -07:00
Kyle Johnson 2333a8b445 Merge pull request #77 from knnniggett/patch-2
Change default dB Engine from MyISAM to InnoDB
2013-08-19 12:22:20 -07:00
Kyle Johnson 6fd04f87a5 Merge pull request #81 from knnniggett/patch-4
Update Makefile.am
2013-08-19 12:20:37 -07:00
Isaac Connor 34bfcb5e7e add lines to change the ZM_DB_USER and ZM_DB_PASS when the user and password are supplied on the command line.
This is neccessary when the regular zm user does not have alter privileges.
2013-08-19 11:19:34 -04:00
Andy 29ec57f64e Update Makefile.am
zm_update-1.26.0.sql was not being copied with the rest of the sql scripts during install.
2013-08-18 16:58:15 -05:00
Knniggett 860c331d58 Suppresses erroneous Corrupt Jpeg messages sent from the jpeg library 2013-08-18 15:01:46 -05:00
Andrew Bauer 31daa32194 Added frameserver patch from Zoneminder Wiki 2013-08-18 13:28:55 -05:00
Kyle Johnson 543a1f2490 Merge pull request #78 from knnniggett/patch-3
Don't check for gnutls-openssl on systems with older gnutls
2013-08-17 08:26:31 -07:00
Andy e3576ccd17 Don't check for gnutls-openssl on systems with older gnutls
This was causing a false warning on CentOS 6 w/ gnutls 2.8.5. It would otherwise compile and work fine despite the warning.
2013-08-17 10:24:30 -05:00
Kyle Johnson fcea4660cd Minor formatting changes 2013-08-17 11:21:52 -04:00
Kyle Johnson d31e9a6c2c Merge pull request #76 from knnniggett/patch-1
Added build notes for CentOS & RHEL
2013-08-17 08:19:43 -07:00
Andy 050a5ac414 Change default dB Engine from MyISAM to InnoDB
I have long ago converted my production zoneminder dB tables to InnoDB and have not experienced any side effects.  One benefit of using InnoDB is a significantly lesser chance of table corruption after an unclean shutdown.  Thoughts?
2013-08-17 09:44:40 -05:00
Andy 42c9b4e7a5 Added build notes for CentOS & RHEL 2013-08-17 08:52:24 -05:00
Kyle Johnson 0a911d9d27 The .deps directory shouldn't have been included. Removing it.
.deps is generated during configure (or is it make?).  Fixes #52
2013-08-15 12:44:10 -04:00
Kyle Johnson e8fa5694e8 Changing AUTOMAKE_OPTIONS from gnu to foreign to fix automake.
In commit 21ee8dbe02 I moved the README
file to README.md so that the markdown inside of the file would be displayed
on github.  This broke builds as AUTOMAKE_OPTIONS gnu requires the README
file to exist.
2013-08-15 12:24:02 -04:00
Kyle Johnson 4d6b9f7276 More updates to the Hungarian translation. #Fixes #45 2013-08-15 09:39:45 -04:00
Kyle Johnson cacf77a183 Merge pull request #37 from nagyrobi/patch-2
Update Hungarian translation - thanks to robi / @nagyrobi
2013-08-15 06:26:33 -07:00
Kyle Johnson 0a79e4a975 1.26 Beta did not install SkyIPCam7xx.pm Control Script. Fixes #38 2013-08-15 09:08:51 -04:00
nagyrobi 1fa04cc104 Update hu_hu.php 2013-08-14 22:38:37 +02:00
Kyle Johnson 21ee8dbe02 Moved README to markdown language for github display 2013-08-14 12:38:42 -04:00
Kyle Johnson 2df9c25df8 Updated release notes with something meaningful 2013-08-14 12:37:10 -04:00