From c9e6b622c4c29a9f1048584cb00095cdbbbc2338 Mon Sep 17 00:00:00 2001 From: hyung-hwan Date: Thu, 4 Mar 2010 12:40:27 +0000 Subject: [PATCH] renamed some configuration items - max_logs_per_page - max_logs_in_project_home - max_log_in_site_home added the full change log view for a project merged the user controller to the site controller removed the user controller --- codepot/etc/codepot.ini.in | 12 +- codepot/src/codepot/config/routes.php | 2 +- codepot/src/codepot/controllers/Makefile.am | 1 - codepot/src/codepot/controllers/Makefile.in | 1 - codepot/src/codepot/controllers/main.php | 4 +- codepot/src/codepot/controllers/project.php | 71 ++++++- codepot/src/codepot/controllers/site.php | 169 ++++++++++++++++- codepot/src/codepot/controllers/user.php | 178 ------------------ codepot/src/codepot/controllers/wiki.php | 57 ++++-- .../codepot/language/english/common_lang.php | 2 + .../language/indonesian/common_lang.php | 10 +- .../codepot/language/korean/common_lang.php | 2 + codepot/src/codepot/models/logmodel.php | 9 +- codepot/src/codepot/views/Makefile.am | 4 +- codepot/src/codepot/views/Makefile.in | 4 +- codepot/src/codepot/views/error.php | 6 +- .../views/{user_sitelog.php => log.php} | 53 ++++-- codepot/src/codepot/views/login.php | 4 +- codepot/src/codepot/views/project_home.php | 14 +- .../views/{user_home.php => site_home.php} | 38 ++-- codepot/src/codepot/views/taskbar.php | 8 +- codepot/src/codepot/views/wiki_show.php | 22 ++- codepot/src/config.php.in | 7 +- codepot/src/css/project.css | 105 +++++------ codepot/src/websvn/blame.php | 2 +- codepot/src/websvn/comp.php | 2 +- codepot/src/websvn/diff.php | 2 +- codepot/src/websvn/filedetails.php | 2 +- codepot/src/websvn/include/configclass.php | 2 +- codepot/src/websvn/index.php | 2 +- codepot/src/websvn/listing.php | 2 +- codepot/src/websvn/log.php | 2 +- codepot/src/websvn/revision.php | 2 +- codepot/src/websvn/templates/calm/blame.tmpl | 2 +- .../src/websvn/templates/calm/compare.tmpl | 2 +- codepot/src/websvn/templates/calm/diff.tmpl | 2 +- .../src/websvn/templates/calm/directory.tmpl | 2 +- codepot/src/websvn/templates/calm/file.tmpl | 2 +- codepot/src/websvn/templates/calm/log.tmpl | 2 +- .../src/websvn/templates/calm/revision.tmpl | 2 +- 40 files changed, 461 insertions(+), 354 deletions(-) delete mode 100644 codepot/src/codepot/controllers/user.php rename codepot/src/codepot/views/{user_sitelog.php => log.php} (70%) rename codepot/src/codepot/views/{user_home.php => site_home.php} (83%) diff --git a/codepot/etc/codepot.ini.in b/codepot/etc/codepot.ini.in index 655fd234..11681a30 100644 --- a/codepot/etc/codepot.ini.in +++ b/codepot/etc/codepot.ini.in @@ -92,19 +92,19 @@ max_upload_size = "10000" max_latest_projects = "10" ;------------------------------------------------------------------------------ -; Maximum number of site log entries to show per page +; Maximum number of log entries to show per details page ;------------------------------------------------------------------------------ -max_site_logs_per_page = "50" +max_logs_per_page = "50" ;------------------------------------------------------------------------------ -; Maximum number of svn commits to show in the front page +; Maximum number of log entries to show in the front page ;------------------------------------------------------------------------------ -max_svn_commits = "10" +max_logs_in_site_home = "10" ;------------------------------------------------------------------------------ -; Maximum number of svn commits to show in the project home page +; Maximum number of log entries to show in the project home page ;------------------------------------------------------------------------------ -max_svn_commits_in_project = "5" +max_logs_in_project_home = "5" ;------------------------------------------------------------------------------ ; directory to accomodate subversion repositories diff --git a/codepot/src/codepot/config/routes.php b/codepot/src/codepot/config/routes.php index 26972990..c82aac08 100644 --- a/codepot/src/codepot/config/routes.php +++ b/codepot/src/codepot/config/routes.php @@ -40,7 +40,7 @@ | */ -$route['default_controller'] = "user"; +$route['default_controller'] = "site"; $route['scaffolding_trigger'] = ""; diff --git a/codepot/src/codepot/controllers/Makefile.am b/codepot/src/codepot/controllers/Makefile.am index 68b7b876..fcf9eaa5 100644 --- a/codepot/src/codepot/controllers/Makefile.am +++ b/codepot/src/codepot/controllers/Makefile.am @@ -7,7 +7,6 @@ www_DATA = \ project.php \ site.php \ source.php \ - user.php \ wiki.php EXTRA_DIST = $(www_DATA) diff --git a/codepot/src/codepot/controllers/Makefile.in b/codepot/src/codepot/controllers/Makefile.in index 3b7d6c9e..3de51c05 100644 --- a/codepot/src/codepot/controllers/Makefile.in +++ b/codepot/src/codepot/controllers/Makefile.in @@ -170,7 +170,6 @@ www_DATA = \ project.php \ site.php \ source.php \ - user.php \ wiki.php EXTRA_DIST = $(www_DATA) diff --git a/codepot/src/codepot/controllers/main.php b/codepot/src/codepot/controllers/main.php index a82d5ef0..35097e23 100644 --- a/codepot/src/codepot/controllers/main.php +++ b/codepot/src/codepot/controllers/main.php @@ -44,7 +44,7 @@ class Main extends Controller else { if ($user_url != "") redirect ($user_url); - else redirect ('user/home'); + else redirect ('site/home'); } } else @@ -74,7 +74,7 @@ class Main extends Controller { $this->login->deauthenticate (); if ($url != "") redirect ($this->converter->HexToAscii($url)); - else redirect ('user/home'); + else redirect ('site/home'); } } diff --git a/codepot/src/codepot/controllers/project.php b/codepot/src/codepot/controllers/project.php index b40a11fc..b5fd998a 100644 --- a/codepot/src/codepot/controllers/project.php +++ b/codepot/src/codepot/controllers/project.php @@ -6,6 +6,7 @@ class Project extends Controller var $VIEW_HOME = 'project_home'; var $VIEW_EDIT = 'project_edit'; var $VIEW_DELETE = 'project_delete'; + var $VIEW_LOG = 'log'; function Project () { @@ -47,7 +48,7 @@ class Project extends Controller else { $log_entries = $this->logs->getEntries ( - 0, CODEPOT_MAX_SVN_COMMITS_IN_PROJECT, $projectid); + 0, CODEPOT_MAX_LOGS_IN_PROJECT_HOME, $projectid); if ($log_entries === FALSE) { $data['message'] = 'DATABASE ERROR'; @@ -158,7 +159,7 @@ class Project extends Controller $this->_edit_project ($project, 'create', $login); } - function update ($projectid) + function update ($projectid = '') { $this->load->model ('ProjectModel', 'projects'); @@ -223,8 +224,8 @@ class Project extends Controller else { // the project has been deleted successfully. - // go back to the user home. - redirect ('user/projectlist'); + // go back to the project list. + redirect ('site/projectlist'); } } else @@ -252,7 +253,7 @@ class Project extends Controller } } - function delete ($projectid) + function delete ($projectid = '') { $this->load->model ('ProjectModel', 'projects'); @@ -286,6 +287,66 @@ class Project extends Controller $this->_delete_project ($project, $login); } } + + function log ($projectid = '', $offset = 0) + { + $this->load->model ('ProjectModel', 'projects'); + + $login = $this->login->getUser (); + + $project = $this->projects->get ($projectid); + if ($project === FALSE) + { + $data['login'] = $login; + $data['message'] = 'DATABASE ERROR'; + $this->load->view ($this->VIEW_ERROR, $data); + } + else if ($project === NULL) + { + $data['login'] = $login; + $data['message'] = + $this->lang->line('MSG_NO_SUCH_PROJECT') . + " - {$projectid}"; + $this->load->view ($this->VIEW_ERROR, $data); + } + else + { + $this->load->library ('pagination'); + $this->load->model ('LogModel', 'logs'); + + $num_log_entries = $this->logs->getNumEntries ($projectid); + if ($num_log_entries === FALSE) + { + $data['login'] = $login; + $data['message'] = 'DATABASE ERROR'; + $this->load->view ($this->VIEW_ERROR, $data); + return; + } + + $pagecfg['base_url'] = site_url() . "/project/log/{$projectid}/"; + $pagecfg['total_rows'] = $num_log_entries; + $pagecfg['per_page'] = CODEPOT_MAX_LOGS_PER_PAGE; + $pagecfg['uri_segment'] = 4; + + $log_entries = $this->logs->getEntries ($offset, $pagecfg['per_page'], $projectid); + if ($log_entries === FALSE) + { + $data['login'] = $login; + $data['message'] = 'DATABASE ERROR'; + $this->load->view ($this->VIEW_ERROR, $data); + return; + } + + $this->pagination->initialize ($pagecfg); + + $data['project'] = $project; + $data['login'] = $login; + $data['log_entries'] = $log_entries; + $data['page_links'] = $this->pagination->create_links (); + + $this->load->view ($this->VIEW_LOG, $data); + } + } } ?> diff --git a/codepot/src/codepot/controllers/site.php b/codepot/src/codepot/controllers/site.php index 01597f64..999f5d7a 100644 --- a/codepot/src/codepot/controllers/site.php +++ b/codepot/src/codepot/controllers/site.php @@ -3,8 +3,11 @@ class Site extends Controller { var $VIEW_ERROR = 'error'; + var $VIEW_HOME = 'site_home'; var $VIEW_EDIT = 'site_edit'; var $VIEW_DELETE = 'site_delete'; + var $VIEW_LOG = 'log'; + var $VIEW_PROJECT_LIST = 'project_list'; function Site () { @@ -19,6 +22,58 @@ class Site extends Controller $this->lang->load ('common', CODEPOT_LANG); } + function index () + { + return $this->home (); + } + + function home () + { + $login = $this->login->getUser (); + if (CODEPOT_SIGNIN_COMPULSORY && $login['id'] == '') + redirect ('main/signin'); + + $this->load->model ('SiteModel', 'sites'); + $this->load->model ('ProjectModel', 'projects'); + $this->load->model ('LogModel', 'logs'); + + $site = $this->sites->get (CODEPOT_DEFAULT_SITEID); + if ($site === FALSE) + { + $data['login'] = $login; + $data['message'] = 'DATABASE ERROR'; + $this->load->view ($this->VIEW_ERROR, $data); + return; + } + if ($site === NULL) $site = $this->sites->getDefault (); + + $latest_projects = $this->projects->getLatestProjects ($login['id'], CODEPOT_MAX_LATEST_PROJECTS); + if ($latest_projects === FALSE) + { + $data['login'] = $login; + $data['message'] = 'DATABASE ERROR'; + $this->load->view ($this->VIEW_ERROR, $data); + return; + } + + $log_entries = $this->logs->getEntries (0, CODEPOT_MAX_LOGS_IN_SITE_HOME); + if ($log_entries === FALSE) + { + $data['login'] = $login; + $data['message'] = 'DATABASE ERROR'; + $this->load->view ($this->VIEW_ERROR, $data); + return; + } + + $data['login'] = $login; + $data['latest_projects'] = $latest_projects; + $data['log_entries'] = $log_entries; + $data['site'] = $site; + //$data['user_name'] = ''; + //$data['user_pass'] = ''; + $this->load->view ($this->VIEW_HOME, $data); + } + function _edit_site ($site, $mode, $login) { $this->load->helper ('form'); @@ -65,8 +120,8 @@ class Site extends Controller } else { - //redirect ('user/home/' . $site->id); - redirect ('user/home'); + //redirect ('site/home/' . $site->id); + redirect ('site/home'); } } else @@ -177,16 +232,16 @@ class Site extends Controller else { // the site has been deleted successfully. - // go back to the user home. - redirect ('user/home'); + // go back to the site home. + redirect ('site/home'); } } else { // the confirm checkbox is not checked. // go back to the site home page. - //redirect ('user/home/' . $site->id); - redirect ('user/home'); + //redirect ('site/home/' . $site->id); + redirect ('site/home'); } } else @@ -238,6 +293,108 @@ class Site extends Controller $this->_delete_site ($site, $login); } } + + function log ($offset = 0) + { + $login = $this->login->getUser (); + + $this->load->library ('pagination'); + $this->load->model ('LogModel', 'logs'); + + $num_log_entries = $this->logs->getNumEntries (); + if ($num_log_entries === FALSE) + { + $data['login'] = $login; + $data['message'] = 'DATABASE ERROR'; + $this->load->view ($this->VIEW_ERROR, $data); + return; + } + + $pagecfg['base_url'] = site_url() . '/site/log/'; + $pagecfg['total_rows'] = $num_log_entries; + $pagecfg['per_page'] = CODEPOT_MAX_LOGS_PER_PAGE; + $pagecfg['uri_segment'] = 3; + + $log_entries = $this->logs->getEntries ($offset, $pagecfg['per_page']); + if ($log_entries === FALSE) + { + $data['login'] = $login; + $data['message'] = 'DATABASE ERROR'; + $this->load->view ($this->VIEW_ERROR, $data); + return; + } + + + $this->pagination->initialize ($pagecfg); + + $data['login'] = $login; + $data['log_entries'] = $log_entries; + $data['page_links'] = $this->pagination->create_links (); + + $this->load->view ($this->VIEW_LOG, $data); + } + + function projectlist () + { + $login = $this->login->getUser (); + if (CODEPOT_SIGNIN_COMPULSORY && $login['id'] == '') + redirect ('main/signin'); + + $this->load->model ('ProjectModel', 'projects'); + + $projects = $this->projects->getMyProjects ($login['id']); + $other_projects = $this->projects->getOtherProjects ($login['id']); + + if ($projects === FALSE || $other_projects === FALSE) + { + $data['login'] = $login; + $data['message'] = 'DATABASE ERROR'; + $this->load->view ($this->VIEW_ERROR, $data); + } + else + { + $data['login'] = $login; + $data['projects'] = $projects; + $data['other_projects'] = $other_projects; + $this->load->view ($this->VIEW_PROJECT_LIST, $data); + } + } + + function preference () + { + $login = $this->login->getUser(); + if ($login['id'] == '') redirect ('main/signin'); + + $this->load->view ( + $this->VIEW_ERROR, + array ( + 'login' => $login, + 'message' => 'USER PREFERENCE NOT SUPPORTED YET' + ) + ); + } + + function admin () + { + $login = $this->login->getUser(); + if ($login['id'] == '') redirect ('main/signin'); + + if ($login['sysadmin?']) + { + echo "...Site Administration..."; + } + else + { + $this->load->view ( + $this->VIEW_ERROR, + array ( + 'login' => $login, + 'message' => 'NO PERMISSION' + ) + ); + } + } + } ?> diff --git a/codepot/src/codepot/controllers/user.php b/codepot/src/codepot/controllers/user.php deleted file mode 100644 index ec1a8dd5..00000000 --- a/codepot/src/codepot/controllers/user.php +++ /dev/null @@ -1,178 +0,0 @@ -load->helper ('url'); - $this->load->helper ('form'); - $this->load->library ('Converter', 'converter'); - $this->load->model (CODEPOT_LOGIN_MODEL, 'login'); - - $this->load->library ('Language', 'lang'); - $this->lang->load ('common', CODEPOT_LANG); - } - - function index () - { - return $this->home (); - } - - function home () - { - $login = $this->login->getUser (); - if (CODEPOT_SIGNIN_COMPULSORY && $login['id'] == '') - redirect ('main/signin'); - - $this->load->model ('SiteModel', 'sites'); - $this->load->model ('ProjectModel', 'projects'); - $this->load->model ('LogModel', 'logs'); - - $site = $this->sites->get (CODEPOT_DEFAULT_SITEID); - if ($site === FALSE) - { - $data['login'] = $login; - $data['message'] = 'DATABASE ERROR'; - $this->load->view ($this->VIEW_ERROR, $data); - return; - } - if ($site === NULL) $site = $this->sites->getDefault (); - - $latest_projects = $this->projects->getLatestProjects ($login['id'], CODEPOT_MAX_LATEST_PROJECTS); - if ($latest_projects === FALSE) - { - $data['login'] = $login; - $data['message'] = 'DATABASE ERROR'; - $this->load->view ($this->VIEW_ERROR, $data); - return; - } - - $log_entries = $this->logs->getEntries (0, CODEPOT_MAX_SVN_COMMITS); - if ($log_entries === FALSE) - { - $data['login'] = $login; - $data['message'] = 'DATABASE ERROR'; - $this->load->view ($this->VIEW_ERROR, $data); - return; - } - - $data['login'] = $login; - $data['latest_projects'] = $latest_projects; - $data['log_entries'] = $log_entries; - $data['site'] = $site; - //$data['user_name'] = ''; - //$data['user_pass'] = ''; - $this->load->view ($this->VIEW_HOME, $data); - } - - function sitelog ($offset = 0) - { - $login = $this->login->getUser (); - - $this->load->library ('pagination'); - $this->load->model ('LogModel', 'logs'); - - $num_log_entries = $this->logs->getNumEntries (); - if ($num_log_entries === FALSE) - { - $data['login'] = $login; - $data['message'] = 'DATABASE ERROR'; - $this->load->view ($this->VIEW_ERROR, $data); - return; - } - - $pagecfg['base_url'] = site_url() . '/user/sitelog/'; - $pagecfg['total_rows'] = $num_log_entries; - $pagecfg['per_page'] = CODEPOT_MAX_SITE_LOGS_PER_PAGE; - - $log_entries = $this->logs->getEntries ($offset, $pagecfg['per_page']); - if ($log_entries === FALSE) - { - $data['login'] = $login; - $data['message'] = 'DATABASE ERROR'; - $this->load->view ($this->VIEW_ERROR, $data); - return; - } - - - $this->pagination->initialize ($pagecfg); - - $data['login'] = $login; - $data['log_entries'] = $log_entries; - $data['page_links'] = $this->pagination->create_links (); - - $this->load->view ($this->VIEW_SITELOG, $data); - } - - function projectlist () - { - $login = $this->login->getUser (); - if (CODEPOT_SIGNIN_COMPULSORY && $login['id'] == '') - redirect ('main/signin'); - - $this->load->model ('ProjectModel', 'projects'); - - $projects = $this->projects->getMyProjects ($login['id']); - $other_projects = $this->projects->getOtherProjects ($login['id']); - - if ($projects === FALSE || $other_projects === FALSE) - { - $data['login'] = $login; - $data['message'] = 'DATABASE ERROR'; - $this->load->view ($this->VIEW_ERROR, $data); - } - else - { - $data['login'] = $login; - $data['projects'] = $projects; - $data['other_projects'] = $other_projects; - $this->load->view ($this->VIEW_PROJECT_LIST, $data); - } - } - - function preference () - { - $login = $this->login->getUser(); - if ($login['id'] == '') redirect ('main/signin'); - - $this->load->view ( - $this->VIEW_ERROR, - array ( - 'login' => $login, - 'message' => 'USER PREFERENCE NOT SUPPORTED YET' - ) - ); - } - - function admin () - { - $login = $this->login->getUser(); - if ($login['id'] == '') redirect ('main/signin'); - - - if ($login['sysadmin?']) - { - echo "...Site Administration..."; - } - else - { - $this->load->view ( - $this->VIEW_ERROR, - array ( - 'login' => $login, - 'message' => 'NO PERMISSION' - ) - ); - } - } - -} - -?> diff --git a/codepot/src/codepot/controllers/wiki.php b/codepot/src/codepot/controllers/wiki.php index f90d2783..1445856b 100644 --- a/codepot/src/codepot/controllers/wiki.php +++ b/codepot/src/codepot/controllers/wiki.php @@ -22,7 +22,7 @@ class Wiki extends Controller } - function home ($projectid = "") + function home ($projectid = '') { $this->load->model ('ProjectModel', 'projects'); $this->load->model ('WikiModel', 'wikis'); @@ -62,7 +62,7 @@ class Wiki extends Controller } } - function show ($projectid, $name) + function _show_wiki ($projectid, $name, $create) { $this->load->model ('ProjectModel', 'projects'); $this->load->model ('WikiModel', 'wikis'); @@ -72,6 +72,13 @@ class Wiki extends Controller redirect ('main/signin'); $data['login'] = $login; + if ($name == '') + { + $data['message'] = 'INVALID PARAMETERS'; + $this->load->view ($this->VIEW_ERROR, $data); + return; + } + $name = $this->converter->HexToAscii ($name); $project = $this->projects->get ($projectid); @@ -120,8 +127,18 @@ class Wiki extends Controller } else if ($wiki === NULL) { - redirect ("wiki/create/{$projectid}/" . - $this->converter->AsciiToHex($name)); + if ($create) + { + redirect ("wiki/create/{$projectid}/" . + $this->converter->AsciiToHex($name)); + } + else + { + $data['message'] = + $this->lang->line('MSG_NO_SUCH_WIKI_PAGE') . + " - {$name}"; + $this->load->view ($this->VIEW_ERROR, $data); + } } else { @@ -133,6 +150,16 @@ class Wiki extends Controller } } + function show ($projectid = '' , $name = '') + { + $this->_show_wiki ($projectid, $name, TRUE); + } + + function show_r ($projectid = '' , $name = '') + { + $this->_show_wiki ($projectid, $name, FALSE); + } + function _edit_wiki ($projectid, $name, $mode) { $this->load->helper ('form'); @@ -228,7 +255,9 @@ class Wiki extends Controller } else if ($wiki == NULL) { - $data['message'] = "NO SUCH WIKI PAGE - $name"; + $data['message'] = + $this->lang->line('MSG_NO_SUCH_WIKI_PAGE') . + " - {$name}"; $this->load->view ($this->VIEW_ERROR, $data); } else @@ -251,17 +280,17 @@ class Wiki extends Controller } } - function create ($projectid, $name = "") + function create ($projectid = '', $name = '') { - return $this->_edit_wiki ($projectid, $name, "create"); + return $this->_edit_wiki ($projectid, $name, 'create'); } - function update ($projectid, $name) + function update ($projectid = '', $name = '') { - return $this->_edit_wiki ($projectid, $name, "update"); + return $this->_edit_wiki ($projectid, $name, 'update'); } - function delete ($projectid, $name) + function delete ($projectid = '', $name = '') { $this->load->helper ('form'); $this->load->library ('form_validation'); @@ -326,12 +355,12 @@ class Wiki extends Controller } else { - redirect ('wiki/home/' . $project->id); + redirect ("wiki/home/{$project->id}"); } } else { - redirect ('wiki/show/' . $project->id . '/' . + redirect ("wiki/show/{$project->id}/" . $this->converter->AsciiToHex($wiki->name)); } } @@ -352,7 +381,9 @@ class Wiki extends Controller } else if ($wiki === NULL) { - $data['message'] = "NO SUCH WIKI PAGE - $name"; + $data['message'] = + $this->lang->line('MSG_NO_SUCH_WIKI_PAGE') . + " - {$name}"; $this->load->view ($this->VIEW_ERROR, $data); } else diff --git a/codepot/src/codepot/language/english/common_lang.php b/codepot/src/codepot/language/english/common_lang.php index 56cf9eb9..2d3809c2 100644 --- a/codepot/src/codepot/language/english/common_lang.php +++ b/codepot/src/codepot/language/english/common_lang.php @@ -15,6 +15,7 @@ $lang['Difference'] = 'Diff'; $lang['Directory'] = 'Directory'; $lang['Download'] = 'Download'; $lang['Edit'] = 'Edit'; +$lang['Error'] = 'Error'; $lang['Head revision'] = 'Head revision'; $lang['History'] = 'History'; $lang['Home'] = 'Home'; @@ -64,6 +65,7 @@ $lang['MSG_NO_DIFF'] = 'No difference found'; $lang['MSG_NO_FILES_AVAIL'] = 'No files available'; $lang['MSG_NO_SOURCE_CODE_AVAIL'] = 'No source code available'; $lang['MSG_NO_SUCH_PROJECT'] = 'No such project'; +$lang['MSG_NO_SUCH_WIKI_PAGE'] = 'No such wiki page'; $lang['MSG_NO_WIKIS_AVAIL'] = 'No wiki pages available'; $lang['MSG_SURE_TO_DELETE_THIS'] = "I'm sure to delete this"; ?> diff --git a/codepot/src/codepot/language/indonesian/common_lang.php b/codepot/src/codepot/language/indonesian/common_lang.php index 6e8020e9..d00de863 100644 --- a/codepot/src/codepot/language/indonesian/common_lang.php +++ b/codepot/src/codepot/language/indonesian/common_lang.php @@ -15,6 +15,7 @@ $lang['Difference'] = 'Beda'; $lang['Directory'] = 'Direktori'; $lang['Download'] = 'Download'; $lang['Edit'] = 'Rubah'; +$lang['Error'] = 'Error'; $lang['Head revision'] = 'Kepala revisi'; $lang['History'] = 'Sejarah'; $lang['Home'] = 'Beranda'; @@ -54,15 +55,16 @@ $lang['Username'] = 'Nama pemakai'; $lang['Wiki'] = 'Wiki'; $lang['Wikis'] = 'Wiki'; -$lang['MSG_LOG_COMMIT_BY'] = 'committed by %s'; -$lang['MSG_LOG_CREATE_BY'] = 'created by %s'; -$lang['MSG_LOG_DELETE_BY'] = 'deleted by %s'; -$lang['MSG_LOG_UPDATE_BY'] = 'updated by %s'; +$lang['MSG_LOG_COMMIT_BY'] = 'Dicommit oleh %s'; +$lang['MSG_LOG_CREATE_BY'] = 'Dibuat oleh %s'; +$lang['MSG_LOG_DELETE_BY'] = 'Dihapus oleh %s'; +$lang['MSG_LOG_UPDATE_BY'] = 'Diupdate oleh %s'; $lang['MSG_NO_DIFF'] = 'Tidak ada bedanya'; $lang['MSG_NO_FILES_AVAIL'] = 'Tidak ada file tersedia'; $lang['MSG_NO_SOURCE_CODE_AVAIL'] = 'Tidak ada kode sumber tersedia'; $lang['MSG_NO_SUCH_PROJECT'] = 'No such project'; +$lang['MSG_NO_SUCH_WIKI_PAGE'] = 'No such wiki page'; $lang['MSG_NO_WIKIS_AVAIL'] = 'Tidak ada halaman wiki tersedia'; $lang['MSG_SURE_TO_DELETE_THIS'] = "Saya yakin untuk menghapus"; ?> diff --git a/codepot/src/codepot/language/korean/common_lang.php b/codepot/src/codepot/language/korean/common_lang.php index 07aa7f46..5c5a09d4 100644 --- a/codepot/src/codepot/language/korean/common_lang.php +++ b/codepot/src/codepot/language/korean/common_lang.php @@ -15,6 +15,7 @@ $lang['Difference'] = '차이점'; $lang['Directory'] = '디렉토리'; $lang['Download'] = '내려받기'; $lang['Edit'] = '수정'; +$lang['Error'] = '오류'; $lang['Head revision'] = '최신리비전'; $lang['History'] = '변경기록'; $lang['Home'] = '홈'; @@ -63,6 +64,7 @@ $lang['MSG_NO_DIFF'] = '차이점이 없습니다'; $lang['MSG_NO_FILES_AVAIL'] = '사용가능한 파일이 없습니다'; $lang['MSG_NO_SOURCE_CODE_AVAIL'] = '사용가능한 소스코드가 없습니다'; $lang['MSG_NO_SUCH_PROJECT'] = '프로젝트가 없습니다'; +$lang['MSG_NO_SUCH_WIKI_PAGE'] = '위키페이지가 없습니다'; $lang['MSG_NO_WIKIS_AVAIL'] = '사용가능한 위키페이지가 없습니다'; $lang['MSG_SURE_TO_DELETE_THIS'] = '반드시 이것을 삭제하고 싶어요'; ?> diff --git a/codepot/src/codepot/models/logmodel.php b/codepot/src/codepot/models/logmodel.php index 0bd67532..19be0972 100644 --- a/codepot/src/codepot/models/logmodel.php +++ b/codepot/src/codepot/models/logmodel.php @@ -14,8 +14,15 @@ class LogModel extends Model //$this->db->where ('type', 'code'); //$this->db->where ('action', 'commit'); + if ($projectid != '') $this->db->where ('projectid', $projectid); - $num = $this->db->count_all ('log'); + //$num = $this->db->count_all ('log'); + + $this->db->select ('count(id) as count'); + $query = $this->db->get ('log'); + $result = $query->result(); + + $num = empty($result)? 0: $result[0]->count; $this->db->trans_complete (); if ($this->db->trans_status() === FALSE) return FALSE; diff --git a/codepot/src/codepot/views/Makefile.am b/codepot/src/codepot/views/Makefile.am index 329e21a8..14a5880c 100644 --- a/codepot/src/codepot/views/Makefile.am +++ b/codepot/src/codepot/views/Makefile.am @@ -7,6 +7,7 @@ www_DATA = \ file_show.php \ footer.php \ index.html \ + log.php \ login.php \ project_delete.php \ project_edit.php \ @@ -15,6 +16,7 @@ www_DATA = \ projectbar.php \ site_edit.php \ site_delete.php \ + site_home.php \ source_blame.php \ source_diff.php \ source_file.php \ @@ -22,8 +24,6 @@ www_DATA = \ source_history.php \ source_revision.php \ taskbar.php \ - user_home.php \ - user_sitelog.php \ wiki_delete.php \ wiki_edit.php \ wiki_home.php \ diff --git a/codepot/src/codepot/views/Makefile.in b/codepot/src/codepot/views/Makefile.in index 604bb5e0..43ac6db5 100644 --- a/codepot/src/codepot/views/Makefile.in +++ b/codepot/src/codepot/views/Makefile.in @@ -170,6 +170,7 @@ www_DATA = \ file_show.php \ footer.php \ index.html \ + log.php \ login.php \ project_delete.php \ project_edit.php \ @@ -178,6 +179,7 @@ www_DATA = \ projectbar.php \ site_edit.php \ site_delete.php \ + site_home.php \ source_blame.php \ source_diff.php \ source_file.php \ @@ -185,8 +187,6 @@ www_DATA = \ source_history.php \ source_revision.php \ taskbar.php \ - user_home.php \ - user_sitelog.php \ wiki_delete.php \ wiki_edit.php \ wiki_home.php \ diff --git a/codepot/src/codepot/views/error.php b/codepot/src/codepot/views/error.php index e3879064..d8d5fc8d 100644 --- a/codepot/src/codepot/views/error.php +++ b/codepot/src/codepot/views/error.php @@ -1,6 +1,6 @@ - +lang->line('Error'); ?> @@ -39,7 +39,9 @@ $this->load->view ( - +load->view ('footer'); ?> + + diff --git a/codepot/src/codepot/views/user_sitelog.php b/codepot/src/codepot/views/log.php similarity index 70% rename from codepot/src/codepot/views/user_sitelog.php rename to codepot/src/codepot/views/log.php index 4894c00f..523c4e26 100644 --- a/codepot/src/codepot/views/user_sitelog.php +++ b/codepot/src/codepot/views/log.php @@ -15,7 +15,7 @@ -
+
@@ -25,12 +25,15 @@ load->view ( 'projectbar', array ( - 'project' => NULL, - 'site' => NULL, - 'pageid' => 'sitelog', + 'site' => $site, + 'project' => $project, + 'pageid' => ((isset($project) && $project != NULL)? 'project': 'sitelog'), 'ctxmenuitems' => array () ) ); @@ -38,15 +41,15 @@ $this->load->view ( -
+
-
+
lang->line ('Change log') ?>
-
+
- +
converter->AsciiToHex ('.'); @@ -54,6 +57,9 @@ $this->load->view ( $rowclasses = array ('odd', 'even'); $rowcount = 0; + $numcols = 4; + if (isset($project) && $project != NULL) $numcols--; + foreach ($log_entries as $log) { if ($log['type'] == 'code') @@ -71,8 +77,8 @@ $this->load->view ( if ($curdate != $date) { - print ""; - print ""; + print ""; + print ""; $curdate = $date; $rowcount = 0; } @@ -81,9 +87,12 @@ $this->load->view ( $rowcount++; print ''; - print ''; + if (!isset($project) || $project == NULL) + { + print ''; + } if ($log['type'] == 'code') @@ -114,11 +123,15 @@ $this->load->view ( { $uri = "/project/home/{$log['projectid']}"; } - else if ($log['type'] == 'wiki' || - $log['type'] == 'file') + else if ($log['type'] == 'wiki') { $hex = $this->converter->AsciiToHex ($log['message']); - $uri = "/{$log['type']}/show/{$log['projectid']}/{$hex}"; + $uri = "/wiki/show_r/{$log['projectid']}/{$hex}"; + } + else if ($log['type'] == 'file') + { + $hex = $this->converter->AsciiToHex ($log['message']); + $uri = "/file/show/{$log['projectid']}/{$hex}"; } $trimmed = preg_replace("/(.{10}).+/u", "$1…", $log['message']); @@ -145,16 +158,16 @@ $this->load->view ( } ?> - +
 
$date
 
$date
' . $time . ''; - print anchor ("/project/home/{$log['projectid']}", $log['projectid']); - print ''; + print anchor ("/project/home/{$log['projectid']}", $log['projectid']); + print '
-
+
-
+
load->view ('footer'); ?> -
+
diff --git a/codepot/src/codepot/views/login.php b/codepot/src/codepot/views/login.php index c8f92cf9..174f6d67 100644 --- a/codepot/src/codepot/views/login.php +++ b/codepot/src/codepot/views/login.php @@ -16,8 +16,8 @@
- lang->line('Home')) ?> - lang->line('Projects')) ?> + lang->line('Home')) ?> + lang->line('Projects')) ?>
diff --git a/codepot/src/codepot/views/project_home.php b/codepot/src/codepot/views/project_home.php index 9080919d..09615dfd 100644 --- a/codepot/src/codepot/views/project_home.php +++ b/codepot/src/codepot/views/project_home.php @@ -12,7 +12,7 @@ function render_wiki() creole_render_wiki ( "project_home_textpre", "project_home_textarea", - "/wiki/show/id?>/" + "/wiki/show/id?>/" ); } @@ -84,7 +84,7 @@ $this->load->view (
-lang->line('Change log') ?> +id}", $this->lang->line('Change log')) ?>
load->view ( { $uri = "/project/home/{$log['projectid']}"; } - else if ($log['type'] == 'wiki' || - $log['type'] == 'file') + else if ($log['type'] == 'wiki') { $hex = $this->converter->AsciiToHex ($log['message']); - $uri = "/{$log['type']}/show/{$log['projectid']}/{$hex}"; + $uri = "/wiki/show_r/{$log['projectid']}/{$hex}"; + } + else if ($log['type'] == 'file') + { + $hex = $this->converter->AsciiToHex ($log['message']); + $uri = "/file/show/{$log['projectid']}/{$hex}"; } $trimmed = preg_replace("/(.{20}).+/u", "$1…", $log['message']); diff --git a/codepot/src/codepot/views/user_home.php b/codepot/src/codepot/views/site_home.php similarity index 83% rename from codepot/src/codepot/views/user_home.php rename to codepot/src/codepot/views/site_home.php index 84bb63f5..bad993af 100644 --- a/codepot/src/codepot/views/user_home.php +++ b/codepot/src/codepot/views/site_home.php @@ -9,9 +9,9 @@ function render_wiki() { creole_render_wiki ( - "user_home_mainarea_textpre", - "user_home_mainarea_text", - "/user/home/" + "site_home_mainarea_textpre", + "site_home_mainarea_text", + "/site/home/" ); } @@ -25,7 +25,7 @@ function render_wiki() -
+
@@ -58,9 +58,9 @@ $this->load->view ( -
+
-
+
converter->AsciiToHex ('.'); foreach ($log_entries as $log) @@ -146,11 +146,15 @@ foreach ($latest_projects as $project) { $uri = "/project/home/{$log['projectid']}"; } - else if ($log['type'] == 'wiki' || - $log['type'] == 'file') + else if ($log['type'] == 'wiki') { $hex = $this->converter->AsciiToHex ($log['message']); - $uri = "/{$log['type']}/show/{$log['projectid']}/{$hex}"; + $uri = "/wiki/show_r/{$log['projectid']}/{$hex}"; + } + else if ($log['type'] == 'file') + { + $hex = $this->converter->AsciiToHex ($log['message']); + $uri = "/file/show/{$log['projectid']}/{$hex}"; } $trimmed = preg_replace("/(.{15}).+/u", "$1…", $log['message']); @@ -179,21 +183,21 @@ foreach ($latest_projects as $project)
- + -
-
- + load->view ('footer'); ?> - + diff --git a/codepot/src/codepot/views/taskbar.php b/codepot/src/codepot/views/taskbar.php index 97eb005b..a90952e9 100644 --- a/codepot/src/codepot/views/taskbar.php +++ b/codepot/src/codepot/views/taskbar.php @@ -8,7 +8,7 @@ function show_taskbar ($con, $loginid, $issysadmin) if (isset($loginid) && $loginid != '') { - print anchor ('user/preference', htmlspecialchars($loginid)); + print anchor ('site/preference', htmlspecialchars($loginid)); $hex = $con->converter->AsciiToHex (current_url()); print anchor ("main/signout/{$hex}", $con->lang->line('Sign out')); @@ -37,10 +37,10 @@ function show_taskbar ($con, $loginid, $issysadmin) print ''; print '
'; - print anchor ('user/home', $con->lang->line('Home')); - print anchor ('user/projectlist', $con->lang->line('Projects')); + print anchor ('site/home', $con->lang->line('Home')); + print anchor ('site/projectlist', $con->lang->line('Projects')); if ($issysadmin) - print anchor ('user/admin', $con->lang->line('System')); + print anchor ('site/admin', $con->lang->line('System')); print '
'; print ''; diff --git a/codepot/src/codepot/views/wiki_show.php b/codepot/src/codepot/views/wiki_show.php index c15f5b53..10055ebb 100644 --- a/codepot/src/codepot/views/wiki_show.php +++ b/codepot/src/codepot/views/wiki_show.php @@ -8,7 +8,19 @@ <?=htmlspecialchars($wiki->name)?> - + + +
@@ -65,14 +77,6 @@ $this->load->view (
- - diff --git a/codepot/src/config.php.in b/codepot/src/config.php.in index 4ef55cb7..61417066 100644 --- a/codepot/src/config.php.in +++ b/codepot/src/config.php.in @@ -29,10 +29,9 @@ function load_ini ($file) array ('sysadmin_userids', 'string', ''), array ('max_upload_size', 'string', '10000'), // kbytes array ('max_latest_projects', 'integer', 10), - array ('max_site_logs_per_page', 'integer', 50), - - array ('max_svn_commits', 'integer', 10), - array ('max_svn_commits_in_project', 'integer', 5), + array ('max_logs_per_page', 'integer', 50), + array ('max_logs_in_site_home', 'integer', 10), + array ('max_logs_in_project_home', 'integer', 5), array ('database_username', 'string', ''), array ('database_password', 'string', ''), diff --git a/codepot/src/css/project.css b/codepot/src/css/project.css index 83eb62d5..5d142b37 100644 --- a/codepot/src/css/project.css +++ b/codepot/src/css/project.css @@ -3,98 +3,99 @@ */ /*----------------------------------------------- - * user home view + * log view *-----------------------------------------------*/ -#user_home_mainarea_sidebar { - width: 24em; -} - -#user_home_mainarea_sidebar_log_table { - border-collapse: collapse; -} - -#user_home_mainarea_sidebar_log_table tr.odd { - background-color: #bbccef; -} - -#user_home_mainarea_sidebar_log_table tr.odd td { - white-space: nowrap; -} - -#user_home_mainarea_sidebar_log_table tr.odd td.date { - width: 1px; -} - -#user_home_mainarea_sidebar_log_table tr.even { - background-color: inherit; -} - -#user_home_mainarea_sidebar_log_table tr.even .description { - font-style: italic; -} - -#user_home_mainarea_sidebar_log_table tr.even pre.message { - border: 0; - margin: 1px; - background-color: inherit; - white-space: pre-wrap; -} - -/*----------------------------------------------- - * user sidelog view - *-----------------------------------------------*/ -#user_sitelog_mainarea_result { +#log_mainarea_result { overflow: auto; } -#user_sitelog_mainarea_result_table { +#log_mainarea_result_table { border-collapse: collapse; } -#user_sitelog_mainarea_result_table a { +#log_mainarea_result_table a { text-decoration: none; } -#user_sitelog_mainarea_result_table td { +#log_mainarea_result_table td { vertical-align: top; white-space: nowrap; } -#user_sitelog_mainarea_result_table td.break { +#log_mainarea_result_table td.break { font-size: 0.5em; } -#user_sitelog_mainarea_result_table td.date { +#log_mainarea_result_table td.date { font-weight: bold; background-color: #bbccef; } -#user_sitelog_mainarea_result_table td.time { +#log_mainarea_result_table td.time { width: 1px; color: #777777; } -#user_sitelog_mainarea_result_table td.details { +#log_mainarea_result_table td.details { white-space: normal; } -#user_sitelog_mainarea_result_table td.details .description { +#log_mainarea_result_table td.details .description { /*font-style: italic;*/ } -#user_sitelog_mainarea_result_table td.details pre.message { +#log_mainarea_result_table td.details pre.message { border: 0; margin: 1px; background-color: inherit; white-space: pre-wrap; } -#user_sitelog_mainarea_result_table td.pages { +#log_mainarea_result_table td.pages { padding-top: 1em; text-align: center; font-weight: bold; } + +/*----------------------------------------------- + * user home view + *-----------------------------------------------*/ +#site_home_mainarea_sidebar { + width: 24em; +} + +#site_home_mainarea_sidebar_log_table { + border-collapse: collapse; +} + +#site_home_mainarea_sidebar_log_table tr.odd { + background-color: #bbccef; +} + +#site_home_mainarea_sidebar_log_table tr.odd td { + white-space: nowrap; +} + +#site_home_mainarea_sidebar_log_table tr.odd td.date { + width: 1px; +} + +#site_home_mainarea_sidebar_log_table tr.even { + background-color: inherit; +} + +#site_home_mainarea_sidebar_log_table tr.even .description { + font-style: italic; +} + +#site_home_mainarea_sidebar_log_table tr.even pre.message { + border: 0; + margin: 1px; + background-color: inherit; + white-space: pre-wrap; +} + /*----------------------------------------------- * project home view *-----------------------------------------------*/ @@ -116,12 +117,10 @@ #project_home_mainarea_sidebar_log_table tr.even { background-color: inherit; - /*font-size: 0.9em;*/ - font-style: italic; } #project_home_mainarea_sidebar_log_table tr.even .description { - /*font-style: italic;*/ + font-style: italic; } #project_home_mainarea_sidebar_log_table tr.even pre.message { diff --git a/codepot/src/websvn/blame.php b/codepot/src/websvn/blame.php index c26b352e..ab8a7604 100644 --- a/codepot/src/websvn/blame.php +++ b/codepot/src/websvn/blame.php @@ -67,7 +67,7 @@ if ($rev != $youngest) { $vars['indexurl'] = $config->getURL($rep, '', 'index'); $vars['repurl'] = $config->getURL($rep, '', 'dir'); -$vars['codepot_userhomeurl'] = $config->getURL($rep, '', 'codepot_userhome'); +$vars['codepot_sitehomeurl'] = $config->getURL($rep, '', 'codepot_sitehome'); $vars['codepot_projectlisturl'] = $config->getURL($rep, '', 'codepot_projectlist'); $vars['codepot_indexurl'] = $config->getURL($rep, '', 'codepot_index'); $vars['codepot_wikiurl'] = $config->getURL($rep, '', 'codepot_wiki'); diff --git a/codepot/src/websvn/comp.php b/codepot/src/websvn/comp.php index 1d9125d3..bb110591 100644 --- a/codepot/src/websvn/comp.php +++ b/codepot/src/websvn/comp.php @@ -79,7 +79,7 @@ if (!@$_REQUEST["manualorder"] && is_numeric($rev1) && is_numeric($rev2)) { $vars['indexurl'] = $config->getURL($rep, '', 'index'); $vars['repurl'] = $config->getURL($rep, '', 'dir'); -$vars['codepot_userhomeurl'] = $config->getURL($rep, '', 'codepot_userhome'); +$vars['codepot_sitehomeurl'] = $config->getURL($rep, '', 'codepot_sitehome'); $vars['codepot_projectlisturl'] = $config->getURL($rep, '', 'codepot_projectlist'); $vars['codepot_indexurl'] = $config->getURL($rep, '', 'codepot_index'); $vars['codepot_wikiurl'] = $config->getURL($rep, '', 'codepot_wiki'); diff --git a/codepot/src/websvn/diff.php b/codepot/src/websvn/diff.php index fd51bc82..11663f44 100644 --- a/codepot/src/websvn/diff.php +++ b/codepot/src/websvn/diff.php @@ -81,7 +81,7 @@ if ($rev != $youngest) { $vars['indexurl'] = $config->getURL($rep, '', 'index'); $vars['repurl'] = $config->getURL($rep, '', 'dir'); -$vars['codepot_userhomeurl'] = $config->getURL($rep, '', 'codepot_userhome'); +$vars['codepot_sitehomeurl'] = $config->getURL($rep, '', 'codepot_sitehome'); $vars['codepot_projectlisturl'] = $config->getURL($rep, '', 'codepot_projectlist'); $vars['codepot_indexurl'] = $config->getURL($rep, '', 'codepot_index'); $vars['codepot_wikiurl'] = $config->getURL($rep, '', 'codepot_wiki'); diff --git a/codepot/src/websvn/filedetails.php b/codepot/src/websvn/filedetails.php index acd189c7..0e1c5da5 100644 --- a/codepot/src/websvn/filedetails.php +++ b/codepot/src/websvn/filedetails.php @@ -128,7 +128,7 @@ createDirLinks($rep, $ppath, $passrev); $vars['indexurl'] = $config->getURL($rep, '', 'index'); $vars['repurl'] = $config->getURL($rep, '', 'dir'); -$vars['codepot_userhomeurl'] = $config->getURL($rep, '', 'codepot_userhome'); +$vars['codepot_sitehomeurl'] = $config->getURL($rep, '', 'codepot_sitehome'); $vars['codepot_projectlisturl'] = $config->getURL($rep, '', 'codepot_projectlist'); $vars['codepot_indexurl'] = $config->getURL($rep, '', 'codepot_index'); $vars['codepot_wikiurl'] = $config->getURL($rep, '', 'codepot_wiki'); diff --git a/codepot/src/websvn/include/configclass.php b/codepot/src/websvn/include/configclass.php index 2012a5ba..bbb2a418 100644 --- a/codepot/src/websvn/include/configclass.php +++ b/codepot/src/websvn/include/configclass.php @@ -741,7 +741,7 @@ class WebSvnConfig { $codepot_base = dirname(dirname($_SERVER['PHP_SELF'])); if ($codepot_base == '/') $codepot_base = ''; if ($op == 'codepot_userhome') - $url = "{$codepot_base}/index.php/user/home"; + $url = "{$codepot_base}/index.php/site/home"; else if ($op == 'codepot_projectlist') $url = "{$codepot_base}/index.php/user/projectlist"; else if ($op == 'codepot_index' || $op == 'index') { diff --git a/codepot/src/websvn/index.php b/codepot/src/websvn/index.php index a46b4a3c..96f2c267 100644 --- a/codepot/src/websvn/index.php +++ b/codepot/src/websvn/index.php @@ -108,7 +108,7 @@ if ($config->flatIndex) { } $vars['indexurl'] = $config->getURL($rep, '', 'index'); -$vars['codepot_userhomeurl'] = $config->getURL($rep, '', 'codepot_userhome'); +$vars['codepot_sitehomeurl'] = $config->getURL($rep, '', 'codepot_sitehome'); $vars['codepot_projectlisturl'] = $config->getURL($rep, '', 'codepot_projectlist'); $vars['codepot_indexurl'] = $config->getURL($rep, '', 'codepot_index'); $vars['codepot_wikiurl'] = $config->getURL($rep, '', 'codepot_wiki'); diff --git a/codepot/src/websvn/listing.php b/codepot/src/websvn/listing.php index 78b7ea27..d877b09b 100644 --- a/codepot/src/websvn/listing.php +++ b/codepot/src/websvn/listing.php @@ -302,7 +302,7 @@ $vars['logurl'] = $logurl.'rev='.$passrev.'&isdir=1'; $vars['indexurl'] = $config->getURL($rep, '', 'index'); $vars['repurl'] = $config->getURL($rep, '', 'dir'); -$vars['codepot_userhomeurl'] = $config->getURL($rep, '', 'codepot_userhome'); +$vars['codepot_sitehomeurl'] = $config->getURL($rep, '', 'codepot_sitehome'); $vars['codepot_projectlisturl'] = $config->getURL($rep, '', 'codepot_projectlist'); $vars['codepot_indexurl'] = $config->getURL($rep, '', 'codepot_index'); $vars['codepot_wikiurl'] = $config->getURL($rep, '', 'codepot_wiki'); diff --git a/codepot/src/websvn/log.php b/codepot/src/websvn/log.php index 38b3598f..87811bea 100644 --- a/codepot/src/websvn/log.php +++ b/codepot/src/websvn/log.php @@ -109,7 +109,7 @@ createDirLinks($rep, $ppath, $passrev); $vars['indexurl'] = $config->getURL($rep, '', 'index'); $vars['repurl'] = $config->getURL($rep, '', 'dir'); -$vars['codepot_userhomeurl'] = $config->getURL($rep, '', 'codepot_userhome'); +$vars['codepot_sitehomeurl'] = $config->getURL($rep, '', 'codepot_sitehome'); $vars['codepot_projectlisturl'] = $config->getURL($rep, '', 'codepot_projectlist'); $vars['codepot_indexurl'] = $config->getURL($rep, '', 'codepot_index'); $vars['codepot_wikiurl'] = $config->getURL($rep, '', 'codepot_wiki'); diff --git a/codepot/src/websvn/revision.php b/codepot/src/websvn/revision.php index 8746e16a..964fc86b 100644 --- a/codepot/src/websvn/revision.php +++ b/codepot/src/websvn/revision.php @@ -131,7 +131,7 @@ $vars['logurl'] = $logurl.'rev='.$passrev.'&isdir=1'; $vars['indexurl'] = $config->getURL($rep, '', 'index'); $vars['repurl'] = $config->getURL($rep, '', 'dir'); -$vars['codepot_userhomeurl'] = $config->getURL($rep, '', 'codepot_userhome'); +$vars['codepot_sitehomeurl'] = $config->getURL($rep, '', 'codepot_sitehome'); $vars['codepot_projectlisturl'] = $config->getURL($rep, '', 'codepot_projectlist'); $vars['codepot_indexurl'] = $config->getURL($rep, '', 'codepot_index'); $vars['codepot_wikiurl'] = $config->getURL($rep, '', 'codepot_wiki'); diff --git a/codepot/src/websvn/templates/calm/blame.tmpl b/codepot/src/websvn/templates/calm/blame.tmpl index ad014aef..5c298c65 100755 --- a/codepot/src/websvn/templates/calm/blame.tmpl +++ b/codepot/src/websvn/templates/calm/blame.tmpl @@ -7,7 +7,7 @@
- [lang:HOME] + [lang:HOME] [lang:PROJECTS]
diff --git a/codepot/src/websvn/templates/calm/compare.tmpl b/codepot/src/websvn/templates/calm/compare.tmpl index ea717491..eb16ea06 100755 --- a/codepot/src/websvn/templates/calm/compare.tmpl +++ b/codepot/src/websvn/templates/calm/compare.tmpl @@ -9,7 +9,7 @@
- [lang:HOME] + [lang:HOME] [lang:PROJECTS]
diff --git a/codepot/src/websvn/templates/calm/diff.tmpl b/codepot/src/websvn/templates/calm/diff.tmpl index 88b61146..b21817dc 100755 --- a/codepot/src/websvn/templates/calm/diff.tmpl +++ b/codepot/src/websvn/templates/calm/diff.tmpl @@ -10,7 +10,7 @@
- [lang:HOME] + [lang:HOME] [lang:PROJECTS]
diff --git a/codepot/src/websvn/templates/calm/directory.tmpl b/codepot/src/websvn/templates/calm/directory.tmpl index 69ff71e4..ec786b07 100755 --- a/codepot/src/websvn/templates/calm/directory.tmpl +++ b/codepot/src/websvn/templates/calm/directory.tmpl @@ -7,7 +7,7 @@
- [lang:HOME] + [lang:HOME] [lang:PROJECTS]
diff --git a/codepot/src/websvn/templates/calm/file.tmpl b/codepot/src/websvn/templates/calm/file.tmpl index 80029c05..e1365cea 100755 --- a/codepot/src/websvn/templates/calm/file.tmpl +++ b/codepot/src/websvn/templates/calm/file.tmpl @@ -7,7 +7,7 @@
- [lang:HOME] + [lang:HOME] [lang:PROJECTS]
diff --git a/codepot/src/websvn/templates/calm/log.tmpl b/codepot/src/websvn/templates/calm/log.tmpl index 3c51136e..c9845ab3 100755 --- a/codepot/src/websvn/templates/calm/log.tmpl +++ b/codepot/src/websvn/templates/calm/log.tmpl @@ -7,7 +7,7 @@
- [lang:HOME] + [lang:HOME] [lang:PROJECTS]
diff --git a/codepot/src/websvn/templates/calm/revision.tmpl b/codepot/src/websvn/templates/calm/revision.tmpl index c93910e4..ec0f79c5 100644 --- a/codepot/src/websvn/templates/calm/revision.tmpl +++ b/codepot/src/websvn/templates/calm/revision.tmpl @@ -7,7 +7,7 @@
- [lang:HOME] + [lang:HOME] [lang:PROJECTS]