Merge branch 'master' of mx:/var/cache/git/repos/ctracker

diff --git a/.gitignore b/.gitignore
index bc2af6d15e64ad75005247c5dfd8c332b79bc0c9..8034addba6c6acb0e679ea987dd880272a6d24cd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
 config/db_config.php
+/nbproject/private/
+

diff --git a/config/db_config.php.dist b/config/db_config.php.dist
index 51c04d8c6ca7e94f8996e4c4d7f9239d08812205..a6368fb10b047b34fae2b61a165e4cd447eab99b 100644 (file)
--- a/config/db_config.php.dist
+++ b/config/db_config.php.dist
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            3.0.0
- * @copyright  Copyright (c) 2009 - 2011 Cracker Tracker Team
+ * @copyright  Copyright (c) 2009 - 2017 Cracker Tracker Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/ctracker.php b/ctracker.php
index b9f04d6a84dd3ea6a9ce433c064235c8c3b46a09..132cd520efde53b9fcc4a276607c74c2f3f4866d 100644 (file)
--- a/ctracker.php
+++ b/ctracker.php
@@ -7,7 +7,7 @@
  *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            3.0.0
- * @copyright  Copyright (c) 2009 - 2011 Cracker Tracker Team
+ * @copyright  Copyright (c) 2009 - 2017 Cracker Tracker Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/libs/language/.php b/libs/language/.php
index 9960b676f910f916bc4d6328df4a2283f770559d..ad89265656a2fd250cfceefa853c350612e6b5b5 100644 (file)
--- a/libs/language/.php
+++ b/libs/language/.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            3.0.0
- * @copyright  Copyright (c) 2009 - 2011 Cracker Tracker Team
+ * @copyright  Copyright (c) 2009 - 2017 Cracker Tracker Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/libs/language/de.php b/libs/language/de.php
index fe8c786a1a529d3706c7588f7264475fc3dbb25b..6cf785979d25049c834391f580c101c134ff20a1 100644 (file)
--- a/libs/language/de.php
+++ b/libs/language/de.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            3.0.0
- * @copyright  Copyright (c) 2009 - 2011 Cracker Tracker Team
+ * @copyright  Copyright (c) 2009 - 2017 Cracker Tracker Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/libs/language/en.php b/libs/language/en.php
index ab1e01128e66f896c705e663e035b6ca24708b89..deedfac34b5f6cc2086d68d4fb3b4ec7168c9885 100644 (file)
--- a/libs/language/en.php
+++ b/libs/language/en.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            3.0.0
- * @copyright  Copyright (c) 2009 - 2011 Cracker Tracker Team
+ * @copyright  Copyright (c) 2009 - 2017 Cracker Tracker Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/libs/lib_ b/libs/lib_
index 0f877be9e92f717cd4c0e142d261486df47ea975..a986c93acfa5a94d9edcbc470177ef29b99c7eef 100644 (file)
--- a/libs/lib_
+++ b/libs/lib_
@@ -1,9 +1,9 @@
 <?php
 /**
- * 
+ *
  * @author             Roland Haeder <webmaster@ship-simu.org>
  * @version            3.0.0
- * @copyright  Copyright (c) 2009, 2010 Cracker Tracker Team
+ * @copyright  Copyright (c) 2009 - 2017 Cracker Tracker Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.ship-simu.org
  *

diff --git a/libs/lib_connect.php b/libs/lib_connect.php
index e21af93b19c58c802414bb6e2bd2d12998ac0041..952445486d1b0429e97be130b96ddeb6c5e00daf 100644 (file)
--- a/libs/lib_connect.php
+++ b/libs/lib_connect.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            3.0.0
- * @copyright  Copyright (c) 2009 - 2011 Cracker Tracker Team
+ * @copyright  Copyright (c) 2009 - 2017 Cracker Tracker Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/libs/lib_detector.php b/libs/lib_detector.php
index 505df9ec7c2869412e54c258687e14c1f648f9b9..627e7b6371a66744f563df2340a1a2964885da7d 100644 (file)
--- a/libs/lib_detector.php
+++ b/libs/lib_detector.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            3.0.0
- * @copyright  Copyright (c) 2009 Cracker Tracker Team
+ * @copyright  Copyright (c) 2009 - 2017 Cracker Tracker Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/libs/lib_general.php b/libs/lib_general.php
index 515f0dc071591b1c375676f449e76dc68a452495..fa4643de30088e24b74c1d3721fe76b79a18265b 100644 (file)
--- a/libs/lib_general.php
+++ b/libs/lib_general.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            3.0.0
- * @copyright  Copyright (c) 2009 - 2011 Cracker Tracker Team
+ * @copyright  Copyright (c) 2009 - 2017 Cracker Tracker Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/libs/lib_updates.php b/libs/lib_updates.php
index 21ef93f731b709c0cd163dc4cc58bfdd7b7c835b..a454a86f409b241022973b7b0439c66cc715c3b2 100644 (file)
--- a/libs/lib_updates.php
+++ b/libs/lib_updates.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            3.0.0
- * @copyright  Copyright (c) 2009 - 2011 Cracker Tracker Team
+ * @copyright  Copyright (c) 2009 - 2017 Cracker Tracker Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/libs/templates/add_ticket.tpl.php b/libs/templates/add_ticket.tpl.php
index cc63835087e1f2024ad21172f134379c54ccc27a..04d8f2a16710312b6e610379e29ec99b6f9184c9 100644 (file)
--- a/libs/templates/add_ticket.tpl.php
+++ b/libs/templates/add_ticket.tpl.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            3.0.0
- * @copyright  Copyright (c) 2009 - 2011 Cracker Tracker Team
+ * @copyright  Copyright (c) 2009 - 2017 Cracker Tracker Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/libs/templates/add_ticket_thanks.tpl.php b/libs/templates/add_ticket_thanks.tpl.php
index 6e3926dd883609f5a6c0f255e409ac356c0ae591..6cf4ff04c56470e359fe169a55c72d18f1dc2c03 100644 (file)
--- a/libs/templates/add_ticket_thanks.tpl.php
+++ b/libs/templates/add_ticket_thanks.tpl.php
@@ -4,7 +4,7 @@
  *
  * @author             Roland Haeder <webmaster@shipsimu.org>
  * @version            3.0.0
- * @copyright  Copyright (c) 2009 - 2011 Cracker Tracker Team
+ * @copyright  Copyright (c) 2009 - 2017 Cracker Tracker Team
  * @license            GNU GPL 3.0 or any newer version
  * @link               http://www.shipsimu.org
  *

diff --git a/nbproject/project.properties b/nbproject/project.properties
new file mode 100644 (file)
index 0000000..76f6f91
--- /dev/null
+++ b/nbproject/project.properties
@@ -0,0 +1,7 @@
+include.path=${php.global.include.path}
+php.version=PHP_56
+source.encoding=UTF-8
+src.dir=.
+tags.asp=false
+tags.short=false
+web.root=.

diff --git a/nbproject/project.xml b/nbproject/project.xml
new file mode 100644 (file)
index 0000000..1a97ac9
--- /dev/null
+++ b/nbproject/project.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>\r
+<project xmlns="http://www.netbeans.org/ns/project/1">\r
+    <type>org.netbeans.modules.php.project</type>\r
+    <configuration>\r
+        <data xmlns="http://www.netbeans.org/ns/php-project/1">\r
+            <name>Cracker Tracker - Enhanced</name>\r
+        </data>\r
+    </configuration>\r
+</project>\r