Fix config mentions (no doc)

diff --git a/bin/dev/friendica-to-smarty-tpl.py b/bin/dev/friendica-to-smarty-tpl.py
index 8149051caec76896410afb141875322b386467aa..017b8b77ae23e7d2c74ec80d211bde9128a2e4e9 100755 (executable)
--- a/bin/dev/friendica-to-smarty-tpl.py
+++ b/bin/dev/friendica-to-smarty-tpl.py
@@ -83,7 +83,7 @@ def fix_element(element):
                        element += ldelim + parts[first+1].rstrip('}') + rdelim
                else:
                        # This takes care of elements where the filename is a path, e.g. {{ inc file.tpl }}
-                       element += parts[first+1].rstrip('}') 
+                       element += parts[first+1].rstrip('}')
 
                element += '"'
 
@@ -205,7 +205,7 @@ try:
 except getopt.GetoptError:
        help(sys.argv[0])
        sys.exit(2)
-       
+
 
 if path == '':
        path = raw_input('Path to template folder to convert: ')
@@ -220,7 +220,7 @@ if not os.path.exists(outpath):
 
 files = os.listdir(path)
 for a_file in files:
-       if a_file == 'htconfig.tpl':
+       if a_file == 'local.ini.tpl':
                php_tpl = True
        else:
                php_tpl = False

diff --git a/src/Core/Console/AutomaticInstallation.php b/src/Core/Console/AutomaticInstallation.php
index e0eea1f507abf474a6f2d0fecbbd0a73b6ad2d04..dbc36190efe2b425df47a11ab4e09ca22644383b 100644 (file)
--- a/src/Core/Console/AutomaticInstallation.php
+++ b/src/Core/Console/AutomaticInstallation.php
@@ -121,7 +121,7 @@ HELP;
 
                Install::checkFunctions($checks);
                Install::checkImagick($checks);
-               Install::checkHtConfig($checks);
+               Install::checkLocalIni($checks);
                Install::checkSmarty3($checks);
                Install::checkKeys($checks);
 

diff --git a/src/Core/Install.php b/src/Core/Install.php
index d6ef52df93056bcdeaee7c5549c1b20ada5b3648..ec33ef9634d77c0440dc74a4aac4b7111f263435 100644 (file)
--- a/src/Core/Install.php
+++ b/src/Core/Install.php
@@ -42,7 +42,7 @@ class Install extends BaseObject
 \r
                self::checkImagick($checks);\r
 \r
-               self::checkHtConfig($checks);\r
+               self::checkLocalIni($checks);\r
 \r
                self::checkSmarty3($checks);\r
 \r
@@ -308,7 +308,7 @@ class Install extends BaseObject
         *\r
         * @param array $checks The list of all checks (by-ref parameter!)\r
         */\r
-       public static function checkHtConfig(&$checks)\r
+       public static function checkLocalIni(&$checks)\r
        {\r
                $status = true;\r
                $help = "";\r

diff --git a/util/Doxyfile b/util/Doxyfile
index 373d172558c2e4737f6363e1803e5e3880502189..aef2307927f46934d76447cfb9319233edcc69fa 100644 (file)
--- a/util/Doxyfile
+++ b/util/Doxyfile
@@ -2,8 +2,8 @@ INPUT = README.md index.php boot.php testargs.php update.php mod/ object/ includ
 RECURSIVE = YES
 PROJECT_NAME = "Friendica"
 PROJECT_LOGO = images/friendica-64.jpg
-EXCLUDE = .htconfig.php library/ doc/ .git/ log/ util/zotsh/easywebdav/ addon/ report/ privacy_image_cache/ photo/ proxy/ local/
-EXCLUDE_PATTERNS = *smarty3* *strings.php*.log *.out *test* 
+EXCLUDE = .htconfig.php config/ library/ doc/ .git/ log/ util/zotsh/easywebdav/ addon/ report/ privacy_image_cache/ photo/ proxy/ local/
+EXCLUDE_PATTERNS = *smarty3* *strings.php*.log *.out *test*
 OUTPUT_DIRECTORY = doc
 GENERATE_HTML = YES
 HTML_OUTPUT = html/