syntaxe POO (visibilite) et maj indentation

[mw_sourceml] / app / data / modules / xml / sml_data_licences.php

diff --git a/app/data/modules/xml/sml_data_licences.php b/app/data/modules/xml/sml_data_licences.php
index 0953652..af85667 100644 (file)
--- a/app/data/modules/xml/sml_data_licences.php
+++ b/app/data/modules/xml/sml_data_licences.php
@@ -1,22 +1,21 @@
 <?php
 
-  class sml_data_licences extends mw_data
-  {
+  class sml_data_licences extends mw_data{
 
-    function licences($start = null)
-    { $sgbd = $this->sgbd();
+    public function licences($start = null){
+      $sgbd = $this->sgbd();
       $env = $this->env();
       $licences = array("list" => array(), "total" => 0);
-      if($rst = $sgbd->open_data("sml_licences"))
-      { while($v_rst = $sgbd->fetch_data($rst))
-        { if(isset($v_rst))
-          { $licences["total"]++;
-            if(!isset($start) || !$env->config("max_list") || ($licences["total"] > $start && $licences["total"] < ($start + $env->config("max_list"))))
-            { $licences["list"][$v_rst["id"]] = $v_rst;
+      if($rst = $sgbd->open_data("sml_licences")){
+        while($v_rst = $sgbd->fetch_data($rst)){
+          if(isset($v_rst)){
+            $licences["total"]++;
+            if(!isset($start) || !$env->config("max_list") || ($licences["total"] > $start && $licences["total"] < ($start + $env->config("max_list")))){
+              $licences["list"][$v_rst["id"]] = $v_rst;
             }
           }
-          else
-          { $licences = false;
+          else{
+            $licences = false;
             break;
           }
         }
@@ -26,33 +25,33 @@
       return $licences;
     }
 
-    function licence($id)
-    { if($id == 0) return $id;
+    public function licence($id){
+      if($id == 0) return $id;
       $sgbd = $this->sgbd();
       return $sgbd->get_data("sml_licences", $id);
     }
 
-    function add_licence($nom, $url)
-    { $sgbd = $this->sgbd();
-      return $sgbd->add_data
-      ( "sml_licences",
-        array
-        ( "nom" => $nom,
+    public function add_licence($nom, $url){
+      $sgbd = $this->sgbd();
+      return $sgbd->add_data(
+        "sml_licences",
+        array(
+          "nom" => $nom,
           "url" => $url
         )
       );
     }
 
-    function set_licence($id, $nom, $url)
-    { if(($licence = $this->licence($id)) !== false)
-      { $sgbd = $this->sgbd();
-        if($nom != $licence["nom"] || $url != $licence["url"])
-        { $licence["nom"] = $nom;
+    public function set_licence($id, $nom, $url){
+      if(($licence = $this->licence($id)) !== false){
+        $sgbd = $this->sgbd();
+        if($nom != $licence["nom"] || $url != $licence["url"]){
+          $licence["nom"] = $nom;
           $licence["url"] = $url;
           if(!$this->maj_source_xml_licence($licence)) return false;
         }
-        return $sgbd->set_data
-        ( "sml_licences",
+        return $sgbd->set_data(
+          "sml_licences",
           $id,
           array
           ( "nom" => $nom,
@@ -63,34 +62,32 @@
       return false;
     }
 
-    function del_licence($id)
-    { $OK = true;
+    public function del_licence($id){
+      $OK = true;
       $USED = false;
       $sgbd = $this->sgbd();
       $env = $this->env();
-      if($rst = $sgbd->open_data("sml_sources"))
-      { while($source = $sgbd->fetch_data($rst))
-        { if(isset($source))
-          { if($source["licence"] == $id)
-            { $USED = true;
+      if($rst = $sgbd->open_data("sml_sources")){
+        while($source = $sgbd->fetch_data($rst)){
+          if(isset($source)){
+            if($source["licence"] == $id){
+              $USED = true;
               break;
             }
           }
-          else
-          { $OK = false;
+          else{
+            $OK = false;
             break;
           }
         }
         $sgbd->close_data($rst);
       }
       else $OK = false;
-      if($OK)
-      { if($USED) return 1;
+      if($OK){
+        if($USED) return 1;
         return $sgbd->del_data("sml_licences", $id) ? true : false;
       }
       return false;
     }
 
   }
-
-?>
\ No newline at end of file