for server in $webservers; do
server=$(echo $server | sed 's/,$//')
servers="$server $servers"
- # Make sure our web server has PHP support
- phpver=php4
- phpini=/etc/$phpver/$server/php.ini
- . /usr/share/wwwconfig-common/apache-php.sh
- if [ "$status" = "uncomment" ] ; then
- restart="$server $restart"
- elif [ "$status" = "error" ] ; then
- echo "Error while trying to enable $phpver support for '$server' : $error."
- fi
-
- # Make sure that PHP has MySQL support enabled
- checkextensions=mysql
- . /usr/share/wwwconfig-common/php-extensions.sh
-
includefile=/etc/diogenes/apache.conf
- # For old versions of Diogenes, remove the include of ourapache.conf
- if dpkg --compare-versions "$2" le-nl "0.9.9.3-6" ; then
- . /usr/share/wwwconfig-common/apache-uninclude_all.sh
- if [ "$status" = "uncomment" ] ; then
- restart="$server $restart"
- fi
- fi
-
+
# If necessary, add a symlink to our apache.conf
if [ -d /etc/$server/conf.d ] && [ ! -e /etc/$server/conf.d/diogenes ] ; then
ln -s $includefile /etc/$server/conf.d/diogenes
if (!isset($this->table_menu))
return;
+ // all menu entries from database
+ $mcache = $this->menuRead();
+
// try to figure out the current MID from the current PID
// and build filiation
$filiation = array();
- $res = $this->dbh->query("select MID from {$this->table_menu} where PID='$PID'");
- while (list($MID) = mysql_fetch_row($res))
- $filiation = $this->menuToRoot($MID, $filiation);
- mysql_free_result($res);
+ foreach ($mcache as $mid => $mentry)
+ {
+ if ($mentry['pid'] == $PID)
+ $filiation = $this->menuToRoot($mcache, $mid, $filiation);
+ }
// add the user-defined part of the menu
- $this->menu = array_merge($this->menu,$this->menuRecurse(0,$filiation,0));
+ $this->menu = array_merge($this->menu,$this->menuRecurse($mcache,0,$filiation,0));
}
/** Return the filiation to get to the root element.
*
+ * @param mcache
* @param MID
* @param path
*/
- function menuToRoot($MID, $path) {
+ function menuToRoot($mcache, $MID, $path) {
/* add ourself to the path */
array_push($path,$MID);
if ($MID) {
/* recursion */
- $res = $this->dbh->query("select MIDpere from {$this->table_menu} where MID=$MID");
- list($MIDpere) = mysql_fetch_row($res);
- mysql_free_result($res);
-
- return $this->menuToRoot($MIDpere, $path);
+ return $this->menuToRoot($mcache, $mcache[$MID]['parent'], $path);
} else {
/* termination */
return $path;
/** Recursively add menu entries
*
+ * @param mcache
* @param MIDpere
* @param filiation
* @param level
*/
- function menuRecurse($MIDpere, $filiation, $level) {
+ function menuRecurse($mcache, $MIDpere, $filiation, $level) {
// the produced output
$out = array();
- $res = $this->dbh->query("select m.MID,m.title,m.link,m.PID ".
- "from {$this->table_menu} as m ".
- "where MIDpere=$MIDpere order by ordre");
-
- while(list($mid,$title,$link,$pid) = mysql_fetch_row($res)) {
- $location = $this->barrel->getLocation($pid);
+ foreach ($mcache[$MIDpere]['children'] as $mid)
+ {
+ $mentry = $mcache[$mid];
// echo "pid : $pid, location : $location<br/>";
- $title = stripslashes($title);
- $entry = htmlentities(stripslashes($title), ENT_QUOTES);
- $link = $pid ? $this->urlSite($location) : $link;
+ $entry = htmlentities(stripslashes($mentry['title']), ENT_QUOTES);
+ if ($mentry['pid'])
+ {
+ $link = $this->urlSite($this->barrel->getLocation($mentry['pid']));
+ } else {
+ $link = $mentry['link'];
+ }
// decide whether this menu should be expanded
$expanded = ($this->barrel->options->menu_min_level == 0) ||
($level+1 < $this->barrel->options->menu_min_level) ||
in_array($mid, $filiation);
- array_push($out, array($level, $entry, $link, $expanded));
- $out = array_merge($out, $this->menuRecurse($mid, $filiation, $level+1));
+ array_push($out, array($level, $entry, $link, $expanded));
+ $out = array_merge($out, $this->menuRecurse($mcache, $mid, $filiation, $level+1));
}
- // free MySQL result and return output
- mysql_free_result($res);
return $out;
}
+ /** Read this barrel's menu entries from database.
+ */
+ function menuRead()
+ {
+ $menu = array();
+ $res = $this->dbh->query("select MID,MIDpere,title,link,PID from {$this->table_menu} order by ordre");
+ while (list($mid, $parent, $title, $link, $pid) = mysql_fetch_row($res))
+ {
+ $menu[$mid]['parent'] = $parent;
+ $menu[$mid]['title'] = $title;
+ $menu[$mid]['link'] = $link;
+ $menu[$mid]['title'] = $title;
+ $menu[$mid]['pid'] = $pid;
+ if (!is_array($menu[$mid]['children']))
+ $menu[$mid]['children'] = array();
+
+ // register this entry with its parent
+ if (!is_array($menu[$parent]['children']))
+ $menu[$parent]['children'] = array();
+ array_push($menu[$parent]['children'], $mid);
+ }
+ mysql_free_result($res);
+ return $menu;
+ }
+
+
/**
* Break down a PATH_INFO into site, page id and file
* Directories *must* be accessed with a final slash.
projects / diogenes.git / commitdiff