From 542dff144e41b1c7e455b6ca1dc4c4a83e8548c4 Mon Sep 17 00:00:00 2001
From: Julio Montoya <gugli100@gmail.com>
Date: Thu, 9 Aug 2012 12:02:32 +0200
Subject: [PATCH] Removing learnpath::escape_string

---
 main/newscorm/aicc_hacp.php           |  4 ++--
 main/newscorm/learnpath.class.php     |  1 +
 main/newscorm/scormResource.class.php | 10 ++++------
 3 files changed, 7 insertions(+), 8 deletions(-)
 mode change 100755 => 100644 main/newscorm/aicc_hacp.php
 mode change 100755 => 100644 main/newscorm/scormResource.class.php

diff --git a/main/newscorm/aicc_hacp.php b/main/newscorm/aicc_hacp.php
old mode 100755
new mode 100644
index 1cd922c700..c9d523eb4d
--- a/main/newscorm/aicc_hacp.php
+++ b/main/newscorm/aicc_hacp.php
@@ -91,10 +91,10 @@ if (!empty($_REQUEST['command'])) {
         case 'getparam':
             // Request for all available data to be printed out in the answer.
             if (!empty($_REQUEST['version'])) {
-                $hacp_version = learnpath::escape_string($_REQUEST['version']);
+                $hacp_version = Database::escape_string($_REQUEST['version']);
             }
             if (!empty($_REQUEST['session_id'])) {
-                $hacp_session_id = learnpath::escape_string($_REQUEST['session_id']);
+                $hacp_session_id = Database::escape_string($_REQUEST['session_id']);
             }
             $error_code = 0;
             $error_text = $errors[$error_code];
diff --git a/main/newscorm/learnpath.class.php b/main/newscorm/learnpath.class.php
index 7b45543c06..5759007a83 100644
--- a/main/newscorm/learnpath.class.php
+++ b/main/newscorm/learnpath.class.php
@@ -1324,6 +1324,7 @@ class learnpath {
      * Escapes a string with the available database escape function
      * @param	string	String to escape
      * @return	string	String escaped
+     * @deprecated use  Database::escape_string
      */
     public function escape_string($string) {
         //if ($this->debug > 0) { error_log('New LP - In learnpath::escape_string('.$string.')', 0); }
diff --git a/main/newscorm/scormResource.class.php b/main/newscorm/scormResource.class.php
old mode 100755
new mode 100644
index b386292dee..71d32b11ab
--- a/main/newscorm/scormResource.class.php
+++ b/main/newscorm/scormResource.class.php
@@ -113,9 +113,8 @@ class scormResource {
      * @return	string	Path for this resource
      */
     public function get_path() {
-        if (!empty($this->href)) {
-            require_once 'learnpath.class.php';
-            return learnpath::escape_string($this->href);
+        if (!empty($this->href)) {            
+            return Database::escape_string($this->href);
         } else {
             return '';
         }
@@ -126,9 +125,8 @@ class scormResource {
      * @return	string	generally 'asset' or 'sco' as these are the only two values defined in SCORM 1.2
      */
     public function get_scorm_type() {
-        if (!empty($this->scormtype)){
-            require_once 'learnpath.class.php';
-            return learnpath::escape_string($this->scormtype);
+        if (!empty($this->scormtype)) {            
+            return Database::escape_string($this->scormtype);
         } else {
             return '';
         }