From 5ddd647875dd292835f14673b8b9bf8e29801006 Mon Sep 17 00:00:00 2001 From: reliberate Date: Wed, 24 Feb 2016 12:28:35 -0700 Subject: [PATCH] Edit: Revamp using Ace editor (ace.c9.io). --- app/edit/app_languages.php | 23 +- app/edit/clipadd.php | 10 +- app/edit/clipdelete.php | 6 +- app/edit/cliplist.php | 71 ++-- app/edit/clipoptions.php | 33 +- app/edit/clipoptionslist.php | 311 +++++++--------- app/edit/clipsearch.php | 181 --------- app/edit/clipupdate.php | 12 +- app/edit/filelist.php | 153 ++++---- app/edit/filenew.php | 4 +- app/edit/fileoptions.php | 36 +- app/edit/fileoptionslist.php | 186 ++++------ app/edit/filerename.php | 2 +- app/edit/filesave.php | 35 +- app/edit/foldernew.php | 4 +- app/edit/header.php | 4 +- app/edit/images/Thumbs.db | Bin 20992 -> 0 bytes app/edit/images/file.gif | Bin 96 -> 0 bytes app/edit/images/file.png | Bin 434 -> 0 bytes app/edit/images/folder.gif | Bin 585 -> 0 bytes app/edit/images/gear.png | Bin 822 -> 0 bytes app/edit/images/leaf.gif | Bin 585 -> 0 bytes app/edit/images/minus.gif | Bin 124 -> 0 bytes app/edit/images/plus.gif | Bin 129 -> 0 bytes app/edit/images/program.gif | Bin 61 -> 0 bytes app/edit/images/thumbnails/Thumbs.db | Bin 18432 -> 0 bytes app/edit/images/thumbnails/cliplibrary.png | Bin 20544 -> 0 bytes app/edit/images/thumbnails/filemanagement.png | Bin 23105 -> 0 bytes app/edit/images/thumbnails/phpeditor.png | Bin 98754 -> 0 bytes app/edit/index.php | 351 ++++++++++-------- app/edit/list.php | 113 ------ app/edit/resources/images/blank.gif | Bin 0 -> 49 bytes app/edit/resources/images/icon_file.png | Bin 0 -> 257 bytes app/edit/resources/images/icon_folder.png | Bin 0 -> 224 bytes app/edit/resources/images/icon_gear.png | Bin 0 -> 726 bytes app/edit/resources/images/icon_indenting.png | Bin 0 -> 324 bytes app/edit/resources/images/icon_invisibles.png | Bin 0 -> 821 bytes app/edit/resources/images/icon_numbering.png | Bin 0 -> 521 bytes app/edit/resources/images/icon_save.png | Bin 0 -> 508 bytes app/edit/resources/images/icon_sidebar.png | Bin 0 -> 197 bytes app/edit/root.php | 12 +- 41 files changed, 611 insertions(+), 936 deletions(-) delete mode 100644 app/edit/clipsearch.php delete mode 100644 app/edit/images/Thumbs.db delete mode 100644 app/edit/images/file.gif delete mode 100644 app/edit/images/file.png delete mode 100644 app/edit/images/folder.gif delete mode 100644 app/edit/images/gear.png delete mode 100644 app/edit/images/leaf.gif delete mode 100644 app/edit/images/minus.gif delete mode 100644 app/edit/images/plus.gif delete mode 100644 app/edit/images/program.gif delete mode 100644 app/edit/images/thumbnails/Thumbs.db delete mode 100644 app/edit/images/thumbnails/cliplibrary.png delete mode 100644 app/edit/images/thumbnails/filemanagement.png delete mode 100644 app/edit/images/thumbnails/phpeditor.png delete mode 100644 app/edit/list.php create mode 100644 app/edit/resources/images/blank.gif create mode 100644 app/edit/resources/images/icon_file.png create mode 100644 app/edit/resources/images/icon_folder.png create mode 100644 app/edit/resources/images/icon_gear.png create mode 100644 app/edit/resources/images/icon_indenting.png create mode 100644 app/edit/resources/images/icon_invisibles.png create mode 100644 app/edit/resources/images/icon_numbering.png create mode 100644 app/edit/resources/images/icon_save.png create mode 100644 app/edit/resources/images/icon_sidebar.png diff --git a/app/edit/app_languages.php b/app/edit/app_languages.php index 7c085caaaf..700cac8235 100644 --- a/app/edit/app_languages.php +++ b/app/edit/app_languages.php @@ -26,6 +26,16 @@ Philippe Rioual */ +$text['title-manage-files']['en-us'] = "Manage Files"; +$text['title-manage-files']['es-cl'] = "Gestión de Archivos"; +$text['title-manage-files']['pt-pt'] = "Gerenciar Arquivos"; +$text['title-manage-files']['fr-fr'] = "Gérer les Fichiers"; + +$text['title-manage-clips']['en-us'] = "Manage Clips"; +$text['title-manage-clips']['es-cl'] = "Gestión de Clips"; +$text['title-manage-clips']['pt-pt'] = "Gerir Clipes"; +$text['title-manage-clips']['fr-fr'] = "Gérer Clips"; + $text['label-folder']['en-us'] = "Folder:"; $text['label-folder']['es-cl'] = "Carpeta:"; $text['label-folder']['pt-pt'] = "Ficheiro:"; @@ -61,6 +71,11 @@ $text['label-clip-library']['es-cl'] = "Librería de Clips"; $text['label-clip-library']['pt-pt'] = "Biblioteca de Clips"; $text['label-clip-library']['fr-fr'] = "Clip Libraries"; +$text['label-selected-clip']['en-us'] = "Selected Clip"; +$text['label-selected-clip']['es-cl'] = "Clip Seleccionado"; +$text['label-selected-clip']['pt-pt'] = "Clipe Selecionado"; +$text['label-selected-clip']['fr-fr'] = "Clip Sélectionné"; + $text['button-edit-clip']['en-us'] = "Edit Clip"; $text['button-edit-clip']['es-cl'] = "Editar Clip"; $text['button-edit-clip']['pt-pt'] = "Editar Clip"; @@ -76,10 +91,10 @@ $text['message-delete-clip']['es-cl'] = "¿Realmente desea eliminar el clip sele $text['message-delete-clip']['pt-pt'] = "Tem a certeza que pretende remover o clip seleccionado?"; $text['message-delete-clip']['fr-fr'] = "Etes-vous sûr de vouloir supprimer le CLIP sélectionné?"; -$text['button-close']['en-us'] = " Close "; -$text['button-close']['es-cl'] = " Cerrar "; -$text['button-close']['pt-pt'] = " Fechar "; -$text['button-close']['fr-fr'] = " Fermé "; +$text['button-close']['en-us'] = "Close"; +$text['button-close']['es-cl'] = "Cerrar"; +$text['button-close']['pt-pt'] = "Fechar"; +$text['button-close']['fr-fr'] = "Fermé"; $text['label-path']['en-us'] = "Path:"; $text['label-path']['es-cl'] = "Ruta:"; diff --git a/app/edit/clipadd.php b/app/edit/clipadd.php index a5eda2b0b0..f291387992 100644 --- a/app/edit/clipadd.php +++ b/app/edit/clipadd.php @@ -80,13 +80,10 @@ if (count($_POST)>0) { //show the content require_once "header.php"; - echo "
"; echo "\n"; - echo "\n"; + echo "\n"; echo " "; echo " "; echo "
\n"; - //echo "Clip Library"; - //echo "
"; echo "
"; echo ""; echo " "; @@ -117,7 +114,9 @@ if (count($_POST)>0) { echo " "; echo " "; - echo " "; + echo " "; + echo " "; + echo " "; echo " "; echo "
"; echo "
"; @@ -125,7 +124,6 @@ if (count($_POST)>0) { echo "
"; - echo "
"; require_once "footer.php"; ?> \ No newline at end of file diff --git a/app/edit/clipdelete.php b/app/edit/clipdelete.php index fea8378161..8653d67c70 100644 --- a/app/edit/clipdelete.php +++ b/app/edit/clipdelete.php @@ -52,10 +52,6 @@ else { } //redirect the browser - require_once "header.php"; - echo "\n"; - echo $text['message-delete']; - require_once "footer.php"; - return; + header("Location: clipoptions.php"); ?> \ No newline at end of file diff --git a/app/edit/cliplist.php b/app/edit/cliplist.php index 97c64d5ce7..f92f9b98a6 100644 --- a/app/edit/cliplist.php +++ b/app/edit/cliplist.php @@ -35,24 +35,14 @@ else { echo "access denied"; exit; } -//require_once "edit/header.php"; + +require_once "header.php"; //add multi-lingual support $language = new text; $text = $language->get(); -echo ""; -echo ""; -echo ""; - function isfile($filename) { if (@filesize($filename) > 0) { return true; } else { return false; } } @@ -135,37 +125,49 @@ echo ""; +// keyboard shortcut bindings +echo "\n"; +echo ""; + echo ""; -echo ""; +echo ""; echo "
"; echo "\n"; echo "\n"; echo "
\n"; -echo "
".$text['label-clip-library']."
\n"; //display:none +echo " "; echo " "; echo "
".$text['label-clip-library']."
\n"; //display:none $sql = "select * from v_clips "; $sql .= "order by clip_folder "; @@ -195,7 +197,7 @@ if ($result_count > 0) { //no results if ($last_folder != $row['clip_folder']) { $clip_folder_name = str_replace ($previous_folder_name, "", $row['clip_folder']); $clip_folder_name = str_replace ("/", "", $clip_folder_name); - echo "\n"; +echo "\n"; +echo "
 ".$clip_folder_name."  
