Merge branch 'master' into 'master'

Merge TW

See merge request !36

database/edugain_schema.sql

@@ -507,8 +507,8 @@ DROP TABLE IF EXISTS `federation`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
 CREATE TABLE `federation` (
-  `fed_id` char(20) COLLATE utf8_unicode_ci NOT NULL,
-  `code` char(20) COLLATE utf8_unicode_ci DEFAULT NULL,
+  `code` char(20) COLLATE utf8_unicode_ci NOT NULL,
+  `fed_id` char(20) COLLATE utf8_unicode_ci DEFAULT NULL,
   `europe` tinyint(1) DEFAULT NULL,
   `contact_email` varchar(100) COLLATE utf8_unicode_ci DEFAULT NULL,
   `url` varchar(255) COLLATE utf8_unicode_ci DEFAULT NULL,

scripts/CoCointerface.php

@@ -3,14 +3,15 @@ require_once(dirname(__FILE__)."/../lib/config.php");
 require(eduGAIN_config."coco_update.php");
 require_once(TECHNICAL_HOME.'/lib/autoload.php');
 
-
 class CoCointerface extends eduGAIN_core{
-   public function load_coco() {
-      $j = file_get_contents(COCO_URL.'/json.php?all_sps=true&attributes=id_status;entityID;status');
-      $e = json_decode($j);
-      foreach ($e as $r) 
-         if($r->id_status != NULL)
-            $this->CoCo[$r->entityID] = array('id'=>$r->id,'code'=>$r->id_status,'msg'=>$r->status);
+    public function load_coco() {
+        $j = file_get_contents(COCO_URL.'/json.php?all_sps=true&attributes=id_status;entityID;status');
+        $e = json_decode($j);
+        foreach ($e as $r) {
+            if($r->id_status != NULL) {
+                $this->CoCo[$r->entityID] = array('id'=>$r->id,'code'=>$r->id_status,'msg'=>$r->status);
+            }
+        }
    }
    public $CoCo;
 }
@@ -22,8 +23,8 @@ $q = "DELETE FROM coco_stat";
 $e->databaseQuery($q);
 
 foreach ($e->CoCo as $e_id => $s) {
-   $q = "INSERT into coco_stat (entityid,status,msg,coco_id) VALUES ('$e_id'," . $s['code'] . ", \"" . $s['msg'] . "\", " . $s['id'] . ")";
-   $e->databaseQuery($q);
+    $q = "INSERT into coco_stat (entityid,status,msg,coco_id) VALUES ('$e_id'," . $s['code'] . ", \"" . $s['msg'] . "\", " . $s['id'] . ")";
+    $e->databaseQuery($q);
 }
 
 ?>