Merge branch 'MDL-36948-master' of git://github.com/FMCorz/moodle
authorDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 03:59:01 +0000 (11:59 +0800)
committerDan Poltawski <dan@moodle.com>
Mon, 3 Dec 2012 03:59:01 +0000 (11:59 +0800)
62 files changed:
admin/renderer.php
install/lang/zh_tw/admin.php
lang/en/plugin.php
lib/pluginlib.php
mdeploy.php
mod/feedback/pix/notrequired.svg
mod/feedback/pix/required.svg
mod/workshop/pix/userplan/task-done.svg
mod/workshop/pix/userplan/task-fail.svg
mod/workshop/pix/userplan/task-todo.svg
pix/i/assignroles.svg
pix/i/caution.svg
pix/i/completion-auto-enabled.svg
pix/i/completion-auto-fail.svg
pix/i/completion-auto-n.svg
pix/i/completion-auto-pass.svg
pix/i/completion-auto-y.svg
pix/i/completion-manual-enabled.svg
pix/i/completion-manual-n.svg
pix/i/completion-manual-y.svg
pix/i/course.svg
pix/i/courseevent.svg
pix/i/enrolusers.svg
pix/i/grade_correct.svg
pix/i/grade_incorrect.svg
pix/i/grade_partiallycorrect.svg
pix/i/invalid.svg
pix/i/mnethost.svg
pix/i/preview.svg
pix/i/risk_config.png [new file with mode: 0644]
pix/i/risk_config.svg [new file with mode: 0644]
pix/i/risk_dataloss.png [new file with mode: 0644]
pix/i/risk_dataloss.svg [new file with mode: 0644]
pix/i/risk_managetrust.png [new file with mode: 0644]
pix/i/risk_managetrust.svg [new file with mode: 0644]
pix/i/risk_personal.png [new file with mode: 0644]
pix/i/risk_personal.svg [new file with mode: 0644]
pix/i/risk_spam.png [new file with mode: 0644]
pix/i/risk_spam.svg [new file with mode: 0644]
pix/i/risk_xss.png [new file with mode: 0644]
pix/i/risk_xss.svg [new file with mode: 0644]
pix/i/scales.svg
pix/i/scheduled.svg
pix/i/siteevent.svg
pix/i/twoway.svg
pix/i/valid.svg
pix/t/approve.svg
pix/t/assignroles.svg
pix/t/block.svg
pix/t/check.svg
pix/t/email.svg
pix/t/emailno.svg
pix/t/enrolusers.svg
pix/t/go.svg
pix/t/markasread.svg
pix/t/message.svg
pix/t/messages.svg
pix/t/portfolioadd.svg
pix/t/print.svg
pix/t/stop.svg
pix/t/unblock.svg
version.php

index eec1497..8d49636 100644 (file)
@@ -1211,8 +1211,13 @@ class core_admin_renderer extends plugin_renderer_base {
             if (empty($impediments)) {
                 $widget = $deployer->make_confirm_widget($updateinfo);
                 $box .= $this->output->render($widget);
-            } else if (isset($impediments['notwritable'])) {
-                $box .= $this->output->help_icon('notwritable', 'core_plugin', get_string('notwritable', 'core_plugin'));
+            } else {
+                if (isset($impediments['notwritable'])) {
+                    $box .= $this->output->help_icon('notwritable', 'core_plugin', get_string('notwritable', 'core_plugin'));
+                }
+                if (isset($impediments['notdownloadable'])) {
+                    $box .= $this->output->help_icon('notdownloadable', 'core_plugin', get_string('notdownloadable', 'core_plugin'));
+                }
             }
         }
 
index 43f6dd0..4b61242 100644 (file)
@@ -32,12 +32,13 @@ defined('MOODLE_INTERNAL') || die();
 
 $string['clianswerno'] = 'n';
 $string['cliansweryes'] = 'y';
-$string['cliincorrectvalueerror'] = '錯誤,不正確的值 "{$a->value}" 用於 "{$a->option}"';
-$string['cliincorrectvalueretry'] = '不正確的值,請再試一次';
+$string['cliincorrectvalueerror'] = '錯誤,將「{$a->option}」的值設為「{$a->value}」是不正確的';
+$string['cliincorrectvalueretry'] = '不正確的值,請重試';
 $string['clitypevalue'] = '輸入值';
