Mercurial > public > src > phphgadmin

changeset 64:fd0ea86d2bf4 1.1.20100623

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Clean up unused files in preparation for 1.1.20100623 release
author joshjcarrier
date Wed, 23 Jun 2010 11:18:57 -0700
parents e4483bbdc31e
children 606dd2a169a8
files .hgignore README.txt admin/application/config/mantis_auth.php admin/application/config/phphgadmin_core.php admin/application/libraries/hg_filesystem.php admin/application/libraries/iniparser.php admin/application/libraries/phphgadmin.php admin/themes/mercurial/index.html admin/themes/mercurial/views/coal.php admin/themes/mercurial/views/gitweb.php admin/themes/mercurial/views/index.html admin/themes/mercurial/views/monoblue.php
diffstat 12 files changed, 36 insertions(+), 276 deletions(-) [+]
line wrap: on
line diff
--- a/.hgignore	Mon Jun 14 01:17:59 2010 -0700
+++ b/.hgignore	Wed Jun 23 11:18:57 2010 -0700
@@ -2,4 +2,6 @@
 syntax: regexp
 ^admin/lock$
 syntax: regexp
-^cgi-bin$
\ No newline at end of file
+^cgi-bin$
+syntax: regexp
+^_media$
\ No newline at end of file
--- a/README.txt	Mon Jun 14 01:17:59 2010 -0700
+++ b/README.txt	Wed Jun 23 11:18:57 2010 -0700
@@ -31,15 +31,20 @@
 Web: http://redirect.joshjcarrier.com/?r=hgphp
 
 Changelog:
-1.1.xxx (unstable)
+1.1.201023
 - rebranded to phpHgAdmin
 - framework revised
 - support for multiple hgweb.config
 - much more customizable and flexible installation
-- blacklists creation of a repo derived from config 'base_url' instead of value "admin"
-	where $config['base_url'] = http://www.contoso.com/hgadmin will blacklist "hgadmin"
 - multiple bug fixes
-Upgrade warning: fresh install recommended due to significant changes.
+Upgrade warning: 
+	Fresh install recommended due to significant changes. hgweb.config [paths] section is now modified in preference to [collections].
+	You should manually repair the hgweb.config file. An entry:
+		[collections]
+		/path/to/repo/name = name
+		should now be referred to as
+		[paths]
+		name = /path/to/repo/name 
 
 1.0.20100519
 - initial release
--- a/admin/application/config/mantis_auth.php	Mon Jun 14 01:17:59 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,7 +0,0 @@
-<?php  if (!defined('BASEPATH')) exit('No direct script access allowed');
-
-/*
- * 
- */
-$config['administrators'] = array('joshjcarrier', 'gnat123');
-$config['mantis_root'] = '/home/joshjca1/public_html/bugs.joshjcarrier.com/mantisbt/';
--- a/admin/application/config/phphgadmin_core.php	Mon Jun 14 01:17:59 2010 -0700
+++ b/admin/application/config/phphgadmin_core.php	Wed Jun 23 11:18:57 2010 -0700
@@ -23,7 +23,7 @@
 define('HGPHP_REPO_STATUS_MISSING', 2);
 
 define('HGPHP_NAME', 'phpHgAdmin Mercurial Repository Manager');
-define('HGPHP_VERSION', '1.1.20100614');
+define('HGPHP_VERSION', '1.1.20100623');
 define('HGPHP_AUTHOR_NAME', 'Josh Carrier');
 define('HGPHP_AUTHOR_LINK', 'http://www.joshjcarrier.com');
 
--- a/admin/application/libraries/hg_filesystem.php	Mon Jun 14 01:17:59 2010 -0700
+++ b/admin/application/libraries/hg_filesystem.php	Wed Jun 23 11:18:57 2010 -0700
@@ -1,5 +1,12 @@
 <?php
-
+/**
+ * File system manipulation for Mercurial-based actions.
+ * @package        	CodeIgniter
+ * @subpackage    	Libraries
+ * @category    	Libraries
+ * @author 			Josh Carrier
+ * @link			blog.joshjcarrier.com
+ */
 class Hg_Filesystem
 {
 	private $_ci;
--- a/admin/application/libraries/iniparser.php	Mon Jun 14 01:17:59 2010 -0700
+++ b/admin/application/libraries/iniparser.php	Wed Jun 23 11:18:57 2010 -0700
@@ -86,6 +86,10 @@
 	}
 }
 
