Merge

main/inc/lib/chamilo.class.php

@@ -9,6 +9,23 @@
  */
 class Chamilo
 {
+    
+    public static function name()
+    {
+        //@todo: add version
+        return 'chamilo';
+    }
+
+    static function is_test_server()
+    {
+        return api_get_setting('server_type') == 'test';
+    }
+
+    static function is_production_server()
+    {
+        return api_get_setting('server_type') == 'production';
+    }
+        
 
     /**
      * Returns a full url from local/absolute path and parameters.
@@ -50,14 +67,4 @@ class Chamilo
         return $root . $path;
     }
 
-    static function is_test_server()
-    {
-        return api_get_setting('server_type') == 'test';
-    }
-
-    static function is_production_server()
-    {
-        return api_get_setting('server_type') == 'production';
-    }
-
 }

main/inc/lib/redirect.class.php

@@ -11,7 +11,7 @@ class Redirect
 
     static function www()
     {
-        Uri::www();
+        return Uri::www();
     }
 
     static function go($url = '')