diff --git a/ponto/.htaccess b/ponto/.htaccess old mode 100644 new mode 100755 index f9f7207..2fbb820 --- a/ponto/.htaccess +++ b/ponto/.htaccess @@ -1,5 +1,8 @@ RewriteEngine on +# prevent httpd from serving dotfiles (.htaccess, .svn, .git, etc.) +RedirectMatch 403 /\..*$ + # if a directory or a file exists, use it directly RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-d diff --git a/ponto/css/acompanhamento.css b/ponto/css/acompanhamento.css old mode 100644 new mode 100755 diff --git a/ponto/css/calendario.css b/ponto/css/calendario.css old mode 100644 new mode 100755 diff --git a/ponto/css/estilos.css b/ponto/css/estilos.css old mode 100644 new mode 100755 diff --git a/ponto/css/estrutura.css b/ponto/css/estrutura.css old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/css/font-awesome.css b/ponto/css/font-awesome/css/font-awesome.css old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/css/font-awesome.min.css b/ponto/css/font-awesome/css/font-awesome.min.css old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/fonts/FontAwesome.otf b/ponto/css/font-awesome/fonts/FontAwesome.otf old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/fonts/fontawesome-webfont.eot b/ponto/css/font-awesome/fonts/fontawesome-webfont.eot old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/fonts/fontawesome-webfont.svg b/ponto/css/font-awesome/fonts/fontawesome-webfont.svg old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/fonts/fontawesome-webfont.ttf b/ponto/css/font-awesome/fonts/fontawesome-webfont.ttf old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/fonts/fontawesome-webfont.woff b/ponto/css/font-awesome/fonts/fontawesome-webfont.woff old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/fonts/fontawesome-webfont.woff2 b/ponto/css/font-awesome/fonts/fontawesome-webfont.woff2 old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/less/animated.less b/ponto/css/font-awesome/less/animated.less old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/less/bordered-pulled.less b/ponto/css/font-awesome/less/bordered-pulled.less old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/less/core.less b/ponto/css/font-awesome/less/core.less old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/less/fixed-width.less b/ponto/css/font-awesome/less/fixed-width.less old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/less/font-awesome.less b/ponto/css/font-awesome/less/font-awesome.less old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/less/icons.less b/ponto/css/font-awesome/less/icons.less old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/less/larger.less b/ponto/css/font-awesome/less/larger.less old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/less/list.less b/ponto/css/font-awesome/less/list.less old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/less/mixins.less b/ponto/css/font-awesome/less/mixins.less old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/less/path.less b/ponto/css/font-awesome/less/path.less old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/less/rotated-flipped.less b/ponto/css/font-awesome/less/rotated-flipped.less old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/less/screen-reader.less b/ponto/css/font-awesome/less/screen-reader.less old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/less/stacked.less b/ponto/css/font-awesome/less/stacked.less old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/less/variables.less b/ponto/css/font-awesome/less/variables.less old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/scss/_animated.scss b/ponto/css/font-awesome/scss/_animated.scss old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/scss/_bordered-pulled.scss b/ponto/css/font-awesome/scss/_bordered-pulled.scss old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/scss/_core.scss b/ponto/css/font-awesome/scss/_core.scss old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/scss/_fixed-width.scss b/ponto/css/font-awesome/scss/_fixed-width.scss old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/scss/_icons.scss b/ponto/css/font-awesome/scss/_icons.scss old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/scss/_larger.scss b/ponto/css/font-awesome/scss/_larger.scss old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/scss/_list.scss b/ponto/css/font-awesome/scss/_list.scss old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/scss/_mixins.scss b/ponto/css/font-awesome/scss/_mixins.scss old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/scss/_path.scss b/ponto/css/font-awesome/scss/_path.scss old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/scss/_rotated-flipped.scss b/ponto/css/font-awesome/scss/_rotated-flipped.scss old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/scss/_screen-reader.scss b/ponto/css/font-awesome/scss/_screen-reader.scss old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/scss/_stacked.scss b/ponto/css/font-awesome/scss/_stacked.scss old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/scss/_variables.scss b/ponto/css/font-awesome/scss/_variables.scss old mode 100644 new mode 100755 diff --git a/ponto/css/font-awesome/scss/font-awesome.scss b/ponto/css/font-awesome/scss/font-awesome.scss old mode 100644 new mode 100755 diff --git a/ponto/css/formulario.css b/ponto/css/formulario.css old mode 100644 new mode 100755 diff --git a/ponto/css/imgs/bigLoader.gif b/ponto/css/imgs/bigLoader.gif old mode 100644 new mode 100755 diff --git a/ponto/css/imgs/contrair.gif b/ponto/css/imgs/contrair.gif old mode 100644 new mode 100755 diff --git a/ponto/css/imgs/expandir.gif b/ponto/css/imgs/expandir.gif old mode 100644 new mode 100755 diff --git a/ponto/css/imgs/fundo_bt.gif b/ponto/css/imgs/fundo_bt.gif old mode 100644 new mode 100755 diff --git a/ponto/css/imgs/fundo_bt_amarelo.gif b/ponto/css/imgs/fundo_bt_amarelo.gif old mode 100644 new mode 100755 diff --git a/ponto/css/imgs/fundo_bt_desabilitado.gif b/ponto/css/imgs/fundo_bt_desabilitado.gif old mode 100644 new mode 100755 diff --git a/ponto/css/imgs/fundo_bt_verde.gif b/ponto/css/imgs/fundo_bt_verde.gif old mode 100644 new mode 100755 diff --git a/ponto/css/imgs/fundo_bt_vermelho.gif b/ponto/css/imgs/fundo_bt_vermelho.gif old mode 100644 new mode 100755 diff --git a/ponto/css/imgs/fundo_tab.jpg b/ponto/css/imgs/fundo_tab.jpg old mode 100644 new mode 100755 diff --git a/ponto/css/imgs/icone_aviso.png b/ponto/css/imgs/icone_aviso.png old mode 100644 new mode 100755 diff --git a/ponto/css/imgs/icone_erro.png b/ponto/css/imgs/icone_erro.png old mode 100644 new mode 100755 diff --git a/ponto/css/imgs/icone_informacao.png b/ponto/css/imgs/icone_informacao.png old mode 100644 new mode 100755 diff --git a/ponto/css/imgs/icone_proibido.png b/ponto/css/imgs/icone_proibido.png old mode 100644 new mode 100755 diff --git a/ponto/css/imgs/icone_sucesso.png b/ponto/css/imgs/icone_sucesso.png old mode 100644 new mode 100755 diff --git a/ponto/css/imgs/icone_zoom_in.png b/ponto/css/imgs/icone_zoom_in.png old mode 100644 new mode 100755 diff --git a/ponto/css/imgs/smallLoader.gif b/ponto/css/imgs/smallLoader.gif old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/images/Thumbs.db b/ponto/css/jquery/images/Thumbs.db old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/images/animated-overlay.gif b/ponto/css/jquery/images/animated-overlay.gif old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/images/ui-bg_flat_15_cd0a0a_40x100.png b/ponto/css/jquery/images/ui-bg_flat_15_cd0a0a_40x100.png old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/images/ui-bg_flat_90_7b7b7b_40x100.png b/ponto/css/jquery/images/ui-bg_flat_90_7b7b7b_40x100.png old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/images/ui-bg_glass_100_e4f1fb_1x400.png b/ponto/css/jquery/images/ui-bg_glass_100_e4f1fb_1x400.png old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/images/ui-bg_glass_50_3baae3_1x400.png b/ponto/css/jquery/images/ui-bg_glass_50_3baae3_1x400.png old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/images/ui-bg_glass_80_d7ebf9_1x400.png b/ponto/css/jquery/images/ui-bg_glass_80_d7ebf9_1x400.png old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png b/ponto/css/jquery/images/ui-bg_highlight-hard_100_f2f5f7_1x100.png old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/images/ui-bg_highlight-hard_70_000000_1x100.png b/ponto/css/jquery/images/ui-bg_highlight-hard_70_000000_1x100.png old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/images/ui-bg_highlight-soft_100_deedf7_1x100.png b/ponto/css/jquery/images/ui-bg_highlight-soft_100_deedf7_1x100.png old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/images/ui-bg_highlight-soft_25_ffef8f_1x100.png b/ponto/css/jquery/images/ui-bg_highlight-soft_25_ffef8f_1x100.png old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/images/ui-icons_2694e8_256x240.png b/ponto/css/jquery/images/ui-icons_2694e8_256x240.png old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/images/ui-icons_2e83ff_256x240.png b/ponto/css/jquery/images/ui-icons_2e83ff_256x240.png old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/images/ui-icons_3d80b3_256x240.png b/ponto/css/jquery/images/ui-icons_3d80b3_256x240.png old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/images/ui-icons_72a7cf_256x240.png b/ponto/css/jquery/images/ui-icons_72a7cf_256x240.png old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/images/ui-icons_ffffff_256x240.png b/ponto/css/jquery/images/ui-icons_ffffff_256x240.png old mode 100644 new mode 100755 diff --git a/ponto/css/jquery/jquery-ui-1.10.3.custom.min.css b/ponto/css/jquery/jquery-ui-1.10.3.custom.min.css old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/LICENSE b/ponto/css/materialize/LICENSE old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/README.md b/ponto/css/materialize/README.md old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/css/materialize.css b/ponto/css/materialize/css/materialize.css old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/css/materialize.min.css b/ponto/css/materialize/css/materialize.min.css old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/material-design-icons/LICENSE.txt b/ponto/css/materialize/font/material-design-icons/LICENSE.txt old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/material-design-icons/Material-Design-Icons.eot b/ponto/css/materialize/font/material-design-icons/Material-Design-Icons.eot old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/material-design-icons/Material-Design-Icons.svg b/ponto/css/materialize/font/material-design-icons/Material-Design-Icons.svg old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/material-design-icons/Material-Design-Icons.ttf b/ponto/css/materialize/font/material-design-icons/Material-Design-Icons.ttf old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/material-design-icons/Material-Design-Icons.woff b/ponto/css/materialize/font/material-design-icons/Material-Design-Icons.woff old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/material-design-icons/Material-Design-Icons.woff2 b/ponto/css/materialize/font/material-design-icons/Material-Design-Icons.woff2 old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/roboto/Roboto-Bold.ttf b/ponto/css/materialize/font/roboto/Roboto-Bold.ttf old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/roboto/Roboto-Bold.woff b/ponto/css/materialize/font/roboto/Roboto-Bold.woff old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/roboto/Roboto-Bold.woff2 b/ponto/css/materialize/font/roboto/Roboto-Bold.woff2 old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/roboto/Roboto-Light.ttf b/ponto/css/materialize/font/roboto/Roboto-Light.ttf old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/roboto/Roboto-Light.woff b/ponto/css/materialize/font/roboto/Roboto-Light.woff old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/roboto/Roboto-Light.woff2 b/ponto/css/materialize/font/roboto/Roboto-Light.woff2 old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/roboto/Roboto-Medium.ttf b/ponto/css/materialize/font/roboto/Roboto-Medium.ttf old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/roboto/Roboto-Medium.woff b/ponto/css/materialize/font/roboto/Roboto-Medium.woff old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/roboto/Roboto-Medium.woff2 b/ponto/css/materialize/font/roboto/Roboto-Medium.woff2 old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/roboto/Roboto-Regular.ttf b/ponto/css/materialize/font/roboto/Roboto-Regular.ttf old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/roboto/Roboto-Regular.woff b/ponto/css/materialize/font/roboto/Roboto-Regular.woff old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/roboto/Roboto-Regular.woff2 b/ponto/css/materialize/font/roboto/Roboto-Regular.woff2 old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/roboto/Roboto-Thin.ttf b/ponto/css/materialize/font/roboto/Roboto-Thin.ttf old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/roboto/Roboto-Thin.woff b/ponto/css/materialize/font/roboto/Roboto-Thin.woff old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/font/roboto/Roboto-Thin.woff2 b/ponto/css/materialize/font/roboto/Roboto-Thin.woff2 old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/js/materialize.js b/ponto/css/materialize/js/materialize.js old mode 100644 new mode 100755 diff --git a/ponto/css/materialize/js/materialize.min.js b/ponto/css/materialize/js/materialize.min.js old mode 100644 new mode 100755 diff --git a/ponto/css/registro.css b/ponto/css/registro.css old mode 100644 new mode 100755 diff --git a/ponto/css/simples.css b/ponto/css/simples.css old mode 100644 new mode 100755 diff --git a/ponto/css/tabela.css b/ponto/css/tabela.css old mode 100644 new mode 100755 diff --git a/ponto/css/texto.css b/ponto/css/texto.css old mode 100644 new mode 100755 diff --git a/ponto/css/yii.css b/ponto/css/yii.css old mode 100644 new mode 100755 diff --git a/ponto/imgs/banner.png b/ponto/imgs/banner.png old mode 100644 new mode 100755 diff --git a/ponto/imgs/fundo-listrado-diagonal.gif b/ponto/imgs/fundo-listrado-diagonal.gif old mode 100644 new mode 100755 diff --git a/ponto/imgs/logo.png b/ponto/imgs/logo.png old mode 100644 new mode 100755 diff --git a/ponto/imgs/logoPonto.png b/ponto/imgs/logoPonto.png old mode 100644 new mode 100755 diff --git a/ponto/imgs/logo_branco.png b/ponto/imgs/logo_branco.png old mode 100644 new mode 100755 diff --git a/ponto/imgs/mouse_normal_g.png b/ponto/imgs/mouse_normal_g.png old mode 100644 new mode 100755 diff --git a/ponto/imgs/mouse_normal_xg.png b/ponto/imgs/mouse_normal_xg.png old mode 100644 new mode 100755 diff --git a/ponto/index.php b/ponto/index.php old mode 100644 new mode 100755 diff --git a/ponto/js/acompanhamento.js b/ponto/js/acompanhamento.js old mode 100644 new mode 100755 diff --git a/ponto/js/acompanhamentoChefia.js b/ponto/js/acompanhamentoChefia.js old mode 100644 new mode 100755 diff --git a/ponto/js/calendario.js b/ponto/js/calendario.js old mode 100644 new mode 100755 diff --git a/ponto/js/circle-progress.js b/ponto/js/circle-progress.js old mode 100644 new mode 100755 diff --git a/ponto/js/compensacao.js b/ponto/js/compensacao.js old mode 100644 new mode 100755 diff --git a/ponto/js/consolida.js b/ponto/js/consolida.js old mode 100644 new mode 100755 diff --git a/ponto/js/gerencia.js b/ponto/js/gerencia.js old mode 100644 new mode 100755 diff --git a/ponto/js/horarioOrgao.js b/ponto/js/horarioOrgao.js old mode 100644 new mode 100755 diff --git a/ponto/js/jquery/jquery.maskedinput-1.2.2.js b/ponto/js/jquery/jquery.maskedinput-1.2.2.js old mode 100644 new mode 100755 index a42b190..fc330b2 --- a/ponto/js/jquery/jquery.maskedinput-1.2.2.js +++ b/ponto/js/jquery/jquery.maskedinput-1.2.2.js @@ -1,4 +1,4 @@ -/// +// /* Masked Input plugin for jQuery Copyright (c) 2007-2009 Josh Bush (digitalbush.com) diff --git a/ponto/js/pedidoAjuste.js b/ponto/js/pedidoAjuste.js old mode 100644 new mode 100755 diff --git a/ponto/js/pedidosAvaliacao.js b/ponto/js/pedidosAvaliacao.js old mode 100644 new mode 100755 diff --git a/ponto/js/pedidosCertificados.js b/ponto/js/pedidosCertificados.js old mode 100644 new mode 100755 diff --git a/ponto/js/registro.js b/ponto/js/registro.js old mode 100644 new mode 100755 diff --git a/ponto/js/relatorio.js b/ponto/js/relatorio.js old mode 100644 new mode 100755 diff --git a/ponto/js/restricao.js b/ponto/js/restricao.js old mode 100644 new mode 100755 diff --git a/ponto/protected/.htaccess b/ponto/protected/.htaccess old mode 100644 new mode 100755 diff --git a/ponto/protected/components/ComponenteSeguranca.php b/ponto/protected/components/ComponenteSeguranca.php old mode 100644 new mode 100755 diff --git a/ponto/protected/components/ConversorDataBehavior.php b/ponto/protected/components/ConversorDataBehavior.php old mode 100644 new mode 100755 diff --git a/ponto/protected/components/Helper.php b/ponto/protected/components/Helper.php old mode 100644 new mode 100755 diff --git a/ponto/protected/components/Identidade.php b/ponto/protected/components/Identidade.php old mode 100644 new mode 100755 diff --git a/ponto/protected/components/IdentidadeInterface.php b/ponto/protected/components/IdentidadeInterface.php old mode 100644 new mode 100755 diff --git a/ponto/protected/components/Repositorio.php b/ponto/protected/components/Repositorio.php old mode 100644 new mode 100755 diff --git a/ponto/protected/components/Sessao.php b/ponto/protected/components/Sessao.php old mode 100644 new mode 100755 diff --git a/ponto/protected/components/UsuarioWeb.php b/ponto/protected/components/UsuarioWeb.php old mode 100644 new mode 100755 diff --git a/ponto/protected/config/config.php b/ponto/protected/config/config.php old mode 100644 new mode 100755 index 2675c52..a6e155e --- a/ponto/protected/config/config.php +++ b/ponto/protected/config/config.php @@ -20,10 +20,10 @@ ), // TODO - configurar acesso ao banco de dados 'db'=>array( - 'connectionString' => 'mysql:host=localhost:3307;dbname=ponto', + 'connectionString' => 'mysql:host=localhost:3306;dbname=ponto', 'emulatePrepare' => true, 'username' => 'root', - 'password' => 'usbw', + 'password' => 'inovar123', 'charset' => 'utf8', ), 'urlManager' => array( @@ -46,9 +46,9 @@ 'filter' => 'CLogFilter', ), // uncomment the following to show log messages on web pages - // array( - // 'class'=>'CWebLogRoute', - // ), + array( + 'class'=>'CWebLogRoute', + ), ), ), ), diff --git a/ponto/protected/controllers/AcompanhamentoController.php b/ponto/protected/controllers/AcompanhamentoController.php old mode 100644 new mode 100755 diff --git a/ponto/protected/controllers/AjusteController.php b/ponto/protected/controllers/AjusteController.php old mode 100644 new mode 100755 diff --git a/ponto/protected/controllers/BaseController.php b/ponto/protected/controllers/BaseController.php old mode 100644 new mode 100755 diff --git a/ponto/protected/controllers/CalendarioController.php b/ponto/protected/controllers/CalendarioController.php old mode 100644 new mode 100755 diff --git a/ponto/protected/controllers/CompensacaoController.php b/ponto/protected/controllers/CompensacaoController.php old mode 100644 new mode 100755 diff --git a/ponto/protected/controllers/ConsolidaController.php b/ponto/protected/controllers/ConsolidaController.php old mode 100644 new mode 100755 diff --git a/ponto/protected/controllers/GerenciaController.php b/ponto/protected/controllers/GerenciaController.php old mode 100644 new mode 100755 diff --git a/ponto/protected/controllers/HorariosController.php b/ponto/protected/controllers/HorariosController.php old mode 100644 new mode 100755 index fe27e48..e9e83ea --- a/ponto/protected/controllers/HorariosController.php +++ b/ponto/protected/controllers/HorariosController.php @@ -67,7 +67,7 @@ public function actionHorariosOrgaos() if(isset($_REQUEST['Orgaos'])) { // Selecionou um dos órgãos sob responsabilidade $orgaos = $this->retornaOrgaosResponsabilidade($id_pessoa); $controle = true; - $orgao = Orgao::model()->findByPk($_REQUEST['Orgaos']); + $orgao = Orgao::model()->findByPk($_REQUEST['orgaos']); $definicao = DefinicoesOrgao::model()->findByPk($orgao->id_orgao); $defOrgaoSuperior = ($orgao->getAttribute("id_orgao_superior") == NULL ? NULL : DefinicoesOrgao::model()->findByPk($orgao->getAttribute("id_orgao_superior"))); $aLimitesHorario['hora_inicio_expediente'] = "00:00"; @@ -109,10 +109,10 @@ public function actionHorariosOrgaos() */ public function actionSalvarHorarios() { - if (isset($_POST['Orgao'])){ + if (isset($_POST['orgao'])){ $msg=""; $postDefinicoes = $_POST['DefinicoesOrgao']; - $orgao = Orgao::model()->find('t.id_orgao = '.$_POST['Orgao']); + $orgao = Orgao::model()->find('t.id_orgao = '.$_POST['orgao']); $definicao = DefinicoesOrgao::model()->find('t.id_orgao = '.$orgao->id_orgao); $defOrgaoSuperior = DefinicoesOrgao::model()->find('t.id_orgao = '.$orgao->getAttribute("id_orgao_superior")); @@ -308,4 +308,4 @@ private function retornaOrgaoLotacao($id_pessoa) )); return $pessoa->OrgaoExercicio; } -} \ No newline at end of file +} diff --git a/ponto/protected/controllers/RegistroController.php b/ponto/protected/controllers/RegistroController.php old mode 100644 new mode 100755 index 6a0c2ed..26f40a3 --- a/ponto/protected/controllers/RegistroController.php +++ b/ponto/protected/controllers/RegistroController.php @@ -393,9 +393,10 @@ public function actionLogin() */ public function actionSair() { - Yii::app()->session->setSessionName("PontoUFRGS"); + //Yii::app()->session->setSessionName("PontoUFRGS"); Yii::app()->session->destroy(); Yii::app()->session->close(); + Yii::app()->session->setSessionName("PontoUFRGS"); $this->actionLogin(); } @@ -427,4 +428,4 @@ public static function getData($formato) return date($formato); } -} \ No newline at end of file +} diff --git a/ponto/protected/controllers/RelatorioController.php b/ponto/protected/controllers/RelatorioController.php old mode 100644 new mode 100755 diff --git a/ponto/protected/controllers/RestricaoController.php b/ponto/protected/controllers/RestricaoController.php old mode 100644 new mode 100755 diff --git a/ponto/protected/controllers/TempLoginController.php b/ponto/protected/controllers/TempLoginController.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/Abono.php b/ponto/protected/models/Abono.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/Ajuste.php b/ponto/protected/models/Ajuste.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/ArquivoAjuste.php b/ponto/protected/models/ArquivoAjuste.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/CargaHorariaMesServidor.php b/ponto/protected/models/CargaHorariaMesServidor.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/CategoriaFuncional.php b/ponto/protected/models/CategoriaFuncional.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/Compensacao.php b/ponto/protected/models/Compensacao.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/DadoFuncional.php b/ponto/protected/models/DadoFuncional.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/DefinicoesOrgao.php b/ponto/protected/models/DefinicoesOrgao.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/Frequencia.php b/ponto/protected/models/Frequencia.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/GrupoEmprego.php b/ponto/protected/models/GrupoEmprego.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/JustificativaAjuste.php b/ponto/protected/models/JustificativaAjuste.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/LogErroAcessoRegistro.php b/ponto/protected/models/LogErroAcessoRegistro.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/Orgao.php b/ponto/protected/models/Orgao.php old mode 100644 new mode 100755 index 08224f9..6ddaa1c --- a/ponto/protected/models/Orgao.php +++ b/ponto/protected/models/Orgao.php @@ -52,7 +52,7 @@ public static function model($className = __CLASS__) */ public function tableName() { - return 'Orgao'; + return 'orgao'; } /** diff --git a/ponto/protected/models/Permissao.php b/ponto/protected/models/Permissao.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/Pessoa.php b/ponto/protected/models/Pessoa.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/Ponto.php b/ponto/protected/models/Ponto.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/PontoEAjuste.php b/ponto/protected/models/PontoEAjuste.php old mode 100644 new mode 100755 diff --git a/ponto/protected/models/RestricaoRelogio.php b/ponto/protected/models/RestricaoRelogio.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/acompanhamento/acompanhamentoChefia.php b/ponto/protected/views/acompanhamento/acompanhamentoChefia.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/acompanhamento/index.php b/ponto/protected/views/acompanhamento/index.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/ajuste/dadosPedido.php b/ponto/protected/views/ajuste/dadosPedido.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/ajuste/dadosPedidoCertificado.php b/ponto/protected/views/ajuste/dadosPedidoCertificado.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/ajuste/pedido.php b/ponto/protected/views/ajuste/pedido.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/ajuste/pedidosAvaliacao.php b/ponto/protected/views/ajuste/pedidosAvaliacao.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/ajuste/pedidosCertificados.php b/ponto/protected/views/ajuste/pedidosCertificados.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/calendario/index.php b/ponto/protected/views/calendario/index.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/compensacao/dadosPedido.php b/ponto/protected/views/compensacao/dadosPedido.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/compensacao/dadosPedidoCertificado.php b/ponto/protected/views/compensacao/dadosPedidoCertificado.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/compensacao/pedido.php b/ponto/protected/views/compensacao/pedido.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/compensacao/pedidosAvaliacao.php b/ponto/protected/views/compensacao/pedidosAvaliacao.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/consolida/index.php b/ponto/protected/views/consolida/index.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/gerencia/index.php b/ponto/protected/views/gerencia/index.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/horarios/exibirHorariosOrgao.php b/ponto/protected/views/horarios/exibirHorariosOrgao.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/horarios/horariosOrgaos.php b/ponto/protected/views/horarios/horariosOrgaos.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/layouts/main.php b/ponto/protected/views/layouts/main.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/layouts/registroPonto.php b/ponto/protected/views/layouts/registroPonto.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/registro/index.php b/ponto/protected/views/registro/index.php old mode 100644 new mode 100755 index b213302..44238f2 --- a/ponto/protected/views/registro/index.php +++ b/ponto/protected/views/registro/index.php @@ -3,7 +3,7 @@ - DadosFuncionais) == 1): ?> + DadosFuncionais) == 1): ?>
@@ -26,6 +26,7 @@
+
@@ -134,6 +135,10 @@

