srchub-old Commit Details

Date:

2014-03-09 22:40:00 (10 years 7 months ago)

Author:

Natalie Adams

Branch:

default

Commit:

2edaca00bc79

Parents:

91cebee6b04d

Message:

Adding file for new syntax highlighter

changing OTP url for QR code creation

Changes:

M	indefero/src/IDF/Template/MarkdownPrefilter.php (1 diff)
M	indefero/src/IDF/templates/idf/user/myaccount.html (2 diffs)

File differences

-101
102 102
103 103
104
104 105
105 106
106 107
+                            'caption' => array('class', 'dir', 'id', 'style', 'title',␊
                                               'align'), // deprecated attribute),␊
                            'code' => array('class', 'dir', 'id', 'style', 'title'),␊
                            'script' => array('type', 'class', 'dir', 'id', 'style', 'title'),␊
                            'dd' => array('class', 'dir', 'id', 'style', 'title'),␊
                            'del' => array('class', 'dir', 'id', 'style', 'title',␊
                                           'cite', 'datetime'),␊
                             'caption' => array('class', 'dir', 'id', 'style', 'title',␊
                                                'align'), // deprecated attribute),␊
                             'code' => array('class', 'dir', 'id', 'style', 'title'),␊
+                            'script' => array('type', 'class', 'dir', 'id', 'style', 'title'),␊
                             'dd' => array('class', 'dir', 'id', 'style', 'title'),␊
                             'del' => array('class', 'dir', 'id', 'style', 'title',␊
                                            'cite', 'datetime'),␊

-181
182 182
183 183
184 
184
185 185
186 186
187 187
... ...
194 194
195 195
196 196
197 
197
198 198
199 199
200 200
201 201
202 202
203 
203
204 204
205 205
206 206
+    {␊
        if ($("#id_otpkey").val() != "")␊
        {␊
            var url = "https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=otpauth%3A%2F%2Ftotp%2F" + user + "?secret=" + $("#id_otpkey").val() + "%26issuer=srchub&choe=UTF-8";␊
            var url = "https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=otpauth%3A%2F%2Ftotp%2Fsrchub:" + user + "?secret=" + $("#id_otpkey").val() + "%26issuer=srchub&choe=UTF-8";␊
            $("#QRcode").html('<img src="' + url + '" />');␊
        } else {␊
            $("#QRcode").html('');␊

        for(var i = 0; i < 32; i++)␊
            key += chars[Math.floor(Math.random() * 32)];␊
        $("#id_otpkey").val(key);␊
        var url = "https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=otpauth%3A%2F%2Ftotp%2F" + user + "?secret=" + $("#id_otpkey").val().toUpperCase() + "%26issuer=srchub&choe=UTF-8";␊
        var url = "https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=otpauth%3A%2F%2Ftotp%srchub:" + user + "?secret=" + $("#id_otpkey").val().toUpperCase() + "%26issuer=srchub&choe=UTF-8";␊
        $("#QRcode").html('<img src="' + url + '" />')␊
        return false;␊
    });␊
    if ($("#id_otpkey").val() != "")␊
    {␊
        var url = "https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=otpauth%3A%2F%2Ftotp%2F" + user + "?secret=" + $("#id_otpkey").val().toUpperCase() + "%26issuer=srchub&choe=UTF-8";␊
        var url = "https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=otpauth%3A%2F%2Ftotp%2Fsrchub:" + user + "?secret=" + $("#id_otpkey").val().toUpperCase() + "%26issuer=srchub&choe=UTF-8";␊
        $("#QRcode").html('<img src="' + url + '" />')␊
    }␊
});{/literal}␊
 ...
     {␊
         if ($("#id_otpkey").val() != "")␊
         {␊
-            var url = "https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=otpauth%3A%2F%2Ftotp%2F" + user + "?secret=" + $("#id_otpkey").val() + "%26issuer=srchub&choe=UTF-8";␊
+            var url = "https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=otpauth%3A%2F%2Ftotp%2Fsrchub:" + user + "?secret=" + $("#id_otpkey").val() + "%26issuer=srchub&choe=UTF-8";␊
             $("#QRcode").html('<img src="' + url + '" />');␊
         } else {␊
             $("#QRcode").html('');␊
         for(var i = 0; i < 32; i++)␊
             key += chars[Math.floor(Math.random() * 32)];␊
         $("#id_otpkey").val(key);␊
-        var url = "https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=otpauth%3A%2F%2Ftotp%2F" + user + "?secret=" + $("#id_otpkey").val().toUpperCase() + "%26issuer=srchub&choe=UTF-8";␊
+        var url = "https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=otpauth%3A%2F%2Ftotp%srchub:" + user + "?secret=" + $("#id_otpkey").val().toUpperCase() + "%26issuer=srchub&choe=UTF-8";␊
         $("#QRcode").html('<img src="' + url + '" />')␊
         return false;␊
     });␊
     if ($("#id_otpkey").val() != "")␊
     {␊
-        var url = "https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=otpauth%3A%2F%2Ftotp%2F" + user + "?secret=" + $("#id_otpkey").val().toUpperCase() + "%26issuer=srchub&choe=UTF-8";␊
+        var url = "https://chart.googleapis.com/chart?chs=300x300&cht=qr&chl=otpauth%3A%2F%2Ftotp%2Fsrchub:" + user + "?secret=" + $("#id_otpkey").val().toUpperCase() + "%26issuer=srchub&choe=UTF-8";␊
         $("#QRcode").html('<img src="' + url + '" />')␊
     }␊
 });{/literal}␊

Download the corresponding diff file

srchub-old

File differences

Branches

Tags