From cb0ed2b6c0d38e8ece0d3960e0c9338fded3919f Mon Sep 17 00:00:00 2001
From: Clemens Schwaighofer <clemens.schwaighofer@e-graphics.com>
Date: Wed, 28 Mar 2018 16:55:31 +0900
Subject: [PATCH] Rename old deprecated method calls

---
 www/admin/footer.inc               |  4 ++--
 www/admin/header.inc               |  2 +-
 www/admin/namespace_test.php       |  3 ++-
 www/admin/set_paths.inc            |  2 +-
 www/admin/smarty.inc               |  2 +-
 www/lib/CoreLibs/Admin/Backend.inc | 38 +++++++++++++++---------------
 6 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/www/admin/footer.inc b/www/admin/footer.inc
index 058db58c..cca41419 100644
--- a/www/admin/footer.inc
+++ b/www/admin/footer.inc
@@ -8,5 +8,5 @@
 *********************************************************************/
 
 // print debug messages
-echo $login->print_error_msg();
-echo $cms->print_error_msg();
+echo $login->printErrorMsg();
+echo $cms->printErrorMsg();
diff --git a/www/admin/header.inc b/www/admin/header.inc
index 8ef65ba9..a0df2c6a 100644
--- a/www/admin/header.inc
+++ b/www/admin/header.inc
@@ -57,7 +57,7 @@ $cms = new CoreLibs\Admin\Backend($DB_CONFIG[MAIN_DB], $lang);
 // the menu show flag (what menu to show)
 $cms->menu_show_flag = 'main';
 // db nfo
-$cms->db_info();
+$cms->dbInfo();
 // set acl
 $cms->acl = $login->acl;
 //------------------------------ class init end
diff --git a/www/admin/namespace_test.php b/www/admin/namespace_test.php
index 11ba8456..6e11a07e 100755
--- a/www/admin/namespace_test.php
+++ b/www/admin/namespace_test.php
@@ -23,7 +23,7 @@ ob_end_flush();
 print "Start time: ".$base->runningTime()."<br>";
 print "ByteStringFormat: ".$base->ByteStringFormat(1234567.12)."<br>";
 print "byteStringFormat: ".$base->byteStringFormat(1234567.12)."<br>";
-print "get_page_name: ".$base->get_page_name()."<br>";
+print "get_page_name [DEPRECATED]: ".$base->get_page_name()."<br>";
 print "getPageName: ".$base->getPageName()."<br>";
 
 print "DB Info: ".$base->dbInfo(1)."<br>";
@@ -31,6 +31,7 @@ print "DB Info: ".$base->dbInfo(1)."<br>";
 
 print "End Time: ".$base->runningTime()."<br>";
 print "Run Time: ".$base->runningTime()."<br>";
+$base->resetRunningtime();
 
 print "Lang: ".$base->l->__getLang().", MO File: ".$base->l->__getMoFile()."<br>";
 print "Translate test: Year -> ".$base->l->__('Year')."<br>";
diff --git a/www/admin/set_paths.inc b/www/admin/set_paths.inc
index 263bc3e7..937b4797 100644
--- a/www/admin/set_paths.inc
+++ b/www/admin/set_paths.inc
@@ -41,7 +41,7 @@ $lang_short = substr($lang, 0, 2);
 $CONTENT_INCLUDE = str_replace(".php", ".tpl", $cms->page_name);
 $FORM_NAME = !isset($FORM_NAME) || !$FORM_NAME ? str_replace(".php", "", $cms->page_name) : $FORM_NAME;
 // set local page title
-$L_TITLE = ucfirst(str_replace('_', ' ', $cms->get_page_name(1))).' - '.$G_TITLE;
+$L_TITLE = ucfirst(str_replace('_', ' ', $cms->getPageName(1))).' - '.$G_TITLE;
 // strip tpl and replace it with inc
 // php include file per page
 $cms->INC_TEMPLATE_NAME = str_replace(".tpl", ".inc", $CONTENT_INCLUDE);
diff --git a/www/admin/smarty.inc b/www/admin/smarty.inc
index 2cb730f3..b4f4b7a1 100644
--- a/www/admin/smarty.inc
+++ b/www/admin/smarty.inc
@@ -84,7 +84,7 @@ $cms->DATA['LANG'] = $lang;
 $cms->DATA['TINYMCE_LANG'] = $lang_short;
 
 // debug data, if DEBUG flag is on, this data is print out
-$cms->DEBUG_DATA['debug_error_msg'] = $cms->running_time();
+$cms->DEBUG_DATA['debug_error_msg'] = $cms->runningTime();
 $cms->DEBUG_DATA['DEBUG'] = @$DEBUG_TMPL;
 
 // create main data array
