Skip to content

Commit

Permalink
Merge from 1.2 branch
Browse files Browse the repository at this point in the history 
1.2.5.7 update file
Internationalization 
mysql password to md5
depricated functions
updated buttons in UI
0000275: [User Interface] Search by filename is hardcoded to be non-wildcard (logart) - resolved.
new logo

git-svn-id: http://opendocman.svn.sourceforge.net/svnroot/opendocman/opendocman/trunk@716 769e0422-6c0b-0410-966c-d94082ee0ac6
  • Loading branch information
logart committed May 29, 2010
1 parent 5f4118f commit 1b1bad8
Show file tree
Hide file tree
Showing 50 changed files with 717 additions and 657 deletions.
18 changes: 14 additions & 4 deletions User_class.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -145,20 +145,30 @@ function getPassword()

function changePassword($non_encrypted_password)
{
$query = "UPDATE $this->tablename SET $this->tablename.password=password('". addslashes($non_encrypted_password) ."') WHERE $this->tablename.id=$this->id";
$query = "UPDATE $this->tablename SET $this->tablename.password=md5('". addslashes($non_encrypted_password) ."') WHERE $this->tablename.id=$this->id";
$result = mysql_query($query, $this->connection) or die("Error in querying: $query" . mysql_error() );
return true;
}

function validatePassword($non_encrypted_password)
{
$query = "SELECT $this->tablename.username FROM $this->tablename WHERE $this->tablename.id=$this->id and password= password('". addslashes($non_encrypted_password) ."')";
$query = "SELECT $this->tablename.username FROM $this->tablename WHERE $this->tablename.id=$this->id and password= md5('". addslashes($non_encrypted_password) ."')";
$result = mysql_query($query, $this->connection) or die("Error in querying: $query" . mysql_error() );
if(mysql_num_rows($result) == 1)
{
return true;
return true;
}
return false;
else
{
// Check the old password() style user password
$query = "SELECT $this->tablename.username FROM $this->tablename WHERE $this->tablename.id=$this->id and password=password('". addslashes($non_encrypted_password) ."')";
$result = mysql_query($query, $this->connection) or die("Error in querying: $query" . mysql_error() );
if(mysql_num_rows($result) == 1)
{
return true;
}
}
return false;
}

