Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #27231 #27237

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/private/legacy/util.php
Original file line number Diff line number Diff line change
Expand Up @@ -396,7 +396,7 @@ public static function getEditionString() {
if (OC_App::isEnabled('enterprise_key')) {
return "Enterprise";
} else {
return "";
return "Non-Enterprise";
}

}
Expand Down
7 changes: 7 additions & 0 deletions settings/css/settings.css
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@ input#openid, input#webdav { width:20em; }

/* PERSONAL */

#general {
margin-left: 50px;
width: 50%;
font-family: 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif;
color: #444;
margin-bottom: 20px;
}
#avatar {
display: inline-block;
float: left;
Expand Down
51 changes: 51 additions & 0 deletions settings/templates/panels/personal/profile.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,57 @@
vendor_style('jcrop/css/jquery.Jcrop');
}
?>

<h2 class="app-name section" id="general_heading"><?php p($l->t('General Details')); ?></h2>
<?php

try {
$systemConfig = \OC::$server->getSystemConfig();

$installed = (bool) $systemConfig->getValue('installed', false);
$maintenance = (bool) $systemConfig->getValue('maintenance', false);
# see core/lib/private/legacy/defaults.php and core/themes/example/defaults.php
# for description and defaults
$defaults = new \OCP\Defaults();
$values= [
'Installed'=>$installed,
'Maintenance Mode' => $maintenance,
'Database Upgrade' => \OCP\Util::needUpgrade(),
'Version'=>implode('.', \OCP\Util::getVersion()),
'Version String'=>OC_Util::getVersionString(),
'Edition'=>OC_Util::getEditionString(),
'Product Name'=>$defaults->getName()];
if (OC::$CLI) {
print_r($values);
} else {
echo "<table width=\"30%\" id=\"general\" >";

foreach ($values as $key => $val) {
echo "<tr>";
echo "<td>" . $key . "</td>";
echo "<td>";
if(!$val) {
if($key == "Database Upgrade") echo 'Not Required';
else if($key == 'Maintenance Mode') echo 'Off';
else echo 'No';
}
else {
if($key == "Database Upgrade") echo 'Required';
else if($key == 'Maintenance Mode') echo 'On';
else if($key == 'Installed') echo 'Yes';
else echo $val;
}
echo "</td>";
}
echo "</table>";
}

} catch (Exception $ex) {
OC_Response::setStatus(OC_Response::STATUS_INTERNAL_SERVER_ERROR);
\OCP\Util::writeLog('remote', $ex->getMessage(), \OCP\Util::FATAL);
}
?>

<?php if ($_['enableAvatars']): ?>
<form id="avatar" class="section" method="post" action="<?php p(\OC::$server->getURLGenerator()->linkToRoute('core.avatar.postAvatar')); ?>">
<h2 class="app-name"><?php p($l->t('Profile picture')); ?></h2>
Expand Down
2 changes: 1 addition & 1 deletion version.php
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
// We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
// between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
// when updating major/minor version number.
$OC_Version = [10, 0, 0, 0];
$OC_Version = [10, 0, 0, 1];

// The human readable string
$OC_VersionString = '10.0.0';
Expand Down