-$string['clitypevaluedefault'] = '輸入值,按Enter可使用預設值({$a})';
-$string['cliunknowoption'] = '不認得的選項:  {$a}
-請使用 --幫助 選項。';
-$string['cliyesnoprompt'] = '輸入y(是) 或n(否)';
-$string['environmentrequireinstall'] = '必須安裝/啟用';
-$string['environmentrequireversion'] = '要求版本為 {$a->needed} ,您目前版本為 {$a->current}';
+$string['clitypevaluedefault'] = '輸入值,按ENTER使用預設值({$a})';
+$string['cliunknowoption'] = '錯誤選項:
+{$a}
+請使用 --help 選項。';
+$string['cliyesnoprompt'] = '輸入y(表示是)或n(表示否)';
+$string['environmentrequireinstall'] = '必須安裝並啟用';
+$string['environmentrequireversion'] = '需要 {$a->needed} 版本,而您的是 {$a->current}';
index f21667f..4d4dd8c 100644 (file)
@@ -30,7 +30,9 @@ $string['availability'] = 'Availability';
 $string['checkforupdates'] = 'Check for available updates';
 $string['checkforupdateslast'] = 'Last check done on {$a}';
 $string['displayname'] = 'Plugin name';
+$string['err_response_curl'] = 'Unable to fetch available updates data - unexpected cURL error.';
 $string['err_response_format_version'] = 'Unexpected version of the response format. Please try to re-check for available updates.';
+$string['err_response_http_code'] = 'Unable to fetch available updates data - unexpected HTTP response code.';
 $string['filterall'] = 'Show all';
 $string['filtercontribonly'] = 'Show contributions only';
 $string['filtercontribonlyactive'] = 'Showing contributions only';
@@ -41,10 +43,14 @@ $string['nonehighlighted'] = 'No plugins require your attention now';
 $string['nonehighlightedinfo'] = 'Display the list of all installed plugins anyway';
 $string['noneinstalled'] = 'No plugins of this type are installed';
 $string['notes'] = 'Notes';
+$string['notdownloadable'] = 'Can not download the package';
+$string['notdownloadable_help'] = 'ZIP package with the update can not be downloaded automatically. Please refer to the documentation page for more help.';
+$string['notdownloadable_link'] = 'admin/mdeploy/notdownloadable';
 $string['notwritable'] = 'Plugin files not writable';
 $string['notwritable_help'] = 'You have enabled automatic updates deployment and there is available update for this plugin. However, the plugin files are not writable by the web server so the update can not be installed at the moment.
 
 Make the plugin folder and all its contents writable to be able to install the available update automatically.';
+$string['notwritable_link'] = 'admin/mdeploy/notwritable';
 $string['numtotal'] = 'Installed: {$a}';
 $string['numdisabled'] = 'Disabled: {$a}';
 $string['numextension'] = 'Contributions: {$a}';