function changeName($new_name)
Expand Down
50 changes: 25 additions & 25 deletions add.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,9 +40,9 @@
{
$_REQUEST['last_message']='';
}
draw_header('Add New File');
draw_header(msg('area_add_new_file'));
draw_menu($_SESSION['uid']);
draw_status_bar('Add new document', $_REQUEST['last_message']);
draw_status_bar(msg('area_add_new_file'), $_REQUEST['last_message']);
echo '<body bgcolor="white">';
echo '<center>'."\n".'<table border="0" cellspacing="5" cellpadding="5">'."\n";
//////////////////////////Get Current User's department id///////////////////
Expand Down Expand Up @@ -113,8 +113,8 @@ function issetFlag()
var default_Setting_pos = 0;
var all_Setting_pos = 1;
var departments = new Array();
var default_Setting = new Department("Default Setting for Unset Department", "0", "0");
var all_Setting = new Department("All", "0", "0");
var default_Setting = new Department("<?php echo msg('label_default_for_unset')?>", "0", "0");
var all_Setting = new Department("<?php echo msg('all')?>", "0", "0");
departments[all_Setting_pos] = all_Setting;
departments[default_Setting_pos] = default_Setting;
/////////////////////////Populate Department obj////////////////////////////////
Expand All @@ -133,17 +133,16 @@ function issetFlag()
<script type="text/javascript"src="functions.js"></script>
<!-- file upload formu using ENCTYPE -->
<form name="main" action="<?php echo $_SERVER['PHP_SELF']; ?>" method="POST" enctype="multipart/form-data">
<input type="hidden" name="MAX_FILE_SIZE" value="50000000">
<tr>
<td>
<a class="body" tabindex=1 href="help.html#Add_File_-_File_Location" onClick="return popup(this, 'Help')" style="text-decoration:none">File Location</a>
<a class="body" tabindex=1 href="help.html#Add_File_-_File_Location" onClick="return popup(this, 'Help')" style="text-decoration:none"><?php echo msg('label_file_location');?></a>
</td>
<td colspan=3><input tabindex="0" name="file" type="file">
</td>
</tr>
<tr>
<td>
<a class="body" tabindex= href="help.html#Add_File_-_Category" onClick="return popup(this, 'Help')" style="text-decoration:none">Category</a>
<a class="body" tabindex= href="help.html#Add_File_-_Category" onClick="return popup(this, 'Help')" style="text-decoration:none"><?php echo msg('category');?></a>
</td>
<td colspan=3><select tabindex=2 name="category" >
<?php
Expand All @@ -164,12 +163,12 @@ function issetFlag()
<!-- Set Department rights on the file -->
<TR>
<TD>
<a class="body" href="help.html#Add_File_-_Department" onClick="return popup(this, 'Help')" style="text-decoration:none">Department</a>
<a class="body" href="help.html#Add_File_-_Department" onClick="return popup(this, 'Help')" style="text-decoration:none"><?php echo msg('department');?></a>
</TD>
<TD COLSPAN=3><SELECT tabindex=3 NAME="dept_drop_box" onChange ="loadDeptData(this.selectedIndex)">
<option value=0> Select a Department</option>
<option value=1> Default Setting for Unset Department</option>
<option value=2> All Departments</option>
<option value=0> <?php echo msg('label_select_a_department');?></option>
<option value=1> <?php echo msg('label_default_for_unset');?></option>
<option value=2> <?php echo msg('label_all_departments');?></option>
<?php
//////Populate department drop down list/////////////////
$query = "SELECT id, name FROM {$GLOBALS['CONFIG']['db_prefix']}department ORDER BY name";
Expand All @@ -188,7 +187,7 @@ function issetFlag()
</TR>
<TR>
<!-- Loading Authority radio_button group -->
<TD><a tabindex="4" class="body" href="help.html#Add_File_-_Authority" onClick="return popup(this, 'Help')" style="text-decoration:none">Authority</a></td>
<TD><a tabindex="4" class="body" href="help.html#Add_File_-_Authority" onClick="return popup(this, 'Help')" style="text-decoration:none"><?php echo msg('label_department_authority')?></a></td>
<!-- <TD><a href="help.html" onClick="return popup(this, 'Help')">Authority</a></TD> -->
<TD>
<?php
Expand All @@ -203,28 +202,28 @@ function issetFlag()
</TR>
<tr>
<td>
<a class="body" href="help.html#Add_File_-_Description" onClick="return popup(this, 'Help')" style="text-decoration:none">Description</a>
<a class="body" href="help.html#Add_File_-_Description" onClick="return popup(this, 'Help')" style="text-decoration:none"><?php echo msg('label_description')?></a>
</td>
<td colspan="3"><input tabindex="5" type="Text" name="description" size="50"></td>
</tr>

<tr>
<td>
<a class="body" href="help.html#Add_File_-_Comment" onClick="return popup(this, 'Help')" style="text-decoration:none">Comment</a>
<a class="body" href="help.html#Add_File_-_Comment" onClick="return popup(this, 'Help')" style="text-decoration:none"><?php echo msg('label_comment')?></a>
</td>
<td colspan="3"><textarea tabindex="6" name="comment" rows="4" onchange="this.value=enforceLength(this.value, 255);"></textarea></td>
</tr>

