File phpipam-configpath.patch of Package phpipam

Overview Repositories Revisions Requests Users Attributes Meta

File phpipam-configpath.patch of Package phpipam (Revision 09fc6ae90cced3f9a00945103a00f63d)

Currently displaying revision 09fc6ae90cced3f9a00945103a00f63d , Show latest

Index: phpipam-1.4/app/install/install_automatic.php
===================================================================
--- phpipam-1.4.orig/app/install/install_automatic.php
+++ phpipam-1.4/app/install/install_automatic.php
@@ -16,7 +16,7 @@ $filename	  = @$_GET['subnetId']=="migra
 		<div class="text-muted" style="margin:10px;">
 		Please provide required inputs in below form for automatic database <?php print $title_prefix; ?>, once finished click Install database.
 		<br>
-		Before you <?php print $text_prefix; ?> please fill in all settings in <strong>config.php</strong> file!
+		Before you <?php print $text_prefix; ?> please fill in all settings in <strong>/etc/phpipam/config.php</strong> file!
 		</div>
 		<hr>
 
@@ -49,7 +49,7 @@ $filename	  = @$_GET['subnetId']=="migra
 			<div class="col-xs-12 col-md-4"><strong>MySQL database name</strong></div>
 			<div class="col-xs-12 col-md-8">
 				<input type="text" style="width:100%;" name="mysqltable" class="form-control" autocomplete="off" autocorrect="off" autocapitalize="off" spellcheck="false" disabled="disabled" value="<?php print $db['name']; ?>">
-				<div class="text-muted">* change database details on config.php</div>
+				<div class="text-muted">* change database details on /etc/phpipam/config.php</div>
 			</div>
 
 			
@@ -109,4 +109,4 @@ $filename	  = @$_GET['subnetId']=="migra
 
 	</div>
 </div>
-</div>
\ No newline at end of file
+</div>
Index: phpipam-1.4/app/install/install_manual.php
===================================================================
--- phpipam-1.4.orig/app/install/install_manual.php
+++ phpipam-1.4/app/install/install_manual.php
@@ -19,7 +19,7 @@ $filename	  = @$_GET['subnetId']=="migra
 		<div style="margin-top:10px;padding:30px 20px;">
 			For importing database file with mysqlimport tool please follow below instructions:<hr>
 			<ol>
-				<li>Set variables for database connection in config.php</li>
+				<li>Set variables for database connection in /etc/phpipam/config.php</li>
 				<li>Open mysql connection, create database
 					<pre>mysql -u root -p</pre>
 				</li>
Index: phpipam-1.4/app/install/install_mysqlimport.php
===================================================================
--- phpipam-1.4.orig/app/install/install_mysqlimport.php
+++ phpipam-1.4/app/install/install_mysqlimport.php
@@ -20,7 +20,7 @@ $filename	  = @$_GET['subnetId']=="migra
 		<div style="margin-top:10px;padding:30px 20px;">
 			For <?php print $title_prefix; ?> with mysqlimport please follow below steps:<hr>
 			<ol>
-				<li>Set variables for database connection in config.php</li>
+				<li>Set variables for database connection in /etc/phpipam/config.php</li>
 				<li>Open mysql connection
 					<pre>mysql -u root -p
 Enter password:</pre>
Index: phpipam-1.4/app/install/select_install_type.php
===================================================================
--- phpipam-1.4.orig/app/install/select_install_type.php
+++ phpipam-1.4/app/install/select_install_type.php
@@ -14,7 +14,7 @@ $text_prefix  = @$_GET['subnetId']=="mig
 		<div class="text-mute2d" style="margin:10px;">
 			We are glad you decided to <?php print $text_prefix; ?> phpipam. Before you can start process please:<br><br>
 			<ul>
-				<li>Edit settings in config.php file</li>
+				<li>Edit settings in /etc/phpipam/config.php file</li>
 				<li>Create MySQL database for phpipam, you can do this three ways (select below)</li>
 			</ul>
 			<br>
