aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2007-05-16 05:10:12 +0000
committerrvelices <rv-github@modusoptimus.com>2007-05-16 05:10:12 +0000
commit9c856a2fd0341ca710b2f0befb3289ac797d64d2 (patch)
treeef9e9ffe3f5ff887bfdfa1f380e334043e144054
parent35858a70a0b9518d3395b4a0883381b8804281cd (diff)
merge svn 2016 from trunk to branch-1_7
admin multi view improvement: allow admins to change conf['show_queries'] and conf['debug_l10n'] for their session ... git-svn-id: http://piwigo.org/svn/branches/branch-1_7@2017 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--plugins/admin_multi_view/controller.php42
-rw-r--r--plugins/admin_multi_view/is_admin.inc.php5
2 files changed, 47 insertions, 0 deletions
diff --git a/plugins/admin_multi_view/controller.php b/plugins/admin_multi_view/controller.php
index ee4dec452..32ad18b88 100644
--- a/plugins/admin_multi_view/controller.php
+++ b/plugins/admin_multi_view/controller.php
@@ -8,6 +8,8 @@ if (!is_admin() or !function_exists('multiview_user_init') )
pwg_unset_session_var( 'multiview_as' );
pwg_unset_session_var( 'multiview_theme' );
pwg_unset_session_var( 'multiview_lang' );
+ pwg_unset_session_var( 'multiview_show_queries' );
+ pwg_unset_session_var( 'multiview_debug_l10n' );
?>
<script type="text/javascript">
window.close();
@@ -43,6 +45,24 @@ if ( isset($_GET['lang']) )
$refresh_main = true;
}
+if ( isset($_GET['show_queries']) )
+{
+ if ( $_GET['show_queries']> 0 )
+ pwg_set_session_var( 'multiview_show_queries', 1 );
+ else
+ pwg_unset_session_var( 'multiview_show_queries' );
+ $refresh_main = true;
+}
+
+if ( isset($_GET['debug_l10n']) )
+{
+ if ( $_GET['debug_l10n']>0 )
+ pwg_set_session_var( 'multiview_debug_l10n', 1 );
+ else
+ pwg_unset_session_var( 'multiview_debug_l10n' );
+ $refresh_main = true;
+}
+
$my_url = get_root_url().'plugins/'.basename(dirname(__FILE__)).'/'.basename(__FILE__);
$my_theme = get_root_url().'template/'.$user['template'].'/theme/'.$user['theme'].'/theme.css';
@@ -71,6 +91,26 @@ foreach (get_languages() as $language_code => $language_name)
.'</option>';
}
$lang_html .= '</select>';
+
+$show_queries_html='';
+if (!$conf['show_queries'])
+{
+ $show_queries_html = '<br/>';
+ if ( !pwg_get_session_var( 'multiview_show_queries', 0 ) )
+ $show_queries_html.='<a href="'.$my_url.'?show_queries=1">Show SQL queries</a>';
+ else
+ $show_queries_html.='<a href="'.$my_url.'?show_queries=0">Hide SQL queries</a>';
+}
+
+$debug_l10n_html='';
+if (!$conf['show_queries'])
+{
+ $debug_l10n_html = '<br/>';
+ if ( !pwg_get_session_var( 'multiview_debug_l10n', 0 ) )
+ $debug_l10n_html.='<a href="'.$my_url.'?debug_l10n=1">Debug language</a>';
+ else
+ $debug_l10n_html.='<a href="'.$my_url.'?debug_l10n=0">Revert debug language</a>';
+}
?>
<html>
@@ -103,6 +143,8 @@ View as:
<br />
<?php echo $lang_html; ?>
+<?php echo $show_queries_html; ?>
+<?php echo $debug_l10n_html; ?>
<script type="text/javascript">
<?php
diff --git a/plugins/admin_multi_view/is_admin.inc.php b/plugins/admin_multi_view/is_admin.inc.php
index 78f68eef1..0f85c5e0d 100644
--- a/plugins/admin_multi_view/is_admin.inc.php
+++ b/plugins/admin_multi_view/is_admin.inc.php
@@ -17,6 +17,11 @@ if (! defined('MULTIVIEW_CONTROLLER') )
{
$user['language'] = $lang;
}
+ global $conf;
+ if (pwg_get_session_var( 'multiview_show_queries', 0 ))
+ $conf['show_queries'] = true;
+ if (pwg_get_session_var( 'multiview_debug_l10n', 0 ))
+ $conf['debug_l10n'] = true;
}
add_event_handler('loc_end_page_header', 'multiview_loc_end_page_header');