<TABLE border="0" cellspacing="0" cellpadding="3" NOWRAP>
<tr nowrap>
<td colspan="2" NOWRAP><b>Specific Permissions Settings</b></td>
<td colspan="4" NOWRAP><b><?php echo msg('label_specific_permissions')?></b></td>
</TR>
<TR>
<td valign="top" align="center"><a class="body" href="help.html#Rights_-_Forbidden" onClick="return popup(this, 'Help')" style="text-decoration:none">Forbidden</a></td>
<td valign="top" align="center"><a class="body" href="help.html#Rights_-_View" onClick="return popup(this, 'Help')" style="text-decoration:none">View</a></td>
<td valign="top" align="center"><a class="body" href="help.html#Rights_-_Read" onClick="return popup(this, 'Help')" style="text-decoration:none">Read</a></td>
<td valign="top" align="center"><a class="body" href="help.html#Rights_-_Modify" onClick="return popup(this, 'Help')" style="text-decoration:none">Modify</a></td>
<td valign="top" align="center"><a class="body" href="help.html#Rights_-_Admin" onClick="return popup(this, 'Help')" style="text-decoration:none">Admin</a></td>
<td valign="top" align="center"><a class="body" href="help.html#Rights_-_Forbidden" onClick="return popup(this, 'Help')" style="text-decoration:none"><?php echo msg('label_forbidden')?></a></td>
<td valign="top" align="center"><a class="body" href="help.html#Rights_-_View" onClick="return popup(this, 'Help')" style="text-decoration:none"><?php echo msg('label_view')?></a></td>
<td valign="top" align="center"><a class="body" href="help.html#Rights_-_Read" onClick="return popup(this, 'Help')" style="text-decoration:none"><?php echo msg('label_read')?></a></td>
<td valign="top" align="center"><a class="body" href="help.html#Rights_-_Modify" onClick="return popup(this, 'Help')" style="text-decoration:none"><?php echo msg('label_modify')?></a></td>
<td valign="top" align="center"><a class="body" href="help.html#Rights_-_Admin" onClick="return popup(this, 'Help')" style="text-decoration:none"><?php echo msg('label_admin')?></a></td>
</tr>
<tr>
<td><select tabindex="8" name="forbidden[]" multiple size="10" onchange="changeForbiddenList(this, this.form);">
Expand Down Expand Up @@ -315,8 +314,9 @@ function issetFlag()

</TR>
</TABLE>
<table>
<tr>
<td colspan="4" align="center"><input tabindex=7 type="Submit" name="submit" value="Add Document"></td>
<td colspan="3" align="center"><div class="buttons"><button class="positive" tabindex=7 type="Submit" name="submit" value="Add Document"><?php echo msg('submit')?></button></div></td>
</tr>
<?php
$query = "SELECT name, id FROM {$GLOBALS['CONFIG']['db_prefix']}department ORDER BY name";
Expand Down Expand Up @@ -398,16 +398,16 @@ function issetFlag()
{
if (!is_writeable($GLOBALS['CONFIG']['dataDir']))
{
$last_message='Folder Permissions Error: ' . $GLOBALS['CONFIG']['dataDir'] . ' not writeable!';
$last_message=msg('message_folder_perms_error'). ': ' . $GLOBALS['CONFIG']['dataDir'] . ' ' . msg('message_not_writeable');
header('Location:error.php?ec=23&last_message=' .$last_message);
exit;
}
}
// all checks completed, proceed!
// INSERT file info into data table
$query = "INSERT INTO {$GLOBALS['CONFIG']['db_prefix']}data (status, category, owner, realname, created, description, department, comment, default_rights, publishable) VALUES(0, '" . addslashes($_REQUEST['category']) . "', '" . addslashes($_SESSION['uid']) . "', '" . addslashes($_FILES['file']['name']) . "', NOW(), '" . addslashes($_REQUEST['description']) . "','" . addslashes($current_user_dept) . "', '" . addslashes($_REQUEST['comment']) . "','" . addslashes($_REQUEST['default_Setting']) . "', $lpublishable )";
$result = mysql_query($query, $GLOBALS['connection']) or die ("Error in query: $query. " . mysql_error());

$result = mysql_query($query, $GLOBALS['connection']) or die ("Error in query: $query. " . mysql_error());
// get id from INSERT operation
$fileId = mysql_insert_id($GLOBALS['connection']);

