mango r195 - trunk/www

[ovitters svn gnome org]

Author: ovitters
Date: Wed Jun  4 08:43:57 2008
New Revision: 195
URL: http://svn.gnome.org/viewvc/mango?rev=195&view=rev

Log:
Retab!


Modified:
   trunk/www/list_modules.php

Modified: trunk/www/list_modules.php
==============================================================================
--- trunk/www/list_modules.php	(original)
+++ trunk/www/list_modules.php	Wed Jun  4 08:43:57 2008
@@ -10,172 +10,168 @@
 define('GROUP', 'sysadmin');
 
 class ListModules {
-	// A PagedResults containing the keys of the modules currently selected
-	var $modules;
-
-	// Filter keyword for narrowing down results
-	var $filter_keyword;
-	
-	// An initialisation error message
-	var $error;
-	
-	function reload() {
-		global $config;
-		
-		unset($this->error);
-
-		// Create an empty resultset in case of problems
-		$results = array();
-		$this->modules = new PagedResults($results);
-		
-		// Get relevant entries from LDAP server
-		$ldapcriteria = "";
-		if(!empty($this->filter_keyword)) {
-			$keyword = $this->filter_keyword;
-			$ldapcriteria .= "(|".
-				"(cn=*".LDAPUtil::ldap_quote($keyword)."*)".
-				"(maintainerUid=*".LDAPUtil::ldap_quote($keyword)."*)".
-				")";
-		}
-		if(!empty($ldapcriteria)) {
-			$ldapcriteria = "(&(objectClass=gnomeModule)".$ldapcriteria.")";
-		}
-		else {
-			$ldapcriteria = "(objectClass=gnomeModule)";
-		}
-
-		// Connect to LDAP server
-		$ldap = LDAPUtil::singleton();
-		if(PEAR::isError($ldap)) {
-			$this->error = $ldap;
-			return;
-		}
-		if(!$ldap) {
-			$this->error = "LDAP authentication failed";
-			return;
-		}
-		$result = ldap_search($ldap, $config->ldap_modules_basedn, $ldapcriteria, array('cn'));
-		if(!$result) {
-			$this->error = "LDAP search failed: ".ldap_error($ldap);
-			return;
-		}
-		$entries = ldap_get_entries($ldap, $result);
-		
-		// Gather uids
-		for($i = 0; $i < $entries['count']; $i++) {
-			$results[] = $entries[$i]['cn'][0];
-		}
-		
-		sort($results);
-		$this->modules = new PagedResults($results);
-	}
-	
-       static function main() {
-		global $config;
-
-		// Check session for previous instance
-		$container = isset($_SESSION[SESSIONID]) ? $_SESSION[SESSIONID] : null;
-		if(!$container instanceof ListModules || isset($_REQUEST['reload'])) {
-			$container = new ListModules();
-			$container->reload();
-			$_SESSION[SESSIONID] = $container;
-		}
-
-		// Set up a page for tracking the response for this request
-		$page = new Page(STYLESHEET);
-		
-		// Service the request, tracking results and output on the given DOM
-		$container->service($page->result);
-		
-		// Send the page for post-processing and output
-		$page->send();
-		
-		// Save anything changed in the session
-		$_SESSION[SESSIONID] = $container;
-	}
-	
-	function service(&$dom) {
-		// Page node is mandatory
-		$dom->appendChild($pagenode = $dom->createElement("page"));
-		$pagenode->setAttribute("title", "List Modules");
-
-		// Security check
-		if(!check_permissions($dom, $pagenode, GROUP)) return;
-
-		// Start the page off		
-		$listnode = $pagenode->appendChild($dom->createElement("listmodules"));
-
-		// Check for page change
-		if(isset($_REQUEST['page'])) {
-			$this->modules->goto_page($_REQUEST['page']);
-		}
-
-		// If filter changes specified...			
-		if(isset($_REQUEST['filter_keyword'])) {
-			$this->filter_keyword = $_REQUEST['filter_keyword'];
-			$this->reload();
-		}
-
-		// Gather results for this page
-		$results = $this->modules->for_page();
-		if(PEAR::isError($results)) {
-			$node = $listnode->appendChild($dom->createElement("error"));
-			$node->appendChild($dom->createTextNode($results->getMessage()));
-			return;
-		}
-
-		// Display results for this page
-		$result = $this->add_entries($dom, $listnode, $results);
-		if(PEAR::isError($result)) {
-			$node = $listnode->appendChild($dom->createElement("error"));
-			$node->appendChild($dom->createTextNode($result->getMessage()));
-			return;
-		}
-
-		// Display filter settings
-		$filternode = $listnode->appendChild($dom->createElement("filter"));
-		$subnode = $filternode->appendChild($dom->createElement("keyword"));
-		$subnode->appendChild($dom->createTextNode($this->filter_keyword));
-
-		// Display navigation information
-		$this->modules->add_navinfo_to($dom, $listnode);
-		
-		// Display the initialisation error (to explain a possible lack of results)
-		if(isset($this->error)) {
-			$node = $listnode->appendChild($dom->createElement("error"));
-			$node->appendChild($dom->createTextNode((PEAR::isError($this->error) ? $this->error->getMessage() : $this->error)));
-		}
-
-		// Display a passed-in error message
-		if(isset($_REQUEST['errmsg'])) {
-			$errmsg = $_REQUEST['errmsg'];
-			$node = $listnode->appendChild($dom->createElement("error"));
-			$node->appendChild($dom->createTextNode($errmsg));
-		}
-	}
-
-	function add_entries(&$dom, &$listnode, &$results) {
-		global $config;
-
-		// Get entries from LDAP server
-		$entries = Module::listmodule($results);
-		// Add entries to page
-		for($i = 0; $i < $entries['count']; $i++) {
-			$usernode = $listnode->appendChild($dom->createElement("module"));
-			$usernode->appendChild($node = $dom->createElement("cn"));
-			$node->appendChild($dom->createTextNode($entries[$i]['cn'][0]));
-			$usernode->appendChild($node = $dom->createElement("description"));
-			$node->appendChild($dom->createTextNode($entries[$i]['description'][0]));
-			$usernode->appendChild($node = $dom->createElement("maintainer"));
-			if ($entries[$i]['maintaineruid']['count'] > 1) {
-				array_shift($entries[$i]['maintaineruid']);
-				$maintainers = join (', ',$entries[$i]['maintaineruid']);
-			} else { 
-				$maintainers = $entries[$i]['maintaineruid'][0];
-			}
-			$node->appendChild($dom->createTextNode($maintainers));
-		}
-	}
+    private
+        $modules,        // A PagedResults containing the keys of the modules currently selected
+        $filter_keyword, // Filter keyword for narrowing down results
+        $error;          // An initialisation error message
+
+    function reload() {
+        global $config;
+
+        unset($this->error);
+
+        // Create an empty resultset in case of problems
+        $results = array();
+        $this->modules = new PagedResults($results);
+
+        // Get relevant entries from LDAP server
+        $ldapcriteria = "";
+        if(!empty($this->filter_keyword)) {
+            $keyword = $this->filter_keyword;
+            $ldapcriteria .= "(|".
+                "(cn=*".LDAPUtil::ldap_quote($keyword)."*)".
+                "(maintainerUid=*".LDAPUtil::ldap_quote($keyword)."*)".
+                ")";
+        }
+        if(!empty($ldapcriteria)) {
+            $ldapcriteria = "(&(objectClass=gnomeModule)".$ldapcriteria.")";
+        }
+        else {
+            $ldapcriteria = "(objectClass=gnomeModule)";
+        }
+
+        // Connect to LDAP server
+        $ldap = LDAPUtil::singleton();
+        if(PEAR::isError($ldap)) {
+            $this->error = $ldap;
+            return;
+        }
+        if(!$ldap) {
+            $this->error = "LDAP authentication failed";
+            return;
+        }
+        $result = ldap_search($ldap, $config->ldap_modules_basedn, $ldapcriteria, array('cn'));
+        if(!$result) {
+            $this->error = "LDAP search failed: ".ldap_error($ldap);
+            return;
+        }
+        $entries = ldap_get_entries($ldap, $result);
+
+        // Gather uids
+        for($i = 0; $i < $entries['count']; $i++) {
+            $results[] = $entries[$i]['cn'][0];
+        }
+
+        sort($results);
+        $this->modules = new PagedResults($results);
+    }
+
+    static function main() {
+        global $config;
+
+        // Check session for previous instance
+        $container = isset($_SESSION[SESSIONID]) ? $_SESSION[SESSIONID] : null;
+        if(!$container instanceof ListModules || isset($_REQUEST['reload'])) {
+            $container = new ListModules();
+            $container->reload();
+            $_SESSION[SESSIONID] = $container;
+        }
+
+        // Set up a page for tracking the response for this request
+        $page = new Page(STYLESHEET);
+
+        // Service the request, tracking results and output on the given DOM
+        $container->service($page->result);
+
+        // Send the page for post-processing and output
+        $page->send();
+
+        // Save anything changed in the session
+        $_SESSION[SESSIONID] = $container;
+    }
+
+    function service(&$dom) {
+        // Page node is mandatory
+        $dom->appendChild($pagenode = $dom->createElement("page"));
+        $pagenode->setAttribute("title", "List Modules");
+
+        // Security check
+        if(!check_permissions($dom, $pagenode, GROUP)) return;
+
+        // Start the page off       
+        $listnode = $pagenode->appendChild($dom->createElement("listmodules"));
+
+        // Check for page change
+        if(isset($_REQUEST['page'])) {
+            $this->modules->goto_page($_REQUEST['page']);
+        }
+
+        // If filter changes specified...           
+        if(isset($_REQUEST['filter_keyword'])) {
+            $this->filter_keyword = $_REQUEST['filter_keyword'];
+            $this->reload();
+        }
+
+        // Gather results for this page
+        $results = $this->modules->for_page();
+        if(PEAR::isError($results)) {
+            $node = $listnode->appendChild($dom->createElement("error"));
+            $node->appendChild($dom->createTextNode($results->getMessage()));
+            return;
+        }
+
+        // Display results for this page
+        $result = $this->add_entries($dom, $listnode, $results);
+        if(PEAR::isError($result)) {
+            $node = $listnode->appendChild($dom->createElement("error"));
+            $node->appendChild($dom->createTextNode($result->getMessage()));
+            return;
+        }
+
+        // Display filter settings
+        $filternode = $listnode->appendChild($dom->createElement("filter"));
+        $subnode = $filternode->appendChild($dom->createElement("keyword"));
+        $subnode->appendChild($dom->createTextNode($this->filter_keyword));
+
+        // Display navigation information
+        $this->modules->add_navinfo_to($dom, $listnode);
+        
+        // Display the initialisation error (to explain a possible lack of results)
+        if(isset($this->error)) {
+            $node = $listnode->appendChild($dom->createElement("error"));
+            $node->appendChild($dom->createTextNode((PEAR::isError($this->error) ? $this->error->getMessage() : $this->error)));
+        }
+
+        // Display a passed-in error message
+        if(isset($_REQUEST['errmsg'])) {
+            $errmsg = $_REQUEST['errmsg'];
+            $node = $listnode->appendChild($dom->createElement("error"));
+            $node->appendChild($dom->createTextNode($errmsg));
+        }
+    }
+
+    function add_entries(&$dom, &$listnode, &$results) {
+        global $config;
+
+        // Get entries from LDAP server
+        $entries = Module::listmodule($results);
+        // Add entries to page
+        for($i = 0; $i < $entries['count']; $i++) {
+            $usernode = $listnode->appendChild($dom->createElement("module"));
+            $usernode->appendChild($node = $dom->createElement("cn"));
+            $node->appendChild($dom->createTextNode($entries[$i]['cn'][0]));
+            $usernode->appendChild($node = $dom->createElement("description"));
+            $node->appendChild($dom->createTextNode($entries[$i]['description'][0]));
+            $usernode->appendChild($node = $dom->createElement("maintainer"));
+            if ($entries[$i]['maintaineruid']['count'] > 1) {
+                array_shift($entries[$i]['maintaineruid']);
+                $maintainers = join (', ',$entries[$i]['maintaineruid']);
+            } else { 
+                $maintainers = $entries[$i]['maintaineruid'][0];
+            }
+            $node->appendChild($dom->createTextNode($maintainers));
+        }
+    }
 }
 
 require_once("common.php");