Skip to content

Commit

Permalink
Fixed bug which references modules/xerte all the time regardless of t…
Browse files Browse the repository at this point in the history 
…he template type

git-svn-id: https://xerteonlinetoolkits.googlecode.com/svn/branches/1.9@483 912cdd6b-5c7d-d5a7-a2ba-d0f0cdb91641
  • Loading branch information
@pgogy
pgogy committed Nov 12, 2012
1 parent 655b057 commit 0f39348
Showing 1 changed file with 144 additions and 139 deletions.
283 changes: 144 additions & 139 deletions edit.php
View file
Expand Up @@ -16,7 +16,6 @@
require $xerte_toolkits_site->php_library_path . "template_status.php";
require $xerte_toolkits_site->php_library_path . "display_library.php";
require $xerte_toolkits_site->php_library_path . "user_library.php";
require_once(dirname(__FILE__) . '/modules/xerte/module_functions.php');

/**
* Function update_access_time
Expand Down Expand Up @@ -60,142 +59,148 @@ function update_access_time($row_edit){
die("Invalid template_id (could not find in DB)");
}

if(has_rights_to_this_template($safe_template_id,$_SESSION['toolkits_logon_id'])){

// Check if user is editor (could be read only)

if(is_user_an_editor($safe_template_id,$_SESSION['toolkits_logon_id'])){

// Check for multiple editors
if(has_template_multiple_editors($safe_template_id)){

// Check for lock file. A lock file is created to prevent more than one
if(file_exists($xerte_toolkits_site->users_file_area_full . $row_edit['template_id'] . "-" . $row_edit['username'] . "-" . $row_edit['template_name'] . "/lockfile.txt")){

// Lock file exists, so open it up and see who created it
$lock_file_data = file_get_contents($xerte_toolkits_site->users_file_area_full . $row_edit['template_id'] . "-" . $row_edit['username'] . "-" . $row_edit['template_name'] . "/lockfile.txt");

$temp = explode("*",$lock_file_data);

if(count($temp)==1){
$temp = explode(" ",$lock_file_data);
}

$lock_file_creator = $temp[0];

/*
* Check if lock file creator is current user, if so, continue into the code
*/

