Overview
SHA1:32b28be4a7cd64e5dee8283c272874f44240fc2a
Date: 2013-07-11 10:38:45
User: bohwaz
Comment:Merge stable
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | folders | manifest
Tags And Properties
Context
2013-07-27
12:20
[5112ee854a] Déplacement du code dans src/ (user: bohwaz, tags: trunk)
2013-07-11
10:38
[32b28be4a7] Merge stable (user: bohwaz, tags: trunk)
10:38
[8cc2a9c58f] Correction bug signalé par @arf où une modification d'une fiche avec des champs privés remplis par un non-admin vidait les champs privés (user: bohwaz, tags: stable, 0.5.6)
2013-06-19
12:27
[f8af42f2cf] Merge stable vers trunk (user: bohwaz, tags: trunk)
Changes

Modified VERSION from [9c88ba14fc] to [7d37a34280].

1
0.5.5
|
1
0.5.6

Modified www/admin/membres/modifier.php from [9f896b92ba] to [703c696499].

48
49
50
51
52
53
54






55
56
57
58
59
60
61
    else
    {
        try {
            $data = array();

            foreach ($champs->getAll() as $key=>$config)
            {






                $data[$key] = utils::post($key);
            }

            if ($user['droits']['membres'] == Membres::DROIT_ADMIN)
            {
                $data['id_categorie'] = utils::post('id_categorie');
                $data['id'] = utils::post('id');







>
>
>
>
>
>







48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
    else
    {
        try {
            $data = array();

            foreach ($champs->getAll() as $key=>$config)
            {
                // do not edit private fields when you're not allowed to
                if (!empty($config['private']) && $user['droits']['membres'] < Membres::DROIT_ADMIN)
                {
                    continue;
                }
                
                $data[$key] = utils::post($key);
            }

            if ($user['droits']['membres'] == Membres::DROIT_ADMIN)
            {
                $data['id_categorie'] = utils::post('id_categorie');
                $data['id'] = utils::post('id');