index 7383d7b..02a6d99 100644 (file)
@@ -826,7 +826,11 @@ class available_update_checker {
         require_once($CFG->libdir.'/filelib.php');
 
         $curl = new curl(array('proxy' => true));
-        $response = $curl->post($this->prepare_request_url(), $this->prepare_request_params());
+        $response = $curl->post($this->prepare_request_url(), $this->prepare_request_params(), $this->prepare_request_options());
+        $curlerrno = $curl->get_errno();
+        if (!empty($curlerrno)) {
+            throw new available_update_checker_exception('err_response_curl', 'cURL error '.$curlerrno.': '.$curl->error);
+        }
         $curlinfo = $curl->get_info();
         if ($curlinfo['http_code'] != 200) {
             throw new available_update_checker_exception('err_response_http_code', $curlinfo['http_code']);
@@ -1069,6 +1073,29 @@ class available_update_checker {
         return $params;
     }
 
+    /**
+     * Returns the list of cURL options to use when fetching available updates data
+     *
+     * @return array of (string)param => (string)value
+     */
+    protected function prepare_request_options() {
+        global $CFG;
+
+        $options = array(
+            'CURLOPT_SSL_VERIFYHOST' => 2,      // this is the default in {@link curl} class but just in case
+            'CURLOPT_SSL_VERIFYPEER' => true,
+        );
+
+        $cacertfile = $CFG->dataroot.'/moodleorgca.crt';
+        if (is_readable($cacertfile)) {
+            // Do not use CA certs provided by the operating system. Instead,
+            // use this CA cert to verify the updates provider.
+            $options['CURLOPT_CAINFO'] = $cacertfile;
+        }
+
+        return $options;
+    }
+
     /**
      * Returns the current timestamp
      *
@@ -1562,6 +1589,10 @@ class available_update_deployer {
             $impediments['missingdownloadmd5'] = true;
         }
 
+        if (!empty($info->download) and !$this->update_downloadable($info->download)) {
+            $impediments['notdownloadable'] = true;
+        }
+
         if (!$this->component_writable($info->component)) {
             $impediments['notwritable'] = true;
         }
@@ -1890,6 +1921,40 @@ class available_update_deployer {
         return $this->directory_writable($directory);
     }
 
+    /**
+     * Checks if the mdeploy.php will be able to fetch the ZIP from the given URL
+     *
+     * This is mainly supposed to check if the transmission over HTTPS would
+     * work. That is, if the CA certificates are present at the server.
+     *
+     * @param string $downloadurl the URL of the ZIP package to download
+     * @return bool
+     */
+    protected function update_downloadable($downloadurl) {
+        global $CFG;
+
+        $curloptions = array(
+            'CURLOPT_SSL_VERIFYHOST' => 2,      // this is the default in {@link curl} class but just in case
+            'CURLOPT_SSL_VERIFYPEER' => true,
+        );
+
+        $cacertfile = $CFG->dataroot.'/moodleorgca.crt';
+        if (is_readable($cacertfile)) {
+            // Do not use CA certs provided by the operating system. Instead,
+            // use this CA cert to verify the updates provider.
+            $curloptions['CURLOPT_CAINFO'] = $cacertfile;
+        }
+
+        $curl = new curl(array('proxy' => true));
+        $result = $curl->head($downloadurl, $curloptions);
+        $errno = $curl->get_errno();
+        if (empty($errno)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
     /**
      * Checks if the directory and all its contents (recursively) is writable
      *
index 9fba3ba..fa53d04 100644 (file)
@@ -618,9 +618,12 @@ class output_http_provider extends output_provider {
      * @param Exception $e uncaught exception
      */
     public function exception(Exception $e) {
+
+        $docslink = 'http://docs.moodle.org/en/admin/mdeploy/'.get_class($e);
         $this->start_output();
         echo('<h1>Oops! It did it again</h1>');
-        echo('<p><strong>Moodle deployment utility had a trouble with your request. See the debugging information for more details.</strong></p>');
+        echo('<p><strong>Moodle deployment utility had a trouble with your request.
+            See <a href="'.$docslink.'">the docs page</a> and the debugging information for more details.</strong></p>');
         echo('<pre>');
         echo exception_handlers::format_exception_info($e);
         echo('</pre>');
@@ -967,6 +970,15 @@ class worker extends singleton_pattern {
         curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 20); // nah, moodle.org is never unavailable! :-p
         curl_setopt($ch, CURLOPT_URL, $source);
 
+        $dataroot = $this->input->get_option('dataroot');
+        $cacertfile = $dataroot.'/moodleorgca.crt';
+        if (is_readable($cacertfile)) {
+            // Do not use CA certs provided by the operating system. Instead,
+            // use this CA cert to verify the ZIP provider.
+            $this->log('Using custom CA certificate '.$cacertfile);
+            curl_setopt($ch, CURLOPT_CAINFO, $cacertfile);
+        }
+
         $targetfile = fopen($target, 'w');
 
         if (!$targetfile) {
index 744dafa..a8e1e47 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 -0.4 12 12" style="overflow:visible;enable-background:new 0 -0.4 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M11,4.1H8.6L9.8,2c0.3-0.5,0.1-1.1-0.4-1.4L8.6,0.1C8.1-0.1,7.5,0,7.2,0.5L6,2.6L4.8,0.5\r
index ff4ca68..fa617d9 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 -0.4 12 12" style="overflow:visible;enable-background:new 0 -0.4 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M11,4.1H8.6L9.8,2c0.3-0.5,0.1-1.1-0.4-1.4L8.6,0.1C8.1-0.1,7.5,0,7.2,0.5L6,2.6L4.8,0.5\r
index aef9ff6..c5156f3 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 0 16 16" style="overflow:visible;enable-background:new -0.1 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#99CC33;" d="M6.4,11.1c-2-2.5-3.7-4-3.7-4S0.3,9.5,0,9.8C5,13.1,8.1,16,8.1,16s0.2-0.7,0.6-1.8\r
index 27d851b..de6808d 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="-1.6 -0.5 16 16"\r
-        style="overflow:visible;enable-background:new -1.6 -0.5 16 16;" xml:space="preserve">\r
+        style="overflow:visible;enable-background:new -1.6 -0.5 16 16;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#FF403C;" d="M12.8,2.7L10.1,0c0,0-1.6,1.5-3.7,4C4.3,1.5,2.7,0,2.7,0L0,2.7c0,0,1.9,1.3,4.6,3.7\r
index c103968..a5b8b7e 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 0 16 16" style="overflow:visible;enable-background:new -0.1 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M5.5,10H0.3C0.2,9.9,0.1,9.9,0,9.8C0.2,9.6,1.1,8.7,1.8,8h1.8C4.1,8.5,4.7,9.2,5.5,10z M9.2,13\r
index 421b41c..668f6ba 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M12,16H0v-2.9l5.2-2.8C5.7,10,5.8,9.5,5.4,9C5.4,9,4,7.2,4,5.2C4,2.3,5.8,0,8,0s4,2.3,4,5.2\r
index 3b7678d..4e2bb31 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 0 16 16" style="overflow:visible;enable-background:new -0.1 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#FFB844;" d="M6.4,11.1c-2-2.5-3.7-4-3.7-4S0.3,9.5,0,9.8C5,13.1,8.1,16,8.1,16s0.2-0.7,0.6-1.8\r
index acc4f7c..83732d2 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M10,0v2H6V0H10z M11,2h1c0.4,0,0.8,0.1,1.1,0.3c0.3-0.3,0.8-0.4,1.2-0.4c0.5,0,1,0.2,1.4,0.6L16,2.8\r
index f33fd79..771adf3 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M10,0v2H6V0H10z M11,2h1c1.1,0,2,0.9,2,2v1h2V2c0-1.1-0.9-2-2-2h-3V2z M16,6h-2v4h2V6z M14,11v1\r
index 440ca8e..6a8bc62 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M10,0v2H6V0H10z M11,2h1c1.1,0,2,0.9,2,2v1h2V2c0-1.1-0.9-2-2-2h-3V2z M16,6h-2v4h2V6z M14,11v1\r
index 3f89f2c..44df83f 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M10,0v2H6V0H10z M11,2h1c0.4,0,0.8,0.1,1.1,0.3c0.3-0.3,0.8-0.4,1.2-0.4c0.5,0,1,0.2,1.4,0.6L16,2.8\r
index 6dc3bb0..14822e1 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M10,0v2H6V0H10z M11,2h1c0.4,0,0.8,0.1,1.1,0.3c0.3-0.3,0.8-0.4,1.2-0.4c0.5,0,1,0.2,1.4,0.6L16,2.8\r
index 62c7da6..0e77087 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M16,6.4V14c0,1.1-0.9,2-2,2H2c-1.1,0-2-0.9-2-2V2c0-1.1,0.9-2,2-2h12c1.1,0,2,0.9,2,2v0.8l-0.3-0.3\r
index fe3dd03..f7750e2 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M14,0H2C0.9,0,0,0.9,0,2v12c0,1.1,0.9,2,2,2h12c1.1,0,2-0.9,2-2V2C16,0.9,15.1,0,14,0z M14,12\r
index 8822aee..3b91bdb 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M14,8.4V12c0,1.1-0.9,2-2,2H4c-1.1,0-2-0.9-2-2V4c0-1.1,0.9-2,2-2h8c0.4,0,0.8,0.1,1.1,0.3\r
index 171d782..e60475f 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="-0.2 0 16 16" style="overflow:visible;enable-background:new -0.2 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M6,0.4c0.4-0.1,0.8-0.1,1.3-0.1c1.5,0,3,0.5,4.2,1.4c-0.6,0.2-1.2,0.5-1.7,1C9.7,2.7,9.6,2.8,9.6,2.8\r
index 171d782..e60475f 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="-0.2 0 16 16" style="overflow:visible;enable-background:new -0.2 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M6,0.4c0.4-0.1,0.8-0.1,1.3-0.1c1.5,0,3,0.5,4.2,1.4c-0.6,0.2-1.2,0.5-1.7,1C9.7,2.7,9.6,2.8,9.6,2.8\r
index 421b41c..668f6ba 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M12,16H0v-2.9l5.2-2.8C5.7,10,5.8,9.5,5.4,9C5.4,9,4,7.2,4,5.2C4,2.3,5.8,0,8,0s4,2.3,4,5.2\r
index aef9ff6..c5156f3 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 0 16 16" style="overflow:visible;enable-background:new -0.1 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#99CC33;" d="M6.4,11.1c-2-2.5-3.7-4-3.7-4S0.3,9.5,0,9.8C5,13.1,8.1,16,8.1,16s0.2-0.7,0.6-1.8\r
index 27d851b..de6808d 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="-1.6 -0.5 16 16"\r
-        style="overflow:visible;enable-background:new -1.6 -0.5 16 16;" xml:space="preserve">\r
+        style="overflow:visible;enable-background:new -1.6 -0.5 16 16;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#FF403C;" d="M12.8,2.7L10.1,0c0,0-1.6,1.5-3.7,4C4.3,1.5,2.7,0,2.7,0L0,2.7c0,0,1.9,1.3,4.6,3.7\r
index 3b7678d..4e2bb31 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 0 16 16" style="overflow:visible;enable-background:new -0.1 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#FFB844;" d="M6.4,11.1c-2-2.5-3.7-4-3.7-4S0.3,9.5,0,9.8C5,13.1,8.1,16,8.1,16s0.2-0.7,0.6-1.8\r
index 27d851b..de6808d 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="-1.6 -0.5 16 16"\r
-        style="overflow:visible;enable-background:new -1.6 -0.5 16 16;" xml:space="preserve">\r
+        style="overflow:visible;enable-background:new -1.6 -0.5 16 16;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#FF403C;" d="M12.8,2.7L10.1,0c0,0-1.6,1.5-3.7,4C4.3,1.5,2.7,0,2.7,0L0,2.7c0,0,1.9,1.3,4.6,3.7\r
index af3f524..e647dc5 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="-0.7 0 16 16" style="overflow:visible;enable-background:new -0.7 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M13.8,5.9c-1.2-1.2-3.1-1.2-4.2,0C9.2,6.2,9,6.6,8.9,7H6.6L5.3,4.9c0.9-1.2,0.9-2.9-0.2-4\r
index 3271954..0f55507 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M15.5,13.4l-2.1-2.1c-0.2-0.2-0.4-0.3-0.7-0.4C13.5,9.8,14,8.5,14,7c0-3.9-3.1-7-7-7C3.1,0,0,3.1,0,7\r
diff --git a/pix/i/risk_config.png b/pix/i/risk_config.png
new file mode 100644 (file)
index 0000000..00d0d83
Binary files /dev/null and b/pix/i/risk_config.png differ
diff --git a/pix/i/risk_config.svg b/pix/i/risk_config.svg
new file mode 100644 (file)
index 0000000..ea89889
--- /dev/null
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 -0.1 16 16"\r
+        style="overflow:visible;enable-background:new -0.1 -0.1 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#99CC33;" d="M15.6,14.1L8.8,0.7c-0.5-1-1.3-1-1.8,0L0.2,14.1c-0.5,1,0,1.8,1.1,1.8h13.2\r
+       C15.6,15.9,16.1,15.1,15.6,14.1z M12.3,11.1l-1.2,0.2c-0.1,0.2-0.2,0.4-0.3,0.7l0.7,1c-0.3,0.4-0.6,0.8-1,1l-1-0.7\r
+       c-0.2,0.1-0.4,0.2-0.6,0.3l-0.2,1.2c-0.2,0-0.5,0.1-0.7,0.1c-0.3,0-0.5,0-0.7-0.1L7,13.6c-0.2-0.1-0.4-0.2-0.6-0.3l-1,0.7\r
+       c-0.4-0.3-0.8-0.6-1-1L5,12c-0.1-0.2-0.2-0.4-0.3-0.7l-1.2-0.2c0-0.2-0.1-0.5-0.1-0.7c0-0.3,0-0.5,0.1-0.7l1.2-0.2\r
+       C4.8,9.2,4.8,9,5,8.8l-0.7-1c0.3-0.4,0.6-0.8,1-1l1,0.7C6.5,7.3,6.7,7.2,7,7.2L7.2,6c0.2,0,0.5-0.1,0.7-0.1c0.3,0,0.5,0,0.7,0.1\r
+       l0.2,1.2c0.2,0.1,0.4,0.2,0.6,0.3l1-0.7c0.4,0.3,0.8,0.6,1,1l-0.7,1C11,9,11.1,9.2,11.1,9.4l1.2,0.2c0,0.2,0.1,0.5,0.1,0.7\r
+       C12.4,10.6,12.4,10.9,12.3,11.1z M9,10.4c0,0.6-0.5,1.1-1.1,1.1S6.8,11,6.8,10.4c0-0.6,0.5-1.1,1.1-1.1S9,9.8,9,10.4z"/>\r
+</svg>\r
diff --git a/pix/i/risk_dataloss.png b/pix/i/risk_dataloss.png
new file mode 100644 (file)
index 0000000..11ce695
Binary files /dev/null and b/pix/i/risk_dataloss.png differ
diff --git a/pix/i/risk_dataloss.svg b/pix/i/risk_dataloss.svg
new file mode 100644 (file)
index 0000000..bb90b92
--- /dev/null
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 -0.2 16 16"\r
+        style="overflow:visible;enable-background:new -0.1 -0.2 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#CC6AFF;" d="M7,0.7L0.2,14.1c-0.5,1,0,1.8,1.1,1.8h13.2c1.1,0,1.6-0.8,1.1-1.8L8.8,0.7C8.3-0.2,7.5-0.2,7,0.7z\r
+        M11.9,9.4h-0.5l-1,5.5h-5l-1-5.5H3.9l0-1h0.3l0-0.1c0,0,0.8-0.7,2.5-1V6.9c0-0.5,0.5-1,1-1h0.5c0.5,0,1,0.5,1,1v0.4\r
+       c1.7,0.3,2.5,1,2.5,1l0,0.1h0.3V9.4z M7.4,9.4v4.5h-1V9.4H7.4z M8.4,9.4h1v4.5h-1V9.4z M7.9,7.1c-0.2,0-0.3,0-0.5,0c0,0,0-0.1,0-0.1\r
+       c0-0.3,0.2-0.5,0.5-0.5c0.3,0,0.5,0.2,0.5,0.5c0,0,0,0.1,0,0.1C8.3,7.1,8.1,7.1,7.9,7.1z"/>\r
+</svg>\r
diff --git a/pix/i/risk_managetrust.png b/pix/i/risk_managetrust.png
new file mode 100644 (file)
index 0000000..4f3203d
Binary files /dev/null and b/pix/i/risk_managetrust.png differ
diff --git a/pix/i/risk_managetrust.svg b/pix/i/risk_managetrust.svg
new file mode 100644 (file)
index 0000000..2691efa
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 -0.1 16 16"\r
+        style="overflow:visible;enable-background:new -0.1 -0.1 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#999999;" d="M15.6,14.1l-2.5-4.9c-0.5-1-1.3-2.6-1.8-3.6L8.8,0.7c-0.5-1-1.3-1-1.8,0L4.5,5.6\r
+       C4,6.6,3.2,8.2,2.7,9.2l-2.5,4.9c-0.5,1,0,1.8,1.1,1.8h4.6c1.1,0,2.9,0,4,0h4.6C15.6,15.9,16.1,15.1,15.6,14.1z M7.9,12.9H4.1L6,9.4\r
+       l1.9-3.5l1.9,3.5l1.9,3.5H7.9z"/>\r
+</svg>\r
diff --git a/pix/i/risk_personal.png b/pix/i/risk_personal.png
new file mode 100644 (file)
index 0000000..6d518d9
Binary files /dev/null and b/pix/i/risk_personal.png differ
diff --git a/pix/i/risk_personal.svg b/pix/i/risk_personal.svg
new file mode 100644 (file)
index 0000000..b575538
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 -0.1 16 16"\r
+        style="overflow:visible;enable-background:new -0.1 -0.1 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#76A1F0;" d="M7,0.7L0.2,14.1c-0.5,1,0,1.8,1.1,1.8l13.2,0c1.1,0,1.6-0.8,1.1-1.8L8.8,0.7C8.3-0.2,7.5-0.2,7,0.7z\r
+        M10.6,9c0,1.2-0.7,2.1-1.8,2.5L9,11.9l1.1,2.4l-2.2,0l-2.2,0l1.1-2.4L7,11.5C6,11.1,5.2,10.1,5.2,9c0-1.5,1.2-2.7,2.7-2.7\r
+       C9.4,6.3,10.6,7.5,10.6,9z"/>\r
+</svg>\r
diff --git a/pix/i/risk_spam.png b/pix/i/risk_spam.png
new file mode 100644 (file)
index 0000000..46b6bd6
Binary files /dev/null and b/pix/i/risk_spam.png differ
diff --git a/pix/i/risk_spam.svg b/pix/i/risk_spam.svg
new file mode 100644 (file)
index 0000000..4f1acbe
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 -0.1 16 16"\r
+        style="overflow:visible;enable-background:new -0.1 -0.1 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#FFB844;" d="M15.6,14.1L8.8,0.7c-0.5-1-1.3-1-1.8,0L0.2,14.1c-0.5,1,0,1.8,1.1,1.8h13.2\r
+       C15.6,15.9,16.1,15.1,15.6,14.1z M8.3,6.5c0.6-0.6,1.5-0.6,2.1,0s0.6,1.5,0,2.1l-1,1L7.3,7.5L8.3,6.5z M5,13.9H2.9v-2.1l3.6-3.6\r
+       l2.1,2.1L5,13.9z M11.9,13.9h-5v-1h5V13.9z"/>\r
+</svg>\r
diff --git a/pix/i/risk_xss.png b/pix/i/risk_xss.png
new file mode 100644 (file)
index 0000000..345f999
Binary files /dev/null and b/pix/i/risk_xss.png differ
diff --git a/pix/i/risk_xss.svg b/pix/i/risk_xss.svg
new file mode 100644 (file)
index 0000000..9bc8352
--- /dev/null
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>\r
+<!-- Generator: Adobe Illustrator 15.1.0, SVG Export Plug-In  -->\r
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [\r
+       <!ENTITY ns_flows "http://ns.adobe.com/Flows/1.0/">\r
+]>\r
+<svg version="1.1"\r
+        xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
+        x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 -0.1 16 16"\r
+        style="overflow:visible;enable-background:new -0.1 -0.1 16 16;" xml:space="preserve">\r
+<defs>\r
+</defs>\r
+<path style="fill:#FF403C;" d="M7,0.7L0.2,14.1c-0.5,1,0,1.8,1.1,1.8l13.2,0c1.1,0,1.6-0.8,1.1-1.8L8.8,0.7C8.3-0.2,7.5-0.2,7,0.7z\r
+        M9.4,13.4c0,0.8-0.7,1.5-1.5,1.5c-0.8,0-1.5-0.7-1.5-1.5c0-0.8,0.7-1.5,1.5-1.5C8.7,11.9,9.4,12.5,9.4,13.4z M9.2,5.9v4\r
+       c0,0.5-0.5,1-1,1l-0.6,0c-0.5,0-1-0.5-1-1v-4c0-0.6,0.5-1,1-1l0.6,0C8.8,4.9,9.2,5.3,9.2,5.9z"/>\r
+</svg>\r
index e76542c..02bbe76 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M6,15V5h4v10H6z M15,16V0h-4v16H15z M5,15V9H1v6H5z M0,16h16v-1H0V16z"/>\r
index 76864c5..f6c4041 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M8,0C3.6,0,0,3.6,0,8c0,4.4,3.6,8,8,8c4.4,0,8-3.6,8-8C16,3.6,12.4,0,8,0z M8,14c-3.3,0-6-2.7-6-6\r
index 061d4bb..23f6975 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="0 0 16 16" style="overflow:visible;enable-background:new 0 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M14,1h-2v1.5C12,3.3,11.3,4,10.5,4S9,3.3,9,2.5V1H6v1.5C6,3.3,5.3,4,4.5,4S3,3.3,3,2.5V1H1\r
index 4aa2fa2..660cb68 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 -3.1 16 16"\r
-        style="overflow:visible;enable-background:new -0.1 -3.1 16 16;" xml:space="preserve">\r
+        style="overflow:visible;enable-background:new -0.1 -3.1 16 16;" xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M15.5,4.1l-3.9-3.9c-0.4-0.4-0.7-0.3-0.7,0.3v2.8h-6V0.5c0-0.5-0.3-0.7-0.7-0.3L0.3,4.1\r
index aef9ff6..c5156f3 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="16px" height="16px" viewBox="-0.1 0 16 16" style="overflow:visible;enable-background:new -0.1 0 16 16;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#99CC33;" d="M6.4,11.1c-2-2.5-3.7-4-3.7-4S0.3,9.5,0,9.8C5,13.1,8.1,16,8.1,16s0.2-0.7,0.6-1.8\r
index b29d965..5c768d1 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M11.4,0.6l-0.9-0.5C10.1-0.1,9.5,0,9.2,0.5L4.7,8.2L2,6.6C1.5,6.3,0.9,6.5,0.6,7L0.1,7.8\r
index c1e9b63..b3255e2 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M5,9c0,1.2,0.6,2.3,1.4,3H0V8.4l1.7-0.9C2.2,7.3,2.3,6.7,2,6.3c0,0-0.9-1.1-0.9-2.5\r
index 78d2f4a..fc3900f 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M6,0C2.7,0,0,2.7,0,6c0,3.3,2.7,6,6,6s6-2.7,6-6C12,2.7,9.3,0,6,0z M6,2.5c0.5,0,1,0.1,1.4,0.3\r
index b29d965..5c768d1 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M11.4,0.6l-0.9-0.5C10.1-0.1,9.5,0,9.2,0.5L4.7,8.2L2,6.6C1.5,6.3,0.9,6.5,0.6,7L0.1,7.8\r
index 3d67bba..7eb785d 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 -1 12 12" style="overflow:visible;enable-background:new 0 -1 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M0,0v10h12V0H0z M1,2.7l2.7,2.7L1,8.1V2.7z M4.4,6.1l1.2,1.2C5.7,7.4,5.9,7.5,6,7.5s0.3,0,0.4-0.1\r
index 3ac0542..c3bfbf9 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M12,2.8V11H3.8l1-1h5.7L7.6,7.2l0.7-0.7L11,9.1V3.8L12,2.8z M1,9.1V3.7l2.7,2.7l0.7-0.7L1,2.3V2h7.1\r
index c1e9b63..b3255e2 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M5,9c0,1.2,0.6,2.3,1.4,3H0V8.4l1.7-0.9C2.2,7.3,2.3,6.7,2,6.3c0,0-0.9-1.1-0.9-2.5\r
index d6f865e..964b199 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <circle style="fill:#99CC33;" cx="6" cy="6" r="6"/>\r
index b29d965..5c768d1 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M11.4,0.6l-0.9-0.5C10.1-0.1,9.5,0,9.2,0.5L4.7,8.2L2,6.6C1.5,6.3,0.9,6.5,0.6,7L0.1,7.8\r
index c6b0590..40e9d44 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M11,0H1C0.4,0,0,0.4,0,1v6c0,0.6,0.4,1,1,1h1v4l4-4h5c0.6,0,1-0.4,1-1V1C12,0.4,11.6,0,11,0z"/>\r
index 3fcc125..fda8256 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M1,12V8C0.4,8,0,7.6,0,7V1c0-0.6,0.4-1,1-1h8c0.6,0,1,0.4,1,1v2H5C4.4,3,4,3.4,4,4v5c0,0,0,0,0,0\r
index 7401456..2d1e3ea 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M5.3,12H0V2.6v0L2.6,0h0H10v3.8l-1-1V1H4v3H1v7h4C5,11.4,5.1,11.7,5.3,12z M11.8,7L8.3,3.4\r
index 2a7fce7..094f5f0 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M12,9c0-1.1-0.9-2-2-2H2C0.9,7,0,7.9,0,9v3h12V9z M10,11H2v-1h8V11z M4,0L2,2v4h8V0H4z M9,5H3V3h2V1\r
index 00f5ca5..e4897f4 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 0 12 12" style="overflow:visible;enable-background:new 0 0 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <circle style="fill:#FF403C;" cx="6" cy="6" r="6"/>\r
index f66e5fc..77ce100 100644 (file)
@@ -6,7 +6,7 @@
 <svg version="1.1"\r
         xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"\r
         x="0px" y="0px" width="12px" height="12px" viewBox="0 -0.3 12 12" style="overflow:visible;enable-background:new 0 -0.3 12 12;"\r
-        xml:space="preserve">\r
+        xml:space="preserve" preserveAspectRatio="xMinYMid meet">\r
 <defs>\r
 </defs>\r
 <path style="fill:#999999;" d="M10.7,0.2C10.3-0.1,9.6,0,9.3,0.4l-5,7.2L2.1,6.1C1.7,5.8,1.1,5.9,0.8,6.4L0.2,7.2\r
index 065ffaa..861a8c7 100644 (file)
 defined('MOODLE_INTERNAL') || die();
 
 
-$version  = 2012112900.00;              // YYYYMMDD      = weekly release date of this DEV branch
+$version  = 2012113000.00;              // YYYYMMDD      = weekly release date of this DEV branch
                                         //         RR    = release increments - 00 in DEV branches
                                         //           .XX = incremental changes
 
-$release  = '2.4beta+ (Build: 20121123)'; // Human-friendly version name
+$release  = '2.4rc1 (Build: 20121130)'; // Human-friendly version name
 
 $branch   = '24';                       // this version's branch
-$maturity = MATURITY_BETA;             // this version's maturity level
+$maturity = MATURITY_RC;                // this version's maturity level