Merge branch 'master' of git.openslx.org:openslx-ng/tutor-module

4 files changed, 44 insertions, 245 deletions

diff --git a/Dozentenmodul/src/models/Image.java b/Dozentenmodul/src/models/Image.java
deleted file mode 100644
index 89df5cd5..00000000
--- a/Dozentenmodul/src/models/Image.java
+++ /dev/null
@@ -1,87 +0,0 @@
-package models;
-
-public class Image {
-	
-	private String ImageId;
-	private String version;
-	private String imagename;
-	private String newName;
-	private String imagepath;
-	private int shareMode;
-	private boolean licensed;
-	private boolean internet;
-	private int ram;
-	private int cpu;
-	private long filesize;
-	public static Image image =new Image();
-	
-	
-	
-	public int getShareMode() {
-		return shareMode;
-	}
-	public void setShareMode(int shareMode) {
-		this.shareMode = shareMode;
-	}
-	public String getImagepath() {
-		return imagepath;
-	}
-	public void setImagepath(String imagepath) {
-		this.imagepath = imagepath;
-	}
-	public String getImagename() {
-		return imagename;
-	}
-	public void setImagename(String imagename) {
-		this.imagename = imagename;
-	}
-	public boolean isLicensed() {
-		return licensed;
-	}
-	public void setLicensed(boolean licensed) {
-		this.licensed = licensed;
-	}
-	public boolean isInternet() {
-		return internet;
-	}
-	public void setInternet(boolean internet) {
-		this.internet = internet;
-	}
-	public int getRam() {
-		return ram;
-	}
-	public void setRam(int ram) {
-		this.ram = ram;
-	}
-	public int getCpu() {
-		return cpu;
-	}
-	public void setCpu(int cpu) {
-		this.cpu = cpu;
-	}
-	public String getNewName() {
-		return newName;
-	}
-	public void setNewName(String newName) {
-		this.newName = newName;
-	}
-	public String getImageId() {
-		return ImageId;
-	}
-	public void setImageId(String imageId) {
-		ImageId = imageId;
-	}
-	public String getVersion() {
-		return version;
-	}
-	public void setVersion(String version) {
-		this.version = version;
-	}
-	public long getFilesize() {
-		return filesize;
-	}
-	public void setFilesize(long filesize) {
-		this.filesize = filesize;
-	}
-	
-}
diff --git a/Dozentenmodul/src/models/Lecture.java b/Dozentenmodul/src/models/Lecture.java
deleted file mode 100644
index eae05ec5..00000000
--- a/Dozentenmodul/src/models/Lecture.java
+++ /dev/null
@@ -1,91 +0,0 @@
-package models;
-
-import java.util.Date;
-
-public class Lecture {
-
-	private String name;
-	private String newName;
-	private String shortDesc;
-	private String desc;
-	private Date startdate;
-	private Date enddate;
-	private boolean active;
-	private String id;
-	private String linkedImagename;
-	public static Lecture lecture =new Lecture();
-	
-
-	public String getNewName() {
-		return newName;
-	}
-
-	public void setNewName(String newName) {
-		this.newName = newName;
-	}
-
-	public String getLinkedImagename() {
-		return linkedImagename;
-	}
-
-	public void setLinkedImagename(String linkedImagename) {
-		this.linkedImagename = linkedImagename;
-	}
-
-	public String getid() {
-		return id;
-	}
-
-	public void setid(String id) {
-		this.id = id;
-	}
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public String getShortDesc() {
-		return shortDesc;
-	}
-
-	public void setShortDesc(String shortDesc) {
-		this.shortDesc = shortDesc;
-	}
-
-	public String getDesc() {
-		return desc;
-	}
-
-	public void setDesc(String desc) {
-		this.desc = desc;
-	}
-
-	public Date getStartdate() {
-		return startdate;
-	}
-
-	public void setStartdate(Date startdate) {
-		this.startdate = startdate;
-	}
-
-	public Date getEnddate() {
-		return enddate;
-	}
-
-	public void setEnddate(Date enddate) {
-		this.enddate = enddate;
-	}
-
-	public boolean isActive() {
-		return active;
-	}
-
-	public void setActive(boolean active) {
-		this.active = active;
-	}
-	
-	
-}
diff --git a/Dozentenmodul/src/models/Links.java b/Dozentenmodul/src/models/Links.java
index 07db94a5..3e3dfb0e 100644
--- a/Dozentenmodul/src/models/Links.java
+++ b/Dozentenmodul/src/models/Links.java
@@ -28,6 +28,29 @@ public class Links {
 
 		try {
 
+
+			if (os.indexOf( "Win" ) >= 0) {
+				
+		        rt.exec( "rundll32 url.dll,FileProtocolHandler " + faq);
+	 
+		    } else if (os.indexOf( "Mac" ) >= 0) {
+		    	
+		        rt.exec( "open " + faq);
+	 
+            } else if (os.indexOf( "nix") >=0 || os.indexOf( "nux") >=0) {
+
+		        // Do a best guess on unix until we get a platform independent way
+		        // Build a list of browsers to try, in this order.
+		        String[] browsers = {"epiphany", "firefox", "mozilla", "konqueror",
+		       			             "netscape","opera","links","lynx"};
+	 
+		        StringBuffer cmd = new StringBuffer();
+		        for (int i=0; i<browsers.length; i++)
+		            cmd.append( (i==0  ? "" : " || " ) + browsers[i] +" \"" + faq + "\" ");
+	 
+		        rt.exec(new String[] { "sh", "-c", cmd.toString() });
+            }
+
 			if (os.indexOf("Win") >= 0) {
 
 				// this doesn't support showing urls in the form of
@@ -56,6 +79,7 @@ public class Links {
 				rt.exec(new String[] { "sh", "-c", cmd.toString() });
 			}
 
+
 		} catch (IOException e) {
 			// TODO Auto-generated catch block
 			e.printStackTrace();
@@ -71,6 +95,26 @@ public class Links {
 
 		try {
 
+			 if (os.indexOf( "Win" ) >= 0) {
+ 
+		        rt.exec( "rundll32 url.dll,FileProtocolHandler " + otrs);
+	 
+		    } else if (os.indexOf( "Mac" ) >= 0) {
+
+		        rt.exec( "open " + otrs);
+	 
+            } else if (os.indexOf( "nix") >=0 || os.indexOf( "nux") >=0) {
+
+		        String[] browsers = {"epiphany", "firefox", "mozilla", "konqueror",
+		       			             "netscape","opera","links","lynx"};
+	 
+		        StringBuffer cmd = new StringBuffer();
+		        for (int i=0; i<browsers.length; i++)
+		            cmd.append( (i==0  ? "" : " || " ) + browsers[i] +" \"" + otrs + "\" ");
+	 
+		        rt.exec(new String[] { "sh", "-c", cmd.toString() });
+            }
+
 			if (os.indexOf("Win") >= 0) {
 
 				// this doesn't support showing urls in the form of
diff --git a/Dozentenmodul/src/models/person.java b/Dozentenmodul/src/models/person.java
deleted file mode 100644
index 0f14af51..00000000
--- a/Dozentenmodul/src/models/person.java
+++ /dev/null
@@ -1,67 +0,0 @@
-package models;
-
-
-public class person{
-
-	private String username;
-	private String Name;
-	private String Vorname;
-	private String Hochschule;
-	private String EMail;
-	private String Tel;
-	private String Fakultaet;
-	private boolean ischecked;
-	public static person verantwortlicher=new person();
-	
-	public String getUsername() {
-		return username;
-	}
-	public void setUsername(String username) {
-		this.username = username;
-	}
-
-	public String getName() {
-		return Name;
-	}
-	public void setName(String name) {
-		Name = name;
-	}
-	public String getVorname() {
-		return Vorname;
-	}
-	public void setVorname(String vorname) {
-		Vorname = vorname;
-	}
-	public String getHochschule() {
-		return Hochschule;
-	}
-	public void setHochschule(String hochschule) {
-		Hochschule = hochschule;
-	}
-	public String getEMail() {
-		return EMail;
-	}
-	public void setEMail(String eMail) {
-		EMail = eMail;
-	}
-	public String getTel() {
-		return Tel;
-	}
-	public void setTel(String tel) {
-		Tel = tel;
-	}
-	public String getFakultaet() {
-		return Fakultaet;
-	}
-	public void setFakultaet(String fakultaet) {
-		Fakultaet = fakultaet;
-	}
-	public boolean isIschecked() {
-		return ischecked;
-	}
-	public void setIschecked(boolean ischecked) {
-		this.ischecked = ischecked;
-	}
-
-
-}