Browse Source

Removing unused error_logs

Julio Montoya 11 years ago
parent
commit
e04b466ee7

+ 1 - 1
main/conference/api.php

@@ -298,4 +298,4 @@ if ($action == "uploadgui") {
             }
         }
     }
-}
+}

+ 0 - 1
main/gradebook/lib/be/abstractlink.class.php

@@ -287,7 +287,6 @@ abstract class AbstractLink implements GradebookItem {
 		} else {
 			$name_log=$arreval['course_code'];
 		}
-		//error_log($name_log);
 		$sql="INSERT INTO ".$tbl_grade_linkeval_log."(id_linkeval_log,name,description,created_at,weight,visible,type,user_id_log)
 			  VALUES('".Database::escape_string($arreval['id'])."','".Database::escape_string($name_log)."','".Database::escape_string($description_log)."','".Database::escape_string($current_date_server)."','".Database::escape_string($arreval['weight'])."','".Database::escape_string($arreval['visible'])."','Link',".api_get_user_id().")";
 

+ 0 - 1
main/inc/lib/attendance.lib.php

@@ -661,7 +661,6 @@ class Attendance
             $this->save_attendance_sheet_log(intval($row[3]), $date_now, $lastedit_type, $lastedit_user_id, $row[5]);
         }
         $sql = substr($sql,0,-1);
-        //error_log($sql);
         $r = Database::query($sql);
         $users_absent = array_diff($user_ids, $user_results);
         $affected_rows = Database::affected_rows($r);

+ 0 - 4
main/inc/lib/course.lib.php

@@ -113,8 +113,6 @@ class CourseManager
                     return $course_info;
                 }
             } else {
-                //error_log('Course already exists with params: '.$params['code']);
-                //error_log(print_r($params, 1));
                 //Course already exists
                 if (isset($params['return_item_if_already_exists']) && $params['return_item_if_already_exists']) {
                     return $course_info;
@@ -2236,7 +2234,6 @@ class CourseManager
                 $rowcfv = Database::fetch_array($rescfv);
                 if ($rowcfv['field_value'] != $fvalues) {
                     $sqlu = "UPDATE $t_cfv SET field_value = '$fvalues', tms = FROM_UNIXTIME($tms) WHERE id = ".$rowcfv['id'];
-                    //error_log('UM::update_extra_field_value: '.$sqlu);
                     $resu = Database::query($sqlu);
                     return ($resu ? true : false);
                 }
@@ -2244,7 +2241,6 @@ class CourseManager
             } else {
                 $sqli = "INSERT INTO $t_cfv (course_code,field_id,field_value,tms) " .
                     "VALUES ('$course_code',".$rowcf['id'].",'$fvalues',FROM_UNIXTIME($tms))";
-                //error_log('UM::update_extra_field_value: '.$sqli);
                 $resi = Database::query($sqli);
                 return ($resi ? true : false);
             }

+ 0 - 1
main/inc/lib/database.lib.php

@@ -384,7 +384,6 @@ class Database
                 $message .= $query;
                 echo $message;
                 echo '</pre>';
-                //error_log($message);
             }
         }
         */

+ 8 - 10
main/inc/lib/legal.lib.php

@@ -1,20 +1,17 @@
 <?php
 /* For licensing terms, see /license.txt */
+
 /**
  * Legal class
- *
- * @version 1.0
- * @package chamilo.legal
- *
-*/
-/**
- * Class
  * @package chamilo.legal
  */
