From 70228adb3d178b996f256596bb3f4acbb20e50b9 Mon Sep 17 00:00:00 2001
From: Luc <luc.lebosse@gmail.com>
Date: Mon, 25 Jan 2016 23:38:26 +0800
Subject: [PATCH] Code formating using astyle --style=otbs *.h *.cpp *.ino

To get nice looking code with a minimum effort
---
 esp8266/LinkedList.h     |  448 ++--
 esp8266/command.cpp      |  430 ++--
 esp8266/command.h        |   20 +-
 esp8266/config.cpp       |  642 ++---
 esp8266/config.h         |    4 +-
 esp8266/esp8266.ino      |  272 ++-
 esp8266/storestrings.cpp |  160 +-
 esp8266/storestrings.h   |   54 +-
 esp8266/webinterface.cpp | 4924 +++++++++++++++++++-------------------
 esp8266/webinterface.h   |   74 +-
 esp8266/wifi.cpp         |  401 ++--
 esp8266/wifi.h           |   42 +-
 12 files changed, 3832 insertions(+), 3639 deletions(-)

diff --git a/esp8266/LinkedList.h b/esp8266/LinkedList.h
index d9139520..d90336f9 100644
--- a/esp8266/LinkedList.h
+++ b/esp8266/LinkedList.h
@@ -15,83 +15,83 @@
 #define LinkedList_h
 
 template<class T>
-struct ListNode
-{
-	T data;
-	ListNode<T> *next;
+struct ListNode {
+    T data;
+    ListNode<T> *next;
 };
 
 template <typename T>
-class LinkedList{
+class LinkedList
+{
 
 protected:
-	int _size;
-	ListNode<T> *root;
-	ListNode<T>	*last;
+    int _size;
+    ListNode<T> *root;
+    ListNode<T>	*last;
 
-	// Helps "get" method, by saving last position
-	ListNode<T> *lastNodeGot;
-	int lastIndexGot;
-	// isCached should be set to FALSE
-	// everytime the list suffer changes
-	bool isCached;
+    // Helps "get" method, by saving last position
+    ListNode<T> *lastNodeGot;
+    int lastIndexGot;
+    // isCached should be set to FALSE
+    // everytime the list suffer changes
+    bool isCached;
 
-	ListNode<T>* getNode(int index);
+    ListNode<T>* getNode(int index);
 
 public:
-	LinkedList();
-	~LinkedList();
+    LinkedList();
+    ~LinkedList();
 
-	/*
-		Returns current size of LinkedList
-	*/
-	virtual int size();
-	/*
-		Adds a T object in the specified index;
-		Unlink and link the LinkedList correcly;
-		Increment _size
-	*/
-	virtual bool add(int index, T);
-	/*
-		Adds a T object in the end of the LinkedList;
-		Increment _size;
-	*/
-	virtual bool add(T);
-	/*
-		Adds a T object in the start of the LinkedList;
-		Increment _size;
-	*/
-	virtual bool unshift(T);
-	/*
-		Set the object at index, with T;
-		Increment _size;
-	*/
-	virtual bool set(int index, T);
-	/*
-		Remove object at index;
-		If index is not reachable, returns false;
-		else, decrement _size
-	*/
-	virtual T remove(int index);
-	/*
-		Remove last object;
-	*/
-	virtual T pop();
-	/*
-		Remove first object;
-	*/
-	virtual T shift();
-	/*
-		Get the index'th element on the list;
-		Return Element if accessible,
-		else, return false;
-	*/
-	virtual T get(int index);
+    /*
+    	Returns current size of LinkedList
+    */
+    virtual int size();
+    /*
+    	Adds a T object in the specified index;
+    	Unlink and link the LinkedList correcly;
+    	Increment _size
+    */
+    virtual bool add(int index, T);
+    /*
+    	Adds a T object in the end of the LinkedList;
+    	Increment _size;
+    */
+    virtual bool add(T);
+    /*
+    	Adds a T object in the start of the LinkedList;
+    	Increment _size;
+    */
+    virtual bool unshift(T);
+    /*
+    	Set the object at index, with T;
+    	Increment _size;
+    */
+    virtual bool set(int index, T);
+    /*
+    	Remove object at index;
+    	If index is not reachable, returns false;
+    	else, decrement _size
+    */
+    virtual T remove(int index);
+    /*
+    	Remove last object;
+    */
+    virtual T pop();
+    /*
+    	Remove first object;
+    */
+    virtual T shift();
+    /*
+    	Get the index'th element on the list;
+    	Return Element if accessible,
+    	else, return false;
+    */
+    virtual T get(int index);
 
-	/*
-		Clear the entire array
-	*/
-	virtual void clear();
+    /*
+    	Clear the entire array
+    */
+    virtual void clear();
 
 };
 
@@ -99,29 +99,28 @@ public:
 template<typename T>
 LinkedList<T>::LinkedList()
 {
-	root=NULL;
-	last=NULL;
-	_size=0;
+    root=NULL;
+    last=NULL;
+    _size=0;
 
-	lastNodeGot = root;
-	lastIndexGot = 0;
-	isCached = false;
+    lastNodeGot = root;
+    lastIndexGot = 0;
+    isCached = false;
 }
 
 // Clear Nodes and free Memory
 template<typename T>
 LinkedList<T>::~LinkedList()
 {
-	ListNode<T>* tmp;
-	while(root!=NULL)
-	{
-		tmp=root;
-		root=root->next;
-		delete tmp;
-	}
-	last = NULL;
-	_size=0;
-	isCached = false;
+    ListNode<T>* tmp;
+    while(root!=NULL) {
+        tmp=root;
+        root=root->next;
+        delete tmp;
+    }
+    last = NULL;
+    _size=0;
+    isCached = false;
 }
 
 /*
@@ -129,196 +128,213 @@ LinkedList<T>::~LinkedList()
 */
 
 template<typename T>
-ListNode<T>* LinkedList<T>::getNode(int index){
+ListNode<T>* LinkedList<T>::getNode(int index)
+{
 
-	int _pos = 0;
-	ListNode<T>* current = root;
+    int _pos = 0;
+    ListNode<T>* current = root;
 
-	// Check if the node trying to get is
-	// immediatly AFTER the previous got one
-	if(isCached && lastIndexGot <= index){
-		_pos = lastIndexGot;
-		current = lastNodeGot;
-	}
+    // Check if the node trying to get is
+    // immediatly AFTER the previous got one
+    if(isCached && lastIndexGot <= index) {
+        _pos = lastIndexGot;
+        current = lastNodeGot;
+    }
 
-	while(_pos < index && current){
-		current = current->next;
+    while(_pos < index && current) {
+        current = current->next;
 
-		_pos++;
-	}
+        _pos++;
+    }
 
-	// Check if the object index got is the same as the required
-	if(_pos == index){
-		isCached = true;
-		lastIndexGot = index;
-		lastNodeGot = current;
+    // Check if the object index got is the same as the required
+    if(_pos == index) {
+        isCached = true;
+        lastIndexGot = index;
+        lastNodeGot = current;
 
-		return current;
-	}
+        return current;
+    }
 
-	return NULL;
+    return NULL;
 }
 
 template<typename T>
-int LinkedList<T>::size(){
-	return _size;
+int LinkedList<T>::size()
+{
+    return _size;
 }
 
 template<typename T>
-bool LinkedList<T>::add(int index, T _t){
+bool LinkedList<T>::add(int index, T _t)
+{
 
-	if(index >= _size)
-		return add(_t);
+    if(index >= _size) {
+        return add(_t);
+    }
 
-	if(index == 0)
-		return unshift(_t);
+    if(index == 0) {
+        return unshift(_t);
+    }
 
-	ListNode<T> *tmp = new ListNode<T>(),
-				 *_prev = getNode(index-1);
-	tmp->data = _t;
-	tmp->next = _prev->next;
-	_prev->next = tmp;
+    ListNode<T> *tmp = new ListNode<T>(),
+    *_prev = getNode(index-1);
+    tmp->data = _t;
+    tmp->next = _prev->next;
+    _prev->next = tmp;
 
-	_size++;
-	isCached = false;
+    _size++;
+    isCached = false;
 
-	return true;
+    return true;
 }
 
 template<typename T>
-bool LinkedList<T>::add(T _t){
+bool LinkedList<T>::add(T _t)
+{
 
-	ListNode<T> *tmp = new ListNode<T>();
-	tmp->data = _t;
-	tmp->next = NULL;
-	
-	if(root){
-		// Already have elements inserted
-		last->next = tmp;
-		last = tmp;
-	}else{
-		// First element being inserted
-		root = tmp;
-		last = tmp;
-	}
+    ListNode<T> *tmp = new ListNode<T>();
+    tmp->data = _t;
+    tmp->next = NULL;
 
-	_size++;
-	isCached = false;
+    if(root) {
+        // Already have elements inserted
+        last->next = tmp;
+        last = tmp;
+    } else {
+        // First element being inserted
+        root = tmp;
+        last = tmp;
+    }
 
-	return true;
+    _size++;
+    isCached = false;
+
+    return true;
 }
 
 template<typename T>
-bool LinkedList<T>::unshift(T _t){
+bool LinkedList<T>::unshift(T _t)
+{
 
-	if(_size == 0)
-		return add(_t);
+    if(_size == 0) {
+        return add(_t);
+    }
 
-	ListNode<T> *tmp = new ListNode<T>();
-	tmp->next = root;
-	tmp->data = _t;
-	root = tmp;
-	
-	_size++;
-	isCached = false;
-	
-	return true;
+    ListNode<T> *tmp = new ListNode<T>();
+    tmp->next = root;
+    tmp->data = _t;
+    root = tmp;
+
+    _size++;
+    isCached = false;
+
+    return true;
 }
 
 template<typename T>
-bool LinkedList<T>::set(int index, T _t){
-	// Check if index position is in bounds
-	if(index < 0 || index >= _size)
-		return false;
+bool LinkedList<T>::set(int index, T _t)
+{
+    // Check if index position is in bounds
+    if(index < 0 || index >= _size) {
+        return false;
+    }
 
-	getNode(index)->data = _t;
-	return true;
+    getNode(index)->data = _t;
+    return true;
 }
 
 template<typename T>
-T LinkedList<T>::pop(){
-	if(_size <= 0)
-		return T();
-	
-	isCached = false;
+T LinkedList<T>::pop()
+{
+    if(_size <= 0) {
+        return T();
+    }
 
-	if(_size >= 2){
-		ListNode<T> *tmp = getNode(_size - 2);
-		T ret = tmp->next->data;
-		delete(tmp->next);
-		tmp->next = NULL;
-		last = tmp;
-		_size--;
-		return ret;
-	}else{
-		// Only one element left on the list
-		T ret = root->data;
-		delete(root);
-		root = NULL;
-		last = NULL;
-		_size = 0;
-		return ret;
-	}
+    isCached = false;
+
+    if(_size >= 2) {
+        ListNode<T> *tmp = getNode(_size - 2);
+        T ret = tmp->next->data;
+        delete(tmp->next);
+        tmp->next = NULL;
+        last = tmp;
+        _size--;
+        return ret;
+    } else {
+        // Only one element left on the list
+        T ret = root->data;
+        delete(root);
+        root = NULL;
+        last = NULL;
+        _size = 0;
+        return ret;
+    }
 }
 
 template<typename T>
-T LinkedList<T>::shift(){
-	if(_size <= 0)
-		return T();
+T LinkedList<T>::shift()
+{
+    if(_size <= 0) {
+        return T();
+    }
 
-	if(_size > 1){
-		ListNode<T> *_next = root->next;
-		T ret = root->data;
-		delete(root);
-		root = _next;
-		_size --;
-		isCached = false;
+    if(_size > 1) {
+        ListNode<T> *_next = root->next;
+        T ret = root->data;
+        delete(root);
+        root = _next;
+        _size --;
+        isCached = false;
 
-		return ret;
-	}else{
-		// Only one left, then pop()
-		return pop();
-	}
+        return ret;
+    } else {
+        // Only one left, then pop()
+        return pop();
+    }
 
 }
 
 template<typename T>
-T LinkedList<T>::remove(int index){
-	if (index < 0 || index >= _size)
-	{
-		return T();
-	}
+T LinkedList<T>::remove(int index)
+{
+    if (index < 0 || index >= _size) {
+        return T();
+    }
 
-	if(index == 0)
-		return shift();
-	
-	if (index == _size-1)
-	{
-		return pop();
-	}
+    if(index == 0) {
+        return shift();
+    }
 
-	ListNode<T> *tmp = getNode(index - 1);
-	ListNode<T> *toDelete = tmp->next;
-	T ret = toDelete->data;
-	tmp->next = tmp->next->next;
-	delete(toDelete);
-	_size--;
-	isCached = false;
-	return ret;
+    if (index == _size-1) {
+        return pop();
+    }
+
+    ListNode<T> *tmp = getNode(index - 1);
+    ListNode<T> *toDelete = tmp->next;
+    T ret = toDelete->data;
+    tmp->next = tmp->next->next;
+    delete(toDelete);
+    _size--;
+    isCached = false;
+    return ret;
 }
 
 
 template<typename T>
-T LinkedList<T>::get(int index){
-	ListNode<T> *tmp = getNode(index);
+T LinkedList<T>::get(int index)
+{
+    ListNode<T> *tmp = getNode(index);
 
-	return (tmp ? tmp->data : T());
+    return (tmp ? tmp->data : T());
 }
 
 template<typename T>
-void LinkedList<T>::clear(){
-	while(size() > 0)
-		shift();
+void LinkedList<T>::clear()
+{
+    while(size() > 0) {
+        shift();
+    }
 }
 
 #endif
diff --git a/esp8266/command.cpp b/esp8266/command.cpp
index 8f599e4d..73ab1de8 100644
--- a/esp8266/command.cpp
+++ b/esp8266/command.cpp
@@ -1,8 +1,8 @@
-/* 
+/*
   command.cpp - esp8266 configuration class
 
   Copyright (c) 2014 Luc Lebosse. All rights reserved.
- 
+
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
@@ -32,240 +32,248 @@ String COMMAND::buffer_tcp;
 
 void COMMAND::execute_command(int cmd,String cmd_params)
 {
-	//manage parameters
-	
-	switch(cmd)
-    {
-		byte mode;
-		case 800:
-			Serial.println("\nCommand received");
-		break;
-		case 100:
-			if(!CONFIG::write_string(EP_SSID,cmd_params.c_str()))Serial.println("\nError");
-			else Serial.println("\nOk");
-			break;
-		case 101:
-			if(!CONFIG::write_string(EP_PASSWORD,cmd_params.c_str()))Serial.println("\nError");
-			else Serial.println("\nOk");
-			break;
-		case 103:
+    //manage parameters
 
-			if (cmd_params=="STA")mode = CLIENT_MODE;
-			else mode=AP_MODE;
-			if(!CONFIG::write_byte(EP_WIFI_MODE,mode))Serial.println("\nError");
-			else Serial.println("\nOk");
-			break;
-		case 104:
-			if (cmd_params=="STATIC")mode = STATIC_IP_MODE;
-			else mode=DHCP_MODE;
-			if(!CONFIG::write_byte(EP_IP_MODE,mode))Serial.println("\nError");
-			else Serial.println("\nOk");
-			break;
-		case 111:
-			{
-			String currentIP ;
-			if (wifi_get_opmode()==WIFI_STA)currentIP=WiFi.localIP().toString();
-			else currentIP=WiFi.softAPIP().toString();
-			Serial.print("\n\r");
-			Serial.print(cmd_params);
-			Serial.println(currentIP);
-			Serial.print("\r\n");
-			}
-		break;
-		case 444:
-			if (cmd_params=="RESET")
-				{
-				CONFIG::reset_config();
-				}
-			if (cmd_params=="SAFEMODE")
-				{
-				wifi_config.Safe_Setup();
-				}
-			if (cmd_params=="CONFIG")
-				{
-				CONFIG::print_config();
-				}
-		break;
-		case 888:
-			if (cmd_params=="RESTART")
-				{
-				Serial.print("\r");
-				Serial.print(cmd_params);
-				web_interface->restartmodule=true;
-				Serial.print("\r\n");
-				}
-		break;
-		case 999:
-			if (cmd_params=="ERROR")
-			{
-				web_interface->error_msg.clear();
-			}
-			else if (cmd_params=="INFO")
-			{
-				web_interface->info_msg.clear();
-			}
-			else if (cmd_params=="STATUS")
-			{
-				web_interface->status_msg.clear();
-			}
-			else if (cmd_params=="ALL")
-			{
-				web_interface->error_msg.clear();
-				web_interface->status_msg.clear();
-				web_interface->info_msg.clear();
-			}
-		break;
-		//default:
+    switch(cmd) {
+        byte mode;
+    case 800:
+        Serial.println("\nCommand received");
+        break;
+    case 100:
+        if(!CONFIG::write_string(EP_SSID,cmd_params.c_str())) {
+            Serial.println("\nError");
+        } else {
+            Serial.println("\nOk");
+        }
+        break;
+    case 101:
+        if(!CONFIG::write_string(EP_PASSWORD,cmd_params.c_str())) {
+            Serial.println("\nError");
+        } else {
+            Serial.println("\nOk");
+        }
+        break;
+    case 103:
 
-	}
+        if (cmd_params=="STA") {
+            mode = CLIENT_MODE;
+        } else {
+            mode=AP_MODE;
+        }
+        if(!CONFIG::write_byte(EP_WIFI_MODE,mode)) {
+            Serial.println("\nError");
+        } else {
+            Serial.println("\nOk");
+        }
+        break;
+    case 104:
+        if (cmd_params=="STATIC") {
+            mode = STATIC_IP_MODE;
+        } else {
+            mode=DHCP_MODE;
+        }
+        if(!CONFIG::write_byte(EP_IP_MODE,mode)) {
+            Serial.println("\nError");
+        } else {
+            Serial.println("\nOk");
+        }
+        break;
+    case 111: {
+        String currentIP ;
+        if (wifi_get_opmode()==WIFI_STA) {
+            currentIP=WiFi.localIP().toString();
+        } else {
+            currentIP=WiFi.softAPIP().toString();
+        }
+        Serial.print("\n\r");
+        Serial.print(cmd_params);
+        Serial.println(currentIP);
+        Serial.print("\r\n");
+    }
+    break;
+    case 444:
+        if (cmd_params=="RESET") {
+            CONFIG::reset_config();
+        }
+        if (cmd_params=="SAFEMODE") {
+            wifi_config.Safe_Setup();
+        }
+        if (cmd_params=="CONFIG") {
+            CONFIG::print_config();
+        }
+        break;
+    case 888:
+        if (cmd_params=="RESTART") {
+            Serial.print("\r");
+            Serial.print(cmd_params);
+            web_interface->restartmodule=true;
+            Serial.print("\r\n");
+        }
+        break;
+    case 999:
+        if (cmd_params=="ERROR") {
+            web_interface->error_msg.clear();
+        } else if (cmd_params=="INFO") {
+            web_interface->info_msg.clear();
+        } else if (cmd_params=="STATUS") {
+            web_interface->status_msg.clear();
+        } else if (cmd_params=="ALL") {
+            web_interface->error_msg.clear();
+            web_interface->status_msg.clear();
+            web_interface->info_msg.clear();
+        }
+        break;
+        //default:
+
+    }
 }
 
 void COMMAND::check_command(String buffer)
 {
-	String ESP_Command;
-	static bool bfileslist=false;
-	static uint32_t start_list=0;
-	if (!bfileslist) 
-	{
-		int filesstart = buffer.indexOf("Begin file list");
-		if (filesstart>-1)
-			{ 
-				Serial.print("Starting");
-				start_list=system_get_time();
-				bfileslist=true;
-				web_interface->fileslist.clear();
-			}
-		int ESPpos = buffer.indexOf("[ESP");
-		int Tpos = buffer.indexOf("T:");
-		int Xpos = buffer.indexOf("X:");
-		int Ypos = buffer.indexOf("Y:");
-		int Zpos = buffer.indexOf("Z:");
-		int Speedpos = buffer.indexOf("SpeedMultiply:");
-		int Flowpos = buffer.indexOf("FlowMultiply:");
-		int Errorpos= buffer.indexOf("Error:");
-		int Infopos= buffer.indexOf("Info:");
-		int Statuspos= buffer.indexOf("Status:");
-		if (ESPpos>-1)
-			{//is there the second part?
-			int ESPpos2 = buffer.indexOf("]",ESPpos);	
-			if (ESPpos2>-1)
-				{	//Split in command and parameters
-					String cmd_part1=buffer.substring(ESPpos+4,ESPpos2);
-					String cmd_part2="";
-					//is there space for parameters?
-					if (ESPpos2<buffer.length())
-						{
-						cmd_part2=buffer.substring(ESPpos2+1);
-						}
-					//if command is a valid number then execute command
-					if(cmd_part1.toInt()!=0)execute_command(cmd_part1.toInt(),cmd_part2);
-					//if not is not a valid [ESPXXX] command
-				}
-			}
-		//check for temperature 
-		if (Tpos>-1)
-			{
-			//look for valid temperature answer
-			int slashpos = buffer.indexOf(" /",Tpos);	
-			int spacepos = buffer.indexOf(" ",slashpos+1);
-			//if match mask T:xxx.xx /xxx.xx 
-			if(spacepos-Tpos < 17)
-				{
-				 web_interface->answer4M105=buffer; //do not interprete just need when requested so store it
-				 web_interface->last_temp=system_get_time();
-				}
-			}
-		//Position of axis
-		if (Xpos>-1 && Ypos>-1 && Zpos>-1)web_interface->answer4M114=buffer;
-		//Speed
-		if (Speedpos>-1)web_interface->answer4M220=buffer.substring(Speedpos+14);
-		//Flow
-		if (Flowpos>-1)web_interface->answer4M221=buffer.substring(Flowpos+13);
-		//Error
-		if (Errorpos>-1 && !(buffer.indexOf("Format error")!=-1 || buffer.indexOf("wait")==Errorpos+6) )(web_interface->error_msg).add(buffer.substring(Errorpos+6).c_str());
-		//Info
-		if (Infopos>-1)(web_interface->info_msg).add(buffer.substring(Infopos+5).c_str());
-		//Status
-		if (Statuspos>-1)(web_interface->status_msg).add(buffer.substring(Statuspos+7).c_str());
-		}
-	else
-		{
-			if ((system_get_time()-start_list)>30000000) //timeout in case of problem
-			{
-				bfileslist=false;
-				Serial.print("time out");
-			}
-			else
-			{
-				if (buffer.indexOf("End file list")>-1)
-				{
-					Serial.print("Ending");
-					bfileslist=false;
-				}
-				else 
-				{
-					Serial.print(buffer);
-					web_interface->fileslist.add(buffer); 
-				}
-			}
-			
-		}
+    String ESP_Command;
+    static bool bfileslist=false;
+    static uint32_t start_list=0;
+    if (!bfileslist) {
+        int filesstart = buffer.indexOf("Begin file list");
+        if (filesstart>-1) {
+            Serial.print("Starting");
+            start_list=system_get_time();
+            bfileslist=true;
+            web_interface->fileslist.clear();
+        }
+        int ESPpos = buffer.indexOf("[ESP");
+        int Tpos = buffer.indexOf("T:");
+        int Xpos = buffer.indexOf("X:");
+        int Ypos = buffer.indexOf("Y:");
+        int Zpos = buffer.indexOf("Z:");
+        int Speedpos = buffer.indexOf("SpeedMultiply:");
+        int Flowpos = buffer.indexOf("FlowMultiply:");
+        int Errorpos= buffer.indexOf("Error:");
+        int Infopos= buffer.indexOf("Info:");
+        int Statuspos= buffer.indexOf("Status:");
+        if (ESPpos>-1) {
+            //is there the second part?
+            int ESPpos2 = buffer.indexOf("]",ESPpos);
+            if (ESPpos2>-1) {
+                //Split in command and parameters
+                String cmd_part1=buffer.substring(ESPpos+4,ESPpos2);
+                String cmd_part2="";
+                //is there space for parameters?
+                if (ESPpos2<buffer.length()) {
+                    cmd_part2=buffer.substring(ESPpos2+1);
+                }
+                //if command is a valid number then execute command
+                if(cmd_part1.toInt()!=0) {
+                    execute_command(cmd_part1.toInt(),cmd_part2);
+                }
+                //if not is not a valid [ESPXXX] command
+            }
+        }
+        //check for temperature
+        if (Tpos>-1) {
+            //look for valid temperature answer
+            int slashpos = buffer.indexOf(" /",Tpos);
+            int spacepos = buffer.indexOf(" ",slashpos+1);
+            //if match mask T:xxx.xx /xxx.xx
+            if(spacepos-Tpos < 17) {
+                web_interface->answer4M105=buffer; //do not interprete just need when requested so store it
+                web_interface->last_temp=system_get_time();
+            }
+        }
+        //Position of axis
+        if (Xpos>-1 && Ypos>-1 && Zpos>-1) {
+            web_interface->answer4M114=buffer;
+        }
+        //Speed
+        if (Speedpos>-1) {
+            web_interface->answer4M220=buffer.substring(Speedpos+14);
+        }
+        //Flow
+        if (Flowpos>-1) {
+            web_interface->answer4M221=buffer.substring(Flowpos+13);
+        }
+        //Error
+        if (Errorpos>-1 && !(buffer.indexOf("Format error")!=-1 || buffer.indexOf("wait")==Errorpos+6) ) {
+            (web_interface->error_msg).add(buffer.substring(Errorpos+6).c_str());
+        }
+        //Info
+        if (Infopos>-1) {
+            (web_interface->info_msg).add(buffer.substring(Infopos+5).c_str());
+        }
+        //Status
+        if (Statuspos>-1) {
+            (web_interface->status_msg).add(buffer.substring(Statuspos+7).c_str());
+        }
+    } else {
+        if ((system_get_time()-start_list)>30000000) { //timeout in case of problem
+            bfileslist=false;
+            Serial.print("time out");
+        } else {
+            if (buffer.indexOf("End file list")>-1) {
+                Serial.print("Ending");
+                bfileslist=false;
+            } else {
+                Serial.print(buffer);
+                web_interface->fileslist.add(buffer);
+            }
+        }
+
+    }
 }
 
 //read a buffer in an array
 void COMMAND::read_buffer_serial(uint8_t *b, size_t len)
 {
-for (long i; i< len;i++)
-	{
-	read_buffer_serial(*b);
-	*b++;
-	}
+    for (long i; i< len; i++) {
+        read_buffer_serial(*b);
+        *b++;
+    }
 }
 
 //read buffer as char
 void COMMAND::read_buffer_tcp(uint8_t b)
 {
-static bool previous_was_char=false;
+    static bool previous_was_char=false;
 //to ensure it is continuous string, no char separated by binaries
-if (!previous_was_char)buffer_tcp="";
+    if (!previous_was_char) {
+        buffer_tcp="";
+    }
 //it is a char so add it to buffer
-if (isPrintable(b))
-	{
-	previous_was_char=true;
-	buffer_tcp+=char(b);
-	}
-else 
-	{
-	previous_was_char=false; //next call will reset the buffer
-	}
+    if (isPrintable(b)) {
+        previous_was_char=true;
+        buffer_tcp+=char(b);
+    } else {
+        previous_was_char=false; //next call will reset the buffer
+    }
 //this is not printable but end of command check if need to handle it
-if (b==13 ||b==10)
-	{//Minimum is something like M10 so 3 char
-	if (buffer_tcp.length()>3)
-		check_command(buffer_tcp);
-	}
+    if (b==13 ||b==10) {
+        //Minimum is something like M10 so 3 char
+        if (buffer_tcp.length()>3) {
+            check_command(buffer_tcp);
+        }
+    }
 }
 
 //read buffer as char
 void COMMAND::read_buffer_serial(uint8_t b)
 {
-static bool previous_was_char=false;
+    static bool previous_was_char=false;
 //to ensure it is continuous string, no char separated by binaries
-if (!previous_was_char)buffer_serial="";
+    if (!previous_was_char) {
+        buffer_serial="";
+    }
 //it is a char so add it to buffer
-if (isPrintable(b))
-	{
-	previous_was_char=true;
-	buffer_serial+=char(b);
-	}
-else 
-	{
-	previous_was_char=false; //next call will reset the buffer
-	}
+    if (isPrintable(b)) {
+        previous_was_char=true;
+        buffer_serial+=char(b);
+    } else {
+        previous_was_char=false; //next call will reset the buffer
+    }
 //this is not printable but end of command check if need to handle it
-if (b==13 ||b==10)
-	{//Minimum is something like M10 so 3 char
-	if (buffer_serial.length()>3)
-		check_command(buffer_serial);
-	}
+    if (b==13 ||b==10) {
+        //Minimum is something like M10 so 3 char
+        if (buffer_serial.length()>3) {
+            check_command(buffer_serial);
+        }
+    }
 }
diff --git a/esp8266/command.h b/esp8266/command.h
index 126ae72e..a7d89992 100644
--- a/esp8266/command.h
+++ b/esp8266/command.h
@@ -1,8 +1,8 @@
-/* 
+/*
   command.h - esp8266 configuration class
 
   Copyright (c) 2014 Luc Lebosse. All rights reserved.
- 
+
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
@@ -24,14 +24,14 @@
 
 class COMMAND
 {
-  public:
-  static String buffer_serial;
-  static String buffer_tcp;
-  static void read_buffer_serial(uint8_t *b, size_t len);
-  static void read_buffer_serial(uint8_t b);
-  static void read_buffer_tcp(uint8_t b);
-  static void check_command(String buffer);
-  static void execute_command(int cmd,String cmd_params);
+public:
+    static String buffer_serial;
+    static String buffer_tcp;
+    static void read_buffer_serial(uint8_t *b, size_t len);
+    static void read_buffer_serial(uint8_t b);
+    static void read_buffer_tcp(uint8_t b);
+    static void check_command(String buffer);
+    static void execute_command(int cmd,String cmd_params);
 
 };
 
diff --git a/esp8266/config.cpp b/esp8266/config.cpp
index 0c4185cd..9069d724 100644
--- a/esp8266/config.cpp
+++ b/esp8266/config.cpp
@@ -1,8 +1,8 @@
-/* 
+/*
   CONFIG.CPP- esp8266 configuration class
 
   Copyright (c) 2014 Luc Lebosse. All rights reserved.
- 
+
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
@@ -24,332 +24,416 @@ extern "C" {
 #include "user_interface.h"
 }
 
-//read a string 
-//a string is multibyte + \0, this is won't work if 1 char is multibyte like chinese char 
+//read a string
+//a string is multibyte + \0, this is won't work if 1 char is multibyte like chinese char
 bool CONFIG::read_string(int pos, char byte_buffer[], int size_max)
 {
-  //check if parameters are acceptable
-  if (size_max==0 ||  pos+size_max+1 > EEPROM_SIZE || byte_buffer== NULL)return false;
-  EEPROM.begin(EEPROM_SIZE);
-  byte b = 13; // non zero for the while loop below
-  int i=0;
+    //check if parameters are acceptable
+    if (size_max==0 ||  pos+size_max+1 > EEPROM_SIZE || byte_buffer== NULL) {
+        return false;
+    }
+    EEPROM.begin(EEPROM_SIZE);
+    byte b = 13; // non zero for the while loop below
+    int i=0;
 
-  //read until max size is reached or \0 is found
-  while (i < size_max && b != 0)
-  {
-    b = EEPROM.read(pos+i);
-    byte_buffer[i]=b; 
-    i++;
-  } 
-  
-  // Be sure there is a 0 at the end.
-  if (b!=0)byte_buffer[i-1]=0x00; 
-  EEPROM.end();
-  
-  return true;
+    //read until max size is reached or \0 is found
+    while (i < size_max && b != 0) {
+        b = EEPROM.read(pos+i);
+        byte_buffer[i]=b;
+        i++;
+    }
+
+    // Be sure there is a 0 at the end.
+    if (b!=0) {
+        byte_buffer[i-1]=0x00;
+    }
+    EEPROM.end();
+
+    return true;
 }
 
 bool CONFIG::read_string(int pos, String & sbuffer, int size_max)
 {
-  //check if parameters are acceptable
-  if (size_max==0 ||  pos+size_max+1 > EEPROM_SIZE )return false;
-  byte b = 13; // non zero for the while loop below
-  int i=0;
-  sbuffer="";
+    //check if parameters are acceptable
+    if (size_max==0 ||  pos+size_max+1 > EEPROM_SIZE ) {
+        return false;
+    }
+    byte b = 13; // non zero for the while loop below
+    int i=0;
+    sbuffer="";
 
-  EEPROM.begin(EEPROM_SIZE);
-  //read until max size is reached or \0 is found
-  while (i < size_max && b != 0)
-  {
-    b = EEPROM.read(pos+i);
-    sbuffer+=char(b); 
-    i++;
-  } 
-  EEPROM.end();
+    EEPROM.begin(EEPROM_SIZE);
+    //read until max size is reached or \0 is found
+    while (i < size_max && b != 0) {
+        b = EEPROM.read(pos+i);
+        sbuffer+=char(b);
+        i++;
+    }
+    EEPROM.end();
 
-  return true;
+    return true;
 }
 
 //read a buffer of size_buffer
 bool CONFIG::read_buffer(int pos, byte byte_buffer[], int size_buffer)
 {
-  //check if parameters are acceptable
-  if (size_buffer==0 ||  pos+size_buffer > EEPROM_SIZE || byte_buffer== NULL)return false;
-  int i=0;
-  EEPROM.begin(EEPROM_SIZE);
-  //read until max size is reached
-  while (i<size_buffer )
-  {
-    byte_buffer[i]=EEPROM.read(pos+i);
-    i++;
-  } 
- EEPROM.end();
-  return true;
+    //check if parameters are acceptable
+    if (size_buffer==0 ||  pos+size_buffer > EEPROM_SIZE || byte_buffer== NULL) {
+        return false;
+    }
+    int i=0;
+    EEPROM.begin(EEPROM_SIZE);
+    //read until max size is reached
+    while (i<size_buffer ) {
+        byte_buffer[i]=EEPROM.read(pos+i);
+        i++;
+    }
+    EEPROM.end();
+    return true;
 }
 
 //read a flag / byte
 bool CONFIG::read_byte(int pos, byte * value)
 {
-  //check if parameters are acceptable
-  if (pos+1 > EEPROM_SIZE)return false;
-  EEPROM.begin(EEPROM_SIZE);
-  value[0] = EEPROM.read(pos);
-EEPROM.end();
-  return true;
+    //check if parameters are acceptable
+    if (pos+1 > EEPROM_SIZE) {
+        return false;
+    }
+    EEPROM.begin(EEPROM_SIZE);
+    value[0] = EEPROM.read(pos);
+    EEPROM.end();
+    return true;
 }
 
 bool CONFIG::write_string(int pos, const __FlashStringHelper *str)
 {
-	String stmp = str;
-	return write_string(pos,stmp.c_str());
+    String stmp = str;
+    return write_string(pos,stmp.c_str());
 }
 
 //write a string (array of byte with a 0x00  at the end)
 bool CONFIG::write_string(int pos, const char * byte_buffer)
 {
-  int size_buffer;
-  size_buffer= strlen(byte_buffer);
-  //check if parameters are acceptable
-  if (size_buffer==0 ||  pos+size_buffer+1 > EEPROM_SIZE || byte_buffer== NULL)return false;
-  //copy the value(s)
-  EEPROM.begin(EEPROM_SIZE);
-  for (int i = 0; i < size_buffer; i++) {
-    EEPROM.write(pos + i, byte_buffer[i]);
-  }
-  
-  //0 terminal
-  EEPROM.write(pos + size_buffer, 0x00);
-  EEPROM.commit();
-  EEPROM.end();
-  return true;
+    int size_buffer;
+    size_buffer= strlen(byte_buffer);
+    //check if parameters are acceptable
+    if (size_buffer==0 ||  pos+size_buffer+1 > EEPROM_SIZE || byte_buffer== NULL) {
+        return false;
+    }
+    //copy the value(s)
+    EEPROM.begin(EEPROM_SIZE);
+    for (int i = 0; i < size_buffer; i++) {
+        EEPROM.write(pos + i, byte_buffer[i]);
+    }
+
+    //0 terminal
+    EEPROM.write(pos + size_buffer, 0x00);
+    EEPROM.commit();
+    EEPROM.end();
+    return true;
 }
 
-//write a buffer 
+//write a buffer
 bool CONFIG::write_buffer(int pos, const byte * byte_buffer, int size_buffer)
 {
-  //check if parameters are acceptable
-  if (size_buffer==0 ||  pos+size_buffer > EEPROM_SIZE || byte_buffer== NULL)return false;
-  EEPROM.begin(EEPROM_SIZE);
-  //copy the value(s)
-  for (int i = 0; i < size_buffer; i++) {
-    EEPROM.write(pos + i, byte_buffer[i]);
-  }
-  EEPROM.commit();
-  EEPROM.end();
-  return true;
+    //check if parameters are acceptable
+    if (size_buffer==0 ||  pos+size_buffer > EEPROM_SIZE || byte_buffer== NULL) {
+        return false;
+    }
+    EEPROM.begin(EEPROM_SIZE);
+    //copy the value(s)
+    for (int i = 0; i < size_buffer; i++) {
+        EEPROM.write(pos + i, byte_buffer[i]);
+    }
+    EEPROM.commit();
+    EEPROM.end();
+    return true;
 }
 
 //read a flag / byte
 bool CONFIG::write_byte(int pos, const byte value)
 {
-  //check if parameters are acceptable
-  if (pos+1 > EEPROM_SIZE)return false;
-  EEPROM.begin(EEPROM_SIZE);
-  EEPROM.write(pos, value);
-  EEPROM.commit();
-  EEPROM.end();
-  return true;
+    //check if parameters are acceptable
+    if (pos+1 > EEPROM_SIZE) {
+        return false;
+    }
+    EEPROM.begin(EEPROM_SIZE);
+    EEPROM.write(pos, value);
+    EEPROM.commit();
+    EEPROM.end();
+    return true;
 }
 
 bool CONFIG::reset_config()
 {
-  if(!CONFIG::write_byte(EP_WIFI_MODE,DEFAULT_WIFI_MODE))return false;
-  if(!CONFIG::write_string(EP_SSID,FPSTR(DEFAULT_SSID)))return false;
-  if(!CONFIG::write_string(EP_PASSWORD,FPSTR(DEFAULT_PASSWORD)))return false;
-  if(!CONFIG::write_byte(EP_IP_MODE,DEFAULT_IP_MODE))return false;
-  if(!CONFIG::write_buffer(EP_IP_VALUE,DEFAULT_IP_VALUE,IP_LENGTH))return false;
-  if(!CONFIG::write_buffer(EP_MASK_VALUE,DEFAULT_MASK_VALUE,IP_LENGTH))return false;
-  if(!CONFIG::write_buffer(EP_GATEWAY_VALUE,DEFAULT_GATEWAY_VALUE,IP_LENGTH))return false;
-  if(!CONFIG::write_buffer(EP_BAUD_RATE,(const byte *)&DEFAULT_BAUD_RATE,INTEGER_LENGTH))return false;
-  if(!CONFIG::write_byte(EP_PHY_MODE,DEFAULT_PHY_MODE))return false;
-  if(!CONFIG::write_byte(EP_SLEEP_MODE,DEFAULT_SLEEP_MODE))return false;
-  if(!CONFIG::write_byte(EP_CHANNEL,DEFAULT_CHANNEL))return false;
-  if(!CONFIG::write_byte(EP_AUTH_TYPE,DEFAULT_AUTH_TYPE))return false;
-  if(!CONFIG::write_byte(EP_SSID_VISIBLE,DEFAULT_SSID_VISIBLE))return false;
-  if(!CONFIG::write_buffer(EP_WEB_PORT,(const byte *)&DEFAULT_WEB_PORT,INTEGER_LENGTH))return false;
-  if(!CONFIG::write_buffer(EP_DATA_PORT,(const byte *)&DEFAULT_DATA_PORT,INTEGER_LENGTH))return false;
-  if(!CONFIG::write_byte(EP_REFRESH_PAGE_TIME,DEFAULT_REFRESH_PAGE_TIME))return false;
-  if(!CONFIG::write_string(EP_HOSTNAME,wifi_config.get_default_hostname()))return false;
-  if(!CONFIG::write_buffer(EP_XY_FEEDRATE,(const byte *)&DEFAULT_XY_FEEDRATE,INTEGER_LENGTH))return false;
-  if(!CONFIG::write_buffer(EP_Z_FEEDRATE,(const byte *)&DEFAULT_Z_FEEDRATE,INTEGER_LENGTH))return false;
-  if(!CONFIG::write_buffer(EP_E_FEEDRATE,(const byte *)&DEFAULT_E_FEEDRATE,INTEGER_LENGTH))return false;
-  if(!CONFIG::write_string(EP_ADMIN_PWD,FPSTR(DEFAULT_ADMIN)))return false;
-  return true;
+    if(!CONFIG::write_byte(EP_WIFI_MODE,DEFAULT_WIFI_MODE)) {
+        return false;
+    }
+    if(!CONFIG::write_string(EP_SSID,FPSTR(DEFAULT_SSID))) {
+        return false;
+    }
+    if(!CONFIG::write_string(EP_PASSWORD,FPSTR(DEFAULT_PASSWORD))) {
+        return false;
+    }
+    if(!CONFIG::write_byte(EP_IP_MODE,DEFAULT_IP_MODE)) {
+        return false;
+    }
+    if(!CONFIG::write_buffer(EP_IP_VALUE,DEFAULT_IP_VALUE,IP_LENGTH)) {
+        return false;
+    }
+    if(!CONFIG::write_buffer(EP_MASK_VALUE,DEFAULT_MASK_VALUE,IP_LENGTH)) {
+        return false;
+    }
+    if(!CONFIG::write_buffer(EP_GATEWAY_VALUE,DEFAULT_GATEWAY_VALUE,IP_LENGTH)) {
+        return false;
+    }
+    if(!CONFIG::write_buffer(EP_BAUD_RATE,(const byte *)&DEFAULT_BAUD_RATE,INTEGER_LENGTH)) {
+        return false;
+    }
+    if(!CONFIG::write_byte(EP_PHY_MODE,DEFAULT_PHY_MODE)) {
+        return false;
+    }
+    if(!CONFIG::write_byte(EP_SLEEP_MODE,DEFAULT_SLEEP_MODE)) {
+        return false;
+    }
+    if(!CONFIG::write_byte(EP_CHANNEL,DEFAULT_CHANNEL)) {
+        return false;
+    }
+    if(!CONFIG::write_byte(EP_AUTH_TYPE,DEFAULT_AUTH_TYPE)) {
+        return false;
+    }
+    if(!CONFIG::write_byte(EP_SSID_VISIBLE,DEFAULT_SSID_VISIBLE)) {
+        return false;
+    }
+    if(!CONFIG::write_buffer(EP_WEB_PORT,(const byte *)&DEFAULT_WEB_PORT,INTEGER_LENGTH)) {
+        return false;
+    }
+    if(!CONFIG::write_buffer(EP_DATA_PORT,(const byte *)&DEFAULT_DATA_PORT,INTEGER_LENGTH)) {
+        return false;
+    }
+    if(!CONFIG::write_byte(EP_REFRESH_PAGE_TIME,DEFAULT_REFRESH_PAGE_TIME)) {
+        return false;
+    }
+    if(!CONFIG::write_string(EP_HOSTNAME,wifi_config.get_default_hostname())) {
+        return false;
+    }
+    if(!CONFIG::write_buffer(EP_XY_FEEDRATE,(const byte *)&DEFAULT_XY_FEEDRATE,INTEGER_LENGTH)) {
+        return false;
+    }
+    if(!CONFIG::write_buffer(EP_Z_FEEDRATE,(const byte *)&DEFAULT_Z_FEEDRATE,INTEGER_LENGTH)) {
+        return false;
+    }
+    if(!CONFIG::write_buffer(EP_E_FEEDRATE,(const byte *)&DEFAULT_E_FEEDRATE,INTEGER_LENGTH)) {
+        return false;
+    }
+    if(!CONFIG::write_string(EP_ADMIN_PWD,FPSTR(DEFAULT_ADMIN))) {
+        return false;
+    }
+    return true;
 }
 
 void CONFIG::print_config()
 {
-  //use biggest size for buffer
-  char sbuf[MAX_PASSWORD_LENGTH+1];
-  byte bbuf=0;
-  int ibuf=0;
-  if (CONFIG::read_byte(EP_WIFI_MODE, &bbuf ))
-	{
-      Serial.print(F("Mode: "));
-      if (byte(bbuf) == CLIENT_MODE) Serial.println(F("Station"));
-      else if (byte(bbuf)==AP_MODE) Serial.println(F("Access Point"));
-      else Serial.println("???");
-	}
-  else Serial.println(F("Error reading mode"));
-  
-  if (CONFIG::read_string(EP_SSID, sbuf , MAX_SSID_LENGTH))
-  {
-      Serial.print(F("SSID: "));
-  Serial.println(sbuf);
-  }
-  else  Serial.println(F("Error reading SSID"));
-  //if (CONFIG::read_string(EP_PASSWORD, sbuf , MAX_PASSWORD_LENGTH))Serial.println(sbuf);
-  
-  if (CONFIG::read_byte(EP_IP_MODE, &bbuf ))
-  {
-      Serial.print(F("IP Mode: "));
-      if (byte(bbuf)==STATIC_IP_MODE) Serial.println(F("Static"));
-      else  if (byte(bbuf)==DHCP_MODE) Serial.println(F("DHCP"));
-      else Serial.println(F("???"));
-  }
-  else  Serial.println(F("Error reading IP mode"));
-  
-  if (CONFIG::read_buffer(EP_IP_VALUE,(byte *)sbuf , IP_LENGTH))
-  {
-      Serial.print(F("IP: "));
-	Serial.println(wifi_config.ip2str((byte *)sbuf));
-	}
-  else Serial.println(F("Error reading IP"));
-  
-  if (CONFIG::read_buffer(EP_MASK_VALUE, (byte *)sbuf  , IP_LENGTH))
-  {
-      Serial.print(F("Subnet: "));
-	Serial.println(wifi_config.ip2str((byte *)sbuf));
-   }
-  else Serial.println(F("Error reading subnet"));
-  
-  if (CONFIG::read_buffer(EP_GATEWAY_VALUE, (byte *)sbuf  , IP_LENGTH))
-  {
-      Serial.print(F("Gateway: "));
-   Serial.println(wifi_config.ip2str((byte *)sbuf));
+    //use biggest size for buffer
+    char sbuf[MAX_PASSWORD_LENGTH+1];
+    byte bbuf=0;
+    int ibuf=0;
+    if (CONFIG::read_byte(EP_WIFI_MODE, &bbuf )) {
+        Serial.print(F("Mode: "));
+        if (byte(bbuf) == CLIENT_MODE) {
+            Serial.println(F("Station"));
+        } else if (byte(bbuf)==AP_MODE) {
+            Serial.println(F("Access Point"));
+        } else {
+            Serial.println("???");
+        }
+    } else {
+        Serial.println(F("Error reading mode"));
     }
-  else Serial.println(F("Error reading gateway"));
-  
-  if (CONFIG::read_buffer(EP_BAUD_RATE,  (byte *)&ibuf , INTEGER_LENGTH))
-  {
-      Serial.print(F("Baud rate: "));
-  Serial.println(ibuf);
-  }
-  else Serial.println(F("Error reading baud rate"));
-  
-  if (CONFIG::read_byte(EP_PHY_MODE, &bbuf ))
-  {
-      Serial.print(F("Phy mode: "));
-      if (byte(bbuf)==PHY_MODE_11B) Serial.println(F("11b"));
-      else if (byte(bbuf)==PHY_MODE_11G) Serial.println(F("11g"));
-      else if (byte(bbuf)==PHY_MODE_11N) Serial.println(F("11n"));
-      else Serial.println(F("???"));
+
+    if (CONFIG::read_string(EP_SSID, sbuf , MAX_SSID_LENGTH)) {
+        Serial.print(F("SSID: "));
+        Serial.println(sbuf);
+    } else {
+        Serial.println(F("Error reading SSID"));
     }
-  else Serial.println(F("Error reading phy mode"));
-  
-  if (CONFIG::read_byte(EP_SLEEP_MODE, &bbuf ))
-  {
-      Serial.print(F("Sleep mode: "));
-      if (byte(bbuf)==NONE_SLEEP_T) Serial.println(F("None"));
-      else if (byte(bbuf)==LIGHT_SLEEP_T) Serial.println(F("Light"));
-      else if (byte(bbuf)==MODEM_SLEEP_T) Serial.println(F("Modem"));
-      else Serial.println(F("???"));
-  }
-  else Serial.println(F("Error reading sleep mode"));
-  
-  if (CONFIG::read_byte(EP_CHANNEL, &bbuf ))
-  {
-      Serial.print(F("Channel: "));
-	Serial.println(byte(bbuf));
-   }
-  else Serial.println(F("Error reading channel"));
-  
-  if (CONFIG::read_byte(EP_AUTH_TYPE, &bbuf ))
-  {
-      Serial.print(F("Authentification: "));
-      if (byte(bbuf)==AUTH_OPEN) Serial.println(F("None"));
-      else if (byte(bbuf)==AUTH_WEP) Serial.println(F("WEP"));
-      else if (byte(bbuf)==AUTH_WPA_PSK) Serial.println(F("WPA"));
-      else if (byte(bbuf)==AUTH_WPA2_PSK) Serial.println(F("WPA2"));
-      else if (byte(bbuf)==AUTH_WPA_WPA2_PSK) Serial.println(F("WPA/WPA2"));
-      else Serial.println(F("???"));
-  }
-  else Serial.println(F("Error reading authentification"));
-  
-  if (CONFIG::read_byte(EP_SSID_VISIBLE, &bbuf ))
-  {
-      Serial.print(F("SSID visibility: "));
-      if (bbuf==0) Serial.println(F("Hidden"));
-      else if (bbuf==1) Serial.println(F("Visible"));
-	  else Serial.println(bbuf);
-      }
-  else Serial.println(F("Error reading SSID visibility"));
-  
-  if (CONFIG::read_buffer(EP_WEB_PORT,  (byte *)&ibuf , INTEGER_LENGTH))
-  {
-      Serial.print(F("Web port: "));
-	  Serial.println(ibuf);
-       }
-  else Serial.println(F("Error reading web port"));
-  
-  if (CONFIG::read_buffer(EP_DATA_PORT,  (byte *)&ibuf , INTEGER_LENGTH))
-  {
-      Serial.print(F("Data port: "));
-	  Serial.println(ibuf);
-  }
-  else Serial.println(F("Error reading data port"));
-  
-  if (CONFIG::read_byte(EP_REFRESH_PAGE_TIME, &bbuf ))
-  {
-      Serial.print(F("Web page refresh time: "));
-	  Serial.println(byte(bbuf));
-	    }
-  else Serial.println(F("Error reading refresh page"));
-  
-  if (CONFIG::read_string(EP_HOSTNAME, sbuf , MAX_HOSTNAME_LENGTH))
-  {
-      Serial.print(F("Hostname: "));
-	  Serial.println(sbuf);
-   }
-  else Serial.println(F("Error reading hostname"));
-  
-  if (CONFIG::read_buffer(EP_XY_FEEDRATE,  (byte *)&ibuf , INTEGER_LENGTH))
-  {
-      Serial.print(F("XY feed rate: "));
-   Serial.println(ibuf);
-     }
-  else Serial.println(F("Error reading XY feed rate"));
-  
-  if (CONFIG::read_buffer(EP_Z_FEEDRATE,  (byte *)&ibuf , INTEGER_LENGTH))
-  {
-      Serial.print(F("Z feed rate: "));
-   Serial.println(ibuf);
-  }
-  else Serial.println(F("Error reading Z feed rate"));
-  
-  if (CONFIG::read_buffer(EP_E_FEEDRATE,  (byte *)&ibuf , INTEGER_LENGTH))
-  {
-      Serial.print(F("E feed rate: "));
-    Serial.println(ibuf);
-      }
-  else Serial.println(F("Error reading E feed rate"));
-  
-  Serial.print(F("Captive portal: "));
- #ifdef CAPTIVE_PORTAL_FEATURE
-  Serial.println(F("Enabled"));
- #else
-  Serial.println(F("Disabled"));
+    //if (CONFIG::read_string(EP_PASSWORD, sbuf , MAX_PASSWORD_LENGTH))Serial.println(sbuf);
+
+    if (CONFIG::read_byte(EP_IP_MODE, &bbuf )) {
+        Serial.print(F("IP Mode: "));
+        if (byte(bbuf)==STATIC_IP_MODE) {
+            Serial.println(F("Static"));
+        } else  if (byte(bbuf)==DHCP_MODE) {
+            Serial.println(F("DHCP"));
+        } else {
+            Serial.println(F("???"));
+        }
+    } else {
+        Serial.println(F("Error reading IP mode"));
+    }
+
+    if (CONFIG::read_buffer(EP_IP_VALUE,(byte *)sbuf , IP_LENGTH)) {
+        Serial.print(F("IP: "));
+        Serial.println(wifi_config.ip2str((byte *)sbuf));
+    } else {
+        Serial.println(F("Error reading IP"));
+    }
+
+    if (CONFIG::read_buffer(EP_MASK_VALUE, (byte *)sbuf  , IP_LENGTH)) {
+        Serial.print(F("Subnet: "));
+        Serial.println(wifi_config.ip2str((byte *)sbuf));
+    } else {
+        Serial.println(F("Error reading subnet"));
+    }
+
+    if (CONFIG::read_buffer(EP_GATEWAY_VALUE, (byte *)sbuf  , IP_LENGTH)) {
+        Serial.print(F("Gateway: "));
+        Serial.println(wifi_config.ip2str((byte *)sbuf));
+    } else {
+        Serial.println(F("Error reading gateway"));
+    }
+
+    if (CONFIG::read_buffer(EP_BAUD_RATE,  (byte *)&ibuf , INTEGER_LENGTH)) {
+        Serial.print(F("Baud rate: "));
+        Serial.println(ibuf);
+    } else {
+        Serial.println(F("Error reading baud rate"));
+    }
+
+    if (CONFIG::read_byte(EP_PHY_MODE, &bbuf )) {
+        Serial.print(F("Phy mode: "));
+        if (byte(bbuf)==PHY_MODE_11B) {
+            Serial.println(F("11b"));
+        } else if (byte(bbuf)==PHY_MODE_11G) {
+            Serial.println(F("11g"));
+        } else if (byte(bbuf)==PHY_MODE_11N) {
+            Serial.println(F("11n"));
+        } else {
+            Serial.println(F("???"));
+        }
+    } else {
+        Serial.println(F("Error reading phy mode"));
+    }
+
+    if (CONFIG::read_byte(EP_SLEEP_MODE, &bbuf )) {
+        Serial.print(F("Sleep mode: "));
+        if (byte(bbuf)==NONE_SLEEP_T) {
+            Serial.println(F("None"));
+        } else if (byte(bbuf)==LIGHT_SLEEP_T) {
+            Serial.println(F("Light"));
+        } else if (byte(bbuf)==MODEM_SLEEP_T) {
+            Serial.println(F("Modem"));
+        } else {
+            Serial.println(F("???"));
+        }
+    } else {
+        Serial.println(F("Error reading sleep mode"));
+    }
+
+    if (CONFIG::read_byte(EP_CHANNEL, &bbuf )) {
+        Serial.print(F("Channel: "));
+        Serial.println(byte(bbuf));
+    } else {
+        Serial.println(F("Error reading channel"));
+    }
+
+    if (CONFIG::read_byte(EP_AUTH_TYPE, &bbuf )) {
+        Serial.print(F("Authentification: "));
+        if (byte(bbuf)==AUTH_OPEN) {
+            Serial.println(F("None"));
+        } else if (byte(bbuf)==AUTH_WEP) {
+            Serial.println(F("WEP"));
+        } else if (byte(bbuf)==AUTH_WPA_PSK) {
+            Serial.println(F("WPA"));
+        } else if (byte(bbuf)==AUTH_WPA2_PSK) {
+            Serial.println(F("WPA2"));
+        } else if (byte(bbuf)==AUTH_WPA_WPA2_PSK) {
+            Serial.println(F("WPA/WPA2"));
+        } else {
+            Serial.println(F("???"));
+        }
+    } else {
+        Serial.println(F("Error reading authentification"));
+    }
+
+    if (CONFIG::read_byte(EP_SSID_VISIBLE, &bbuf )) {
+        Serial.print(F("SSID visibility: "));
+        if (bbuf==0) {
+            Serial.println(F("Hidden"));
+        } else if (bbuf==1) {
+            Serial.println(F("Visible"));
+        } else {
+            Serial.println(bbuf);
+        }
+    } else {
+        Serial.println(F("Error reading SSID visibility"));
+    }
+
+    if (CONFIG::read_buffer(EP_WEB_PORT,  (byte *)&ibuf , INTEGER_LENGTH)) {
+        Serial.print(F("Web port: "));
+        Serial.println(ibuf);
+    } else {
+        Serial.println(F("Error reading web port"));
+    }
+
+    if (CONFIG::read_buffer(EP_DATA_PORT,  (byte *)&ibuf , INTEGER_LENGTH)) {
+        Serial.print(F("Data port: "));
+        Serial.println(ibuf);
+    } else {
+        Serial.println(F("Error reading data port"));
+    }
+
+    if (CONFIG::read_byte(EP_REFRESH_PAGE_TIME, &bbuf )) {
+        Serial.print(F("Web page refresh time: "));
+        Serial.println(byte(bbuf));
+    } else {
+        Serial.println(F("Error reading refresh page"));
+    }
+
+    if (CONFIG::read_string(EP_HOSTNAME, sbuf , MAX_HOSTNAME_LENGTH)) {
+        Serial.print(F("Hostname: "));
+        Serial.println(sbuf);
+    } else {
+        Serial.println(F("Error reading hostname"));
+    }
+
+    if (CONFIG::read_buffer(EP_XY_FEEDRATE,  (byte *)&ibuf , INTEGER_LENGTH)) {
+        Serial.print(F("XY feed rate: "));
+        Serial.println(ibuf);
+    } else {
+        Serial.println(F("Error reading XY feed rate"));
+    }
+
+    if (CONFIG::read_buffer(EP_Z_FEEDRATE,  (byte *)&ibuf , INTEGER_LENGTH)) {
+        Serial.print(F("Z feed rate: "));
+        Serial.println(ibuf);
+    } else {
+        Serial.println(F("Error reading Z feed rate"));
+    }
+
+    if (CONFIG::read_buffer(EP_E_FEEDRATE,  (byte *)&ibuf , INTEGER_LENGTH)) {
+        Serial.print(F("E feed rate: "));
+        Serial.println(ibuf);
+    } else {
+        Serial.println(F("Error reading E feed rate"));
+    }
+
+    Serial.print(F("Captive portal: "));
+#ifdef CAPTIVE_PORTAL_FEATURE
+    Serial.println(F("Enabled"));
+#else
+    Serial.println(F("Disabled"));
 #endif
-  Serial.print(F("SSDP: "));
+    Serial.print(F("SSDP: "));
 #ifdef SSDP_FEATURE
-  Serial.println(F("Enabled"));
- #else
-  Serial.println(F("Disabled"));
+    Serial.println(F("Enabled"));
+#else
+    Serial.println(F("Disabled"));
 #endif
-  Serial.print(F("mDNS: "));
+    Serial.print(F("mDNS: "));
 #ifdef MDNS_FEATURE
-  Serial.println(F("Enabled"));
- #else
-  Serial.println(F("Disabled"));
+    Serial.println(F("Enabled"));
+#else
+    Serial.println(F("Disabled"));
 #endif
-} 
+}
diff --git a/esp8266/config.h b/esp8266/config.h
index 8904b0db..f4ae1344 100644
--- a/esp8266/config.h
+++ b/esp8266/config.h
@@ -20,7 +20,7 @@
 
 //comment to disable
 //MDNS_FEATURE: this feature allow  type the name defined
-//in web browser by default: http:\\esp8266.local and connect 
+//in web browser by default: http:\\esp8266.local and connect
 #define MDNS_FEATURE
 
 //SSDD_FEATURE: this feature is a discovery protocol, supported on Windows out of the box
@@ -119,7 +119,7 @@ const char DEFAULT_ADMIN []  PROGMEM =	"admin";
 
 class CONFIG
 {
-  public:
+public:
     static bool read_string(int pos, char byte_buffer[], int size_max);
     static bool read_string(int pos, String & sbuffer, int size_max);
     static bool read_buffer(int pos, byte byte_buffer[], int size_buffer);
diff --git a/esp8266/esp8266.ino b/esp8266/esp8266.ino
index 653f5d29..5ef9a906 100644
--- a/esp8266/esp8266.ino
+++ b/esp8266/esp8266.ino
@@ -19,7 +19,7 @@
 
     Latest version of the code and documentation can be found here :
     https://github.com/luc-github/ESP8266
-    
+
     Main author: luc lebosse
 
 */
@@ -55,90 +55,101 @@ extern "C" {
 WiFiServer * data_server;
 WiFiClient serverClients[MAX_SRV_CLIENTS];
 
-void setup() {
-  // init:
-   web_interface = NULL;
-  data_server = NULL;
- // ESP.wdtDisable();
-  system_update_cpu_freq(SYS_CPU_160MHZ);
-  delay(8000);
-  bool breset_config=false;
-  //check if reset config is requested
-  pinMode(RESET_CONFIG_PIN, INPUT);
-  if (digitalRead(RESET_CONFIG_PIN)==0)breset_config=true;//if requested =>reset settings
-  //default baud rate
-  long baud_rate=0;
-  
-  //check if EEPROM has value
-  if ( CONFIG::read_buffer(EP_BAUD_RATE,  (byte *)&baud_rate , INTEGER_LENGTH)&&CONFIG::read_buffer(EP_WEB_PORT,  (byte *)&(wifi_config.iweb_port) , INTEGER_LENGTH)&&CONFIG::read_buffer(EP_DATA_PORT,  (byte *)&(wifi_config.idata_port) , INTEGER_LENGTH))
-    {
-      //check if baud value is one of allowed ones
-      if ( ! (baud_rate==9600 || baud_rate==19200 ||baud_rate==38400 ||baud_rate==57600 ||baud_rate==115200 ||baud_rate==230400 ||baud_rate==250000) )breset_config=true;//baud rate is incorrect =>reset settings
-	  if (wifi_config.iweb_port<1 ||wifi_config.iweb_port>65001 || wifi_config.idata_port <1 || wifi_config.idata_port >65001)breset_config=true; //out of range =>reset settings
-    
+void setup()
+{
+    // init:
+    web_interface = NULL;
+    data_server = NULL;
+// ESP.wdtDisable();
+    system_update_cpu_freq(SYS_CPU_160MHZ);
+    delay(8000);
+    bool breset_config=false;
+    //check if reset config is requested
+    pinMode(RESET_CONFIG_PIN, INPUT);
+    if (digitalRead(RESET_CONFIG_PIN)==0) {
+        breset_config=true;    //if requested =>reset settings
     }
-  else breset_config=true;//cannot access to config settings=> reset settings
- 
-  
-  //reset is requested
-  if(breset_config)
-    {
-    //update EEPROM with default settings
-    Serial.begin(9600);
-    delay(2000);
-	Serial.println(F("M117 ESP EEPROM reset"));
-    CONFIG::reset_config();
+    //default baud rate
+    long baud_rate=0;
+
+    //check if EEPROM has value
+    if ( CONFIG::read_buffer(EP_BAUD_RATE,  (byte *)&baud_rate , INTEGER_LENGTH)&&CONFIG::read_buffer(EP_WEB_PORT,  (byte *)&(wifi_config.iweb_port) , INTEGER_LENGTH)&&CONFIG::read_buffer(EP_DATA_PORT,  (byte *)&(wifi_config.idata_port) , INTEGER_LENGTH)) {
+        //check if baud value is one of allowed ones
+        if ( ! (baud_rate==9600 || baud_rate==19200 ||baud_rate==38400 ||baud_rate==57600 ||baud_rate==115200 ||baud_rate==230400 ||baud_rate==250000) ) {
+            breset_config=true;    //baud rate is incorrect =>reset settings
+        }
+        if (wifi_config.iweb_port<1 ||wifi_config.iweb_port>65001 || wifi_config.idata_port <1 || wifi_config.idata_port >65001) {
+            breset_config=true;    //out of range =>reset settings
+        }
+
+    } else {
+        breset_config=true;    //cannot access to config settings=> reset settings
+    }
+
+
+    //reset is requested
+    if(breset_config) {
+        //update EEPROM with default settings
+        Serial.begin(9600);
+        delay(2000);
+        Serial.println(F("M117 ESP EEPROM reset"));
+        CONFIG::reset_config();
+        delay(1000);
+        //put some default value to a void some exception at first start
+        WiFi.mode(WIFI_AP);
+        wifi_set_phy_mode(PHY_MODE_11G);
+        Serial.flush();
+        delay(500);
+        Serial.swap();
+        delay(100);
+        //restart once reset config is done
+        ESP.restart();
+        while (1) {
+            delay(1);
+        };
+    }
+    //setup serial
+    Serial.begin(baud_rate);
     delay(1000);
-    //put some default value to a void some exception at first start
-    WiFi.mode(WIFI_AP);
-    wifi_set_phy_mode(PHY_MODE_11G);
-    Serial.flush();
-	delay(500);
-	Serial.swap();
-	delay(100);
-	//restart once reset config is done
-    ESP.restart();
-	while (1){delay(1);};
+    wifi_config.baud_rate=baud_rate;
+    //setup wifi according settings
+    if (!wifi_config.Setup()) {
+        wifi_config.Safe_Setup();
     }
-  //setup serial
-  Serial.begin(baud_rate);
-  delay(1000);
-  wifi_config.baud_rate=baud_rate;
-  //setup wifi according settings
-  if (!wifi_config.Setup()) wifi_config.Safe_Setup();
-  delay(1000);
-  //start interfaces
-  web_interface = new WEBINTERFACE_CLASS(wifi_config.iweb_port);
-  data_server = new WiFiServer (wifi_config.idata_port);
-  //here the list of headers to be recorded
-  const char * headerkeys[] = {"Cookie"} ;
-  size_t headerkeyssize = sizeof(headerkeys)/sizeof(char*);
-  //ask server to track these headers
-  web_interface->WebServer.collectHeaders(headerkeys, headerkeyssize );
-  web_interface->WebServer.begin();
-  data_server->begin();
-  data_server->setNoDelay(true);
+    delay(1000);
+    //start interfaces
+    web_interface = new WEBINTERFACE_CLASS(wifi_config.iweb_port);
+    data_server = new WiFiServer (wifi_config.idata_port);
+    //here the list of headers to be recorded
+    const char * headerkeys[] = {"Cookie"} ;
+    size_t headerkeyssize = sizeof(headerkeys)/sizeof(char*);
+    //ask server to track these headers
+    web_interface->WebServer.collectHeaders(headerkeys, headerkeyssize );
+    web_interface->WebServer.begin();
+    data_server->begin();
+    data_server->setNoDelay(true);
 
 #ifdef MDNS_FEATURE
-	// Check for any mDNS queries and send responses
-	wifi_config.mdns.addService("http", "tcp", wifi_config.iweb_port);
+    // Check for any mDNS queries and send responses
+    wifi_config.mdns.addService("http", "tcp", wifi_config.iweb_port);
 #endif
 
 #ifdef CAPTIVE_PORTAL_FEATURE
-   if (wifi_get_opmode()!=WIFI_STA )
-	{
-	 // if DNSServer is started with "*" for domain name, it will reply with
-	 // provided IP to all DNS request
-	 dnsServer.setErrorReplyCode(DNSReplyCode::NoError);
-     dnsServer.start(DNS_PORT, "*", WiFi.softAPIP());
-	}
-  #endif
+    if (wifi_get_opmode()!=WIFI_STA ) {
+        // if DNSServer is started with "*" for domain name, it will reply with
+        // provided IP to all DNS request
+        dnsServer.setErrorReplyCode(DNSReplyCode::NoError);
+        dnsServer.start(DNS_PORT, "*", WiFi.softAPIP());
+    }
+#endif
 
 #ifdef SSDP_FEATURE
-	String stmp;
-	SSDP.setSchemaURL("description.xml");
+    String stmp;
+    SSDP.setSchemaURL("description.xml");
     SSDP.setHTTPPort( wifi_config.iweb_port);
-    if (!CONFIG::read_string(EP_HOSTNAME, stmp , MAX_HOSTNAME_LENGTH))stmp=wifi_config.get_default_hostname();
+    if (!CONFIG::read_string(EP_HOSTNAME, stmp , MAX_HOSTNAME_LENGTH)) {
+        stmp=wifi_config.get_default_hostname();
+    }
     SSDP.setName(stmp.c_str());
     stmp=String(system_get_chip_id());
     SSDP.setSerialNumber(stmp.c_str());
@@ -150,70 +161,73 @@ void setup() {
     SSDP.setManufacturerURL("http://espressif.com");
     SSDP.begin();
 #endif
-SPIFFS.begin();
+    SPIFFS.begin();
 }
 
 
 //main loop
-void loop() {
+void loop()
+{
 #ifdef CAPTIVE_PORTAL_FEATURE
-   if (wifi_get_opmode()!=WIFI_STA )
-	{
-	dnsServer.processNextRequest();
-	}
+    if (wifi_get_opmode()!=WIFI_STA ) {
+        dnsServer.processNextRequest();
+    }
 #endif
 //web requests
-web_interface->WebServer.handleClient();
+    web_interface->WebServer.handleClient();
 //TODO use a method to handle serial also in class and call it instead of this one
-uint8_t i,data;
-  //check if there are any new clients
-  if (data_server->hasClient()){
-    for(i = 0; i < MAX_SRV_CLIENTS; i++){
-      //find free/disconnected spot
-      if (!serverClients[i] || !serverClients[i].connected()){
-        if(serverClients[i]) serverClients[i].stop();
-        serverClients[i] = data_server->available();
-        continue;
-      }
+    uint8_t i,data;
+    //check if there are any new clients
+    if (data_server->hasClient()) {
+        for(i = 0; i < MAX_SRV_CLIENTS; i++) {
+            //find free/disconnected spot
+            if (!serverClients[i] || !serverClients[i].connected()) {
+                if(serverClients[i]) {
+                    serverClients[i].stop();
+                }
+                serverClients[i] = data_server->available();
+                continue;
+            }
+        }
+        //no free/disconnected spot so reject
+        WiFiClient serverClient = data_server->available();
+        serverClient.stop();
     }
-    //no free/disconnected spot so reject
-    WiFiClient serverClient = data_server->available();
-    serverClient.stop();
-  }
-  //check clients for data
-  for(i = 0; i < MAX_SRV_CLIENTS; i++){
-    if (serverClients[i] && serverClients[i].connected()){
-      if(serverClients[i].available()){
-        //get data from the tcp client and push it to the UART
-        while(serverClients[i].available()){
-         data = serverClients[i].read();
-         Serial.write(data);
-         COMMAND::read_buffer_tcp(data);
-         }
-      }
+    //check clients for data
+    for(i = 0; i < MAX_SRV_CLIENTS; i++) {
+        if (serverClients[i] && serverClients[i].connected()) {
+            if(serverClients[i].available()) {
+                //get data from the tcp client and push it to the UART
+                while(serverClients[i].available()) {
+                    data = serverClients[i].read();
+                    Serial.write(data);
+                    COMMAND::read_buffer_tcp(data);
+                }
+            }
+        }
     }
-  }
-  //check UART for data
-  if(Serial.available()){
-    size_t len = Serial.available();
-    uint8_t sbuf[len];
-    Serial.readBytes(sbuf, len);
-    //push UART data to all connected tcp clients
-    for(i = 0; i < MAX_SRV_CLIENTS; i++){
-      if (serverClients[i] && serverClients[i].connected()){
-        serverClients[i].write(sbuf, len);
-        delay(1);
-      }
-	  COMMAND::read_buffer_serial(sbuf, len);
+    //check UART for data
+    if(Serial.available()) {
+        size_t len = Serial.available();
+        uint8_t sbuf[len];
+        Serial.readBytes(sbuf, len);
+        //push UART data to all connected tcp clients
+        for(i = 0; i < MAX_SRV_CLIENTS; i++) {
+            if (serverClients[i] && serverClients[i].connected()) {
+                serverClients[i].write(sbuf, len);
+                delay(1);
+            }
+            COMMAND::read_buffer_serial(sbuf, len);
+        }
+    }
+    if (web_interface->restartmodule) {
+        Serial.flush();
+        delay(500);
+        Serial.swap();
+        delay(100);
+        ESP.restart();
+        while (1) {
+            delay(1);
+        };
     }
-  }
-  if (web_interface->restartmodule)
-	{
-			Serial.flush();
-			delay(500);
-			Serial.swap();
-			delay(100);
-			ESP.restart();
-			while (1){delay(1);};
-	}
 }
diff --git a/esp8266/storestrings.cpp b/esp8266/storestrings.cpp
index 28a760e8..c5bcafb9 100644
--- a/esp8266/storestrings.cpp
+++ b/esp8266/storestrings.cpp
@@ -1,8 +1,8 @@
-/* 
+/*
   storestrings.cpp - rolling storage class
 
   Copyright (c) 2014 Luc Lebosse. All rights reserved.
- 
+
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
@@ -19,107 +19,121 @@
 */
 #include "storestrings.h"
 //Constructor
-STORESTRINGS_CLASS::STORESTRINGS_CLASS (int maxsize , int maxstringlength){
+STORESTRINGS_CLASS::STORESTRINGS_CLASS (int maxsize , int maxstringlength)
+{
 //for rolling buffer
 //if max size is reached then remove oldest one and add the new one
-_maxsize=maxsize;
+    _maxsize=maxsize;
 //to limit the storage space
-_maxstringlength=maxstringlength;
+    _maxstringlength=maxstringlength;
 //need space for the "..."
-if (_maxstringlength<4 && _maxstringlength!=-1)_maxstringlength=4;
+    if (_maxstringlength<4 && _maxstringlength!=-1) {
+        _maxstringlength=4;
+    }
 }
 //Destructor
-STORESTRINGS_CLASS::~STORESTRINGS_CLASS (){
-	// clear list and content
-	clear();
+STORESTRINGS_CLASS::~STORESTRINGS_CLASS ()
+{
+    // clear list and content
+    clear();
 }
 
 bool STORESTRINGS_CLASS::setsize(int size)
 {
-	_maxsize=size;
-	return true;
+    _maxsize=size;
+    return true;
 }
 bool STORESTRINGS_CLASS::setlength(int len)
 {
-  if (len < 4) return false;
-  _maxstringlength = len;
-	return true;
+    if (len < 4) {
+        return false;
+    }
+    _maxstringlength = len;
+    return true;
 }
 
 //Clear list and content
-void STORESTRINGS_CLASS::clear(){
-	//while list is not empty
-	while(_charlist.size()){
-		//remove element
-		char * str = _charlist.pop();
-		//destroy it
-		delete str;
-	}
+void STORESTRINGS_CLASS::clear()
+{
+    //while list is not empty
+    while(_charlist.size()) {
+        //remove element
+        char * str = _charlist.pop();
+        //destroy it
+        delete str;
+    }
 }
 
 bool STORESTRINGS_CLASS::add (const __FlashStringHelper *str)
 {
-	String stmp;
-	stmp=str;
-	return add(stmp.c_str());
+    String stmp;
+    stmp=str;
+    return add(stmp.c_str());
 }
 //Add element in storage
-bool STORESTRINGS_CLASS::add (const char * string){
-	//if we reach max size
-	if (_maxsize==_charlist.size())
-		{//remove oldest one
-			char * str = _charlist.shift();
-			delete str;
-		}
-	//add new one
-	//get size including \0 at the end
-	size_t size = strlen(string)+1;
-	bool need_resize=false;
-	if ( (_maxstringlength!=-1) && (size >_maxstringlength+1 ))
-		{
-			need_resize = true;
-			size=_maxstringlength+1;
-		}
-	//reserve memory
-	char * ptr = new char[size*sizeof(char)];
-	//copy string to storage
-	if (need_resize)
-		{  //copy maximum length minus 3
-			strncpy(ptr,string,_maxstringlength-3);
-			strcpy(ptr+_maxstringlength-3,"...");
-		}
-	else
-		{ //copy as it is
-			strcpy(ptr,string);
-		}
-	//add storage to list
-	_charlist.add(ptr);
-	return true;
+bool STORESTRINGS_CLASS::add (const char * string)
+{
+    //if we reach max size
+    if (_maxsize==_charlist.size()) {
+        //remove oldest one
+        char * str = _charlist.shift();
+        delete str;
+    }
+    //add new one
+    //get size including \0 at the end
+    size_t size = strlen(string)+1;
+    bool need_resize=false;
+    if ( (_maxstringlength!=-1) && (size >_maxstringlength+1 )) {
+        need_resize = true;
+        size=_maxstringlength+1;
+    }
+    //reserve memory
+    char * ptr = new char[size*sizeof(char)];
+    //copy string to storage
+    if (need_resize) {
+        //copy maximum length minus 3
+        strncpy(ptr,string,_maxstringlength-3);
+        strcpy(ptr+_maxstringlength-3,"...");
+    } else {
+        //copy as it is
+        strcpy(ptr,string);
+    }
+    //add storage to list
+    _charlist.add(ptr);
+    return true;
 }
 //Remove element at pos position
 bool STORESTRINGS_CLASS::remove(int pos)
-{  //be sure index is in range
-	if (pos<0 && pos>(_charlist.size()-1)) return false;
-	//remove item from list
-	char * str = _charlist.remove(pos);
-	//destroy item
-	delete str;
-	return true;
+{
+    //be sure index is in range
+    if (pos<0 && pos>(_charlist.size()-1)) {
+        return false;
+    }
+    //remove item from list
+    char * str = _charlist.remove(pos);
+    //destroy item
+    delete str;
+    return true;
 }
 //Get element at pos position
 const char * STORESTRINGS_CLASS::get(int pos)
-{  //be sure index is in range
-	if (pos<0 && pos>(_charlist.size()-1)) return NULL;
-	return (const char *) _charlist.get(pos);
+{
+    //be sure index is in range
+    if (pos<0 && pos>(_charlist.size()-1)) {
+        return NULL;
+    }
+    return (const char *) _charlist.get(pos);
 }
 //Get index for defined string
 int STORESTRINGS_CLASS::get_index(const char * string)
-{//parse the list until it is found
-	for (int p=0;p<_charlist.size();p++)
-		{
-			if (strcmp ( _charlist.get(p),  string)==0)return p;
-		}
-	//if not found return -1
-	return -1;
+{
+    //parse the list until it is found
+    for (int p=0; p<_charlist.size(); p++) {
+        if (strcmp ( _charlist.get(p),  string)==0) {
+            return p;
+        }
+    }
+    //if not found return -1
+    return -1;
 }
 
diff --git a/esp8266/storestrings.h b/esp8266/storestrings.h
index 4809084d..6589f50b 100644
--- a/esp8266/storestrings.h
+++ b/esp8266/storestrings.h
@@ -1,8 +1,8 @@
-/* 
+/*
   storestrings.h - rolling storage class
 
   Copyright (c) 2014 Luc Lebosse. All rights reserved.
- 
+
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
@@ -24,26 +24,38 @@
 #include "LinkedList.h"
 class STORESTRINGS_CLASS
 {
-  public:
-  STORESTRINGS_CLASS (int maxsize = -1, int maxstringlength=-1);
-  ~STORESTRINGS_CLASS ();
-  bool add (const char * string);
-  inline bool add (String & string) {return add(string.c_str());};
-  bool add (const __FlashStringHelper *str);
-  bool remove(int pos);
-  const char * get(int pos);
-  int get_index(const char * string);
-  void clear();
-  inline int size() {return _charlist.size();};
-  bool setsize(int size);
-  bool setlength(int len);
-  inline int getsize() {return _maxsize;};
-  inline int getlength() {return _maxstringlength;};
+public:
+    STORESTRINGS_CLASS (int maxsize = -1, int maxstringlength=-1);
+    ~STORESTRINGS_CLASS ();
+    bool add (const char * string);
+    inline bool add (String & string)
+    {
+        return add(string.c_str());
+    };
+    bool add (const __FlashStringHelper *str);
+    bool remove(int pos);
+    const char * get(int pos);
+    int get_index(const char * string);
+    void clear();
+    inline int size()
+    {
+        return _charlist.size();
+    };
+    bool setsize(int size);
+    bool setlength(int len);
+    inline int getsize()
+    {
+        return _maxsize;
+    };
+    inline int getlength()
+    {
+        return _maxstringlength;
+    };
 
-  private:
-  int _maxsize;
-  int _maxstringlength;
-  LinkedList<char *> _charlist;
+private:
+    int _maxsize;
+    int _maxstringlength;
+    LinkedList<char *> _charlist;
 };
 
 #endif
diff --git a/esp8266/webinterface.cpp b/esp8266/webinterface.cpp
index 3b910a7a..9ab6a2b7 100644
--- a/esp8266/webinterface.cpp
+++ b/esp8266/webinterface.cpp
@@ -1,8 +1,8 @@
-/* 
+/*
   webinterface.cpp - esp8266 configuration class
 
   Copyright (c) 2014 Luc Lebosse. All rights reserved.
- 
+
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
@@ -206,372 +206,380 @@ const char MISSING_DATA [] PROGMEM = "Error: Missing data";
 const char EEPROM_NOWRITE [] PROGMEM = "Error: Cannot write to EEPROM";
 
 bool WEBINTERFACE_CLASS::isHostnameValid(const char * hostname)
-{  //limited size 
-	char c;
-	if (strlen(hostname)>MAX_HOSTNAME_LENGTH || strlen(hostname) < 1) return false;
-	//only letter and digit
-	for (int i=0;i < strlen(hostname);i++)
-		{
-			c = hostname[i];
-			if (!(isdigit(c) || isalpha(c) || c=='_')) return false;
-			if (c==' ') return false;
-		}
-	return true;
+{
+    //limited size
+    char c;
+    if (strlen(hostname)>MAX_HOSTNAME_LENGTH || strlen(hostname) < 1) {
+        return false;
+    }
+    //only letter and digit
+    for (int i=0; i < strlen(hostname); i++) {
+        c = hostname[i];
+        if (!(isdigit(c) || isalpha(c) || c=='_')) {
+            return false;
+        }
+        if (c==' ') {
+            return false;
+        }
+    }
+    return true;
 }
 
 bool WEBINTERFACE_CLASS::isSSIDValid(const char * ssid)
-{  //limited size 
-	char c;
-	if (strlen(ssid)>MAX_SSID_LENGTH || strlen(ssid)<MIN_SSID_LENGTH) return false;
-	//only letter and digit
-	for (int i=0;i < strlen(ssid);i++)
-		{
-			c = ssid[i];
-			//if (!(isdigit(c) || isalpha(c))) return false;
-			if (c==' ') return false;
-		}
-	return true;
+{
+    //limited size
+    char c;
+    if (strlen(ssid)>MAX_SSID_LENGTH || strlen(ssid)<MIN_SSID_LENGTH) {
+        return false;
+    }
+    //only letter and digit
+    for (int i=0; i < strlen(ssid); i++) {
+        c = ssid[i];
+        //if (!(isdigit(c) || isalpha(c))) return false;
+        if (c==' ') {
+            return false;
+        }
+    }
+    return true;
 }
 
 bool WEBINTERFACE_CLASS::isPasswordValid(const char * password)
 {
-	 //limited size 
-	if ((strlen(password)>MAX_PASSWORD_LENGTH)||  (strlen(password)<MIN_PASSWORD_LENGTH)) return false;
-	//no space allowed
-	for (int i=0;i < strlen(password);i++)
-    if (password[i] == ' ') return false;
-  
-	return true;
+    //limited size
+    if ((strlen(password)>MAX_PASSWORD_LENGTH)||  (strlen(password)<MIN_PASSWORD_LENGTH)) {
+        return false;
+    }
+    //no space allowed
+    for (int i=0; i < strlen(password); i++)
+        if (password[i] == ' ') {
+            return false;
+        }
+
+    return true;
 }
 
 bool WEBINTERFACE_CLASS::isAdminPasswordValid(const char * password)
 {
-	char c;
-	 //limited size 
-	if ((strlen(password)>MAX_ADMIN_PASSWORD_LENGTH)||  (strlen(password)<MIN_ADMIN_PASSWORD_LENGTH)) return false;
-	//no space allowed
-	for (int i=0;i < strlen(password);i++)
-		{
-			c= password[i];
-			if (c==' ') return false;
-		}
-	return true;
+    char c;
+    //limited size
+    if ((strlen(password)>MAX_ADMIN_PASSWORD_LENGTH)||  (strlen(password)<MIN_ADMIN_PASSWORD_LENGTH)) {
+        return false;
+    }
+    //no space allowed
+    for (int i=0; i < strlen(password); i++) {
+        c= password[i];
+        if (c==' ') {
+            return false;
+        }
+    }
+    return true;
 }
 
 bool WEBINTERFACE_CLASS::isIPValid(const char * IP)
-{  //limited size 
-	int internalcount=0;
-	int dotcount = 0;
-	bool previouswasdot=false;
-	char c;
+{
+    //limited size
+    int internalcount=0;
+    int dotcount = 0;
+    bool previouswasdot=false;
+    char c;
 
-	if (strlen(IP)>15 || strlen(IP)==0) return false;
-	//cannot start with .
-	if (IP[0]=='.')return false;
-	//only letter and digit
-	for (int i=0;i < strlen(IP);i++)
-		{
-			c = IP[i];
-			if (isdigit(c))
-				{//only 3 digit at once
-					internalcount++;
-					previouswasdot=false;
-					if (internalcount>3)return false;
-				}
-			else if(c=='.')
-				{   //cannot have 2 dots side by side
-					if (previouswasdot)return false;
-					previouswasdot=true;
-					internalcount=0;
-					dotcount++;
-				}//if not a dot neither a digit it is wrong
-			else return false;
-		}
-	//if not 3 dots then it is wrong
-	if (dotcount!=3)return false;
-	//cannot have the last dot as last char
-	if (IP[strlen(IP)-1]=='.')return false;
-	return true;
+    if (strlen(IP)>15 || strlen(IP)==0) {
+        return false;
+    }
+    //cannot start with .
+    if (IP[0]=='.') {
+        return false;
+    }
+    //only letter and digit
+    for (int i=0; i < strlen(IP); i++) {
+        c = IP[i];
+        if (isdigit(c)) {
+            //only 3 digit at once
+            internalcount++;
+            previouswasdot=false;
+            if (internalcount>3) {
+                return false;
+            }
+        } else if(c=='.') {
+            //cannot have 2 dots side by side
+            if (previouswasdot) {
+                return false;
+            }
+            previouswasdot=true;
+            internalcount=0;
+            dotcount++;
+        }//if not a dot neither a digit it is wrong
+        else {
+            return false;
+        }
+    }
+    //if not 3 dots then it is wrong
+    if (dotcount!=3) {
+        return false;
+    }
+    //cannot have the last dot as last char
+    if (IP[strlen(IP)-1]=='.') {
+        return false;
+    }
+    return true;
 }
 
 //TODO should be in some tool class
-char * intTostr(int value){
-static char result [12];
-sprintf(result,"%d",value);
-return result;
+char * intTostr(int value)
+{
+    static char result [12];
+    sprintf(result,"%d",value);
+    return result;
 }
 
 //TODO: should be in webserver class
 bool processTemplate(const char  * filename, STORESTRINGS_CLASS & KeysList ,  STORESTRINGS_CLASS & ValuesList )
 {
-	if(KeysList.size() != ValuesList.size())  //Sanity check  
-	return false;
+    if(KeysList.size() != ValuesList.size()) { //Sanity check
+        return false;
+    }
 
-	LinkedList<File> myFileList  = LinkedList<File>();
-	String  buffer2send;
-  String bufferheader(F("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: "));
-	int size_content=0;
-	bool header_sent=false;
-  
-	//one loop to calculate size + one loop to really send
-	//size_content is a mandatory element to avoid memory leak
-	for(int processing_step=0;processing_step<2;processing_step++)
-	{
-		buffer2send="";
-		//open template file
-		File currentfile = SPIFFS.open(filename, "r");
-		//if error display error on web page
-		if (!currentfile) 
-			{
-				buffer2send = String(F("Error opening: ")) + filename;
-				web_interface->WebServer.send(200,"text/plain",buffer2send);
-				return false;
-			}
-		else //template is open 
-			{
-				 int b ;
-				String sLine;
-				bool bprocessing=true;
+    LinkedList<File> myFileList  = LinkedList<File>();
+    String  buffer2send;
+    String bufferheader(F("HTTP/1.1 200 OK\r\nContent-Type: text/html\r\nContent-Length: "));
+    int size_content=0;
+    bool header_sent=false;
 
-				while (bprocessing) //read all bytes
-				{
-				b = currentfile.read(); //from current open file
-				if (b!=-1) //if not EOF
-					{
-						sLine+=char(b); //add to current line
-						if (b=='\n') //end of line is reached
-							{   //change all variables by their values
-								for (int k=0;k<KeysList.size();k++)
-										sLine.replace(KeysList.get(k),ValuesList.get(k));
-								//is line an Include line ? no others command will be displayed 
-								//but they can be used to build file name like
-								//$INCLUDE[$SHORT_FILENAME$-$MODE$.inc]$
-								int pos_tag=sLine.indexOf("$INCLUDE[");
-								if (pos_tag!=-1) //if yes
-									{  //extract include file name
-										int pos_tag_end = sLine.indexOf("]$");
-										String includefilename = "/"+sLine.substring( pos_tag+strlen("$INCLUDE["),pos_tag_end);
-										//try to open include file
-										File includefile = SPIFFS.open(includefilename, "r");
-										 if (!includefile)  //if error display it on web page
-											{
-											buffer2send+= String("Error opening: ") + includefilename;
-											}
-										else //if include is open lets read it, current open file is now include file
-											{
-												myFileList.add(currentfile);
-												currentfile=includefile;
-											}
-									}
-								else //if it is not include file 
-									{ //check if there is a table to display
-										int pos_tag=sLine.indexOf("$CONNECTED_STATIONS[");
-										if (pos_tag!=-1) //if yes
-											{  //extract line
-												int pos_tag_end = sLine.indexOf("]$",pos_tag);
-												int nb = -1;
-												int ipos = -1;
-												//part before repetitive section
-												String beforelinetoprocess=sLine.substring( 0,pos_tag);
-												//part after repetitive section
-												String afterlinetoprocess=sLine.substring( pos_tag_end+2);
-												//repetitive section itself
-												String linetoprocess =sLine.substring( pos_tag+strlen("$CONNECTED_STATIONS["),pos_tag_end);
-												String tablepart;
-												//get how many items
-												ipos=KeysList.get_index("$CONNECTED_STATIONS_NB_ITEMS$");
-												if (ipos >-1)
-													{   //get value
-														nb=atoi(ValuesList.get(ipos));
-														ipos=ipos-(nb*3);
-													}
-												//do a sanity check data are there
-												String Last_IP_Key = "$IP_CONNECTED["+String(nb-1)+"]$";
-												if (nb>0 && (KeysList.get_index("$ROW_NUMBER[0]$")==ipos) &&(Last_IP_Key==KeysList.get(ipos-1+(nb*3))))
-													{
-													for (int j=0;j<nb;j++)
-														{
-															String tmppart=linetoprocess + "\n";
-															if (ipos+j>-1)
-																{
-																	tmppart.replace("$ROW_NUMBER$",ValuesList.get(ipos+0+(j*3)));
-																	tmppart.replace("$MAC_CONNECTED$",ValuesList.get(ipos+1+(j*3)));
-																	tmppart.replace("$IP_CONNECTED$",ValuesList.get(ipos+2+(j*3)));
-																}
-															tablepart +=tmppart;
-														}
-													}
-												//now build back
-												sLine = beforelinetoprocess + tablepart + afterlinetoprocess;
-											}
-										
-										pos_tag=sLine.indexOf("$AVAILABLE_AP[");
-										if (pos_tag!=-1) //if yes
-											{  //extract line
-												int pos_tag_end = sLine.indexOf("]$",pos_tag);
-												int nb = -1;
-												int ipos = -1;
-												//part before repetitive section
-												String beforelinetoprocess=sLine.substring( 0,pos_tag);
-												//part after repetitive section
-												String afterlinetoprocess=sLine.substring( pos_tag_end+2);
-												//repetitive section itself
-												String linetoprocess =sLine.substring( pos_tag+strlen("$AVAILABLE_AP["),pos_tag_end);
-												String tablepart;
-												//get how many items
-												ipos=KeysList.get_index("$AVAILABLE_AP_NB_ITEMS$");
-												if (ipos >-1)
-													{   //get value
-														nb=atoi(ValuesList.get(ipos));
-														ipos=ipos-(nb*4);
-													}
-												//do a sanity check data are there
-												String Last_IP_Key = "$IS_PROTECTED["+String(nb-1)+"]$";
-												if (nb>0 && (KeysList.get_index("$ROW_NUMBER[0]$")==ipos) &&(Last_IP_Key==KeysList.get(ipos-1+(nb*4))))
-													{
-													for (int j=0;j<nb;j++)
-														{
-															String tmppart=linetoprocess + "\n";
-															if (ipos+j>-1)
-																{
-																	tmppart.replace("$ROW_NUMBER$",ValuesList.get(ipos+0+(j*4)));
-																	tmppart.replace("$AP_SSID$",ValuesList.get(ipos+1+(j*4)));
-																	tmppart.replace("$AP_SIGNAL$",ValuesList.get(ipos+2+(j*4)));
-																	tmppart.replace("$IS_PROTECTED$",ValuesList.get(ipos+3+(j*4)));
-																}
-															tablepart +=tmppart;
-														}
-													}
-												//now build back
-												sLine = beforelinetoprocess + tablepart + afterlinetoprocess;
-											}
-										
-										//add current line to buffer
-										buffer2send+=sLine;
-										//if buffer limit is reached
-										if (buffer2send.length()>1200)
-										{  //if we are just doing size calculation
-											if (processing_step==0)
-											{  //add buffer size
-												size_content+=buffer2send.length();
-											}
-											else //if no size calculation, send data
-											{ //if header is not send yet 
-											if (!header_sent)
-												{//send header with calculated size
-												header_sent=true;
-												 web_interface->WebServer.sendContent(bufferheader);
-												}
-											//send data
-											 web_interface->WebServer.sendContent(buffer2send);
-											}
-											//reset buffer
-											buffer2send="";
-										}
-									}
-								 //reset line
-								sLine="";
-								//add a delay for safety for WDT
-								delay(1);
-							}
-					}
-				else //EOF is reached
-					{   //close current file
-						currentfile.close();
-						//if current file is not template file but included one
-						if (myFileList.size()>0)
-							{  //get level +1 file description and continue
-								currentfile = myFileList.pop();
-							}
-						else
-							{//we have done template parsing, let's stop reading
-							bprocessing=false;
-							}
-					}
-				}
-			}
-		//check if something is still in buffer and need to be send
-		if (buffer2send!=""){
-			//if we are doing size calculation
-			if (processing_step==0)
-				{  //add buffer size
-					size_content+=buffer2send.length();
-				}
-			else //if no size calculation, send data
-				{ //if header is not send yet 
-				  if (!header_sent)
-						{//send header with calculated size
-						 web_interface->WebServer.sendContent(bufferheader);
-						}
-				  //send data
-				   web_interface->WebServer.sendContent(buffer2send);
-				}
-		  }
-    //if we end size calculation loop
-	if (processing_step==0)
-		{  //let's build the header with correct size'
-			bufferheader.concat(size_content);
-			bufferheader.concat(F("\r\nConnection: close\r\nAccess-Control-Allow-Origin: *\r\n\r\n"));
-		}
-	}
-	return true;
+    //one loop to calculate size + one loop to really send
+    //size_content is a mandatory element to avoid memory leak
+    for(int processing_step=0; processing_step<2; processing_step++) {
+        buffer2send="";
+        //open template file
+        File currentfile = SPIFFS.open(filename, "r");
+        //if error display error on web page
+        if (!currentfile) {
+            buffer2send = String(F("Error opening: ")) + filename;
+            web_interface->WebServer.send(200,"text/plain",buffer2send);
+            return false;
+        } else { //template is open
+            int b ;
+            String sLine;
+            bool bprocessing=true;
+
+            while (bprocessing) { //read all bytes
+                b = currentfile.read(); //from current open file
+                if (b!=-1) { //if not EOF
+                    sLine+=char(b); //add to current line
+                    if (b=='\n') { //end of line is reached
+                        //change all variables by their values
+                        for (int k=0; k<KeysList.size(); k++) {
+                            sLine.replace(KeysList.get(k),ValuesList.get(k));
+                        }
+                        //is line an Include line ? no others command will be displayed
+                        //but they can be used to build file name like
+                        //$INCLUDE[$SHORT_FILENAME$-$MODE$.inc]$
+                        int pos_tag=sLine.indexOf("$INCLUDE[");
+                        if (pos_tag!=-1) { //if yes
+                            //extract include file name
+                            int pos_tag_end = sLine.indexOf("]$");
+                            String includefilename = "/"+sLine.substring( pos_tag+strlen("$INCLUDE["),pos_tag_end);
+                            //try to open include file
+                            File includefile = SPIFFS.open(includefilename, "r");
+                            if (!includefile) { //if error display it on web page
+                                buffer2send+= String("Error opening: ") + includefilename;
+                            } else { //if include is open lets read it, current open file is now include file
+                                myFileList.add(currentfile);
+                                currentfile=includefile;
+                            }
+                        } else { //if it is not include file
+                            //check if there is a table to display
+                            int pos_tag=sLine.indexOf("$CONNECTED_STATIONS[");
+                            if (pos_tag!=-1) { //if yes
+                                //extract line
+                                int pos_tag_end = sLine.indexOf("]$",pos_tag);
+                                int nb = -1;
+                                int ipos = -1;
+                                //part before repetitive section
+                                String beforelinetoprocess=sLine.substring( 0,pos_tag);
+                                //part after repetitive section
+                                String afterlinetoprocess=sLine.substring( pos_tag_end+2);
+                                //repetitive section itself
+                                String linetoprocess =sLine.substring( pos_tag+strlen("$CONNECTED_STATIONS["),pos_tag_end);
+                                String tablepart;
+                                //get how many items
+                                ipos=KeysList.get_index("$CONNECTED_STATIONS_NB_ITEMS$");
+                                if (ipos >-1) {
+                                    //get value
+                                    nb=atoi(ValuesList.get(ipos));
+                                    ipos=ipos-(nb*3);
+                                }
+                                //do a sanity check data are there
+                                String Last_IP_Key = "$IP_CONNECTED["+String(nb-1)+"]$";
+                                if (nb>0 && (KeysList.get_index("$ROW_NUMBER[0]$")==ipos) &&(Last_IP_Key==KeysList.get(ipos-1+(nb*3)))) {
+                                    for (int j=0; j<nb; j++) {
+                                        String tmppart=linetoprocess + "\n";
+                                        if (ipos+j>-1) {
+                                            tmppart.replace("$ROW_NUMBER$",ValuesList.get(ipos+0+(j*3)));
+                                            tmppart.replace("$MAC_CONNECTED$",ValuesList.get(ipos+1+(j*3)));
+                                            tmppart.replace("$IP_CONNECTED$",ValuesList.get(ipos+2+(j*3)));
+                                        }
+                                        tablepart +=tmppart;
+                                    }
+                                }
+                                //now build back
+                                sLine = beforelinetoprocess + tablepart + afterlinetoprocess;
+                            }
+
+                            pos_tag=sLine.indexOf("$AVAILABLE_AP[");
+                            if (pos_tag!=-1) { //if yes
+                                //extract line
+                                int pos_tag_end = sLine.indexOf("]$",pos_tag);
+                                int nb = -1;
+                                int ipos = -1;
+                                //part before repetitive section
+                                String beforelinetoprocess=sLine.substring( 0,pos_tag);
+                                //part after repetitive section
+                                String afterlinetoprocess=sLine.substring( pos_tag_end+2);
+                                //repetitive section itself
+                                String linetoprocess =sLine.substring( pos_tag+strlen("$AVAILABLE_AP["),pos_tag_end);
+                                String tablepart;
+                                //get how many items
+                                ipos=KeysList.get_index("$AVAILABLE_AP_NB_ITEMS$");
+                                if (ipos >-1) {
+                                    //get value
+                                    nb=atoi(ValuesList.get(ipos));
+                                    ipos=ipos-(nb*4);
+                                }
+                                //do a sanity check data are there
+                                String Last_IP_Key = "$IS_PROTECTED["+String(nb-1)+"]$";
+                                if (nb>0 && (KeysList.get_index("$ROW_NUMBER[0]$")==ipos) &&(Last_IP_Key==KeysList.get(ipos-1+(nb*4)))) {
+                                    for (int j=0; j<nb; j++) {
+                                        String tmppart=linetoprocess + "\n";
+                                        if (ipos+j>-1) {
+                                            tmppart.replace("$ROW_NUMBER$",ValuesList.get(ipos+0+(j*4)));
+                                            tmppart.replace("$AP_SSID$",ValuesList.get(ipos+1+(j*4)));
+                                            tmppart.replace("$AP_SIGNAL$",ValuesList.get(ipos+2+(j*4)));
+                                            tmppart.replace("$IS_PROTECTED$",ValuesList.get(ipos+3+(j*4)));
+                                        }
+                                        tablepart +=tmppart;
+                                    }
+                                }
+                                //now build back
+                                sLine = beforelinetoprocess + tablepart + afterlinetoprocess;
+                            }
+
+                            //add current line to buffer
+                            buffer2send+=sLine;
+                            //if buffer limit is reached
+                            if (buffer2send.length()>1200) {
+                                //if we are just doing size calculation
+                                if (processing_step==0) {
+                                    //add buffer size
+                                    size_content+=buffer2send.length();
+                                } else { //if no size calculation, send data
+                                    //if header is not send yet
+                                    if (!header_sent) {
+                                        //send header with calculated size
+                                        header_sent=true;
+                                        web_interface->WebServer.sendContent(bufferheader);
+                                    }
+                                    //send data
+                                    web_interface->WebServer.sendContent(buffer2send);
+                                }
+                                //reset buffer
+                                buffer2send="";
+                            }
+                        }
+                        //reset line
+                        sLine="";
+                        //add a delay for safety for WDT
+                        delay(1);
+                    }
+                } else { //EOF is reached
+                    //close current file
+                    currentfile.close();
+                    //if current file is not template file but included one
+                    if (myFileList.size()>0) {
+                        //get level +1 file description and continue
+                        currentfile = myFileList.pop();
+                    } else {
+                        //we have done template parsing, let's stop reading
+                        bprocessing=false;
+                    }
+                }
+            }
+        }
+        //check if something is still in buffer and need to be send
+        if (buffer2send!="") {
+            //if we are doing size calculation
+            if (processing_step==0) {
+                //add buffer size
+                size_content+=buffer2send.length();
+            } else { //if no size calculation, send data
+                //if header is not send yet
+                if (!header_sent) {
+                    //send header with calculated size
+                    web_interface->WebServer.sendContent(bufferheader);
+                }
+                //send data
+                web_interface->WebServer.sendContent(buffer2send);
+            }
+        }
+        //if we end size calculation loop
+        if (processing_step==0) {
+            //let's build the header with correct size'
+            bufferheader.concat(size_content);
+            bufferheader.concat(F("\r\nConnection: close\r\nAccess-Control-Allow-Origin: *\r\n\r\n"));
+        }
+    }
+    return true;
 }
 // -----------------------------------------------------------------------------
 // Helper for FreeMem and Firmware
 // -----------------------------------------------------------------------------
 void GetFreeMem(STORESTRINGS_CLASS & KeysList, STORESTRINGS_CLASS & ValuesList)
 {
-  //FreeMem
-  KeysList.add(FPSTR(KEY_FREE_MEM));
-  ValuesList.add(intTostr(system_get_free_heap_size()));
-  //FW Version
-  KeysList.add(FPSTR(KEY_FW_VER));
-  ValuesList.add(FPSTR(VALUE_FW_VERSION));
+    //FreeMem
+    KeysList.add(FPSTR(KEY_FREE_MEM));
+    ValuesList.add(intTostr(system_get_free_heap_size()));
+    //FW Version
+    KeysList.add(FPSTR(KEY_FW_VER));
+    ValuesList.add(FPSTR(VALUE_FW_VERSION));
 }
 // -----------------------------------------------------------------------------
 // Helper for IP+Web address
 // -----------------------------------------------------------------------------
 void GetIpWeb(STORESTRINGS_CLASS & KeysList, STORESTRINGS_CLASS & ValuesList)
 {
-  String stmp;
-  
-  KeysList.add(FPSTR(KEY_IP));
-  if (wifi_get_opmode() == WIFI_STA )
-    stmp = WiFi.localIP().toString();
-  else stmp = WiFi.softAPIP().toString();
-  ValuesList.add(stmp);
+    String stmp;
 
-  //Web address = ip + port
-  KeysList.add(FPSTR(KEY_WEB_ADDRESS));
-  if (wifi_config.iweb_port != 80)
-    {
-      stmp.concat(":");
-      stmp.concat(wifi_config.iweb_port);
+    KeysList.add(FPSTR(KEY_IP));
+    if (wifi_get_opmode() == WIFI_STA ) {
+        stmp = WiFi.localIP().toString();
+    } else {
+        stmp = WiFi.softAPIP().toString();
     }
-  ValuesList.add(stmp);
+    ValuesList.add(stmp);
+
+    //Web address = ip + port
+    KeysList.add(FPSTR(KEY_WEB_ADDRESS));
+    if (wifi_config.iweb_port != 80) {
+        stmp.concat(":");
+        stmp.concat(wifi_config.iweb_port);
+    }
+    ValuesList.add(stmp);
 }
 // -----------------------------------------------------------------------------
 // Helper for Wifi Mode
 // -----------------------------------------------------------------------------
 void GetMode(STORESTRINGS_CLASS & KeysList, STORESTRINGS_CLASS & ValuesList)
 {
-  if (wifi_get_opmode() == WIFI_STA )
-    {
-      KeysList.add(FPSTR(KEY_MODE));
-      ValuesList.add(FPSTR(VALUE_STA));
-    }
-  else
-    {
-      if (wifi_get_opmode() == WIFI_AP )
-	{
-	  KeysList.add(FPSTR(KEY_MODE));
-	  ValuesList.add(FPSTR(VALUE_AP));
-	}
-      else
-	{
-	  KeysList.add(FPSTR(KEY_MODE));
-	  ValuesList.add(FPSTR(VALUE_AP_STA));
-	}
+    if (wifi_get_opmode() == WIFI_STA ) {
+        KeysList.add(FPSTR(KEY_MODE));
+        ValuesList.add(FPSTR(VALUE_STA));
+    } else {
+        if (wifi_get_opmode() == WIFI_AP ) {
+            KeysList.add(FPSTR(KEY_MODE));
+            ValuesList.add(FPSTR(VALUE_AP));
+        } else {
+            KeysList.add(FPSTR(KEY_MODE));
+            ValuesList.add(FPSTR(VALUE_AP_STA));
+        }
     }
 }
 // -----------------------------------------------------------------------------
@@ -579,31 +587,31 @@ void GetMode(STORESTRINGS_CLASS & KeysList, STORESTRINGS_CLASS & ValuesList)
 // -----------------------------------------------------------------------------
 void GetPorts(STORESTRINGS_CLASS & KeysList, STORESTRINGS_CLASS & ValuesList)
 {
-  //Web port
-  KeysList.add(FPSTR(KEY_WEB_PORT));
-  ValuesList.add(intTostr(wifi_config.iweb_port));
-  //Data port
-  KeysList.add(FPSTR(KEY_DATA_PORT));
-  ValuesList.add(intTostr(wifi_config.idata_port));
+    //Web port
+    KeysList.add(FPSTR(KEY_WEB_PORT));
+    ValuesList.add(intTostr(wifi_config.iweb_port));
+    //Data port
+    KeysList.add(FPSTR(KEY_DATA_PORT));
+    ValuesList.add(intTostr(wifi_config.idata_port));
 }
 // -----------------------------------------------------------------------------
 // Helper for Page properties
 // -----------------------------------------------------------------------------
 void SetPageProp(STORESTRINGS_CLASS & KeysList, STORESTRINGS_CLASS & ValuesList,
-		 const __FlashStringHelper *title, const __FlashStringHelper *filename)
+                 const __FlashStringHelper *title, const __FlashStringHelper *filename)
 {
-  String fullFilename(filename);
-  fullFilename.concat(".tpl");
+    String fullFilename(filename);
+    fullFilename.concat(".tpl");
 
-  //page title
-  KeysList.add(FPSTR(KEY_PAGE_TITLE));
-  ValuesList.add(title);
-  //tpl file name with extension
-  KeysList.add(FPSTR(KEY_FILE_NAME));
-  ValuesList.add(fullFilename);
-  //tpl file name without extension
-  KeysList.add(FPSTR(KEY_SHORT_FILE_NAME));
-  ValuesList.add(filename);
+    //page title
+    KeysList.add(FPSTR(KEY_PAGE_TITLE));
+    ValuesList.add(title);
+    //tpl file name with extension
+    KeysList.add(FPSTR(KEY_FILE_NAME));
+    ValuesList.add(fullFilename);
+    //tpl file name without extension
+    KeysList.add(FPSTR(KEY_SHORT_FILE_NAME));
+    ValuesList.add(filename);
 }
 
 // -----------------------------------------------------------------------------
@@ -611,13 +619,19 @@ void SetPageProp(STORESTRINGS_CLASS & KeysList, STORESTRINGS_CLASS & ValuesList,
 // -----------------------------------------------------------------------------
 void GetDHCPStatus(STORESTRINGS_CLASS & KeysList, STORESTRINGS_CLASS & ValuesList)
 {
-  KeysList.add(FPSTR(KEY_AP_DHCP_STATUS));
-  if (wifi_softap_dhcps_status() == DHCP_STARTED) ValuesList.add(FPSTR(VALUE_STARTED));
-  else ValuesList.add(FPSTR(VALUE_STOPPED));
+    KeysList.add(FPSTR(KEY_AP_DHCP_STATUS));
+    if (wifi_softap_dhcps_status() == DHCP_STARTED) {
+        ValuesList.add(FPSTR(VALUE_STARTED));
+    } else {
+        ValuesList.add(FPSTR(VALUE_STOPPED));
+    }
 
-  KeysList.add(FPSTR(KEY_STA_DHCP_STATUS));
-  if (wifi_station_dhcpc_status()==DHCP_STARTED)ValuesList.add(FPSTR(VALUE_STARTED));
-  else ValuesList.add(FPSTR(VALUE_STOPPED));
+    KeysList.add(FPSTR(KEY_STA_DHCP_STATUS));
+    if (wifi_station_dhcpc_status()==DHCP_STARTED) {
+        ValuesList.add(FPSTR(VALUE_STARTED));
+    } else {
+        ValuesList.add(FPSTR(VALUE_STOPPED));
+    }
 }
 
 // -----------------------------------------------------------------------------
@@ -625,18 +639,18 @@ void GetDHCPStatus(STORESTRINGS_CLASS & KeysList, STORESTRINGS_CLASS & ValuesLis
 // -----------------------------------------------------------------------------
 void ProcessAlertError(STORESTRINGS_CLASS & KeysList, STORESTRINGS_CLASS & ValuesList, String & smsg)
 {
-  KeysList.add(FPSTR(KEY_ERROR_MSG));
-  ValuesList.add(smsg);
-  KeysList.add(FPSTR(KEY_SUCCESS_MSG));
-  ValuesList.add("");
-  KeysList.add(FPSTR(KEY_ERROR_MSG_VISIBILITY ));
-  ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
-  KeysList.add(FPSTR(KEY_SUCCESS_MSG_VISIBILITY));
-  ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
-  KeysList.add(FPSTR(KEY_SUBMIT_BUTTON_VISIBILITY));
-  ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
-  KeysList.add(FPSTR(KEY_SERVICE_PAGE));
-  ValuesList.add("");
+    KeysList.add(FPSTR(KEY_ERROR_MSG));
+    ValuesList.add(smsg);
+    KeysList.add(FPSTR(KEY_SUCCESS_MSG));
+    ValuesList.add("");
+    KeysList.add(FPSTR(KEY_ERROR_MSG_VISIBILITY ));
+    ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
+    KeysList.add(FPSTR(KEY_SUCCESS_MSG_VISIBILITY));
+    ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
+    KeysList.add(FPSTR(KEY_SUBMIT_BUTTON_VISIBILITY));
+    ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
+    KeysList.add(FPSTR(KEY_SERVICE_PAGE));
+    ValuesList.add("");
 }
 
 // -----------------------------------------------------------------------------
@@ -644,16 +658,16 @@ void ProcessAlertError(STORESTRINGS_CLASS & KeysList, STORESTRINGS_CLASS & Value
 // -----------------------------------------------------------------------------
 void ProcessAlertSuccess(STORESTRINGS_CLASS & KeysList, STORESTRINGS_CLASS & ValuesList, String & smsg)
 {
-  KeysList.add(FPSTR(KEY_ERROR_MSG));
-  ValuesList.add("");
-  KeysList.add(FPSTR(KEY_SUCCESS_MSG));
-  ValuesList.add(smsg);
-  KeysList.add(FPSTR(KEY_ERROR_MSG_VISIBILITY ));
-  ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
-  KeysList.add(FPSTR(KEY_SUCCESS_MSG_VISIBILITY));
-  ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
-  KeysList.add(FPSTR(KEY_SUBMIT_BUTTON_VISIBILITY));
-  ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
+    KeysList.add(FPSTR(KEY_ERROR_MSG));
+    ValuesList.add("");
+    KeysList.add(FPSTR(KEY_SUCCESS_MSG));
+    ValuesList.add(smsg);
+    KeysList.add(FPSTR(KEY_ERROR_MSG_VISIBILITY ));
+    ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
+    KeysList.add(FPSTR(KEY_SUCCESS_MSG_VISIBILITY));
+    ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
+    KeysList.add(FPSTR(KEY_SUBMIT_BUTTON_VISIBILITY));
+    ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
 }
 
 // -----------------------------------------------------------------------------
@@ -661,2261 +675,2269 @@ void ProcessAlertSuccess(STORESTRINGS_CLASS & KeysList, STORESTRINGS_CLASS & Val
 // -----------------------------------------------------------------------------
 void ProcessNoAlert(STORESTRINGS_CLASS & KeysList, STORESTRINGS_CLASS & ValuesList)
 {
-  KeysList.add(FPSTR(KEY_ERROR_MSG));
-  ValuesList.add("");
-  KeysList.add(FPSTR(KEY_SUCCESS_MSG));
-  ValuesList.add("");
-  KeysList.add(FPSTR(KEY_ERROR_MSG_VISIBILITY ));
-  ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
-  KeysList.add(FPSTR(KEY_SUCCESS_MSG_VISIBILITY));
-  ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
-  KeysList.add(FPSTR(KEY_SUBMIT_BUTTON_VISIBILITY));
-  ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
-  KeysList.add(FPSTR(KEY_SERVICE_PAGE));
-  ValuesList.add("");
+    KeysList.add(FPSTR(KEY_ERROR_MSG));
+    ValuesList.add("");
+    KeysList.add(FPSTR(KEY_SUCCESS_MSG));
+    ValuesList.add("");
+    KeysList.add(FPSTR(KEY_ERROR_MSG_VISIBILITY ));
+    ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
+    KeysList.add(FPSTR(KEY_SUCCESS_MSG_VISIBILITY));
+    ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
+    KeysList.add(FPSTR(KEY_SUBMIT_BUTTON_VISIBILITY));
+    ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
+    KeysList.add(FPSTR(KEY_SERVICE_PAGE));
+    ValuesList.add("");
 }
 
 //root insterface
 void handle_web_interface_root()
 {
-	String stmp;
-	long lstatus;
-	int istatus;
-	byte bbuf;
-	STORESTRINGS_CLASS KeysList ;
-	STORESTRINGS_CLASS ValuesList ;
-	struct softap_config apconfig;
-	struct ip_info info;
-	uint8_t mac [WL_MAC_ADDR_LENGTH];
+    String stmp;
+    long lstatus;
+    int istatus;
+    byte bbuf;
+    STORESTRINGS_CLASS KeysList ;
+    STORESTRINGS_CLASS ValuesList ;
+    struct softap_config apconfig;
+    struct ip_info info;
+    uint8_t mac [WL_MAC_ADDR_LENGTH];
 
-	KeysList.add(FPSTR(KEY_DISCONNECT_VISIBILITY));
-	if (web_interface->is_authenticated())ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
-	else ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
+    KeysList.add(FPSTR(KEY_DISCONNECT_VISIBILITY));
+    if (web_interface->is_authenticated()) {
+        ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
+    } else {
+        ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
+    }
 
-	//IP+Web
-	GetIpWeb(KeysList, ValuesList);
+    //IP+Web
+    GetIpWeb(KeysList, ValuesList);
 
-	//Hostname
-	if (wifi_get_opmode()==WIFI_STA )
-		{
-		KeysList.add(FPSTR(KEY_MODE));
-		ValuesList.add(FPSTR(VALUE_STA));
-		KeysList.add(FPSTR(KEY_HOSTNAME));
-		ValuesList.add(wifi_config.get_hostname());
-		KeysList.add(FPSTR(KEY_HOSTNAME_VISIBLE));
-		ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
-		}
-	else
-		{
-		KeysList.add(FPSTR(KEY_HOSTNAME));
-		ValuesList.add(FPSTR(KEY_NOT_APPLICABLE_4_AP));
-		KeysList.add(FPSTR(KEY_HOSTNAME_VISIBLE));
-		ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
-		if (wifi_get_opmode()==WIFI_AP )
-			{
-				KeysList.add(FPSTR(KEY_MODE));
-				ValuesList.add(FPSTR(VALUE_AP));
-			}
-		else
-			{
-				KeysList.add(FPSTR(KEY_MODE));
-				ValuesList.add(FPSTR(VALUE_AP_STA));
-			}
-		}
+    //Hostname
+    if (wifi_get_opmode()==WIFI_STA ) {
+        KeysList.add(FPSTR(KEY_MODE));
+        ValuesList.add(FPSTR(VALUE_STA));
+        KeysList.add(FPSTR(KEY_HOSTNAME));
+        ValuesList.add(wifi_config.get_hostname());
+        KeysList.add(FPSTR(KEY_HOSTNAME_VISIBLE));
+        ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
+    } else {
+        KeysList.add(FPSTR(KEY_HOSTNAME));
+        ValuesList.add(FPSTR(KEY_NOT_APPLICABLE_4_AP));
+        KeysList.add(FPSTR(KEY_HOSTNAME_VISIBLE));
+        ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
+        if (wifi_get_opmode()==WIFI_AP ) {
+            KeysList.add(FPSTR(KEY_MODE));
+            ValuesList.add(FPSTR(VALUE_AP));
+        } else {
+            KeysList.add(FPSTR(KEY_MODE));
+            ValuesList.add(FPSTR(VALUE_AP_STA));
+        }
+    }
 
-	//page title and filenames
-	SetPageProp(KeysList,ValuesList,FPSTR(VALUE_HOME),F("home"));
-	//menu item
-	KeysList.add(FPSTR(KEY_MENU_HOME));
-	ValuesList.add(FPSTR(VALUE_ACTIVE));
-  
-	//Chip ID
-	KeysList.add(FPSTR(KEY_CHIP_ID));
-	ValuesList.add(intTostr(system_get_chip_id()));
-	//CPU Freq
-	KeysList.add(FPSTR(KEY_CPU_FREQ));
-	ValuesList.add(intTostr(system_get_cpu_freq()));
-	//SDK Version
-	KeysList.add(FPSTR(KEY_SDK_VER));
-	ValuesList.add(system_get_sdk_version());
+    //page title and filenames
+    SetPageProp(KeysList,ValuesList,FPSTR(VALUE_HOME),F("home"));
+    //menu item
+    KeysList.add(FPSTR(KEY_MENU_HOME));
+    ValuesList.add(FPSTR(VALUE_ACTIVE));
 
-	//MDNS Feature
-	#ifdef MDNS_FEATURE
-	KeysList.add(FPSTR(KEY_MDNS_NAME));
-	stmp="http://";
-	stmp+=wifi_config.get_hostname();
-	stmp+=".local";
-	ValuesList.add(stmp);
-	KeysList.add(FPSTR(KEY_MDNS_VISIBLE));
-	ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
-	#else
-	KeysList.add(FPSTR(KEY_MDNS_NAME));
-	ValuesList.add(FPSTR(VALUE_DISABLED));
-	KeysList.add(FPSTR(KEY_MDNS_VISIBLE));
-	ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
-	#endif
+    //Chip ID
+    KeysList.add(FPSTR(KEY_CHIP_ID));
+    ValuesList.add(intTostr(system_get_chip_id()));
+    //CPU Freq
+    KeysList.add(FPSTR(KEY_CPU_FREQ));
+    ValuesList.add(intTostr(system_get_cpu_freq()));
+    //SDK Version
+    KeysList.add(FPSTR(KEY_SDK_VER));
+    ValuesList.add(system_get_sdk_version());
 
-	//SSDP Feature
-	#ifdef SSDP_FEATURE
-	KeysList.add(FPSTR(KEY_SSDP_STATUS));
-	ValuesList.add(FPSTR(VALUE_ENABLED));
-	KeysList.add(FPSTR(KEY_SSDP_VISIBLE));
-	ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
-	#else
-	KeysList.add(FPSTR(KEY_SSDP_STATUS));
-	ValuesList.add(FPSTR(VALUE_DISABLED));
-	KeysList.add(FPSTR(KEY_SSDP_VISIBLE));
-	ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
-	#endif
+    //MDNS Feature
+#ifdef MDNS_FEATURE
+    KeysList.add(FPSTR(KEY_MDNS_NAME));
+    stmp="http://";
+    stmp+=wifi_config.get_hostname();
+    stmp+=".local";
+    ValuesList.add(stmp);
+    KeysList.add(FPSTR(KEY_MDNS_VISIBLE));
+    ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
+#else
+    KeysList.add(FPSTR(KEY_MDNS_NAME));
+    ValuesList.add(FPSTR(VALUE_DISABLED));
+    KeysList.add(FPSTR(KEY_MDNS_VISIBLE));
+    ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
+#endif
 
-	//Captive portal Feature
-	#ifdef CAPTIVE_PORTAL_FEATURE
-	if (wifi_get_opmode()==WIFI_AP)
-		{
-		KeysList.add(FPSTR(KEY_CAPTIVE_PORTAL_STATUS));
-		ValuesList.add(FPSTR(VALUE_ENABLED));
-		KeysList.add(FPSTR(KEY_CAPTIVE_PORTAL_VISIBLE));
-		ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
-		}
-	else
-		{
-		KeysList.add(FPSTR(KEY_CAPTIVE_PORTAL_STATUS));
-		ValuesList.add(FPSTR(VALUE_DISABLED));
-		KeysList.add(FPSTR(KEY_CAPTIVE_PORTAL_VISIBLE));
-		ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
-		}
-	#else
-	KeysList.add(FPSTR(KEY_CAPTIVE_PORTAL_STATUS));
-	ValuesList.add(FPSTR(VALUE_DISABLED));
-	KeysList.add(FPSTR(KEY_CAPTIVE_PORTAL_VISIBLE));
-	ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
-	#endif
+    //SSDP Feature
+#ifdef SSDP_FEATURE
+    KeysList.add(FPSTR(KEY_SSDP_STATUS));
+    ValuesList.add(FPSTR(VALUE_ENABLED));
+    KeysList.add(FPSTR(KEY_SSDP_VISIBLE));
+    ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
+#else
+    KeysList.add(FPSTR(KEY_SSDP_STATUS));
+    ValuesList.add(FPSTR(VALUE_DISABLED));
+    KeysList.add(FPSTR(KEY_SSDP_VISIBLE));
+    ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
+#endif
 
-	//network	
-	KeysList.add(FPSTR(KEY_NET_PHY));
-	if (wifi_get_phy_mode()==PHY_MODE_11B) ValuesList.add(FPSTR(VALUE_11B));
-	else if (wifi_get_phy_mode()==PHY_MODE_11G)ValuesList.add(FPSTR(VALUE_11G));
-	else ValuesList.add(FPSTR(VALUE_11N));
-	//sleep mode
-	KeysList.add(FPSTR(KEY_SLEEP_MODE));
-	if (wifi_get_sleep_type()==NONE_SLEEP_T) ValuesList.add(FPSTR(VALUE_NONE));
-	else if (wifi_get_sleep_type()==LIGHT_SLEEP_T) ValuesList.add(FPSTR(VALUE_LIGHT));
-	else  ValuesList.add(FPSTR(VALUE_MODEM));
-	//Boot version
-	KeysList.add(FPSTR(KEY_BOOT_VER));
-	ValuesList.add(intTostr(system_get_boot_version()));
-	//Baud rate
-	KeysList.add(FPSTR(KEY_BAUD_RATE));
-	ValuesList.add(intTostr(wifi_config.baud_rate));
-	// Web and Data ports
-	GetPorts(KeysList, ValuesList);
+    //Captive portal Feature
+#ifdef CAPTIVE_PORTAL_FEATURE
+    if (wifi_get_opmode()==WIFI_AP) {
+        KeysList.add(FPSTR(KEY_CAPTIVE_PORTAL_STATUS));
+        ValuesList.add(FPSTR(VALUE_ENABLED));
+        KeysList.add(FPSTR(KEY_CAPTIVE_PORTAL_VISIBLE));
+        ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
+    } else {
+        KeysList.add(FPSTR(KEY_CAPTIVE_PORTAL_STATUS));
+        ValuesList.add(FPSTR(VALUE_DISABLED));
+        KeysList.add(FPSTR(KEY_CAPTIVE_PORTAL_VISIBLE));
+        ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
+    }
+#else
+    KeysList.add(FPSTR(KEY_CAPTIVE_PORTAL_STATUS));
+    ValuesList.add(FPSTR(VALUE_DISABLED));
+    KeysList.add(FPSTR(KEY_CAPTIVE_PORTAL_VISIBLE));
+    ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
+#endif
 
-	//AP part
-	if (wifi_get_opmode()==WIFI_AP ||  wifi_get_opmode()==WIFI_AP_STA) 
-		{
-		int client_counter=0;
-		struct station_info * station;
-		//AP is enabled
-		KeysList.add(FPSTR(KEY_AP_STATUS_ENABLED));
-		ValuesList.add(FPSTR(VALUE_ENABLED));
-		//set visible
-		KeysList.add(FPSTR(KEY_AP_VISIBILITY));
-		ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
-		//list of connected clients
-		station = wifi_softap_get_station_info();
-		while(station)
-			{
-				//Row number
-				 stmp = "$ROW_NUMBER["+String(client_counter)+"]$";
-				KeysList.add(stmp.c_str());
-				stmp=String(client_counter+1);
-				ValuesList.add(stmp);
-				//BSSID
-				stmp = "$MAC_CONNECTED["+String(client_counter)+"]$";
-				KeysList.add(stmp.c_str());
-				ValuesList.add(wifi_config.mac2str(station->bssid));
-				//IP
-				stmp = "$IP_CONNECTED["+String(client_counter)+"]$";
-				KeysList.add(stmp.c_str());
-				ValuesList.add(wifi_config.ip2str((byte *)&station->ip));
-			    //increment counter
-				client_counter++;
-				//go next record
-				station = STAILQ_NEXT(station, next);
-			}
-		wifi_softap_free_station_info();
-		//Connected clients
-		KeysList.add(FPSTR(KEY_CONNECTED_STATIONS_NB_ITEMS));
-		ValuesList.add(intTostr(client_counter));
-		}
-	else
-		{
-		//AP is disabled
-		KeysList.add(FPSTR(KEY_AP_STATUS_ENABLED));
-		ValuesList.add(FPSTR(VALUE_DISABLED));
-		//set hide
-		KeysList.add(FPSTR(KEY_AP_VISIBILITY));
-		ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
-		//Connected clients
-		KeysList.add(FPSTR(KEY_CONNECTED_STATIONS_NB_ITEMS));
-		ValuesList.add("0");
-		}
-	//AP mac address
-	KeysList.add(FPSTR(KEY_AP_MAC));
-	ValuesList.add(wifi_config.mac2str(WiFi.softAPmacAddress(mac)));
-	//AP configuration
-	if (wifi_softap_get_config(&apconfig))
-		{
-		//SSID
-		KeysList.add(FPSTR(KEY_AP_SSID));
-		ValuesList.add((char *)(apconfig.ssid));
-		//AP visible or hidden
-		KeysList.add(FPSTR(KEY_AP_IS_VISIBLE));
-		if(apconfig.ssid_hidden==1)ValuesList.add(FPSTR(VALUE_NO));
-		else ValuesList.add(FPSTR(VALUE_YES));
-		//Channel
-		KeysList.add(FPSTR(KEY_AP_CHANNEL));
-		ValuesList.add(intTostr(apconfig.channel));
-		//Authentification mode
-		KeysList.add(FPSTR(KEY_AP_AUTH));
-		if (apconfig.authmode==AUTH_OPEN)ValuesList.add(FPSTR(VALUE_NONE));
-		else if (apconfig.authmode==AUTH_WEP)ValuesList.add(FPSTR(VALUE_WEP));
-		else if (apconfig.authmode==AUTH_WPA_PSK)ValuesList.add(FPSTR(VALUE_WPA));
-		else if (apconfig.authmode==AUTH_WPA2_PSK)ValuesList.add(FPSTR(VALUE_WPA2));
-		else ValuesList.add(FPSTR(VALUE_WPAWPA2));
+    //network
+    KeysList.add(FPSTR(KEY_NET_PHY));
+    if (wifi_get_phy_mode()==PHY_MODE_11B) {
+        ValuesList.add(FPSTR(VALUE_11B));
+    } else if (wifi_get_phy_mode()==PHY_MODE_11G) {
+        ValuesList.add(FPSTR(VALUE_11G));
+    } else {
+        ValuesList.add(FPSTR(VALUE_11N));
+    }
+    //sleep mode
+    KeysList.add(FPSTR(KEY_SLEEP_MODE));
+    if (wifi_get_sleep_type()==NONE_SLEEP_T) {
+        ValuesList.add(FPSTR(VALUE_NONE));
+    } else if (wifi_get_sleep_type()==LIGHT_SLEEP_T) {
+        ValuesList.add(FPSTR(VALUE_LIGHT));
+    } else {
+        ValuesList.add(FPSTR(VALUE_MODEM));
+    }
+    //Boot version
+    KeysList.add(FPSTR(KEY_BOOT_VER));
+    ValuesList.add(intTostr(system_get_boot_version()));
+    //Baud rate
+    KeysList.add(FPSTR(KEY_BAUD_RATE));
+    ValuesList.add(intTostr(wifi_config.baud_rate));
+    // Web and Data ports
+    GetPorts(KeysList, ValuesList);
 
-		//Max connections
-		KeysList.add(FPSTR(KEY_AP_MAX_CON));
-		ValuesList.add(intTostr(apconfig.max_connection));
-		}
-	else
-		{
-		//SSID
-		KeysList.add(FPSTR(KEY_AP_SSID));
-		ValuesList.add(FPSTR(VALUE_NOT_AVAILABLE));
-		//AP visible or hidden
-		KeysList.add(FPSTR(KEY_AP_IS_VISIBLE));
-		ValuesList.add(FPSTR(VALUE_NOT_AVAILABLE));
-		//Channel
-		KeysList.add(FPSTR(KEY_AP_CHANNEL));
-		ValuesList.add(FPSTR(VALUE_NOT_AVAILABLE));
-		//Authentification mode
-		KeysList.add(FPSTR(KEY_AP_AUTH));
-		ValuesList.add(FPSTR(VALUE_NOT_AVAILABLE));
-		//Max connections
-		KeysList.add(FPSTR(KEY_AP_MAX_CON));
-		ValuesList.add(FPSTR(VALUE_NOT_AVAILABLE));
-		}
-		//DHCP Status
-		GetDHCPStatus(KeysList, ValuesList);
-		//IP/GW/MASK
-		if (wifi_get_ip_info(SOFTAP_IF,&info))
-		{
-			//IP address
-			KeysList.add(FPSTR(KEY_AP_IP));
-			ValuesList.add(wifi_config.ip2str(info.ip.addr));
-			//GW address
-			KeysList.add(FPSTR(KEY_AP_GW));
-			ValuesList.add(wifi_config.ip2str(info.gw.addr));
-			//Sub Net Mask
-			KeysList.add(FPSTR(KEY_AP_SUBNET));
-			ValuesList.add(wifi_config.ip2str(info.netmask.addr));
-		}
-	else
-		{
-			//IP address
-			KeysList.add(FPSTR(KEY_AP_IP));
-			ValuesList.add(FPSTR(VALUE_NO_IP));
-			//GW address
-			KeysList.add(FPSTR(KEY_AP_GW));
-			ValuesList.add(FPSTR(VALUE_NO_IP));
-			//Sub Net Mask
-			KeysList.add(FPSTR(KEY_AP_SUBNET));
-			ValuesList.add(FPSTR(VALUE_NO_IP));
-		}
-	//STA part
-	if (wifi_get_opmode()==WIFI_STA ||  wifi_get_opmode()==WIFI_AP_STA) 
-		{
-			//STA is enabled
-			KeysList.add(FPSTR(KEY_STA_STATUS_ENABLED));
-			ValuesList.add(FPSTR(VALUE_ENABLED));
-			//set visible
-			KeysList.add(FPSTR(KEY_STA_VISIBILITY));
-			ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
-		}
-	else
-		{
-			//STA is disabled
-			KeysList.add(FPSTR(KEY_STA_STATUS_ENABLED));
-			ValuesList.add(FPSTR(VALUE_DISABLED));
-			//set hide
-			KeysList.add(FPSTR(KEY_STA_VISIBILITY));
-			ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
-		}
-	//STA mac address
-	KeysList.add(FPSTR(KEY_STA_MAC));
-	ValuesList.add(wifi_config.mac2str(WiFi.macAddress(mac)));
-	//SSID used by STA
-	KeysList.add(FPSTR(KEY_STA_SSID));
-	if (WiFi.SSID().length()==0)ValuesList.add(FPSTR(VALUE_NOT_AVAILABLE));
-	else ValuesList.add(WiFi.SSID().c_str());
-	//Channel
-	KeysList.add(FPSTR(KEY_STA_CHANNEL));
-	ValuesList.add(intTostr (wifi_get_channel()));
-	//Connection status
-	istatus = wifi_station_get_connect_status();
-	KeysList.add(FPSTR(KEY_STA_STATUS));
-	if (istatus==STATION_GOT_IP) ValuesList.add(FPSTR(VALUE_CONNECTED));
-	else if  (istatus==STATION_NO_AP_FOUND) ValuesList.add(FPSTR(VALUE_NO_SSID));
-	else if  (istatus==STATION_CONNECT_FAIL) ValuesList.add(FPSTR(VALUE_CONNECTION_FAILED));
-	else if  (istatus==STATION_WRONG_PASSWORD) ValuesList.add(FPSTR(VALUE_CONNECTION_FAILED2));
-	else if  (istatus==STATION_IDLE) ValuesList.add(FPSTR(VALUE_IDLE));//should not happen
-	else ValuesList.add(FPSTR(VALUE_DISCONNECTED));
-	//DHCP Client status
-	GetDHCPStatus(KeysList, ValuesList);
-	//IP address
-	KeysList.add(FPSTR(KEY_STA_IP));
-	ValuesList.add(WiFi.localIP().toString().c_str());
-	//GW address
-	KeysList.add(FPSTR(KEY_STA_GW));
-	ValuesList.add(WiFi.gatewayIP().toString().c_str());
-	//Sub Net Mask
-	KeysList.add(FPSTR(KEY_STA_SUBNET));
-	ValuesList.add(WiFi.subnetMask().toString().c_str());
-	//Service page / no need refresh on this page
-	KeysList.add(FPSTR(KEY_SERVICE_PAGE));
-	ValuesList.add("");
-	//Firmware & Free Mem, at the end to reflect situation
-	GetFreeMem(KeysList, ValuesList);
+    //AP part
+    if (wifi_get_opmode()==WIFI_AP ||  wifi_get_opmode()==WIFI_AP_STA) {
+        int client_counter=0;
+        struct station_info * station;
+        //AP is enabled
+        KeysList.add(FPSTR(KEY_AP_STATUS_ENABLED));
+        ValuesList.add(FPSTR(VALUE_ENABLED));
+        //set visible
+        KeysList.add(FPSTR(KEY_AP_VISIBILITY));
+        ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
+        //list of connected clients
+        station = wifi_softap_get_station_info();
+        while(station) {
+            //Row number
+            stmp = "$ROW_NUMBER["+String(client_counter)+"]$";
+            KeysList.add(stmp.c_str());
+            stmp=String(client_counter+1);
+            ValuesList.add(stmp);
+            //BSSID
+            stmp = "$MAC_CONNECTED["+String(client_counter)+"]$";
+            KeysList.add(stmp.c_str());
+            ValuesList.add(wifi_config.mac2str(station->bssid));
+            //IP
+            stmp = "$IP_CONNECTED["+String(client_counter)+"]$";
+            KeysList.add(stmp.c_str());
+            ValuesList.add(wifi_config.ip2str((byte *)&station->ip));
+            //increment counter
+            client_counter++;
+            //go next record
+            station = STAILQ_NEXT(station, next);
+        }
+        wifi_softap_free_station_info();
+        //Connected clients
+        KeysList.add(FPSTR(KEY_CONNECTED_STATIONS_NB_ITEMS));
+        ValuesList.add(intTostr(client_counter));
+    } else {
+        //AP is disabled
+        KeysList.add(FPSTR(KEY_AP_STATUS_ENABLED));
+        ValuesList.add(FPSTR(VALUE_DISABLED));
+        //set hide
+        KeysList.add(FPSTR(KEY_AP_VISIBILITY));
+        ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
+        //Connected clients
+        KeysList.add(FPSTR(KEY_CONNECTED_STATIONS_NB_ITEMS));
+        ValuesList.add("0");
+    }
+    //AP mac address
+    KeysList.add(FPSTR(KEY_AP_MAC));
+    ValuesList.add(wifi_config.mac2str(WiFi.softAPmacAddress(mac)));
+    //AP configuration
+    if (wifi_softap_get_config(&apconfig)) {
+        //SSID
+        KeysList.add(FPSTR(KEY_AP_SSID));
+        ValuesList.add((char *)(apconfig.ssid));
+        //AP visible or hidden
+        KeysList.add(FPSTR(KEY_AP_IS_VISIBLE));
+        if(apconfig.ssid_hidden==1) {
+            ValuesList.add(FPSTR(VALUE_NO));
+        } else {
+            ValuesList.add(FPSTR(VALUE_YES));
+        }
+        //Channel
+        KeysList.add(FPSTR(KEY_AP_CHANNEL));
+        ValuesList.add(intTostr(apconfig.channel));
+        //Authentification mode
+        KeysList.add(FPSTR(KEY_AP_AUTH));
+        if (apconfig.authmode==AUTH_OPEN) {
+            ValuesList.add(FPSTR(VALUE_NONE));
+        } else if (apconfig.authmode==AUTH_WEP) {
+            ValuesList.add(FPSTR(VALUE_WEP));
+        } else if (apconfig.authmode==AUTH_WPA_PSK) {
+            ValuesList.add(FPSTR(VALUE_WPA));
+        } else if (apconfig.authmode==AUTH_WPA2_PSK) {
+            ValuesList.add(FPSTR(VALUE_WPA2));
+        } else {
+            ValuesList.add(FPSTR(VALUE_WPAWPA2));
+        }
 
-	//process the template file and provide list of variables
-	processTemplate("/home.tpl", KeysList , ValuesList);
-	//need to clean to speed up memory recovery
-	KeysList.clear();
-	ValuesList.clear();
+        //Max connections
+        KeysList.add(FPSTR(KEY_AP_MAX_CON));
+        ValuesList.add(intTostr(apconfig.max_connection));
+    } else {
+        //SSID
+        KeysList.add(FPSTR(KEY_AP_SSID));
+        ValuesList.add(FPSTR(VALUE_NOT_AVAILABLE));
+        //AP visible or hidden
+        KeysList.add(FPSTR(KEY_AP_IS_VISIBLE));
+        ValuesList.add(FPSTR(VALUE_NOT_AVAILABLE));
+        //Channel
+        KeysList.add(FPSTR(KEY_AP_CHANNEL));
+        ValuesList.add(FPSTR(VALUE_NOT_AVAILABLE));
+        //Authentification mode
+        KeysList.add(FPSTR(KEY_AP_AUTH));
+        ValuesList.add(FPSTR(VALUE_NOT_AVAILABLE));
+        //Max connections
+        KeysList.add(FPSTR(KEY_AP_MAX_CON));
+        ValuesList.add(FPSTR(VALUE_NOT_AVAILABLE));
+    }
+    //DHCP Status
+    GetDHCPStatus(KeysList, ValuesList);
+    //IP/GW/MASK
+    if (wifi_get_ip_info(SOFTAP_IF,&info)) {
+        //IP address
+        KeysList.add(FPSTR(KEY_AP_IP));
+        ValuesList.add(wifi_config.ip2str(info.ip.addr));
+        //GW address
+        KeysList.add(FPSTR(KEY_AP_GW));
+        ValuesList.add(wifi_config.ip2str(info.gw.addr));
+        //Sub Net Mask
+        KeysList.add(FPSTR(KEY_AP_SUBNET));
+        ValuesList.add(wifi_config.ip2str(info.netmask.addr));
+    } else {
+        //IP address
+        KeysList.add(FPSTR(KEY_AP_IP));
+        ValuesList.add(FPSTR(VALUE_NO_IP));
+        //GW address
+        KeysList.add(FPSTR(KEY_AP_GW));
+        ValuesList.add(FPSTR(VALUE_NO_IP));
+        //Sub Net Mask
+        KeysList.add(FPSTR(KEY_AP_SUBNET));
+        ValuesList.add(FPSTR(VALUE_NO_IP));
+    }
+    //STA part
+    if (wifi_get_opmode()==WIFI_STA ||  wifi_get_opmode()==WIFI_AP_STA) {
+        //STA is enabled
+        KeysList.add(FPSTR(KEY_STA_STATUS_ENABLED));
+        ValuesList.add(FPSTR(VALUE_ENABLED));
+        //set visible
+        KeysList.add(FPSTR(KEY_STA_VISIBILITY));
+        ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
+    } else {
+        //STA is disabled
+        KeysList.add(FPSTR(KEY_STA_STATUS_ENABLED));
+        ValuesList.add(FPSTR(VALUE_DISABLED));
+        //set hide
+        KeysList.add(FPSTR(KEY_STA_VISIBILITY));
+        ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
+    }
+    //STA mac address
+    KeysList.add(FPSTR(KEY_STA_MAC));
+    ValuesList.add(wifi_config.mac2str(WiFi.macAddress(mac)));
+    //SSID used by STA
+    KeysList.add(FPSTR(KEY_STA_SSID));
+    if (WiFi.SSID().length()==0) {
+        ValuesList.add(FPSTR(VALUE_NOT_AVAILABLE));
+    } else {
+        ValuesList.add(WiFi.SSID().c_str());
+    }
+    //Channel
+    KeysList.add(FPSTR(KEY_STA_CHANNEL));
+    ValuesList.add(intTostr (wifi_get_channel()));
+    //Connection status
+    istatus = wifi_station_get_connect_status();
+    KeysList.add(FPSTR(KEY_STA_STATUS));
+    if (istatus==STATION_GOT_IP) {
+        ValuesList.add(FPSTR(VALUE_CONNECTED));
+    } else if  (istatus==STATION_NO_AP_FOUND) {
+        ValuesList.add(FPSTR(VALUE_NO_SSID));
+    } else if  (istatus==STATION_CONNECT_FAIL) {
+        ValuesList.add(FPSTR(VALUE_CONNECTION_FAILED));
+    } else if  (istatus==STATION_WRONG_PASSWORD) {
+        ValuesList.add(FPSTR(VALUE_CONNECTION_FAILED2));
+    } else if  (istatus==STATION_IDLE) {
+        ValuesList.add(FPSTR(VALUE_IDLE));    //should not happen
+    } else {
+        ValuesList.add(FPSTR(VALUE_DISCONNECTED));
+    }
+    //DHCP Client status
+    GetDHCPStatus(KeysList, ValuesList);
+    //IP address
+    KeysList.add(FPSTR(KEY_STA_IP));
+    ValuesList.add(WiFi.localIP().toString().c_str());
+    //GW address
+    KeysList.add(FPSTR(KEY_STA_GW));
+    ValuesList.add(WiFi.gatewayIP().toString().c_str());
+    //Sub Net Mask
+    KeysList.add(FPSTR(KEY_STA_SUBNET));
+    ValuesList.add(WiFi.subnetMask().toString().c_str());
+    //Service page / no need refresh on this page
+    KeysList.add(FPSTR(KEY_SERVICE_PAGE));
+    ValuesList.add("");
+    //Firmware & Free Mem, at the end to reflect situation
+    GetFreeMem(KeysList, ValuesList);
+
+    //process the template file and provide list of variables
+    processTemplate("/home.tpl", KeysList , ValuesList);
+    //need to clean to speed up memory recovery
+    KeysList.clear();
+    ValuesList.clear();
 }
 
 void handle_web_interface_configSys()
 {
-  static const char NOT_AUTH_CS [] PROGMEM = "HTTP/1.1 301 OK\r\nLocation: /LOGIN?return=CONFIGSYS\r\nCache-Control: no-cache\r\n\r\n";
-  
-	String stmp,smsg;
-	long lstatus;
-	int istatus;
-	byte bbuf;
-	long ibaud=DEFAULT_BAUD_RATE;
-	int iweb_port =DEFAULT_WEB_PORT;
-	int idata_port =DEFAULT_DATA_PORT;
-	byte bsleepmode=DEFAULT_SLEEP_MODE;
-	bool msg_alert_error=false;
-	bool msg_alert_success=false;
-	long lbaudlist[] = {9600 ,19200,38400,57600,115200,230400,250000,-1};
-	int bmodemvaluelist[] = {NONE_SLEEP_T,LIGHT_SLEEP_T,MODEM_SLEEP_T, -1};
-	const __FlashStringHelper  *smodemdisplaylist[]={FPSTR(VALUE_NONE),FPSTR(VALUE_LIGHT),FPSTR(VALUE_MODEM),FPSTR(VALUE_MODEM)};
-	STORESTRINGS_CLASS KeysList ;
-	STORESTRINGS_CLASS ValuesList ;
+    static const char NOT_AUTH_CS [] PROGMEM = "HTTP/1.1 301 OK\r\nLocation: /LOGIN?return=CONFIGSYS\r\nCache-Control: no-cache\r\n\r\n";
 
-	if (!web_interface->is_authenticated())
-	{
-		web_interface->WebServer.sendContent_P(NOT_AUTH_CS);
-		return;
-	}
+    String stmp,smsg;
+    long lstatus;
+    int istatus;
+    byte bbuf;
+    long ibaud=DEFAULT_BAUD_RATE;
+    int iweb_port =DEFAULT_WEB_PORT;
+    int idata_port =DEFAULT_DATA_PORT;
+    byte bsleepmode=DEFAULT_SLEEP_MODE;
+    bool msg_alert_error=false;
+    bool msg_alert_success=false;
+    long lbaudlist[] = {9600 ,19200,38400,57600,115200,230400,250000,-1};
+    int bmodemvaluelist[] = {NONE_SLEEP_T,LIGHT_SLEEP_T,MODEM_SLEEP_T, -1};
+    const __FlashStringHelper  *smodemdisplaylist[]= {FPSTR(VALUE_NONE),FPSTR(VALUE_LIGHT),FPSTR(VALUE_MODEM),FPSTR(VALUE_MODEM)};
+    STORESTRINGS_CLASS KeysList ;
+    STORESTRINGS_CLASS ValuesList ;
 
-	//IP+Web
-	GetIpWeb(KeysList, ValuesList);
-	//mode
-	GetMode(KeysList, ValuesList);
-	//page title and filenames
-	SetPageProp(KeysList,ValuesList,FPSTR(VALUE_HOME),F("system"));
-	//menu item
-	KeysList.add(FPSTR(KEY_MENU_SYSTEM));
-	ValuesList.add(FPSTR(VALUE_ACTIVE));
+    if (!web_interface->is_authenticated()) {
+        web_interface->WebServer.sendContent_P(NOT_AUTH_CS);
+        return;
+    }
 
-  //check is it is a submission or a display
-  if (web_interface->WebServer.hasArg("SUBMIT"))
-  {   //is there a correct list of values?
-	  	  if (web_interface->WebServer.hasArg("BAUD_RATE") && web_interface->WebServer.hasArg("SLEEP_MODE")&& web_interface->WebServer.hasArg("DATAPORT")&& web_interface->WebServer.hasArg("WEBPORT"))
-		{   //is each value correct ?
-			ibaud  = web_interface->WebServer.arg("BAUD_RATE").toInt();
-			iweb_port  = web_interface->WebServer.arg("WEBPORT").toInt();
-			idata_port  = web_interface->WebServer.arg("DATAPORT").toInt();
-			bsleepmode = web_interface->WebServer.arg("SLEEP_MODE").toInt();
+    //IP+Web
+    GetIpWeb(KeysList, ValuesList);
+    //mode
+    GetMode(KeysList, ValuesList);
+    //page title and filenames
+    SetPageProp(KeysList,ValuesList,FPSTR(VALUE_HOME),F("system"));
+    //menu item
+    KeysList.add(FPSTR(KEY_MENU_SYSTEM));
+    ValuesList.add(FPSTR(VALUE_ACTIVE));
 
-			if (!(iweb_port>0 && iweb_port<65001))
-				{
-					msg_alert_error=true;
-					smsg.concat(F("Error: invalid port value for web port<BR>"));
-					KeysList.add(FPSTR(KEY_WEB_PORT_STATUS));
-					ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-			    }
-			 if (!(idata_port>0 && idata_port<65001))
-				{
-					msg_alert_error=true;
-					smsg.concat("Error: invalid port value for data port<BR>");
-					KeysList.add(FPSTR(KEY_DATA_PORT_STATUS));
-					ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-			    }
-			if (iweb_port== idata_port)
-				{
-					msg_alert_error=true;
-					smsg.concat("Error: web port and data port cannot be identical<BR>");
-					KeysList.add(FPSTR(KEY_WEB_PORT_STATUS));
-					ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-					KeysList.add(FPSTR(KEY_DATA_PORT_STATUS));
-					ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-			    }
-			if (!(ibaud==9600 || ibaud==19200|| ibaud==38400|| ibaud==57600|| ibaud==115200|| ibaud==230400 || ibaud==250000)) 
-				{
-					msg_alert_error=true;
-					smsg.concat(F("Error: value for baud rate is not correct<BR>"));
-					KeysList.add(FPSTR(KEY_BAUD_RATE_STATUS));
-					ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-			    }
-			if (!(bsleepmode==NONE_SLEEP_T ||bsleepmode==LIGHT_SLEEP_T ||bsleepmode==MODEM_SLEEP_T ))
-				{
-					msg_alert_error=true;
-					smsg.concat(F("Error: value for sleeping mode is not correct<BR>"));
-					KeysList.add(FPSTR(KEY_SLEEP_MODE_STATUS));
-					ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-			    }
-	  }
-	  else
-	   {
-		msg_alert_error=true;
-		smsg = FPSTR(MISSING_DATA);
-	   }
-	   //if no error apply the changes
-		if (msg_alert_error!=true)
-			{
-			 if(!CONFIG::write_buffer(EP_BAUD_RATE,(const byte *)&ibaud,INTEGER_LENGTH)||!CONFIG::write_buffer(EP_WEB_PORT,(const byte *)&iweb_port,INTEGER_LENGTH)||!CONFIG::write_buffer(EP_DATA_PORT,(const byte *)&idata_port,INTEGER_LENGTH)||!CONFIG::write_byte(EP_SLEEP_MODE,bsleepmode))
-				{
-					msg_alert_error=true;
-					smsg = FPSTR(EEPROM_NOWRITE);
-				}
-			else
-				{
-					msg_alert_success=true;
-					wifi_config.iweb_port=iweb_port;
-					wifi_config.idata_port=idata_port;
-					smsg = F("Changes saved to EEPROM, restarting....");
-				}
-			}
-  }
-  else //no submit need to get data from EEPROM
-	{
-	if (!CONFIG::read_buffer(EP_BAUD_RATE,  (byte *)&ibaud , INTEGER_LENGTH))ibaud=DEFAULT_BAUD_RATE;
-	if (!CONFIG::read_byte(EP_SLEEP_MODE, &bsleepmode ))bsleepmode=DEFAULT_SLEEP_MODE;
-	if (!CONFIG::read_buffer(EP_WEB_PORT,  (byte *)&iweb_port , INTEGER_LENGTH))iweb_port=DEFAULT_WEB_PORT;
-	if (!CONFIG::read_buffer(EP_DATA_PORT,  (byte *)&idata_port , INTEGER_LENGTH))idata_port=DEFAULT_DATA_PORT;
-	}
-	//Baud rate list
-	istatus = 0;
-	stmp="";
-	while (lbaudlist[istatus]>-1)
-		{
-		stmp+="<OPTION VALUE=\"";
-		stmp+= intTostr(lbaudlist[istatus]);
-		stmp+="\" ";
-		if (lbaudlist[istatus]==ibaud)stmp+=FPSTR(VALUE_SELECTED);
-		stmp+=">" ;
-		stmp+=intTostr(lbaudlist[istatus]);
-		stmp+= "</OPTION>\n";
-		istatus++;
-		}
-	 KeysList.add(FPSTR(KEY_BAUD_RATE_OPTIONS_LIST));
-	 ValuesList.add(stmp);
-	 //Sleep Mode
-	 istatus = 0;
-	stmp="";
-	while (bmodemvaluelist[istatus]>-1)
-		{
-		stmp+="<OPTION VALUE=\"";
-		stmp+= intTostr(bmodemvaluelist[istatus]);
-		stmp+="\" ";
-		if (bmodemvaluelist[istatus]==bsleepmode)stmp+=FPSTR(VALUE_SELECTED);
-		stmp+=">" ;
-		stmp+=smodemdisplaylist[istatus];
-		stmp+= "</OPTION>\n";
-		istatus++;
-		}
-	 KeysList.add(FPSTR(KEY_SLEEP_MODE_OPTIONS_LIST));
-	 ValuesList.add(stmp);
-	 
-	// Web and Data ports
-	GetPorts(KeysList, ValuesList);
+    //check is it is a submission or a display
+    if (web_interface->WebServer.hasArg("SUBMIT")) {
+        //is there a correct list of values?
+        if (web_interface->WebServer.hasArg("BAUD_RATE") && web_interface->WebServer.hasArg("SLEEP_MODE")&& web_interface->WebServer.hasArg("DATAPORT")&& web_interface->WebServer.hasArg("WEBPORT")) {
+            //is each value correct ?
+            ibaud  = web_interface->WebServer.arg("BAUD_RATE").toInt();
+            iweb_port  = web_interface->WebServer.arg("WEBPORT").toInt();
+            idata_port  = web_interface->WebServer.arg("DATAPORT").toInt();
+            bsleepmode = web_interface->WebServer.arg("SLEEP_MODE").toInt();
 
-	if (msg_alert_error)
-		ProcessAlertError(KeysList, ValuesList, smsg);
-	else if (msg_alert_success)
-	{
-		ProcessAlertSuccess(KeysList, ValuesList, smsg);
-		KeysList.add(FPSTR(KEY_SERVICE_PAGE));
-		ValuesList.add(FPSTR(RESTARTCMD));
-		KeysList.add(FPSTR(KEY_BAUD_RATE_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_SLEEP_MODE_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_WEB_PORT_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_DATA_PORT_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-	}
-	
-	else
-	
-		ProcessNoAlert(KeysList, ValuesList);
-	
-	//Firmware and Free Mem, at the end to reflect situation
-	GetFreeMem(KeysList, ValuesList);
+            if (!(iweb_port>0 && iweb_port<65001)) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: invalid port value for web port<BR>"));
+                KeysList.add(FPSTR(KEY_WEB_PORT_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+            if (!(idata_port>0 && idata_port<65001)) {
+                msg_alert_error=true;
+                smsg.concat("Error: invalid port value for data port<BR>");
+                KeysList.add(FPSTR(KEY_DATA_PORT_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+            if (iweb_port== idata_port) {
+                msg_alert_error=true;
+                smsg.concat("Error: web port and data port cannot be identical<BR>");
+                KeysList.add(FPSTR(KEY_WEB_PORT_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+                KeysList.add(FPSTR(KEY_DATA_PORT_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+            if (!(ibaud==9600 || ibaud==19200|| ibaud==38400|| ibaud==57600|| ibaud==115200|| ibaud==230400 || ibaud==250000)) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: value for baud rate is not correct<BR>"));
+                KeysList.add(FPSTR(KEY_BAUD_RATE_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+            if (!(bsleepmode==NONE_SLEEP_T ||bsleepmode==LIGHT_SLEEP_T ||bsleepmode==MODEM_SLEEP_T )) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: value for sleeping mode is not correct<BR>"));
+                KeysList.add(FPSTR(KEY_SLEEP_MODE_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+        } else {
+            msg_alert_error=true;
+            smsg = FPSTR(MISSING_DATA);
+        }
+        //if no error apply the changes
+        if (msg_alert_error!=true) {
+            if(!CONFIG::write_buffer(EP_BAUD_RATE,(const byte *)&ibaud,INTEGER_LENGTH)||!CONFIG::write_buffer(EP_WEB_PORT,(const byte *)&iweb_port,INTEGER_LENGTH)||!CONFIG::write_buffer(EP_DATA_PORT,(const byte *)&idata_port,INTEGER_LENGTH)||!CONFIG::write_byte(EP_SLEEP_MODE,bsleepmode)) {
+                msg_alert_error=true;
+                smsg = FPSTR(EEPROM_NOWRITE);
+            } else {
+                msg_alert_success=true;
+                wifi_config.iweb_port=iweb_port;
+                wifi_config.idata_port=idata_port;
+                smsg = F("Changes saved to EEPROM, restarting....");
+            }
+        }
+    } else { //no submit need to get data from EEPROM
+        if (!CONFIG::read_buffer(EP_BAUD_RATE,  (byte *)&ibaud , INTEGER_LENGTH)) {
+            ibaud=DEFAULT_BAUD_RATE;
+        }
+        if (!CONFIG::read_byte(EP_SLEEP_MODE, &bsleepmode )) {
+            bsleepmode=DEFAULT_SLEEP_MODE;
+        }
+        if (!CONFIG::read_buffer(EP_WEB_PORT,  (byte *)&iweb_port , INTEGER_LENGTH)) {
+            iweb_port=DEFAULT_WEB_PORT;
+        }
+        if (!CONFIG::read_buffer(EP_DATA_PORT,  (byte *)&idata_port , INTEGER_LENGTH)) {
+            idata_port=DEFAULT_DATA_PORT;
+        }
+    }
+    //Baud rate list
+    istatus = 0;
+    stmp="";
+    while (lbaudlist[istatus]>-1) {
+        stmp+="<OPTION VALUE=\"";
+        stmp+= intTostr(lbaudlist[istatus]);
+        stmp+="\" ";
+        if (lbaudlist[istatus]==ibaud) {
+            stmp+=FPSTR(VALUE_SELECTED);
+        }
+        stmp+=">" ;
+        stmp+=intTostr(lbaudlist[istatus]);
+        stmp+= "</OPTION>\n";
+        istatus++;
+    }
+    KeysList.add(FPSTR(KEY_BAUD_RATE_OPTIONS_LIST));
+    ValuesList.add(stmp);
+    //Sleep Mode
+    istatus = 0;
+    stmp="";
+    while (bmodemvaluelist[istatus]>-1) {
+        stmp+="<OPTION VALUE=\"";
+        stmp+= intTostr(bmodemvaluelist[istatus]);
+        stmp+="\" ";
+        if (bmodemvaluelist[istatus]==bsleepmode) {
+            stmp+=FPSTR(VALUE_SELECTED);
+        }
+        stmp+=">" ;
+        stmp+=smodemdisplaylist[istatus];
+        stmp+= "</OPTION>\n";
+        istatus++;
+    }
+    KeysList.add(FPSTR(KEY_SLEEP_MODE_OPTIONS_LIST));
+    ValuesList.add(stmp);
 
-	//process the template file and provide list of variables
-	processTemplate("/system.tpl", KeysList , ValuesList);
-	//need to clean to speed up memory recovery
-	KeysList.clear();
-	ValuesList.clear();
+    // Web and Data ports
+    GetPorts(KeysList, ValuesList);
+
+    if (msg_alert_error) {
+        ProcessAlertError(KeysList, ValuesList, smsg);
+    } else if (msg_alert_success) {
+        ProcessAlertSuccess(KeysList, ValuesList, smsg);
+        KeysList.add(FPSTR(KEY_SERVICE_PAGE));
+        ValuesList.add(FPSTR(RESTARTCMD));
+        KeysList.add(FPSTR(KEY_BAUD_RATE_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_SLEEP_MODE_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_WEB_PORT_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_DATA_PORT_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+    }
+
+    else
+
+    {
+        ProcessNoAlert(KeysList, ValuesList);
+    }
+
+    //Firmware and Free Mem, at the end to reflect situation
+    GetFreeMem(KeysList, ValuesList);
+
+    //process the template file and provide list of variables
+    processTemplate("/system.tpl", KeysList , ValuesList);
+    //need to clean to speed up memory recovery
+    KeysList.clear();
+    ValuesList.clear();
 }
 
 void handle_password()
 {
-  static const char NOT_AUTH_PW [] PROGMEM = "HTTP/1.1 301 OK\r\nLocation: /LOGIN?return=PASSWORD\r\nCache-Control: no-cache\r\n\r\n";
-  
-  String smsg;
-	String sPassword,sPassword2;
-	bool msg_alert_error=false;
-	bool msg_alert_success=false;
-   	int ipos;
-	STORESTRINGS_CLASS KeysList ;
-	STORESTRINGS_CLASS ValuesList ;
-  
-	if (!web_interface->is_authenticated())
-	{
-	web_interface->WebServer.sendContent_P(NOT_AUTH_PW);
-		return;
-	}
+    static const char NOT_AUTH_PW [] PROGMEM = "HTTP/1.1 301 OK\r\nLocation: /LOGIN?return=PASSWORD\r\nCache-Control: no-cache\r\n\r\n";
 
-	//IP+Web
-	GetIpWeb(KeysList, ValuesList);
-	//mode
-	GetMode(KeysList, ValuesList);
-	//page title and filenames
-	SetPageProp(KeysList,ValuesList,FPSTR(VALUE_CHANGE_PASSWORD),F("password"));
-	//menu item
-	KeysList.add(FPSTR(KEY_MENU_ADMIN));
-	ValuesList.add(FPSTR(VALUE_ACTIVE));
+    String smsg;
+    String sPassword,sPassword2;
+    bool msg_alert_error=false;
+    bool msg_alert_success=false;
+    int ipos;
+    STORESTRINGS_CLASS KeysList ;
+    STORESTRINGS_CLASS ValuesList ;
 
-  //check if it is a submission or a display
-  smsg="";
-  if (web_interface->WebServer.hasArg("SUBMIT"))
-  {   //is there a correct list of values?
-	  if (web_interface->WebServer.hasArg("PASSWORD") && web_interface->WebServer.hasArg("PASSWORD2"))
-		{	
-		    //Password
-		    web_interface->urldecode(sPassword,web_interface->WebServer.arg("PASSWORD").c_str());
-		    web_interface->urldecode(sPassword2,web_interface->WebServer.arg("PASSWORD2").c_str());
-		    if (!web_interface->isAdminPasswordValid(sPassword.c_str()) )
-				{
-				msg_alert_error=true;
-				smsg.concat(F("Error: Incorrect password<BR>"));
-				KeysList.add(FPSTR(KEY_USER_PASSWORD_STATUS));
-				ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				}
-			if (sPassword!=sPassword2)
-				{
-				msg_alert_error=true;
-				smsg.concat(F("Error: Passwords do not match<BR>"));
-				KeysList.add(FPSTR(KEY_USER_PASSWORD_STATUS2));
-				ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				}
-		}
-      else
-	   {
-		msg_alert_error=true;
-		smsg = FPSTR(MISSING_DATA);
-	   }
-	  
-	   //if no error apply the change
-	   if (msg_alert_error==false)
-		{
-		//save
-		 if(!CONFIG::write_string(EP_ADMIN_PWD,sPassword.c_str()))
-			{
-				msg_alert_error=true;
-				smsg = FPSTR(EEPROM_NOWRITE);
-			}
-		else
-				{
-					msg_alert_success=true;
-					smsg = F("Changes saved to EEPROM");
-				}
-			}
-		}
-  
-	else //no submit, need to get data from EEPROM
-	{
-	//password 
-	sPassword="";
-	sPassword2="";
-	}
-	//Display values
-	//password
-	KeysList.add(FPSTR(KEY_USER_PASSWORD));
-	ValuesList.add(sPassword);
-	KeysList.add(FPSTR(KEY_USER_PASSWORD2));
-	ValuesList.add(sPassword2);
+    if (!web_interface->is_authenticated()) {
+        web_interface->WebServer.sendContent_P(NOT_AUTH_PW);
+        return;
+    }
 
-if (msg_alert_error)
-    ProcessAlertError(KeysList, ValuesList, smsg);
-	else if (msg_alert_success)
-	{
-		ProcessAlertSuccess(KeysList, ValuesList, smsg);
-		KeysList.add(FPSTR(KEY_SERVICE_PAGE));
-		ValuesList.add("");
-		//Add all green
-		KeysList.add(FPSTR(KEY_USER_PASSWORD_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_USER_PASSWORD_STATUS2));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-	}
-	
-	else
-	
-		ProcessNoAlert(KeysList,ValuesList);
+    //IP+Web
+    GetIpWeb(KeysList, ValuesList);
+    //mode
+    GetMode(KeysList, ValuesList);
+    //page title and filenames
+    SetPageProp(KeysList,ValuesList,FPSTR(VALUE_CHANGE_PASSWORD),F("password"));
+    //menu item
+    KeysList.add(FPSTR(KEY_MENU_ADMIN));
+    ValuesList.add(FPSTR(VALUE_ACTIVE));
 
-	//Firmware and Free Mem, at the end to reflect situation
-	GetFreeMem(KeysList, ValuesList);
+    //check if it is a submission or a display
+    smsg="";
+    if (web_interface->WebServer.hasArg("SUBMIT")) {
+        //is there a correct list of values?
+        if (web_interface->WebServer.hasArg("PASSWORD") && web_interface->WebServer.hasArg("PASSWORD2")) {
+            //Password
+            web_interface->urldecode(sPassword,web_interface->WebServer.arg("PASSWORD").c_str());
+            web_interface->urldecode(sPassword2,web_interface->WebServer.arg("PASSWORD2").c_str());
+            if (!web_interface->isAdminPasswordValid(sPassword.c_str()) ) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Incorrect password<BR>"));
+                KeysList.add(FPSTR(KEY_USER_PASSWORD_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+            if (sPassword!=sPassword2) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Passwords do not match<BR>"));
+                KeysList.add(FPSTR(KEY_USER_PASSWORD_STATUS2));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+        } else {
+            msg_alert_error=true;
+            smsg = FPSTR(MISSING_DATA);
+        }
 
-	//process the template file and provide list of variables
-	processTemplate("/password.tpl", KeysList , ValuesList);
-	//need to clean to speed up memory recovery
-	KeysList.clear();
-	ValuesList.clear();
+        //if no error apply the change
+        if (msg_alert_error==false) {
+            //save
+            if(!CONFIG::write_string(EP_ADMIN_PWD,sPassword.c_str())) {
+                msg_alert_error=true;
+                smsg = FPSTR(EEPROM_NOWRITE);
+            } else {
+                msg_alert_success=true;
+                smsg = F("Changes saved to EEPROM");
+            }
+        }
+    }
+
+    else { //no submit, need to get data from EEPROM
+        //password
+        sPassword="";
+        sPassword2="";
+    }
+    //Display values
+    //password
+    KeysList.add(FPSTR(KEY_USER_PASSWORD));
+    ValuesList.add(sPassword);
+    KeysList.add(FPSTR(KEY_USER_PASSWORD2));
+    ValuesList.add(sPassword2);
+
+    if (msg_alert_error) {
+        ProcessAlertError(KeysList, ValuesList, smsg);
+    } else if (msg_alert_success) {
+        ProcessAlertSuccess(KeysList, ValuesList, smsg);
+        KeysList.add(FPSTR(KEY_SERVICE_PAGE));
+        ValuesList.add("");
+        //Add all green
+        KeysList.add(FPSTR(KEY_USER_PASSWORD_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_USER_PASSWORD_STATUS2));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+    }
+
+    else
+
+    {
+        ProcessNoAlert(KeysList,ValuesList);
+    }
+
+    //Firmware and Free Mem, at the end to reflect situation
+    GetFreeMem(KeysList, ValuesList);
+
+    //process the template file and provide list of variables
+    processTemplate("/password.tpl", KeysList , ValuesList);
+    //need to clean to speed up memory recovery
+    KeysList.clear();
+    ValuesList.clear();
 }
 
 
 void handle_web_interface_configAP()
 {
-  static const char NOT_AUTH_AP [] PROGMEM = "HTTP/1.1 301 OK\r\nLocation: /LOGIN?return=CONFIGAP\r\nCache-Control: no-cache\r\n\r\n";
-  
-	String stmp,smsg;
-	String sSSID,sPassword,sIP,sGW,sMask;
-	bool msg_alert_error=false;
-	bool msg_alert_success=false;
+    static const char NOT_AUTH_AP [] PROGMEM = "HTTP/1.1 301 OK\r\nLocation: /LOGIN?return=CONFIGAP\r\nCache-Control: no-cache\r\n\r\n";
+
+    String stmp,smsg;
+    String sSSID,sPassword,sIP,sGW,sMask;
+    bool msg_alert_error=false;
+    bool msg_alert_success=false;
     byte visible_buf;
     byte static_ip_buf;
     byte auth_buf;
     byte channel_buf;
     byte phy_mode_buf;
     byte ip_sav[4];
-	byte gw_sav[4];
-	byte msk_sav[4];
-	int ipos;
-	int inetworkvaluelist []={PHY_MODE_11B,PHY_MODE_11G,-1};
-	const __FlashStringHelper  * inetworkdisplaylist []={FPSTR(VALUE_11B),FPSTR(VALUE_11G),FPSTR(VALUE_11B)};
-	int iauthvaluelist[] = {AUTH_OPEN,AUTH_WPA_PSK,AUTH_WPA2_PSK,AUTH_WPA_WPA2_PSK,-1};
-	const __FlashStringHelper  * iauthdisplaylist[] = {FPSTR(VALUE_NONE),FPSTR(VALUE_WPA),FPSTR(VALUE_WPA2),FPSTR(VALUE_WPAWPA2)};
-	STORESTRINGS_CLASS KeysList ;
-	STORESTRINGS_CLASS ValuesList ;
-  
-	if (!web_interface->is_authenticated())
-	{
-		web_interface->WebServer.sendContent_P(NOT_AUTH_AP);
-		return;
-	}
+    byte gw_sav[4];
+    byte msk_sav[4];
+    int ipos;
+    int inetworkvaluelist []= {PHY_MODE_11B,PHY_MODE_11G,-1};
+    const __FlashStringHelper  * inetworkdisplaylist []= {FPSTR(VALUE_11B),FPSTR(VALUE_11G),FPSTR(VALUE_11B)};
+    int iauthvaluelist[] = {AUTH_OPEN,AUTH_WPA_PSK,AUTH_WPA2_PSK,AUTH_WPA_WPA2_PSK,-1};
+    const __FlashStringHelper  * iauthdisplaylist[] = {FPSTR(VALUE_NONE),FPSTR(VALUE_WPA),FPSTR(VALUE_WPA2),FPSTR(VALUE_WPAWPA2)};
+    STORESTRINGS_CLASS KeysList ;
+    STORESTRINGS_CLASS ValuesList ;
 
-	//IP+Web
-	GetIpWeb(KeysList, ValuesList);
-	//mode
-	GetMode(KeysList, ValuesList);
-	//page title and filenames
-	SetPageProp(KeysList,ValuesList,FPSTR(VALUE_CONFIG_AP),F("config_ap"));
-	//menu item
-	KeysList.add(FPSTR(KEY_MENU_AP));
-	ValuesList.add(FPSTR(VALUE_ACTIVE));
+    if (!web_interface->is_authenticated()) {
+        web_interface->WebServer.sendContent_P(NOT_AUTH_AP);
+        return;
+    }
 
-  //check is it is a submission or a display
-  smsg="";
-  if (web_interface->WebServer.hasArg("SUBMIT"))
-  {   //is there a correct list of values?
-	  if (web_interface->WebServer.hasArg("SSID") && web_interface->WebServer.hasArg("PASSWORD")&& web_interface->WebServer.hasArg("NETWORK")
-	      && web_interface->WebServer.hasArg("AUTHENTIFICATION")&& web_interface->WebServer.hasArg("IP")
-	      && web_interface->WebServer.hasArg("GATEWAY")&& web_interface->WebServer.hasArg("SUBNET")
-	      && web_interface->WebServer.hasArg("CHANNEL"))
-		{	
-			//SSID
-		    web_interface->urldecode(sSSID,web_interface->WebServer.arg("SSID").c_str());
-		    if (!web_interface->isSSIDValid(sSSID.c_str()))
-				{
-				msg_alert_error=true;
-				smsg.concat(F("Error: Incorrect SSID<BR>"));
-				KeysList.add(FPSTR(KEY_AP_SSID_STATUS));
-				ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				}
-		    //Password
-		    web_interface->urldecode(sPassword,web_interface->WebServer.arg("PASSWORD").c_str());
-		    if (!web_interface->isPasswordValid(sPassword.c_str()))
-				{
-				msg_alert_error=true;
-				smsg.concat(F("Error: Incorrect password<BR>"));
-				KeysList.add(FPSTR(KEY_AP_PASSWORD_STATUS));
-				ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				}
-			//ssid visible ?	
-			if (web_interface->WebServer.hasArg("SSID_VISIBLE")) 
-				{
-					visible_buf=1;
-				}
-			else
-				{
-					visible_buf=0;
-				}
-			//phy mode
-			phy_mode_buf  = byte(web_interface->WebServer.arg("NETWORK").toInt());
-			if (!(phy_mode_buf==PHY_MODE_11B||phy_mode_buf==PHY_MODE_11G) )
-				 {
-					msg_alert_error=true;
-					smsg.concat(F("Error: Incorrect network<BR>"));
-					KeysList.add(FPSTR(KEY_NETWORK_OPTION_LIST_STATUS));
-					ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				 }
-			//channel
-			channel_buf  = byte (web_interface->WebServer.arg("CHANNEL").toInt());
-			if (channel_buf< 1|| channel_buf>11) 
-				 {
-					msg_alert_error=true;
-					smsg.concat("Error: Incorrect channel<BR>");
-					KeysList.add(FPSTR(KEY_CHANNEL_OPTION_LIST_STATUS));
-					ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				 }
-			//authentification
-			auth_buf  = byte(web_interface->WebServer.arg("AUTHENTIFICATION").toInt());
-			if (!(auth_buf == AUTH_OPEN || auth_buf == AUTH_WEP || auth_buf == AUTH_WPA_PSK ||
-		auth_buf == AUTH_WPA2_PSK || auth_buf == AUTH_WPA_WPA2_PSK))
-				 {
-					msg_alert_error=true;
-					smsg.concat(F("Error: Incorrect authentification method<BR>"));
-					KeysList.add(FPSTR(KEY_AUTH_OPTION_LIST_STATUS));
-					ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				 }	
-		    //Static IP ?	
-			if (web_interface->WebServer.hasArg("STATIC_IP") )
-				{
-					static_ip_buf=STATIC_IP_MODE;
-				}
-			else
-				{
-					static_ip_buf=DHCP_MODE;
-				}
-				
-			//IP
-			web_interface->urldecode(sIP,web_interface->WebServer.arg("IP").c_str());
-			if (!web_interface->isIPValid(sIP.c_str()))
-				{
-				msg_alert_error=true;
-				smsg.concat(F("Error: Incorrect IP fortmat<BR>"));
-				KeysList.add(FPSTR(KEY_AP_IP_STATUS));
-				ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				}
+    //IP+Web
+    GetIpWeb(KeysList, ValuesList);
+    //mode
+    GetMode(KeysList, ValuesList);
+    //page title and filenames
+    SetPageProp(KeysList,ValuesList,FPSTR(VALUE_CONFIG_AP),F("config_ap"));
+    //menu item
+    KeysList.add(FPSTR(KEY_MENU_AP));
+    ValuesList.add(FPSTR(VALUE_ACTIVE));
 
-			//Gateway
-			web_interface->urldecode(sGW,web_interface->WebServer.arg("GATEWAY").c_str());
-			if (!web_interface->isIPValid(sGW.c_str()))
-				{
-				msg_alert_error=true;
-				smsg.concat(F("Error: Incorrect gateway<BR>"));
-				KeysList.add(FPSTR(KEY_AP_GW_STATUS));
-				ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				}
-			//subnet
-			web_interface->urldecode(sMask,web_interface->WebServer.arg("SUBNET").c_str());
-			if (!web_interface->isIPValid(sMask.c_str()))
-				{
-				msg_alert_error=true;
-				smsg.concat(F("Error: Incorrect subnet<BR>"));
-				KeysList.add(FPSTR(KEY_AP_SUBNET_STATUS));
-				ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				}   	  	    
-		}
-      else
-	   {
-		msg_alert_error=true;
-		smsg = FPSTR(MISSING_DATA);
-	   }
-	  
-	   //if no error apply the change
-	   if (msg_alert_error==false)
-		{
-		//save
-		 wifi_config.split_ip(sIP.c_str(),ip_sav);
-		 wifi_config.split_ip(sGW.c_str(),gw_sav);
-		 wifi_config.split_ip(sMask.c_str(),msk_sav);
-		 if((!CONFIG::write_byte(EP_WIFI_MODE,AP_MODE))||
-			(!CONFIG::write_string(EP_SSID,sSSID.c_str()))||
-			(!CONFIG::write_string(EP_PASSWORD,sPassword.c_str()))||
-			(!CONFIG::write_byte(EP_SSID_VISIBLE,visible_buf))||
-			(!CONFIG::write_byte(EP_PHY_MODE,phy_mode_buf))||
-			(!CONFIG::write_byte(EP_CHANNEL,channel_buf)) ||
-			(!CONFIG::write_byte(EP_AUTH_TYPE,auth_buf)) ||
-			(!CONFIG::write_byte(EP_IP_MODE,static_ip_buf)) ||
-			(!CONFIG::write_buffer(EP_IP_VALUE,ip_sav,IP_LENGTH))||
-			(!CONFIG::write_buffer(EP_GATEWAY_VALUE,gw_sav,IP_LENGTH))||
-			(!CONFIG::write_buffer(EP_MASK_VALUE,msk_sav,IP_LENGTH)))
-			{
-				msg_alert_error=true;
-				smsg = FPSTR(EEPROM_NOWRITE);
-			}
-		else
-				{
-					msg_alert_success=true;
-					smsg = F("Changes saved to EEPROM, restarting...");
-				}
-			}
-		}
-  
-	else //no submit need to get data from EEPROM
-	{
-	//ssid
-	if (!CONFIG::read_string(EP_SSID, sSSID , MAX_SSID_LENGTH) )sSSID=FPSTR(DEFAULT_SSID);
-	//password 
-	if (!CONFIG::read_string(EP_PASSWORD, sPassword , MAX_PASSWORD_LENGTH) )sPassword=FPSTR(DEFAULT_PASSWORD);
-	//ssid visible ?
-	if (!CONFIG::read_byte(EP_SSID_VISIBLE, &visible_buf ))visible_buf=DEFAULT_SSID_VISIBLE;
-	//phy mode
-	if (!CONFIG::read_byte(EP_PHY_MODE, &phy_mode_buf ))phy_mode_buf=DEFAULT_PHY_MODE;
-	//authentification
-	if (!CONFIG::read_byte(EP_AUTH_TYPE, &auth_buf ))auth_buf=DEFAULT_AUTH_TYPE;
-	//channel
-	if (!CONFIG::read_byte(EP_CHANNEL, &channel_buf ))channel_buf=DEFAULT_CHANNEL;
-	//static IP ?
-	if (!CONFIG::read_byte(EP_IP_MODE, &static_ip_buf ))static_ip_buf=DEFAULT_IP_MODE;
-	//IP for static IP
-	if (!CONFIG::read_buffer(EP_IP_VALUE,ip_sav , IP_LENGTH) )
-		sIP=wifi_config.ip2str((byte *)DEFAULT_IP_VALUE);
-	else
-		sIP=wifi_config.ip2str(ip_sav);  
-	//GW for static IP
-	if (!CONFIG::read_buffer(EP_GATEWAY_VALUE,gw_sav , IP_LENGTH) )
-		sGW=wifi_config.ip2str((byte *)DEFAULT_GATEWAY_VALUE);
-	else
-		sGW=wifi_config.ip2str(gw_sav);  
-	
-	//Subnet for static IP
-	if (!CONFIG::read_buffer(EP_MASK_VALUE,msk_sav , IP_LENGTH) )
-		sMask=wifi_config.ip2str((byte *)DEFAULT_MASK_VALUE);
-	else
-		sMask=wifi_config.ip2str(msk_sav);  
-	}
-	
-	//Display values
-	
-  //ssid
-	KeysList.add(FPSTR(KEY_AP_SSID));
-	ValuesList.add(sSSID);
-	
-	//password
-	KeysList.add(FPSTR(KEY_AP_PASSWORD));
-	ValuesList.add(sPassword);
+    //check is it is a submission or a display
+    smsg="";
+    if (web_interface->WebServer.hasArg("SUBMIT")) {
+        //is there a correct list of values?
+        if (web_interface->WebServer.hasArg("SSID") && web_interface->WebServer.hasArg("PASSWORD")&& web_interface->WebServer.hasArg("NETWORK")
+                && web_interface->WebServer.hasArg("AUTHENTIFICATION")&& web_interface->WebServer.hasArg("IP")
+                && web_interface->WebServer.hasArg("GATEWAY")&& web_interface->WebServer.hasArg("SUBNET")
+                && web_interface->WebServer.hasArg("CHANNEL")) {
+            //SSID
+            web_interface->urldecode(sSSID,web_interface->WebServer.arg("SSID").c_str());
+            if (!web_interface->isSSIDValid(sSSID.c_str())) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Incorrect SSID<BR>"));
+                KeysList.add(FPSTR(KEY_AP_SSID_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+            //Password
+            web_interface->urldecode(sPassword,web_interface->WebServer.arg("PASSWORD").c_str());
+            if (!web_interface->isPasswordValid(sPassword.c_str())) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Incorrect password<BR>"));
+                KeysList.add(FPSTR(KEY_AP_PASSWORD_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+            //ssid visible ?
+            if (web_interface->WebServer.hasArg("SSID_VISIBLE")) {
+                visible_buf=1;
+            } else {
+                visible_buf=0;
+            }
+            //phy mode
+            phy_mode_buf  = byte(web_interface->WebServer.arg("NETWORK").toInt());
+            if (!(phy_mode_buf==PHY_MODE_11B||phy_mode_buf==PHY_MODE_11G) ) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Incorrect network<BR>"));
+                KeysList.add(FPSTR(KEY_NETWORK_OPTION_LIST_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+            //channel
+            channel_buf  = byte (web_interface->WebServer.arg("CHANNEL").toInt());
+            if (channel_buf< 1|| channel_buf>11) {
+                msg_alert_error=true;
+                smsg.concat("Error: Incorrect channel<BR>");
+                KeysList.add(FPSTR(KEY_CHANNEL_OPTION_LIST_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+            //authentification
+            auth_buf  = byte(web_interface->WebServer.arg("AUTHENTIFICATION").toInt());
+            if (!(auth_buf == AUTH_OPEN || auth_buf == AUTH_WEP || auth_buf == AUTH_WPA_PSK ||
+                    auth_buf == AUTH_WPA2_PSK || auth_buf == AUTH_WPA_WPA2_PSK)) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Incorrect authentification method<BR>"));
+                KeysList.add(FPSTR(KEY_AUTH_OPTION_LIST_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+            //Static IP ?
+            if (web_interface->WebServer.hasArg("STATIC_IP") ) {
+                static_ip_buf=STATIC_IP_MODE;
+            } else {
+                static_ip_buf=DHCP_MODE;
+            }
 
-	//ssid visible ?
-	KeysList.add(FPSTR(KEY_IS_SSID_VISIBLE));
-	if (visible_buf==1)ValuesList.add(VALUE_CHECKED);
-	else ValuesList.add("");
-  
-	//network
-	ipos = 0;
-	stmp="";
-	while (inetworkvaluelist[ipos]>-1)
-		{
-		stmp+="<OPTION VALUE=\"";
-		stmp+= intTostr(inetworkvaluelist[ipos]);
-		stmp+="\" ";
-		if (inetworkvaluelist[ipos]==phy_mode_buf)stmp+=FPSTR(VALUE_SELECTED);
-		stmp+=">" ;
-		stmp+=inetworkdisplaylist[ipos];
-		stmp+= "</OPTION>\n";
-		ipos++;
-		}
-	 KeysList.add(FPSTR(KEY_NETWORK_OPTION_LIST));
-	 ValuesList.add(stmp);
-	 
-	 //channel
-	 stmp ="";
-	  for (int c=1;c < 12;c++)
-		{
-		stmp+="<OPTION VALUE=\"";
-		stmp+=intTostr(c);
-		stmp+="\" ";
-		if (channel_buf==c)stmp += FPSTR(VALUE_SELECTED);
-		else stmp+="";
-		stmp+=" >";
-		stmp+=intTostr(c);
-		stmp+= "</OPTION>\n";
-		}
-  
-	 KeysList.add(FPSTR(KEY_CHANNEL_OPTION_LIST));
-	 ValuesList.add(stmp);
-	//auth
-	ipos = 0;
-	stmp="";
-	while (iauthvaluelist[ipos]>-1)
-		{
-		stmp+="<OPTION VALUE=\"";
-		stmp+= intTostr(iauthvaluelist[ipos]);
-		stmp+="\" ";
-		if (iauthvaluelist[ipos]==auth_buf)stmp+=FPSTR(VALUE_SELECTED);
-		stmp+=">" ;
-		stmp+=iauthdisplaylist[ipos];
-		stmp+= "</OPTION>\n";
-		ipos++;
-		}
-	 KeysList.add(FPSTR(KEY_AUTH_OPTION_LIST));
-	 ValuesList.add(stmp);
+            //IP
+            web_interface->urldecode(sIP,web_interface->WebServer.arg("IP").c_str());
+            if (!web_interface->isIPValid(sIP.c_str())) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Incorrect IP fortmat<BR>"));
+                KeysList.add(FPSTR(KEY_AP_IP_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
 
-	 //static IP ?
-	KeysList.add(FPSTR(KEY_IS_STATIC_IP));
-	if (static_ip_buf==STATIC_IP_MODE)ValuesList.add(VALUE_CHECKED);
-	else ValuesList.add("");
-	
-	//IP for static IP
-	KeysList.add(FPSTR(KEY_AP_IP));
-	ValuesList.add(sIP);
-	 
-	//Gateway for static IP
-	KeysList.add(FPSTR(KEY_AP_GW));
-	ValuesList.add(sGW);
-	  
-	//Mask for static IP
-	KeysList.add(FPSTR(KEY_AP_SUBNET));
-	ValuesList.add(sMask);
+            //Gateway
+            web_interface->urldecode(sGW,web_interface->WebServer.arg("GATEWAY").c_str());
+            if (!web_interface->isIPValid(sGW.c_str())) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Incorrect gateway<BR>"));
+                KeysList.add(FPSTR(KEY_AP_GW_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+            //subnet
+            web_interface->urldecode(sMask,web_interface->WebServer.arg("SUBNET").c_str());
+            if (!web_interface->isIPValid(sMask.c_str())) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Incorrect subnet<BR>"));
+                KeysList.add(FPSTR(KEY_AP_SUBNET_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+        } else {
+            msg_alert_error=true;
+            smsg = FPSTR(MISSING_DATA);
+        }
 
-if (msg_alert_error)
-    ProcessAlertError(KeysList, ValuesList, smsg);
-	else if (msg_alert_success)
-	{
-		ProcessAlertSuccess(KeysList, ValuesList, smsg);
-		KeysList.add(FPSTR(KEY_SERVICE_PAGE));
-		ValuesList.add(FPSTR(RESTARTCMD));
-		//Add all green
-		KeysList.add(FPSTR(KEY_AP_SSID_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_AP_PASSWORD_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_IS_SSID_VISIBLE_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_NETWORK_OPTION_LIST_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_CHANNEL_OPTION_LIST_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_AUTH_OPTION_LIST_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_AP_STATIC_IP_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_AP_IP_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_AP_GW_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_AP_SUBNET_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-	}
-	
-	else
-	
-		ProcessNoAlert(KeysList,ValuesList);	
+        //if no error apply the change
+        if (msg_alert_error==false) {
+            //save
+            wifi_config.split_ip(sIP.c_str(),ip_sav);
+            wifi_config.split_ip(sGW.c_str(),gw_sav);
+            wifi_config.split_ip(sMask.c_str(),msk_sav);
+            if((!CONFIG::write_byte(EP_WIFI_MODE,AP_MODE))||
+                    (!CONFIG::write_string(EP_SSID,sSSID.c_str()))||
+                    (!CONFIG::write_string(EP_PASSWORD,sPassword.c_str()))||
+                    (!CONFIG::write_byte(EP_SSID_VISIBLE,visible_buf))||
+                    (!CONFIG::write_byte(EP_PHY_MODE,phy_mode_buf))||
+                    (!CONFIG::write_byte(EP_CHANNEL,channel_buf)) ||
+                    (!CONFIG::write_byte(EP_AUTH_TYPE,auth_buf)) ||
+                    (!CONFIG::write_byte(EP_IP_MODE,static_ip_buf)) ||
+                    (!CONFIG::write_buffer(EP_IP_VALUE,ip_sav,IP_LENGTH))||
+                    (!CONFIG::write_buffer(EP_GATEWAY_VALUE,gw_sav,IP_LENGTH))||
+                    (!CONFIG::write_buffer(EP_MASK_VALUE,msk_sav,IP_LENGTH))) {
+                msg_alert_error=true;
+                smsg = FPSTR(EEPROM_NOWRITE);
+            } else {
+                msg_alert_success=true;
+                smsg = F("Changes saved to EEPROM, restarting...");
+            }
+        }
+    }
 
-	//Firmware and Free Mem, at the end to reflect situation
-	GetFreeMem(KeysList, ValuesList);
-	//process the template file and provide list of variables
-	processTemplate("/config_ap.tpl", KeysList , ValuesList);
-	//need to clean to speed up memory recovery
-	KeysList.clear();
-	ValuesList.clear();
+    else { //no submit need to get data from EEPROM
+        //ssid
+        if (!CONFIG::read_string(EP_SSID, sSSID , MAX_SSID_LENGTH) ) {
+            sSSID=FPSTR(DEFAULT_SSID);
+        }
+        //password
+        if (!CONFIG::read_string(EP_PASSWORD, sPassword , MAX_PASSWORD_LENGTH) ) {
+            sPassword=FPSTR(DEFAULT_PASSWORD);
+        }
+        //ssid visible ?
+        if (!CONFIG::read_byte(EP_SSID_VISIBLE, &visible_buf )) {
+            visible_buf=DEFAULT_SSID_VISIBLE;
+        }
+        //phy mode
+        if (!CONFIG::read_byte(EP_PHY_MODE, &phy_mode_buf )) {
+            phy_mode_buf=DEFAULT_PHY_MODE;
+        }
+        //authentification
+        if (!CONFIG::read_byte(EP_AUTH_TYPE, &auth_buf )) {
+            auth_buf=DEFAULT_AUTH_TYPE;
+        }
+        //channel
+        if (!CONFIG::read_byte(EP_CHANNEL, &channel_buf )) {
+            channel_buf=DEFAULT_CHANNEL;
+        }
+        //static IP ?
+        if (!CONFIG::read_byte(EP_IP_MODE, &static_ip_buf )) {
+            static_ip_buf=DEFAULT_IP_MODE;
+        }
+        //IP for static IP
+        if (!CONFIG::read_buffer(EP_IP_VALUE,ip_sav , IP_LENGTH) ) {
+            sIP=wifi_config.ip2str((byte *)DEFAULT_IP_VALUE);
+        } else {
+            sIP=wifi_config.ip2str(ip_sav);
+        }
+        //GW for static IP
+        if (!CONFIG::read_buffer(EP_GATEWAY_VALUE,gw_sav , IP_LENGTH) ) {
+            sGW=wifi_config.ip2str((byte *)DEFAULT_GATEWAY_VALUE);
+        } else {
+            sGW=wifi_config.ip2str(gw_sav);
+        }
+
+        //Subnet for static IP
+        if (!CONFIG::read_buffer(EP_MASK_VALUE,msk_sav , IP_LENGTH) ) {
+            sMask=wifi_config.ip2str((byte *)DEFAULT_MASK_VALUE);
+        } else {
+            sMask=wifi_config.ip2str(msk_sav);
+        }
+    }
+
+    //Display values
+
+    //ssid
+    KeysList.add(FPSTR(KEY_AP_SSID));
+    ValuesList.add(sSSID);
+
+    //password
+    KeysList.add(FPSTR(KEY_AP_PASSWORD));
+    ValuesList.add(sPassword);
+
+    //ssid visible ?
+    KeysList.add(FPSTR(KEY_IS_SSID_VISIBLE));
+    if (visible_buf==1) {
+        ValuesList.add(VALUE_CHECKED);
+    } else {
+        ValuesList.add("");
+    }
+
+    //network
+    ipos = 0;
+    stmp="";
+    while (inetworkvaluelist[ipos]>-1) {
+        stmp+="<OPTION VALUE=\"";
+        stmp+= intTostr(inetworkvaluelist[ipos]);
+        stmp+="\" ";
+        if (inetworkvaluelist[ipos]==phy_mode_buf) {
+            stmp+=FPSTR(VALUE_SELECTED);
+        }
+        stmp+=">" ;
+        stmp+=inetworkdisplaylist[ipos];
+        stmp+= "</OPTION>\n";
+        ipos++;
+    }
+    KeysList.add(FPSTR(KEY_NETWORK_OPTION_LIST));
+    ValuesList.add(stmp);
+
+    //channel
+    stmp ="";
+    for (int c=1; c < 12; c++) {
+        stmp+="<OPTION VALUE=\"";
+        stmp+=intTostr(c);
+        stmp+="\" ";
+        if (channel_buf==c) {
+            stmp += FPSTR(VALUE_SELECTED);
+        } else {
+            stmp+="";
+        }
+        stmp+=" >";
+        stmp+=intTostr(c);
+        stmp+= "</OPTION>\n";
+    }
+
+    KeysList.add(FPSTR(KEY_CHANNEL_OPTION_LIST));
+    ValuesList.add(stmp);
+    //auth
+    ipos = 0;
+    stmp="";
+    while (iauthvaluelist[ipos]>-1) {
+        stmp+="<OPTION VALUE=\"";
+        stmp+= intTostr(iauthvaluelist[ipos]);
+        stmp+="\" ";
+        if (iauthvaluelist[ipos]==auth_buf) {
+            stmp+=FPSTR(VALUE_SELECTED);
+        }
+        stmp+=">" ;
+        stmp+=iauthdisplaylist[ipos];
+        stmp+= "</OPTION>\n";
+        ipos++;
+    }
+    KeysList.add(FPSTR(KEY_AUTH_OPTION_LIST));
+    ValuesList.add(stmp);
+
+    //static IP ?
+    KeysList.add(FPSTR(KEY_IS_STATIC_IP));
+    if (static_ip_buf==STATIC_IP_MODE) {
+        ValuesList.add(VALUE_CHECKED);
+    } else {
+        ValuesList.add("");
+    }
+
+    //IP for static IP
+    KeysList.add(FPSTR(KEY_AP_IP));
+    ValuesList.add(sIP);
+
+    //Gateway for static IP
+    KeysList.add(FPSTR(KEY_AP_GW));
+    ValuesList.add(sGW);
+
+    //Mask for static IP
+    KeysList.add(FPSTR(KEY_AP_SUBNET));
+    ValuesList.add(sMask);
+
+    if (msg_alert_error) {
+        ProcessAlertError(KeysList, ValuesList, smsg);
+    } else if (msg_alert_success) {
+        ProcessAlertSuccess(KeysList, ValuesList, smsg);
+        KeysList.add(FPSTR(KEY_SERVICE_PAGE));
+        ValuesList.add(FPSTR(RESTARTCMD));
+        //Add all green
+        KeysList.add(FPSTR(KEY_AP_SSID_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_AP_PASSWORD_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_IS_SSID_VISIBLE_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_NETWORK_OPTION_LIST_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_CHANNEL_OPTION_LIST_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_AUTH_OPTION_LIST_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_AP_STATIC_IP_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_AP_IP_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_AP_GW_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_AP_SUBNET_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+    }
+
+    else
+
+    {
+        ProcessNoAlert(KeysList,ValuesList);
+    }
+
+    //Firmware and Free Mem, at the end to reflect situation
+    GetFreeMem(KeysList, ValuesList);
+    //process the template file and provide list of variables
+    processTemplate("/config_ap.tpl", KeysList , ValuesList);
+    //need to clean to speed up memory recovery
+    KeysList.clear();
+    ValuesList.clear();
 }
 
 void handle_web_interface_configSTA()
 {
-  static const char NOT_AUTH_STA [] PROGMEM = "HTTP/1.1 301 OK\r\nLocation: /LOGIN?return=CONFIGSTA\r\nCache-Control: no-cache\r\n\r\n";
-  
-	String stmp,smsg;
-	String sSSID,sPassword,sIP,sGW,sMask,sHostname;
-	bool msg_alert_error=false;
-	bool msg_alert_success=false;
+    static const char NOT_AUTH_STA [] PROGMEM = "HTTP/1.1 301 OK\r\nLocation: /LOGIN?return=CONFIGSTA\r\nCache-Control: no-cache\r\n\r\n";
+
+    String stmp,smsg;
+    String sSSID,sPassword,sIP,sGW,sMask,sHostname;
+    bool msg_alert_error=false;
+    bool msg_alert_success=false;
     byte static_ip_buf;
     byte phy_mode_buf;
     byte ip_sav[4];
-	byte gw_sav[4];
-	byte msk_sav[4];
-	bool revertSTA=false;
-	int ipos;
-	int inetworkvaluelist []={PHY_MODE_11B,PHY_MODE_11G,PHY_MODE_11N,-1};
-	const __FlashStringHelper  * inetworkdisplaylist []={FPSTR(VALUE_11B),FPSTR(VALUE_11G),FPSTR(VALUE_11N),FPSTR(VALUE_11B)};
-	STORESTRINGS_CLASS KeysList ;
-	STORESTRINGS_CLASS ValuesList ;
-  
-	if (!web_interface->is_authenticated())
-	{
-      web_interface->WebServer.sendContent_P(NOT_AUTH_STA);
-		return;
-	}
+    byte gw_sav[4];
+    byte msk_sav[4];
+    bool revertSTA=false;
+    int ipos;
+    int inetworkvaluelist []= {PHY_MODE_11B,PHY_MODE_11G,PHY_MODE_11N,-1};
+    const __FlashStringHelper  * inetworkdisplaylist []= {FPSTR(VALUE_11B),FPSTR(VALUE_11G),FPSTR(VALUE_11N),FPSTR(VALUE_11B)};
+    STORESTRINGS_CLASS KeysList ;
+    STORESTRINGS_CLASS ValuesList ;
 
-	//IP+Web
-	GetIpWeb(KeysList, ValuesList);
-	//mode
-	GetMode(KeysList, ValuesList);
-	//page title and filenames
-	SetPageProp(KeysList,ValuesList,FPSTR(VALUE_CONFIG_STA),F("config_sta"));
-	//menu item
-	KeysList.add(FPSTR(KEY_MENU_STA));
-	ValuesList.add(FPSTR(VALUE_ACTIVE));
-	
-  smsg="";
-  if (web_interface->WebServer.hasArg("SUBMIT"))
-  {   //is there a correct list of values?
-	  if (web_interface->WebServer.hasArg("SSID") && web_interface->WebServer.hasArg("PASSWORD")&& web_interface->WebServer.hasArg("NETWORK")
-	     && web_interface->WebServer.hasArg("IP") && web_interface->WebServer.hasArg("GATEWAY")&& web_interface->WebServer.hasArg("SUBNET")
-	     && web_interface->WebServer.hasArg("HOSTNAME"))
-		{	
-			//SSID
-		    web_interface->urldecode(sSSID,web_interface->WebServer.arg("SSID").c_str());
-		    if (!web_interface->isSSIDValid(sSSID.c_str()))
-				{
-				msg_alert_error=true;
-				smsg.concat(F("Error: Incorrect SSID<BR>"));
-				KeysList.add(FPSTR(KEY_STA_SSID_STATUS));
-				ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				}
+    if (!web_interface->is_authenticated()) {
+        web_interface->WebServer.sendContent_P(NOT_AUTH_STA);
+        return;
+    }
 
-			//Password
-		    web_interface->urldecode(sPassword,web_interface->WebServer.arg("PASSWORD").c_str());
-		    if (!web_interface->isPasswordValid(sPassword.c_str()))
-				{
-				msg_alert_error=true;
-				smsg.concat(F("Error: Incorrect password<BR>"));
-				KeysList.add(FPSTR(KEY_STA_PASSWORD_STATUS));
-				ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				}
-				
-			//Hostname
-		    web_interface->urldecode(sHostname,web_interface->WebServer.arg("HOSTNAME").c_str());
-		    if (!web_interface->isHostnameValid(sHostname.c_str()))
-				{
-				msg_alert_error=true;
-				smsg.concat(F("Error: Incorrect hostname<BR>"));
-				KeysList.add(FPSTR(KEY_HOSTNAME_STATUS));
-				ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				}
-			
-			//phy mode
-			phy_mode_buf  = byte(web_interface->WebServer.arg("NETWORK").toInt());
-			if (!(phy_mode_buf==PHY_MODE_11B||phy_mode_buf==PHY_MODE_11G||phy_mode_buf==PHY_MODE_11N) )
-				 {
-					msg_alert_error=true;
-					smsg.concat(F("Error: Incorrect network<BR>"));
-					KeysList.add(FPSTR(KEY_NETWORK_OPTION_LIST_STATUS));
-					ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				 }
-				 
-		   //Static IP ?	
-			if (web_interface->WebServer.hasArg("STATIC_IP") )
-				{
-					static_ip_buf=STATIC_IP_MODE;
-				}
-			else
-				{
-					static_ip_buf=DHCP_MODE;
-				}
-				
-			//IP
-			web_interface->urldecode(sIP,web_interface->WebServer.arg("IP").c_str());
-			if (!web_interface->isIPValid(sIP.c_str()))
-				{
-				msg_alert_error=true;
-				smsg.concat(F("Error: Incorrect IP format<BR>"));
-				KeysList.add(FPSTR(KEY_STA_IP_STATUS));
-				ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				}
+    //IP+Web
+    GetIpWeb(KeysList, ValuesList);
+    //mode
+    GetMode(KeysList, ValuesList);
+    //page title and filenames
+    SetPageProp(KeysList,ValuesList,FPSTR(VALUE_CONFIG_STA),F("config_sta"));
+    //menu item
+    KeysList.add(FPSTR(KEY_MENU_STA));
+    ValuesList.add(FPSTR(VALUE_ACTIVE));
 
-			//Gateway
-			web_interface->urldecode(sGW,web_interface->WebServer.arg("GATEWAY").c_str());
-			if (!web_interface->isIPValid(sGW.c_str()))
-				{
-				msg_alert_error=true;
-				smsg.concat(F("Error: Incorrect gateway<BR>"));
-				KeysList.add(FPSTR(KEY_STA_GW_STATUS));
-				ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				}
-			//subnet
-			web_interface->urldecode(sMask,web_interface->WebServer.arg("SUBNET").c_str());
-			if (!web_interface->isIPValid(sMask.c_str()))
-				{
-				msg_alert_error=true;
-				smsg.concat(F("Error: Incorrect subnet<BR>"));
-				KeysList.add(FPSTR(KEY_STA_SUBNET_STATUS));
-				ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				}   	  	    
-		}
-     else
-	   {
-		msg_alert_error=true;
-		smsg = FPSTR(MISSING_DATA);
-	   }
-	   
-	   //no error ? then save
-	   if (msg_alert_error==false)
-		{
-		//save
-		 wifi_config.split_ip(sIP.c_str(),ip_sav);
-		 wifi_config.split_ip(sGW.c_str(),gw_sav);
-		 wifi_config.split_ip(sMask.c_str(),msk_sav);
-		 if((!CONFIG::write_byte(EP_WIFI_MODE,CLIENT_MODE))||
-			(!CONFIG::write_string(EP_SSID,sSSID.c_str()))||
-			(!CONFIG::write_string(EP_PASSWORD,sPassword.c_str()))||
-			(!CONFIG::write_string(EP_HOSTNAME,sHostname.c_str()))||
-			(!CONFIG::write_byte(EP_PHY_MODE,phy_mode_buf))||
-			(!CONFIG::write_byte(EP_IP_MODE,static_ip_buf)) ||
-			(!CONFIG::write_buffer(EP_IP_VALUE,ip_sav,IP_LENGTH))||
-			(!CONFIG::write_buffer(EP_GATEWAY_VALUE,gw_sav,IP_LENGTH))||
-			(!CONFIG::write_buffer(EP_MASK_VALUE,msk_sav,IP_LENGTH)))
-			{
-				msg_alert_error=true;
-				smsg = FPSTR(EEPROM_NOWRITE);
-			}
-		else
-				{
-					msg_alert_success=true;
-					smsg = F("Changes saved to EEPROM, restarting...");
-				}
-			}
-		}
-	else //no submit, need to get data from EEPROM
-	{
-	//ssid
-	if (!CONFIG::read_string(EP_SSID, sSSID , MAX_SSID_LENGTH) )sSSID=FPSTR(DEFAULT_SSID);
-	//password 
-	if (!CONFIG::read_string(EP_PASSWORD, sPassword , MAX_PASSWORD_LENGTH) )sPassword=FPSTR(DEFAULT_PASSWORD);
-	//hostname 
-	if (!CONFIG::read_string(EP_HOSTNAME, sHostname , MAX_HOSTNAME_LENGTH) )sHostname=wifi_config.get_default_hostname();
-	//phy mode
-	if (!CONFIG::read_byte(EP_PHY_MODE, &phy_mode_buf ))phy_mode_buf=DEFAULT_PHY_MODE;
-	//static IP ?
-	if (!CONFIG::read_byte(EP_IP_MODE, &static_ip_buf ))static_ip_buf=DEFAULT_IP_MODE;
-	//IP for static IP
-	if (!CONFIG::read_buffer(EP_IP_VALUE,ip_sav , IP_LENGTH) )
-		sIP=wifi_config.ip2str((byte *)DEFAULT_IP_VALUE);
-	else
-		sIP=wifi_config.ip2str(ip_sav);  
-	//GW for static IP
-	if (!CONFIG::read_buffer(EP_GATEWAY_VALUE,gw_sav , IP_LENGTH) )
-		sGW=wifi_config.ip2str((byte *)DEFAULT_GATEWAY_VALUE);
-	else
-		sGW=wifi_config.ip2str(gw_sav);  
-	//Subnet for static IP
-	if (!CONFIG::read_buffer(EP_MASK_VALUE,msk_sav , IP_LENGTH) )
-		sMask=wifi_config.ip2str((byte *)DEFAULT_MASK_VALUE);
-	else
-		sMask=wifi_config.ip2str(msk_sav);  
-	}
-	//Display values
-	//ssid
-	KeysList.add(FPSTR(KEY_STA_SSID));
-	ValuesList.add(sSSID);
-	
-	//password
-	KeysList.add(FPSTR(KEY_STA_PASSWORD));
-	ValuesList.add(sPassword);
-	
-	//hostname
-	KeysList.add(FPSTR(KEY_HOSTNAME));
-	ValuesList.add(sHostname);
-  
-	//network
-	ipos = 0;
-	stmp="";
-	while (inetworkvaluelist[ipos]>-1)
-		{
-		stmp+="<OPTION VALUE=\"";
-		stmp+= intTostr(inetworkvaluelist[ipos]);
-		stmp+="\" ";
-		if (inetworkvaluelist[ipos]==phy_mode_buf)stmp+=FPSTR(VALUE_SELECTED);
-		stmp+=">" ;
-		stmp+=inetworkdisplaylist[ipos];
-		stmp+= "</OPTION>\n";
-		ipos++;
-		}
-	 KeysList.add(FPSTR(KEY_NETWORK_OPTION_LIST));
-	 ValuesList.add(stmp);
-	 
-	 //static IP ?
-	KeysList.add(FPSTR(KEY_IS_STATIC_IP));
-	if (static_ip_buf==STATIC_IP_MODE)ValuesList.add(VALUE_CHECKED);
-	else ValuesList.add("");
-	
-	//IP for static IP
-	KeysList.add(FPSTR(KEY_STA_IP));
-	ValuesList.add(sIP);
-	 
-	//Gateway for static IP
-	KeysList.add(FPSTR(KEY_STA_GW));
-	ValuesList.add(sGW);
-	  
-	//Mask for static IP
-	KeysList.add(FPSTR(KEY_STA_SUBNET));
-	ValuesList.add(sMask);
-	
-	//do we need to do a scan and display it ?
-	 if (!msg_alert_success)
-		 {
-			   //if in AP mode switch to mixed mode to be able to scan
-			  if (wifi_get_opmode()!=WIFI_STA )
-				{
-					WiFi.mode(WIFI_AP_STA);
-					revertSTA=true;
-				}
-				
-			  int n = WiFi.scanNetworks();
-			  for (int i = 0; i < n; ++i)
-				{
-				   //row number
-				  stmp = "$ROW_NUMBER["+String(i)+"]$";
-				  KeysList.add(stmp);
-				  stmp=String(i+1);
-				  ValuesList.add(stmp);
-				  //SSID
-				stmp = "$AP_SSID["+String(i)+"]$";
-				KeysList.add(stmp);
-				ValuesList.add(WiFi.SSID(i).c_str());
-				//signal strength
-				 stmp = "$AP_SIGNAL["+String(i)+"]$";
-				 KeysList.add(stmp);
-				 stmp = intTostr(100+WiFi.RSSI(i)) ;
-				 stmp += "%";
-				 ValuesList.add(stmp);
-				//is protected
-				stmp = "$IS_PROTECTED["+String(i)+"]$";
-				 KeysList.add(stmp);
-				 if (WiFi.encryptionType(i) == ENC_TYPE_NONE)  ValuesList.add(FPSTR(VALUE_NO));
-				 else  ValuesList.add(FPSTR(VALUE_YES));
-				}
-			WiFi.scanDelete();
-			KeysList.add(FPSTR(KEY_AVAILABLE_AP_NB_ITEMS));
-			ValuesList.add(intTostr(n));
-				 
-		  //revert to pure softAP
-		   if (revertSTA) WiFi.mode(WIFI_AP);
-		   KeysList.add(FPSTR(KEY_AP_SCAN_VISIBILITY));
-		   ValuesList.add(VALUE_ITEM_VISIBLE);
-		  }
-	else
-		{//no need to do a scan if we are going to restart
-		KeysList.add(FPSTR(KEY_AP_SCAN_VISIBILITY));
-	   ValuesList.add(VALUE_ITEM_HIDDEN);
-	   KeysList.add(FPSTR(KEY_AVAILABLE_AP_NB_ITEMS));
-	  ValuesList.add(intTostr(0));
-		}
+    smsg="";
+    if (web_interface->WebServer.hasArg("SUBMIT")) {
+        //is there a correct list of values?
+        if (web_interface->WebServer.hasArg("SSID") && web_interface->WebServer.hasArg("PASSWORD")&& web_interface->WebServer.hasArg("NETWORK")
+                && web_interface->WebServer.hasArg("IP") && web_interface->WebServer.hasArg("GATEWAY")&& web_interface->WebServer.hasArg("SUBNET")
+                && web_interface->WebServer.hasArg("HOSTNAME")) {
+            //SSID
+            web_interface->urldecode(sSSID,web_interface->WebServer.arg("SSID").c_str());
+            if (!web_interface->isSSIDValid(sSSID.c_str())) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Incorrect SSID<BR>"));
+                KeysList.add(FPSTR(KEY_STA_SSID_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
 
-if (msg_alert_error)
-    ProcessAlertError(KeysList, ValuesList, smsg);
-	else if (msg_alert_success)
-	{
-		ProcessAlertSuccess(KeysList, ValuesList, smsg);
-		KeysList.add(FPSTR(KEY_SERVICE_PAGE));
-		ValuesList.add(FPSTR(RESTARTCMD));
-		//Add all green
-		KeysList.add(FPSTR(KEY_STA_SSID_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_STA_PASSWORD_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_NETWORK_OPTION_LIST_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_STA_STATIC_IP_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_STA_IP_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_STA_GW_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_STA_SUBNET_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_HOSTNAME_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-	}
-	
-	else
-	
-		ProcessNoAlert(KeysList,ValuesList);	
-	
-	//Firmware and Free Mem, at the end to reflect situation
-	GetFreeMem(KeysList, ValuesList);
-	//process the template file and provide list of variables
-	processTemplate("/config_sta.tpl", KeysList , ValuesList);
-	//need to clean to speed up memory recovery
-	KeysList.clear();
-	ValuesList.clear();
+            //Password
+            web_interface->urldecode(sPassword,web_interface->WebServer.arg("PASSWORD").c_str());
+            if (!web_interface->isPasswordValid(sPassword.c_str())) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Incorrect password<BR>"));
+                KeysList.add(FPSTR(KEY_STA_PASSWORD_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+
+            //Hostname
+            web_interface->urldecode(sHostname,web_interface->WebServer.arg("HOSTNAME").c_str());
+            if (!web_interface->isHostnameValid(sHostname.c_str())) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Incorrect hostname<BR>"));
+                KeysList.add(FPSTR(KEY_HOSTNAME_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+
+            //phy mode
+            phy_mode_buf  = byte(web_interface->WebServer.arg("NETWORK").toInt());
+            if (!(phy_mode_buf==PHY_MODE_11B||phy_mode_buf==PHY_MODE_11G||phy_mode_buf==PHY_MODE_11N) ) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Incorrect network<BR>"));
+                KeysList.add(FPSTR(KEY_NETWORK_OPTION_LIST_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+
+            //Static IP ?
+            if (web_interface->WebServer.hasArg("STATIC_IP") ) {
+                static_ip_buf=STATIC_IP_MODE;
+            } else {
+                static_ip_buf=DHCP_MODE;
+            }
+
+            //IP
+            web_interface->urldecode(sIP,web_interface->WebServer.arg("IP").c_str());
+            if (!web_interface->isIPValid(sIP.c_str())) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Incorrect IP format<BR>"));
+                KeysList.add(FPSTR(KEY_STA_IP_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+
+            //Gateway
+            web_interface->urldecode(sGW,web_interface->WebServer.arg("GATEWAY").c_str());
+            if (!web_interface->isIPValid(sGW.c_str())) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Incorrect gateway<BR>"));
+                KeysList.add(FPSTR(KEY_STA_GW_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+            //subnet
+            web_interface->urldecode(sMask,web_interface->WebServer.arg("SUBNET").c_str());
+            if (!web_interface->isIPValid(sMask.c_str())) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Incorrect subnet<BR>"));
+                KeysList.add(FPSTR(KEY_STA_SUBNET_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+        } else {
+            msg_alert_error=true;
+            smsg = FPSTR(MISSING_DATA);
+        }
+
+        //no error ? then save
+        if (msg_alert_error==false) {
+            //save
+            wifi_config.split_ip(sIP.c_str(),ip_sav);
+            wifi_config.split_ip(sGW.c_str(),gw_sav);
+            wifi_config.split_ip(sMask.c_str(),msk_sav);
+            if((!CONFIG::write_byte(EP_WIFI_MODE,CLIENT_MODE))||
+                    (!CONFIG::write_string(EP_SSID,sSSID.c_str()))||
+                    (!CONFIG::write_string(EP_PASSWORD,sPassword.c_str()))||
+                    (!CONFIG::write_string(EP_HOSTNAME,sHostname.c_str()))||
+                    (!CONFIG::write_byte(EP_PHY_MODE,phy_mode_buf))||
+                    (!CONFIG::write_byte(EP_IP_MODE,static_ip_buf)) ||
+                    (!CONFIG::write_buffer(EP_IP_VALUE,ip_sav,IP_LENGTH))||
+                    (!CONFIG::write_buffer(EP_GATEWAY_VALUE,gw_sav,IP_LENGTH))||
+                    (!CONFIG::write_buffer(EP_MASK_VALUE,msk_sav,IP_LENGTH))) {
+                msg_alert_error=true;
+                smsg = FPSTR(EEPROM_NOWRITE);
+            } else {
+                msg_alert_success=true;
+                smsg = F("Changes saved to EEPROM, restarting...");
+            }
+        }
+    } else { //no submit, need to get data from EEPROM
+        //ssid
+        if (!CONFIG::read_string(EP_SSID, sSSID , MAX_SSID_LENGTH) ) {
+            sSSID=FPSTR(DEFAULT_SSID);
+        }
+        //password
+        if (!CONFIG::read_string(EP_PASSWORD, sPassword , MAX_PASSWORD_LENGTH) ) {
+            sPassword=FPSTR(DEFAULT_PASSWORD);
+        }
+        //hostname
+        if (!CONFIG::read_string(EP_HOSTNAME, sHostname , MAX_HOSTNAME_LENGTH) ) {
+            sHostname=wifi_config.get_default_hostname();
+        }
+        //phy mode
+        if (!CONFIG::read_byte(EP_PHY_MODE, &phy_mode_buf )) {
+            phy_mode_buf=DEFAULT_PHY_MODE;
+        }
+        //static IP ?
+        if (!CONFIG::read_byte(EP_IP_MODE, &static_ip_buf )) {
+            static_ip_buf=DEFAULT_IP_MODE;
+        }
+        //IP for static IP
+        if (!CONFIG::read_buffer(EP_IP_VALUE,ip_sav , IP_LENGTH) ) {
+            sIP=wifi_config.ip2str((byte *)DEFAULT_IP_VALUE);
+        } else {
+            sIP=wifi_config.ip2str(ip_sav);
+        }
+        //GW for static IP
+        if (!CONFIG::read_buffer(EP_GATEWAY_VALUE,gw_sav , IP_LENGTH) ) {
+            sGW=wifi_config.ip2str((byte *)DEFAULT_GATEWAY_VALUE);
+        } else {
+            sGW=wifi_config.ip2str(gw_sav);
+        }
+        //Subnet for static IP
+        if (!CONFIG::read_buffer(EP_MASK_VALUE,msk_sav , IP_LENGTH) ) {
+            sMask=wifi_config.ip2str((byte *)DEFAULT_MASK_VALUE);
+        } else {
+            sMask=wifi_config.ip2str(msk_sav);
+        }
+    }
+    //Display values
+    //ssid
+    KeysList.add(FPSTR(KEY_STA_SSID));
+    ValuesList.add(sSSID);
+
+    //password
+    KeysList.add(FPSTR(KEY_STA_PASSWORD));
+    ValuesList.add(sPassword);
+
+    //hostname
+    KeysList.add(FPSTR(KEY_HOSTNAME));
+    ValuesList.add(sHostname);
+
+    //network
+    ipos = 0;
+    stmp="";
+    while (inetworkvaluelist[ipos]>-1) {
+        stmp+="<OPTION VALUE=\"";
+        stmp+= intTostr(inetworkvaluelist[ipos]);
+        stmp+="\" ";
+        if (inetworkvaluelist[ipos]==phy_mode_buf) {
+            stmp+=FPSTR(VALUE_SELECTED);
+        }
+        stmp+=">" ;
+        stmp+=inetworkdisplaylist[ipos];
+        stmp+= "</OPTION>\n";
+        ipos++;
+    }
+    KeysList.add(FPSTR(KEY_NETWORK_OPTION_LIST));
+    ValuesList.add(stmp);
+
+    //static IP ?
+    KeysList.add(FPSTR(KEY_IS_STATIC_IP));
+    if (static_ip_buf==STATIC_IP_MODE) {
+        ValuesList.add(VALUE_CHECKED);
+    } else {
+        ValuesList.add("");
+    }
+
+    //IP for static IP
+    KeysList.add(FPSTR(KEY_STA_IP));
+    ValuesList.add(sIP);
+
+    //Gateway for static IP
+    KeysList.add(FPSTR(KEY_STA_GW));
+    ValuesList.add(sGW);
+
+    //Mask for static IP
+    KeysList.add(FPSTR(KEY_STA_SUBNET));
+    ValuesList.add(sMask);
+
+    //do we need to do a scan and display it ?
+    if (!msg_alert_success) {
+        //if in AP mode switch to mixed mode to be able to scan
+        if (wifi_get_opmode()!=WIFI_STA ) {
+            WiFi.mode(WIFI_AP_STA);
+            revertSTA=true;
+        }
+
+        int n = WiFi.scanNetworks();
+        for (int i = 0; i < n; ++i) {
+            //row number
+            stmp = "$ROW_NUMBER["+String(i)+"]$";
+            KeysList.add(stmp);
+            stmp=String(i+1);
+            ValuesList.add(stmp);
+            //SSID
+            stmp = "$AP_SSID["+String(i)+"]$";
+            KeysList.add(stmp);
+            ValuesList.add(WiFi.SSID(i).c_str());
+            //signal strength
+            stmp = "$AP_SIGNAL["+String(i)+"]$";
+            KeysList.add(stmp);
+            stmp = intTostr(100+WiFi.RSSI(i)) ;
+            stmp += "%";
+            ValuesList.add(stmp);
+            //is protected
+            stmp = "$IS_PROTECTED["+String(i)+"]$";
+            KeysList.add(stmp);
+            if (WiFi.encryptionType(i) == ENC_TYPE_NONE) {
+                ValuesList.add(FPSTR(VALUE_NO));
+            } else {
+                ValuesList.add(FPSTR(VALUE_YES));
+            }
+        }
+        WiFi.scanDelete();
+        KeysList.add(FPSTR(KEY_AVAILABLE_AP_NB_ITEMS));
+        ValuesList.add(intTostr(n));
+
+        //revert to pure softAP
+        if (revertSTA) {
+            WiFi.mode(WIFI_AP);
+        }
+        KeysList.add(FPSTR(KEY_AP_SCAN_VISIBILITY));
+        ValuesList.add(VALUE_ITEM_VISIBLE);
+    } else {
+        //no need to do a scan if we are going to restart
+        KeysList.add(FPSTR(KEY_AP_SCAN_VISIBILITY));
+        ValuesList.add(VALUE_ITEM_HIDDEN);
+        KeysList.add(FPSTR(KEY_AVAILABLE_AP_NB_ITEMS));
+        ValuesList.add(intTostr(0));
+    }
+
+    if (msg_alert_error) {
+        ProcessAlertError(KeysList, ValuesList, smsg);
+    } else if (msg_alert_success) {
+        ProcessAlertSuccess(KeysList, ValuesList, smsg);
+        KeysList.add(FPSTR(KEY_SERVICE_PAGE));
+        ValuesList.add(FPSTR(RESTARTCMD));
+        //Add all green
+        KeysList.add(FPSTR(KEY_STA_SSID_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_STA_PASSWORD_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_NETWORK_OPTION_LIST_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_STA_STATIC_IP_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_STA_IP_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_STA_GW_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_STA_SUBNET_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_HOSTNAME_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+    }
+
+    else
+
+    {
+        ProcessNoAlert(KeysList,ValuesList);
+    }
+
+    //Firmware and Free Mem, at the end to reflect situation
+    GetFreeMem(KeysList, ValuesList);
+    //process the template file and provide list of variables
+    processTemplate("/config_sta.tpl", KeysList , ValuesList);
+    //need to clean to speed up memory recovery
+    KeysList.clear();
+    ValuesList.clear();
 }
 
 void handle_web_interface_printer()
 {
-  static const char NOT_AUTH_PRT [] PROGMEM = "HTTP/1.1 301 OK\r\nLocation: /LOGIN?return=PRINTER\r\nCache-Control: no-cache\r\n\r\n";
+    static const char NOT_AUTH_PRT [] PROGMEM = "HTTP/1.1 301 OK\r\nLocation: /LOGIN?return=PRINTER\r\nCache-Control: no-cache\r\n\r\n";
 
-	bool msg_alert_error=false;
-	bool msg_alert_success=false;
-	STORESTRINGS_CLASS KeysList ;
-	STORESTRINGS_CLASS ValuesList ;
+    bool msg_alert_error=false;
+    bool msg_alert_success=false;
+    STORESTRINGS_CLASS KeysList ;
+    STORESTRINGS_CLASS ValuesList ;
 
-	if (!web_interface->is_authenticated())
-	{
-		web_interface->WebServer.sendContent_P(NOT_AUTH_PRT);
-		return;
-	}
+    if (!web_interface->is_authenticated()) {
+        web_interface->WebServer.sendContent_P(NOT_AUTH_PRT);
+        return;
+    }
 
-	//IP+Web
-	GetIpWeb(KeysList, ValuesList);
-	//mode
-	GetMode(KeysList, ValuesList);		
-	//page title and filenames
-	SetPageProp(KeysList,ValuesList,FPSTR(VALUE_PRINTER),F("printer"));
-	//menu item
-	KeysList.add(FPSTR(KEY_MENU_PRINTER));
-	ValuesList.add(FPSTR(VALUE_ACTIVE));
-	
-	//Refresh page time
-	KeysList.add(FPSTR(KEY_REFRESH_PAGE));
-	byte bflag;
-	if (!CONFIG::read_byte(EP_REFRESH_PAGE_TIME, &bflag ))ValuesList.add(intTostr(DEFAULT_REFRESH_PAGE_TIME*1000));
-    else ValuesList.add(intTostr(1000*bflag));
+    //IP+Web
+    GetIpWeb(KeysList, ValuesList);
+    //mode
+    GetMode(KeysList, ValuesList);
+    //page title and filenames
+    SetPageProp(KeysList,ValuesList,FPSTR(VALUE_PRINTER),F("printer"));
+    //menu item
+    KeysList.add(FPSTR(KEY_MENU_PRINTER));
+    ValuesList.add(FPSTR(VALUE_ACTIVE));
+
+    //Refresh page time
+    KeysList.add(FPSTR(KEY_REFRESH_PAGE));
+    byte bflag;
+    if (!CONFIG::read_byte(EP_REFRESH_PAGE_TIME, &bflag )) {
+        ValuesList.add(intTostr(DEFAULT_REFRESH_PAGE_TIME*1000));
+    } else {
+        ValuesList.add(intTostr(1000*bflag));
+    }
     int istatus;
     //xy feedrate
-	KeysList.add(FPSTR(KEY_XY_FEEDRATE));
-	if (!CONFIG::read_buffer(EP_XY_FEEDRATE,  (byte *)&istatus , INTEGER_LENGTH))istatus=DEFAULT_XY_FEEDRATE;
-	ValuesList.add(intTostr(istatus));
-	//Z feedrate
-	KeysList.add(FPSTR(KEY_Z_FEEDRATE));
-	if (!CONFIG::read_buffer(EP_Z_FEEDRATE,  (byte *)&istatus , INTEGER_LENGTH))istatus=DEFAULT_Z_FEEDRATE;
-	ValuesList.add(intTostr(istatus));
-	//E feedrate
-	KeysList.add(FPSTR(KEY_E_FEEDRATE));
-	if (!CONFIG::read_buffer(EP_E_FEEDRATE,  (byte *)&istatus , INTEGER_LENGTH))istatus=DEFAULT_E_FEEDRATE;
-	ValuesList.add(intTostr(istatus));
+    KeysList.add(FPSTR(KEY_XY_FEEDRATE));
+    if (!CONFIG::read_buffer(EP_XY_FEEDRATE,  (byte *)&istatus , INTEGER_LENGTH)) {
+        istatus=DEFAULT_XY_FEEDRATE;
+    }
+    ValuesList.add(intTostr(istatus));
+    //Z feedrate
+    KeysList.add(FPSTR(KEY_Z_FEEDRATE));
+    if (!CONFIG::read_buffer(EP_Z_FEEDRATE,  (byte *)&istatus , INTEGER_LENGTH)) {
+        istatus=DEFAULT_Z_FEEDRATE;
+    }
+    ValuesList.add(intTostr(istatus));
+    //E feedrate
+    KeysList.add(FPSTR(KEY_E_FEEDRATE));
+    if (!CONFIG::read_buffer(EP_E_FEEDRATE,  (byte *)&istatus , INTEGER_LENGTH)) {
+        istatus=DEFAULT_E_FEEDRATE;
+    }
+    ValuesList.add(intTostr(istatus));
 
-	//Serial.println("M114");
-	Serial.println(F("M220"));
-	Serial.println(F("M221"));
-	KeysList.add(FPSTR(KEY_SERVICE_PAGE));
-	ValuesList.add("");
+    //Serial.println("M114");
+    Serial.println(F("M220"));
+    Serial.println(F("M221"));
+    KeysList.add(FPSTR(KEY_SERVICE_PAGE));
+    ValuesList.add("");
 
-	//Firmware and Free Mem, at the end to reflect situation
-	GetFreeMem(KeysList, ValuesList);
-	
-	processTemplate("/printer.tpl", KeysList , ValuesList);
-	//need to clean to speed up memory recovery
-	KeysList.clear();
-	ValuesList.clear();
+    //Firmware and Free Mem, at the end to reflect situation
+    GetFreeMem(KeysList, ValuesList);
+
+    processTemplate("/printer.tpl", KeysList , ValuesList);
+    //need to clean to speed up memory recovery
+    KeysList.clear();
+    ValuesList.clear();
 }
 
 void handle_web_settings()
 {
-  static const char NOT_AUTH_SET [] PROGMEM = "HTTP/1.1 301 OK\r\nLocation: /LOGIN?return=SETTINGS\r\nCache-Control: no-cache\r\n\r\n";
-  
-  String smsg;
-	int istatus;
-	byte bbuf;
-	bool msg_alert_error=false;
-	bool msg_alert_success=false;
-	byte irefresh_page;
-	int ixy_feedrate,iz_feedrate,ie_feedrate;
-	STORESTRINGS_CLASS KeysList ;
-	STORESTRINGS_CLASS ValuesList ;
-  
-	if (!web_interface->is_authenticated())
-	{
-		web_interface->WebServer.sendContent_P(NOT_AUTH_SET);
-		return;
-	}
+    static const char NOT_AUTH_SET [] PROGMEM = "HTTP/1.1 301 OK\r\nLocation: /LOGIN?return=SETTINGS\r\nCache-Control: no-cache\r\n\r\n";
 
-	//IP+Web
-	GetIpWeb(KeysList, ValuesList);
-	//mode
-	GetMode(KeysList, ValuesList);
-	//page title and filenames
-	SetPageProp(KeysList,ValuesList,FPSTR(VALUE_SETTINGS),F("settings"));
-	//menu item
-	KeysList.add(FPSTR(KEY_MENU_SETTINGS));
-	ValuesList.add(FPSTR(VALUE_ACTIVE));
+    String smsg;
+    int istatus;
+    byte bbuf;
+    bool msg_alert_error=false;
+    bool msg_alert_success=false;
+    byte irefresh_page;
+    int ixy_feedrate,iz_feedrate,ie_feedrate;
+    STORESTRINGS_CLASS KeysList ;
+    STORESTRINGS_CLASS ValuesList ;
 
-  //check is it is a submission or a display
-  if (web_interface->WebServer.hasArg("SUBMIT"))
-  {   //is there a correct list of values?
-	  	  if (web_interface->WebServer.hasArg("REFRESH_PAGE") && web_interface->WebServer.hasArg("XY_FEEDRATE")&& web_interface->WebServer.hasArg("Z_FEEDRATE")&& web_interface->WebServer.hasArg("E_FEEDRATE"))
-		{   //is each value correct ?
-			irefresh_page  = web_interface->WebServer.arg("REFRESH_PAGE").toInt();
-			ixy_feedrate  = web_interface->WebServer.arg("XY_FEEDRATE").toInt();
-			iz_feedrate  = web_interface->WebServer.arg("Z_FEEDRATE").toInt();
-			ie_feedrate = web_interface->WebServer.arg("E_FEEDRATE").toInt();
+    if (!web_interface->is_authenticated()) {
+        web_interface->WebServer.sendContent_P(NOT_AUTH_SET);
+        return;
+    }
 
-			if (!(irefresh_page>1 && irefresh_page<120))
-				{
-					msg_alert_error=true;
-					smsg.concat(F("Error: invalid value for refresh time<BR>"));
-					KeysList.add(FPSTR(KEY_REFRESH_PAGE_STATUS));
-					ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-			    }
-			 if (!(ixy_feedrate>0 && ixy_feedrate<9999))
-				{
-					msg_alert_error=true;
-					smsg.concat(F("Error: invalid value for XY axis feedrate<BR>"));
-					KeysList.add(FPSTR(KEY_XY_FEEDRATE_STATUS));
-					ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-			    }
-			 if (!(iz_feedrate>0 && iz_feedrate<9999))
-				{
-					msg_alert_error=true;
-					smsg.concat(F("Error: invalid value for Z axis feedrate<BR>"));
-					KeysList.add(FPSTR(KEY_Z_FEEDRATE_STATUS));
-					ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-			    }
-			if (!(ie_feedrate>0 && ie_feedrate<9999))
-				{
-					msg_alert_error=true;
-					smsg.concat(F("Error: invalid value for Extruder feedrate<BR>"));
-					KeysList.add(FPSTR(KEY_XY_FEEDRATE_STATUS));
-					ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-			    }
-	  }
-	  else
-	   {
-		msg_alert_error=true;
-		smsg = FPSTR(MISSING_DATA);
-	   }
-	   //if no error apply the changes
-		if (msg_alert_error!=true)
-			{
-			 if(!CONFIG::write_buffer(EP_XY_FEEDRATE,(const byte *)&ixy_feedrate,INTEGER_LENGTH)||!CONFIG::write_buffer(EP_Z_FEEDRATE,(const byte *)&iz_feedrate,INTEGER_LENGTH)||!CONFIG::write_buffer(EP_E_FEEDRATE,(const byte *)&ie_feedrate,INTEGER_LENGTH)||!CONFIG::write_byte(EP_REFRESH_PAGE_TIME,irefresh_page))
-				{
-					msg_alert_error=true;
-					smsg = FPSTR(EEPROM_NOWRITE);
-				}
-			else
-				{
-					msg_alert_success=true;
-					smsg = F("Changes saved to EEPROM");
-				}
-			}
-  }
-  else //no submit need to get data from EEPROM
-	{
-	if (!CONFIG::read_buffer(EP_XY_FEEDRATE,  (byte *)&ixy_feedrate , INTEGER_LENGTH))ixy_feedrate=DEFAULT_XY_FEEDRATE;
-	if (!CONFIG::read_byte(EP_REFRESH_PAGE_TIME, &irefresh_page ))irefresh_page=DEFAULT_REFRESH_PAGE_TIME;
-	if (!CONFIG::read_buffer(EP_Z_FEEDRATE,  (byte *)&iz_feedrate , INTEGER_LENGTH))iz_feedrate=DEFAULT_Z_FEEDRATE;
-	if (!CONFIG::read_buffer(EP_E_FEEDRATE,  (byte *)&ie_feedrate , INTEGER_LENGTH))ie_feedrate=DEFAULT_E_FEEDRATE;
-	}
-	//fill the variables
-	//refresh page
-	KeysList.add(FPSTR(KEY_REFRESH_PAGE));
-	ValuesList.add(intTostr(irefresh_page));
-	//xy feedrate
-	KeysList.add(FPSTR(KEY_XY_FEEDRATE));
-	ValuesList.add(intTostr(ixy_feedrate));
-	//Z feedrate
-	KeysList.add(FPSTR(KEY_Z_FEEDRATE));
-	ValuesList.add(intTostr(iz_feedrate));
-	//E feedrate
-	KeysList.add(FPSTR(KEY_E_FEEDRATE));
-	ValuesList.add(intTostr(ie_feedrate));
-	
-	if (msg_alert_error)
-		ProcessAlertError(KeysList, ValuesList, smsg);
-	else if (msg_alert_success)
-	{
-		ProcessAlertSuccess(KeysList, ValuesList, smsg);
-		KeysList.add(FPSTR(KEY_SERVICE_PAGE));
-		ValuesList.add("");
-		KeysList.add(FPSTR(KEY_REFRESH_PAGE_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_XY_FEEDRATE_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_Z_FEEDRATE_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_E_FEEDRATE_STATUS));
-		ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
-		KeysList.add(FPSTR(KEY_SERVICE_PAGE));
-		ValuesList.add("");
-	}
-	
-	else
-		ProcessNoAlert(KeysList,ValuesList);
-	
-  //Firmware and Free Mem, at the end to reflect situation
-  GetFreeMem(KeysList, ValuesList);
+    //IP+Web
+    GetIpWeb(KeysList, ValuesList);
+    //mode
+    GetMode(KeysList, ValuesList);
+    //page title and filenames
+    SetPageProp(KeysList,ValuesList,FPSTR(VALUE_SETTINGS),F("settings"));
+    //menu item
+    KeysList.add(FPSTR(KEY_MENU_SETTINGS));
+    ValuesList.add(FPSTR(VALUE_ACTIVE));
 
-	//process the template file and provide list of variables
-	processTemplate("/settings.tpl", KeysList , ValuesList);
-	//need to clean to speed up memory recovery
-	KeysList.clear();
-	ValuesList.clear();
+    //check is it is a submission or a display
+    if (web_interface->WebServer.hasArg("SUBMIT")) {
+        //is there a correct list of values?
+        if (web_interface->WebServer.hasArg("REFRESH_PAGE") && web_interface->WebServer.hasArg("XY_FEEDRATE")&& web_interface->WebServer.hasArg("Z_FEEDRATE")&& web_interface->WebServer.hasArg("E_FEEDRATE")) {
+            //is each value correct ?
+            irefresh_page  = web_interface->WebServer.arg("REFRESH_PAGE").toInt();
+            ixy_feedrate  = web_interface->WebServer.arg("XY_FEEDRATE").toInt();
+            iz_feedrate  = web_interface->WebServer.arg("Z_FEEDRATE").toInt();
+            ie_feedrate = web_interface->WebServer.arg("E_FEEDRATE").toInt();
+
+            if (!(irefresh_page>1 && irefresh_page<120)) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: invalid value for refresh time<BR>"));
+                KeysList.add(FPSTR(KEY_REFRESH_PAGE_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+            if (!(ixy_feedrate>0 && ixy_feedrate<9999)) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: invalid value for XY axis feedrate<BR>"));
+                KeysList.add(FPSTR(KEY_XY_FEEDRATE_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+            if (!(iz_feedrate>0 && iz_feedrate<9999)) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: invalid value for Z axis feedrate<BR>"));
+                KeysList.add(FPSTR(KEY_Z_FEEDRATE_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+            if (!(ie_feedrate>0 && ie_feedrate<9999)) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: invalid value for Extruder feedrate<BR>"));
+                KeysList.add(FPSTR(KEY_XY_FEEDRATE_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+        } else {
+            msg_alert_error=true;
+            smsg = FPSTR(MISSING_DATA);
+        }
+        //if no error apply the changes
+        if (msg_alert_error!=true) {
+            if(!CONFIG::write_buffer(EP_XY_FEEDRATE,(const byte *)&ixy_feedrate,INTEGER_LENGTH)||!CONFIG::write_buffer(EP_Z_FEEDRATE,(const byte *)&iz_feedrate,INTEGER_LENGTH)||!CONFIG::write_buffer(EP_E_FEEDRATE,(const byte *)&ie_feedrate,INTEGER_LENGTH)||!CONFIG::write_byte(EP_REFRESH_PAGE_TIME,irefresh_page)) {
+                msg_alert_error=true;
+                smsg = FPSTR(EEPROM_NOWRITE);
+            } else {
+                msg_alert_success=true;
+                smsg = F("Changes saved to EEPROM");
+            }
+        }
+    } else { //no submit need to get data from EEPROM
+        if (!CONFIG::read_buffer(EP_XY_FEEDRATE,  (byte *)&ixy_feedrate , INTEGER_LENGTH)) {
+            ixy_feedrate=DEFAULT_XY_FEEDRATE;
+        }
+        if (!CONFIG::read_byte(EP_REFRESH_PAGE_TIME, &irefresh_page )) {
+            irefresh_page=DEFAULT_REFRESH_PAGE_TIME;
+        }
+        if (!CONFIG::read_buffer(EP_Z_FEEDRATE,  (byte *)&iz_feedrate , INTEGER_LENGTH)) {
+            iz_feedrate=DEFAULT_Z_FEEDRATE;
+        }
+        if (!CONFIG::read_buffer(EP_E_FEEDRATE,  (byte *)&ie_feedrate , INTEGER_LENGTH)) {
+            ie_feedrate=DEFAULT_E_FEEDRATE;
+        }
+    }
+    //fill the variables
+    //refresh page
+    KeysList.add(FPSTR(KEY_REFRESH_PAGE));
+    ValuesList.add(intTostr(irefresh_page));
+    //xy feedrate
+    KeysList.add(FPSTR(KEY_XY_FEEDRATE));
+    ValuesList.add(intTostr(ixy_feedrate));
+    //Z feedrate
+    KeysList.add(FPSTR(KEY_Z_FEEDRATE));
+    ValuesList.add(intTostr(iz_feedrate));
+    //E feedrate
+    KeysList.add(FPSTR(KEY_E_FEEDRATE));
+    ValuesList.add(intTostr(ie_feedrate));
+
+    if (msg_alert_error) {
+        ProcessAlertError(KeysList, ValuesList, smsg);
+    } else if (msg_alert_success) {
+        ProcessAlertSuccess(KeysList, ValuesList, smsg);
+        KeysList.add(FPSTR(KEY_SERVICE_PAGE));
+        ValuesList.add("");
+        KeysList.add(FPSTR(KEY_REFRESH_PAGE_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_XY_FEEDRATE_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_Z_FEEDRATE_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_E_FEEDRATE_STATUS));
+        ValuesList.add(FPSTR(VALUE_HAS_SUCCESS));
+        KeysList.add(FPSTR(KEY_SERVICE_PAGE));
+        ValuesList.add("");
+    }
+
+    else {
+        ProcessNoAlert(KeysList,ValuesList);
+    }
+
+    //Firmware and Free Mem, at the end to reflect situation
+    GetFreeMem(KeysList, ValuesList);
+
+    //process the template file and provide list of variables
+    processTemplate("/settings.tpl", KeysList , ValuesList);
+    //need to clean to speed up memory recovery
+    KeysList.clear();
+    ValuesList.clear();
 }
 
 void handle_web_interface_status()
 {
-	static const char NO_TEMP_LINE[] PROGMEM = "\"temperature\":\"0\",\"target\":\"0\",\"active\":\"0\"";
-	web_interface->is_authenticated();
-	Serial.println(F("M114"));
-	int tagpos,tagpos2;
-	String buffer2send;
-	String value;
-	int temperature,target;
+    static const char NO_TEMP_LINE[] PROGMEM = "\"temperature\":\"0\",\"target\":\"0\",\"active\":\"0\"";
+    web_interface->is_authenticated();
+    Serial.println(F("M114"));
+    int tagpos,tagpos2;
+    String buffer2send;
+    String value;
+    int temperature,target;
 
-	//request temperature only if no feedback
-	if ((system_get_time()-web_interface->last_temp)>2000000)
-		Serial.println(F("M105"));
+    //request temperature only if no feedback
+    if ((system_get_time()-web_interface->last_temp)>2000000) {
+        Serial.println(F("M105"));
+    }
 
-	if ((system_get_time()-web_interface->last_temp)<3200000)
-		{
-		value="Connected";
-		}
-	else if ((system_get_time()-web_interface->last_temp)<32000000)
-		{
-		value="Busy";
-		}
-	else 
-		{
-		value="Offline";
-		}
+    if ((system_get_time()-web_interface->last_temp)<3200000) {
+        value="Connected";
+    } else if ((system_get_time()-web_interface->last_temp)<32000000) {
+        value="Busy";
+    } else {
+        value="Offline";
+    }
 
-	//start JSON answer
-	buffer2send="{";
-	//status color
-	buffer2send+="\"status\":\""+value +"\",";
-	//speed
-	buffer2send+="\"speed\":\""+web_interface->answer4M220 +"\",";
-	//flow
-	buffer2send+="\"flow\":\""+web_interface->answer4M221 +"\",";
-	//X position
-	tagpos = web_interface->answer4M114.indexOf("X:");
-	tagpos2 = web_interface->answer4M114.indexOf(" ",tagpos);
-	value=web_interface->answer4M114.substring(tagpos+2,tagpos2);
-	buffer2send+="\"Xpos\":\""+value +"\",";
-	//Y position
-	tagpos = web_interface->answer4M114.indexOf("Y:");
-	tagpos2 = web_interface->answer4M114.indexOf(" ",tagpos);
-	value=web_interface->answer4M114.substring(tagpos+2,tagpos2);
-	buffer2send+="\"Ypos\":\""+value +"\",";
-	//Z position
-	tagpos = web_interface->answer4M114.indexOf("Z:");
-	tagpos2 = web_interface->answer4M114.indexOf(" ",tagpos);
-	value=web_interface->answer4M114.substring(tagpos+2,tagpos2);
-	buffer2send+="\"Zpos\":\""+value +"\",";
-	//heater
-	buffer2send.concat(F("\"heater\":["));
-	//Extruder 1
-	buffer2send.concat(F("{\"name\":\"Extruder 1\","));
-	int Tpos = web_interface->answer4M105.indexOf("T0:");
-	byte bshift=1;
-	if (Tpos==-1)
-		{
-		Tpos = web_interface->answer4M105.indexOf("T:");
-		bshift=0;
-		}
-	int slashpos = web_interface->answer4M105.indexOf(" /",Tpos);	
-	int spacepos = web_interface->answer4M105.indexOf(" ",slashpos+2);
-	//have Extruder 1 ?
-	if(slashpos!=-1 && spacepos!=-1 )
-			{
-			buffer2send += "\"temperature\":\""+web_interface->answer4M105.substring(Tpos+2+bshift,slashpos)+
-			"\",\"target\":\""+web_interface->answer4M105.substring(slashpos+2,spacepos)+"\",\"active\":\"1\"";
-			}
-	else{//no extruder temperature
-			buffer2send.concat(FPSTR(NO_TEMP_LINE));
-			}
-	
-	buffer2send+="},";
-	//Extruder 2
-	buffer2send.concat(F("{\"name\":\"Extruder 2\","));
-	Tpos = web_interface->answer4M105.indexOf("T1:");
-	if (Tpos>-1) //have extruder 2 ?
-		{
-		slashpos = web_interface->answer4M105.indexOf(" /",Tpos);
-		spacepos = web_interface->answer4M105.indexOf(" ",slashpos+2);
-		if(slashpos!=-1 && spacepos!=-1 )
-			{
-			buffer2send += "\"temperature\":\""+web_interface->answer4M105.substring(Tpos+3,slashpos)+
-			"\",\"target\":\""+web_interface->answer4M105.substring(slashpos+2,spacepos)+"\",\"active\":\"1\"";
-			}
-		else{//no extruder temperature
-			buffer2send.concat(FPSTR(NO_TEMP_LINE));
-			}
-		}	
-	else{//no extruder temperature
-		buffer2send.concat(FPSTR(NO_TEMP_LINE));
-		}
-	buffer2send+="},";
-	
-	//Bed
-	buffer2send.concat(F("{\"name\":\"Bed\","));
-	Tpos = web_interface->answer4M105.indexOf("B:");
-	if (Tpos>-1)
-		{
-		slashpos = web_interface->answer4M105.indexOf(" /",Tpos);	
-		spacepos = web_interface->answer4M105.indexOf(" ",slashpos+2);
-		if(slashpos!=-1 && spacepos!=-1 )
-			{
-			temperature = (int)atof(web_interface->answer4M105.substring(Tpos+2,slashpos).c_str());
-			target = (int)atof(web_interface->answer4M105.substring(slashpos+2,spacepos).c_str());
-			buffer2send += "\"temperature\":\""+web_interface->answer4M105.substring(Tpos+2,slashpos)+
-			"\",\"target\":\""+web_interface->answer4M105.substring(slashpos+2,spacepos)+"\",\"active\":\"1\"";
-			}
-		else{//no extruder temperature
-			buffer2send.concat(FPSTR(NO_TEMP_LINE));
-			}
-		}	
-	else{//no extruder temperature
-		buffer2send.concat(FPSTR(NO_TEMP_LINE));
-		}
-	buffer2send+="}";
-	buffer2send+="],";
-	
-	//information
-	buffer2send.concat(F("\"InformationMsg\":["));
-	for (int i=0;i<web_interface->info_msg.size();i++)
-	{
-		if (i>0)buffer2send+=",";
-		buffer2send+="{\"line\":\"";
-		buffer2send+=web_interface->info_msg.get(i);
-		buffer2send+="\"}";
-	}
-	buffer2send+="],";
-	//Error
-	buffer2send.concat(F("\"ErrorMsg\":["));
-	for (int i=0;i<web_interface->error_msg.size();i++)
-	{
-		if (i>0)buffer2send+=",";
-		buffer2send+="{\"line\":\"";
-		buffer2send+=web_interface->error_msg.get(i);
-		buffer2send+="\"}";
-	}
-	buffer2send+="],";
-	//Status
-	buffer2send.concat(F("\"StatusMsg\":["));
-	for (int i=0;i<web_interface->status_msg.size();i++)
-	{
-		if (i>0)buffer2send+=",";
-		buffer2send+="{\"line\":\"";
-		buffer2send+=web_interface->status_msg.get(i);
-		buffer2send+="\"}";
-	}
-	buffer2send+="]";
-	buffer2send+="}";
-	web_interface->WebServer.sendHeader("Cache-Control", "no-cache");
-	web_interface->WebServer.send(200, "application/json",buffer2send);	
+    //start JSON answer
+    buffer2send="{";
+    //status color
+    buffer2send+="\"status\":\""+value +"\",";
+    //speed
+    buffer2send+="\"speed\":\""+web_interface->answer4M220 +"\",";
+    //flow
+    buffer2send+="\"flow\":\""+web_interface->answer4M221 +"\",";
+    //X position
+    tagpos = web_interface->answer4M114.indexOf("X:");
+    tagpos2 = web_interface->answer4M114.indexOf(" ",tagpos);
+    value=web_interface->answer4M114.substring(tagpos+2,tagpos2);
+    buffer2send+="\"Xpos\":\""+value +"\",";
+    //Y position
+    tagpos = web_interface->answer4M114.indexOf("Y:");
+    tagpos2 = web_interface->answer4M114.indexOf(" ",tagpos);
+    value=web_interface->answer4M114.substring(tagpos+2,tagpos2);
+    buffer2send+="\"Ypos\":\""+value +"\",";
+    //Z position
+    tagpos = web_interface->answer4M114.indexOf("Z:");
+    tagpos2 = web_interface->answer4M114.indexOf(" ",tagpos);
+    value=web_interface->answer4M114.substring(tagpos+2,tagpos2);
+    buffer2send+="\"Zpos\":\""+value +"\",";
+    //heater
+    buffer2send.concat(F("\"heater\":["));
+    //Extruder 1
+    buffer2send.concat(F("{\"name\":\"Extruder 1\","));
+    int Tpos = web_interface->answer4M105.indexOf("T0:");
+    byte bshift=1;
+    if (Tpos==-1) {
+        Tpos = web_interface->answer4M105.indexOf("T:");
+        bshift=0;
+    }
+    int slashpos = web_interface->answer4M105.indexOf(" /",Tpos);
+    int spacepos = web_interface->answer4M105.indexOf(" ",slashpos+2);
+    //have Extruder 1 ?
+    if(slashpos!=-1 && spacepos!=-1 ) {
+        buffer2send += "\"temperature\":\""+web_interface->answer4M105.substring(Tpos+2+bshift,slashpos)+
+                       "\",\"target\":\""+web_interface->answer4M105.substring(slashpos+2,spacepos)+"\",\"active\":\"1\"";
+    } else { //no extruder temperature
+        buffer2send.concat(FPSTR(NO_TEMP_LINE));
+    }
+
+    buffer2send+="},";
+    //Extruder 2
+    buffer2send.concat(F("{\"name\":\"Extruder 2\","));
+    Tpos = web_interface->answer4M105.indexOf("T1:");
+    if (Tpos>-1) { //have extruder 2 ?
+        slashpos = web_interface->answer4M105.indexOf(" /",Tpos);
+        spacepos = web_interface->answer4M105.indexOf(" ",slashpos+2);
+        if(slashpos!=-1 && spacepos!=-1 ) {
+            buffer2send += "\"temperature\":\""+web_interface->answer4M105.substring(Tpos+3,slashpos)+
+                           "\",\"target\":\""+web_interface->answer4M105.substring(slashpos+2,spacepos)+"\",\"active\":\"1\"";
+        } else { //no extruder temperature
+            buffer2send.concat(FPSTR(NO_TEMP_LINE));
+        }
+    } else { //no extruder temperature
+        buffer2send.concat(FPSTR(NO_TEMP_LINE));
+    }
+    buffer2send+="},";
+
+    //Bed
+    buffer2send.concat(F("{\"name\":\"Bed\","));
+    Tpos = web_interface->answer4M105.indexOf("B:");
+    if (Tpos>-1) {
+        slashpos = web_interface->answer4M105.indexOf(" /",Tpos);
+        spacepos = web_interface->answer4M105.indexOf(" ",slashpos+2);
+        if(slashpos!=-1 && spacepos!=-1 ) {
+            temperature = (int)atof(web_interface->answer4M105.substring(Tpos+2,slashpos).c_str());
+            target = (int)atof(web_interface->answer4M105.substring(slashpos+2,spacepos).c_str());
+            buffer2send += "\"temperature\":\""+web_interface->answer4M105.substring(Tpos+2,slashpos)+
+                           "\",\"target\":\""+web_interface->answer4M105.substring(slashpos+2,spacepos)+"\",\"active\":\"1\"";
+        } else { //no extruder temperature
+            buffer2send.concat(FPSTR(NO_TEMP_LINE));
+        }
+    } else { //no extruder temperature
+        buffer2send.concat(FPSTR(NO_TEMP_LINE));
+    }
+    buffer2send+="}";
+    buffer2send+="],";
+
+    //information
+    buffer2send.concat(F("\"InformationMsg\":["));
+    for (int i=0; i<web_interface->info_msg.size(); i++) {
+        if (i>0) {
+            buffer2send+=",";
+        }
+        buffer2send+="{\"line\":\"";
+        buffer2send+=web_interface->info_msg.get(i);
+        buffer2send+="\"}";
+    }
+    buffer2send+="],";
+    //Error
+    buffer2send.concat(F("\"ErrorMsg\":["));
+    for (int i=0; i<web_interface->error_msg.size(); i++) {
+        if (i>0) {
+            buffer2send+=",";
+        }
+        buffer2send+="{\"line\":\"";
+        buffer2send+=web_interface->error_msg.get(i);
+        buffer2send+="\"}";
+    }
+    buffer2send+="],";
+    //Status
+    buffer2send.concat(F("\"StatusMsg\":["));
+    for (int i=0; i<web_interface->status_msg.size(); i++) {
+        if (i>0) {
+            buffer2send+=",";
+        }
+        buffer2send+="{\"line\":\"";
+        buffer2send+=web_interface->status_msg.get(i);
+        buffer2send+="\"}";
+    }
+    buffer2send+="]";
+    buffer2send+="}";
+    web_interface->WebServer.sendHeader("Cache-Control", "no-cache");
+    web_interface->WebServer.send(200, "application/json",buffer2send);
 }
 
-String formatBytes(size_t bytes){
-  if (bytes < 1024){
-    return String(bytes)+" B";
-  } else if(bytes < (1024 * 1024)){
-    return String(bytes/1024.0)+" KB";
-  } else if(bytes < (1024 * 1024 * 1024)){
-    return String(bytes/1024.0/1024.0)+" MB";
-  } else {
-    return String(bytes/1024.0/1024.0/1024.0)+" GB";
-  }
+String formatBytes(size_t bytes)
+{
+    if (bytes < 1024) {
+        return String(bytes)+" B";
+    } else if(bytes < (1024 * 1024)) {
+        return String(bytes/1024.0)+" KB";
+    } else if(bytes < (1024 * 1024 * 1024)) {
+        return String(bytes/1024.0/1024.0)+" MB";
+    } else {
+        return String(bytes/1024.0/1024.0/1024.0)+" GB";
+    }
 }
 
-String getContentType(String filename){
-   if(filename.endsWith(".htm")) return "text/html";
-  else if(filename.endsWith(".html")) return "text/html";
-  else if(filename.endsWith(".css")) return "text/css";
-  else if(filename.endsWith(".js")) return "application/javascript";
-  else if(filename.endsWith(".png")) return "image/png";
-  else if(filename.endsWith(".gif")) return "image/gif";
-  else if(filename.endsWith(".jpg")) return "image/jpeg";
-  else if(filename.endsWith(".ico")) return "image/x-icon";
-  else if(filename.endsWith(".xml")) return "text/xml";
-  else if(filename.endsWith(".pdf")) return "application/x-pdf";
-  else if(filename.endsWith(".zip")) return "application/x-zip";
-  else if(filename.endsWith(".gz")) return "application/x-gzip";
-  else if(filename.endsWith(".tpl")) return "text/plain";
-  else if(filename.endsWith(".inc")) return "text/plain";
-  else if(filename.endsWith(".txt")) return "text/plain";
-  return "application/octet-stream";
+String getContentType(String filename)
+{
+    if(filename.endsWith(".htm")) {
+        return "text/html";
+    } else if(filename.endsWith(".html")) {
+        return "text/html";
+    } else if(filename.endsWith(".css")) {
+        return "text/css";
+    } else if(filename.endsWith(".js")) {
+        return "application/javascript";
+    } else if(filename.endsWith(".png")) {
+        return "image/png";
+    } else if(filename.endsWith(".gif")) {
+        return "image/gif";
+    } else if(filename.endsWith(".jpg")) {
+        return "image/jpeg";
+    } else if(filename.endsWith(".ico")) {
+        return "image/x-icon";
+    } else if(filename.endsWith(".xml")) {
+        return "text/xml";
+    } else if(filename.endsWith(".pdf")) {
+        return "application/x-pdf";
+    } else if(filename.endsWith(".zip")) {
+        return "application/x-zip";
+    } else if(filename.endsWith(".gz")) {
+        return "application/x-gzip";
+    } else if(filename.endsWith(".tpl")) {
+        return "text/plain";
+    } else if(filename.endsWith(".inc")) {
+        return "text/plain";
+    } else if(filename.endsWith(".txt")) {
+        return "text/plain";
+    }
+    return "application/octet-stream";
 }
 
 void SPIFFSFileupload()
 {
-  HTTPUpload& upload = (web_interface->WebServer).upload();
-  if(upload.status == UPLOAD_FILE_START){
-    String filename = upload.filename;
-    web_interface->fsUploadFile = SPIFFS.open(filename, "w");
-    filename = String();
-  } else if(upload.status == UPLOAD_FILE_WRITE){
-    if(web_interface->fsUploadFile)
-		{
-		web_interface->fsUploadFile.write(upload.buf, upload.currentSize);
-		}
-  } else if(upload.status == UPLOAD_FILE_END){
-    if(web_interface->fsUploadFile)
-      web_interface->fsUploadFile.close();
-  }
-  else Serial.println("Cannot open file");
+    HTTPUpload& upload = (web_interface->WebServer).upload();
+    if(upload.status == UPLOAD_FILE_START) {
+        String filename = upload.filename;
+        web_interface->fsUploadFile = SPIFFS.open(filename, "w");
+        filename = String();
+    } else if(upload.status == UPLOAD_FILE_WRITE) {
+        if(web_interface->fsUploadFile) {
+            web_interface->fsUploadFile.write(upload.buf, upload.currentSize);
+        }
+    } else if(upload.status == UPLOAD_FILE_END) {
+        if(web_interface->fsUploadFile) {
+            web_interface->fsUploadFile.close();
+        }
+    } else {
+        Serial.println("Cannot open file");
+    }
 }
 
 void WebUpdateUpload()
 {
-	HTTPUpload& upload = (web_interface->WebServer).upload();
-	if(upload.status == UPLOAD_FILE_START){
-	Serial.println(F("M117 Update Firmware"));
-	web_interface->_upload_status= UPLOAD_STATUS_ONGOING;
-	WiFiUDP::stopAll();
-	uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
-	if(!Update.begin(maxSketchSpace)){//start with max available size
-	}
-	} else if(upload.status == UPLOAD_FILE_WRITE){
-	web_interface->_upload_status= UPLOAD_STATUS_ONGOING;
-	if(Update.write(upload.buf, upload.currentSize) != upload.currentSize){
-	}
-	} else if(upload.status == UPLOAD_FILE_END){
-	if(Update.end(true)){ //true to set the size to the current progress
-	  //Now Reboot
-	  web_interface->_upload_status=UPLOAD_STATUS_SUCCESSFUL;
-	} 
-	} else if(upload.status == UPLOAD_FILE_ABORTED){
-	Update.end();
-	web_interface->_upload_status=UPLOAD_STATUS_CANCELLED;
-	}
-	yield();
+    HTTPUpload& upload = (web_interface->WebServer).upload();
+    if(upload.status == UPLOAD_FILE_START) {
+        Serial.println(F("M117 Update Firmware"));
+        web_interface->_upload_status= UPLOAD_STATUS_ONGOING;
+        WiFiUDP::stopAll();
+        uint32_t maxSketchSpace = (ESP.getFreeSketchSpace() - 0x1000) & 0xFFFFF000;
+        if(!Update.begin(maxSketchSpace)) { //start with max available size
+        }
+    } else if(upload.status == UPLOAD_FILE_WRITE) {
+        web_interface->_upload_status= UPLOAD_STATUS_ONGOING;
+        if(Update.write(upload.buf, upload.currentSize) != upload.currentSize) {
+        }
+    } else if(upload.status == UPLOAD_FILE_END) {
+        if(Update.end(true)) { //true to set the size to the current progress
+            //Now Reboot
+            web_interface->_upload_status=UPLOAD_STATUS_SUCCESSFUL;
+        }
+    } else if(upload.status == UPLOAD_FILE_ABORTED) {
+        Update.end();
+        web_interface->_upload_status=UPLOAD_STATUS_CANCELLED;
+    }
+    yield();
 }
 
 
-void handleUpdate(){
-	web_interface->is_authenticated();
-	String jsonfile = "{\"status\":\"" ;
-	jsonfile+=intTostr(web_interface->_upload_status);
-	jsonfile+="\"}";
-	//send status
-	web_interface->WebServer.sendHeader("Cache-Control", "no-cache");
-	web_interface->WebServer.send(200, "application/json", jsonfile);
-	//if success restart
-	if (web_interface->_upload_status==UPLOAD_STATUS_SUCCESSFUL)web_interface->restartmodule=true;
+void handleUpdate()
+{
+    web_interface->is_authenticated();
+    String jsonfile = "{\"status\":\"" ;
+    jsonfile+=intTostr(web_interface->_upload_status);
+    jsonfile+="\"}";
+    //send status
+    web_interface->WebServer.sendHeader("Cache-Control", "no-cache");
+    web_interface->WebServer.send(200, "application/json", jsonfile);
+    //if success restart
+    if (web_interface->_upload_status==UPLOAD_STATUS_SUCCESSFUL) {
+        web_interface->restartmodule=true;
+    }
 }
 
-void handleFileList() {
-	if (!web_interface->is_authenticated())
-	{
-		return;
-	}
-	String path = "/";
-	String status="Ok";
+void handleFileList()
+{
+    if (!web_interface->is_authenticated()) {
+        return;
+    }
+    String path = "/";
+    String status="Ok";
 
-	if(web_interface->WebServer.hasArg("action")) {
-		if(web_interface->WebServer.arg("action")=="delete" && web_interface->WebServer.hasArg("filename"))
-			{
-				String filename;
-				 web_interface->urldecode(filename,web_interface->WebServer.arg("filename").c_str());
-				if(!SPIFFS.exists(filename)){
-					 status="Cannot delete, file not found!";
-					}
-				else
-					{
-						SPIFFS.remove(filename);
-					}
-			}
-	  }
-	String jsonfile = "{\"path\":\"" + path + "\",";
-	Dir dir = SPIFFS.openDir(path);
-	jsonfile+="\"files\":[";
-	bool firstentry=true;
-	while (dir.next()) {
-		if (!firstentry) jsonfile+=",";
-		else firstentry=false;
-		jsonfile+="{";
-		jsonfile+="\"name\":\"";
-		jsonfile+=dir.fileName();
-		jsonfile+="\",\"size\":\"";
-		File f = dir.openFile("r");
-		jsonfile+=formatBytes(f.size());
-		jsonfile+="\"";
-		jsonfile+="}";
-		f.close();
-		}	
-	jsonfile+="],";
-	jsonfile+="\"status\":\"" + status + "\",";
-	FSInfo info;
-	SPIFFS.info(info);
-	jsonfile+="\"total\":\"" + formatBytes(info.totalBytes) + "\",";
-	jsonfile+="\"used\":\"" + formatBytes(info.usedBytes) + "\",";
-	jsonfile.concat(F("\"occupation\":\""));
-	jsonfile+= intTostr(100*info.usedBytes/info.totalBytes);
-	jsonfile+="\"";
-	jsonfile+="}";
-	path = "";
-	web_interface->WebServer.sendHeader("Cache-Control", "no-cache");
-	web_interface->WebServer.send(200, "application/json", jsonfile);
+    if(web_interface->WebServer.hasArg("action")) {
+        if(web_interface->WebServer.arg("action")=="delete" && web_interface->WebServer.hasArg("filename")) {
+            String filename;
+            web_interface->urldecode(filename,web_interface->WebServer.arg("filename").c_str());
+            if(!SPIFFS.exists(filename)) {
+                status="Cannot delete, file not found!";
+            } else {
+                SPIFFS.remove(filename);
+            }
+        }
+    }
+    String jsonfile = "{\"path\":\"" + path + "\",";
+    Dir dir = SPIFFS.openDir(path);
+    jsonfile+="\"files\":[";
+    bool firstentry=true;
+    while (dir.next()) {
+        if (!firstentry) {
+            jsonfile+=",";
+        } else {
+            firstentry=false;
+        }
+        jsonfile+="{";
+        jsonfile+="\"name\":\"";
+        jsonfile+=dir.fileName();
+        jsonfile+="\",\"size\":\"";
+        File f = dir.openFile("r");
+        jsonfile+=formatBytes(f.size());
+        jsonfile+="\"";
+        jsonfile+="}";
+        f.close();
+    }
+    jsonfile+="],";
+    jsonfile+="\"status\":\"" + status + "\",";
+    FSInfo info;
+    SPIFFS.info(info);
+    jsonfile+="\"total\":\"" + formatBytes(info.totalBytes) + "\",";
+    jsonfile+="\"used\":\"" + formatBytes(info.usedBytes) + "\",";
+    jsonfile.concat(F("\"occupation\":\""));
+    jsonfile+= intTostr(100*info.usedBytes/info.totalBytes);
+    jsonfile+="\"";
+    jsonfile+="}";
+    path = "";
+    web_interface->WebServer.sendHeader("Cache-Control", "no-cache");
+    web_interface->WebServer.send(200, "application/json", jsonfile);
 }
 
-void handleSDFileList() {
-	if (!web_interface->is_authenticated())
-	{
-		return;
-	}
-	String jsonfile = "[";
-	for (int i=0;i<web_interface->fileslist.size();i++)
-	{
-		if (i>0)jsonfile+=",";
-		jsonfile+="{\"entry\":\"";
-		jsonfile+=web_interface->fileslist.get(i);
-		jsonfile+="\"}";
-	}
-	jsonfile+="]";
-	web_interface->WebServer.sendHeader("Cache-Control", "no-cache");
-	web_interface->WebServer.send(200, "application/json", jsonfile);
+void handleSDFileList()
+{
+    if (!web_interface->is_authenticated()) {
+        return;
+    }
+    String jsonfile = "[";
+    for (int i=0; i<web_interface->fileslist.size(); i++) {
+        if (i>0) {
+            jsonfile+=",";
+        }
+        jsonfile+="{\"entry\":\"";
+        jsonfile+=web_interface->fileslist.get(i);
+        jsonfile+="\"}";
+    }
+    jsonfile+="]";
+    web_interface->WebServer.sendHeader("Cache-Control", "no-cache");
+    web_interface->WebServer.send(200, "application/json", jsonfile);
 }
 
 //do a redirect to avoid to many query
 //and handle not registred path
 void handle_not_found()
 {
-  static const char NOT_AUTH_NF [] PROGMEM = "HTTP/1.1 301 OK\r\nLocation: /\r\nCache-Control: no-cache\r\n\r\n";
-  
-  if (!web_interface->is_authenticated())
-	{
-		web_interface->WebServer.sendContent_P(NOT_AUTH_NF);
-		return;
-	}
+    static const char NOT_AUTH_NF [] PROGMEM = "HTTP/1.1 301 OK\r\nLocation: /\r\nCache-Control: no-cache\r\n\r\n";
 
-  String path = web_interface->WebServer.uri();
-  String contentType = getContentType(path);
-  String pathWithGz = path + ".gz";
-  if(SPIFFS.exists(pathWithGz) || SPIFFS.exists(path))
-	{
-	if(SPIFFS.exists(pathWithGz)) path = pathWithGz;
-		File file = SPIFFS.open(path, "r");
-		web_interface->WebServer.streamFile(file, contentType);
-		file.close();
-	}
-else 
-	{
-		if (SPIFFS.exists("/404.tpl"))
-			{
-			STORESTRINGS_CLASS KeysList ;
-			STORESTRINGS_CLASS ValuesList ;
-			String stmp;
+    if (!web_interface->is_authenticated()) {
+        web_interface->WebServer.sendContent_P(NOT_AUTH_NF);
+        return;
+    }
 
-	  //IP+Web
-	  GetIpWeb(KeysList, ValuesList);
-			//mode
-	  GetMode(KeysList, ValuesList);
-	  //page title and filenames
-	  SetPageProp(KeysList,ValuesList,F("404 Page not found"),F("404"));
+    String path = web_interface->WebServer.uri();
+    String contentType = getContentType(path);
+    String pathWithGz = path + ".gz";
+    if(SPIFFS.exists(pathWithGz) || SPIFFS.exists(path)) {
+        if(SPIFFS.exists(pathWithGz)) {
+            path = pathWithGz;
+        }
+        File file = SPIFFS.open(path, "r");
+        web_interface->WebServer.streamFile(file, contentType);
+        file.close();
+    } else {
+        if (SPIFFS.exists("/404.tpl")) {
+            STORESTRINGS_CLASS KeysList ;
+            STORESTRINGS_CLASS ValuesList ;
+            String stmp;
 
-    //Firmware and Free Mem, at the end to reflect situation
-    GetFreeMem(KeysList, ValuesList);
-	  
-			//process the template file and provide list of variables
-			processTemplate("/404.tpl", KeysList , ValuesList);
-			//need to clean to speed up memory recovery
-			KeysList.clear();
-			ValuesList.clear();
-			}
-		else
-		{ //if not template use default page
-			contentType=FPSTR(PAGE_404);
-			String stmp;
-			if (wifi_get_opmode()==WIFI_STA ) stmp=WiFi.localIP().toString();
-			else stmp=WiFi.softAPIP().toString();
-			//Web address = ip + port
-			String KEY_IP = FPSTR(KEY_WEB_ADDRESS);
-			if (wifi_config.iweb_port!=80)
-				{
-				stmp+=":";
-				stmp+=intTostr(wifi_config.iweb_port);
-				}
-			contentType.replace(KEY_IP,stmp);
-			web_interface->WebServer.send(200,"text/html",contentType);
-		}
-	}
+            //IP+Web
+            GetIpWeb(KeysList, ValuesList);
+            //mode
+            GetMode(KeysList, ValuesList);
+            //page title and filenames
+            SetPageProp(KeysList,ValuesList,F("404 Page not found"),F("404"));
+
+            //Firmware and Free Mem, at the end to reflect situation
+            GetFreeMem(KeysList, ValuesList);
+
+            //process the template file and provide list of variables
+            processTemplate("/404.tpl", KeysList , ValuesList);
+            //need to clean to speed up memory recovery
+            KeysList.clear();
+            ValuesList.clear();
+        } else {
+            //if not template use default page
+            contentType=FPSTR(PAGE_404);
+            String stmp;
+            if (wifi_get_opmode()==WIFI_STA ) {
+                stmp=WiFi.localIP().toString();
+            } else {
+                stmp=WiFi.softAPIP().toString();
+            }
+            //Web address = ip + port
+            String KEY_IP = FPSTR(KEY_WEB_ADDRESS);
+            if (wifi_config.iweb_port!=80) {
+                stmp+=":";
+                stmp+=intTostr(wifi_config.iweb_port);
+            }
+            contentType.replace(KEY_IP,stmp);
+            web_interface->WebServer.send(200,"text/html",contentType);
+        }
+    }
 }
 
 void handle_login()
 {
-  static const char NOT_AUTH_LOG [] PROGMEM = "HTTP/1.1 301 OK\r\nSet-Cookie: ESPSESSIONID=0\r\nLocation: /LOGIN\r\nCache-Control: no-cache\r\n\r\n";
-  
-  String smsg;
-	String sReturn;
-	String sUser,sPassword;
-	bool msg_alert_error=false;
-	bool msg_alert_success=false;
-	STORESTRINGS_CLASS KeysList ;
-	STORESTRINGS_CLASS ValuesList ;
-	
-	if (web_interface->WebServer.hasArg("DISCONNECT")){
-    web_interface->WebServer.sendContent_P(NOT_AUTH_LOG);
-    return;
-  }
-  
-  //check is it is a submission or a display
-  smsg="";
-  if (web_interface->WebServer.hasArg("return")) web_interface->urldecode(sReturn,web_interface->WebServer.arg("return").c_str());
-  if (web_interface->WebServer.hasArg("SUBMIT"))
-  {   //is there a correct list of values?
-	  if ( web_interface->WebServer.hasArg("PASSWORD")&& web_interface->WebServer.hasArg("USER"))
-		{	
-			//USER
-		    web_interface->urldecode(sUser,web_interface->WebServer.arg("USER").c_str());
-		    #ifdef AUTHENTICATION_FEATURE
-		    if (sUser!="admin")
-				{
-				msg_alert_error=true;
-				smsg.concat(F("Error : Incorrect User<BR>"));
-				KeysList.add(FPSTR(KEY_USER_STATUS));
-				ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				}
-		    //Password
-		    web_interface->urldecode(sPassword,web_interface->WebServer.arg("PASSWORD").c_str());
-		    String scurrentPassword;
-		    
-		    if (!CONFIG::read_string(EP_ADMIN_PWD, scurrentPassword , MAX_ADMIN_PASSWORD_LENGTH))
-		      scurrentPassword=FPSTR(DEFAULT_ADMIN);
-      
-		    if (strcmp(sPassword.c_str(),scurrentPassword.c_str())!=0)
-				{
-				msg_alert_error=true;
-				smsg.concat(F("Error: Incorrect password<BR>"));
-				KeysList.add(FPSTR(KEY_USER_PASSWORD_STATUS));
-				ValuesList.add(FPSTR(VALUE_HAS_ERROR));
-				}
-			#endif
-		}
-      else
-	   {
-		msg_alert_error=true;
-		smsg = FPSTR(MISSING_DATA);
-	   }
-	  
-	   //if no error login is ok
-	   if (msg_alert_error==false)
-		{
-		#ifdef AUTHENTICATION_FEATURE
-		auth_ip * current_auth = new auth_ip;
-		current_auth->ip=web_interface->WebServer.client().remoteIP();
-		strcpy(current_auth->sessionID,web_interface->create_session_ID());
-		current_auth->last_time=millis();
-		if (web_interface->AddAuthIP(current_auth))
-		{
-		String header = F("HTTP/1.1 301 OK\r\nSet-Cookie: ESPSESSIONID=");
-		header+=current_auth->sessionID;
-		header+="\r\nLocation: /";
-		header+=sReturn;
-		header.concat(F("\r\nCache-Control: no-cache\r\n\r\n"));
-		web_interface->WebServer.sendContent(header);
-		return;
-		}
-		else
-		{
-			delete current_auth;
-			msg_alert_error=true;
-			smsg = F("Error: Too many connections");
-		}
-		#endif
-		}
-	}
-  
-	else //no submit need to get data from EEPROM
-	{
-	sUser=String();
-	//password 
-	sPassword=String();
-	}
-	
-	//Display values
-	KeysList.add(FPSTR(KEY_RETURN));
-	ValuesList.add(sReturn);
-  
-	KeysList.add(FPSTR(KEY_DISCONNECT_VISIBILITY));
-	if (web_interface->is_authenticated())ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
-	else ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
-	//IP+Web
-	GetIpWeb(KeysList, ValuesList);
-	//mode
-	GetMode(KeysList, ValuesList);
-  
-	//page title and filenames
-	SetPageProp(KeysList,ValuesList,FPSTR(VALUE_LOGIN),F("login"));	
-	//User
-	KeysList.add(FPSTR(KEY_USER));
-	ValuesList.add(sUser);
-	//password
-	KeysList.add(FPSTR(KEY_USER_PASSWORD));
-	ValuesList.add(sPassword);
+    static const char NOT_AUTH_LOG [] PROGMEM = "HTTP/1.1 301 OK\r\nSet-Cookie: ESPSESSIONID=0\r\nLocation: /LOGIN\r\nCache-Control: no-cache\r\n\r\n";
 
-if (msg_alert_error)
-    ProcessAlertError(KeysList, ValuesList, smsg);
-else
-    ProcessNoAlert(KeysList,ValuesList);
+    String smsg;
+    String sReturn;
+    String sUser,sPassword;
+    bool msg_alert_error=false;
+    bool msg_alert_success=false;
+    STORESTRINGS_CLASS KeysList ;
+    STORESTRINGS_CLASS ValuesList ;
 
-  //Firmware and Free Mem, at the end to reflect situation
-  GetFreeMem(KeysList, ValuesList);
+    if (web_interface->WebServer.hasArg("DISCONNECT")) {
+        web_interface->WebServer.sendContent_P(NOT_AUTH_LOG);
+        return;
+    }
 
-	//process the template file and provide list of variables
-	processTemplate("/login.tpl", KeysList , ValuesList);
-	//need to clean to speed up memory recovery
-	KeysList.clear();
-	ValuesList.clear();
+    //check is it is a submission or a display
+    smsg="";
+    if (web_interface->WebServer.hasArg("return")) {
+        web_interface->urldecode(sReturn,web_interface->WebServer.arg("return").c_str());
+    }
+    if (web_interface->WebServer.hasArg("SUBMIT")) {
+        //is there a correct list of values?
+        if ( web_interface->WebServer.hasArg("PASSWORD")&& web_interface->WebServer.hasArg("USER")) {
+            //USER
+            web_interface->urldecode(sUser,web_interface->WebServer.arg("USER").c_str());
+#ifdef AUTHENTICATION_FEATURE
+            if (sUser!="admin") {
+                msg_alert_error=true;
+                smsg.concat(F("Error : Incorrect User<BR>"));
+                KeysList.add(FPSTR(KEY_USER_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+            //Password
+            web_interface->urldecode(sPassword,web_interface->WebServer.arg("PASSWORD").c_str());
+            String scurrentPassword;
+
+            if (!CONFIG::read_string(EP_ADMIN_PWD, scurrentPassword , MAX_ADMIN_PASSWORD_LENGTH)) {
+                scurrentPassword=FPSTR(DEFAULT_ADMIN);
+            }
+
+            if (strcmp(sPassword.c_str(),scurrentPassword.c_str())!=0) {
+                msg_alert_error=true;
+                smsg.concat(F("Error: Incorrect password<BR>"));
+                KeysList.add(FPSTR(KEY_USER_PASSWORD_STATUS));
+                ValuesList.add(FPSTR(VALUE_HAS_ERROR));
+            }
+#endif
+        } else {
+            msg_alert_error=true;
+            smsg = FPSTR(MISSING_DATA);
+        }
+
+        //if no error login is ok
+        if (msg_alert_error==false) {
+#ifdef AUTHENTICATION_FEATURE
+            auth_ip * current_auth = new auth_ip;
+            current_auth->ip=web_interface->WebServer.client().remoteIP();
+            strcpy(current_auth->sessionID,web_interface->create_session_ID());
+            current_auth->last_time=millis();
+            if (web_interface->AddAuthIP(current_auth)) {
+                String header = F("HTTP/1.1 301 OK\r\nSet-Cookie: ESPSESSIONID=");
+                header+=current_auth->sessionID;
+                header+="\r\nLocation: /";
+                header+=sReturn;
+                header.concat(F("\r\nCache-Control: no-cache\r\n\r\n"));
+                web_interface->WebServer.sendContent(header);
+                return;
+            } else {
+                delete current_auth;
+                msg_alert_error=true;
+                smsg = F("Error: Too many connections");
+            }
+#endif
+        }
+    }
+
+    else { //no submit need to get data from EEPROM
+        sUser=String();
+        //password
+        sPassword=String();
+    }
+
+    //Display values
+    KeysList.add(FPSTR(KEY_RETURN));
+    ValuesList.add(sReturn);
+
+    KeysList.add(FPSTR(KEY_DISCONNECT_VISIBILITY));
+    if (web_interface->is_authenticated()) {
+        ValuesList.add(FPSTR(VALUE_ITEM_VISIBLE));
+    } else {
+        ValuesList.add(FPSTR(VALUE_ITEM_HIDDEN));
+    }
+    //IP+Web
+    GetIpWeb(KeysList, ValuesList);
+    //mode
+    GetMode(KeysList, ValuesList);
+
+    //page title and filenames
+    SetPageProp(KeysList,ValuesList,FPSTR(VALUE_LOGIN),F("login"));
+    //User
+    KeysList.add(FPSTR(KEY_USER));
+    ValuesList.add(sUser);
+    //password
+    KeysList.add(FPSTR(KEY_USER_PASSWORD));
+    ValuesList.add(sPassword);
+
+    if (msg_alert_error) {
+        ProcessAlertError(KeysList, ValuesList, smsg);
+    } else {
+        ProcessNoAlert(KeysList,ValuesList);
+    }
+
+    //Firmware and Free Mem, at the end to reflect situation
+    GetFreeMem(KeysList, ValuesList);
+
+    //process the template file and provide list of variables
+    processTemplate("/login.tpl", KeysList , ValuesList);
+    //need to clean to speed up memory recovery
+    KeysList.clear();
+    ValuesList.clear();
 }
 void handle_restart()
 {
-	if (SPIFFS.exists("/restart.tpl"))
-		{
-		STORESTRINGS_CLASS KeysList ;
-		STORESTRINGS_CLASS ValuesList ;
+    if (SPIFFS.exists("/restart.tpl")) {
+        STORESTRINGS_CLASS KeysList ;
+        STORESTRINGS_CLASS ValuesList ;
 
-		//IP+Web
-		GetIpWeb(KeysList, ValuesList);
-		//mode
-		GetMode(KeysList, ValuesList);  
-		//page title and filenames
-		SetPageProp(KeysList,ValuesList,F("Restarting..."),F("restart"));
+        //IP+Web
+        GetIpWeb(KeysList, ValuesList);
+        //mode
+        GetMode(KeysList, ValuesList);
+        //page title and filenames
+        SetPageProp(KeysList,ValuesList,F("Restarting..."),F("restart"));
 
-		//Firmware and Free Mem, at the end to reflect situation
-		GetFreeMem(KeysList, ValuesList);
-		
-		//process the template file and provide list of variables
-		processTemplate("/restart.tpl", KeysList , ValuesList);
-		//need to clean to speed up memory recovery
-		KeysList.clear();
-		ValuesList.clear();
-		}
-	else
-		{//if not restart template use default
-			String contentType=FPSTR(PAGE_RESTART);
-			web_interface->WebServer.send(200,"text/html",contentType);
-		}
-	web_interface->restartmodule=true;
+        //Firmware and Free Mem, at the end to reflect situation
+        GetFreeMem(KeysList, ValuesList);
+
+        //process the template file and provide list of variables
+        processTemplate("/restart.tpl", KeysList , ValuesList);
+        //need to clean to speed up memory recovery
+        KeysList.clear();
+        ValuesList.clear();
+    } else {
+        //if not restart template use default
+        String contentType=FPSTR(PAGE_RESTART);
+        web_interface->WebServer.send(200,"text/html",contentType);
+    }
+    web_interface->restartmodule=true;
 }
 
 void handle_web_command()
 {
-	if (!web_interface->is_authenticated())
-	{
-		return;
-	}
-	//check we have proper parameter
-	if (web_interface->WebServer.hasArg("COM"))
-	  {  
-		  String scmd;
-		  //decode command
-		  web_interface->urldecode(scmd,web_interface->WebServer.arg("COM").c_str()); 
-		  scmd.trim();
-		  //send command to serial
-		  Serial.println(scmd);
-		  //give an ack - we need to be polite, right ?
-		  web_interface->WebServer.send(200,"text/plain","Ok");
-		  //if it is for ESP module [ESPXXX]<parameter>
-		  int ESPpos = scmd.indexOf("[ESP");
-		  if (ESPpos>-1)
-			{//is there the second part?
-			int ESPpos2 = scmd.indexOf("]",ESPpos);	
-			if (ESPpos2>-1)
-				{	//Split in command and parameters
-					String cmd_part1=scmd.substring(ESPpos+4,ESPpos2);
-					String cmd_part2="";
-					//is there space for parameters?
-					if (ESPpos2<scmd.length())
-						{
-						cmd_part2=scmd.substring(ESPpos2+1);
-						}
-					//if command is a valid number then execute command
-					if(cmd_part1.toInt()!=0)COMMAND::execute_command(cmd_part1.toInt(),cmd_part2);
-					//if not is not a valid [ESPXXX] command
-				}
-			}
-	  }
+    if (!web_interface->is_authenticated()) {
+        return;
+    }
+    //check we have proper parameter
+    if (web_interface->WebServer.hasArg("COM")) {
+        String scmd;
+        //decode command
+        web_interface->urldecode(scmd,web_interface->WebServer.arg("COM").c_str());
+        scmd.trim();
+        //send command to serial
+        Serial.println(scmd);
+        //give an ack - we need to be polite, right ?
+        web_interface->WebServer.send(200,"text/plain","Ok");
+        //if it is for ESP module [ESPXXX]<parameter>
+        int ESPpos = scmd.indexOf("[ESP");
+        if (ESPpos>-1) {
+            //is there the second part?
+            int ESPpos2 = scmd.indexOf("]",ESPpos);
+            if (ESPpos2>-1) {
+                //Split in command and parameters
+                String cmd_part1=scmd.substring(ESPpos+4,ESPpos2);
+                String cmd_part2="";
+                //is there space for parameters?
+                if (ESPpos2<scmd.length()) {
+                    cmd_part2=scmd.substring(ESPpos2+1);
+                }
+                //if command is a valid number then execute command
+                if(cmd_part1.toInt()!=0) {
+                    COMMAND::execute_command(cmd_part1.toInt(),cmd_part2);
+                }
+                //if not is not a valid [ESPXXX] command
+            }
+        }
+    }
 }
 
 
- #ifdef SSDP_FEATURE
- void handle_SSDP(){
-      SSDP.schema(web_interface->WebServer.client());
-    }
- #endif
+#ifdef SSDP_FEATURE
+void handle_SSDP()
+{
+    SSDP.schema(web_interface->WebServer.client());
+}
+#endif
 
-//URI Decoding function 
+//URI Decoding function
 void   WEBINTERFACE_CLASS::urldecode( String & dst, const char *src)
 {
-  char a, b,c;
-  dst="";
-  while (*src) {
-    if ((*src == '%') &&
-      ((a = src[1]) && (b = src[2])) &&
-      (isxdigit(a) && isxdigit(b))) {
-      if (a >= 'a')
-        a -= 'a'-'A';
-      if (a >= 'A')
-        a -= ('A' - 10);
-      else
-        a -= '0';
-      if (b >= 'a')
-        b -= 'a'-'A';
-      if (b >= 'A')
-        b -= ('A' - 10);
-      else
-        b -= '0';
-      dst+= char(16*a+b);
-      src+=3;
-    } 
-    else {
-		c = *src++;
-		if(c=='+')c=' ';
-      dst+= char(c);
+    char a, b,c;
+    dst="";
+    while (*src) {
+        if ((*src == '%') &&
+                ((a = src[1]) && (b = src[2])) &&
+                (isxdigit(a) && isxdigit(b))) {
+            if (a >= 'a') {
+                a -= 'a'-'A';
+            }
+            if (a >= 'A') {
+                a -= ('A' - 10);
+            } else {
+                a -= '0';
+            }
+            if (b >= 'a') {
+                b -= 'a'-'A';
+            }
+            if (b >= 'A') {
+                b -= ('A' - 10);
+            } else {
+                b -= '0';
+            }
+            dst+= char(16*a+b);
+            src+=3;
+        } else {
+            c = *src++;
+            if(c=='+') {
+                c=' ';
+            }
+            dst+= char(c);
+        }
     }
-  }
 }
 
 
 //constructor
 WEBINTERFACE_CLASS::WEBINTERFACE_CLASS (int port):WebServer(port)
 {
-	//init what will handle "/"
-	WebServer.on("/",HTTP_ANY, handle_web_interface_root);
-	WebServer.on("/CONFIGSYS",HTTP_ANY, handle_web_interface_configSys);
-	WebServer.on("/CONFIGAP",HTTP_ANY, handle_web_interface_configAP);
-	WebServer.on("/CONFIGSTA",HTTP_ANY, handle_web_interface_configSTA);
-	WebServer.on("/STATUS",HTTP_ANY, handle_web_interface_status);
-	WebServer.on("/SETTINGS",HTTP_ANY, handle_web_settings);
-	WebServer.on("/PRINTER",HTTP_ANY, handle_web_interface_printer);
-	WebServer.on("/CMD",HTTP_ANY, handle_web_command);
-	WebServer.on("/RESTART",HTTP_GET, handle_restart);
-	WebServer.on("/UPDATE",HTTP_ANY, handleUpdate,WebUpdateUpload);
-	WebServer.on("/FILES", HTTP_ANY, handleFileList,SPIFFSFileupload);
-	WebServer.on("/SDFILES", HTTP_ANY, handleSDFileList);
-	WebServer.on("/LOGIN", HTTP_ANY, handle_login);
-	WebServer.on("/PASSWORD", HTTP_ANY, handle_password);
-	//Captive portal Feature
-	#ifdef CAPTIVE_PORTAL_FEATURE
-	WebServer.on("/generate_204",HTTP_ANY, handle_web_interface_root);
-	WebServer.on("/fwlink",HTTP_ANY, handle_web_interface_root);
-	#endif
-	#ifdef SSDP_FEATURE
-	WebServer.on("/description.xml", HTTP_GET, handle_SSDP);
-	#endif
-	WebServer.onNotFound( handle_not_found);
-	answer4M105="T:0 /0 ";
-	answer4M114="X:0.0 Y:0.0 Z:0.000";
-	answer4M220="100";
-	answer4M221="100";
-	last_temp=system_get_time();
-	restartmodule=false;
-	//rolling list of 4entries with a maximum of 50 char for each entry
-	error_msg.setsize(4);
-	error_msg.setlength(50);
-	info_msg.setsize(4);
-	info_msg.setlength(50);
-	status_msg.setsize(4);
-	status_msg.setlength(50);
-	fileslist.setlength(30);//12 for filename + space + size
-	fileslist.setsize(70); // 70 files to limite to 2K
-	fsUploadFile=(fs::File)0;
-	_head=NULL;
-	_nb_ip=0;
-	_upload_status=UPLOAD_STATUS_NONE;
+    //init what will handle "/"
+    WebServer.on("/",HTTP_ANY, handle_web_interface_root);
+    WebServer.on("/CONFIGSYS",HTTP_ANY, handle_web_interface_configSys);
+    WebServer.on("/CONFIGAP",HTTP_ANY, handle_web_interface_configAP);
+    WebServer.on("/CONFIGSTA",HTTP_ANY, handle_web_interface_configSTA);
+    WebServer.on("/STATUS",HTTP_ANY, handle_web_interface_status);
+    WebServer.on("/SETTINGS",HTTP_ANY, handle_web_settings);
+    WebServer.on("/PRINTER",HTTP_ANY, handle_web_interface_printer);
+    WebServer.on("/CMD",HTTP_ANY, handle_web_command);
+    WebServer.on("/RESTART",HTTP_GET, handle_restart);
+    WebServer.on("/UPDATE",HTTP_ANY, handleUpdate,WebUpdateUpload);
+    WebServer.on("/FILES", HTTP_ANY, handleFileList,SPIFFSFileupload);
+    WebServer.on("/SDFILES", HTTP_ANY, handleSDFileList);
+    WebServer.on("/LOGIN", HTTP_ANY, handle_login);
+    WebServer.on("/PASSWORD", HTTP_ANY, handle_password);
+    //Captive portal Feature
+#ifdef CAPTIVE_PORTAL_FEATURE
+    WebServer.on("/generate_204",HTTP_ANY, handle_web_interface_root);
+    WebServer.on("/fwlink",HTTP_ANY, handle_web_interface_root);
+#endif
+#ifdef SSDP_FEATURE
+    WebServer.on("/description.xml", HTTP_GET, handle_SSDP);
+#endif
+    WebServer.onNotFound( handle_not_found);
+    answer4M105="T:0 /0 ";
+    answer4M114="X:0.0 Y:0.0 Z:0.000";
+    answer4M220="100";
+    answer4M221="100";
+    last_temp=system_get_time();
+    restartmodule=false;
+    //rolling list of 4entries with a maximum of 50 char for each entry
+    error_msg.setsize(4);
+    error_msg.setlength(50);
+    info_msg.setsize(4);
+    info_msg.setlength(50);
+    status_msg.setsize(4);
+    status_msg.setlength(50);
+    fileslist.setlength(30);//12 for filename + space + size
+    fileslist.setsize(70); // 70 files to limite to 2K
+    fsUploadFile=(fs::File)0;
+    _head=NULL;
+    _nb_ip=0;
+    _upload_status=UPLOAD_STATUS_NONE;
 }
 //Destructor
 WEBINTERFACE_CLASS::~WEBINTERFACE_CLASS()
 {
-	info_msg.clear();
-	error_msg.clear();
-	status_msg.clear();
-	fileslist.clear();
-	while (_head)
-	{
-		auth_ip * current = _head;
-		_head=_head->_next;
-		delete current;
-	}
-	_nb_ip=0;
+    info_msg.clear();
+    error_msg.clear();
+    status_msg.clear();
+    fileslist.clear();
+    while (_head) {
+        auth_ip * current = _head;
+        _head=_head->_next;
+        delete current;
+    }
+    _nb_ip=0;
 }
 //Session ID based on IP and time using 16 char
-char * WEBINTERFACE_CLASS::create_session_ID(){
-static char  sessionID[17];
+char * WEBINTERFACE_CLASS::create_session_ID()
+{
+    static char  sessionID[17];
 //reset SESSIONID
-for (int i=0;i<17;i++)sessionID[i]='\0';
+    for (int i=0; i<17; i++) {
+        sessionID[i]='\0';
+    }
 //get time
-uint32_t now = millis();
+    uint32_t now = millis();
 //get remote IP
-IPAddress remoteIP=WebServer.client().remoteIP();
+    IPAddress remoteIP=WebServer.client().remoteIP();
 //generate SESSIONID
-if (0>sprintf(sessionID,"%02X%02X%02X%02X%02X%02X%02X%02X",remoteIP[0],remoteIP[1],remoteIP[2],remoteIP[3],(uint8_t) ((now >> 0) & 0xff),(uint8_t) ((now >> 8) & 0xff),(uint8_t) ((now >> 16) & 0xff),(uint8_t) ((now >> 24) & 0xff)))strcpy(sessionID,"NONE");
-return sessionID;
+    if (0>sprintf(sessionID,"%02X%02X%02X%02X%02X%02X%02X%02X",remoteIP[0],remoteIP[1],remoteIP[2],remoteIP[3],(uint8_t) ((now >> 0) & 0xff),(uint8_t) ((now >> 8) & 0xff),(uint8_t) ((now >> 16) & 0xff),(uint8_t) ((now >> 24) & 0xff))) {
+        strcpy(sessionID,"NONE");
+    }
+    return sessionID;
 }
 //check authentification
 bool  WEBINTERFACE_CLASS::is_authenticated()
 {
-#ifdef AUTHENTICATION_FEATURE 
- if (WebServer.hasHeader("Cookie")){   
-    String cookie = WebServer.header("Cookie");
-    int pos = cookie.indexOf("ESPSESSIONID=");
-    if (pos!= -1) {
-	int pos2 = cookie.indexOf(";",pos);
-	String sessionID = cookie.substring(pos+strlen("ESPSESSIONID="),pos2);
-	IPAddress ip = WebServer.client().remoteIP();
-	//check if cookie can be reset and clean table in same time
-    return ResetAuthIP(ip,sessionID.c_str());
-	}
-  }
-  return false;	
+#ifdef AUTHENTICATION_FEATURE
+    if (WebServer.hasHeader("Cookie")) {
+        String cookie = WebServer.header("Cookie");
+        int pos = cookie.indexOf("ESPSESSIONID=");
+        if (pos!= -1) {
+            int pos2 = cookie.indexOf(";",pos);
+            String sessionID = cookie.substring(pos+strlen("ESPSESSIONID="),pos2);
+            IPAddress ip = WebServer.client().remoteIP();
+            //check if cookie can be reset and clean table in same time
+            return ResetAuthIP(ip,sessionID.c_str());
+        }
+    }
+    return false;
 #else
-return true;
+    return true;
 #endif
 }
 
 //add the information in the linked list if possible
 bool WEBINTERFACE_CLASS::AddAuthIP(auth_ip * item)
 {
-	if (_nb_ip>MAX_AUTH_IP) return false;
-	item->_next=_head;
-	_head=item;
-	_nb_ip++;
-	return true;
+    if (_nb_ip>MAX_AUTH_IP) {
+        return false;
+    }
+    item->_next=_head;
+    _head=item;
+    _nb_ip++;
+    return true;
 }
 
 bool WEBINTERFACE_CLASS::ResetAuthIP(IPAddress ip,const char * sessionID)
 {
-	bool done=false;
-	auth_ip * current = _head;
-	auth_ip * previous = NULL;
-	//get time
-	uint32_t now = millis();
-	while (current)
-	{
-		 if ((millis()-current->last_time)>400000)
-		 {
-			 //remove
-			 if (current==_head)
-			 {
-				_head=current->_next;
-				_nb_ip--;
-				delete current;
-				current=_head;
-			 }
-			 else
-			 {
-				 previous->_next=current->_next; 
-				 _nb_ip--;
-				delete current;
-				current=previous->_next;
-			 }
-		 }
-		 else
-		 {
-			 if (ip==current->ip)
-			 {
-				 if (strcmp(sessionID,current->sessionID)==0)
-				 {
-					 //reset time
-					 current->last_time=millis();
-					 return true;
-				 }
-			 }
-			previous = current;
-			current=current->_next;
-		 }
-	}
-	return done;
+    bool done=false;
+    auth_ip * current = _head;
+    auth_ip * previous = NULL;
+    //get time
+    uint32_t now = millis();
+    while (current) {
+        if ((millis()-current->last_time)>400000) {
+            //remove
+            if (current==_head) {
+                _head=current->_next;
+                _nb_ip--;
+                delete current;
+                current=_head;
+            } else {
+                previous->_next=current->_next;
+                _nb_ip--;
+                delete current;
+                current=previous->_next;
+            }
+        } else {
+            if (ip==current->ip) {
+                if (strcmp(sessionID,current->sessionID)==0) {
+                    //reset time
+                    current->last_time=millis();
+                    return true;
+                }
+            }
+            previous = current;
+            current=current->_next;
+        }
+    }
+    return done;
 }
 
 WEBINTERFACE_CLASS * web_interface;
diff --git a/esp8266/webinterface.h b/esp8266/webinterface.h
index 763afde5..c6852979 100644
--- a/esp8266/webinterface.h
+++ b/esp8266/webinterface.h
@@ -1,8 +1,8 @@
-/* 
+/*
   webinterface.h - esp8266 configuration class
 
   Copyright (c) 2014 Luc Lebosse. All rights reserved.
- 
+
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
@@ -29,45 +29,45 @@
 
 #define MAX_EXTRUDERS 4
 
-struct auth_ip{
-	IPAddress ip;
-	char sessionID[17];
-	uint32_t last_time;
-	auth_ip * _next;
-	};
+struct auth_ip {
+    IPAddress ip;
+    char sessionID[17];
+    uint32_t last_time;
+    auth_ip * _next;
+};
 
 class WEBINTERFACE_CLASS
 {
-  public:
-  WEBINTERFACE_CLASS (int port = 80);
-  ~WEBINTERFACE_CLASS();
-  ESP8266WebServer WebServer;
-  File fsUploadFile;
-  void urldecode( String & dst, const char *src);
-  bool isSSIDValid(const char * ssid);
-  bool isPasswordValid(const char * password);
-  bool isAdminPasswordValid(const char * password);
-  bool isHostnameValid(const char * hostname);
-  bool isIPValid(const char * IP);
-  String answer4M105;
-  String answer4M114;
-  String answer4M220;
-  String answer4M221;
-  STORESTRINGS_CLASS fileslist;
-  uint32_t last_temp;
-  STORESTRINGS_CLASS error_msg;
-  STORESTRINGS_CLASS info_msg;
-  STORESTRINGS_CLASS status_msg;
-  bool restartmodule; 
-  char * create_session_ID();
-  bool is_authenticated();
-  bool AddAuthIP(auth_ip * item);
-  bool ResetAuthIP(IPAddress ip,const char * sessionID);
-  uint8_t _upload_status;
+public:
+    WEBINTERFACE_CLASS (int port = 80);
+    ~WEBINTERFACE_CLASS();
+    ESP8266WebServer WebServer;
+    File fsUploadFile;
+    void urldecode( String & dst, const char *src);
+    bool isSSIDValid(const char * ssid);
+    bool isPasswordValid(const char * password);
+    bool isAdminPasswordValid(const char * password);
+    bool isHostnameValid(const char * hostname);
+    bool isIPValid(const char * IP);
+    String answer4M105;
+    String answer4M114;
+    String answer4M220;
+    String answer4M221;
+    STORESTRINGS_CLASS fileslist;
+    uint32_t last_temp;
+    STORESTRINGS_CLASS error_msg;
+    STORESTRINGS_CLASS info_msg;
+    STORESTRINGS_CLASS status_msg;
+    bool restartmodule;
+    char * create_session_ID();
+    bool is_authenticated();
+    bool AddAuthIP(auth_ip * item);
+    bool ResetAuthIP(IPAddress ip,const char * sessionID);
+    uint8_t _upload_status;
 
-  private:
-  auth_ip * _head;
-  uint8_t _nb_ip;
+private:
+    auth_ip * _head;
+    uint8_t _nb_ip;
 };
 
 extern WEBINTERFACE_CLASS * web_interface;
diff --git a/esp8266/wifi.cpp b/esp8266/wifi.cpp
index da08a180..410f8d28 100644
--- a/esp8266/wifi.cpp
+++ b/esp8266/wifi.cpp
@@ -1,8 +1,8 @@
-/* 
+/*
   wifi.cpp - esp8266 configuration class
 
   Copyright (c) 2014 Luc Lebosse. All rights reserved.
- 
+
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
@@ -35,235 +35,258 @@ extern DNSServer dnsServer;
 
 WIFI_CONFIG::WIFI_CONFIG()
 {
-  iweb_port=DEFAULT_WEB_PORT;
-  idata_port=DEFAULT_DATA_PORT;
-  baud_rate=DEFAULT_BAUD_RATE;
-  sleep_mode=DEFAULT_SLEEP_MODE;
-  _hostname[0]=0;
+    iweb_port=DEFAULT_WEB_PORT;
+    idata_port=DEFAULT_DATA_PORT;
+    baud_rate=DEFAULT_BAUD_RATE;
+    sleep_mode=DEFAULT_SLEEP_MODE;
+    _hostname[0]=0;
 }
 
-const char * WIFI_CONFIG::get_hostname(){
-	if (WiFi.hostname().length()==0)
-	{
-	if (!CONFIG::read_string(EP_HOSTNAME, _hostname , MAX_HOSTNAME_LENGTH))strcpy(_hostname,get_default_hostname());
-	}
-	else strcpy(_hostname,WiFi.hostname().c_str());
-return _hostname;
+const char * WIFI_CONFIG::get_hostname()
+{
+    if (WiFi.hostname().length()==0) {
+        if (!CONFIG::read_string(EP_HOSTNAME, _hostname , MAX_HOSTNAME_LENGTH)) {
+            strcpy(_hostname,get_default_hostname());
+        }
+    } else {
+        strcpy(_hostname,WiFi.hostname().c_str());
+    }
+    return _hostname;
 }
 
 const char * WIFI_CONFIG::get_default_hostname()
 {
-	static char hostname[13];
-	uint8_t mac [WL_MAC_ADDR_LENGTH];
-	WiFi.macAddress(mac);
-	if (0>sprintf(hostname,"ESP_%02X%02X%02X",mac[3],mac[4],mac[5])) strcpy (hostname, "ESP8266");
-	return hostname;
+    static char hostname[13];
+    uint8_t mac [WL_MAC_ADDR_LENGTH];
+    WiFi.macAddress(mac);
+    if (0>sprintf(hostname,"ESP_%02X%02X%02X",mac[3],mac[4],mac[5])) {
+        strcpy (hostname, "ESP8266");
+    }
+    return hostname;
 }
 
 //no strtok so this is simplified version
 //return number of part
 byte WIFI_CONFIG::split_ip (const char * ptr,byte * part)
 {
-  if (strlen(ptr)>15 || strlen(ptr)< 7)
-	{
-		part[0]=0;
-		part[1]=0;
-		part[2]=0;
-		part[3]=0;
-		return 0;
-	}
-  
-  char pstart [16];
-  char * ptr2;
-  strcpy(pstart,ptr);
-  ptr2 = pstart;
-  byte i = strlen(pstart);
-  byte pos = 0;
-  for (byte j=0;j<i;j++)
-    {
-      if (pstart[j]=='.')
-        {
-		  if (pos==4)
-			{
-				part[0]=0;
-				part[1]=0;
-				part[2]=0;
-				part[3]=0;
-				return 0;
-			}
-          pstart[j]=0x0;
-          part[pos]=atoi(ptr2);
-          pos++;
-          ptr2 = &pstart[j+1]; 
+    if (strlen(ptr)>15 || strlen(ptr)< 7) {
+        part[0]=0;
+        part[1]=0;
+        part[2]=0;
+        part[3]=0;
+        return 0;
+    }
+
+    char pstart [16];
+    char * ptr2;
+    strcpy(pstart,ptr);
+    ptr2 = pstart;
+    byte i = strlen(pstart);
+    byte pos = 0;
+    for (byte j=0; j<i; j++) {
+        if (pstart[j]=='.') {
+            if (pos==4) {
+                part[0]=0;
+                part[1]=0;
+                part[2]=0;
+                part[3]=0;
+                return 0;
+            }
+            pstart[j]=0x0;
+            part[pos]=atoi(ptr2);
+            pos++;
+            ptr2 = &pstart[j+1];
         }
     }
-  part[pos]=atoi(ptr2);
-  return pos+1;  
+    part[pos]=atoi(ptr2);
+    return pos+1;
 }
 
 //just simple helper to convert mac address to string
 char * WIFI_CONFIG::mac2str(uint8_t mac [WL_MAC_ADDR_LENGTH])
 {
-  static char macstr [18];
-  if (0>sprintf(macstr,"%02X:%02X:%02X:%02X:%02X:%02X",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5])) strcpy (macstr, "00:00:00:00:00:00");
-  return macstr;
+    static char macstr [18];
+    if (0>sprintf(macstr,"%02X:%02X:%02X:%02X:%02X:%02X",mac[0],mac[1],mac[2],mac[3],mac[4],mac[5])) {
+        strcpy (macstr, "00:00:00:00:00:00");
+    }
+    return macstr;
 }
 
 //just simple helper to convert IP address to string
 char * WIFI_CONFIG::ip2str(IPAddress Ip )
 {
-  static char ipstr [16];
-  if (0>sprintf(ipstr, "%i.%i.%i.%i",Ip[0],Ip[1],Ip[2],Ip[3])) strcpy (ipstr, "0.0.0.0");
-  return ipstr;
+    static char ipstr [16];
+    if (0>sprintf(ipstr, "%i.%i.%i.%i",Ip[0],Ip[1],Ip[2],Ip[3])) {
+        strcpy (ipstr, "0.0.0.0");
+    }
+    return ipstr;
 }
 
 void  WIFI_CONFIG::Safe_Setup()
 {
-		#ifdef CAPTIVE_PORTAL_FEATURE
-		dnsServer.stop();
-		delay(100);
-		#endif
-  
-		WiFi.disconnect();
-		//setup Soft AP
-		WiFi.mode(WIFI_AP);
-		IPAddress local_ip (DEFAULT_IP_VALUE[0],DEFAULT_IP_VALUE[1],DEFAULT_IP_VALUE[2],DEFAULT_IP_VALUE[3]);
-		IPAddress gateway (DEFAULT_GATEWAY_VALUE[0],DEFAULT_GATEWAY_VALUE[1],DEFAULT_GATEWAY_VALUE[2],DEFAULT_GATEWAY_VALUE[3]);
-		IPAddress subnet (DEFAULT_MASK_VALUE[0],DEFAULT_MASK_VALUE[1],DEFAULT_MASK_VALUE[2],DEFAULT_MASK_VALUE[3]);
-		String ssid = FPSTR(DEFAULT_SSID);
-		String pwd = FPSTR(DEFAULT_PASSWORD);
-		WiFi.softAP(ssid.c_str(),pwd.c_str());
-		delay(500);
-		WiFi.softAPConfig( local_ip,  gateway,  subnet);
-		delay(1000);
-		Serial.println(F("M117 Safe mode started"));
+#ifdef CAPTIVE_PORTAL_FEATURE
+    dnsServer.stop();
+    delay(100);
+#endif
+
+    WiFi.disconnect();
+    //setup Soft AP
+    WiFi.mode(WIFI_AP);
+    IPAddress local_ip (DEFAULT_IP_VALUE[0],DEFAULT_IP_VALUE[1],DEFAULT_IP_VALUE[2],DEFAULT_IP_VALUE[3]);
+    IPAddress gateway (DEFAULT_GATEWAY_VALUE[0],DEFAULT_GATEWAY_VALUE[1],DEFAULT_GATEWAY_VALUE[2],DEFAULT_GATEWAY_VALUE[3]);
+    IPAddress subnet (DEFAULT_MASK_VALUE[0],DEFAULT_MASK_VALUE[1],DEFAULT_MASK_VALUE[2],DEFAULT_MASK_VALUE[3]);
+    String ssid = FPSTR(DEFAULT_SSID);
+    String pwd = FPSTR(DEFAULT_PASSWORD);
+    WiFi.softAP(ssid.c_str(),pwd.c_str());
+    delay(500);
+    WiFi.softAPConfig( local_ip,  gateway,  subnet);
+    delay(1000);
+    Serial.println(F("M117 Safe mode started"));
 }
 
 //Read configuration settings and apply them
 bool WIFI_CONFIG::Setup()
 {
-  char pwd[MAX_PASSWORD_LENGTH+1];
-  char sbuf[MAX_SSID_LENGTH+1];
-  char hostname [MAX_HOSTNAME_LENGTH+1];
-  int wstatus;
-   IPAddress currentIP;
-  byte bflag=0;
+    char pwd[MAX_PASSWORD_LENGTH+1];
+    char sbuf[MAX_SSID_LENGTH+1];
+    char hostname [MAX_HOSTNAME_LENGTH+1];
+    int wstatus;
+    IPAddress currentIP;
+    byte bflag=0;
 
-  //set the sleep mode
-  if (!CONFIG::read_byte(EP_SLEEP_MODE, &bflag ))
-	{
-	return false;
-	}
-  wifi_set_sleep_type ((sleep_type)bflag);
-  sleep_mode=bflag;
-  //AP or client ?
-  if (!CONFIG::read_byte(EP_WIFI_MODE, &bflag ) ||  !CONFIG::read_string(EP_SSID, sbuf , MAX_SSID_LENGTH) ||!CONFIG::read_string(EP_PASSWORD, pwd , MAX_PASSWORD_LENGTH)) 
-	{
-	return false;
-	}
-	if (!CONFIG::read_string(EP_HOSTNAME, hostname , MAX_HOSTNAME_LENGTH))strcpy(hostname,get_default_hostname());
+    //set the sleep mode
+    if (!CONFIG::read_byte(EP_SLEEP_MODE, &bflag )) {
+        return false;
+    }
+    wifi_set_sleep_type ((sleep_type)bflag);
+    sleep_mode=bflag;
+    //AP or client ?
+    if (!CONFIG::read_byte(EP_WIFI_MODE, &bflag ) ||  !CONFIG::read_string(EP_SSID, sbuf , MAX_SSID_LENGTH) ||!CONFIG::read_string(EP_PASSWORD, pwd , MAX_PASSWORD_LENGTH)) {
+        return false;
+    }
+    if (!CONFIG::read_string(EP_HOSTNAME, hostname , MAX_HOSTNAME_LENGTH)) {
+        strcpy(hostname,get_default_hostname());
+    }
     //disconnect if connected
-  WiFi.disconnect();
-   //this is AP mode
-  if (bflag==AP_MODE)
-    {
-		//setup Soft AP
-      WiFi.mode(WIFI_AP);
-      WiFi.softAP(sbuf, pwd);
-      //setup PHY_MODE
-	  if (!CONFIG::read_byte(EP_PHY_MODE, &bflag ))
-	  {
-	  return false;
-	  }
-      wifi_set_phy_mode((phy_mode)bflag);
-      //get current config
-      struct softap_config apconfig;
-       wifi_softap_get_config(&apconfig);
-       //set the chanel
-       if (!CONFIG::read_byte(EP_CHANNEL, &bflag ))return false;
-       apconfig.channel=bflag;
-       //set Authentification type
-        if (!CONFIG::read_byte(EP_AUTH_TYPE, &bflag ))return false;
-       apconfig.authmode=(AUTH_MODE)bflag;
-       //set the visibility of SSID
-        if (!CONFIG::read_byte(EP_SSID_VISIBLE, &bflag ))return false;
-       apconfig.ssid_hidden=!bflag;
-       //no need to add these settings to configuration just use default ones
-       apconfig.max_connection=DEFAULT_MAX_CONNECTIONS;
-       apconfig.beacon_interval=DEFAULT_BEACON_INTERVAL;
-      //apply settings to current and to default
-      if (!wifi_softap_set_config(&apconfig) || !wifi_softap_set_config_current(&apconfig))
-		{
-			Serial.println(F("M117 Error Wifi AP!"));
-			delay(1000);
-		}
-    }
-  else
-    {//setup station mode
-		WiFi.mode(WIFI_STA);
-		WiFi.begin(sbuf, pwd);
-		delay(500);
-		//setup PHY_MODE
-		if (!CONFIG::read_byte(EP_PHY_MODE, &bflag ))return false;
-		wifi_set_phy_mode((phy_mode)bflag);
-		byte i=0;
-		//try to connect
-		while (WiFi.status() != WL_CONNECTED && i<40) {
-		switch(WiFi.status())
-			{
-	  case 1:
-	    Serial.print(FPSTR(M117_));
-	    Serial.println(F("No SSID found!"));
-					break;
+    WiFi.disconnect();
+    //this is AP mode
+    if (bflag==AP_MODE) {
+        //setup Soft AP
+        WiFi.mode(WIFI_AP);
+        WiFi.softAP(sbuf, pwd);
+        //setup PHY_MODE
+        if (!CONFIG::read_byte(EP_PHY_MODE, &bflag )) {
+            return false;
+        }
+        wifi_set_phy_mode((phy_mode)bflag);
+        //get current config
+        struct softap_config apconfig;
+        wifi_softap_get_config(&apconfig);
+        //set the chanel
+        if (!CONFIG::read_byte(EP_CHANNEL, &bflag )) {
+            return false;
+        }
+        apconfig.channel=bflag;
+        //set Authentification type
+        if (!CONFIG::read_byte(EP_AUTH_TYPE, &bflag )) {
+            return false;
+        }
+        apconfig.authmode=(AUTH_MODE)bflag;
+        //set the visibility of SSID
+        if (!CONFIG::read_byte(EP_SSID_VISIBLE, &bflag )) {
+            return false;
+        }
+        apconfig.ssid_hidden=!bflag;
+        //no need to add these settings to configuration just use default ones
+        apconfig.max_connection=DEFAULT_MAX_CONNECTIONS;
+        apconfig.beacon_interval=DEFAULT_BEACON_INTERVAL;
+        //apply settings to current and to default
+        if (!wifi_softap_set_config(&apconfig) || !wifi_softap_set_config_current(&apconfig)) {
+            Serial.println(F("M117 Error Wifi AP!"));
+            delay(1000);
+        }
+    } else {
+        //setup station mode
+        WiFi.mode(WIFI_STA);
+        WiFi.begin(sbuf, pwd);
+        delay(500);
+        //setup PHY_MODE
+        if (!CONFIG::read_byte(EP_PHY_MODE, &bflag )) {
+            return false;
+        }
+        wifi_set_phy_mode((phy_mode)bflag);
+        byte i=0;
+        //try to connect
+        while (WiFi.status() != WL_CONNECTED && i<40) {
+            switch(WiFi.status()) {
+            case 1:
+                Serial.print(FPSTR(M117_));
+                Serial.println(F("No SSID found!"));
+                break;
 
-	  case 4:
-	    Serial.print(FPSTR(M117_));
-	    Serial.println(F("No Connection!"));
-					break;
+            case 4:
+                Serial.print(FPSTR(M117_));
+                Serial.println(F("No Connection!"));
+                break;
 
-	  default:
-	    Serial.print(FPSTR(M117_));
-	    Serial.println(F("Connecting..."));
-					break;
-			}
-			delay(500);
-			i++;
-			}
-		if (WiFi.status() != WL_CONNECTED) return false;
-	    WiFi.hostname(hostname);
+            default:
+                Serial.print(FPSTR(M117_));
+                Serial.println(F("Connecting..."));
+                break;
+            }
+            delay(500);
+            i++;
+        }
+        if (WiFi.status() != WL_CONNECTED) {
+            return false;
+        }
+        WiFi.hostname(hostname);
     }
-  
-  //DHCP or Static IP ?
-  if (!CONFIG::read_byte(EP_IP_MODE, &bflag )) return false;
-  if (bflag==STATIC_IP_MODE)
-    {
-		byte ip_buf[4];
-      //get the IP 
-      if (!CONFIG::read_buffer(EP_IP_VALUE,ip_buf , IP_LENGTH))return false;
-      IPAddress local_ip (ip_buf[0],ip_buf[1],ip_buf[2],ip_buf[3]);
-      //get the gateway 
-      if (!CONFIG::read_buffer(EP_GATEWAY_VALUE,ip_buf , IP_LENGTH))return false;
-      IPAddress gateway (ip_buf[0],ip_buf[1],ip_buf[2],ip_buf[3]);
-      //get the mask 
-      if (!CONFIG::read_buffer(EP_MASK_VALUE,ip_buf , IP_LENGTH))return false;
-      IPAddress subnet (ip_buf[0],ip_buf[1],ip_buf[2],ip_buf[3]);
-     //apply according active wifi mode
-     if (wifi_get_opmode()==WIFI_AP || wifi_get_opmode()==WIFI_AP_STA)  WiFi.softAPConfig( local_ip,  gateway,  subnet);
-     else WiFi.config( local_ip,  gateway,  subnet); 
+
+    //DHCP or Static IP ?
+    if (!CONFIG::read_byte(EP_IP_MODE, &bflag )) {
+        return false;
     }
-    #ifdef MDNS_FEATURE
+    if (bflag==STATIC_IP_MODE) {
+        byte ip_buf[4];
+        //get the IP
+        if (!CONFIG::read_buffer(EP_IP_VALUE,ip_buf , IP_LENGTH)) {
+            return false;
+        }
+        IPAddress local_ip (ip_buf[0],ip_buf[1],ip_buf[2],ip_buf[3]);
+        //get the gateway
+        if (!CONFIG::read_buffer(EP_GATEWAY_VALUE,ip_buf , IP_LENGTH)) {
+            return false;
+        }
+        IPAddress gateway (ip_buf[0],ip_buf[1],ip_buf[2],ip_buf[3]);
+        //get the mask
+        if (!CONFIG::read_buffer(EP_MASK_VALUE,ip_buf , IP_LENGTH)) {
+            return false;
+        }
+        IPAddress subnet (ip_buf[0],ip_buf[1],ip_buf[2],ip_buf[3]);
+        //apply according active wifi mode
+        if (wifi_get_opmode()==WIFI_AP || wifi_get_opmode()==WIFI_AP_STA) {
+            WiFi.softAPConfig( local_ip,  gateway,  subnet);
+        } else {
+            WiFi.config( local_ip,  gateway,  subnet);
+        }
+    }
+#ifdef MDNS_FEATURE
     // Set up mDNS responder:
-	if (!mdns.begin(hostname)) {
-    Serial.print(FPSTR(M117_));
-    Serial.println(F("Error with mDNS!"));
-	delay(1000);
-	}
-    #endif
+    if (!mdns.begin(hostname)) {
+        Serial.print(FPSTR(M117_));
+        Serial.println(F("Error with mDNS!"));
+        delay(1000);
+    }
+#endif
     //Get IP
-    if (wifi_get_opmode()==WIFI_STA)currentIP=WiFi.localIP();
-    else currentIP=WiFi.softAPIP();
+    if (wifi_get_opmode()==WIFI_STA) {
+        currentIP=WiFi.localIP();
+    } else {
+        currentIP=WiFi.softAPIP();
+    }
     Serial.print(FPSTR(M117_));
     Serial.println(currentIP);
-  return true;
+    return true;
 }
 WIFI_CONFIG wifi_config;
diff --git a/esp8266/wifi.h b/esp8266/wifi.h
index 86635501..7b90c894 100644
--- a/esp8266/wifi.h
+++ b/esp8266/wifi.h
@@ -1,8 +1,8 @@
-/* 
+/*
   wifi.h - esp8266 configuration class
 
   Copyright (c) 2014 Luc Lebosse. All rights reserved.
- 
+
   This library is free software; you can redistribute it and/or
   modify it under the terms of the GNU Lesser General Public
   License as published by the Free Software Foundation; either
@@ -31,25 +31,25 @@
 
 class WIFI_CONFIG
 {
-  public:
-  // multicast DNS responder feature
-  #ifdef MDNS_FEATURE
-	MDNSResponder mdns;
-  #endif
-  WIFI_CONFIG();
-  int iweb_port;
-  int idata_port;
-  long baud_rate;
-  int sleep_mode;
-  bool Setup();
-  void Safe_Setup();
-  char * mac2str(uint8_t mac [WL_MAC_ADDR_LENGTH]);
-  char * ip2str(IPAddress Ip );
-  byte split_ip (const char * ptr,byte * part);
-  const char * get_default_hostname();
-  const char * get_hostname();
-  private:
-  char _hostname[33];
+public:
+    // multicast DNS responder feature
+#ifdef MDNS_FEATURE
+    MDNSResponder mdns;
+#endif
+    WIFI_CONFIG();
+    int iweb_port;
+    int idata_port;
+    long baud_rate;
+    int sleep_mode;
+    bool Setup();
+    void Safe_Setup();
+    char * mac2str(uint8_t mac [WL_MAC_ADDR_LENGTH]);
+    char * ip2str(IPAddress Ip );
+    byte split_ip (const char * ptr,byte * part);
+    const char * get_default_hostname();
+    const char * get_hostname();
+private:
+    char _hostname[33];
 };
 
 extern WIFI_CONFIG wifi_config;