Move some PHP files from ./ to ./inc: common, connection, header, footer

diff --git a/Classes/class-unrealconf.php b/Classes/class-unrealconf.php
index 6fcad6bb48f6765fb28b3748b81bb5fac3b7541e..95378e891456d91e1a82279cf9b3487be45a95db 100644 (file)
--- a/Classes/class-unrealconf.php
+++ b/Classes/class-unrealconf.php
@@ -1,6 +1,6 @@
 <?php 
 
-require_once("../common.php");
+require_once("../inc/common.php");
 
 class Conf
 {

diff --git a/api/common_api.php b/api/common_api.php
index 36f2422fe18e602cb1c6957ae860334e87e63520..2224b0d5abcc0d6452c2738ba12997b2c167d4b0 100644 (file)
--- a/api/common_api.php
+++ b/api/common_api.php
@@ -1,5 +1,5 @@
 <?php
-include "../common.php";
+include "../inc/common.php";
 
 if(session_status() !== PHP_SESSION_ACTIVE) session_start();
 
@@ -10,7 +10,7 @@ if (!isset($_SESSION['id']))
 session_write_close();
 
 // Only now make the connection (this can take a short while)
-include "../connection.php";
+include "../inc/connection.php";
 
 // Server Side Events
 header('Content-Type: text/event-stream');

diff --git a/api/installation.php b/api/installation.php
index e8e8321cda485ae4ff176cf3f3fa9d3453998bf4..76711f36af7bb964e208a5452d09f157e5eaed5b 100644 (file)
--- a/api/installation.php
+++ b/api/installation.php
@@ -2,7 +2,7 @@
 
 /** For handling installation BEFORE any backend and user is configured */
 
-require_once "../common.php";
+require_once "../inc/common.php";
 
 /* only let this happen pre-config */
 if (file_exists("../config/config.php"))

diff --git a/api/installation2.php b/api/installation2.php
index d641972e3a8f855dcc20388d1bda432b9b6fcbc8..b3545e1e1cbb9fb06cfece1298aa7219df54ea24 100644 (file)
--- a/api/installation2.php
+++ b/api/installation2.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../common.php";
+require_once "../inc/common.php";
 
 /* only let this happen  */
 if (isset($config['unrealircd']) && empty($config['unrealircd']['host']))

diff --git a/api/users.php b/api/users.php
index c0a30098fe4ada4997d301a4b7a6d7af17220294..78ccb980855c30d73cc91d0e436c8a816eb3166c 100644 (file)
--- a/api/users.php
+++ b/api/users.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once "../common.php";
-require_once "../connection.php";
+require_once "../inc/common.php";
+require_once "../inc/connection.php";
 
 header('Content-Type: application/json');
 

diff --git a/channels/details.php b/channels/details.php
index dc5510c012761079f263b046c6bb23aa9889998d..8cf6543914963545af6222f5a96ac72ce82f86ac 100644 (file)
--- a/channels/details.php
+++ b/channels/details.php
@@ -1,7 +1,7 @@
 <?php
-require_once "../common.php";
-require_once "../connection.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/connection.php";
+require_once "../inc/header.php";
 
 if ($uplink = $rpc->server()->get())
        IRCList::setmodes($uplink->server->features->chanmodes);
@@ -558,5 +558,5 @@ if ($topicset)
 $('.nav-tabs a[href="#chanmodes"]').tab('show')
 </script>
 <?php 
-require_once("../footer.php");
+require_once("../inc/footer.php");
 

diff --git a/channels/index.php b/channels/index.php
index 070df50c98f6d8d3407421094db8810a1192c1c3..111bf225e26160c492b8b0050541881efec281b2 100644 (file)
--- a/channels/index.php
+++ b/channels/index.php
@@ -1,7 +1,7 @@
 <?php
-require_once "../common.php";
-require_once "../connection.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/connection.php";
+require_once "../inc/header.php";
 
 if (!empty($_POST))
 {
@@ -47,7 +47,7 @@ $channels = $rpc->channel()->getAll();
                        echo "</tr>";
                }
 
-       require_once("../footer.php");
+       require_once("../inc/footer.php");
        ?>
 </tbody>
 </table>

diff --git a/common.php b/inc/common.php
similarity index 99%
rename from common.php
rename to inc/common.php
index a7fb94e0e2e253c42bb485ef708358a388228ffb..fa3f7c7da5720657a52129dbb69fb67c7ec7afca 100644 (file)
--- a/common.php
+++ b/inc/common.php
@@ -7,7 +7,7 @@ if (version_compare(PHP_VERSION, '8.0.0', '<'))
            "<code>apt-get remove libapache2-mod-php7.4</code> (or a similar version). ".
            "You may also need to choose again the PHP module to load in apache via <code>a2enmod php8.2</code>");
 
