diff --git a/.htaccess b/.htaccess index 34d124a..97c7a19 100644 --- a/.htaccess +++ b/.htaccess @@ -2,8 +2,8 @@ Options -MultiViews RewriteEngine On # Add trailing slash -RewriteCond %{REQUEST_URI} !(/$|\.) -RewriteRule (.*) %{REQUEST_URI}/ [R=301,L] +# RewriteCond %{REQUEST_URI} !(/$|\.) +# RewriteRule (.*) %{REQUEST_URI}/ [R=301,L] # Force HTTPS RewriteCond %{HTTP:X-Forwarded-Proto} !https @@ -19,9 +19,9 @@ RewriteRule ^$ views/index.php [L,QSA] # Rewrite views RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f -RewriteRule ^([^\/\.]+)/$ views/$1.php [L,QSA] +RewriteRule ^([^\/\.]+)/?$ views/$1.php [L,QSA] # Rewrite views with ID RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f -RewriteRule ^([^\/\.]+)/([^\/\.\?\&]+)/$ views/$1.php?id=$2 [L,QSA] +RewriteRule ^([^\/\.]+)/([^\/\.\?\&]+)/?$ views/$1.php?id=$2 [L,QSA] diff --git a/classes/GDE/Acontecimento.inc.php b/classes/GDE/Acontecimento.inc.php index 6e41429..acacffb 100644 --- a/classes/GDE/Acontecimento.inc.php +++ b/classes/GDE/Acontecimento.inc.php @@ -160,9 +160,9 @@ public function getFoto($th = true) { if(($this->getOrigem() !== null) || ($this->getGrupo_Origem() !== null)) return ($this->getOrigem() !== null) ? $this->getOrigem()->getFoto(true, $th) : $this->getGrupo_Origem()->getFoto(true, $th); elseif($this->tipo == 'ga') - return ($th) ? "../web/images/gde_th.gif" : "../web/images/gde.gif"; + return ($th) ? CONFIG_URL . "web/images/gde_th.gif" : "../web/images/gde.gif"; elseif($this->tipo == 'gc') - return ($th) ? "../web/images/gde_th.gif" : "../web/images/gde.gif"; + return ($th) ? CONFIG_URL . "web/images/gde_th.gif" : "../web/images/gde.gif"; } public function Pode_Responder(Usuario $Usuario) { diff --git a/views/disciplina.php b/views/disciplina.php index bfbb72e..a9760da 100644 --- a/views/disciplina.php +++ b/views/disciplina.php @@ -132,7 +132,7 @@
Sigla: | -= ((isset($_GET['of']))?'':null).$Disciplina->getSigla(true).((isset($_GET['of']))?'':null); ?> | += ((isset($_GET['of']))?'':null).$Disciplina->getSigla(true).((isset($_GET['of']))?'':null); ?> |
Nome: | diff --git a/views/index.php b/views/index.php index 6bb13a7..ab0c8a4 100644 --- a/views/index.php +++ b/views/index.php @@ -14,13 +14,13 @@ $_SESSION['atualizacoes_last_id'] = 0; //Acontecimento::Ultimo_Id_Por_Data($_SESSION['ultimo_acesso']); ?> - - - - - - - + + + + + + + --> +