Merge branch 'wip'

app/modules/directory_service/scripts/directoryservice.sh

@@ -24,16 +24,18 @@ case "$DS" in
 	# osvers is 10 for 10.6, 11 for 10.7, 12 for 10.8, 13 for 10.9, etc.
 	osversionlong=$(uname -r)
 	osvers=${osversionlong/.*/}
-	localhostname=`/usr/sbin/scutil --get LocalHostName`
+
 	# Set variable for Domain
 	domain=`dscl localhost -list /Active\ Directory`
+	# Get AD computer object name
+	adbindname=$(defaults read "/Library/Preferences/OpenDirectory/Configurations/Active Directory/$domain" trustaccount)
 
 	if [[ ${osvers} -ge 11 ]]; then
-		AD_COMMENTS=`dscl /Search -read Computers/"${localhostname}"$ Comment 2>/dev/null | tr -d '\n' | awk '{$1 =""; print }'`
+		AD_COMMENTS=`dscl /Search -read Computers/"${adbindname}"$ Comment 2>/dev/null | tr -d '\n' | awk '{$1 =""; print }'`
 	fi
 
 	if [ "${osvers}" = 10 ]; then
-		AD_COMMENTS=`dscl /Active\ Directory/All\ Domains/ -read Computers/"${localhostname}"$ Comment 2>/dev/null | tr -d '\n' | awk '{$1 =""; print }'`	
+		AD_COMMENTS=`dscl /Active\ Directory/All\ Domains/ -read Computers/"${adbindname}"$ Comment 2>/dev/null | tr -d '\n' | awk '{$1 =""; print }'`	
 	fi
 
 	echo "Active Directory Comments = ${AD_COMMENTS}" >> "$DIR/cache/directoryservice.txt"

app/views/dashboard/dashboard.php

@@ -18,23 +18,6 @@
 
 </div>	<!-- /container -->
 
-<script>
-
-// Automatically refresh widgets
-$(document).on('appReady', function(e, lang) {
-
-	var delay = 60; // seconds
-	var refresh = function(){
-
-		$(document).trigger('appUpdate');
-
-		setTimeout(refresh, delay * 1000);
-	}
-
-	refresh();
-
-});
-
-</script>
+<script src="<?php echo conf('subdirectory'); ?>assets/js/munkireport.autoupdate.js"></script>
 
 <?php $this->view('partials/foot'); ?>

app/views/install/install_script.php

@@ -1,10 +1,7 @@
 <?php header("Content-Type: text/plain");
 ?>#!/bin/bash
 
-BASEURL="<?php echo
-	(isset($_SERVER['HTTPS']) && $_SERVER['HTTPS'] ? 'https://' : 'http://')
-	. $_SERVER['HTTP_HOST']
-	. conf('subdirectory'); ?>"
+BASEURL="<?php echo conf('webhost') . conf('subdirectory'); ?>"
 TPL_BASE="${BASEURL}/assets/client_installer/"
 MUNKIPATH="/usr/local/munki/" # TODO read munkipath from munki config
 CACHEPATH="${MUNKIPATH}preflight.d/cache/"

app/views/report/appVersions.php

@@ -14,4 +14,6 @@
 
 </div>  <!-- /container -->
 
+<script src="<?php echo conf('subdirectory'); ?>assets/js/munkireport.autoupdate.js"></script>
+
 <?$this->view('partials/foot')?>

app/views/report/backup.php

@@ -14,4 +14,6 @@
 
 </div>  <!-- /container -->
 
+<script src="<?php echo conf('subdirectory'); ?>assets/js/munkireport.autoupdate.js"></script>
+
 <?php $this->view('partials/foot'); ?>

app/views/report/clients.php

@@ -22,4 +22,6 @@
 
 </div>  <!-- /container -->
 
+<script src="<?php echo conf('subdirectory'); ?>assets/js/munkireport.autoupdate.js"></script>
+
 <?php $this->view('partials/foot'); ?>

app/views/report/configuration.php

@@ -24,4 +24,6 @@
 
 </div>  <!-- /container -->
 
+<script src="<?php echo conf('subdirectory'); ?>assets/js/munkireport.autoupdate.js"></script>
+
 <?php $this->view('partials/foot'); ?>

app/views/report/hardware.php

@@ -37,4 +37,6 @@
 
 </div>  <!-- /container -->
 
+<script src="<?php echo conf('subdirectory'); ?>assets/js/munkireport.autoupdate.js"></script>
+
 <?php $this->view('partials/foot'); ?>

app/views/report/munki.php

@@ -28,4 +28,6 @@
 
 </div>  <!-- /container -->
 
+<script src="<?php echo conf('subdirectory'); ?>assets/js/munkireport.autoupdate.js"></script>
+
 <?php $this->view('partials/foot'); ?>

app/views/report/network.php

@@ -20,4 +20,6 @@
 
 </div>  <!-- /container -->
 
+<script src="<?php echo conf('subdirectory'); ?>assets/js/munkireport.autoupdate.js"></script>
+
 <?php $this->view('partials/foot'); ?>

app/views/report/power.php

@@ -16,4 +16,6 @@
 
 </div>  <!-- /container -->
 
+<script src="<?php echo conf('subdirectory'); ?>assets/js/munkireport.autoupdate.js"></script>
+
 <?php $this->view('partials/foot'); ?>

assets/js/munkireport.autoupdate.js

@@ -0,0 +1,14 @@
+// Automatically refresh widgets
+$(document).on('appReady', function(e, lang) {
+
+	var delay = 60; // seconds
+	var refresh = function(){
+
+		$(document).trigger('appUpdate');
+
+		setTimeout(refresh, delay * 1000);
+	}
+
+	refresh();
+
+});