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

.eslintignore

@@ -0,0 +1,4 @@
+web/api/lib
+web/skins/classic/js/jquery-1.11.3.js
+web/skins/classic/js/jquery.js
+web/tools/mootools

.eslintrc.js

@@ -0,0 +1,29 @@
+"use strict";
+
+module.exports = {
+  "env": {
+    "browser": true,
+  },
+  "extends": ["google"],
+  "rules": {
+    "brace-style": "off",
+    "camelcase": "off",
+    "comma-dangle": "off",
+    "key-spacing": "off",
+    "max-len": "off",
+    "new-cap": ["error", {
+      capIsNewExceptions: ["Error", "Warning", "Debug", "Polygon_calcArea", "Play", "Stop"],
+      newIsCapExceptionPattern: "^Asset\.."
+    }],
+    "no-array-constructor": "off",
+    "no-caller": "off",
+    "no-new-object": "off",
+    "no-unused-vars": "off",
+    "no-var": "off",
+    "object-curly-spacing": "off",
+    "prefer-rest-params": "off",
+    "quotes": "off",
+    "require-jsdoc": "off",
+    "spaced-comment": "off",
+  },
+};

docs/installationguide/ubuntu.rst

@@ -287,19 +287,19 @@ To build the latest master snapshot:
 
 ::
 
-	./do_debian_package.sh `lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'`  `date +%Y%m%d`01 local master
+	./do_debian_package.sh --snapshot=NOW --branch=master --type=local
 
 
 To build the latest stable release:
 
 ::
 
-	./do_debian_package.sh `lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'`  `date +%Y%m%d`01 local stable
+	./do_debian_package.sh --snapshot=stable --type=local
 
 
-Note that the ``lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'``
+Note that the distribution will be guessed using ``lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'``
-part simply extracts your distribution name - like "vivid", "trusty" etc. You
+which simply extracts your distribution name - like "vivid", "trusty" etc. You
-can always replace it by your distro name if you know it. As far as the script
+can always specify it using --distro=your distro name if you know it. As far as the script
 goes, it checks if your distro is "trusty" in which case it pulls in pre-systemd
 release configurations and if its not "trusty" it assumes its based on systemd
 and pulls in systemd related config files.

utils/do_debian_package.sh

@@ -8,88 +8,272 @@ exit;
 
 fi
 
+for i in "$@"
+do
+case $i in
+    -b=*|--branch=*)
+    BRANCH="${i#*=}"
+    shift # past argument=value
+    ;;
+    -d=*|--distro=*)
+    DISTRO="${i#*=}"
+    shift # past argument=value
+    ;;
+    -i=*|--interactive=*)
+    INTERACTIVE="${i#*=}"
+    shift # past argument=value
+    ;;
+    -r=*|--release=*)
+    RELEASE="${i#*=}"
+    shift
+    ;;
+    -s=*|--snapshot=*)
+    SNAPSHOT="${i#*=}"
+    shift # past argument=value
+    ;;
+    -t=*|--type=*)
+    TYPE="${i#*=}"
+    shift # past argument=value
+    ;;
+    -u=*|--urgency=*)
+    URGENCY="${i#*=}"
+    shift # past argument=value
+    ;;
+    -f=*|--fork=*)
+    GITHUB_FORK="${i#*=}"
+    shift # past argument=value
+    ;;
+    -v=*|--version=*)
+    PACKAGE_VERSION="${i#*=}"
+    shift
+    ;;
+    --default)
+    DEFAULT=YES
+    shift # past argument with no value
+    ;;
+    *)
+    # unknown option
+    read -p "Unknown option $i, continue? (Y|n)"
+    [[ $REPLY == [yY] ]] && { echo "continuing..."; } || exit 1;
+    ;;
+esac
+done
 
 DATE=`date -R`
-DISTRO=$1
-SNAPSHOT=$2
-if [ "$SNAPSHOT" == "stable" ]; then
-SNAPSHOT="";
-fi;
-
-
-TYPE=$3
 if [ "$TYPE" == "" ]; then
+  echo "Defaulting to source build"
   TYPE="source";
 fi;
-BRANCH=$4
 
-
+if [ "$DISTRO" == "" ]; then
-if [ ! -d 'zoneminder_release' ]; then 
+  DISTRO=`lsb_release -a 2>/dev/null | grep Codename | awk '{print $2}'`;
-	git clone https://github.com/ZoneMinder/ZoneMinder.git zoneminder_release
+  echo "Defaulting to $DISTRO for distribution";
+else
+  echo "Building for $DISTRO";
 fi;
