[gh-123] Merging testing into staging (org unl dir)

git-svn-id: file:///tmp/wdn_thm_drupal/branches/drupal-7.x/staging@626 20a16fea-79d4-4915-8869-1ea9d5ebf173

sites/all/modules/unl/unl.info

-name = UNL WDN
-description = Adds features to allow wysiwyg editing of WDN Templated sites.
+name = UNL
+description = Adds various needed features to support the UNL templates including wysiwyg editing of WDN Templated sites.
+package = UNL
+dependencies[] = wysiwyg
 core = 7.x
 version = "7.x-1.0-20100920"
 
-dependencies[] = wysiwyg
 files[] = unl.install
 files[] = unl.module

sites/all/modules/unl/unl_cas.info → sites/all/modules/unl/unl_cas/unl_cas.info

 ; $Id$
 name = UNL CAS
-description = Enables UNL CAS authentication/registration of users.
+description = Enables CAS authentication/registration of users through login.unl.edu.
+package = UNL
+dependencies[] = unl
 core = 7.x
 version = "7.x-1.0-20101129"
 configure = admin/config/people/unl_cas

sites/all/modules/unl/unl_cas.module → sites/all/modules/unl/unl_cas/unl_cas.module

@@ -2,7 +2,7 @@
 
 require_once dirname(__FILE__) . '/unl_loader.php';
 unl_load_zend_framework();
-  
+
 function unl_cas_enable() {
   variable_set('user_register', 0);
 }
@@ -204,7 +204,7 @@ function unl_cas_import_user($username) {
 
   // Next, if LDAP didn't work, try peoplefinder.
   if (!isset($user['email'])) {
-    $xml = @file_get_contents('http://peoplefinder.unl.edu/service.php?format=xml&uid=' . $username);
+    $xml = @file_get_contents('http://directory.unl.edu/service.php?format=xml&uid=' . $username);
     if ($xml) {
       $dom = new DOMDocument();
       $dom->loadXML($xml);

sites/all/modules/unl/unl_loader.php → sites/all/modules/unl/unl_cas/unl_loader.php

@@ -2,12 +2,12 @@
 
 function unl_load_zend_framework() {
   static $isLoaded = FALSE;
-  
+
   if ($isLoaded) {
     return;
   }
-  
-  set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/../../libraries');
+
+  set_include_path(get_include_path() . PATH_SEPARATOR . dirname(__FILE__) . '/../../../libraries');
   require_once 'Zend/Loader/Autoloader.php';
   $autoloader = Zend_Loader_Autoloader::getInstance();
   $autoloader->registerNamespace('Unl_');