From 089ba73c3e357cb25d18c99fd05e70c8340578d1 Mon Sep 17 00:00:00 2001
From: Alessandro Iezzi <aiezzi@alessandroiezzi.it>
Date: Tue, 9 Jul 2024 12:24:36 +0200
Subject: Rename ip.rhtml to ip.rphp

---
 Makefile            | 27 ++++++++++++++++-----------
 ip.rhtml.php        | 26 --------------------------
 ip.rhtml.php.config |  3 ---
 ip.rphp             | 26 ++++++++++++++++++++++++++
 ip.rphp.config      |  3 +++
 5 files changed, 45 insertions(+), 40 deletions(-)
 delete mode 100644 ip.rhtml.php
 delete mode 100644 ip.rhtml.php.config
 create mode 100644 ip.rphp
 create mode 100644 ip.rphp.config

diff --git a/Makefile b/Makefile
index 6874267..421e562 100644
--- a/Makefile
+++ b/Makefile
@@ -1,17 +1,25 @@
-.SUFFIXES: .rhtml .html .tmpl .trhtml .rhtml.config
+.SUFFIXES: .rhtml .html .tmpl .trhtml .rhtml.config .rphp .php
 
-include config.mk
-
-DEST = ~/www/alessandroiezzi.it
+# Finds any file with the extensions:
+#	.rthml
+#	.rphp
+# Excludes:
+#	master.rhtml
+SRC != find -E * ! -name 'master.rhtml'  -regex '.*\.r(html|php)*'
 
+# The first assignment is to change extension from .rhtml to .html. The second
+# one is used to replace .rphp with .php (note the use of :=, in this way, the
+# old value can be replaced)
+OBJ  = ${SRC:.rhtml=.html}
+OBJ := ${OBJ:.rphp=.php}
 
+include config.mk
 
-SOURCES != find . -name "*.rhtml" | grep -v master | sed 's|\./||g'
-OBJECTS = ${SOURCES:.rhtml=.html}
+DEST = ~/www/alessandroiezzi.it
 
 CONFIGS != find . -name "*.rhtml.config" | grep -v master | sed 's|\./||g'
 
-all: ${OBJECTS} ip.php
+all: ${OBJ}
 
 install: all
 	mkdir -p ${DEST}
@@ -33,8 +41,5 @@ clean:
 	rm -rf ${DEST}/*
 	rm -f ip.php
 
-.rhtml.html: navigation.rhtml.inc master.rhtml
-	${HYDE} -b ${BASEHREF} -f $< > $@
-
-ip.php: ip.rhtml.php
+.rhtml.html .rphp.php: navigation.rhtml.inc master.rhtml
 	${HYDE} -b ${BASEHREF} -f $< > $@
diff --git a/ip.rhtml.php b/ip.rhtml.php
deleted file mode 100644
index 94b63fb..0000000
--- a/ip.rhtml.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<h1>Il tuo IP</h1>
-<p>
-<?php
-// Function to get the client IP address
-function get_client_ip() {
-    $ipaddress = '';
-    if (isset($_SERVER['HTTP_CLIENT_IP']))
-        $ipaddress = $_SERVER['HTTP_CLIENT_IP'];
-    else if(isset($_SERVER['HTTP_X_FORWARDED_FOR']))
-        $ipaddress = $_SERVER['HTTP_X_FORWARDED_FOR'];
-    else if(isset($_SERVER['HTTP_X_FORWARDED']))
-        $ipaddress = $_SERVER['HTTP_X_FORWARDED'];
-    else if(isset($_SERVER['HTTP_FORWARDED_FOR']))
-        $ipaddress = $_SERVER['HTTP_FORWARDED_FOR'];
-    else if(isset($_SERVER['HTTP_FORWARDED']))
-        $ipaddress = $_SERVER['HTTP_FORWARDED'];
-    else if(isset($_SERVER['REMOTE_ADDR']))
-        $ipaddress = $_SERVER['REMOTE_ADDR'];
-    else
-        $ipaddress = 'UNKNOWN';
-    return $ipaddress;
-}
-
-echo get_client_ip();
-?>
-</p>
\ No newline at end of file
diff --git a/ip.rhtml.php.config b/ip.rhtml.php.config
deleted file mode 100644
index ad50284..0000000
--- a/ip.rhtml.php.config
+++ /dev/null
@@ -1,3 +0,0 @@
-title: Il tuo IP
-category: ip
-master: master.rhtml
diff --git a/ip.rphp b/ip.rphp
new file mode 100644
index 0000000..94b63fb
--- /dev/null
+++ b/ip.rphp
@@ -0,0 +1,26 @@
+<h1>Il tuo IP</h1>
+<p>
+<?php
+// Function to get the client IP address
+function get_client_ip() {
+    $ipaddress = '';
+    if (isset($_SERVER['HTTP_CLIENT_IP']))
+        $ipaddress = $_SERVER['HTTP_CLIENT_IP'];
+    else if(isset($_SERVER['HTTP_X_FORWARDED_FOR']))
+        $ipaddress = $_SERVER['HTTP_X_FORWARDED_FOR'];
+    else if(isset($_SERVER['HTTP_X_FORWARDED']))
+        $ipaddress = $_SERVER['HTTP_X_FORWARDED'];
+    else if(isset($_SERVER['HTTP_FORWARDED_FOR']))
+        $ipaddress = $_SERVER['HTTP_FORWARDED_FOR'];
+    else if(isset($_SERVER['HTTP_FORWARDED']))
+        $ipaddress = $_SERVER['HTTP_FORWARDED'];
+    else if(isset($_SERVER['REMOTE_ADDR']))
+        $ipaddress = $_SERVER['REMOTE_ADDR'];
+    else
+        $ipaddress = 'UNKNOWN';
+    return $ipaddress;
+}
+
+echo get_client_ip();
+?>
+</p>
\ No newline at end of file
diff --git a/ip.rphp.config b/ip.rphp.config
new file mode 100644
index 0000000..ad50284
--- /dev/null
+++ b/ip.rphp.config
@@ -0,0 +1,3 @@
+title: Il tuo IP
+category: ip
+master: master.rhtml
-- 
cgit v1.2.3