\n\n"; + echo ""; +echo " "; +echo "
".$clip_folder_name."
\n\n"; $tag_open = 1; } @@ -205,8 +207,8 @@ if ($result_count > 0) { //no results echo "\n"; echo "\n"; echo "\n"; - echo "\n"; echo "
\n"; - echo "".$row['clip_name']."\n"; + echo "
"; + echo "".$row['clip_name']."\n"; echo "
\n"; echo "\n\n"; @@ -226,16 +228,11 @@ echo "
\n"; echo "
"; -echo "

"; -//require_once "resources/footer.php"; +require_once "footer.php"; unset ($result_count); unset ($result); unset ($key); unset ($val); unset ($c); - -echo ""; -echo ""; - ?> \ No newline at end of file diff --git a/app/edit/clipoptions.php b/app/edit/clipoptions.php index 0867c89de6..5a03eacad2 100644 --- a/app/edit/clipoptions.php +++ b/app/edit/clipoptions.php @@ -39,39 +39,30 @@ else { $language = new text; $text = $language->get(); +$title = $text['title-manage-clips']; require_once "header.php"; -echo "
"; -echo "\n"; +echo "
\n"; echo ""; -echo "\n"; +echo "\n"; echo ""; echo "\n"; echo "\n"; -echo "\n"; echo "\n"; echo "
Selected Clip:
".$text['label-selected-clip']."
"; -echo " "; +echo " "; echo ""; +echo ""; -echo " "; -//echo " \n"; -//echo " \n"; -//echo " \n"; - -echo " \n"; -echo " \n"; -//echo " \n"; -echo " \n"; -echo " \n"; - -echo " \n"; -echo "
Options











