Prepared Release

fluxapps · Nov 3, 2014 · 251dd15 · 251dd15
1 parent b7db1ef
commit 251dd15
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 5 deletions.
diff --git a/README.md b/README.md
@@ -24,9 +24,7 @@ As ILIAS administrator go to "Administration->Plugins" and install/activate the
 - Config Rewrite Rule in .htaccess or Apache-Config:
 ```apacheconf
 <IfModule mod_rewrite.c>
-	RewriteEngine on
-	RewriteRule ^vote$ Customizing/global/plugins/Services/Repository/RepositoryObject/LiveVoting/pin.php [L]
-	RewriteRule ^vote\?(.*)$ Customizing/global/plugins/Services/Repository/RepositoryObject/LiveVoting/pin.php?$1 [L]
+	RewriteRule ^vote([|/|/0-9]*)$ Customizing/global/plugins/Services/Repository/RepositoryObject/LiveVoting/pin.php?pin=$1 [L]
 </IfModule>
 ```
 

diff --git a/classes/class.ilObjLiveVoting.php b/classes/class.ilObjLiveVoting.php
@@ -480,6 +480,9 @@ public function addOption($title) {
 	 * @return ilObjLiveVoting|false
 	 */
 	public static function _getObjectByPin($pin) {
+		if (!ilLiveVotingPlugin::getInstance()->isActive()) {
+			return false;
+		}
 		global $ilDB;
 		$query = "SELECT id FROM rep_robj_xlvo_data WHERE pin = " . $ilDB->quote($pin, "text");
 		$set = $ilDB->query($query);

diff --git a/pin.php b/pin.php
@@ -9,7 +9,8 @@
 
 $_GET['pin'] = str_ireplace('/', '', $_GET['pin']);
 
-if ($_POST['pin'] || $_GET['pin']) {
+
+if ($_POST['pin'] OR $_GET['pin']) {
 	$pin = ((!$_POST['pin'] AND $_GET['pin']) ? $_GET['pin'] : $_POST['pin']);
 	$link = ilObjLiveVotingGUI::getLinkByPin($pin);
 	if ($link) {

diff --git a/plugin.php b/plugin.php
@@ -1,6 +1,6 @@
 <?php
 $id                = 'xlvo';
-$version           = '1.1.0';
+$version           = '1.2.0';
 $ilias_min_version = '4.3.0';
 $ilias_max_version = '4.4.999';
 $responsible       = 'Oskar Truffer, Fabian Schmid';