+/**
+ * An object which represents key-values of an ini file.
+ * This implementation is necessary as certain values of a key are illegal in the PHP implementation (attempts to store as associative array).
+ */
 class ini64
 {
 	private $_values;
--- a/admin/application/libraries/phphgadmin.php	Mon Jun 14 01:17:59 2010 -0700
+++ b/admin/application/libraries/phphgadmin.php	Wed Jun 23 11:18:57 2010 -0700
@@ -1,5 +1,15 @@
 <?php
-
+/**
+ * Moderates all actions between the application controllers and the underlying libraries,
+ * - permissions
+ * - optimistic locking
+ * - error catching
+ * @package        	CodeIgniter
+ * @subpackage    	Libraries
+ * @category    	Libraries
+ * @author 			Josh Carrier
+ * @link			blog.joshjcarrier.com
+ */
 class phpHgAdmin
 {
 	private $_ci;
--- a/admin/themes/mercurial/index.html	Mon Jun 14 01:17:59 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>
\ No newline at end of file
--- a/admin/themes/mercurial/views/coal.php	Mon Jun 14 01:17:59 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,81 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> 
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> 
-<head> 
-<link rel="icon" href="<?php echo base_url(); ?>static/hgicon.png" type="image/png" /> 
-<meta name="robots" content="index, nofollow" /> 
-<link rel="stylesheet" href="<?php echo base_url(); ?>static/style-coal.css" type="text/css" /> 
-<link rel="stylesheet" href="<?php echo base_url(); ?>themes/mercurial/css/smoothness/jquery-ui-1.8.1.custom.css" type="text/css" /> 
-<script type="text/javascript" src="<?php echo base_url(); ?>themes/mercurial/js/jquery-1.4.2.min.js"></script>
-<script type="text/javascript" src="<?php echo base_url(); ?>themes/mercurial/js/jquery-ui-1.8.1.custom.min.js"></script>
-
-<title><?php echo $template['title']; ?></title> 
-
-<style type="text/css">
-.dialog_link {padding: .4em 1em .4em 20px;text-decoration: none;position: relative; font-size: 70%;}
-.dialog_link span.ui-icon {margin: 0 5px 0 0;position: absolute;left: .2em;top: 50%;margin-top: -8px;}
-.ui-dialog-content {font-size: 70%;}
-.ui-dialog-title {font-size: 70%;}
-.ui-dialog-buttonpane {font-size: 70%;}
-</style>
-</head> 
-<body> 
- 
-<div class="container"> 
-<div class="menu"> 
-<a href="http://mercurial.selenic.com/"> 
-<img src="<?php echo base_url(); ?>static/hglogo.png" width=75 height=90 border=0 alt="mercurial" /></a> 
-</div> 
-<div class="main"> 
-<h2><?php echo htmlentities($template['title']); ?></h2> 
- 
-<table class="bigtable" style="border-bottom: 0">
-  <tr>
-    <td> 
-	<a href="<?php echo base_url()?>"><?php echo lang('hgphp_title_adminhome'); ?></a> | <a href="/"><?php echo lang('hgphp_title_listingshome'); ?></a>
-    </td>
-  </tr>
-<?php if(isset($template['partials']['user_err'])): ?>
-  <tr>
-    <td>
-		<div class="ui-widget">
-			<div class="ui-state-error ui-corner-all" style="padding: 0 .7em;font-size: 70%;"> 
-				<p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span> 
-				<strong><?php echo lang('hgphp_msg_err'); ?>:</strong> <?php echo $template['partials']['user_err']; ?></p>
-			</div>
-		</div>
-    </td>
-  </tr>
-<?php endif; ?>
-<?php if(isset($template['partials']['user_msg'])): ?>
-  <tr>
-    <td>
-		<div class="ui-widget">
-			<div class="ui-state-highlight ui-corner-all" style="padding: 0 .7em;font-size: 70%;"> 
-				<p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
-				<?php echo $template['partials']['user_msg']; ?></p>
-			</div>
-		</div>
-    </td>
-  </tr>
-<?php endif; ?>
-  <tr>
-    <td> 
-<?php echo $template['body']; ?>
-    </td>
-  </tr>
-  <tr>
-  	<td>
-<span style="background:#ffc;font-size:70%;">
-Processed in {elapsed_time} seconds. <?php echo HGPHP_NAME; ?> v<?php echo HGPHP_VERSION; ?> <a href="<?php echo HGPHP_AUTHOR_LINK; ?>"><?php echo HGPHP_AUTHOR_NAME; ?></a>. 
-</span>  	
-  	</td>
-  </tr>
-</table>
-
-</div> 
-
-</div> 
-  
-</body> 
-</html> 
- 
\ No newline at end of file
--- a/admin/themes/mercurial/views/gitweb.php	Mon Jun 14 01:17:59 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> 
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> 
-<head> 
-<link rel="icon" href="<?php echo base_url(); ?>static/hgicon.png" type="image/png" /> 
-<meta name="robots" content="index, nofollow" /> 
-<link rel="stylesheet" href="<?php echo base_url(); ?>static/style-gitweb.css" type="text/css" /> 
-<link rel="stylesheet" href="<?php echo base_url(); ?>themes/mercurial/css/smoothness/jquery-ui-1.8.1.custom.css" type="text/css" /> 
-<script type="text/javascript" src="<?php echo base_url(); ?>themes/mercurial/js/jquery-1.4.2.min.js"></script>
-<script type="text/javascript" src="<?php echo base_url(); ?>themes/mercurial/js/jquery-ui-1.8.1.custom.min.js"></script>
-
-<title><?php echo $template['title']; ?></title> 
-
-<style type="text/css">
-.dialog_link {padding: .4em 1em .4em 20px;text-decoration: none;position: relative; font-size: 70%;}
-.dialog_link span.ui-icon {margin: 0 5px 0 0;position: absolute;left: .2em;top: 50%;margin-top: -8px;}
-.ui-dialog-content {font-size: 70%;}
-.ui-dialog-title {font-size: 70%;}
-.ui-dialog-buttonpane {font-size: 70%;}
-</style>
-</head> 
-<body> 
- 
-<div class="page_header"> 
-<a href="http://mercurial.selenic.com/" title="Mercurial" style="float: right;">Mercurial</a><?php echo htmlentities($template['title']); ?>
-
-</div> 
- 
-<div class="page_nav"> 
-<a href="<?php echo base_url()?>"><?php echo lang('hgphp_title_adminhome'); ?></a> |
-<a href="/"><?php echo lang('hgphp_title_listingshome'); ?></a>
-<br/> 
-</div>  
-<table cellspacing="0"> 
-
-<?php if(isset($template['partials']['user_err'])): ?>
-  <tr>
-    <td>
-		<div class="ui-widget">
-			<div class="ui-state-error ui-corner-all" style="padding: 0 .7em;font-size: 70%;"> 
-				<p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span> 
-				<strong><?php echo lang('hgphp_msg_err'); ?>:</strong> <?php echo $template['partials']['user_err']; ?></p>
-			</div>
-		</div>
-    </td>
-  </tr>
-<?php endif; ?>
-<?php if(isset($template['partials']['user_msg'])): ?>
-  <tr>
-    <td>
-		<div class="ui-widget">
-			<div class="ui-state-highlight ui-corner-all" style="padding: 0 .7em;font-size: 70%;"> 
-				<p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
-				<?php echo $template['partials']['user_msg']; ?></p>
-			</div>
-		</div>
-    </td>
-  </tr>
-<?php endif; ?>
-  <tr>
-    <td> 
-<?php echo $template['body']; ?>
-    </td>
-  </tr>
-  <tr>
-  	<td>
-<span style="background:#ffc;font-size:70%;">
-Processed in {elapsed_time} seconds. <?php echo HGPHP_NAME; ?> v<?php echo HGPHP_VERSION; ?> <a href="<?php echo HGPHP_AUTHOR_LINK; ?>"><?php echo HGPHP_AUTHOR_NAME; ?></a>. 
-</span>  	
-  	</td>
-  </tr>
-</table>
-
-</body> 
-</html> 
- 
\ No newline at end of file
--- a/admin/themes/mercurial/views/index.html	Mon Jun 14 01:17:59 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,10 +0,0 @@
-<html>
-<head>
-	<title>403 Forbidden</title>
-</head>
-<body>
-
-<p>Directory access is forbidden.</p>
-
-</body>
-</html>
\ No newline at end of file
--- a/admin/themes/mercurial/views/monoblue.php	Mon Jun 14 01:17:59 2010 -0700
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN" "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"> 
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en-US"> 
-<head> 
-<link rel="icon" href="<?php echo base_url(); ?>static/hgicon.png" type="image/png" /> 
-<meta name="robots" content="index, nofollow" /> 
-<link rel="stylesheet" href="<?php echo base_url(); ?>static/style-monoblue.css" type="text/css" /> 
-<link rel="stylesheet" href="<?php echo base_url(); ?>themes/mercurial/css/smoothness/jquery-ui-1.8.1.custom.css" type="text/css" /> 
-<script type="text/javascript" src="<?php echo base_url(); ?>themes/mercurial/js/jquery-1.4.2.min.js"></script>
-<script type="text/javascript" src="<?php echo base_url(); ?>themes/mercurial/js/jquery-ui-1.8.1.custom.min.js"></script>
-
-<title><?php echo $template['title']; ?></title> 
-
-<style type="text/css">
-.dialog_link {padding: .4em 1em .4em 20px;text-decoration: none;position: relative; font-size: 80%;}
-.dialog_link span.ui-icon {margin: 0 5px 0 0;position: absolute;left: .2em;top: 50%;margin-top: -8px;}
-.ui-dialog-content {font-size: 90%;}
-.ui-dialog-title {font-size: 90%;}
-.ui-dialog-buttonpane {font-size: 90%;}
-</style>
-</head> 
- 
-<body> 
-<div id="container"> 
-    <div class="page-header"> 
-        <h1><?php echo htmlentities($template['title']); ?></h1> 
-    </div> 
-
-        <ul class="submenu"> 
-        	<li class="current"><a href="<?php echo base_url()?>"><?php echo lang('hgphp_title_adminhome'); ?></a></li> 
-			<li><a href="/"><?php echo lang('hgphp_title_listingshome'); ?></a></li>     
-    	</ul> 
- 
-    <table> 
-
-<?php if(isset($template['partials']['user_err'])): ?>
-  <tr>
-    <td>
-		<div class="ui-widget">
-			<div class="ui-state-error ui-corner-all" style="padding: 0 .7em;font-size: 70%;"> 
-				<p><span class="ui-icon ui-icon-alert" style="float: left; margin-right: .3em;"></span> 
-				<strong><?php echo lang('hgphp_msg_err'); ?>:</strong> <?php echo $template['partials']['user_err']; ?></p>
-			</div>
-		</div>
-    </td>
-  </tr>
-<?php endif; ?>
-<?php if(isset($template['partials']['user_msg'])): ?>
-  <tr>
-    <td>
-		<div class="ui-widget">
-			<div class="ui-state-highlight ui-corner-all" style="padding: 0 .7em;font-size: 70%;"> 
-				<p><span class="ui-icon ui-icon-info" style="float: left; margin-right: .3em;"></span>
-				<?php echo $template['partials']['user_msg']; ?></p>
-			</div>
-		</div>
-    </td>
-  </tr>
-<?php endif; ?>
-  <tr>
-    <td> 
-<?php echo $template['body']; ?>
-    </td>
-  </tr>
-  <tr>
-  	<td>
-<span style="background:#ffc;font-size:70%;">
-Processed in {elapsed_time} seconds. <?php echo HGPHP_NAME; ?> v<?php echo HGPHP_VERSION; ?> <a href="<?php echo HGPHP_AUTHOR_LINK; ?>"><?php echo HGPHP_AUTHOR_NAME; ?></a>. 
-</span>  	
-  	</td>
-  </tr>
-</table> 
-    <div id="powered-by"> 
-        <p><a href="http://mercurial.selenic.com/" title="Mercurial"><img src="<?php echo base_url(); ?>static/hglogo.png" width=75 height=90 border=0 alt="mercurial"></a></p> 
-    </div> 
- 
-    <div id="corner-top-left"></div> 
-    <div id="corner-top-right"></div> 
-    <div id="corner-bottom-left"></div> 
-    <div id="corner-bottom-right"></div> 
- 
-</div> 
- 
-</body> 
-</html> 
- 
\ No newline at end of file