"; +echo ""; +echo " \n"; +echo " \n"; +echo " \n"; +echo " \n"; +echo " \n"; +echo "
 
"; echo "
"; -echo "
"; require_once "footer.php"; ?> \ No newline at end of file diff --git a/app/edit/clipoptionslist.php b/app/edit/clipoptionslist.php index c1566a5a8e..8073cd2dc7 100644 --- a/app/edit/clipoptionslist.php +++ b/app/edit/clipoptionslist.php @@ -39,195 +39,156 @@ else { $language = new text; $text = $language->get(); -echo ""; -echo ""; +//include + require_once "header.php"; -echo ""; +echo ""; -function isfile($filename) { - if (@filesize($filename) > 0) { return true; } else { return false; } -} +echo "\n"; -function space($count) { - $r=''; $i=0; - while($i < $count) { - $r .= ' '; - $i++; - } - return $r; -} +echo "\n"; +echo "
\n"; +echo "
".$text['label-clip-library']."
\n"; -//show the content - echo ""; - - echo ""; - -echo ""; -echo ""; - - echo "
"; - echo "\n"; - - echo "\n"; - echo "
\n"; - echo "
".$text['label-clip-library']."
\n"; //display:none - - $sql = "select * from v_clips "; - $sql .= "order by clip_folder "; - $prep_statement = $db->prepare(check_sql($sql)); - $prep_statement->execute(); - $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); - $result_count = count($result); - - if ($result_count > 0) { //no results - $last_folder = ''; - $tag_open = ''; - $x = 0; - $current_depth = 0; - $previous_depth = 0; - foreach($result as $row) { - $current_depth = count(explode("/", $row[clip_folder])); - if ($current_depth < $previous_depth) { - $count = ($previous_depth - $current_depth); - $i=0; - while($i < $count){ - echo "
\n"; - $i++; - } - echo "
\n"; +$sql = "select * from v_clips "; +$sql .= "order by clip_folder "; +$prep_statement = $db->prepare(check_sql($sql)); +$prep_statement->execute(); +$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); +$result_count = count($result); +if ($result_count > 0) { //no results + $last_folder = ''; + $tag_open = ''; + $x = 0; + $current_depth = 0; + $previous_depth = 0; + foreach($result as $row) { + $current_depth = count(explode("/", $row[clip_folder])); + if ($current_depth < $previous_depth) { + $count = ($previous_depth - $current_depth); + $i=0; + while($i < $count){ + echo "
\n"; + $i++; } + echo "
\n"; - if ($last_folder != $row['clip_folder']) { - $clip_folder_name = str_replace ($previous_folder_name, "", $row['clip_folder']); - $clip_folder_name = str_replace ("/", "", $clip_folder_name); - echo "\n"; - echo "\n"; - echo "
 ".$clip_folder_name."  
\n\n"; - $tag_open = 1; - } - - $previous_depth = $current_depth; - $previous_folder_name = $row['clip_folder']; + } - echo "\n"; - echo "\n"; - echo "\n"; - echo "
\n"; - echo "".$row['clip_name']."\n"; + if ($last_folder != $row['clip_folder']) { + $clip_folder_name = str_replace ($previous_folder_name, "", $row['clip_folder']); + $clip_folder_name = str_replace ("/", "", $clip_folder_name); + echo ""; + echo " "; + echo "
"; + echo " ".$clip_folder_name."
"; + $tag_open = 1; + } - echo "
\n"; - echo "\n\n"; + $previous_depth = $current_depth; + $previous_folder_name = $row['clip_folder']; - $last_folder = $row['clip_folder']; - if ($c==0) { $c=1; } else { $c=0; } - } //end foreach - unset($sql, $result, $row_count); - } //end if results + echo "\n"; + echo "\n"; + echo "\n"; + echo ""; + echo " "; + echo " "; + echo " "; + echo "
"; + echo " ".$row['clip_name'].""; + echo "
\n"; - echo "\n"; - echo "
\n"; + $last_folder = $row['clip_folder']; + if ($c==0) { $c=1; } else { $c=0; } + } //end foreach + unset($sql, $result, $row_count); +} //end if results - echo "
\n"; - echo ""; +echo " "; +echo "
\n"; - echo "