-define('UPATH', dirname(__FILE__));
+define('UPATH', dirname(dirname(__FILE__)));
 
 function get_config($setting)
 {
@@ -305,7 +305,7 @@ if (!read_config_file())
        }
 }
 
-require_once "Classes/class-hook.php";
+require_once UPATH . "/Classes/class-hook.php";
 if (!is_dir(UPATH . "/vendor"))
        die("The vendor/ directory is missing. Most likely the admin forgot to run 'composer install'\n");
 require_once UPATH . '/vendor/autoload.php';

diff --git a/connection.php b/inc/connection.php
similarity index 100%
rename from connection.php
rename to inc/connection.php

diff --git a/footer.php b/inc/footer.php
similarity index 100%
rename from footer.php
rename to inc/footer.php

diff --git a/header.php b/inc/header.php
similarity index 100%
rename from header.php
rename to inc/header.php

diff --git a/index.php b/index.php
index 43fc08f83f4ac89a3ce43b3870de9c96b902d543..219c143c451c18f242153fe6e9de1e42d7f52dc1 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,5 +1,5 @@
 <?php
-require_once "common.php";
+require_once "inc/common.php";
 if (!isset($config['unrealircd']) || empty($config['unrealircd']['host']))
 {
        $redirect = get_config("base_url")."settings/install2.php";
@@ -7,8 +7,8 @@ if (!isset($config['unrealircd']) || empty($config['unrealircd']['host']))
        die;
 }
 
-require_once "header.php";
-require_once "connection.php";
+require_once "inc/header.php";
+require_once "inc/connection.php";
 
 $stats = $rpc->stats()->get();
 ?>
@@ -324,4 +324,4 @@ $num_of_panel_admins = count($userlist);
 
 Hook::run(HOOKTYPE_OVERVIEW_CARD, $stats);
 
-require_once "footer.php";
+require_once "inc/footer.php";

diff --git a/login/index.php b/login/index.php
index bea6f0ae9e491f48779080bec745872fd531fe72..56dc0a72612cd979ff29d7cf8c9ab37630a3de7a 100644 (file)
--- a/login/index.php
+++ b/login/index.php
@@ -1,5 +1,5 @@
 <?php
-require_once "../common.php";
+require_once "../inc/common.php";
 
 $logout = false;
 
@@ -165,4 +165,4 @@ if (!empty($_POST))
        });
 </script>
 
-<?php require_once "../footer.php";
\ No newline at end of file
+<?php require_once "../inc/footer.php";
\ No newline at end of file

diff --git a/news.php b/news.php
index c8bfb5d490b53ca48ce54ac33d907e83556d0625..b656348f68a555f547d1ab67bad8e03176d7853e 100644 (file)
--- a/news.php
+++ b/news.php
@@ -1,10 +1,10 @@
 
 <?php
-require_once "common.php";
-require_once "header.php";
+require_once "inc/common.php";
+require_once "inc/header.php";
 ?>
 <iframe style="border:none;" height="1000" width="600" data-tweet-url="https://twitter.com/Unreal_IRCd" src="data:text/html;charset=utf-8,%3Ca%20class%3D%22twitter-timeline%22%20href%3D%22https%3A//twitter.com/Unreal_IRCd%3Fref_src%3Dtwsrc%255Etfw%22%3ETweets%20by%20Unreal_IRCd%3C/a%3E%0A%3Cscript%20async%20src%3D%22https%3A//platform.twitter.com/widgets.js%22%20charset%3D%22utf-8%22%3E%3C/script%3E%0A%3Cstyle%3Ehtml%7Boverflow%3Ahidden%20%21important%3B%7D%3C/style%3E"></iframe>
 <iframe style="border:none;" height="1000" width="600" data-tweet-url="https://twitter.com/irc_stats" src="data:text/html;charset=utf-8,%3Ca%20class%3D%22twitter-timeline%22%20href%3D%22https%3A//twitter.com/irc_stats%3Fref_src%3Dtwsrc%255Etfw%22%3ETweets%20by%20IRC%20Stats%3C/a%3E%0A%3Cscript%20async%20src%3D%22https%3A//platform.twitter.com/widgets.js%22%20charset%3D%22utf-8%22%3E%3C/script%3E%0A%3Cstyle%3Ehtml%7Boverflow%3Ahidden%20%21important%3B%7D%3C/style%3E"></iframe>
 <?php
 
