Authentication and Session Handling

.gitignore

@@ -1 +1,4 @@
 composer.lock
+config.ini
+*.swp
+*.cache

LICENSE.txt → LICENSE

@@ -1,7 +1,238 @@
-GNU AFFERO GENERAL PUBLIC LICENSE
+
+
+1. BAREOS WEBUI LICENSE SPECIFICS
+
+
+Bareos WebUI is licensed under the AGPL version 3 (see 2. below). Some parts of the code
+are licensed under the following licenses:
+
+
+a) Twitter Bootstrap
+
+File: /bareos-webui/public/css/bootstrap.css
+File: /bareos-webui/public/css/bootstrap.min.css
+File: /bareos-webui/public/css/bootstrap-theme.css
+File: /bareos-webui/public/css/bootstrap-theme.min.css
+File: /bareos-webui/public/fonts/glyphicons-halflings-regular.eot
+File: /bareos-webui/public/fonts/glyphicons-halflings-regular.svg
+File: /bareos-webui/public/fonts/glyphicons-halflings-regular.ttf
+File: /bareos-webui/public/fonts/glyphicons-halflings-regular.woff
+File: /bareos-webui/public/fonts/glyphicons-halflings-regular.woff2
+File: /bareos-webui/public/js/bootstrap.js
+File: /bareos-webui/public/js/bootstrap.min.js
+File: /bareos-webui/public/js/npm.js
+
+The MIT License (MIT)
+
+Copyright (c) 2011-2015 Twitter, Inc
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+b) jQuery
+
+File: /bareos-webui/public/js/jquery.js
+File: /bareos-webui/public/js/jquery.min.js
+File: /bareos-webui/public/js/jquery.min.map
+
+Copyright jQuery Foundation and other contributors, https://jquery.org/
+This software consists of voluntary contributions made by many
+individuals. For exact contribution history, see the revision history
+available at https://github.com/jquery/jquery
+
+The following license applies to all parts of this software except as
+documented below:
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
+c) jqPlot - Pure JavaScript plotting plugin using jQuery
+
+File: /bareos-webui/public/js/jqplot.barRenderer.js
+File: /bareos-webui/public/js/jqplot.barRenderer.min.js
+File: /bareos-webui/public/js/jqplot.categoryAxisRenderer.js
+File: /bareos-webui/public/js/jqplot.categoryAxisRenderer.min.js
+File: /bareos-webui/public/js/jqplot.pieRenderer.js
+File: /bareos-webui/public/js/jqplot.pieRenderer.min.js
+File: /bareos-webui/public/js/jqplot.pointLabels.js
+File: /bareos-webui/public/js/jqplot.pointLabels.min.js
+
+Copyright (c) 2009-2013 Chris Leonello
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+/**
+ * jqPlot
+ * Pure JavaScript plotting plugin using jQuery
+ *
+ * Version: 1.0.8r1250
+ *
+ * Copyright (c) 2009-2013 Chris Leonello
+ * jqPlot is currently available for use in all personal or commercial projects
+ * under both the MIT (http://www.opensource.org/licenses/mit-license.php) and GPL
+ * version 2.0 (http://www.gnu.org/licenses/gpl-2.0.html) licenses. This means that you can
+ * choose the license that best suits your project and use it accordingly.
+ *
+ * Although not required, the author would appreciate an email letting him
+ * know of any substantial use of jqPlot.  You can reach the author at:
+ * chris at jqplot dot com or see http://www.jqplot.com/info.php .
+ *
+ * If you are feeling kind and generous, consider supporting the project by
+ * making a donation at: http://www.jqplot.com/donate.php .
+ *
+ * sprintf functions contained in jqplot.sprintf.js by Ash Searle:
+ *
+ *     version 2007.04.27
+ *     author Ash Searle
+ *     http://hexmen.com/blog/2007/03/printf-sprintf/
+ *     http://hexmen.com/js/sprintf.js
+ *     The author (Ash Searle) has placed this code in the public domain:
+ *     "This code is unrestricted: you are free to use it however you like."
+ *
+ * included jsDate library by Chris Leonello:
+ *
+ * Copyright (c) 2010-2013 Chris Leonello
+ *
+ * jsDate is currently available for use in all personal or commercial projects
+ * under both the MIT and GPL version 2.0 licenses. This means that you can
+ * choose the license that best suits your project and use it accordingly.
+ *
+ * jsDate borrows many concepts and ideas from the Date Instance
+ * Methods by Ken Snyder along with some parts of Ken's actual code.
+ *
+ * Ken's origianl Date Instance Methods and copyright notice:
+ *
+ * Ken Snyder (ken d snyder at gmail dot com)
+ * 2008-09-10
+ * version 2.0.2 (http://kendsnyder.com/sandbox/date/)
+ * Creative Commons Attribution License 3.0 (http://creativecommons.org/licenses/by/3.0/)
+ *
+ * jqplotToImage function based on Larry Siden's export-jqplot-to-png.js.
+ * Larry has generously given permission to adapt his code for inclusion
+ * into jqPlot.
+ *
+ * Larry's original code can be found here:
+ *
+ * https://github.com/lsiden/export-jqplot-to-png
+ *
+ *
+ */
+
+d) Zend Skeleton Application
+
+The Bareos Webui as it is today, evolved from using Zends Skeleton Application as a
+inital starting point.
+
+Copyright (c) 2005-2015, Zend Technologies USA, Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* 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 Zend Technologies USA, Inc. 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 THE COPYRIGHT HOLDERS AND CONTRIBUTORS "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 THE COPYRIGHT OWNER OR CONTRIBUTORS 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.
+
+
+e) Composer Dependency Manager for PHP
+
+File: /bareos-webui/composer.phar
+
+Copyright (c) 2011 Nils Adermann, Jordi Boggiano
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is furnished
+to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
+
+
+2. GNU AFFERO GENERAL PUBLIC LICENSE
+
+
+		GNU AFFERO GENERAL PUBLIC LICENSE
                        Version 3, 19 November 2007
 
