Changeset 1294

Timestamp:

09/17/07 13:25:32 (1 year ago)

Author:

benoitg

Message:

• SmartyWifidog?: If ANY of the mandatory dependencies (not just smarty) are missing, user will be redirected to the install script
  
• Move Smarty detection and install to common framework. Take this opportunity to move to upgrade to latest Smarty since people will have to re-run the install script anyway.
  
• Fix #381 by applying patch from leandro@texnet.it, mea-culpa, I didn't know I broke the install script.
  
  

Files:

• trunk/wifidog-auth/CHANGELOG (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/DependenciesList.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/classes/Dependency.php (modified) (7 diffs)
• trunk/wifidog-auth/wifidog/classes/SmartyWifidog.php (modified) (1 diff)
• trunk/wifidog-auth/wifidog/install.php (modified) (5 diffs)

trunk/wifidog-auth/CHANGELOG

@@ -1 +1 @@
-# $Id$
+2007-09-17 Benoit Grégoire  <bock@step.polymtl.ca>
+        * SmartyWifidog:  If ANY of the mandatory dependencies (not just smarty) are missing, user will be redirected to the install script
+        * Move Smarty detection and install to common framework.  Take this opportunity to move to upgrade to latest Smarty since people will have to re-run the install script anyway.
+        * Fix #381 by applying patch from leandro@texnet.it, mea-culpa, I didn't know I broke the install script.
+        
-2007-09-12 Benoit Grégoire  <bock@step.polymtl.ca>
-        * Scratch a few itches:  Fix the link from node admin to stats, minor CSS fixes

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

@@ -131 +131 @@
-           $html .= "</table>";
-
-y
+ies
-           $html .= "<table BORDER=\"1\">\n";
-           $html .= "<tr><th>"._("Component").'<br/>'._("Click for the component's website")."</th>\n";

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

@@ -55 +55 @@
-
- require_once ('classes/Utils.php');
-
+
+
+
- /**
-  * This class checks the existence of components required by WiFiDog.
@@ -71 +73 @@
-  {
-      /**
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-       * @var array
-       */
@@ -79 +99 @@
-       /* PHP extensions (mandatory) */
-       'mbstring' => array (
-1
+true
-       "type" => "phpExtension",
-       'description' => 'Required for core auth-server and RSS support'
-       ),
-       'session' => array (
-1
+true
-       "type" => "phpExtension",
-       'description' => 'Required for core auth-server'
-       ),
-       'pgsql' => array (
-1
+true
-       "type" => "phpExtension",
-       'description' => 'Required for auth-server to connect to Postgresql database'
-       ),
-
+
+
+
+
+
+
+
+
+
+
-       /* PHP extensions (optional) */
-       'gettext' => array (
@@ -146 +175 @@
-
-       /* Locally installed libraries */
-       "Smarty" => array (
-       "type" => "localLib",
-       "detectFiles" => "lib/smarty/Smarty.class.php",
-       'description' => "Required for all parts of wifidog",
-       'website' => "http://smarty.php.net/"
-       ),
-       "FCKeditor" => array (
-       "type" => "localLib",
@@ -247 +270 @@
-          * @return boolean Returns whether the file has been found or not.
-          */
-y
+ies
-          {
-              $retval = array();
@@ -396 +419 @@
-            }
-
+                       /**
+            * Checks if one of the mandatory components is missing.
+            *
+            * @param string $errmsg    Reference of a string which would contain an
+            *                          error message.
+            *
+            * @return boolean Returns false if any components are missing.
+            */
+            public static function checkMandatoryComponents(&$errmsg = null)
+            {
+                // Init values
+                $returnValue = true;
+$components = self::getDependencies();
+foreach($components as $component) {
+    if($component->isMandatory()) {
+        $returnValue &= self::check($component->getId(), $errmsg);
+    }
+}
+
+                return $returnValue;
+            }
+            
-            /** Use PHP internal functions to download a file */
-            static public function downloadFile($remoteURL, $localPath) {
@@ -424 +469 @@
-                             break;
-                         case "localLib":
-
-
+
+
+
+
+
+
+
+
+
+
-
-                             break;

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

@@ -47 +47 @@
-require_once("classes/Locale.php");
-require_once("classes/Utils.php");
-
-
-
-
+
+
-    // Load Smarty library
-'lib/smarty/
+SMARTY_PATH.'
-} else {
-    // Build the system_path for the auth-server
-Smart
+a mandatory Dependenc
-    exit();
-}
-
+
-/*
- * Smarty plugin

trunk/wifidog-auth/wifidog/install.php

@@ -166 +166 @@
-'tmp/simplepie_cache',
-'lib/',
-'lib/smarty',
-'lib/smarty/plugins',
-'tmp/smarty/templates_c',
-'tmp/smarty/cache',
@@ -500 +498 @@
-                array (
-                "title" => "Next",
-marty
+implepie
-                )
-                ));
@@ -506 +504 @@
-
-            break;
-            ###################################
-        case 'smarty' : // Download, uncompress and install Smarty
-            print<<< EndHTML
-    <h1>Smarty template engine installation</h1>
-    <p><A HREF="http://smarty.php.net/">Smarty</A> is Template Engine. WifiDog requires you install it before you continue.</p>
-EndHTML;
-if ($neededPackages['smarty']['available']) {
-            print "Already installed !<br/>";
-}
-else {
-    $output = WIFIDOG_ABS_FILE_PATH."tmp/";
-    //chdir($output);
-    list ($url, $filename) = split("=", $smarty_full_url);
-
-    print "Download source code ($filename) : ";
-    if (!file_exists($output.$filename))
-    Dependency::downloadFile($smarty_full_url, $output.$filename);
-
-    if (!file_exists($output.$filename)) {
-        print "<B STYLE=\"color:red\">Error</b><p>Current working directory : <em>$output</em>";
-        print "<pre><em>wget \"$smarty_full_url\"</em>\n$output</pre>";
-        exit ();
-    }
-    else {
-        print "OK<BR>";
-    }
-
-    print "Uncompressing : ";
-    $dir_array = split(".tar.gz", $output.$filename);
-    $dirname = array_shift($dir_array);
-
-    if (!file_exists($dirname))
-    Dependency::execVerbose("cd $output; tar -xzf $dirname.tar.gz", $output, $return);
-    print "OK<BR>";
-    print "Copying : ";
-    if (!file_exists(WIFIDOG_ABS_FILE_PATH . "lib/smarty"));
-    Dependency::execVerbose("cp -r $dirname/libs/* " . WIFIDOG_ABS_FILE_PATH . "/lib/smarty", $output, $return); # TODO : Utiliser SMARTY_REL_PATH
-    print "OK<BR>";
-
-    refreshButton();
-}
-navigation(array (
-array (
-"title" => "Back",
-"page" => "version"
-            ),
-array (
-"title" => "Next",
-"page" => "simplepie"
-            )
-));
-break;
-###################################
-        case 'simplepie' : // Download, uncompress and install SimplePie
@@ -576 +522 @@
-            }
-            elseif ($action == 'install') {
-
+
-                print "Download source code frpm svn($filename) : ";
-                Dependency::execVerbose("svn co ".escapeshellarg($neededPackages['simplepie']['svn_source'])." ".escapeshellarg(WIFIDOG_ABS_FILE_PATH."lib/simplepie"), $output, $return);
@@ -634 +580 @@
-            }
-            elseif ($action == 'install') {
-
+
-                print "Download source code frpm svn($filename) : ";
-                Dependency::execVerbose("svn co ".escapeshellarg($neededPackages['feedpressreview']['svn_source'])." ".escapeshellarg(WIFIDOG_ABS_FILE_PATH."lib/feedpressreview"), $output, $return);