diff --git a/www/lib/CoreLibs/Admin/Backend.inc b/www/lib/CoreLibs/Admin/Backend.inc
index 08da9af7..4022876a 100644
--- a/www/lib/CoreLibs/Admin/Backend.inc
+++ b/www/lib/CoreLibs/Admin/Backend.inc
@@ -122,11 +122,11 @@ class Backend extends \CoreLibs\DB\IO
 	public function adbEditLog($event = '', $data = '', $write_type = 'STRING')
 	{
 		if ($write_type == 'BINARY') {
-			$data_binary = $this->db_escape_bytea(bzcompress(serialize($data)));
+			$data_binary = $this->dbEscapeBytea(bzcompress(serialize($data)));
 			$data = 'see bzip compressed data_binary field';
 		}
 		if ($write_type == 'STRING') {
-			$data = $this->db_escape_string(serialize($data));
+			$data = $this->dbEscapeString(serialize($data));
 		}
 
 		$q = "INSERT INTO ".LOGIN_DB_SCHEMA.".edit_log ";
@@ -134,18 +134,18 @@ class Backend extends \CoreLibs\DB\IO
 		$q .= "ip, user_agent, referer, script_name, query_string, server_name, http_host, http_accept, http_accept_charset, http_accept_encoding, session_id, ";
 		$q .= "action, action_id, action_yes, action_flag, action_menu, action_loaded, action_value, action_error) ";
 		$q .= "VALUES ";
-		$q .= "(".@$_SESSION['EUID'].", NOW(), '".$this->db_escape_string($event)."', '".$data."', '".$data_binary."', '".$this->page_name."', ";
-		$q .= "'".@$_SERVER["REMOTE_ADDR"]."', '".$this->db_escape_string(@$_SERVER['HTTP_USER_AGENT'])."', ";
-		$q .= "'".$this->db_escape_string(@$_SERVER['HTTP_REFERER'])."', '".$this->db_escape_string(@$_SERVER['SCRIPT_FILENAME'])."', ";
-		$q .= "'".$this->db_escape_string(@$_SERVER['QUERY_STRING'])."', '".$this->db_escape_string(@$_SERVER['SERVER_NAME'])."', ";
-		$q .= "'".$this->db_escape_string(@$_SERVER['HTTP_HOST'])."', '".$this->db_escape_string(@$_SERVER['HTTP_ACCEPT'])."', ";
-		$q .= "'".$this->db_escape_string(@$_SERVER['HTTP_ACCEPT_CHARSET'])."', '".$this->db_escape_string(@$_SERVER['HTTP_ACCEPT_ENCODING'])."', ";
+		$q .= "(".@$_SESSION['EUID'].", NOW(), '".$this->dbEscapeString($event)."', '".$data."', '".$data_binary."', '".$this->page_name."', ";
+		$q .= "'".@$_SERVER["REMOTE_ADDR"]."', '".$this->dbEscapeString(@$_SERVER['HTTP_USER_AGENT'])."', ";
+		$q .= "'".$this->dbEscapeString(@$_SERVER['HTTP_REFERER'])."', '".$this->dbEscapeString(@$_SERVER['SCRIPT_FILENAME'])."', ";
+		$q .= "'".$this->dbEscapeString(@$_SERVER['QUERY_STRING'])."', '".$this->dbEscapeString(@$_SERVER['SERVER_NAME'])."', ";
+		$q .= "'".$this->dbEscapeString(@$_SERVER['HTTP_HOST'])."', '".$this->dbEscapeString(@$_SERVER['HTTP_ACCEPT'])."', ";
+		$q .= "'".$this->dbEscapeString(@$_SERVER['HTTP_ACCEPT_CHARSET'])."', '".$this->dbEscapeString(@$_SERVER['HTTP_ACCEPT_ENCODING'])."', ";
 		$q .= "'".session_id()."', ";
-		$q .= "'".$this->db_escape_string($this->action)."', '".$this->db_escape_string($this->action_id)."', ";
-		$q .= "'".$this->db_escape_string($this->action_yes)."', '".$this->db_escape_string($this->action_flag)."', ";
-		$q .= "'".$this->db_escape_string($this->action_menu)."', '".$this->db_escape_string($this->action_loaded)."', ";
-		$q .= "'".$this->db_escape_string($this->action_value)."', '".$this->db_escape_string($this->action_error)."')";
-		$this->db_exec($q, 'NULL');
+		$q .= "'".$this->dbEscapeString($this->action)."', '".$this->dbEscapeString($this->action_id)."', ";
+		$q .= "'".$this->dbEscapeString($this->action_yes)."', '".$this->dbEscapeString($this->action_flag)."', ";
+		$q .= "'".$this->dbEscapeString($this->action_menu)."', '".$this->dbEscapeString($this->action_loaded)."', ";
+		$q .= "'".$this->dbEscapeString($this->action_value)."', '".$this->dbEscapeString($this->action_error)."')";
+		$this->dbExec($q, 'NULL');
 	}
 
 	// METHOD: adbTopMenu
@@ -211,7 +211,7 @@ class Backend extends \CoreLibs\DB\IO
 					$name = $pages[$i]["page_name"];
 					// if page name matchs -> set selected flag
 					$selected = 0;
-					if ($this->get_page_name() == $pages[$i]["filename"]) {
+					if ($this->getPageName() == $pages[$i]["filename"]) {
 						$selected = 1;
 						$this->page_name = $name;
 					}
@@ -322,11 +322,11 @@ class Backend extends \CoreLibs\DB\IO
 		$q = "INSERT INTO ".GLOBAL_DB_SCHEMA.".live_queue (";
 		$q .= "queue_key, key_value, key_name, type, target, data, group_key, action, associate, file";
 		$q .= ") VALUES (";
-		$q .= "'".$this->db_escape_string($queue_key)."', '".$this->db_escape_string($key_value)."', ";
-		$q .= "'".$this->db_escape_string($key_name)."', '".$this->db_escape_string($type)."', ";
-		$q .= "'".$this->db_escape_string($target)."', '".$this->db_escape_string($data)."', ";
-		$q .= "'".$this->queue_key."', '".$this->action."', '".$this->db_escape_string($associate)."', ";
-		$q .= "'".$this->db_escape_string($file)."')";
+		$q .= "'".$this->dbEscapeString($queue_key)."', '".$this->dbEscapeString($key_value)."', ";
+		$q .= "'".$this->dbEscapeString($key_name)."', '".$this->dbEscapeString($type)."', ";
+		$q .= "'".$this->dbEscapeString($target)."', '".$this->dbEscapeString($data)."', ";
+		$q .= "'".$this->queue_key."', '".$this->action."', '".$this->dbEscapeString($associate)."', ";
+		$q .= "'".$this->dbEscapeString($file)."')";
 		$this->db_exec($q);
 	}