- Copyright (C) 2013-2014 dass IT GmbH, Inc. <http://www.dass-it.de/>
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -659,3 +890,5 @@ specific requirements.
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU AGPL, see
 <http://www.gnu.org/licenses/>.
+
+

Makefile.am

@@ -1,10 +1,12 @@
 install: install-am
 	mkdir -p $(DESTDIR)$(pkgdatadir)
 	mkdir -p $(DESTDIR)/@HTTPD_CONF@
+	mkdir -p $(DESTDIR)/etc/bareos/bareos-dir.d/
+	mkdir -p $(DESTDIR)/etc/bareos-webui/
 
 	cp -pr init_autoloader.php config/ data/ module/ public/ vendor/ $(DESTDIR)$(pkgdatadir)
-	cp -p  config/autoload/local.php.dist $(DESTDIR)/etc/bareos-webui.conf.php
-	ln -s  /etc/bareos-webui.conf.php $(DESTDIR)/$(pkgdatadir)/config/autoload/local.php
-	$(INSTALL) -m 0640 install/apache/bareos-webui.conf  $(DESTDIR)@HTTPD_CONF@/
+	cp -p install/directors.ini $(DESTDIR)/etc/bareos-webui/directors.ini
+	$(INSTALL) -m 0640 install/bareos/bareos-webui.conf $(DESTDIR)/etc/bareos/bareos-dir.d/
+	$(INSTALL) -m 0640 install/apache/bareos-webui.conf $(DESTDIR)@HTTPD_CONF@/
 
 #	#$(INSTALL_SCRIPT) install/bareos-webui-config $(DESTDIR)@sbindir@

Makefile.in

@@ -77,8 +77,8 @@ PRE_UNINSTALL = :
 POST_UNINSTALL = :
 subdir = .
 DIST_COMMON = $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
