From 513c4e60dcf6eeaa0f3d306042c4c9455f54295e Mon Sep 17 00:00:00 2001 From: Poil Date: Sun, 14 Jan 2018 10:07:58 +0100 Subject: [PATCH] Replace tabs with space, and improve plugins --- ajax/json_environment.php | 6 +- ajax/json_role.php | 6 +- ajax/json_server.php | 6 +- ajax/json_server_wh_q.php | 60 +- ajax/screen_res.php | 2 +- component/auth/group.php | 2 +- component/auth/user.php | 2 +- component/config/dynamic_dashboard.php | 2 +- component/config/environment.php | 2 +- component/config/plugin.php | 2 +- component/config/project.php | 2 +- component/config/role.php | 2 +- component/config/server.php | 2 +- component/dashboard/dynamic.php | 2 +- component/dashboard/light.php | 2 +- component/dashboard/view.php | 8 +- component/perm/module.php | 2 +- component/small_admin/myaccount.php | 2 +- component/small_admin/mydashboard.php | 2 +- component/small_admin/mygroup.php | 4 +- component/small_admin/newuser.php | 2 +- config/module.php | 28 +- graph.php | 222 ++--- html/auth/auth/f_auth.php | 4 +- html/auth/group/d_group.php | 16 +- html/auth/group/e_group.php | 12 +- html/auth/group/r_group_wh_id.php | 12 +- html/auth/group/w_group.php | 54 +- html/auth/group_user/d_group_user.php | 28 +- html/auth/group_user/e_group_user.php | 18 +- html/auth/group_user/e_group_user_wh_id.php | 14 +- html/auth/group_user/f_group_user.php | 20 +- html/auth/group_user/r_group_user.php | 78 +- html/auth/group_user/r_group_user_wh_id.php | 44 +- html/auth/group_user/w_group_user.php | 32 +- html/auth/user/d_user.php | 20 +- html/auth/user/e_user.php | 12 +- html/auth/user/r_user_wh_id.php | 12 +- html/auth/user/w_user.php | 106 +-- html/auth/user_group/d_user_group.php | 28 +- html/auth/user_group/e_user_group.php | 18 +- html/auth/user_group/e_user_group_wh_id.php | 14 +- html/auth/user_group/r_user_group.php | 78 +- html/auth/user_group/r_user_group_wh_id.php | 44 +- html/auth/user_group/w_user_group.php | 30 +- .../dynamic_dashboard/d_dynamic_dashboard.php | 12 +- .../dynamic_dashboard/e_dynamic_dashboard.php | 14 +- .../r_dynamic_dashboard_wh_id.php | 12 +- .../dynamic_dashboard/w_dynamic_dashboard.php | 38 +- ...x_dynamic_dashboard_content_test_regex.php | 160 ++-- .../d_dynamic_dashboard_content.php | 40 +- .../e_dynamic_dashboard_content.php | 16 +- .../e_dynamic_dashboard_content_wh_id.php | 16 +- .../f_dynamic_dashboard_content.php | 78 +- .../r_dynamic_dashboard_content.php | 22 +- .../r_dynamic_dashboard_content_wh_id.php | 12 +- .../w_dynamic_dashboard_content.php | 94 +- .../d_dynamic_dashboard_group.php | 28 +- .../e_dynamic_dashboard_group.php | 18 +- .../e_dynamic_dashboard_group_wh_id.php | 14 +- .../r_dynamic_dashboard_group.php | 78 +- .../r_dynamic_dashboard_group_wh_id.php | 46 +- .../w_dynamic_dashboard_group.php | 32 +- html/config/environment/d_environment.php | 16 +- html/config/environment/e_environment.php | 14 +- .../environment/r_environment_wh_id.php | 12 +- html/config/environment/w_environment.php | 44 +- .../d_environment_server.php | 16 +- .../e_environment_server.php | 18 +- .../e_environment_server_wh_id.php | 14 +- .../r_environment_server.php | 102 +-- .../r_environment_server_wh_id.php | 36 +- .../w_environment_server.php | 36 +- .../d_group_dynamic_dashboard.php | 20 +- .../e_group_dynamic_dashboard.php | 18 +- .../e_group_dynamic_dashboard_wh_id.php | 14 +- .../r_group_dynamic_dashboard.php | 70 +- .../r_group_dynamic_dashboard_wh_id.php | 38 +- .../w_group_dynamic_dashboard.php | 22 +- .../d_group_plugin_filter.php | 16 +- .../e_group_plugin_filter.php | 18 +- .../e_group_plugin_filter_wh_id.php | 14 +- .../r_group_plugin_filter.php | 70 +- .../r_group_plugin_filter_wh_id.php | 38 +- .../w_group_plugin_filter.php | 26 +- html/config/plugin_filter/d_plugin_filter.php | 32 +- html/config/plugin_filter/e_plugin_filter.php | 12 +- .../plugin_filter/r_plugin_filter_wh_id.php | 12 +- html/config/plugin_filter/w_plugin_filter.php | 70 +- html/config/project/d_project.php | 16 +- html/config/project/e_project.php | 12 +- html/config/project/r_project_wh_id.php | 12 +- html/config/project/w_project.php | 44 +- .../project_server/d_project_server.php | 16 +- .../project_server/e_project_server.php | 18 +- .../project_server/e_project_server_wh_id.php | 14 +- .../project_server/r_project_server.php | 100 +- .../project_server/r_project_server_wh_id.php | 44 +- .../project_server/w_project_server.php | 32 +- html/config/role/d_role.php | 16 +- html/config/role/e_role.php | 12 +- html/config/role/r_role_wh_id.php | 12 +- html/config/role/w_role.php | 42 +- html/config/role_server/d_role_server.php | 16 +- html/config/role_server/e_role_server.php | 18 +- .../role_server/e_role_server_wh_id.php | 14 +- html/config/role_server/f_role_server.php | 2 +- html/config/role_server/r_role_server.php | 100 +- .../role_server/r_role_server_wh_id.php | 36 +- html/config/role_server/w_role_server.php | 32 +- html/config/server/d_server.php | 20 +- html/config/server/e_server.php | 12 +- html/config/server/r_server.php | 32 +- html/config/server/r_server_wh_id.php | 18 +- html/config/server/w_server.php | 84 +- html/config/server_check/e_server_check.php | 10 +- html/config/server_check/r_server_check.php | 10 +- .../d_server_environment.php | 16 +- .../e_server_environment.php | 18 +- .../e_server_environment_wh_id.php | 14 +- .../r_server_environment.php | 78 +- .../r_server_environment_wh_id.php | 40 +- .../w_server_environment.php | 24 +- .../server_project/d_server_project.php | 16 +- .../server_project/e_server_project.php | 18 +- .../server_project/e_server_project_wh_id.php | 14 +- .../server_project/r_server_project.php | 78 +- .../server_project/r_server_project_wh_id.php | 40 +- .../server_project/w_server_project.php | 22 +- html/config/server_role/d_server_role.php | 16 +- html/config/server_role/e_server_role.php | 18 +- .../server_role/e_server_role_wh_id.php | 14 +- html/config/server_role/r_server_role.php | 14 +- .../server_role/r_server_role_wh_id.php | 42 +- html/config/server_role/w_server_role.php | 22 +- .../dashboard_light/d_dashboard_light.php | 552 +++++------ .../dashboard/dynamic/d_dynamic_dashboard.php | 2 +- .../dashboard/dynamic/r_dynamic_dashboard.php | 28 +- html/dashboard/nav_menu/d_nav_menu.php | 34 +- html/dashboard/nav_menu/r_nav_menu.php | 48 +- .../dashboard/project_list/d_project_list.php | 16 +- .../project_list/d_project_server_list.php | 38 +- .../dashboard/project_list/r_project_list.php | 14 +- .../project_list/r_project_server_list.php | 322 +++---- .../server_plugins/d_server_plugins.php | 84 +- html/dashboard/zoom/d_zoom.php | 8 +- html/form/commun/ajax_get_timerange.php | 4 +- html/form/commun/ajax_set_timerange.php | 40 +- html/form/commun/func_form.php | 318 +++---- html/menu/menu_project.php | 68 +- html/menu/menu_quickview.php | 2 +- html/menu/nav_menu.php | 10 +- html/menu/time_selector.php | 72 +- html/perm/group_module/d_group_module.php | 20 +- html/perm/group_module/e_group_module.php | 18 +- .../group_module/e_group_module_wh_id.php | 14 +- html/perm/group_module/r_group_module.php | 80 +- .../group_module/r_group_module_wh_id.php | 46 +- html/perm/group_module/w_group_module.php | 26 +- html/perm/group_project/d_group_project.php | 16 +- html/perm/group_project/e_group_project.php | 18 +- .../group_project/e_group_project_wh_id.php | 14 +- html/perm/group_project/r_group_project.php | 76 +- .../group_project/r_group_project_wh_id.php | 44 +- html/perm/group_project/w_group_project.php | 26 +- html/perm/module/d_module.php | 24 +- html/perm/module/e_module.php | 12 +- html/perm/module/r_module_wh_id.php | 12 +- html/perm/module/w_module.php | 58 +- html/perm/module_group/d_module_group.php | 12 +- html/perm/module_group/e_module_group.php | 18 +- .../module_group/e_module_group_wh_id.php | 14 +- html/perm/module_group/r_module_group.php | 76 +- .../module_group/r_module_group_wh_id.php | 42 +- html/perm/module_group/w_module_group.php | 32 +- html/perm/project_group/d_project_group.php | 16 +- html/perm/project_group/e_project_group.php | 18 +- .../project_group/e_project_group_wh_id.php | 14 +- html/perm/project_group/r_project_group.php | 76 +- .../project_group/r_project_group_wh_id.php | 44 +- html/perm/project_group/w_project_group.php | 30 +- .../myaccount/r_myaccount_wh_id.php | 12 +- html/small_admin/myaccount/w_myaccount.php | 74 +- .../mydashboard/d_dynamic_dashboard.php | 12 +- .../mydashboard/e_dynamic_dashboard.php | 62 +- .../mydashboard/r_dynamic_dashboard.php | 20 +- .../mydashboard/r_dynamic_dashboard_wh_id.php | 32 +- .../mydashboard/w_dynamic_dashboard.php | 100 +- ...x_dynamic_dashboard_content_test_regex.php | 160 ++-- .../d_dynamic_dashboard_content.php | 40 +- .../e_dynamic_dashboard_content.php | 12 +- .../f_dynamic_dashboard_content.php | 78 +- .../r_dynamic_dashboard_content.php | 18 +- .../r_dynamic_dashboard_content_wh_id.php | 12 +- .../w_dynamic_dashboard_content.php | 92 +- html/small_admin/mygroup/d_group.php | 16 +- html/small_admin/mygroup/r_group.php | 2 +- html/small_admin/mygroup/r_group_wh_id.php | 12 +- html/small_admin/mygroup/w_group.php | 110 +-- .../small_admin/mygroup_user/d_group_user.php | 28 +- .../small_admin/mygroup_user/e_group_user.php | 54 +- .../small_admin/mygroup_user/f_group_user.php | 20 +- .../small_admin/mygroup_user/r_group_user.php | 78 +- .../mygroup_user/r_group_user_wh_id.php | 44 +- .../small_admin/mygroup_user/w_group_user.php | 28 +- html/small_admin/newuser/w_user.php | 72 +- index.php | 10 +- modules/AUTH_USER.php | 14 +- modules/Button.php | 6 +- modules/CURL_REQUEST.php | 190 ++-- modules/DB.php | 466 +++++----- modules/Field.php | 10 +- modules/Form.php | 18 +- modules/InputCheckbox.php | 16 +- modules/InputHidden.php | 4 +- modules/InputSubmit.php | 6 +- modules/InputText.php | 18 +- modules/LDAP.php | 154 ++-- modules/LOG.php | 132 +-- modules/PERMS.php | 288 +++--- modules/PROJECT.php | 256 +++--- modules/RRDTool.php | 60 +- modules/Select.php | 28 +- modules/Textarea.php | 20 +- modules/Validator.php | 34 +- modules/claranet/extend_auth.php | 28 +- modules/collectd.inc.php | 58 +- modules/functions.inc.php | 344 +++---- modules/preg_find.php | 4 +- plugin/GenericJMX.json | 96 +- plugin/IIS.json | 112 +-- plugin/MSSQL.json | 274 +++--- plugin/apache.json | 280 +++--- plugin/apcups.json | 130 +-- plugin/battery.json | 66 +- plugin/ceph.json | 114 +-- plugin/conntrack.json | 22 +- plugin/contextswitch.json | 22 +- plugin/cpu.json | 86 +- plugin/cpufreq.json | 10 +- plugin/curl_json-opcache.json | 128 +-- plugin/curl_json-phpfpm.json | 100 +- ...n-puppetdb-average_resources_per_node.json | 18 +- ...ppetdb-catalog_duplication_percentage.json | 26 +- ...petdb-collection_queries_service_time.json | 18 +- ...n-puppetdb-command_processing_latency.json | 18 +- ...url_json-puppetdb-command_queue_depth.json | 18 +- ...curl_json-puppetdb-commands_discarded.json | 18 +- ...curl_json-puppetdb-commands_processed.json | 20 +- ...uppetdb-commands_processed_per_second.json | 20 +- .../curl_json-puppetdb-commands_rejected.json | 18 +- .../curl_json-puppetdb-commands_retried.json | 18 +- ...b-database_compaction_round_trip_time.json | 18 +- ...curl_json-puppetdb-discarded_messages.json | 18 +- ...petdb-dlo_compression_round_trip_time.json | 18 +- .../curl_json-puppetdb-dlo_size_on_disk.json | 18 +- ..._json-puppetdb-enqueuing_service_time.json | 18 +- .../curl_json-puppetdb-jvm_heap_memory.json | 18 +- plugin/curl_json-puppetdb-nodes_count.json | 18 +- ...petdb-resource_duplication_percentage.json | 26 +- .../curl_json-puppetdb-resources_count.json | 18 +- plugin/curl_json.json | 156 ++-- plugin/df.json | 82 +- plugin/disk.json | 177 ++-- plugin/dns.json | 60 +- plugin/entropy.json | 22 +- plugin/filecount.json | 48 +- plugin/hddtemp.json | 10 +- plugin/interface.json | 130 +-- plugin/ipmi.json | 30 +- plugin/iptables.json | 26 +- plugin/irq.json | 12 +- plugin/libvirt.json | 230 ++--- plugin/load.json | 40 +- plugin/lvm.json | 26 +- plugin/mailqueues.json | 10 +- plugin/md.json | 10 +- plugin/memcached.json | 266 +++--- plugin/memory.json | 112 +-- plugin/mongo.json | 32 +- plugin/mysql.json | 330 +++---- plugin/netlink.json | 296 +++--- plugin/nfs.json | 12 +- plugin/nfs4.json | 12 +- plugin/nginx.json | 98 +- plugin/ntpd.json | 40 +- plugin/nut.json | 60 +- plugin/openvpn.json | 56 +- plugin/oracle.json | 24 +- plugin/ping.json | 28 +- plugin/postgresql.json | 264 +++--- plugin/processes.json | 384 ++++---- plugin/redis_info.json | 18 +- plugin/sensors.json | 30 +- plugin/snmp.json | 248 ++--- plugin/solr_info-cache.json | 38 +- plugin/solr_info-cache_hitratio.json | 22 +- plugin/solr_info-index.json | 22 +- plugin/solr_info-query.json | 18 +- plugin/solr_info-request_times.json | 16 +- plugin/solr_info-requests_per_second.json | 18 +- plugin/solr_info-update.json | 80 +- plugin/swap.json | 74 +- plugin/tail-postfix.json | 214 ++--- plugin/tail-puppet-catalog.json | 32 +- plugin/tcpconns.json | 12 +- plugin/thermal.json | 20 +- plugin/uptime.json | 24 +- plugin/users.json | 20 +- plugin/varnish.json | 120 +-- plugin/varnish3-allocations.json | 20 +- plugin/varnish3-backend_traffic.json | 56 +- plugin/varnish3-bad.json | 2 +- plugin/varnish3-data_structures.json | 26 +- plugin/varnish3-esi.json | 20 +- plugin/varnish3-expunge.json | 26 +- plugin/varnish3-hcb.json | 32 +- plugin/varnish3-hit_rate.json | 38 +- plugin/varnish3-losthdr.json | 20 +- plugin/varnish3-lru.json | 20 +- plugin/varnish3-memory_usage.json | 26 +- plugin/varnish3-objects.json | 32 +- plugin/varnish3-objects_per_objhead.json | 26 +- plugin/varnish3-objoverflow.json | 20 +- plugin/varnish3-request_rate.json | 62 +- plugin/varnish3-session.json | 38 +- plugin/varnish3-session_herd.json | 20 +- plugin/varnish3-shm.json | 32 +- plugin/varnish3-shm_writes.json | 26 +- plugin/varnish3-threads.json | 44 +- plugin/varnish3-transfer_rates.json | 26 +- plugin/varnish3-uptime.json | 20 +- plugin/virt.json | 269 +++--- plugin/vmem.json | 50 +- plugin/vserver.json | 164 ++-- plugin/wireless.json | 66 +- plugin/wpm.json | 42 +- rrd.php | 56 +- scripts/insert_all_server.php | 110 +-- type/Base.class.php | 866 +++++++++--------- type/Default.class.php | 106 +-- type/GenericIO.class.php | 138 +-- type/GenericIOWPM.class.php | 180 ++-- type/GenericStacked.class.php | 100 +- type/GenericStackedTotal.class.php | 118 +-- type/Uptime.class.php | 110 +-- type/VarnishStacked.class.php | 204 ++--- view/backend/v_dynamic_dashboard.php | 8 +- view/backend/v_environment.php | 6 +- view/backend/v_group.php | 16 +- view/backend/v_module.php | 6 +- view/backend/v_project.php | 10 +- view/backend/v_role.php | 6 +- view/backend/v_server.php | 8 +- view/backend/v_small_admin_mydashboard.php | 4 +- view/backend/v_user.php | 6 +- 356 files changed, 9521 insertions(+), 9469 deletions(-) diff --git a/ajax/json_environment.php b/ajax/json_environment.php index a0c723d6..5bc9b7f1 100644 --- a/ajax/json_environment.php +++ b/ajax/json_environment.php @@ -10,8 +10,8 @@ $f_id_config_role=filter_input(INPUT_GET, 'f_id_config_role',FILTER_SANITIZE_NUMBER_INT); if ($auth->verif_auth()) { - $project=new PROJECT($f_id_config_project); - $envs = (array) $project->get_servers_environments($f_id_config_role); - echo json_encode($envs); + $project=new PROJECT($f_id_config_project); + $envs = (array) $project->get_servers_environments($f_id_config_role); + echo json_encode($envs); } ?> diff --git a/ajax/json_role.php b/ajax/json_role.php index fbc62e77..5b6c15a9 100644 --- a/ajax/json_role.php +++ b/ajax/json_role.php @@ -10,8 +10,8 @@ $f_id_config_environment=filter_input(INPUT_GET, 'f_id_config_environment',FILTER_SANITIZE_NUMBER_INT); if ($auth->verif_auth()) { - $project=new PROJECT($f_id_config_project); - $envs = (array) $project->get_servers_roles($f_id_config_environment); - echo json_encode($envs); + $project=new PROJECT($f_id_config_project); + $envs = (array) $project->get_servers_roles($f_id_config_environment); + echo json_encode($envs); } ?> diff --git a/ajax/json_server.php b/ajax/json_server.php index 71208bf6..234c124f 100644 --- a/ajax/json_server.php +++ b/ajax/json_server.php @@ -11,9 +11,9 @@ $f_id_config_role=filter_input(INPUT_GET, 'f_id_config_role',FILTER_SANITIZE_NUMBER_INT); if ($auth->verif_auth()) { - $project=new PROJECT($f_id_config_project); + $project=new PROJECT($f_id_config_project); - $servers = (array) $project->get_servers($f_id_config_environment, $f_id_config_role); - echo json_encode($servers); + $servers = (array) $project->get_servers($f_id_config_environment, $f_id_config_role); + echo json_encode($servers); } ?> diff --git a/ajax/json_server_wh_q.php b/ajax/json_server_wh_q.php index ac42fda5..495369b1 100644 --- a/ajax/json_server_wh_q.php +++ b/ajax/json_server_wh_q.php @@ -5,38 +5,38 @@ if ($auth->verif_auth()) { if ($_GET['f_q']) { - $connSQL=new DB(); - $f_q='%'.filter_input(INPUT_GET,'f_q',FILTER_SANITIZE_SPECIAL_CHARS).'%'; - $s_id_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); - $f_id_config_dynamic_dashboard=filter_input(INPUT_GET,'f_id_config_dynamic_dashboard',FILTER_SANITIZE_NUMBER_INT); - - $lib=' - SELECT - cs.id_config_server, - cs.server_name, - MAX(csp.id_config_project) as id_config_project - FROM config_server cs - LEFT JOIN config_server_project csp - ON cs.id_config_server=csp.id_config_server - LEFT JOIN perm_project_group ppg - ON ppg.id_config_project=csp.id_config_project - LEFT JOIN auth_group ag - ON ag.id_auth_group=ppg.id_auth_group - LEFT JOIN auth_user_group aug - ON aug.id_auth_group=ag.id_auth_group - WHERE aug.id_auth_user=:s_id_user - AND cs.server_name LIKE :f_q - GROUP BY id_config_server, server_name - ORDER BY server_name'; + $connSQL=new DB(); + $f_q='%'.filter_input(INPUT_GET,'f_q',FILTER_SANITIZE_SPECIAL_CHARS).'%'; + $s_id_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); + $f_id_config_dynamic_dashboard=filter_input(INPUT_GET,'f_id_config_dynamic_dashboard',FILTER_SANITIZE_NUMBER_INT); - $connSQL->bind('s_id_user',$s_id_user); - $connSQL->bind('f_q',$f_q); - $all_server=$connSQL->query($lib); - $cpt_server=count($all_server); + $lib=' + SELECT + cs.id_config_server, + cs.server_name, + MAX(csp.id_config_project) as id_config_project + FROM config_server cs + LEFT JOIN config_server_project csp + ON cs.id_config_server=csp.id_config_server + LEFT JOIN perm_project_group ppg + ON ppg.id_config_project=csp.id_config_project + LEFT JOIN auth_group ag + ON ag.id_auth_group=ppg.id_auth_group + LEFT JOIN auth_user_group aug + ON aug.id_auth_group=ag.id_auth_group + WHERE aug.id_auth_user=:s_id_user + AND cs.server_name LIKE :f_q + GROUP BY id_config_server, server_name + ORDER BY server_name'; - for ($i=0; $i<$cpt_server; $i++) { - echo ''.$all_server[$i]->server_name.'
'; - } + $connSQL->bind('s_id_user',$s_id_user); + $connSQL->bind('f_q',$f_q); + $all_server=$connSQL->query($lib); + $cpt_server=count($all_server); + + for ($i=0; $i<$cpt_server; $i++) { + echo ''.$all_server[$i]->server_name.'
'; + } } } ?> diff --git a/ajax/screen_res.php b/ajax/screen_res.php index 5f182f3e..36785a2e 100644 --- a/ajax/screen_res.php +++ b/ajax/screen_res.php @@ -8,5 +8,5 @@ $_SESSION['detail-width'] = $f_width; $_SESSION['detail-height'] = $f_height; -} +} ?> diff --git a/component/auth/group.php b/component/auth/group.php index e53c1e8b..da3311da 100644 --- a/component/auth/group.php +++ b/component/auth/group.php @@ -1,3 +1,3 @@ diff --git a/component/auth/user.php b/component/auth/user.php index 85a76f62..4a3a26f0 100644 --- a/component/auth/user.php +++ b/component/auth/user.php @@ -1,3 +1,3 @@ diff --git a/component/config/dynamic_dashboard.php b/component/config/dynamic_dashboard.php index 6ea123b8..f8451185 100644 --- a/component/config/dynamic_dashboard.php +++ b/component/config/dynamic_dashboard.php @@ -1,3 +1,3 @@ diff --git a/component/config/environment.php b/component/config/environment.php index 9908e373..e4a9eaa7 100644 --- a/component/config/environment.php +++ b/component/config/environment.php @@ -1,3 +1,3 @@ diff --git a/component/config/plugin.php b/component/config/plugin.php index 403a67ea..5a2cec43 100644 --- a/component/config/plugin.php +++ b/component/config/plugin.php @@ -1,3 +1,3 @@ diff --git a/component/config/project.php b/component/config/project.php index 98f8410c..b9bbceca 100644 --- a/component/config/project.php +++ b/component/config/project.php @@ -1,3 +1,3 @@ diff --git a/component/config/role.php b/component/config/role.php index dae649d5..af2acfbe 100644 --- a/component/config/role.php +++ b/component/config/role.php @@ -1,3 +1,3 @@ diff --git a/component/config/server.php b/component/config/server.php index 55f11f6a..110dd524 100644 --- a/component/config/server.php +++ b/component/config/server.php @@ -1,3 +1,3 @@ diff --git a/component/dashboard/dynamic.php b/component/dashboard/dynamic.php index 005ff3a3..e5fb3570 100644 --- a/component/dashboard/dynamic.php +++ b/component/dashboard/dynamic.php @@ -1,4 +1,4 @@ diff --git a/component/dashboard/light.php b/component/dashboard/light.php index 1a63bb58..38c4d9c3 100644 --- a/component/dashboard/light.php +++ b/component/dashboard/light.php @@ -1,4 +1,4 @@ diff --git a/component/dashboard/view.php b/component/dashboard/view.php index 6572c4c9..7ae68e1a 100644 --- a/component/dashboard/view.php +++ b/component/dashboard/view.php @@ -1,8 +1,8 @@ diff --git a/component/perm/module.php b/component/perm/module.php index 8d462f34..61fe14f7 100644 --- a/component/perm/module.php +++ b/component/perm/module.php @@ -1,3 +1,3 @@ diff --git a/component/small_admin/myaccount.php b/component/small_admin/myaccount.php index abf84c4c..6e15723b 100644 --- a/component/small_admin/myaccount.php +++ b/component/small_admin/myaccount.php @@ -1,5 +1,5 @@ '.MY_ACCOUNT.''; + echo '

'.MY_ACCOUNT.'

'; echo '
'; echo ''.EDIT.''; include(DIR_FSROOT.'/html/small_admin/myaccount/w_myaccount.php'); diff --git a/component/small_admin/mydashboard.php b/component/small_admin/mydashboard.php index e07afbd8..8434ecba 100644 --- a/component/small_admin/mydashboard.php +++ b/component/small_admin/mydashboard.php @@ -1,3 +1,3 @@ diff --git a/component/small_admin/mygroup.php b/component/small_admin/mygroup.php index 7f3142c0..f15beec5 100644 --- a/component/small_admin/mygroup.php +++ b/component/small_admin/mygroup.php @@ -1,5 +1,5 @@ '.MANAGE_MYGROUP.''; + echo '

'.MANAGE_MYGROUP.'

'; include(DIR_FSROOT.'/html/small_admin/mygroup/w_group.php'); include(DIR_FSROOT.'/html/small_admin/mygroup/r_group_wh_id.php'); include(DIR_FSROOT.'/html/small_admin/mygroup/r_group.php'); @@ -44,7 +44,7 @@ echo '
'; if (isset($_GET['f_id_auth_user'])) { echo ''.DEL.''; - } else { + } else { echo ''.ADD.''; } include(DIR_FSROOT.'/html/small_admin/mygroup_user/f_group_user.php'); diff --git a/component/small_admin/newuser.php b/component/small_admin/newuser.php index 33a8e3d4..369ef71f 100644 --- a/component/small_admin/newuser.php +++ b/component/small_admin/newuser.php @@ -1,5 +1,5 @@ '.ADD_USER.''; + echo '

'.ADD_USER.'

'; echo '
'; echo ''.EDIT.''; include(DIR_FSROOT.'/html/small_admin/newuser/w_user.php'); diff --git a/config/module.php b/config/module.php index d97d4157..211650c7 100644 --- a/config/module.php +++ b/config/module.php @@ -1,4 +1,4 @@ -perm_module($module, $component)) { // DEBUT PERM MODULE - if(file_exists(DIR_FSROOT.'/component/'.$module.'/'.$component.'.php')){ - include(DIR_FSROOT.'/component/'.$module.'/'.$component.'.php'); - }else{ - echo $CONFIG['welcome_text']; - } - } else { - if ($component && $module) { - echo '
'.NO_ACCESS.'
'; - } - } + if ($perm_mod->perm_module($module, $component)) { // DEBUT PERM MODULE + if(file_exists(DIR_FSROOT.'/component/'.$module.'/'.$component.'.php')){ + include(DIR_FSROOT.'/component/'.$module.'/'.$component.'.php'); + }else{ + echo $CONFIG['welcome_text']; + } + } else { + if ($component && $module) { + echo '
'.NO_ACCESS.'
'; + } + } } else { - echo '
'.NO_ACCESS.'
'; - die(); + echo '
'.NO_ACCESS.'
'; + die(); } ?> diff --git a/graph.php b/graph.php index a3c5f7c6..29fb123e 100644 --- a/graph.php +++ b/graph.php @@ -4,7 +4,7 @@ require_once 'modules/collectd.inc.php'; $auth = new AUTH_USER(); -$log = new LOG(); +$log = new LOG(); $authed = $auth->verif_auth(); @@ -22,12 +22,12 @@ } $width = GET('x') ? filter_input(INPUT_GET, 'x', FILTER_VALIDATE_INT, array( - 'min_range' => 10, - 'max_range' => $CONFIG['max-width'] + 'min_range' => 10, + 'max_range' => $CONFIG['max-width'] )) : $CONFIG['width']; $height = GET('y') ? filter_input(INPUT_GET, 'y', FILTER_VALIDATE_INT, array( - 'min_range' => 10, - 'max_range' => $CONFIG['max-height'] + 'min_range' => 10, + 'max_range' => $CONFIG['max-height'] )) : $CONFIG['height']; $height = empty($_GET['y']) ? $CONFIG['height'] : $_GET['y']; $host=validate_get(GET('h'), 'host'); @@ -36,174 +36,174 @@ $datadir = GET('datadir'); if (strpos($host,':')!=FALSE) { - $tmp=explode(':',$host); - $host=$tmp[0]; + $tmp=explode(':',$host); + $host=$tmp[0]; } if ($authed && !$authorized=$auth->check_access_right($host)) { - $log->write('CGRAPHZ ERROR: Permission denied for host : '.$host); - error_image('[ERROR] Permission denied to '.$host); + $log->write('CGRAPHZ ERROR: Permission denied for host : '.$host); + error_image('[ERROR] Permission denied to '.$host); } if (validate_get(GET('h'), 'host') === NULL) { - $log->write('CGRAPHZ ERROR: host contains unknown characters'); - error_image('[ERROR] host contains unknown characters'); + $log->write('CGRAPHZ ERROR: host contains unknown characters'); + error_image('[ERROR] host contains unknown characters'); } if ($authorized->collectd_version) { - $mytypesdb=$authorized->collectd_version; + $mytypesdb=$authorized->collectd_version; } else { - $mytypesdb=COLLECTD_DEFAULT_VERSION; + $mytypesdb=COLLECTD_DEFAULT_VERSION; } if (isset($CONFIG['typesdb']) && is_array($CONFIG['typesdb'])) { - array_unshift($CONFIG['typesdb'],DIR_FSROOT.'/inc/types_'.$mytypesdb.'.db'); - $typesdb = parse_typesdb_file($CONFIG['typesdb']); + array_unshift($CONFIG['typesdb'],DIR_FSROOT.'/inc/types_'.$mytypesdb.'.db'); + $typesdb = parse_typesdb_file($CONFIG['typesdb']); } else { - $typesdb = parse_typesdb_file(DIR_FSROOT.'/inc/types_'.$mytypesdb.'.db'); + $typesdb = parse_typesdb_file(DIR_FSROOT.'/inc/types_'.$mytypesdb.'.db'); } if ($plugin == 'aggregation') { - $plugin = GET('pc'); + $plugin = GET('pc'); } # plugin json if (function_exists('json_decode') && file_exists('plugin/'.$plugin.'-'.$plugininstance.'.json')) { - $json = file_get_contents('plugin/'.$plugin.'-'.$plugininstance.'.json'); - $plugin_json = json_decode($json, true); - - if (is_null($plugin_json)) - $log->write('CGP Error: invalid json in plugin/'.$plugin.'.json'); + $json = file_get_contents('plugin/'.$plugin.'-'.$plugininstance.'.json'); + $plugin_json = json_decode($json, true); + + if (is_null($plugin_json)) + $log->write('CGP Error: invalid json in plugin/'.$plugin.'.json'); } else if (function_exists('json_decode') && file_exists('plugin/'.$plugin.'-'.$plugincategory.'.json')) { - $json = file_get_contents('plugin/'.$plugin.'-'.$plugincategory.'.json'); - $plugin_json = json_decode($json, true); - - if (is_null($plugin_json)) - $log->write('CGP Error: invalid json in plugin/'.$plugin.'.json'); + $json = file_get_contents('plugin/'.$plugin.'-'.$plugincategory.'.json'); + $plugin_json = json_decode($json, true); + + if (is_null($plugin_json)) + $log->write('CGP Error: invalid json in plugin/'.$plugin.'.json'); } else if (function_exists('json_decode') && file_exists('plugin/'.$plugin.'-'.$plugincategory.'-'.$plugininstance.'.json')) { - $json = file_get_contents('plugin/'.$plugin.'-'.$plugincategory.'-'.$plugininstance.'.json'); - $plugin_json = json_decode($json, true); - - if (is_null($plugin_json)) - $log->write('CGP Error: invalid json in plugin/'.$plugin.'.json'); + $json = file_get_contents('plugin/'.$plugin.'-'.$plugincategory.'-'.$plugininstance.'.json'); + $plugin_json = json_decode($json, true); + + if (is_null($plugin_json)) + $log->write('CGP Error: invalid json in plugin/'.$plugin.'.json'); } else { - if (function_exists('json_decode') && file_exists('plugin/'.$plugin.'.json')) { - $json = file_get_contents('plugin/'.$plugin.'.json'); - $plugin_json = json_decode($json, true); - - if (is_null($plugin_json)) - $log->write('CGP Error: invalid json in plugin/'.$plugin.'.json'); - } else { - $log->write(sprintf('CGRAPHZ ERROR: plugin "%s" is not available', $plugin)); - error_image('Unknown graph type :'.$plugin.' '.PHP_EOL.str_replace('&',PHP_EOL,$_SERVER['QUERY_STRING'])); - } + if (function_exists('json_decode') && file_exists('plugin/'.$plugin.'.json')) { + $json = file_get_contents('plugin/'.$plugin.'.json'); + $plugin_json = json_decode($json, true); + + if (is_null($plugin_json)) + $log->write('CGP Error: invalid json in plugin/'.$plugin.'.json'); + } else { + $log->write(sprintf('CGRAPHZ ERROR: plugin "%s" is not available', $plugin)); + error_image('Unknown graph type :'.$plugin.' '.PHP_EOL.str_replace('&',PHP_EOL,$_SERVER['QUERY_STRING'])); + } } if (!isset($plugin_json[$type]['type'])) - $plugin_json[$type]['type'] = 'default'; + $plugin_json[$type]['type'] = 'default'; // Build pluginconfig $pluginconfig=$CONFIG['datadir'][$datadir]; switch ($plugin_json[$type]['type']) { - case 'stackedtotal': - require_once 'type/GenericStackedTotal.class.php'; - $obj = new Type_GenericStackedTotal($CONFIG, $_GET, $pluginconfig); - break; - case 'stacked': - require_once 'type/GenericStacked.class.php'; - $obj = new Type_GenericStacked($CONFIG, $_GET, $pluginconfig); - break; - case 'io': - require_once 'type/GenericIO.class.php'; - $obj = new Type_GenericIO($CONFIG, $_GET, $pluginconfig); - break; - case 'uptime': - require_once 'type/Uptime.class.php'; - $obj = new Type_Uptime($CONFIG, $_GET, $pluginconfig); - break; - case 'iowpm': - require_once 'type/GenericIOWPM.class.php'; + case 'stackedtotal': + require_once 'type/GenericStackedTotal.class.php'; + $obj = new Type_GenericStackedTotal($CONFIG, $_GET, $pluginconfig); + break; + case 'stacked': + require_once 'type/GenericStacked.class.php'; + $obj = new Type_GenericStacked($CONFIG, $_GET, $pluginconfig); + break; + case 'io': + require_once 'type/GenericIO.class.php'; + $obj = new Type_GenericIO($CONFIG, $_GET, $pluginconfig); + break; + case 'uptime': + require_once 'type/Uptime.class.php'; + $obj = new Type_Uptime($CONFIG, $_GET, $pluginconfig); + break; + case 'iowpm': + require_once 'type/GenericIOWPM.class.php'; $obj = new Type_GenericIOWPM($CONFIG, $_GET, $pluginconfig); break; - case 'aggregation': - require_once 'type/GenericAggregation.class.php'; + case 'aggregation': + require_once 'type/GenericAggregation.class.php'; $obj = new Type_GenericAggregation($CONFIG, $_GET, $pluginconfig); - break; - case 'varnish': - require_once 'type/VarnishStacked.class.php'; + break; + case 'varnish': + require_once 'type/VarnishStacked.class.php'; $obj = new Type_VarnishStacked($CONFIG, $_GET, $pluginconfig); - break; - default: - require_once 'type/Default.class.php'; - $obj = new Type_Default($CONFIG, $_GET, $pluginconfig); - break; + break; + default: + require_once 'type/Default.class.php'; + $obj = new Type_Default($CONFIG, $_GET, $pluginconfig); + break; } if (isset($typesdb[$type])) { - $obj->data_sources = array(); - foreach ($typesdb[$type] as $ds => $property) { - $obj->data_sources[] = $ds; - } + $obj->data_sources = array(); + foreach ($typesdb[$type] as $ds => $property) { + $obj->data_sources[] = $ds; + } } if (isset($plugin_json[$type]['legend'])) { - $obj->order = array(); - foreach ($plugin_json[$type]['legend'] as $rrd => $property) { - $obj->order[] = $rrd; - $obj->legend[$rrd] = isset($property['name']) ? $property['name'] : $rrd; - if (isset($property['color'])) - $obj->colors[$rrd] = $property['color']; - } + $obj->order = array(); + foreach ($plugin_json[$type]['legend'] as $rrd => $property) { + $obj->order[] = $rrd; + $obj->legend[$rrd] = isset($property['name']) ? $property['name'] : $rrd; + if (isset($property['color'])) + $obj->colors[$rrd] = $property['color']; + } } if (GRAPH_TITLE!='text' || $obj->graph_type!='png') { - if (isset($plugin_json[$type]['title'])) { - $obj->rrd_title = $plugin_json[$type]['title']; - $replacements = array( - '{{PI}}' => GET('pi'), - '{{PC}}' => GET('pc'), - '{{TI}}' => GET('ti'), - '{{TC}}' => GET('tc'), - '{{HOST}}' => GET('h') - ); - $obj->rrd_title = str_replace(array_keys($replacements), array_values($replacements), $obj->rrd_title); - } + if (isset($plugin_json[$type]['title'])) { + $obj->rrd_title = $plugin_json[$type]['title']; + $replacements = array( + '{{PI}}' => GET('pi'), + '{{PC}}' => GET('pc'), + '{{TI}}' => GET('ti'), + '{{TC}}' => GET('tc'), + '{{HOST}}' => GET('h') + ); + $obj->rrd_title = str_replace(array_keys($replacements), array_values($replacements), $obj->rrd_title); + } } else { - $obj->rrd_title=''; + $obj->rrd_title=''; } if (isset($plugin_json[$type]['vertical'])) { - $obj->rrd_vertical = $plugin_json[$type]['vertical']; - $obj->rrd_vertical = str_replace('{{ND}}', ucfirst($CONFIG['network_datasize']), $obj->rrd_vertical); + $obj->rrd_vertical = $plugin_json[$type]['vertical']; + $obj->rrd_vertical = str_replace('{{ND}}', ucfirst($CONFIG['network_datasize']), $obj->rrd_vertical); } if (isset($plugin_json[$type]['rrdtool_opts'])) { - $rrdtool_extra_opts = $plugin_json[$type]['rrdtool_opts']; - # compatibility with plugins which specify arguments as string - if (is_string($rrdtool_extra_opts)) { - $rrdtool_extra_opts = explode(' ', $rrdtool_extra_opts); - } - - $obj->rrdtool_opts = array_merge( - $obj->rrdtool_opts, - $rrdtool_extra_opts - ); + $rrdtool_extra_opts = $plugin_json[$type]['rrdtool_opts']; + # compatibility with plugins which specify arguments as string + if (is_string($rrdtool_extra_opts)) { + $rrdtool_extra_opts = explode(' ', $rrdtool_extra_opts); + } + + $obj->rrdtool_opts = array_merge( + $obj->rrdtool_opts, + $rrdtool_extra_opts + ); } if ($type == 'if_octets') - $obj->percentile = $CONFIG['percentile']; + $obj->percentile = $CONFIG['percentile']; if (isset($plugin_json[$type]['datasize']) and $plugin_json[$type]['datasize']) - $obj->scale = $CONFIG['network_datasize'] == 'bits' ? 8 : 1; + $obj->scale = $CONFIG['network_datasize'] == 'bits' ? 8 : 1; if (isset($plugin_json[$type]['scale'])) - $obj->scale = $plugin_json[$type]['scale']; + $obj->scale = $plugin_json[$type]['scale']; if (isset($plugin_json[$type]['base'])) - $obj->base = $plugin_json[$type]['base']; + $obj->base = $plugin_json[$type]['base']; if (isset($plugin_json[$type]['legend_format'])) - $obj->rrd_format = $plugin_json[$type]['legend_format']; + $obj->rrd_format = $plugin_json[$type]['legend_format']; $obj->rrd_graph(); diff --git a/html/auth/auth/f_auth.php b/html/auth/auth/f_auth.php index 2fa59db1..7f8cf6bb 100644 --- a/html/auth/auth/f_auth.php +++ b/html/auth/auth/f_auth.php @@ -12,7 +12,7 @@ ->labelGrid('col-xs-3 col-md-4') ->inputGrid('col-xs-6 col-md-4') ->placeholder(USER); - + $form->add('text', 'f_passwd') ->iType('password') ->label(PASSWORD) @@ -25,7 +25,7 @@ ->labelGrid('col-xs-offset-3 col-md-offset-4') ->inputGrid('col-xs-6 col-md-4') ->value(SUBMIT); - + $form->bindValues($_POST); echo $form->bindForm(); ?> diff --git a/html/auth/group/d_group.php b/html/auth/group/d_group.php index 8d42c88d..bc68097e 100644 --- a/html/auth/group/d_group.php +++ b/html/auth/group/d_group.php @@ -1,20 +1,20 @@ - - + + - - - - '; + echo ' + + + + '; } ?> diff --git a/html/auth/group/e_group.php b/html/auth/group/e_group.php index 3c308632..36c17513 100644 --- a/html/auth/group/e_group.php +++ b/html/auth/group/e_group.php @@ -1,11 +1,11 @@ bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + $lib='DELETE FROM auth_group WHERE id_auth_group=:f_id_auth_group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/auth/group/r_group_wh_id.php b/html/auth/group/r_group_wh_id.php index 94e90706..274912e3 100644 --- a/html/auth/group/r_group_wh_id.php +++ b/html/auth/group/r_group_wh_id.php @@ -1,10 +1,10 @@ bind('f_id_auth_group',$f_id_auth_group); - $cur_group=$connSQL->row($lib); + $f_id_auth_group=filter_input(INPUT_GET,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $connSQL=new DB(); + $lib='SELECT * FROM auth_group WHERE id_auth_group=:f_id_auth_group'; + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $cur_group=$connSQL->row($lib); } ?> diff --git a/html/auth/group/w_group.php b/html/auth/group/w_group.php index bf484c30..7cbd0187 100644 --- a/html/auth/group/w_group.php +++ b/html/auth/group/w_group.php @@ -1,31 +1,31 @@ bind('f_id_auth_group',$f_id_auth_group); - $lib=' - UPDATE auth_group SET - `group`=:f_group, - group_description=:f_group_description - WHERE - ag.id_auth_group=:f_id_auth_group'; - } else { // INSERT - $lib='INSERT INTO auth_group ( - `group`, - group_description - ) - VALUES ( - :f_group, - :f_group_description - )'; - } - - $connSQL->bind('f_group_description',$f_group_description); - $connSQL->bind('f_group',$f_group); - $connSQL->query($lib); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + $f_group_description=filter_input(INPUT_POST,'f_group_description',FILTER_SANITIZE_SPECIAL_CHARS); + $f_group=filter_input(INPUT_POST,'f_group',FILTER_SANITIZE_SPECIAL_CHARS); + + $connSQL=new DB(); + if ($_POST['f_id_auth_group']) { // UPDATE + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $lib=' + UPDATE auth_group SET + `group`=:f_group, + group_description=:f_group_description + WHERE + ag.id_auth_group=:f_id_auth_group'; + } else { // INSERT + $lib='INSERT INTO auth_group ( + `group`, + group_description + ) + VALUES ( + :f_group, + :f_group_description + )'; + } + + $connSQL->bind('f_group_description',$f_group_description); + $connSQL->bind('f_group',$f_group); + $connSQL->query($lib); } ?> diff --git a/html/auth/group_user/d_group_user.php b/html/auth/group_user/d_group_user.php index 44fed00b..4975448a 100644 --- a/html/auth/group_user/d_group_user.php +++ b/html/auth/group_user/d_group_user.php @@ -1,26 +1,26 @@
'.$all_group[$i]->group.''.$all_group[$i]->group_description.'
'.$all_group[$i]->group.''.$all_group[$i]->group_description.'
- - + + -manager==1) { - $manager=YES; - } else { - $manager=NO; - } - - echo ' - - - - '; + if($all_group_user[$i]->manager==1) { + $manager=YES; + } else { + $manager=NO; + } + + echo ' + + + + '; } ?> diff --git a/html/auth/group_user/e_group_user.php b/html/auth/group_user/e_group_user.php index 73c4b72d..dbeb4bb3 100644 --- a/html/auth/group_user/e_group_user.php +++ b/html/auth/group_user/e_group_user.php @@ -1,14 +1,14 @@ bind('f_id_auth_user',$f_id_auth_user); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + $f_id_auth_user=filter_input(INPUT_POST,'f_id_auth_user',FILTER_SANITIZE_NUMBER_INT); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM auth_user_group WHERE id_auth_user=:f_id_auth_user AND id_auth_group=:f_id_auth_group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_user',$f_id_auth_user); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/auth/group_user/e_group_user_wh_id.php b/html/auth/group_user/e_group_user_wh_id.php index b13e0174..4bd7b66a 100644 --- a/html/auth/group_user/e_group_user_wh_id.php +++ b/html/auth/group_user/e_group_user_wh_id.php @@ -1,12 +1,12 @@ bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM auth_user_group WHERE id_auth_group=:f_id_auth_group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/auth/group_user/f_group_user.php b/html/auth/group_user/f_group_user.php index c63442e4..ae9c99fd 100644 --- a/html/auth/group_user/f_group_user.php +++ b/html/auth/group_user/f_group_user.php @@ -2,13 +2,13 @@ if (isset($_GET['f_id_auth_user'])) { /* Edit */ $gu_form = new Form('horizontal', removeqsvar($cur_url, 'last_action').'&last_action=edit_user'); - + $gu_form->add('hidden', 'f_id_auth_group') ->value($cur_group->id_auth_group); $gu_form->add('hidden', 'f_id_auth_user') ->value($f_id_auth_user); - + $gu_form->add('text','f_user') ->value($cur_group_user->user) ->readonly(true) @@ -16,19 +16,19 @@ ->autocomplete(false) ->labelGrid(IL_CSS) ->inputGrid(I_CSS); - + $gu_form->add('checkbox','f_manager') ->value('manager') ->label(MANAGER) ->checked(@$cur_group_user->manager) ->inputGrid(C_CSS); - + $gu_form->add('submit', 'f_submit_group_user') ->iType('add') ->value(SUBMIT) ->labelGrid(SL_CSS) ->inputGrid(S_CSS); - + echo $gu_form->bindForm(); /* Delete */ @@ -50,27 +50,27 @@ } else { /* Add */ $gu_form = new Form('horizontal', removeqsvar($cur_url, 'last_action').'&last_action=edit_user'); - + $gu_form->add('hidden', 'f_id_auth_group') ->value($cur_group->id_auth_group); - + $gu_form->add('select','f_id_auth_user') ->options($all_user, 'id_auth_user', 'user') ->label(USER) ->labelGrid(IL_CSS) ->inputGrid(I_CSS); - + $gu_form->add('checkbox','f_manager') ->value('manager') ->label(MANAGER) ->inputGrid(C_CSS); - + $gu_form->add('submit', 'f_submit_group_user') ->iType('add') ->value(SUBMIT) ->labelGrid(SL_CSS) ->inputGrid(S_CSS); - + echo $gu_form->bindForm(); } diff --git a/html/auth/group_user/r_group_user.php b/html/auth/group_user/r_group_user.php index 5b9d9c24..82b65223 100644 --- a/html/auth/group_user/r_group_user.php +++ b/html/auth/group_user/r_group_user.php @@ -1,47 +1,47 @@ bind('f_id_auth_group',$f_id_auth_group); - $all_group_user=$connSQL->query($lib); - $cpt_group_user=count($all_group_user); - + $connSQL=new DB(); + $lib='SELECT + aug.id_auth_user, + aug.id_auth_group, + aug.manager, + au.user, + ag.group, + ag.group_description + FROM + auth_user_group aug + LEFT JOIN auth_user au + ON aug.id_auth_user=au.id_auth_user + LEFT JOIN auth_group ag + ON aug.id_auth_group=ag.id_auth_group + WHERE aug.id_auth_group=:f_id_auth_group'; - $lib='SELECT - * - FROM - auth_user - WHERE - id_auth_user NOT IN ( - SELECT id_auth_user - FROM auth_user_group - WHERE id_auth_group=:f_id_auth_group - ) - ORDER BY - nom, - prenom, - mail'; + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $all_group_user=$connSQL->query($lib); + $cpt_group_user=count($all_group_user); - $connSQL=new DB(); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $all_user=$connSQL->query($lib); - $cpt_user=count($all_user); + + $lib='SELECT + * + FROM + auth_user + WHERE + id_auth_user NOT IN ( + SELECT id_auth_user + FROM auth_user_group + WHERE id_auth_group=:f_id_auth_group + ) + ORDER BY + nom, + prenom, + mail'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $all_user=$connSQL->query($lib); + $cpt_user=count($all_user); } ?> diff --git a/html/auth/group_user/r_group_user_wh_id.php b/html/auth/group_user/r_group_user_wh_id.php index 20cd99a4..2cd3754c 100644 --- a/html/auth/group_user/r_group_user_wh_id.php +++ b/html/auth/group_user/r_group_user_wh_id.php @@ -1,27 +1,27 @@ bind('f_id_auth_user',$f_id_auth_user); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $cur_group_user=$connSQL->row($lib); + $connSQL=new DB(); + $lib='SELECT + aug.id_auth_user, + aug.id_auth_group, + aug.manager, + au.user, + ag.group, + ag.group_description + FROM + auth_user_group aug + LEFT JOIN auth_user au + ON aug.id_auth_user=au.id_auth_user + LEFT JOIN auth_group ag + ON aug.id_auth_group=ag.id_auth_group + WHERE aug.id_auth_user=:f_id_auth_user + AND aug.id_auth_group=:f_id_auth_group'; + + $connSQL->bind('f_id_auth_user',$f_id_auth_user); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $cur_group_user=$connSQL->row($lib); } ?> diff --git a/html/auth/group_user/w_group_user.php b/html/auth/group_user/w_group_user.php index 89174f9e..4a156a8e 100644 --- a/html/auth/group_user/w_group_user.php +++ b/html/auth/group_user/w_group_user.php @@ -1,23 +1,23 @@ bind('f_id_auth_user',$f_id_auth_user); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->bind('f_manager',$f_manager); - $connSQL->query($lib); + if(isset($_POST['f_manager'])) { + $f_manager='1'; + } else { + $f_manager='0'; + } + + $lib='REPLACE INTO auth_user_group (id_auth_user, id_auth_group, manager) + VALUES (:f_id_auth_user, :f_id_auth_group, :f_manager)'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_user',$f_id_auth_user); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->bind('f_manager',$f_manager); + $connSQL->query($lib); } ?> diff --git a/html/auth/user/d_user.php b/html/auth/user/d_user.php index e47ffc26..83ba36b4 100644 --- a/html/auth/user/d_user.php +++ b/html/auth/user/d_user.php @@ -1,22 +1,22 @@
'.$all_group_user[$i]->user.''.$manager.'
'.$all_group_user[$i]->user.''.$manager.'
- - - + + + - - - - - '; + echo ' + + + + + '; } ?> diff --git a/html/auth/user/e_user.php b/html/auth/user/e_user.php index 8a6943a0..8d9dd051 100644 --- a/html/auth/user/e_user.php +++ b/html/auth/user/e_user.php @@ -1,11 +1,11 @@ bind('f_id_auth_user',$f_id_auth_user); - $connSQL->query($lib); + $lib='DELETE FROM auth_user WHERE id_auth_user=:f_id_auth_user'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_user',$f_id_auth_user); + $connSQL->query($lib); } ?> diff --git a/html/auth/user/r_user_wh_id.php b/html/auth/user/r_user_wh_id.php index 3b91944e..ccbdd649 100644 --- a/html/auth/user/r_user_wh_id.php +++ b/html/auth/user/r_user_wh_id.php @@ -1,10 +1,10 @@ bind('f_id_auth_user',$f_id_auth_user); - $cur_user=$connSQL->row($lib); + $f_id_auth_user=filter_input(INPUT_GET,'f_id_auth_user',FILTER_SANITIZE_NUMBER_INT); + + $connSQL=new DB(); + $lib='SELECT * FROM auth_user WHERE id_auth_user=:f_id_auth_user'; + $connSQL->bind('f_id_auth_user',$f_id_auth_user); + $cur_user=$connSQL->row($lib); } ?> diff --git a/html/auth/user/w_user.php b/html/auth/user/w_user.php index ccae96b9..82d669a5 100644 --- a/html/auth/user/w_user.php +++ b/html/auth/user/w_user.php @@ -1,57 +1,57 @@ bind('f_id_auth_user',$f_id_auth_user); - if (!empty($f_passwd)) { - $libpasswd='passwd=PASSWORD(:f_passwd),'; - $connSQL->bind('f_passwd',$f_passwd); - } else { - $libpasswd=''; - } - $lib=' - UPDATE auth_user SET - nom=:f_nom, - prenom=:f_prenom, - user=:f_user, - mail=:f_mail, - '.$libpasswd.' - type=:f_type - WHERE - id_auth_user=:f_id_auth_user'; - } else { // INSERT - $connSQL->bind('f_passwd',$f_passwd); - $lib='INSERT INTO auth_user ( - nom, - prenom, - user, - mail, - passwd, - type - ) - VALUES ( - :f_nom, - :f_prenom, - :f_user, - :f_mail, - PASSWORD(:f_passwd), - :f_type - )'; - } - $connSQL->bind('f_nom',$f_nom); - $connSQL->bind('f_prenom',$f_prenom); - $connSQL->bind('f_user',$f_user); - $connSQL->bind('f_mail',$f_mail); - $connSQL->bind('f_type',$f_type); - $connSQL->query($lib); + + $f_id_auth_user=filter_input(INPUT_POST,'f_id_auth_user',FILTER_SANITIZE_NUMBER_INT); + $f_nom=filter_input(INPUT_POST,'f_nom',FILTER_SANITIZE_SPECIAL_CHARS); + $f_prenom=filter_input(INPUT_POST,'f_prenom',FILTER_SANITIZE_SPECIAL_CHARS); + $f_user=filter_input(INPUT_POST,'f_user',FILTER_SANITIZE_SPECIAL_CHARS); + $f_mail=filter_input(INPUT_POST,'f_mail',FILTER_SANITIZE_SPECIAL_CHARS); + $f_passwd=$_POST['f_passwd']; + $f_type=filter_input(INPUT_POST,'f_type',FILTER_SANITIZE_SPECIAL_CHARS); + + $connSQL=new DB(); + if ($_POST['f_id_auth_user']) { // UPDATE + $connSQL->bind('f_id_auth_user',$f_id_auth_user); + if (!empty($f_passwd)) { + $libpasswd='passwd=PASSWORD(:f_passwd),'; + $connSQL->bind('f_passwd',$f_passwd); + } else { + $libpasswd=''; + } + $lib=' + UPDATE auth_user SET + nom=:f_nom, + prenom=:f_prenom, + user=:f_user, + mail=:f_mail, + '.$libpasswd.' + type=:f_type + WHERE + id_auth_user=:f_id_auth_user'; + } else { // INSERT + $connSQL->bind('f_passwd',$f_passwd); + $lib='INSERT INTO auth_user ( + nom, + prenom, + user, + mail, + passwd, + type + ) + VALUES ( + :f_nom, + :f_prenom, + :f_user, + :f_mail, + PASSWORD(:f_passwd), + :f_type + )'; + } + $connSQL->bind('f_nom',$f_nom); + $connSQL->bind('f_prenom',$f_prenom); + $connSQL->bind('f_user',$f_user); + $connSQL->bind('f_mail',$f_mail); + $connSQL->bind('f_type',$f_type); + $connSQL->query($lib); } ?> diff --git a/html/auth/user_group/d_user_group.php b/html/auth/user_group/d_user_group.php index b54a59d7..5a5b1607 100644 --- a/html/auth/user_group/d_user_group.php +++ b/html/auth/user_group/d_user_group.php @@ -1,24 +1,24 @@
'.$all_user[$i]->user.''.$all_user[$i]->nom.''.$all_user[$i]->prenom.'
'.$all_user[$i]->user.''.$all_user[$i]->nom.''.$all_user[$i]->prenom.'
- - + + -manager==1) { - $manager=YES; - } else { - $manager=NO; - } - echo ' - - - - '; + if($all_user_group[$i]->manager==1) { + $manager=YES; + } else { + $manager=NO; + } + echo ' + + + + '; } ?> diff --git a/html/auth/user_group/e_user_group.php b/html/auth/user_group/e_user_group.php index 6b5557d4..a9b4674c 100644 --- a/html/auth/user_group/e_user_group.php +++ b/html/auth/user_group/e_user_group.php @@ -1,14 +1,14 @@ bind('f_id_auth_user',$f_id_auth_user); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + $f_id_auth_user=filter_input(INPUT_POST,'f_id_auth_user',FILTER_SANITIZE_NUMBER_INT); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM auth_user_group WHERE id_auth_user=:f_id_auth_user AND id_auth_group=:f_id_auth_group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_user',$f_id_auth_user); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/auth/user_group/e_user_group_wh_id.php b/html/auth/user_group/e_user_group_wh_id.php index 0765112f..a37f26e5 100644 --- a/html/auth/user_group/e_user_group_wh_id.php +++ b/html/auth/user_group/e_user_group_wh_id.php @@ -1,12 +1,12 @@ bind('f_id_auth_user',$f_id_auth_user); - $connSQL->query($lib); + $f_id_auth_user=filter_input(INPUT_POST,'f_id_auth_user',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM auth_user_group WHERE id_auth_user=:f_id_auth_user'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_user',$f_id_auth_user); + $connSQL->query($lib); } ?> diff --git a/html/auth/user_group/r_user_group.php b/html/auth/user_group/r_user_group.php index 1186a75c..5d3b224e 100644 --- a/html/auth/user_group/r_user_group.php +++ b/html/auth/user_group/r_user_group.php @@ -1,44 +1,44 @@ bind('f_id_auth_user',$f_id_auth_user); - $all_user_group=$connSQL->query($lib); - $cpt_user_group=count($all_user_group); - - - $lib='SELECT - * - FROM - auth_group ag - WHERE - id_auth_group NOT IN ( - SELECT id_auth_group - FROM auth_user_group - WHERE id_auth_user=:f_id_auth_user - ) - ORDER BY - ag.group'; - - $connSQL=new DB(); - $connSQL->bind('f_id_auth_user',$f_id_auth_user); - $all_group=$connSQL->query($lib); - $cpt_group=count($all_group); + $connSQL=new DB(); + $lib='SELECT + aug.id_auth_user, + aug.id_auth_group, + aug.manager, + au.user, + ag.group, + ag.group_description + FROM + auth_user_group aug + LEFT JOIN auth_user au + ON aug.id_auth_user=au.id_auth_user + LEFT JOIN auth_group ag + ON aug.id_auth_group=ag.id_auth_group + WHERE aug.id_auth_user=:f_id_auth_user'; + + $connSQL->bind('f_id_auth_user',$f_id_auth_user); + $all_user_group=$connSQL->query($lib); + $cpt_user_group=count($all_user_group); + + + $lib='SELECT + * + FROM + auth_group ag + WHERE + id_auth_group NOT IN ( + SELECT id_auth_group + FROM auth_user_group + WHERE id_auth_user=:f_id_auth_user + ) + ORDER BY + ag.group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_user',$f_id_auth_user); + $all_group=$connSQL->query($lib); + $cpt_group=count($all_group); } ?> diff --git a/html/auth/user_group/r_user_group_wh_id.php b/html/auth/user_group/r_user_group_wh_id.php index 277c0bee..9d67e5b7 100644 --- a/html/auth/user_group/r_user_group_wh_id.php +++ b/html/auth/user_group/r_user_group_wh_id.php @@ -1,27 +1,27 @@ bind('f_id_auth_user',$f_id_auth_user); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $cur_user_group=$connSQL->row($lib); + $connSQL=new DB(); + $lib='SELECT + aug.id_auth_user, + aug.id_auth_group, + aug.manager, + au.user, + ag.group, + ag.group_description + FROM + auth_user_group aug + LEFT JOIN auth_user au + ON aug.id_auth_user=au.id_auth_user + LEFT JOIN auth_group ag + ON aug.id_auth_group=ag.id_auth_group + WHERE aug.id_auth_user=:f_id_auth_user + AND aug.id_auth_group=:f_id_auth_group'; + + $connSQL->bind('f_id_auth_user',$f_id_auth_user); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $cur_user_group=$connSQL->row($lib); } ?> diff --git a/html/auth/user_group/w_user_group.php b/html/auth/user_group/w_user_group.php index 6202469e..a7f79b12 100644 --- a/html/auth/user_group/w_user_group.php +++ b/html/auth/user_group/w_user_group.php @@ -1,21 +1,21 @@ bind('f_id_auth_user',$f_id_auth_user); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->bind('f_manager',$f_manager); - $connSQL->query($lib); + $lib='INSERT INTO auth_user_group (id_auth_user, id_auth_group, manager) + VALUES (:f_id_auth_user, :f_id_auth_group, :f_manager)'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_user',$f_id_auth_user); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->bind('f_manager',$f_manager); + $connSQL->query($lib); } ?> diff --git a/html/config/dynamic_dashboard/d_dynamic_dashboard.php b/html/config/dynamic_dashboard/d_dynamic_dashboard.php index a4f5c0fa..8acb25f2 100644 --- a/html/config/dynamic_dashboard/d_dynamic_dashboard.php +++ b/html/config/dynamic_dashboard/d_dynamic_dashboard.php @@ -1,18 +1,18 @@
- '.$all_user_group[$i]->group.''.$manager.'
+ '.$all_user_group[$i]->group.''.$manager.'
- + - - - '; + echo ' + + + '; } ?> diff --git a/html/config/dynamic_dashboard/e_dynamic_dashboard.php b/html/config/dynamic_dashboard/e_dynamic_dashboard.php index 83718c3f..a3c0ec0d 100644 --- a/html/config/dynamic_dashboard/e_dynamic_dashboard.php +++ b/html/config/dynamic_dashboard/e_dynamic_dashboard.php @@ -1,11 +1,11 @@ bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $connSQL->query($lib); + $f_id_config_dynamic_dashboard=filter_input(INPUT_POST,'f_id_config_dynamic_dashboard',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_dynamic_dashboard WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $connSQL->query($lib); } ?> diff --git a/html/config/dynamic_dashboard/r_dynamic_dashboard_wh_id.php b/html/config/dynamic_dashboard/r_dynamic_dashboard_wh_id.php index d6e9f6b8..bcf25ce9 100644 --- a/html/config/dynamic_dashboard/r_dynamic_dashboard_wh_id.php +++ b/html/config/dynamic_dashboard/r_dynamic_dashboard_wh_id.php @@ -1,10 +1,10 @@ bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $cur_dynamic_dashboard=$connSQL->row($lib); + $f_id_config_dynamic_dashboard=filter_input(INPUT_GET,'f_id_config_dynamic_dashboard',FILTER_SANITIZE_NUMBER_INT); + + $connSQL=new DB(); + $lib='SELECT * FROM config_dynamic_dashboard WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard'; + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $cur_dynamic_dashboard=$connSQL->row($lib); } ?> diff --git a/html/config/dynamic_dashboard/w_dynamic_dashboard.php b/html/config/dynamic_dashboard/w_dynamic_dashboard.php index 6a5fd84e..3bbc9b4f 100644 --- a/html/config/dynamic_dashboard/w_dynamic_dashboard.php +++ b/html/config/dynamic_dashboard/w_dynamic_dashboard.php @@ -1,23 +1,23 @@ bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - } else { // INSERT - $lib='INSERT INTO config_dynamic_dashboard (title) - VALUES (:f_title)'; - } - - $connSQL->bind('f_title',$f_title); - $connSQL->query($lib); + $f_id_config_dynamic_dashboard=filter_input(INPUT_POST,'f_id_config_dynamic_dashboard',FILTER_SANITIZE_NUMBER_INT); + $f_title=filter_input(INPUT_POST,'f_title',FILTER_SANITIZE_SPECIAL_CHARS); + $f_dynamic_dashboard_description=filter_input(INPUT_POST,'f_dynamic_dashboard_description',FILTER_SANITIZE_SPECIAL_CHARS); + + $connSQL=new DB(); + if ($_POST['f_id_config_dynamic_dashboard']) { // UPDATE + $lib=' + UPDATE config_dynamic_dashboard SET + title=:f_title + WHERE + id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard'; + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + } else { // INSERT + $lib='INSERT INTO config_dynamic_dashboard (title) + VALUES (:f_title)'; + } + + $connSQL->bind('f_title',$f_title); + $connSQL->query($lib); } ?> diff --git a/html/config/dynamic_dashboard_content/ajax_dynamic_dashboard_content_test_regex.php b/html/config/dynamic_dashboard_content/ajax_dynamic_dashboard_content_test_regex.php index 825ecf3f..f3435819 100644 --- a/html/config/dynamic_dashboard_content/ajax_dynamic_dashboard_content_test_regex.php +++ b/html/config/dynamic_dashboard_content/ajax_dynamic_dashboard_content_test_regex.php @@ -4,93 +4,93 @@ $auth = new AUTH_USER(); if (!$auth->verif_auth()) { - die(); + die(); } if ($_POST['f_regex_srv']) { - $f_regex_srv=filter_input(INPUT_POST,'f_regex_srv',FILTER_SANITIZE_SPECIAL_CHARS); - $s_id_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); - - $connSQL=new DB(); - $connSQL->bind('s_id_user',$s_id_user); - $connSQL->bind('f_regex_srv',$f_regex_srv); - $lib=' - SELECT - cs.id_config_server, - cs.server_name - FROM config_server cs - LEFT JOIN config_server_project csp - ON cs.id_config_server=csp.id_config_server - LEFT JOIN perm_project_group ppg - ON ppg.id_config_project=csp.id_config_project - LEFT JOIN auth_group ag - ON ag.id_auth_group=ppg.id_auth_group - LEFT JOIN auth_user_group aug - ON aug.id_auth_group=ag.id_auth_group - WHERE aug.id_auth_user=:s_id_user - AND cs.server_name REGEXP :f_regex_srv - GROUP BY id_config_server, server_name - ORDER BY server_name'; - - $all_server=$connSQL->query($lib); - $cpt_server=count($all_server); - - $f_regex_p=filter_input(INPUT_POST,'f_regex_p',FILTER_SANITIZE_SPECIAL_CHARS); - $f_regex_pi=filter_input(INPUT_POST,'f_regex_pi',FILTER_SANITIZE_SPECIAL_CHARS); - $f_regex_t=filter_input(INPUT_POST,'f_regex_t',FILTER_SANITIZE_SPECIAL_CHARS); - $f_regex_ti=filter_input(INPUT_POST,'f_regex_ti',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_srv=filter_input(INPUT_POST,'f_regex_srv',FILTER_SANITIZE_SPECIAL_CHARS); + $s_id_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); - for ($i=0; $i<$cpt_server; $i++) { - $allDatadir=getAllDatadir(); - foreach($allDatadir as $key => $datadir){ - if(!is_dir($datadir.'/'.$all_server[$i]->server_name.'/')) unset($allDatadir[$key]); - } + $connSQL=new DB(); + $connSQL->bind('s_id_user',$s_id_user); + $connSQL->bind('f_regex_srv',$f_regex_srv); + $lib=' + SELECT + cs.id_config_server, + cs.server_name + FROM config_server cs + LEFT JOIN config_server_project csp + ON cs.id_config_server=csp.id_config_server + LEFT JOIN perm_project_group ppg + ON ppg.id_config_project=csp.id_config_project + LEFT JOIN auth_group ag + ON ag.id_auth_group=ppg.id_auth_group + LEFT JOIN auth_user_group aug + ON aug.id_auth_group=ag.id_auth_group + WHERE aug.id_auth_user=:s_id_user + AND cs.server_name REGEXP :f_regex_srv + GROUP BY id_config_server, server_name + ORDER BY server_name'; - if (!empty($allDatadir)) { - $myregex='#^(('.implode('|',$allDatadir).')/'.$all_server[$i]->server_name.'/)('.$f_regex_p.')(?:\-('.$f_regex_pi.'))?/('.$f_regex_t.')(?:\-('.$f_regex_ti.'))?\.rrd#'; + $all_server=$connSQL->query($lib); + $cpt_server=count($all_server); - $plugins = array(); - foreach($allDatadir as $datadir) { - $tplugins = preg_find($myregex, $datadir.'/'.$all_server[$i]->server_name, PREG_FIND_RECURSIVE|PREG_FIND_FULLPATH|PREG_FIND_SORTBASENAME); - $plugins=array_merge($plugins, $tplugins); - } + $f_regex_p=filter_input(INPUT_POST,'f_regex_p',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_pi=filter_input(INPUT_POST,'f_regex_pi',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_t=filter_input(INPUT_POST,'f_regex_t',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_ti=filter_input(INPUT_POST,'f_regex_ti',FILTER_SANITIZE_SPECIAL_CHARS); - foreach ($plugins as $plugin) { - preg_match($myregex, $plugin, $matches); - if (isset($matches[3])) { - $str=$matches[3]; - } - if (isset($matches[4]) && $matches[4]!='') { - $str.='-'.$matches[4].'/'; - } else { - $str.='/'; - } - if (isset($matches[5])) { - $str.=$matches[5]; - } - if (isset($matches[6]) && $matches[6]!='') { - $str.='-'.$matches[6].'.rrd'; - } else { - $str.='.rrd'; - } - $plugin_array[]=$str; - } - - } - } + for ($i=0; $i<$cpt_server; $i++) { + $allDatadir=getAllDatadir(); + foreach($allDatadir as $key => $datadir){ + if(!is_dir($datadir.'/'.$all_server[$i]->server_name.'/')) unset($allDatadir[$key]); + } - echo '
'.SERVERS_FOUND.'
'; - foreach ($all_server as $server) { - echo $server->server_name.', '; - } - echo '

-
'.RRDS_FOUND.'
'; - - $plugin_array=array_unique($plugin_array,SORT_REGULAR); + if (!empty($allDatadir)) { + $myregex='#^(('.implode('|',$allDatadir).')/'.$all_server[$i]->server_name.'/)('.$f_regex_p.')(?:\-('.$f_regex_pi.'))?/('.$f_regex_t.')(?:\-('.$f_regex_ti.'))?\.rrd#'; - foreach ($plugin_array as $plugin) { - echo $plugin.'
'; - } - echo '
'; + $plugins = array(); + foreach($allDatadir as $datadir) { + $tplugins = preg_find($myregex, $datadir.'/'.$all_server[$i]->server_name, PREG_FIND_RECURSIVE|PREG_FIND_FULLPATH|PREG_FIND_SORTBASENAME); + $plugins=array_merge($plugins, $tplugins); + } + + foreach ($plugins as $plugin) { + preg_match($myregex, $plugin, $matches); + if (isset($matches[3])) { + $str=$matches[3]; + } + if (isset($matches[4]) && $matches[4]!='') { + $str.='-'.$matches[4].'/'; + } else { + $str.='/'; + } + if (isset($matches[5])) { + $str.=$matches[5]; + } + if (isset($matches[6]) && $matches[6]!='') { + $str.='-'.$matches[6].'.rrd'; + } else { + $str.='.rrd'; + } + $plugin_array[]=$str; + } + + } + } + + echo '
'.SERVERS_FOUND.'
'; + foreach ($all_server as $server) { + echo $server->server_name.', '; + } + echo '

+
'.RRDS_FOUND.'
'; + + $plugin_array=array_unique($plugin_array,SORT_REGULAR); + + foreach ($plugin_array as $plugin) { + echo $plugin.'
'; + } + echo '
'; } -?> +?> diff --git a/html/config/dynamic_dashboard_content/d_dynamic_dashboard_content.php b/html/config/dynamic_dashboard_content/d_dynamic_dashboard_content.php index 00063310..1290d67d 100644 --- a/html/config/dynamic_dashboard_content/d_dynamic_dashboard_content.php +++ b/html/config/dynamic_dashboard_content/d_dynamic_dashboard_content.php @@ -1,32 +1,32 @@
'.$all_dynamic_dashboard[$i]->title.'
'.$all_dynamic_dashboard[$i]->title.'
- - - - - - - - + + + + + + + + - - - - - - - - - - '; + echo ' + + + + + + + + + + '; } ?> diff --git a/html/config/dynamic_dashboard_content/e_dynamic_dashboard_content.php b/html/config/dynamic_dashboard_content/e_dynamic_dashboard_content.php index 3ffd15d3..edea42de 100644 --- a/html/config/dynamic_dashboard_content/e_dynamic_dashboard_content.php +++ b/html/config/dynamic_dashboard_content/e_dynamic_dashboard_content.php @@ -1,12 +1,12 @@ bind('f_id_config_dynamic_dashboard_content',$f_id_config_dynamic_dashboard_content); - $connSQL->query($lib); + + $f_id_config_dynamic_dashboard_content=filter_input(INPUT_POST,'f_id_config_dynamic_dashboard_content',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_dynamic_dashboard_content WHERE id_config_dynamic_dashboard_content="'.$f_id_config_dynamic_dashboard_content.'"'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_dynamic_dashboard_content',$f_id_config_dynamic_dashboard_content); + $connSQL->query($lib); } ?> diff --git a/html/config/dynamic_dashboard_content/e_dynamic_dashboard_content_wh_id.php b/html/config/dynamic_dashboard_content/e_dynamic_dashboard_content_wh_id.php index e1df7771..dfcfa11f 100644 --- a/html/config/dynamic_dashboard_content/e_dynamic_dashboard_content_wh_id.php +++ b/html/config/dynamic_dashboard_content/e_dynamic_dashboard_content_wh_id.php @@ -1,12 +1,12 @@ bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $connSQL->query($lib); + + $f_id_config_dynamic_dashboard=filter_input(INPUT_POST,'f_id_config_dynamic_dashboard',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_dynamic_dashboard_content WHERE id_config_dynamic_dashboard="'.$f_id_config_dynamic_dashboard.'"'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $connSQL->query($lib); } ?> diff --git a/html/config/dynamic_dashboard_content/f_dynamic_dashboard_content.php b/html/config/dynamic_dashboard_content/f_dynamic_dashboard_content.php index 1c300855..79134ed5 100644 --- a/html/config/dynamic_dashboard_content/f_dynamic_dashboard_content.php +++ b/html/config/dynamic_dashboard_content/f_dynamic_dashboard_content.php @@ -109,43 +109,43 @@ diff --git a/html/config/dynamic_dashboard_content/r_dynamic_dashboard_content.php b/html/config/dynamic_dashboard_content/r_dynamic_dashboard_content.php index 7461953e..78025fe2 100644 --- a/html/config/dynamic_dashboard_content/r_dynamic_dashboard_content.php +++ b/html/config/dynamic_dashboard_content/r_dynamic_dashboard_content.php @@ -1,18 +1,18 @@ bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - - $all_dynamic_dashboard_content=$connSQL->query('SELECT * FROM config_dynamic_dashboard_content - WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard ORDER BY dash_ordering'); - - $cpt_dynamic_dashboard_content=count($all_dynamic_dashboard_content); - + $connSQL=new DB(); + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $all_plugin_filter=$connSQL->query('SELECT * FROM config_plugin_filter ORDER BY plugin_order, plugin_filter_desc'); - $cpt_plugin_filter=count($all_plugin_filter); + $all_dynamic_dashboard_content=$connSQL->query('SELECT * FROM config_dynamic_dashboard_content + WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard ORDER BY dash_ordering'); + + $cpt_dynamic_dashboard_content=count($all_dynamic_dashboard_content); + + + $all_plugin_filter=$connSQL->query('SELECT * FROM config_plugin_filter ORDER BY plugin_order, plugin_filter_desc'); + $cpt_plugin_filter=count($all_plugin_filter); } ?> diff --git a/html/config/dynamic_dashboard_content/r_dynamic_dashboard_content_wh_id.php b/html/config/dynamic_dashboard_content/r_dynamic_dashboard_content_wh_id.php index dc785d69..fbd0c2cd 100644 --- a/html/config/dynamic_dashboard_content/r_dynamic_dashboard_content_wh_id.php +++ b/html/config/dynamic_dashboard_content/r_dynamic_dashboard_content_wh_id.php @@ -1,10 +1,10 @@ bind('f_id_config_dynamic_dashboard_content',$f_id_config_dynamic_dashboard_content); - $lib='SELECT * FROM config_dynamic_dashboard_content WHERE id_config_dynamic_dashboard_content=:f_id_config_dynamic_dashboard_content'; - $cur_dynamic_dashboard_content=$connSQL->row($lib); + $f_id_config_dynamic_dashboard_content=filter_input(INPUT_GET,'f_id_config_dynamic_dashboard_content',FILTER_SANITIZE_NUMBER_INT); + + $connSQL=new DB(); + $connSQL->bind('f_id_config_dynamic_dashboard_content',$f_id_config_dynamic_dashboard_content); + $lib='SELECT * FROM config_dynamic_dashboard_content WHERE id_config_dynamic_dashboard_content=:f_id_config_dynamic_dashboard_content'; + $cur_dynamic_dashboard_content=$connSQL->row($lib); } ?> diff --git a/html/config/dynamic_dashboard_content/w_dynamic_dashboard_content.php b/html/config/dynamic_dashboard_content/w_dynamic_dashboard_content.php index 57769338..c761206b 100644 --- a/html/config/dynamic_dashboard_content/w_dynamic_dashboard_content.php +++ b/html/config/dynamic_dashboard_content/w_dynamic_dashboard_content.php @@ -1,53 +1,53 @@ bind('f_id_config_dynamic_dashboard_content',$f_id_config_dynamic_dashboard_content); - $lib=' - UPDATE config_dynamic_dashboard_content SET - title=:f_title, - regex_srv=:f_regex_srv, - regex_p_filter=:f_regex_p_filter, - regex_pi_filter=:f_regex_pi_filter, - regex_t_filter=:f_regex_t_filter, - regex_ti_filter=:f_regex_ti_filter, - rrd_ordering=:f_rrd_ordering, - dash_ordering=:f_dash_ordering - WHERE - id_config_dynamic_dashboard_content=:f_id_config_dynamic_dashboard_content'; - } else { // INSERT - $lib='INSERT INTO config_dynamic_dashboard_content - (id_config_dynamic_dashboard,title,regex_srv,regex_p_filter,regex_pi_filter,regex_t_filter,regex_ti_filter,rrd_ordering,dash_ordering) - VALUES - (:f_id_config_dynamic_dashboard, :f_title, - :f_regex_srv, :f_regex_p_filter, :f_regex_pi_filter, - :f_regex_t_filter, :f_regex_ti_filter, - :f_rrd_ordering, :f_dash_ordering)'; - $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $f_id_config_dynamic_dashboard=filter_input(INPUT_POST,'f_id_config_dynamic_dashboard',FILTER_SANITIZE_NUMBER_INT); + $f_id_config_dynamic_dashboard_content=filter_input(INPUT_POST,'f_id_config_dynamic_dashboard_content',FILTER_SANITIZE_NUMBER_INT); + $f_dash_ordering=filter_input(INPUT_POST,'f_dash_ordering',FILTER_SANITIZE_NUMBER_INT); + $f_title=filter_input(INPUT_POST,'f_title',FILTER_SANITIZE_SPECIAL_CHARS); - } - $connSQL->bind('f_title',$f_title); - $connSQL->bind('f_regex_srv',$f_regex_srv); - $connSQL->bind('f_regex_p_filter',$f_regex_p_filter); - $connSQL->bind('f_regex_pi_filter',$f_regex_pi_filter); - $connSQL->bind('f_regex_t_filter',$f_regex_t_filter); - $connSQL->bind('f_regex_ti_filter',$f_regex_ti_filter); - $connSQL->bind('f_rrd_ordering',$f_rrd_ordering); - $connSQL->bind('f_dash_ordering',$f_dash_ordering); + $f_regex_srv=filter_input(INPUT_POST,'f_regex_srv',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_p_filter=filter_input(INPUT_POST,'f_regex_p_filter',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_pi_filter=filter_input(INPUT_POST,'f_regex_pi_filter',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_t_filter=filter_input(INPUT_POST,'f_regex_t_filter',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_ti_filter=filter_input(INPUT_POST,'f_regex_ti_filter',FILTER_SANITIZE_SPECIAL_CHARS); - $connSQL->query($lib); + $f_rrd_ordering=filter_input(INPUT_POST,'f_rrd_ordering',FILTER_SANITIZE_SPECIAL_CHARS); + + $connSQL=new DB(); + if ($f_id_config_dynamic_dashboard_content != 0) { + $connSQL->bind('f_id_config_dynamic_dashboard_content',$f_id_config_dynamic_dashboard_content); + $lib=' + UPDATE config_dynamic_dashboard_content SET + title=:f_title, + regex_srv=:f_regex_srv, + regex_p_filter=:f_regex_p_filter, + regex_pi_filter=:f_regex_pi_filter, + regex_t_filter=:f_regex_t_filter, + regex_ti_filter=:f_regex_ti_filter, + rrd_ordering=:f_rrd_ordering, + dash_ordering=:f_dash_ordering + WHERE + id_config_dynamic_dashboard_content=:f_id_config_dynamic_dashboard_content'; + } else { // INSERT + $lib='INSERT INTO config_dynamic_dashboard_content + (id_config_dynamic_dashboard,title,regex_srv,regex_p_filter,regex_pi_filter,regex_t_filter,regex_ti_filter,rrd_ordering,dash_ordering) + VALUES + (:f_id_config_dynamic_dashboard, :f_title, + :f_regex_srv, :f_regex_p_filter, :f_regex_pi_filter, + :f_regex_t_filter, :f_regex_ti_filter, + :f_rrd_ordering, :f_dash_ordering)'; + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + + } + $connSQL->bind('f_title',$f_title); + $connSQL->bind('f_regex_srv',$f_regex_srv); + $connSQL->bind('f_regex_p_filter',$f_regex_p_filter); + $connSQL->bind('f_regex_pi_filter',$f_regex_pi_filter); + $connSQL->bind('f_regex_t_filter',$f_regex_t_filter); + $connSQL->bind('f_regex_ti_filter',$f_regex_ti_filter); + $connSQL->bind('f_rrd_ordering',$f_rrd_ordering); + $connSQL->bind('f_dash_ordering',$f_dash_ordering); + + $connSQL->query($lib); } ?> diff --git a/html/config/dynamic_dashboard_group/d_dynamic_dashboard_group.php b/html/config/dynamic_dashboard_group/d_dynamic_dashboard_group.php index 139912bb..624f453a 100644 --- a/html/config/dynamic_dashboard_group/d_dynamic_dashboard_group.php +++ b/html/config/dynamic_dashboard_group/d_dynamic_dashboard_group.php @@ -1,24 +1,24 @@
'.$all_dynamic_dashboard_content[$i]->title.''.$all_dynamic_dashboard_content[$i]->dash_ordering.''.$all_dynamic_dashboard_content[$i]->regex_srv.''.$all_dynamic_dashboard_content[$i]->regex_p_filter.''.$all_dynamic_dashboard_content[$i]->regex_pi_filter.''.$all_dynamic_dashboard_content[$i]->regex_t_filter.''.$all_dynamic_dashboard_content[$i]->regex_ti_filter.''.$all_dynamic_dashboard_content[$i]->rrd_ordering.'
'.$all_dynamic_dashboard_content[$i]->title.''.$all_dynamic_dashboard_content[$i]->dash_ordering.''.$all_dynamic_dashboard_content[$i]->regex_srv.''.$all_dynamic_dashboard_content[$i]->regex_p_filter.''.$all_dynamic_dashboard_content[$i]->regex_pi_filter.''.$all_dynamic_dashboard_content[$i]->regex_t_filter.''.$all_dynamic_dashboard_content[$i]->regex_ti_filter.''.$all_dynamic_dashboard_content[$i]->rrd_ordering.'
- - + + -group_manager==1) { - $manager=YES; - } else { - $manager=NO; - } - echo ' - - - - '; + if($all_dynamic_dashboard_group[$i]->group_manager==1) { + $manager=YES; + } else { + $manager=NO; + } + echo ' + + + + '; } ?> diff --git a/html/config/dynamic_dashboard_group/e_dynamic_dashboard_group.php b/html/config/dynamic_dashboard_group/e_dynamic_dashboard_group.php index 76b8cf78..5c1b4ef2 100644 --- a/html/config/dynamic_dashboard_group/e_dynamic_dashboard_group.php +++ b/html/config/dynamic_dashboard_group/e_dynamic_dashboard_group.php @@ -1,14 +1,14 @@ bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + $f_id_config_dynamic_dashboard=filter_input(INPUT_POST,'f_id_config_dynamic_dashboard',FILTER_SANITIZE_NUMBER_INT); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_dynamic_dashboard_group WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard AND id_auth_group=:f_id_auth_group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/config/dynamic_dashboard_group/e_dynamic_dashboard_group_wh_id.php b/html/config/dynamic_dashboard_group/e_dynamic_dashboard_group_wh_id.php index f29a6549..129624bb 100644 --- a/html/config/dynamic_dashboard_group/e_dynamic_dashboard_group_wh_id.php +++ b/html/config/dynamic_dashboard_group/e_dynamic_dashboard_group_wh_id.php @@ -1,12 +1,12 @@ bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $connSQL->query($lib); + $f_id_config_dynamic_dashboard=filter_input(INPUT_POST,'f_id_config_dynamic_dashboard',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_dynamic_dashboard_group WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $connSQL->query($lib); } ?> diff --git a/html/config/dynamic_dashboard_group/r_dynamic_dashboard_group.php b/html/config/dynamic_dashboard_group/r_dynamic_dashboard_group.php index d57ab87e..aaa919d3 100644 --- a/html/config/dynamic_dashboard_group/r_dynamic_dashboard_group.php +++ b/html/config/dynamic_dashboard_group/r_dynamic_dashboard_group.php @@ -1,45 +1,45 @@ bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $all_dynamic_dashboard_group=$connSQL->query($lib); - $cpt_dynamic_dashboard_group=count($all_dynamic_dashboard_group); - - - $connSQL=new DB(); - $lib='SELECT - * - FROM - auth_group - WHERE - id_auth_group NOT IN ( - SELECT DISTINCT(id_auth_group) - FROM config_dynamic_dashboard_group - WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard - GROUP BY id_auth_group - ) - ORDER BY - `group`'; + $connSQL=new DB(); + $lib='SELECT + cddg.id_config_dynamic_dashboard, + cddg.id_auth_group, + cddg.group_manager, + cdd.title, + ag.`group`, + ag.group_description + FROM + config_dynamic_dashboard_group cddg + LEFT JOIN config_dynamic_dashboard cdd + ON cddg.id_config_dynamic_dashboard=cdd.id_config_dynamic_dashboard + LEFT JOIN auth_group ag + ON cddg.id_auth_group=ag.id_auth_group + WHERE cddg.id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard'; - $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $all_group=$connSQL->query($lib); - $cpt_group=count($all_group); + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $all_dynamic_dashboard_group=$connSQL->query($lib); + $cpt_dynamic_dashboard_group=count($all_dynamic_dashboard_group); + + + $connSQL=new DB(); + $lib='SELECT + * + FROM + auth_group + WHERE + id_auth_group NOT IN ( + SELECT DISTINCT(id_auth_group) + FROM config_dynamic_dashboard_group + WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard + GROUP BY id_auth_group + ) + ORDER BY + `group`'; + + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $all_group=$connSQL->query($lib); + $cpt_group=count($all_group); } ?> diff --git a/html/config/dynamic_dashboard_group/r_dynamic_dashboard_group_wh_id.php b/html/config/dynamic_dashboard_group/r_dynamic_dashboard_group_wh_id.php index 8e81d935..e03ea8bc 100644 --- a/html/config/dynamic_dashboard_group/r_dynamic_dashboard_group_wh_id.php +++ b/html/config/dynamic_dashboard_group/r_dynamic_dashboard_group_wh_id.php @@ -1,30 +1,30 @@ bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL=new DB(); + $lib='SELECT + cddg.id_config_dynamic_dashboard, + cddg.id_auth_group, + cddg.group_manager, + cdd.`title`, + ag.`group`, + ag.group_description + FROM + config_dynamic_dashboard_group cddg + LEFT JOIN config_dynamic_dashboard cdd + ON cddg.id_config_dynamic_dashboard=cdd.id_config_dynamic_dashboard + LEFT JOIN auth_group ag + ON cddg.id_auth_group=ag.id_auth_group + WHERE cddg.id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard + AND cddg.id_auth_group=:f_id_auth_group'; + + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + + $cur_dynamic_dashboard_group=$connSQL->row($lib); - $cur_dynamic_dashboard_group=$connSQL->row($lib); - } ?> diff --git a/html/config/dynamic_dashboard_group/w_dynamic_dashboard_group.php b/html/config/dynamic_dashboard_group/w_dynamic_dashboard_group.php index 43c432d5..d361506c 100644 --- a/html/config/dynamic_dashboard_group/w_dynamic_dashboard_group.php +++ b/html/config/dynamic_dashboard_group/w_dynamic_dashboard_group.php @@ -1,21 +1,21 @@ bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->bind('f_group_manager',$f_group_manager); - $connSQL->query($lib); + if (isset($_POST['f_group_manager'])!="") { + $f_group_manager='1'; + } else { + $f_group_manager='0'; + } + + $lib='INSERT INTO `config_dynamic_dashboard_group` (id_config_dynamic_dashboard,id_auth_group,group_manager) + VALUES (:f_id_config_dynamic_dashboard, :f_id_auth_group, :f_group_manager)'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->bind('f_group_manager',$f_group_manager); + $connSQL->query($lib); } ?> diff --git a/html/config/environment/d_environment.php b/html/config/environment/d_environment.php index 9163eab9..62ae30ae 100644 --- a/html/config/environment/d_environment.php +++ b/html/config/environment/d_environment.php @@ -1,20 +1,20 @@
- '.$all_dynamic_dashboard_group[$i]->group.''.$manager.'
+ '.$all_dynamic_dashboard_group[$i]->group.''.$manager.'
- - + + - - - - '; + echo ' + + + + '; } ?> diff --git a/html/config/environment/e_environment.php b/html/config/environment/e_environment.php index b70e9b07..57de8dae 100644 --- a/html/config/environment/e_environment.php +++ b/html/config/environment/e_environment.php @@ -1,12 +1,12 @@ bind('f_id_config_environment',$f_id_config_environment); - $connSQL->query($lib); + $f_id_config_environment=filter_input(INPUT_POST,'f_id_config_environment',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_environment WHERE id_config_environment=:f_id_config_environment'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_environment',$f_id_config_environment); + $connSQL->query($lib); } ?> diff --git a/html/config/environment/r_environment_wh_id.php b/html/config/environment/r_environment_wh_id.php index bff51829..51cf037e 100644 --- a/html/config/environment/r_environment_wh_id.php +++ b/html/config/environment/r_environment_wh_id.php @@ -1,10 +1,10 @@ bind('f_id_config_environment',$f_id_config_environment); - $cur_environment=$connSQL->row($lib); + $f_id_config_environment=filter_input(INPUT_GET,'f_id_config_environment',FILTER_SANITIZE_NUMBER_INT); + + $connSQL=new DB(); + $lib='SELECT * FROM config_environment WHERE id_config_environment=:f_id_config_environment'; + $connSQL->bind('f_id_config_environment',$f_id_config_environment); + $cur_environment=$connSQL->row($lib); } ?> diff --git a/html/config/environment/w_environment.php b/html/config/environment/w_environment.php index c94daf60..6ed65eaa 100644 --- a/html/config/environment/w_environment.php +++ b/html/config/environment/w_environment.php @@ -1,26 +1,26 @@ bind('f_id_config_environment',$f_id_config_environment); - $connSQL->bind('f_environment_description',$f_environment_description); - $connSQL->bind('f_environment',$f_environment); - $connSQL->query($lib); + + $f_id_config_environment=filter_input(INPUT_POST,'f_id_config_environment',FILTER_SANITIZE_NUMBER_INT); + $f_environment=filter_input(INPUT_POST,'f_environment',FILTER_SANITIZE_SPECIAL_CHARS); + $f_environment_description=filter_input(INPUT_POST,'f_environment_description',FILTER_SANITIZE_SPECIAL_CHARS); + + $connSQL=new DB(); + if ($_POST['f_id_config_environment']) { // UPDATE + $lib=' + UPDATE config_environment SET + environment=:f_environment, + environment_description=:f_environment_description + WHERE + id_config_environment=:f_id_config_environment'; + } else { // INSERT + $lib='INSERT INTO config_environment (id_config_environment,environment,environment_description) + VALUES (:f_id_config_environment, :f_environment, :f_environment_description)'; + } + + $connSQL->bind('f_id_config_environment',$f_id_config_environment); + $connSQL->bind('f_environment_description',$f_environment_description); + $connSQL->bind('f_environment',$f_environment); + $connSQL->query($lib); } ?> diff --git a/html/config/environment_server/d_environment_server.php b/html/config/environment_server/d_environment_server.php index a8ef324c..6d95518d 100644 --- a/html/config/environment_server/d_environment_server.php +++ b/html/config/environment_server/d_environment_server.php @@ -1,21 +1,21 @@
'.$all_environment[$i]->environment.''.$all_environment[$i]->environment_description.'
'.$all_environment[$i]->environment.''.$all_environment[$i]->environment_description.'
- - + + - - - - '; + echo ' + + + + '; } ?> diff --git a/html/config/environment_server/e_environment_server.php b/html/config/environment_server/e_environment_server.php index 862fe1f4..02df5579 100644 --- a/html/config/environment_server/e_environment_server.php +++ b/html/config/environment_server/e_environment_server.php @@ -1,14 +1,14 @@ bind('f_id_config_environment',$f_id_config_environment); - $connSQL->bind('f_id_config_server',$f_id_config_server); - $connSQL->query($lib); + $f_id_config_environment=filter_input(INPUT_POST,'f_id_config_environment',FILTER_SANITIZE_NUMBER_INT); + $f_id_config_server=filter_input(INPUT_POST,'f_id_config_server',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM `config_environment_server` WHERE id_config_environment=:f_id_config_environment AND id_config_server=:f_id_config_server'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_environment',$f_id_config_environment); + $connSQL->bind('f_id_config_server',$f_id_config_server); + $connSQL->query($lib); } ?> diff --git a/html/config/environment_server/e_environment_server_wh_id.php b/html/config/environment_server/e_environment_server_wh_id.php index c12835b1..1b887479 100644 --- a/html/config/environment_server/e_environment_server_wh_id.php +++ b/html/config/environment_server/e_environment_server_wh_id.php @@ -1,12 +1,12 @@ bind('f_id_config_environment',$f_id_config_environment); - $connSQL->query($lib); + $f_id_config_environment=filter_input(INPUT_POST,'f_id_config_environment',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_environment_server WHERE id_config_environment=:f_id_config_environment'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_environment',$f_id_config_environment); + $connSQL->query($lib); } ?> diff --git a/html/config/environment_server/r_environment_server.php b/html/config/environment_server/r_environment_server.php index 67acd0e0..9366777c 100644 --- a/html/config/environment_server/r_environment_server.php +++ b/html/config/environment_server/r_environment_server.php @@ -1,56 +1,56 @@ bind('f_id_config_environment',$f_id_config_environment); - $all_environment_server=$connSQL->query($lib); - $cpt_environment_server=count($all_environment_server); - - $connSQL=new DB(); - // To check ! - if ($f_filter_server_in_environment!='true') { - $lib='SELECT - * - FROM - config_server - WHERE - id_config_server NOT IN ( - SELECT id_config_server - FROM config_environment_server - WHERE id_config_environment=:f_id_config_environment - ) - ORDER BY - server_name'; - $connSQL->bind('f_id_config_environment',$f_id_config_environment); - } else { - $lib='SELECT - * - FROM - config_server - WHERE - id_config_server NOT IN ( - SELECT id_config_server - FROM config_environment_server - ) - ORDER BY - server_name'; - } - $all_server=$connSQL->query($lib); - $cpt_server=count($all_server); + $connSQL=new DB(); + $lib='SELECT + crs.id_config_environment, + crs.id_config_server, + cr.environment, + cs.server_name, + cs.server_description + FROM + config_environment_server crs + LEFT JOIN config_server cs + ON crs.id_config_server=cs.id_config_server + LEFT JOIN config_environment cr + ON crs.id_config_environment=cr.id_config_environment + WHERE crs.id_config_environment=:f_id_config_environment'; + + $connSQL->bind('f_id_config_environment',$f_id_config_environment); + $all_environment_server=$connSQL->query($lib); + $cpt_environment_server=count($all_environment_server); + + $connSQL=new DB(); + // To check ! + if ($f_filter_server_in_environment!='true') { + $lib='SELECT + * + FROM + config_server + WHERE + id_config_server NOT IN ( + SELECT id_config_server + FROM config_environment_server + WHERE id_config_environment=:f_id_config_environment + ) + ORDER BY + server_name'; + $connSQL->bind('f_id_config_environment',$f_id_config_environment); + } else { + $lib='SELECT + * + FROM + config_server + WHERE + id_config_server NOT IN ( + SELECT id_config_server + FROM config_environment_server + ) + ORDER BY + server_name'; + } + $all_server=$connSQL->query($lib); + $cpt_server=count($all_server); } ?> diff --git a/html/config/environment_server/r_environment_server_wh_id.php b/html/config/environment_server/r_environment_server_wh_id.php index 7ffcfe11..db742d75 100644 --- a/html/config/environment_server/r_environment_server_wh_id.php +++ b/html/config/environment_server/r_environment_server_wh_id.php @@ -1,22 +1,22 @@ bind('f_id_config_environment',$f_id_config_environment); - $connSQL->bind('f_id_config_server',$f_id_config_server); - $cur_environment_server=$connSQL->row($lib); + $f_id_config_server=filter_input(INPUT_GET,'f_id_config_server',FILTER_SANITIZE_NUMBER_INT); + $f_id_config_environment=filter_input(INPUT_GET,'f_id_config_environment',FILTER_SANITIZE_NUMBER_INT); + + $connSQL=new DB(); + $lib='SElECT + crs.id_config_environment, + crs.id_config_server, + cs.server_name, + cs.server_description + FROM + config_environment_server crs + LEFT JOIN config_server cs + ON crs.id_config_server=cs.id_config_server + WHERE crs.id_config_environment=:f_id_config_environment + AND crs.id_config_server=:f_id_config_server'; + $connSQL->bind('f_id_config_environment',$f_id_config_environment); + $connSQL->bind('f_id_config_server',$f_id_config_server); + $cur_environment_server=$connSQL->row($lib); } ?> diff --git a/html/config/environment_server/w_environment_server.php b/html/config/environment_server/w_environment_server.php index 5f6d58f5..c0e1edb7 100644 --- a/html/config/environment_server/w_environment_server.php +++ b/html/config/environment_server/w_environment_server.php @@ -1,24 +1,24 @@ bind('f_id_config_environment',$f_id_config_environment); - $connSQL->bind('id_config_server',$id_config_server); - $connSQL->query($lib); - } - } + $f_id_config_environment=filter_input(INPUT_POST,'f_id_config_environment',FILTER_SANITIZE_NUMBER_INT); + $f_id_config_server=filter_input(INPUT_POST,'f_id_config_server',FILTER_SANITIZE_NUMBER_INT, FILTER_REQUIRE_ARRAY); + $f_filter_server_in_environment=filter_input(INPUT_POST,'f_filter_server_in_environment',FILTER_SANITIZE_SPECIAL_CHARS); + + if ($f_id_config_server) { + foreach ($f_id_config_server as $id_config_server) { + $lib='INSERT INTO config_environment_server + (id_config_environment,id_config_server) + VALUES + (:f_id_config_environment,:id_config_server)'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_environment',$f_id_config_environment); + $connSQL->bind('id_config_server',$id_config_server); + $connSQL->query($lib); + } + } } else { - $f_filter_server_in_environment='true'; + $f_filter_server_in_environment='true'; } ?> diff --git a/html/config/group_dynamic_dashboard/d_group_dynamic_dashboard.php b/html/config/group_dynamic_dashboard/d_group_dynamic_dashboard.php index 4ff7ef5b..8c5524ca 100644 --- a/html/config/group_dynamic_dashboard/d_group_dynamic_dashboard.php +++ b/html/config/group_dynamic_dashboard/d_group_dynamic_dashboard.php @@ -1,23 +1,23 @@
'.$all_environment_server[$i]->server_name.''.$all_environment_server[$i]->server_description.'
'.$all_environment_server[$i]->server_name.''.$all_environment_server[$i]->server_description.'
- + - - - '; + echo ' + + + '; } ?> diff --git a/html/config/group_dynamic_dashboard/e_group_dynamic_dashboard.php b/html/config/group_dynamic_dashboard/e_group_dynamic_dashboard.php index 9424ccfe..cd7813ff 100644 --- a/html/config/group_dynamic_dashboard/e_group_dynamic_dashboard.php +++ b/html/config/group_dynamic_dashboard/e_group_dynamic_dashboard.php @@ -1,14 +1,14 @@ bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + $f_id_config_dynamic_dashboard=filter_input(INPUT_POST,'f_id_config_dynamic_dashboard',FILTER_SANITIZE_NUMBER_INT); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_dynamic_dashboard_group WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard AND id_auth_group=:f_id_auth_group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/config/group_dynamic_dashboard/e_group_dynamic_dashboard_wh_id.php b/html/config/group_dynamic_dashboard/e_group_dynamic_dashboard_wh_id.php index be130bd5..62090557 100644 --- a/html/config/group_dynamic_dashboard/e_group_dynamic_dashboard_wh_id.php +++ b/html/config/group_dynamic_dashboard/e_group_dynamic_dashboard_wh_id.php @@ -1,12 +1,12 @@ bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_dynamic_dashboard_group WHERE id_auth_group=:f_id_auth_group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/config/group_dynamic_dashboard/r_group_dynamic_dashboard.php b/html/config/group_dynamic_dashboard/r_group_dynamic_dashboard.php index 47e7128a..11f7c3b1 100644 --- a/html/config/group_dynamic_dashboard/r_group_dynamic_dashboard.php +++ b/html/config/group_dynamic_dashboard/r_group_dynamic_dashboard.php @@ -1,42 +1,42 @@ bind('f_id_auth_group',$f_id_auth_group); - $all_group_dynamic_dashboard=$connSQL->query($lib); - $cpt_group_dynamic_dashboard=count($all_group_dynamic_dashboard); + $connSQL=new DB(); + $lib='SELECT + cdd.id_config_dynamic_dashboard, + cddg.id_auth_group, + cdd.title + FROM + config_dynamic_dashboard_group cddg + LEFT JOIN config_dynamic_dashboard cdd + ON cddg.id_config_dynamic_dashboard=cdd.id_config_dynamic_dashboard + LEFT JOIN auth_group ag + ON cddg.id_auth_group=ag.id_auth_group + WHERE cddg.id_auth_group=:f_id_auth_group + ORDER BY title'; - $lib='SELECT - * - FROM - config_dynamic_dashboard - WHERE - id_config_dynamic_dashboard NOT IN ( - SELECT id_config_dynamic_dashboard - FROM config_dynamic_dashboard_group - WHERE id_auth_group=:f_id_auth_group - ) - ORDER BY - title'; - - $connSQL=new DB(); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $all_dynamic_dashboard=$connSQL->query($lib); - $cpt_dynamic_dashboard=count($all_dynamic_dashboard); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $all_group_dynamic_dashboard=$connSQL->query($lib); + $cpt_group_dynamic_dashboard=count($all_group_dynamic_dashboard); + + $lib='SELECT + * + FROM + config_dynamic_dashboard + WHERE + id_config_dynamic_dashboard NOT IN ( + SELECT id_config_dynamic_dashboard + FROM config_dynamic_dashboard_group + WHERE id_auth_group=:f_id_auth_group + ) + ORDER BY + title'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $all_dynamic_dashboard=$connSQL->query($lib); + $cpt_dynamic_dashboard=count($all_dynamic_dashboard); } ?> diff --git a/html/config/group_dynamic_dashboard/r_group_dynamic_dashboard_wh_id.php b/html/config/group_dynamic_dashboard/r_group_dynamic_dashboard_wh_id.php index e9f1f043..853809e9 100644 --- a/html/config/group_dynamic_dashboard/r_group_dynamic_dashboard_wh_id.php +++ b/html/config/group_dynamic_dashboard/r_group_dynamic_dashboard_wh_id.php @@ -1,24 +1,24 @@ bind('f_id_auth_group',$f_id_auth_group); - $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $cur_group_dynamic_dashboard=$connSQL->row($lib); + $connSQL=new DB(); + $lib='SElECT + cddg.id_config_dynamic_dashboard, + cddg.id_auth_group, + cdd.title + FROM + config_dynamic_dashboard_group cddg + LEFT JOIN auth_group ag + ON cddg.id_auth_group=ag.id_auth_group + LEFT JOIN config_dynamic_dashboard cdd + ON cdd.id_config_dynamic_dashboard=cddg.id_config_dynamic_dashboard + WHERE cddg.id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard + AND cddg.id_auth_group=:f_id_auth_group'; + + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $cur_group_dynamic_dashboard=$connSQL->row($lib); } ?> diff --git a/html/config/group_dynamic_dashboard/w_group_dynamic_dashboard.php b/html/config/group_dynamic_dashboard/w_group_dynamic_dashboard.php index ea3af0f4..f640d6c9 100644 --- a/html/config/group_dynamic_dashboard/w_group_dynamic_dashboard.php +++ b/html/config/group_dynamic_dashboard/w_group_dynamic_dashboard.php @@ -1,15 +1,15 @@ bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + + $f_id_config_dynamic_dashboard=filter_input(INPUT_POST,'f_id_config_dynamic_dashboard',FILTER_SANITIZE_NUMBER_INT); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $lib='INSERT INTO config_dynamic_dashboard_group (id_config_dynamic_dashboard,id_auth_group) + VALUES (:f_id_config_dynamic_dashboard, :f_id_auth_group)'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/config/group_plugin_filter/d_group_plugin_filter.php b/html/config/group_plugin_filter/d_group_plugin_filter.php index f183535d..8a0119e6 100644 --- a/html/config/group_plugin_filter/d_group_plugin_filter.php +++ b/html/config/group_plugin_filter/d_group_plugin_filter.php @@ -1,21 +1,21 @@
- - '.$all_group_dynamic_dashboard[$i]->title - .' -
+ + '.$all_group_dynamic_dashboard[$i]->title + .' +
- - + + - - - - '; + echo ' + + + + '; } ?> diff --git a/html/config/group_plugin_filter/e_group_plugin_filter.php b/html/config/group_plugin_filter/e_group_plugin_filter.php index 9109a911..a0448c6b 100644 --- a/html/config/group_plugin_filter/e_group_plugin_filter.php +++ b/html/config/group_plugin_filter/e_group_plugin_filter.php @@ -1,14 +1,14 @@ bind('f_id_config_plugin_filter',$f_id_config_plugin_filter); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + $f_id_config_plugin_filter=filter_input(INPUT_POST,'f_id_config_plugin_filter',FILTER_SANITIZE_NUMBER_INT); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_plugin_filter_group WHERE id_config_plugin_filter=:f_id_config_plugin_filter AND id_auth_group=:f_id_auth_group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_plugin_filter',$f_id_config_plugin_filter); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/config/group_plugin_filter/e_group_plugin_filter_wh_id.php b/html/config/group_plugin_filter/e_group_plugin_filter_wh_id.php index 000d48d0..72aa27b8 100644 --- a/html/config/group_plugin_filter/e_group_plugin_filter_wh_id.php +++ b/html/config/group_plugin_filter/e_group_plugin_filter_wh_id.php @@ -1,12 +1,12 @@ bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_plugin_filter_group WHERE id_auth_group=:f_id_auth_group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/config/group_plugin_filter/r_group_plugin_filter.php b/html/config/group_plugin_filter/r_group_plugin_filter.php index f39135ba..bfdc3b94 100644 --- a/html/config/group_plugin_filter/r_group_plugin_filter.php +++ b/html/config/group_plugin_filter/r_group_plugin_filter.php @@ -1,43 +1,43 @@ bind('f_id_auth_group',$f_id_auth_group); - $lib='SELECT - cpfg.id_config_plugin_filter, - cpfg.id_auth_group, - cpf.plugin_filter_desc, - cpf.plugin_order - FROM - config_plugin_filter_group cpfg - LEFT JOIN config_plugin_filter cpf - ON cpfg.id_config_plugin_filter=cpf.id_config_plugin_filter - LEFT JOIN auth_group ag - ON cpfg.id_auth_group=ag.id_auth_group - WHERE cpfg.id_auth_group=:f_id_auth_group - ORDER BY plugin_order'; + $connSQL=new DB(); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $lib='SELECT + cpfg.id_config_plugin_filter, + cpfg.id_auth_group, + cpf.plugin_filter_desc, + cpf.plugin_order + FROM + config_plugin_filter_group cpfg + LEFT JOIN config_plugin_filter cpf + ON cpfg.id_config_plugin_filter=cpf.id_config_plugin_filter + LEFT JOIN auth_group ag + ON cpfg.id_auth_group=ag.id_auth_group + WHERE cpfg.id_auth_group=:f_id_auth_group + ORDER BY plugin_order'; - $all_group_plugin_filter=$connSQL->query($lib); - $cpt_group_plugin_filter=count($all_group_plugin_filter); - - $connSQL=new DB(); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $lib='SELECT - * - FROM - config_plugin_filter - WHERE - id_config_plugin_filter NOT IN ( - SELECT id_config_plugin_filter - FROM config_plugin_filter_group - WHERE id_auth_group=:f_id_auth_group - ) - ORDER BY - plugin_filter_desc'; + $all_group_plugin_filter=$connSQL->query($lib); + $cpt_group_plugin_filter=count($all_group_plugin_filter); - $all_plugin_filter=$connSQL->query($lib); - $cpt_plugin_filter=count($all_plugin_filter); + $connSQL=new DB(); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $lib='SELECT + * + FROM + config_plugin_filter + WHERE + id_config_plugin_filter NOT IN ( + SELECT id_config_plugin_filter + FROM config_plugin_filter_group + WHERE id_auth_group=:f_id_auth_group + ) + ORDER BY + plugin_filter_desc'; + + $all_plugin_filter=$connSQL->query($lib); + $cpt_plugin_filter=count($all_plugin_filter); } ?> diff --git a/html/config/group_plugin_filter/r_group_plugin_filter_wh_id.php b/html/config/group_plugin_filter/r_group_plugin_filter_wh_id.php index eca800d5..8dc80660 100644 --- a/html/config/group_plugin_filter/r_group_plugin_filter_wh_id.php +++ b/html/config/group_plugin_filter/r_group_plugin_filter_wh_id.php @@ -1,24 +1,24 @@ bind('f_id_auth_group',$f_id_auth_group); - $connSQL->bind('f_id_config_plugin_filter',$f_id_config_plugin_filter); - $cur_group_plugin_filter=$connSQL->row($lib); + $connSQL=new DB(); + $lib='SElECT + cpfg.id_config_plugin_filter, + cpfg.id_auth_group, + cpf.plugin_filter_desc + FROM + config_plugin_filter_group cpfg + LEFT JOIN auth_group ag + ON cpfg.id_auth_group=ag.id_auth_group + LEFT JOIN config_plugin_filter cpf + ON cpf.id_config_plugin_filter=cpfg.id_config_plugin_filter + WHERE cpfg.id_config_plugin_filter=:f_id_config_plugin_filter + AND cpfg.id_auth_group=:f_id_auth_group'; + + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->bind('f_id_config_plugin_filter',$f_id_config_plugin_filter); + $cur_group_plugin_filter=$connSQL->row($lib); } ?> diff --git a/html/config/group_plugin_filter/w_group_plugin_filter.php b/html/config/group_plugin_filter/w_group_plugin_filter.php index 9fc90a05..f3fba226 100644 --- a/html/config/group_plugin_filter/w_group_plugin_filter.php +++ b/html/config/group_plugin_filter/w_group_plugin_filter.php @@ -1,18 +1,18 @@ bind('id_config_plugin_filter',$id_config_plugin_filter); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); - } + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $f_id_config_plugin_filter=filter_input(INPUT_POST,'f_id_config_plugin_filter',FILTER_SANITIZE_NUMBER_INT, FILTER_REQUIRE_ARRAY); + + foreach ($f_id_config_plugin_filter as $id_config_plugin_filter) { + $lib='INSERT INTO config_plugin_filter_group (id_config_plugin_filter,id_auth_group) + VALUES (:id_config_plugin_filter,:f_id_auth_group)'; + + $connSQL=new DB(); + $connSQL->bind('id_config_plugin_filter',$id_config_plugin_filter); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); + } } ?> diff --git a/html/config/plugin_filter/d_plugin_filter.php b/html/config/plugin_filter/d_plugin_filter.php index 7fbf7199..db3eddd4 100644 --- a/html/config/plugin_filter/d_plugin_filter.php +++ b/html/config/plugin_filter/d_plugin_filter.php @@ -1,28 +1,28 @@
'.$all_group_plugin_filter[$i]->plugin_filter_desc.''.$all_group_plugin_filter[$i]->plugin_order.'
'.$all_group_plugin_filter[$i]->plugin_filter_desc.''.$all_group_plugin_filter[$i]->plugin_order.'
- - - - - - + + + + + + - - - - - - - - '; + echo ' + + + + + + + + '; } ?> diff --git a/html/config/plugin_filter/e_plugin_filter.php b/html/config/plugin_filter/e_plugin_filter.php index 05eafc09..b6237c4c 100644 --- a/html/config/plugin_filter/e_plugin_filter.php +++ b/html/config/plugin_filter/e_plugin_filter.php @@ -1,11 +1,11 @@ bind('f_id_config_plugin_filter',$f_id_config_plugin_filter); - $connSQL->query($lib); + $lib='DELETE FROM config_plugin_filter WHERE id_config_plugin_filter=:f_id_config_plugin_filter'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_plugin_filter',$f_id_config_plugin_filter); + $connSQL->query($lib); } ?> diff --git a/html/config/plugin_filter/r_plugin_filter_wh_id.php b/html/config/plugin_filter/r_plugin_filter_wh_id.php index d9e7820d..03a19513 100644 --- a/html/config/plugin_filter/r_plugin_filter_wh_id.php +++ b/html/config/plugin_filter/r_plugin_filter_wh_id.php @@ -1,10 +1,10 @@ bind('f_id_config_plugin_filter',$f_id_config_plugin_filter); - $cur_plugin_filter=$connSQL->row($lib); + $f_id_config_plugin_filter=filter_input(INPUT_GET,'f_id_config_plugin_filter',FILTER_SANITIZE_NUMBER_INT); + + $connSQL=new DB(); + $lib='SELECT * FROM config_plugin_filter WHERE id_config_plugin_filter=:f_id_config_plugin_filter'; + $connSQL->bind('f_id_config_plugin_filter',$f_id_config_plugin_filter); + $cur_plugin_filter=$connSQL->row($lib); } ?> diff --git a/html/config/plugin_filter/w_plugin_filter.php b/html/config/plugin_filter/w_plugin_filter.php index a0db108b..dbaa6fa6 100644 --- a/html/config/plugin_filter/w_plugin_filter.php +++ b/html/config/plugin_filter/w_plugin_filter.php @@ -1,39 +1,39 @@ bind('f_plugin_filter_desc',$f_plugin_filter_desc); - $connSQL->bind('f_plugin_filter_p',$f_plugin_filter_p); - $connSQL->bind('f_plugin_filter_pi',$f_plugin_filter_pi); - $connSQL->bind('f_plugin_filter_t',$f_plugin_filter_t); - $connSQL->bind('f_plugin_filter_ti',$f_plugin_filter_ti); - $connSQL->bind('f_plugin_filter_plugin_order',$f_plugin_filter_plugin_order); - $connSQL->bind('f_id_config_plugin_filter',$f_id_config_plugin_filter); - - $connSQL->query($lib); + + $f_id_config_plugin_filter=filter_input(INPUT_POST,'f_id_config_plugin_filter',FILTER_SANITIZE_NUMBER_INT); + $f_plugin_filter_desc=filter_input(INPUT_POST,'f_plugin_filter_desc',FILTER_SANITIZE_SPECIAL_CHARS); + $f_plugin_filter_p=filter_input(INPUT_POST,'f_plugin_filter_p',FILTER_SANITIZE_SPECIAL_CHARS); + $f_plugin_filter_pi=filter_input(INPUT_POST,'f_plugin_filter_pi',FILTER_SANITIZE_SPECIAL_CHARS); + $f_plugin_filter_t=filter_input(INPUT_POST,'f_plugin_filter_t',FILTER_SANITIZE_SPECIAL_CHARS); + $f_plugin_filter_ti=filter_input(INPUT_POST,'f_plugin_filter_ti',FILTER_SANITIZE_SPECIAL_CHARS); + $f_plugin_filter_plugin_order=filter_input(INPUT_POST,'f_plugin_filter_plugin_order',FILTER_SANITIZE_NUMBER_INT); + + $connSQL=new DB(); + if ($_POST['f_id_config_plugin_filter']) { // UPDATE + $lib=' + UPDATE config_plugin_filter SET + plugin_filter_desc=:f_plugin_filter_desc, + plugin=:f_plugin_filter_p, + plugin_instance=:f_plugin_filter_pi, + type=:f_plugin_filter_t, + type_instance=:f_plugin_filter_ti, + plugin_order=:f_plugin_filter_plugin_order + WHERE + id_config_plugin_filter=:f_id_config_plugin_filter'; + } else { // INSERT + $lib='INSERT INTO config_plugin_filter (id_config_plugin_filter, plugin_filter_desc,plugin, plugin_instance, type, type_instance, plugin_order) + VALUES (:f_id_config_plugin_filter, :f_plugin_filter_desc, :f_plugin_filter_p, + :f_plugin_filter_pi, :f_plugin_filter_t, :f_plugin_filter_ti, :f_plugin_filter_plugin_order)'; + } + $connSQL->bind('f_plugin_filter_desc',$f_plugin_filter_desc); + $connSQL->bind('f_plugin_filter_p',$f_plugin_filter_p); + $connSQL->bind('f_plugin_filter_pi',$f_plugin_filter_pi); + $connSQL->bind('f_plugin_filter_t',$f_plugin_filter_t); + $connSQL->bind('f_plugin_filter_ti',$f_plugin_filter_ti); + $connSQL->bind('f_plugin_filter_plugin_order',$f_plugin_filter_plugin_order); + $connSQL->bind('f_id_config_plugin_filter',$f_id_config_plugin_filter); + + $connSQL->query($lib); } ?> diff --git a/html/config/project/d_project.php b/html/config/project/d_project.php index 7aea3a85..076cdc79 100644 --- a/html/config/project/d_project.php +++ b/html/config/project/d_project.php @@ -1,20 +1,20 @@
'.$all_plugin_filter[$i]->plugin_filter_desc.''.$all_plugin_filter[$i]->plugin.''.$all_plugin_filter[$i]->plugin_instance.''.$all_plugin_filter[$i]->type.''.$all_plugin_filter[$i]->type_instance.''.$all_plugin_filter[$i]->plugin_order.'
'.$all_plugin_filter[$i]->plugin_filter_desc.''.$all_plugin_filter[$i]->plugin.''.$all_plugin_filter[$i]->plugin_instance.''.$all_plugin_filter[$i]->type.''.$all_plugin_filter[$i]->type_instance.''.$all_plugin_filter[$i]->plugin_order.'
- - + + - - - - '; + echo ' + + + + '; } ?> diff --git a/html/config/project/e_project.php b/html/config/project/e_project.php index 1c062247..539c414f 100644 --- a/html/config/project/e_project.php +++ b/html/config/project/e_project.php @@ -1,11 +1,11 @@ bind('f_id_config_project',$f_id_config_project); - $connSQL->query($lib); + $lib='DELETE FROM config_project WHERE id_config_project=:f_id_config_project'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->query($lib); } ?> diff --git a/html/config/project/r_project_wh_id.php b/html/config/project/r_project_wh_id.php index 6af5d45b..c2afe721 100644 --- a/html/config/project/r_project_wh_id.php +++ b/html/config/project/r_project_wh_id.php @@ -1,10 +1,10 @@ bind('f_id_config_project',$f_id_config_project); - $cur_project=$connSQL->row($lib); + $f_id_config_project=filter_input(INPUT_GET,'f_id_config_project',FILTER_SANITIZE_NUMBER_INT); + + $connSQL=new DB(); + $lib='SELECT * FROM config_project WHERE id_config_project=:f_id_config_project'; + $connSQL->bind('f_id_config_project',$f_id_config_project); + $cur_project=$connSQL->row($lib); } ?> diff --git a/html/config/project/w_project.php b/html/config/project/w_project.php index be0b75cb..3c7d6c7a 100644 --- a/html/config/project/w_project.php +++ b/html/config/project/w_project.php @@ -1,26 +1,26 @@ bind('f_id_config_project',$f_id_config_project); - $connSQL->bind('f_project_description',$f_project_description); - $connSQL->bind('f_project',$f_project); - $connSQL->query($lib); + + $f_id_config_project=filter_input(INPUT_POST,'f_id_config_project',FILTER_SANITIZE_NUMBER_INT); + $f_project=filter_input(INPUT_POST,'f_project',FILTER_SANITIZE_SPECIAL_CHARS); + $f_project_description=filter_input(INPUT_POST,'f_project_description',FILTER_SANITIZE_SPECIAL_CHARS); + + if ($_POST['f_id_config_project']) { // UPDATE + $lib=' + UPDATE config_project SET + project=:f_project, + project_description=:f_project_description + WHERE + id_config_project=:f_id_config_project'; + } else { // INSERT + $lib='INSERT INTO config_project (id_config_project, project, project_description) + VALUES (:f_id_config_project, :f_project, :f_project_description)'; + } + + $connSQL=new DB(); + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->bind('f_project_description',$f_project_description); + $connSQL->bind('f_project',$f_project); + $connSQL->query($lib); } ?> diff --git a/html/config/project_server/d_project_server.php b/html/config/project_server/d_project_server.php index 0c0d6c2e..d2c4a63e 100644 --- a/html/config/project_server/d_project_server.php +++ b/html/config/project_server/d_project_server.php @@ -1,19 +1,19 @@
'.$all_project[$i]->project.''.$all_project[$i]->project_description.'
'.$all_project[$i]->project.''.$all_project[$i]->project_description.'
- - + + - - - - '; + echo ' + + + + '; } ?> diff --git a/html/config/project_server/e_project_server.php b/html/config/project_server/e_project_server.php index dad04f1c..f3b3ed1e 100644 --- a/html/config/project_server/e_project_server.php +++ b/html/config/project_server/e_project_server.php @@ -1,14 +1,14 @@ bind('f_id_config_project',$f_id_config_project); - $connSQL->bind('f_id_config_server',$f_id_config_server); - $connSQL->query($lib); + $f_id_config_project=filter_input(INPUT_POST,'f_id_config_project',FILTER_SANITIZE_NUMBER_INT); + $f_id_config_server=filter_input(INPUT_POST,'f_id_config_server',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_server_project WHERE id_config_project=:f_id_config_project AND id_config_server=:f_id_config_server'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->bind('f_id_config_server',$f_id_config_server); + $connSQL->query($lib); } ?> diff --git a/html/config/project_server/e_project_server_wh_id.php b/html/config/project_server/e_project_server_wh_id.php index 2aef2e67..ced32d07 100644 --- a/html/config/project_server/e_project_server_wh_id.php +++ b/html/config/project_server/e_project_server_wh_id.php @@ -1,12 +1,12 @@ bind('f_id_config_project',$f_id_config_project); - $connSQL->query($lib); + $f_id_config_project=filter_input(INPUT_POST,'f_id_config_project',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_server_project WHERE id_config_project=:f_id_config_project'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->query($lib); } ?> diff --git a/html/config/project_server/r_project_server.php b/html/config/project_server/r_project_server.php index 12c43ae4..d1023ca7 100644 --- a/html/config/project_server/r_project_server.php +++ b/html/config/project_server/r_project_server.php @@ -1,55 +1,55 @@ bind('f_id_config_project',$f_id_config_project); - $all_project_server=$connSQL->query($lib); - $cpt_project_server=count($all_project_server); - - $connSQL=new DB(); - if ($f_filter_server_in_project!='true') { - $lib='SELECT - * - FROM - config_server - WHERE - id_config_server NOT IN ( - SELECT id_config_server - FROM config_server_project - WHERE id_config_project=:f_id_config_project - ) - ORDER BY - server_name'; - $connSQL->bind('f_id_config_project',$f_id_config_project); - } else { - $lib='SELECT - * - FROM - config_server - WHERE - id_config_server NOT IN ( - SELECT id_config_server - FROM config_server_project - ) - ORDER BY - server_name'; - } - $all_server=$connSQL->query($lib); - $cpt_server=count($all_server); + $connSQL=new DB(); + $lib='SELECT + csp.id_config_project, + csp.id_config_server, + cp.project, + cs.server_name, + cs.server_description + FROM + config_server_project csp + LEFT JOIN config_project cp + ON csp.id_config_project=cp.id_config_project + LEFT JOIN config_server cs + ON csp.id_config_server=cs.id_config_server + WHERE csp.id_config_project=:f_id_config_project'; + + $connSQL->bind('f_id_config_project',$f_id_config_project); + $all_project_server=$connSQL->query($lib); + $cpt_project_server=count($all_project_server); + + $connSQL=new DB(); + if ($f_filter_server_in_project!='true') { + $lib='SELECT + * + FROM + config_server + WHERE + id_config_server NOT IN ( + SELECT id_config_server + FROM config_server_project + WHERE id_config_project=:f_id_config_project + ) + ORDER BY + server_name'; + $connSQL->bind('f_id_config_project',$f_id_config_project); + } else { + $lib='SELECT + * + FROM + config_server + WHERE + id_config_server NOT IN ( + SELECT id_config_server + FROM config_server_project + ) + ORDER BY + server_name'; + } + $all_server=$connSQL->query($lib); + $cpt_server=count($all_server); } ?> diff --git a/html/config/project_server/r_project_server_wh_id.php b/html/config/project_server/r_project_server_wh_id.php index c22b7af1..c8f6f7c3 100644 --- a/html/config/project_server/r_project_server_wh_id.php +++ b/html/config/project_server/r_project_server_wh_id.php @@ -1,27 +1,27 @@ bind('f_id_config_project',$f_id_config_project); - $connSQL->bind('f_id_config_server',$f_id_config_server); - $cur_project_server=$connSQL->row($lib); + $connSQL=new DB(); + /* A FAIRE A PARTIR D'ICI DEMAIN GROS BOULET */ + $lib='SELECT + csp.id_config_project, + csp.id_config_server, + cp.project, + cs.server_name, + cs.server_description + FROM + config_server_project csp + LEFT JOIN config_project cp + ON csp.id_config_project=cp.id_config_project + LEFT JOIN config_server cs + ON csp.id_config_server=cs.id_config_server + WHERE csp.id_config_project=:f_id_config_project + AND csp.id_config_server=:f_id_config_server'; + + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->bind('f_id_config_server',$f_id_config_server); + $cur_project_server=$connSQL->row($lib); } ?> diff --git a/html/config/project_server/w_project_server.php b/html/config/project_server/w_project_server.php index 84c1e976..c092c8a5 100644 --- a/html/config/project_server/w_project_server.php +++ b/html/config/project_server/w_project_server.php @@ -1,21 +1,21 @@ bind('f_id_config_project',$f_id_config_project); - $connSQL->bind('id_config_server',$id_config_server); - $connSQL->query($lib); - } + + $f_id_config_project=filter_input(INPUT_POST,'f_id_config_project',FILTER_SANITIZE_NUMBER_INT); + $f_id_config_server=filter_input(INPUT_POST,'f_id_config_server',FILTER_SANITIZE_NUMBER_INT, FILTER_REQUIRE_ARRAY); + $f_filter_server_in_project=$_POST['f_filter_server_in_project']; + + foreach ($f_id_config_server as $id_config_server) { + $lib='INSERT INTO config_server_project + (id_config_project, id_config_server) + VALUES + (:f_id_config_project, :id_config_server)'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->bind('id_config_server',$id_config_server); + $connSQL->query($lib); + } } else { $f_filter_server_in_project='true'; } diff --git a/html/config/role/d_role.php b/html/config/role/d_role.php index 6cee4d74..0b6b2fe6 100644 --- a/html/config/role/d_role.php +++ b/html/config/role/d_role.php @@ -1,20 +1,20 @@
'.$all_project_server[$i]->server_name.''.$all_project_server[$i]->server_description.'
'.$all_project_server[$i]->server_name.''.$all_project_server[$i]->server_description.'
- - + + - - - - '; + echo ' + + + + '; } ?> diff --git a/html/config/role/e_role.php b/html/config/role/e_role.php index e6e50248..0ae301d3 100644 --- a/html/config/role/e_role.php +++ b/html/config/role/e_role.php @@ -1,11 +1,11 @@ bind('f_id_config_role',$f_id_config_role); - $connSQL->query($lib); + $lib='DELETE FROM config_role WHERE id_config_role=:f_id_config_role'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_role',$f_id_config_role); + $connSQL->query($lib); } ?> diff --git a/html/config/role/r_role_wh_id.php b/html/config/role/r_role_wh_id.php index 199994e2..96de8511 100644 --- a/html/config/role/r_role_wh_id.php +++ b/html/config/role/r_role_wh_id.php @@ -1,10 +1,10 @@ bind('f_id_config_role',$f_id_config_role); - $cur_role=$connSQL->row($lib); + $f_id_config_role=filter_input(INPUT_GET,'f_id_config_role',FILTER_SANITIZE_NUMBER_INT); + + $connSQL=new DB(); + $lib='SELECT * FROM config_role WHERE id_config_role=:f_id_config_role'; + $connSQL->bind('f_id_config_role',$f_id_config_role); + $cur_role=$connSQL->row($lib); } ?> diff --git a/html/config/role/w_role.php b/html/config/role/w_role.php index 0cdbf1c6..82160c0f 100644 --- a/html/config/role/w_role.php +++ b/html/config/role/w_role.php @@ -1,25 +1,25 @@ bind('f_role',$f_role); - $connSQL->bind('f_role_description',$f_role_description); - $connSQL->bind('f_id_config_role',$f_id_config_role); - $connSQL->query($lib); + $f_id_config_role=filter_input(INPUT_POST,'f_id_config_role',FILTER_SANITIZE_NUMBER_INT); + $f_role=filter_input(INPUT_POST,'f_role',FILTER_SANITIZE_SPECIAL_CHARS); + $f_role_description=filter_input(INPUT_POST,'f_role_description',FILTER_SANITIZE_SPECIAL_CHARS); + + if ($_POST['f_id_config_role']) { // UPDATE + $lib=' + UPDATE config_role SET + role=:f_role, + role_description=:f_role_description + WHERE + id_config_role=:f_id_config_role'; + } else { // INSERT + $lib='INSERT INTO config_role (id_config_role,role,role_description) + VALUES (:f_id_config_role, :f_role, :f_role_description)'; + } + + $connSQL=new DB(); + $connSQL->bind('f_role',$f_role); + $connSQL->bind('f_role_description',$f_role_description); + $connSQL->bind('f_id_config_role',$f_id_config_role); + $connSQL->query($lib); } ?> diff --git a/html/config/role_server/d_role_server.php b/html/config/role_server/d_role_server.php index 18ee9b5f..99933554 100644 --- a/html/config/role_server/d_role_server.php +++ b/html/config/role_server/d_role_server.php @@ -1,21 +1,21 @@
'.$all_role[$i]->role.''.$all_role[$i]->role_description.'
'.$all_role[$i]->role.''.$all_role[$i]->role_description.'
- - + + - - - - '; + echo ' + + + + '; } ?> diff --git a/html/config/role_server/e_role_server.php b/html/config/role_server/e_role_server.php index 9d4a0c31..3c003885 100644 --- a/html/config/role_server/e_role_server.php +++ b/html/config/role_server/e_role_server.php @@ -1,14 +1,14 @@ bind('f_id_config_role', $f_id_config_role); - $connSQL->bind('f_id_config_server', $f_id_config_server); - $connSQL->query($lib); + $f_id_config_role=filter_input(INPUT_POST,'f_id_config_role',FILTER_SANITIZE_NUMBER_INT); + $f_id_config_server=filter_input(INPUT_POST,'f_id_config_server',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_role_server WHERE id_config_role=:f_id_config_role AND id_config_server=:f_id_config_server'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_role', $f_id_config_role); + $connSQL->bind('f_id_config_server', $f_id_config_server); + $connSQL->query($lib); } ?> diff --git a/html/config/role_server/e_role_server_wh_id.php b/html/config/role_server/e_role_server_wh_id.php index a723d1a8..81a56e1a 100644 --- a/html/config/role_server/e_role_server_wh_id.php +++ b/html/config/role_server/e_role_server_wh_id.php @@ -1,12 +1,12 @@ bind('f_id_config_role', $f_id_config_role); - $connSQL->query($lib); + $f_id_config_role=filter_input(INPUT_POST,'f_id_config_role',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_role_server WHERE id_config_role=:f_id_config_role'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_role', $f_id_config_role); + $connSQL->query($lib); } ?> diff --git a/html/config/role_server/f_role_server.php b/html/config/role_server/f_role_server.php index ca11ccb5..fef8de45 100644 --- a/html/config/role_server/f_role_server.php +++ b/html/config/role_server/f_role_server.php @@ -1,4 +1,4 @@ - + bind('f_id_config_role',$f_id_config_role); - $all_role_server=$connSQL->query($lib); - $cpt_role_server=count($all_role_server); - - $connSQL=new DB(); - if ($f_filter_server_in_role!='true') { - $lib='SELECT - * - FROM - config_server - WHERE - id_config_server NOT IN ( - SELECT id_config_server - FROM config_role_server - WHERE id_config_role=:f_id_config_role - ) - ORDER BY - server_name'; - $connSQL->bind('f_id_config_role',$f_id_config_role); - } else { - $lib='SELECT - * - FROM - config_server - WHERE - id_config_server NOT IN ( - SELECT id_config_server - FROM config_role_server - ) - ORDER BY - server_name'; - } - $all_server=$connSQL->query($lib); - $cpt_server=count($all_server); + $lib='SELECT + crs.id_config_role, + crs.id_config_server, + cr.role, + cs.server_name, + cs.server_description + FROM + config_role_server crs + LEFT JOIN config_server cs + ON crs.id_config_server=cs.id_config_server + LEFT JOIN config_role cr + ON crs.id_config_role=cr.id_config_role + WHERE crs.id_config_role=:f_id_config_role'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_role',$f_id_config_role); + $all_role_server=$connSQL->query($lib); + $cpt_role_server=count($all_role_server); + + $connSQL=new DB(); + if ($f_filter_server_in_role!='true') { + $lib='SELECT + * + FROM + config_server + WHERE + id_config_server NOT IN ( + SELECT id_config_server + FROM config_role_server + WHERE id_config_role=:f_id_config_role + ) + ORDER BY + server_name'; + $connSQL->bind('f_id_config_role',$f_id_config_role); + } else { + $lib='SELECT + * + FROM + config_server + WHERE + id_config_server NOT IN ( + SELECT id_config_server + FROM config_role_server + ) + ORDER BY + server_name'; + } + $all_server=$connSQL->query($lib); + $cpt_server=count($all_server); } ?> diff --git a/html/config/role_server/r_role_server_wh_id.php b/html/config/role_server/r_role_server_wh_id.php index 28ae0498..d3e253ae 100644 --- a/html/config/role_server/r_role_server_wh_id.php +++ b/html/config/role_server/r_role_server_wh_id.php @@ -1,24 +1,24 @@ bind('f_id_config_role',$f_id_config_role); - $connSQL->bind('f_id_config_server',$f_id_config_server); + $connSQL=new DB(); + $lib='SElECT + crs.id_config_role, + crs.id_config_server, + cs.server_name, + cs.server_description + FROM + config_role_server crs + LEFT JOIN config_server cs + ON crs.id_config_server=cs.id_config_server + WHERE crs.id_config_role=:f_id_config_role + AND crs.id_config_server=:f_id_config_server'; - $cur_role_server=$connSQL->row($lib); + $connSQL->bind('f_id_config_role',$f_id_config_role); + $connSQL->bind('f_id_config_server',$f_id_config_server); + + $cur_role_server=$connSQL->row($lib); } ?> diff --git a/html/config/role_server/w_role_server.php b/html/config/role_server/w_role_server.php index 50a71760..458a24bb 100644 --- a/html/config/role_server/w_role_server.php +++ b/html/config/role_server/w_role_server.php @@ -1,22 +1,22 @@ bind('f_id_config_role',$f_id_config_role); - $connSQL->bind('id_config_server',$id_config_server); - $connSQL->query($lib); - } + foreach ($f_id_config_server as $id_config_server) { + + $lib='INSERT INTO config_role_server + (id_config_role,id_config_server) + VALUES + (:f_id_config_role, :id_config_server)'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_role',$f_id_config_role); + $connSQL->bind('id_config_server',$id_config_server); + $connSQL->query($lib); + } } else { - $f_filter_server_in_role='true'; + $f_filter_server_in_role='true'; } ?> diff --git a/html/config/server/d_server.php b/html/config/server/d_server.php index acb49221..4958734d 100644 --- a/html/config/server/d_server.php +++ b/html/config/server/d_server.php @@ -1,21 +1,21 @@
'.$all_role_server[$i]->server_name.''.$all_role_server[$i]->server_description.'
'.$all_role_server[$i]->server_name.''.$all_role_server[$i]->server_description.'
- - - + + + - - - - - '; + echo ' + + + + + '; } ?> diff --git a/html/config/server/e_server.php b/html/config/server/e_server.php index 8cc250c7..d1e62505 100644 --- a/html/config/server/e_server.php +++ b/html/config/server/e_server.php @@ -1,12 +1,12 @@ bind('f_id_config_server',$f_id_config_server); - $connSQL->query($lib); + $lib='DELETE FROM config_server WHERE id_config_server=:f_id_config_server'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_server',$f_id_config_server); + $connSQL->query($lib); } ?> diff --git a/html/config/server/r_server.php b/html/config/server/r_server.php index 10860953..316a0b9c 100644 --- a/html/config/server/r_server.php +++ b/html/config/server/r_server.php @@ -7,38 +7,38 @@ $allDatadir=getAllDatadir(); $filelist=array(); foreach($allDatadir as $datadir){ - $filelist=array_merge(array_values(array_diff(scandir($datadir), array('..', '.', 'lost+found'))), $filelist); + $filelist=array_merge(array_values(array_diff(scandir($datadir), array('..', '.', 'lost+found'))), $filelist); } $lib=' CREATE TEMPORARY TABLE server_list ( - `server_name` varchar(45) NOT NULL default \'\' + `server_name` varchar(45) NOT NULL default \'\' )'; $connSQL->query($lib); $find='0'; -$lib= 'INSERT INTO server_list (server_name) VALUES ('; +$lib= 'INSERT INTO server_list (server_name) VALUES ('; $cpt_filelist=count($filelist); for($i=0; $i<$cpt_filelist; $i++) { - if (strpos($filelist[$i],':')==false) { - if($find=='1') { - $lib.=" ), ("; - } - $lib.= '\''.$filelist[$i].'\''; - $find='1'; - } -} + if (strpos($filelist[$i],':')==false) { + if($find=='1') { + $lib.=" ), ("; + } + $lib.= '\''.$filelist[$i].'\''; + $find='1'; + } +} $lib.=' )'; if ($find=='1') $connSQL->query($lib); $lib=' - SELECT * - FROM server_list - WHERE server_name NOT IN ( - SELECT server_name FROM config_server - ) ORDER BY server_name'; + SELECT * + FROM server_list + WHERE server_name NOT IN ( + SELECT server_name FROM config_server + ) ORDER BY server_name'; $all_rrdserver=$connSQL->query($lib); $cpt_rrdserver=count($all_rrdserver); diff --git a/html/config/server/r_server_wh_id.php b/html/config/server/r_server_wh_id.php index 29314267..1ee6c38f 100644 --- a/html/config/server/r_server_wh_id.php +++ b/html/config/server/r_server_wh_id.php @@ -1,13 +1,13 @@ bind('f_id_config_server',$f_id_config_server); - $cur_server=$connSQL->row($lib); + $f_id_config_server=filter_input(INPUT_GET,'f_id_config_server',FILTER_SANITIZE_NUMBER_INT); + $connSQL=new DB(); + if ($module=='dashboard') { + $lib='SELECT *, COALESCE(collectd_version,"'.COLLECTD_DEFAULT_VERSION.'") as collectd_version FROM config_server WHERE id_config_server=:f_id_config_server'; + } else { + $lib='SELECT * FROM config_server WHERE id_config_server=:f_id_config_server'; +} + $connSQL->bind('f_id_config_server',$f_id_config_server); + $cur_server=$connSQL->row($lib); } ?> diff --git a/html/config/server/w_server.php b/html/config/server/w_server.php index a468bac2..ef210e33 100644 --- a/html/config/server/w_server.php +++ b/html/config/server/w_server.php @@ -1,49 +1,49 @@ bind('f_server_description',$f_server_description); - $connSQL->bind('f_id_config_server',$f_id_config_server); - - if (!empty($f_collectd_version)) { - $connSQL->bind('f_collectd_version',$f_collectd_version); - $lib=' - UPDATE config_server SET - server_description=:f_server_description, - collectd_version=:f_collectd_version - WHERE - id_config_server=:f_id_config_server'; - } else { - $lib=' - UPDATE config_server SET - server_description=:f_server_description, - collectd_version=NULL - WHERE - id_config_server=:f_id_config_server'; - } - $connSQL->query($lib); + if ($_POST['f_id_config_server']) { // UPDATE + $connSQL=new DB(); + $connSQL->bind('f_server_description',$f_server_description); + $connSQL->bind('f_id_config_server',$f_id_config_server); - } else { // INSERT - $connSQL=new DB(); - $f_server_name=filter_input(INPUT_POST,'f_server_name',FILTER_SANITIZE_SPECIAL_CHARS, FILTER_REQUIRE_ARRAY); - foreach ($f_server_name as $server_name) { - $connSQL->bind('server_name',$server_name); - $connSQL->bind('f_server_description',$f_server_description); + if (!empty($f_collectd_version)) { + $connSQL->bind('f_collectd_version',$f_collectd_version); + $lib=' + UPDATE config_server SET + server_description=:f_server_description, + collectd_version=:f_collectd_version + WHERE + id_config_server=:f_id_config_server'; + } else { + $lib=' + UPDATE config_server SET + server_description=:f_server_description, + collectd_version=NULL + WHERE + id_config_server=:f_id_config_server'; + } + $connSQL->query($lib); - if (!empty($f_collectd_version)) { - $connSQL->bind('f_collectd_version',$f_collectd_version); - $lib='INSERT INTO config_server (server_name, server_description, collectd_version) - VALUES (:server_name, :f_server_description, :f_collectd_version)'; - } else { - $lib='INSERT INTO config_server (server_name, server_description) - VALUES (:server_name, :f_server_description)'; - } - $connSQL->query($lib); - } - } + } else { // INSERT + $connSQL=new DB(); + $f_server_name=filter_input(INPUT_POST,'f_server_name',FILTER_SANITIZE_SPECIAL_CHARS, FILTER_REQUIRE_ARRAY); + foreach ($f_server_name as $server_name) { + $connSQL->bind('server_name',$server_name); + $connSQL->bind('f_server_description',$f_server_description); + + if (!empty($f_collectd_version)) { + $connSQL->bind('f_collectd_version',$f_collectd_version); + $lib='INSERT INTO config_server (server_name, server_description, collectd_version) + VALUES (:server_name, :f_server_description, :f_collectd_version)'; + } else { + $lib='INSERT INTO config_server (server_name, server_description) + VALUES (:server_name, :f_server_description)'; + } + $connSQL->query($lib); + } + } } ?> diff --git a/html/config/server_check/e_server_check.php b/html/config/server_check/e_server_check.php index da73f4b9..15af37ea 100644 --- a/html/config/server_check/e_server_check.php +++ b/html/config/server_check/e_server_check.php @@ -3,24 +3,24 @@ $f_server_name_to_del=filter_input(INPUT_POST,'f_server_name_to_del',FILTER_SANITIZE_SPECIAL_CHARS, FILTER_REQUIRE_ARRAY); if (count($f_server_name_to_del)>0) { foreach ($f_server_name_to_del as $server_name) { - + $connSQL=new DB(); $connSQL->bind('server_name',$server_name); $lib='SELECT id_config_server FROM config_server WHERE server_name=:server_name'; $cur_todelete_server=$connSQL->row($lib); - + $connSQL->bind('id_config_server',$cur_todelete_server->id_config_server); $lib='DELETE FROM config_role_server WHERE id_config_server=:id_config_server'; $connSQL->query($lib); - + $connSQL->bind('id_config_server',$cur_todelete_server->id_config_server); $lib='DELETE FROM config_environment_server WHERE id_config_server=:id_config_server'; $connSQL->query($lib); - + $connSQL->bind('id_config_server',$cur_todelete_server->id_config_server); $lib='DELETE FROM config_server_project WHERE id_config_server=:id_config_server'; $connSQL->query($lib); - + $connSQL->bind('id_config_server',$cur_todelete_server->id_config_server); $lib='DELETE FROM config_server WHERE id_config_server=:id_config_server'; $connSQL->query($lib); diff --git a/html/config/server_check/r_server_check.php b/html/config/server_check/r_server_check.php index 56737cb7..aceb112a 100644 --- a/html/config/server_check/r_server_check.php +++ b/html/config/server_check/r_server_check.php @@ -3,11 +3,11 @@ $cpt_server=count($all_server); $lib=' - SELECT * - FROM config_server - WHERE server_name NOT IN ( - SELECT server_name FROM server_list - ) ORDER BY server_name'; + SELECT * + FROM config_server + WHERE server_name NOT IN ( + SELECT server_name FROM server_list + ) ORDER BY server_name'; $all_deleted_server=$connSQL->query($lib); $cpt_deleted_server=count($all_deleted_server); diff --git a/html/config/server_environment/d_server_environment.php b/html/config/server_environment/d_server_environment.php index bdc8b98e..727d10d5 100644 --- a/html/config/server_environment/d_server_environment.php +++ b/html/config/server_environment/d_server_environment.php @@ -1,19 +1,19 @@
'.$all_server[$i]->server_name.''.$all_server[$i]->server_description.''.$all_server[$i]->collectd_version.'
'.$all_server[$i]->server_name.''.$all_server[$i]->server_description.''.$all_server[$i]->collectd_version.'
- - + + - - - - '; + echo ' + + + + '; } ?> diff --git a/html/config/server_environment/e_server_environment.php b/html/config/server_environment/e_server_environment.php index ad7f937b..ad6d0b52 100644 --- a/html/config/server_environment/e_server_environment.php +++ b/html/config/server_environment/e_server_environment.php @@ -1,14 +1,14 @@ bind('f_id_config_environment',$f_id_config_environment); - $connSQL->bind('f_id_config_server',$f_id_config_server); - $connSQL->query($lib); + $f_id_config_environment=filter_input(INPUT_POST,'f_id_config_environment',FILTER_SANITIZE_NUMBER_INT); + $f_id_config_server=filter_input(INPUT_POST,'f_id_config_server',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_environment_server WHERE id_config_environment=:f_id_config_environment AND id_config_server=:f_id_config_server'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_environment',$f_id_config_environment); + $connSQL->bind('f_id_config_server',$f_id_config_server); + $connSQL->query($lib); } ?> diff --git a/html/config/server_environment/e_server_environment_wh_id.php b/html/config/server_environment/e_server_environment_wh_id.php index b9b78551..1b4befe7 100644 --- a/html/config/server_environment/e_server_environment_wh_id.php +++ b/html/config/server_environment/e_server_environment_wh_id.php @@ -1,12 +1,12 @@ bind('f_id_config_server',$f_id_config_server); - $connSQL->query($lib); + $f_id_config_server=filter_input(INPUT_POST,'f_id_config_server',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_environment_server WHERE id_config_server=:f_id_config_server'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_server',$f_id_config_server); + $connSQL->query($lib); } ?> diff --git a/html/config/server_environment/r_server_environment.php b/html/config/server_environment/r_server_environment.php index 51ca31e0..9db50a94 100644 --- a/html/config/server_environment/r_server_environment.php +++ b/html/config/server_environment/r_server_environment.php @@ -1,44 +1,44 @@ bind('f_id_config_server',$f_id_config_server); - $all_server_environment=$connSQL->query($lib); - $cpt_server_environment=count($all_server_environment); - - - $connSQL=new DB(); - $lib='SELECT - * - FROM - config_environment - WHERE - id_config_environment NOT IN ( - SELECT id_config_environment - FROM config_environment_server - WHERE id_config_server=:f_id_config_server - ) - ORDER BY - environment_description'; - - $connSQL->bind('f_id_config_server',$f_id_config_server); - $all_environment=$connSQL->query($lib); - $cpt_environment=count($all_environment); + $connSQL=new DB(); + $lib='SELECT + ces.id_config_environment, + ces.id_config_server, + ce.environment, + ce.environment_description, + cs.server_name, + cs.server_description + FROM + config_environment_server ces + LEFT JOIN config_environment ce + ON ces.id_config_environment=ce.id_config_environment + LEFT JOIN config_server cs + ON ces.id_config_server=cs.id_config_server + WHERE ces.id_config_server=:f_id_config_server'; + + $connSQL->bind('f_id_config_server',$f_id_config_server); + $all_server_environment=$connSQL->query($lib); + $cpt_server_environment=count($all_server_environment); + + + $connSQL=new DB(); + $lib='SELECT + * + FROM + config_environment + WHERE + id_config_environment NOT IN ( + SELECT id_config_environment + FROM config_environment_server + WHERE id_config_server=:f_id_config_server + ) + ORDER BY + environment_description'; + + $connSQL->bind('f_id_config_server',$f_id_config_server); + $all_environment=$connSQL->query($lib); + $cpt_environment=count($all_environment); } ?> diff --git a/html/config/server_environment/r_server_environment_wh_id.php b/html/config/server_environment/r_server_environment_wh_id.php index c522767e..51558572 100644 --- a/html/config/server_environment/r_server_environment_wh_id.php +++ b/html/config/server_environment/r_server_environment_wh_id.php @@ -1,25 +1,25 @@ bind('f_id_config_environment',$f_id_config_environment); - $connSQL->bind('f_id_config_server',$f_id_config_server); - $cur_server_environment=$connSQL->row($lib); + $connSQL=new DB(); + $lib='SELECT + ces.id_config_environment, + ces.id_config_server, + ce.environment, + ce.environment_description + FROM + config_environment_server ces + LEFT JOIN config_environment ce + ON ces.id_config_environment=ce.id_config_environment + LEFT JOIN config_server cs + ON ces.id_config_server=cs.id_config_server + WHERE ces.id_config_environment=:f_id_config_environment + AND ces.id_config_server=:f_id_config_server'; + + $connSQL->bind('f_id_config_environment',$f_id_config_environment); + $connSQL->bind('f_id_config_server',$f_id_config_server); + $cur_server_environment=$connSQL->row($lib); } ?> diff --git a/html/config/server_environment/w_server_environment.php b/html/config/server_environment/w_server_environment.php index c4c90ee3..bb0fda6c 100644 --- a/html/config/server_environment/w_server_environment.php +++ b/html/config/server_environment/w_server_environment.php @@ -1,17 +1,17 @@ bind('f_id_config_environment',$f_id_config_environment); - $connSQL->bind('f_id_config_server',$f_id_config_server); - $connSQL->query($lib); + $f_id_config_environment=filter_input(INPUT_POST,'f_id_config_environment',FILTER_SANITIZE_NUMBER_INT); + $f_id_config_server=filter_input(INPUT_POST,'f_id_config_server',FILTER_SANITIZE_NUMBER_INT); + + $lib='INSERT INTO config_environment_server + (id_config_environment, id_config_server) + VALUES + (:f_id_config_environment, :f_id_config_server)'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_environment',$f_id_config_environment); + $connSQL->bind('f_id_config_server',$f_id_config_server); + $connSQL->query($lib); } ?> diff --git a/html/config/server_project/d_server_project.php b/html/config/server_project/d_server_project.php index c1205361..69bc6d53 100644 --- a/html/config/server_project/d_server_project.php +++ b/html/config/server_project/d_server_project.php @@ -1,19 +1,19 @@
'.$all_server_environment[$i]->environment.''.$all_server_environment[$i]->environment_description.'
'.$all_server_environment[$i]->environment.''.$all_server_environment[$i]->environment_description.'
- - + + - - - - '; + echo ' + + + + '; } ?> diff --git a/html/config/server_project/e_server_project.php b/html/config/server_project/e_server_project.php index 65db513d..8d59568a 100644 --- a/html/config/server_project/e_server_project.php +++ b/html/config/server_project/e_server_project.php @@ -1,14 +1,14 @@ bind('f_id_config_project',$f_id_config_project); - $connSQL->bind('f_id_config_server',$f_id_config_server); - $connSQL->query($lib); + $f_id_config_project=filter_input(INPUT_POST,'f_id_config_project',FILTER_SANITIZE_NUMBER_INT); + $f_id_config_server=filter_input(INPUT_POST,'f_id_config_server',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_server_project WHERE id_config_project=:f_id_config_project AND id_config_server=:f_id_config_server'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->bind('f_id_config_server',$f_id_config_server); + $connSQL->query($lib); } ?> diff --git a/html/config/server_project/e_server_project_wh_id.php b/html/config/server_project/e_server_project_wh_id.php index cde92163..826769b2 100644 --- a/html/config/server_project/e_server_project_wh_id.php +++ b/html/config/server_project/e_server_project_wh_id.php @@ -1,12 +1,12 @@ bind('f_id_config_server',$f_id_config_server); - $connSQL->query($lib); + $f_id_config_server=filter_input(INPUT_POST,'f_id_config_server',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_server_project WHERE id_config_server=:f_id_config_server'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_server',$f_id_config_server); + $connSQL->query($lib); } ?> diff --git a/html/config/server_project/r_server_project.php b/html/config/server_project/r_server_project.php index 5e19cace..06995e1b 100644 --- a/html/config/server_project/r_server_project.php +++ b/html/config/server_project/r_server_project.php @@ -1,44 +1,44 @@ bind('f_id_config_server',$f_id_config_server); - $all_server_project=$connSQL->query($lib); - $cpt_server_project=count($all_server_project); - - - $connSQL=new DB(); - $lib='SELECT - * - FROM - config_project - WHERE - id_config_project NOT IN ( - SELECT id_config_project - FROM config_server_project - WHERE id_config_server=:f_id_config_server - ) - ORDER BY - project_description'; - - $connSQL->bind('f_id_config_server',$f_id_config_server); - $all_project=$connSQL->query($lib); - $cpt_project=count($all_project); + $connSQL=new DB(); + $lib='SELECT + csp.id_config_project, + csp.id_config_server, + cp.project, + cp.project_description, + cs.server_name, + cs.server_description + FROM + config_server_project csp + LEFT JOIN config_project cp + ON csp.id_config_project=cp.id_config_project + LEFT JOIN config_server cs + ON csp.id_config_server=cs.id_config_server + WHERE csp.id_config_server=:f_id_config_server'; + + $connSQL->bind('f_id_config_server',$f_id_config_server); + $all_server_project=$connSQL->query($lib); + $cpt_server_project=count($all_server_project); + + + $connSQL=new DB(); + $lib='SELECT + * + FROM + config_project + WHERE + id_config_project NOT IN ( + SELECT id_config_project + FROM config_server_project + WHERE id_config_server=:f_id_config_server + ) + ORDER BY + project_description'; + + $connSQL->bind('f_id_config_server',$f_id_config_server); + $all_project=$connSQL->query($lib); + $cpt_project=count($all_project); } ?> diff --git a/html/config/server_project/r_server_project_wh_id.php b/html/config/server_project/r_server_project_wh_id.php index a70ec0ef..5ae2b49c 100644 --- a/html/config/server_project/r_server_project_wh_id.php +++ b/html/config/server_project/r_server_project_wh_id.php @@ -1,25 +1,25 @@ bind('f_id_config_project',$f_id_config_project); - $connSQL->bind('f_id_config_server',$f_id_config_server); - $cur_server_project=$connSQL->row($lib); + $connSQL=new DB(); + $lib='SELECT + csp.id_config_project, + csp.id_config_server, + cp.project, + cp.project_description + FROM + config_server_project csp + LEFT JOIN config_project cp + ON csp.id_config_project=cp.id_config_project + LEFT JOIN config_server cs + ON csp.id_config_server=cs.id_config_server + WHERE csp.id_config_project=:f_id_config_project + AND csp.id_config_server=:f_id_config_server'; + + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->bind('f_id_config_server',$f_id_config_server); + $cur_server_project=$connSQL->row($lib); } ?> diff --git a/html/config/server_project/w_server_project.php b/html/config/server_project/w_server_project.php index 48772393..aa7110d0 100644 --- a/html/config/server_project/w_server_project.php +++ b/html/config/server_project/w_server_project.php @@ -1,17 +1,17 @@ bind('f_id_config_project',$f_id_config_project); - $connSQL->bind('f_id_config_server',$f_id_config_server); - $connSQL->query($lib); + $lib='INSERT INTO config_server_project + (id_config_project, id_config_server) + VALUES + (:f_id_config_project, :f_id_config_server)'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->bind('f_id_config_server',$f_id_config_server); + $connSQL->query($lib); } ?> diff --git a/html/config/server_role/d_server_role.php b/html/config/server_role/d_server_role.php index 94ed3af0..4e286ec5 100644 --- a/html/config/server_role/d_server_role.php +++ b/html/config/server_role/d_server_role.php @@ -1,19 +1,19 @@
'.$all_server_project[$i]->project.''.$all_server_project[$i]->project_description.'
'.$all_server_project[$i]->project.''.$all_server_project[$i]->project_description.'
- - + + - - - - '; + echo ' + + + + '; } ?> diff --git a/html/config/server_role/e_server_role.php b/html/config/server_role/e_server_role.php index 3be1169e..3f1867a2 100644 --- a/html/config/server_role/e_server_role.php +++ b/html/config/server_role/e_server_role.php @@ -1,14 +1,14 @@ bind('f_id_config_role',$f_id_config_role); - $connSQL->bind('f_id_config_server',$f_id_config_server); - $connSQL->query($lib); + $f_id_config_role=filter_input(INPUT_POST,'f_id_config_role',FILTER_SANITIZE_NUMBER_INT); + $f_id_config_server=filter_input(INPUT_POST,'f_id_config_server',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_role_server WHERE id_config_role=:f_id_config_role AND id_config_server=:f_id_config_server'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_role',$f_id_config_role); + $connSQL->bind('f_id_config_server',$f_id_config_server); + $connSQL->query($lib); } ?> diff --git a/html/config/server_role/e_server_role_wh_id.php b/html/config/server_role/e_server_role_wh_id.php index 7dd8be26..fde36928 100644 --- a/html/config/server_role/e_server_role_wh_id.php +++ b/html/config/server_role/e_server_role_wh_id.php @@ -1,12 +1,12 @@ bind('f_id_config_server',$f_id_config_server); - $connSQL->query($lib); + $f_id_config_server=filter_input(INPUT_POST,'f_id_config_server',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM config_role_server WHERE id_config_server=:f_id_config_server'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_server',$f_id_config_server); + $connSQL->query($lib); } ?> diff --git a/html/config/server_role/r_server_role.php b/html/config/server_role/r_server_role.php index 322d06d8..29fd769c 100644 --- a/html/config/server_role/r_server_role.php +++ b/html/config/server_role/r_server_role.php @@ -1,13 +1,13 @@ bind('f_id_config_server',$f_id_config_server); + $connSQL->bind('f_id_config_server',$f_id_config_server); $all_server_role=$connSQL->query($lib); $cpt_server_role=count($all_server_role); - + $lib='SELECT * FROM @@ -34,9 +34,9 @@ ) ORDER BY role_description'; - + $connSQL=new DB(); - $connSQL->bind('f_id_config_server',$f_id_config_server); + $connSQL->bind('f_id_config_server',$f_id_config_server); $all_role=$connSQL->query($lib); $cpt_role=count($all_role); } diff --git a/html/config/server_role/r_server_role_wh_id.php b/html/config/server_role/r_server_role_wh_id.php index 081b6608..627bb039 100644 --- a/html/config/server_role/r_server_role_wh_id.php +++ b/html/config/server_role/r_server_role_wh_id.php @@ -1,26 +1,26 @@ bind('f_id_config_role',$f_id_config_role); - $connSQL->bind('f_id_config_server',$f_id_config_server); + $f_id_config_role=filter_input(INPUT_GET,'f_id_config_role',FILTER_SANITIZE_NUMBER_INT); + $f_id_config_server=filter_input(INPUT_GET,'f_id_config_server',FILTER_SANITIZE_NUMBER_INT); - $cur_server_role=$connSQL->row($lib); + $connSQL=new DB(); + $lib='SELECT + crs.id_config_role, + crs.id_config_server, + cr.role, + cr.role_description + FROM + config_role_server crs + LEFT JOIN config_role cr + ON crs.id_config_role=cr.id_config_role + LEFT JOIN config_server cs + ON crs.id_config_server=cs.id_config_server + WHERE crs.id_config_role=:f_id_config_role + AND crs.id_config_server=:f_id_config_server'; + + $connSQL->bind('f_id_config_role',$f_id_config_role); + $connSQL->bind('f_id_config_server',$f_id_config_server); + + $cur_server_role=$connSQL->row($lib); } ?> diff --git a/html/config/server_role/w_server_role.php b/html/config/server_role/w_server_role.php index 1dc7d619..6926a519 100644 --- a/html/config/server_role/w_server_role.php +++ b/html/config/server_role/w_server_role.php @@ -1,16 +1,16 @@ bind('f_id_config_role',$f_id_config_role); - $connSQL->bind('f_id_config_server',$f_id_config_server); - $connSQL->query($lib); + $lib='INSERT INTO config_role_server + (id_config_role, id_config_server) + VALUES + (:f_id_config_role, :f_id_config_server)'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_role',$f_id_config_role); + $connSQL->bind('f_id_config_server',$f_id_config_server); + $connSQL->query($lib); } ?> diff --git a/html/dashboard/dashboard_light/d_dashboard_light.php b/html/dashboard/dashboard_light/d_dashboard_light.php index 3adb53f7..2c9a8724 100644 --- a/html/dashboard/dashboard_light/d_dashboard_light.php +++ b/html/dashboard/dashboard_light/d_dashboard_light.php @@ -12,59 +12,59 @@ $connSQL=new DB(); $lib=' - SELECT - cs.id_config_server, - cs.server_name, - COALESCE(cs.collectd_version,"'.COLLECTD_DEFAULT_VERSION.'") as collectd_version, - MAX(csp.id_config_project) as id_config_project - FROM config_server cs - LEFT JOIN config_server_project csp - ON cs.id_config_server=csp.id_config_server - LEFT JOIN perm_project_group ppg - ON ppg.id_config_project=csp.id_config_project - LEFT JOIN auth_group ag - ON ag.id_auth_group=ppg.id_auth_group - LEFT JOIN auth_user_group aug - ON aug.id_auth_group=ag.id_auth_group - WHERE aug.id_auth_user=:s_id_user - AND cs.server_name=:f_host - GROUP BY id_config_server, server_name - ORDER BY server_name'; - - $connSQL->bind('s_id_user',$s_id_user); - $connSQL->bind('f_host',$f_host); - - $cur_server=$connSQL->row($lib); + SELECT + cs.id_config_server, + cs.server_name, + COALESCE(cs.collectd_version,"'.COLLECTD_DEFAULT_VERSION.'") as collectd_version, + MAX(csp.id_config_project) as id_config_project + FROM config_server cs + LEFT JOIN config_server_project csp + ON cs.id_config_server=csp.id_config_server + LEFT JOIN perm_project_group ppg + ON ppg.id_config_project=csp.id_config_project + LEFT JOIN auth_group ag + ON ag.id_auth_group=ppg.id_auth_group + LEFT JOIN auth_user_group aug + ON aug.id_auth_group=ag.id_auth_group + WHERE aug.id_auth_user=:s_id_user + AND cs.server_name=:f_host + GROUP BY id_config_server, server_name + ORDER BY server_name'; + + $connSQL->bind('s_id_user',$s_id_user); + $connSQL->bind('f_host',$f_host); + + $cur_server=$connSQL->row($lib); if (isset($cur_server->id_config_server)) { - include(DIR_FSROOT.'/html/menu/time_selector.php'); + include(DIR_FSROOT.'/html/menu/time_selector.php'); } echo '
'; if ($cur_server->server_name=='') { - echo '

'.UNKNOWN_SERVER.'

'; - echo '
'; - exit; + echo '

'.UNKNOWN_SERVER.'

'; + echo ''; + exit; } echo '

'.$cur_server->server_name.'

'; -$lib = 'SELECT - cpf.* - FROM - config_plugin_filter cpf - LEFT JOIN config_plugin_filter_group cpfg - ON cpf.id_config_plugin_filter=cpfg.id_config_plugin_filter - LEFT JOIN auth_group ag - ON cpfg.id_auth_group=ag.id_auth_group - LEFT JOIN auth_user_group aug - ON aug.id_auth_group=ag.id_auth_group - LEFT JOIN perm_project_group ppg - ON ppg.id_auth_group=ag.id_auth_group - WHERE - aug.id_auth_user=:s_id_user - AND ppg.id_config_project=:r_id_config_project - ORDER BY plugin_order, plugin, plugin_instance, type, type_instance'; +$lib = 'SELECT + cpf.* + FROM + config_plugin_filter cpf + LEFT JOIN config_plugin_filter_group cpfg + ON cpf.id_config_plugin_filter=cpfg.id_config_plugin_filter + LEFT JOIN auth_group ag + ON cpfg.id_auth_group=ag.id_auth_group + LEFT JOIN auth_user_group aug + ON aug.id_auth_group=ag.id_auth_group + LEFT JOIN perm_project_group ppg + ON ppg.id_auth_group=ag.id_auth_group + WHERE + aug.id_auth_user=:s_id_user + AND ppg.id_config_project=:r_id_config_project + ORDER BY plugin_order, plugin, plugin_instance, type, type_instance'; $connSQL=new DB(); $connSQL->bind('s_id_user',$s_id_user); @@ -72,258 +72,258 @@ $pg_filters=$connSQL->query($lib); if (isset($time_start) && isset($time_end)) { - $zoom='onclick="Show_Popup($(this).attr(\'src\').split(\'?\')[1],\'\',\''.$time_start.'\',\''.$time_end.'\')"'; + $zoom='onclick="Show_Popup($(this).attr(\'src\').split(\'?\')[1],\'\',\''.$time_start.'\',\''.$time_end.'\')"'; } else { - $zoom='onclick="Show_Popup($(this).attr(\'src\').split(\'?\')[1],\''.$time_range.'\',\'\',\'\')"'; + $zoom='onclick="Show_Popup($(this).attr(\'src\').split(\'?\')[1],\''.$time_range.'\',\'\',\'\')"'; } $dgraph=0; $allDatadir=getAllDatadir(); foreach($allDatadir as $key => $datadir){ - if(!is_dir($datadir.'/'.$cur_server->server_name.'/')) unset($allDatadir[$key]); + if(!is_dir($datadir.'/'.$cur_server->server_name.'/')) unset($allDatadir[$key]); } if (!empty($allDatadir)) { - $myregex=''; - foreach ($pg_filters as $filter) { - if (empty($myregex)) { - $myregex='#^(((('.implode('|',$allDatadir).')/'.$cur_server->server_name.'/)('.$filter->plugin.')(?:\-('.$filter->plugin_instance.'))?/('.$filter->type.')(?:\-('.$filter->type_instance.'))?\.rrd)'; - } else { - $myregex=$myregex.'|((('.implode("|",$allDatadir).')/'.$cur_server->server_name.'/)('.$filter->plugin.')(?:\-('.$filter->plugin_instance.'))?/('.$filter->type.')(?:\-('.$filter->type_instance.'))?\.rrd)'; - } - } - $myregex=$myregex.')#'; - - $tplugins=array(); - foreach($allDatadir as $datadir) { - $tpluginsDatadir=preg_find($myregex, $datadir.'/'.$cur_server->server_name, PREG_FIND_RECURSIVE|PREG_FIND_FULLPATH|PREG_FIND_SORTBASENAME); - if ($tpluginsDatadir) $dgraph=1; - $tplugins=array_merge($tplugins,$tpluginsDatadir); - } - $plugins = (sort_plugins('('.implode('|',$allDatadir).')/'.$cur_server->server_name,$tplugins, $pg_filters)); - - if ($plugins) $dgraph=1; - - $old_t=''; - $old_pi=''; - $old_subpg=''; - $myregex='#^(('.implode('|',$allDatadir).')/'.$cur_server->server_name.'/)(\w+)(?:\-(.*))?/(\w+)(?:\-(.*))?\.rrd#'; - foreach ($plugins as $plugin) { - preg_match($myregex, $plugin['content'], $matches); - $plugin_datadir = getDatadirEntry($matches[1]); - - if (isset($matches[3])) { - $p=$matches[3]; - if (!isset($$p)) $$p=false; - } else { - continue; - $p=null; - } - if (isset($matches[4])) { - $pi=$matches[4]; - $pc=null; - if (substr_count($pi, '-') >= 1 && preg_match($CONFIG['plugin_pcategory'], $p)) { - $tmp=explode('-',$pi); - // Fix when PI is null after separating PC/PI for example a directory named "MyHost/GenericJMX-cassandra_activity_request-/" - if (strlen($tmp[1])) { - $pc=$tmp[0]; - $pi=implode('-', array_slice($tmp,1)); - } - // Copy PI to PC if no PC but Plugin can have a PC - } else if (preg_match($CONFIG['plugin_pcategory'], $p)) { - $pc=$pi; - $pi=null; - } - } else { - $pc=null; - $pi=null; - } - if (isset($matches[5])) { - $t=$matches[5]; - } else { - $t=null; - } - if (isset($matches[6])) { - $ti=$matches[6]; - $tc=null; - if (substr_count($ti, '-') >= 1 && preg_match($CONFIG['plugin_tcategory'], $p)) { - $tmp=explode('-',$ti); - $tc=$tmp[0]; - //$ti=implode('-', array_slice($tmp,1)); - $ti=null; - } - } else { - $tc=null; - $ti=null; - } - - - if (!isset(${$p.$pc.$pi.$t.$tc.$ti}) ) { - if ($$p!=true && $p!='aggregation') { - $lvl_p=2; - $lvl_pc=$lvl_p+1; - $lvl_pi=$lvl_pc; - $lvl_tc=null; - echo "".ucfirst($p).""; - $$p=true; - $others=false; - } else if ($p == 'aggregation') { - $lvl_p=2; - $lvl_pc=$lvl_p; - $lvl_pi=$lvl_pc; - $lvl_tc=null; - $others=false; - } - // Displaying Plugin Category if there is a Plugin Category - if (isset($pc) && empty($$pc)) { - echo "".ucfirst(str_replace('_', ' ', $pc)).""; - $lvl_pi=$lvl_pc+1; - $$pc=true; - $others=false; - $$pi=false; - } - // Displaying Plugin Instance for some plugins - if (preg_match($CONFIG['title_pinstance'],$p) && strlen($pi) && ${$pc.$pi}!=true) { - ${$pc.$pi}=true; - echo "".ucfirst(str_replace('_', ' ',$pi)).""; - // Displaying Type for SNMP - } else if ($p=='snmp' && ${$p.$t}!=true) { - ${$p.$t}=true; - echo "".ucfirst(str_replace('_', ' ',$t)).""; + $myregex=''; + foreach ($pg_filters as $filter) { + if (empty($myregex)) { + $myregex='#^(((('.implode('|',$allDatadir).')/'.$cur_server->server_name.'/)('.$filter->plugin.')(?:\-('.$filter->plugin_instance.'))?/('.$filter->type.')(?:\-('.$filter->type_instance.'))?\.rrd)'; + } else { + $myregex=$myregex.'|((('.implode("|",$allDatadir).')/'.$cur_server->server_name.'/)('.$filter->plugin.')(?:\-('.$filter->plugin_instance.'))?/('.$filter->type.')(?:\-('.$filter->type_instance.'))?\.rrd)'; + } + } + $myregex=$myregex.')#'; + + $tplugins=array(); + foreach($allDatadir as $datadir) { + $tpluginsDatadir=preg_find($myregex, $datadir.'/'.$cur_server->server_name, PREG_FIND_RECURSIVE|PREG_FIND_FULLPATH|PREG_FIND_SORTBASENAME); + if ($tpluginsDatadir) $dgraph=1; + $tplugins=array_merge($tplugins,$tpluginsDatadir); + } + $plugins = (sort_plugins('('.implode('|',$allDatadir).')/'.$cur_server->server_name,$tplugins, $pg_filters)); + + if ($plugins) $dgraph=1; + + $old_t=''; + $old_pi=''; + $old_subpg=''; + $myregex='#^(('.implode('|',$allDatadir).')/'.$cur_server->server_name.'/)(\w+)(?:\-(.*))?/(\w+)(?:\-(.*))?\.rrd#'; + foreach ($plugins as $plugin) { + preg_match($myregex, $plugin['content'], $matches); + $plugin_datadir = getDatadirEntry($matches[1]); + + if (isset($matches[3])) { + $p=$matches[3]; + if (!isset($$p)) $$p=false; + } else { + continue; + $p=null; + } + if (isset($matches[4])) { + $pi=$matches[4]; + $pc=null; + if (substr_count($pi, '-') >= 1 && preg_match($CONFIG['plugin_pcategory'], $p)) { + $tmp=explode('-',$pi); + // Fix when PI is null after separating PC/PI for example a directory named "MyHost/GenericJMX-cassandra_activity_request-/" + if (strlen($tmp[1])) { + $pc=$tmp[0]; + $pi=implode('-', array_slice($tmp,1)); + } + // Copy PI to PC if no PC but Plugin can have a PC + } else if (preg_match($CONFIG['plugin_pcategory'], $p)) { + $pc=$pi; + $pi=null; + } + } else { + $pc=null; + $pi=null; + } + if (isset($matches[5])) { + $t=$matches[5]; + } else { + $t=null; + } + if (isset($matches[6])) { + $ti=$matches[6]; + $tc=null; + if (substr_count($ti, '-') >= 1 && preg_match($CONFIG['plugin_tcategory'], $p)) { + $tmp=explode('-',$ti); + $tc=$tmp[0]; + //$ti=implode('-', array_slice($tmp,1)); + $ti=null; + } + } else { + $tc=null; + $ti=null; + } + + + if (!isset(${$p.$pc.$pi.$t.$tc.$ti}) ) { + if ($$p!=true && $p!='aggregation') { + $lvl_p=2; + $lvl_pc=$lvl_p+1; + $lvl_pi=$lvl_pc; + $lvl_tc=null; + echo "".ucfirst($p).""; + $$p=true; + $others=false; + } else if ($p == 'aggregation') { + $lvl_p=2; + $lvl_pc=$lvl_p; + $lvl_pi=$lvl_pc; + $lvl_tc=null; + $others=false; + } + // Displaying Plugin Category if there is a Plugin Category + if (isset($pc) && empty($$pc)) { + echo "".ucfirst(str_replace('_', ' ', $pc)).""; + $lvl_pi=$lvl_pc+1; + $$pc=true; + $others=false; + $$pi=false; + } + // Displaying Plugin Instance for some plugins + if (preg_match($CONFIG['title_pinstance'],$p) && strlen($pi) && ${$pc.$pi}!=true) { + ${$pc.$pi}=true; + echo "".ucfirst(str_replace('_', ' ',$pi)).""; + // Displaying Type for SNMP + } else if ($p=='snmp' && ${$p.$t}!=true) { + ${$p.$t}=true; + echo "".ucfirst(str_replace('_', ' ',$t)).""; } - ${$p.$pc.$pi.$t.$tc.$ti}=true; - - - // Verif regex OK - if (isset($p) && isset($t)) { - if (!preg_match('/^(df|interface|oracle|snmp)$/', $p) || - (((preg_replace('/[^0-9\.]/','',$cur_server->collectd_version) >= 5) - && !preg_match('/^(oracle|snmp)$/', $p) && $t!='df')) - || ($p == 'snmp' && $t == 'memory') - ) { - if ($p == 'varnish3') { $t='all'; } - $ti=''; - if ($old_t!=$t or $old_pi!=$pi or $old_pc!=$pc or $old_tc!=$tc) { - if ($CONFIG['graph_type'] == 'canvas') { - $_GET['h'] = $cur_server->server_name; - $_GET['p'] = $p; - $_GET['pc'] = $pc; - $_GET['pi'] = $pi; - $_GET['t'] = $t; - $_GET['tc'] = $tc; - $_GET['ti'] = $ti; - - chdir(DIR_FSROOT); - include DIR_FSROOT.'/plugin/'.$p.'.php'; - } else { - $graph_title=gen_title($cur_server->server_name,$p,$pc,$pi,$t,$tc,$ti); - if (GRAPH_TITLE=='text') { echo '
'.$graph_title.'
'; } - - if ($time_range!='') { - echo ''.$graph_title.''."\n"; - } else { - echo ''.$graph_title.''."\n"; - } - if(GRAPH_TITLE=='text') { echo '
'; } - } - } - } else { - if ($CONFIG['graph_type'] == 'canvas') { - $_GET['h'] = $cur_server->server_name; - $_GET['p'] = $p; - $_GET['pc'] = $pc; - $_GET['pi'] = $pi; - $_GET['t'] = $t; - $_GET['tc'] = $tc; - $_GET['ti'] = $ti; - - chdir(DIR_FSROOT); - include DIR_FSROOT.'/plugin/'.$p.'.php'; - } else { - $graph_title=gen_title($cur_server->server_name,$p,$pc,$pi,$t,$tc,$ti); - if (GRAPH_TITLE=='text') { echo '
'.$graph_title.'
'; } - if ($time_range!='') { - echo ''.$graph_title.''."\n"; - } else { - echo ''.$graph_title.''."\n"; - } - if(GRAPH_TITLE=='text') { echo '
'; } - } - } - } else if (DEBUG==true){ - echo 'ERREUR - p='.$p.' pc='.$pc.' pi='.$pi.' t='.$t.' tc='.$tc.' ti='.$ti.'
'; - } - } - $old_t=$t; - $old_tc=$tc; - $old_p=$p; - $old_pi=$pi; - $old_pc=$pc; - } + ${$p.$pc.$pi.$t.$tc.$ti}=true; + + + // Verif regex OK + if (isset($p) && isset($t)) { + if (!preg_match('/^(df|interface|oracle|snmp)$/', $p) || + (((preg_replace('/[^0-9\.]/','',$cur_server->collectd_version) >= 5) + && !preg_match('/^(oracle|snmp)$/', $p) && $t!='df')) + || ($p == 'snmp' && $t == 'memory') + ) { + if ($p == 'varnish3') { $t='all'; } + $ti=''; + if ($old_t!=$t or $old_pi!=$pi or $old_pc!=$pc or $old_tc!=$tc) { + if ($CONFIG['graph_type'] == 'canvas') { + $_GET['h'] = $cur_server->server_name; + $_GET['p'] = $p; + $_GET['pc'] = $pc; + $_GET['pi'] = $pi; + $_GET['t'] = $t; + $_GET['tc'] = $tc; + $_GET['ti'] = $ti; + + chdir(DIR_FSROOT); + include DIR_FSROOT.'/plugin/'.$p.'.php'; + } else { + $graph_title=gen_title($cur_server->server_name,$p,$pc,$pi,$t,$tc,$ti); + if (GRAPH_TITLE=='text') { echo '
'.$graph_title.'
'; } + + if ($time_range!='') { + echo ''.$graph_title.''."\n"; + } else { + echo ''.$graph_title.''."\n"; + } + if(GRAPH_TITLE=='text') { echo '
'; } + } + } + } else { + if ($CONFIG['graph_type'] == 'canvas') { + $_GET['h'] = $cur_server->server_name; + $_GET['p'] = $p; + $_GET['pc'] = $pc; + $_GET['pi'] = $pi; + $_GET['t'] = $t; + $_GET['tc'] = $tc; + $_GET['ti'] = $ti; + + chdir(DIR_FSROOT); + include DIR_FSROOT.'/plugin/'.$p.'.php'; + } else { + $graph_title=gen_title($cur_server->server_name,$p,$pc,$pi,$t,$tc,$ti); + if (GRAPH_TITLE=='text') { echo '
'.$graph_title.'
'; } + if ($time_range!='') { + echo ''.$graph_title.''."\n"; + } else { + echo ''.$graph_title.''."\n"; + } + if(GRAPH_TITLE=='text') { echo '
'; } + } + } + } else if (DEBUG==true){ + echo 'ERREUR - p='.$p.' pc='.$pc.' pi='.$pi.' t='.$t.' tc='.$tc.' ti='.$ti.'
'; + } + } + $old_t=$t; + $old_tc=$tc; + $old_p=$p; + $old_pi=$pi; + $old_pc=$pc; + } } /* VMHOST LibVirt */ $vmlist = array(); foreach($allDatadir as $datadir){ - //$vmlist=array_merge($vmlist,preg_find('#^'.$cur_server->server_name.':#', $datadir.'/', PREG_FIND_DIRMATCH|PREG_FIND_SORTBASENAME)); - $vmlist=array_merge($vmlist,glob($datadir.'/'.$cur_server->server_name.':*')); + //$vmlist=array_merge($vmlist,preg_find('#^'.$cur_server->server_name.':#', $datadir.'/', PREG_FIND_DIRMATCH|PREG_FIND_SORTBASENAME)); + $vmlist=array_merge($vmlist,glob($datadir.'/'.$cur_server->server_name.':*')); } if (!empty($vmlist)) { - echo "

Libvirt

"; - foreach ($vmlist as $vmdir) { - - $tmp=explode(':',$vmdir); - $vm=$tmp[1]; - - echo "

$vm

"; - - foreach ($pg_filters as $filter) { - $myregex='#^('.$vmdir.'/)('.$filter->plugin.')(?:\-('.$filter->plugin_instance.'))?/('.$filter->type.')(?:\-('.$filter->type_instance.'))?\.rrd#'; - - $plugins = preg_find($myregex, $vmdir, PREG_FIND_RECURSIVE|PREG_FIND_FULLPATH|PREG_FIND_SORTBASENAME); - - $old_t=''; - $old_pi=''; - foreach ($plugins as $plugin) { - preg_match($myregex, $plugin, $matches); - - if (isset($matches[2])) { - $p=$matches[2]; - if (!isset($$p)) $$p=false; - } else { - $p=null; - } - if (isset($matches[3])) { - $pi=$matches[3]; - } else { - $pi=null; - } - if (isset($matches[4])) { - $t=$matches[4]; - } else { - $t=null; - } - if (isset($matches[5])) { - $ti=$matches[5]; - } else { - $ti=null; - } - - if (! isset(${$vm.$p.$pi.$t.$ti}) ) { - ${$vm.$p.$pi.$t.$ti}=true; - if ($t!=$old_t) echo '

'.ucfirst(str_replace('_', ' ',$t)).'

'; - $old_t=$t; - - $graph_title=gen_title($cur_server->server_name,$p,$pc,$pi,$t,$tc,$ti); - if (GRAPH_TITLE=='text') { echo '
'.$graph_title.'
'; } - echo ''.$graph_title.''; - if (GRAPH_TITLE=='text') { echo '
'; } - } - } - } - } + echo "

Libvirt

"; + foreach ($vmlist as $vmdir) { + + $tmp=explode(':',$vmdir); + $vm=$tmp[1]; + + echo "

$vm

"; + + foreach ($pg_filters as $filter) { + $myregex='#^('.$vmdir.'/)('.$filter->plugin.')(?:\-('.$filter->plugin_instance.'))?/('.$filter->type.')(?:\-('.$filter->type_instance.'))?\.rrd#'; + + $plugins = preg_find($myregex, $vmdir, PREG_FIND_RECURSIVE|PREG_FIND_FULLPATH|PREG_FIND_SORTBASENAME); + + $old_t=''; + $old_pi=''; + foreach ($plugins as $plugin) { + preg_match($myregex, $plugin, $matches); + + if (isset($matches[2])) { + $p=$matches[2]; + if (!isset($$p)) $$p=false; + } else { + $p=null; + } + if (isset($matches[3])) { + $pi=$matches[3]; + } else { + $pi=null; + } + if (isset($matches[4])) { + $t=$matches[4]; + } else { + $t=null; + } + if (isset($matches[5]) && !in_array($t, array('memory', 'virt_vcpu'))) { + $ti=$matches[5]; + } else { + $ti=null; + } + + if (! isset(${$vm.$p.$pi.$t.$ti}) ) { + ${$vm.$p.$pi.$t.$ti}=true; + if ($t!=$old_t) echo '

'.ucfirst(str_replace('_', ' ',$t)).'

'; + $old_t=$t; + + $graph_title=gen_title($cur_server->server_name,$p,$pc,$pi,$t,$tc,$ti); + if (GRAPH_TITLE=='text') { echo '
'.$graph_title.'
'; } + echo ''.$graph_title.''; + if (GRAPH_TITLE=='text') { echo '
'; } + } + } + } + } } if ($dgraph===0) { echo NO_GRAPH; diff --git a/html/dashboard/dynamic/d_dynamic_dashboard.php b/html/dashboard/dynamic/d_dynamic_dashboard.php index e8dcdc9d..53df9346 100644 --- a/html/dashboard/dynamic/d_dynamic_dashboard.php +++ b/html/dashboard/dynamic/d_dynamic_dashboard.php @@ -1,5 +1,5 @@ '.$all_dd[$i]->title.''; + echo '
  • '.$all_dd[$i]->title.'
    • '; } ?> diff --git a/html/dashboard/dynamic/r_dynamic_dashboard.php b/html/dashboard/dynamic/r_dynamic_dashboard.php index a8084de5..cbf0d1d2 100644 --- a/html/dashboard/dynamic/r_dynamic_dashboard.php +++ b/html/dashboard/dynamic/r_dynamic_dashboard.php @@ -3,20 +3,20 @@ $s_id_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); $connSQL=new DB(); - -$lib='SELECT - cdd.* - FROM - config_dynamic_dashboard cdd - LEFT JOIN config_dynamic_dashboard_group cddg - ON cdd.id_config_dynamic_dashboard=cddg.id_config_dynamic_dashboard - LEFT JOIN auth_user_group aug - ON cddg.id_auth_group=aug.id_auth_group - LEFT JOIN auth_user au - ON aug.id_auth_user=au.id_auth_user - WHERE aug.id_auth_user=:s_id_user - GROUP BY cdd.title - ORDER BY title'; + +$lib='SELECT + cdd.* + FROM + config_dynamic_dashboard cdd + LEFT JOIN config_dynamic_dashboard_group cddg + ON cdd.id_config_dynamic_dashboard=cddg.id_config_dynamic_dashboard + LEFT JOIN auth_user_group aug + ON cddg.id_auth_group=aug.id_auth_group + LEFT JOIN auth_user au + ON aug.id_auth_user=au.id_auth_user + WHERE aug.id_auth_user=:s_id_user + GROUP BY cdd.title + ORDER BY title'; $connSQL->bind('s_id_user',$s_id_user); $all_dd=$connSQL->query($lib); diff --git a/html/dashboard/nav_menu/d_nav_menu.php b/html/dashboard/nav_menu/d_nav_menu.php index ff6ce3e9..4b5b35c6 100644 --- a/html/dashboard/nav_menu/d_nav_menu.php +++ b/html/dashboard/nav_menu/d_nav_menu.php @@ -2,23 +2,23 @@ echo ''; diff --git a/html/dashboard/nav_menu/r_nav_menu.php b/html/dashboard/nav_menu/r_nav_menu.php index 7506edd0..ea5c2a83 100644 --- a/html/dashboard/nav_menu/r_nav_menu.php +++ b/html/dashboard/nav_menu/r_nav_menu.php @@ -3,30 +3,30 @@ $s_id_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); $lib='SELECT - cp.id_config_project, - cp.project_description, - cs.id_config_server, - cs.server_name, - cr.id_config_role, - COALESCE(cr.role_description, "'.OTHERS.'") as role_description - FROM config_project cp - LEFT JOIN config_server_project csp - ON cp.id_config_project=csp.id_config_project - LEFT JOIN config_server cs - ON csp.id_config_server=cs.id_config_server - LEFT JOIN config_role_server crs - ON cs.id_config_server=crs.id_config_server - LEFT JOIN config_role cr - ON crs.id_config_role=cr.id_config_role - LEFT JOIN perm_project_group ppg - ON ppg.id_config_project=csp.id_config_project - LEFT JOIN auth_group ag - ON ag.id_auth_group=ppg.id_auth_group - LEFT JOIN auth_user_group aug - ON aug.id_auth_group=ag.id_auth_group - WHERE - aug.id_auth_user=:s_id_user - ORDER BY project_description, role_description, server_name'; + cp.id_config_project, + cp.project_description, + cs.id_config_server, + cs.server_name, + cr.id_config_role, + COALESCE(cr.role_description, "'.OTHERS.'") as role_description + FROM config_project cp + LEFT JOIN config_server_project csp + ON cp.id_config_project=csp.id_config_project + LEFT JOIN config_server cs + ON csp.id_config_server=cs.id_config_server + LEFT JOIN config_role_server crs + ON cs.id_config_server=crs.id_config_server + LEFT JOIN config_role cr + ON crs.id_config_role=cr.id_config_role + LEFT JOIN perm_project_group ppg + ON ppg.id_config_project=csp.id_config_project + LEFT JOIN auth_group ag + ON ag.id_auth_group=ppg.id_auth_group + LEFT JOIN auth_user_group aug + ON aug.id_auth_group=ag.id_auth_group + WHERE + aug.id_auth_user=:s_id_user + ORDER BY project_description, role_description, server_name'; $connSQL->bind('s_id_user',$s_id_user); $all_nav=$connSQL->query($lib); diff --git a/html/dashboard/project_list/d_project_list.php b/html/dashboard/project_list/d_project_list.php index 249e41a3..4b9d1884 100644 --- a/html/dashboard/project_list/d_project_list.php +++ b/html/dashboard/project_list/d_project_list.php @@ -1,27 +1,27 @@ '; $perm_mod = new PERMS(); -if ($perm_mod->perm_module('dashboard','view')) { +if ($perm_mod->perm_module('dashboard','view')) { foreach ($all_project as $project) { if (intval(GET('f_id_config_project'))==$project->id_config_project) { - $style=' style="font-weight: bold;" '; - } else { - $style=''; + $style=' style="font-weight: bold;" '; + } else { + $style=''; } - + echo ''; - } + } } echo ''; -if ($perm_mod->perm_module('dashboard','search')) { +if ($perm_mod->perm_module('dashboard','search')) { ?>
    diff --git a/html/dashboard/project_list/d_project_server_list.php b/html/dashboard/project_list/d_project_server_list.php index f00ae0dc..bf9dfc81 100644 --- a/html/dashboard/project_list/d_project_server_list.php +++ b/html/dashboard/project_list/d_project_server_list.php @@ -1,62 +1,62 @@ perm_module('dashboard','view')) { +if ($perm_mod->perm_module('dashboard','view')) { if (isset($_GET['f_id_config_project'])) { if (isset($all_environment) && $cpt_environment>1) { echo ''; } if ($cpt_environment <= 1 || isset($_GET['f_id_config_environment'])) { if (isset($all_role) && $cpt_role>1) { echo ''; } if (($cpt_server'; foreach ($all_server as $server) { - if (intval(GET('f_id_config_server'))==$server->id_config_server) { - $style=' style="font-weight: bold;" '; - } else { - $style=''; + if (intval(GET('f_id_config_server'))==$server->id_config_server) { + $style=' style="font-weight: bold;" '; + } else { + $style=''; } if (($cpt_server>MAX_SRV && $cpt_role>1) || isset($_GET['f_id_config_role'])) $str_role='&f_id_config_role='.$f_id_config_role; else $str_role=''; if (isset($_GET['f_id_config_environment'])) $str_environment='&f_id_config_environment='.$f_id_config_environment; else $str_environment=''; - + echo ''; } echo ''; diff --git a/html/dashboard/project_list/r_project_list.php b/html/dashboard/project_list/r_project_list.php index 351b95a4..b25bed9d 100644 --- a/html/dashboard/project_list/r_project_list.php +++ b/html/dashboard/project_list/r_project_list.php @@ -5,14 +5,14 @@ $lib=' SELECT cp.project_description, cp.id_config_project FROM config_project cp - LEFT JOIN perm_project_group ppg - ON cp.id_config_project=ppg.id_config_project - LEFT JOIN auth_group ag - ON ppg.id_auth_group=ag.id_auth_group - LEFT JOIN auth_user_group aug - ON ag.id_auth_group=aug.id_auth_group + LEFT JOIN perm_project_group ppg + ON cp.id_config_project=ppg.id_config_project + LEFT JOIN auth_group ag + ON ppg.id_auth_group=ag.id_auth_group + LEFT JOIN auth_user_group aug + ON ag.id_auth_group=aug.id_auth_group WHERE - aug.id_auth_user=:s_id_user + aug.id_auth_user=:s_id_user GROUP BY id_config_project, project_description ORDER BY project_description '; diff --git a/html/dashboard/project_list/r_project_server_list.php b/html/dashboard/project_list/r_project_server_list.php index f49dc480..70e54bb9 100644 --- a/html/dashboard/project_list/r_project_server_list.php +++ b/html/dashboard/project_list/r_project_server_list.php @@ -1,173 +1,173 @@ bind('f_id_config_role',$f_id_config_role); - - } else if (isset($_GET['f_id_config_role']) && $f_id_config_role===0) { - $lib=' - SELECT - cs.id_config_server, - cs.server_name - FROM config_server cs - LEFT OUTER JOIN config_role_server crs - ON cs.id_config_server=crs.id_config_server - LEFT OUTER JOIN config_role cr - ON crs.id_config_role=cr.id_config_role - LEFT JOIN config_server_project csp - ON cs.id_config_server=csp.id_config_server - '.$JOIN_ENV.' - LEFT JOIN perm_project_group ppg - ON ppg.id_config_project=csp.id_config_project - LEFT JOIN auth_group ag - ON ag.id_auth_group=ppg.id_auth_group - LEFT JOIN auth_user_group aug - ON aug.id_auth_group=ag.id_auth_group - WHERE csp.id_config_project=:f_id_config_project - AND aug.id_auth_user=:s_id_user - AND crs.id_config_role IS NULL - '.$WHERE_ENV.' - GROUP BY id_config_server, server_name - ORDER BY server_name'; - } else { - $lib=' - SELECT - cs.id_config_server, - cs.server_name - FROM config_server cs - LEFT JOIN config_server_project csp - ON cs.id_config_server=csp.id_config_server - '.$JOIN_ENV.' - LEFT JOIN perm_project_group ppg - ON ppg.id_config_project=csp.id_config_project - LEFT JOIN auth_group ag - ON ag.id_auth_group=ppg.id_auth_group - LEFT JOIN auth_user_group aug - ON aug.id_auth_group=ag.id_auth_group - WHERE csp.id_config_project=:f_id_config_project - AND aug.id_auth_user=:s_id_user - '.$WHERE_ENV.' - GROUP BY id_config_server, server_name - ORDER BY server_name'; - } + $s_id_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); + $f_id_config_project=filter_input(INPUT_GET,'f_id_config_project',FILTER_SANITIZE_NUMBER_INT); + $f_id_config_role=intval(filter_input(INPUT_GET,'f_id_config_role',FILTER_SANITIZE_NUMBER_INT)); + $f_id_config_environment=filter_input(INPUT_GET,'f_id_config_environment',FILTER_SANITIZE_NUMBER_INT); - $connSQL->bind('f_id_config_project',$f_id_config_project); - $connSQL->bind('s_id_user',$s_id_user); - $all_server=$connSQL->query($lib); - $cpt_server=count($all_server); + if (isset($_GET['f_id_config_environment']) && $f_id_config_environment!=0) { + $JOIN_ENV='LEFT OUTER JOIN config_environment_server ces + ON cs.id_config_server=ces.id_config_server'; + $WHERE_ENV='AND ces.id_config_environment="'.$f_id_config_environment.'"'; + } else if (isset($_GET['f_id_config_environment']) && $f_id_config_environment==0) { + $JOIN_ENV='LEFT OUTER JOIN config_environment_server ces + ON cs.id_config_server=ces.id_config_server'; + $WHERE_ENV='AND ces.id_config_environment IS NULL'; + } else { + $JOIN_ENV=''; + $WHERE_ENV=''; + } + if (isset($_GET['f_id_config_role']) && $f_id_config_role!==0) { + $lib=' + SELECT + cs.id_config_server, + cs.server_name + FROM config_server cs + LEFT OUTER JOIN config_role_server crs + ON cs.id_config_server=crs.id_config_server + LEFT OUTER JOIN config_role cr + ON crs.id_config_role=cr.id_config_role + LEFT JOIN config_server_project csp + ON cs.id_config_server=csp.id_config_server + '.$JOIN_ENV.' + LEFT JOIN perm_project_group ppg + ON ppg.id_config_project=csp.id_config_project + LEFT JOIN auth_group ag + ON ag.id_auth_group=ppg.id_auth_group + LEFT JOIN auth_user_group aug + ON aug.id_auth_group=ag.id_auth_group + WHERE csp.id_config_project=:f_id_config_project + AND aug.id_auth_user=:s_id_user + AND cr.id_config_role=:f_id_config_role + '.$WHERE_ENV.' + GROUP BY id_config_server, server_name + ORDER BY server_name'; + $connSQL->bind('f_id_config_role',$f_id_config_role); - // Si plus de MAX_SRV Serveurs, on affiche des catégories - if ($cpt_server>MAX_SRV || isset($_GET['f_id_config_role'])) { - $f_id_config_project=intval(GET('f_id_config_project')); - - $lib=' - SELECT - cr.id_config_role, - CASE - WHEN cr.role_description IS NULL THEN "'.OTHERS.'" - ELSE cr.role_description - END AS role_description - FROM config_server cs - LEFT OUTER JOIN config_role_server crs - ON cs.id_config_server=crs.id_config_server - LEFT OUTER JOIN config_role cr - ON crs.id_config_role=cr.id_config_role - '.$JOIN_ENV.' - LEFT JOIN config_server_project csp - ON cs.id_config_server=csp.id_config_server - LEFT JOIN perm_project_group ppg - ON ppg.id_config_project=csp.id_config_project - LEFT JOIN auth_group ag - ON ag.id_auth_group=ppg.id_auth_group - LEFT JOIN auth_user_group aug - ON aug.id_auth_group=ag.id_auth_group - WHERE csp.id_config_project=:f_id_config_project - AND aug.id_auth_user=:s_id_user - '.$WHERE_ENV.' - GROUP BY id_config_role, role_description - ORDER BY role_description'; + } else if (isset($_GET['f_id_config_role']) && $f_id_config_role===0) { + $lib=' + SELECT + cs.id_config_server, + cs.server_name + FROM config_server cs + LEFT OUTER JOIN config_role_server crs + ON cs.id_config_server=crs.id_config_server + LEFT OUTER JOIN config_role cr + ON crs.id_config_role=cr.id_config_role + LEFT JOIN config_server_project csp + ON cs.id_config_server=csp.id_config_server + '.$JOIN_ENV.' + LEFT JOIN perm_project_group ppg + ON ppg.id_config_project=csp.id_config_project + LEFT JOIN auth_group ag + ON ag.id_auth_group=ppg.id_auth_group + LEFT JOIN auth_user_group aug + ON aug.id_auth_group=ag.id_auth_group + WHERE csp.id_config_project=:f_id_config_project + AND aug.id_auth_user=:s_id_user + AND crs.id_config_role IS NULL + '.$WHERE_ENV.' + GROUP BY id_config_server, server_name + ORDER BY server_name'; + } else { + $lib=' + SELECT + cs.id_config_server, + cs.server_name + FROM config_server cs + LEFT JOIN config_server_project csp + ON cs.id_config_server=csp.id_config_server + '.$JOIN_ENV.' + LEFT JOIN perm_project_group ppg + ON ppg.id_config_project=csp.id_config_project + LEFT JOIN auth_group ag + ON ag.id_auth_group=ppg.id_auth_group + LEFT JOIN auth_user_group aug + ON aug.id_auth_group=ag.id_auth_group + WHERE csp.id_config_project=:f_id_config_project + AND aug.id_auth_user=:s_id_user + '.$WHERE_ENV.' + GROUP BY id_config_server, server_name + ORDER BY server_name'; + } - $connSQL->bind('f_id_config_project',$f_id_config_project); - $connSQL->bind('s_id_user',$s_id_user); + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->bind('s_id_user',$s_id_user); + $all_server=$connSQL->query($lib); + $cpt_server=count($all_server); - $all_role=$connSQL->query($lib); - $cpt_role=count($all_role); - } - - // Pour afficher les environnements si y en a - $lib=' - SELECT - ce.id_config_environment, - CASE - WHEN ce.environment_description IS NULL THEN "'.OTHERS.'" - ELSE ce.environment_description - END AS environment_description - FROM config_server cs - LEFT OUTER JOIN config_environment_server ces - ON cs.id_config_server=ces.id_config_server - LEFT OUTER JOIN config_environment ce - ON ces.id_config_environment=ce.id_config_environment - LEFT JOIN config_server_project csp - ON cs.id_config_server=csp.id_config_server - LEFT JOIN perm_project_group ppg - ON ppg.id_config_project=csp.id_config_project - LEFT JOIN auth_group ag - ON ag.id_auth_group=ppg.id_auth_group - LEFT JOIN auth_user_group aug - ON aug.id_auth_group=ag.id_auth_group - WHERE csp.id_config_project=:f_id_config_project - AND aug.id_auth_user=:s_id_user - GROUP BY id_config_environment, environment_description - ORDER BY environment_description'; - - $connSQL->bind('f_id_config_project',$f_id_config_project); - $connSQL->bind('s_id_user',$s_id_user); - $all_environment=$connSQL->query($lib); - $cpt_environment=count($all_environment); + // Si plus de MAX_SRV Serveurs, on affiche des catégories + if ($cpt_server>MAX_SRV || isset($_GET['f_id_config_role'])) { + $f_id_config_project=intval(GET('f_id_config_project')); + + $lib=' + SELECT + cr.id_config_role, + CASE + WHEN cr.role_description IS NULL THEN "'.OTHERS.'" + ELSE cr.role_description + END AS role_description + FROM config_server cs + LEFT OUTER JOIN config_role_server crs + ON cs.id_config_server=crs.id_config_server + LEFT OUTER JOIN config_role cr + ON crs.id_config_role=cr.id_config_role + '.$JOIN_ENV.' + LEFT JOIN config_server_project csp + ON cs.id_config_server=csp.id_config_server + LEFT JOIN perm_project_group ppg + ON ppg.id_config_project=csp.id_config_project + LEFT JOIN auth_group ag + ON ag.id_auth_group=ppg.id_auth_group + LEFT JOIN auth_user_group aug + ON aug.id_auth_group=ag.id_auth_group + WHERE csp.id_config_project=:f_id_config_project + AND aug.id_auth_user=:s_id_user + '.$WHERE_ENV.' + GROUP BY id_config_role, role_description + ORDER BY role_description'; + + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->bind('s_id_user',$s_id_user); + + $all_role=$connSQL->query($lib); + $cpt_role=count($all_role); + } + + // Pour afficher les environnements si y en a + $lib=' + SELECT + ce.id_config_environment, + CASE + WHEN ce.environment_description IS NULL THEN "'.OTHERS.'" + ELSE ce.environment_description + END AS environment_description + FROM config_server cs + LEFT OUTER JOIN config_environment_server ces + ON cs.id_config_server=ces.id_config_server + LEFT OUTER JOIN config_environment ce + ON ces.id_config_environment=ce.id_config_environment + LEFT JOIN config_server_project csp + ON cs.id_config_server=csp.id_config_server + LEFT JOIN perm_project_group ppg + ON ppg.id_config_project=csp.id_config_project + LEFT JOIN auth_group ag + ON ag.id_auth_group=ppg.id_auth_group + LEFT JOIN auth_user_group aug + ON aug.id_auth_group=ag.id_auth_group + WHERE csp.id_config_project=:f_id_config_project + AND aug.id_auth_user=:s_id_user + GROUP BY id_config_environment, environment_description + ORDER BY environment_description'; + + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->bind('s_id_user',$s_id_user); + + $all_environment=$connSQL->query($lib); + $cpt_environment=count($all_environment); } diff --git a/html/dashboard/server_plugins/d_server_plugins.php b/html/dashboard/server_plugins/d_server_plugins.php index 66872870..a505bb64 100644 --- a/html/dashboard/server_plugins/d_server_plugins.php +++ b/html/dashboard/server_plugins/d_server_plugins.php @@ -23,19 +23,19 @@ echo '

    '.$cur_server->server_name.'

    '; -$lib = 'SELECT - cpf.* - FROM +$lib = 'SELECT + cpf.* + FROM config_plugin_filter cpf LEFT JOIN config_plugin_filter_group cpfg ON cpf.id_config_plugin_filter=cpfg.id_config_plugin_filter - LEFT JOIN auth_group ag + LEFT JOIN auth_group ag ON cpfg.id_auth_group=ag.id_auth_group - LEFT JOIN auth_user_group aug + LEFT JOIN auth_user_group aug ON aug.id_auth_group=ag.id_auth_group - LEFT JOIN perm_project_group ppg + LEFT JOIN perm_project_group ppg ON ppg.id_auth_group=ag.id_auth_group - WHERE + WHERE aug.id_auth_user=:s_id_user AND ppg.id_config_project=:f_id_config_project ORDER BY plugin_order, plugin, plugin_instance, type, type_instance'; @@ -53,7 +53,7 @@ $dgraph=0; $allDatadir=getAllDatadir(); foreach($allDatadir as $key => $datadir){ - if(!is_dir($datadir.'/'.$cur_server->server_name.'/')) unset($allDatadir[$key]); + if(!is_dir($datadir.'/'.$cur_server->server_name.'/')) unset($allDatadir[$key]); } if (!empty($allDatadir)) { @@ -72,7 +72,7 @@ $tpluginsDatadir=preg_find($myregex, $datadir.'/'.$cur_server->server_name, PREG_FIND_RECURSIVE|PREG_FIND_FULLPATH|PREG_FIND_SORTBASENAME); if ($tpluginsDatadir) $dgraph=1; $tplugins=array_merge($tplugins,$tpluginsDatadir); - } + } $plugins = (sort_plugins('('.implode('|',$allDatadir).')/'.$cur_server->server_name,$tplugins, $pg_filters)); $old_t=''; @@ -81,14 +81,14 @@ $myregex='#^(('.implode('|',$allDatadir).')/'.$cur_server->server_name.'/)(\w+)(?:\-(.*))?/(\w+)(?:\-(.*))?\.rrd#'; foreach ($plugins as $plugin) { preg_match($myregex, $plugin['content'], $matches); - $plugin_datadir = getDatadirEntry($matches[1]); + $plugin_datadir = getDatadirEntry($matches[1]); if (isset($matches[3])) { $p=$matches[3]; if (!isset($$p)) $$p=false; - } else { + } else { continue; - $p=null; + $p=null; } if (isset($matches[4])) { $pi=$matches[4]; @@ -105,14 +105,14 @@ $pc=$pi; $pi=null; } - } else { - $pc=null; - $pi=null; + } else { + $pc=null; + $pi=null; } if (isset($matches[5])) { $t=$matches[5]; - } else { - $t=null; + } else { + $t=null; } if (isset($matches[6])) { $ti=$matches[6]; @@ -122,10 +122,10 @@ $tc=$tmp[0]; //$ti=implode('-', array_slice($tmp,1)); $ti=null; - } - } else { - $tc=null; - $ti=null; + } + } else { + $tc=null; + $ti=null; } @@ -155,7 +155,7 @@ } // Displaying Plugin Instance for some plugins - ${$pc.$pi} = isset(${$pc.$pi}) ? ${$pc.$pi} : false; + ${$pc.$pi} = isset(${$pc.$pi}) ? ${$pc.$pi} : false; if (preg_match($CONFIG['title_pinstance'],$p) && strlen($pi) && ${$pc.$pi}!=true) { ${$pc.$pi}=true; echo "".ucfirst(str_replace('_', ' ',$pi)).""; @@ -169,7 +169,7 @@ // Verif regex OK if (isset($p) && isset($t)) { - if (!preg_match('/^(df|interface|oracle|snmp)$/', $p) || + if (!preg_match('/^(df|interface|oracle|snmp)$/', $p) || (((preg_replace('/[^0-9\.]/','',$cur_server->collectd_version) >= 5) && !preg_match('/^(oracle|snmp)$/', $p) && $t!='df')) || ($p == 'snmp' && $t == 'memory') @@ -225,8 +225,8 @@ } } else if (DEBUG==true){ echo 'ERREUR - p='.$p.' pc='.$pc.' pi='.$pi.' t='.$t.' tc='.$tc.' ti='.$ti.'
    '; - } - } + } + } $old_t=$t; $old_tc=$tc; $old_p=$p; @@ -244,49 +244,49 @@ if (!empty($vmlist)) { echo "

    Libvirt

    "; foreach ($vmlist as $vmdir) { - + $tmp=explode(':',$vmdir); $vm=$tmp[1]; - + echo "

    $vm

    "; - + foreach ($pg_filters as $filter) { $myregex='#^('.$vmdir.'/)('.$filter->plugin.')(?:\-('.$filter->plugin_instance.'))?/('.$filter->type.')(?:\-('.$filter->type_instance.'))?\.rrd#'; - + $plugins = preg_find($myregex, $vmdir, PREG_FIND_RECURSIVE|PREG_FIND_FULLPATH|PREG_FIND_SORTBASENAME); - + $old_t=''; $old_pi=''; foreach ($plugins as $plugin) { preg_match($myregex, $plugin, $matches); - + if (isset($matches[2])) { $p=$matches[2]; if (!isset($$p)) $$p=false; - } else { - $p=null; + } else { + $p=null; } if (isset($matches[3])) { $pi=$matches[3]; - } else { - $pi=null; + } else { + $pi=null; } if (isset($matches[4])) { $t=$matches[4]; - } else { - $t=null; + } else { + $t=null; } - if (isset($matches[5])) { + if (isset($matches[5]) && !in_array($t, array('memory', 'virt_vcpu'))) { $ti=$matches[5]; - } else { - $ti=null; + } else { + $ti=null; } - + if (! isset(${$vm.$p.$pi.$t.$ti}) ) { ${$vm.$p.$pi.$t.$ti}=true; if ($t!=$old_t) echo '

    '.ucfirst(str_replace('_', ' ',$t)).'

    '; $old_t=$t; - + $graph_title=gen_title($cur_server->server_name,$p,$pc,$pi,$t,$tc,$ti); if (GRAPH_TITLE=='text') { echo '
    '.$graph_title.'
    '; } echo ''.$graph_title.''; diff --git a/html/dashboard/zoom/d_zoom.php b/html/dashboard/zoom/d_zoom.php index 0e412ae2..84136540 100644 --- a/html/dashboard/zoom/d_zoom.php +++ b/html/dashboard/zoom/d_zoom.php @@ -15,14 +15,14 @@ echo ''; echo ''; if (isset($_SESSION['time_start']) && $_SESSION['time_start']!='') { - $date_start=date('Y-m-d H:i',$_SESSION['time_start']); + $date_start=date('Y-m-d H:i',$_SESSION['time_start']); } else { - $date_start=date('Y-m-d H:i',mktime() - intval($_GET['s']) ); + $date_start=date('Y-m-d H:i',mktime() - intval($_GET['s']) ); } if (isset($_SESSION['time_end']) && $_SESSION['time_end']!='') { - $date_end=date('Y-m-d H:i',$_SESSION['time_end']); + $date_end=date('Y-m-d H:i',$_SESSION['time_end']); } else { - $date_end=date('Y-m-d H:i'); + $date_end=date('Y-m-d H:i'); } ?> diff --git a/html/form/commun/ajax_get_timerange.php b/html/form/commun/ajax_get_timerange.php index 873c81b8..d20072f2 100644 --- a/html/form/commun/ajax_get_timerange.php +++ b/html/form/commun/ajax_get_timerange.php @@ -7,7 +7,7 @@ $time_start = (!empty($_SESSION['time_start']) ? $_SESSION['time_start'] : null); $time_end = (!empty($_SESSION['time_end']) ? $_SESSION['time_end'] : null); echo '{ - "time_start" : '.$time_start.', - "time_end" : '.$time_end.' + "time_start" : '.$time_start.', + "time_end" : '.$time_end.' }'; ?> diff --git a/html/form/commun/ajax_set_timerange.php b/html/form/commun/ajax_set_timerange.php index fe9081b5..21abfffd 100644 --- a/html/form/commun/ajax_set_timerange.php +++ b/html/form/commun/ajax_set_timerange.php @@ -3,28 +3,28 @@ $auth = new AUTH_USER(); if (isset($_GET['time_start']) && isset($_GET['time_end'])) { - if (strlen($_GET['time_start']) == strlen($_GET['time_end'])) { - if (isset($_GET['time_start']) && is_numeric($_GET['time_start'])) { - $_SESSION['time_start']=intval($_GET['time_start']); - echo 'time_start is setted :'.$_SESSION['time_start']."\n"; - } - - if (isset($_GET['time_end']) && is_numeric($_GET['time_end'])) { - $_SESSION['time_end']=intval($_GET['time_end']); - echo 'time_end is setted :'.$_SESSION['time_end']."\n"; - } - - $_SESSION['time_range']=''; - } else { - echo 'Erreur : '.strlen($_GET['time_start']).'!='.strlen($_GET['time_end']); - } + if (strlen($_GET['time_start']) == strlen($_GET['time_end'])) { + if (isset($_GET['time_start']) && is_numeric($_GET['time_start'])) { + $_SESSION['time_start']=intval($_GET['time_start']); + echo 'time_start is setted :'.$_SESSION['time_start']."\n"; + } + + if (isset($_GET['time_end']) && is_numeric($_GET['time_end'])) { + $_SESSION['time_end']=intval($_GET['time_end']); + echo 'time_end is setted :'.$_SESSION['time_end']."\n"; + } + + $_SESSION['time_range']=''; + } else { + echo 'Erreur : '.strlen($_GET['time_start']).'!='.strlen($_GET['time_end']); + } } if (isset($_GET['time_range']) && is_numeric($_GET['time_range'])) { - $_SESSION['time_range']=intval($_GET['time_range']); - $_SESSION['time_start']=''; - $_SESSION['time_end']=''; - - echo 'time_range is setted :'.$_SESSION['time_range']."\n"; + $_SESSION['time_range']=intval($_GET['time_range']); + $_SESSION['time_start']=''; + $_SESSION['time_end']=''; + + echo 'time_range is setted :'.$_SESSION['time_range']."\n"; } ?> diff --git a/html/form/commun/func_form.php b/html/form/commun/func_form.php index 203f582f..872b044b 100644 --- a/html/form/commun/func_form.php +++ b/html/form/commun/func_form.php @@ -1,176 +1,176 @@ query($lib); - $cpt_res=count($res); - - $s=''; - - return $s; + $lib=' + SELECT + '.$row_display.' AS row_display, + '.$row_value.' AS row_value + FROM + '.$table.' + GROUP BY + row_display, + row_value + ORDER by + row_display, + row_value'; + //echo $lib; + $connSQL=new DB(); + $res=$connSQL->query($lib); + $cpt_res=count($res); + + $s=''; + + return $s; } function select_count_template($name, $id, $table, $row_value, $selected='', $js_func='') { - $lib=' - SELECT - '.$row_value.' AS row_value - FROM - '.$table.' - GROUP BY - row_value - ORDER by - row_value'; - - //echo $lib; - $connSQL=new DB(); - $res=$connSQL->row($lib); - - $s=''; - - return $s; + $lib=' + SELECT + '.$row_value.' AS row_value + FROM + '.$table.' + GROUP BY + row_value + ORDER by + row_value'; + + //echo $lib; + $connSQL=new DB(); + $res=$connSQL->row($lib); + + $s=''; + + return $s; } function options_template($table, $row_display, $row_value, $filter='', $typefilter='') { - if ($filter!='' && $typefilter!='') { - $lib=' - SELECT - '.$row_display.' AS row_display, - '.$row_value.' AS row_value, - '.$typefilter.'('.$filter.') AS filter_value - FROM - '.$table.' - GROUP BY - row_display - ORDER BY - row_display'; - - } else { - $lib=' - SELECT - '.$row_display.' AS row_display, - '.$row_value.' AS row_value - FROM - '.$table.' - GROUP BY - row_display, - row_value - ORDER by - row_display, - row_value'; - } - $connSQL=new DB(); - $res=$connSQL->query($lib); - $cpt_res=count($res); + if ($filter!='' && $typefilter!='') { + $lib=' + SELECT + '.$row_display.' AS row_display, + '.$row_value.' AS row_value, + '.$typefilter.'('.$filter.') AS filter_value + FROM + '.$table.' + GROUP BY + row_display + ORDER BY + row_display'; - $s='['; - $s.='{optionValue:'.php2js('').', optionDisplay:'.php2js('').'},'; - for ($i=0; $i<$cpt_res; $i++) { - $s.='{optionValue:'.php2js($res[$i]->row_value).', optionDisplay:'.php2js($res[$i]->row_display).'}'; - if ($i+1<$cpt_res) $s.=', '; - } - $s.=']'; - - return $s; + } else { + $lib=' + SELECT + '.$row_display.' AS row_display, + '.$row_value.' AS row_value + FROM + '.$table.' + GROUP BY + row_display, + row_value + ORDER by + row_display, + row_value'; + } + $connSQL=new DB(); + $res=$connSQL->query($lib); + $cpt_res=count($res); + + $s='['; + $s.='{optionValue:'.php2js('').', optionDisplay:'.php2js('').'},'; + for ($i=0; $i<$cpt_res; $i++) { + $s.='{optionValue:'.php2js($res[$i]->row_value).', optionDisplay:'.php2js($res[$i]->row_display).'}'; + if ($i+1<$cpt_res) $s.=', '; + } + $s.=']'; + + return $s; } function options_count_template($table, $row_value) { - $lib=' - SELECT - '.$row_value.' AS row_value - FROM - '.$table.' - GROUP BY - row_value - ORDER by - row_value'; - - $connSQL=new DB(); - $res=$connSQL->row($lib); + $lib=' + SELECT + '.$row_value.' AS row_value + FROM + '.$table.' + GROUP BY + row_value + ORDER by + row_value'; + + $connSQL=new DB(); + $res=$connSQL->row($lib); + + $s='['; + for ($i=1; $i<=$res->row_value; $i++) { + $s.='{optionValue:'.php2js($i).', optionDisplay:'.php2js($i).'}'; + if ($i+1<=$res->row_value) $s.=', '; + } + $s.=']'; - $s='['; - for ($i=1; $i<=$res->row_value; $i++) { - $s.='{optionValue:'.php2js($i).', optionDisplay:'.php2js($i).'}'; - if ($i+1<=$res->row_value) $s.=', '; - } - $s.=']'; - - return $s; + return $s; } function single_value($table, $row_value) { - $lib=' - SELECT - '.$row_value.' AS row_value - FROM - '.$table; - - $connSQL=new DB(); - $res=$connSQL->row($lib); - echo '[{optionValue:'.php2js($res->row_value).'}]'; + $lib=' + SELECT + '.$row_value.' AS row_value + FROM + '.$table; + + $connSQL=new DB(); + $res=$connSQL->row($lib); + echo '[{optionValue:'.php2js($res->row_value).'}]'; } function load_profile($table, $myurl, $mycpt, $mytarget, $mylabelname) { - $lib=' - SELECT - * - FROM - '.$table; + $lib=' + SELECT + * + FROM + '.$table; + + $connSQL=new DB(); + $res=$connSQL->query($lib); + $cpt_res=count($res); + echo ''."\n"; + foreach($res as $key => $value) { + $i=1; + if (strpos($myurl,'?')) { + $url=$myurl.'&'; + } else { + $url=$myurl.'?'; + } + foreach($value as $val) { + if ($i!=1 && count($value)!=$i) $url.='&'; + $url.='f_'.$i.'='.$val; + $i++; + } + echo 'addFormField(\''.$mycpt.'\',\''.$mytarget.'\', \''.$mylabelname.'\', \''.$url.'\', \'\');'."\n"; + } + echo ''."\n"; } @@ -255,14 +255,14 @@ function print_nice(&$elem,$max_level=10,$print_nice_stack=array()){ } function sortArray($data, $field) { - if(!is_array($field)) $field = array($field); - usort($data, function($a, $b) use($field) { - $retval = 0; - foreach($field as $fieldname) { - if($retval == 0) $retval = strnatcmp($a[$fieldname],$b[$fieldname]); - } - return $retval; - }); - return $data; + if(!is_array($field)) $field = array($field); + usort($data, function($a, $b) use($field) { + $retval = 0; + foreach($field as $fieldname) { + if($retval == 0) $retval = strnatcmp($a[$fieldname],$b[$fieldname]); + } + return $retval; + }); + return $data; } ?> diff --git a/html/menu/menu_project.php b/html/menu/menu_project.php index 0a28b797..6744310e 100644 --- a/html/menu/menu_project.php +++ b/html/menu/menu_project.php @@ -46,7 +46,7 @@ } else { echo ''; } - } + } } ?> @@ -65,7 +65,7 @@ } else { echo ''; } - } + } } ?> @@ -83,7 +83,7 @@ } else { echo ''; } - } + } } ?> @@ -120,12 +120,12 @@ }); $('#f_id_config_environment').on('change', function (){ - if ($('#f_id_config_role').val()!="") { var role=$('#f_id_config_role option:selected').text(); } + if ($('#f_id_config_role').val()!="") { var role=$('#f_id_config_role option:selected').text(); } $.getJSON('ajax/json_server.php', { - f_id_config_project: $('#f_id_config_project').val(), - f_id_config_role: $('#f_id_config_role').val(), - f_id_config_environment: $(this).val() - }, function(data){ + f_id_config_project: $('#f_id_config_project').val(), + f_id_config_role: $('#f_id_config_role').val(), + f_id_config_environment: $(this).val() + }, function(data){ var options = ''; for (var x = 0; x < data.length; x++) { options += ''; @@ -133,45 +133,45 @@ $('#f_id_config_server').html(options); }), $.getJSON('ajax/json_role.php', { - f_id_config_project: $('#f_id_config_project').val(), - f_id_config_environment: $(this).val() - }, function(data){ + f_id_config_project: $('#f_id_config_project').val(), + f_id_config_environment: $(this).val() + }, function(data){ var options = ''; for (var x = 0; x < data.length; x++) { - if (role == data[x]['role_description']) { - options += ''; - } else { - options += ''; - } + if (role == data[x]['role_description']) { + options += ''; + } else { + options += ''; + } } $('#f_id_config_role').html(options); }); }); $('#f_id_config_role').on('change', function (){ - if ($('#f_id_config_environment').val()!="") { var environment=$('#f_id_config_environment option:selected').text(); } + if ($('#f_id_config_environment').val()!="") { var environment=$('#f_id_config_environment option:selected').text(); } $.getJSON('ajax/json_server.php', { - f_id_config_project: $('#f_id_config_project').val(), - f_id_config_environment: $('#f_id_config_environment').val(), - f_id_config_role: $(this).val() - }, function(data){ + f_id_config_project: $('#f_id_config_project').val(), + f_id_config_environment: $('#f_id_config_environment').val(), + f_id_config_role: $(this).val() + }, function(data){ var options = ''; for (var x = 0; x < data.length; x++) { - options += ''; + options += ''; } $('#f_id_config_server').html(options); }), $.getJSON('ajax/json_environment.php', { - f_id_config_project: $('#f_id_config_project').val(), - f_id_config_role: $(this).val() - }, function(data){ + f_id_config_project: $('#f_id_config_project').val(), + f_id_config_role: $(this).val() + }, function(data){ var options = ''; for (var x = 0; x < data.length; x++) { - if (environment == data[x]['environment_description']) { - options += ''; - } else { - options += ''; - } + if (environment == data[x]['environment_description']) { + options += ''; + } else { + options += ''; + } } $('#f_id_config_environment').html(options); }); @@ -179,10 +179,10 @@ $('#f_id_config_server').on('change', function (){ window.location = 'index.php?module=dashboard&component=view' - +'&f_id_config_project=' + $('#f_id_config_project').val() - +'&f_id_config_environment=' + $('#f_id_config_environment').val() - +'&f_id_config_role=' + $('#f_id_config_role').val() - +'&f_id_config_server=' + $(this).val(); + +'&f_id_config_project=' + $('#f_id_config_project').val() + +'&f_id_config_environment=' + $('#f_id_config_environment').val() + +'&f_id_config_role=' + $('#f_id_config_role').val() + +'&f_id_config_server=' + $(this).val(); }); }); diff --git a/html/menu/menu_quickview.php b/html/menu/menu_quickview.php index df9d53df..28823344 100644 --- a/html/menu/menu_quickview.php +++ b/html/menu/menu_quickview.php @@ -14,7 +14,7 @@
    '.$all_server_role[$i]->role.''.$all_server_role[$i]->role_description.'
    '.$all_server_role[$i]->role.''.$all_server_role[$i]->role_description.'
    - - - + + + - - - - - '; + echo ' + + + + + '; } ?> diff --git a/html/perm/group_module/e_group_module.php b/html/perm/group_module/e_group_module.php index 104d83ea..18196d0b 100644 --- a/html/perm/group_module/e_group_module.php +++ b/html/perm/group_module/e_group_module.php @@ -1,14 +1,14 @@ bind('f_id_perm_module',$f_id_perm_module); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + $f_id_perm_module=filter_input(INPUT_POST,'f_id_perm_module',FILTER_SANITIZE_NUMBER_INT); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM perm_module_group WHERE id_perm_module=:f_id_perm_module AND id_auth_group=:f_id_auth_group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_perm_module',$f_id_perm_module); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/perm/group_module/e_group_module_wh_id.php b/html/perm/group_module/e_group_module_wh_id.php index f1215177..d91d5456 100644 --- a/html/perm/group_module/e_group_module_wh_id.php +++ b/html/perm/group_module/e_group_module_wh_id.php @@ -1,12 +1,12 @@ bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM perm_module_group WHERE id_auth_group=:f_id_auth_group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/perm/group_module/r_group_module.php b/html/perm/group_module/r_group_module.php index 732cf97a..c3e09f35 100644 --- a/html/perm/group_module/r_group_module.php +++ b/html/perm/group_module/r_group_module.php @@ -1,46 +1,46 @@ bind('f_id_auth_group',$f_id_auth_group); - $all_group_module=$connSQL->query($lib); - $cpt_group_module=count($all_group_module); - + $connSQL=new DB(); + $lib='SELECT + pmg.id_perm_module, + pmg.id_auth_group, + pm.module, + pm.component, + pm.menu_name, + ag.group, + ag.group_description + FROM + perm_module_group pmg + LEFT JOIN perm_module pm + ON pmg.id_perm_module=pm.id_perm_module + LEFT JOIN auth_group ag + ON pmg.id_auth_group=ag.id_auth_group + WHERE ag.id_auth_group=:f_id_auth_group'; - $lib='SELECT - * - FROM - perm_module - WHERE - id_perm_module NOT IN ( - SELECT id_perm_module - FROM perm_module_group - WHERE id_auth_group=:f_id_auth_group - ) - ORDER BY - `module`, - `component`'; - - $connSQL=new DB(); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $all_module=$connSQL->query($lib); - $cpt_module=count($all_module); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $all_group_module=$connSQL->query($lib); + $cpt_group_module=count($all_group_module); + + + $lib='SELECT + * + FROM + perm_module + WHERE + id_perm_module NOT IN ( + SELECT id_perm_module + FROM perm_module_group + WHERE id_auth_group=:f_id_auth_group + ) + ORDER BY + `module`, + `component`'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $all_module=$connSQL->query($lib); + $cpt_module=count($all_module); } ?> diff --git a/html/perm/group_module/r_group_module_wh_id.php b/html/perm/group_module/r_group_module_wh_id.php index fe77f836..b7c8a633 100644 --- a/html/perm/group_module/r_group_module_wh_id.php +++ b/html/perm/group_module/r_group_module_wh_id.php @@ -1,28 +1,28 @@ bind('f_id_perm_module',$f_id_perm_module); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $cur_group_module=$connSQL->row($lib); + $connSQL=new DB(); + /* A FAIRE A PARTIR D'ICI DEMAIN GROS BOULET */ + $lib='SELECT + pmg.id_perm_module, + pmg.id_auth_group, + pm.module, + pm.component, + ag.group, + ag.group_description + FROM + perm_module_group pmg + LEFT JOIN perm_module pm + ON pmg.id_perm_module=pm.id_perm_module + LEFT JOIN auth_group ag + ON pmg.id_auth_group=ag.id_auth_group + WHERE pmg.id_perm_module=:f_id_perm_module + AND pmg.id_auth_group=:f_id_auth_group'; + + $connSQL->bind('f_id_perm_module',$f_id_perm_module); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $cur_group_module=$connSQL->row($lib); } ?> diff --git a/html/perm/group_module/w_group_module.php b/html/perm/group_module/w_group_module.php index a134abb2..00fc4de0 100644 --- a/html/perm/group_module/w_group_module.php +++ b/html/perm/group_module/w_group_module.php @@ -1,18 +1,18 @@ bind('id_perm_module',$id_perm_module); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); - } + foreach ($f_id_perm_module as $id_perm_module) { + $lib='INSERT INTO perm_module_group + (id_perm_module, id_auth_group) + VALUES + (:id_perm_module, :f_id_auth_group)'; + + $connSQL=new DB(); + $connSQL->bind('id_perm_module',$id_perm_module); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); + } } ?> diff --git a/html/perm/group_project/d_group_project.php b/html/perm/group_project/d_group_project.php index 8103aaf6..8bfca688 100644 --- a/html/perm/group_project/d_group_project.php +++ b/html/perm/group_project/d_group_project.php @@ -1,19 +1,19 @@
    '.$all_group_module[$i]->module.''.$all_group_module[$i]->component.''.$all_group_module[$i]->menu_name.'
    '.$all_group_module[$i]->module.''.$all_group_module[$i]->component.''.$all_group_module[$i]->menu_name.'
    - - + + - - - - '; + echo ' + + + + '; } ?> diff --git a/html/perm/group_project/e_group_project.php b/html/perm/group_project/e_group_project.php index 486d356d..d0ab7c9b 100644 --- a/html/perm/group_project/e_group_project.php +++ b/html/perm/group_project/e_group_project.php @@ -1,14 +1,14 @@ bind('f_id_config_project',$f_id_config_project); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + $f_id_config_project=filter_input(INPUT_POST,'f_id_config_project',FILTER_SANITIZE_NUMBER_INT); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM perm_project_group WHERE id_config_project=:f_id_config_project AND id_auth_group=:f_id_auth_group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/perm/group_project/e_group_project_wh_id.php b/html/perm/group_project/e_group_project_wh_id.php index fee6d872..704b0065 100644 --- a/html/perm/group_project/e_group_project_wh_id.php +++ b/html/perm/group_project/e_group_project_wh_id.php @@ -1,12 +1,12 @@ bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM perm_project_group WHERE id_auth_group=:f_id_auth_group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/perm/group_project/r_group_project.php b/html/perm/group_project/r_group_project.php index db49e10a..773e7701 100644 --- a/html/perm/group_project/r_group_project.php +++ b/html/perm/group_project/r_group_project.php @@ -1,44 +1,44 @@ bind('f_id_auth_group',$f_id_auth_group); - $all_group_project=$connSQL->query($lib); - $cpt_group_project=count($all_group_project); - + $connSQL=new DB(); + $lib='SELECT + ppg.id_config_project, + ppg.id_auth_group, + cp.project, + cp.project_description, + ag.group, + ag.group_description + FROM + perm_project_group ppg + LEFT JOIN config_project cp + ON ppg.id_config_project=cp.id_config_project + LEFT JOIN auth_group ag + ON ppg.id_auth_group=ag.id_auth_group + WHERE ag.id_auth_group=:f_id_auth_group'; - $lib='SELECT - * - FROM - config_project cp - WHERE - id_config_project NOT IN ( - SELECT id_config_project - FROM perm_project_group - WHERE id_auth_group=:f_id_auth_group - ) - ORDER BY - cp.project'; - - $connSQL=new DB(); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $all_project=$connSQL->query($lib); - $cpt_project=count($all_project); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $all_group_project=$connSQL->query($lib); + $cpt_group_project=count($all_group_project); + + + $lib='SELECT + * + FROM + config_project cp + WHERE + id_config_project NOT IN ( + SELECT id_config_project + FROM perm_project_group + WHERE id_auth_group=:f_id_auth_group + ) + ORDER BY + cp.project'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $all_project=$connSQL->query($lib); + $cpt_project=count($all_project); } ?> diff --git a/html/perm/group_project/r_group_project_wh_id.php b/html/perm/group_project/r_group_project_wh_id.php index 84347cc1..be5564b0 100644 --- a/html/perm/group_project/r_group_project_wh_id.php +++ b/html/perm/group_project/r_group_project_wh_id.php @@ -1,27 +1,27 @@ bind('f_id_config_project',$f_id_config_project); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $cur_group_project=$connSQL->row($lib); + $connSQL=new DB(); + /* A FAIRE A PARTIR D'ICI DEMAIN GROS BOULET */ + $lib='SELECT + ppg.id_config_project, + ppg.id_auth_group, + cp.project, + ag.group, + ag.group_description + FROM + perm_project_group ppg + LEFT JOIN config_project cp + ON ppg.id_config_project=cp.id_config_project + LEFT JOIN auth_group ag + ON ppg.id_auth_group=ag.id_auth_group + WHERE ppg.id_config_project=:f_id_config_project + AND ppg.id_auth_group=:f_id_auth_group'; + + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $cur_group_project=$connSQL->row($lib); } ?> diff --git a/html/perm/group_project/w_group_project.php b/html/perm/group_project/w_group_project.php index df42cd0c..d2c7bb9c 100644 --- a/html/perm/group_project/w_group_project.php +++ b/html/perm/group_project/w_group_project.php @@ -1,18 +1,18 @@ bind('id_config_project',$id_config_project); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); - } + foreach ($f_id_config_project as $id_config_project) { + $lib='INSERT INTO perm_project_group + (id_config_project, id_auth_group ) + VALUES + (:id_config_project, :f_id_auth_group)'; + + $connSQL=new DB(); + $connSQL->bind('id_config_project',$id_config_project); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); + } } ?> diff --git a/html/perm/module/d_module.php b/html/perm/module/d_module.php index 99261cde..def1733d 100644 --- a/html/perm/module/d_module.php +++ b/html/perm/module/d_module.php @@ -1,24 +1,24 @@
    '.$all_group_project[$i]->project.''.$all_group_project[$i]->project_description.'
    '.$all_group_project[$i]->project.''.$all_group_project[$i]->project_description.'
    - - - - + + + + - - - - - - '; + echo ' + + + + + + '; } ?> diff --git a/html/perm/module/e_module.php b/html/perm/module/e_module.php index e363077a..3512a475 100644 --- a/html/perm/module/e_module.php +++ b/html/perm/module/e_module.php @@ -1,11 +1,11 @@ bind('f_id_perm_module',$f_id_perm_module); - $connSQL->query($lib); + $lib='DELETE FROM perm_module WHERE id_perm_module=:f_id_perm_module'; + + $connSQL=new DB(); + $connSQL->bind('f_id_perm_module',$f_id_perm_module); + $connSQL->query($lib); } ?> diff --git a/html/perm/module/r_module_wh_id.php b/html/perm/module/r_module_wh_id.php index 976c99ca..e8b5cfe6 100644 --- a/html/perm/module/r_module_wh_id.php +++ b/html/perm/module/r_module_wh_id.php @@ -1,10 +1,10 @@ bind('f_id_perm_module',$f_id_perm_module); - $lib='SELECT * FROM perm_module WHERE id_perm_module=:f_id_perm_module'; - $cur_module=$connSQL->row($lib); + $f_id_perm_module=filter_input(INPUT_GET,'f_id_perm_module',FILTER_SANITIZE_NUMBER_INT); + + $connSQL=new DB(); + $connSQL->bind('f_id_perm_module',$f_id_perm_module); + $lib='SELECT * FROM perm_module WHERE id_perm_module=:f_id_perm_module'; + $cur_module=$connSQL->row($lib); } ?> diff --git a/html/perm/module/w_module.php b/html/perm/module/w_module.php index 5335e190..e7b40738 100644 --- a/html/perm/module/w_module.php +++ b/html/perm/module/w_module.php @@ -1,35 +1,35 @@ bind('f_id_perm_module',$f_id_perm_module); - $lib=' - UPDATE perm_module SET - module=:f_module, - component=:f_component, - menu_name=:f_menu_name, - menu_order=:f_menu_order - WHERE - id_perm_module=:f_id_perm_module'; - $connSQL->bind('f_id_perm_module',$f_id_perm_module); + $f_id_perm_module=filter_input(INPUT_POST,'f_id_perm_module',FILTER_SANITIZE_NUMBER_INT); + $f_module=filter_input(INPUT_POST,'f_module',FILTER_SANITIZE_SPECIAL_CHARS); + $f_component=filter_input(INPUT_POST,'f_component',FILTER_SANITIZE_SPECIAL_CHARS); + $f_menu_name=filter_input(INPUT_POST,'f_menu_name',FILTER_SANITIZE_SPECIAL_CHARS); + $f_menu_order=filter_input(INPUT_POST,'f_menu_order',FILTER_SANITIZE_NUMBER_INT); - } else { // INSERT - $lib='INSERT INTO perm_module (module, component, menu_name, menu_order) - VALUES (:f_module, :f_component, :f_menu_name, :f_menu_order)'; - } - - $connSQL->bind('f_module',$f_module); - $connSQL->bind('f_component',$f_component); - $connSQL->bind('f_menu_name',$f_menu_name); - $connSQL->bind('f_menu_order',$f_menu_order); - $connSQL->query($lib); + $connSQL=new DB(); + if ($_POST['f_id_perm_module']) { // UPDATE + $connSQL->bind('f_id_perm_module',$f_id_perm_module); + $lib=' + UPDATE perm_module SET + module=:f_module, + component=:f_component, + menu_name=:f_menu_name, + menu_order=:f_menu_order + WHERE + id_perm_module=:f_id_perm_module'; + + $connSQL->bind('f_id_perm_module',$f_id_perm_module); + + } else { // INSERT + $lib='INSERT INTO perm_module (module, component, menu_name, menu_order) + VALUES (:f_module, :f_component, :f_menu_name, :f_menu_order)'; + } + + $connSQL->bind('f_module',$f_module); + $connSQL->bind('f_component',$f_component); + $connSQL->bind('f_menu_name',$f_menu_name); + $connSQL->bind('f_menu_order',$f_menu_order); + $connSQL->query($lib); } ?> diff --git a/html/perm/module_group/d_module_group.php b/html/perm/module_group/d_module_group.php index 676dd7d6..70a39953 100644 --- a/html/perm/module_group/d_module_group.php +++ b/html/perm/module_group/d_module_group.php @@ -1,17 +1,17 @@
    '.$all_module[$i]->module.''.$all_module[$i]->component.''.$all_module[$i]->menu_name.''.$all_module[$i]->menu_order.'
    '.$all_module[$i]->module.''.$all_module[$i]->component.''.$all_module[$i]->menu_name.''.$all_module[$i]->menu_order.'
    - + - - - '; + echo ' + + + '; } ?> diff --git a/html/perm/module_group/e_module_group.php b/html/perm/module_group/e_module_group.php index 0f2caa6b..a018d461 100644 --- a/html/perm/module_group/e_module_group.php +++ b/html/perm/module_group/e_module_group.php @@ -1,14 +1,14 @@ bind('f_id_perm_module',$f_id_perm_module); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + $f_id_perm_module=filter_input(INPUT_POST,'f_id_perm_module',FILTER_SANITIZE_NUMBER_INT); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM perm_module_group WHERE id_perm_module=:f_id_perm_module AND id_auth_group=:f_id_auth_group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_perm_module',$f_id_perm_module); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/perm/module_group/e_module_group_wh_id.php b/html/perm/module_group/e_module_group_wh_id.php index 99fdd016..7702959d 100644 --- a/html/perm/module_group/e_module_group_wh_id.php +++ b/html/perm/module_group/e_module_group_wh_id.php @@ -1,12 +1,12 @@ bind('f_id_perm_module',$f_id_perm_module); - $connSQL->query($lib); + $f_id_perm_module=filter_input(INPUT_POST,'f_id_perm_module',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM perm_module_group WHERE id_perm_module=:f_id_perm_module'; + + $connSQL=new DB(); + $connSQL->bind('f_id_perm_module',$f_id_perm_module); + $connSQL->query($lib); } ?> diff --git a/html/perm/module_group/r_module_group.php b/html/perm/module_group/r_module_group.php index ec1f383b..2370e0c3 100644 --- a/html/perm/module_group/r_module_group.php +++ b/html/perm/module_group/r_module_group.php @@ -1,43 +1,43 @@ bind('f_id_perm_module',$f_id_perm_module); - $all_module_group=$connSQL->query($lib); - $cpt_module_group=count($all_module_group); - - - $lib='SELECT - * - FROM - auth_group ag - WHERE - ag.id_auth_group NOT IN ( - SELECT id_auth_group - FROM perm_module_group - WHERE id_perm_module=:f_id_perm_module - ) - ORDER BY - ag.group'; - - $connSQL=new DB(); - $connSQL->bind('f_id_perm_module',$f_id_perm_module); - $all_group=$connSQL->query($lib); - $cpt_group=count($all_group); + $connSQL=new DB(); + $lib='SELECT + pmg.id_perm_module, + pmg.id_auth_group, + pm.module, + ag.group, + ag.group_description + FROM + perm_module_group pmg + LEFT JOIN perm_module pm + ON pmg.id_perm_module=pm.id_perm_module + LEFT JOIN auth_group ag + ON pmg.id_auth_group=ag.id_auth_group + WHERE pmg.id_perm_module=:f_id_perm_module'; + + $connSQL->bind('f_id_perm_module',$f_id_perm_module); + $all_module_group=$connSQL->query($lib); + $cpt_module_group=count($all_module_group); + + + $lib='SELECT + * + FROM + auth_group ag + WHERE + ag.id_auth_group NOT IN ( + SELECT id_auth_group + FROM perm_module_group + WHERE id_perm_module=:f_id_perm_module + ) + ORDER BY + ag.group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_perm_module',$f_id_perm_module); + $all_group=$connSQL->query($lib); + $cpt_group=count($all_group); } ?> diff --git a/html/perm/module_group/r_module_group_wh_id.php b/html/perm/module_group/r_module_group_wh_id.php index d2fde13e..9d232bc4 100644 --- a/html/perm/module_group/r_module_group_wh_id.php +++ b/html/perm/module_group/r_module_group_wh_id.php @@ -1,26 +1,26 @@ bind('f_id_perm_module',$f_id_perm_module); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $cur_module_group=$connSQL->row($lib); + $connSQL=new DB(); + $lib='SELECT + pmg.id_perm_module, + pmg.id_auth_group, + pm.module, + ag.group, + ag.group_description + FROM + perm_module_group pmg + LEFT JOIN perm_module pm + ON pmg.id_perm_module=pm.id_perm_module + LEFT JOIN auth_group ag + ON pmg.id_auth_group=ag.id_auth_group + WHERE pmg.id_perm_module=:f_id_perm_module + AND pmg.id_auth_group=:f_id_auth_group'; + + $connSQL->bind('f_id_perm_module',$f_id_perm_module); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $cur_module_group=$connSQL->row($lib); } ?> diff --git a/html/perm/module_group/w_module_group.php b/html/perm/module_group/w_module_group.php index c08faafc..031b8ee2 100644 --- a/html/perm/module_group/w_module_group.php +++ b/html/perm/module_group/w_module_group.php @@ -1,21 +1,21 @@ bind('f_id_perm_module',$f_id_perm_module); - $connSQL->bind('id_auth_group',$id_auth_group); - $connSQL->query($lib); - } - } + $f_id_perm_module=filter_input(INPUT_POST,'f_id_perm_module',FILTER_SANITIZE_NUMBER_INT); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT,FILTER_REQUIRE_ARRAY); + + if (!empty($f_id_auth_group)) { + foreach ($f_id_auth_group as $id_auth_group) { + $lib='INSERT INTO perm_module_group + (id_perm_module, id_auth_group) + VALUES + (:f_id_perm_module, :id_auth_group)'; + + $connSQL=new DB(); + $connSQL->bind('f_id_perm_module',$f_id_perm_module); + $connSQL->bind('id_auth_group',$id_auth_group); + $connSQL->query($lib); + } + } } ?> diff --git a/html/perm/project_group/d_project_group.php b/html/perm/project_group/d_project_group.php index 15dbf81d..b68bcbf9 100644 --- a/html/perm/project_group/d_project_group.php +++ b/html/perm/project_group/d_project_group.php @@ -1,19 +1,19 @@
    '.$all_module_group[$i]->group.'
    '.$all_module_group[$i]->group.'
    - - + + - - - - '; + echo ' + + + + '; } ?> diff --git a/html/perm/project_group/e_project_group.php b/html/perm/project_group/e_project_group.php index 30e4b526..6d24cce0 100644 --- a/html/perm/project_group/e_project_group.php +++ b/html/perm/project_group/e_project_group.php @@ -1,14 +1,14 @@ bind('f_id_config_project',$f_id_config_project); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + $f_id_config_project=filter_input(INPUT_POST,'f_id_config_project',FILTER_SANITIZE_NUMBER_INT); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM perm_project_group WHERE id_config_project=:f_id_config_project AND id_auth_group=:f_id_auth_group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/perm/project_group/e_project_group_wh_id.php b/html/perm/project_group/e_project_group_wh_id.php index af695b83..4e029357 100644 --- a/html/perm/project_group/e_project_group_wh_id.php +++ b/html/perm/project_group/e_project_group_wh_id.php @@ -1,12 +1,12 @@ bind('f_id_config_project',$f_id_config_project); - $connSQL->query($lib); + $f_id_config_project=filter_input(INPUT_POST,'f_id_config_project',FILTER_SANITIZE_NUMBER_INT); + + $lib='DELETE FROM perm_project_group WHERE id_config_project=:f_id_config_project'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->query($lib); } ?> diff --git a/html/perm/project_group/r_project_group.php b/html/perm/project_group/r_project_group.php index 382b2a54..fe8a0ed8 100644 --- a/html/perm/project_group/r_project_group.php +++ b/html/perm/project_group/r_project_group.php @@ -1,43 +1,43 @@ bind('f_id_config_project',$f_id_config_project); - $all_project_group=$connSQL->query($lib); - $cpt_project_group=count($all_project_group); - - - $lib='SELECT - * - FROM - auth_group ag - WHERE - ag.id_auth_group NOT IN ( - SELECT id_auth_group - FROM perm_project_group - WHERE id_config_project=:f_id_config_project - ) - ORDER BY - ag.group'; - - $connSQL=new DB(); - $connSQL->bind('f_id_config_project',$f_id_config_project); - $all_group=$connSQL->query($lib); - $cpt_group=count($all_group); + $lib='SELECT + ppg.id_config_project, + ppg.id_auth_group, + cp.project, + ag.group, + ag.group_description + FROM + perm_project_group ppg + LEFT JOIN config_project cp + ON ppg.id_config_project=cp.id_config_project + LEFT JOIN auth_group ag + ON ppg.id_auth_group=ag.id_auth_group + WHERE ppg.id_config_project=:f_id_config_project'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_project',$f_id_config_project); + $all_project_group=$connSQL->query($lib); + $cpt_project_group=count($all_project_group); + + + $lib='SELECT + * + FROM + auth_group ag + WHERE + ag.id_auth_group NOT IN ( + SELECT id_auth_group + FROM perm_project_group + WHERE id_config_project=:f_id_config_project + ) + ORDER BY + ag.group'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_project',$f_id_config_project); + $all_group=$connSQL->query($lib); + $cpt_group=count($all_group); } ?> diff --git a/html/perm/project_group/r_project_group_wh_id.php b/html/perm/project_group/r_project_group_wh_id.php index a94e7039..cf086f86 100644 --- a/html/perm/project_group/r_project_group_wh_id.php +++ b/html/perm/project_group/r_project_group_wh_id.php @@ -1,27 +1,27 @@ bind('f_id_config_project',$f_id_config_project); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $cur_project_group=$connSQL->row($lib); + $connSQL=new DB(); + /* A FAIRE A PARTIR D'ICI DEMAIN GROS BOULET */ + $lib='SELECT + ppg.id_config_project, + ppg.id_auth_group, + cp.project, + ag.group, + ag.group_description + FROM + perm_project_group ppg + LEFT JOIN config_project cp + ON ppg.id_config_project=cp.id_config_project + LEFT JOIN auth_group ag + ON ppg.id_auth_group=ag.id_auth_group + WHERE ppg.id_config_project=:f_id_config_project + AND ppg.id_auth_group=:f_id_auth_group'; + + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $cur_project_group=$connSQL->row($lib); } ?> diff --git a/html/perm/project_group/w_project_group.php b/html/perm/project_group/w_project_group.php index e855ad82..aec603a9 100644 --- a/html/perm/project_group/w_project_group.php +++ b/html/perm/project_group/w_project_group.php @@ -1,20 +1,20 @@ bind('f_id_config_project',$f_id_config_project); - $connSQL->bind('id_auth_group',$id_auth_group); - $connSQL->query($lib); - } - } + if (!empty($f_id_auth_group)) { + foreach ($f_id_auth_group as $id_auth_group) { + $lib='INSERT INTO perm_project_group + (id_config_project, id_auth_group) + VALUES + (:f_id_config_project, :id_auth_group)'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_project',$f_id_config_project); + $connSQL->bind('id_auth_group',$id_auth_group); + $connSQL->query($lib); + } + } } ?> diff --git a/html/small_admin/myaccount/r_myaccount_wh_id.php b/html/small_admin/myaccount/r_myaccount_wh_id.php index fde2e8cf..308fd418 100644 --- a/html/small_admin/myaccount/r_myaccount_wh_id.php +++ b/html/small_admin/myaccount/r_myaccount_wh_id.php @@ -1,10 +1,10 @@ bind('s_id_user',$s_id_user); - $cur_user=$connSQL->row($lib); + $s_id_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); + + $connSQL=new DB(); + $lib='SELECT * FROM auth_user WHERE id_auth_user=:s_id_user'; + $connSQL->bind('s_id_user',$s_id_user); + $cur_user=$connSQL->row($lib); } ?> diff --git a/html/small_admin/myaccount/w_myaccount.php b/html/small_admin/myaccount/w_myaccount.php index d011249f..be1b6ceb 100644 --- a/html/small_admin/myaccount/w_myaccount.php +++ b/html/small_admin/myaccount/w_myaccount.php @@ -1,44 +1,44 @@ bind('f_passwd',$f_passwd); - } else { - $libpasswd =''; - } - $lib=' - UPDATE auth_user SET - nom=:f_nom, - prenom=:f_prenom, - user=:f_user, - mail=:f_mail, - '.$libpasswd.' - type=:f_type - WHERE - id_auth_user=:f_id_auth_user'; - $connSQL=new DB(); - $connSQL->bind('f_id_auth_user',$f_id_auth_user); - $connSQL->bind('f_nom',$f_nom); - $connSQL->bind('f_prenom',$f_prenom); - $connSQL->bind('f_user',$f_user); - $connSQL->bind('f_mail',$f_mail); - $connSQL->bind('f_type',$f_type); + if ($_POST['f_id_auth_user'] && $f_id_auth_user==$s_id_user) { // UPDATE + if ($f_passwd) { + $libpasswd='passwd=PASSWORD(:f_passwd),'; + $connSQL->bind('f_passwd',$f_passwd); + } else { + $libpasswd =''; + } + $lib=' + UPDATE auth_user SET + nom=:f_nom, + prenom=:f_prenom, + user=:f_user, + mail=:f_mail, + '.$libpasswd.' + type=:f_type + WHERE + id_auth_user=:f_id_auth_user'; - $res=$connSQL->query($lib); - } else { - echo 'Beuuarrhhhh !!'; - } + $connSQL=new DB(); + $connSQL->bind('f_id_auth_user',$f_id_auth_user); + $connSQL->bind('f_nom',$f_nom); + $connSQL->bind('f_prenom',$f_prenom); + $connSQL->bind('f_user',$f_user); + $connSQL->bind('f_mail',$f_mail); + $connSQL->bind('f_type',$f_type); + + $res=$connSQL->query($lib); + } else { + echo 'Beuuarrhhhh !!'; + } } ?> diff --git a/html/small_admin/mydashboard/d_dynamic_dashboard.php b/html/small_admin/mydashboard/d_dynamic_dashboard.php index 00d05948..aa82f3e3 100644 --- a/html/small_admin/mydashboard/d_dynamic_dashboard.php +++ b/html/small_admin/mydashboard/d_dynamic_dashboard.php @@ -1,18 +1,18 @@
    '.$all_project_group[$i]->group.''.$all_project_group[$i]->group_description.'
    '.$all_project_group[$i]->group.''.$all_project_group[$i]->group_description.'
    - + - - - '; + echo ' + + + '; } ?> diff --git a/html/small_admin/mydashboard/e_dynamic_dashboard.php b/html/small_admin/mydashboard/e_dynamic_dashboard.php index 71a1cc2d..e1fa9cab 100644 --- a/html/small_admin/mydashboard/e_dynamic_dashboard.php +++ b/html/small_admin/mydashboard/e_dynamic_dashboard.php @@ -1,36 +1,36 @@ bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $connSQL->bind('s_id_user',$s_id_user); - $cur_dynamic_dashboard=$connSQL->row($lib); - - if ($cur_dynamic_dashboard) { - $connSQL=new DB(); + $f_id_config_dynamic_dashboard=filter_input(INPUT_POST,'f_id_config_dynamic_dashboard',FILTER_SANITIZE_NUMBER_INT); + $s_id_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); - $lib='DELETE FROM config_dynamic_dashboard_content WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard'; - $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $connSQL->query($lib); - - $lib='DELETE FROM config_dynamic_dashboard_group WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard'; - $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $connSQL->query($lib); - - $lib='DELETE FROM config_dynamic_dashboard WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard'; - $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $connSQL->query($lib); - } + $connSQL=new DB(); + $lib='SELECT * + FROM config_dynamic_dashboard cdd + LEFT JOIN config_dynamic_dashboard_group cddg + ON cdd.id_config_dynamic_dashboard=cddg.id_config_dynamic_dashboard + LEFT JOIN auth_user_group aug + ON cddg.id_auth_group=aug.id_auth_group + WHERE cdd.id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard + AND aug.id_auth_user=:s_id_user'; + + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $connSQL->bind('s_id_user',$s_id_user); + $cur_dynamic_dashboard=$connSQL->row($lib); + + if ($cur_dynamic_dashboard) { + $connSQL=new DB(); + + $lib='DELETE FROM config_dynamic_dashboard_content WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard'; + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $connSQL->query($lib); + + $lib='DELETE FROM config_dynamic_dashboard_group WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard'; + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $connSQL->query($lib); + + $lib='DELETE FROM config_dynamic_dashboard WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard'; + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $connSQL->query($lib); + } } ?> diff --git a/html/small_admin/mydashboard/r_dynamic_dashboard.php b/html/small_admin/mydashboard/r_dynamic_dashboard.php index b7ca4e2c..1548ef68 100644 --- a/html/small_admin/mydashboard/r_dynamic_dashboard.php +++ b/html/small_admin/mydashboard/r_dynamic_dashboard.php @@ -2,16 +2,16 @@ $connSQL=new DB(); $s_id_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); -$lib='SELECT cdd.* - FROM config_dynamic_dashboard cdd - LEFT JOIN config_dynamic_dashboard_group cddg - ON cdd.id_config_dynamic_dashboard=cddg.id_config_dynamic_dashboard - LEFT JOIN auth_user_group aug - ON cddg.id_auth_group=aug.id_auth_group - WHERE aug.id_auth_user=:s_id_user - AND cddg.group_manager=1 - GROUP BY cdd.title - ORDER BY cdd.title'; +$lib='SELECT cdd.* + FROM config_dynamic_dashboard cdd + LEFT JOIN config_dynamic_dashboard_group cddg + ON cdd.id_config_dynamic_dashboard=cddg.id_config_dynamic_dashboard + LEFT JOIN auth_user_group aug + ON cddg.id_auth_group=aug.id_auth_group + WHERE aug.id_auth_user=:s_id_user + AND cddg.group_manager=1 + GROUP BY cdd.title + ORDER BY cdd.title'; $connSQL->bind('s_id_user',$s_id_user); diff --git a/html/small_admin/mydashboard/r_dynamic_dashboard_wh_id.php b/html/small_admin/mydashboard/r_dynamic_dashboard_wh_id.php index 1c0ea719..720a8ca9 100644 --- a/html/small_admin/mydashboard/r_dynamic_dashboard_wh_id.php +++ b/html/small_admin/mydashboard/r_dynamic_dashboard_wh_id.php @@ -1,20 +1,20 @@ bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $connSQL->bind('s_id_user',$s_id_user); - $cur_dynamic_dashboard=$connSQL->row($lib); + $f_id_config_dynamic_dashboard=filter_input(INPUT_GET,'f_id_config_dynamic_dashboard',FILTER_SANITIZE_NUMBER_INT); + $s_id_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); + + $connSQL=new DB(); + $lib='SELECT * + FROM config_dynamic_dashboard cdd + LEFT JOIN config_dynamic_dashboard_group cddg + ON cdd.id_config_dynamic_dashboard=cddg.id_config_dynamic_dashboard + LEFT JOIN auth_user_group aug + ON cddg.id_auth_group=aug.id_auth_group + WHERE cdd.id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard + AND aug.id_auth_user=:s_id_user'; + + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $connSQL->bind('s_id_user',$s_id_user); + $cur_dynamic_dashboard=$connSQL->row($lib); } ?> diff --git a/html/small_admin/mydashboard/w_dynamic_dashboard.php b/html/small_admin/mydashboard/w_dynamic_dashboard.php index 2b706151..f84ad56b 100644 --- a/html/small_admin/mydashboard/w_dynamic_dashboard.php +++ b/html/small_admin/mydashboard/w_dynamic_dashboard.php @@ -1,54 +1,54 @@ bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $connSQL->bind('f_title',$f_title); - $connSQL->query($lib); - - } else { // INSERT - $lib='INSERT INTO config_dynamic_dashboard (title) - VALUES (:f_title)'; - $connSQL->bind('f_title',$f_title); - $connSQL->query($lib); - - $id_config_dynamic_dashboard=$connSQL->lastInsertId(); - - if ($id_config_dynamic_dashboard!==0) { - $lib='SELECT ag.id_auth_group - FROM auth_group ag - LEFT JOIN auth_user_group aug - ON ag.id_auth_group=aug.id_auth_group - WHERE aug.id_auth_user=:s_id_user'; - - $connSQL->bind('s_id_user',$s_id_user); - $cur_group=$connSQL->query($lib); - $cpt_group=count($cur_group); - - for ($i=0; $i<$cpt_group; $i++) { - $id_auth_group=$cur_group[$i]->id_auth_group; - - $lib='INSERT INTO config_dynamic_dashboard_group - (id_config_dynamic_dashboard, id_auth_group, group_manager) - VALUES - (:id_config_dynamic_dashboard, :id_auth_group ,1)'; - $connSQL->bind('id_config_dynamic_dashboard',$id_config_dynamic_dashboard); - $connSQL->bind('id_auth_group',$id_auth_group); - $connSQL->query($lib); - } - } - } + $connSQL=new DB(); + + $f_id_config_dynamic_dashboard=filter_input(INPUT_POST,'f_id_config_dynamic_dashboard',FILTER_SANITIZE_NUMBER_INT); + $f_title=filter_input(INPUT_POST,'f_title',FILTER_SANITIZE_SPECIAL_CHARS); + $f_dynamic_dashboard_description=filter_input(INPUT_POST,'f_dynamic_dashboard_description',FILTER_SANITIZE_SPECIAL_CHARS); + $s_id_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); + + if ($_POST['f_id_config_dynamic_dashboard']) { // UPDATE + $lib=' + UPDATE config_dynamic_dashboard SET + title=:f_title + WHERE + id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard'; + + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $connSQL->bind('f_title',$f_title); + $connSQL->query($lib); + + } else { // INSERT + $lib='INSERT INTO config_dynamic_dashboard (title) + VALUES (:f_title)'; + $connSQL->bind('f_title',$f_title); + $connSQL->query($lib); + + $id_config_dynamic_dashboard=$connSQL->lastInsertId(); + + if ($id_config_dynamic_dashboard!==0) { + $lib='SELECT ag.id_auth_group + FROM auth_group ag + LEFT JOIN auth_user_group aug + ON ag.id_auth_group=aug.id_auth_group + WHERE aug.id_auth_user=:s_id_user'; + + $connSQL->bind('s_id_user',$s_id_user); + $cur_group=$connSQL->query($lib); + $cpt_group=count($cur_group); + + for ($i=0; $i<$cpt_group; $i++) { + $id_auth_group=$cur_group[$i]->id_auth_group; + + $lib='INSERT INTO config_dynamic_dashboard_group + (id_config_dynamic_dashboard, id_auth_group, group_manager) + VALUES + (:id_config_dynamic_dashboard, :id_auth_group ,1)'; + $connSQL->bind('id_config_dynamic_dashboard',$id_config_dynamic_dashboard); + $connSQL->bind('id_auth_group',$id_auth_group); + $connSQL->query($lib); + } + } + } } ?> diff --git a/html/small_admin/mydashboard_content/ajax_dynamic_dashboard_content_test_regex.php b/html/small_admin/mydashboard_content/ajax_dynamic_dashboard_content_test_regex.php index 48fe476d..de6fefe2 100644 --- a/html/small_admin/mydashboard_content/ajax_dynamic_dashboard_content_test_regex.php +++ b/html/small_admin/mydashboard_content/ajax_dynamic_dashboard_content_test_regex.php @@ -4,93 +4,93 @@ $auth = new AUTH_USER(); if (!$auth->verif_auth()) { - die(); + die(); } if ($_POST['f_regex_srv']) { - $f_regex_srv=filter_input(INPUT_POST,'f_regex_srv',FILTER_SANITIZE_SPECIAL_CHARS); - $s_id_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); - - $connSQL=new DB(); - $lib=' - SELECT - cs.id_config_server, - cs.server_name - FROM config_server cs - LEFT JOIN config_server_project csp - ON cs.id_config_server=csp.id_config_server - LEFT JOIN perm_project_group ppg - ON ppg.id_config_project=csp.id_config_project - LEFT JOIN auth_group ag - ON ag.id_auth_group=ppg.id_auth_group - LEFT JOIN auth_user_group aug - ON aug.id_auth_group=ag.id_auth_group - WHERE aug.id_auth_user=:s_id_user - AND cs.server_name REGEXP :f_regex_srv - GROUP BY id_config_server, server_name - ORDER BY server_name'; - - $connSQL->bind('f_regex_srv',$f_regex_srv); - $connSQL->bind('s_id_user',$s_id_user); - $all_server=$connSQL->query($lib); - $cpt_server=count($all_server); - - $f_regex_p=filter_input(INPUT_POST,'f_regex_p',FILTER_SANITIZE_SPECIAL_CHARS); - $f_regex_pi=filter_input(INPUT_POST,'f_regex_pi',FILTER_SANITIZE_SPECIAL_CHARS); - $f_regex_t=filter_input(INPUT_POST,'f_regex_t',FILTER_SANITIZE_SPECIAL_CHARS); - $f_regex_ti=filter_input(INPUT_POST,'f_regex_ti',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_srv=filter_input(INPUT_POST,'f_regex_srv',FILTER_SANITIZE_SPECIAL_CHARS); + $s_id_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); - for ($i=0; $i<$cpt_server; $i++) { - $allDatadir=getAllDatadir(); - foreach($allDatadir as $key => $datadir){ - if(!is_dir($datadir.'/'.$all_server[$i]->server_name.'/')) unset($allDatadir[$key]); - } + $connSQL=new DB(); + $lib=' + SELECT + cs.id_config_server, + cs.server_name + FROM config_server cs + LEFT JOIN config_server_project csp + ON cs.id_config_server=csp.id_config_server + LEFT JOIN perm_project_group ppg + ON ppg.id_config_project=csp.id_config_project + LEFT JOIN auth_group ag + ON ag.id_auth_group=ppg.id_auth_group + LEFT JOIN auth_user_group aug + ON aug.id_auth_group=ag.id_auth_group + WHERE aug.id_auth_user=:s_id_user + AND cs.server_name REGEXP :f_regex_srv + GROUP BY id_config_server, server_name + ORDER BY server_name'; - if (!empty($allDatadir)) { - $myregex='#^(('.implode('|',$allDatadir).')/'.$all_server[$i]->server_name.'/)('.$f_regex_p.')(?:\-('.$f_regex_pi.'))?/('.$f_regex_t.')(?:\-('.$f_regex_ti.'))?\.rrd#'; + $connSQL->bind('f_regex_srv',$f_regex_srv); + $connSQL->bind('s_id_user',$s_id_user); + $all_server=$connSQL->query($lib); + $cpt_server=count($all_server); - $plugins = array(); - foreach($allDatadir as $datadir) { - $tplugins = preg_find($myregex, $datadir.'/'.$all_server[$i]->server_name, PREG_FIND_RECURSIVE|PREG_FIND_FULLPATH|PREG_FIND_SORTBASENAME); - $plugins=array_merge($plugins, $tplugins); - } + $f_regex_p=filter_input(INPUT_POST,'f_regex_p',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_pi=filter_input(INPUT_POST,'f_regex_pi',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_t=filter_input(INPUT_POST,'f_regex_t',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_ti=filter_input(INPUT_POST,'f_regex_ti',FILTER_SANITIZE_SPECIAL_CHARS); - foreach ($plugins as $plugin) { - preg_match($myregex, $plugin, $matches); - if (isset($matches[3])) { - $str=$matches[3]; - } - if (isset($matches[4]) && $matches[4]!='') { - $str.='-'.$matches[4].'/'; - } else { - $str.='/'; - } - if (isset($matches[5])) { - $str.=$matches[5]; - } - if (isset($matches[6]) && $matches[6]!='') { - $str.='-'.$matches[6].'.rrd'; - } else { - $str.='.rrd'; - } - $plugin_array[]=$str; - } - - } - } + for ($i=0; $i<$cpt_server; $i++) { + $allDatadir=getAllDatadir(); + foreach($allDatadir as $key => $datadir){ + if(!is_dir($datadir.'/'.$all_server[$i]->server_name.'/')) unset($allDatadir[$key]); + } - echo '
    '.SERVERS_FOUND.'
    '; - foreach ($all_server as $server) { - echo $server->server_name.', '; - } - echo '

    -
    '.RRDS_FOUND.'
    '; - - $plugin_array=array_unique($plugin_array,SORT_REGULAR); + if (!empty($allDatadir)) { + $myregex='#^(('.implode('|',$allDatadir).')/'.$all_server[$i]->server_name.'/)('.$f_regex_p.')(?:\-('.$f_regex_pi.'))?/('.$f_regex_t.')(?:\-('.$f_regex_ti.'))?\.rrd#'; - foreach ($plugin_array as $plugin) { - echo $plugin.'
    '; - } - echo '
    '; + $plugins = array(); + foreach($allDatadir as $datadir) { + $tplugins = preg_find($myregex, $datadir.'/'.$all_server[$i]->server_name, PREG_FIND_RECURSIVE|PREG_FIND_FULLPATH|PREG_FIND_SORTBASENAME); + $plugins=array_merge($plugins, $tplugins); + } + + foreach ($plugins as $plugin) { + preg_match($myregex, $plugin, $matches); + if (isset($matches[3])) { + $str=$matches[3]; + } + if (isset($matches[4]) && $matches[4]!='') { + $str.='-'.$matches[4].'/'; + } else { + $str.='/'; + } + if (isset($matches[5])) { + $str.=$matches[5]; + } + if (isset($matches[6]) && $matches[6]!='') { + $str.='-'.$matches[6].'.rrd'; + } else { + $str.='.rrd'; + } + $plugin_array[]=$str; + } + + } + } + + echo '
    '.SERVERS_FOUND.'
    '; + foreach ($all_server as $server) { + echo $server->server_name.', '; + } + echo '

    +
    '.RRDS_FOUND.'
    '; + + $plugin_array=array_unique($plugin_array,SORT_REGULAR); + + foreach ($plugin_array as $plugin) { + echo $plugin.'
    '; + } + echo '
    '; } -?> +?> diff --git a/html/small_admin/mydashboard_content/d_dynamic_dashboard_content.php b/html/small_admin/mydashboard_content/d_dynamic_dashboard_content.php index 9c6fb134..bcf769d4 100644 --- a/html/small_admin/mydashboard_content/d_dynamic_dashboard_content.php +++ b/html/small_admin/mydashboard_content/d_dynamic_dashboard_content.php @@ -1,32 +1,32 @@
    '.$all_dynamic_dashboard[$i]->title.'
    '.$all_dynamic_dashboard[$i]->title.'
    - - - - - - - - + + + + + + + + - - - - - - - - - - '; + echo ' + + + + + + + + + + '; } ?> diff --git a/html/small_admin/mydashboard_content/e_dynamic_dashboard_content.php b/html/small_admin/mydashboard_content/e_dynamic_dashboard_content.php index e45fb285..662e2e43 100644 --- a/html/small_admin/mydashboard_content/e_dynamic_dashboard_content.php +++ b/html/small_admin/mydashboard_content/e_dynamic_dashboard_content.php @@ -1,11 +1,11 @@ bind('f_id_config_dynamic_dashboard_content',$f_id_config_dynamic_dashboard_content); - $connSQL->query($lib); + $lib='DELETE FROM config_dynamic_dashboard_content WHERE id_config_dynamic_dashboard_content=:f_id_config_dynamic_dashboard_content'; + + $connSQL=new DB(); + $connSQL->bind('f_id_config_dynamic_dashboard_content',$f_id_config_dynamic_dashboard_content); + $connSQL->query($lib); } ?> diff --git a/html/small_admin/mydashboard_content/f_dynamic_dashboard_content.php b/html/small_admin/mydashboard_content/f_dynamic_dashboard_content.php index 540863de..06d0b448 100644 --- a/html/small_admin/mydashboard_content/f_dynamic_dashboard_content.php +++ b/html/small_admin/mydashboard_content/f_dynamic_dashboard_content.php @@ -109,43 +109,43 @@ diff --git a/html/small_admin/mydashboard_content/r_dynamic_dashboard_content.php b/html/small_admin/mydashboard_content/r_dynamic_dashboard_content.php index 24a585a8..be7fa77b 100644 --- a/html/small_admin/mydashboard_content/r_dynamic_dashboard_content.php +++ b/html/small_admin/mydashboard_content/r_dynamic_dashboard_content.php @@ -1,16 +1,16 @@ bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - $all_dynamic_dashboard_content=$connSQL->query('SELECT * FROM config_dynamic_dashboard_content - WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard ORDER BY dash_ordering'); - $cpt_dynamic_dashboard_content=count($all_dynamic_dashboard_content); + $connSQL=new DB(); + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + $all_dynamic_dashboard_content=$connSQL->query('SELECT * FROM config_dynamic_dashboard_content + WHERE id_config_dynamic_dashboard=:f_id_config_dynamic_dashboard ORDER BY dash_ordering'); + $cpt_dynamic_dashboard_content=count($all_dynamic_dashboard_content); - $connSQL=new DB(); - $all_plugin_filter=$connSQL->query('SELECT * FROM config_plugin_filter ORDER BY plugin_order, plugin_filter_desc'); - $cpt_plugin_filter=count($all_plugin_filter); + $connSQL=new DB(); + $all_plugin_filter=$connSQL->query('SELECT * FROM config_plugin_filter ORDER BY plugin_order, plugin_filter_desc'); + $cpt_plugin_filter=count($all_plugin_filter); } ?> diff --git a/html/small_admin/mydashboard_content/r_dynamic_dashboard_content_wh_id.php b/html/small_admin/mydashboard_content/r_dynamic_dashboard_content_wh_id.php index 5a435991..bd71c9df 100644 --- a/html/small_admin/mydashboard_content/r_dynamic_dashboard_content_wh_id.php +++ b/html/small_admin/mydashboard_content/r_dynamic_dashboard_content_wh_id.php @@ -1,10 +1,10 @@ bind('f_id_config_dynamic_dashboard_content',$f_id_config_dynamic_dashboard_content); - $lib='SELECT * FROM config_dynamic_dashboard_content WHERE id_config_dynamic_dashboard_content=:f_id_config_dynamic_dashboard_content'; - $cur_dynamic_dashboard_content=$connSQL->row($lib); + $f_id_config_dynamic_dashboard_content=filter_input(INPUT_GET,'f_id_config_dynamic_dashboard_content',FILTER_SANITIZE_NUMBER_INT); + + $connSQL=new DB(); + $connSQL->bind('f_id_config_dynamic_dashboard_content',$f_id_config_dynamic_dashboard_content); + $lib='SELECT * FROM config_dynamic_dashboard_content WHERE id_config_dynamic_dashboard_content=:f_id_config_dynamic_dashboard_content'; + $cur_dynamic_dashboard_content=$connSQL->row($lib); } ?> diff --git a/html/small_admin/mydashboard_content/w_dynamic_dashboard_content.php b/html/small_admin/mydashboard_content/w_dynamic_dashboard_content.php index 70383d80..a0b722a7 100644 --- a/html/small_admin/mydashboard_content/w_dynamic_dashboard_content.php +++ b/html/small_admin/mydashboard_content/w_dynamic_dashboard_content.php @@ -1,50 +1,50 @@ bind('f_id_config_dynamic_dashboard_content',$f_id_config_dynamic_dashboard_content); - $lib=' - UPDATE config_dynamic_dashboard_content SET - title=:f_title, - regex_srv=:f_regex_srv, - regex_p_filter=:f_regex_p_filter, - regex_pi_filter=:f_regex_pi_filter, - regex_t_filter=:f_regex_t_filter, - regex_ti_filter=:f_regex_ti_filter, - rrd_ordering=:f_rrd_ordering, - dash_ordering=:f_dash_ordering - WHERE - id_config_dynamic_dashboard_content=:f_id_config_dynamic_dashboard_content'; - } else { // INSERT - $connSQL=new DB(); - $lib='INSERT INTO config_dynamic_dashboard_content - (id_config_dynamic_dashboard, title, regex_srv, regex_p_filter, regex_pi_filter, regex_t_filter, regex_ti_filter, rrd_ordering, dash_ordering) - VALUES - (:f_id_config_dynamic_dashboard,:f_title, - :f_regex_srv, :f_regex_p_filter, :f_regex_pi_filter, - :f_regex_t_filter, :f_regex_ti_filter, - :f_rrd_ordering, :f_dash_ordering)'; - $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); - } - $connSQL->bind('f_title',$f_title); - $connSQL->bind('f_regex_srv',$f_regex_srv); - $connSQL->bind('f_regex_p_filter',$f_regex_p_filter); - $connSQL->bind('f_regex_pi_filter',$f_regex_pi_filter); - $connSQL->bind('f_regex_t_filter',$f_regex_t_filter); - $connSQL->bind('f_regex_ti_filter',$f_regex_ti_filter); - $connSQL->bind('f_rrd_ordering',$f_rrd_ordering); - $connSQL->bind('f_dash_ordering',$f_dash_ordering); - $connSQL->query($lib); + $f_id_config_dynamic_dashboard=filter_input(INPUT_GET,'f_id_config_dynamic_dashboard',FILTER_SANITIZE_NUMBER_INT); + $f_id_config_dynamic_dashboard_content=filter_input(INPUT_POST,'f_id_config_dynamic_dashboard_content',FILTER_SANITIZE_NUMBER_INT); + $f_dash_ordering=filter_input(INPUT_POST,'f_dash_ordering',FILTER_SANITIZE_NUMBER_INT); + $f_title=filter_input(INPUT_POST,'f_title',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_srv=filter_input(INPUT_POST,'f_regex_srv',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_p_filter=filter_input(INPUT_POST,'f_regex_p_filter',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_pi_filter=filter_input(INPUT_POST,'f_regex_pi_filter',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_t_filter=filter_input(INPUT_POST,'f_regex_t_filter',FILTER_SANITIZE_SPECIAL_CHARS); + $f_regex_ti_filter=filter_input(INPUT_POST,'f_regex_ti_filter',FILTER_SANITIZE_SPECIAL_CHARS); + $f_rrd_ordering=filter_input(INPUT_POST,'f_rrd_ordering',FILTER_SANITIZE_SPECIAL_CHARS); + + if (!empty($f_id_config_dynamic_dashboard_content)) { + $connSQL=new DB(); + $connSQL->bind('f_id_config_dynamic_dashboard_content',$f_id_config_dynamic_dashboard_content); + $lib=' + UPDATE config_dynamic_dashboard_content SET + title=:f_title, + regex_srv=:f_regex_srv, + regex_p_filter=:f_regex_p_filter, + regex_pi_filter=:f_regex_pi_filter, + regex_t_filter=:f_regex_t_filter, + regex_ti_filter=:f_regex_ti_filter, + rrd_ordering=:f_rrd_ordering, + dash_ordering=:f_dash_ordering + WHERE + id_config_dynamic_dashboard_content=:f_id_config_dynamic_dashboard_content'; + } else { // INSERT + $connSQL=new DB(); + $lib='INSERT INTO config_dynamic_dashboard_content + (id_config_dynamic_dashboard, title, regex_srv, regex_p_filter, regex_pi_filter, regex_t_filter, regex_ti_filter, rrd_ordering, dash_ordering) + VALUES + (:f_id_config_dynamic_dashboard,:f_title, + :f_regex_srv, :f_regex_p_filter, :f_regex_pi_filter, + :f_regex_t_filter, :f_regex_ti_filter, + :f_rrd_ordering, :f_dash_ordering)'; + $connSQL->bind('f_id_config_dynamic_dashboard',$f_id_config_dynamic_dashboard); + } + $connSQL->bind('f_title',$f_title); + $connSQL->bind('f_regex_srv',$f_regex_srv); + $connSQL->bind('f_regex_p_filter',$f_regex_p_filter); + $connSQL->bind('f_regex_pi_filter',$f_regex_pi_filter); + $connSQL->bind('f_regex_t_filter',$f_regex_t_filter); + $connSQL->bind('f_regex_ti_filter',$f_regex_ti_filter); + $connSQL->bind('f_rrd_ordering',$f_rrd_ordering); + $connSQL->bind('f_dash_ordering',$f_dash_ordering); + $connSQL->query($lib); } ?> diff --git a/html/small_admin/mygroup/d_group.php b/html/small_admin/mygroup/d_group.php index 6e128071..23fe6eea 100644 --- a/html/small_admin/mygroup/d_group.php +++ b/html/small_admin/mygroup/d_group.php @@ -1,20 +1,20 @@
    '.$all_dynamic_dashboard_content[$i]->title.''.$all_dynamic_dashboard_content[$i]->dash_ordering.''.$all_dynamic_dashboard_content[$i]->regex_srv.''.$all_dynamic_dashboard_content[$i]->regex_p_filter.''.$all_dynamic_dashboard_content[$i]->regex_pi_filter.''.$all_dynamic_dashboard_content[$i]->regex_t_filter.''.$all_dynamic_dashboard_content[$i]->regex_ti_filter.''.$all_dynamic_dashboard_content[$i]->rrd_ordering.'
    '.$all_dynamic_dashboard_content[$i]->title.''.$all_dynamic_dashboard_content[$i]->dash_ordering.''.$all_dynamic_dashboard_content[$i]->regex_srv.''.$all_dynamic_dashboard_content[$i]->regex_p_filter.''.$all_dynamic_dashboard_content[$i]->regex_pi_filter.''.$all_dynamic_dashboard_content[$i]->regex_t_filter.''.$all_dynamic_dashboard_content[$i]->regex_ti_filter.''.$all_dynamic_dashboard_content[$i]->rrd_ordering.'
    - - + + - - - - '; + echo ' + + + + '; } ?> diff --git a/html/small_admin/mygroup/r_group.php b/html/small_admin/mygroup/r_group.php index 5120be13..585e58a0 100644 --- a/html/small_admin/mygroup/r_group.php +++ b/html/small_admin/mygroup/r_group.php @@ -3,7 +3,7 @@ $lib='SELECT * FROM auth_group ag WHERE ag.id_auth_group IN ( - SELECT id_auth_group FROM auth_user_group WHERE id_auth_user=:s_id_user AND manager=1 + SELECT id_auth_group FROM auth_user_group WHERE id_auth_user=:s_id_user AND manager=1 ) ORDER BY ag.group'; $connSQL=new DB(); diff --git a/html/small_admin/mygroup/r_group_wh_id.php b/html/small_admin/mygroup/r_group_wh_id.php index 94e90706..274912e3 100644 --- a/html/small_admin/mygroup/r_group_wh_id.php +++ b/html/small_admin/mygroup/r_group_wh_id.php @@ -1,10 +1,10 @@ bind('f_id_auth_group',$f_id_auth_group); - $cur_group=$connSQL->row($lib); + $f_id_auth_group=filter_input(INPUT_GET,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $connSQL=new DB(); + $lib='SELECT * FROM auth_group WHERE id_auth_group=:f_id_auth_group'; + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $cur_group=$connSQL->row($lib); } ?> diff --git a/html/small_admin/mygroup/w_group.php b/html/small_admin/mygroup/w_group.php index 3f24f713..ecb53c0c 100644 --- a/html/small_admin/mygroup/w_group.php +++ b/html/small_admin/mygroup/w_group.php @@ -1,59 +1,59 @@ auth_user_group($s_id_user,$f_id_auth_group,true)) || !$f_id_auth_group) { - $connSQL=new DB(); - - if ($_POST['f_id_auth_group']) { // UPDATE - $lib=' - UPDATE auth_group ag SET - ag.group=:f_group, - ag.group_description=:f_group_description - WHERE - ag.id_auth_group=:f_id_auth_group'; - - - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->bind('f_group_description',$f_group_description); - $connSQL->query($lib); - - } else { // INSERT - $lib='INSERT INTO auth_group ag ( - ag.group, - group_description - ) - VALUES ( - :f_group, - :f_group_description - )'; - $connSQL->bind('f_group',$f_group); - $connSQL->bind('f_group_description',$f_group_description); - $connSQL->query($lib); - - $id_auth_group=$connSQL->getLastInsertId(); - - $lib='INSERT INTO auth_user_group ( - id_auth_user, - id_auth_group, - manager - ) VALUES ( - :s_id_user, - :id_auth_group, - "1" - )'; - $connSQL->bind('s_id_user',$s_id_user); - $connSQL->bind('id_auth_group',$id_auth_group); - $connSQL->query($lib); - } - } else { - echo 'Arrrrrrrrrrh am I hacked ?!!'; - } + + + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + $f_group_description=filter_input(INPUT_POST,'f_group_description',FILTER_SANITIZE_SPECIAL_CHARS); + $f_group=filter_input(INPUT_POST,'f_group',FILTER_SANITIZE_SPECIAL_CHARS); + $s_id_user=filter_var($_SESSION['S_ID_USER'], FILTER_SANITIZE_NUMBER_INT); + + $perm_grp = new PERMS(); + if (($f_id_auth_group && $perm_grp->auth_user_group($s_id_user,$f_id_auth_group,true)) || !$f_id_auth_group) { + $connSQL=new DB(); + + if ($_POST['f_id_auth_group']) { // UPDATE + $lib=' + UPDATE auth_group ag SET + ag.group=:f_group, + ag.group_description=:f_group_description + WHERE + ag.id_auth_group=:f_id_auth_group'; + + + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->bind('f_group_description',$f_group_description); + $connSQL->query($lib); + + } else { // INSERT + $lib='INSERT INTO auth_group ag ( + ag.group, + group_description + ) + VALUES ( + :f_group, + :f_group_description + )'; + $connSQL->bind('f_group',$f_group); + $connSQL->bind('f_group_description',$f_group_description); + $connSQL->query($lib); + + $id_auth_group=$connSQL->getLastInsertId(); + + $lib='INSERT INTO auth_user_group ( + id_auth_user, + id_auth_group, + manager + ) VALUES ( + :s_id_user, + :id_auth_group, + "1" + )'; + $connSQL->bind('s_id_user',$s_id_user); + $connSQL->bind('id_auth_group',$id_auth_group); + $connSQL->query($lib); + } + } else { + echo 'Arrrrrrrrrrh am I hacked ?!!'; + } } ?> diff --git a/html/small_admin/mygroup_user/d_group_user.php b/html/small_admin/mygroup_user/d_group_user.php index 18cfdeba..73684d78 100644 --- a/html/small_admin/mygroup_user/d_group_user.php +++ b/html/small_admin/mygroup_user/d_group_user.php @@ -1,26 +1,26 @@
    '.$all_group[$i]->group.''.$all_group[$i]->group_description.'
    '.$all_group[$i]->group.''.$all_group[$i]->group_description.'
    - - + + -manager==1) { - $manager=YES; - } else { - $manager=NO; - } - - echo ' - - - - '; + if($all_group_user[$i]->manager==1) { + $manager=YES; + } else { + $manager=NO; + } + + echo ' + + + + '; } ?> diff --git a/html/small_admin/mygroup_user/e_group_user.php b/html/small_admin/mygroup_user/e_group_user.php index 143efafb..69028d09 100644 --- a/html/small_admin/mygroup_user/e_group_user.php +++ b/html/small_admin/mygroup_user/e_group_user.php @@ -1,32 +1,32 @@ bind('f_id_auth_user',$f_id_auth_user); - $connSQL->bind('f_id_auth_grouo',$f_id_auth_group); - $lib='DELETE FROM auth_user_group WHERE id_auth_user=:f_id_auth_user AND id_auth_group=:f_id_auth_group'; - $connSQL->query($lib); - - // If no more user in cur group then delete it - $lib='SELECT count(*) as mycpt FROM auth_user_group WHERE id_auth_group=:f_id_auth_group'; - $res=$connSQL->row($lib); - - if ($res->mycpt == 0) { - $lib='DELETE FROM config_plugin_filter_group WHERE id_auth_group=:f_id_auth_group'; - $connSQL->query($lib); - - $lib='DELETE FROM perm_module_group WHERE id_auth_group=:f_id_auth_group'; - $connSQL->query($lib); - - $lib='DELETE FROM perm_project_group WHERE id_auth_group=:f_id_auth_group'; - $connSQL->query($lib); - - $lib='DELETE FROM auth_group WHERE id_auth_group=:$f_id_auth_group'; - $connSQL->query($lib); - } + $f_id_auth_user=filter_input(INPUT_POST,'f_id_auth_user',FILTER_SANITIZE_NUMBER_INT); + $f_id_auth_group=filter_input(INPUT_POST,'f_id_auth_group',FILTER_SANITIZE_NUMBER_INT); + + $connSQL=new DB(); + + $connSQL->bind('f_id_auth_user',$f_id_auth_user); + $connSQL->bind('f_id_auth_grouo',$f_id_auth_group); + $lib='DELETE FROM auth_user_group WHERE id_auth_user=:f_id_auth_user AND id_auth_group=:f_id_auth_group'; + $connSQL->query($lib); + + // If no more user in cur group then delete it + $lib='SELECT count(*) as mycpt FROM auth_user_group WHERE id_auth_group=:f_id_auth_group'; + $res=$connSQL->row($lib); + + if ($res->mycpt == 0) { + $lib='DELETE FROM config_plugin_filter_group WHERE id_auth_group=:f_id_auth_group'; + $connSQL->query($lib); + + $lib='DELETE FROM perm_module_group WHERE id_auth_group=:f_id_auth_group'; + $connSQL->query($lib); + + $lib='DELETE FROM perm_project_group WHERE id_auth_group=:f_id_auth_group'; + $connSQL->query($lib); + + $lib='DELETE FROM auth_group WHERE id_auth_group=:$f_id_auth_group'; + $connSQL->query($lib); + } } ?> diff --git a/html/small_admin/mygroup_user/f_group_user.php b/html/small_admin/mygroup_user/f_group_user.php index c63442e4..ae9c99fd 100644 --- a/html/small_admin/mygroup_user/f_group_user.php +++ b/html/small_admin/mygroup_user/f_group_user.php @@ -2,13 +2,13 @@ if (isset($_GET['f_id_auth_user'])) { /* Edit */ $gu_form = new Form('horizontal', removeqsvar($cur_url, 'last_action').'&last_action=edit_user'); - + $gu_form->add('hidden', 'f_id_auth_group') ->value($cur_group->id_auth_group); $gu_form->add('hidden', 'f_id_auth_user') ->value($f_id_auth_user); - + $gu_form->add('text','f_user') ->value($cur_group_user->user) ->readonly(true) @@ -16,19 +16,19 @@ ->autocomplete(false) ->labelGrid(IL_CSS) ->inputGrid(I_CSS); - + $gu_form->add('checkbox','f_manager') ->value('manager') ->label(MANAGER) ->checked(@$cur_group_user->manager) ->inputGrid(C_CSS); - + $gu_form->add('submit', 'f_submit_group_user') ->iType('add') ->value(SUBMIT) ->labelGrid(SL_CSS) ->inputGrid(S_CSS); - + echo $gu_form->bindForm(); /* Delete */ @@ -50,27 +50,27 @@ } else { /* Add */ $gu_form = new Form('horizontal', removeqsvar($cur_url, 'last_action').'&last_action=edit_user'); - + $gu_form->add('hidden', 'f_id_auth_group') ->value($cur_group->id_auth_group); - + $gu_form->add('select','f_id_auth_user') ->options($all_user, 'id_auth_user', 'user') ->label(USER) ->labelGrid(IL_CSS) ->inputGrid(I_CSS); - + $gu_form->add('checkbox','f_manager') ->value('manager') ->label(MANAGER) ->inputGrid(C_CSS); - + $gu_form->add('submit', 'f_submit_group_user') ->iType('add') ->value(SUBMIT) ->labelGrid(SL_CSS) ->inputGrid(S_CSS); - + echo $gu_form->bindForm(); } diff --git a/html/small_admin/mygroup_user/r_group_user.php b/html/small_admin/mygroup_user/r_group_user.php index 1de578f7..dc04236a 100644 --- a/html/small_admin/mygroup_user/r_group_user.php +++ b/html/small_admin/mygroup_user/r_group_user.php @@ -1,46 +1,46 @@ bind('f_id_auth_group',$f_id_auth_group); - $all_group_user=$connSQL->query($lib); - $cpt_group_user=count($all_group_user); - + $connSQL=new DB(); + $lib='SELECT + aug.id_auth_user, + aug.id_auth_group, + aug.manager, + au.user, + ag.group, + ag.group_description + FROM + auth_user_group aug + LEFT JOIN auth_user au + ON aug.id_auth_user=au.id_auth_user + LEFT JOIN auth_group ag + ON aug.id_auth_group=ag.id_auth_group + WHERE aug.id_auth_group=:f_id_auth_group'; - $lib='SELECT - * - FROM - auth_user - WHERE - id_auth_user NOT IN ( - SELECT id_auth_user - FROM auth_user_group - WHERE id_auth_group=:f_id_auth_group - ) - ORDER BY - nom, - prenom, - mail'; - $connSQL=new DB(); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $all_user=$connSQL->query($lib); - $cpt_user=count($all_user); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $all_group_user=$connSQL->query($lib); + $cpt_group_user=count($all_group_user); + + + $lib='SELECT + * + FROM + auth_user + WHERE + id_auth_user NOT IN ( + SELECT id_auth_user + FROM auth_user_group + WHERE id_auth_group=:f_id_auth_group + ) + ORDER BY + nom, + prenom, + mail'; + $connSQL=new DB(); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $all_user=$connSQL->query($lib); + $cpt_user=count($all_user); } ?> diff --git a/html/small_admin/mygroup_user/r_group_user_wh_id.php b/html/small_admin/mygroup_user/r_group_user_wh_id.php index 20cd99a4..2cd3754c 100644 --- a/html/small_admin/mygroup_user/r_group_user_wh_id.php +++ b/html/small_admin/mygroup_user/r_group_user_wh_id.php @@ -1,27 +1,27 @@ bind('f_id_auth_user',$f_id_auth_user); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $cur_group_user=$connSQL->row($lib); + $connSQL=new DB(); + $lib='SELECT + aug.id_auth_user, + aug.id_auth_group, + aug.manager, + au.user, + ag.group, + ag.group_description + FROM + auth_user_group aug + LEFT JOIN auth_user au + ON aug.id_auth_user=au.id_auth_user + LEFT JOIN auth_group ag + ON aug.id_auth_group=ag.id_auth_group + WHERE aug.id_auth_user=:f_id_auth_user + AND aug.id_auth_group=:f_id_auth_group'; + + $connSQL->bind('f_id_auth_user',$f_id_auth_user); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $cur_group_user=$connSQL->row($lib); } ?> diff --git a/html/small_admin/mygroup_user/w_group_user.php b/html/small_admin/mygroup_user/w_group_user.php index fc1cd00c..96c7f2a6 100644 --- a/html/small_admin/mygroup_user/w_group_user.php +++ b/html/small_admin/mygroup_user/w_group_user.php @@ -1,20 +1,20 @@ bind('f_id_auth_user',$f_id_auth_user); - $connSQL->bind('f_id_auth_group',$f_id_auth_group); - $connSQL->query($lib); + $lib='REPLACE INTO auth_user_group (id_auth_user,id_auth_group,manager) + VALUES (:f_id_auth_user, :f_id_auth_group, :f_manager)'; + + $connSQL=new DB(); + $connSQL->bind('f_id_auth_user',$f_id_auth_user); + $connSQL->bind('f_id_auth_group',$f_id_auth_group); + $connSQL->query($lib); } ?> diff --git a/html/small_admin/newuser/w_user.php b/html/small_admin/newuser/w_user.php index 8af5df38..c42f4e14 100644 --- a/html/small_admin/newuser/w_user.php +++ b/html/small_admin/newuser/w_user.php @@ -1,40 +1,40 @@ bind('f_nom',$f_nom); - $connSQL->bind('f_prenom',$f_prenom); - $connSQL->bind('f_user',$f_user); - $connSQL->bind('f_mail',$f_mail); - $connSQL->bind('f_passwd',$f_passwd); - $connSQL->bind('f_type',$f_type); - $connSQL->query($lib); - - echo USER.' '.$f_user.' '.CREATED.'
    '; + + $f_nom=filter_input(INPUT_POST,'f_nom',FILTER_SANITIZE_SPECIAL_CHARS); + $f_prenom=filter_input(INPUT_POST,'f_prenom',FILTER_SANITIZE_SPECIAL_CHARS); + $f_user=filter_input(INPUT_POST,'f_user',FILTER_SANITIZE_SPECIAL_CHARS); + $f_mail=filter_input(INPUT_POST,'f_mail',FILTER_SANITIZE_SPECIAL_CHARS); + $f_passwd=$_POST['f_passwd']; + $f_type=filter_input(INPUT_POST,'f_type',FILTER_SANITIZE_SPECIAL_CHARS); + + + $lib='INSERT INTO auth_user ( + nom, + prenom, + user, + mail, + passwd, + type + ) + VALUES ( + :f_nom, + :f_prenom, + :f_user, + :f_mail, + PASSWORD(:f_passwd), + :f_type + )'; + + $connSQL=new DB(); + $connSQL->bind('f_nom',$f_nom); + $connSQL->bind('f_prenom',$f_prenom); + $connSQL->bind('f_user',$f_user); + $connSQL->bind('f_mail',$f_mail); + $connSQL->bind('f_passwd',$f_passwd); + $connSQL->bind('f_type',$f_type); + $connSQL->query($lib); + + echo USER.' '.$f_user.' '.CREATED.'
    '; } ?> diff --git a/index.php b/index.php index 88704437..6239eef1 100644 --- a/index.php +++ b/index.php @@ -11,13 +11,13 @@ */ -?> +?> - + @@ -27,7 +27,7 @@ - + @@ -74,7 +74,7 @@ } ?> - + CGRAPHZ <?php echo CGRAPHZ_VERSION; ?> @@ -111,7 +111,7 @@ } else { include(DIR_FSROOT.'/html/auth/auth/f_auth.php'); } -?> +?> diff --git a/modules/AUTH_USER.php b/modules/AUTH_USER.php index ec994fb6..0d39de1f 100644 --- a/modules/AUTH_USER.php +++ b/modules/AUTH_USER.php @@ -71,7 +71,7 @@ function verif_auth() { } if ($this->verif_auth_ldap(false)) { return true; } else { - return false; + return false; } } else { return false; @@ -116,15 +116,15 @@ function check_access_right($host) { if (!$this->verif_auth()) { return false; } $lib=' - SELECT - cs.server_name, + SELECT + cs.server_name, COALESCE(cs.collectd_version,"'.COLLECTD_DEFAULT_VERSION.'") as collectd_version FROM config_server cs - LEFT JOIN config_server_project csp + LEFT JOIN config_server_project csp ON cs.id_config_server=csp.id_config_server - LEFT JOIN perm_project_group ppg + LEFT JOIN perm_project_group ppg ON csp.id_config_project=ppg.id_config_project - LEFT JOIN auth_user_group aug + LEFT JOIN auth_user_group aug ON ppg.id_auth_group=aug.id_auth_group WHERE (cs.server_name=:host) AND (aug.id_auth_user=:s_id_user) @@ -139,7 +139,7 @@ function check_access_right($host) { return $authorized; } else if (AUTH_TYPE != 'default') { include(DIR_FSROOT.'/modules/'.AUTH_TYPE.'/extend_access_right.php'); - } else { + } else { return false; } } diff --git a/modules/Button.php b/modules/Button.php index 15f55faa..c789e2a2 100644 --- a/modules/Button.php +++ b/modules/Button.php @@ -1,7 +1,7 @@ itype) { case 'add': @@ -28,7 +28,7 @@ public function buildField(){ default: break; } - + $field.= ''."\n"; switch($this->formtype) { @@ -41,7 +41,7 @@ public function buildField(){ return $field; } - + public function iType($v){ $this->itype = $v; return $this; diff --git a/modules/CURL_REQUEST.php b/modules/CURL_REQUEST.php index 901e0c7f..6f67bae5 100644 --- a/modules/CURL_REQUEST.php +++ b/modules/CURL_REQUEST.php @@ -1,108 +1,108 @@ '', - * 'host' => '', - * 'header' => '', - * 'method' => '', - * 'referer' => '', - * 'cookie' => '', - * 'post_fields' => '', - * ['login' => '',] - * ['password' => '',] - * 'timeout' => 0 - * ); - */ - public function init($params) { - $this->ch = curl_init(); - $user_agent = 'Mozilla/5.0 (Windows; U;Windows NT 5.1; ru; rv:1.8.0.9) Gecko/20061206 Firefox/1.5.0.9'; - $header = array( - "Accept: text/xml,application/xml,application/xhtml+xml, - text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5", - "Accept-Language: ru-ru,ru;q=0.7,en-us;q=0.5,en;q=0.3", - "Accept-Charset: windows-1251,utf-8;q=0.7,*;q=0.7", - "Keep-Alive: 300"); - - if (isset($params['host']) && $params['host']) $header[]="Host: " . $params['host']; - if (isset($params['header']) && $params['header']) $header[]=$params['header']; - - @curl_setopt ( $this -> ch , CURLOPT_RETURNTRANSFER , 1 ); - @curl_setopt ( $this -> ch , CURLOPT_VERBOSE , 1 ); - @curl_setopt ( $this -> ch , CURLOPT_HEADER , 1 ); - - if ($params['method'] == "HEAD") @curl_setopt($this -> ch,CURLOPT_NOBODY,1); - @curl_setopt ( $this -> ch, CURLOPT_FOLLOWLOCATION, 1); - @curl_setopt ( $this -> ch , CURLOPT_HTTPHEADER, $header ); - if ($params['referer']) @curl_setopt ($this -> ch , CURLOPT_REFERER, $params['referer'] ); - @curl_setopt ( $this -> ch , CURLOPT_USERAGENT, $user_agent); - if ($params['cookie']) @curl_setopt ($this -> ch , CURLOPT_COOKIE, $params['cookie']); + private $ch; + /** + * Init curl session + * + * $params = array('url' => '', + * 'host' => '', + * 'header' => '', + * 'method' => '', + * 'referer' => '', + * 'cookie' => '', + * 'post_fields' => '', + * ['login' => '',] + * ['password' => '',] + * 'timeout' => 0 + * ); + */ + public function init($params) { + $this->ch = curl_init(); + $user_agent = 'Mozilla/5.0 (Windows; U;Windows NT 5.1; ru; rv:1.8.0.9) Gecko/20061206 Firefox/1.5.0.9'; + $header = array( + "Accept: text/xml,application/xml,application/xhtml+xml, + text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5", + "Accept-Language: ru-ru,ru;q=0.7,en-us;q=0.5,en;q=0.3", + "Accept-Charset: windows-1251,utf-8;q=0.7,*;q=0.7", + "Keep-Alive: 300"); - if ( $params['method'] == "POST" ) { - curl_setopt( $this -> ch, CURLOPT_POST, true ); - curl_setopt( $this -> ch, CURLOPT_POSTFIELDS, $params['post_fields'] ); - } - @curl_setopt( $this -> ch, CURLOPT_URL, $params['url']); - @curl_setopt ( $this -> ch , CURLOPT_SSL_VERIFYPEER, 0 ); - @curl_setopt ( $this -> ch , CURLOPT_SSL_VERIFYHOST, 0 ); - if (isset($params['login']) & isset($params['password'])) - @curl_setopt($this -> ch , CURLOPT_USERPWD,$params['login'].':'.$params['password']); - @curl_setopt ( $this -> ch , CURLOPT_TIMEOUT, $params['timeout']); - } - - /** - * Make curl request - * - * @return array 'header','body','curl_error','http_code','last_url' - */ - public function exec() { - $response = curl_exec($this->ch); - $error = curl_error($this->ch); - $result = array( 'header' => '', - 'body' => '', - 'curl_error' => '', - 'http_code' => '', - 'last_url' => ''); - if ( $error != "" ) - { - $result['curl_error'] = $error; - return $result; - } - - $header_size = curl_getinfo($this->ch,CURLINFO_HEADER_SIZE); - $result['header'] = substr($response, 0, $header_size); - $result['body'] = substr( $response, $header_size ); - $result['http_code'] = curl_getinfo($this -> ch,CURLINFO_HTTP_CODE); - $result['last_url'] = curl_getinfo($this -> ch,CURLINFO_EFFECTIVE_URL); - return $result; - } + if (isset($params['host']) && $params['host']) $header[]="Host: " . $params['host']; + if (isset($params['header']) && $params['header']) $header[]=$params['header']; + + @curl_setopt ( $this -> ch , CURLOPT_RETURNTRANSFER , 1 ); + @curl_setopt ( $this -> ch , CURLOPT_VERBOSE , 1 ); + @curl_setopt ( $this -> ch , CURLOPT_HEADER , 1 ); + + if ($params['method'] == "HEAD") @curl_setopt($this -> ch,CURLOPT_NOBODY,1); + @curl_setopt ( $this -> ch, CURLOPT_FOLLOWLOCATION, 1); + @curl_setopt ( $this -> ch , CURLOPT_HTTPHEADER, $header ); + if ($params['referer']) @curl_setopt ($this -> ch , CURLOPT_REFERER, $params['referer'] ); + @curl_setopt ( $this -> ch , CURLOPT_USERAGENT, $user_agent); + if ($params['cookie']) @curl_setopt ($this -> ch , CURLOPT_COOKIE, $params['cookie']); + + if ( $params['method'] == "POST" ) { + curl_setopt( $this -> ch, CURLOPT_POST, true ); + curl_setopt( $this -> ch, CURLOPT_POSTFIELDS, $params['post_fields'] ); + } + @curl_setopt( $this -> ch, CURLOPT_URL, $params['url']); + @curl_setopt ( $this -> ch , CURLOPT_SSL_VERIFYPEER, 0 ); + @curl_setopt ( $this -> ch , CURLOPT_SSL_VERIFYHOST, 0 ); + if (isset($params['login']) & isset($params['password'])) + @curl_setopt($this -> ch , CURLOPT_USERPWD,$params['login'].':'.$params['password']); + @curl_setopt ( $this -> ch , CURLOPT_TIMEOUT, $params['timeout']); + } + + /** + * Make curl request + * + * @return array 'header','body','curl_error','http_code','last_url' + */ + public function exec() { + $response = curl_exec($this->ch); + $error = curl_error($this->ch); + $result = array( 'header' => '', + 'body' => '', + 'curl_error' => '', + 'http_code' => '', + 'last_url' => ''); + if ( $error != "" ) + { + $result['curl_error'] = $error; + return $result; + } + + $header_size = curl_getinfo($this->ch,CURLINFO_HEADER_SIZE); + $result['header'] = substr($response, 0, $header_size); + $result['body'] = substr( $response, $header_size ); + $result['http_code'] = curl_getinfo($this -> ch,CURLINFO_HTTP_CODE); + $result['last_url'] = curl_getinfo($this -> ch,CURLINFO_EFFECTIVE_URL); + return $result; + } } ?> 'http://www.google.com', - 'host' => '', - 'header' => '', - 'method' => 'GET', // 'POST','HEAD' - 'referer' => '', - 'cookie' => '', - 'post_fields' => '', // 'var1=value&var2=value - 'timeout' => 20 - ); - - $this->curl->init($params); - $result = $this->curl->exec(); - if ($result['curl_error']) throw new Exception($result['curl_error']); - if ($result['http_code']!='200') throw new Exception("HTTP Code = ".$result['http_code']); - if (!$result['body']) throw new Exception("Body of file is empty"); - ............... +try { + $params = array('url' => 'http://www.google.com', + 'host' => '', + 'header' => '', + 'method' => 'GET', // 'POST','HEAD' + 'referer' => '', + 'cookie' => '', + 'post_fields' => '', // 'var1=value&var2=value + 'timeout' => 20 + ); + + $this->curl->init($params); + $result = $this->curl->exec(); + if ($result['curl_error']) throw new Exception($result['curl_error']); + if ($result['http_code']!='200') throw new Exception("HTTP Code = ".$result['http_code']); + if (!$result['body']) throw new Exception("Body of file is empty"); + ............... } catch (Exception $e) { - echo $e->getMessage(); + echo $e->getMessage(); } */ ?> diff --git a/modules/DB.php b/modules/DB.php index 05892bad..54837617 100644 --- a/modules/DB.php +++ b/modules/DB.php @@ -1,268 +1,268 @@ log = new LOG(); - $this->Connect(); - $this->parameters = array(); - } - + * Default Constructor + * + * 1. Instantiate Log class. + * 2. Connect to database. + * 3. Creates the parameter array. + */ + public function __construct() + { + $this->log = new LOG(); + $this->Connect(); + $this->parameters = array(); + } + /** - * This method makes connection to the database. - * - * 1. Reads the database settings from a ini file. - * 2. Puts the ini content into the settings array. - * 3. Tries to connect to the database. - * 4. If connection failed, exception is displayed and a log file gets created. - */ - private function Connect() - { - $this->settings = parse_ini_file(DIR_FSROOT.'/config/databases.ini.php'); - $dsn = 'mysql:dbname='.$this->settings["dbname"].';'; - if(!empty($this->settings["socket"])) { - $dsn .= 'unix_socket='.$this->settings["socket"]; - } else { - $dsn .= 'host='.$this->settings["host"]; - } - try - { - # Read settings from INI file, set UTF8 - $this->pdo = new PDO($dsn, $this->settings["user"], $this->settings["password"], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8")); - - # We can now log any exceptions on Fatal error. - $this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); - - # Disable emulation of prepared statements, use REAL prepared statements instead. - $this->pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, false); - - # Connection succeeded, set the boolean to true. - $this->bConnected = true; - } - catch (PDOException $e) - { - # Write into log - echo $this->ExceptionLog($e->getMessage()); - die(); - } - } - /* - * You can use this little method if you want to close the PDO connection - * - */ - public function CloseConnection() - { - # Set the PDO object to null to close the connection - # http://www.php.net/manual/en/pdo.connections.php - $this->pdo = null; - } - + * This method makes connection to the database. + * + * 1. Reads the database settings from a ini file. + * 2. Puts the ini content into the settings array. + * 3. Tries to connect to the database. + * 4. If connection failed, exception is displayed and a log file gets created. + */ + private function Connect() + { + $this->settings = parse_ini_file(DIR_FSROOT.'/config/databases.ini.php'); + $dsn = 'mysql:dbname='.$this->settings["dbname"].';'; + if(!empty($this->settings["socket"])) { + $dsn .= 'unix_socket='.$this->settings["socket"]; + } else { + $dsn .= 'host='.$this->settings["host"]; + } + try + { + # Read settings from INI file, set UTF8 + $this->pdo = new PDO($dsn, $this->settings["user"], $this->settings["password"], array(PDO::MYSQL_ATTR_INIT_COMMAND => "SET NAMES utf8")); + + # We can now log any exceptions on Fatal error. + $this->pdo->setAttribute(PDO::ATTR_ERRMODE, PDO::ERRMODE_EXCEPTION); + + # Disable emulation of prepared statements, use REAL prepared statements instead. + $this->pdo->setAttribute(PDO::ATTR_EMULATE_PREPARES, false); + + # Connection succeeded, set the boolean to true. + $this->bConnected = true; + } + catch (PDOException $e) + { + # Write into log + echo $this->ExceptionLog($e->getMessage()); + die(); + } + } + /* + * You can use this little method if you want to close the PDO connection + * + */ + public function CloseConnection() + { + # Set the PDO object to null to close the connection + # http://www.php.net/manual/en/pdo.connections.php + $this->pdo = null; + } + /** - * Every method which needs to execute a SQL query uses this method. - * - * 1. If not connected, connect to the database. - * 2. Prepare Query. - * 3. Parameterize Query. - * 4. Execute Query. - * 5. On exception : Write Exception into the log + SQL query. - * 6. Reset the Parameters. - */ - private function Init($query,$parameters = "") - { - # Connect to database - if(!$this->bConnected) { $this->Connect(); } - try { - # Prepare query - $this->sQuery = $this->pdo->prepare($query); - - # Add parameters to the parameter array - $this->bindMore($parameters); + * Every method which needs to execute a SQL query uses this method. + * + * 1. If not connected, connect to the database. + * 2. Prepare Query. + * 3. Parameterize Query. + * 4. Execute Query. + * 5. On exception : Write Exception into the log + SQL query. + * 6. Reset the Parameters. + */ + private function Init($query,$parameters = "") + { + # Connect to database + if(!$this->bConnected) { $this->Connect(); } + try { + # Prepare query + $this->sQuery = $this->pdo->prepare($query); + + # Add parameters to the parameter array + $this->bindMore($parameters); - # Bind parameters - if(!empty($this->parameters)) { - foreach($this->parameters as $param) - { - $parameters = explode("\x7F",$param); - $this->sQuery->bindParam($parameters[0],$parameters[1]); - } - } + # Bind parameters + if(!empty($this->parameters)) { + foreach($this->parameters as $param) + { + $parameters = explode("\x7F",$param); + $this->sQuery->bindParam($parameters[0],$parameters[1]); + } + } - # Execute SQL - $this->succes = $this->sQuery->execute(); - } - catch(PDOException $e) - { - # Write into log and display Exception - echo $this->ExceptionLog($e->getMessage(), $query ); - die(); - } + # Execute SQL + $this->succes = $this->sQuery->execute(); + } + catch(PDOException $e) + { + # Write into log and display Exception + echo $this->ExceptionLog($e->getMessage(), $query ); + die(); + } + + # Reset the parameters + $this->parameters = array(); + } - # Reset the parameters - $this->parameters = array(); - } - /** - * @void - * - * Add the parameter to the parameter array - * @param string $para - * @param string $value - */ - public function bind($para, $value) - { - $this->parameters[sizeof($this->parameters)] = ":" . $para . "\x7F" . $value; - } + * @void + * + * Add the parameter to the parameter array + * @param string $para + * @param string $value + */ + public function bind($para, $value) + { + $this->parameters[sizeof($this->parameters)] = ":" . $para . "\x7F" . $value; + } /** - * @void - * - * Add more parameters to the parameter array - * @param array $parray - */ - public function bindMore($parray) - { - if(empty($this->parameters) && is_array($parray)) { - $columns = array_keys($parray); - foreach($columns as $i => &$column) { - $this->bind($column, $parray[$column]); - } - } - } + * @void + * + * Add more parameters to the parameter array + * @param array $parray + */ + public function bindMore($parray) + { + if(empty($this->parameters) && is_array($parray)) { + $columns = array_keys($parray); + foreach($columns as $i => &$column) { + $this->bind($column, $parray[$column]); + } + } + } /** - * If the SQL query contains a SELECT statement it returns an array containing all of the result set row - * If the SQL statement is a DELETE, INSERT, or UPDATE statement it returns the number of affected rows - * - * @param string $query - * @param array $params - * @param int $fetchmode - * @return mixed - */ - public function query($query,$params = null, $fetchmode = PDO::FETCH_OBJ) - { - $query = trim($query); + * If the SQL query contains a SELECT statement it returns an array containing all of the result set row + * If the SQL statement is a DELETE, INSERT, or UPDATE statement it returns the number of affected rows + * + * @param string $query + * @param array $params + * @param int $fetchmode + * @return mixed + */ + public function query($query,$params = null, $fetchmode = PDO::FETCH_OBJ) + { + $query = trim($query); + + $this->Init($query,$params); - $this->Init($query,$params); + # The first six letters of the sql statement -> insert, select, etc... + $statement = strtolower(substr($query, 0 , 6)); + + if ($statement === 'select') { + return $this->sQuery->fetchAll($fetchmode); + } + elseif ( $statement === 'insert' || $statement === 'update' || $statement === 'delete' ) { + return $this->sQuery->rowCount(); + } + else { + return NULL; + } + } - # The first six letters of the sql statement -> insert, select, etc... - $statement = strtolower(substr($query, 0 , 6)); - - if ($statement === 'select') { - return $this->sQuery->fetchAll($fetchmode); - } - elseif ( $statement === 'insert' || $statement === 'update' || $statement === 'delete' ) { - return $this->sQuery->rowCount(); - } - else { - return NULL; - } - } - /** * Returns the last inserted id. * @return string - */ - public function lastInsertId() { - return $this->pdo->lastInsertId(); - } - + */ + public function lastInsertId() { + return $this->pdo->lastInsertId(); + } + /** - * Returns an array which represents a column from the result set - * - * @param string $query - * @param array $params - * @return array - */ - public function column($query,$params = null) - { - $this->Init($query,$params); - $Columns = $this->sQuery->fetchAll(PDO::FETCH_NUM); - - $column = null; + * Returns an array which represents a column from the result set + * + * @param string $query + * @param array $params + * @return array + */ + public function column($query,$params = null) + { + $this->Init($query,$params); + $Columns = $this->sQuery->fetchAll(PDO::FETCH_NUM); - foreach($Columns as $cells) { - $column[] = $cells[0]; - } + $column = null; - return $column; - - } + foreach($Columns as $cells) { + $column[] = $cells[0]; + } + + return $column; + + } + /** + * Returns an array which represents a row from the result set + * + * @param string $query + * @param array $params + * @param int $fetchmode + * @return array + */ + public function row($query,$params = null,$fetchmode = PDO::FETCH_OBJ) + { + $this->Init($query,$params); + return $this->sQuery->fetch($fetchmode); + } /** - * Returns an array which represents a row from the result set - * - * @param string $query - * @param array $params - * @param int $fetchmode - * @return array - */ - public function row($query,$params = null,$fetchmode = PDO::FETCH_OBJ) - { - $this->Init($query,$params); - return $this->sQuery->fetch($fetchmode); - } + * Returns the value of one single field/column + * + * @param string $query + * @param array $params + * @return string + */ + public function single($query,$params = null) + { + $this->Init($query,$params); + return $this->sQuery->fetchColumn(); + } /** - * Returns the value of one single field/column - * - * @param string $query - * @param array $params - * @return string - */ - public function single($query,$params = null) - { - $this->Init($query,$params); - return $this->sQuery->fetchColumn(); - } - /** - * Writes the log and returns the exception - * - * @param string $message - * @param string $sql - * @return string - */ - private function ExceptionLog($message , $sql = "") - { - $exception = 'Unhandled Exception.
    '; - $exception .= $message; - $exception .= "
    You can find the error back in the log."; + * Writes the log and returns the exception + * + * @param string $message + * @param string $sql + * @return string + */ + private function ExceptionLog($message , $sql = "") + { + $exception = 'Unhandled Exception.
    '; + $exception .= $message; + $exception .= "
    You can find the error back in the log."; - if(!empty($sql)) { - # Add the Raw SQL to the Log - $message .= "\r\nRaw SQL : " . $sql; - } - # Write into log - $this->log->write($message); + if(!empty($sql)) { + # Add the Raw SQL to the Log + $message .= "\r\nRaw SQL : " . $sql; + } + # Write into log + $this->log->write($message); - return $exception; - } + return $exception; + } } diff --git a/modules/Field.php b/modules/Field.php index 5db65e25..3bbb46bf 100644 --- a/modules/Field.php +++ b/modules/Field.php @@ -13,21 +13,21 @@ abstract class Field{ protected $readonly = false; protected $onchange = null; protected $onclick = null; - + public function __construct($formtype, $name){ $this->name($name); $this->formType($formtype); } - + public function hydrate($options){ foreach($options as $k => $v){ if(is_callable(array($this, $k))) $this->$k($v); } } - + abstract public function buildField(); - + private function formType($v){ $this->formtype = $v; } @@ -86,5 +86,5 @@ public function fieldClasses($v){ $this->fieldclasses = $v; return $this; } - + } diff --git a/modules/Form.php b/modules/Form.php index 95b28b49..eb683d24 100644 --- a/modules/Form.php +++ b/modules/Form.php @@ -8,16 +8,16 @@ class Form{ protected $fieldset = false; protected $legend = null; protected $method = 'post'; - + public function __construct($formtype='', $action='', $enctype='', $onsubmit=''){ $this->action = $action; $this->formtype = $formtype; $this->enctype = $enctype; $this->onsubmit = ' onsubmit="'.$onsubmit.'"'; - + return $this; } - + public function add($entry, $value){ switch($entry){ case 'html': $this->items[] = $value; break; @@ -45,7 +45,7 @@ public function add($entry, $value){ } return true; } - + /* Ici son comportement est spécifique à mon système d'entités-modèles */ public function bindValues($entity){ if($entity instanceof \Library\Model\Entity) @@ -54,13 +54,13 @@ public function bindValues($entity){ $attributs = $entity; else throw new \Library\Tiles\Exceptions\TileException('Le paramètre passé en argument doit être un objet de la classe \Library\Model\Entity ou un tableau.'); - + foreach($this->items as $k=>$v){ if($v instanceof field AND isset($attributs[$k])) $v->value($attributs[$k]); } } - + public function bindForm() { if(!empty($this->enctype)) $enctype .= 'enctype="'.$this->enctype.'"'; else $enctype=''; @@ -87,7 +87,7 @@ public function bindForm() { else $view.= $output; } - + if($this->fieldset) $view.=''."\n"; return $view.''."\n"; } @@ -101,11 +101,11 @@ public function legend($v) { public function method($v) { $this->method=$v; } - + public function printForm(){ echo $this->bindForm(); } - + public function __toString(){ return $this->bindForm(); } diff --git a/modules/InputCheckbox.php b/modules/InputCheckbox.php index c07b1517..e8d24dae 100644 --- a/modules/InputCheckbox.php +++ b/modules/InputCheckbox.php @@ -2,7 +2,7 @@ class InputCheckbox extends Field{ private $checked = false; private $default = false; - + public function buildField(){ $field = '
    '."\n"; @@ -38,11 +38,11 @@ public function buildField(){ $field.= ' checked />'."\n"; else $field.= ' />'."\n"; - + if(!empty($this->label)){ - $field.=$this->label; + $field.=$this->label; if($this->important) - $field.= '*'."\n"; + $field.= '*'."\n"; $field.= ''."\n"; } @@ -53,13 +53,13 @@ public function buildField(){ $field.= '
    '."\n"; } - # formgroup + # formgroup $field.= ''."\n"; return $field; } - - + + public function checked($v=true){ $this->checked = $v; return $this; @@ -69,5 +69,5 @@ public function defaultValue($v){ $this->default = $v; return $this; } - + } diff --git a/modules/InputHidden.php b/modules/InputHidden.php index 2327c4f2..81226f28 100644 --- a/modules/InputHidden.php +++ b/modules/InputHidden.php @@ -9,10 +9,10 @@ public function buildField(){ if(!empty($this->maxlength)) $field.= 'maxlength="'.$this->maxlength.'" '; $field.= 'id="'.$this->name.'"/>'; - + return $field; } - + public function maxlength($v){ $v = intval($v); if($v > 0) diff --git a/modules/InputSubmit.php b/modules/InputSubmit.php index 67fd0924..785531fb 100644 --- a/modules/InputSubmit.php +++ b/modules/InputSubmit.php @@ -1,7 +1,7 @@ btnclass)) $this->btnclass=''; switch($this->itype) { @@ -29,7 +29,7 @@ public function buildField(){ default: break; } - + $field.= ''."\n"; switch($this->formtype) { @@ -42,7 +42,7 @@ public function buildField(){ return $field; } - + public function iType($v){ $this->itype = $v; return $this; diff --git a/modules/InputText.php b/modules/InputText.php index eac34a26..9bb2c3a0 100644 --- a/modules/InputText.php +++ b/modules/InputText.php @@ -4,7 +4,7 @@ class InputText extends Field{ private $maxlength; private $itype='text'; private $autocomplete=true; - + public function buildField(){ $field = '
    '."\n"; if (!isset($this->labelclass)) $this->labelclass=''; @@ -28,23 +28,23 @@ public function buildField(){ if ($formcontrol==true) { $fieldclass='form-control'; - } + } if(!empty($this->label)){ if (!empty($this->labelgrid)) { $this->labelclass.=' '.$this->labelgrid; } - $field.= '
    '."\n"; - + return $field; } - + public function maxlength($v){ $v = intval($v); if($v > 0) diff --git a/modules/LDAP.php b/modules/LDAP.php index 415375be..e6d64e3f 100644 --- a/modules/LDAP.php +++ b/modules/LDAP.php @@ -1,86 +1,86 @@ LDAP_login = $login; - $this->LDAP_password = $password; - $this->LDAP_host = $host; - $this->LDAP_port = $port; - } - - //fonction de connection - function connect() { - // Connection à LDAP - $this->connect = ldap_connect($this->LDAP_host.':'.$this->LDAP_port); + // Définition du constructeur + function __construct($host, $port, $login, $password) { + // Initialisation des attributs + $this->LDAP_login = $login; + $this->LDAP_password = $password; + $this->LDAP_host = $host; + $this->LDAP_port = $port; + } - // Vérification de la connection - if (!$this->connect){ - // Affichage du message d'erreur - echo "Erreur : Connection au serveur impossible impossible
    "; - return false; - } else { - ldap_set_option($this->connect,LDAP_OPT_PROTOCOL_VERSION,3); - ldap_set_option($this->connect,LDAP_OPT_REFERRALS,0); - return true; - } - } - - // Méthode Identification() - function identification () { - // Exécution de l'identification - $ident = @ldap_bind($this->connect, 'uid='.$this->LDAP_login.','.LDAP_TREE, $this->LDAP_password); + //fonction de connection + function connect() { + // Connection à LDAP + $this->connect = ldap_connect($this->LDAP_host.':'.$this->LDAP_port); - //Vérification de la connection - if ($ident) { - $this->identification = $ident; - return true; - } else { - echo "Echec d'identification
    "; - return false; - } - } - - //fonction recherche - function recherche($Nom) { - echo 'Recherchons (sn='.$Nom.') ...'; - // Recherche par nom - $search = ldap_search($this->connect, LDAP_TREE, "sn=$Nom"); - echo 'Le résultat de la recherche est ' . $search . '
    '; - echo 'Le nombre d\'entrées retournées est ' . ldap_count_entries($this->connect,$search) . '
    '; - echo 'Lecture des entrées ...
    '; - $info = ldap_get_entries($this->connect, $search); - echo 'Données pour ' . $info["count"] . ' entrées:
    '; + // Vérification de la connection + if (!$this->connect){ + // Affichage du message d'erreur + echo "Erreur : Connection au serveur impossible impossible
    "; + return false; + } else { + ldap_set_option($this->connect,LDAP_OPT_PROTOCOL_VERSION,3); + ldap_set_option($this->connect,LDAP_OPT_REFERRALS,0); + return true; + } + } - for ($i=0; $i<$info["count"]; $i++) { - echo 'dn est : ' . $info[$i]["dn"] . '
    '; - echo 'premiere entree cn : ' . $info[$i]["cn"][0] . '
    '; - echo 'premiere entree sn : ' . $info[$i]["sn"][0] . '
    '; - echo 'premier email : ' . $info[$i]["mail"][0] . '
    '; - echo 'premier givenName : ' . $info[$i]["givenName"][0] . '
    '; - echo 'premier uid : ' . $info[$i]["uid"][0] . '
    '; - } - } - - // Méthode deconnect() - function deconnect (){ - // Déconnection - $deconnect = ldap_unbind($this->connect); - if(!$deconnect) - ldap_close($this->connect);//c les bretelles et la ceinture :) - } //fin de déconnexion + // Méthode Identification() + function identification () { + // Exécution de l'identification + $ident = @ldap_bind($this->connect, 'uid='.$this->LDAP_login.','.LDAP_TREE, $this->LDAP_password); + + //Vérification de la connection + if ($ident) { + $this->identification = $ident; + return true; + } else { + echo "Echec d'identification
    "; + return false; + } + } + + //fonction recherche + function recherche($Nom) { + echo 'Recherchons (sn='.$Nom.') ...'; + // Recherche par nom + $search = ldap_search($this->connect, LDAP_TREE, "sn=$Nom"); + echo 'Le résultat de la recherche est ' . $search . '
    '; + echo 'Le nombre d\'entrées retournées est ' . ldap_count_entries($this->connect,$search) . '
    '; + echo 'Lecture des entrées ...
    '; + $info = ldap_get_entries($this->connect, $search); + echo 'Données pour ' . $info["count"] . ' entrées:
    '; + + for ($i=0; $i<$info["count"]; $i++) { + echo 'dn est : ' . $info[$i]["dn"] . '
    '; + echo 'premiere entree cn : ' . $info[$i]["cn"][0] . '
    '; + echo 'premiere entree sn : ' . $info[$i]["sn"][0] . '
    '; + echo 'premier email : ' . $info[$i]["mail"][0] . '
    '; + echo 'premier givenName : ' . $info[$i]["givenName"][0] . '
    '; + echo 'premier uid : ' . $info[$i]["uid"][0] . '
    '; + } + } + + // Méthode deconnect() + function deconnect (){ + // Déconnection + $deconnect = ldap_unbind($this->connect); + if(!$deconnect) + ldap_close($this->connect);//c les bretelles et la ceinture :) + } //fin de déconnexion } diff --git a/modules/LOG.php b/modules/LOG.php index f8e38084..69c32750 100644 --- a/modules/LOG.php +++ b/modules/LOG.php @@ -1,68 +1,68 @@ -path = dirname(__FILE__) . $this->path; - $this->path=DIR_FSROOT.$this->path; - } - - /** - * @void - * Creates the log - * - * @param string $message the message which is written into the log. - * @description: - * 1. Checks if directory exists, if not, create one and call this method again. - * 2. Checks if log already exists. - * 3. If not, new log gets created. Log is written into the logs folder. - * 4. Logname is current date(Year - Month - Day). - * 5. If log exists, edit method called. - * 6. Edit method modifies the current log. - */ - public function write($message) { - $date = new DateTime(); - $log = $this->path . $date->format('Y-m-d').".txt"; + * Log A logger class which creates logs when an exception is thrown. + * @author Author: Vivek Wicky Aswal. (https://twitter.com/#!/VivekWickyAswal) + * @git https://github.com/indieteq-vivek/PHP-MySQL-PDO-Database-Class + * @version 0.1a + */ + class LOG { - if(is_dir($this->path)) { - if(!file_exists($log)) { - $fh = fopen($log, 'a+') or die("Fatal Error !"); - $logcontent = "Time : " . $date->format('H:i:s')."\r\n" . $message ."\r\n"; - fwrite($fh, $logcontent); - fclose($fh); - } - else { - $this->edit($log,$date, $message); - } - } - else { - if(mkdir($this->path,2770) === true) { - $this->write($message); - } - } - } - - /** - * @void - * Gets called if log exists. - * Modifies current log and adds the message to the log. - * - * @param string $log - * @param DateTimeObject $date - * @param string $message - */ - private function edit($log,$date,$message) { - $logcontent = "Time : " . $date->format('H:i:s')."\r\n" . $message ."\r\n\r\n"; - file_put_contents($log, $logcontent, FILE_APPEND); - } - } + # @string, Log directory name + private $path = '/logs/'; + + # @void, Default Constructor, Sets the timezone and path of the log files. + public function __construct() { + date_default_timezone_set('Europe/Amsterdam'); + //$this->path = dirname(__FILE__) . $this->path; + $this->path=DIR_FSROOT.$this->path; + } + + /** + * @void + * Creates the log + * + * @param string $message the message which is written into the log. + * @description: + * 1. Checks if directory exists, if not, create one and call this method again. + * 2. Checks if log already exists. + * 3. If not, new log gets created. Log is written into the logs folder. + * 4. Logname is current date(Year - Month - Day). + * 5. If log exists, edit method called. + * 6. Edit method modifies the current log. + */ + public function write($message) { + $date = new DateTime(); + $log = $this->path . $date->format('Y-m-d').".txt"; + + if(is_dir($this->path)) { + if(!file_exists($log)) { + $fh = fopen($log, 'a+') or die("Fatal Error !"); + $logcontent = "Time : " . $date->format('H:i:s')."\r\n" . $message ."\r\n"; + fwrite($fh, $logcontent); + fclose($fh); + } + else { + $this->edit($log,$date, $message); + } + } + else { + if(mkdir($this->path,2770) === true) { + $this->write($message); + } + } + } + + /** + * @void + * Gets called if log exists. + * Modifies current log and adds the message to the log. + * + * @param string $log + * @param DateTimeObject $date + * @param string $message + */ + private function edit($log,$date,$message) { + $logcontent = "Time : " . $date->format('H:i:s')."\r\n" . $message ."\r\n\r\n"; + file_put_contents($log, $logcontent, FILE_APPEND); + } + } diff --git a/modules/PERMS.php b/modules/PERMS.php index 3c259fd9..ad3694d0 100644 --- a/modules/PERMS.php +++ b/modules/PERMS.php @@ -1,148 +1,148 @@ connSQL=new DB(); - $this->id_auth_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); - } - - function perm_module($module, $component) { - $module=filter_var($module,FILTER_SANITIZE_STRING); - $component=filter_var($component,FILTER_SANITIZE_STRING); - - // Check si Admin - $lib=' - SELECT count(*) AS mycpt - FROM - auth_group ag - JOIN auth_user_group aug - ON ag.id_auth_group=aug.id_auth_group AND ag.group="Admin" - JOIN auth_user au - ON aug.id_auth_user=au.id_auth_user AND au.id_auth_user=:id_auth_user'; - - $this->connSQL->bind('id_auth_user',$this->id_auth_user); - $res=$this->connSQL->row($lib); - - if ($res->mycpt > 0) { - return true; - } else { // Sinon - $lib=' - SELECT count(*) AS mycpt - FROM - perm_module pm - JOIN perm_module_group pmg - ON pm.id_perm_module=pmg.id_perm_module AND pm.module=:module AND pm.component=:component - JOIN auth_user_group aug - ON pmg.id_auth_group=aug.id_auth_group - JOIN auth_user au - ON aug.id_auth_user=au.id_auth_user AND au.id_auth_user=:id_auth_user'; - - - $this->connSQL->bind('id_auth_user',$this->id_auth_user); - $this->connSQL->bind('module',$module); - $this->connSQL->bind('component',$component); - - $res=$this->connSQL->row($lib); - if ($res->mycpt > 0) { - return true; - } else { - return false; - } - } - } - - function perm_list_module($module, $show_no_menu=true) { - $module=filter_var($module,FILTER_SANITIZE_STRING); - - if ($show_no_menu!==true) $libmenu=' AND menu_name != "" AND menu_name IS NOT NULL '; - else $libmenu=''; - $lib=' - SELECT pm.component, pm.menu_name - FROM perm_module pm - LEFT JOIN perm_module_group pmg - ON pm.id_perm_module=pmg.id_perm_module - LEFT JOIN auth_group ag - ON pmg.id_auth_group=ag.id_auth_group - LEFT JOIN auth_user_group aug - ON ag.id_auth_group=aug.id_auth_group - LEFT JOIN auth_user au - ON aug.id_auth_user=au.id_auth_user - WHERE au.id_auth_user=:id_auth_user + private $id_auth_user; + + function __construct() { + $this->connSQL=new DB(); + $this->id_auth_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); + } + + function perm_module($module, $component) { + $module=filter_var($module,FILTER_SANITIZE_STRING); + $component=filter_var($component,FILTER_SANITIZE_STRING); + + // Check si Admin + $lib=' + SELECT count(*) AS mycpt + FROM + auth_group ag + JOIN auth_user_group aug + ON ag.id_auth_group=aug.id_auth_group AND ag.group="Admin" + JOIN auth_user au + ON aug.id_auth_user=au.id_auth_user AND au.id_auth_user=:id_auth_user'; + + $this->connSQL->bind('id_auth_user',$this->id_auth_user); + $res=$this->connSQL->row($lib); + + if ($res->mycpt > 0) { + return true; + } else { // Sinon + $lib=' + SELECT count(*) AS mycpt + FROM + perm_module pm + JOIN perm_module_group pmg + ON pm.id_perm_module=pmg.id_perm_module AND pm.module=:module AND pm.component=:component + JOIN auth_user_group aug + ON pmg.id_auth_group=aug.id_auth_group + JOIN auth_user au + ON aug.id_auth_user=au.id_auth_user AND au.id_auth_user=:id_auth_user'; + + + $this->connSQL->bind('id_auth_user',$this->id_auth_user); + $this->connSQL->bind('module',$module); + $this->connSQL->bind('component',$component); + + $res=$this->connSQL->row($lib); + if ($res->mycpt > 0) { + return true; + } else { + return false; + } + } + } + + function perm_list_module($module, $show_no_menu=true) { + $module=filter_var($module,FILTER_SANITIZE_STRING); + + if ($show_no_menu!==true) $libmenu=' AND menu_name != "" AND menu_name IS NOT NULL '; + else $libmenu=''; + $lib=' + SELECT pm.component, pm.menu_name + FROM perm_module pm + LEFT JOIN perm_module_group pmg + ON pm.id_perm_module=pmg.id_perm_module + LEFT JOIN auth_group ag + ON pmg.id_auth_group=ag.id_auth_group + LEFT JOIN auth_user_group aug + ON ag.id_auth_group=aug.id_auth_group + LEFT JOIN auth_user au + ON aug.id_auth_user=au.id_auth_user + WHERE au.id_auth_user=:id_auth_user AND pm.module=:module - '.$libmenu.' - GROUP BY component - ORDER BY menu_order'; - - $this->connSQL->bind('id_auth_user',$this->id_auth_user); - $this->connSQL->bind('module',$module); - $components=$this->connSQL->query($lib); - - if (isset($components)) { - return $components; - } else { - return false; - } - } - - function auth_user_group($id_auth_group, $manager=false) { - $id_auth_group=filter_var($id_auth_group,FILTER_SANITIZE_NUMBER_INT); - - $lib='SELECT count(id_auth_group) as mycpt FROM auth_user_group WHERE id_auth_user=:id_auth_user AND id_auth_group=:id_auth_group'; - if ($manager===true) $lib.=' AND manager="1"'; - - $this->connSQL->bind('id_auth_user',$this->id_auth_user); - $this->connSQL->bind('id_auth_group',$id_auth_group); - $res=$this->connSQL->row($lib); - if ($res->mycpt > 0) { - return true; - } else { - return false; - } - } - - function perm_list_project() { - $lib=' - SELECT cp.project_description, cp.id_config_project - FROM config_project cp - LEFT JOIN perm_project_group ppg - ON cp.id_config_project=ppg.id_config_project - LEFT JOIN auth_group ag - ON ppg.id_auth_group=ag.id_auth_group - LEFT JOIN auth_user_group aug - ON ag.id_auth_group=aug.id_auth_group - WHERE - aug.id_auth_user=:id_auth_user - GROUP BY id_config_project, project_description - ORDER BY project_description'; - - $this->connSQL->bind('id_auth_user',$this->id_auth_user); - $all_project=$this->connSQL->query($lib); - - return $all_project; - } - - function perm_list_project_server($id_config_project) { - } - - function perm_list_plugin_filter() { - $lib=' - SELECT cpf.plugin_filter_desc, cpf.id_config_plugin_filter - FROM config_plugin_filter cpf - LEFT JOIN config_plugin_filter_group cpfg - ON cpf.id_config_plugin_filter=cpfg.id_config_plugin_filter - LEFT JOIN auth_group ag - ON cpfg.id_auth_group=ag.id_auth_group - LEFT JOIN auth_user_group aug - ON ag.id_auth_group=aug.id_auth_group - WHERE - aug.id_auth_user=:id_auth_user - GROUP BY id_config_plugin_filter, plugin_filter_desc - ORDER BY plugin_filter_desc'; - - $this->connSQL->bind('id_auth_user',$this->id_auth_user); - $all_plugin_filter=$this->connSQL->query($lib); - - return $all_plugin_filter; - } + '.$libmenu.' + GROUP BY component + ORDER BY menu_order'; + + $this->connSQL->bind('id_auth_user',$this->id_auth_user); + $this->connSQL->bind('module',$module); + $components=$this->connSQL->query($lib); + + if (isset($components)) { + return $components; + } else { + return false; + } + } + + function auth_user_group($id_auth_group, $manager=false) { + $id_auth_group=filter_var($id_auth_group,FILTER_SANITIZE_NUMBER_INT); + + $lib='SELECT count(id_auth_group) as mycpt FROM auth_user_group WHERE id_auth_user=:id_auth_user AND id_auth_group=:id_auth_group'; + if ($manager===true) $lib.=' AND manager="1"'; + + $this->connSQL->bind('id_auth_user',$this->id_auth_user); + $this->connSQL->bind('id_auth_group',$id_auth_group); + $res=$this->connSQL->row($lib); + if ($res->mycpt > 0) { + return true; + } else { + return false; + } + } + + function perm_list_project() { + $lib=' + SELECT cp.project_description, cp.id_config_project + FROM config_project cp + LEFT JOIN perm_project_group ppg + ON cp.id_config_project=ppg.id_config_project + LEFT JOIN auth_group ag + ON ppg.id_auth_group=ag.id_auth_group + LEFT JOIN auth_user_group aug + ON ag.id_auth_group=aug.id_auth_group + WHERE + aug.id_auth_user=:id_auth_user + GROUP BY id_config_project, project_description + ORDER BY project_description'; + + $this->connSQL->bind('id_auth_user',$this->id_auth_user); + $all_project=$this->connSQL->query($lib); + + return $all_project; + } + + function perm_list_project_server($id_config_project) { + } + + function perm_list_plugin_filter() { + $lib=' + SELECT cpf.plugin_filter_desc, cpf.id_config_plugin_filter + FROM config_plugin_filter cpf + LEFT JOIN config_plugin_filter_group cpfg + ON cpf.id_config_plugin_filter=cpfg.id_config_plugin_filter + LEFT JOIN auth_group ag + ON cpfg.id_auth_group=ag.id_auth_group + LEFT JOIN auth_user_group aug + ON ag.id_auth_group=aug.id_auth_group + WHERE + aug.id_auth_user=:id_auth_user + GROUP BY id_config_plugin_filter, plugin_filter_desc + ORDER BY plugin_filter_desc'; + + $this->connSQL->bind('id_auth_user',$this->id_auth_user); + $all_plugin_filter=$this->connSQL->query($lib); + + return $all_plugin_filter; + } } diff --git a/modules/PROJECT.php b/modules/PROJECT.php index a5e4491a..0e909561 100644 --- a/modules/PROJECT.php +++ b/modules/PROJECT.php @@ -1,142 +1,142 @@ connSQL=new DB(); + function __construct($id_config_project) { + $this->connSQL=new DB(); - // Need to improve that a day - $this->id_auth_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); - $this->id_config_project=filter_var($id_config_project,FILTER_SANITIZE_NUMBER_INT); - } + // Need to improve that a day + $this->id_auth_user=filter_var($_SESSION['S_ID_USER'],FILTER_SANITIZE_NUMBER_INT); + $this->id_config_project=filter_var($id_config_project,FILTER_SANITIZE_NUMBER_INT); + } - function get_servers($id_config_environment=null, $id_config_role=null) { - if (!empty($id_config_environment)) { - $JOIN_ENV='LEFT OUTER JOIN config_environment_server ces - ON cs.id_config_server=ces.id_config_server'; - $WHERE_ENV='AND ces.id_config_environment=:id_config_environment'; - $this->connSQL->bind('id_config_environment',$id_config_environment); - } else { - $JOIN_ENV=''; - $WHERE_ENV=''; - } - if (!empty($id_config_role)) { - $JOIN_ROLE='LEFT OUTER JOIN config_role_server crs - ON cs.id_config_server=crs.id_config_server'; - $WHERE_ROLE='AND crs.id_config_role=:id_config_role'; - $this->connSQL->bind('id_config_role',$id_config_role); - } else { - $JOIN_ROLE=''; - $WHERE_ROLE=''; - } + function get_servers($id_config_environment=null, $id_config_role=null) { + if (!empty($id_config_environment)) { + $JOIN_ENV='LEFT OUTER JOIN config_environment_server ces + ON cs.id_config_server=ces.id_config_server'; + $WHERE_ENV='AND ces.id_config_environment=:id_config_environment'; + $this->connSQL->bind('id_config_environment',$id_config_environment); + } else { + $JOIN_ENV=''; + $WHERE_ENV=''; + } + if (!empty($id_config_role)) { + $JOIN_ROLE='LEFT OUTER JOIN config_role_server crs + ON cs.id_config_server=crs.id_config_server'; + $WHERE_ROLE='AND crs.id_config_role=:id_config_role'; + $this->connSQL->bind('id_config_role',$id_config_role); + } else { + $JOIN_ROLE=''; + $WHERE_ROLE=''; + } - $lib=' - SELECT cs.* - FROM config_server cs - LEFT JOIN config_server_project csp - ON cs.id_config_server=csp.id_config_server - LEFT JOIN perm_project_group ppg - ON ppg.id_config_project=csp.id_config_project - LEFT JOIN auth_group ag - ON ag.id_auth_group=ppg.id_auth_group - LEFT JOIN auth_user_group aug - ON aug.id_auth_group=ag.id_auth_group - '.$JOIN_ENV.' - '.$JOIN_ROLE.' - WHERE csp.id_config_project=:id_config_project - AND aug.id_auth_user=:id_auth_user - '.$WHERE_ENV.' - '.$WHERE_ROLE.' - ORDER BY cs.server_name'; + $lib=' + SELECT cs.* + FROM config_server cs + LEFT JOIN config_server_project csp + ON cs.id_config_server=csp.id_config_server + LEFT JOIN perm_project_group ppg + ON ppg.id_config_project=csp.id_config_project + LEFT JOIN auth_group ag + ON ag.id_auth_group=ppg.id_auth_group + LEFT JOIN auth_user_group aug + ON aug.id_auth_group=ag.id_auth_group + '.$JOIN_ENV.' + '.$JOIN_ROLE.' + WHERE csp.id_config_project=:id_config_project + AND aug.id_auth_user=:id_auth_user + '.$WHERE_ENV.' + '.$WHERE_ROLE.' + ORDER BY cs.server_name'; - $this->connSQL->bind('id_config_project',$this->id_config_project); - $this->connSQL->bind('id_auth_user',$this->id_auth_user); + $this->connSQL->bind('id_config_project',$this->id_config_project); + $this->connSQL->bind('id_auth_user',$this->id_auth_user); - return $this->connSQL->query($lib); - } + return $this->connSQL->query($lib); + } - function get_servers_roles($id_config_environment=null) { - if (!empty($id_config_environment)) { - $JOIN_ENV='LEFT OUTER JOIN config_environment_server ces - ON cs.id_config_server=ces.id_config_server'; - $WHERE_ENV='AND ces.id_config_environment=:id_config_environment'; - $this->connSQL->bind('id_config_environment',$id_config_environment); - } else { - $JOIN_ENV=''; - $WHERE_ENV=''; - } - $lib=' - SELECT - cr.id_config_role, - CASE - WHEN cr.role_description IS NULL THEN "'.OTHERS.'" - ELSE cr.role_description - END AS role_description - FROM config_server cs - LEFT OUTER JOIN config_role_server crs - ON cs.id_config_server=crs.id_config_server - LEFT OUTER JOIN config_role cr - ON crs.id_config_role=cr.id_config_role - '.$JOIN_ENV.' - LEFT JOIN config_server_project csp - ON cs.id_config_server=csp.id_config_server - LEFT JOIN perm_project_group ppg - ON ppg.id_config_project=csp.id_config_project - LEFT JOIN auth_group ag - ON ag.id_auth_group=ppg.id_auth_group - LEFT JOIN auth_user_group aug - ON aug.id_auth_group=ag.id_auth_group - WHERE csp.id_config_project=:id_config_project - AND aug.id_auth_user=:id_auth_user - '.$WHERE_ENV.' - GROUP BY id_config_role, role_description - ORDER BY role_description'; + function get_servers_roles($id_config_environment=null) { + if (!empty($id_config_environment)) { + $JOIN_ENV='LEFT OUTER JOIN config_environment_server ces + ON cs.id_config_server=ces.id_config_server'; + $WHERE_ENV='AND ces.id_config_environment=:id_config_environment'; + $this->connSQL->bind('id_config_environment',$id_config_environment); + } else { + $JOIN_ENV=''; + $WHERE_ENV=''; + } + $lib=' + SELECT + cr.id_config_role, + CASE + WHEN cr.role_description IS NULL THEN "'.OTHERS.'" + ELSE cr.role_description + END AS role_description + FROM config_server cs + LEFT OUTER JOIN config_role_server crs + ON cs.id_config_server=crs.id_config_server + LEFT OUTER JOIN config_role cr + ON crs.id_config_role=cr.id_config_role + '.$JOIN_ENV.' + LEFT JOIN config_server_project csp + ON cs.id_config_server=csp.id_config_server + LEFT JOIN perm_project_group ppg + ON ppg.id_config_project=csp.id_config_project + LEFT JOIN auth_group ag + ON ag.id_auth_group=ppg.id_auth_group + LEFT JOIN auth_user_group aug + ON aug.id_auth_group=ag.id_auth_group + WHERE csp.id_config_project=:id_config_project + AND aug.id_auth_user=:id_auth_user + '.$WHERE_ENV.' + GROUP BY id_config_role, role_description + ORDER BY role_description'; - $this->connSQL->bind('id_config_project',$this->id_config_project); - $this->connSQL->bind('id_auth_user',$this->id_auth_user); + $this->connSQL->bind('id_config_project',$this->id_config_project); + $this->connSQL->bind('id_auth_user',$this->id_auth_user); - return $this->connSQL->query($lib); - } - function get_servers_environments($id_config_role=null) { - if (!empty($id_config_role)) { - $JOIN_ROLE='LEFT OUTER JOIN config_role_server crs - ON cs.id_config_server=crs.id_config_server'; - $WHERE_ROLE='AND crs.id_config_role=:id_config_role'; - $this->connSQL->bind('id_config_role',$id_config_role); - } else { - $JOIN_ROLE=''; - $WHERE_ROLE=''; - } - $lib=' - SELECT - ce.id_config_environment, - CASE - WHEN ce.environment_description IS NULL THEN "'.OTHERS.'" - ELSE ce.environment_description - END AS environment_description - FROM config_server cs - LEFT OUTER JOIN config_environment_server ces - ON cs.id_config_server=ces.id_config_server - LEFT OUTER JOIN config_environment ce - ON ces.id_config_environment=ce.id_config_environment - '.$JOIN_ROLE.' - LEFT JOIN config_server_project csp - ON cs.id_config_server=csp.id_config_server - LEFT JOIN perm_project_group ppg - ON ppg.id_config_project=csp.id_config_project - LEFT JOIN auth_group ag - ON ag.id_auth_group=ppg.id_auth_group - LEFT JOIN auth_user_group aug - ON aug.id_auth_group=ag.id_auth_group - WHERE csp.id_config_project=:id_config_project - AND aug.id_auth_user=:id_auth_user - '.$WHERE_ROLE.' - GROUP BY id_config_environment, environment_description - ORDER BY environment_description'; + return $this->connSQL->query($lib); + } + function get_servers_environments($id_config_role=null) { + if (!empty($id_config_role)) { + $JOIN_ROLE='LEFT OUTER JOIN config_role_server crs + ON cs.id_config_server=crs.id_config_server'; + $WHERE_ROLE='AND crs.id_config_role=:id_config_role'; + $this->connSQL->bind('id_config_role',$id_config_role); + } else { + $JOIN_ROLE=''; + $WHERE_ROLE=''; + } + $lib=' + SELECT + ce.id_config_environment, + CASE + WHEN ce.environment_description IS NULL THEN "'.OTHERS.'" + ELSE ce.environment_description + END AS environment_description + FROM config_server cs + LEFT OUTER JOIN config_environment_server ces + ON cs.id_config_server=ces.id_config_server + LEFT OUTER JOIN config_environment ce + ON ces.id_config_environment=ce.id_config_environment + '.$JOIN_ROLE.' + LEFT JOIN config_server_project csp + ON cs.id_config_server=csp.id_config_server + LEFT JOIN perm_project_group ppg + ON ppg.id_config_project=csp.id_config_project + LEFT JOIN auth_group ag + ON ag.id_auth_group=ppg.id_auth_group + LEFT JOIN auth_user_group aug + ON aug.id_auth_group=ag.id_auth_group + WHERE csp.id_config_project=:id_config_project + AND aug.id_auth_user=:id_auth_user + '.$WHERE_ROLE.' + GROUP BY id_config_environment, environment_description + ORDER BY environment_description'; - $this->connSQL->bind('id_config_project',$this->id_config_project); - $this->connSQL->bind('id_auth_user',$this->id_auth_user); - return $this->connSQL->query($lib); - } + $this->connSQL->bind('id_config_project',$this->id_config_project); + $this->connSQL->bind('id_auth_user',$this->id_auth_user); + return $this->connSQL->query($lib); + } } diff --git a/modules/RRDTool.php b/modules/RRDTool.php index 46896e4e..ded508b8 100644 --- a/modules/RRDTool.php +++ b/modules/RRDTool.php @@ -1,38 +1,38 @@ rrdtool = $rrdtool; - } else { - printf('

    Error: RRDTool (%s) is not executable. Please install RRDTool it and configure $CONFIG[\'rrdtool\'].

    ', $rrdtool); - die(); - } - } + function __construct($rrdtool) { + if (file_exists($rrdtool)) { + $this->rrdtool = $rrdtool; + } else { + printf('

    Error: RRDTool (%s) is not executable. Please install RRDTool it and configure $CONFIG[\'rrdtool\'].

    ', $rrdtool); + die(); + } + } - function rrd_info($rrdfile) { - if (file_exists($rrdfile)) { - $raw_info = shell_exec( - escapeshellarg($this->rrdtool) - . " info " . - escapeshellarg($rrdfile) - ); - $raw_array = explode("\n", $raw_info); - $info_array = array(); - foreach ($raw_array as $key => $info) { - if ($info != "") { - $item_info = explode(" = ", $info); - $item_info[1] = preg_replace('/"/', '', $item_info[1]); - $info_array[$item_info[0]] = $item_info[1]; - } - } - return $info_array; - } else { - return false; - } - } + function rrd_info($rrdfile) { + if (file_exists($rrdfile)) { + $raw_info = shell_exec( + escapeshellarg($this->rrdtool) + . " info " . + escapeshellarg($rrdfile) + ); + $raw_array = explode("\n", $raw_info); + $info_array = array(); + foreach ($raw_array as $key => $info) { + if ($info != "") { + $item_info = explode(" = ", $info); + $item_info[1] = preg_replace('/"/', '', $item_info[1]); + $info_array[$item_info[0]] = $item_info[1]; + } + } + return $info_array; + } else { + return false; + } + } } ?> diff --git a/modules/Select.php b/modules/Select.php index 55fe2ee2..1029e8b5 100644 --- a/modules/Select.php +++ b/modules/Select.php @@ -8,10 +8,10 @@ class Select extends Field{ private $multiple = false; private $optionseparator = ' '; private $enable_data = false; - + public function buildField(){ $field = ''; - + if($this->multiple) { $name_prefix='[]'; } else { @@ -25,10 +25,10 @@ public function buildField(){ } if ($formcontrol==true) { $fieldclass='form-control '.$fieldclass; - } + } $field = '
    '; - if (!isset($this->labelclass)) $this->labelclass=''; + if (!isset($this->labelclass)) $this->labelclass=''; switch($this->formtype) { case 'horizontal': $this->labelclass.='control-label'; @@ -52,22 +52,22 @@ public function buildField(){ $this->labelclass.=' '.$this->labelgrid; } - $field.= '
    '; echo '
    '; ?> diff --git a/view/backend/v_environment.php b/view/backend/v_environment.php index a37062ac..34240556 100644 --- a/view/backend/v_environment.php +++ b/view/backend/v_environment.php @@ -18,7 +18,7 @@ if (isset($_GET['f_id_config_server']) || $last_action=='edit_server') { $tab_environment_server_class='active'; $tab_environment_class=''; - } + } } if (isset($cur_environment)) { @@ -63,14 +63,14 @@ include(DIR_FSROOT.'/html/config/environment_server/r_environment_server.php'); include(DIR_FSROOT.'/html/config/environment_server/d_environment_server.php'); echo '
    '; - + if (isset($_GET['f_id_config_server'])) { echo ''; } echo '
    '; include(DIR_FSROOT.'/html/config/environment_server/f_environment_server.php'); echo ''; -} +} echo ''; echo '
    '; diff --git a/view/backend/v_group.php b/view/backend/v_group.php index 84d04056..4786b6a7 100644 --- a/view/backend/v_group.php +++ b/view/backend/v_group.php @@ -92,7 +92,7 @@ include(DIR_FSROOT.'/html/auth/group_user/r_group_user.php'); include(DIR_FSROOT.'/html/auth/group_user/d_group_user.php'); echo '
    '; - + if (isset($_GET['f_id_auth_user'])) { echo ''; } @@ -101,7 +101,7 @@ echo ''.EDIT.''; include(DIR_FSROOT.'/html/auth/group_user/f_group_user.php'); echo ''; - + echo ''; /* GROUP PROJECT */ @@ -113,7 +113,7 @@ include(DIR_FSROOT.'/html/perm/group_project/r_group_project.php'); include(DIR_FSROOT.'/html/perm/group_project/d_group_project.php'); echo '
    '; - + if (isset($_GET['f_id_config_project'])) { echo ''; } @@ -130,7 +130,7 @@ include(DIR_FSROOT.'/html/config/group_plugin_filter/r_group_plugin_filter.php'); include(DIR_FSROOT.'/html/config/group_plugin_filter/d_group_plugin_filter.php'); echo '
    '; - + if (isset($_GET['f_id_config_plugin_filter'])) { echo ''; } @@ -147,7 +147,7 @@ include(DIR_FSROOT.'/html/perm/group_module/r_group_module.php'); include(DIR_FSROOT.'/html/perm/group_module/d_group_module.php'); echo '
    '; - + if (isset($_GET['f_id_perm_module'])) { echo ''; } @@ -164,15 +164,15 @@ include(DIR_FSROOT.'/html/config/group_dynamic_dashboard/r_group_dynamic_dashboard.php'); include(DIR_FSROOT.'/html/config/group_dynamic_dashboard/d_group_dynamic_dashboard.php'); echo '
    '; - + if (isset($_GET['f_id_perm_module'])) { echo ''; } echo '
    '; include(DIR_FSROOT.'/html/config/group_dynamic_dashboard/f_group_dynamic_dashboard.php'); - + echo ''; -} +} echo ''; echo '
    '; ?> diff --git a/view/backend/v_module.php b/view/backend/v_module.php index be4c33ca..883173a0 100644 --- a/view/backend/v_module.php +++ b/view/backend/v_module.php @@ -63,15 +63,15 @@ include(DIR_FSROOT.'/html/perm/module_group/r_module_group.php'); include(DIR_FSROOT.'/html/perm/module_group/d_module_group.php'); echo '
    '; - + if (isset($_GET['f_id_auth_group'])) { echo ''; } echo '
    '; include(DIR_FSROOT.'/html/perm/module_group/f_module_group.php'); - + echo ''; -} +} echo ''; echo '
    '; ?> diff --git a/view/backend/v_project.php b/view/backend/v_project.php index 4f40de35..df59e7a4 100644 --- a/view/backend/v_project.php +++ b/view/backend/v_project.php @@ -20,7 +20,7 @@ if (isset($_GET['f_id_config_server']) || $last_action=='edit_server') { $tab_project_server_class='active'; $tab_project_class=''; - } + } else if (isset($_GET['f_id_auth_group']) || $last_action=='edit_group') { $tab_project_group_class='active'; $tab_project_class=''; @@ -70,13 +70,13 @@ include(DIR_FSROOT.'/html/perm/project_group/r_project_group.php'); include(DIR_FSROOT.'/html/perm/project_group/d_project_group.php'); echo '
    '; - + if (isset($_GET['f_id_auth_group'])) { echo ''; } echo '
    '; include(DIR_FSROOT.'/html/perm/project_group/f_project_group.php'); - + echo ''; echo '
    '; @@ -87,14 +87,14 @@ include(DIR_FSROOT.'/html/config/project_server/r_project_server.php'); include(DIR_FSROOT.'/html/config/project_server/d_project_server.php'); echo '
    '; - + if (isset($_GET['f_id_config_server'])) { echo ''; } echo '
    '; include(DIR_FSROOT.'/html/config/project_server/f_project_server.php'); echo '
    '; -} +} echo ''; echo '
    '; ?> diff --git a/view/backend/v_role.php b/view/backend/v_role.php index 14de657a..94e5ce69 100644 --- a/view/backend/v_role.php +++ b/view/backend/v_role.php @@ -18,7 +18,7 @@ if (isset($_GET['f_id_config_server']) || $last_action=='edit_server') { $tab_role_server_class='active'; $tab_role_class=''; - } + } } if (isset($cur_role)) { @@ -63,14 +63,14 @@ include(DIR_FSROOT.'/html/config/role_server/r_role_server.php'); include(DIR_FSROOT.'/html/config/role_server/d_role_server.php'); echo '
    '; - + if (isset($_GET['f_id_config_server'])) { echo ''; } echo '
    '; include(DIR_FSROOT.'/html/config/role_server/f_role_server.php'); echo ''; -} +} echo ''; echo '
    '; ?> diff --git a/view/backend/v_server.php b/view/backend/v_server.php index 49852399..a2438ac7 100644 --- a/view/backend/v_server.php +++ b/view/backend/v_server.php @@ -101,7 +101,7 @@ include(DIR_FSROOT.'/html/config/server_project/r_server_project.php'); include(DIR_FSROOT.'/html/config/server_project/d_server_project.php'); echo '
    '; - + if (isset($_GET['f_id_config_project'])) { echo ''; } @@ -118,7 +118,7 @@ include(DIR_FSROOT.'/html/config/server_role/r_server_role.php'); include(DIR_FSROOT.'/html/config/server_role/d_server_role.php'); echo '
    '; - + if (isset($_GET['f_id_config_role'])) { echo ''; } @@ -135,14 +135,14 @@ include(DIR_FSROOT.'/html/config/server_environment/r_server_environment.php'); include(DIR_FSROOT.'/html/config/server_environment/d_server_environment.php'); echo '
    '; - + if (isset($_GET['f_id_config_environment'])) { echo ''; } echo '
    '; include(DIR_FSROOT.'/html/config/server_environment/f_server_environment.php'); echo ''; -} +} echo ''; echo '
    '; ?> diff --git a/view/backend/v_small_admin_mydashboard.php b/view/backend/v_small_admin_mydashboard.php index 4fdd330a..ed079f9c 100644 --- a/view/backend/v_small_admin_mydashboard.php +++ b/view/backend/v_small_admin_mydashboard.php @@ -63,7 +63,7 @@ include(DIR_FSROOT.'/html/small_admin/mydashboard_content/r_dynamic_dashboard_content.php'); include(DIR_FSROOT.'/html/small_admin/mydashboard_content/d_dynamic_dashboard_content.php'); echo '
    '; - + if (isset($_GET['f_id_config_dynamic_dashboard_content'])) { echo ''; } @@ -71,7 +71,7 @@ include(DIR_FSROOT.'/html/small_admin/mydashboard_content/f_dynamic_dashboard_content.php'); echo ''; echo ''; -} +} echo ''; echo '
    '; ?> diff --git a/view/backend/v_user.php b/view/backend/v_user.php index 1256479e..758515e1 100644 --- a/view/backend/v_user.php +++ b/view/backend/v_user.php @@ -63,15 +63,15 @@ include(DIR_FSROOT.'/html/auth/user_group/r_user_group.php'); include(DIR_FSROOT.'/html/auth/user_group/d_user_group.php'); echo '
    '; - + if (isset($_GET['f_id_auth_group'])) { echo ''; } echo '
    '; include(DIR_FSROOT.'/html/auth/user_group/f_user_group.php'); - + echo ''; -} +} echo ''; echo '
    '; ?>
    '.$all_group_user[$i]->user.''.$manager.'
    '.$all_group_user[$i]->user.''.$manager.'