Expand Down Expand Up @@ -479,7 +479,7 @@ function issetFlag()
else
copy($GLOBALS['CONFIG']['dataDir'] . '/' . ($fileId-1) . '.dat', $GLOBALS['CONFIG']['dataDir'] . '/' . $newFileName);
// back to main page
$message = urlencode('Document successfully added');
$message = urlencode(msg('message_document_added'));
header('Location: out.php?last_message=' . $message);
}
}
Expand Down
38 changes: 19 additions & 19 deletions admin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,13 +39,13 @@
draw_error('error.php?ec=4');
exit;
}
draw_header('Admin');
draw_header(msg('label_admin'));
draw_menu($_SESSION['uid']);
@draw_status_bar('Admin',$_REQUEST['last_message']);
@draw_status_bar(msg('label_admin'),$_REQUEST['last_message']);
?>
<center>
<table border="1" cellspacing="5" cellpadding="5" >
<font color="#FFFFFF"><th bgcolor ="#83a9f7"><font color="#FFFFFF">Users</th><th bgcolor ="#83a9f7"><font color="#FFFFFF">Departments</th><th bgcolor ="#83a9f7"><font color="#FFFFFF">Categories</th></font><?php if($user_obj->isRoot()) echo '<th bgcolor ="#83a9f7"><font color="#FFFFFF">File Operations</th></font>'; ?>
<font color="#FFFFFF"><th bgcolor ="#83a9f7"><font color="#FFFFFF"><?php echo msg('users')?></th><th bgcolor ="#83a9f7"><font color="#FFFFFF"><?php echo msg('label_department')?></th><th bgcolor ="#83a9f7"><font color="#FFFFFF"><?php echo msg('category')?></th></font><?php if($user_obj->isRoot()) echo '<th bgcolor ="#83a9f7"><font color="#FFFFFF">' . msg('file') . '</th></font>'; ?>
<?php
if($user_obj->isRoot())
udf_admin_header();
Expand All @@ -56,35 +56,35 @@
<!-- User Admin -->
<table border="0">
<tr>
<td><b><a href="<?php echo $secureurl->encode('user.php?submit=adduser&state=' . ($_REQUEST['state']+1)); ?>">Add</a></b></td>
<td><b><a href="<?php echo $secureurl->encode('user.php?submit=adduser&state=' . ($_REQUEST['state']+1)); ?>"><?php echo msg('label_add')?></a></b></td>
</tr>
<tr>
<td><b><a href="<?php echo $secureurl->encode('user.php?submit=deletepick&state=' . ($_REQUEST['state']+1)); ?>">Delete</a></b></td>
<td><b><a href="<?php echo $secureurl->encode('user.php?submit=deletepick&state=' . ($_REQUEST['state']+1)); ?>"><?php echo msg('label_delete')?></a></b></td>
</tr>
<tr>
<td><b><a href="<?php echo $secureurl->encode('user.php?submit=updatepick&state=' . ($_REQUEST['state']+1)); ?>">Update</a></b></td>
<td><b><a href="<?php echo $secureurl->encode('user.php?submit=updatepick&state=' . ($_REQUEST['state']+1)); ?>"><?php echo msg('label_update')?></a></b></td>
</tr>
<tr>
<td><b><a href="<?php echo $secureurl->encode('user.php?submit=showpick&state=' . ($_REQUEST['state']+1)); ?>">Display</a></b></td>
<td><b><a href="<?php echo $secureurl->encode('user.php?submit=showpick&state=' . ($_REQUEST['state']+1)); ?>"><?php echo msg('label_display')?></a></b></td>
</tr>
</table>
</td>
<td>
<!-- Department Admin -->
<table border="0">
<tr>
<td><b><a href="<?php echo $secureurl->encode('department.php?submit=add&state=' . ($_REQUEST['state']+1)); ?>">Add</a></b></td>
<td><b><a href="<?php echo $secureurl->encode('department.php?submit=add&state=' . ($_REQUEST['state']+1)); ?>"><?php echo msg('label_add')?></a></b></td>
</tr>
<!--
<tr>
<td><b><a href="department.php?deletepick=1">Delete</a></b></td>
</tr>
-->
<tr>
<td><b><a href="<?php echo $secureurl->encode('department.php?submit=updatepick&state=' . ($_REQUEST['state']+1)); ?>">Update</a></b></td>
<td><b><a href="<?php echo $secureurl->encode('department.php?submit=updatepick&state=' . ($_REQUEST['state']+1)); ?>"><?php echo msg('label_update')?></a></b></td>
</tr>
<tr>
<td><b><a href="<?php echo $secureurl->encode('department.php?submit=showpick&state=' . ($_REQUEST['state']+1)); ?>">Display</a></b></td>
<td><b><a href="<?php echo $secureurl->encode('department.php?submit=showpick&state=' . ($_REQUEST['state']+1)); ?>"><?php echo msg('label_display')?></a></b></td>
</tr>
</td>
</table>
Expand All @@ -93,16 +93,16 @@
<!-- Category Admin -->
<table border="0">
<tr>
<td><b><a href="<?php echo $secureurl->encode('category.php?submit=add&state=' . ($_REQUEST['state']+1)); ?>">Add</a></b></td>
<td><b><a href="<?php echo $secureurl->encode('category.php?submit=add&state=' . ($_REQUEST['state']+1)); ?>"><?php echo msg('label_add')?></a></b></td>
</tr>
<tr>
<td><b><a href="<?php echo $secureurl->encode('category.php?submit=deletepick&state=' . ($_REQUEST['state']+1)); ?>">Delete</a></b></td>
<td><b><a href="<?php echo $secureurl->encode('category.php?submit=deletepick&state=' . ($_REQUEST['state']+1)); ?>"><?php echo msg('label_delete')?></a></b></td>
</tr>
<tr>
<td><b><a href="<?php echo $secureurl->encode('category.php?submit=updatepick&state=' . ($_REQUEST['state']+1)); ?>">Update</a></b></td>
<td><b><a href="<?php echo $secureurl->encode('category.php?submit=updatepick&state=' . ($_REQUEST['state']+1)); ?>"><?php echo msg('label_update')?></a></b></td>
</tr>
<tr>
<td><b><a href="<?php echo $secureurl->encode('category.php?submit=showpick&state=' . ($_REQUEST['state']+1)); ?>">Display</a></b></td>
<td><b><a href="<?php echo $secureurl->encode('category.php?submit=showpick&state=' . ($_REQUEST['state']+1)); ?>"><?php echo msg('label_display')?></a></b></td>
</tr>
</td>
</table>
Expand All @@ -115,19 +115,19 @@
<!-- Admin-Only Section -->
<table border="0" valign="top">
<tr>
<td ><b><a href="<?php echo $secureurl->encode('delete.php?mode=view_del_archive&state=' . ($_REQUEST['state']+1)); ?>">Del/Undel</a></b></td>
<td ><b><a href="<?php echo $secureurl->encode('delete.php?mode=view_del_archive&state=' . ($_REQUEST['state']+1)); ?>"><?php echo msg('label_delete_undelete')?></a></b></td>
</tr>
<tr>
<td><b><a href="<?php echo $secureurl->encode('toBePublished.php?mode=root&state=' . ($_REQUEST['state']+1)); ?>">Reviews</a></b></td>
<td><b><a href="<?php echo $secureurl->encode('toBePublished.php?mode=root&state=' . ($_REQUEST['state']+1)); ?>"><?php echo msg('label_reviews')?></a></b></td>
</tr>
<tr>
<td><b><a href="<?php echo $secureurl->encode('rejects.php?mode=root&state=' . ($_REQUEST['state']+1)); ?>">Rejections</a></b></td>
<td><b><a href="<?php echo $secureurl->encode('rejects.php?mode=root&state=' . ($_REQUEST['state']+1)); ?>"><?php echo msg('label_rejections')?></a></b></td>
</tr>
<tr>
<td><b><a href="<?php echo $secureurl->encode('check_exp.php?&state=' . ($_REQUEST['state']+1)); ?>">Check Expiration</a></b></td>
<td><b><a href="<?php echo $secureurl->encode('check_exp.php?&state=' . ($_REQUEST['state']+1)); ?>"><?php echo msg('label_check_expiration')?></a></b></td>
</tr>
<tr>
<td><b><a href="<?php echo $secureurl->encode('file_ops.php?&state=' . ($_REQUEST['state']+1)); ?>&submit=view_checkedout">Checked-Out Files</a></b></td>
<td><b><a href="<?php echo $secureurl->encode('file_ops.php?&state=' . ($_REQUEST['state']+1)); ?>&submit=view_checkedout"><?php echo msg('label_checked_out_files')?></a></b></td>
</tr>
</table>
</td>
Expand Down
Loading

0 comments on commit 1b1bad8

Please sign in to comment.