Changeset 3390:8cc44296f7b0

Timestamp:

11/04/16 11:47:26 (9 years ago)

Author:

franck <carnet.franck.paul@…>

Branch:

default

Message:

Check minimum version of PHP required before giving access to auto-update

Files:

• admin/index.php (modified) (1 diff)
• admin/update.php (modified) (1 diff)
• inc/core/class.dc.update.php (modified) (4 diffs)
• locales/fr/main.po (modified) (1 diff)

admin/index.php

@@ -214 +214 @@
 
      if ($updater->getNotify() && $new_v) {
-          echo
-          '<div class="dc-update"><h3>'.sprintf(__('Dotclear %s is available!'),$new_v).'</h3> '.
-          '<p><a class="button submit" href="'.$core->adminurl->get("admin.update").'">'.sprintf(__('Upgrade now'),$new_v).'</a> '.
-          '<a class="button" href="'.$core->adminurl->get("admin.update", array('hide_msg' => 1)).'">'.__('Remind me later').'</a>'.
-          ($version_info ? ' </p>'.
-          '<p class="updt-info"><a href="'.$version_info.'">'.__('Information about this version').'</a>' : '').'</p>'.
-          '</div>';
+          // Check PHP version required
+          if (version_compare(phpversion(),$updater->getPHPVersion()) >= 0) {
+               echo
+               '<div class="dc-update"><h3>'.sprintf(__('Dotclear %s is available!'),$new_v).'</h3> '.
+               '<p><a class="button submit" href="'.$core->adminurl->get("admin.update").'">'.sprintf(__('Upgrade now'),$new_v).'</a> '.
+               '<a class="button" href="'.$core->adminurl->get("admin.update", array('hide_msg' => 1)).'">'.__('Remind me later').'</a>'.
+               ($version_info ? ' </p>'.
+               '<p class="updt-info"><a href="'.$version_info.'">'.__('Information about this version').'</a>' : '').'</p>'.
+               '</div>';
+          }
      }
 }

admin/update.php

@@ -203 +203 @@
           echo
                '<p class="static-msg">'.sprintf(__('Dotclear %s is available.'),$new_v).
-                    ($version_info ? ' <a href="'.$version_info.'" class="outgoing" title="'.__('Information about this version').'">('.
-                         __('Information about this version').')&nbsp;<img src="images/outgoing.png" alt=""/></a>' : '').
-                    '</p>'.
-
-          '<p>'.__('To upgrade your Dotclear installation simply click on the following button. '.
-               'A backup file of your current installation will be created in your root directory.').'</p>'.
-          '<form action="'.$p_url.'" method="get">'.
-          '<p><input type="hidden" name="step" value="check" />'.
-          '<input type="submit" value="'.__('Update Dotclear').'" /></p>'.
-          '</form>';
+               ($version_info ? ' <a href="'.$version_info.'" class="outgoing" title="'.__('Information about this version').'">('.
+               __('Information about this version').')&nbsp;<img src="images/outgoing.png" alt=""/></a>' : '').
+               '</p>';
+          if (version_compare(phpversion(),$updater->getPHPVersion()) < 0) {
+               echo
+               '<p class="warning-msg">'.sprintf(__('PHP version is %s (%s or earlier needed).'),phpversion(),$updater->getPHPVersion()).'</p>';
+          } else {
+               echo
+               '<p>'.__('To upgrade your Dotclear installation simply click on the following button. '.
+                    'A backup file of your current installation will be created in your root directory.').'</p>'.
+               '<form action="'.$p_url.'" method="get">'.
+               '<p><input type="hidden" name="step" value="check" />'.
+               '<input type="submit" value="'.__('Update Dotclear').'" /></p>'.
+               '</form>';
+          }
      }
      echo '</div>';

inc/core/class.dc.update.php

@@ -28 +28 @@
           'checksum' => null,
           'info' => null,
+          'php' => '5.3',
           'notify' => true
      );
@@ -58 +59 @@
       * @return string                  Latest version if available
       */
-     public function check($version, $nocache=false)
+     public function check($version,$nocache=false)
      {
           $this->getVersionInfo($nocache);
@@ -158 +159 @@
      {
           return $this->version_info['checksum'];
+     }
+
+     public function getPHPVersion()
+     {
+          return $this->version_info['php'];
      }
 
@@ -453 +459 @@
                     $this->version_info['checksum'] = isset($r['checksum']) ? (string) $r['checksum'] : null;
                     $this->version_info['info'] = isset($r['info']) ? (string) $r['info'] : null;
+                    $this->version_info['php'] = isset($r['php']) ? (string) $r['php'] : null;
                }
           }

locales/fr/main.po

@@ -1065 +1065 @@
 msgstr "La version de PHP est %s (5.3 ou plus récente nécessaire)."
 
+#, php-format
+msgid "PHP version is %s (%s or earlier needed)."
+msgstr "La version de PHP est %s (%s ou plus récente nécessaire)."
+
 msgid "Multibyte string module (mbstring) is not available."
 msgstr "Le support des chaînes multi-octets (mbstring) n'est pas disponible."