"; +echo "
\n"; - unset ($result_count); - unset ($result); - unset ($key); - unset ($val); - unset ($c); - - echo ""; - echo ""; +require_once "footer.php"; +unset ($result_count); +unset ($result); +unset ($key); +unset ($val); +unset ($c); ?> \ No newline at end of file diff --git a/app/edit/clipsearch.php b/app/edit/clipsearch.php deleted file mode 100644 index 979771a271..0000000000 --- a/app/edit/clipsearch.php +++ /dev/null @@ -1,181 +0,0 @@ - - Portions created by the Initial Developer are Copyright (C) 2008-2012 - the Initial Developer. All Rights Reserved. - - Contributor(s): - Mark J Crane - James Rose -*/ -include "root.php"; -require_once "resources/check_auth.php"; -if (permission_exists('script_editor_view')) { - //access granted -} -else { - echo "access denied"; - exit; -} - -if (count($_POST)>0) { - $clip_uuid = $_POST["id"]; - $clip_name = $_POST["clip_name"]; - $clip_folder = $_POST["clip_folder"]; - $clip_text_start = $_POST["clip_text_start"]; - $clip_text_end = $_POST["clip_text_end"]; - $clip_desc = $_POST["clip_desc"]; - $clip_order = $_POST["clip_order"]; - - require_once "header.php"; - echo "
"; - echo "\n"; - echo "\n"; - echo " \n"; - echo "\n"; - - } //end if results - - echo "
\n"; - echo "
"; - - $sql .= "select * from v_clips "; - $sql .= "where "; - if (strlen($clip_uuid) > 0) { $sql .= "and id = '$clip_uuid' "; } - if (strlen($clip_name) > 0) { $sql .= "and clip_name like '%$clip_name%' "; } - if (strlen($clip_folder) > 0) { $sql .= "and clip_folder like '%$clip_folder%' "; } - if (strlen($clip_text_start) > 0) { $sql .= "and clip_text_start like '%$clip_text_start%' "; } - if (strlen($clip_text_end) > 0) { $sql .= "and clip_text_end like '%$clip_text_end%' "; } - if (strlen($clip_desc) > 0) { $sql .= "and clip_desc like '%$clip_desc%' "; } - if (strlen($clip_order) > 0) { $sql .= "and clip_order like '%$clip_order%' "; } - - $sql = trim($sql); - if (substr($sql, -5) == "where"){ $sql = substr($sql, 0, (strlen($sql)-5)); } - $sql = str_replace ("where and", "where", $sql); - $prep_statement = $db->prepare(check_sql($sql)); - $prep_statement->execute(); - $result = $prep_statement->fetchAll(PDO::FETCH_NAMED); - $result_count = count($result); - - $c = 0; - $row_style["0"] = "background-color: #F5F5DC;"; - $row_style["1"] = "background-color: #FFFFFF;"; - - echo "
\n"; - echo "\n"; - echo ""; - - if ($result_count == 0) { - //no results - echo ""; - } - else { //received results - echo ""; - //echo ""; - echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - echo ""; - echo "\n"; - - foreach($result as $row) { - //print_r( $row ); - echo "\n"; - //echo ""; - echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - echo ""; - - echo "\n"; - if ($c==0) { $c=1; } else { $c=0; } - } //end foreach unset($sql, $result, $row_count); - echo "
 
    Id        clip_name Search         clip_folder        clip_text_start        clip_text_end        clip_desc        clip_order   
".$row[id]."".$row[clip_name]."".$row[clip_folder]."".$row[clip_text_start]."".$row[clip_text_end]."".$row[clip_desc]."".$row[clip_order]."
\n"; - echo "
\n"; - - echo "

"; - echo "
\n"; - echo "
"; - echo "