-if [ "$BRANCH" != "" ]; then
+
-	cd zoneminder_release
+# Release is a special mode...  it uploads to the release ppa and cannot have a snapshot
-	if [ "$BRANCH" == "stable" ]; then
+if [ "$RELEASE" != "" ]; then
+  if [ "$SNAPSHOT" != "" ]; then
+    echo "Releases cannot have a snapshot.... exiting."
+    exit 0;
+  fi
+  if [ "$GITHUB_FORK" != "" ] && [ "$GITHUB_FORK" != "ZoneMinder" ]; then
+    echo "Releases cannot have a fork ($GITHUB_FORK).... exiting."
+    exit 0;
+  fi
+  BRANCH="release-$RELEASE"
+else
+  if [ "$GITHUB_FORK" == "" ]; then
+    echo "Defaulting to ZoneMinder upstream git"
+    GITHUB_FORK="ZoneMinder"
+  fi;
+  if [ "$SNAPSHOT" == "stable" ]; then
+    if [ "$BRANCH" == "" ]; then
       BRANCH=$(git describe --tags $(git rev-list --tags --max-count=1));
       echo "Latest stable branch is $BRANCH";
-		
-	fi
-	git checkout $BRANCH
-	cd ../
     fi;
-VERSION=`cat zoneminder_release/version`
+  else
+    if [ "$BRANCH" == "" ]; then
+      echo "Defaulting to master branch";
+      BRANCH="master";
+    fi;
+    if [ "$SNAPSHOT" == "NOW" ]; then
+      SNAPSHOT=`date +%Y%m%d%H%M%S`;
+    fi;
+  fi;
+fi
+
+
+# Instead of cloning from github each time, if we have a fork lying around, update it and pull from there instead.
+if [ ! -d "${GITHUB_FORK}_zoneminder_release" ]; then 
+  if [ -d "${GITHUB_FORK}_ZoneMinder.git" ]; then
+    echo "Using local clone ${GITHUB_FORK}_ZoneMinder.git to pull from."
+    cd "${GITHUB_FORK}_ZoneMinder.git"
+    echo "git pull..."
+    git pull
+    echo "git checkout $BRANCH"
+    git checkout $BRANCH
+    echo "git pull..."
+    git pull
+    cd ../
+    echo "git clone ${GITHUB_FORK}_ZoneMinder.git ${GITHUB_FORK}_zoneminder_release"
+	  git clone "${GITHUB_FORK}_ZoneMinder.git" "${GITHUB_FORK}_zoneminder_release"
+  else
+    echo "git clone https://github.com/$GITHUB_FORK/ZoneMinder.git ${GITHUB_FORK}_zoneminder_release"
+	  git clone "https://github.com/$GITHUB_FORK/ZoneMinder.git" "${GITHUB_FORK}_zoneminder_release"
+  fi
+else
+  echo "release dir already exists. Please remove it."
+  exit 0;
+fi;
+
+cd "${GITHUB_FORK}_zoneminder_release"
+if [ $RELEASE ]; then
+  git checkout $RELEASE
+else
+  git checkout $BRANCH
+fi;
+cd ../
+
+VERSION=`cat ${GITHUB_FORK}_zoneminder_release/version`
+
 if [ $VERSION == "" ]; then
 	exit 1;
 fi;
-echo "Doing $TYPE release zoneminder_$VERSION-$DISTRO-$SNAPSHOT";
+if [ "$SNAPSHOT" != "stable" ] && [ "$SNAPSHOT" != "" ]; then
-mv zoneminder_release zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
+  VERSION="$VERSION~$SNAPSHOT";
-cd zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
-git submodule init
-git submodule update --init --recursive
-if [ $DISTRO == "trusty" ]; then 
-ln -sf distros/ubuntu1204 debian
-else
-ln -sf distros/ubuntu1604 debian
 fi;
 
-# Auto-install all ZoneMinder's depedencies using the Debian control file
+DIRECTORY="zoneminder_$VERSION";
-sudo apt-get install devscripts equivs
+echo "Doing $TYPE release $DIRECTORY";
-sudo mk-build-deps -ir ./debian/control
+mv "${GITHUB_FORK}_zoneminder_release" "$DIRECTORY.orig";
+cd "$DIRECTORY.orig";
 
