tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-06-28 Miguel de Dios <miguel.dedios@artica.es> 

* include/functions_config.php: added lost lines for the text sizes
	into the function "config_process_config".
	
	* include/config_process.php: cleaned source code style.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6724 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2012-06-28 13:44:15 +00:00
parent b3a6e0b669
commit 3c238903e9
3 changed files with 40 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
pandora_console/ChangeLog
View File

@ -1,3 +1,10 @@
2012-06-28 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_config.php: added lost lines for the text sizes
into the function "config_process_config".
* include/config_process.php: cleaned source code style.
2012-06-28 Miguel de Dios <miguel.dedios@artica.es>
* include/functions.php: fixed into the function "copy_dir" when

8
pandora_console/include/config_process.php
View File

@ -126,7 +126,7 @@ else {
$config["global_block_size"] = $config["block_size"];
$config["global_flash_charts"] = $config["flash_charts"];
if (isset ($config['id_user'])){
if (isset ($config['id_user'])) {
$userinfo = get_user_info ($config['id_user']);
// Refresh the last_connect info in the user table
@ -140,11 +140,11 @@ if (isset ($config['id_user'])){
$config["block_size"] = $userinfo["block_size"];
if ($userinfo["flash_chart"] != -1)
$config["flash_charts"] = $userinfo["flash_chart"];
$config["flash_charts"] = $userinfo["flash_chart"];
// Each user could have it's own timezone)
if (isset($userinfo["timezone"])) {
if ($userinfo["timezone"] != ""){
if ($userinfo["timezone"] != "") {
date_default_timezone_set($userinfo["timezone"]);
}
}

34
pandora_console/include/functions_config.php
View File

@ -257,7 +257,7 @@ function config_update_config () {
*/
function config_process_config () {
global $config;
$configs = db_get_all_rows_in_table ('tconfig');
if (empty ($configs)) {
@ -646,13 +646,13 @@ function config_process_config () {
} else {
$view_mode = true;
}
if (isset ($_GET["modified"]) && !$view_mode) {
$upd_info["id_skin"] = get_parameter ("skin", $user_info["id_skin"]);
$return_update_skin = update_user ($id, $upd_info);
}
}
}
if (isset($config['id_user']))
$relative_path = enterprise_hook('skins_set_image_skin_path',array($config['id_user']));
else
@ -673,11 +673,35 @@ function config_process_config () {
config_update_value ('refr', '');
}
if (!isset($config['agent_size_text_small'])) {
config_update_value ('agent_size_text_small', 18);
}
if (!isset($config['agent_size_text_medium'])) {
config_update_value ('agent_size_text_medium', 50);
}
if (!isset($config['module_size_text_small'])) {
config_update_value ('module_size_text_small', 25);
}
if (!isset($config['module_size_text_medium'])) {
config_update_value ('module_size_text_medium', 50);
}
if (!isset($config['description_size_text'])) {
config_update_value ('description_size_text', 60);
}
if (!isset($config['item_title_size_text'])) {
config_update_value ('item_title_size_text', 45);
}
/* Finally, check if any value was overwritten in a form */
config_update_config();
}
function config_check (){
function config_check () {
global $config;
// At this first version I'm passing errors using session variables, because the error management