Changeset 1420
- Timestamp:
- 12/07/07 21:47:27 (1 year ago)
- Files:
-
- releases/0.9/install.php (modified) (1 diff)
- releases/0.9/lib/datalib.php (modified) (1 diff)
- releases/0.9/lib/dbsetup.php (modified) (1 diff)
- releases/0.9/lib/setup.php (modified) (2 diffs)
- releases/0.9/mod/commentwall/lib.php (modified) (1 diff)
- releases/0.9/mod/elggadmin/elggadmin.css (modified) (3 diffs)
- releases/0.9/mod/elggadmin/lib/configdef.php (modified) (2 diffs)
- releases/0.9/mod/elggadmin/lib/elggadmin.inc.php (modified) (4 diffs)
- releases/0.9/mod/generic_comments/lib.php (modified) (1 diff)
- releases/0.9/mod/pages/lib.php (modified) (1 diff)
- releases/0.9/mod/widget/lib.php (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
releases/0.9/install.php
r1380 r1420 845 845 \$CFG->prefix = "{$_POST['prefix']}"; 846 846 847 \$CFG->sysadminemail = "{$_POST['adminemail']}";847 // \$CFG->sysadminemail = "{$_POST['adminemail']}"; 848 848 849 849 // Settings for initial administrator, only used at installation time releases/0.9/lib/datalib.php
r1418 r1420 42 42 if ($result) { 43 43 // elggcache_purge(); // TODO - should probably be here, given function can do anything, but very inefficient 44 if ($feedback ) {44 if ($feedback && $CFG->debug > 7) { 45 45 notify(__gettext('Success'), 'notifysuccess'); 46 46 } releases/0.9/lib/dbsetup.php
r1327 r1420 55 55 //execute_sql("update ".$CFG->prefix."users set email = ". $db->qstr($CFG->sysadminemail) ." where username = 'news'"); 56 56 set_field('users', 'email', $CFG->sysadminemail, 'username', 'news'); 57 // store sysadminemail in db 58 set_config('sysadminemail', $CFG->sysadminemail); 57 59 58 60 // change initial administrator if it's set releases/0.9/lib/setup.php
r1330 r1420 39 39 $CFG->tagline = ""; 40 40 } 41 if ( empty($CFG->debug)) {41 if (!isset($CFG->debug)) { 42 42 $CFG->debug = 0; 43 43 } … … 174 174 175 175 /// Set error reporting back to normal 176 if ( empty($CFG->debug)) {176 if (!isset($CFG->debug)) { 177 177 $CFG->debug = 7; 178 178 } releases/0.9/mod/commentwall/lib.php
r1338 r1420 30 30 { 31 31 modify_database($CFG->dirroot . "mod/commentwall/$CFG->dbtype.sql"); 32 //reload system 33 header_redirect($CFG->wwwroot); 34 32 35 } 33 36 else releases/0.9/mod/elggadmin/elggadmin.css
r1415 r1420 29 29 } 30 30 31 .form-item label {31 .form-item .input-label { 32 32 float: left; 33 33 text-align: right; … … 36 36 } 37 37 38 .form-item input {38 .form-item .input-text { 39 39 width: 300px; 40 } 41 42 .form-item .input-numeric { 43 width: 35px; 44 text-align: right; 45 } 46 47 .form-item .input-disabled { 48 color: #ccc; 40 49 } 41 50 … … 57 66 .form-item span { 58 67 display: block; 59 font-size: 0. 8em;68 font-size: 0.9em; 60 69 color: #666; 61 70 padding-top: 5px; releases/0.9/mod/elggadmin/lib/configdef.php
r1418 r1420 50 50 $DEFCFG->config['defaultlocale']->name = __gettext("Default locale"); 51 51 $DEFCFG->config['defaultlocale']->description = __gettext("Country code to set language to if you have gettext installed"); 52 $DEFCFG->config['defaultlocale']->type = 'language'; 52 53 53 54 $DEFCFG->config['publicreg']->name = __gettext("Public registration"); … … 101 102 $DEFCFG->config['debug']->name = __gettext("Debug"); 102 103 $DEFCFG->config['debug']->description = __gettext("Set this to 2047 to get adodb error handling"); 103 $DEFCFG->config['debug']->type = "integer";104 $DEFCFG->config['debug']->type = 'debug'; 104 105 105 106 $DEFCFG->config['rsspostsmaxage']->name = __gettext("RSS posts maximum age"); releases/0.9/mod/elggadmin/lib/elggadmin.inc.php
r1418 r1420 97 97 elgg_messages_add(sprintf(__gettext('%s could not be empty'), $allowed[$name]->name)); 98 98 } else { 99 set_config($name, $value); 99 if (!isset($allowed[$name]->type)) { 100 $allowed[$name]->type = null; 101 } 102 $allowempty = false; 103 104 switch ($allowed[$name]->type) { 105 case 'bool': 106 case 'boolean': 107 $value = (bool)$value; 108 if (!$value) { 109 $value = ''; 110 } 111 $allowempty = true; 112 break; 113 case 'int': 114 case 'integer': 115 case 'debug': 116 if (empty($value)) { 117 $value = 0; 118 } else { 119 $value = (int)$value; 120 } 121 $value .= ''; 122 $allowempty = true; 123 break; 124 case 'access': 125 $accessvals = array( 126 'PUBLIC', 127 'LOGGED_IN', 128 'PRIVATE', 129 ); 130 if (!in_array($value, $accessvals)) { 131 $value = $CFG->default_value; 132 } 133 break; 134 case 'language': 135 if (!preg_match('!^[a-z]{2,3}(_[A-Z]{2,3})?$!', $value)) { 136 $value = $CFG->defaultlocale; 137 } 138 break; 139 } 140 141 if (empty($value) && !$allowempty) { 142 unset_config($name); 143 } else { 144 set_config($name, $value); 145 } 100 146 elgg_messages_add(sprintf(__gettext('%s option updated'), $allowed[$name]->name)); 101 147 $sucess = true; … … 235 281 $desc = (isset($obj->description)) ? $obj->description : ' '; 236 282 237 $input = pages_html_wrap('label', $name );283 $input = pages_html_wrap('label', $name, array('class'=>'input-label')); 238 284 $input .= elggadmin_config_input($c, $obj); 239 285 $input .= pages_html_wrap('span', $desc); … … 251 297 global $CFG; 252 298 299 // override with current values 253 300 $value = (isset($CFG->$c)) ? $CFG->$c : null; 301 254 302 $input_name = "config[$c]"; 255 303 … … 257 305 $attrs['name'] = $input_name; 258 306 $attrs['value'] = $value; 307 $attrs['class'] = 'input'; 259 308 260 309 if (isset($obj->noteditable)) { 261 310 $attrs['disabled'] = 'disabled'; 262 } 263 264 $result = pages_html_input('text', $attrs); 311 $attrs['class'] .= ' input-disabled'; 312 } 313 314 if (!isset($obj->type)) { 315 $obj->type = null; 316 } 317 switch ($obj->type) { 318 case 'bool': 319 case 'boolean': 320 $yes = __gettext('Yes'); 321 $no = __gettext('No'); 322 $yesattrs = unserialize(serialize($attrs)); 323 $noattrs = unserialize(serialize($attrs)); 324 $yesattrs['value'] = 1; 325 $noattrs['value'] = 0; 326 327 if ((bool)$value) { 328 $yesattrs['checked'] = 'checked'; 329 } else { 330 $noattrs['checked'] = 'checked'; 331 } 332 333 $result = pages_html_wrap('label', pages_html_input('radio', $yesattrs) . ' ' . $yes); 334 $result .= pages_html_wrap('label', pages_html_input('radio', $noattrs) . ' ' . $no); 335 $result = pages_html_wrap('div', $result, array('class'=>'input-text')); 336 break; 337 case 'int': 338 case 'integer': 339 $attrs['class'] = ' input-numeric'; 340 $result = pages_html_input('text', $attrs); 341 break; 342 case 'access': 343 unset($attrs['name']); 344 unset($attrs['value']); 345 $options = array(); 346 $_opts = array( 347 'Private' => 'PRIVATE', 348 'Logged in' => 'LOGGED_IN', 349 'Public' => 'PUBLIC', 350 ); 351 foreach ($_opts as $label=>$access) { 352 $obj = new StdClass; 353 $obj->label = $label; 354 $obj->value = $access; 355 if ($value == $access) { 356 $obj->selected = true; 357 } 358 $options[] = $obj; 359 } 360 $result = pages_html_select($input_name, $options, $attrs); 361 break; 362 case 'debug': 363 unset($attrs['name']); 364 unset($attrs['value']); 365 $_opts = array( 366 'Off' => '0', 367 'Warning' => '7', 368 'Enabled' => '2047', 369 ); 370 371 $options = array(); 372 foreach ($_opts as $label=>$access) { 373 $obj = new StdClass; 374 $obj->label = $label; 375 $obj->value = $access; 376 if ($value == $access) { 377 $obj->selected = true; 378 } 379 $options[] = $obj; 380 } 381 $result = pages_html_select($input_name, $options, $attrs); 382 break; 383 case 'language': 384 if (empty($CFG->languages_installed)) { 385 $result = __gettext('No languages installed'); 386 } else { 387 ksort($CFG->languages_installed); 388 $options = array(); 389 foreach ($CFG->languages_installed as $code => $lang) { 390 $obj = new StdClass; 391 $obj->label = $lang; 392 $obj->value = $code; 393 if ($code == $value) { 394 $obj->selected = true; 395 } 396 $options[] = $obj; 397 } 398 } 399 $result = pages_html_select($input_name, $options, $attrs); 400 break; 401 default: 402 $attrs['class'] .= ' input-text'; 403 $result = pages_html_input('text', $attrs); 404 break; 405 } 265 406 266 407 return $result; releases/0.9/mod/generic_comments/lib.php
r1402 r1420 11 11 if (file_exists($CFG->dirroot . "mod/generic_comments/$CFG->dbtype.sql")) { 12 12 modify_database($CFG->dirroot . "mod/generic_comments/$CFG->dbtype.sql"); 13 //reload system 14 header_redirect($CFG->wwwroot); 13 15 } else { 14 16 error("Error: Your database ($CFG->dbtype) is not yet fully supported by the Elgg generic comments. See the mod/generic_comments directory."); releases/0.9/mod/pages/lib.php
r1415 r1420 166 166 167 167 $page = pages_create_page($page); 168 169 //reload system 170 header_redirect($CFG->wwwroot); 168 171 169 172 } else { releases/0.9/mod/widget/lib.php
r1070 r1420 39 39 if (file_exists($CFG->dirroot . "mod/widget/$CFG->dbtype.sql")) { 40 40 modify_database($CFG->dirroot . "mod/widget/$CFG->dbtype.sql"); 41 //reload system 42 header_redirect($CFG->wwwroot); 43 41 44 } else { 42 45 error("Error: Your database ($CFG->dbtype) is not yet fully supported by the Elgg widgets. See the mod/widget directory.");
