* add ability to add multiple ip addresses to objects using pattern x…

.gitignore

@@ -1,8 +1,8 @@
 wwwroot/inc/secret.php
 wwwroot/inc/local.php
+/.idea
 /.project
 tags
-plugins/*
 
 # vim
 [._]*.s[a-w][a-z]

.travis.yml

@@ -5,17 +5,15 @@ git:
   depth: 3
 
 php:
- - 5.4
  - 5.5
  - 5.6
- # In Travis CI PHP 7.0.15 comes with PHPUnit 5.7.6, which is compatible with
- # earlier versions of itself hence RackTables tests can work on older PHP
- # versions too (a major advantage of the test matrix). Later PHP versions come
- # with PHPUnit 6, which is compatible with itself only due to namespaces.
- - 7.0.15
+ - 7.0
+ - 7.1
 
 matrix:
   fast_finish: true
+  allow_failures:
+   - php: 7.1
 
 services:
  - mysql

ChangeLog

@@ -1,3 +1,19 @@
+0.21.0
+	update: display MySQL warnings in debug mode
+	update: better display objects that have no common name
+	update: highlight RackCode syntax in the Permissions viewer too
+	update: refine delivery of rack thumb images
+	update: new plugin architecture
+	update: add support for IP-over-InfiniBand L2 addresses
+	bugfix: put dictionary-based attributes formatting right
+	bugfix: date attributes now can be set for racks, rows and locations
+	new feature: tag colors (GH#158 by Maik Ehinger)
+0.20.14 2017-08-10
+	update: cover comments too in IPv4 & IPv6 search (Mantis#1773 by Fred Stuck)
+	update: suppress the rackspace portlet column if it is empty
+	update: refine items in the dictionary (e.g. SuperMicro and EMC)
+	update: adjust some code for easier customization
+	update: improve some error messages
 0.20.13 2017-05-12
 	update: fix performance for pages with images (GH#190 by Michael A. Mikhailov)
 	update: improve SNMP support for Brocade devices (GH#180 by Chris Jones)

README.Fedora

@@ -47,13 +47,12 @@ The configuration directories could be:
 The "wwwroot" directories will require a short PHP wrapper file each. The
 wrappers will differ only in the value of $racktables_confdir setting:
 
-# cat > /var/www/vhosts/racktables.example1.com/index.php <<<EOF
+# cat > /var/www/vhosts/racktables.example1.com/index.php <<EOF
 <?php
 
 $racktables_confdir = '/etc/RackTables/example1';
 require '/usr/share/RackTables/wwwroot/index.php';
 
-?>
 EOF
 
 Once the wrapper files are installed, setup of each instance must be

README.md

@@ -7,7 +7,7 @@ look for the respective links at [project's web-site](http://racktables.org).
 
 ## 1. Prepare the server
 
-RackTables uses a web-server with PHP (5.2.10 or newer) for front-end and a
+RackTables uses a web-server with PHP (5.5.0 or newer) for front-end and a
 MySQL/MariaDB server version 5 for back-end. The most commonly used web-server
 for RackTables is Apache httpd.
 
@@ -18,7 +18,7 @@ for RackTables is Apache httpd.
 | Debian 6           | `aptitude install mysql-server-5.1`                                     |
 | Debian 7           | `aptitude install mysql-server-5.1`                                     |
 | Fedora 8-16        | `yum install mysql-server mysql`                                        |
-| Fedora 23          | `dnf install mariadb-server mariadb`                                    |
+| Fedora 23-26       | `dnf install mariadb-server mariadb`                                    |
 | FreeBSD 10         | `pkg install mysql56-server`                                            |
 | openSUSE 42.1      | `zypper install mysql-community-server`                                 |
 | Scientific Linux 6 | `yum install mysql-server mysql`                                        |
@@ -32,7 +32,7 @@ for RackTables is Apache httpd.
 | Debian 6           | add `character-set-server=utf8` line to `[mysqld]` section of `/etc/mysql/my.cnf` file and restart mysqld          |
 | Debian 7           | add `character-set-server=utf8` line to `[mysqld]` section of `/etc/mysql/my.cnf` file and restart mysqld          |
 | Fedora 8-16        | add `character-set-server=utf8` line to `[mysqld]` section of `/etc/my.cnf` file and restart mysqld                |
-| Fedora 23          | ```printf "[mysqld]\ncharacter-set-server=utf8\n" > /etc/my.cnf.d/mysqld-charset.cnf; systemctl restart mariadb``` |
+| Fedora 23-26       | ```printf "[mysqld]\ncharacter-set-server=utf8\n" > /etc/my.cnf.d/mysqld-charset.cnf; systemctl restart mariadb``` |
 | openSUSE 42.1      | No action required, comes configured for UTF-8 by default.                                                         |
 | Scientific Linux 6 | add `character-set-server=utf8` line to `[mysqld]` section of `/etc/my.cnf` file and restart mysqld                |
 | Ubuntu 14.04       | ```printf "[mysqld]\ncharacter-set-server=utf8\n" > /etc/mysql/conf.d/charset.cnf; service mysql restart```        |
@@ -46,6 +46,7 @@ for RackTables is Apache httpd.
 | Debian 7 (nginx)   | `aptitude install nginx php5-fpm` **(see note below)**                               |
 | Fedora 8-16        | `yum install httpd php php-mysql php-pdo php-gd php-snmp php-mbstring php-bcmath`    |
 | Fedora 23          | `dnf install httpd php php-mysql php-pdo php-gd php-snmp php-mbstring php-bcmath`    |
+| Fedora 26          | `dnf install httpd php php-mysqlnd php-pdo php-gd php-snmp php-mbstring php-bcmath`  |
 | FreeBSD 10         | see note 1.3.c                                                                       | 
 | openSUSE 42.1      | `zypper install apache2-mod_php5 php5-gd php5-mbstring php5-mysql php5-bcmath`       |
 | Scientific Linux 6 | `yum install httpd php php-mysql php-pdo php-gd php-mbstring php-bcmath`             |
@@ -132,15 +133,15 @@ Note: set `secret.php` permissions when prompted.
 Unpack the tar.gz/zip archive to a directory of your choice and configure Apache
 httpd to use `wwwroot` subdirectory as a new DocumentRoot. Alternatively,
 symlinks to `wwwroot` or even to `index.php` from an existing DocumentRoot are
-also possible and often adisable (see `README.Fedora`).
+also possible and often advisable (see `README.Fedora`).
 
 ## 3. Run the installer
 Open the configured RackTables URL and you will be prompted to configure
 and initialize the application.
 
 | Distribution    | Apache httpd UID:GID    | MySQL UNIX socket path           |
 | --------------- | ----------------------- | -------------------------------- |
-| Fedora 23       | `apache:apache`         | `/var/lib/mysql/mysql.sock`      |
+| Fedora 23-26    | `apache:apache`         | `/var/lib/mysql/mysql.sock`      |
 | openSUSE 42.1   | `wwwrun:www`            | `/var/run/mysql/mysql.sock`      |
 | Ubuntu 14.04    | `www-data:www-data`     | `/var/run/mysqld/mysqld.sock`    |
 | Ubuntu 16.04    | `www-data:www-data`     | `/var/run/mysqld/mysqld.sock`    |
@@ -159,6 +160,16 @@ and initialize the application.
 
 ## Release notes
 
+### Upgrading to 0.21.0
+
+From now on the minimum (oldest) release of PHP that can run RackTables is
+5.5.0.
+
+This release introduces a new plugin architecture.  If you experience issues
+after the upgrade, try disabling plugins.
+Refer to http://wiki.racktables.org/index.php/RackTablesAdminGuide#Plugins
+for more information.
+
 ### Upgrading to 0.20.11
 
 New `IPV4_TREE_SHOW_UNALLOCATED` configuration option introduced to disable

gateways/git-commit

@@ -21,6 +21,10 @@
 # able to write to the repository and run "git pull", "git commit" and "git push"
 # without any user interaction (i.e. the git remote must be on a local
 # filesystem or be configured to use SSH keys).
+#
+# This script uses sudo to switch between the pseudo-users and requires an
+# entry in sudoers along the following lines:
+# httpduser ALL=(racktablesuser) NOPASSWD:/path/to/racktables/gateways/git-commit
 
 [ $# -eq 4 ] || {
 	echo "Usage: $0 <pseudo-user> <repo dir> <path to file> <commit message>" >&2

gateways/ucssdk

@@ -32,6 +32,7 @@ try:
 	from ucsmsdk.mometa.compute.ComputeRackUnit import ComputeRackUnit
 except Exception, err:
 	sys.stderr.write('UCS Python SDK is missing %s (Path: %s)\n' % (str(err), sys.path))
+	sys.stderr.write('<P>Available at https://communities.cisco.com/docs/DOC-64378<P>\n')
 	sys.exit(2)
 
 loggedin = 0

plugins/README

@@ -1,3 +1,13 @@
+*** New Plugin Architecture ***
+
+Each plugin should reside in its own directory and contain a file named
+plugin.php housing certain mandatory functions.
+
+Refer to http://wiki.racktables.org/index.php/RackTablesAdminGuide#Plugins
+for more information.
+
+*** Old Plugin Architecture ***
+
 Put your custom RackTables add-ons into this folder.
 
 Old local.php file is the sample of such add-ons and should be put here