List of commits:
Subject Hash Author Date (UTC)
We did not validated the plan id - now is fixed. 3786d759107c4028f181c7de77d39382d9f572bf Catalin(ux) M. BOIE 2022-02-16 18:55:05
Added build stats 3f574c94ad35d6f85ee37a4da410499f268e608f Catalin(ux) M. BOIE 2022-02-16 18:53:54
Cosmetic 548c8a909c994ef528c9910c625e6afb88beeead Catalin(ux) M. BOIE 2022-02-16 18:44:12
.deb support 722ca672abf6f28109e35f3573dca7e367d3b51a Catalin(ux) M. BOIE 2022-02-16 18:39:19
compare: added rpm/deb lines 1356fb5c8e5d82356776561af4a2dcaec0d19c14 Catalin(ux) M. BOIE 2022-02-16 07:30:06
debian folder updates 45e86104b565e508c514804910cfda87a3c1239c Catalin(ux) M. BOIE 2022-02-16 07:26:09
Fix rate limit for IPv6 336d34f7eaac356688ba5c251f027aff947ce9e4 Catalin(ux) M. BOIE 2022-02-09 14:39:28
Forgot to remove a function after moving it b6fd0700cf5dde953acb0d4584a48cb404a69ab2 Catalin(ux) M. BOIE 2021-11-17 19:27:04
Prepare correctly for rgfs (missed some places) 38d255af17a72fd9f92a8c37d4fddc8f2caf023b Catalin(ux) M. BOIE 2021-11-17 18:05:01
TODO/cosmetic d4968bc1d9c8bbe3c4aba2479f3694a7a3863d0f Catalin(ux) M. BOIE 2021-11-17 18:04:36
More debug help 74f45188bffd7630d0c08648433749a3ef23c9af Catalin(ux) M. BOIE 2021-11-15 17:34:58
worker: Fixed a stupid bug leading to wrong distro upgrade command d9bc215557cd9a6f30dbc90434dc3aba46e39979 Catalin(ux) M. BOIE 2021-11-14 16:16:43
Silence an 'unpack' exception when we do not have enough bytes. add562b15d94501a0585001db526b241c251b6e6 Catalin(ux) M. BOIE 2021-11-14 11:25:01
Run struct and fixes under the same lock d046942317c73351473a18eb833318aec3f4d907 Catalin(ux) M. BOIE 2021-11-14 08:18:05
spec file small updates 7aef02df6ed5f6ce4d39cd2a926a79bcdc1a3c5a Catalin(ux) M. BOIE 2021-11-14 06:33:35
Typo b0087441b4d637c7bf6ed64b6c243ad2ec8f1493 Catalin(ux) M. BOIE 2021-11-14 06:15:00
spec: Added 'Replaces: rocketgit' to easy upgrade, fixed fixfiles c380f40fe86ddf70b99030a6f0be93d91137b909 Catalin(ux) M. BOIE 2021-11-14 06:14:25
Fixed non debug case of rg_debug_html 523f6784671e5f810b8435ad66ad21ea548219d8 Catalin(ux) M. BOIE 2021-11-14 05:58:37
Fix rate limit types 0de3ee35d0d0e46521d64a596232765fb5d618a3 Catalin(ux) M. BOIE 2021-11-14 05:58:03
commented request_slowlog_timeout 505877b567807e11f25695de58725f316f10043e Catalin(ux) M. BOIE 2021-11-13 17:32:46
Commit 3786d759107c4028f181c7de77d39382d9f572bf - We did not validated the plan id - now is fixed.
Author: Catalin(ux) M. BOIE
Author date (UTC): 2022-02-16 18:55
Committer name: Catalin(ux) M. BOIE
Committer date (UTC): 2022-02-16 18:55
Parent(s): 3f574c94ad35d6f85ee37a4da410499f268e608f
Signing key:
Tree: f2cc524abccce0dbf429aa8d00fa4f9b59cf38e2
File Lines added Lines deleted
inc/plan.inc.php 13 12
inc/user.inc.php 6 0
tests/http_settings.php 11 5
File inc/plan.inc.php changed (mode: 100644) (index 6e7db52..c443db4)
... ... function rg_plan_edit_high_level($db, &$rg)
305 305 else else
306 306 $id = 0; $id = 0;
307 307
308 if ($id > 0) {
309 $db_pi = rg_plan_info($db, $id);
310 if ($db_pi['exists'] != 1) {
311 $ret .= rg_warning('Invalid plan.');
312 return $ret;
313 }
314 }
315
308 316 $ret = ""; $ret = "";
309 317 $pi = array(); $pi = array();
310 318
311 319 if ($rg['doit'] == 0) { if ($rg['doit'] == 0) {
312 320 if ($id > 0) { if ($id > 0) {
313 $pi = rg_plan_info($db, $id);
314 if ($pi['exists'] != 1) {
315 $ret .= rg_warning("Invalid plan.");
316 return $ret;
317 }
321 $pi = $db_pi;
318 322 } else { } else {
319 323 // Defaults // Defaults
320 324 $pi['id'] = 0; $pi['id'] = 0;
 
... ... function rg_plan_edit_high_level($db, &$rg)
332 336
333 337 $errmsg = array(); $errmsg = array();
334 338 $load_form = TRUE; $load_form = TRUE;
335 while (1) {
336 if ($rg['doit'] != 1)
337 break;
338
339 $pi = array();
340 if ($id > 0)
339 while ($rg['doit'] == 1) {
340 if ($id > 0) {
341 341 $pi['id'] = $id; $pi['id'] = $id;
342 else
342 } else {
343 343 $pi['id'] = rg_var_uint("pi::id"); $pi['id'] = rg_var_uint("pi::id");
344 }
344 345 $pi['name'] = rg_var_str("pi::name"); $pi['name'] = rg_var_str("pi::name");
345 346 $pi['description'] = trim(rg_var_str("pi::description")); $pi['description'] = trim(rg_var_str("pi::description"));
346 347 $pi['disk_mb'] = rg_var_uint("pi::disk_mb"); $pi['disk_mb'] = rg_var_uint("pi::disk_mb");
File inc/user.inc.php changed (mode: 100644) (index c6a9323..c22be30)
... ... function rg_user_edit_high_level($db, $rg)
2107 2107 break; break;
2108 2108 } }
2109 2109
2110 $pi = rg_plan_info($db, $ui['plan_id']);
2111 if ($pi['exists'] != 1) {
2112 $errmsg[] = 'invalid plan';
2113 break;
2114 }
2115
2110 2116 $ui_login = rg_ui_login(); $ui_login = rg_ui_login();
2111 2117 if (($ui_login['is_admin'] != 1) && ($ui['is_admin'] != 0)) { if (($ui_login['is_admin'] != 1) && ($ui['is_admin'] != 0)) {
2112 2118 $errmsg[] = "you are not admin, you cannot give admin rights"; $errmsg[] = "you are not admin, you cannot give admin rights";
File tests/http_settings.php changed (mode: 100644) (index a254b82..35ae6ff)
... ... if ($r === FALSE) {
135 135 } }
136 136 rg_log_exit(); rg_log_exit();
137 137
138 rg_log('');
139 rg_log_enter('Create some fake plans');
140 $sql = 'INSERT INTO plans (id) VALUES (1000)';
141 $res = rg_sql_query($db, $sql);
142 rg_cache_unset('plan::list', 0);
143 rg_log_exit();
144
138 145 rg_log(''); rg_log('');
139 146 rg_log_enter('Posting edit info form'); rg_log_enter('Posting edit info form');
140 147 $session_time = intval($now / 393956); $session_time = intval($now / 393956);
 
... ... $data = array(
144 151 "uid" => 4, "uid" => 4,
145 152 "username" => $rg_ui['username'], "username" => $rg_ui['username'],
146 153 "realname" => $rg_ui['realname'], "realname" => $rg_ui['realname'],
147 "plan_id" => 5,
148 "session_time" => $session_time
149 );
154 'plan_id' => 1000,
155 'session_time' => $session_time);
150 156 $headers = array(); $headers = array();
151 157 $r = do_req($info, $test_url . "/op/settings/edit_info?t=post_edit_info_form", $data, $headers); $r = do_req($info, $test_url . "/op/settings/edit_info?t=post_edit_info_form", $data, $headers);
152 158 if (!strstr($r['body'], "Information has been successfully updated")) { if (!strstr($r['body'], "Information has been successfully updated")) {
 
... ... if (strcmp($rg_ui['realname'], $row['realname']) != 0) {
167 173 rg_log_ml("realname has not been changed: " . print_r($row, TRUE)); rg_log_ml("realname has not been changed: " . print_r($row, TRUE));
168 174 exit(1); exit(1);
169 175 } }
170 if ($row['plan_id'] != 5) {
176 if ($row['plan_id'] != 1000) {
171 177 rg_log_ml('r: ' . print_r($r, TRUE)); rg_log_ml('r: ' . print_r($r, TRUE));
172 rg_log_ml("plan_id has not been changed: " . print_r($row, TRUE));
178 rg_log_ml("plan_id has not been changed to 1000: " . print_r($row, TRUE));
173 179 exit(1); exit(1);
174 180 } }
175 181 if ($row['session_time'] != $session_time) { if ($row['session_time'] != $session_time) {
Hints:
Before first commit, do not forget to setup your git environment:
git config --global user.name "your_name_here"
git config --global user.email "your@email_here"

Clone this repository using HTTP(S):
git clone https://rocketgit.com/user/catalinux/rocketgit

Clone this repository using ssh (do not forget to upload a key first):
git clone ssh://rocketgit@ssh.rocketgit.com/user/catalinux/rocketgit

Clone this repository using git:
git clone git://git.rocketgit.com/user/catalinux/rocketgit

You are allowed to anonymously push to this repository.
This means that your pushed commits will automatically be transformed into a merge request:
... clone the repository ...
... make some changes and some commits ...
git push origin main