@@ -65,4 +65,4 @@ $text_prefix  = @$_GET['subnetId']=="mig
 	</div>
 	</div>
 </div>
-</div>
\ No newline at end of file
+</div>
Index: phpipam-1.4/app/install/sql_error.php
===================================================================
--- phpipam-1.4.orig/app/install/sql_error.php
+++ phpipam-1.4/app/install/sql_error.php
@@ -21,9 +21,9 @@
 			print '<div class="text-muted" style="margin:10px;margin-bottom:20px;">';
 			print 'Troubleshooting:';
 			print '<ul>';
-			print '	<li>Make sure all settings in config.php are correct</li>';
+			print '	<li>Make sure all settings in /etc/phpipam/config.php are correct</li>';
 			print '	<li>Make sure database is running and accepting connections</li>';
-			print '	<li>Make sure user defined in config.php has access to database</li>';
+			print '	<li>Make sure user defined in /etc/phpipam/config.php has access to database</li>';
 			print '</ul>';
 			print '</div>';
 		}
@@ -33,4 +33,4 @@
 		?>
 	</div>
 </div>
-</div>
\ No newline at end of file
+</div>
Index: phpipam-1.4/app/tools/circuits/all-circuits-map.php
===================================================================
--- phpipam-1.4.orig/app/tools/circuits/all-circuits-map.php
+++ phpipam-1.4/app/tools/circuits/all-circuits-map.php
@@ -1,4 +1,3 @@
-<?php
 
 #
 # Prints map of all Circuits
