36c36
< // $Id: config.php,v 1.148 2004/12/31 10:33:31 dhaun Exp $
---
> // $Id: config.php,v 1.110.2.1 2004/05/31 10:52:16 dhaun Exp $
49,50c49,50
< $_DB_host         = 'localhost';   // host name or IP address of your DB server
< $_DB_name         = 'geeklog';     // name of your database,
---
> $_DB_host='localhost';
> $_DB_name='lifeless_geek2';
52,53c52,53
< $_DB_user         = 'username';    // MySQL user name
< $_DB_pass         = 'password';    // MySQL password
---
> $_DB_user='lifeless_geek2';
> $_DB_pass='3stqmIuJ0E';
55c55
< // The table prefix is prepended to each table used by Geeklog to avoid name
---
> // The table prefix is prepended to each table used be Geeklog to avoid name
68c68
< $_CONF['path']            = '/path/to/geeklog/'; // should end in a slash
---
> $_CONF['path'] ='/usr/home/lifeless/public_html/geeklogtest/';
74c74
< $_CONF['path_html']         = $_CONF['path'] . 'public_html/';
---
> $_CONF['path_html'] ='/usr/home/lifeless/public_html/geeklogtest/';
83c83
< $_CONF['site_url']          = 'http://www.example.com';
---
> $_CONF['site_url'] ='http://lifelesspeople.com/geeklogtest';
114,118c114,117
< $_CONF['path_system']   = $_CONF['path'] . 'system/';
< $_CONF['path_log']      = $_CONF['path'] . 'logs/';
< $_CONF['path_language'] = $_CONF['path'] . 'language/';
< $_CONF['backup_path']   = $_CONF['path'] . 'backups/';
< $_CONF['path_data']     = $_CONF['path'] . 'data/';
---
> $_CONF['path_system']     = $_CONF['path'] . 'system/';
> $_CONF['path_log']        = $_CONF['path'] . 'logs/';
> $_CONF['path_language']   = $_CONF['path'] . 'language/';
> $_CONF['backup_path']     = $_CONF['path'] . 'backups/';
123c122
< $_CONF['path_images']   = $_CONF['path_html'] . 'images/';
---
> $_CONF['path_images']     = $_CONF['path_html'] . 'images/';
158c157
<     // sendmail parameters (only needed for 'backend' => 'sendmail')
---
>     // sendmail parameters (for 'backend' => 'sendmail')
162c161
<     // SMTP parameters (only needed for 'backend' => 'smtp')
---
>     // SMTP parameters (for 'backend' => 'smtp')
180,187c179,180
< 
< // full path to mysqldump executable (Windows users: add ".exe"!)
< $_DB_mysqldump_path = '/usr/bin/mysqldump';
< 
< // additional options for mysqldump
< // If you're using InnoDB tables, include the '--single-transaction' or you
< // may end up with inconsistent backups!
< $_CONF['mysqldump_options'] = '-Q';
---
> $_DB_mysqldump_path         = '/usr/bin/mysqldump'; // path to mysqldump binary
> $_CONF['mysqldump_options'] = '-Q';   // additional options for mysqldump
194,211c187
< $_CONF['theme']             = 'professional';  // default theme
< 
< // List of entries that you want to see in the site's menu bar (if you're using
< // a theme that uses the {menu_elements} variable in its header.thtml).
< // Choose any combination of the following (order here = order in the menu).
< $_CONF['menu_elements'] = array
< (
<     // 'home',      // link to homepage
<     'contribute',   // contribute / "submit a story" link
<     'links',        // link to the links section (aka web resources)
<     'polls',        // link to past polls
<     'calendar',     // link to the site calendar
<     'search',       // link to advanced search
<     'stats',        // link to site stats
<     // 'prefs',     // link to user's preferences
<     'plugins'       // links added by plugins, like {plg_menu_elements}
<     // 'custom'     // for custom links (see lib-custom.php)
< );
---
> $_CONF['theme']             = 'XSilver';  // default theme
223,228d198
< // Allow users to change their username (if set to 1).
< $_CONF['allow_username_change'] = 0;
< 
< // Allow users to delete their account (if set to 1).
< $_CONF['allow_account_delete']  = 0;
< 
232,233d201
< // Used by COM_displayName to return Members's Full Name else username  (1 = yes, 0 = no)
< $_CONF['show_fullname'] = 0;
242,257d209
< // +---------------------------------------------------------------------------+
< // | Define action to be taken by SPAMX module if spam detected                |
< // | Current SPAMX module supports two actions which can be combined           |
< // | Additional classes can be added as well as other plugin extensions        |
< // | Actions: 128 = ignore comment and redirect to homepage                    |
< // |          8 = mail admin message                                           |
< // |          136 (SUM) ignore and email adming                                |
< // +---------------------------------------------------------------------------+
< $_CONF['spamx'] = 128;  // Default to ignore comment.
< 
< // +---------------------------------------------------------------------------+
< // | Support for custom templaes to support advanced Rich Text Editor          |
< // | Checked in comment.php, submit.php, admin/story.php and                   |
< // | staticpages/index.php. If set true and advanced template exists           |
< // +---------------------------------------------------------------------------+
< $_CONF['advanced_editor'] = false;
264,271c216,222
< $_CONF['language']        = 'english';
< $_CONF['locale']          = 'en-gb';
< $_CONF['date']            = '%A, %B %d %Y @ %I:%M %p %Z';
< $_CONF['daytime']         = '%m/%d %I:%M%p';
< $_CONF['shortdate']       = '%x';
< $_CONF['dateonly']        = '%d-%b';
< $_CONF['timeonly']        = '%I:%M%p';
< $_CONF['week_start']      = 'Sun'; // can be 'Sun' or 'Mon'
---
> $_CONF['language']  = 'english';
> $_CONF['locale']    = 'en-gb';
> $_CONF['date']      = '%A, %B %d %Y @ %I:%M %p';
> $_CONF['daytime']   = '%m/%d %I:%M%p';
> $_CONF['shortdate'] = '%x';
> $_CONF['dateonly']  = '%d-%b';
> $_CONF['timeonly']  = '%I:%M %p';
274,285d224
< // "Timezone Hack"
< // If your webserver is located in a different timezone than yourself but you
< // prefer Geeklog to post stories in your local time, then set your local
< // timezone here.
< //
< // Please note that this does not work when safe_mode is on!
< //
< // For more information, see this discussion on geeklog.net:
< // http://www.geeklog.net/forum/viewtopic.php?showtopic=21232
< // $_CONF['timezone'] = 'Etc/GMT-6'; // e.g. 6 hours behind GMT
< 
< 
331,332c270
< // Geeklog keeps track of when a user last logged in. Set this to false
< // if you don't want that.
---
> // Set to false if you don't want to store last login data and time in the userinfo table
335d272
< 
347,351d283
< 
< // Note: PDF conversion didn't make it into this release. Leave as is.
< $_CONF['pdf_enabled'] = 0;
< 
< 
398c330
< $_CONF['usersubmission']  = 0; // 1 = new users must be approved
---
> $_CONF['usersubmission']  = 0;
405,406c337
< // of the array can be any combination of 'story', 'comment', 'link', 'event',
< // and 'user'.
---
> // of the array can be any combination of 'story', 'link', 'event', and 'user'.
412c343
< $_CONF['speedlimit']    = 45;           // in seconds
---
> $_CONF['speedlimit']    = 45;         // in seconds
414a346,351
> // Allow users to change their username (if set to 1).
> $_CONF['allow_username_change'] = 0;
> 
> // Allow users to delete their account (if set to 1).
> $_CONF['allow_account_delete']  = 0;
> 
437,439d373
< 
< // Who's Online block settings
< 
443,448d376
< // Show full names (= 1) or usernames (= 0) in Who's Online block
< $_CONF['whosonline_fullname'] = 0; // 1 = show full names, 0 = usernames
< 
< // If set to 1, don't show names of registered users to anonymous users
< $_CONF['whosonline_anonymous'] = 0; // 1 = don't show names to anon. users
< 
480,482d407
< // Link to the documentation from the Admin block (0 = hide link, 1 = show)
< $_CONF['link_documentation'] = 1;
< 
498,502d422
< 
< // Advanced theme settings
< // It is recommended to leave these unchanged and overwrite them in the theme's
< // functions.php instead.
< 
507,512d426
< // When set to 1, this will make the {left_blocks} variable available in
< // footer.thtml (and disable it in header.thtml). This is really only useful
< // for two-column layouts where you want the left column contain the stories
< // and the right column contain the standard blocks.
< $_CONF['left_blocks_in_footer'] = 0;
< 
554,556c468,470
< // If you set image_lib to 'imagemagick' give the complete path to mogrify
< // here (i.e. including the name of the executable), otherwise comment it out
< // NOTE: requires ImageMagick version 5.4.9 (or newer)
---
> // If you set image_lib to imagemagick give this path otherwise comment it out
> // NOTE: you will need a fairly recent version of ImageMagick for this to work.
> // ImageMagick version 5.4.9 (or newer) is recommended.
559c473
< // If you set image_lib to 'netpbm' give the path to the netpbm directory, you
---
> // If you set image_lib to netpbm give the path to the netpbm directory, you
567c481
< // jpegtopnm, pngtopnm, ppmtogif, pnmtojpeg, pnmtopng and pnmscale
---
> // jpegtopnm, pngtopnm, ppmtogif, ppmtojpeg, pnmtopng and pnmscale
579,580c493,494
< $_CONF['max_image_width']       = 160;  // In pixels
< $_CONF['max_image_height']      = 120;  // In pixels
---
> $_CONF['max_image_width']       = 300;  // In pixels
> $_CONF['max_image_height']      = 300;  // In pixels
584,585c498,499
< $_CONF['max_photo_width']       = 128; // In pixels
< $_CONF['max_photo_height']      = 128; // In pixels
---
> $_CONF['max_photo_width']       = 96;  // In pixels
> $_CONF['max_photo_height']      = 96;  // In pixels
596,598c510,512
< $_CONF['maxanswers']        = 10; // max. number of options in a poll
< // 'submitorder' is the order in which answers are saved in admin/poll.php
< // 'voteorder' will list answers ordered by number of votes (highest->lowest);
---
> $_CONF['maxanswers']        = 10;
> // 'submitorder' is order answers are saved in admin/poll.php
> // 'voteorder' will list answers in order of number of votes (highest->lowest);
662,663d575
< // disables autolinks if set to 1
< $_CONF['disable_autolinks'] = 0; // 0 = autolinks enabled
670,685c582,584
< 
< // IP lookup support
< //
< // If $_CONF['ip_lookup'] contains the URL to a web-based service for IP
< // address lookups, Geeklog will let you click on IP addresses so that you
< // can find out where a visitor came from. This can either be a remote
< // service or a plugin like Tom Willet's Nettools.
< // The '*' in the URL will be replaced with the IP address to look up.
< //
< // uncomment this line if you have Tom Willet's Nettools installed
< // $_CONF['ip_lookup'] = $_CONF['site_url'] . '/nettools/whois.php?domain=*';
< 
< 
< // This feature, when activated, makes some of Geeklog's URLs more crawler
< // friendly, i.e. more likely to be picked up by search engines.
< // Only implemented for stories, static pages, and portal links right now.
---
> // EXPERIMENTAL!
> // This feature when fully implemented, will make your site crawler friendly.
> // Only works with staticpages right now.
689c588
< $_CONF['url_rewrite'] = false; // false = off, true = on
---
> $_CONF['url_rewrite']       = false; // false = off, true = on
692,696d590
< 
< // Story Record Options for the STATUS Field
< define('STORY_ARCHIVE_ON_EXPIRE', '10');
< define('STORY_DELETE_ON_EXPIRE', '11');
< 
701c595
<     define('VERSION', '1.3.11');
---
>     define('VERSION', '1.3.9sr1');