-require_once("footer.php");
\ No newline at end of file
+require_once("inc/footer.php");
\ No newline at end of file

diff --git a/plugins.php b/plugins.php
index 6a82c87384667c5a4948b81d3118c022b8371863..2f433cb57e98a25c952988001061ae03cc335139 100644 (file)
--- a/plugins.php
+++ b/plugins.php
@@ -1,5 +1,5 @@
 <?php
-require_once "common.php";
+require_once "inc/common.php";
 require_once "Classes/class-message.php";
 
 

diff --git a/plugins/config_blocks/index.php b/plugins/config_blocks/index.php
index 34e9d03445439231dfeafea84890b36f6e8fc923..406eba19bb597b0f48b4deb8e3b3961436ac2cfb 100644 (file)
--- a/plugins/config_blocks/index.php
+++ b/plugins/config_blocks/index.php
@@ -1,16 +1,16 @@
 <?php
 
-require_once "../../common.php";
+require_once "../../inc/common.php";
 if (!current_user_can(PERMISSION_CONFIG_BLOCKS))
 {
     header("Location: ".get_config("base_url"));
     die();
 }
-require_once "../../header.php";
+require_once "../../inc/header.php";
 
 ?>
 
 <h4>Configuration Blocks</h4>
 
 
-<?php require_once("../footer.php");
\ No newline at end of file
+<?php require_once("../inc/footer.php");
\ No newline at end of file

diff --git a/plugins/example_plugin/example.php b/plugins/example_plugin/example.php
index 5a5f07fc75e82e5b81d66904c69bfd45cb52d82a..011cdb02db156dc43dfff16d8275731ce0ddde4e 100644 (file)
--- a/plugins/example_plugin/example.php
+++ b/plugins/example_plugin/example.php
@@ -1,4 +1,4 @@
 <?php
-require_once "../../common.php";
-require_once "../../header.php";
+require_once "../../inc/common.php";
+require_once "../../inc/header.php";
 echo "Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.";
\ No newline at end of file

diff --git a/plugins/sql_auth/user-info.php b/plugins/sql_auth/user-info.php
index fca2df9cffd059b86a0d44c46006c2d07b49c7da..546bf3cf4ef5103eb0bf5963357a109047c8f756 100644 (file)
--- a/plugins/sql_auth/user-info.php
+++ b/plugins/sql_auth/user-info.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once "../../common.php";
-require_once "../../header.php";
+require_once "../../inc/common.php";
+require_once "../../inc/header.php";
 
 
 ?>
\ No newline at end of file

diff --git a/server-bans/ban-exceptions.php b/server-bans/ban-exceptions.php
index 13b5e4c7eb9dbb4a7e3e1d65aa0ebde66be79c29..34596d2eb5eeaf2c9d0a90b92e487514032e7fc8 100644 (file)
--- a/server-bans/ban-exceptions.php
+++ b/server-bans/ban-exceptions.php
@@ -1,7 +1,7 @@
 <?php
