kienan
/
AlternC
mirror of https://github.com/kienanstewart/AlternC.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Deux corrections

This commit is contained in:
Alan Garcia 2014-01-21 17:24:27 +00:00
parent f81924c72c
commit ee88b4b77d
2 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bureau/admin/adm_var_edit.php
View File

@ -110,6 +110,7 @@ foreach ( $variables->strata_order as $strata) {
break; break;
case 'FQDN_CREATOR': case 'FQDN_CREATOR':
echo "<td>"; echo "<td>";
if (isset($allvars['FQDN_CREATOR']) && is_array($allvars['FQDN_CREATOR'])) {
foreach ($allvars['FQDN_CREATOR'] as $ttk => $ttv ) { foreach ($allvars['FQDN_CREATOR'] as $ttk => $ttv ) {
if ( isset($ttv[$var]) && is_array( $ttv[$var])) { if ( isset($ttv[$var]) && is_array( $ttv[$var])) {
echo sprintf(_("Overwritted by %s"), $members[$ttk]['login'])." &rarr; "; echo sprintf(_("Overwritted by %s"), $members[$ttk]['login'])." &rarr; ";
@ -118,12 +119,14 @@ foreach ( $variables->strata_order as $strata) {
} }
echo "<br/>"; echo "<br/>";
} }
} // isset
echo "<a href='javascript:add_var(\"$strata\");'>"._("Add")."</a>"; echo "<a href='javascript:add_var(\"$strata\");'>"._("Add")."</a>";
add_var($strata, $members_list); add_var($strata, $members_list);
echo "</td>"; echo "</td>";
break; break;
case 'FQDN': case 'FQDN':
echo "<td>"; echo "<td>";
if ( isset($allvars['FQDN']) && is_array($allvars['FQDN'])) {
foreach ($allvars['FQDN'] as $ttk => $ttv ) { foreach ($allvars['FQDN'] as $ttk => $ttv ) {
if ( isset($ttv[$var]) && is_array( $ttv[$var])) { if ( isset($ttv[$var]) && is_array( $ttv[$var])) {
echo sprintf(_("Overwritted by %s"), $panel_url[$ttk])." &rarr; "; echo sprintf(_("Overwritted by %s"), $panel_url[$ttk])." &rarr; ";
@ -132,12 +135,14 @@ foreach ( $variables->strata_order as $strata) {
} }
echo "<br/>"; echo "<br/>";
} }
} //isset
echo "<a href='javascript:add_var(\"$strata\");'>"._("Add")."</a>"; echo "<a href='javascript:add_var(\"$strata\");'>"._("Add")."</a>";
add_var($strata, $panel_url); add_var($strata, $panel_url);
echo "</td>"; echo "</td>";
break; break;
case 'CREATOR': case 'CREATOR':
echo "<td>"; echo "<td>";
if (isset($allvars['CREATOR']) && is_array($allvars['CREATOR'])) {
foreach ($allvars['CREATOR'] as $ttk => $ttv ) { foreach ($allvars['CREATOR'] as $ttk => $ttv ) {
if ( isset($ttv[$var]) && is_array( $ttv[$var])) { if ( isset($ttv[$var]) && is_array( $ttv[$var])) {
echo sprintf(_("Overwritted by %s"), $members[$ttk]['login'])." &rarr; "; echo sprintf(_("Overwritted by %s"), $members[$ttk]['login'])." &rarr; ";
@ -146,12 +151,14 @@ foreach ( $variables->strata_order as $strata) {
} }
echo "<br/>"; echo "<br/>";
} }
} //isset
echo "<a href='javascript:add_var(\"$strata\");'>"._("Add")."</a>"; echo "<a href='javascript:add_var(\"$strata\");'>"._("Add")."</a>";
add_var($strata, $creators_list ); add_var($strata, $creators_list );
echo "</td>"; echo "</td>";
break; break;
case 'MEMBER': case 'MEMBER':
echo "<td>"; echo "<td>";
if (isset($allvars['MEMBER']) && is_array($allvars['MEMBER'])) {
foreach ($allvars['MEMBER'] as $ttk => $ttv ) { foreach ($allvars['MEMBER'] as $ttk => $ttv ) {
if ( isset($ttv[$var]) && is_array( $ttv[$var])) { if ( isset($ttv[$var]) && is_array( $ttv[$var])) {
echo sprintf(_("Overwritted by %s"), $members[$ttk]['login'])." &rarr; "; echo sprintf(_("Overwritted by %s"), $members[$ttk]['login'])." &rarr; ";
@ -160,6 +167,7 @@ foreach ( $variables->strata_order as $strata) {
} }
echo "<br/>"; echo "<br/>";
} }
} //isset
echo "<a href='javascript:add_var(\"$strata\");'>"._("Add")."</a>"; echo "<a href='javascript:add_var(\"$strata\");'>"._("Add")."</a>";
add_var($strata, $members_list); add_var($strata, $members_list);
echo "</td>"; echo "</td>";

2
bureau/class/m_variables.php
View File

@ -163,7 +163,7 @@ class m_variables {
if (isset($conf[$name])) { if (isset($conf[$name])) {
return $conf[$name]['value']; return $conf[$name]['value'];
} elseif (!is_null($createit_comment)) { } elseif (!is_null($createit_comment)) {
$this->variable_update_or_create($name, $default, 'DEFAULT', null, null, $createit_comment); $this->variable_update_or_create($name, $default, 'DEFAULT', 'null', 'null', $createit_comment);
} }
return $default; return $default;
} }