Completed
Pull Request — master (#532)
06:37
created
upgrade/index.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -54,7 +54,7 @@
 block discarded – undo
54 54
 		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
55 55
 
56 56
 		<div class="well" style="padding:5px;margin-top:5px;">
57
-		Detected BASE: <?php print str_replace("upgrade/", "", $_SERVER['REQUEST_URI']);  ?>
57
+		Detected BASE: <?php print str_replace ("upgrade/", "", $_SERVER['REQUEST_URI']); ?>
58 58
 		</div>
59 59
 
60 60
 		<h4>2.) Enable mod_rewrite</h4>
Please login to merge, or discard this patch.
install/index.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -39,7 +39,7 @@  discard block
 block discarded – undo
39 39
 <!-- page header -->
40 40
 <div id="header">
41 41
 <div class="hero-unit">
42
-	<a href="<?php print create_link(null); ?>">phpIPAM installation error</a>
42
+	<a href="<?php print create_link (null); ?>">phpIPAM installation error</a>
43 43
 </div>
44 44
 </div>
45 45
 
@@ -55,7 +55,7 @@  discard block
 block discarded – undo
55 55
 		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
56 56
 
57 57
 		<div class="well" style="padding:5px;margin-top:5px;">
58
-		Detected BASE: <?php print str_replace("install/", "", $_SERVER['REQUEST_URI']);  ?>
58
+		Detected BASE: <?php print str_replace ("install/", "", $_SERVER['REQUEST_URI']); ?>
59 59
 		</div>
60 60
 
61 61
 		<h4>2.) Enable mod_rewrite</h4>
Please login to merge, or discard this patch.
functions/checks/check_db_install.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -5,8 +5,8 @@
 block discarded – undo
5 5
 # initialize install class
6 6
 $Install = new Install ($Database);
7 7
 # try to connect, if it fails redirect to install
8
-$Install->check_db_connection(true);
8
+$Install->check_db_connection (true);
9 9
 # connection is ok, check that table exists
10
-$Install->check_table("vrf", true);
10
+$Install->check_table ("vrf", true);
11 11
 
12 12
 ?>
13 13
\ No newline at end of file
Please login to merge, or discard this patch.
functions/version.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <?php
2 2
 /* set latest version */
3
-define("VERSION", "1.21");									//version changes if database structure changes
3
+define ("VERSION", "1.21"); //version changes if database structure changes
4 4
 /* set latest revision */
5
-define("REVISION", "001");									//revision always changes, verision only if database structure changes
5
+define ("REVISION", "001"); //revision always changes, verision only if database structure changes
6 6
 /* set last possible upgrade */
7
-define("LAST_POSSIBLE", "1.1");								//minimum required version to be able to upgrade
7
+define ("LAST_POSSIBLE", "1.1"); //minimum required version to be able to upgrade
8 8
 ?>
Please login to merge, or discard this patch.
api/controllers/Folders.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -17,7 +17,7 @@
 block discarded – undo
17 17
 	 * @param mixed $params		// post/get values
18 18
 	 * @param mixed $Response
19 19
 	 */
20
-	public function __construct($Database, $Tools, $params, $Response) {
20
+	public function __construct ($Database, $Tools, $params, $Response) {
21 21
 		// include
22 22
 		require("Subnets.php");
23 23
 		// subnets
Please login to merge, or discard this patch.
api/controllers/_template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -17,9 +17,9 @@
 block discarded – undo
17 17
 	 * @param mixed $params		// post/get values
18 18
 	 * @param mixed $Response
19 19
 	 */
20
-	public function __construct($Database, $Tools, $params, $Response) {
20
+	public function __construct ($Database, $Tools, $params, $Response) {
21 21
 		$this->Database = $Database;
22
-		$this->Tools 	= $Tools;
22
+		$this->Tools = $Tools;
23 23
 		$this->_params 	= $params;
24 24
 		$this->Response = $Response;
25 25
 		// include
Please login to merge, or discard this patch.
app/install/install_automatic.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -74,7 +74,7 @@
 block discarded – undo
74 74
 				<hr>
75 75
 				<div class="btn-block">
76 76
 					<!-- Back -->
77
-					<a class="btn btn-sm btn-default" href="<?php print create_link("install",null,null,null,null,true); ?>" ><i class='fa fa-angle-left'></i> Back</a>
77
+					<a class="btn btn-sm btn-default" href="<?php print create_link ("install", null, null, null, null, true); ?>" ><i class='fa fa-angle-left'></i> Back</a>
78 78
 					<a class="install btn btn-sm btn-info" version="0">Install phpipam database</a>
79 79
 				</div>
80 80
 			</div>
Please login to merge, or discard this patch.
app/install/install_manual.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
 	<div style="padding:10px;">
7 7
 
8 8
 		<!-- Back -->
9
-		<a href="<?php print create_link("install",null,null,null,null,true); ?>" class="btn btn-sm btn-default"><i class='fa fa-angle-left'></i> Back</a>
9
+		<a href="<?php print create_link ("install", null, null, null, null, true); ?>" class="btn btn-sm btn-default"><i class='fa fa-angle-left'></i> Back</a>
10 10
 		<!-- Instructions -->
11 11
 		<div style="margin-top:10px;padding:30px 20px;">
12 12
 			For importing database file with mysqlimport tool please follow below instructions:<hr>
@@ -19,7 +19,7 @@  discard block
 block discarded – undo
19 19
 					Copy below SQL queries and paste them to mysql
20 20
 				</li>
21 21
 				<li>Finished ! Now login with <strong>Admin/ipamadmin</strong> to webpage<br>
22
-				<a href="<?php print create_link(null,null,null,null,null,true); ?>" class="btn btn-sm btn-info">Login</a>
22
+				<a href="<?php print create_link (null, null, null, null, null, true); ?>" class="btn btn-sm btn-info">Login</a>
23 23
 				</li>
24 24
 			</ol> 
25 25
 			<hr>
@@ -44,8 +44,8 @@  discard block
 block discarded – undo
44 44
 $file .= "# Create tables and import data\n";
45 45
 $file .= "# ------------------------------------------------------------\n\n\n\n";
46 46
 
47
-$file .= file_get_contents("db/SCHEMA.sql"); 
48
-print_r($file); ?>
47
+$file .= file_get_contents ("db/SCHEMA.sql"); 
48
+print_r ($file); ?>
49 49
 </pre>
50 50
 		</div>
51 51
 			
Please login to merge, or discard this patch.
app/install/invalid_install_type.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -4,9 +4,9 @@
 block discarded – undo
4 4
 
5 5
 	<div class="hContent">
6 6
 	<div style="padding:10px;">
7
-		<?php $Result->show("danger", "This installation type does not exist. Please select valid installation method!", false); ?>
7
+		<?php $Result->show ("danger", "This installation type does not exist. Please select valid installation method!", false); ?>
8 8
 
9
-		<a href="<?php print create_link("install",null,null,null,null,true); ?>" class="btn btn-sm btn-default"><i class='fa fa-angle-left'></i> Back</a>
9
+		<a href="<?php print create_link ("install", null, null, null, null, true); ?>" class="btn btn-sm btn-default"><i class='fa fa-angle-left'></i> Back</a>
10 10
 
11 11
 	</div>
12 12
 	</div>
Please login to merge, or discard this patch.