Browse Source

Commenting latest changes in installer. Need a new lib to manage php reqs.

Julio Montoya 11 years ago
parent
commit
f03c8b1ef7
3 changed files with 18 additions and 17 deletions
  1. 1 1
      main/install/index.php
  2. 13 11
      main/install/install.lib.php
  3. 4 5
      main/install/templates/requirements.tpl

+ 1 - 1
main/install/index.php

@@ -197,7 +197,7 @@ $app->match('/requirements', function() use($app) {
          return $app->redirect($url);
     }
 
-    $reqs = drawRequeriments($app['translator']);
+    $reqs = drawRequirements($app['translator']);
 
     return $app['twig']->render(
         'requirements.tpl',

+ 13 - 11
main/install/install.lib.php

@@ -910,7 +910,7 @@ function getRequirements() {
     return
         array(
             'required' => array(
-                'session' => array('url' => 'http://php.net/manual/en/book.session.php'),
+                //'session' => array('url' => 'http://php.net/manual/en/book.session.php', 'recommend' => Display::label('OFF', 'success')),
                 'mysql' => array('url' => 'http://php.net/manual/en/book.mysql.php'),
                 'zlib' => array('url' => 'http://php.net/manual/en/book.zlib.php'),
                 'pcre' => array('url' => 'http://php.net/manual/en/book.pcre.php'),
@@ -919,21 +919,23 @@ function getRequirements() {
                 'iconv' => array('url' => 'http://php.net/manual/en/book.iconv.php'),
                 'intl' => array('url' => 'http://php.net/manual/en/book.intl.php'),
                 'gd' => array('url' => 'http://php.net/manual/en/book.image.php'),
-                'json' => array('url' => 'http://php.net/manual/en/book.json.php'),
-
-
+                'json' => array('url' => 'http://php.net/manual/en/book.json.php')
             ),
             'optional' =>  array(
                 'imagick' => array('url' => 'http://php.net/manual/en/book.imagick.php'),
                 'ldap' => array('url' => 'http://php.net/manual/en/book.ldap.php'),
                 'xapian' => array('url' => 'http://php.net/manual/en/book.xapian.php'),
-                'curl' => array('url' => 'http://php.net/manual/en/book.curl.php'),
-
+                'curl' => array('url' => 'http://php.net/manual/en/book.curl.php')
             )
         );
 }
 
-function drawRequeriments($translator) {
+/**
+ * @param Symfony\Component\Translation\Translator $translator
+ * @return null|string
+ */
+function drawRequirements($translator)
+{
     $requeriments = getRequirements();
     $html = null;
 
@@ -945,8 +947,8 @@ function drawRequeriments($translator) {
                     <td>
                         '.check_extension(
                             $extension,
-                            $translator->translate('Yes'),
-                            $translator->translate('No')
+                            $translator->trans('Yes'),
+                            $translator->trans('No')
                         ).'
                     </td>
                   </tr>';
@@ -960,8 +962,8 @@ function drawRequeriments($translator) {
                     <td>
                         '.check_extension(
                             $extension,
-                            $translator->translate('Yes'),
-                            $translator->translate('No'),
+                            $translator->trans('Yes'),
+                            $translator->trans('No'),
                             true
                         ).'
                     </td>

+ 4 - 5
main/install/templates/requirements.tpl

@@ -19,7 +19,6 @@
     <div class="RequirementText">{{ 'ServerRequirementsInfo' | trans }}</div>
 
     <table class="table">
-
         <tr>
             <td>{{ 'PHPVersion' | trans }} >=  {{ required_php_version }} </td>
             <td>
@@ -31,13 +30,13 @@
             </td>
         </tr>
 
-
+        {% autoescape false %}
+            {# reqs #}
+        {% endautoescape %}
     </table>
 
-
-
     {% autoescape false %}
-        {{ requirements }}
+    {{ requirements }}
     {% endautoescape %}
 
     <form action="#" method="post">