updated php5 sites

diff --git a/content/tv2developer.js b/content/tv2developer.js
index ce8e57b5275850499c94c0fa39302b4bed1dad30..c1a269d6c534d58dd7304045434e27b48cf97b05 100755 (executable)
--- a/content/tv2developer.js
+++ b/content/tv2developer.js
@@ -219,12 +219,11 @@ var TV2Developer = {
     },
  
     /* Main function for adding all the links for the menu popup */   
-    _reg_tv2: /^https?:\/\/([^/.]*)?([^/]*?)(\.(robot|opdatering2?|template)\.?)?(\.((test|snapshot)3?)\.)?tv2\.dk((\/[^#\?]*).*)?$/,
+    _reg_tv2: /^https?:\/\/([^/.]*)?([^/]*?)(\.(robot|opdatering|template)\.?)?(\.((test|snapshot)3?)\.)?tv2\.dk((\/[^#\?]*).*)?$/,
     _reg_php: /^(.*\.php)/,
     _reg_nodeid: /([0-9]{2,})/g,
     _reg_i2files: /\/([0-9]+)-/,
-    //_reg_php5: /^(www|i2|common|ttvpumpe|1234|nyhederne)$/,
-    _reg_php5: /^(1234|i2|nyhederne|krimi)$/,
+    _reg_php5: /^(www|i2|common|ttvpumpe|1234|nyhederne|krimi)$/,
     _reg_fromviewcvs: /^http:\/\/viewcvs\.tv2.dk:7467\/cgi-bin\/viewvc\.cgi\/([^/]+)\.tv2\.dk\/(webroot|robot|opdatering|template)([^#\?]+)/,
     _reg_fromi2if: /^\/(tango\/(entry|requeue|dynamic)|tool\/pdo_log\/frameset)\.php.*?(\?|&)url=([^&]+)/,
     getLinks: function() {
@@ -253,7 +252,6 @@ var TV2Developer = {
             //var php5 = ((!tv2_sitename) || (this._reg_php5.test(tv2_sitename)));
             var php5 = ((tv2_sitename) && (this._reg_php5.test(tv2_sitename)));
             var testType = php5 ? '' : '3';
-            if (tv2_sitetype && tv2_sitetype == 'opdatering2') tv2_sitetype = 'opdatering';
             
             // Find live, test and snapshot url for current site
             var liveurl;
@@ -336,7 +334,7 @@ var TV2Developer = {
             // Update and I2 base URL
             var updatepostfix = (tv2_user ? '.' + tv2_user : '')
                               + '.opdatering'
-                              + (tv2_testtype ? '.' + tv2_testtype : '2') + '.tv2.dk'
+                              + (tv2_testtype ? '.' + tv2_testtype : '') + '.tv2.dk'
             var i2link = 'http://i2' + updatepostfix;
 
             // Check if we are on an Tango or I2 interface, then we can extract the URL again
@@ -482,10 +480,10 @@ var TV2Developer = {
         
         // Utility links
         links.push(new this.TV2LinkSplit());
-        links.push(new this.TV2LinkWithLabel('link_tree', this.getStr('i2Tree'), 'http://i2.opdatering2.tv2.dk/tree/', this.getStr('i2Tree.accesskey')));
-        links.push(new this.TV2LinkWithLabel('node', this.getStr('nodeInformationTool'), 'http://i2.opdatering2.tv2.dk/tool/node/', this.getStr('nodeInformationTool.accesskey')));
-        links.push(new this.TV2LinkWithLabel('link_query', this.getStr('nodeQueryTool'), 'http://i2.opdatering2.tv2.dk/tool/query/', this.getStr('nodeQueryTool.accesskey')));
-        links.push(new this.TV2LinkWithLabel('tango/entry', this.getStr('tangoInterface'), 'http://i2.opdatering2.tv2.dk/tango/', this.getStr('tangoInterface.accesskey')));
+        links.push(new this.TV2LinkWithLabel('link_tree', this.getStr('i2Tree'), 'http://i2.opdatering.tv2.dk/tree/', this.getStr('i2Tree.accesskey')));
+        links.push(new this.TV2LinkWithLabel('node', this.getStr('nodeInformationTool'), 'http://i2.opdatering.tv2.dk/tool/node/', this.getStr('nodeInformationTool.accesskey')));
+        links.push(new this.TV2LinkWithLabel('link_query', this.getStr('nodeQueryTool'), 'http://i2.opdatering.tv2.dk/tool/query/', this.getStr('nodeQueryTool.accesskey')));
+        links.push(new this.TV2LinkWithLabel('tango/entry', this.getStr('tangoInterface'), 'http://i2.opdatering.tv2.dk/tango/', this.getStr('tangoInterface.accesskey')));
         links.push(new this.TV2LinkWithLabel('w3c', this.getStr('w3c'),
             'http://validator.w3.org/check?uri=' + encodedURL, this.getStr('w3c.accesskey')));
         return links;
@@ -672,9 +670,9 @@ var TV2Developer = {
                if (postfix_obj.id == 'go-node') {
                    url = 'http://i2.opdatering.tv2.dk/tool/node/?id=' + id;
                } else if (postfix_obj.id == 'go-content-id') {
-                   url = 'http://i2.opdatering2.tv2.dk/tool/query/?id=&2=&3=&_checkbox=1&content_id='+id+'&4=&5=0&6=&action=Query&timeout=1';
+                   url = 'http://i2.opdatering.tv2.dk/tool/query/?id=&2=&3=&_checkbox=1&content_id='+id+'&4=&5=0&6=&action=Query&timeout=1';
                } else if (postfix_obj.id == 'go-ttv-page') {
-                   url = 'http://i2.opdatering2.tv2.dk/tool/ttv/?1=' + id + '&2=0';
+                   url = 'http://i2.opdatering.tv2.dk/tool/ttv/?1=' + id + '&2=0';
                }
            }
         window.close();

diff --git a/version b/version
index 33ac52006e6b1864598551ba273e99628b242c56..d15dfad3b90e87880b1c1ab76cf9bd3d82693186 100644 (file)
--- a/version
+++ b/version
@@ -1 +1 @@
-0.6.21
+0.6.22