Skip to content
Snippets Groups Projects
Commit d9372ac7 authored by Robin Appelman's avatar Robin Appelman
Browse files

make log level configurable

parent 820cd0fb
No related branches found
No related tags found
No related merge requests found
...@@ -225,10 +225,7 @@ class OC_App{ ...@@ -225,10 +225,7 @@ class OC_App{
// admin log menu // admin log menu
$settings[] = array( "id" => "core_log", "order" => 4, "href" => OC_Helper::linkTo( "settings", "log.php" ), "name" => $l->t("Log"), "icon" => OC_Helper::imagePath( "log", "apps.svg" )); $settings[] = array( "id" => "core_log", "order" => 4, "href" => OC_Helper::linkTo( "settings", "log.php" ), "name" => $l->t("Log"), "icon" => OC_Helper::imagePath( "log", "apps.svg" ));
// if there're some admin forms $settings[]=array( "id" => "admin", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "admin.php" ), "name" => $l->t("Admin"), "icon" => OC_Helper::imagePath( "settings", "admin.svg" ));
if(!empty(self::$adminForms))
// admins menu
$settings[]=array( "id" => "admin", "order" => 1000, "href" => OC_Helper::linkTo( "settings", "admin.php" ), "name" => $l->t("Admin"), "icon" => OC_Helper::imagePath( "settings", "admin.svg" ));
} }
} }
......
...@@ -9,10 +9,12 @@ require_once('../lib/base.php'); ...@@ -9,10 +9,12 @@ require_once('../lib/base.php');
OC_Util::checkAdminUser(); OC_Util::checkAdminUser();
OC_Util::addStyle( "settings", "settings" ); OC_Util::addStyle( "settings", "settings" );
OC_Util::addScript( "settings", "admin" );
OC_App::setActiveNavigationEntry( "admin" ); OC_App::setActiveNavigationEntry( "admin" );
$tmpl = new OC_Template( 'settings', 'admin', 'user'); $tmpl = new OC_Template( 'settings', 'admin', 'user');
$forms=OC_App::getForms('admin'); $forms=OC_App::getForms('admin');
$tmpl->assign('loglevel',OC_Config::getValue( "loglevel", 2 ));
$tmpl->assign('forms',array()); $tmpl->assign('forms',array());
foreach($forms as $form){ foreach($forms as $form){
$tmpl->append('forms',$form); $tmpl->append('forms',$form);
......
<?php
/**
* Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
* This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file.
*/
require_once('../../lib/base.php');
OC_Util::checkAdminUser();
OC_Config::setValue( 'loglevel', $_POST['level'] );
echo 'true';
?>
\ No newline at end of file
$(document).ready(function(){
$('#loglevel').change(function(){
$.post(OC.filePath('settings','ajax','setloglevel.php'), { level: $(this).val() } );
})
});
\ No newline at end of file
...@@ -2,8 +2,21 @@ ...@@ -2,8 +2,21 @@
* Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com> * Copyright (c) 2011, Robin Appelman <icewind1991@gmail.com>
* This file is licensed under the Affero General Public License version 3 or later. * This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file. * See the COPYING-README file.
*/?> */
$levels=array('Debug','Info','Warning','Error','Fatal');
?>
<?php foreach($_['forms'] as $form){ <?php foreach($_['forms'] as $form){
echo $form; echo $form;
};?> };?>
\ No newline at end of file <fieldset class="personalblock">
<legend><strong><?php echo $l->t('Log level');?></strong></legend>
<select name='loglevel' id='loglevel'>
<option value='<?php echo $_['loglevel']?>'><?php echo $levels[$_['loglevel']]?></option>
<?php for($i=0;$i<5;$i++):
if($i!=$_['loglevel']):?>
<option value='<?php echo $i?>'><?php echo $levels[$i]?></option>
<?php endif;
endfor;?>
</select>
</fieldset>
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
* This file is licensed under the Affero General Public License version 3 or later. * This file is licensed under the Affero General Public License version 3 or later.
* See the COPYING-README file. * See the COPYING-README file.
*/ */
$levels=array('DEBUG','INFO','WARN','ERROR','FATAL'); $levels=array('Debug','Info','Warning','Error','Fatal');
?> ?>
<div id="controls"> <div id="controls">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment