Skip to content

Commit a7f1302

Browse files
committed
WIP: Remove Standard and Enhanced Interfaces
TODO: * testing! * update faq/proofreadhelp.php for the new PI
1 parent 856aed1 commit a7f1302

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+95
-5903
lines changed

SETUP/ci/check_require_login.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@
5555
"styles/design_philosophy.php",
5656
// Tools
5757
"tools/setlangcookie.php", // allows unauth users to set their language
58-
"tools/proofers/ctrl_frame.php", // required for unauth quiz access
5958
// Dev tools
6059
".php-cs-fixer.dist.php",
6160
];

SETUP/db_schema.sql

Lines changed: 0 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -542,36 +542,6 @@ CREATE TABLE `user_filters` (
542542
PRIMARY KEY (`username`,`filtertype`)
543543
);
544544

545-
--
546-
-- Table structure for table `user_profiles`
547-
--
548-
549-
CREATE TABLE `user_profiles` (
550-
`id` int(10) unsigned NOT NULL auto_increment,
551-
`u_ref` int(10) unsigned NOT NULL default '0',
552-
`profilename` varchar(30) NOT NULL default 'default',
553-
`i_type` tinyint(1) default '0',
554-
`i_layout` tinyint(1) default '0',
555-
`v_fnts` tinyint(2) default '0',
556-
`v_fntf` tinyint(1) default '2',
557-
`v_fntf_other` varchar(32) default '',
558-
`v_tframe` tinyint(2) default '50',
559-
`v_tlines` tinyint(2) unsigned default '40',
560-
`v_tchars` tinyint(2) unsigned default '65',
561-
`v_tscroll` tinyint(1) default '1',
562-
`v_twrap` tinyint(1) default '0',
563-
`h_fnts` tinyint(2) default '0',
564-
`h_fntf` tinyint(1) default '2',
565-
`h_fntf_other` varchar(32) default '',
566-
`h_tframe` tinyint(2) default '35',
567-
`h_tlines` tinyint(2) unsigned default '6',
568-
`h_tchars` tinyint(2) unsigned default '70',
569-
`h_tscroll` tinyint(1) default '1',
570-
`h_twrap` tinyint(1) default '0',
571-
PRIMARY KEY (`id`),
572-
KEY `u_ref` (`u_ref`)
573-
);
574-
575545
--
576546
-- Table structure for table `user_project_info`
577547
--
@@ -648,7 +618,6 @@ CREATE TABLE `users` (
648618
`u_align` tinyint(1) NOT NULL default '0',
649619
`i_theme` varchar(100) NOT NULL default 'project_gutenberg',
650620
`u_id` int(10) unsigned NOT NULL auto_increment,
651-
`u_profile` int(10) unsigned NOT NULL default '0',
652621
`u_intlang` varchar(25) default '',
653622
`u_privacy` tinyint(1) default '0',
654623
`api_key` varchar(38) DEFAULT NULL,

SETUP/devex/dpdev-docker/dp_db.sql

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,10 +46,8 @@ INSERT INTO `project_events` VALUES (1,1451401587,'projectID5682a1735f76a','pm',
4646

4747
INSERT INTO `projects` VALUES ('Demonology','Doe, John','English','pm','Match the scan, man!','html','projectID5682a1735f76a','','proofer',1451401669,1458275991,1451401587,1599454842,'','P1.proj_avail',NULL,'testingonly',NULL,1,'Other','average',0,'','',33,32,NULL,'_internal','pm','pm','',0,'','');
4848

49-
INSERT INTO `user_profiles` VALUES (1,1,'default',0,0,0,0,'',50,40,65,1,0,0,0,'',35,6,70,1,0),(2,2,'default',0,0,0,0,'',50,40,65,1,0,0,0,'',35,6,70,1,0),(3,3,'default',0,0,0,2,'',50,40,65,1,0,0,0,'',35,6,70,1,0);
50-
5149
INSERT INTO `user_project_info` VALUES ('proofer','projectID5682a1735f76a',1599454853,1599454842,0,0,0,0,0,0,0,0,0);
5250

53-
INSERT INTO `users` VALUES ('userID9f3b0f2cb891c25ffd036d11a678abce','Admin','admin','admin@localhost',1446834642,1599108129,1599108129,1,'','','',10,0,'project_gutenberg',1,1,'is_IS',0,NULL,1),('userID8dd8829eb52045889dc71ebc0920d929','Project Manager','pm','pm@localhost',1446834908,1717990305,1717990305,1,'','','',10,0,'project_gutenberg',2,2,'en_US',0,NULL,1),('userID3757fbb62df1454bff56b6f3aae608dd','Proofer','proofer','proofer@localhost',1451401482,1717996545,1717996545,1,'','','',10,0,'project_gutenberg',3,3,'en_EN',0,NULL,1);
51+
INSERT INTO `users` VALUES ('userID9f3b0f2cb891c25ffd036d11a678abce','Admin','admin','admin@localhost',1446834642,1599108129,1599108129,1,'','','',10,0,'project_gutenberg',1,'is_IS',0,NULL,1),('userID8dd8829eb52045889dc71ebc0920d929','Project Manager','pm','pm@localhost',1446834908,1717990305,1717990305,1,'','','',10,0,'project_gutenberg',2,'en_US',0,NULL,1),('userID3757fbb62df1454bff56b6f3aae608dd','Proofer','proofer','proofer@localhost',1451401482,1717996545,1717996545,1,'','','',10,0,'project_gutenberg',3,'en_EN',0,NULL,1);
5452

5553
INSERT INTO `usersettings` VALUES ('admin','credit_name','real_name'),('admin','search:PM.sort','stateA'),('admin','search:PM.sort_sec','title'),('admin','sitemanager','yes'),('pm','manager','yes'),('pm','my_projects:pool_sort','titleA'),('pm','my_projects:pool_view','reserved'),('pm','my_projects:round_sort','timeD'),('pm','my_projects:round_view','recent'),('pm','pm_view','user_all'),('pm','search:PM.sort','stateA'),('pm','search:PM.sort_sec','title'),('proofer','credit_name','real_name'),('proofer','credit_other',''),('proofer','my_projects:pool_sort','titleA'),('proofer','my_projects:pool_view','reserved'),('proofer','my_projects:round_sort','timeD'),('proofer','my_projects:round_view','available'),('proofer','pm_anonymous','yes');

SETUP/tests/jsTests/dp_proofTests.js

Lines changed: 0 additions & 116 deletions
This file was deleted.

SETUP/tests/jsTests/qunit.html

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,14 @@
1414
</script>
1515
<script src="../../../node_modules/qunit/qunit/qunit.js"></script>
1616
<script src="../../../node_modules/jquery/dist/jquery.min.js"></script>
17-
<script src="../../../tools/proofers/srchrep.js"></script>
1817
<script src="../../../accounts/addproofer.js"></script>
19-
<script src="../../../tools/proofers/dp_proof.js"></script>
2018
<script src="../../../scripts/misc.js"></script>
2119

2220
<!-- tests -->
2321
<script src="./characterValidation.js" type="module"></script>
2422
<script src="./splitControlTests.js" type="module"></script>
2523
<script src="./formatPreviewTests.js" type="module"></script>
26-
<script src="./srchrepTests.js"></script>
2724
<script src="./addprooferTests.js"></script>
28-
<script src="./dp_proofTests.js"></script>
2925
<script src="./ajaxTests.js" type="module"></script>
3026
</body>
3127
</html>

SETUP/tests/jsTests/srchrepTests.js

Lines changed: 0 additions & 110 deletions
This file was deleted.

SETUP/tests/smoketests/pageload_smoketest.py

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
{'path': 'quiz/generic/hints.php?quiz_page_id=p_basicx_2&error=arid&number=1'},
9292
{'path': 'quiz/generic/main.php?quiz_page_id=p_basic_1'},
9393
{'path': 'quiz/generic/orig.php?quiz_page_id=p_basic_2'},
94-
{'path': 'quiz/generic/proof.php?quiz_page_id=p_basic_3'},
9594
{'path': 'quiz/generic/returnfeed.php?quiz_page_id=p_thorn'},
9695
{'path': 'quiz/generic/right.php?quiz_page_id=p_fraktur'},
9796
{'path': 'quiz/generic/wizard/default_messages.php'},
@@ -319,9 +318,6 @@
319318
TOOLS_PROOFERS_TESTS = [
320319
{'path': 'tools/proofers/for_mentors.php?round_id=P3'},
321320
# TODO not installed
322-
{'path': 'tools/proofers/ctrl_frame.php?round_id=P3&project_id=projectID5e23a810ef693'},
323-
{'path': 'tools/proofers/image_frame_std.php?projectid=projectID5e23a810ef693&proj_state=P3.proj_unavail&imagefile=001.png&page_state=P3.page_saved'},
324-
{'path': 'tools/proofers/text_frame_std.php?projectid=projectID5e23a810ef693&proj_state=P3.proj_unavail&imagefile=001.png&page_state=P3.page_saved'},
325321
{'path': 'tools/proofers/images_index.php?project=projectID5e23a810ef693'},
326322
{'path': 'tools/proofers/mktable.php'},
327323
# TODO make non-empty
@@ -336,42 +332,17 @@
336332
{'path': 'tools/proofers/my_suggestions.php?round_view=familiar'},
337333
{'path': 'tools/proofers/my_suggestions.php?round_view=style'},
338334
{'path': 'tools/proofers/my_suggestions.php?round_view=different'},
339-
# TODO make a valid state
340-
{
341-
'method': 'POST',
342-
'path': 'tools/proofers/processtext.php',
343-
'data': {
344-
'projectid': 'projectID5e23a810ef693',
345-
'proj_state': 'P3.proj_unavail',
346-
'imagefile': '001.png',
347-
'page_state': 'P3.page_saved',
348-
'button4': '1', # B_SWITCH_LAYOUT. NB this fails because not P3.page_temp
349-
},
350-
},
351335
# TODO check redirect URL
352336
{
353337
'path': 'tools/proofers/project_topic.php?project=projectID5e23a810ef693',
354338
'expect_status': 302,
355339
},
356340
# TODO proof a valid state
357341
{'path': 'tools/proofers/proof.php?projectid=projectID5e23a810ef693&proj_state=P3.proj_unavail'},
358-
# TODO proof a valid state
359-
{'path': 'tools/proofers/proof_frame.php?projectid=projectID5e23a810ef693&proj_state=P3.proj_unavail'},
360-
{
361-
'method': 'POST',
362-
'path': 'tools/proofers/report_bad_page.php',
363-
'data': {
364-
'projectid': 'projectID5e23a810ef693',
365-
'proj_state': 'P3.proj_unavail',
366-
'imagefile': '001.png',
367-
'page_state': 'P3.page_saved',
368-
},
369-
},
370342
# TODO: Needs page_events or user_project_info entries to exercise properly
371343
{'path': 'tools/proofers/review_work.php?username=teststeel'},
372344
# TODO: Needs projects in P3.proj_avail to exercise properly
373345
{'path': 'tools/proofers/round.php?round_id=P3'},
374-
{'path': 'tools/proofers/srchrep.php'},
375346
]
376347

377348
TOOLS_SITE_ADMIN_TESTS = [

SETUP/tests/smoketests/test_tables.sql

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,13 +10,8 @@ REPLACE INTO `projects` VALUES ('An Empty Project','Fletcher, Jessica','English'
1010
/* `users` rows populated by INSERTs in accounts/activate.php.
1111
* Can't do this programatically yet.
1212
*/
13-
REPLACE INTO `users` VALUES ('userID1234567890abc', 'Adam Adminston', 'admin', '[email protected]', 1234567890, 1234567890, 1234567890, 1, '', '', '', 10, 0, 'project_gutenberg', 1, 110, '', 0, 'admin_key', 1);
14-
REPLACE INTO `users` VALUES ('userID460b20a8a8a71','BKeir','teststeel','teststeel@localhost',1175134376,1175134406,1175134457,1,'','','',10,0,'project_gutenberg',110,119,'en_US',0,NULL,1);
15-
16-
/* $up = new UserProfile(); $up->foo = bar; $up->save(); does not allow new
17-
* profiles to be created with programmatic control of id.
18-
*/
19-
REPLACE INTO `user_profiles` VALUES (110,105,'default',1,1,5,6,'',50,40,65,1,0,5,6,'',35,20,70,1,0);
13+
REPLACE INTO `users` VALUES ('userID1234567890abc', 'Adam Adminston', 'admin', '[email protected]', 1234567890, 1234567890, 1234567890, 1, '', '', '', 10, 0, 'project_gutenberg', 1, '', 0, 'admin_key', 1);
14+
REPLACE INTO `users` VALUES ('userID460b20a8a8a71','BKeir','teststeel','teststeel@localhost',1175134376,1175134406,1175134457,1,'','','',10,0,'project_gutenberg',110,'en_US',0,NULL,1);
2015

2116
/* This can be done with $s = new Settings('admin'); $s->set_true('sitemanager');
2217
* But there's not much point until we can do some of the rest with code.

0 commit comments

Comments
 (0)