if($lock_file_creator==$_SESSION['toolkits_logon_username']) {
if(update_access_time($row_edit)) {
// Display the editor
require $xerte_toolkits_site->root_file_path . "modules/" . $row_edit['template_framework'] . "/edit.php";
output_editor_code($row_edit, $xerte_toolkits_site, "true", true);
}
else {
// show error
error_show_template();
exit(0);
}
}
else {
if(isset($_POST['lockfile_clear'])) {

/*
* Delete the lockfile
*/

$file_handle = fopen($xerte_toolkits_site->users_file_area_full . $row_edit['template_id'] . "-" . $row_edit['username'] . "-" . $row_edit['template_name'] . "/lockfile.txt", 'w');

fwrite($file_handle, $_SESSION['toolkits_logon_username'] . "*");

fclose($file_handle);

/*
* Update the time this template was last edited
*/

if(update_access_time($row_edit)){

require $xerte_toolkits_site->root_file_path . "modules/" . $row_edit['template_framework'] . "/edit.php";
output_editor_code($row_edit, $xerte_toolkits_site, "true", true);
}
else {
error_show_template();
exit(0);
}
}
else {

// Update the lock file. The lock file format is creator id*id that tried to access 1 <space> id that tried to access 2 and so on
$new_lock_file = $lock_file_data . $_SESSION['toolkits_logon_username'] . " ";
$file_handle = fopen($xerte_toolkits_site->users_file_area_full . $row_edit['template_id'] . "-" . $row_edit['username'] . "-" . $row_edit['template_name'] . "/lockfile.txt",'w');
fwrite($file_handle, $new_lock_file);
fclose($file_handle);
output_locked_file_code($lock_file_creator);
}
}
}
else {

// No lock file, so create one
$file_handle = fopen($xerte_toolkits_site->users_file_area_full . $row_edit['template_id'] . "-" . $row_edit['username'] . "-" . $row_edit['template_name'] . "/lockfile.txt", 'w');
fwrite($file_handle, $_SESSION['toolkits_logon_username'] . "*");
fclose($file_handle);

// Update the time this template was last edited
if(update_access_time($row_edit)){
require $xerte_toolkits_site->root_file_path . "modules/" . $row_edit['template_framework'] . "/edit.php";
output_editor_code($row_edit, $xerte_toolkits_site, "true", true);
}else{
error_show_template();
exit(0);
}

}

}
else {
// One editor (but shared) for this prohect, so continue without creating a lock file
if(update_access_time($row_edit)){
require $xerte_toolkits_site->root_file_path . "modules/" . $row_edit['template_framework'] . "/edit.php";
output_editor_code($row_edit, $xerte_toolkits_site, "true", false);
}
else {
error_show_template();
exit(0);
}
}
}
else {
// One editor (and no sharing) for this prohect, so continue without creating a lock file
if(update_access_time($row_edit)){
_debug("editphp - no sharing etc");
require $xerte_toolkits_site->root_file_path . "modules/" . $row_edit['template_framework'] . "/edit.php";
output_editor_code($row_edit, $xerte_toolkits_site, "false", false);
}
else {
error_show_template();
exit(0);
}
}
}
else if(is_user_admin()) {
// Is the current user an administrator - If so access here.
require $xerte_toolkits_site->root_file_path . "modules/" . $row_edit['template_framework'] . "/edit.php";
output_editor_code($row_edit, $xerte_toolkits_site, "false", false);
}
else {
// Wiki mode - check to see if template allows anonymous editing.

$string_for_flash_xml = $xerte_toolkits_site->users_file_area_short . $row_edit['template_id'] . "-" . $row_edit['username'] . "-" . $row_edit['template_name'] . "/data.xml";
$buffer = file_get_contents($string_for_flash_xml);
if(strpos($buffer,"editable=true")==false){
// so the user sees a blank page?
}else{
// Wiki mode set
require $xerte_toolkits_site->root_file_path . "modules/" . $row_edit['template_framework'] . "/edit.php";
output_editor_code($row_edit, $xerte_toolkits_site, "true", false);
}
if(isset($_SESSION['toolkits_logon_id'])){

if(has_rights_to_this_template($safe_template_id,$_SESSION['toolkits_logon_id'])){

// Check if user is editor (could be read only)

if(is_user_an_editor($safe_template_id,$_SESSION['toolkits_logon_id'])){

// Check for multiple editors
if(has_template_multiple_editors($safe_template_id)){

// Check for lock file. A lock file is created to prevent more than one
if(file_exists($xerte_toolkits_site->users_file_area_full . $row_edit['template_id'] . "-" . $row_edit['username'] . "-" . $row_edit['template_name'] . "/lockfile.txt")){

// Lock file exists, so open it up and see who created it
$lock_file_data = file_get_contents($xerte_toolkits_site->users_file_area_full . $row_edit['template_id'] . "-" . $row_edit['username'] . "-" . $row_edit['template_name'] . "/lockfile.txt");

$temp = explode("*",$lock_file_data);

if(count($temp)==1){
$temp = explode(" ",$lock_file_data);
}

$lock_file_creator = $temp[0];

/*
* Check if lock file creator is current user, if so, continue into the code
*/

if($lock_file_creator==$_SESSION['toolkits_logon_username']) {
if(update_access_time($row_edit)) {
// Display the editor
require $xerte_toolkits_site->root_file_path . "modules/" . $row_edit['template_framework'] . "/edit.php";
output_editor_code($row_edit, $xerte_toolkits_site, "true", true);
}
else {
// show error
error_show_template();
exit(0);
}
}
else {
if(isset($_POST['lockfile_clear'])) {

/*
* Delete the lockfile
*/

$file_handle = fopen($xerte_toolkits_site->users_file_area_full . $row_edit['template_id'] . "-" . $row_edit['username'] . "-" . $row_edit['template_name'] . "/lockfile.txt", 'w');

fwrite($file_handle, $_SESSION['toolkits_logon_username'] . "*");

fclose($file_handle);

/*
* Update the time this template was last edited
*/

if(update_access_time($row_edit)){

require $xerte_toolkits_site->root_file_path . "modules/" . $row_edit['template_framework'] . "/edit.php";
output_editor_code($row_edit, $xerte_toolkits_site, "true", true);
}
else {
error_show_template();
exit(0);
}
}
else {

// Update the lock file. The lock file format is creator id*id that tried to access 1 <space> id that tried to access 2 and so on
$new_lock_file = $lock_file_data . $_SESSION['toolkits_logon_username'] . " ";
$file_handle = fopen($xerte_toolkits_site->users_file_area_full . $row_edit['template_id'] . "-" . $row_edit['username'] . "-" . $row_edit['template_name'] . "/lockfile.txt",'w');
fwrite($file_handle, $new_lock_file);
fclose($file_handle);
output_locked_file_code($lock_file_creator);
}
}
}
else {

// No lock file, so create one
$file_handle = fopen($xerte_toolkits_site->users_file_area_full . $row_edit['template_id'] . "-" . $row_edit['username'] . "-" . $row_edit['template_name'] . "/lockfile.txt", 'w');
fwrite($file_handle, $_SESSION['toolkits_logon_username'] . "*");
fclose($file_handle);

// Update the time this template was last edited
if(update_access_time($row_edit)){
require $xerte_toolkits_site->root_file_path . "modules/" . $row_edit['template_framework'] . "/edit.php";
output_editor_code($row_edit, $xerte_toolkits_site, "true", true);
}else{
error_show_template();
exit(0);
}

}

}
else {
// One editor (but shared) for this prohect, so continue without creating a lock file
if(update_access_time($row_edit)){
require $xerte_toolkits_site->root_file_path . "modules/" . $row_edit['template_framework'] . "/edit.php";
output_editor_code($row_edit, $xerte_toolkits_site, "true", false);
}
else {
error_show_template();
exit(0);
}
}
}
else {
// One editor (and no sharing) for this prohect, so continue without creating a lock file
if(update_access_time($row_edit)){
_debug("editphp - no sharing etc");
require $xerte_toolkits_site->root_file_path . "modules/" . $row_edit['template_framework'] . "/edit.php";
output_editor_code($row_edit, $xerte_toolkits_site, "false", false);
}
else {
error_show_template();
exit(0);
}
}
}
else if(is_user_admin()) {
// Is the current user an administrator - If so access here.
require $xerte_toolkits_site->root_file_path . "modules/" . $row_edit['template_framework'] . "/edit.php";
output_editor_code($row_edit, $xerte_toolkits_site, "false", false);
}
else {
// Wiki mode - check to see if template allows anonymous editing.

$string_for_flash_xml = $xerte_toolkits_site->users_file_area_short . $row_edit['template_id'] . "-" . $row_edit['username'] . "-" . $row_edit['template_name'] . "/data.xml";
$buffer = file_get_contents($string_for_flash_xml);
if(strpos($buffer,"editable=true")==false){
// so the user sees a blank page?
}else{
// Wiki mode set
require $xerte_toolkits_site->root_file_path . "modules/" . $row_edit['template_framework'] . "/edit.php";
output_editor_code($row_edit, $xerte_toolkits_site, "true", false);
}
}

}else{
die("Session ID not set");
}

0 comments on commit 0f39348

Please sign in to comment.