@@ -33,7 +32,7 @@ foreach($locations as $l){ $all_location
 
 // check
 if ($User->settings->enableLocations=="1" && strlen(Config::get('gmaps_api_key'))==0) {
-    $Result->show("info text-center nomargin", _("Location: Google Maps API key is unset. Please configure config.php \$gmaps_api_key to enable."));
+    $Result->show("info text-center nomargin", _("Location: Google Maps API key is unset. Please configure /etc/phpipam/config.php \$gmaps_api_key to enable."));
 }
 //elseif ($locA->name!=="/" && $locB->name!=="/") { ?
 elseif(true) {
Index: phpipam-1.4/app/tools/locations/all-locations-map.php
===================================================================
--- phpipam-1.4.orig/app/tools/locations/all-locations-map.php
+++ phpipam-1.4/app/tools/locations/all-locations-map.php
@@ -31,7 +31,7 @@ elseif ($User->settings->enableLocations
     $Result->show("danger", _("Locations module disabled."), false);
 }
 elseif ($User->settings->enableLocations=="1" && strlen(Config::get('gmaps_api_key'))==0) {
-    $Result->show("info text-center nomargin", _("Location: Google Maps API key is unset. Please configure config.php \$gmaps_api_key to enable."));
+    $Result->show("info text-center nomargin", _("Location: Google Maps API key is unset. Please configure /etc/phpipam/config.php \$gmaps_api_key to enable."));
 }
 else {
     # fetch all locations
Index: phpipam-1.4/app/tools/locations/single-location-map.php
===================================================================
--- phpipam-1.4.orig/app/tools/locations/single-location-map.php
+++ phpipam-1.4/app/tools/locations/single-location-map.php
@@ -21,7 +21,7 @@ elseif($location===false) {
     $Result->show("info","Invalid location", false);
 }
 elseif (strlen(Config::get('gmaps_api_key'))==0) {
-      $Result->show("info text-center nomargin", _("Location: Google Maps API key is unset. Please configure config.php \$gmaps_api_key to enable."));
+      $Result->show("info text-center nomargin", _("Location: Google Maps API key is unset. Please configure /etc/phpipam/config.php \$gmaps_api_key to enable."));
 }else {
     // recode
     if (strlen($location->long)==0 && strlen($location->lat)==0 && strlen($location->address)>0) {
@@ -85,4 +85,4 @@ elseif (strlen(Config::get('gmaps_api_ke
     </script>
 <?php
     }
-}
\ No newline at end of file
+}
Index: phpipam-1.4/functions/classes/class.User.php
===================================================================
--- phpipam-1.4.orig/functions/classes/class.User.php
+++ phpipam-1.4/functions/classes/class.User.php
@@ -508,7 +508,7 @@ class User extends Common_functions {
     }
 
     /**
-     * Migrate resolve_subnets from config.php to database
+     * Migrate resolve_subnets from /etc/phpipam/config.php to database
      * for versions older than 1.31
      *
      * @method migrate_resolve_subnets
@@ -531,7 +531,7 @@ class User extends Common_functions {
             } catch (Exception $e) {}
         }
         // print that is can be deleted
-        $this->Result->show ("warning", '$config[resolve_subnets] '._('was migrated to database. It can be deleted from config.php'), false);
+        $this->Result->show ("warning", '$config[resolve_subnets] '._('was migrated to database. It can be deleted from /etc/phpipam/config.php'), false);
     }
 
 
Index: phpipam-1.4/index.php
===================================================================
--- phpipam-1.4.orig/index.php
+++ phpipam-1.4/index.php
@@ -2,7 +2,7 @@
 ob_start();
 
 /* config */
-if (!file_exists("config.php"))	{ die("<br><hr>-- config.php file missing! Please copy default config file `config.dist.php` to `config.php` and set configuration! --<hr><br>phpipam installation documentation: <a href='http://phpipam.net/documents/installation/'>http://phpipam.net/documents/installation/</a>"); }
+if (!file_exists("/etc/phpipam/config.php"))	{ die("<br><hr>-- config.php file missing! Please copy default config file `/etc/phpipam/config.dist.php` to `/etc/phpipam/config.php` and set configuration! --<hr><br>phpipam installation documentation: <a href='http://phpipam.net/documents/installation/'>http://phpipam.net/documents/installation/</a>"); }
 
 /* site functions */
 require_once( 'functions/functions.php' );
Index: phpipam-1.4/install/index.php
===================================================================
--- phpipam-1.4.orig/install/index.php
+++ phpipam-1.4/install/index.php
@@ -52,7 +52,7 @@ require('../functions/functions.php')
 
 		<h4>1.) Define Base</h4>
 		<hr>
-		Make sure BASE directive is set for your installation. This is used to properly detect phpIPAM directory. It must be set in config.php and in .htaccess
+		Make sure BASE directive is set for your installation. This is used to properly detect phpIPAM directory. It must be set in /etc/phpipam/config.php and in .htaccess
 
 		<div class="well" style="padding:5px;margin-top:5px;">
 		Detected BASE: <?php print str_replace("install/", "", $_SERVER['REQUEST_URI']);  ?>
Index: phpipam-1.4/upgrade/index.php
===================================================================
--- phpipam-1.4.orig/upgrade/index.php
+++ phpipam-1.4/upgrade/index.php
@@ -51,7 +51,7 @@
 
 		<h4>1.) Define Base</h4>
 		<hr>
-		Make sure BASE directive is set for your installation. This is used to properly detect phpIPAM directory. It must be set in config.php.
+		Make sure BASE directive is set for your installation. This is used to properly detect phpIPAM directory. It must be set in /etc/phpipam/config.php.
 
 		<div class="well" style="padding:5px;margin-top:5px;">
 		Detected BASE: <?php print str_replace("upgrade/", "", $_SERVER['REQUEST_URI']);  ?>
@@ -76,4 +76,4 @@
 
 
 </body>
-</html>
\ No newline at end of file
+</html>
Index: phpipam-1.4/functions/classes/class.Config.php
===================================================================
--- phpipam-1.4.orig/functions/classes/class.Config.php
+++ phpipam-1.4/functions/classes/class.Config.php
@@ -13,7 +13,7 @@ class Config {
      * @return void
      */
     private static function read_config() {
-        require( dirname(__FILE__)."/../../config.php" );
+        require( "/etc/phpipam/config.php" );
         self::$config = (object) get_defined_vars();
     }

Places

File phpipam-configpath.patch of Package phpipam (Revision 09fc6ae90cced3f9a00945103a00f63d)

Places