[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpcompta-dev] r5385 - in phpcompta/trunk: html html/js include
From: |
phpcompta-dev |
Subject: |
[Phpcompta-dev] r5385 - in phpcompta/trunk: html html/js include |
Date: |
Sun, 15 Sep 2013 20:31:37 +0200 (CEST) |
Author: danydb
Date: 2013-09-15 20:31:37 +0200 (Sun, 15 Sep 2013)
New Revision: 5385
Modified:
phpcompta/trunk/html/ajax_misc.php
phpcompta/trunk/html/js/scripts.js
phpcompta/trunk/html/user_login.php
phpcompta/trunk/include/ajax_preference.php
phpcompta/trunk/include/class_user.php
Log:
Preference are now in a internal windows
Modified: phpcompta/trunk/html/ajax_misc.php
===================================================================
--- phpcompta/trunk/html/ajax_misc.php 2013-09-15 18:09:33 UTC (rev 5384)
+++ phpcompta/trunk/html/ajax_misc.php 2013-09-15 18:31:37 UTC (rev 5385)
@@ -65,7 +65,9 @@
$g_user = new User($cn);
$g_user->check(true);
$g_user->check_dossier($gDossier, true);
-$g_parameter=new Own($cn);
+if ($gDossier<>0) {
+ $g_parameter=new Own($cn);
+}
$html = var_export($_REQUEST, true);
switch ($op)
Modified: phpcompta/trunk/html/js/scripts.js
===================================================================
--- phpcompta/trunk/html/js/scripts.js 2013-09-15 18:09:33 UTC (rev 5384)
+++ phpcompta/trunk/html/js/scripts.js 2013-09-15 18:31:37 UTC (rev 5385)
@@ -1847,7 +1847,7 @@
onFailure:ajax_misc_failure,
onSuccess:function(req){
remove_waiting_box();
-
add_div({id:'preference_div',style:'top:2em;left:20%;width:50%',cssclass:'inner_box'});
+
add_div({id:'preference_div',style:'top:2em;left:20%;width:50%',cssclass:'inner_box',drag:1});
$('preference_div').innerHTML=req.responseText;
try
{
Modified: phpcompta/trunk/html/user_login.php
===================================================================
--- phpcompta/trunk/html/user_login.php 2013-09-15 18:09:33 UTC (rev 5384)
+++ phpcompta/trunk/html/user_login.php 2013-09-15 18:31:37 UTC (rev 5385)
@@ -96,6 +96,20 @@
include_once("user_menu.php");
$priv=($User->admin==1)?"Administrateur":"Utilisateur";
load_all_script();
+if ( isset ($_POST['set_preference'])) {
+ //// Save value
+ extract($_POST);
+
+ if (strlen(trim($pass_1)) != 0 && strlen(trim($pass_2)) != 0)
+ {
+ $User->save_password($pass_1,$pass_2);
+
+ }
+ $User->save_global_preference('THEME', $style_user);
+ $User->save_global_preference('LANG', $lang);
+ $_SESSION['g_theme']=$style_user;
+ $_SESSION['g_lang']=$lang;
+}
echo '<div class="welcome"> ';
/**
*
@@ -132,7 +146,9 @@
{
$result.="<TD class=\"tool\" ><A class=\"cell\" HREF=\"admin_repo.php\">
Administration </A></TD>";
}
-$result.='<TD class="tool"><A class="cell"
HREF="user_pref.php">'._('Préférence').'</a></TD>';
+$result.='<TD class="tool">';
+$result.='<a onclick="set_preference(0)" title="Préférence"
href="javascript:void(0)" class="mtitle">Préférence</a>';
+$result.= '</TD>';
$result.='<TD class="tool" ><A class="cell" HREF="logout.php"
>'._('Deconnexion').'</a></TD>';
$result.="</TR>";
$result.="</table>";
Modified: phpcompta/trunk/include/ajax_preference.php
===================================================================
--- phpcompta/trunk/include/ajax_preference.php 2013-09-15 18:09:33 UTC (rev
5384)
+++ phpcompta/trunk/include/ajax_preference.php 2013-09-15 18:31:37 UTC (rev
5385)
@@ -31,6 +31,7 @@
require_once('class_periode.php');
echo HtmlInput::title_box(_('Préférence'), 'preference_div');
echo '<DIV class="content">';
+echo '<p class="notice"> Si vous validez la page sera rechargée</p>';
//----------------------------------------------------------------------
//
global $g_user;
@@ -38,7 +39,7 @@
$g_user=new User($cn);
$inside_dossier = false;
-if (isset($_REQUEST['gDossier']))
+if (isset($_REQUEST['gDossier']) && $_REQUEST['gDossier']<>0)
{
$g_user->load_global_pref();
$msg = "";
@@ -60,7 +61,6 @@
from theme
order by the_name");
$style->selected =$_SESSION['g_theme'];
- echo '<h2 class="info2">' . _('Changez vos préférences') . '</h2>';
?>
<div class="content" >
Modified: phpcompta/trunk/include/class_user.php
===================================================================
--- phpcompta/trunk/include/class_user.php 2013-09-15 18:09:33 UTC (rev
5384)
+++ phpcompta/trunk/include/class_user.php 2013-09-15 18:31:37 UTC (rev
5385)
@@ -1138,7 +1138,6 @@
$l_pass = md5($_POST['pass_1']);
$repo->exec_sql("update ac_users set use_pass=$1 where
use_login=$2", array($l_pass, $_SESSION['g_user']));
$_SESSION['g_pass'] = $_POST['pass_1'];
- echo "<i>" . _('Mot de passe est modifiée') . "</i>";
} else {
alert(_("Les mots de passe ne correspondent pas. Mot de passe
inchangé"));
}
---
PhpCompta est un logiciel de comptabilité libre en ligne (full web)
Projet opensource http://www.phpcompta.eu
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpcompta-dev] r5385 - in phpcompta/trunk: html html/js include,
phpcompta-dev <=