From 71b01086b2c5d1ce08f5cebfb03ff2866a0ff043 Mon Sep 17 00:00:00 2001
From: schneefux <schneefux+commit@schneefux.xyz>
Date: Sat, 3 May 2014 15:30:37 +0200
Subject: ersetze reguläre Ausdrücke durch Selektoren
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 js/index.js | 44 +++++++++++++++++++-------------------------
 1 file changed, 19 insertions(+), 25 deletions(-)

(limited to 'js/index.js')

diff --git a/js/index.js b/js/index.js
index 128afb7..62820a8 100644
--- a/js/index.js
+++ b/js/index.js
@@ -529,10 +529,9 @@ function getPlan(link){
     });
 
     request.done(function gotPlan(resultHtml){
-        var pdfRe = new RegExp('(http://***REMOVED***\\.de/moodle/pluginfile\\.php/\\d+/mod_resource/content/\\d+/.*?\\.pdf)');
-        var pdflink = pdfRe.exec(resultHtml)[1];
+        var pdflink = $('.resourceworkaround a', resultHtml).attr('href');
 
-        if(pdflink === null){
+        if(pdflink === undefined){
             return 0;
         }
 
@@ -555,37 +554,32 @@ function getOverview(link, onfail){
     console.log('Hole Übersicht');
 
     request.done(function gotOverview(resultHtml){
-            /* ruft getPlan für jeden Link in der Kursübersicht auf */
-            var plansRe = new RegExp('window\\.open\\(&#039;(http://***REMOVED***\\.de/moodle/mod/resource/view\\.php\\?id=\\d+)&amp;redirect=1&#039;\\)', 'g');
+        /* ruft getPlan für jeden Link in der Kursübersicht auf */
+        var as = $('.activityinstance a', resultHtml);
 
-            var resultarr = resultHtml.match(plansRe);
-
-            if(resultarr === null){
-                $('#error_passwd').show('fast');
-                onfail();
-                return 0;
-            }
-
-            var resultl = resultarr.length;
-
-            while((link = plansRe.exec(resultHtml)) !== null){
-                console.log('suche Plan ' + link[1]);
-                getPlan(link[1]);
-            }
+        if(as.length === 0){
+            $('#error_passwd').show('fast');
+            onfail();
+            return 0;
+        }
 
-            console.log('Übersichts-Request erfolgreich');
-            return 1;
+        as.each(function(index, element){
+            console.log('suche Plan ' + element);
+            getPlan(element);
         });
+        
+        console.log('Übersichts-Request erfolgreich');
+        return 1;
+    });
 
-        request.fail(onfail);
+    request.fail(onfail);
 }
 
 /* such den Link zur Übersicht von der Startseite aus */
 function loggedIn(resultHtml){
-    var vertretungsRe = new RegExp('title="Vertretungsplan" href="(http://***REMOVED***\\.de/moodle/course/view\\.php\\?id=\\d+)"');
-    var link = vertretungsRe.exec(resultHtml)[1];
+    var link = $('.coursebox .info .coursename a:contains("Vertretungsplan")', resultHtml).attr('href');
 
-    if(link === null){
+    if(link === undefined){
         return 0;
     }
 
-- 
cgit v1.3.1