From 3fc21f0d64b229043e6d76750083a82d22237f23 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Wed, 27 Jun 2018 23:06:23 -0400 Subject: [PATCH] Fix config mentions (no doc) --- bin/dev/friendica-to-smarty-tpl.py | 6 +++--- src/Core/Console/AutomaticInstallation.php | 2 +- src/Core/Install.php | 4 ++-- util/Doxyfile | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bin/dev/friendica-to-smarty-tpl.py b/bin/dev/friendica-to-smarty-tpl.py index 8149051cae..017b8b77ae 100755 --- 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 e0eea1f507..dbc36190ef 100644 --- 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 d6ef52df93..ec33ef9634 100644 --- a/src/Core/Install.php +++ b/src/Core/Install.php @@ -42,7 +42,7 @@ class Install extends BaseObject self::checkImagick($checks); - self::checkHtConfig($checks); + self::checkLocalIni($checks); self::checkSmarty3($checks); @@ -308,7 +308,7 @@ class Install extends BaseObject * * @param array $checks The list of all checks (by-ref parameter!) */ - public static function checkHtConfig(&$checks) + public static function checkLocalIni(&$checks) { $status = true; $help = ""; diff --git a/util/Doxyfile b/util/Doxyfile index 373d172558..aef2307927 100644 --- 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/ -- 2.39.5