-require_once "../common.php";
-require_once "../connection.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/connection.php";
+require_once "../inc/header.php";
 require_once "../misc/ban-exceptions-misc.php";
 if (!empty($_POST))
 {
@@ -231,4 +231,4 @@ Here is where you can make an exception to bans, that is, to make it so that the
        </div>
        </div></form></div></div>
 
-<?php require_once '../footer.php'; ?>
+<?php require_once '../inc/footer.php'; ?>

diff --git a/server-bans/index.php b/server-bans/index.php
index 49c053da75fdfef183258a0ded9fa6b2005e2fd1..fc2dee78a78a893a8d5932c3e102335ca4b6551e 100644 (file)
--- a/server-bans/index.php
+++ b/server-bans/index.php
@@ -1,7 +1,7 @@
 <?php
-require_once "../common.php";
-require_once "../connection.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/connection.php";
+require_once "../inc/header.php";
 
 if (!empty($_POST))
 {
@@ -247,4 +247,4 @@ Here are all your network bans, from K-Lines to G-Lines, it's all here.<br><br>
        </div>
        </div></form></div></div>
 
-<?php require_once '../footer.php'; ?>
+<?php require_once '../inc/footer.php'; ?>

diff --git a/server-bans/name-bans.php b/server-bans/name-bans.php
index 40b3ac2dd77aa965f001ff7ba995c7229e85efef..75ef9861ef24eeafc76c348d3cf53e83d4a6b934 100644 (file)
--- a/server-bans/name-bans.php
+++ b/server-bans/name-bans.php
@@ -1,7 +1,7 @@
 <?php
-require_once "../common.php";
-require_once "../connection.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/connection.php";
+require_once "../inc/header.php";
 
 if (!empty($_POST))
 {
@@ -202,4 +202,4 @@ You can also forbid the use of channel names. This is useful in such cases where
        </div>
        </div></form></div></div>
 
-<?php require_once '../footer.php'; ?>
\ No newline at end of file
+<?php require_once '../inc/footer.php'; ?>
\ No newline at end of file

diff --git a/servers/details.php b/servers/details.php
index dc22161382c04257002cbc77c55118606586e33a..afed86081f6cfcb72ce1afbdfb9d53b3f3d2cd17 100644 (file)
--- a/servers/details.php
+++ b/servers/details.php
@@ -1,7 +1,7 @@
 <?php
-require_once "../common.php";
-require_once "../connection.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/connection.php";
+require_once "../inc/header.php";
 
 $title = "Server Lookup";
 $servername = "";
@@ -244,4 +244,4 @@ if (!empty($rehash_success)) {
                </div>
        </div>
 </div>
-<?php require_once UPATH.'/footer.php'; ?>
+<?php require_once UPATH.'/inc/footer.php'; ?>

diff --git a/servers/index.php b/servers/index.php
index 20991347ea1c361ec2fe668c1facd4a14d385e3e..f63ed5afc417abc2f702d9a799ad570340cd9112 100644 (file)
--- a/servers/index.php
+++ b/servers/index.php
@@ -1,7 +1,7 @@
 <?php
-require_once "../common.php";
-require_once "../connection.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/connection.php";
+require_once "../inc/header.php";
 
 $rehash_errors = [];
 $rehash_warnings = [];
@@ -180,4 +180,4 @@ Click on a server name to view more information.
        </tbody></table>
 </div>
 
-<?php require_once UPATH.'/footer.php'; ?>
+<?php require_once UPATH.'/inc/footer.php'; ?>

diff --git a/settings/index.php b/settings/index.php
index b2e6f22ac4abc49b701bba0a33fc628346dc7f6a..3798fea2b88e5bccb219d982ed609481631f1959 100644 (file)
--- a/settings/index.php
+++ b/settings/index.php
@@ -1,8 +1,8 @@
 <?php
 $conn = NULL;
 
-require_once "../common.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/header.php";
 do_log($_POST);
 
 
@@ -181,4 +181,4 @@ Click on a username to view more information.
        </div>
        </div></form></div></div><br></div>
 <?php
-require_once '../footer.php'; ?>
+require_once '../inc/footer.php'; ?>

diff --git a/settings/install.php b/settings/install.php
index 64aa93906e6383e472c3e93863218771575e5f41..26e563d7ba3b620c57a30948b9c412d007c03493 100644 (file)
--- a/settings/install.php
+++ b/settings/install.php
@@ -16,7 +16,7 @@ if (ini_get("session.use_cookies")) {
 }
 session_destroy();
 
-require_once "../common.php";
+require_once "../inc/common.php";
 
 /* Get the base url */
 $uri = $_SERVER['REQUEST_URI'];

diff --git a/settings/install2.php b/settings/install2.php
index 361fe14ebfb4b3f6f44e5478ba9309ceaffc363e..5c6d00e3366deb264ea20e4739a8d35865085097 100644 (file)
--- a/settings/install2.php
+++ b/settings/install2.php
@@ -1,6 +1,6 @@
 <?php
 
-require_once "../common.php";
+require_once "../inc/common.php";
 
 /* Get the base url */
 $uri = $_SERVER['REQUEST_URI'];

diff --git a/settings/plugins.php b/settings/plugins.php
index c89deb6626f580c4751309d7753d9a2336fe2a4f..a787dd83d1ec1c3d6c477b32fd1055963e14eef6 100644 (file)
--- a/settings/plugins.php
+++ b/settings/plugins.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once "../common.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/header.php";
 
 
 ?>
@@ -38,4 +38,4 @@ To load and unload plugins, see the plugins section of your <code>config.php</co
     </tbody>
 </table>
 <?php
-require_once "../footer.php";
+require_once "../inc/footer.php";

diff --git a/settings/user-edit.php b/settings/user-edit.php
index 73469c6d081dd4a335493cfad849c6c88ae86e58..e95307f8f9fa2aeb4ee1bbc5d9e708b1d18682b9 100644 (file)
--- a/settings/user-edit.php
+++ b/settings/user-edit.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once "../common.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/header.php";
 do_log($_POST);
 
 $us = unreal_get_current_user();
@@ -131,4 +131,4 @@ if ($postbutton && $can_edit_profile)
 <button type="submit" name="update_user" class="btn btn-primary">Save Changes</button><br>
 </form>
 <?php
-require_once "../footer.php";
+require_once "../inc/footer.php";

diff --git a/settings/user-role-edit.php b/settings/user-role-edit.php
index e32eb2d0308ff50a39ca625a7218554fb64aafa6..e32281b300d932e91ae7277febf83ff0e533bb32 100644 (file)
--- a/settings/user-role-edit.php
+++ b/settings/user-role-edit.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once "../common.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/header.php";
 
 if (!current_user_can(PERMISSION_MANAGE_USERS))
 {
@@ -165,4 +165,4 @@ elseif (isset($_POST['del_role_name']) && $role_name = $_POST['del_role_name'])
 generate_role_list($list);
 
 
-require_once "../footer.php";
\ No newline at end of file
+require_once "../inc/footer.php";
\ No newline at end of file

diff --git a/spamfilter.php b/spamfilter.php
index a3e7cd3cad43a52c632ff6c2431a57a61d094195..80d439607be06ab0f8c0e74a623ea1fee6107454 100644 (file)
--- a/spamfilter.php
+++ b/spamfilter.php
@@ -1,7 +1,7 @@
 <?php
-require_once "common.php";
-require_once "connection.php";
-require_once "header.php";
+require_once "inc/common.php";
+require_once "inc/connection.php";
+require_once "inc/header.php";
 
 $spamfilter_target_info = Array(
        "p"=>Array("short_text" => "usermsg", "long_text" => "User message"),
@@ -323,4 +323,4 @@ $spamfilter = $rpc->spamfilter()->getAll();
 </form></div></div>
 
 
-<?php require_once 'footer.php'; ?>
+<?php require_once 'inc/footer.php'; ?>

diff --git a/tools/checkup.php b/tools/checkup.php
index e294ca11d8890927105e2e4fe3bd3968d7ff9498..73ede5a03ec76816576d349e407c627c0fbafb07 100644 (file)
--- a/tools/checkup.php
+++ b/tools/checkup.php
@@ -1,7 +1,7 @@
 <?php
-require_once "../common.php";
-require_once "../connection.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/connection.php";
+require_once "../inc/header.php";
 require_once "../Classes/class-checkup.php";
 
 $checkup = new CheckUp();

diff --git a/tools/ip-whois.php b/tools/ip-whois.php
index 755fcd317d1cc2ceb802addb91ef5ed3c4a6fd13..e2239837c312c02927493ca0efc7ca7313f80f23 100644 (file)
--- a/tools/ip-whois.php
+++ b/tools/ip-whois.php
@@ -1,7 +1,7 @@
 <?php
 
-require_once "../common.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/header.php";
 
 $ip_info = [];
 $ip = NULL;
@@ -108,4 +108,4 @@ if (isset($whois))
 
 <?php
 }
-require_once "../footer.php";
+require_once "../inc/footer.php";

diff --git a/users/details.php b/users/details.php
index 5665015c1f5d55d476d561708326e892e9fdfdb1..08430911320334490c7cffb341410a00f2553757 100644 (file)
--- a/users/details.php
+++ b/users/details.php
@@ -1,7 +1,7 @@
 <?php
-require_once "../common.php";
-require_once "../connection.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/connection.php";
+require_once "../inc/header.php";
 
 $title = "User Lookup";
 $nickname = "";
@@ -62,6 +62,6 @@ if (isset($_GET['nick']))
       </div>
   </div>
 </div>
-<?php require_once UPATH.'/footer.php'; ?>
+<?php require_once UPATH.'/inc/footer.php'; ?>
 
 

diff --git a/users/index.php b/users/index.php
index 0c2f3b88dbd1679a275f8432f724782531634cb7..2e8cf752fa8914fc1ad27bf0c02a3b495b8b153c 100644 (file)
--- a/users/index.php
+++ b/users/index.php
@@ -1,7 +1,7 @@
 <?php
-require_once "../common.php";
-require_once "../connection.php";
-require_once "../header.php";
+require_once "../inc/common.php";
+require_once "../inc/connection.php";
+require_once "../inc/header.php";
 
 if (!empty($_GET))
 {
@@ -476,4 +476,4 @@ Click on a username to view more information.
 });
 </script>
 
-<?php require_once UPATH.'/footer.php'; ?>
+<?php require_once UPATH.'/inc/footer.php'; ?>