Added support for naming INI files .ini.php so that they can be secured without the need for .htaccess files. This should be the new best practice as we aim to make Xataface more friendly to non-apache environments.

shannah · shannah · commit b17bbf25fc2c · 2018-07-01T08:15:40.000-07:00
diff --git a/Dataface/Application.php b/Dataface/Application.php
@@ -550,13 +550,20 @@ function Dataface_Application($conf = null){
 		}
 		$this->_baseUrl  = $_SERVER['PHP_SELF'];
 		if ( !is_array($conf) ) $conf = array();
-		if ( is_readable(DATAFACE_SITE_PATH.'/conf.ini') ){
-			$conf = array_merge(parse_ini_file(DATAFACE_SITE_PATH.'/conf.ini', true), $conf);
+                $configPath = DATAFACE_SITE_PATH.'/conf.ini.php';
+                if (!is_readable($configPath)) {
+                    $configPath = DATAFACE_SITE_PATH.'/conf.ini';
+                }
+		if ( is_readable($configPath) ){
+			$conf = array_merge(parse_ini_file($configPath, true), $conf);
 			if ( @$conf['__include__'] ){
 				$includes = array_map('trim',explode(',', $conf['__include__']));
 				foreach ($includes as $i){
+                                        
 					if ( is_readable($i) ){
 						$conf = array_merge($conf, parse_ini_file($i, true));
+					} else if ( is_readable($i.'.php') ){
+						$conf = array_merge($conf, parse_ini_file($i.'.php', true));
 					}
 				}
 			}
diff --git a/Dataface/ConfigTool.php b/Dataface/ConfigTool.php
@@ -161,13 +161,18 @@ function &loadConfigFromINI($type=null, $tablename='__global__'){
 			
 			if ( $tablename !== '__global__' ){
 			    $paths[] = DATAFACE_PATH.'/lang/'.basename($app->_conf['lang']).'.ini';
-				$lpaths[] = DATAFACE_SITE_PATH.'/lang/'.basename($app->_conf['lang']).'.ini';
-				if ( !class_exists('Dataface_Table') ) import('Dataface/Table.php');
-				$lpaths[] = Dataface_Table::getBasePath($tablename).'/tables/'.basename($tablename).'/lang/'.basename($app->_conf['lang']).'.ini';
-				
+                            $paths[] = DATAFACE_PATH.'/lang/'.basename($app->_conf['lang']).'.ini.php';
+                            $lpaths[] = DATAFACE_SITE_PATH.'/lang/'.basename($app->_conf['lang']).'.ini';
+                            $lpaths[] = DATAFACE_SITE_PATH.'/lang/'.basename($app->_conf['lang']).'.ini.php';
+                            if ( !class_exists('Dataface_Table') ) import('Dataface/Table.php');
+                            $lpaths[] = Dataface_Table::getBasePath($tablename).'/tables/'.basename($tablename).'/lang/'.basename($app->_conf['lang']).'.ini';
+                            $lpaths[] = Dataface_Table::getBasePath($tablename).'/tables/'.basename($tablename).'/lang/'.basename($app->_conf['lang']).'.ini.php';
+
 			} else {
 				$paths[] = DATAFACE_PATH.'/lang/'.basename($app->_conf['lang']).'.ini';
+                                $paths[] = DATAFACE_PATH.'/lang/'.basename($app->_conf['lang']).'.ini.php';
 				$lpaths[] = DATAFACE_SITE_PATH.'/lang/'.basename($app->_conf['lang']).'.ini';
+                                $lpaths[] = DATAFACE_SITE_PATH.'/lang/'.basename($app->_conf['lang']).'.ini.php';
 			}
 		
 		} else if ( $tablename !== '__global__' ){
@@ -176,13 +181,18 @@ function &loadConfigFromINI($type=null, $tablename='__global__'){
 			// the valuelist each time... and there may be opportunities to 
 			// share between tables
 			if ( $type != 'valuelists' ) $paths[] = DATAFACE_PATH.'/'.basename($type).'.ini';
+                        if ( $type != 'valuelists' ) $paths[] = DATAFACE_PATH.'/'.basename($type).'.ini.php';
 			if ( $type != 'valuelists' ) $lpaths[] = DATAFACE_SITE_PATH.'/'.basename($type).'.ini';
+                        if ( $type != 'valuelists' ) $lpaths[] = DATAFACE_SITE_PATH.'/'.basename($type).'.ini.php';
 			$lpaths[] = Dataface_Table::getBasePath($tablename).'/tables/'.basename($tablename).'/'.basename($type).'.ini';
+                        $lpaths[] = Dataface_Table::getBasePath($tablename).'/tables/'.basename($tablename).'/'.basename($type).'.ini.php';
 			
 		} else {
 			
 			$paths[] = DATAFACE_PATH.'/'.basename($type).'.ini';
+                        $paths[] = DATAFACE_PATH.'/'.basename($type).'.ini.php';
 			$lpaths[] = DATAFACE_SITE_PATH.'/'.basename($type).'.ini';
+                        $lpaths[] = DATAFACE_SITE_PATH.'/'.basename($type).'.ini.php';
 		}
 		
 		// Add the ability to override settings in a module.
@@ -194,10 +204,14 @@ function &loadConfigFromINI($type=null, $tablename='__global__'){
 				$modname = implode('_', $modpath);
 				if ( $type == 'lang' ){
 					$paths[] = DATAFACE_SITE_PATH.'/modules/'.basename($modname).'/lang/'.basename($app->_conf['lang']).'.ini';
+                                        $paths[] = DATAFACE_SITE_PATH.'/modules/'.basename($modname).'/lang/'.basename($app->_conf['lang']).'.ini.php';
 					$paths[] = DATAFACE_PATH.'/modules/'.basename($modname).'/lang/'.basename($app->_conf['lang']).'.ini';
+                                        $paths[] = DATAFACE_PATH.'/modules/'.basename($modname).'/lang/'.basename($app->_conf['lang']).'.ini.php';
 				} else {
 					$paths[] = DATAFACE_SITE_PATH.'/modules/'.basename($modname).'/'.basename($type).'.ini';
+                                        $paths[] = DATAFACE_SITE_PATH.'/modules/'.basename($modname).'/'.basename($type).'.ini.php';
 					$paths[] = DATAFACE_PATH.'/modules/'.basename($modname).'/'.basename($type).'.ini';
+                                        $paths[] = DATAFACE_PATH.'/modules/'.basename($modname).'/'.basename($type).'.ini.php';
 				}
 			}
 		}
@@ -325,10 +339,13 @@ function &loadConfigFromINI($type=null, $tablename='__global__'){
 		$upaths = array();
 		if ( $type == 'lang' ){
 			$upaths[] =  'lang/'.$app->_conf['lang'].'.ini';
+                        $upaths[] =  'lang/'.$app->_conf['lang'].'.ini.php';
 			$upaths[] = 'tables/'.$tablename.'/lang/'.$app->_conf['lang'].'.ini';
+                        $upaths[] = 'tables/'.$tablename.'/lang/'.$app->_conf['lang'].'.ini.php';
 		} else {
 			$upaths[] = $type.'.ini';
 			$upaths[] = 'tables/'.$tablename.'/'.$type.'.ini';
+                        $upaths[] = 'tables/'.$tablename.'/'.$type.'.ini.php';
 		}
 		foreach ( $upaths as $p ){
 			if ( isset($user_config->{$p}) ){
diff --git a/actions.ini.php b/actions.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 ;;------------------------------------------------------------------------------
 ;; Table tabs
 ;; -----------
diff --git a/lang/ca.ini.php b/lang/ca.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 440 = "322"
 templates.Dataface_Fineprint.COPYRIGHT = "(c) $year Tots els drets reservats"
 actions.related_records_list.label = "{$query['-relationship']}"
diff --git a/lang/de.ini.php b/lang/de.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 440 = "439"
 templates.Dataface_Fineprint.COPYRIGHT = "(c) $year Alle Rechte vorbehalten"
 actions.related_records_list.label = "{$query['-relationship']}"
diff --git a/lang/el.ini.php b/lang/el.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 actions.edit.label = "Τροποποίηση"
 actions.summary_edit.label = "Τροποποίηση"
 templates.Dataface_RecordHistory.LABEL_CHANGES = "Αλλαγές"
diff --git a/lang/en.ini.php b/lang/en.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 440 = "440"
 templates.Dataface_Fineprint.COPYRIGHT = "(c) $year All rights reserved"
 actions.related_records_list.label = "{$query['-relationship']}"
diff --git a/lang/es.ini.php b/lang/es.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 440 = "436"
 templates.Dataface_Fineprint.COPYRIGHT = "&copy; $year - Todos los derechos reservados"
 actions.edit.label = "Editar"
diff --git a/lang/fr.ini.php b/lang/fr.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 440 = "408"
 templates.Dataface_Fineprint.COPYRIGHT = "(c) $year Tous droits réservés"
 actions.related_records_list.label = "{$query['-relationship']}"
diff --git a/lang/it.ini.php b/lang/it.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 440 = "440"
 templates.Dataface_Fineprint.COPYRIGHT = "(c) $year Tutti i diritti riservati"
 actions.related_records_list.label = "{$query['-relationship']}"
diff --git a/lang/jp.ini.php b/lang/jp.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 440 = "149"
 templates.Dataface_Fineprint.COPYRIGHT = "(c) $year すべての権利を保有"
 actions.related_records_list.label = "{$query['-関係']}"
diff --git a/lang/nl.ini.php b/lang/nl.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 440 = "323"
 templates.Dataface_Fineprint.COPYRIGHT = "(c) $year Alle rechten voorbehouden"
 actions.related_records_list.label = "{$query['-relationship']}"
diff --git a/lang/pl.ini.php b/lang/pl.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 440 = "424"
 templates.Dataface_Fineprint.COPYRIGHT = "(c) $year Wszelkie prawa zastrzeżone."
 actions.related_records_list.label = "{$query['-relationship']}"
diff --git a/lang/pt.ini.php b/lang/pt.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 440 = "16"
 templates.Dataface_Fineprint.COPYRIGHT = "(c) $year Todos os direitos reservados"
 actions.related_records_list.label = "{$query['-relationship]}"
diff --git a/lang/zh.ini.php b/lang/zh.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 440 = "306"
 templates.Dataface_Fineprint.COPYRIGHT = "（三）{$year}保留所有權利"
 actions.related_records_list.label = "{$query['-relationship']}"
diff --git a/lang/zt.ini.php b/lang/zt.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 440 = "306"
 templates.Dataface_Fineprint.COPYRIGHT = "(c) $year保留所有權利"
 actions.related_records_list.label = "{$query['-relationship']}"
diff --git a/metadata.ini.php b/metadata.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 [translation_state]
 Type="int(11)"
 multilingual=1
diff --git a/modules/XataJax/permissions.ini.php b/modules/XataJax/permissions.ini.php
@@ -1 +1,2 @@
+;<?php exit;
 view schema = "Permission to view the schema for a table, field, or relationship"
diff --git a/modules/g2/actions.ini.php b/modules/g2/actions.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 [logout > logout]
 	url="{$site_href}?-action=logout"
 	condition="df_is_logged_in()"
diff --git a/modules/g2/lang/en.ini.php b/modules/g2/lang/en.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 actions.new.label = "New {$tableObj->getSingularLabel()}"
 actions.new.description = "Insert a new {$tableObj->getSingularLabel()} into {$tableObj->getLabel()}"
 actions.import.label = "Import {$tableObj->getLabel()}"
diff --git a/modules/g2/lang/fr.ini.php b/modules/g2/lang/fr.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 actions.new.label = "Créer un(e) {$tableObj->getSingularLabel()}"
 actions.new.description = "Insérer un(e) {$tableObj->getSingularLabel()} dans les {$tableObj->getLabel()}"
 actions.import.label = "Importer des {$tableObj->getLabel()}"
diff --git a/modules/g2/lang/it.ini.php b/modules/g2/lang/it.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 actions.new.label = "Nuovo {$tableObj->getSingularLabel()}"
 actions.new.description = "Inserire un nuovo {$tableObj->getSingularLabel()} in {$tableObj->getLabel()}"
 actions.import.label = "Importa {$tableObj->getLabel()}"
diff --git a/modules/g2/lang/pl.ini.php b/modules/g2/lang/pl.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 actions.new.label = "Nowy rekord"
 actions.new.description = "Wstawienie nowego rekordu do {$tableObj->getLabel()}"
 actions.import.label = "Importuj rekordy"
diff --git a/permissions.ini.php b/permissions.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 ;;First we will list the permissions and their associated labels.
 
 ;; view : Allowed to view an element
diff --git a/site_skeleton/conf.ini.php b/site_skeleton/conf.ini.php
@@ -1,3 +1,4 @@
+;<?php exit;
 ; File: 	conf.ini
 ; Description:
 ; ------------

Original file line number	Diff line number	Diff line change
`@@ -550,13 +550,20 @@ function Dataface_Application($conf = null){`
`550`	`550`	`}`
`551`	`551`	`$this->_baseUrl = $_SERVER['PHP_SELF'];`
`552`	`552`	`if ( !is_array($conf) ) $conf = array();`
`553`		`- if ( is_readable(DATAFACE_SITE_PATH.'/conf.ini') ){`
`554`		`- $conf = array_merge(parse_ini_file(DATAFACE_SITE_PATH.'/conf.ini', true), $conf);`
	`553`	`+ $configPath = DATAFACE_SITE_PATH.'/conf.ini.php';`
	`554`	`+ if (!is_readable($configPath)) {`
	`555`	`+ $configPath = DATAFACE_SITE_PATH.'/conf.ini';`
	`556`	`+ }`
	`557`	`+ if ( is_readable($configPath) ){`
	`558`	`+ $conf = array_merge(parse_ini_file($configPath, true), $conf);`
`555`	`559`	`if ( @$conf['__include__'] ){`
`556`	`560`	`$includes = array_map('trim',explode(',', $conf['__include__']));`
`557`	`561`	`foreach ($includes as $i){`
	`562`	`+`
`558`	`563`	`if ( is_readable($i) ){`
`559`	`564`	`$conf = array_merge($conf, parse_ini_file($i, true));`
	`565`	`+ } else if ( is_readable($i.'.php') ){`
	`566`	`+ $conf = array_merge($conf, parse_ini_file($i.'.php', true));`
`560`	`567`	`}`
`561`	`568`	`}`
`562`	`569`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+;<?php exit;`
`1`	`2`	`;;------------------------------------------------------------------------------`
`2`	`3`	`;; Table tabs`
`3`	`4`	`;; -----------`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+;<?php exit;`
`1`	`2`	`440 = "322"`
`2`	`3`	`templates.Dataface_Fineprint.COPYRIGHT = "(c) $year Tots els drets reservats"`
`3`	`4`	`actions.related_records_list.label = "{$query['-relationship']}"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+;<?php exit;`
`1`	`2`	`440 = "439"`
`2`	`3`	`templates.Dataface_Fineprint.COPYRIGHT = "(c) $year Alle Rechte vorbehalten"`
`3`	`4`	`actions.related_records_list.label = "{$query['-relationship']}"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+;<?php exit;`
`1`	`2`	`actions.edit.label = "Τροποποίηση"`
`2`	`3`	`actions.summary_edit.label = "Τροποποίηση"`
`3`	`4`	`templates.Dataface_RecordHistory.LABEL_CHANGES = "Αλλαγές"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+;<?php exit;`
`1`	`2`	`440 = "440"`
`2`	`3`	`templates.Dataface_Fineprint.COPYRIGHT = "(c) $year All rights reserved"`
`3`	`4`	`actions.related_records_list.label = "{$query['-relationship']}"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+;<?php exit;`
`1`	`2`	`440 = "436"`
`2`	`3`	`templates.Dataface_Fineprint.COPYRIGHT = "© $year - Todos los derechos reservados"`
`3`	`4`	`actions.edit.label = "Editar"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+;<?php exit;`
`1`	`2`	`440 = "408"`
`2`	`3`	`templates.Dataface_Fineprint.COPYRIGHT = "(c) $year Tous droits réservés"`
`3`	`4`	`actions.related_records_list.label = "{$query['-relationship']}"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+;<?php exit;`
`1`	`2`	`440 = "149"`
`2`	`3`	`templates.Dataface_Fineprint.COPYRIGHT = "(c) $year すべての権利を保有"`
`3`	`4`	`actions.related_records_list.label = "{$query['-関係']}"`
Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,4 @@`
	`1`	`+;<?php exit;`
`1`	`2`	`440 = "323"`
`2`	`3`	`templates.Dataface_Fineprint.COPYRIGHT = "(c) $year Alle rechten voorbehouden"`
`3`	`4`	`actions.related_records_list.label = "{$query['-relationship']}"`