-	$(top_srcdir)/configure $(am__configure_deps) install-sh \
-	missing
+	$(top_srcdir)/configure $(am__configure_deps) AUTHORS \
+	install-sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
@@ -522,11 +522,13 @@ uninstall-am:
 install: install-am
 	mkdir -p $(DESTDIR)$(pkgdatadir)
 	mkdir -p $(DESTDIR)/@HTTPD_CONF@
+	mkdir -p $(DESTDIR)/etc/bareos/bareos-dir.d/
+	mkdir -p $(DESTDIR)/etc/bareos-webui/
 
 	cp -pr init_autoloader.php config/ data/ module/ public/ vendor/ $(DESTDIR)$(pkgdatadir)
-	cp -p  config/autoload/local.php.dist $(DESTDIR)/etc/bareos-webui.conf.php
-	ln -s  /etc/bareos-webui.conf.php $(DESTDIR)/$(pkgdatadir)/config/autoload/local.php
-	$(INSTALL) -m 0640 install/apache/bareos-webui.conf  $(DESTDIR)@HTTPD_CONF@/
+	cp -p install/directors.ini $(DESTDIR)/etc/bareos-webui/directors.ini
+	$(INSTALL) -m 0640 install/bareos/bareos-webui.conf $(DESTDIR)/etc/bareos/bareos-dir.d/
+	$(INSTALL) -m 0640 install/apache/bareos-webui.conf $(DESTDIR)@HTTPD_CONF@/
 
 #	#$(INSTALL_SCRIPT) install/bareos-webui-config $(DESTDIR)@sbindir@
 

README.md

@@ -1,34 +1,28 @@
+
 Bareos WebUI
 ============
 
 A PHP-Frontend to manage [Bareos](http://www.bareos.org/) over the web.
 
-### SYSTEM REQUIREMENTS
-
-* A working Bareos Environment, Bareos 12.4 or later, including a Bareos catalog database
-* An Apache 2.x Webserver with mod-rewrite, mod-php5 and mod-setenvif enabled
-* PHP 5.3.3 or later; we recommend using the latest PHP version whenever possible
-* PHP PDO Extension
-* PHP intl Extension
-* PHP PHAR Extension (for development purposes)
-* PHP DATE Extension
-* PHP OpenSSL Extension (for development purposes)
-* Zend Framework 2.2.x
-* A Browser with JavaScript enabled
-
 ### INSTALLATION
 
-Please see [doc/install/INSTALL.md](doc/install/INSTALL.md).
+Please see [doc/INSTALL.md](doc/INSTALL.md).
 
 ### LICENSES
 
 The Bareos WebUI is licensed under AGPL Version 3.
-You can find a copy of this license in [LICENSE.txt](LICENSE.txt).
+You can find a copy of this license in [AGPL-3.0.txt](AGPL-3.0.txt).
+
+Some other licenses are also involved by the use of external libraries
+and frameworks.
+
+* [Zend Framework 2 - BSD 3-Clause License](http://framework.zend.com/)
+* [Twitter Bootstrap - Apache License v2.0](http://getbootstrap.com/)
+* [jQuery - MIT License](http://jquery.com/)
+* [jqplot - dual licensed under MIT License and GPL Version 2 License](http://www.jqplot.com/)
+* [composer - MIT License](https://getcomposer.org/)
 
-* Zend Framework 2 - BSD 3-Clause License
-* Twitter Bootstrap - Apache License v2.0
-* jQuery - MIT License
-* jqplot - dual licensed under MIT License and GPL Version 2 License
+You can find a complete file listing in [LICENSE](LICENSE).
 
 ### BUGTRACKER
 

composer.json

@@ -9,6 +9,7 @@
     "homepage": "http://bareos.github.io/bareos-webui",
     "require": {
         "php": ">=5.3.3",
-        "zendframework/zendframework": "2.2.*"
+        "zendframework/zendframework": "2.3.*",
+	"zendframework/zend-developer-tools": "dev-master"
     }
 }