-class LegalManager {
-	private function __construct () {
+class LegalManager
+{
+	private function __construct ()
+    {
 		//void
 	}
+
 	/**
 	 * Add a new Term and Condition
 	 * @param int language id
@@ -23,7 +20,8 @@ class LegalManager {
 	 * @param string explain changes
 	 * @return boolean sucess
 	 */
-	public static function add ($language, $content, $type, $changes) {
+	public static function add ($language, $content, $type, $changes)
+    {
 		$legal_table = Database::get_main_table(TABLE_MAIN_LEGAL);
 		$last = self::get_last_condition($language);
 		$language = Database::escape_string($language);

+ 0 - 2
main/inc/lib/login.lib.php

@@ -490,12 +490,10 @@ class Login
                                 //We update the course tracking table
                                 $sql = "UPDATE $course_tracking_table  SET logout_course_date = '$time', counter = counter+1
                                 WHERE course_access_id = " . intval($i_course_access_id) . " AND session_id = " . api_get_session_id();
-                                //error_log($sql);
                                 Database::query($sql);
                             } else {
                                 $sql = "INSERT INTO $course_tracking_table (c_id, user_id, login_course_date, logout_course_date, counter, session_id)" .
                                     "VALUES('" . $_real_cid . "', '" . $_user['user_id'] . "', '$time', '$time', '1','" . api_get_session_id() . "')";
-                                //error_log($sql);
                                 Database::query($sql);
                             }
                         }

+ 32 - 32
main/inc/lib/magpierss/rss_cache.inc

@@ -1,7 +1,7 @@
 <?php
 /**
  * Project:     MagpieRSS: a simple RSS integration tool
- * File:        rss_cache.inc, a simple, rolling(no GC), cache 
+ * File:        rss_cache.inc, a simple, rolling(no GC), cache
  *              for RSS objects, keyed on URL.
  * Author:      Kellan Elliott-McCrea <kellan@protest.net>
  * Version:     0.51
@@ -22,7 +22,7 @@ class RSSCache {
     public $BASE_CACHE = './cache';    // where the cache files are stored
     public $MAX_AGE    = 3600;         // when are files stale, default one hour
     public $ERROR      = "";           // accumulate error messages
-    
+
     public function RSSCache ($base='', $age='') {
         if ( $base ) {
             $this->BASE_CACHE = $base;
@@ -30,12 +30,12 @@ class RSSCache {
         if ( $age ) {
             $this->MAX_AGE = $age;
         }
-        
+
         // attempt to make the cache directory
         if ( ! file_exists( $this->BASE_CACHE ) ) {
             $status = @mkdir( $this->BASE_CACHE, 0755 );
-            
-            // if make failed 
+
+            // if make failed
             if ( ! $status ) {
                 $this->error(
                     "Cache couldn't make dir '" . $this->BASE_CACHE . "'."
@@ -43,50 +43,50 @@ class RSSCache {
             }
         }
     }
-    
+
 /*=======================================================================*\
     Function:   set
     Purpose:    add an item to the cache, keyed on url
     Input:      url from wich the rss file was fetched
-    Output:     true on sucess  
+    Output:     true on sucess
 \*=======================================================================*/
     public function set ($url, $rss) {
         $this->ERROR = "";
         $cache_file = $this->file_name( $url );
         $fp = @fopen( $cache_file, 'w' );
-        
+
         if ( ! $fp ) {
             $this->error(
                 "Cache unable to open file for writing: $cache_file"
             );
             return 0;
         }
-        
-        
+
+
         $data = $this->serialize( $rss );
         fwrite( $fp, $data );
         fclose( $fp );
-        
+
         return $cache_file;
     }
-    
+
 /*=======================================================================*\
     Function:   get
     Purpose:    fetch an item from the cache
     Input:      url from wich the rss file was fetched
-    Output:     cached object on HIT, false on MISS 
-\*=======================================================================*/ 
+    Output:     cached object on HIT, false on MISS
+\*=======================================================================*/
     public function get ($url) {
         $this->ERROR = "";
         $cache_file = $this->file_name( $url );
-        
+
         if ( ! file_exists( $cache_file ) ) {
-            $this->debug( 
+            $this->debug(
                 "Cache doesn't contain: $url (cache file: $cache_file)"
             );
             return 0;
         }
-        
+
         $fp = @fopen($cache_file, 'r');
         if ( ! $fp ) {
             $this->error(
@@ -94,14 +94,14 @@ class RSSCache {
             );
             return 0;
         }
-        
+
         if ($filesize = filesize($cache_file) ) {
         	$data = fread( $fp, filesize($cache_file) );
         	$rss = $this->unserialize( $data );
-        
+
         	return $rss;
     	}
-    	
+
     	return 0;
     }
 
@@ -110,12 +110,12 @@ class RSSCache {
     Purpose:    check a url for membership in the cache
                 and whether the object is older then MAX_AGE (ie. STALE)
     Input:      url from wich the rss file was fetched
-    Output:     cached object on HIT, false on MISS 
-\*=======================================================================*/     
+    Output:     cached object on HIT, false on MISS
+\*=======================================================================*/
     public function check_cache ( $url ) {
         $this->ERROR = "";
         $filename = $this->file_name( $url );
-        
+
         if ( file_exists( $filename ) ) {
             // find how long ago the file was added to the cache
             // and whether that is longer then MAX_AGE
@@ -144,30 +144,30 @@ class RSSCache {
 			return $age;
 		}
 		else {
-			return -1;	
+			return -1;
 		}
 	}
-	
+
 /*=======================================================================*\
     Function:   serialize
-\*=======================================================================*/     
+\*=======================================================================*/
     public function serialize ( $rss ) {
         return serialize( $rss );
     }
 
 /*=======================================================================*\
     Function:   unserialize
-\*=======================================================================*/     
+\*=======================================================================*/
     public function unserialize ( $data ) {
         return unserialize( $data );
     }
-    
+
 /*=======================================================================*\
     Function:   file_name
     Purpose:    map url to location in cache
     Input:      url from wich the rss file was fetched
     Output:     a file name
-\*=======================================================================*/     
+\*=======================================================================*/
     public function file_name ($url) {
         $filename = md5( $url );
         return join( DIRECTORY_SEPARATOR, array( $this->BASE_CACHE, $filename ) );
@@ -176,10 +176,10 @@ class RSSCache {
 /*=======================================================================*\
     Function:   error
     Purpose:    register error
-\*=======================================================================*/         
+\*=======================================================================*/
     public function error ($errormsg, $lvl=E_USER_WARNING) {
         // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) { 
+        if ( isset($php_errormsg) ) {
             $errormsg .= " ($php_errormsg)";
         }
         $this->ERROR = $errormsg;
@@ -190,7 +190,7 @@ class RSSCache {
             error_log( $errormsg, 0);
         }
     }
-    
+
     public function debug ($debugmsg, $lvl=E_USER_NOTICE) {
         if ( MAGPIE_DEBUG ) {
             $this->error("MagpieRSS [debug] $debugmsg", $lvl);

+ 111 - 111
main/inc/lib/magpierss/rss_parse.inc

@@ -35,7 +35,7 @@ require_once (MAGPIE_DIR . 'rss_utils.inc');
 */
 class MagpieRSS {
     public $parser;
-    
+
     public $current_item   = array();  // item currently being parsed
     public $items          = array();  // collection of parsed items
     public $channel        = array();  // hash of channel fields
@@ -44,14 +44,14 @@ class MagpieRSS {
     public $feed_type;
     public $feed_version;
     public $encoding       = '';       // output encoding of parsed rss
-    
+
     private $_source_encoding = '';     // only set if we have to parse xml prolog
-    
+
     public $ERROR = "";
     public $WARNING = "";
-    
+
     // define some constants
-    
+
     private $_CONTENT_CONSTRUCTS = array('content', 'summary', 'info', 'title', 'tagline', 'copyright');
     private $_KNOWN_ENCODINGS    = array('UTF-8', 'US-ASCII', 'ISO-8859-1');
 
@@ -59,75 +59,75 @@ class MagpieRSS {
     public $stack              = array(); // parser stack
     public $inchannel          = false;
     public $initem             = false;
-    public $incontent          = false; // if in Atom <content mode="xml"> field 
+    public $incontent          = false; // if in Atom <content mode="xml"> field
     public $intextinput        = false;
     public $inimage            = false;
     public $current_namespace  = false;
-    
+
 
     /**
      *  Set up XML parser, parse source, and return populated RSS object..
-     *   
+     *
      *  @param string $source           string containing the RSS to be parsed
      *
      *  NOTE:  Probably a good idea to leave the encoding options alone unless
      *         you know what you're doing as PHP's character set support is
      *         a little weird.
      *
-     *  NOTE:  A lot of this is unnecessary but harmless with PHP5 
+     *  NOTE:  A lot of this is unnecessary but harmless with PHP5
      *
      *
-     *  @param string $output_encoding  output the parsed RSS in this character 
+     *  @param string $output_encoding  output the parsed RSS in this character
      *                                  set defaults to ISO-8859-1 as this is PHP's
      *                                  default.
      *
      *                                  NOTE: might be changed to UTF-8 in future
      *                                  versions.
-     *                               
-     *  @param string $input_encoding   the character set of the incoming RSS source. 
+     *
+     *  @param string $input_encoding   the character set of the incoming RSS source.
      *                                  Leave blank and Magpie will try to figure it
      *                                  out.
-     *                                  
-     *                                   
+     *
+     *
      *  @param bool   $detect_encoding  if false Magpie won't attempt to detect
      *                                  source encoding. (caveat emptor)
      *
      */
-    public function MagpieRSS ($source, $output_encoding='ISO-8859-1', 
-                        $input_encoding=null, $detect_encoding=true) 
-    {   
+    public function MagpieRSS ($source, $output_encoding='ISO-8859-1',
+                        $input_encoding=null, $detect_encoding=true)
+    {
         # if PHP xml isn't compiled in, die
         #
         if (!function_exists('xml_parser_create')) {
-            $this->error( "Failed to load PHP's XML Extension. " . 
+            $this->error( "Failed to load PHP's XML Extension. " .
                           "http://www.php.net/manual/en/ref.xml.php",
                            E_USER_ERROR );
         }
-        
-        list($parser, $source) = $this->create_parser($source, 
+
+        list($parser, $source) = $this->create_parser($source,
                 $output_encoding, $input_encoding, $detect_encoding);
-        
-        
+
+
         if (!is_resource($parser)) {
             $this->error( "Failed to create an instance of PHP's XML parser. " .
                           "http://www.php.net/manual/en/ref.xml.php",
                           E_USER_ERROR );
         }
 
-        
+
         $this->parser = $parser;
-        
+
         # pass in parser, and a reference to this object
         # setup handlers
         #
         xml_set_object( $this->parser, $this );
-        xml_set_element_handler($this->parser, 
+        xml_set_element_handler($this->parser,
                 'feed_start_element', 'feed_end_element' );
-                        
-        xml_set_character_data_handler( $this->parser, 'feed_cdata' ); 
-    
+
+        xml_set_character_data_handler( $this->parser, 'feed_cdata' );
+
         $status = xml_parse( $this->parser, $source );
-        
+
         if (! $status ) {
             $errorcode = xml_get_error_code( $this->parser );
             if ( $errorcode != XML_ERROR_NONE ) {
@@ -139,25 +139,25 @@ class MagpieRSS {
                 $this->error( $errormsg );
             }
         }
-        
+
         xml_parser_free( $this->parser );
 
         $this->normalize();
     }
-    
+
     public function feed_start_element($p, $element, &$attrs) {
         $el = $element = strtolower($element);
         $attrs = array_change_key_case($attrs, CASE_LOWER);
-        
+
         // check for a namespace, and split if found
         $ns = false;
         if ( strpos( $element, ':' ) ) {
-            list($ns, $el) = split( ':', $element, 2); 
+            list($ns, $el) = split( ':', $element, 2);
         }
         if ( $ns and $ns != 'rdf' ) {
             $this->current_namespace = $ns;
         }
-            
+
         # if feed type isn't set, then this is first element of feed
         # identify feed from root element
         #
@@ -177,37 +177,37 @@ class MagpieRSS {
             }
             return;
         }
-    
-        if ( $el == 'channel' ) 
+
+        if ( $el == 'channel' )
         {
             $this->inchannel = true;
         }
-        elseif ($el == 'item' or $el == 'entry' ) 
+        elseif ($el == 'item' or $el == 'entry' )
         {
             $this->initem = true;
             if ( isset($attrs['rdf:about']) ) {
-                $this->current_item['about'] = $attrs['rdf:about']; 
+                $this->current_item['about'] = $attrs['rdf:about'];
             }
         }
-        
+
         // if we're in the default namespace of an RSS feed,
         //  record textinput or image fields
-        elseif ( 
-            $this->feed_type == RSS and 
-            $this->current_namespace == '' and 
-            $el == 'textinput' ) 
+        elseif (
+            $this->feed_type == RSS and
+            $this->current_namespace == '' and
+            $el == 'textinput' )
         {
             $this->intextinput = true;
         }
-        
+
         elseif (
-            $this->feed_type == RSS and 
-            $this->current_namespace == '' and 
-            $el == 'image' ) 
+            $this->feed_type == RSS and
+            $this->current_namespace == '' and
+            $el == 'image' )
         {
             $this->inimage = true;
         }
-        
+
         # handle atom content constructs
         elseif ( $this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
         {
@@ -215,40 +215,40 @@ class MagpieRSS {
             if ($el == 'content' ) {
                 $el = 'atom_content';
             }
-            
+
             $this->incontent = $el;
-            
-            
+
+
         }
-        
+
         // if inside an Atom content construct (e.g. content or summary) field treat tags as text
-        elseif ($this->feed_type == ATOM and $this->incontent ) 
+        elseif ($this->feed_type == ATOM and $this->incontent )
         {
             // if tags are inlined, then flatten
-            $attrs_str = join(' ', 
-                    array_map('map_attrs', 
-                    array_keys($attrs), 
+            $attrs_str = join(' ',
+                    array_map('map_attrs',
+                    array_keys($attrs),
                     array_values($attrs) ) );
-            
+
             $this->append_content( "<$element $attrs_str>"  );
-                    
+
             array_unshift( $this->stack, $el );
         }
-        
+
         // Atom support many links per containging element.
         // Magpie treats link elements of type rel='alternate'
         // as being equivalent to RSS's simple link element.
         //
-        elseif ($this->feed_type == ATOM and $el == 'link' ) 
+        elseif ($this->feed_type == ATOM and $el == 'link' )
         {
-            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' ) 
+            if ( isset($attrs['rel']) and $attrs['rel'] == 'alternate' )
             {
                 $link_el = 'link';
             }
             else {
                 $link_el = 'link_' . $attrs['rel'];
             }
-            
+
             $this->append($link_el, $attrs['href']);
         }
         // set stack[0] to current element
@@ -256,11 +256,11 @@ class MagpieRSS {
             array_unshift($this->stack, $el);
         }
     }
-    
 
-    
+
+
     public function feed_cdata ($p, $text) {
-        if ($this->feed_type == ATOM and $this->incontent) 
+        if ($this->feed_type == ATOM and $this->incontent)
         {
             $this->append_content( $text );
         }
@@ -269,36 +269,36 @@ class MagpieRSS {
             $this->append($current_el, $text);
         }
     }
-    
+
     public function feed_end_element ($p, $el) {
         $el = strtolower($el);
-        
-        if ( $el == 'item' or $el == 'entry' ) 
+
+        if ( $el == 'item' or $el == 'entry' )
         {
             $this->items[] = $this->current_item;
             $this->current_item = array();
             $this->initem = false;
         }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' ) 
+        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'textinput' )
         {
             $this->intextinput = false;
         }
-        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' ) 
+        elseif ($this->feed_type == RSS and $this->current_namespace == '' and $el == 'image' )
         {
             $this->inimage = false;
         }
         elseif ($this->feed_type == ATOM and in_array($el, $this->_CONTENT_CONSTRUCTS) )
-        {   
+        {
             $this->incontent = false;
         }
-        elseif ($el == 'channel' or $el == 'feed' ) 
+        elseif ($el == 'channel' or $el == 'feed' )
         {
             $this->inchannel = false;
         }
         elseif ($this->feed_type == ATOM and $this->incontent  ) {
             // balance tags properly
             // note:  i don't think this is actually neccessary
-            if ( $this->stack[0] == $el ) 
+            if ( $this->stack[0] == $el )
             {
                 $this->append_content("</$el>");
             }
@@ -311,19 +311,19 @@ class MagpieRSS {
         else {
             array_shift( $this->stack );
         }
-        
+
         $this->current_namespace = false;
     }
-    
+
     public function concat (&$str1, $str2="") {
         if (!isset($str1) ) {
             $str1="";
         }
         $str1 .= $str2;
     }
-    
-    
-    
+
+
+
     public function append_content($text) {
         if ( $this->initem ) {
             $this->concat( $this->current_item[ $this->incontent ], $text );
@@ -332,13 +332,13 @@ class MagpieRSS {
             $this->concat( $this->channel[ $this->incontent ], $text );
         }
     }
-    
+
     // smart append - field and namespace aware
     public function append($el, $text) {
         if (!$el) {
             return;
         }
-        if ( $this->current_namespace ) 
+        if ( $this->current_namespace )
         {
             if ( $this->initem ) {
                 $this->concat(
@@ -374,10 +374,10 @@ class MagpieRSS {
                 $this->concat(
                     $this->channel[ $el ], $text );
             }
-            
+
         }
     }
-    
+
     public function normalize () {
         // if atom populate rss fields
         if ( $this->is_atom() ) {
@@ -388,7 +388,7 @@ class MagpieRSS {
                     $item['description'] = $item['summary'];
                 if ( isset($item['atom_content']))
                     $item['content']['encoded'] = $item['atom_content'];
-                
+
                 $atom_date = (isset($item['issued']) ) ? $item['issued'] : $item['modified'];
                 if ( $atom_date ) {
                     $epoch = @parse_w3cdtf($atom_date);
@@ -396,9 +396,9 @@ class MagpieRSS {
                         $item['date_timestamp'] = $epoch;
                     }
                 }
-                
+
                 $this->items[$i] = $item;
-            }       
+            }
         }
         elseif ( $this->is_rss() ) {
             $this->channel['tagline'] = $this->channel['description'];
@@ -408,7 +408,7 @@ class MagpieRSS {
                     $item['summary'] = $item['description'];
                 if ( isset($item['content']['encoded'] ) )
                     $item['atom_content'] = $item['content']['encoded'];
-                
+
                 if ( $this->is_rss() == '1.0' and isset($item['dc']['date']) ) {
                     $epoch = @parse_w3cdtf($item['dc']['date']);
                     if ($epoch and $epoch > 0) {
@@ -421,22 +421,22 @@ class MagpieRSS {
                         $item['date_timestamp'] = $epoch;
                     }
                 }
-                
+
                 $this->items[$i] = $item;
             }
         }
     }
-    
-    
+
+
     public function is_rss () {
         if ( $this->feed_type == RSS ) {
-            return $this->feed_version; 
+            return $this->feed_version;
         }
         else {
             return false;
         }
     }
-    
+
     public function is_atom() {
         if ( $this->feed_type == ATOM ) {
             return $this->feed_version;
@@ -461,15 +461,15 @@ class MagpieRSS {
             $this->encoding = $out_enc;
             xml_parser_set_option($parser, XML_OPTION_TARGET_ENCODING, $out_enc);
         }
-        
+
         return array($parser, $source);
     }
-    
+
     /**
     * Instantiate an XML parser under PHP5
     *
     * PHP5 will do a fine job of detecting input encoding
-    * if passed an empty string as the encoding. 
+    * if passed an empty string as the encoding.
     *
     * All hail libxml2!
     *
@@ -483,7 +483,7 @@ class MagpieRSS {
             return xml_parser_create('');
         }
     }
-    
+
     /**
     * Instaniate an XML parser under PHP4
     *
@@ -503,7 +503,7 @@ class MagpieRSS {
         if ( !$detect ) {
             return array(xml_parser_create($in_enc), $source);
         }
-        
+
         if (!$in_enc) {
             if (preg_match('/<?xml.*encoding=[\'"](.*?)[\'"].*?>/m', $source, $m)) {
                 $in_enc = strtoupper($m[1]);
@@ -513,24 +513,24 @@ class MagpieRSS {
                 $in_enc = 'UTF-8';
             }
         }
-        
+
         if ($this->known_encoding($in_enc)) {
             return array(xml_parser_create($in_enc), $source);
         }
-        
+
         // the dectected encoding is not one of the simple encodings PHP knows
-        
+
         // attempt to use the iconv extension to
         // cast the XML to a known encoding
         // @see http://php.net/iconv
-       
+
         if (function_exists('iconv'))  {
             $encoded_source = iconv($in_enc,'UTF-8', $source);
             if ($encoded_source) {
                 return array(xml_parser_create('UTF-8'), $encoded_source);
             }
         }
-        
+
         // iconv didn't work, try mb_convert_encoding
         // @see http://php.net/mbstring
         if(function_exists('mb_convert_encoding')) {
@@ -539,15 +539,15 @@ class MagpieRSS {
                 return array(xml_parser_create('UTF-8'), $encoded_source);
             }
         }
-        
-        // else 
+
+        // else
         $this->error("Feed is in an unsupported character encoding. ($in_enc) " .
                      "You may see strange artifacts, and mangled characters.",
                      E_USER_NOTICE);
-            
+
         return array(xml_parser_create(), $source);
     }
-    
+
     public function known_encoding($enc) {
         $enc = strtoupper($enc);
         if ( in_array($enc, $this->_KNOWN_ENCODINGS) ) {
@@ -560,16 +560,16 @@ class MagpieRSS {
 
     public function error ($errormsg, $lvl=E_USER_WARNING) {
         // append PHP's error message if track_errors enabled
-        if ( isset($php_errormsg) ) { 
+        if ( isset($php_errormsg) ) {
             $errormsg .= " ($php_errormsg)";
         }
         if ( MAGPIE_DEBUG ) {
-            trigger_error( $errormsg, $lvl);        
+            trigger_error( $errormsg, $lvl);
         }
         else {
             error_log( $errormsg, 0);
         }
-        
+
         $notices = E_USER_NOTICE|E_NOTICE;
         if ( $lvl&$notices ) {
             $this->WARNING = $errormsg;
@@ -577,15 +577,15 @@ class MagpieRSS {
             $this->ERROR = $errormsg;
         }
     }
-    
-    
+
+
 } // end class RSS
 
 function map_attrs($k, $v) {
     return "$k=\"$v\"";
 }
 
-// patch to support medieval versions of PHP4.1.x, 
+// patch to support medieval versions of PHP4.1.x,
 // courtesy, Ryan Currie, ryan@digibliss.com
 
 if (!function_exists('array_change_key_case')) {

+ 0 - 1
main/inc/lib/nanogong.lib.php

@@ -313,7 +313,6 @@ class Nanogong
                     if (move_uploaded_file($_FILES['file']['tmp_name'], $this->store_path.$file_name)) {
                         $this->store_filename = $this->store_path.$file_name;
 
-                        //error_log('saved');
                         return 1;
                     }
                 }

+ 2 - 3
main/inc/lib/usermanager.lib.php

@@ -1148,11 +1148,10 @@ class UserManager
      * @param     string     The username
      * @return array All user information as an associative array
      */
-    public static function get_user_info_simple($username) {
+    public static function get_user_info_simple($username)
+    {
         static $user_list = array();
-        //error_log($sql);
         if (isset($user_list[$username])) {
-            //error_log('loaded with static');
             return $user_list[$username];
         }
         $user_table = Database :: get_main_table(TABLE_MAIN_USER);

+ 0 - 1
main/inc/local.inc.php

@@ -566,7 +566,6 @@ if (!isset($_SESSION['login_as'])) {
                 //We update the course tracking table
                 $sql = "UPDATE $course_tracking_table  SET logout_course_date = '$time', counter = counter+1
                         WHERE course_access_id = ".intval($i_course_access_id)." AND session_id = ".api_get_session_id();
-                //error_log($sql);
                 Database::query($sql);
             } else {
                 $sql="INSERT INTO $course_tracking_table (c_id, user_id, login_course_date, logout_course_date, counter, session_id)" .

+ 1 - 1
main/tracking/courseLogCSV.php

@@ -347,7 +347,7 @@ if ($is_allowedToTrack) {
                             "INNER JOIN $table_user u " .
                             "ON u.user_id = sd.user_id " .
                             "WHERE sd.c_id = $course_id AND sd.lp_id=$contentId group by u.user_id";
-                    //error_log($sql2,0);
+
                     $result2 = Database::query($sql2);
 
                     if (Database::num_rows($result2) > 0) {

+ 4 - 4
src/ChamiloLMS/Component/Editor/Connector.php

@@ -46,8 +46,8 @@ class Connector
 
         $courseInfo = api_get_course_info();
 
-        error_log($cmd);
-        error_log(print_r($result, 1));
+        /*error_log($cmd);
+        error_log(print_r($result, 1));*/
         //error_log(print_r($args,1));
         //error_log(print_r($elfinder,1));
 
@@ -66,7 +66,7 @@ class Connector
                     foreach ($result['added'] as $file) {
                         $name = $file['name'];
                         $webalized = \URLify::filter($file['name'], 80);
-                        error_log($webalized);
+                        //error_log($webalized);
                         if (strcmp($name, $webalized) != 0) {
                             $arg = array('target' => $file['hash'], 'name' => $webalized);
                             $elfinder->exec('rename', $arg);
@@ -74,7 +74,7 @@ class Connector
 
                         $realPath = $elfinder->realpath($file['hash']);
 
-                        error_log($realPath);
+                        //error_log($realPath);
                         if (!empty($realPath)) {
                             // Getting file info
                             $info = $elfinder->exec('file', array('target' => $file['hash']));

+ 12 - 12
src/ChamiloLMS/Controller/IndexController.php

@@ -25,9 +25,9 @@ class IndexController extends CommonController
     public function logoutAction(Application $app)
     {
         $userId = api_get_user_id();
-
         \Online::logout($userId, true);
 
+
         // the Online::logout function already does a redirect
         //return $app->redirect($app['url_generator']->generate('index'));
     }
@@ -44,6 +44,17 @@ class IndexController extends CommonController
         $template = $app['template'];
         $loginError = $app['request']->get('error');
         $extraJS = array();
+
+        /*\ChamiloSession::write('name', 'clara');
+        var_dump(\ChamiloSession::read('name'));
+        var_dump($_SESSION['name']);*/
+
+        //var_dump(\ChamiloSession::read('aaa'));
+
+        /*\ChamiloSession::write('name', 'clar');
+        echo \ChamiloSession::read('name');
+        $app['session']->set('name', 'julio');
+        echo $app['session']->get('name');*/
         /*
         $token = $app['security']->getToken();
         if (null !== $token) {
@@ -61,14 +72,11 @@ class IndexController extends CommonController
         $em->persist($user);
         $em->flush();*/
 
-
         //$user->roles->add($status);
         /*$roles = $user->getRolesObj();
         foreach ($roles as $role) {
-
         }*/
 
-
         // $countries = Intl::getRegionBundle()->getCountryNames('es');
         //var_dump($countries);
 
@@ -77,7 +85,6 @@ class IndexController extends CommonController
         $formatter->setPattern("EEEE d MMMM Y");
         echo $formatter->format(time());*/
 
-
         //@todo improve this JS includes should be added using twig
         $extraJS[] = api_get_jquery_libraries_js(array('bxslider'));
         $extraJS[] = '<script>
@@ -122,8 +129,6 @@ class IndexController extends CommonController
           echo $course->getCode() . "\n";
           }
           exit; */
-
-
         if (api_get_setting('allow_terms_conditions') == 'true') {
             unset($_SESSION['term_and_condition']);
         }
@@ -211,11 +216,6 @@ class IndexController extends CommonController
         return new Response($response, 200, array());
     }
 
-    public function loginCheckAction(Application $app)
-    {
-
-    }
-
     /**
      *
      * @todo This piece of code should probably move to local.inc.php where the actual login procedure is handled.