Revision 733
Added by thorn over 16 years ago
| trunk/CHANGELOG | ||
|---|---|---|
| 11 | 11 |
! = Update/Change |
| 12 | 12 |
|
| 13 | 13 |
------------------------------------- 2.7.0 ------------------------------------- |
| 14 |
01-Feb-2008 Thomas Hornik |
|
| 14 |
01-Mar-2008 Thomas Hornik |
|
| 15 |
# fixed ticket #562, applied changes from user tavitar with some own additions |
|
| 15 | 16 |
+ added check for AddDefaultCharset to install |
| 16 | 17 |
29-Feb-2008 Thomas Hornik |
| 17 | 18 |
# fixed issue in pagename generation if AddDefaultCharset is set (as work-around). |
| trunk/wb/admin/pages/settings.php | ||
|---|---|---|
| 161 | 161 |
$flag_cursor = 'pointer'; |
| 162 | 162 |
$flag_color = ''; |
| 163 | 163 |
if (in_array($group["group_id"], $admin->get_groups_id())) {
|
| 164 |
$flag_disabled = ' disabled'; |
|
| 165 |
$flag_checked = ' checked'; |
|
| 164 |
$flag_disabled = ''; //' disabled';
|
|
| 165 |
$flag_checked = ''; //' checked';
|
|
| 166 | 166 |
$flag_cursor = 'default'; |
| 167 | 167 |
$flag_color = '000000'; |
| 168 | 168 |
} |
| ... | ... | |
| 217 | 217 |
$flag_cursor = 'pointer'; |
| 218 | 218 |
$flag_color = ''; |
| 219 | 219 |
if (in_array($group["group_id"], $admin->get_groups_id())) {
|
| 220 |
$flag_disabled = ' disabled'; |
|
| 221 |
$flag_checked = ' checked'; |
|
| 220 |
$flag_disabled = ''; //' disabled';
|
|
| 221 |
$flag_checked = ''; //' checked';
|
|
| 222 | 222 |
$flag_cursor = 'default'; |
| 223 | 223 |
$flag_color = '000000'; |
| 224 | 224 |
} |
| trunk/wb/admin/pages/index.php | ||
|---|---|---|
| 415 | 415 |
$flag_cursor = 'pointer'; |
| 416 | 416 |
$flag_color = ''; |
| 417 | 417 |
if (in_array($group["group_id"], $admin->get_groups_id())) {
|
| 418 |
$flag_disabled = ' disabled'; |
|
| 418 |
$flag_disabled = ''; //' disabled';
|
|
| 419 | 419 |
$flag_checked = ' checked'; |
| 420 | 420 |
$flag_cursor = 'default'; |
| 421 | 421 |
$flag_color = '000000'; |
| ... | ... | |
| 464 | 464 |
$flag_cursor = 'pointer'; |
| 465 | 465 |
$flag_color = ''; |
| 466 | 466 |
if (in_array($group["group_id"], $admin->get_groups_id())) {
|
| 467 |
$flag_disabled = ' disabled'; |
|
| 467 |
$flag_disabled = ''; //' disabled';
|
|
| 468 | 468 |
$flag_checked = ' checked'; |
| 469 | 469 |
$flag_cursor = 'default'; |
| 470 | 470 |
$flag_color = '000000'; |
| trunk/wb/admin/pages/settings2.php | ||
|---|---|---|
| 86 | 86 |
|
| 87 | 87 |
// Setup admin groups |
| 88 | 88 |
$admin_groups[] = 1; |
| 89 |
if(!in_array(1, $admin->get_groups_id())) {
|
|
| 90 |
$admin_groups[] = implode(",",$admin->get_groups_id());
|
|
| 91 |
} |
|
| 89 |
//if(!in_array(1, $admin->get_groups_id())) {
|
|
| 90 |
// $admin_groups[] = implode(",",$admin->get_groups_id());
|
|
| 91 |
//}
|
|
| 92 | 92 |
$admin_groups = implode(',', $admin_groups);
|
| 93 | 93 |
// Setup viewing groups |
| 94 | 94 |
$viewing_groups[] = 1; |
| 95 |
if(!in_array(1, $admin->get_groups_id())) {
|
|
| 96 |
$viewing_groups[] = implode(",",$admin->get_groups_id());
|
|
| 97 |
} |
|
| 95 |
//if(!in_array(1, $admin->get_groups_id())) {
|
|
| 96 |
// $viewing_groups[] = implode(",",$admin->get_groups_id());
|
|
| 97 |
//}
|
|
| 98 | 98 |
$viewing_groups = implode(',', $viewing_groups);
|
| 99 | 99 |
|
| 100 | 100 |
// If needed, get new order |
| trunk/wb/admin/pages/add.php | ||
|---|---|---|
| 40 | 40 |
$admin_groups = $admin->get_post('admin_groups');
|
| 41 | 41 |
$viewing_groups = $admin->get_post('viewing_groups');
|
| 42 | 42 |
|
| 43 |
// work-around: $viewing_groups contains group-numbers for both private _and_ registered - keep group-numbers which appears twice only |
|
| 44 |
$view_groups=array(); |
|
| 45 |
foreach($viewing_groups as $a) {
|
|
| 46 |
if(isset($view_groups[$a])) $view_groups[$a]++; |
|
| 47 |
else $view_groups[$a] = 1; |
|
| 48 |
} |
|
| 49 |
$viewing_groups=array(); |
|
| 50 |
foreach($view_groups as $k=>$v) {
|
|
| 51 |
if($v==2) |
|
| 52 |
$viewing_groups[]=$k; |
|
| 53 |
} |
|
| 54 |
|
|
| 43 | 55 |
if ($parent!=0) {
|
| 44 | 56 |
if (!$admin->get_page_permission($parent,'admin')) |
| 45 | 57 |
$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); |
| ... | ... | |
| 54 | 66 |
|
| 55 | 67 |
// Setup admin groups |
| 56 | 68 |
$admin_groups[] = 1; |
| 57 |
if(!in_array(1, $admin->get_groups_id())) {
|
|
| 58 |
$admin_groups[] = implode(",",$admin->get_groups_id());
|
|
| 59 |
} |
|
| 60 |
$admin_groups = implode(',', $admin_groups);
|
|
| 69 |
//if(!in_array(1, $admin->get_groups_id())) {
|
|
| 70 |
// $admin_groups[] = implode(",",$admin->get_groups_id());
|
|
| 71 |
//} |
|
| 61 | 72 |
// Setup viewing groups |
| 62 | 73 |
$viewing_groups[] = 1; |
| 74 |
//if(!in_array(1, $admin->get_groups_id())) {
|
|
| 75 |
// $viewing_groups[] = implode(",",$admin->get_groups_id());
|
|
| 76 |
//} |
|
| 77 |
|
|
| 78 |
// Check to see if page created has needed permissions |
|
| 63 | 79 |
if(!in_array(1, $admin->get_groups_id())) {
|
| 64 |
$viewing_groups[] = implode(",",$admin->get_groups_id());
|
|
| 80 |
$admin_perm_ok = false; |
|
| 81 |
foreach ($admin_groups as $adm_group) {
|
|
| 82 |
if (in_array($adm_group, $admin->get_groups_id())) {
|
|
| 83 |
$admin_perm_ok = true; |
|
| 84 |
} |
|
| 85 |
} |
|
| 86 |
if ($admin_perm_ok == false) {
|
|
| 87 |
$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); |
|
| 88 |
} |
|
| 89 |
$admin_perm_ok = false; |
|
| 90 |
foreach ($viewing_groups as $view_group) {
|
|
| 91 |
if (in_array($view_group, $admin->get_groups_id())) {
|
|
| 92 |
$admin_perm_ok = true; |
|
| 93 |
} |
|
| 94 |
} |
|
| 95 |
if ($admin_perm_ok == false) {
|
|
| 96 |
$admin->print_error($MESSAGE['PAGES']['INSUFFICIENT_PERMISSIONS']); |
|
| 97 |
} |
|
| 65 | 98 |
} |
| 99 |
|
|
| 100 |
$admin_groups = implode(',', $admin_groups);
|
|
| 66 | 101 |
$viewing_groups = implode(',', $viewing_groups);
|
| 67 | 102 |
|
| 68 | 103 |
// Work-out what the link and page filename should be |
Also available in: Unified diff
fixed ticket #562, applied changes from user tavitar with some own additions