Para realizar ajustes e acompanhamento, acesse o Portal de Serviços.

+ + - \ No newline at end of file + + +DadosFuncionais[0] ?> \ No newline at end of file diff --git a/ponto/protected/views/registro/login.php b/ponto/protected/views/registro/login.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/registro/mensagem.php b/ponto/protected/views/registro/mensagem.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/registro/selecionaVinculo.php b/ponto/protected/views/registro/selecionaVinculo.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/relatorio/_periodos.php b/ponto/protected/views/relatorio/_periodos.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/relatorio/exibicao.php b/ponto/protected/views/relatorio/exibicao.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/relatorio/index.php b/ponto/protected/views/relatorio/index.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/restricao/index.php b/ponto/protected/views/restricao/index.php old mode 100644 new mode 100755 diff --git a/ponto/protected/views/tempLogin/login.php b/ponto/protected/views/tempLogin/login.php old mode 100644 new mode 100755 diff --git a/repositorio/abreArquivo.php b/repositorio/abreArquivo.php old mode 100644 new mode 100755 diff --git a/repositorio/docs/F727BC55D5AA b/repositorio/docs/F727BC55D5AA old mode 100644 new mode 100755 diff --git a/repositorio/docs/F727BC55D5AA.txt b/repositorio/docs/F727BC55D5AA.txt old mode 100644 new mode 100755