Permalink
Browse files

Misc fixes; full test set passes again; RC4

  • Loading branch information...
1 parent 94c58ad commit 9eb960883fa3fc7c74e19cea6f302695f33109e2 @chrisgraham committed Apr 12, 2012
Showing with 195 additions and 163 deletions.
  1. +2 −0 .gitignore
  2. +1 −1 _tests/codechecker/code_quality.php
  3. +1 −1 _tests/codechecker/lib.php
  4. +1 −1 _tests/tests/unit_tests/cqc__function_sigs.php
  5. +1 −1 _tests/tests/unit_tests/cqc_adminzone.php
  6. +1 −1 _tests/tests/unit_tests/cqc_blocks.php
  7. +1 −1 _tests/tests/unit_tests/cqc_cms.php
  8. +1 −1 _tests/tests/unit_tests/cqc_collaboration.php
  9. +1 −1 _tests/tests/unit_tests/cqc_database.php
  10. +1 −1 _tests/tests/unit_tests/cqc_forum.php
  11. +1 −1 _tests/tests/unit_tests/cqc_forumdrivers.php
  12. +1 −1 _tests/tests/unit_tests/cqc_hooks.php
  13. +1 −1 _tests/tests/unit_tests/cqc_rest.php
  14. +1 −1 _tests/tests/unit_tests/cqc_site.php
  15. +1 −1 _tests/tests/unit_tests/cqc_sources.php
  16. +1 −1 _tests/tests/unit_tests/cqc_welcome.php
  17. +1 −1 _tests/tests/unit_tests/lang.php
  18. +16 −13 adminzone/pages/modules/admin_config.php
  19. +3 −1 adminzone/pages/modules/admin_staff.php
  20. +4 −2 cms/pages/modules/cms_catalogues.php
  21. +3 −1 collaboration/pages/modules/supermembers.php
  22. +2 −2 data_custom/addon_files.txt
  23. +2 −2 data_custom/functions.dat
  24. +1 −0 lang/EN/global.ini
  25. +0 −1 lang/EN/news.ini
  26. +23 −29 ocportal-git.tmproj
  27. +1 −2 rootkit_detection.php
  28. +3 −1 site/pages/modules/staff.php
  29. +1 −1 site/pages/modules/tester.php
  30. +13 −12 sources/catalogues2.php
  31. +2 −2 sources/comcode_renderer.php
  32. +2 −1 sources/hooks/blocks/main_staff_checklist/blog.php
  33. +3 −0 sources/hooks/systems/addon_registry/catalogues.php
  34. +1 −1 sources/hooks/systems/addon_registry/cedi.php
  35. +5 −5 sources/hooks/systems/addon_registry/galleries.php
  36. +2 −2 sources/hooks/systems/addon_registry/ocf_forum.php
  37. +2 −0 sources/hooks/systems/addon_registry/syndication.php
  38. +6 −0 sources/hooks/systems/addon_registry/themewizard.php
  39. +36 −36 sources/hooks/systems/ecommerce_via/paypal.php
  40. +1 −1 sources/inst_special.php
  41. +4 −6 sources/minikernel.php
  42. +8 −6 sources/notifications.php
  43. +2 −2 sources/site2.php
  44. +2 −2 sources/submit.php
  45. +1 −0 sources/support.php
  46. +1 −1 sources/users_active_actions.php
  47. +1 −1 sources/version.php
  48. +2 −1 sources_custom/activities_submission.php
  49. +2 −0 sources_custom/hooks/systems/cron/classifieds.php
  50. +10 −4 sources_custom/hooks/systems/cron/group_points.php
  51. +3 −0 sources_custom/hooks/systems/ecommerce/classifieds.php
  52. +2 −2 sources_custom/site2.php
  53. +1 −1 themes/Eco-theme/css_custom/search.css
  54. +1 −1 themes/default/templates/FORM_SCREEN_INPUT_TREE_LIST.tpl
  55. +1 −1 themes/default/templates/INSTALLER_WRAP.tpl
  56. +2 −2 themes/default/templates/NOTIFICATION_BUTTONS.tpl
  57. +1 −1 themes/default/templates/SUPPORT_TICKETS_SCREEN.tpl
  58. +1 −1 themes/default/templates_custom/POINTS_GIVE.tpl
