Skip to content

Commit 34801e5

Browse files
TheWitnessTheWitness
committed
QA: Updating copyrights and new registration function
1 parent 87792f2 commit 34801e5

9 files changed

+49
-48
lines changed

‎CHANGELOG.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@
3434
- Initial Release
3535

3636
-----------------------------------------------
37-
Copyright (c) 2004-2023 - The Cacti Group, Inc.
37+
Copyright (c) 2004-2024 - The Cacti Group, Inc.

‎INFO

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
; +-------------------------------------------------------------------------+
2-
; | Copyright (C) 2004-2023 The Cacti Group |
2+
; | Copyright (C) 2004-2024 The Cacti Group |
33
; | |
44
; | This program is free software; you can redistribute it and/or |
55
; | modify it under the terms of the GNU General Public License |
@@ -23,7 +23,6 @@
2323
compat = 1.2.17
2424
author=Howard Jones
2525
homepage=https://github.com/howardjones/cacti-quicktree
26-
webpage=https://github.com/howardjones/cacti-quicktree
2726
longname=QuickTree for Cacti
2827
name=quicktree
2928
version=2.0

‎index.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22
/*
33
+-------------------------------------------------------------------------+
4-
| Copyright (C) 2004-2023 Howard Jones |
5-
| Copyright (C) 2022 The Cacti Group |
4+
| Copyright (C) 2010-2022 Howard Jones |
5+
| Copyright (C) 2022-2024 The Cacti Group |
66
| |
77
| This program is free software; you can redistribute it and/or |
88
| modify it under the terms of the GNU General Public License |

‎locales/build_gettext.sh

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
#!/bin/sh
2-
#+-------------------------------------------------------------------------+
3-
#| Copyright (C) 2004-2023 Howard Jones |
4-
#| |
5-
#| This program is free software; you can redistribute it and/or |
6-
#| modify it under the terms of the GNU General Public License |
7-
#| as published by the Free Software Foundation; either version 2 |
8-
#| of the License, or (at your option) any later version. |
9-
#| |
10-
#| This program is distributed in the hope that it will be useful, |
11-
#| but WITHOUT ANY WARRANTY; without even the implied warranty of |
12-
#| MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13-
#| GNU General Public License for more details. |
14-
#+-------------------------------------------------------------------------+
15-
#| Cacti: The Complete RRDtool-based Graphing Solution |
16-
#+-------------------------------------------------------------------------+
17-
#| This code is designed, written, and maintained by the Cacti Group. See |
18-
#| about.php and/or the AUTHORS file for specific developer information. |
19-
#+-------------------------------------------------------------------------+
20-
#| http://www.cacti.net/ |
21-
#+-------------------------------------------------------------------------+
2+
# +-------------------------------------------------------------------------+
3+
# | Copyright (C) 2004-2024 The Cacti Group |
4+
# | |
5+
# | This program is free software; you can redistribute it and/or |
6+
# | modify it under the terms of the GNU General Public License |
7+
# | as published by the Free Software Foundation; either version 2 |
8+
# | of the License, or (at your option) any later version. |
9+
# | |
10+
# | This program is distributed in the hope that it will be useful, |
11+
# | but WITHOUT ANY WARRANTY; without even the implied warranty of |
12+
# | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
13+
# | GNU General Public License for more details. |
14+
# +-------------------------------------------------------------------------+
15+
# | Cacti: The Complete RRDtool-based Graphing Solution |
16+
# +-------------------------------------------------------------------------+
17+
# | This code is designed, written, and maintained by the Cacti Group. See |
18+
# | about.php and/or the AUTHORS file for specific developer information. |
19+
# +-------------------------------------------------------------------------+
20+
# | http://www.cacti.net/ |
21+
# +-------------------------------------------------------------------------+
2222

2323
# get script name
2424
SCRIPT_NAME=`basename ${0}`

‎locales/index.php

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22
/*
33
+-------------------------------------------------------------------------+
4-
| Copyright (C) 2004-2023 Howard Jones |
5-
| Copyright (C) 2022 The Cacti Group |
4+
| Copyright (C) 2004-2022 Howard Jones |
5+
| Copyright (C) 2022-2024 The Cacti Group |
66
| |
77
| This program is free software; you can redistribute it and/or |
88
| modify it under the terms of the GNU General Public License |
@@ -24,5 +24,3 @@
2424
*/
2525

2626
header("Location:../index.php");
27-
28-
?>

‎quicktree.css

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
+-------------------------------------------------------------------------+
3-
| Copyright (C) 2004-2023 Howard Jones |
4-
| Copyright (C) 2022 The Cacti Group |
3+
| Copyright (C) 2010-2022 Howard Jones |
4+
| Copyright (C) 2022-2024 The Cacti Group |
55
| |
66
| This program is free software; you can redistribute it and/or |
77
| modify it under the terms of the GNU General Public License |

‎quicktree.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
/*
22
+-------------------------------------------------------------------------+
3-
| Copyright (C) 2004-2023 Howard Jones |
4-
| Copyright (C) 2022 The Cacti Group |
3+
| Copyright (C) 2010-2022 Howard Jones |
4+
| Copyright (C) 2022-2024 The Cacti Group |
55
| |
66
| This program is free software; you can redistribute it and/or |
77
| modify it under the terms of the GNU General Public License |

‎quicktree.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22
/*
33
+-------------------------------------------------------------------------+
4-
| Copyright (C) 2004-2023 Howard Jones |
5-
| Copyright (C) 2022 The Cacti Group |
4+
| Copyright (C) 2010-2022 Howard Jones |
5+
| Copyright (C) 2022-2024 The Cacti Group |
66
| |
77
| This program is free software; you can redistribute it and/or |
88
| modify it under the terms of the GNU General Public License |

‎setup.php

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?php
22
/*
33
+-------------------------------------------------------------------------+
4-
| Copyright (C) 2004-2023 Howard Jones |
5-
| Copyright (C) 2022 The Cacti Group |
4+
| Copyright (C) 2004-2022 Howard Jones |
5+
| Copyright (C) 2022-2024 The Cacti Group |
66
| |
77
| This program is free software; you can redistribute it and/or |
88
| modify it under the terms of the GNU General Public License |
@@ -246,17 +246,21 @@ function quicktree_check_upgrade() {
246246

247247
quicktree_setup_table();
248248

249-
db_execute_prepared('UPDATE plugin_config SET
250-
version = ?, name = ?, author = ?, webpage = ?
251-
WHERE directory = ?',
252-
array(
253-
$info['version'],
254-
$info['longname'],
255-
$info['author'],
256-
$info['homepage'],
257-
$info['name']
258-
)
259-
);
249+
if (function_exists('api_plugin_upgrade_register')) {
250+
api_plugin_upgrade_register('quicktree');
251+
} else {
252+
db_execute_prepared('UPDATE plugin_config SET
253+
version = ?, name = ?, author = ?, webpage = ?
254+
WHERE directory = ?',
255+
array(
256+
$info['version'],
257+
$info['longname'],
258+
$info['author'],
259+
$info['homepage'],
260+
$info['name']
261+
)
262+
);
263+
}
260264
}
261265
}
262266

0 commit comments

Comments
 (0)