Changeset 1313

Timestamp:

12/23/07 23:38:43 (10 months ago)

Author:

benoitg

Message:

• install.php, Dependency.php: Commit install script improvements by Robin Jones
  

Files:

• trunk/wifidog-auth/CHANGELOG (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/Dependency.php (modified) (9 diffs)
• trunk/wifidog-auth/wifidog/classes/NodeLists/NodeListPDF.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/install.php (modified) (3 diffs)

trunk/wifidog-auth/CHANGELOG

@@ -2 +2 @@
-2007-12-23 Benoit Grégoire  <bock@step.polymtl.ca>
-        * Node.php:  Fix bug in setCurrentNode() reported by Vacio
+        * install.php, Dependency.php:  Commit install script improvements by Robin Jones
-        
-2007-11-29 Benoit Grégoire  <bock@step.polymtl.ca>

trunk/wifidog-auth/wifidog/classes/Dependency.php

@@ -81 +81 @@
-           *    "phpExtension":  Standard PHP extension 
-           *    "peclStandard":  Standard (in the PECL reposidory) PECL PHP module
-Standard (in the PEAR reposidory) PEAR PHP module
+PEAR PHP module in the standard PEAR repository or in a custom channel
-           *    "pearCustom":   PEAR-compatible tarball
-           *    "localLib": Custom PHP extension, to be downloaded and installed in wifidog/lib
@@ -89 +89 @@
-           * 'website' => URL to the dependency's official website
-       * 'installSourceUrl' => For localLib and pearCustom dependency, the URL where the dependency can be downloaded.
+       *                                                For pearStandard, either the required alpha or beta name like "Image_Canvas-alpha" or the fulle channel URL like: "channel://pear.php.net/Image_graph-0.7.2" ( normally not used for dependencies in standard pear repositories)
-       * 'installMethod' => For localLib, the protocol to be used to download and install the dependency.  Currently, allowed values are:
-       *        'tarball': Decompress a tarball in wifidog/lib
-       * 'installDestination' => For localLib, the path, relative to wifidog/lib where the dependency should be installed
+       * 'filename' => temp download filename if sourceurl does not meet preg requirements.
-       * 
-       * @var array
@@ -200 +202 @@
-       "radius" => array (
-       "type" => "peclStandard",
-
+.  If it's not detected, make sure it's installed (pecl list) AND loaded in php.ini (extension=radius.so)
-       ),
-
@@ -206 +208 @@
-       "FCKeditor" => array (
-       "type" => "localLib",
-FCK
+fck
-       'description' => "Required by content type FCKEditor (WYSIWYG HTML)",
-
-
+
+
+
+
+
+
-       "FPDF" => array (
-       "type" => "localLib",
-
+153
-       'description' => "Required if you want to be able to export the node list as a PDF file",
-
+
+
+
+
+
-       ),
-       "php-openid" => array (
@@ -246 +256 @@
-       "Cache" => array (
-       "type" => "pearStandard",
-
-
+ #unsure whether this file still exists.
+,
-       ),
-       "HTML_Safe" => array (
-       "type" => "pearStandard",
-       "detectFiles" => "HTML/Safe.php",
-
+
+
-       ),
-       "Image_Graph" => array (
-       "type" => "pearStandard",
-       "detectFiles" => "Image/Graph.php",
-
+
+
-       ),
-       "Image_Canvas" => array (
-       "type" => "pearStandard",
-       "detectFiles" => "Image/Canvas.php",
-
+
+
-       ),
-       "Image_Color" => array (
@@ -508 +521 @@
-                                 $this->getId());
-                             }
-
-
-                             break;
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                         case "pearCustom":
-                             if($this->getInstallSourceUrl()) {
@@ -518 +551 @@
-                             }
-                             else {
-    
+
-                             }
-                             $html .= sprintf(_("To install this custom PEAR extension, use 'sudo pear install %s'"), $installSource);
-                             break;
+                             
+                             
-                         default:
-                             $html .= sprintf(_("Sorry, I don't know how to install a %s extension"), $type);
@@ -615 +650 @@
-                      return $retval;
-                  }
+                  
-
-                  /**
@@ -699 +735 @@
-                                       $downloadPath = WIFIDOG_ABS_FILE_PATH . "tmp/";
-                                       chdir($downloadPath);
-
-
+
+
+
+
+
+
+
-
-

trunk/wifidog-auth/wifidog/classes/NodeLists/NodeListPDF.php

@@ -68 +68 @@
-    if (!$_serverBusy) {
-        // Load FPDF library
-
+153
-
-        /**

trunk/wifidog-auth/wifidog/install.php

@@ -551 +551 @@
-            navigation(array(array("title" => "Back", "page" => "Database")));
-            die();
+            break;
-        }
-        print "</li>";
@@ -767 +768 @@
-
-       <div class="language">
-           <form class="language" name="lang_form" method="post" action="{$formAction}">
-               <div>Default Server Locale:
-        <select name="default_locale" onchange="newConfig('DEFAULT_LANG=' + this.options[this.selectedIndex].value);">
@@ -785 +785 @@
-                </select>
-               </div>
-           </form>
-       </div>
-