Merge pull request #171 from uplink42/dev

Dev
uplink42 · Apr 29, 2017 · 4b178ab · 4b178ab
2 parents 0525d93 + d86d6eb
commit 4b178ab
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 8 deletions.
diff --git a/application/controllers/Register.php b/application/controllers/Register.php
@@ -23,9 +23,7 @@ public function processData(): void
         $email          = $this->input->post('email', true);
         $apikey         = (int) $this->input->post('apikey', true);
         $vcode          = $this->input->post('vcode', true);
-        $reports        = $this->input->post('reports', true);
-
-        log_message('error', $reports);
+        $reports        = $this->input->post('reports');
 
         $this->load->model('Register_model', 'register');
         $result = $this->register->validate($username, $password, $repeatpassword, $email, $apikey, $vcode, $reports);
@@ -64,7 +62,7 @@ public function processCharacters(): void
             'email'            => $this->input->post('email', true),
             'apikey'           => (int) $this->input->post('apikey', true),
             'vcode'            => $this->input->post('vcode', true),
-            'reports'          => $this->input->post('reports', true),
+            'reports'          => $this->input->post('reports'),
             'default_buy'      => $this->input->post('default-buy', true),
             'default_sell'     => $this->input->post('default-sell', true),
             'x_character'      => $this->input->post('x-character', true),
@@ -93,7 +91,6 @@ public function processCharacters(): void
         }
 
         $user_data['chars'] = $chars;
-
         // no characters selected
         if (count($chars) == 0) {
             $characters         = $this->register->getCharacters($user_data['apikey'], $user_data['vcode']);

diff --git a/application/views/register/register_characters_v.twig b/application/views/register/register_characters_v.twig
@@ -42,7 +42,7 @@
         						<input type="hidden" name="apikey" value="{{set_value('apikey')}}">
         						<input type="hidden" name="vcode" value="{{set_value('vcode')}}">
         						<input type="hidden" name="email" value="{{set_value('email')}}">
-        						<input type="hidden" name="reports" value="<{{set_value('reports')}}">
+        						<input type="hidden" name="reports" value="{{set_value('reports')}}">
 
         						<div class="text-center submit-register">
         							<i class="fa fa-info"></i> <span>You can add up to 20 characters to your account after registering</span><br>

diff --git a/application/views/reports/reports_v.php b/application/views/reports/reports_v.php
@@ -37,11 +37,11 @@
     </style>        
 </head>
 <body>
-    <center><h2>Daily earnings report for <?=$username?></h2></center><br>
+    <center><h2><?=$period?> earnings report for <?=$username?></h2></center><br>
 
     <center><h2>From: <?=$date_prev?> GMT</h2></center>
     <center><h2>To: <?=$date_now?> GMT</h2><br></center>
-    <center><p align='center'><h3>Last 24 hours snapshot: </h3></p></center>
+    <center><p align='center'><h3>Snapshot: </h3></p></center>
 
     <table>
         <tr>