projects
/
platal.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Initial work on the rewriting of the profile/edit page"
[platal.git]
/
classes
/
xnet.php
diff --git
a/classes/xnet.php
b/classes/xnet.php
index
1e76f67
..
58d1375
100644
(file)
--- a/
classes/xnet.php
+++ b/
classes/xnet.php
@@
-1,6
+1,6
@@
<?php
/***************************************************************************
<?php
/***************************************************************************
- * Copyright (C) 2003-200
6
Polytechnique.org *
+ * Copyright (C) 2003-200
7
Polytechnique.org *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
* http://opensource.polytechnique.org/ *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-21,10
+21,10
@@
class Xnet extends Platal
{
class Xnet extends Platal
{
-
function Xne
t()
+
public function __construc
t()
{
$modules = func_get_args();
{
$modules = func_get_args();
-
call_user_func_array(array(&$this, 'Platal'),
$modules);
+
parent::__construct(
$modules);
global $globals;
if ($globals->asso()) {
global $globals;
if ($globals->asso()) {
@@
-38,7
+38,7
@@
class Xnet extends Platal
}
}
}
}
-
function find_nearest_key($key,
&$array)
+
protected function find_nearest_key($key, array
&$array)
{
global $globals;
if (in_array('%grp', array_keys($array)) && $key == $globals->asso('diminutif')) {
{
global $globals;
if (in_array('%grp', array_keys($array)) && $key == $globals->asso('diminutif')) {
@@
-47,15
+47,20
@@
class Xnet extends Platal
return parent::find_nearest_key($key, $array);
}
return parent::find_nearest_key($key, $array);
}
- function near_hook()
+
public
function near_hook()
{
global $globals;
{
global $globals;
- return str_replace('%grp', $globals->asso('diminutif'), parent::near_hook());
+ $link = str_replace('%grp', $globals->asso('diminutif'), parent::near_hook());
+ if ($link != $this->path) {
+ return $link;
+ }
+ return null;
}
}
- function find_hook()
+
protected
function find_hook()
{
$ans = parent::find_hook();
{
$ans = parent::find_hook();
+ $this->https = false;
if ($ans && $this->ns) {
$this->path = $this->ns . substr($this->path, 5);
$this->argv[0] = $this->ns . substr($this->argv[0], 5);
if ($ans && $this->ns) {
$this->path = $this->ns . substr($this->path, 5);
$this->argv[0] = $this->ns . substr($this->argv[0], 5);
@@
-63,10
+68,11
@@
class Xnet extends Platal
return $ans;
}
return $ans;
}
- function force_login(&$page)
+
public
function force_login(&$page)
{
http_redirect(S::v('loginX'));
}
}
{
http_redirect(S::v('loginX'));
}
}
+// vim:set et sw=4 sts=4 sws=4 foldmethod=marker enc=utf-8:
?>
?>