Merge pull request #45 from Sashi20/drupal_7.x

Fix issue with renaming directory in manage proposal

2 files changed, 15 insertions, 11 deletions

diff --git a/manage_proposal.inc b/manage_proposal.inc
index 0357a6a..6590419 100755
--- a/manage_proposal.inc
+++ b/manage_proposal.inc
@@ -1324,7 +1324,8 @@ function proposal_edit_form_submit($form, &$form_state)
         ));
         $query->condition('id', $preference1_id);
         $num_updated = $query->execute();
-    }
+    }    
+    CreateReadmeFileTextbookCompanion($proposal_id);
     drupal_set_message(t('Proposal Updated'), 'status');
 }
 /*function default_value_for_selections($id)
@@ -1787,17 +1788,20 @@ function RenameDir($preference_id, $dir_name)
         ':preference_id' => $preference_id
     ));
     $result = $query->fetchObject();
+    //var_dump($result->id);die;
     if ($result != NULL) {
         $files = scandir(textbook_companion_path());
-        $files_id_dir = textbook_companion_path() . $result->id;
-        $file_dir = textbook_companion_path() . $result->directory_name;
-        if (is_dir($file_dir)) {
-            $new_directory_name = rename(textbook_companion_path() . $result->directory_name, textbook_companion_path() . $dir_name);
-            CreateReadmeFileTextbookCompanion($result->proposal_id);
+        //$files_id_dir = textbook_companion_path() . $result->id;
+        $old_file_dir = textbook_companion_path() . $result->directory_name;
+        $new_file_dir = textbook_companion_path() . $dir_name;
+        //var_dump('Old dir:' . $old_file_dir . ' New dir' . $new_file_dir);die;
+        if (is_dir($old_file_dir)) {
+            $new_directory_name = rename($old_file_dir, $new_file_dir);
+            //var_dump($new_directory_name);die;
             return $new_directory_name;
         } else if (is_dir($files_id_dir)) {
-            $new_directory_name = rename(textbook_companion_path() . $result->id, textbook_companion_path() . $dir_name);
-            CreateReadmeFileTextbookCompanion($result->proposal_id);
+            $new_directory_name = rename($files_id_dir, textbook_companion_path() . $dir_name);
+            //CreateReadmeFileTextbookCompanion($result->proposal_id);
             return $new_directory_name;
         } else {
             drupal_set_message('Can not rename the directory. If you are editing proposal before approving the proposal directory is not present because the code has been not uploaded yet. For more information please contact to administrator');
diff --git a/textbook_companion.module b/textbook_companion.module
index 04f1367..0334f21 100755
--- a/textbook_companion.module
+++ b/textbook_companion.module
@@ -3702,7 +3702,7 @@ function _list_of_software_version()
 	$software_version = array();
 	$query = db_select('r_software_version');
 	$query->fields('r_software_version');
-	$query->orderBy('r_version', 'ASC');
+	//$query->orderBy('r_version', 'ASC');
 	$software_version_list = $query->execute();
 	while ($software_version_list_data = $software_version_list->fetchObject())
 	{
@@ -3809,7 +3809,7 @@ function _dir_name($book, $author, $pref_id)
 		$book_title = ucname($book);
 		$author = ucname($author);
 		$dir_name = $book_title . " " . "by" . " " . $author;
-		$directory_name = str_replace("__", "_", str_replace(" ", "_", $dir_name));
+		$directory_name = str_replace("__", "_", preg_replace('/[^a-zA-Z0-9-_]/', "_", $dir_name));
 		$query = db_select('textbook_companion_preference');
 		$query->fields('textbook_companion_preference');
 		$query->condition('directory_name', $directory_name);
@@ -3827,7 +3827,7 @@ function _dir_name($book, $author, $pref_id)
 		$book_title = ucname($book);
 		$author = ucname($author);
 		$dir_name = $book_title . " " . "by" . " " . $author;
-		$directory_name = str_replace("__", "_", str_replace(" ", "_", $dir_name));
+		$directory_name = str_replace("__", "_", preg_replace('/[^a-zA-Z0-9-_]/', "_", $dir_name));
 		$query = db_select('textbook_companion_preference');
 		$query->fields('textbook_companion_preference');
 		$query->condition('directory_name', $directory_name);