"; - require_once "footer.php"; - - unset ($result_count); - unset ($result); - unset ($key); - unset ($val); - unset ($c); - -} -else { - - //show the content - require_once "header.php"; - echo "
"; - echo "\n"; - echo "\n"; - echo " "; - echo " "; - echo "
\n"; - echo "
"; - - echo "
"; - echo ""; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - echo " "; - //echo " "; - //echo " "; - //echo " "; - //echo " "; - echo " "; - echo " "; - echo " "; - echo "
Name
Folder
Start
End
Desc
clip_order
"; - echo "
"; - - echo "
"; - echo "
"; - - require_once "footer.php"; - -} //end if not post -?> \ No newline at end of file diff --git a/app/edit/clipupdate.php b/app/edit/clipupdate.php index 228c23a15c..a17ad25825 100644 --- a/app/edit/clipupdate.php +++ b/app/edit/clipupdate.php @@ -57,7 +57,6 @@ if (count($_POST)>0) { $sql .= "clip_order = '$clip_order' "; $sql .= "where clip_uuid = '$clip_uuid' "; $count = $db->exec(check_sql($sql)); - //echo "affected rows: ".$count; //redirect the browser require_once "header.php"; @@ -89,9 +88,8 @@ else { //show the content require_once "header.php"; - echo "
"; echo "\n"; - echo "\n"; + echo "\n"; echo " "; echo " "; - echo " "; + echo " "; echo " "; echo "
\n"; echo "
"; @@ -125,9 +123,10 @@ else { echo "
"; - echo " "; - echo " "; + echo " "; + echo " "; + echo " "; echo "
"; @@ -136,7 +135,6 @@ else { echo "
"; - echo "
"; require_once "footer.php"; ?> \ No newline at end of file diff --git a/app/edit/filelist.php b/app/edit/filelist.php index 8f73c91662..ab77644bff 100644 --- a/app/edit/filelist.php +++ b/app/edit/filelist.php @@ -38,16 +38,6 @@ else { //add css and javascript require_once "header.php"; -//define function space - function space($count) { - $r=''; $i=0; - while($i < $count) { - $r .= ' '; - $i++; - } - return $r; - } - //define function recure_dir function recur_dir($dir) { clearstatcache(); @@ -59,12 +49,17 @@ else { if ($file != "." AND $file != ".."){ $newpath = $dir.'/'.$file; $level = explode('/',$newpath); - if (substr($newpath, -4) == ".svn" || - substr($newpath, -4) == ".git") { - //ignore .svn and .git dir and subdir - } - elseif (substr($newpath, -3) == ".db") { - //ignore .db files + if ( + substr(strtolower($newpath), -4) == ".svn" || + substr(strtolower($newpath), -4) == ".git" || + substr(strtolower($newpath), -3) == ".db" || + substr(strtolower($newpath), -4) == ".jpg" || + substr(strtolower($newpath), -4) == ".gif" || + substr(strtolower($newpath), -4) == ".png" || + substr(strtolower($newpath), -4) == ".ico" || + substr(strtolower($newpath), -4) == ".ttf" + ) { + //ignore certain files (and folders) } else { $dir_array[] = $newpath; @@ -79,45 +74,32 @@ else { $level = explode('/',$newpath); if (is_dir($newpath)) { - - //$mod_array[] = array( - //'level'=>count($level)-1, - //'path'=>$newpath, - //'name'=>end($level), - //'type'=>'dir', - //'mod_time'=>filemtime($newpath), - //'size'=>''); - //$mod_array[] = recur_dir($newpath); - $dirname = end($level); - $htmldirlist .= space(count($level))."
$dirname
\n"; - //$htmldirlist .= space(count($level))."
Tools
\n"; - //$htmldirlist .= space(count($level))."
New Folder
\n"; //parent.document.getElementById('file').value='".urlencode($newpath)."' - //$htmldirlist .= space(count($level))."
\n"; - //$htmldirlist .= space(count($level))."
New File
\n"; //parent.document.getElementById('file').value='".urlencode($newpath)."' - //$htmldirlist .= space(count($level))."
\n"; - //$htmldirlist .= space(count($level))."
\n"; - //$htmldirlist .= space(count($level))."
Options
\n"; //parent.document.getElementById('file').value='".urlencode($newpath)."' - //$htmldirlist .= space(count($level))."
\n"; - $htmldirlist .= recur_dir($newpath); - $htmldirlist .= space(count($level))."
\n"; + $htmldirlist .= " + + + + +
+ ".$dirname."
".recur_dir($newpath)."
+
\n"; } else { - - //$mod_array[] = array( - // 'level'=>count($level)-1, - // 'path'=>$newpath, - // 'name'=>end($level), - // 'type'=>'file', - // 'mod_time'=>filemtime($newpath), - // 'size'=>filesize($newpath)); - $filename = end($level); $filesize = round(filesize($newpath)/1024, 2); - $htmlfilelist .= space(count($level))."
$filename
\n"; - $htmlfilelist .= space(count($level))."
\n"; + $newpath = str_replace ('//', '/', $newpath); + $newpath = str_replace ("\\", "/", $newpath); + $htmlfilelist .= " + + + + +
+ ".$filename." +
\n"; } } + closedir($dirlist); return $htmldirlist ."\n". $htmlfilelist; } @@ -154,14 +136,11 @@ echo " http_request.open('POST', url, true);\n"; echo "\n"; echo "\n"; echo " if (strpost.length == 0) {\n"; -//echo " alert('none');\n"; echo " //http_request.send(null);\n"; echo " http_request.send('name=value&foo=bar');\n"; echo " }\n"; echo " else {\n"; -//echo " alert(strpost);\n"; echo " http_request.setRequestHeader('Content-Type','application/x-www-form-urlencoded');\n"; -//echo " http_request.send('name=value&foo=bar');\n"; echo " http_request.send(strpost);\n"; echo " }\n"; echo "\n"; @@ -171,15 +150,12 @@ echo " function returnContent(http_request) {\n"; echo "\n"; echo " if (http_request.readyState == 4) {\n"; echo " if (http_request.status == 200) {\n"; - -echo " parent.editAreaLoader.setValue('edit1', http_request.responseText); \n"; -//echo " alert(http_request.responseText);\n"; +echo " parent.document.getElementById('editor_source').value=http_request.responseText;"; +echo " parent.editor.getSession().setValue(parent.document.getElementById('editor_source').value);"; +echo " parent.editor.gotoLine(1);"; +echo " parent.editor.scrollToLine(1, true, true, function() {});"; +echo " parent.editor.focus();"; echo "\n"; -//echo " //var xmldoc = http_request.responseXML;\n"; -//echo " //var root_node = xmldoc.getElementsByTagName('doc').item(0);\n"; -//echo " //alert(xmldoc.getElementByID('fr1').value);\n"; -//echo " //alert(root_node.firstChild.data);\n"; -//echo "\n"; echo " }\n"; echo " else {\n"; echo " alert('".$text['message-problem']."');\n"; @@ -199,39 +175,53 @@ echo ""; +// keyboard shortcut bindings +echo "\n"; +echo ""; + +echo "\n"; +echo "\n"; + echo "
"; echo "\n"; echo "\n"; echo "
\n"; -//echo "
"; echo "\n"; -echo "
".$text['label-files']."
\n"; //display:none -//echo "
Files
\n"; //display:none +echo " \n"; echo "
".$text['label-files']."
\n"; //start the session ini_set("session.cookie_httponly", True); @@ -286,7 +276,6 @@ echo "
\n"; echo "
"; -echo "

"; require_once "footer.php"; unset ($result_count); @@ -294,8 +283,4 @@ unset ($result); unset ($key); unset ($val); unset ($c); - -echo ""; -echo ""; - ?> \ No newline at end of file diff --git a/app/edit/filenew.php b/app/edit/filenew.php index 6039a45000..6f93a3a8c2 100644 --- a/app/edit/filenew.php +++ b/app/edit/filenew.php @@ -61,7 +61,7 @@ else { echo ""; echo " "; echo " "; - echo " "; + echo " "; echo " "; echo " "; echo " "; @@ -81,7 +81,7 @@ else { echo " "; echo " "; echo " "; echo "
Path:
".$folder.$file."
"; echo " "; - echo " "; + echo " "; echo "
"; diff --git a/app/edit/fileoptions.php b/app/edit/fileoptions.php index 8fe7a025f3..7c7ff62990 100644 --- a/app/edit/fileoptions.php +++ b/app/edit/fileoptions.php @@ -36,8 +36,10 @@ else { } //add multi-lingual support - // included in the header.php file below + $language = new text; + $text = $language->get(); +$title = $text['title-manage-files']; require_once "header.php"; $file = $_GET["file"]; @@ -46,15 +48,14 @@ $folder = $_GET["folder"]; $folder = str_replace ($file, "", $folder); $urlpath = str_replace ($_SERVER["DOCUMENT_ROOT"], "", $folder); -echo "
"; -echo "\n"; +echo "
\n"; echo ""; echo "\n"; echo "\n"; echo "\n"; -echo "\n"; echo "\n"; echo "
"; echo ""; echo ""; -echo "\n"; -echo "\n"; +echo "\n"; +echo "\n"; echo ""; echo "
".$text['label-path']."
".$text['label-file']."
".$text['label-path']."
".$text['label-file']."
"; @@ -63,28 +64,23 @@ echo "
"; -echo " "; +echo " "; echo ""; +echo ""; -echo "
"; -echo ""; -echo " \n"; -echo " \n"; -echo " \n"; -echo " \n"; -echo " \n"; -echo " \n"; -echo " \n"; +echo "





"; +echo " \n"; +echo " \n"; +echo " \n"; +echo " \n"; +echo " \n"; +echo " \n"; +echo " \n"; echo "
 
"; -echo "
"; echo "
"; -echo "
"; require_once "footer.php"; ?> \ No newline at end of file diff --git a/app/edit/fileoptionslist.php b/app/edit/fileoptionslist.php index a7154e3dca..518d620d3e 100644 --- a/app/edit/fileoptionslist.php +++ b/app/edit/fileoptionslist.php @@ -42,77 +42,71 @@ else { //include require_once "header.php"; -function isfile($filename) { - if (@filesize($filename) > 0) { return true; } else { return false; } -} +//define function recure_dir + function recur_dir($dir) { + clearstatcache(); + $htmldirlist = ''; + $htmlfilelist = ''; + $dirlist = opendir($dir); + $dir_array = array(); + while (false !== ($file = readdir($dirlist))) { + if ($file != "." AND $file != ".."){ + $newpath = $dir.'/'.$file; + $level = explode('/',$newpath); + if (substr($newpath, -4) == ".svn" || + substr($newpath, -4) == ".git") { + //ignore .svn and .git dir and subdir + } + elseif (substr($newpath, -3) == ".db") { + //ignore .db files + } + else { + $dir_array[] = $newpath; + } + if ($x > 1000) { break; }; + $x++; + } + } -function space($count) { - $r=''; $i=0; - while($i < $count) { - $r .= ' '; - $i++; + asort($dir_array); + foreach ($dir_array as $newpath){ + $level = explode('/',$newpath); + + if (is_dir($newpath)) { + $dirname = end($level); + $newpath = str_replace ('//', '/', $newpath); + $htmldirlist .= " + + + + +
+ ".$dirname."
".recur_dir($newpath)."
+
\n"; + } + else { + $filename = end($level); + $filesize = round(filesize($newpath)/1024, 2); + $newpath = str_replace ('//', '/', $newpath); + $newpath = str_replace ("\\", "/", $newpath); + $newpath = str_replace ($filename, '', $newpath); + $htmlfilelist .= " + + + + +
+ ".$filename." +
\n"; + } + } + + closedir($dirlist); + return $htmldirlist ."\n". $htmlfilelist; } - return $r; -} - -function recur_dir($dir) { - clearstatcache(); - $htmldirlist = ''; - $htmlfilelist = ''; - $dirlist = opendir($dir); - while ($file = readdir ($dirlist)) { - if ($file != '.' && $file != '..') { - $newpath = $dir.'/'.$file; - $level = explode('/',$newpath); - - if (is_dir($newpath)) { - /*$mod_array[] = array( - 'level'=>count($level)-1, - 'path'=>$newpath, - 'name'=>end($level), - 'type'=>'dir', - 'mod_time'=>filemtime($newpath), - 'size'=>''); - $mod_array[] = recur_dir($newpath); - */ - $dirname = end($level); - $htmldirlist .= space(count($level))."
$dirname
\n"; - //$htmldirlist .= space(count($level))."
Tools
\n"; - //$htmldirlist .= space(count($level))."
New Folder
\n"; //parent.document.getElementById('file').value='".urlencode($newpath)."' - //$htmldirlist .= space(count($level))."
\n"; - //$htmldirlist .= space(count($level))."
New File
\n"; //parent.document.getElementById('file').value='".urlencode($newpath)."' - //$htmldirlist .= space(count($level))."
\n"; - //$htmldirlist .= space(count($level))."
\n"; - //$htmldirlist .= space(count($level))."
Options
\n"; //parent.document.getElementById('file').value='".urlencode($newpath)."' - //$htmldirlist .= space(count($level))."
\n"; - $htmldirlist .= recur_dir($newpath); - $htmldirlist .= space(count($level))."
\n"; - } - else { - /*$mod_array[] = array( - 'level'=>count($level)-1, - 'path'=>$newpath, - 'name'=>end($level), - 'type'=>'file', - 'mod_time'=>filemtime($newpath), - 'size'=>filesize($newpath)); - */ - $filename = end($level); - $filesize = round(filesize($newpath)/1024, 2); - $newpath = str_replace ($filename, "", $newpath); - $htmlfilelist .= space(count($level))."
$filename
\n"; - $htmlfilelist .= space(count($level))."
\n"; - } - } - } - - closedir($dirlist); - return $htmldirlist ."\n". $htmlfilelist; -} echo "\n"; -echo "
"; echo "\n"; - -echo "\n"; -echo " "; echo " "; echo "
\n"; -echo "\n"; -echo " \n"; -echo "\n"; +echo " \n"; +echo " \n"; echo "
".$text['label-files']."
\n"; //display:none -//echo " \n"; +echo "
Files
\n"; //display:none - -//echo "
Tools
\n"; -//echo "
New Folder
\n"; //parent.document.getElementById('file').value='".urlencode($newpath)."' -//echo "
\n"; -//echo "
New File
\n"; //parent.document.getElementById('file').value='".urlencode($newpath)."' -//echo "
\n"; -//echo "
\n"; +echo "
\n"; +echo "
".$text['label-files']."
\n"; ini_set("session.cookie_httponly", True); session_start(); @@ -246,15 +207,12 @@ if ($_SESSION["app"]["edit"]["dir"] == "xml") { echo recur_dir($_SESSION['switch']['conf']['dir']); } -echo "
\n"; +echo "
\n"; - -echo "
\n"; -echo ""; -echo "

"; require_once "footer.php"; unset ($result_count); @@ -262,8 +220,4 @@ unset ($result); unset ($key); unset ($val); unset ($c); - -echo ""; -echo ""; - ?> \ No newline at end of file diff --git a/app/edit/filerename.php b/app/edit/filerename.php index 693fc7578b..b526f8b9c1 100644 --- a/app/edit/filerename.php +++ b/app/edit/filerename.php @@ -93,7 +93,7 @@ else { //display form echo " 		"; echo " "; echo " "; - echo " "; + echo " "; echo "
"; diff --git a/app/edit/filesave.php b/app/edit/filesave.php index a13101623d..25f68df698 100644 --- a/app/edit/filesave.php +++ b/app/edit/filesave.php @@ -39,17 +39,34 @@ else { $language = new text; $text = $language->get(); -$filename = $_POST["file"]; //filename with the path -$filename = str_replace ("\\", "/", $filename); -$content = $_POST["content"]; + $filepath = $_POST["filepath"]; + if ($filepath != '') { -$handle = fopen($filename, 'wb') or die($text['message-error']); -fwrite($handle, $content); -fclose($handle); + try { + //save file content + $filepath = realpath($filepath); //filepath + $filepath = str_replace ('//', '/', $filepath); + $filepath = str_replace ("\\", "/", $filepath); + $content = $_POST["content"]; -//set the reload_xml value to true - $_SESSION["reload_xml"] = true; + $handle = fopen($filepath, 'wb'); + if (!$handle) { + throw new Exception('Write Failed - Check File Owner & Permissions'); + } + fwrite($handle, $content); + fclose($handle); -echo $content; + //set the reload_xml value to true + $_SESSION["reload_xml"] = true; + + //alert user of success + echo ""; + } + catch(Exception $e) { + //alert error + echo ""; + } + + } ?> \ No newline at end of file diff --git a/app/edit/foldernew.php b/app/edit/foldernew.php index 0718d135b1..0f0e002636 100644 --- a/app/edit/foldernew.php +++ b/app/edit/foldernew.php @@ -56,7 +56,7 @@ else { //display form echo ""; echo " "; echo " "; - echo " "; + echo " "; echo " "; echo " "; echo " "; @@ -76,7 +76,7 @@ else { //display form echo " "; echo " "; echo " "; echo "
".$text['label-path']."
".$folder."
"; echo " "; - echo " "; + echo " "; echo "
"; diff --git a/app/edit/header.php b/app/edit/header.php index 010f002f18..5bd754a763 100644 --- a/app/edit/header.php +++ b/app/edit/header.php @@ -31,7 +31,7 @@ echo ""; echo ""; -echo ""; +echo "".$title.""; //echo ""; echo " - + +
- -
- - + - \n"; - echo "\n"; - } - else { - echo "\n"; - } - ?> - + +
+ + + + + + + + + + + + + + + +
+ + + + + +
+
+
+
+ + + + + \ No newline at end of file diff --git a/app/edit/list.php b/app/edit/list.php deleted file mode 100644 index 3670501ec1..0000000000 --- a/app/edit/list.php +++ /dev/null @@ -1,113 +0,0 @@ - - Portions created by the Initial Developer are Copyright (C) 2008-2012 - the Initial Developer. All Rights Reserved. - - Contributor(s): - Mark J Crane - James Rose -*/ -include "root.php"; -require_once "resources/check_auth.php"; -if (permission_exists('script_editor_view')) { - //access granted -} -else { - echo "access denied"; - exit; -} - -//add multi-lingual support - $language = new text; - $text = $language->get(); - -require_once "admin/edit/header.php"; -echo "
"; -echo "\n"; -echo "\n"; -echo " \n"; - echo "\n"; -} //end if results -echo "
\n"; -echo "
"; - -$sql = "select * from v_clips "; -$prep_statement = $db->prepare(check_sql($sql)); -$prep_statement->execute(); -$result = $prep_statement->fetchAll(PDO::FETCH_NAMED); -$result_count = count($result); - -$c = 0; -$row_style["0"] = "background-color: #F5F5DC;"; -$row_style["1"] = "background-color: #FFFFFF;"; - -echo "
\n"; -echo "\n"; -echo ""; - -if ($result_count == 0) { //no results - echo ""; -} -else { //received results - echo ""; - echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - echo ""; - echo "\n"; - - foreach($result as $row) { - echo "\n"; - //echo ""; - echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - //echo ""; - echo ""; - echo "\n"; - if ($c==0) { $c=1; } else { $c=0; } - } //end foreach - unset($sql, $result, $row_count); - echo "
 
    clip name      clip_folder        clip_text_start        clip_text_end        clip_desc        clip_order   
".$row['clip_uuid']."".$row['clip_name']."".$row[clip_folder]."".$row[clip_text_start]."".$row[clip_text_end]."".$row[clip_desc]."".$row[clip_order]."
\n"; - echo "
\n"; - - echo "
\n"; - -echo "
\n"; -echo "   \n"; -echo "   \n"; -echo "
\n"; -echo ""; - -echo "

"; -require_once "admin/edit/footer.php"; - -unset ($result_count); -unset ($result); -unset ($key); -unset ($val); -unset ($c); - -?> \ No newline at end of file diff --git a/app/edit/resources/images/blank.gif b/app/edit/resources/images/blank.gif new file mode 100644 index 0000000000000000000000000000000000000000..75b945d2553848b8b6f41fe5e24599c0687b8472 GIT binary patch literal 49 zcmZ?wbhEHbWMp7unE0RJ|Ns9C3=9Vj8~~DvKUo+V7?>DzfNY>Fh|Ltj$Y2csQN9XW literal 0 HcmV?d00001 diff --git a/app/edit/resources/images/icon_file.png b/app/edit/resources/images/icon_file.png new file mode 100644 index 0000000000000000000000000000000000000000..c8d71de0c4ad9a7a8f4349f7b5afecf4d97e0bb7 GIT binary patch literal 257 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`EX7WqAsj$Z!;#Vf4nJ za0`PlBg3pY55O6*3aqU4E)2*A_r%sCn&Dx^)?Ph~mWJ}XY zrZ<;%OrBu7XQP2rM}k|9&Yrt9?;aW%FbSys6x+fwGkHS0-;^IU8mk^$ydLQcFw|Q4~G%p-ze-6lZA1 zk{YU&jWJLtl2luXAT35+s4IzP5wP1Qy|jX>NX zY6>kWouRP6I1Di30+9*7jc4`Vz2}|#?#Ti62XR1ef0A%dsJ7Yj1aToT9Sj6(0HC3< zp@U;{^1lC=>F8|l?9ub-odUVm+!B9frB{^1Vm`-e093Nj<-B3aG8uopSosRzU;%=r z2!bHMv0QqEul%mQN6{3y=L&)#RGW{ROAH2vC_Gnio9FlpS(c$F3IM=hFo0ngBPkRaFf14>|yB3P=fQT3VEfIhIS8Wf|e{$ng82AzvsIS_c4+$Mb}w$YGz~?*RZw zl2*iIVg>*~0ze=TsF{pRJqG|qQ4o(s`?ekfKqwSikHupzx9*c)CVGQy!TSI-ohj<} zd1I$l00nBBspC=rh}yc^r`}5!ZyAloG)>d6n34`@8(L2^8dU+n>2#*KT&|Xrj#D-O zIC3<@!Db(`jgE}IrU7Uc-g3f}WikQ)!!U5W-DNaI59Oc9e?@@;Z{e?(x=Sx?O=Yv$ zbhE{52ma%Q5972jAIQ4=e6olE>*nR--6DJ1a(#ry~j}({V(u-_( zBapHN;y;XxjPpq}9IIYNV$->>u<$V^CZ-4=e)RI?OX{W;W@ctfpsO|mnF3T#EkGB8 zupZEYQ^ckgxZ(f){qqN6DIk^uVi&9~fmoml3L<22TzZL4Ei5c>rMKU{eQQP4)B+51 z5OoQd0PLxrS`-x(K|v7#H0Ti!5T%EaE=4Xh#-9Q4BQnbtOueIJ3q`4AWL0wj0R{l= WHTrvIz+7Yi0000}#2@UW1Hq1KuRbX2Ya?I0C@d))q#Fd-wWOxz zs4;o~bLVgxU6G37y$MXB6L4py%7uEqH$HhuyduZcNUZwEOEYr2pRl$q5Py)BzJNNX zQKF7aDt!lQnV)LTB4-ic@U-eM4MeHPNknUiTo2gL0Oz|{*=v=G(A0HY-axH(gT3)Y z>$J?1LC}v3#>>Icz$9weq?Gi+ju~@124(`VN+39X%98>0KaGy|{#+K3CrDx&%;B=R zE#m1J%zD^e(0#BYWi&35UI=^ZcOd4md_Lbg_VvrnnHu`SiEPC96pAZK)kwb<4Zh)> z-w!@Jl!BbK3!-B2I>OhXFXX*{9XZ9Dfi_r(tczXBAj*Eyd|$VH6&c zgpaq>18@&EuYmoLy}n{{=5iQhb6`v5w?!sZl_P?j6JFdRxQE#I zMv0vAERRX_2zXzj){GC=q^w8qevBC$VZ+FvCG zU*Nt}bKABRP1BS#O=;%}_tM_DNYGrO*=*)_?)$!p2U9Rk@%4pUGX^Fl%F+R!#j@N` z`p_792+qJbxCM(6<}O&tmBq5G08(WW8ektx7qSqEq}6Iwayv(@L(bf1-9iTx0bRm8 zDs>CY_h7aO(=KSRjM~s$=mzVSOrTrtO5IYc)qZCcx=N zjTA4gl%K$9#tuu^ywoi)uR~U;EU4Q#Yel+S>at}S{>=@HZvh4XFCx-qlh}c#00000 LNkvXXu0mjfcthUG literal 0 HcmV?d00001 diff --git a/app/edit/resources/images/icon_save.png b/app/edit/resources/images/icon_save.png new file mode 100644 index 0000000000000000000000000000000000000000..bccf65520a352b0c4401ebfd573c8f71d9a788ef GIT binary patch literal 508 zcmV zDR*|di~0smuI?g;qk|y&0^;r{4o*ITLn-CX-FyO}|Mg2~Bu!Imx%Unp_(*b+oP7Px zX`(hwqpZs`WsPRAP7nmIXttM#RY8T@x~|{CFzg1es_F!dx+K{da0Wbgg5$(5G@HOj z>))4bUI2vF9&p(D-hl#`0}gP{f@>UeiYSU^zyTZc0D(s=JwQ$VZ?t0@oAd&(;q4V{Mt+ yuH20kJV2k2Ygc4mt>|^DWSVdNs|Wg9fB^tj7FE7Pi0g#_0000{( zJaZG%Q-e|yQz{EjrrH1%rF*(KhE&{2`t$$4J@Z-yVP;*%6Hf!KZ)f}%I6;6_V#$8q zJhe#=r%3T^XGl|1);S|7Df!>I_E5(g