diff --git a/apps/user_ldap/templates/settings.php b/apps/user_ldap/templates/settings.php index 6a02b79525..811deada94 100644 --- a/apps/user_ldap/templates/settings.php +++ b/apps/user_ldap/templates/settings.php @@ -1,5 +1,7 @@ -
-
+ +

t('LDAP')); ?>

+ +
    $title) { ?>
    • diff --git a/settings/admin.php b/settings/admin.php index f77145e034..d58b9a597b 100644 --- a/settings/admin.php +++ b/settings/admin.php @@ -6,89 +6,117 @@ */ OC_Util::checkAdminUser(); +OC_App::setActiveNavigationEntry("admin"); -OCP\Util::addStyle('settings', 'settings'); -OCP\Util::addScript('settings', 'settings'); -OCP\Util::addScript( "settings", "admin" ); -OCP\Util::addScript( "settings", "log" ); -OCP\Util::addScript( 'core', 'multiselect' ); -OCP\Util::addScript('core', 'select2/select2'); -OCP\Util::addStyle('core', 'select2/select2'); -OCP\Util::addScript('core', 'setupchecks'); -OC_App::setActiveNavigationEntry( "admin" ); +$template = new OC_Template('settings', 'admin', 'user'); +$htAccessWorking = OC_Util::isHtaccessWorking(); -$tmpl = new OC_Template( 'settings', 'admin', 'user'); -$forms=OC_App::getForms('admin'); -$htaccessworking=OC_Util::isHtaccessWorking(); - -$entries=OC_Log_Owncloud::getEntries(3); -$entriesremain = count(OC_Log_Owncloud::getEntries(4)) > 3; +$entries = OC_Log_Owncloud::getEntries(3); +$entriesRemaining = count(OC_Log_Owncloud::getEntries(4)) > 3; $config = \OC::$server->getConfig(); +$appConfig = \OC::$server->getAppConfig(); // Should we display sendmail as an option? -$tmpl->assign('sendmail_is_available', (bool) findBinaryPath('sendmail')); +$template->assign('sendmail_is_available', (bool)findBinaryPath('sendmail')); -$tmpl->assign('loglevel', OC_Config::getValue( "loglevel", 2 )); -$tmpl->assign('mail_domain', OC_Config::getValue( "mail_domain", '' )); -$tmpl->assign('mail_from_address', OC_Config::getValue( "mail_from_address", '' )); -$tmpl->assign('mail_smtpmode', OC_Config::getValue( "mail_smtpmode", '' )); -$tmpl->assign('mail_smtpsecure', OC_Config::getValue( "mail_smtpsecure", '' )); -$tmpl->assign('mail_smtphost', OC_Config::getValue( "mail_smtphost", '' )); -$tmpl->assign('mail_smtpport', OC_Config::getValue( "mail_smtpport", '' )); -$tmpl->assign('mail_smtpauthtype', OC_Config::getValue( "mail_smtpauthtype", '' )); -$tmpl->assign('mail_smtpauth', OC_Config::getValue( "mail_smtpauth", false )); -$tmpl->assign('mail_smtpname', OC_Config::getValue( "mail_smtpname", '' )); -$tmpl->assign('mail_smtppassword', OC_Config::getValue( "mail_smtppassword", '' )); -$tmpl->assign('entries', $entries); -$tmpl->assign('entriesremain', $entriesremain); -$tmpl->assign('htaccessworking', $htaccessworking); -$tmpl->assign('isLocaleWorking', OC_Util::isSetLocaleWorking()); -$tmpl->assign('isPhpCharSetUtf8', OC_Util::isPhpCharSetUtf8()); -$tmpl->assign('isAnnotationsWorking', OC_Util::isAnnotationsWorking()); -$tmpl->assign('has_fileinfo', OC_Util::fileInfoLoaded()); -$tmpl->assign('old_php', OC_Util::isPHPoutdated()); -$tmpl->assign('backgroundjobs_mode', OC_Appconfig::getValue('core', 'backgroundjobs_mode', 'ajax')); -$tmpl->assign('cron_log', OC_Config::getValue('cron_log', true)); -$tmpl->assign('lastcron', OC_Appconfig::getValue('core', 'lastcron', false)); -$tmpl->assign('shareAPIEnabled', OC_Appconfig::getValue('core', 'shareapi_enabled', 'yes')); -$tmpl->assign('shareDefaultExpireDateSet', OC_Appconfig::getValue('core', 'shareapi_default_expire_date', 'no')); -$tmpl->assign('shareExpireAfterNDays', OC_Appconfig::getValue('core', 'shareapi_expire_after_n_days', '7')); -$tmpl->assign('shareEnforceExpireDate', OC_Appconfig::getValue('core', 'shareapi_enforce_expire_date', 'no')); -$excludeGroups = OC_Appconfig::getValue('core', 'shareapi_exclude_groups', 'no') === 'yes' ? true : false; -$tmpl->assign('shareExcludeGroups', $excludeGroups); -$excludedGroupsList = OC_Appconfig::getValue('core', 'shareapi_exclude_groups_list', ''); +$template->assign('loglevel', $config->getSystemValue("loglevel", 2)); +$template->assign('mail_domain', $config->getSystemValue("mail_domain", '')); +$template->assign('mail_from_address', $config->getSystemValue("mail_from_address", '')); +$template->assign('mail_smtpmode', $config->getSystemValue("mail_smtpmode", '')); +$template->assign('mail_smtpsecure', $config->getSystemValue("mail_smtpsecure", '')); +$template->assign('mail_smtphost', $config->getSystemValue("mail_smtphost", '')); +$template->assign('mail_smtpport', $config->getSystemValue("mail_smtpport", '')); +$template->assign('mail_smtpauthtype', $config->getSystemValue("mail_smtpauthtype", '')); +$template->assign('mail_smtpauth', $config->getSystemValue("mail_smtpauth", false)); +$template->assign('mail_smtpname', $config->getSystemValue("mail_smtpname", '')); +$template->assign('mail_smtppassword', $config->getSystemValue("mail_smtppassword", '')); +$template->assign('entries', $entries); +$template->assign('entriesremain', $entriesRemaining); +$template->assign('htaccessworking', $htAccessWorking); +$template->assign('isLocaleWorking', OC_Util::isSetLocaleWorking()); +$template->assign('isPhpCharSetUtf8', OC_Util::isPhpCharSetUtf8()); +$template->assign('isAnnotationsWorking', OC_Util::isAnnotationsWorking()); +$template->assign('has_fileinfo', OC_Util::fileInfoLoaded()); +$template->assign('old_php', OC_Util::isPHPoutdated()); +$template->assign('backgroundjobs_mode', $appConfig->getValue('core', 'backgroundjobs_mode', 'ajax')); +$template->assign('cron_log', $config->getSystemValue('cron_log', true)); +$template->assign('lastcron', $appConfig->getValue('core', 'lastcron', false)); +$template->assign('shareAPIEnabled', $appConfig->getValue('core', 'shareapi_enabled', 'yes')); +$template->assign('shareDefaultExpireDateSet', $appConfig->getValue('core', 'shareapi_default_expire_date', 'no')); +$template->assign('shareExpireAfterNDays', $appConfig->getValue('core', 'shareapi_expire_after_n_days', '7')); +$template->assign('shareEnforceExpireDate', $appConfig->getValue('core', 'shareapi_enforce_expire_date', 'no')); +$excludeGroups = $appConfig->getValue('core', 'shareapi_exclude_groups', 'no') === 'yes' ? true : false; +$template->assign('shareExcludeGroups', $excludeGroups); +$excludedGroupsList = $appConfig->getValue('core', 'shareapi_exclude_groups_list', ''); $excludedGroupsList = explode(',', $excludedGroupsList); // FIXME: this should be JSON! -$tmpl->assign('shareExcludedGroupsList', implode('|', $excludedGroupsList)); +$template->assign('shareExcludedGroupsList', implode('|', $excludedGroupsList)); // Check if connected using HTTPS -$tmpl->assign('isConnectedViaHTTPS', OC_Request::serverProtocol() === 'https'); -$tmpl->assign('enforceHTTPSEnabled', OC_Config::getValue( "forcessl", false)); +$template->assign('isConnectedViaHTTPS', OC_Request::serverProtocol() === 'https'); +$template->assign('enforceHTTPSEnabled', $config->getSystemValue("forcessl", false)); -// If the current webroot is non-empty but the webroot from the config is, +// If the current web root is non-empty but the web root from the config is, // and system cron is used, the URL generator fails to build valid URLs. -$shouldSuggestOverwriteWebroot = $config->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'cron' && +$shouldSuggestOverwriteWebRoot = $config->getAppValue('core', 'backgroundjobs_mode', 'ajax') === 'cron' && \OC::$WEBROOT && \OC::$WEBROOT !== '/' && !$config->getSystemValue('overwritewebroot', ''); -$tmpl->assign('suggestedOverwriteWebroot', ($shouldSuggestOverwriteWebroot) ? \OC::$WEBROOT : ''); +$suggestedOverwriteWebRoot = ($shouldSuggestOverwriteWebRoot) ? \OC::$WEBROOT : ''; +$template->assign('suggestedOverwriteWebroot', $suggestedOverwriteWebRoot); -$tmpl->assign('allowLinks', OC_Appconfig::getValue('core', 'shareapi_allow_links', 'yes')); -$tmpl->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired()); -$tmpl->assign('allowPublicUpload', OC_Appconfig::getValue('core', 'shareapi_allow_public_upload', 'yes')); -$tmpl->assign('allowResharing', OC_Appconfig::getValue('core', 'shareapi_allow_resharing', 'yes')); -$tmpl->assign('allowMailNotification', OC_Appconfig::getValue('core', 'shareapi_allow_mail_notification', 'no')); -$tmpl->assign('onlyShareWithGroupMembers', \OC\Share\Share::shareWithGroupMembersOnly()); -$tmpl->assign('forms', array()); -foreach($forms as $form) { - $tmpl->append('forms', $form); +$template->assign('allowLinks', $appConfig->getValue('core', 'shareapi_allow_links', 'yes')); +$template->assign('enforceLinkPassword', \OCP\Util::isPublicLinkPasswordRequired()); +$template->assign('allowPublicUpload', $appConfig->getValue('core', 'shareapi_allow_public_upload', 'yes')); +$template->assign('allowResharing', $appConfig->getValue('core', 'shareapi_allow_resharing', 'yes')); +$template->assign('allowMailNotification', $appConfig->getValue('core', 'shareapi_allow_mail_notification', 'no')); +$template->assign('onlyShareWithGroupMembers', \OC\Share\Share::shareWithGroupMembersOnly()); +$databaseOverload = (strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false); +$template->assign('databaseOverload', $databaseOverload); + + +// add hardcoded forms from the template +$forms = OC_App::getForms('admin'); +$l = OC_L10N::get('settings'); +$formsAndMore = array(); +if (OC_Request::serverProtocol() !== 'https' || !$htAccessWorking || !OC_Util::isAnnotationsWorking() || + $suggestedOverwriteWebRoot || !OC_Util::isSetLocaleWorking() || !OC_Util::isPhpCharSetUtf8() || + OC_Util::isPHPoutdated() || !OC_Util::fileInfoLoaded() || $databaseOverload +) { + $formsAndMore[] = array('anchor' => 'security-warning', 'section-name' => $l->t('Security & Setup Warnings')); } -$databaseOverload = (strpos(\OCP\Config::getSystemValue('dbtype'), 'sqlite') !== false); -$tmpl->assign('databaseOverload', $databaseOverload); +$formsMap = array_map(function ($form) { + if (preg_match('%(]*>.*?)%i', $form, $regs)) { + $sectionName = str_replace('

    ', '', $regs[0]); + $sectionName = str_replace('

    ', '', $sectionName); + $anchor = strtolower($sectionName); + $anchor = str_replace(' ', '-', $anchor); -$tmpl->printPage(); + return array( + 'anchor' => $anchor, + 'section-name' => $sectionName, + 'form' => $form + ); + } + return array( + 'form' => $form + ); +}, $forms); + +$formsAndMore = array_merge($formsAndMore, $formsMap); + +// add bottom hardcoded forms from the template +$formsAndMore[] = array('anchor' => 'backgroundjobs', 'section-name' => $l->t('Cron')); +$formsAndMore[] = array('anchor' => 'shareAPI', 'section-name' => $l->t('Sharing')); +$formsAndMore[] = array('anchor' => 'security', 'section-name' => $l->t('Security')); +$formsAndMore[] = array('anchor' => 'mail_general_settings', 'section-name' => $l->t('Email Server')); +$formsAndMore[] = array('anchor' => 'log-section', 'section-name' => $l->t('Log')); + +$template->assign('forms', $formsAndMore); + +$template->printPage(); /** - * Try to find a programm + * Try to find a program * * @param string $program * @return null|string diff --git a/settings/js/admin.js b/settings/js/admin.js index 09e8a1d691..e3a092f71b 100644 --- a/settings/js/admin.js +++ b/settings/js/admin.js @@ -3,7 +3,8 @@ $(document).ready(function(){ // Hack to add a trusted domain if (params.trustDomain) { - OC.dialogs.confirm(t('core', 'Are you really sure you want add "{domain}" as trusted domain?', {domain: params.trustDomain}), + OC.dialogs.confirm(t('core', 'Are you really sure you want add "{domain}" as trusted domain?', + {domain: params.trustDomain}), t('core', 'Add trusted domain'), function(answer) { if(answer) { $.ajax({ @@ -52,14 +53,13 @@ $(document).ready(function(){ }); $('#shareAPI input:not(#excludedGroups)').change(function() { + var value = $(this).val(); if ($(this).attr('type') === 'checkbox') { if (this.checked) { - var value = 'yes'; + value = 'yes'; } else { - var value = 'no'; + value = 'no'; } - } else { - var value = $(this).val(); } OC.AppConfig.setValue('core', $(this).attr('name'), value); }); diff --git a/settings/js/log.js b/settings/js/log.js index 197fef907a..46d1bfefd5 100644 --- a/settings/js/log.js +++ b/settings/js/log.js @@ -5,75 +5,77 @@ * See the COPYING-README file. */ -OC.Log={ - reload:function(count){ - if(!count){ - count=OC.Log.loaded; +/* global formatDate */ + +OC.Log = { + reload: function (count) { + if (!count) { + count = OC.Log.loaded; } - OC.Log.loaded=0; + OC.Log.loaded = 0; $('#log tbody').empty(); OC.Log.getMore(count); }, - levels:['Debug','Info','Warning','Error','Fatal'], - loaded:3,//are initially loaded - getMore:function(count){ + levels: ['Debug', 'Info', 'Warning', 'Error', 'Fatal'], + loaded: 3,//are initially loaded + getMore: function (count) { count = count || 10; - $.get(OC.filePath('settings','ajax','getlog.php'),{offset:OC.Log.loaded,count:count},function(result){ - if(result.status === 'success'){ + $.get(OC.filePath('settings', 'ajax', 'getlog.php'), {offset: OC.Log.loaded, count: count}, function (result) { + if (result.status === 'success') { OC.Log.addEntries(result.data); - if(!result.remain){ + if (!result.remain) { $('#moreLog').hide(); } $('#lessLog').show(); } }); }, - showLess:function(count){ + showLess: function (count) { count = count || 10; //calculate remaining items - at least 3 - OC.Log.loaded = Math.max(3,OC.Log.loaded-count); + OC.Log.loaded = Math.max(3, OC.Log.loaded - count); $('#moreLog').show(); // remove all non-remaining items $('#log tr').slice(OC.Log.loaded).remove(); - if(OC.Log.loaded <= 3) { + if (OC.Log.loaded <= 3) { $('#lessLog').hide(); } }, - addEntries:function(entries){ - for(var i=0;i'); - var levelTd=$(''); + addEntries: function (entries) { + for (var i = 0; i < entries.length; i++) { + var entry = entries[i]; + var row = $(''); + var levelTd = $(''); levelTd.text(OC.Log.levels[entry.level]); row.append(levelTd); - var appTd=$(''); + var appTd = $(''); appTd.text(entry.app); row.append(appTd); - var messageTd=$(''); + var messageTd = $(''); messageTd.text(entry.message); row.append(messageTd); - var timeTd=$(''); + var timeTd = $(''); timeTd.addClass('date'); - if(isNaN(entry.time)){ + if (isNaN(entry.time)) { timeTd.text(entry.time); } else { - timeTd.text(formatDate(entry.time*1000)); + timeTd.text(formatDate(entry.time * 1000)); } row.append(timeTd); $('#log').append(row); } OC.Log.loaded += entries.length; } -} +}; -$(document).ready(function(){ - $('#moreLog').click(function(){ +$(document).ready(function () { + $('#moreLog').click(function () { OC.Log.getMore(); - }) - $('#lessLog').click(function(){ + }); + $('#lessLog').click(function () { OC.Log.showLess(); - }) + }); }); diff --git a/settings/templates/admin.php b/settings/templates/admin.php index 2ea5d82490..f02dedbbc8 100644 --- a/settings/templates/admin.php +++ b/settings/templates/admin.php @@ -8,6 +8,16 @@ * @var array $_ * @var \OCP\IL10N $l */ + +style('settings', 'settings'); +script('settings', 'settings'); +script( "settings", "admin" ); +script( "settings", "log" ); +script( 'core', 'multiselect' ); +script('core', 'select2/select2'); +style('core', 'select2/select2'); +script('core', 'setupchecks'); + $levels = array('Debug', 'Info', 'Warning', 'Error', 'Fatal'); $levelLabels = array( $l->t( 'Everything (fatal issues, errors, warnings, info, debug)' ), @@ -40,9 +50,23 @@ if ($_['sendmail_is_available']) { if ($_['mail_smtpmode'] == 'qmail') { $mail_smtpmode[] = 'qmail'; } - ?> +
    +
      + %s", OC_Util::sanitizeHTML($anchor), OC_Util::sanitizeHTML($sectionName))); + } + }?> +
    +
    + +
    + +
    @@ -193,10 +216,12 @@ if ($_['suggestedOverwriteWebroot']) { ?>
    - +
+ +
+

t('Cron'));?>

@@ -419,7 +444,7 @@ if ($_['suggestedOverwriteWebroot']) {
-
+

t('Log'));?>

t('Log level'));?>