Index: /extensions/LCAS/trunk/admin/LCAS_admin.php
===================================================================
--- /extensions/LCAS/trunk/admin/LCAS_admin.php (revision 9157)
+++ /extensions/LCAS/trunk/admin/LCAS_admin.php (revision 9158)
@@ -38,5 +38,5 @@
$version = $plugin['version'];
- if (isset($_POST['submit']) and isset($_POST['LCAS_Option']) and isset($_POST['LCAS_Mail']))
+ if (isset($_POST['submit']) and !is_adviser() and isset($_POST['LCAS_Option']) and isset($_POST['LCAS_Mail']))
{
@@ -45,13 +45,13 @@
// LCAS configuration is now hereby defined :
- // $conf_LCAS[0] : "final case", describe how LCAS should behave;
+ // $conf_LCAS[0] : spare // quite lazy, but convenient to not have to
+ // decrease index of each option below everywhere :-/ ...
// $conf_LCAS[1] : LCAS option, describe the choice of the webmaster;
// $conf_LCAS[2] : LCAS_Mail;
// $conf_LCAS[3] : LCAS_MailText.
$newconf_LCAS= array(
- LCAS_final_case($_POST['LCAS_Option']),
+ '', // quite lazy, but convenient to not have to
+ // decrease index of each option everywhere :-/ ...
$_POST['LCAS_Option'],
- // $_POST['LCAS__spare'] : quite lazy, but convenient to not have to
- // decrease index of each option below everywhere :-/ ...
$_POST['LCAS_Mail'],
$_POST['LCAS_MailText']);
@@ -72,16 +72,9 @@
$conf_LCAS= unserialize($conf['LoginCaseAccentsSensitivity']);
- $conf_LCAS[0] = LCAS_final_case($conf_LCAS[1]);
- if (isset($conf_LCAS[0]))
+ if (isset($conf_LCAS[1]))
{
- // $conf['insensitive_case_logon'] must be true or false when needed
- if ($conf_LCAS[0]=='4' or $conf_LCAS[0]=='5')
- array_push($page['errors'], l10n('LCAS_warning'));
- elseif ($conf_LCAS[0]=='6' or $conf_LCAS[0]=='7')
- array_push($page['errors'], l10n('LCAS_warning2'));
-
- $case_ins = (in_array($conf_LCAS[0], array('1', '3','6','7')));
- $acc_ins = (in_array($conf_LCAS[0], array('2', '5', '3','6','7')));
+ $case_ins = ($conf_LCAS[1] == '1' or $conf_LCAS[1] == '3');
+ $acc_ins = ($conf_LCAS[1] == '2' or $conf_LCAS[1] == '3');
if ($case_ins or $acc_ins)
@@ -128,5 +121,5 @@
// +-----------------------------------------------------------------------+
- $page['all_users'] = LCAS_get_user_list($conf_LCAS[0]);
+ $page['all_users'] = LCAS_get_user_list($conf_LCAS[1]);
// +-----------------------------------------------------------------------+
@@ -157,25 +150,5 @@
);
}
- /* Plugin version insert */
- $template->assign(
- array(
- 'LCAS_VERSION' => $version,
- 'LCAS_PATH' => LCAS_PATH,
- )
- );
-
-// +-----------------------------------------------------------------------+
-// | errors display |
-// +-----------------------------------------------------------------------+
- if ( isset ($errors) and count($errors) != 0)
- {
- $template->assign('errors',array());
- foreach ($errors as $error)
- {
- array_push($page['errors'], $error);
- }
- }
-
}
}
@@ -189,10 +162,8 @@
'LCAS_VERSION' => $version,
'LCAS_PATH' => LCAS_PATH,
- 'PWG_insensitive_case_logon' => ($conf['insensitive_case_logon']),
'Personalized_not_allowed' => (!isset($conf['LCAS_replacement_set'][0])),
- 'LCAS_final_case' => $conf_LCAS[0],
'LCAS_Option' => $conf_LCAS[1],
- 'LCAS_MAIL_TRUE' => $conf_LCAS[2]=='true' ? 'checked="checked"' : '' ,
- 'LCAS_MAIL_FALSE' => $conf_LCAS[2]=='false' ? 'checked="checked"' : '' ,
+ 'LCAS_MAIL_TRUE' => $conf_LCAS[2] == 'true' ? 'checked = "checked"' : '' ,
+ 'LCAS_MAIL_FALSE' => $conf_LCAS[2] == 'false' ? 'checked = "checked"' : '' ,
'LCAS_MAILTEXT' => $conf_LCAS[3]
)
Index: /extensions/LCAS/trunk/admin/template/global.tpl
===================================================================
--- /extensions/LCAS/trunk/admin/template/global.tpl (revision 9157)
+++ /extensions/LCAS/trunk/admin/template/global.tpl (revision 9158)
@@ -1,12 +1,16 @@
+{known_script id="jquery" src=$ROOT_URL|@cat:"themes/default/js/jquery.packed.js"}
+{known_script id="jquery.cluetip" src=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
+{known_script id="jquery.tablesorter" src=$LCAS_PATH|@cat:"admin/template/js/jquery.tablesorter.js"}
+{known_script id="jquery.tablesorter.pager" src=$LCAS_PATH|@cat:"admin/template/js/jquery.tablesorter.pager.js"}
+{*
{combine_script id="jquery" path=$ROOT_URL|@cat:"themes/default/js/jquery.js"}
{combine_script id="jquery.cluetip" path=$ROOT_URL|@cat:"themes/default/js/plugins/jquery.cluetip.packed.js"}
{combine_script id="jquery.tablesorter" path=$LCAS_PATH|@cat:"admin/template/js/jquery.tablesorter.js"}
{combine_script id="jquery.tablesorter.pager" path=$LCAS_PATH|@cat:"admin/template/js/jquery.tablesorter.pager.js"}
+*}
{html_head}{/html_head}