projects
/
mw_sourceml
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
titre du site par defaut
[mw_sourceml]
/
app
/
controllers
/
users
/
morceaux.php
diff --git
a/app/controllers/users/morceaux.php
b/app/controllers/users/morceaux.php
index
092da62
..
9bf2fdf
100644
(file)
--- a/
app/controllers/users/morceaux.php
+++ b/
app/controllers/users/morceaux.php
@@
-2,13
+2,12
@@
class mw_users_morceaux extends mw_controller{
class mw_users_morceaux extends mw_controller{
- var $user;
+ public $user;
+ public $status;
+ public $album_status_id;
+ public $morceau_status_id;
- var $status;
- var $album_status_id;
- var $morceau_status_id;
-
- function validate(){
+ public function validate(){
$env = $this->env();
$data = $env->data();
if(($this->status = $data->source_status()) === false){
$env = $this->env();
$data = $env->data();
if(($this->status = $data->source_status()) === false){
@@
-29,7
+28,7
@@
return true;
}
return true;
}
- function index(){
+
public
function index(){
$env = $this->env();
$data = $env->data();
if(($groupes = $data->groupes($this->user["id"])) === false){
$env = $this->env();
$data = $env->data();
if(($groupes = $data->groupes($this->user["id"])) === false){
@@
-105,7
+104,7
@@
$env->set_out("morceaux", $morceaux);
}
$env->set_out("morceaux", $morceaux);
}
- function add(){
+
public
function add(){
$env = $this->env();
$data = $env->data();
$morceau = $data->empty_source();
$env = $this->env();
$data = $env->data();
$morceau = $data->empty_source();
@@
-261,7
+260,7
@@
}
}
$env->redirect(
}
}
$env->redirect(
- $env->url("users/morceaux
"
),
+ $env->url("users/morceaux
/edit", array("id" => $id_source)
),
"le morceau a été ajouté"
);
}
"le morceau a été ajouté"
);
}
@@
-275,7
+274,7
@@
$env->set_out("album", $album);
}
$env->set_out("album", $album);
}
- function edit(){
+
public
function edit(){
$env = $this->env();
$data = $env->data();
if(($groupes = $data->groupes($this->user["id"])) === false){
$env = $this->env();
$data = $env->data();
if(($groupes = $data->groupes($this->user["id"])) === false){
@@
-324,7
+323,10
@@
$env->erreur("Impossible de lire la liste des compositions");
return;
}
$env->erreur("Impossible de lire la liste des compositions");
return;
}
- if($compositions) foreach($compositions[$morceau["id"]] as $id_album) { $morceau["album"] = $id_album; break; }
+ if($compositions) foreach($compositions[$morceau["id"]] as $id_album){
+ $morceau["album"] = $id_album;
+ break;
+ }
if($_POST){
$source_infos = array(
"date_inscription" => $_POST["date_inscription"],
if($_POST){
$source_infos = array(
"date_inscription" => $_POST["date_inscription"],
@@
-472,7
+474,7
@@
$env->set_out("morceau", $morceau);
}
$env->set_out("morceau", $morceau);
}
- function maj_xml(){
+
public
function maj_xml(){
$env = $this->env();
$data = $env->data();
if(!($morceau = $data->source($_GET[$env->param("id")], true))){
$env = $this->env();
$data = $env->data();
if(!($morceau = $data->source($_GET[$env->param("id")], true))){
@@
-535,7
+537,7
@@
$env->run("users/morceaux/edit", array("get" => array("id" => $morceau["id"])));
}
$env->run("users/morceaux/edit", array("get" => array("id" => $morceau["id"])));
}
- function del(){
+
public
function del(){
$env = $this->env();
$data = $env->data();
if(!($morceau = $data->source($_GET[$env->param("id")], true))){
$env = $this->env();
$data = $env->data();
if(!($morceau = $data->source($_GET[$env->param("id")], true))){
@@
-557,7
+559,7
@@
);
}
);
}
- function groupes(){
+
public
function groupes(){
$env = $this->env();
if(
!($sources_invitations_controller = $env->get_controller("users/sources_invitations"))
$env = $this->env();
if(
!($sources_invitations_controller = $env->get_controller("users/sources_invitations"))
@@
-570,5
+572,3
@@
}
}
}
}
-
-?>
\ No newline at end of file