diff --git a/.gitignore b/.gitignore
index 2c91b88..7ad9690 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,13 @@
.DS_Store
.svn
+NetSUSLPInstaller.run
+.name
+compiler.xml
+misc.xml
+modules.xml
+NetSUS.iml
+vcs.xml
+workspace.xml
+profiles_settings.xml
+cgolds.xml
diff --git a/CHANGELOG.md b/CHANGELOG.md
old mode 100644
new mode 100755
index 395a829..6d72491
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
# NetSUS Changelog
+## 4.1
+
+* New and improved User Interface and minor changes to the User Experience
+* Added LDAP administration group login support
+* Added ability to rename the advertised NetBoot name
+* Documentation updated, improved, and converted to markdown format
## 4.0
diff --git a/README.md b/README.md
old mode 100644
new mode 100755
index 7bc6b80..b01e7b1
--- a/README.md
+++ b/README.md
@@ -1,58 +1,54 @@
-
-NetSUS Downloads
-======
-
-Installer:
-http://content.jamfcloud.com/NetSUSLP_4.0.0.run
-
-OVA:
-http://content.jamfcloud.com/NetSUSLP_4.0.0.ova
-
-
-
-
-# What is NetSUS?
-
-The NetBoot/SUS/LP server allows you to host an internal software update server (SUS), a NetBoot server, and a LDAP Proxy server **all on the same Linux system**. For a list of supported Linux distributions see [Requirements](#requirements).
-
-
-
-* **Software Update Server** - Unlike a standard SUS, the SUS hosted by the NetBoot/SUS/LP server allows you to control which software updates should be installed on each computer in your organization.
-
-* **NetBoot Server** - The NetBoot/SUS/LP server allows you to host a NetBoot image. You can boot computers to a NetBoot image in place of a recovery partition or external drive when imaging.
-
-* **LDAP Proxy** - Use the NetBoot/SUS/LP server as a lightweight proxy that acts as a middleware layer between LDAP clients and LDAP directory servers.
-
-* **Web Application** - The NetBoot/SUS/LP server includes a web application that can be used to easily manage your NetBoot and Software Update Servers as well as your LDAP Proxy. The dashboard page is shown above.
-
-## Documentation
-
-For a getting started guide and step-by-step walkthroughs check out the **[documentation for the current release](docs/README.md)**
-
-## Requirements
-
-#### Supported Linux distributions:
-
-* Ubuntu 10.04 LTS Server
-* Ubuntu 12.04 LTS Server
-* Ubuntu 14.04 LTS Server
-* Red Hat Enterprise Linux (RHEL) 6.4 or later
-* CentOS 6.4 or later
-
-#### To install the NetBoot/SUS/LP server using an installer, you need:
-
-* The NetBoot/SUS/LP Server Installer (.run), available at:
-
-* 300 GB of disk space available
-* 1 GB of RAM
-
-#### To set up the NetBoot/SUS/LP server as an appliance, you need:
-
-* The OVA file for the NetBoot/SUS/LP server, available at:
-
-* Virtualization software that supports Open Virtualization Format
-* 300 GB of disk space available
-* 2 GB of RAM
-
-**Only Intel-based Macs can use a NetBoot server hosted by the NetBoot/SUS/LP server.**
-
+
+# NetSUS Downloads
+
+Installer:
+http://content.jamfcloud.com/NetSUSLP_4.0.0.run
+
+OVA:
+http://content.jamfcloud.com/NetSUSLP_4.0.0.ova
+
+
+# What is NetSUS?
+
+The NetBoot/SUS/LP server allows you to host an internal software update server (SUS), a NetBoot server, and a LDAP Proxy server **all on the same Linux system**. For a list of supported Linux distributions see [Requirements](#requirements).
+
+
+
+* **Software Update Server** - Unlike a standard SUS, the SUS hosted by the NetBoot/SUS/LP server allows you to control which software updates should be installed on each computer in your organization.
+
+* **NetBoot Server** - The NetBoot/SUS/LP server allows you to host a NetBoot image. You can boot computers to a NetBoot image in place of a recovery partition or external drive when imaging.
+
+* **LDAP Proxy** - Use the NetBoot/SUS/LP server as a lightweight proxy that acts as a middleware layer between LDAP clients and LDAP directory servers.
+
+* **Web Application** - The NetBoot/SUS/LP server includes a web application that can be used to easily manage your NetBoot and Software Update Servers as well as your LDAP Proxy. The dashboard page is shown above.
+
+## Documentation
+
+For a getting started guide and step-by-step walkthroughs check out the **[documentation for the current release](docs/README.md)**
+
+## Requirements
+
+#### Supported Linux distributions:
+
+* Ubuntu 10.04 LTS Server
+* Ubuntu 12.04 LTS Server
+* Ubuntu 14.04 LTS Server
+* Red Hat Enterprise Linux (RHEL) 6.4 or later
+* CentOS 6.4 or later
+
+#### To install the NetBoot/SUS/LP server using an installer, you need:
+
+* The NetBoot/SUS/LP Server Installer (.run), available at:
+
+* 300 GB of disk space available
+* 1 GB of RAM
+
+#### To set up the NetBoot/SUS/LP server as an appliance, you need:
+
+* The OVA file for the NetBoot/SUS/LP server, available at:
+
+* Virtualization software that supports Open Virtualization Format
+* 300 GB of disk space available
+* 2 GB of RAM
+
+**Only Intel-based Macs can use a NetBoot server hosted by the NetBoot/SUS/LP server.**
\ No newline at end of file
diff --git a/docs/README.md b/docs/README.md
old mode 100644
new mode 100755
diff --git a/docs/accounts.md b/docs/accounts.md
old mode 100644
new mode 100755
index cae392b..22aa6f0
--- a/docs/accounts.md
+++ b/docs/accounts.md
@@ -1,16 +1 @@
-# Accounts
The following table lists the default credentials for all accounts associated with the NetBoot/SUS/LP server:
-
-Account | Username | Password
-------- | -------- | --------
-Web Application | webadmin | webadmin
-Shell (used to administer the NetBoot/SUS/LP server from the command line) | shelluser | shelluser
-AFP share | afpuser | afpuser
-SMB user | smbuser | smbuser
-
-You can change the usernames and passwords for the web application and shell accounts. You can also change the passwords for the AFP and SMB shares.
-
-## Changing the Web Application or Shell Credentials
-
1. Log in to the NetBoot/SUS/LP server web application.
-
2. In the top-right corner of the page, click **Settings** .
3. In the "NetBoot/SUS/LDAP Proxy Server" section, click **Accounts** .
4. Change the credentials using the fields and tabs provided.
5. Click **Save**. A message displays, reporting the success or failure of the change.
-
-## Changing the Password for the AFP or SMB Share
1. Log in to the NetBoot/SUS/LP server web application.
2. In the top-right corner of the page, click **Settings** .
3. In the "Shares" section, click **AFP** or **SMB** .
4. Enter and verify the new password.
5. Click **Save**. A message displays, reporting the success or failure of the change.
+# Accounts
The following table lists the default credentials for all accounts associated with the NetBoot/SUS/LP server:
Account | Username | Password
------- | -------- | --------
Web Application | webadmin | webadmin
Shell (used to administer the NetBoot/SUS/LP server from the command line) | shelluser | shelluser
AFP share | afpuser | afpuser
SMB user | smbuser | smbuser
You can change the usernames and passwords for the web application and shell accounts. You can also change the passwords for the AFP and SMB shares.
## Changing the Web Application or Shell Credentials
1. Log in to the NetBoot/SUS/LP server web application.
2. In the side navigation menu or in the mobile dropdown menu, click **Settings** .
3. In the "NetBoot/SUS/LDAP Proxy Server" section, click **Accounts** .
4. Change the credentials using the fields and tabs provided.
5. Click **Save**. A message displays, reporting the success or failure of the change.
## Changing the Password for the AFP or SMB Share
1. Log in to the NetBoot/SUS/LP server web application.
2. In the top-right corner of the page, click **Settings** .
3. In the "Shares" section, click **AFP** or **SMB** .
4. Enter and verify the new password.
5. Click **Save**. A message displays, reporting the success or failure of the change.
\ No newline at end of file
diff --git a/docs/getting_started.md b/docs/getting_started.md
old mode 100644
new mode 100755
diff --git a/docs/images/attachments/certificates.png b/docs/images/attachments/certificates.png
old mode 100755
new mode 100644
index 604dc84..848d1c1
Binary files a/docs/images/attachments/certificates.png and b/docs/images/attachments/certificates.png differ
diff --git a/docs/images/attachments/dashboard.png b/docs/images/attachments/dashboard.png
index 24d0e13..b94d5e3 100644
Binary files a/docs/images/attachments/dashboard.png and b/docs/images/attachments/dashboard.png differ
diff --git a/docs/images/attachments/ldap_proxy.png b/docs/images/attachments/ldap_proxy.png
old mode 100755
new mode 100644
index 54a5ca5..8e428bb
Binary files a/docs/images/attachments/ldap_proxy.png and b/docs/images/attachments/ldap_proxy.png differ
diff --git a/docs/images/attachments/netboot.png b/docs/images/attachments/netboot.png
old mode 100755
new mode 100644
index 55c8a9a..6ad05a8
Binary files a/docs/images/attachments/netboot.png and b/docs/images/attachments/netboot.png differ
diff --git a/docs/images/attachments/netboot_lower.png b/docs/images/attachments/netboot_lower.png
new file mode 100644
index 0000000..5d9b3ea
Binary files /dev/null and b/docs/images/attachments/netboot_lower.png differ
diff --git a/docs/images/attachments/proxy_diagram.png b/docs/images/attachments/proxy_diagram.png
old mode 100644
new mode 100755
diff --git a/docs/images/attachments/sus_branch_lower.png b/docs/images/attachments/sus_branch_lower.png
deleted file mode 100755
index 42e707e..0000000
Binary files a/docs/images/attachments/sus_branch_lower.png and /dev/null differ
diff --git a/docs/images/attachments/sus_branch_upper.png b/docs/images/attachments/sus_branch_upper.png
old mode 100755
new mode 100644
index 42bb059..1f58b02
Binary files a/docs/images/attachments/sus_branch_upper.png and b/docs/images/attachments/sus_branch_upper.png differ
diff --git a/docs/images/attachments/sus_no_branch.png b/docs/images/attachments/sus_no_branch.png
new file mode 100644
index 0000000..276e9df
Binary files /dev/null and b/docs/images/attachments/sus_no_branch.png differ
diff --git a/docs/images/attachments/sus_no_branches.png b/docs/images/attachments/sus_no_branches.png
deleted file mode 100755
index e160db6..0000000
Binary files a/docs/images/attachments/sus_no_branches.png and /dev/null differ
diff --git a/docs/images/attachments/sus_sync.png b/docs/images/attachments/sus_sync.png
new file mode 100644
index 0000000..5aa0048
Binary files /dev/null and b/docs/images/attachments/sus_sync.png differ
diff --git a/docs/images/attachments/sus_with_branch.png b/docs/images/attachments/sus_with_branch.png
deleted file mode 100755
index 90db954..0000000
Binary files a/docs/images/attachments/sus_with_branch.png and /dev/null differ
diff --git a/docs/images/thumbnails/settings_icon.png b/docs/images/thumbnails/settings_icon.png
index e1ed0c3..b05532b 100755
Binary files a/docs/images/thumbnails/settings_icon.png and b/docs/images/thumbnails/settings_icon.png differ
diff --git a/docs/ldap_proxy.md b/docs/ldap_proxy.md
old mode 100644
new mode 100755
index d973d09..727fa2f
--- a/docs/ldap_proxy.md
+++ b/docs/ldap_proxy.md
@@ -1,14 +1,25 @@
-# LDAP Proxy Server
The LDAP Proxy Server is a proxy server that allows you to expose an access point to an LDAP Server. In doing so it allows you to adjust the distinguished name to whatever you choose. You may find the following diagram helpful when filling out your proxy information.
+# LDAP Proxy Server
+The LDAP Proxy Server is a proxy server that allows you to expose an access point to an LDAP Server. In doing so it allows you to adjust the distinguished name to whatever you choose. You may find the following diagram helpful when filling out your proxy information.
-
-
1. Log in to the NetBoot/SUS/LP server web application.
2. Click **LDAP Proxy** in the side navigation menu.
On a smartphone, this option is in the pop-up menu.
3. Enter your **Exposed Distinguished Name** that you intend to use to reach the proxy. For more information, see [Exposed Distinguished Name](#edn)
4. Enter your **Real Distinguished Name** that you use to connect to the LDAP Server. For more information, see [Real Distinguished Name](#rdn)
-
-5. Enter your **LDAP URL** with the port of the LDAP Server. For more information, see [LDAP URL](#lu)
6. Click **Add**
+
-
7. Enter as many other LDAP Connections as you want to configure
+1. Log in to the NetBoot/SUS/LP server web application.
-8. Click **Enable LDAP Proxy**
+2. Click **LDAP Proxy** in the side navigation menu or in the mobile dropdown menu.
+
+3. Enter your **Exposed Distinguished Name** that you intend to use to reach the proxy. For more information, see [Exposed Distinguished Name](#edn)
+
+4. Enter your **Real Distinguished Name** that you use to connect to the LDAP Server. For more information, see [Real Distinguished Name](#rdn)
+
+5. Enter your **LDAP URL** with the port of the LDAP Server. For more information, see [LDAP URL](#lu)
+6. Click **Add**
+
+
+
+7. Enter as many other LDAP Connections as you want to configure
+
+8. Click **Enable LDAP Proxy**
## Exposed Distinguished Name
diff --git a/docs/netboot.md b/docs/netboot.md
old mode 100644
new mode 100755
index 2390a92..3616ca8
--- a/docs/netboot.md
+++ b/docs/netboot.md
@@ -1,17 +1 @@
-# Setting Up the NetBoot Server
-
To set up a NetBoot server, you need a NetBoot image (.nbi folder). For more information, see the following Knowledge Base article:
[Creating a NetBoot Image and Setting Up a NetBoot Server](https://jamfnation.jamfsoftware.com/article.html?id=307)
-
-1. Log in to the NetBoot/SUS/LP server web application.
2. Click **NetBoot Server**.
On a smartphone, this option is in the pop-up menu.
3. Upload a NetBoot image:
* Click **Upload NetBoot Image**.
-
-
-
* You will be connected to the SMB share where NetBoot images are stored.
* Enter credentials for the SMB share and click **Connect**.
* Copy a NetBoot image (.nbi) to the SMB share.
-
- **Important:** The name of the folder cannot contain any spaces.
4. Return to the NetBoot/SUS/LP server web application and refresh the page.
5. Choose the NetBoot image from the pop-up menu.
6. Choose subnets for the NetBoot image by entering a subnet and a netmask. Then click **Add Subnet**.
-
- **Important**: One of the subnets must include the IP address of the NetBoot server.
7. Click **Enable NetBoot**. If NetBoot is successfully enabled, the NetBoot status icon turns green.
-
-## Using the NetBoot Server with the Casper Suite
**Note**: The instructions in this section are for the Casper Suite v9.0 or later. However, if you are using the Casper Suite v8.x, these instructions can still be followed loosely.
-
Like standard NetBoot servers, you can add the NetBoot server hosted by the NetBoot/SUS/LP server to the JSS. This allows you to use a policy or Casper Remote to boot managed computers to a NetBoot image.
-
When adding the NetBoot server to the JSS, enter the IP address specified in the NetBoot/SUS/LP server web application and choose the “Use default image” option from the NetBoot Image pop-up menu.
-
For more information on adding a NetBoot server to the JSS, see the “NetBoot Servers” section in the Casper Suite Administrator’s Guide.
-
For more information on using a policy or Casper Remote to boot computers to a NetBoot image, see the “Booting Computers to NetBoot Images” section in the Casper Suite Administrator’s Guide.
\ No newline at end of file
+# Setting Up the NetBoot Server
To set up a NetBoot server, you need a NetBoot image (.nbi folder). For more information, see the following Knowledge Base article:
[Creating a NetBoot Image and Setting Up a NetBoot Server](https://jamfnation.jamfsoftware.com/article.html?id=307)
1. Log in to the NetBoot/SUS/LP server web application.
2. Click **NetBoot Server** in the side navigation menu or in the mobile dropdown menu.
3. Upload a NetBoot image:
* Click **Upload NetBoot Image**.
* You will be connected to the SMB share where NetBoot images are stored.
* Enter credentials for the SMB share and click **Connect**.
* Copy a NetBoot image folder (.nbi extension) to the SMB share. The nbi folder must contain a .plist file and .dmg file to function properly.
**Important:** The name of the folder cannot contain any spaces.
4. Return to the NetBoot/SUS/LP server web application and refresh the page.
5. Choose the NetBoot image from the pop-up menu.
6. **Optional:** Enter a name for your Netboot Server. The name cannot contain spaces. If left blank the name will default to the name of your .nbi folder uploaded previously. For common issues on this setting please see the troubleshooting section below.
7. Choose subnets for the NetBoot image by entering a subnet and a netmask. Then click **Add**.
**Important**: One of the subnets must include the IP address of the NetBoot server.
8. Click **Enable NetBoot**. If NetBoot is successfully enabled, the NetBoot status alert turns green.
## Troubleshooting
The best place to gather information on why your NetBoot Server might not be working is the "dhcpd" service logs in your system's default log locaion. For example:
On Debian family distributions you would enter the command
`grep "dhcpd" /var/log/syslog`
On Red Hat family distributions you would enter the command
`grep "dhcpd" /var/log/messages`
Either of these commands will output a list of logs related to the dhcpd service to your console window.
## Using the NetBoot Server with the Casper Suite
**Note**: The instructions in this section are for the Casper Suite v9.0 or later. However, if you are using the Casper Suite v8.x, these instructions can still be followed loosely.
Like standard NetBoot servers, you can add the NetBoot server hosted by the NetBoot/SUS/LP server to the JSS. This allows you to use a policy or Casper Remote to boot managed computers to a NetBoot image.
When adding the NetBoot server to the JSS, enter the IP address specified in the NetBoot/SUS/LP server web application and choose the “Use default image” option from the NetBoot Image pop-up menu.
For more information on adding a NetBoot server to the JSS, see the “NetBoot Servers” section in the Casper Suite Administrator’s Guide.
For more information on using a policy or Casper Remote to boot computers to a NetBoot image, see the “Booting Computers to NetBoot Images” section in the Casper Suite Administrator’s Guide.
\ No newline at end of file
diff --git a/docs/settings.md b/docs/settings.md
old mode 100644
new mode 100755
index 148e13a..ee7cf58
--- a/docs/settings.md
+++ b/docs/settings.md
@@ -9,7 +9,7 @@ You may need to restart the AFP or SMB share for troubleshooting purposes.
1. Log in to the NetBoot/SUS/LP server web application.
-2. In the top-right corner of the page, click **Settings** .
+2. In the side navigation menu or in the mobile dropdown menu, click **Settings** .
3. In the "Shares" section, click **AFP** or **SMB** .
@@ -21,7 +21,7 @@ The User Menu now adds additional functionality to be able to Disable GUI.
1. Log in to the NetBoot/SUS/LP server web application.
-2. In the top-right corner of the page, click the username drop down.
+2. In the side navigation menu or in the mobile dropdown menu, click the username drop down.
3. In the drop down list select Disable GUI.
@@ -62,7 +62,7 @@ The Network settings allow you to configure the following:
1. Log in to the NetBoot/SUS/LP server web application.
-2. In the top-right corner of the page, click **Settings** .
+2. In the side navigation menu or in the mobile dropdown menu, click **Settings** .
3. In the "NetBoot/SUS/LDAP Proxy Server" section, click **Network** .
@@ -80,7 +80,7 @@ The Date/Time settings allow you to do the following:
1. Log in to the NetBoot/SUS/LP server web application.
-2. In the top-right corner of the page, click **Settings** .
+2. In the side navigation menu or in the mobile dropdown menu, click **Settings** .
3. In the "NetBoot/SUS/LDAP Proxy Server" section, click **Date/Time** .
@@ -94,13 +94,13 @@ Certificates Settings allows you to modify the server settings with either a Tom
1. Log in to the NetBoot/SUS/LP server web application.
-2. In the top-right corner of the page, click **Settings** .
+2. In the side navigation menu or in the mobile dropdown menu, click **Settings** .
3. In the "NetBoot/SUS/LDAP Proxy Server" section, click **Certificates** .
4. Enter the "Private Key", "Certificate", and "Chain" fields with the appropriate unencrypted certificate information.
-
+
5. Click **Save**.
diff --git a/docs/sus.md b/docs/sus.md
old mode 100644
new mode 100755
index 59c0f81..b6c9b3f
--- a/docs/sus.md
+++ b/docs/sus.md
@@ -1,76 +1,132 @@
# Managing a Software Update Server (SUS)
-
The SUS hosted by the NetBoot/SUS/LP server uses Reposado, an open source software update application.
Unlike a standard SUS, you can divide the SUS hosted by the NetBoot/SUS/LP server into branches and enable different software updates on each branch. This gives you more control over which updates should be installed on each computer in your organization.
-## Setting Up the SUS
1. Log in to the NetBoot/SUS/LP server web application.
2. Click Software Update Server.
On a smartphone, this option is in the pop-up menu.
3. Enter a base URL and click Change URL.
+The SUS hosted by the NetBoot/SUS/LP server uses Reposado, an open source software update application.
+Unlike a standard SUS, you can divide the SUS hosted by the NetBoot/SUS/LP server into branches and enable different software updates on each branch. This gives you more control over which updates should be installed on each computer in your organization.
-
+## Setting Up the SUS
+
+1. Log in to the NetBoot/SUS/LP server web application.
+
+2. Click **Software Update Server** in the side navigation menu or in the mobile dropdown menu.
+
+3. Enter a base URL and click Change URL.
+
+
4. Create at least one branch by typing a branch name in the New Branch field and clicking Add. Repeat as needed for each branch.
## Syncing with Apple's Software Update Server
-
You can sync the list of available software updates with Apple’s Software Update server manually or on a schedule.
-
1. Log in to the NetBoot/SUS/LP server web application.
2. Click Software Update Server. On a smartphone, this option is in the pop-up menu.
+
+You can sync the list of available software updates with Apple’s Software Update server manually or on a schedule.
+
+1. Log in to the NetBoot/SUS/LP server web application.
+
+2. Click **Software Update Server** in the side navigation menu or in the mobile dropdown menu.
3. Sync the list of available software updates manually, or choose a time to sync the list each day.
-
+
## Configuring SUS Branches
-
The NetBoot/SUS/LP server web application allows you to do the following for each branch:
-
* Make the branch the root.
* Manually enable or disable software updates.
-* Automatically enable new software updates.
1. Log in to the NetBoot/SUS/LP server web application.
2. Click Software Update Server.
On a smartphone, this option is in the pop-up menu.
3. Click the branch you want to configure.
4. Configure the branch using the settings on the pane.
-
-5. Click Apply below the list of software updates.
+The NetBoot/SUS/LP server web application allows you to do the following for each branch:
+
+* Make the branch the root.
+* Manually enable or disable software updates.
+* Automatically enable new software updates.
+1. Log in to the NetBoot/SUS/LP server web application.
+
+2. Click **Software Update Server** in the side navigation menu or in the mobile dropdown menu.
+
+3. Click the branch you want to configure.
+
+4. Configure the branch using the settings on the pane.
+
+
+
+5. Click **Apply** below the list of software updates or at the top of the page.
-
-
# Using the SUS with the Casper Suite
-
Like a standard SUS, you can use the SUS hosted by the NetBoot/SUS/LP server to run Software Update on computers that are enrolled with the JSS. This involves pointing computers at a branch, and then using a policy or Casper Remote to run Software Update on the computers.
-
## Pointing Computers at a SUS Branch
**Note:** The instructions in this section are for the Casper Suite v9.0 or later. However, if you are using the Casper Suite v8.x, these instructions can still be followed loosely.
-
There are several ways to point computers at a SUS branch:
-
* Use network segments (root branch only)
-* Use a configuration profile
* Use Managed Preferences
* Use a policy or Casper Remote
-
### Pointing Computers at a SUS Branch Using Network Segments
-
This method is available for the root branch only. It involves adding the root branch to the JSS as a software update server, and then using network segments to set a default software update server for computers.
-
For more information, see the “Software Update Servers” and “Network Segments” sections in the Casper Suite Administrator’s Guide.
-
When adding the root branch to the JSS as a software update server, be sure to enter “80” for the port.
+
+Like a standard SUS, you can use the SUS hosted by the NetBoot/SUS/LP server to run Software Update on computers that are enrolled with the JSS. This involves pointing computers at a branch, and then using a policy or Casper Remote to run Software Update on the computers.
+
+## Pointing Computers at a SUS Branch
+**Note:** The instructions in this section are for the Casper Suite v9.0 or later. However, if you are using the Casper Suite v8.x, these instructions can still be followed loosely.
+
+There are several ways to point computers at a SUS branch:
+
+* Use network segments (root branch only)
+* Use a configuration profile
+* Use Managed Preferences
+* Use a policy or Casper Remote
+
+### Pointing Computers at a SUS Branch Using Network Segments
+
+This method is available for the root branch only. It involves adding the root branch to the JSS as a software update server, and then using network segments to set a default software update server for computers.
+
+For more information, see the “Software Update Servers” and “Network Segments” sections in the Casper Suite Administrator’s Guide.
+
+When adding the root branch to the JSS as a software update server, be sure to enter “80” for the port.
+
### Pointing Computers at a SUS Branch Using a Configuration Profile
-
Create a configuration profile with the branch URL entered in the **Software Update Server** field in the Software Update payload.
-
For more information on creating configuration profiles, see the “OS X Configuration Profiles” section in the Casper Suite Administrator’s Guide.
-
For more information on branch URLs, see the “Branch URLs” section below.
-
### Pointing Computers at a SUS Branch Using Managed Preferences
-
Create a Managed Preference profile with the branch URL entered in the **Software Update Server** field in the Software Update payload.
-
For more information on creating Managed Preference profiles, see the “Managed Preferences” section in the Casper Suite Administrator’s Guide.
-
For more information on branch URLs, see the “Branch URLs” section below.
-
### Pointing Computers at a SUS Branch by Executing a Command
-
Use a policy or Casper Remote to execute the following command on managed computers:
+
+Create a configuration profile with the branch URL entered in the **Software Update Server** field in the Software Update payload.
+
+For more information on creating configuration profiles, see the “OS X Configuration Profiles” section in the Casper Suite Administrator’s Guide.
+
+For more information on branch URLs, see the “Branch URLs” section below.
+
+### Pointing Computers at a SUS Branch Using Managed Preferences
+
+Create a Managed Preference profile with the branch URL entered in the **Software Update Server** field in the Software Update payload.
+
+For more information on creating Managed Preference profiles, see the “Managed Preferences” section in the Casper Suite Administrator’s Guide.
+
+For more information on branch URLs, see the “Branch URLs” section below.
+
+### Pointing Computers at a SUS Branch by Executing a Command
+
+Use a policy or Casper Remote to execute the following command on managed computers:
defaults write /Library/Preferences com.apple.SoftwareUpdate CatalogURL
-
Substitute `` with the branch URL. For more information, see the “Branch URLs” section below.
-
You can execute a command from the Advanced pane in Casper Remote, or from the Files and Processes payload in a policy.
-
### Branch URLs
Branch URLs vary depending on the operating system of enrolled computers. Example branch URLs are listed below.
-
**OS X v10.5**
+
+Substitute `` with the branch URL. For more information, see the “Branch URLs” section below.
+
+You can execute a command from the Advanced pane in Casper Remote, or from the Files and Processes payload in a policy.
+
+### Branch URLs
+Branch URLs vary depending on the operating system of enrolled computers. Example branch URLs are listed below.
+
+**OS X v10.5**
http://sus.mycompany.corp/content/catalogs/others/index-leopard.merged-1_.sucatalog
-
**OS X v10.6**
+
+**OS X v10.6**
http://sus.mycompany.corp/content/catalogs/others/index-leopard-snowleopard.merged-1_.sucatalog
-
**OS X v10.7**
- http://sus.mycompany.corp/content/catalogs/others/index-lion-snowleopard-leopard.merged-1_.sucatalog
+**OS X v10.7**
+
+ http://sus.mycompany.corp/content/catalogs/others/index-lion-snowleopard-leopard.merged-1_.sucatalog
+
**OS X v10.8**
- http://sus.mycompany.corp/content/catalogs/others/index-mountainlion-lion-snowleopard-leopard. merged-1_.sucatalog
-
**OS X v10.9**
+ http://sus.mycompany.corp/content/catalogs/others/index-mountainlion-lion-snowleopard-leopard.merged-1_.sucatalog
+
+**OS X v10.9**
+
+ http://sus.mycompany.corp/content/catalogs/others/index-10.9-mountainlion-lion-snowleopard-leopard.merged-1_.sucatalog
+
+**OS X v10.10**
+
+ http://sus.mycompany.corp/content/catalogs/others/index-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1_.sucatalog
+
+**OS X v10.11**
+
+ http://sus.mycompany.corp/content/catalogs/others/index-10.11-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1_.sucatalog
+
+### Running Software Update on Computers
- http://sus.mycompany.corp/content/catalogs/others/index-10.9-mountainlion-lion-snowleopard- leopard.merged-1_.sucatalog
-
**OS X v10.10**
+For instructions on using the Casper Suite to run Software Update on computers that are managed by the JSS, see the “Running Software Update” section in the Casper Suite Administrator’s Guide.
- http://sus.mycompany.corp/content/catalogs/others/index-10.10-10.9-mountainlion-lion-snowleopard-leopard.merged-1_name>.sucatalog
-
**OS X v10.11**
- http://sus.mycompany.corp/content/catalogs/others/index-10.11-10.10-10.9-mountainlion-lion- snowleopard-leopard.merged-1_name>.sucatalog
-
### Running Software Update on Computers
-
For instructions on using the Casper Suite to run Software Update on computers that are managed by the JSS, see the “Running Software Update” section in the Casper Suite Administrator’s Guide.
-
\ No newline at end of file
diff --git a/webadmin/var/www/webadmin/AFP.php b/webadmin/var/www/webadmin/AFP.php
index e64048d..5c731d7 100644
--- a/webadmin/var/www/webadmin/AFP.php
+++ b/webadmin/var/www/webadmin/AFP.php
@@ -38,75 +38,51 @@
$accounterror = "All fields required.";
}
}
-
-
-
?>
-
-
-
-
-
- getSetting("mirrorpkgs") == "true")
- {
- echo "checked=\"checked\"";
- }?>
- onChange="javascript:ajaxPost('ajax.php?service=SUS', 'mirrorpkgs=' + this.checked);"/>
- Store software updates on the NetBoot/SUS/LDAP Proxy server
- Ensure that computers install software updates from the NetBoot/SUS server instead of downloading and installing them from Apple's software update server
+
+ Store Updates on the NetBoot/SUS/LDAP Proxy Server
+
+
- Manual Sync
+ Purge Deprecated Updates
+ Removes all deprecated products that are not in any branch catalogs
+
+
+ Manual Sync
+
Manual method for syncing the list of available updates with Apple's Software Update server
-
-
+
+
+ Daily Sync Time
- Daily Sync TimeTime at which to sync the list of available updates with Apple's Software Update server each day
-
-
-
-
-
-
+
+ Last Sync:
+
+
+
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/webadmin/var/www/webadmin/about.php b/webadmin/var/www/webadmin/about.php
index 5b6316b..0ad1acc 100644
--- a/webadmin/var/www/webadmin/about.php
+++ b/webadmin/var/www/webadmin/about.php
@@ -1,153 +1,151 @@
-
-
-
- Copyright (C) 2015, JAMF Software, LLC
- All rights reserved.
+
Additional License Information
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
-
-
+
+
+ Copyright (C) 2015, JAMF Software, LLC
+ All rights reserved.
-
-
Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+
-
Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
+
+
+
Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+
+
Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+
+
Neither the name of the JAMF Software, LLC nor the names of its contributors
+ may be used to endorse or promote products derived from this software without
+ specific prior written permission.
+
-
Neither the name of the JAMF Software, LLC nor the names of its contributors
- may be used to endorse or promote products derived from this software without
- specific prior written permission.
-
-
-
-
- THIS SOFTWARE IS PROVIDED BY JAMF SOFTWARE, LLC "AS IS" AND ANY EXPRESS OR IMPLIED
- WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
- AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JAMF SOFTWARE, LLC
- BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- POSSIBILITY OF SUCH DAMAGE.
-
-
+
+
+ THIS SOFTWARE IS PROVIDED BY JAMF SOFTWARE, LLC "AS IS" AND ANY EXPRESS OR IMPLIED
+ WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+ AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JAMF SOFTWARE, LLC
+ BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+ OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
+
+
\ No newline at end of file
diff --git a/webadmin/var/www/webadmin/accounts.php b/webadmin/var/www/webadmin/accounts.php
index 315d018..9227d90 100644
--- a/webadmin/var/www/webadmin/accounts.php
+++ b/webadmin/var/www/webadmin/accounts.php
@@ -4,12 +4,6 @@
include "inc/auth.php";
include "inc/functions.php";
-//Change the view depending on what tab the user has clicked on
-if (isset($_POST["userAction"]) && $_POST["userAction"] != "") {
- $userAction = $_POST["userAction"];
-} else {
- $userAction = "WebAdmin";
-}
$accounterror = "";
$accountsuccess = "";
@@ -87,123 +81,185 @@
}
}
+
+$ldaperror = "";
+$ldapsuccess = "";
+
+if (isset($_POST['saveLDAPConfiguration']) && isset($_POST['server']) && isset($_POST['domain']))
+{
+ if ($_POST['server'] == "")
+ {
+ $ldaperror = "Specify LDAP server.";
+ }
+ else if ($_POST['domain'] == "")
+ {
+ $ldaperror = "Specify a domain.";
+ }
+ else {
+ $conf->setSetting("ldapserver", $_POST['server']);
+ $conf->setSetting("ldapdomain", $_POST['domain']);
+ $ldapsuccess = "Saved LDAP configuration.";
+ }
+}
+if (isset($_POST['addadmin']) && isset($_POST['cn']) && $_POST['cn'] != "")
+{
+ $conf->addAdmin($_POST['cn']);
+}
+if (isset($_GET['deleteAdmin']) && $_GET['deleteAdmin'] != "")
+{
+ $conf->deleteAdmin($_GET['deleteAdmin']);
+}
+
$title = "Accounts";
include "inc/header.php";
-
?>
- ERROR: " . $accounterror . "
-
diff --git a/webadmin/var/www/webadmin/dashboard.php b/webadmin/var/www/webadmin/dashboard.php
index 4e43b0f..2dd8089 100644
--- a/webadmin/var/www/webadmin/dashboard.php
+++ b/webadmin/var/www/webadmin/dashboard.php
@@ -15,8 +15,8 @@
if ($conf->needsToChangeAnyPasses())
{
?>
-WARNING: Credentials have not been changed for the following accounts:
-
+
WARNING: Credentials have not been changed for the following accounts:
+
\ No newline at end of file
diff --git a/webadmin/var/www/webadmin/dateTime.php b/webadmin/var/www/webadmin/dateTime.php
index 555b07a..703fd06 100644
--- a/webadmin/var/www/webadmin/dateTime.php
+++ b/webadmin/var/www/webadmin/dateTime.php
@@ -19,51 +19,46 @@
$ts = $_POST['timeserver'];
setTimeServer($ts);
}
- echo "
Configuration saved.
";
+ echo "
Configuration saved.
";
}
?>
Date/Time
-
+
+
-
+
- Current Time
+ Current TimeCurrent time on the NetBoot/SUS/LDAP Proxy server
-
- Current Time Zone
+ Current Time ZoneCurrent time zone on the NetBoot/SUS/LDAP Proxy server
-
- Network Time Server
+ Network Time ServerServer to use to synchronize the date/time (e.g. "pool.ntp.org")
-
-
-
-
-
+
-
-
-
-
-
+
-
+
-
+
-
+
+
+
+
-
+
+
\ No newline at end of file
diff --git a/webadmin/var/www/webadmin/disablegui.php b/webadmin/var/www/webadmin/disablegui.php
index bb6fe3a..6b4a694 100644
--- a/webadmin/var/www/webadmin/disablegui.php
+++ b/webadmin/var/www/webadmin/disablegui.php
@@ -11,7 +11,7 @@
if (isset($_POST['confirm']))
{
echo '';
- echo '
NOTICE: GUI is disabled and you have been logged out. File system access is required to enable WebAdmin.
';
+ echo '
NOTICE: GUI is disabled and you have been logged out. File system access is required to enable WebAdmin.
- Are you sure you want to disable the web interface for the NetBoot/SUS/LDAP Proxy Server?
- >
+
Are you sure you want to disable the web interface for the NetBoot/SUS/LDAP Proxy Server?
-
-
-
-
-
-
- >
+ >
+
+
-
+
-
+
+
-
+ >
-
+
+
diff --git a/webadmin/var/www/webadmin/fonts/Roboto/LICENSE.txt b/webadmin/var/www/webadmin/fonts/Roboto/LICENSE.txt
new file mode 100755
index 0000000..d645695
--- /dev/null
+++ b/webadmin/var/www/webadmin/fonts/Roboto/LICENSE.txt
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
diff --git a/webadmin/var/www/webadmin/fonts/Roboto/Roboto-Bold.ttf b/webadmin/var/www/webadmin/fonts/Roboto/Roboto-Bold.ttf
new file mode 100755
index 0000000..a355c27
Binary files /dev/null and b/webadmin/var/www/webadmin/fonts/Roboto/Roboto-Bold.ttf differ
diff --git a/webadmin/var/www/webadmin/fonts/Roboto/Roboto-Light.ttf b/webadmin/var/www/webadmin/fonts/Roboto/Roboto-Light.ttf
new file mode 100755
index 0000000..94c6bcc
Binary files /dev/null and b/webadmin/var/www/webadmin/fonts/Roboto/Roboto-Light.ttf differ
diff --git a/webadmin/var/www/webadmin/fonts/Roboto/Roboto-Regular.ttf b/webadmin/var/www/webadmin/fonts/Roboto/Roboto-Regular.ttf
new file mode 100755
index 0000000..8c082c8
Binary files /dev/null and b/webadmin/var/www/webadmin/fonts/Roboto/Roboto-Regular.ttf differ
diff --git a/webadmin/var/www/webadmin/fonts/glyphicons-halflings-regular.eot b/webadmin/var/www/webadmin/fonts/glyphicons-halflings-regular.eot
new file mode 100644
index 0000000..b93a495
Binary files /dev/null and b/webadmin/var/www/webadmin/fonts/glyphicons-halflings-regular.eot differ
diff --git a/webadmin/var/www/webadmin/fonts/glyphicons-halflings-regular.svg b/webadmin/var/www/webadmin/fonts/glyphicons-halflings-regular.svg
new file mode 100644
index 0000000..94fb549
--- /dev/null
+++ b/webadmin/var/www/webadmin/fonts/glyphicons-halflings-regular.svg
@@ -0,0 +1,288 @@
+
+
+
\ No newline at end of file
diff --git a/webadmin/var/www/webadmin/fonts/glyphicons-halflings-regular.ttf b/webadmin/var/www/webadmin/fonts/glyphicons-halflings-regular.ttf
new file mode 100644
index 0000000..1413fc6
Binary files /dev/null and b/webadmin/var/www/webadmin/fonts/glyphicons-halflings-regular.ttf differ
diff --git a/webadmin/var/www/webadmin/fonts/glyphicons-halflings-regular.woff b/webadmin/var/www/webadmin/fonts/glyphicons-halflings-regular.woff
new file mode 100644
index 0000000..9e61285
Binary files /dev/null and b/webadmin/var/www/webadmin/fonts/glyphicons-halflings-regular.woff differ
diff --git a/webadmin/var/www/webadmin/fonts/glyphicons-halflings-regular.woff2 b/webadmin/var/www/webadmin/fonts/glyphicons-halflings-regular.woff2
new file mode 100644
index 0000000..64539b5
Binary files /dev/null and b/webadmin/var/www/webadmin/fonts/glyphicons-halflings-regular.woff2 differ
diff --git a/webadmin/var/www/webadmin/images/Lookup.png b/webadmin/var/www/webadmin/images/Lookup.png
deleted file mode 100755
index 524d7de..0000000
Binary files a/webadmin/var/www/webadmin/images/Lookup.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/NSUS-logo-plain.png b/webadmin/var/www/webadmin/images/NSUS-logo-plain.png
similarity index 100%
rename from webadmin/var/www/webadmin/images/navigation/NSUS-logo-plain.png
rename to webadmin/var/www/webadmin/images/NSUS-logo-plain.png
diff --git a/webadmin/var/www/webadmin/images/Refresh.png b/webadmin/var/www/webadmin/images/Refresh.png
deleted file mode 100755
index 5eaf5f0..0000000
Binary files a/webadmin/var/www/webadmin/images/Refresh.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/active.gif b/webadmin/var/www/webadmin/images/active.gif
deleted file mode 100644
index b5ec8e1..0000000
Binary files a/webadmin/var/www/webadmin/images/active.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bkg/IPCU-vertical-list-Bkg.png b/webadmin/var/www/webadmin/images/bkg/IPCU-vertical-list-Bkg.png
deleted file mode 100755
index 819d445..0000000
Binary files a/webadmin/var/www/webadmin/images/bkg/IPCU-vertical-list-Bkg.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bkg/bodyGradientBkgdRepeater.png b/webadmin/var/www/webadmin/images/bkg/bodyGradientBkgdRepeater.png
deleted file mode 100644
index 0ca2ff7..0000000
Binary files a/webadmin/var/www/webadmin/images/bkg/bodyGradientBkgdRepeater.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bkg/divGradientBkgdRepeaterGrey.gif b/webadmin/var/www/webadmin/images/bkg/divGradientBkgdRepeaterGrey.gif
deleted file mode 100644
index dc8fc3a..0000000
Binary files a/webadmin/var/www/webadmin/images/bkg/divGradientBkgdRepeaterGrey.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bkg/dkGradientBkgRepeater.gif b/webadmin/var/www/webadmin/images/bkg/dkGradientBkgRepeater.gif
deleted file mode 100644
index 12efee1..0000000
Binary files a/webadmin/var/www/webadmin/images/bkg/dkGradientBkgRepeater.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bkg/dotBkgRepeater.gif b/webadmin/var/www/webadmin/images/bkg/dotBkgRepeater.gif
deleted file mode 100644
index 34b7550..0000000
Binary files a/webadmin/var/www/webadmin/images/bkg/dotBkgRepeater.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bkg/jssHeaderBkgRepeater.gif b/webadmin/var/www/webadmin/images/bkg/jssHeaderBkgRepeater.gif
deleted file mode 100644
index b5a199c..0000000
Binary files a/webadmin/var/www/webadmin/images/bkg/jssHeaderBkgRepeater.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bkg/leftColContentWrapperBkgRepeater.png b/webadmin/var/www/webadmin/images/bkg/leftColContentWrapperBkgRepeater.png
deleted file mode 100644
index 43a8709..0000000
Binary files a/webadmin/var/www/webadmin/images/bkg/leftColContentWrapperBkgRepeater.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bkg/logout.png b/webadmin/var/www/webadmin/images/bkg/logout.png
deleted file mode 100644
index 406be36..0000000
Binary files a/webadmin/var/www/webadmin/images/bkg/logout.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bkg/password.png b/webadmin/var/www/webadmin/images/bkg/password.png
deleted file mode 100644
index 2405d0f..0000000
Binary files a/webadmin/var/www/webadmin/images/bkg/password.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bkg/shadowBkg.png b/webadmin/var/www/webadmin/images/bkg/shadowBkg.png
deleted file mode 100644
index 1cdcde5..0000000
Binary files a/webadmin/var/www/webadmin/images/bkg/shadowBkg.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bkg/shadowBkgOpaque.png b/webadmin/var/www/webadmin/images/bkg/shadowBkgOpaque.png
deleted file mode 100644
index 8711514..0000000
Binary files a/webadmin/var/www/webadmin/images/bkg/shadowBkgOpaque.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bkg/subNavAnchorBkgRepeater.png b/webadmin/var/www/webadmin/images/bkg/subNavAnchorBkgRepeater.png
deleted file mode 100644
index b42d7ba..0000000
Binary files a/webadmin/var/www/webadmin/images/bkg/subNavAnchorBkgRepeater.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bkg/subNavBkgRepeater.png b/webadmin/var/www/webadmin/images/bkg/subNavBkgRepeater.png
deleted file mode 100644
index c045fee..0000000
Binary files a/webadmin/var/www/webadmin/images/bkg/subNavBkgRepeater.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bkg/subNavBkgRepeater2.png b/webadmin/var/www/webadmin/images/bkg/subNavBkgRepeater2.png
deleted file mode 100644
index b35e39c..0000000
Binary files a/webadmin/var/www/webadmin/images/bkg/subNavBkgRepeater2.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bkg/tab-round.png b/webadmin/var/www/webadmin/images/bkg/tab-round.png
deleted file mode 100644
index 2bb2c9e..0000000
Binary files a/webadmin/var/www/webadmin/images/bkg/tab-round.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bkg/tabs.png b/webadmin/var/www/webadmin/images/bkg/tabs.png
deleted file mode 100644
index 93847ab..0000000
Binary files a/webadmin/var/www/webadmin/images/bkg/tabs.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bottom.gif b/webadmin/var/www/webadmin/images/bottom.gif
deleted file mode 100755
index e278ee6..0000000
Binary files a/webadmin/var/www/webadmin/images/bottom.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bottomleft.gif b/webadmin/var/www/webadmin/images/bottomleft.gif
deleted file mode 100755
index 3f1c7bf..0000000
Binary files a/webadmin/var/www/webadmin/images/bottomleft.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/bottomright.gif b/webadmin/var/www/webadmin/images/bottomright.gif
deleted file mode 100755
index 07ba099..0000000
Binary files a/webadmin/var/www/webadmin/images/bottomright.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/check.gif b/webadmin/var/www/webadmin/images/check.gif
deleted file mode 100755
index d7e1cf1..0000000
Binary files a/webadmin/var/www/webadmin/images/check.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/choose.gif b/webadmin/var/www/webadmin/images/choose.gif
deleted file mode 100755
index b01be40..0000000
Binary files a/webadmin/var/www/webadmin/images/choose.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/collapsed.png b/webadmin/var/www/webadmin/images/collapsed.png
deleted file mode 100755
index 2c45859..0000000
Binary files a/webadmin/var/www/webadmin/images/collapsed.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/column_header.gif b/webadmin/var/www/webadmin/images/column_header.gif
deleted file mode 100755
index e8e37c2..0000000
Binary files a/webadmin/var/www/webadmin/images/column_header.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/dashboard/green-light.png b/webadmin/var/www/webadmin/images/dashboard/green-light.png
deleted file mode 100644
index 596110e..0000000
Binary files a/webadmin/var/www/webadmin/images/dashboard/green-light.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/dashboard/red-light.png b/webadmin/var/www/webadmin/images/dashboard/red-light.png
deleted file mode 100644
index f44db62..0000000
Binary files a/webadmin/var/www/webadmin/images/dashboard/red-light.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/dashboard/view-all-mobile.png b/webadmin/var/www/webadmin/images/dashboard/view-all-mobile.png
deleted file mode 100644
index b7d561a..0000000
Binary files a/webadmin/var/www/webadmin/images/dashboard/view-all-mobile.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/dashboard/yellow-light.png b/webadmin/var/www/webadmin/images/dashboard/yellow-light.png
deleted file mode 100644
index 9c635d9..0000000
Binary files a/webadmin/var/www/webadmin/images/dashboard/yellow-light.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/delete.png b/webadmin/var/www/webadmin/images/delete.png
deleted file mode 100755
index 08f2493..0000000
Binary files a/webadmin/var/www/webadmin/images/delete.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/expanded.png b/webadmin/var/www/webadmin/images/expanded.png
deleted file mode 100755
index 4b49c13..0000000
Binary files a/webadmin/var/www/webadmin/images/expanded.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/arrow.png b/webadmin/var/www/webadmin/images/forms/arrow.png
deleted file mode 100644
index b8bc15a..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/arrow.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/ascending.png b/webadmin/var/www/webadmin/images/forms/ascending.png
deleted file mode 100644
index df1ef83..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/ascending.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/delete-button.png b/webadmin/var/www/webadmin/images/forms/delete-button.png
deleted file mode 100644
index 12d3bb1..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/delete-button.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/delete-mobile.png b/webadmin/var/www/webadmin/images/forms/delete-mobile.png
deleted file mode 100644
index 1e2c111..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/delete-mobile.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/descending.png b/webadmin/var/www/webadmin/images/forms/descending.png
deleted file mode 100644
index 06a9e8f..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/descending.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/lookup-button.png b/webadmin/var/www/webadmin/images/forms/lookup-button.png
deleted file mode 100644
index 524d7de..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/lookup-button.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/mobile-top-nav.png b/webadmin/var/www/webadmin/images/forms/mobile-top-nav.png
deleted file mode 100644
index c786de4..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/mobile-top-nav.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/mobile-top-navleft.png b/webadmin/var/www/webadmin/images/forms/mobile-top-navleft.png
deleted file mode 100644
index a6c05dd..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/mobile-top-navleft.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/new-button.png b/webadmin/var/www/webadmin/images/forms/new-button.png
deleted file mode 100644
index 9fa69af..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/new-button.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/new-from-template-button.png b/webadmin/var/www/webadmin/images/forms/new-from-template-button.png
deleted file mode 100644
index e2962a2..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/new-from-template-button.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/progress-spinner.gif b/webadmin/var/www/webadmin/images/forms/progress-spinner.gif
deleted file mode 100644
index 39615c8..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/progress-spinner.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/required.png b/webadmin/var/www/webadmin/images/forms/required.png
deleted file mode 100644
index 56d79ad..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/required.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/table-top-bg.png b/webadmin/var/www/webadmin/images/forms/table-top-bg.png
deleted file mode 100644
index 9d36b7f..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/table-top-bg.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/upload-button.png b/webadmin/var/www/webadmin/images/forms/upload-button.png
deleted file mode 100644
index 8eb62c0..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/upload-button.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/view-grid-active.png b/webadmin/var/www/webadmin/images/forms/view-grid-active.png
deleted file mode 100644
index 0bcd255..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/view-grid-active.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/view-grid-inactive.png b/webadmin/var/www/webadmin/images/forms/view-grid-inactive.png
deleted file mode 100644
index 055c4c0..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/view-grid-inactive.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/view-list-active.png b/webadmin/var/www/webadmin/images/forms/view-list-active.png
deleted file mode 100644
index af8dbc1..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/view-list-active.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/view-list-inactive.png b/webadmin/var/www/webadmin/images/forms/view-list-inactive.png
deleted file mode 100644
index d7a6fb6..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/view-list-inactive.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/forms/view-object-mobile.png b/webadmin/var/www/webadmin/images/forms/view-object-mobile.png
deleted file mode 100644
index cba66c8..0000000
Binary files a/webadmin/var/www/webadmin/images/forms/view-object-mobile.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/inactive.gif b/webadmin/var/www/webadmin/images/inactive.gif
deleted file mode 100644
index 296684e..0000000
Binary files a/webadmin/var/www/webadmin/images/inactive.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/left.gif b/webadmin/var/www/webadmin/images/left.gif
deleted file mode 100755
index 422ecd7..0000000
Binary files a/webadmin/var/www/webadmin/images/left.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/leftdark.gif b/webadmin/var/www/webadmin/images/leftdark.gif
deleted file mode 100755
index 3dd9c0b..0000000
Binary files a/webadmin/var/www/webadmin/images/leftdark.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/login/ipad-landscape.png b/webadmin/var/www/webadmin/images/login/ipad-landscape.png
deleted file mode 100644
index 0e1c7f9..0000000
Binary files a/webadmin/var/www/webadmin/images/login/ipad-landscape.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/login/ipad-portrait.png b/webadmin/var/www/webadmin/images/login/ipad-portrait.png
deleted file mode 100644
index d9267a1..0000000
Binary files a/webadmin/var/www/webadmin/images/login/ipad-portrait.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/login/iphone-landscape.png b/webadmin/var/www/webadmin/images/login/iphone-landscape.png
deleted file mode 100644
index dbcef0b..0000000
Binary files a/webadmin/var/www/webadmin/images/login/iphone-landscape.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/login/iphone.png b/webadmin/var/www/webadmin/images/login/iphone.png
deleted file mode 100644
index 1182003..0000000
Binary files a/webadmin/var/www/webadmin/images/login/iphone.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/login/standard.png b/webadmin/var/www/webadmin/images/login/standard.png
deleted file mode 100644
index a8196b1..0000000
Binary files a/webadmin/var/www/webadmin/images/login/standard.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/loginBackground.png b/webadmin/var/www/webadmin/images/loginBackground.png
deleted file mode 100644
index af9e0f7..0000000
Binary files a/webadmin/var/www/webadmin/images/loginBackground.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/logout_bottom.gif b/webadmin/var/www/webadmin/images/logout_bottom.gif
deleted file mode 100755
index 1b56266..0000000
Binary files a/webadmin/var/www/webadmin/images/logout_bottom.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/minus.gif b/webadmin/var/www/webadmin/images/minus.gif
deleted file mode 100755
index f68ee4f..0000000
Binary files a/webadmin/var/www/webadmin/images/minus.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/NSUS-logo.png b/webadmin/var/www/webadmin/images/navigation/NSUS-logo.png
deleted file mode 100644
index 8bfdd50..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/NSUS-logo.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/arrow-active.png b/webadmin/var/www/webadmin/images/navigation/arrow-active.png
deleted file mode 100644
index 7a272de..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/arrow-active.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/arrow.png b/webadmin/var/www/webadmin/images/navigation/arrow.png
deleted file mode 100644
index 17cc771..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/arrow.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/button-bg-active.png b/webadmin/var/www/webadmin/images/navigation/button-bg-active.png
deleted file mode 100644
index aea0814..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/button-bg-active.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/button-bg.png b/webadmin/var/www/webadmin/images/navigation/button-bg.png
deleted file mode 100644
index 08076ce..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/button-bg.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/computer-icon-active.png b/webadmin/var/www/webadmin/images/navigation/computer-icon-active.png
deleted file mode 100644
index 5be051c..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/computer-icon-active.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/computer-icon.png b/webadmin/var/www/webadmin/images/navigation/computer-icon.png
deleted file mode 100644
index d332a0d..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/computer-icon.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/down-arrow.png b/webadmin/var/www/webadmin/images/navigation/down-arrow.png
deleted file mode 100644
index 6901673..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/down-arrow.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/handle.png b/webadmin/var/www/webadmin/images/navigation/handle.png
deleted file mode 100644
index e88ea74..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/handle.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/logo-bg.png b/webadmin/var/www/webadmin/images/navigation/logo-bg.png
deleted file mode 100644
index 87b1fe7..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/logo-bg.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/logo-hover.png b/webadmin/var/www/webadmin/images/navigation/logo-hover.png
deleted file mode 100644
index d13e9e2..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/logo-hover.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/mobile-icon-active.png b/webadmin/var/www/webadmin/images/navigation/mobile-icon-active.png
deleted file mode 100644
index a295fcf..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/mobile-icon-active.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/mobile-icon.png b/webadmin/var/www/webadmin/images/navigation/mobile-icon.png
deleted file mode 100644
index 55c2e9e..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/mobile-icon.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/notifications-bg.png b/webadmin/var/www/webadmin/images/navigation/notifications-bg.png
deleted file mode 100644
index 1f17328..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/notifications-bg.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/page-active.png b/webadmin/var/www/webadmin/images/navigation/page-active.png
deleted file mode 100644
index 2f0089e..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/page-active.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/settings-mobile.png b/webadmin/var/www/webadmin/images/navigation/settings-mobile.png
deleted file mode 100644
index 800acf5..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/settings-mobile.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/settings.png b/webadmin/var/www/webadmin/images/navigation/settings.png
deleted file mode 100644
index 36b548d..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/settings.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/sidebar-bg.jpg b/webadmin/var/www/webadmin/images/navigation/sidebar-bg.jpg
deleted file mode 100644
index a976fd3..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/sidebar-bg.jpg and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/sidebar-bg.png b/webadmin/var/www/webadmin/images/navigation/sidebar-bg.png
deleted file mode 100644
index 8155a75..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/sidebar-bg.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/navigation/sidebar-bg2.png b/webadmin/var/www/webadmin/images/navigation/sidebar-bg2.png
deleted file mode 100644
index dea2d8f..0000000
Binary files a/webadmin/var/www/webadmin/images/navigation/sidebar-bg2.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/note.png b/webadmin/var/www/webadmin/images/note.png
deleted file mode 100755
index bfeb8ad..0000000
Binary files a/webadmin/var/www/webadmin/images/note.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/objectAlert.png b/webadmin/var/www/webadmin/images/objectAlert.png
deleted file mode 100755
index d5e4c82..0000000
Binary files a/webadmin/var/www/webadmin/images/objectAlert.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/objectQuestion.png b/webadmin/var/www/webadmin/images/objectQuestion.png
deleted file mode 100755
index f4269a8..0000000
Binary files a/webadmin/var/www/webadmin/images/objectQuestion.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/payloads/choose.gif b/webadmin/var/www/webadmin/images/payloads/choose.gif
deleted file mode 100644
index b01be40..0000000
Binary files a/webadmin/var/www/webadmin/images/payloads/choose.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/payloads/minus.gif b/webadmin/var/www/webadmin/images/payloads/minus.gif
deleted file mode 100644
index f68ee4f..0000000
Binary files a/webadmin/var/www/webadmin/images/payloads/minus.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/payloads/plus.gif b/webadmin/var/www/webadmin/images/payloads/plus.gif
deleted file mode 100644
index abac36e..0000000
Binary files a/webadmin/var/www/webadmin/images/payloads/plus.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/plus.gif b/webadmin/var/www/webadmin/images/plus.gif
deleted file mode 100755
index f41c34f..0000000
Binary files a/webadmin/var/www/webadmin/images/plus.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/right.gif b/webadmin/var/www/webadmin/images/right.gif
deleted file mode 100755
index b7d1682..0000000
Binary files a/webadmin/var/www/webadmin/images/right.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/rightdark.gif b/webadmin/var/www/webadmin/images/rightdark.gif
deleted file mode 100755
index 934f47d..0000000
Binary files a/webadmin/var/www/webadmin/images/rightdark.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/searchfield_leftcap.png b/webadmin/var/www/webadmin/images/searchfield_leftcap.png
deleted file mode 100755
index cc00c22..0000000
Binary files a/webadmin/var/www/webadmin/images/searchfield_leftcap.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/searchfield_repeat.png b/webadmin/var/www/webadmin/images/searchfield_repeat.png
deleted file mode 100755
index b429a16..0000000
Binary files a/webadmin/var/www/webadmin/images/searchfield_repeat.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/searchfield_rightcap.png b/webadmin/var/www/webadmin/images/searchfield_rightcap.png
deleted file mode 100755
index 8e13620..0000000
Binary files a/webadmin/var/www/webadmin/images/searchfield_rightcap.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/security.png b/webadmin/var/www/webadmin/images/security.png
deleted file mode 100755
index 8a70f48..0000000
Binary files a/webadmin/var/www/webadmin/images/security.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/services/cca.png b/webadmin/var/www/webadmin/images/services/cca.png
deleted file mode 100644
index 9b13f5f..0000000
Binary files a/webadmin/var/www/webadmin/images/services/cca.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/services/mysql.png b/webadmin/var/www/webadmin/images/services/mysql.png
deleted file mode 100644
index e9f953a..0000000
Binary files a/webadmin/var/www/webadmin/images/services/mysql.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/services/netboot.png b/webadmin/var/www/webadmin/images/services/netboot.png
deleted file mode 100644
index afff598..0000000
Binary files a/webadmin/var/www/webadmin/images/services/netboot.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/services/sharing.png b/webadmin/var/www/webadmin/images/services/sharing.png
deleted file mode 100644
index e2afaa4..0000000
Binary files a/webadmin/var/www/webadmin/images/services/sharing.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/services/smb.png b/webadmin/var/www/webadmin/images/services/smb.png
deleted file mode 100755
index 500a3c6..0000000
Binary files a/webadmin/var/www/webadmin/images/services/smb.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/services/swu.png b/webadmin/var/www/webadmin/images/services/swu.png
deleted file mode 100644
index 017de3d..0000000
Binary files a/webadmin/var/www/webadmin/images/services/swu.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/services/tomcat.png b/webadmin/var/www/webadmin/images/services/tomcat.png
deleted file mode 100644
index 815fdb5..0000000
Binary files a/webadmin/var/www/webadmin/images/services/tomcat.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/sidenavigation/current-side-tab-background.png b/webadmin/var/www/webadmin/images/sidenavigation/current-side-tab-background.png
deleted file mode 100644
index 819d445..0000000
Binary files a/webadmin/var/www/webadmin/images/sidenavigation/current-side-tab-background.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/spacer.gif b/webadmin/var/www/webadmin/images/spacer.gif
deleted file mode 100755
index 35d42e8..0000000
Binary files a/webadmin/var/www/webadmin/images/spacer.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/startup/aqua-progress-bar.gif b/webadmin/var/www/webadmin/images/startup/aqua-progress-bar.gif
deleted file mode 100644
index 4532364..0000000
Binary files a/webadmin/var/www/webadmin/images/startup/aqua-progress-bar.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/startup/gradient.png b/webadmin/var/www/webadmin/images/startup/gradient.png
deleted file mode 100644
index 294eab4..0000000
Binary files a/webadmin/var/www/webadmin/images/startup/gradient.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/tabs/Account.png b/webadmin/var/www/webadmin/images/tabs/Account.png
deleted file mode 100644
index 8dbf010..0000000
Binary files a/webadmin/var/www/webadmin/images/tabs/Account.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/tabs/Advanced.png b/webadmin/var/www/webadmin/images/tabs/Advanced.png
deleted file mode 100755
index cc72768..0000000
Binary files a/webadmin/var/www/webadmin/images/tabs/Advanced.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/tabs/DateAndTime.png b/webadmin/var/www/webadmin/images/tabs/DateAndTime.png
deleted file mode 100644
index 6fce6fa..0000000
Binary files a/webadmin/var/www/webadmin/images/tabs/DateAndTime.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/tabs/Network.png b/webadmin/var/www/webadmin/images/tabs/Network.png
deleted file mode 100755
index ee73bce..0000000
Binary files a/webadmin/var/www/webadmin/images/tabs/Network.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/tabs/script.png b/webadmin/var/www/webadmin/images/tabs/script.png
deleted file mode 100644
index 97e8647..0000000
Binary files a/webadmin/var/www/webadmin/images/tabs/script.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/top.gif b/webadmin/var/www/webadmin/images/top.gif
deleted file mode 100755
index 684b6c9..0000000
Binary files a/webadmin/var/www/webadmin/images/top.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/topclean.gif b/webadmin/var/www/webadmin/images/topclean.gif
deleted file mode 100755
index 95aa48d..0000000
Binary files a/webadmin/var/www/webadmin/images/topclean.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/topcleanleft.gif b/webadmin/var/www/webadmin/images/topcleanleft.gif
deleted file mode 100755
index 1a9b4e9..0000000
Binary files a/webadmin/var/www/webadmin/images/topcleanleft.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/topcleanright.gif b/webadmin/var/www/webadmin/images/topcleanright.gif
deleted file mode 100755
index 01b221e..0000000
Binary files a/webadmin/var/www/webadmin/images/topcleanright.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/topleft.gif b/webadmin/var/www/webadmin/images/topleft.gif
deleted file mode 100755
index abff777..0000000
Binary files a/webadmin/var/www/webadmin/images/topleft.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/topright.gif b/webadmin/var/www/webadmin/images/topright.gif
deleted file mode 100755
index 4c11928..0000000
Binary files a/webadmin/var/www/webadmin/images/topright.gif and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/touchicons/apple-touch-icon-114x114-precomposed.png b/webadmin/var/www/webadmin/images/touchicons/apple-touch-icon-114x114-precomposed.png
deleted file mode 100644
index b88e774..0000000
Binary files a/webadmin/var/www/webadmin/images/touchicons/apple-touch-icon-114x114-precomposed.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/touchicons/apple-touch-icon-144x144-precomposed.png b/webadmin/var/www/webadmin/images/touchicons/apple-touch-icon-144x144-precomposed.png
deleted file mode 100644
index 5556f81..0000000
Binary files a/webadmin/var/www/webadmin/images/touchicons/apple-touch-icon-144x144-precomposed.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/touchicons/apple-touch-icon-72x72-precomposed.png b/webadmin/var/www/webadmin/images/touchicons/apple-touch-icon-72x72-precomposed.png
deleted file mode 100644
index 0fd7aeb..0000000
Binary files a/webadmin/var/www/webadmin/images/touchicons/apple-touch-icon-72x72-precomposed.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/images/touchicons/apple-touch-icon-precomposed.png b/webadmin/var/www/webadmin/images/touchicons/apple-touch-icon-precomposed.png
deleted file mode 100644
index 8c18610..0000000
Binary files a/webadmin/var/www/webadmin/images/touchicons/apple-touch-icon-precomposed.png and /dev/null differ
diff --git a/webadmin/var/www/webadmin/inc/config.php b/webadmin/var/www/webadmin/inc/config.php
old mode 100644
new mode 100755
index b840c68..0b326f8
--- a/webadmin/var/www/webadmin/inc/config.php
+++ b/webadmin/var/www/webadmin/inc/config.php
@@ -21,6 +21,7 @@ class WebadminConfig
private $topElement;
private $settings;
private $subnets;
+ private $admins;
private $proxies;
private $autosyncbranches;
private $defaultpasses;
@@ -30,6 +31,7 @@ function __construct()
{
$this->settings = array();
$this->subnets = array();
+ $this->admins = array();
$this->proxies = array();
$this->autosyncbranches = array();
$this->defaultpasses = array();
@@ -106,7 +108,7 @@ public function loadSettings()
{
foreach($this->topElement->childNodes as $curNode)
{
- if ($curNode->nodeName == "ldapproxies" || $curNode->nodeName == "netbootsubnets" || $curNode->nodeName == "autosyncbranches" || $curNode->nodeName == "defaultpasses" || $curNode->nodeName == "files")
+ if ($curNode->nodeName == "ldapproxies" || $curNode->nodeName == "netbootsubnets" || $curNode->nodeName == "autosyncbranches" || $curNode->nodeName == "defaultpasses" || $curNode->nodeName == "files" || $curNode->nodeName == "ldapadmins")
{
continue;
}
@@ -118,8 +120,8 @@ public function loadSettings()
}
$this->loadSubnets();
+ $this->loadAdmins();
$this->loadProxies();
-
}
public function saveSettings()
@@ -145,11 +147,42 @@ public function saveSettings()
}
}
+ // Create the netbootsubnets node
+ $netbootsubnets = $this->createElement("netbootsubnets");
+ $this->topElement->appendChild($netbootsubnets);
+
+
+ // Loop through the Netboot subnets
+ foreach($this->subnets as $key => $value)
+ {
+ $newSubnetNode = $this->createElement("netbootsubnet");
+ $netbootsubnets->appendChild($newSubnetNode);
+ $newSubnet = $this->createElement("subnet");
+ $newSubnet->nodeValue = trim($value['subnet']);
+ $newSubnetNode->appendChild($newSubnet);
+ $newNetmask = $this->createElement("netmask");
+ $newNetmask->nodeValue = trim($value['netmask']);
+ $newSubnetNode->appendChild($newNetmask);
+ }
+
+ // Create the ldapadmins node
+ $ldapadmins = $this->createElement("ldapadmins");
+ $this->topElement->appendChild($ldapadmins);
+
+ // Loop through the LDAP admins
+ foreach($this->admins as $key => $value)
+ {
+ $newAdminNode = $this->createElement("ldapadmin");
+ $ldapadmins->appendChild($newAdminNode);
+ $newAdmin = $this->createElement("cn");
+ $newAdmin->nodeValue = trim($value['cn']);
+ $newAdminNode->appendChild($newAdmin);
+ }
+
// Create the ldapproxies node
$ldapproxies = $this->createElement("ldapproxies");
$this->topElement->appendChild($ldapproxies);
-
// Loop through the LDAP Proxies
foreach($this->proxies as $key => $value)
{
@@ -165,29 +198,11 @@ public function saveSettings()
$newinURL->nodeValue = trim($value['inURL']);
$newProxyNode->appendChild($newinURL);
}
-
- // Create the netbootsubnets node
- $netbootsubnets = $this->createElement("netbootsubnets");
- $this->topElement->appendChild($netbootsubnets);
-
- // Loop through the Netboot subnets
- foreach($this->subnets as $key => $value)
- {
- $newSubnetNode = $this->createElement("netbootsubnet");
- $netbootsubnets->appendChild($newSubnetNode);
- $newSubnet = $this->createElement("subnet");
- $newSubnet->nodeValue = trim($value['subnet']);
- $newSubnetNode->appendChild($newSubnet);
- $newNetmask = $this->createElement("netmask");
- $newNetmask->nodeValue = trim($value['netmask']);
- $newSubnetNode->appendChild($newNetmask);
- }
-
// Create the autosyncbranches node
$autosyncbranches = $this->createElement("autosyncbranches");
$this->topElement->appendChild($autosyncbranches);
-
+
// Loop through the autosync branches
foreach($this->autosyncbranches as $key => $value)
{
@@ -195,11 +210,11 @@ public function saveSettings()
$newBranchNode->nodeValue = $key;
$autosyncbranches->appendChild($newBranchNode);
}
-
+
// Create the defaultpasses node
$defaultpasses = $this->createElement("defaultpasses");
$this->topElement->appendChild($defaultpasses);
-
+
// Lopo through the default pass list
foreach($this->defaultpasses as $key => $value)
{
@@ -211,11 +226,11 @@ public function saveSettings()
// Write the newly-created XML document to the settings file
if ($this->xmlDoc->save(CONF_FILE_PATH) === FALSE)
{
- echo("Could not save settings");
+ echo(" ". CONF_FILE_PATH. ": Could not save settings");
}
}
-
-
+
+
public function loadSubnets()
{
$subnetnodes = $this->xmlDoc->getElementsByTagName("netbootsubnet");
@@ -240,7 +255,88 @@ public function loadSubnets()
$this->subnets["$subnet $netmask"] = array("subnet" => $subnet, "netmask" => $netmask);
}
}
-
+
+ public function getSubnets()
+ {
+ return $this->subnets;
+ }
+
+ public function addSubnet($subnet, $netmask)
+ {
+ if (isset($this->subnets["$subnet $netmask"]))
+ {
+ return false; // False means duplicate
+ }
+ else
+ {
+ $this->subnets["$subnet $netmask"] = array("subnet" => $subnet, "netmask" => $netmask);
+ $this->saveSettings();
+ return true; // True means added
+ }
+ }
+
+ public function deleteSubnet($subnet, $netmask)
+ {
+ reset($this->subnets);
+ if (array_key_exists("$subnet $netmask", $this->subnets))
+ {
+ unset($this->subnets["$subnet $netmask"]);
+ $this->saveSettings();
+ }
+ }
+
+ public function loadAdmins()
+ {
+ $adminnodes = $this->xmlDoc->getElementsByTagName("ldapadmin");
+ $numadmins = $adminnodes->length;
+ for ($admini = 0; $admini < $numadmins; $admini++)
+ {
+ $node = $adminnodes->item($admini)->childNodes;
+ if ($node->length != 1)
+ continue;
+ if ($node->item(0)->nodeName == "cn")
+ $cn = $node->item(0)->nodeValue;
+ else
+ continue;
+
+ $this->admins["$cn"] = array("cn" => $cn);
+ }
+ }
+
+ public function printAdmins()
+ {
+ print_r($this->admins);
+ }
+
+ public function getAdmins()
+ {
+ return $this->admins;
+ }
+
+ public function addAdmin($cn)
+ {
+ if (isset($this->admins["$cn"]))
+ {
+ return false; // False means duplicate
+ }
+ else
+ {
+ $this->admins["$cn"] = array("cn" => $cn);
+ $this->saveSettings();
+ return true; // True means added
+ }
+ }
+
+ public function deleteAdmin($cn)
+ {
+ reset($this->admins);
+ if (array_key_exists("$cn", $this->admins))
+ {
+ unset($this->admins["$cn"]);
+ $this->saveSettings();
+ }
+ }
+
public function loadProxies()
{
$proxynodes = $this->xmlDoc->getElementsByTagName("ldapproxy");
@@ -278,30 +374,11 @@ public function loadProxies()
}
}
- public function getSubnets()
- {
- return $this->subnets;
- }
-
public function getProxies()
{
return $this->proxies;
}
- public function addSubnet($subnet, $netmask)
- {
- if (isset($this->subnets["$subnet $netmask"]))
- {
- return false; // False means duplicate
- }
- else
- {
- $this->subnets["$subnet $netmask"] = array("subnet" => $subnet, "netmask" => $netmask);
- $this->saveSettings();
- return true; // True means added
- }
- }
-
public function addProxy($outLDAP, $inLDAP, $inURL)
{
if (isset($this->proxies["$outLDAP $inLDAP $inURL"]))
@@ -316,16 +393,6 @@ public function addProxy($outLDAP, $inLDAP, $inURL)
}
}
- public function deleteSubnet($subnet, $netmask)
- {
- reset($this->subnets);
- if (array_key_exists("$subnet $netmask", $this->subnets))
- {
- unset($this->subnets["$subnet $netmask"]);
- $this->saveSettings();
- }
- }
-
public function deleteProxy($outLDAP, $inLDAP, $inURL)
{
reset($this->proxies);
@@ -335,7 +402,7 @@ public function deleteProxy($outLDAP, $inLDAP, $inURL)
$this->saveSettings();
}
}
-
+
public function loadAutosyncBranches()
{
$branchnodes = $this->xmlDoc->getElementsByTagName("branch");
@@ -375,7 +442,7 @@ public function deleteAutosyncBranch($branch)
$this->saveSettings();
}
}
-
+
public function containsAutosyncBranch($branch)
@@ -384,7 +451,7 @@ public function containsAutosyncBranch($branch)
return array_key_exists($branch, $this->autosyncbranches);
}
-
+
public function loadDefaultPasses()
{
$defaultpassnodes = $this->xmlDoc->getElementsByTagName("defaultpass");
@@ -403,7 +470,7 @@ public function loadDefaultPasses()
}
}
}
-
+
public function createDefaultPasses()
{
$this->defaultpasses["webaccount"] = "webaccount";
@@ -447,7 +514,7 @@ public function changedPass($name)
$this->saveSettings();
}
}
-
+
public function printDebug()
{
echo "Settings: ";
diff --git a/webadmin/var/www/webadmin/inc/footer.php b/webadmin/var/www/webadmin/inc/footer.php
index 05733e2..349e952 100644
--- a/webadmin/var/www/webadmin/inc/footer.php
+++ b/webadmin/var/www/webadmin/inc/footer.php
@@ -1,15 +1,5 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
diff --git a/webadmin/var/www/webadmin/inc/functions.php b/webadmin/var/www/webadmin/inc/functions.php
old mode 100644
new mode 100755
index 0bfd7d4..2fd7c29
--- a/webadmin/var/www/webadmin/inc/functions.php
+++ b/webadmin/var/www/webadmin/inc/functions.php
@@ -26,7 +26,7 @@ function getSystemTimeZones($path="/usr/share/zoneinfo/right")
$tzlist[$i++] = $file;
}
}
-
+
closedir($handle);
}
sort($tzlist);
@@ -36,7 +36,7 @@ function getSystemTimeZones($path="/usr/share/zoneinfo/right")
function getSystemTimeZoneMenu()
{
$currentTZ = getCurrentTimeZone();
- echo "\n";
+ echo "\n";
$timezone_identifiers = DateTimeZone::listIdentifiers();
foreach($timezone_identifiers as $value){
if (preg_match('/^(America|Australia|Antartica|Arctic|Asia|Atlantic|Europe|Indian|Pacific)\//', $value))
@@ -44,12 +44,12 @@ function getSystemTimeZoneMenu()
if (!isset($continent)) {
$continent = '';
}
- $ex=explode("/",$value);//obtain continent,city
+ $ex=explode("/",$value);//obtain continent,city
if ($continent!=$ex[0]){
if ($continent!="") $return = ''."\n";
echo '