From 30db779020e5a2fe07cc7e7d7a08f3053a84b751 Mon Sep 17 00:00:00 2001
From: xdrm-brackets <doowap31@gmail.com>
Date: Fri, 27 Jan 2017 11:09:34 +0100
Subject: [PATCH] Defined constants to include in other scripts + absolute
 include

---
 lib/cyclic-hash/decr           | 15 +++++++--------
 lib/cyclic-hash/hash           |  7 +++----
 lib/cyclic-hash/secret         |  1 +
 lib/include/{include => const} |  6 +++++-
 4 files changed, 16 insertions(+), 13 deletions(-)
 create mode 100644 lib/cyclic-hash/secret
 rename lib/include/{include => const} (78%)

diff --git a/lib/cyclic-hash/decr b/lib/cyclic-hash/decr
index 3c59d82..f7d35e5 100755
--- a/lib/cyclic-hash/decr
+++ b/lib/cyclic-hash/decr
@@ -1,9 +1,8 @@
 #!/usr/bin/php
-<?php
 
-	#define('SECRET_FILE', '/home/sats/satsd/conf/machine.secret');
-	define('SECRET_FILE', '/home/xdrm-brackets/Desktop/git.xdrm.io/logauth-sats/lib/cyclic-hash/secret');
-	define('SECRET_SIZE', 250);
+<?php
+	
+	require_once __DIR__.'/../include/const';
 
 
 	/* [1] Function that generates a random secret
@@ -29,7 +28,7 @@
 	/* [2] Fetch necessary data
 	=========================================================*/
 	/* (1) Fetch secret file */
-	$secret = @file_get_contents(SECRET_FILE);
+	$secret = @file_get_contents(SECRET_CONF);
 	
 	/* (2) Check secret file format */
 	if( !is_string($secret) || !preg_match("/^(.{250}):(\d+)$/", $secret, $match) ){
@@ -38,7 +37,7 @@
 		$secret = generate_secret().':1000';
 
 		// Try to override the secret file
-		@file_put_contents(SECRET_FILE, $secret) && die(0) || die(127);
+		@file_put_contents(SECRET_CONF, $secret) && die(0) || die(127);
 	}
 
 	/* (3) Extract data */
@@ -54,7 +53,7 @@
 		$depth--;
 
 		/* (2) Try to override the secret file */
-		@file_put_contents(SECRET_FILE, "$key:$depth") && die(0) || die(127);
+		@file_put_contents(SECRET_CONF, "$key:$depth") && die(0) || die(127);
 
 
 	/* [4] If cannot decrement, generate new password
@@ -65,7 +64,7 @@
 		$secret = generate_secret().':1000';
 
 		// Try to override the secret file
-		file_put_contents(SECRET_FILE, $secret) && die(0) || die(127);
+		file_put_contents(SECRET_CONF, $secret) && die(0) || die(127);
 
 	}
 
diff --git a/lib/cyclic-hash/hash b/lib/cyclic-hash/hash
index 15f934d..0301b95 100755
--- a/lib/cyclic-hash/hash
+++ b/lib/cyclic-hash/hash
@@ -1,15 +1,14 @@
 #!/usr/bin/php
+
 <?php
 
-	#define('SECRET_FILE', '/home/sats/satsd/conf/machine.secret');
-	define('SECRET_FILE', '/home/xdrm-brackets/Desktop/git.xdrm.io/logauth-sats/lib/cyclic-hash/secret');
-	define('SECRET_SIZE', 250);
+	require_once __DIR__.'/../include/const';
 
 
 	/* [1] Fetch necessary data
 	=========================================================*/
 	/* (1) Fetch secret file */
-	$secret = @file_get_contents(SECRET_FILE);
+	$secret = @file_get_contents(SECRET_CONF);
 	
 	/* (2) Check secret file format */
 	if( !is_string($secret) || !preg_match("/^(.{".SECRET_SIZE."}):(\d+)$/", $secret, $match) )	
diff --git a/lib/cyclic-hash/secret b/lib/cyclic-hash/secret
new file mode 100644
index 0000000..bb470df
--- /dev/null
+++ b/lib/cyclic-hash/secret
@@ -0,0 +1 @@
+2wFkoxlQvF8S3twsVAm705_8HuUCV3dYzTiXpDNUiWLmohOjR9qRfq_XUUyPYMMxE3u3HgXZbIkAZ7TQhjHwJHsCA0ryNc4rgyuXOrW_8fz7nsYELEatkC5VDwspJwR_3kXSMSRU7q1uSZ8CDi5XVbSxIkXrQNqU7mMTeDNl2OPVMYxofCl9OdHvxDWmpmgwI1pWEbhHZ5BL378iKusxH82dLZAakQH2S5ZvgfbflN_oU8HEC8bjgew1c5:992
\ No newline at end of file
diff --git a/lib/include/include b/lib/include/const
similarity index 78%
rename from lib/include/include
rename to lib/include/const
index f232cb4..3acdf74 100644
--- a/lib/include/include
+++ b/lib/include/const
@@ -9,7 +9,8 @@
 	define('SOURCE_DIR', ROOT_DIR.'/source');
 
 	# CONFIGURATION FILES
-	define('SECRET_CONF', CONF_DIR.'/machine.secret');
+	#define('SECRET_CONF', CONF_DIR.'/machine.secret');
+	define('SECRET_CONF', '/home/xdrm-brackets/Desktop/git.xdrm.io/logauth-sats/lib/cyclic-hash/secret');
 	define('STATE_CONF', CONF_DIR.'/machine.state');
 	define('BRANCH_CONF', CONF_DIR.'/machine.branch');
 	define('ID_CONF', CONF_DIR.'/machine.id');
@@ -22,4 +23,7 @@
 	define('DAEMON_LOG', CONF_DIR.'/daemon.log');
 	define('INSTALL_LOG', CONF_DIR.'/install-source.log');
 	define('UPDATE_LOG', CONF_DIR.'/update.log');
+
+	# SETTINGS
+	define('SECRET_SIZE', 250);
 ?>