gistfile1.txt

From: Christian Ruppert <idl0r@qasl.de>
Date: Wed, 3 May 2017 20:32:25 +0200
Subject: [PATCH] Some fixes

---
 .htaccess                           | 9 ++++-----
 setup/tools/CLISetup.class.php      | 2 +-
 setup/tools/fileGen.class.php       | 2 +-
 setup/tools/filegen/glyphs.func.php | 2 +-
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.htaccess b/.htaccess
index c0d5b59..112654f 100644
--- a/.htaccess
+++ b/.htaccess
@@ -1,9 +1,8 @@
-Order Deny,Allow
 <FilesMatch "\.(conf|php|in)$">
-    Deny from all
+    Require all denied
 </FilesMatch>
 <FilesMatch "^(index)\.php$">
-    Allow from all
+    Require all granted
 </FilesMatch>
 
 <Files "aowow">
@@ -22,8 +21,8 @@ AddDefaultCharset utf8
 </IfModule>
 
 # UHD screenshots can get pretty large (cannot be set in config)
-    php_value       upload_max_filesize                         20M
-    php_value       post_max_size                               25M
+#    php_value       upload_max_filesize                         20M
+#    php_value       post_max_size                               25M
 
 RewriteEngine on
 # RewriteBase /~user/localPath/     # enable if the rules do not work, when they should
diff --git a/setup/tools/CLISetup.class.php b/setup/tools/CLISetup.class.php
index d3e1954..78de2ea 100644
--- a/setup/tools/CLISetup.class.php
+++ b/setup/tools/CLISetup.class.php
@@ -439,7 +439,7 @@ class CLISetup
                         if (!$isHidden && self::$hasReadline)
                             echo chr(self::CHR_BACK)." ".chr(self::CHR_BACK);
                     }
-                    else if ($keyId == self::CHR_LF)
+                                       else if ($keyId == self::CHR_LF or $keyId == 13)
                     {
                         $fields[$name] = $charBuff;
                         break;
diff --git a/setup/tools/fileGen.class.php b/setup/tools/fileGen.class.php
index cbaaae8..632cdb4 100644
--- a/setup/tools/fileGen.class.php
+++ b/setup/tools/fileGen.class.php
@@ -52,7 +52,7 @@ class FileGen
         'soundfiles'    => [['sounds'], null]
     );
 
-    public  static $defaultExecTime = 30;
+    public  static $defaultExecTime = 300;
 
     private static $reqDirs   = array(
         'static/uploads/screenshots/normal',
diff --git a/setup/tools/filegen/glyphs.func.php b/setup/tools/filegen/glyphs.func.php
index f39914d..3eb9549 100644
--- a/setup/tools/filegen/glyphs.func.php
+++ b/setup/tools/filegen/glyphs.func.php
@@ -52,7 +52,7 @@ if (!CLI)
 
         foreach (CLISetup::$localeIds as $lId)
         {
-            set_time_limit(30);
+            set_time_limit(300);
 
             User::useLocale($lId);
             Lang::load(Util::$localeStrings[$lId]);
-- 
2.10.2