mbirth/LuckyCoinkydink
1
0
Fork 0
Code Issues Pull Requests Activity

installer and upgrader hardcoded markup notices (no fallback)

Browse Source
This commit is contained in:
Ian 2012-03-26 14:28:49 +02:00
parent b718e9714e
commit 92638f3426
4 changed files with 10 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
include/admin/installer.inc.php
View File

@ -40,19 +40,19 @@ $data['basedir'] = $basedir;
* @return string returned String
*/
function serendipity_installerResultDiagnose($result, $s) {
global $errorCount;
global $errorCount, $data;
if ( $result === S9Y_I_SUCCESS ) {
$data['i_success'] = true;
return '<span class="serendipityAdminMsgSuccessInstall" style="color: green; font-weight: bold">'. $s .'</span>';
$data['i_success'] = true; // we dont need data here explicitely, but we keep it for possible future purposes
return '<span class="msg_success">'. $s .'</span>';
}
if ( $result === S9Y_I_WARNING ) {
$data['i_warning'] = true;
return '<span class="serendipityAdminMsgWarningInstall" style="color: orange; font-weight: bold">'. $s .' [?]</span>';
return '<span class="msg_notice">'. $s .' [?]</span>';
}
if ( $result === S9Y_I_ERROR ) {
$errorCount++;
$data['i_error'] = true;
return '<span class="serendipityAdminMsgErrorInstall" style="color: red; font-weight: bold">'. $s .' [!]</span>';
return '<span class="msg_error">'. $s .' [!]</span>';
}
}

11
include/admin/tpl/installer.inc.tpl
View File

@ -1,14 +1,3 @@
{** please return correct markup for these serendipity_installerResultDiagnose notices in the upper PHP file
{if $i_success}
return '<span class="serendipityAdminMsgSuccessInstall" style="color: green; font-weight: bold">'. $s .'</span>';
{/if}
{if $i_warning}
return '<span class="serendipityAdminMsgWarningInstall" style="color: orange; font-weight: bold">'. $s .' [?]</span>';
{/if}
{if $i_error}
return '<span class="serendipityAdminMsgErrorInstall" style="color: red; font-weight: bold">'. $s .' [!]</span>';
{/if}
**}
{* From configuration to install *}
{if ( sizeof($smarty.post) > 1 && $s9yGETstep == 3 )}

12
include/admin/tpl/upgrader.inc.tpl
View File

@ -1,15 +1,3 @@
{** please return correct markup for these serendipity_upgraderResultDiagnose notices in the upper PHP file
{if $u_success}
return '<span class="serendipityAdminMsgSuccessInstall" style="color: green; font-weight: bold">'. $s .'</span>';
{/if}
{if $u_warning}
return '<span class="serendipityAdminMsgWarningInstall" style="color: orange; font-weight: bold">'. $s .'</span>';
{/if}
{if $u_error}
return '<span class="serendipityAdminMsgErrorInstall" style="color: red; font-weight: bold">'. $s .'</span>';
{/if}
**}
{if $task_function}
{'Calling %s ...<br />'|sprintf:(is_array($task['function']) ? $task['function'][0] . '::'. $task['function'][1] : $task['function'])}
{/if}

10
include/admin/upgrader.inc.php
View File

@ -23,22 +23,22 @@ define('S9Y_U_SUCCESS', 1);
* @return string returned String
*/
function serendipity_upgraderResultDiagnose($result, $s) {
global $errorCount;
global $errorCount, $data;
if ( $result === S9Y_U_SUCCESS ) {
$data['u_success'] = true;
return '<span class="serendipityAdminMsgSuccessInstall" style="color: green; font-weight: bold">'. $s .'</span>';
$data['u_success'] = true; // we dont need data here explicitely, but we keep it for possible future purposes
return '<span class="msg_success">'. $s .'</span>';
}
if ( $result === S9Y_U_WARNING ) {
$data['u_warning'] = true;
return '<span class="serendipityAdminMsgWarningInstall" style="color: orange; font-weight: bold">'. $s .'</span>';
return '<span class="msg_notice">'. $s .'</span>';
}
if ( $result === S9Y_U_ERROR ) {
$errorCount++;
$data['u_error'] = true;
return '<span class="serendipityAdminMsgErrorInstall" style="color: red; font-weight: bold">'. $s .'</span>';
return '<span class="msg_error">'. $s .'</span>';
}
}