View
@@ -18,3 +18,5 @@ html_custom
spelling
data_custom/modules/chat/*.dat
themes/default/images_custom/*logo.png
+screens_tested
+html_dump
@@ -688,7 +688,7 @@
$avoid=array();
if (isset($_GET['avoid']))
$avoid=explode(',',$_GET['avoid']);
- $files=do_dir($OCPORTAL_PATH.(isset($_GET['subdir'])?('/'.$_GET['subdir']):''),true,$avoid);
+ $files=do_dir($OCPORTAL_PATH.(isset($_GET['subdir'])?('/'.$_GET['subdir']):''),true,false,$avoid);
$start=isset($_GET['start'])?intval($_GET['start']):0;
foreach ($files as $i=>$to_use)
{
@@ -67,7 +67,7 @@ function do_dir($dir,$no_custom=false,$orig_priority=false,$avoid=NULL)
{
while (($file=readdir($dh))!==false)
{
- if ((!is_null($avoid)) && (in_array($avoid,$file))) continue;
+ if ((!is_null($avoid)) && (in_array($file,$avoid))) continue;
if (((strpos($file,'_custom')!==false) || ($file=='_tests') || ($file=='ocworld')) && ($no_custom)) continue;
if ($file[0]!='.')
@@ -26,7 +26,7 @@ class cqc__function_sigs_test_set extends ocp_test_case
function testAdminZone()
{
$result=http_download_file(get_base_url().'/_tests/codechecker/phpdoc_parser.php',NULL,true,false,'ocPortal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,10000.0);
- foreach (explode(chr(10),$result) as $line)
+ foreach (explode('<br />',$result) as $line)
$this->assertTrue((trim($line)=='' || substr($line,0,4)=='Done' || substr($line,0,6)=='FINAL ' || strpos($line,'TODO')!==false || strpos($line,'HACKHACK')!==false),$line);
}
}
@@ -26,7 +26,7 @@ class cqc_adminzone_test_set extends ocp_test_case
function testAdminZone()
{
$result=http_download_file(get_base_url().'/_tests/codechecker/code_quality.php?subdir=adminzone&api=1',NULL,true,false,'ocPortal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,10000.0);
- foreach (explode(chr(10),$result) as $line)
+ foreach (explode('<br />',$result) as $line)
$this->assertTrue((trim($line)=='' || substr($line,0,5)=='SKIP:' || substr($line,0,5)=='DONE ' || substr($line,0,6)=='FINAL ' || strpos($line,'TODO')!==false || strpos($line,'HACKHACK')!==false),$line);
}
}
@@ -26,7 +26,7 @@ class cqc_blocks_test_set extends ocp_test_case
function testBlocks()
{
$result=http_download_file(get_base_url().'/_tests/codechecker/code_quality.php?subdir=sources/blocks&api=1',NULL,true,false,'ocPortal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,10000.0);
- foreach (explode(chr(10),$result) as $line)
+ foreach (explode('<br />',$result) as $line)
$this->assertTrue((trim($line)=='' || substr($line,0,5)=='SKIP:' || substr($line,0,5)=='DONE ' || substr($line,0,6)=='FINAL ' || strpos($line,'TODO')!==false || strpos($line,'HACKHACK')!==false),$line);
}
}
@@ -26,7 +26,7 @@ class cqc_cms_test_set extends ocp_test_case
function testCMS()
{
$result=http_download_file(get_base_url().'/_tests/codechecker/code_quality.php?subdir=cms&api=1',NULL,true,false,'ocPortal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,10000.0);
- foreach (explode(chr(10),$result) as $line)
+ foreach (explode('<br />',$result) as $line)
$this->assertTrue((trim($line)=='' || substr($line,0,5)=='SKIP:' || substr($line,0,5)=='DONE ' || substr($line,0,6)=='FINAL ' || strpos($line,'TODO')!==false || strpos($line,'HACKHACK')!==false),$line);
}
}
@@ -26,7 +26,7 @@ class cqc_collaboration_test_set extends ocp_test_case
function testCollaboration()
{
$result=http_download_file(get_base_url().'/_tests/codechecker/code_quality.php?subdir=collaboration&api=1',NULL,true,false,'ocPortal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,10000.0);
- foreach (explode(chr(10),$result) as $line)
+ foreach (explode('<br />',$result) as $line)
$this->assertTrue((trim($line)=='' || substr($line,0,5)=='SKIP:' || substr($line,0,5)=='DONE ' || substr($line,0,6)=='FINAL ' || strpos($line,'TODO')!==false || strpos($line,'HACKHACK')!==false),$line);
}
}
@@ -26,7 +26,7 @@ class cqc_database_test_set extends ocp_test_case
function testDatabase()
{
$result=http_download_file(get_base_url().'/_tests/codechecker/code_quality.php?subdir=sources/database&api=1',NULL,true,false,'ocPortal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,10000.0);
- foreach (explode(chr(10),$result) as $line)
+ foreach (explode('<br />',$result) as $line)
$this->assertTrue((trim($line)=='' || substr($line,0,5)=='SKIP:' || substr($line,0,5)=='DONE ' || substr($line,0,6)=='FINAL ' || strpos($line,'TODO')!==false || strpos($line,'HACKHACK')!==false),$line);
}
}
@@ -26,7 +26,7 @@ class cqc_forum_test_set extends ocp_test_case
function testForum()
{
$result=http_download_file(get_base_url().'/_tests/codechecker/code_quality.php?subdir=forum&api=1',NULL,true,false,'ocPortal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,10000.0);
- foreach (explode(chr(10),$result) as $line)
+ foreach (explode('<br />',$result) as $line)
$this->assertTrue((trim($line)=='' || substr($line,0,5)=='SKIP:' || substr($line,0,5)=='DONE ' || substr($line,0,6)=='FINAL ' || strpos($line,'TODO')!==false || strpos($line,'HACKHACK')!==false),$line);
}
}
@@ -26,7 +26,7 @@ class cqc_forumdrivers_test_set extends ocp_test_case
function testForumDrivers()
{
$result=http_download_file(get_base_url().'/_tests/codechecker/code_quality.php?subdir=sources/forum&api=1',NULL,true,false,'ocPortal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,10000.0);
- foreach (explode(chr(10),$result) as $line)
+ foreach (explode('<br />',$result) as $line)
$this->assertTrue((trim($line)=='' || substr($line,0,5)=='SKIP:' || substr($line,0,5)=='DONE ' || substr($line,0,6)=='FINAL ' || strpos($line,'TODO')!==false || strpos($line,'HACKHACK')!==false),$line);
}
}
@@ -26,7 +26,7 @@ class cqc_hooks_test_set extends ocp_test_case
function testHooks()
{
$result=http_download_file(get_base_url().'/_tests/codechecker/code_quality.php?subdir=sources/hooks&api=1',NULL,true,false,'ocPortal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,10000.0);
- foreach (explode(chr(10),$result) as $line)
+ foreach (explode('<br />',$result) as $line)
$this->assertTrue((trim($line)=='' || substr($line,0,5)=='SKIP:' || substr($line,0,5)=='DONE ' || substr($line,0,6)=='FINAL ' || strpos($line,'TODO')!==false || strpos($line,'HACKHACK')!==false),$line);
}
}
@@ -26,7 +26,7 @@ class cqc_rest_test_set extends ocp_test_case
function testRest()
{
$result=http_download_file(get_base_url().'/_tests/codechecker/code_quality.php?avoid=sources,site,adminzone,collaboration,cms,forum,pages&api=1',NULL,true,false,'ocPortal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,10000.0);
- foreach (explode(chr(10),$result) as $line)
+ foreach (explode('<br />',$result) as $line)
$this->assertTrue((trim($line)=='' || substr($line,0,5)=='SKIP:' || substr($line,0,5)=='DONE ' || substr($line,0,6)=='FINAL ' || strpos($line,'TODO')!==false || strpos($line,'HACKHACK')!==false),$line);
}
}
@@ -26,7 +26,7 @@ class cqc_site_test_set extends ocp_test_case
function testSite()
{
$result=http_download_file(get_base_url().'/_tests/codechecker/code_quality.php?subdir=site&api=1',NULL,true,false,'ocPortal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,10000.0);
- foreach (explode(chr(10),$result) as $line)
+ foreach (explode('<br />',$result) as $line)
$this->assertTrue((trim($line)=='' || substr($line,0,5)=='SKIP:' || substr($line,0,5)=='DONE ' || substr($line,0,6)=='FINAL ' || strpos($line,'TODO')!==false || strpos($line,'HACKHACK')!==false),$line);
}
}
@@ -26,7 +26,7 @@ class cqc_sources_test_set extends ocp_test_case
function testSources()
{
$result=http_download_file(get_base_url().'/_tests/codechecker/code_quality.php?subdir=sources&avoid=forum,database,hooks,blocks&api=1',NULL,true,false,'ocPortal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,10000.0);
- foreach (explode(chr(10),$result) as $line)
+ foreach (explode('<br />',$result) as $line)
$this->assertTrue((trim($line)=='' || substr($line,0,5)=='SKIP:' || substr($line,0,5)=='DONE ' || substr($line,0,6)=='FINAL ' || strpos($line,'TODO')!==false || strpos($line,'HACKHACK')!==false),$line);
}
}
@@ -26,7 +26,7 @@ class cqc_welcome_test_set extends ocp_test_case
function testWelcome()
{
$result=http_download_file(get_base_url().'/_tests/codechecker/code_quality.php?subdir=pages&api=1',NULL,true,false,'ocPortal',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,10000.0);
- foreach (explode(chr(10),$result) as $line)
+ foreach (explode('<br />',$result) as $line)
$this->assertTrue((trim($line)=='' || substr($line,0,5)=='SKIP:' || substr($line,0,5)=='DONE ' || substr($line,0,6)=='FINAL ' || strpos($line,'TODO')!==false || strpos($line,'HACKHACK')!==false),$line);
}
}
@@ -67,7 +67,7 @@ function testLangMistakes()
if($this->str_ipos($string,'ID\'s')!==false) $this->assertTrue(false,'The term \'ID\'s\' was used in '.$file.'. This should be changed to \'IDs\'.');
if($this->str_ipos($string,'comma separated')!==false) $this->assertTrue(false,'The phrase \'comma separated\' was used in '.$file.'. This should be changed to \'comma-separated\'.');
//if($this->str_ipos($string,'center')!==false) $this->assertTrue(false,'The word \'center\' was used in '.$file.'. This should be changed to \'centre\'.');
- if($file!='upgrade.ini' && $key!='NO_PHP_IN_TEMPLATES' && $key!='WHAT_TO_EXPECT' && $key!='DESCRIPTION_INCLUDE_OCP_ADVERT' && $key!='INCLUDE_OCP_ADVERT' && $key!='UNINSTALL_WARNING' && $key!='OCP_CHAT_EXTRA' && (strpos($key,'SETUP_WIZARD')===false) && $file!='lang.ini' && $file!='recommend.ini' && $file!='version.ini' && $file!='tips.ini' && $file!='debrand.ini' && $file!='import.ini' && $file!='installer.ini' && $file!='occle.ini' && $file!='addons.ini' && $this->str_ipos($string,'ocPortal')!==false)
+ if($file!='upgrade.ini' && $key!='NO_PHP_IN_TEMPLATES' && $key!='WHAT_TO_EXPECT' && $key!='DESCRIPTION_INCLUDE_OCP_ADVERT' && $key!='INCLUDE_OCP_ADVERT' && $key!='UNINSTALL_WARNING' && $key!='OCP_CHAT_EXTRA' && (strpos($key,'SETUP_WIZARD')===false) && $file!='lang.ini' && $file!='recommend.ini' && $file!='version.ini' && $file!='tips.ini' && $file!='debrand.ini' && $file!='import.ini' && $file!='installer.ini' && $file!='occle.ini' && $file!='addons.ini' && strpos($string,'ocPortal')!==false)
$this->assertTrue(false,'The word \'ocPortal\' was used in '.$file.'. This should probably be changed to \'the software\'.');
if(preg_match('#([^A-Za-z"\_]+)comcode([^A-Za-z"]+)#',$string)!=0) $this->assertTrue(false,'The term \'comcode\' was used in '.$file.'. This should be changed to \'Comcode\'.');
@@ -798,21 +798,24 @@ function config_set()
if (($new_site_name!='') && (get_option('is_on_sync_staff',true)==='1'))
{
$admin_groups=array_merge($GLOBALS['FORUM_DRIVER']->get_super_admin_groups(),$GLOBALS['FORUM_DRIVER']->get_moderator_groups());
- $staff=$GLOBALS['FORUM_DRIVER']->member_group_query($admin_groups);
- foreach ($staff as $row_staff)
+ $staff=$GLOBALS['FORUM_DRIVER']->member_group_query($admin_groups,100);
+ if (count($staff)<100)
{
- $member=$GLOBALS['FORUM_DRIVER']->pname_id($row_staff);
- if ($GLOBALS['FORUM_DRIVER']->is_staff($member))
+ foreach ($staff as $row_staff)
{
- $sites=get_ocp_cpf('sites');
- $sites=str_replace(', '.get_site_name(),'',$sites);
- $sites=str_replace(','.get_site_name(),'',$sites);
- $sites=str_replace(get_site_name().', ','',$sites);
- $sites=str_replace(get_site_name().',','',$sites);
- $sites=str_replace(get_site_name(),'',$sites);
- if ($sites!='') $sites.=', ';
- $sites.=$new_site_name;
- $GLOBALS['FORUM_DRIVER']->set_custom_field($member,'sites',$sites);
+ $member=$GLOBALS['FORUM_DRIVER']->pname_id($row_staff);
+ if ($GLOBALS['FORUM_DRIVER']->is_staff($member))
+ {
+ $sites=get_ocp_cpf('sites');
+ $sites=str_replace(', '.get_site_name(),'',$sites);
+ $sites=str_replace(','.get_site_name(),'',$sites);
+ $sites=str_replace(get_site_name().', ','',$sites);
+ $sites=str_replace(get_site_name().',','',$sites);
+ $sites=str_replace(get_site_name(),'',$sites);
+ if ($sites!='') $sites.=', ';
+ $sites.=$new_site_name;
+ $GLOBALS['FORUM_DRIVER']->set_custom_field($member,'sites',$sites);
+ }
}
}
}
@@ -128,7 +128,9 @@ function staff_interface()
if (get_option('is_on_staff_filter')=='0') $text=do_lang_tempcode('STAFF_FILTER_OFF'); else $text=do_lang_tempcode('STAFF_FILTER_ON');
$admin_groups=array_merge($GLOBALS['FORUM_DRIVER']->get_super_admin_groups(),$GLOBALS['FORUM_DRIVER']->get_moderator_groups());
- $staff=$GLOBALS['FORUM_DRIVER']->member_group_query($admin_groups);
+ $staff=$GLOBALS['FORUM_DRIVER']->member_group_query($admin_groups,400);
+ if (count($staff)>=400)
+ warn_exit(do_lang_tempcode('TOO_MANY_TO_CHOOSE_FROM'));
$available=new ocp_tempcode();
require_code('form_templates');
foreach ($staff as $row_staff)
@@ -569,7 +569,8 @@ function add_actualisation()
{
if ((has_actual_page_access($GLOBALS['FORUM_DRIVER']->get_guest_id(),'catalogues')) && (has_category_access($GLOBALS['FORUM_DRIVER']->get_guest_id(),'catalogues_catalogue',$catalogue_name)) && (has_category_access($GLOBALS['FORUM_DRIVER']->get_guest_id(),'catalogues_category',strval($category_id))))
{
- $title=array_shift($map);
+ $map_copy=$map;
+ $title=array_shift($map_copy);
$catalogue_title=get_translated_text($GLOBALS['SITE_DB']->query_value('catalogues','c_title',array('c_name'=>$catalogue_name)));
syndicate_described_activity('catalogues:ACTIVITY_CATALOGUE_GENERIC_ADD',$catalogue_title,$title,'','_SEARCH:catalogues:entry:'.strval($id),'','','catalogues');
}
@@ -607,7 +608,8 @@ function edit_actualisation($_id)
{
if ((has_actual_page_access($GLOBALS['FORUM_DRIVER']->get_guest_id(),'catalogues')) && (has_category_access($GLOBALS['FORUM_DRIVER']->get_guest_id(),'catalogues_catalogue',$catalogue_name)) && (has_category_access($GLOBALS['FORUM_DRIVER']->get_guest_id(),'catalogues_category',strval($category_id))))
{
- $title=array_shift($map);
+ $map_copy=$map;
+ $title=array_shift($map_copy);
$catalogue_title=get_translated_text($GLOBALS['SITE_DB']->query_value('catalogues','c_title',array('c_name'=>$catalogue_name)));
syndicate_described_activity('catalogues:ACTIVITY_CATALOGUE_GENERIC_ADD',$catalogue_title,$title,'','_SEARCH:catalogues:entry:'.strval($id),'','','catalogues');
}
@@ -105,7 +105,9 @@ function run()
$supermember_groups=collapse_1d_complexity('group_id',$GLOBALS['SITE_DB']->query_select('group_zone_access',array('group_id'),array('zone_name'=>get_zone_name())));
$supermember_groups=array_merge($supermember_groups,$GLOBALS['FORUM_DRIVER']->get_super_admin_groups());
- $rows=$GLOBALS['FORUM_DRIVER']->member_group_query($supermember_groups);
+ $rows=$GLOBALS['FORUM_DRIVER']->member_group_query($supermember_groups,1000);
+ if (count($rows)>=1000)
+ warn_exit(do_lang_tempcode('TOO_MANY_TO_CHOOSE_FROM'));
$all_usergroups=$GLOBALS['FORUM_DRIVER']->get_usergroup_list();
// Calculate
@@ -2281,8 +2281,8 @@ theme_debug
cleanup_repository
------------------
- - find_files_in_uninstall_addons.php
- - remove_junk.sh
+ - data_custom/find_files_in_uninstall_addons.php
+ - killjunk.sh
booking
-------
Oops, something went wrong.
View
@@ -931,3 +931,4 @@ SHOW_COMMENTS=Show {1} {1|reply|replies}
LIKED_BY=Liked by
THREADED_REPLY_NOTICE=To reply to an existing post use the reply/quote button under it. Type fresh posts here when not replying to any existing post.\n\n{1}
QUOTED_REPLY_MESSAGE=Click to type your reply to {1}'s message, which was:\n\n{2}
+READ_MORE=Read more
View
@@ -43,7 +43,6 @@ CONFIG_OPTION_points_ADD_NEWS=The number of points awarded for adding news/blog
MANAGE_NEWS=Manage news
MANAGE_BLOGS=Manage blogs
POSTED_TIME=Posted {1}
-READ_MORE=Read more
BLOG=Blog
BLOGS=Blogs
NONBLOG_CATEGORIES=Non-blog categories
View
@@ -2,6 +2,8 @@
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
+ <key>currentDocument</key>
+ <string>data_custom/addon_files.txt</string>
<key>documents</key>
<array>
<dict>
@@ -637,33 +639,35 @@
<key>firstVisibleLine</key>
<integer>0</integer>
</dict>
- <key>data/securityimage.php</key>
+ <key>data_custom/addon_files.txt</key>
<dict>
<key>caret</key>
<dict>
<key>column</key>
- <integer>0</integer>
+ <integer>14</integer>
<key>line</key>
- <integer>0</integer>
+ <integer>2284</integer>
</dict>
+ <key>columnSelection</key>
+ <false/>
<key>firstVisibleColumn</key>
<integer>0</integer>
<key>firstVisibleLine</key>
- <integer>6</integer>
- </dict>
- <key>data_custom/errorlog.php</key>
- <dict>
- <key>caret</key>
+ <integer>2258</integer>
+ <key>selectFrom</key>
<dict>
<key>column</key>
- <integer>0</integer>
+ <integer>3</integer>
<key>line</key>
- <integer>0</integer>
+ <integer>2284</integer>
+ </dict>
+ <key>selectTo</key>
+ <dict>
+ <key>column</key>
+ <integer>14</integer>
+ <key>line</key>
+ <integer>2284</integer>
</dict>
- <key>firstVisibleColumn</key>
- <integer>0</integer>
- <key>firstVisibleLine</key>
- <integer>0</integer>
</dict>
<key>data_custom/jabber-logs/.htaccess</key>
<dict>
@@ -995,20 +999,6 @@
<key>firstVisibleLine</key>
<integer>247</integer>
</dict>
- <key>site/pages/modules/catalogues.php</key>
- <dict>
- <key>caret</key>
- <dict>
- <key>column</key>
- <integer>41</integer>
- <key>line</key>
- <integer>949</integer>
- </dict>
- <key>firstVisibleColumn</key>
- <integer>0</integer>
- <key>firstVisibleLine</key>
- <integer>894</integer>
- </dict>
<key>sources/backup.php</key>
<dict>
<key>caret</key>
@@ -2808,9 +2798,13 @@
<integer>0</integer>
</dict>
</dict>
+ <key>openDocuments</key>
+ <array>
+ <string>data_custom/addon_files.txt</string>
+ </array>
<key>showFileHierarchyDrawer</key>
<true/>
<key>windowFrame</key>
- <string>{{493, 216}, {966, 879}}</string>
+ <string>{{379, 158}, {966, 879}}</string>
</dict>
</plist>
View
@@ -271,10 +271,9 @@ function rd_do_footer()
* Check the given master password is valid.
*
* @param SHORT_TEXT Given master password
- * @param SHORT_TEXT Actual master password
* @return boolean Whether it is valid
*/
-function rk_check_master_password($password_given,$password)
+function rk_check_master_password($password_given)
{
global $SITE_INFO;
if (!array_key_exists('admin_password',$SITE_INFO)) exit('No master password defined in info.php currently so cannot authenticate');
@@ -98,7 +98,9 @@ function do_all_staff()
$title=get_page_title('STAFF_TITLE',true,array(escape_html(get_site_name())));
$admin_groups=array_merge($GLOBALS['FORUM_DRIVER']->get_super_admin_groups(),$GLOBALS['FORUM_DRIVER']->get_moderator_groups());
- $rows=$GLOBALS['FORUM_DRIVER']->member_group_query($admin_groups);
+ $rows=$GLOBALS['FORUM_DRIVER']->member_group_query($admin_groups,400);
+ if (count($rows)>=400)
+ warn_exit(do_lang_tempcode('TOO_MANY_TO_CHOOSE_FROM'));
$pre=do_lang_tempcode('PRE_STAFF');
@@ -367,7 +367,7 @@ function get_tester_list($it)
$groups=array_unique(array_merge($tester_groups,$admin_groups,$moderator_groups));
- $members=$GLOBALS['FORUM_DRIVER']->member_group_query($groups);
+ $members=$GLOBALS['FORUM_DRIVER']->member_group_query($groups,2000);
$list=form_input_list_entry('-1',is_null($it),do_lang_tempcode('NA_EM'));
foreach ($members as $member=>$details)
Oops, something went wrong.

0 comments on commit 9eb9608

Please sign in to comment.