From 436bfd0c36026a110eaed737659d1ef62b66664a Mon Sep 17 00:00:00 2001
From: Stanislas Dolcini <stanislas.dolcini@devinci.fr>
Date: Sat, 6 Oct 2018 14:44:53 +0200
Subject: [PATCH] Move function out of the class, as they should be global

---
 .../login/class/connection_handler.php        | 50 +++----------------
 code/web/public_php/login/r2_login.php        | 16 ++----
 code/web/public_php/login/tools/utils.php     | 37 ++++++++++++++
 3 files changed, 48 insertions(+), 55 deletions(-)
 create mode 100644 code/web/public_php/login/tools/utils.php

diff --git a/code/web/public_php/login/class/connection_handler.php b/code/web/public_php/login/class/connection_handler.php
index bbe7aaf7f..7124cf94f 100644
--- a/code/web/public_php/login/class/connection_handler.php
+++ b/code/web/public_php/login/class/connection_handler.php
@@ -1,19 +1,12 @@
 <?php
-
-error_reporting(E_ERROR | E_PARSE);
-set_error_handler('err_callback');
-
-// For error handling, buffer all output
-ob_start('ob_callback_r2login');
-
-include_once '../config.php';
-include_once '../login_translations.php';
-include_once '../../tools/nel_message.php';
-include_once '../../tools/domain_info.php';
-include_once '../login_service_itf.php';
-include_once '../../ring/join_shard.php';
-include_once './CWwwLog.php';
 include_once './LoginCb.php';
+include_once './../tools/utils.php';
+include_once './../config.php';
+include_once './../login_translations.php';
+include_once './../login_service_itf.php';
+include_once './../../ring/join_shard.php';
+include_once './../../tools/nel_message.php';
+include_once './../../tools/domain_info.php';
 
 class ConnectionHandler
 {
@@ -238,35 +231,6 @@ class ConnectionHandler
         // }
     }
 
-    public function errorMsgBlock($errNum = GENERIC_ERROR_NUM)
-    {
-        return '0:' . call_user_func_array('errorMsg', func_get_args());
-    }
-
-    /**
-     * Callback called on end of output buffering
-     */
-    public function ob_callback_r2login($buffer)
-    {
-        // Log only in case of error or malformed result string
-        $blockHd = substr($buffer, 0, 2);
-        if ($blockHd != '1:') {
-            $logFile = new CWwwLog();
-            $logFile->logStr(str_replace("\n", '\n', $buffer));
-        }
-        return $buffer; // sent to output
-    }
-
-    /**
-     *  Callback called on error
-     */
-    public function err_callback($errno, $errmsg, $filename, $linenum, $vars)
-    {
-        $logFile = new CWwwLog();
-        $logFile->logStr('PHP ERROR/$errno $errmsg ($filename:$linenum)');
-        $logFile->logStr('PHP CALLSTACK/' . print_r(debug_backtrace(), true));
-    }
-
     /**
      * @param string
      * the password to extract the salt from.
diff --git a/code/web/public_php/login/r2_login.php b/code/web/public_php/login/r2_login.php
index 936b3209a..834d94f35 100755
--- a/code/web/public_php/login/r2_login.php
+++ b/code/web/public_php/login/r2_login.php
@@ -1,19 +1,11 @@
 <?php
-error_reporting(E_ERROR | E_PARSE);
-set_error_handler('err_callback');
-
-// For error handling, buffer all output
-ob_start('ob_callback_r2login');
-
-include_once 'config.php';
-include_once 'login_translations.php';
-include_once '../tools/nel_message.php';
-include_once '../tools/domain_info.php';
-include_once 'login_service_itf.php';
-include_once '../ring/join_shard.php';
+include_once './tools/utils.php';
 include_once './class/connection_handler.php';
 include_once './class/nel_command.php';
 
+/**
+ * If there is no command, no point in going further.
+ */
 if (!isset($_GET['cmd'])) {
     die(errorMsgBlock(3002));
 }
diff --git a/code/web/public_php/login/tools/utils.php b/code/web/public_php/login/tools/utils.php
new file mode 100644
index 000000000..04bed25d8
--- /dev/null
+++ b/code/web/public_php/login/tools/utils.php
@@ -0,0 +1,37 @@
+<?php
+include_once './../class/CWwwLog.php';
+
+error_reporting(E_ERROR | E_PARSE);
+set_error_handler('err_callback');
+
+// For error handling, buffer all output
+ob_start('ob_callback_r2login');
+
+function errorMsgBlock($errNum = GENERIC_ERROR_NUM)
+{
+    return '0:' . call_user_func_array('errorMsg', func_get_args());
+}
+
+/**
+ * Callback called on end of output buffering
+ */
+function ob_callback_r2login($buffer)
+{
+    // Log only in case of error or malformed result string
+    $blockHd = substr($buffer, 0, 2);
+    if ($blockHd != '1:') {
+        $logFile = new CWwwLog();
+        $logFile->logStr(str_replace("\n", '\n', $buffer));
+    }
+    return $buffer; // sent to output
+}
+
+/**
+ *  Callback called on error
+ */
+function err_callback($errno, $errmsg, $filename, $linenum, $vars)
+{
+    $logFile = new CWwwLog();
+    $logFile->logStr('PHP ERROR/$errno $errmsg ($filename:$linenum)');
+    $logFile->logStr('PHP CALLSTACK/' . print_r(debug_backtrace(), true));
+}