Browse Source

Fix config mentions (no doc)

tags/2018.09
Hypolite Petovan 1 year ago
parent
commit
3fc21f0d64

+ 3
- 3
bin/dev/friendica-to-smarty-tpl.py View File

@@ -83,7 +83,7 @@ def fix_element(element):
83 83
 			element += ldelim + parts[first+1].rstrip('}') + rdelim
84 84
 		else:
85 85
 			# This takes care of elements where the filename is a path, e.g. {{ inc file.tpl }}
86
-			element += parts[first+1].rstrip('}') 
86
+			element += parts[first+1].rstrip('}')
87 87
 
88 88
 		element += '"'
89 89
 
@@ -205,7 +205,7 @@ try:
205 205
 except getopt.GetoptError:
206 206
 	help(sys.argv[0])
207 207
 	sys.exit(2)
208
-	
208
+
209 209
 
210 210
 if path == '':
211 211
 	path = raw_input('Path to template folder to convert: ')
@@ -220,7 +220,7 @@ if not os.path.exists(outpath):
220 220
 
221 221
 files = os.listdir(path)
222 222
 for a_file in files:
223
-	if a_file == 'htconfig.tpl':
223
+	if a_file == 'local.ini.tpl':
224 224
 		php_tpl = True
225 225
 	else:
226 226
 		php_tpl = False

+ 1
- 1
src/Core/Console/AutomaticInstallation.php View File

@@ -121,7 +121,7 @@ HELP;
121 121
 
122 122
 		Install::checkFunctions($checks);
123 123
 		Install::checkImagick($checks);
124
-		Install::checkHtConfig($checks);
124
+		Install::checkLocalIni($checks);
125 125
 		Install::checkSmarty3($checks);
126 126
 		Install::checkKeys($checks);
127 127
 

+ 2
- 2
src/Core/Install.php View File

@@ -42,7 +42,7 @@ class Install extends BaseObject
42 42
 
43 43
 		self::checkImagick($checks);
44 44
 
45
-		self::checkHtConfig($checks);
45
+		self::checkLocalIni($checks);
46 46
 
47 47
 		self::checkSmarty3($checks);
48 48
 
@@ -308,7 +308,7 @@ class Install extends BaseObject
308 308
 	 *
309 309
 	 * @param array $checks The list of all checks (by-ref parameter!)
310 310
 	 */
311
-	public static function checkHtConfig(&$checks)
311
+	public static function checkLocalIni(&$checks)
312 312
 	{
313 313
 		$status = true;
314 314
 		$help = "";

+ 2
- 2
util/Doxyfile View File

@@ -2,8 +2,8 @@ INPUT = README.md index.php boot.php testargs.php update.php mod/ object/ includ
2 2
 RECURSIVE = YES
3 3
 PROJECT_NAME = "Friendica"
4 4
 PROJECT_LOGO = images/friendica-64.jpg
5
-EXCLUDE = .htconfig.php library/ doc/ .git/ log/ util/zotsh/easywebdav/ addon/ report/ privacy_image_cache/ photo/ proxy/ local/
6
-EXCLUDE_PATTERNS = *smarty3* *strings.php*.log *.out *test* 
5
+EXCLUDE = .htconfig.php config/ library/ doc/ .git/ log/ util/zotsh/easywebdav/ addon/ report/ privacy_image_cache/ photo/ proxy/ local/
6
+EXCLUDE_PATTERNS = *smarty3* *strings.php*.log *.out *test*
7 7
 OUTPUT_DIRECTORY = doc
8 8
 GENERATE_HTML = YES
9 9
 HTML_OUTPUT = html/

Loading…
Cancel
Save