+git submodule init
+git submodule update --init --recursive
+if [ "$DISTRO" == "trusty" ] || [ "$DISTRO" == "precise" ]; then 
+	mv distros/ubuntu1204 debian
+else 
+  if [ "$DISTRO" == "wheezy" ]; then 
+    mv distros/debian debian
+  else 
+    mv distros/ubuntu1604 debian
+  fi;
+fi;
+
+if [ "$DEBEMAIL" != "" ] && [ "$DEBFULLNAME" != "" ]; then
+    AUTHOR="$DEBFULLNAME <$DEBEMAIL>"
+else
   if [ -z `hostname -d` ] ; then
       AUTHOR="`getent passwd $USER | cut -d ':' -f 5 | cut -d ',' -f 1` <`whoami`@`hostname`.local>"
   else
       AUTHOR="`getent passwd $USER | cut -d ':' -f 5 | cut -d ',' -f 1` <`whoami`@`hostname`>"
   fi
+fi
 
+if [ "$URGENCY" = "" ]; then
+  URGENCY="medium"
+fi;
+
+if [ "$SNAPSHOT" == "stable" ]; then
 cat <<EOF > debian/changelog
-zoneminder ($VERSION-$DISTRO-$SNAPSHOT) $DISTRO; urgency=medium
+zoneminder ($VERSION-$DISTRO${PACKAGE_VERSION}) $DISTRO; urgency=$URGENCY
+
+  * Release $VERSION
+
+ -- $AUTHOR  $DATE
+
+EOF
+else
+cat <<EOF > debian/changelog
+zoneminder ($VERSION-$DISTRO${PACKAGE_VERSION}) $DISTRO; urgency=$URGENCY
 
   * 
 
  -- $AUTHOR  $DATE
 
 EOF
-#rm -rf .git
+fi;
-#rm .gitignore
+
-#cd ../
+rm -rf .git
-#tar zcf zoneminder_$VERSION-$DISTRO.orig.tar.gz zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
+rm .gitignore
-#cd zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
+cd ../
+tar zcf $DIRECTORY.orig.tar.gz $DIRECTORY.orig
+cd $DIRECTORY.orig
+
 if [ $TYPE == "binary" ]; then
-	debuild
+  # Auto-install all ZoneMinder's depedencies using the Debian control file
+  sudo apt-get install devscripts equivs
+  sudo mk-build-deps -ir ./debian/control
+  echo "Status: $?"
+	DEBUILD=debuild
 else
   if [ $TYPE == "local" ]; then
-		debuild -i -us -uc -b
+    # Auto-install all ZoneMinder's depedencies using the Debian control file
+    sudo apt-get install devscripts equivs
+    sudo mk-build-deps -ir ./debian/control
+    echo "Status: $?"
+    DEBUILD="debuild -i -us -uc -b"
   else 
-		debuild -S -sa
+    DEBUILD="debuild -S -sa"
   fi;
 fi;
+if [ "$DEBSIGN_KEYID" != "" ]; then
+  DEBUILD="$DEBUILD -k$DEBSIGN_KEYID"
+fi
+$DEBUILD
+if [ $? -ne 0 ]; then
+echo "Error status code is: $?"
+  echo "Build failed.";
+  exit $?;
+fi;
 
 cd ../
-
+if [ "$INTERACTIVE" != "no" ]; then
   read -p "Do you want to keep the checked out version of Zoneminder (incase you want to modify it later) [y/N]"
-[[ $REPLY == [yY] ]] && { mv zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig zoneminder_release; echo "The checked out copy is preserved in zoneminder_release"; } || { rm -fr zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig; echo "The checked out copy has been deleted"; }
+  [[ $REPLY == [yY] ]] && { mv $DIRECTORY zoneminder_release; echo "The checked out copy is preserved in zoneminder_release"; } || { rm -fr $DIRECTORY; echo "The checked out copy has been deleted"; }
   echo "Done!"
-
+else 
+  rm -fr $DIRECTORY; echo "The checked out copy has been deleted";
+fi
+
+if [ $TYPE == "binary" ]; then
+  if [ "$INTERACTIVE" != "no" ]; then
+    echo "Not doing dput since it's a binary release. Do you want to install it? (Y/N)"
+    read install
+    if [ "$install" == "Y" ]; then
+        sudo dpkg -i $DIRECTORY*.deb
+    fi;
+    if [ "$DISTRO" == "jessie" ]; then
+        echo "Do you want to upload this binary to zmrepo? (y/N)"
+        read install
+        if [ "$install" == "Y" ]; then
+          scp "zoneminder_*-${VERSION}-${DISTRO}*" "zmrepo@zmrepo.connortechnology.com:debian/${BRANCH}/mini-dinstall/incoming/"
+        fi;
+    fi;
+  fi;
+else
+  SC="zoneminder_${VERSION}-${DISTRO}${PACKAGE_VERSION}_source.changes";
+	PPA="";
+	if [ "$RELEASE" != "" ]; then
+			PPA="ppa:iconnor/zoneminder";
+	else
+		if [ "$BRANCH" == "" ]; then
+			PPA="ppa:iconnor/zoneminder-master";
+		else 
+			PPA="ppa:iconnor/zoneminder-$BRANCH";
+		fi;
+	fi;
+
+  dput="Y";
+  if [ "$INTERACTIVE" != "no" ]; then
+    echo "Ready to dput $SC to $PPA ? Y/N...";
+    read dput
+  fi
+	if [ "$dput" == "Y" -o "$dput" == "y" ]; then
+		dput $PPA $SC
+	fi;
+fi;
 
 

