Skip to content

Commit

Permalink
Commit Delishbooru changes
Browse files Browse the repository at this point in the history
Make 1.0.6 ready for Delishbooru
  • Loading branch information
WildDogOne committed Oct 27, 2013
1 parent 1c845d8 commit e41f6e1
Show file tree
Hide file tree
Showing 5 changed files with 42 additions and 3 deletions.
2 changes: 0 additions & 2 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
/config/config.php
/config/database.yml
/log/*
/public/assets
/public/data
Expand Down
2 changes: 1 addition & 1 deletion app/controllers/PostController.php
Original file line number Diff line number Diff line change
Expand Up @@ -1038,7 +1038,7 @@ public function import()

# Take folders as tags
if (is_int(strpos($post['filename'], '/'))) {
$folders = str_replace('#', ':', $post['filename']);
$folders = str_replace('~', ':', $post['filename']);
$tags = array_filter(array_unique(array_merge(explode(' ', $post['tags']), explode('/', $folders))));
array_pop($tags);
$post['tags'] = trim($post['tags'].' '.implode(' ', $tags));
Expand Down
26 changes: 26 additions & 0 deletions config/config.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?php
namespace MyImouto;

/**
* Place your custom configuration here, instead
* of modifying the default_config.php file.
*
* Values placed here will overwrite the values in the parent class.
* List the properties you want to overwrite.
*/
class LocalConfig extends DefaultConfig
{
public $app_name = 'Delishbooru';

public $server_host = 'delishbooru.com';

public $url_base = 'http://delishbooru.com';

public $admin_contact = 'admin@myimouto';

public $download_filename_prefix = "delish";

public $starting_level = 20;

public $member_post_limit = 20;
}
15 changes: 15 additions & 0 deletions config/database.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
# Copy this to "database.yml" and adjust the fields accordingly.
# Only works with mysql adapter.
login: &login
adapter: mysql
host: 127.0.0.1
username: danbo
password: xxx

development:
<<: *login
database: myimouto_dev

production:
<<: *login
database: danbo
Binary file modified public/favicon.ico
Binary file not shown.

0 comments on commit e41f6e1

Please sign in to comment.