Update options menu
Took 23 minutes
This commit is contained in:
parent
7373d4417f
commit
f612de7a5b
29
.idea/workspace.xml
generated
29
.idea/workspace.xml
generated
@ -21,7 +21,9 @@
|
|||||||
<component name="ChangeListManager">
|
<component name="ChangeListManager">
|
||||||
<list default="true" id="fc13552d-b118-4828-b78f-fc8714e0cfdc" name="Default Changelist" comment="Final COMMIT!!!">
|
<list default="true" id="fc13552d-b118-4828-b78f-fc8714e0cfdc" name="Default Changelist" comment="Final COMMIT!!!">
|
||||||
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
|
||||||
<change beforePath="$PROJECT_DIR$/vendor/js/faq.js" beforeDir="false" afterPath="$PROJECT_DIR$/vendor/js/faq.js" afterDir="false" />
|
<change beforePath="$PROJECT_DIR$/controller/DefaultController.class.inc.php" beforeDir="false" afterPath="$PROJECT_DIR$/controller/DefaultController.class.inc.php" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/model/DefaultModel.class.inc.php" beforeDir="false" afterPath="$PROJECT_DIR$/model/DefaultModel.class.inc.php" afterDir="false" />
|
||||||
|
<change beforePath="$PROJECT_DIR$/templates/faq.tmpl.html" beforeDir="false" afterPath="$PROJECT_DIR$/templates/faq.tmpl.html" afterDir="false" />
|
||||||
</list>
|
</list>
|
||||||
<option name="SHOW_DIALOG" value="false" />
|
<option name="SHOW_DIALOG" value="false" />
|
||||||
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
<option name="HIGHLIGHT_CONFLICTS" value="true" />
|
||||||
@ -32,7 +34,7 @@
|
|||||||
<execution />
|
<execution />
|
||||||
</component>
|
</component>
|
||||||
<component name="DarkyenusTimeTracker">
|
<component name="DarkyenusTimeTracker">
|
||||||
<option name="totalTimeSeconds" value="93281" />
|
<option name="totalTimeSeconds" value="94668" />
|
||||||
<option name="gitIntegration" value="true" />
|
<option name="gitIntegration" value="true" />
|
||||||
<option name="naggedAbout" value="1" />
|
<option name="naggedAbout" value="1" />
|
||||||
</component>
|
</component>
|
||||||
@ -78,7 +80,7 @@
|
|||||||
<updated>1601618466935</updated>
|
<updated>1601618466935</updated>
|
||||||
<workItem from="1601618467981" duration="36776000" />
|
<workItem from="1601618467981" duration="36776000" />
|
||||||
<workItem from="1601809534320" duration="1558000" />
|
<workItem from="1601809534320" duration="1558000" />
|
||||||
<workItem from="1601811106543" duration="28096000" />
|
<workItem from="1601811106543" duration="29962000" />
|
||||||
</task>
|
</task>
|
||||||
<task id="LOCAL-00001" summary="Initial commit">
|
<task id="LOCAL-00001" summary="Initial commit">
|
||||||
<created>1601618764031</created>
|
<created>1601618764031</created>
|
||||||
@ -339,7 +341,14 @@
|
|||||||
<option name="project" value="LOCAL" />
|
<option name="project" value="LOCAL" />
|
||||||
<updated>1601922350102</updated>
|
<updated>1601922350102</updated>
|
||||||
</task>
|
</task>
|
||||||
<option name="localTasksCounter" value="38" />
|
<task id="LOCAL-00038" summary="fix room lock msgs">
|
||||||
|
<created>1601922746760</created>
|
||||||
|
<option name="number" value="00038" />
|
||||||
|
<option name="presentableId" value="LOCAL-00038" />
|
||||||
|
<option name="project" value="LOCAL" />
|
||||||
|
<updated>1601922746760</updated>
|
||||||
|
</task>
|
||||||
|
<option name="localTasksCounter" value="39" />
|
||||||
<servers />
|
<servers />
|
||||||
</component>
|
</component>
|
||||||
<component name="TypeScriptGeneratedFilesManager">
|
<component name="TypeScriptGeneratedFilesManager">
|
||||||
@ -358,7 +367,6 @@
|
|||||||
<option name="oldMeFiltersMigrated" value="true" />
|
<option name="oldMeFiltersMigrated" value="true" />
|
||||||
</component>
|
</component>
|
||||||
<component name="VcsManagerConfiguration">
|
<component name="VcsManagerConfiguration">
|
||||||
<MESSAGE value="Final COMMIT!!!" />
|
|
||||||
<MESSAGE value="Fix issue #1" />
|
<MESSAGE value="Fix issue #1" />
|
||||||
<MESSAGE value="Done issue #5 and #3" />
|
<MESSAGE value="Done issue #5 and #3" />
|
||||||
<MESSAGE value="Fix issue #2" />
|
<MESSAGE value="Fix issue #2" />
|
||||||
@ -383,7 +391,8 @@
|
|||||||
<MESSAGE value="increase answer size" />
|
<MESSAGE value="increase answer size" />
|
||||||
<MESSAGE value="Correct spelling" />
|
<MESSAGE value="Correct spelling" />
|
||||||
<MESSAGE value="Add room lock" />
|
<MESSAGE value="Add room lock" />
|
||||||
<option name="LAST_COMMIT_MESSAGE" value="Add room lock" />
|
<MESSAGE value="fix room lock msgs" />
|
||||||
|
<option name="LAST_COMMIT_MESSAGE" value="fix room lock msgs" />
|
||||||
</component>
|
</component>
|
||||||
<component name="WindowStateProjectService">
|
<component name="WindowStateProjectService">
|
||||||
<state x="728" y="326" width="800" height="683" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1601632929047">
|
<state x="728" y="326" width="800" height="683" key="#com.intellij.execution.impl.EditConfigurationsDialog" timestamp="1601632929047">
|
||||||
@ -422,10 +431,10 @@
|
|||||||
<screen x="0" y="34" width="1920" height="1046" />
|
<screen x="0" y="34" width="1920" height="1046" />
|
||||||
</state>
|
</state>
|
||||||
<state x="441" y="192" width="1037" height="736" key="SettingsEditor/0.34.1920.1046@0.34.1920.1046" timestamp="1601632853044" />
|
<state x="441" y="192" width="1037" height="736" key="SettingsEditor/0.34.1920.1046@0.34.1920.1046" timestamp="1601632853044" />
|
||||||
<state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2" timestamp="1601922351176">
|
<state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2" timestamp="1601922747943">
|
||||||
<screen x="0" y="34" width="1920" height="1046" />
|
<screen x="0" y="34" width="1920" height="1046" />
|
||||||
</state>
|
</state>
|
||||||
<state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2/0.34.1920.1046@0.34.1920.1046" timestamp="1601922351176" />
|
<state x="555" y="292" width="800" height="535" key="Vcs.Push.Dialog.v2/0.34.1920.1046@0.34.1920.1046" timestamp="1601922747943" />
|
||||||
<state x="809" y="122" width="639" height="876" key="com.intellij.database.view.ui.AbstractDbRefactoringDialog" timestamp="1601632983240">
|
<state x="809" y="122" width="639" height="876" key="com.intellij.database.view.ui.AbstractDbRefactoringDialog" timestamp="1601632983240">
|
||||||
<screen x="0" y="34" width="1920" height="1046" />
|
<screen x="0" y="34" width="1920" height="1046" />
|
||||||
</state>
|
</state>
|
||||||
@ -438,6 +447,10 @@
|
|||||||
<screen x="0" y="34" width="1920" height="1046" />
|
<screen x="0" y="34" width="1920" height="1046" />
|
||||||
</state>
|
</state>
|
||||||
<state x="641" y="122" width="638" height="870" key="find.popup/0.34.1920.1046@0.34.1920.1046" timestamp="1601836650536" />
|
<state x="641" y="122" width="638" height="870" key="find.popup/0.34.1920.1046@0.34.1920.1046" timestamp="1601836650536" />
|
||||||
|
<state x="624" y="254" key="run.anything.popup" timestamp="1601922739895">
|
||||||
|
<screen x="0" y="34" width="1920" height="1046" />
|
||||||
|
</state>
|
||||||
|
<state x="624" y="254" key="run.anything.popup/0.34.1920.1046@0.34.1920.1046" timestamp="1601922739895" />
|
||||||
<state x="623" y="264" width="672" height="678" key="search.everywhere.popup" timestamp="1601893370899">
|
<state x="623" y="264" width="672" height="678" key="search.everywhere.popup" timestamp="1601893370899">
|
||||||
<screen x="0" y="34" width="1920" height="1046" />
|
<screen x="0" y="34" width="1920" height="1046" />
|
||||||
</state>
|
</state>
|
||||||
|
@ -17,10 +17,17 @@ class DefaultController
|
|||||||
$Request = new Request();
|
$Request = new Request();
|
||||||
|
|
||||||
$room_code = mb_strtoupper( $Request->getVar( 'code', null, 'GET' ) );
|
$room_code = mb_strtoupper( $Request->getVar( 'code', null, 'GET' ) );
|
||||||
|
$secret = $Request->getVar( 'secret', null, 'GET' );
|
||||||
if( !empty( $room_code ) )
|
if( !empty( $room_code ) )
|
||||||
{
|
{
|
||||||
|
if( !empty( $secret ) )
|
||||||
|
{
|
||||||
|
header( 'Location: ?a=joinFAQ&code=' . $room_code . '&secret=' . $secret );
|
||||||
|
exit();
|
||||||
|
}
|
||||||
// Redirect to Join
|
// Redirect to Join
|
||||||
header( 'Location: ?a=joinFAQ&code=' . $room_code );
|
header( 'Location: ?a=joinFAQ&code=' . $room_code );
|
||||||
|
exit();
|
||||||
}
|
}
|
||||||
|
|
||||||
$view->set_placeholder( 'max_len', CODE_LENGTH );
|
$view->set_placeholder( 'max_len', CODE_LENGTH );
|
||||||
@ -50,6 +57,7 @@ class DefaultController
|
|||||||
$view->set_placeholder( 'max_len', CODE_LENGTH );
|
$view->set_placeholder( 'max_len', CODE_LENGTH );
|
||||||
$view->set_placeholder( 'wasted_time', WASTED_TIME );
|
$view->set_placeholder( 'wasted_time', WASTED_TIME );
|
||||||
$room_code = mb_strtoupper( $Request->getVar( 'code', null, 'POST' ) );
|
$room_code = mb_strtoupper( $Request->getVar( 'code', null, 'POST' ) );
|
||||||
|
$secret = $Request->getVar( 'secret', null, 'GET' );
|
||||||
if( empty( $room_code ) )
|
if( empty( $room_code ) )
|
||||||
{
|
{
|
||||||
$room_code = mb_strtoupper( $Request->getVar( 'code', null, 'GET' ) );
|
$room_code = mb_strtoupper( $Request->getVar( 'code', null, 'GET' ) );
|
||||||
@ -68,6 +76,8 @@ class DefaultController
|
|||||||
return $view->getHtml();
|
return $view->getHtml();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$DefaultModel->setSecret( $room_id, $secret );
|
||||||
|
|
||||||
if( !$DefaultModel->joinRoom( $room_id ) )
|
if( !$DefaultModel->joinRoom( $room_id ) )
|
||||||
{
|
{
|
||||||
$view->set_placeholder( 'error', 'An error occurred, please try again later!' );
|
$view->set_placeholder( 'error', 'An error occurred, please try again later!' );
|
||||||
|
@ -56,5 +56,10 @@ class DefaultModel
|
|||||||
return $randomString;
|
return $randomString;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function setSecret( int $room_id, string $secret)
|
||||||
|
{
|
||||||
|
setcookie( 'owner_room_' . $room_id, $secret, time()+60*60*24*365 );
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
@ -113,7 +113,7 @@
|
|||||||
<div class="modal-dialog modal-dialog-centered" role="document">
|
<div class="modal-dialog modal-dialog-centered" role="document">
|
||||||
<div class="modal-content">
|
<div class="modal-content">
|
||||||
<div class="modal-header">
|
<div class="modal-header">
|
||||||
<h5 class="modal-title" id="optionsModalLabel">Room-Options</h5>
|
<h5 class="modal-title" id="optionsModalLabel">Room-Options(not finished yet)</h5>
|
||||||
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
|
||||||
<span aria-hidden="true">×</span>
|
<span aria-hidden="true">×</span>
|
||||||
</button>
|
</button>
|
||||||
@ -121,8 +121,12 @@
|
|||||||
<div class="modal-body">
|
<div class="modal-body">
|
||||||
<span class="text-danger" id="optionsErrorMsg"></span>
|
<span class="text-danger" id="optionsErrorMsg"></span>
|
||||||
<div class="form-group">
|
<div class="form-group">
|
||||||
|
Not finished yet! - Options not working.
|
||||||
<label for="lock_room">Lock Room?</label>
|
<label for="lock_room">Lock Room?</label>
|
||||||
<input type="checkbox" class="form-control" checked="false" id="lock_room">
|
<input type="checkbox" class="form-control" [[LOCKED]] id="lock_room">
|
||||||
|
|
||||||
|
<label for="secret_url">Admin-URL</label>
|
||||||
|
<input type="text" readonly class="form-control" value="https://faq.hw-table.de/?code=XXXX&secret=XXXXXXXXXXXXX" id="secret_url">
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="modal-footer">
|
<div class="modal-footer">
|
||||||
|
Loading…
x
Reference in New Issue
Block a user