web/js/logger.js

@@ -115,4 +115,4 @@ window.onerror =
     function( message, url, line )
     {
         logReport( "ERR", message, url, line );
-    }
+    };

web/js/overlay.js

@@ -116,7 +116,7 @@ function setupOverlays()
             overlay.getElements('.overlayCloser').each(
                 function( closer )
                 {
-                    closer.addEvent( 'click', function() { overlay.element.hide(); } )   
+                    closer.addEvent( 'click', function() { overlay.element.hide(); } );
                 }
             );
             overlay.overlayShow = function() { overlay.element.show(); };

web/skins/classic/js/classic.js

@@ -33,7 +33,7 @@ var popupSizes = {
     'device':       { 'width': 260, 'height': 150 },
     'devices':      { 'width': 400, 'height': 240 },
     'donate':       { 'width': 500, 'height': 280 },
-    'event':        { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, minHeight: 540 },
+    'event':        { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, 'minHeight': 540 },
     'eventdetail':  { 'width': 600, 'height': 220 },
     'events':       { 'width': 960, 'height': 780 },
     'export':       { 'width': 400, 'height': 340 },

web/skins/classic/js/dark.js

@@ -33,7 +33,7 @@ var popupSizes = {
     'device':       { 'width': 260, 'height': 150 },
     'devices':      { 'width': 400, 'height': 240 },
     'donate':       { 'width': 500, 'height': 280 },
-    'event':        { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, minHeight: 540 },
+    'event':        { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, 'minHeight': 540 },
     'eventdetail':  { 'width': 600, 'height': 220 },
     'events':       { 'width': 960, 'height': 780 },
     'export':       { 'width': 400, 'height': 340 },

web/skins/classic/js/flat.js

@@ -33,7 +33,7 @@ var popupSizes = {
     'device':       { 'width': 260, 'height': 150 },
     'devices':      { 'width': 400, 'height': 240 },
     'donate':       { 'width': 500, 'height': 280 },
-    'event':        { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, minHeight: 540 },
+    'event':        { 'addWidth': 108, 'minWidth': 496, 'addHeight': 230, 'minHeight': 540 },
     'eventdetail':  { 'width': 600, 'height': 220 },
     'events':       { 'width': 1080, 'height': 780 },
     'export':       { 'width': 400, 'height': 340 },

web/skins/classic/views/js/console.js

@@ -25,7 +25,6 @@ function setButtonStates( element )
 
 function addMonitor( element)
 {
-
     var form = element.form;
     var dupParam;
     var monitorId=-1;

web/skins/classic/views/js/controlcap.js

@@ -19,6 +19,5 @@ function validateForm( form ) {
         return( false );
     }
     return( true );
-
 }
 

web/skins/classic/views/js/event.js

@@ -25,7 +25,7 @@ function changeReplayMode()
 {
     var replayMode = $('replayMode').get('value');
 
-    Cookie.write( 'replayMode', replayMode, { duration: 10*365 })
+    Cookie.write( 'replayMode', replayMode, { duration: 10*365 });
 
     refreshWindow();
 }
@@ -477,7 +477,7 @@ function checkFrames( eventId, frameId, loadImage )
         if ( !$('eventThumb'+fid) )
         {
             var img = new Element( 'img', { 'id': 'eventThumb'+fid, 'src': 'graphics/transparent.gif', 'alt': fid, 'class': 'placeholder' } );
-            img.addEvent( 'click', function () { eventData['frames'][fid] = null; checkFrames( eventId, fid ) } );
+            img.addEvent( 'click', function() { eventData['frames'][fid] = null; checkFrames( eventId, fid ); } );
             frameQuery( eventId, fid, loadImage && (fid == frameId) );
             var imgs = $('eventThumbs').getElements( 'img' );
             var injected = false;

web/skins/classic/views/js/group.js

@@ -9,7 +9,6 @@ if ( refreshParent )
 }
 
 function configureButtons( element ) {
-
     if ( canEditGroups ) {
         var form = element.form;
         form.saveBtn.disabled = (element.value == 0);

web/skins/classic/views/js/log.js

@@ -315,7 +315,7 @@ function initPage()
                 if ( sortReversed )
                     startIndex = displayLimit;
                 else
-                    startIndex = 0;;
+                    startIndex = 0;
                 for ( var i = startIndex; logCount > displayLimit; i++ )
                 {
                     rows[i].destroy();

web/skins/classic/views/js/montage.js

@@ -15,7 +15,7 @@ function Monitor( index, monitorData )
     this.start = function( delay )
     {
         this.streamCmdTimer = this.streamCmdQuery.delay( delay, this );
-    }
+    };
 
     this.setStateClass = function( element, stateClass )
     {
@@ -29,7 +29,7 @@ function Monitor( index, monitorData )
                 element.removeClass( 'idle' );
             element.addClass( stateClass );
         }
-    }
+    };
 
     this.getStreamCmdResponse = function( respObj, respText )
     {
@@ -94,14 +94,13 @@ function Monitor( index, monitorData )
             // Try to reload the image stream.
             if ( stream )
                 stream.src = stream.src.replace(/rand=\d+/i, 'rand='+Math.floor((Math.random() * 1000000) ));
-
         }
         var streamCmdTimeout = statusRefreshTimeout;
         if ( this.alarmState == STATE_ALARM || this.alarmState == STATE_ALERT )
             streamCmdTimeout = streamCmdTimeout/5;
         this.streamCmdTimer = this.streamCmdQuery.delay( streamCmdTimeout, this );
         this.lastAlarmState = this.alarmState;
-    }
+    };
 
     this.streamCmdQuery = function( resent )
     {
@@ -109,7 +108,7 @@ function Monitor( index, monitorData )
             //console.log( this.connKey+": Resending" );
         //this.streamCmdReq.cancel();
         this.streamCmdReq.send( this.streamCmdParms+"&command="+CMD_QUERY );
-    }
+    };
 
     this.streamCmdReq = new Request.JSON( { url: this.server_url, method: 'get', timeout: AJAX_TIMEOUT, onSuccess: this.getStreamCmdResponse.bind( this ), onTimeout: this.streamCmdQuery.bind( this, true ), link: 'cancel' } );
 

