Preparing for Version 2.0

CHANGELOG.md

@@ -0,0 +1,25 @@
+--- 2.0 ---
+
+feature: Allow creation of named Trees
+feature: Allow Adding optional sub-branches to new Trees
+feature: Add more callbacks to make navaigation smoother
+feature: Move away from concept of 'Personal Trees' till Cacti arrives there
+
+--- 1.1 ---
+
+issue: Correct some image issues
+issue: Made default sorting Alphabetic for new trees
+issue; Made default sorting Inherited for new branches/graphs
+
+--- 1.0 ---
+
+feature: Updated to work with 1.x
+
+--- 0.2 ---
+
+feature: Added option to display as a console menu item instead
+feature: Added option to save to an existing Graph Tree
+
+--- v0.1 --- 
+
+Initial Release

INFO

@@ -1,10 +1,10 @@
 [info]
-compat = 1.1.9
+compat = 1.2.17
 author=Howard Jones
 homepage=https://github.com/howardjones/cacti-quicktree
 webpage=https://github.com/howardjones/cacti-quicktree
-longname=QuickTree for Cacti 1.x
+longname=QuickTree for Cacti
 name=quicktree
-version=1.1.0
+version=2.0
 email=howie@thingy.com
 url=http://www.network-weathermap.com/versions.php

README.md

@@ -1,6 +1,9 @@
 # cacti-quicktree
 
-Make playlists of graphs in Cacti
+Make play-lists of graphs in Cacti
+
+
+***NOTE*** Version 2.0 of QuickTree only works on Cacti 1.2.17 or above!
 
 ***NOTE*** Version 1.0 of QuickTree only works on Cacti 1.1.9 or above!
 
@@ -15,7 +18,7 @@ Cacti install very quickly. If it turns out that the set of graphs will be
 useful in the future too, you can save them as a normal Cacti graph tree,
 provided that you have permissions to do so.
 
-Each user (with QuickTree permssions) gets their own QuickTree.
+Each user (with QuickTree permissions) gets their own QuickTree.
 
 Make sure that you rename the folder to `quicktree` so that the plugin system is
 happy.

index.php

@@ -1,6 +1,4 @@
 <?php
 
-header("Location:../index.php");
+header('Location:../index.php');
 
-// vim:ts=4:sw=4:
-?>

locales/LC_MESSAGES/index.php

@@ -0,0 +1,4 @@
+<?php
+
+header("Location:../index.php");
+

locales/build_gettext.sh

@@ -0,0 +1,75 @@
+#!/bin/sh
+#+-------------------------------------------------------------------------+
+#| Copyright (C) 2004-2021 Howard Jones                                    |
+#|                                                                         |
+#| This program is free software; you can redistribute it and/or           |
+#| modify it under the terms of the GNU General Public License             |
+#| as published by the Free Software Foundation; either version 2          |
+#| of the License, or (at your option) any later version.                  |
+#|                                                                         |
+#| This program is distributed in the hope that it will be useful,         |
+#| but WITHOUT ANY WARRANTY; without even the implied warranty of          |
+#| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the           |
+#| GNU General Public License for more details.                            |
+#+-------------------------------------------------------------------------+
+#| Cacti: The Complete RRDtool-based Graphing Solution                     |
+#+-------------------------------------------------------------------------+
+#| This code is designed, written, and maintained by the Cacti Group. See  |
+#| about.php and/or the AUTHORS file for specific developer information.   |
+#+-------------------------------------------------------------------------+
+#| http://www.cacti.net/                                                   |
+#+-------------------------------------------------------------------------+
+
+# get script name
+SCRIPT_NAME=`basename ${0}`
+
+# locate base directory of Cacti
+REALPATH_BIN=`which realpath 2>/dev/null`
+if [ $? -gt 0 ]
+then
+	echo "ERROR: unable to locate realpath"
+	echo
+	echo "Linux: Confirm coreutils installed"
+	echo "Mac: Brew install coreutils"
+	echo
+	exit 1
+fi
+BASE_PATH=`${REALPATH_BIN} ${0} | sed s#/locales/${SCRIPT_NAME}##`
+
+# locate xgettext for processing
+XGETTEXT_BIN=`which xgettext 2>/dev/null`
+if [ $? -gt 0 ]
+then
+	echo "ERROR: Unable to locate xgettext"
+	echo
+	echo "Linux: Install GNU gettext"
+	echo "Mac: Brew install GNU gettext"
+	echo
+	exit 1
+fi
+
+# Update main gettext POT file with application strings
+echo "Updating Cacti language gettext language file..."
+cd ${BASE_PATH}
+
+${XGETTEXT_BIN} --no-wrap --copyright-holder="The Cacti Group" --package-name="Cacti" --package-version=`cat include/cacti_version` --msgid-bugs-address="developers@cacti.net" -F -k__gettext -k__ -k__n:1,2 -k__x:1c,2 -k__xn:1c,2,3 -k__esc -k__esc_n:1,2 -k__esc_x:1c,2 -k__esc_xn:1c,2,3 -k__date -o locales/po/cacti.pot `find . -maxdepth 2 -name \*.php`
+
+sed -i 's/FULL NAME <EMAIL@ADDRESS\>/Howard Jones <howie@thingy.com>/g' locales/po/cacti.pot
+sed -i 's/LANGUAGE <LL@li.org>/Howard Jones <howie@thingy.com>/g' locales/po/cacti.pot
+sed -i 's/CHARSET/UTF-8/g' locales/po/cacti.pot
+
+# Merge any changes to POT file into language files
+echo "Merging updates to language files..."
+
+for file in `ls -1 locales/po/*.po`;do
+	echo "Updating $file from cacti.pot"
+	msgmerge --backup off --no-wrap --update -F $file locales/po/cacti.pot
+done
+
+for file in `ls -1 locales/po/*.po`;do
+  ofile=$(basename --suffix=.po ${file})
+  echo "Converting $file to LC_MESSAGES/${ofile}.mo"
+  msgfmt ${file} -o locales/LC_MESSAGES/${ofile}.mo
+done
+
+exit 0

locales/index.php

@@ -0,0 +1,5 @@
+<?php
+
+header("Location:../index.php");
+
+?>