Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
testElastica
.htaccess
.project
.settings
.settings
4 changes: 2 additions & 2 deletions config.php
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
* The users that are allowed in. Format 'username' => 'password'
*/
$config['users'] = array(
'user' => 'password'
'admin' => 'admin'
);
?>
?>
16 changes: 16 additions & 0 deletions core/router.php
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,22 @@ class Router
*/
protected static $config = array();




static function appendMessage($message){
$_SESSION["messages"] = isset($_SESSION["messages"])?array():$_SESSION["messages"];
$_SESSION["messages"][] = $message;
}

static function getMessages(){
if(isset($_SESSION["messages"])){
$messages = $_SESSION["messages"];
unset($_SESSION["messages"]);
return $messages;
}
return FALSE;
}
/**
* The main routing function. Keeps track
* on which controllers and views to run.
Expand Down
3 changes: 2 additions & 1 deletion helper/form.php
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ public function createForm()

// Create a form id that can be used for validation
$_SESSION['form_id_' . $name] = md5(time() . $name);

$this->output = isset($this->output)?$this->output:"";

$this->output .= '<form id="' . $name . '" name="' . $name . '" ';
$this->output .= 'action="?q=' . $_GET['q'] . '" ';
$this->output .= "method =\"POST\">\n";
Expand Down
3 changes: 2 additions & 1 deletion modules/index/controller/index.php
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ class controllerIndex extends router
*/
public function page_refresh($args)
{
self::$query_loader->callWithCheck($args[0] . '/_refresh', 'POST', null, 'index/edit/' . $args[0]);
self::appendMessage("Index refreshed!");
self::$query_loader->callWithCheck($args[0] . '/_refresh', 'POST', null, 'index/edit/' . $args[0]);
}

/**
Expand Down
19 changes: 16 additions & 3 deletions view/page.tpl.php
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
<div id="main">
<?php echo l('', '<span><div class="logo"></div></span>'); ?>
<div class="check">
<input type="checkbox" id="validateQuery" <?php echo $vars['validate']; ?>><label for="validateQuery">Validate each query</label>
<input type="checkbox" id="validateQuery" <?php echo isset($vars['validate'])?$vars['validate']:""; ?>><label for="validateQuery">Validate each query</label>
</div>
</div>
</div>
Expand All @@ -41,12 +41,25 @@

<div id="main">
<div id="leftmenu" class="leftMenu">
<?php echo $vars['leftblock']; ?>
<?php echo isset($vars['leftblock'])?$vars['leftblock']:""; ?>
</div>

<div id="content" class="content">
<h2><?php echo $vars['title']; ?></h2>
<?php if($vars['response_message']): ?>


<?php
$messages = router::getMessages();
if(!empty($messages)){
foreach($messages as $msg){
echo $msg;
}
}
?>



<?php if($vars['response_message']): ?>
<div class="response_message">
<pre><?php echo $vars['response_message']; ?></pre>
</div>
Expand Down