web/skins/classic/views/js/state.js

@@ -1,6 +1,5 @@
 function checkState( element )
 {
-
     var form = element.form;
 
     var minIndex = running?2:1;
@@ -25,7 +24,6 @@ function checkState( element )
 	form.saveBtn.disabled = false;
         form.deleteBtn.disabled = true;
     }
-
 }
 
 function saveState( element )

web/skins/classic/views/js/watch.js

@@ -496,7 +496,7 @@ function getEventCmdResponse( respObj, respText )
                 link.set( 'text', event.AvgScore+'/'+event.MaxScore );
                 link.inject( row.getElement( 'td.colScore' ) );
 
-                link = new Element( 'a', { 'href': '#', 'title': deleteString, 'events': { 'click': function( e ) { deleteEvent( e, event.Id ); }.bind( link ), 'mouseover': highlightRow.pass( row ), 'mouseout': highlightRow.pass( row ) } });
+                link = new Element( 'a', { 'href': '#', 'title': deleteString, 'events': { 'click': function( e ) { deleteEvent( e, event.Id ); }, 'mouseover': highlightRow.pass( row ), 'mouseout': highlightRow.pass( row ) } });
                 link.set( 'text', 'X' );
                 link.inject( row.getElement( 'td.colDelete' ) );
 

web/skins/classic/views/js/zone.js

@@ -384,7 +384,7 @@ function delPoint( index )
 
 function limitPointValue( point, loVal, hiVal )
 {
-    point.value = constrainValue(point.value, loVal, hiVal)
+    point.value = constrainValue(point.value, loVal, hiVal);
 }
 
 function updateArea( ) {
@@ -393,7 +393,6 @@ function updateArea( ) {
   var form = $('zoneForm');
   form.elements['newZone[Area]'].value = area;
   if ( form.elements['newZone[Units]'].value == 'Percent' ) {
-
     form.elements['newZone[TempArea]'].value = Math.round( area/monitorArea*100 );
   } else if ( form.elements['newZone[Units]'].value == 'Pixels' ) {
     form.elements['newZone[TempArea]'].value = area;