Merge pull request #362 from nachtgeist/master

don't split .gitignore

.gitignore

@@ -1,6 +1,7 @@
-templates/*
-logs/*
 install/update.log
+templates/*
+lib/userdata.inc.php
+logs/*
 .buildpath
 .project
 .settings/
@@ -8,4 +9,9 @@ install/update.log
 *~
 .well-known
 .idea
-*.iml
+*.iml
+
+!templates/Froxlor/
+!templates/Sparkle/
+!templates/misc/
+templates/Froxlor/assets/img/logo_custom.png

install/scripts/language-check.php

@@ -19,10 +19,7 @@
 $baseLanguage = 'english.lng.php';
 
 // Check if we're in the CLI
-if(@php_sapi_name() != 'cli'
+if(@php_sapi_name() !== 'cli') {
-   && @php_sapi_name() != 'cgi'
-   && @php_sapi_name() != 'cgi-fcgi'
-) {
 	die('This script will only work in the shell.');
 }
 

install/scripts/switch-server-ip.php

@@ -16,6 +16,11 @@
  *
  */
 
+// Check if we're in the CLI
+if(@php_sapi_name() !== 'cli') {
+	die('This script will only work in the shell.');
+}
+
 // give control to command line handler
 try {
 	CmdLineHandler::processParameters($argc, $argv);

lib/.gitignore

@@ -1 +0,0 @@
-userdata.inc.php

templates/.gitignore

@@ -1,4 +0,0 @@
-!Froxlor/
-!Sparkle/
-Froxlor/assets/img/logo_custom.png
-!misc/