← Back to branch summary

~piersharding/udi/master-udi

« back to all changes in this revision

Viewing changes to lib/config_default.php

  • Committer: Piers Harding
  • Date: 2011-10-02 21:27:04 UTC
  • mfrom: (151.1.63)
  • Revision ID: git-v1:a3e8fccd857706bbe9f37a05061ddc2e2d0b8143
Merge branch 'master' into test-master-merge

Conflicts:
        lib/ds_ldap_pla.php
        lib/page.php

Show diffs side-by-side

added added

removed removed

Lines of Context:
lib/config_default.php
111
111
                        'desc'=>'Hide the features that may provide sensitive debugging information to the browser',
112
112
                        'default'=>true);
113
113
 
 
114
                $this->default->appearance['hide_template_regexp'] = array(
 
115
                        'desc'=>'Templates that are disabled by their regex are not shown',
 
116
                        'default'=>false);
 
117
 
114
118
                $this->default->appearance['hide_template_warning'] = array(
115
119
                        'desc'=>'Hide template errors from being displayed',
116
120
                        'default'=>false);
288
292
 
289
293
                /** Confirm actions
290
294
                 */
 
295
                $this->default->confirm['copy'] = array(
 
296
                        'desc'=>'Confirm copy actions',
 
297
                        'default'=>true);
 
298
 
291
299
                $this->default->confirm['create'] = array(
292
300
                        'desc'=>'Confirm creation actions',
293
301
                        'default'=>true);
477
485
                        'desc'=>'Blowfish key to encrypt cookie details',
478
486
                        'default'=>null);
479
487
 
 
488
                /** Cookie Time
 
489
                 * If you used auth_type 'form' in the servers list, you can adjust how long the cookie will last
 
490
                 * (default is 0 seconds, which expires when you close the browser)
 
491
                 */
 
492
                $this->default->session['cookie_time'] = array(
 
493
                        'desc'=>'Time in seconds for the life of cookies',
 
494
                        'default'=>0);
 
495
 
 
496
                $this->default->session['http_realm'] = array(
 
497
                        'desc'=>'HTTP Authentication Realm',
 
498
                        'default'=>sprintf('%s %s',app_name(),_('login')));
 
499
 
480
500
                $this->default->session['memorylimit'] = array(
481
501
                        'desc'=>'Set the PHP memorylimit warning threshold.',
482
502
                        'default'=>24);
485
505
                        'desc'=>'Set the PHP timelimit.',
486
506
                        'default'=>30);
487
507
 
488
 
                /** Cookie Time
489
 
                 * If you used auth_type 'form' in the servers list, you can adjust how long the cookie will last
490
 
                 * (default is 0 seconds, which expires when you close the browser)
491
 
                 */
492
 
                $this->default->session['cookie_time'] = array(
493
 
                        'desc'=>'Time in seconds for the life of cookies',
494
 
                        'default'=>0);
495
 
 
496
508
                /**
497
509
                 * Session Menu
498
510
                 */