diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000000000000000000000000000000000..0b829f9ec2dc779ad02fcf53163b75f7515ab932 --- /dev/null +++ b/.gitignore @@ -0,0 +1,2 @@ +*~ +password diff --git a/.htaccess b/.htaccess index 36e0d1116875519624d80f6fad33c0526cd86c9c..a4da0ed505c5263c522e20f3b9deef9e7de29c17 100644 --- a/.htaccess +++ b/.htaccess @@ -1,2 +1,13 @@ #Options +Indexes +ExecCGI +Multiviews addhandler cgi-script .py + +# Authentication +AuthType Basic +AuthName "Restricted Content" +AuthBasicProvider file ldap +AuthUserFile /home/other/webcam/public-html/password +AuthLDAPURL ldaps://ad.ucc.gu.uwa.edu.au/dc=ad,dc=ucc,dc=gu,dc=uwa,dc=edu,dc=au?cn +AuthLDAPInitialBindAsUser on +AuthLDAPInitialBindPattern (.+) cn=$1,cn=Users,dc=ad,dc=ucc,dc=gu,dc=uwa,dc=edu,dc=au +Require valid-user +ErrorDocument 401 /401.html diff --git a/401.html b/401.html new file mode 100755 index 0000000000000000000000000000000000000000..a898bf518af97c085fd4c9eb3860778914b3f24d --- /dev/null +++ b/401.html @@ -0,0 +1,2 @@ +<h1>Unauthorized</h1> +<p>See here: <a href="https://wiki.ucc.asn.au/Webcam#Authentication">https://wiki.ucc.asn.au/Webcam#Authentication</a></p> diff --git a/archive.html b/archive.html index e75c1507c7ee2f55a62db613e1458d1831ae9ec9..6c63b058431d11e3d9495b3862f3b6b8d39c3e28 100755 --- a/archive.html +++ b/archive.html @@ -58,6 +58,7 @@ <div class="camera" id="webcam1"><img alt="Webcam 2"></div> <div class="camera" id="ipcamera1"><img alt="IPCamera1"></div> <div class="camera" id="ipcamera11"><img alt="IPCamera11"></div> + <div class="camera" id="ipcamera12"><img alt="IPCamera12"></div> <div class="camera" id="ipcamera2"><img alt="IPCamera2"></div> <div class="camera" id="ipcamera3"><img alt="IPCamera3"></div> <div class="camera" id="ipcamera4"><img alt="IPCamera4"></div> @@ -66,7 +67,9 @@ <div class="camera" id="ipcamera6"><img alt="IPCamera6"></div> <div class="camera" id="ipcamera9"><img alt="IPCamera9"></div> <div class="camera" id="ipcamera10"><img alt="IPCamera10"></div> + <!-- unisfa committee requested archive not be readily available 2022-03-31 <div class="camera" id="ipcamera8"><img alt="IPCamera8"></div> + --> </div> <div id="footerNav" class="nav"> <table> diff --git a/archive.js b/archive.js index cec3f380899262c06556dc957bcf753d1e513feb..768083caf150ce207d6a034832b927e733ac3a28 100755 --- a/archive.js +++ b/archive.js @@ -322,6 +322,7 @@ function setDate() updateWebcam ("uvc1" , "archive.php?camera=uvc1×tamp=" + timestamp); updateWebcam ("ipcamera1", "archive.php?camera=ipcamera1×tamp=" + timestamp); updateWebcam ("ipcamera11", "archive.php?camera=ipcamera11×tamp=" + timestamp); + updateWebcam ("ipcamera12", "archive.php?camera=ipcamera12×tamp=" + timestamp); updateWebcam ("ipcamera2", "archive.php?camera=ipcamera2×tamp=" + timestamp); updateWebcam ("ipcamera3", "archive.php?camera=ipcamera3×tamp=" + timestamp); updateWebcam ("ipcamera4", "archive.php?camera=ipcamera4×tamp=" + timestamp); diff --git a/archive.php b/archive.php index 7030541dd0205dd12cbe743adcd6c7bc6f4869ef..b67357d0eefe292b2c8be3e231d24dfdc4b67673 100644 --- a/archive.php +++ b/archive.php @@ -14,6 +14,7 @@ "ipcamera1", "ipcamera10", "ipcamera11", + "ipcamera12", "ipcamera2", "ipcamera3", "ipcamera4", diff --git a/webcam.css b/webcam.css index d8924d3a598176f4c4922223f35d3e06048f7319..d7eb46b017403f1ec2e5301cb75e33e6c2341330 100644 --- a/webcam.css +++ b/webcam.css @@ -68,8 +68,8 @@ h1 { } .camera img { - max-width: 465px; - width: 100%; + width: 465px; + max-width: 100%; } .footer { diff --git a/webcams.js b/webcams.js index c84f34b382f0f9426914a69f5c26db5e04b814c0..6f5e2ba516f8927812699085ab96697a0eee9f91 100755 --- a/webcams.js +++ b/webcams.js @@ -66,7 +66,7 @@ function updateWebcam (webcamid, webcamurl) function updateTime() { var date = new Date (); - updateWebcam ("ipcamera1", "camera.php?camera=ipcamera1"); + updateWebcam ("ipcamera11", "camera.php?camera=ipcamera11"); updateWebcam ("ipcamera2", "camera.php?camera=ipcamera2"); updateWebcam ("ipcamera3", "camera.php?camera=ipcamera3"); updateWebcam ("ipcamera4", "camera.php?camera=ipcamera4");