Version 1.3

Now includes word HINT

CodeMirror-2.32/README.md

@@ -1,8 +0,0 @@
-# CodeMirror 2
-
-CodeMirror is a JavaScript component that provides a code editor in
-the browser. When a mode is available for the language you are coding
-in, it will color your code, and optionally help with indentation.
-
-The project page is http://codemirror.net
-The manual is at http://codemirror.net/doc/manual.html

CodeMirror-2.32/lib/codemirror.css

@@ -1,169 +0,0 @@
-.CodeMirror {
-  line-height: 1em;
-  font-family: monospace;
-
-  /* Necessary so the scrollbar can be absolutely positioned within the wrapper on Lion. */
-  position: relative;
-  /* This prevents unwanted scrollbars from showing up on the body and wrapper in IE. */
-  overflow: hidden;
-}
-
-.CodeMirror-scroll {
-  overflow-x: auto;
-  overflow-y: hidden;
-  height: 300px;
-  /* This is needed to prevent an IE[67] bug where the scrolled content
-     is visible outside of the scrolling box. */
-  position: relative;
-  outline: none;
-}
-
-/* Vertical scrollbar */
-.CodeMirror-scrollbar {
-  float: right;
-  overflow-x: hidden;
-  overflow-y: scroll;
-
-  /* This corrects for the 1px gap introduced to the left of the scrollbar
-     by the rule for .CodeMirror-scrollbar-inner. */
-  margin-left: -1px;
-}
-.CodeMirror-scrollbar-inner {
-  /* This needs to have a nonzero width in order for the scrollbar to appear
-     in Firefox and IE9. */
-  width: 1px;
-}
-.CodeMirror-scrollbar.cm-sb-overlap {
-  /* Ensure that the scrollbar appears in Lion, and that it overlaps the content
-     rather than sitting to the right of it. */
-  position: absolute;
-  z-index: 1;
-  float: none;
-  right: 0;
-  min-width: 12px;
-}
-.CodeMirror-scrollbar.cm-sb-nonoverlap {
-  min-width: 12px;
-}
-.CodeMirror-scrollbar.cm-sb-ie7 {
-  min-width: 18px;
-}
-
-.CodeMirror-gutter {
-  position: absolute; left: 0; top: 0;
-  z-index: 10;
-  background-color: #f7f7f7;
-  border-right: 1px solid #eee;
-  min-width: 2em;
-  height: 100%;
-}
-.CodeMirror-gutter-text {
-  color: #aaa;
-  text-align: right;
-  padding: .4em .2em .4em .4em;
-  white-space: pre !important;
-  cursor: default;
-}
-.CodeMirror-lines {
-  padding: .4em;
-  white-space: pre;
-  cursor: text;
-}
-.CodeMirror-lines * {
-  /* Necessary for throw-scrolling to decelerate properly on Safari. */
-  pointer-events: none;
-}
-
-.CodeMirror pre {
-  -moz-border-radius: 0;
-  -webkit-border-radius: 0;
-  -o-border-radius: 0;
-  border-radius: 0;
-  border-width: 0; margin: 0; padding: 0; background: transparent;
-  font-family: inherit;
-  font-size: inherit;
-  padding: 0; margin: 0;
-  white-space: pre;
-  word-wrap: normal;
-  line-height: inherit;
-  color: inherit;
-}
-
-.CodeMirror-wrap pre {
-  word-wrap: break-word;
-  white-space: pre-wrap;
-  word-break: normal;
-}
-.CodeMirror-wrap .CodeMirror-scroll {
-  overflow-x: hidden;
-}
-
-.CodeMirror textarea {
-  outline: none !important;
-}
-
-.CodeMirror pre.CodeMirror-cursor {
-  z-index: 10;
-  position: absolute;
-  visibility: hidden;
-  border-left: 1px solid black;
-  border-right: none;
-  width: 0;
-}
-.cm-keymap-fat-cursor pre.CodeMirror-cursor {
-  width: auto;
-  border: 0;
-  background: transparent;
-  background: rgba(0, 200, 0, .4);
-  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#6600c800, endColorstr=#4c00c800);
-}
-/* Kludge to turn off filter in ie9+, which also accepts rgba */
-.cm-keymap-fat-cursor pre.CodeMirror-cursor:not(#nonsense_id) {
-  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
-}
-.CodeMirror pre.CodeMirror-cursor.CodeMirror-overwrite {}
-.CodeMirror-focused pre.CodeMirror-cursor {
-  visibility: visible;
-}
-
-div.CodeMirror-selected { background: #d9d9d9; }
-.CodeMirror-focused div.CodeMirror-selected { background: #d7d4f0; }
-
-.CodeMirror-searching {
-  background: #ffa;
-  background: rgba(255, 255, 0, .4);
-}
-
-/* Default theme */
-
-.cm-s-default span.cm-keyword {color: #708;}
-.cm-s-default span.cm-atom {color: #219;}
-.cm-s-default span.cm-number {color: #164;}
-.cm-s-default span.cm-def {color: #00f;}
-.cm-s-default span.cm-variable {color: black;}
-.cm-s-default span.cm-variable-2 {color: #05a;}
-.cm-s-default span.cm-variable-3 {color: #085;}
-.cm-s-default span.cm-property {color: black;}
-.cm-s-default span.cm-operator {color: black;}
-.cm-s-default span.cm-comment {color: #a50;}
-.cm-s-default span.cm-string {color: #a11;}
-.cm-s-default span.cm-string-2 {color: #f50;}
-.cm-s-default span.cm-meta {color: #555;}
-.cm-s-default span.cm-error {color: #f00;}
-.cm-s-default span.cm-qualifier {color: #555;}
-.cm-s-default span.cm-builtin {color: #30a;}
-.cm-s-default span.cm-bracket {color: #cc7;}
-.cm-s-default span.cm-tag {color: #170;}
-.cm-s-default span.cm-attribute {color: #00c;}
-.cm-s-default span.cm-header {color: blue;}
-.cm-s-default span.cm-quote {color: #090;}
-.cm-s-default span.cm-hr {color: #999;}
-.cm-s-default span.cm-link {color: #00c;}
-
-span.cm-header, span.cm-strong {font-weight: bold;}
-span.cm-em {font-style: italic;}
-span.cm-emstrong {font-style: italic; font-weight: bold;}
-span.cm-link {text-decoration: underline;}
-
-div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
-div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}

CodeMirror-3.0/lib/codemirror.css

@@ -0,0 +1,239 @@
+/* BASICS */
+
+.CodeMirror {
+  /* Set height, width, borders, and global font properties here */
+  font-family: monospace;
+  height: 300px;
+}
+.CodeMirror-scroll {
+  /* Set scrolling behaviour here */
+  overflow: auto;
+}
+
+/* PADDING */
+
+.CodeMirror-lines {
+  padding: 4px 0; /* Vertical padding around content */
+}
+.CodeMirror pre {
+  padding: 0 4px; /* Horizontal padding of content */
+}
+
+.CodeMirror-scrollbar-filler {
+  background-color: white; /* The little square between H and V scrollbars */
+}
+
+/* GUTTER */
+
+.CodeMirror-gutters {
+  border-right: 1px solid #ddd;
+  background-color: #f7f7f7;
+}
+.CodeMirror-linenumbers {}
+.CodeMirror-linenumber {
+  padding: 0 3px 0 5px;
+  min-width: 20px;
+  text-align: right;
+  color: #999;
+}
+
+/* CURSOR */
+
+.CodeMirror pre.CodeMirror-cursor {
+  border-left: 1px solid black;
+}
+/* Shown when moving in bi-directional text */
+.CodeMirror pre.CodeMirror-secondarycursor {
+  border-left: 1px solid silver;
+}
+.cm-keymap-fat-cursor pre.CodeMirror-cursor {
+  width: auto;
+  border: 0;
+  background: transparent;
+  background: rgba(0, 200, 0, .4);
+  filter: progid:DXImageTransform.Microsoft.gradient(startColorstr=#6600c800, endColorstr=#4c00c800);
+}
+/* Kludge to turn off filter in ie9+, which also accepts rgba */
+.cm-keymap-fat-cursor pre.CodeMirror-cursor:not(#nonsense_id) {
+  filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
+}
+/* Can style cursor different in overwrite (non-insert) mode */
+.CodeMirror pre.CodeMirror-cursor.CodeMirror-overwrite {}
+
+/* DEFAULT THEME */
+
+.cm-s-default .cm-keyword {color: #708;}
+.cm-s-default .cm-atom {color: #219;}
+.cm-s-default .cm-number {color: #164;}
+.cm-s-default .cm-def {color: #00f;}
+.cm-s-default .cm-variable {color: black;}
+.cm-s-default .cm-variable-2 {color: #05a;}
+.cm-s-default .cm-variable-3 {color: #085;}
+.cm-s-default .cm-property {color: black;}
+.cm-s-default .cm-operator {color: black;}
+.cm-s-default .cm-comment {color: #a50;}
+.cm-s-default .cm-string {color: #a11;}
+.cm-s-default .cm-string-2 {color: #f50;}
+.cm-s-default .cm-meta {color: #555;}
+.cm-s-default .cm-error {color: #f00;}
+.cm-s-default .cm-qualifier {color: #555;}
+.cm-s-default .cm-builtin {color: #30a;}
+.cm-s-default .cm-bracket {color: #997;}
+.cm-s-default .cm-tag {color: #170;}
+.cm-s-default .cm-attribute {color: #00c;}
+.cm-s-default .cm-header {color: blue;}
+.cm-s-default .cm-quote {color: #090;}
+.cm-s-default .cm-hr {color: #999;}
+.cm-s-default .cm-link {color: #00c;}
+
+.cm-negative {color: #d44;}
+.cm-positive {color: #292;}
+.cm-header, .cm-strong {font-weight: bold;}
+.cm-em {font-style: italic;}
+.cm-emstrong {font-style: italic; font-weight: bold;}
+.cm-link {text-decoration: underline;}
+
+.cm-invalidchar {color: #f00;}
+
+div.CodeMirror span.CodeMirror-matchingbracket {color: #0f0;}
+div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #f22;}
+
+/* STOP */
+
+/* The rest of this file contains styles related to the mechanics of
+   the editor. You probably shouldn't touch them. */
+
+.CodeMirror {
+  line-height: 1;
+  position: relative;
+  overflow: hidden;
+}
+
+.CodeMirror-scroll {
+  /* 30px is the magic margin used to hide the element's real scrollbars */
+  /* See overflow: hidden in .CodeMirror, and the paddings in .CodeMirror-sizer */
+  margin-bottom: -30px; margin-right: -30px;
+  padding-bottom: 30px; padding-right: 30px;
+  height: 100%;
+  outline: none; /* Prevent dragging from highlighting the element */
+  position: relative;
+}
+.CodeMirror-sizer {
+  position: relative;
+}
+
+/* The fake, visible scrollbars. Used to force redraw during scrolling
+   before actuall scrolling happens, thus preventing shaking and
+   flickering artifacts. */
+.CodeMirror-vscrollbar, .CodeMirror-hscrollbar, .CodeMirror-scrollbar-filler {
+  position: absolute;
+  z-index: 6;
+  display: none;
+}
+.CodeMirror-vscrollbar {
+  right: 0; top: 0;
+  overflow-x: hidden;
+  overflow-y: scroll;
+}
+.CodeMirror-hscrollbar {
+  bottom: 0; left: 0;
+  overflow-y: hidden;
+  overflow-x: scroll;
+}
+.CodeMirror-scrollbar-filler {
+  right: 0; bottom: 0;
+  z-index: 6;
+}
+
+.CodeMirror-gutters {
+  position: absolute; left: 0; top: 0;
+  height: 100%;
+  z-index: 3;
+}
+.CodeMirror-gutter {
+  height: 100%;
+  display: inline-block;
+  /* Hack to make IE7 behave */
+  *zoom:1;
+  *display:inline;
+}
+.CodeMirror-gutter-elt {
+  position: absolute;
+  cursor: default;
+  z-index: 4;
+}
+
+.CodeMirror-lines {
+  cursor: text;
+}
+.CodeMirror pre {
+  /* Reset some styles that the rest of the page might have set */
+  -moz-border-radius: 0; -webkit-border-radius: 0; -o-border-radius: 0; border-radius: 0;
+  border-width: 0;
+  background: transparent;
+  font-family: inherit;
+  font-size: inherit;
+  margin: 0;
+  white-space: pre;
+  word-wrap: normal;
+  line-height: inherit;
+  color: inherit;
+  z-index: 2;
+  position: relative;
+  overflow: visible;
+}
+.CodeMirror-wrap pre {
+  word-wrap: break-word;
+  white-space: pre-wrap;
+  word-break: normal;
+}
+.CodeMirror-linebackground {
+  position: absolute;
+  left: 0; right: 0; top: 0; bottom: 0;
+  z-index: 0;
+}
+
+.CodeMirror-linewidget {
+  position: relative;
+  z-index: 2;
+}
+
+.CodeMirror-wrap .CodeMirror-scroll {
+  overflow-x: hidden;
+}
+
+.CodeMirror-measure {
+  position: absolute;
+  width: 100%; height: 0px;
+  overflow: hidden;
+  visibility: hidden;
+}
+.CodeMirror-measure pre { position: static; }
+
+.CodeMirror pre.CodeMirror-cursor {
+  position: absolute;
+  visibility: hidden;
+  border-right: none;
+  width: 0;
+}
+.CodeMirror-focused pre.CodeMirror-cursor {
+  visibility: visible;
+}
+
+.CodeMirror-selected { background: #d9d9d9; }
+.CodeMirror-focused .CodeMirror-selected { background: #d7d4f0; }
+
+.CodeMirror-searching {
+  background: #ffa;
+  background: rgba(255, 255, 0, .4);
+}
+
+/* IE7 hack to prevent it from returning funny offsetTops on the spans */
+.CodeMirror span { *vertical-align: text-bottom; }
+
+@media print {
+  /* Hide the cursor when printing */
+  .CodeMirror pre.CodeMirror-cursor {
+    visibility: hidden;
+  }
+}

CodeMirror-3.0/theme/ambiance-mobile.css

@@ -0,0 +1,6 @@
+.cm-s-ambiance.CodeMirror {
+  -webkit-box-shadow: none;
+  -moz-box-shadow: none;
+  -o-box-shadow: none;
+  box-shadow: none;
+}

CodeMirror-3.0/theme/blackboard.css

@@ -1,9 +1,9 @@
 /* Port of TextMate's Blackboard theme */
 
-.cm-s-blackboard { background: #0C1021; color: #F8F8F8; }
+.cm-s-blackboard.CodeMirror { background: #0C1021; color: #F8F8F8; }
 .cm-s-blackboard .CodeMirror-selected { background: #253B76 !important; }
-.cm-s-blackboard .CodeMirror-gutter { background: #0C1021; border-right: 0; }
-.cm-s-blackboard .CodeMirror-gutter-text { color: #888; }
+.cm-s-blackboard .CodeMirror-gutters { background: #0C1021; border-right: 0; }
+.cm-s-blackboard .CodeMirror-linenumber { color: #888; }
 .cm-s-blackboard .CodeMirror-cursor { border-left: 1px solid #A7A7A7 !important; }
 
 .cm-s-blackboard .cm-keyword { color: #FBDE2D; }

CodeMirror-3.0/theme/cobalt.css

@@ -1,7 +1,7 @@
-.cm-s-cobalt { background: #002240; color: white; }
+.cm-s-cobalt.CodeMirror { background: #002240; color: white; }
 .cm-s-cobalt div.CodeMirror-selected { background: #b36539 !important; }
-.cm-s-cobalt .CodeMirror-gutter { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-cobalt .CodeMirror-gutter-text { color: #d0d0d0; }
+.cm-s-cobalt .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-cobalt .CodeMirror-linenumber { color: #d0d0d0; }
 .cm-s-cobalt .CodeMirror-cursor { border-left: 1px solid white !important; }
 
 .cm-s-cobalt span.cm-comment { color: #08f; }

CodeMirror-3.0/theme/erlang-dark.css

@@ -1,7 +1,7 @@
-.cm-s-erlang-dark { background: #002240; color: white; }
+.cm-s-erlang-dark.CodeMirror { background: #002240; color: white; }
 .cm-s-erlang-dark div.CodeMirror-selected { background: #b36539 !important; }
-.cm-s-erlang-dark .CodeMirror-gutter { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-erlang-dark .CodeMirror-gutter-text { color: #d0d0d0; }
+.cm-s-erlang-dark .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-erlang-dark .CodeMirror-linenumber { color: #d0d0d0; }
 .cm-s-erlang-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
 
 .cm-s-erlang-dark span.cm-atom       { color: #845dc4; }

CodeMirror-3.0/theme/lesser-dark.css

@@ -9,15 +9,15 @@ Ported to CodeMirror by Peter Kroon
   font-family: 'Bitstream Vera Sans Mono', 'DejaVu Sans Mono', 'Monaco', Courier, monospace !important;
 }
 
-.cm-s-lesser-dark { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
+.cm-s-lesser-dark.CodeMirror { background: #262626; color: #EBEFE7; text-shadow: 0 -1px 1px #262626; }
 .cm-s-lesser-dark div.CodeMirror-selected {background: #45443B !important;} /* 33322B*/
 .cm-s-lesser-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
-.cm-s-lesser-dark .CodeMirror-lines { margin-left:3px; margin-right:3px; }/*editable code holder*/
+.cm-s-lesser-dark pre { padding: 0 8px; }/*editable code holder*/
 
 div.CodeMirror span.CodeMirror-matchingbracket { color: #7EFC7E; }/*65FC65*/
 
-.cm-s-lesser-dark .CodeMirror-gutter { background: #262626; border-right:1px solid #aaa; padding-right:3px; min-width:2.5em; }
-.cm-s-lesser-dark .CodeMirror-gutter-text { color: #777; }
+.cm-s-lesser-dark .CodeMirror-gutters { background: #262626; border-right:1px solid #aaa; }
+.cm-s-lesser-dark .CodeMirror-linenumber { color: #777; }
 
 .cm-s-lesser-dark span.cm-keyword { color: #599eff; }
 .cm-s-lesser-dark span.cm-atom { color: #C2B470; }

CodeMirror-3.0/theme/monokai.css

@@ -1,9 +1,9 @@
 /* Based on Sublime Text's Monokai theme */
 
-.cm-s-monokai {background: #272822; color: #f8f8f2;}
+.cm-s-monokai.CodeMirror {background: #272822; color: #f8f8f2;}
 .cm-s-monokai div.CodeMirror-selected {background: #49483E !important;}
-.cm-s-monokai .CodeMirror-gutter {background: #272822; border-right: 0px;}
-.cm-s-monokai .CodeMirror-gutter-text {color: #d0d0d0;}
+.cm-s-monokai .CodeMirror-gutters {background: #272822; border-right: 0px;}
+.cm-s-monokai .CodeMirror-linenumber {color: #d0d0d0;}
 .cm-s-monokai .CodeMirror-cursor {border-left: 1px solid #f8f8f0 !important;}
 
 .cm-s-monokai span.cm-comment {color: #75715e;}

CodeMirror-3.0/theme/night.css

@@ -1,9 +1,9 @@
 /* Loosely based on the Midnight Textmate theme */
 
-.cm-s-night { background: #0a001f; color: #f8f8f8; }
+.cm-s-night.CodeMirror { background: #0a001f; color: #f8f8f8; }
 .cm-s-night div.CodeMirror-selected { background: #447 !important; }
-.cm-s-night .CodeMirror-gutter { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-night .CodeMirror-gutter-text { color: #f8f8f8; }
+.cm-s-night .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-night .CodeMirror-linenumber { color: #f8f8f8; }
 .cm-s-night .CodeMirror-cursor { border-left: 1px solid white !important; }
 
 .cm-s-night span.cm-comment { color: #6900a1; }

CodeMirror-3.0/theme/rubyblue.css

@@ -1,9 +1,9 @@
 .cm-s-rubyblue { font:13px/1.4em Trebuchet, Verdana, sans-serif; }	/* - customized editor font - */
 
-.cm-s-rubyblue { background: #112435; color: white; }
+.cm-s-rubyblue.CodeMirror { background: #112435; color: white; }
 .cm-s-rubyblue div.CodeMirror-selected { background: #38566F !important; }
-.cm-s-rubyblue .CodeMirror-gutter { background: #1F4661; border-right: 7px solid #3E7087; min-width:2.5em; }
-.cm-s-rubyblue .CodeMirror-gutter-text { color: white; }
+.cm-s-rubyblue .CodeMirror-gutters { background: #1F4661; border-right: 7px solid #3E7087; }
+.cm-s-rubyblue .CodeMirror-linenumber { color: white; }
 .cm-s-rubyblue .CodeMirror-cursor { border-left: 1px solid white !important; }
 
 .cm-s-rubyblue span.cm-comment { color: #999; font-style:italic; line-height: 1em; }

CodeMirror-3.0/theme/twilight.css

@@ -0,0 +1,26 @@
+.cm-s-twilight.CodeMirror { background: #141414; color: #f7f7f7; } /**/
+.cm-s-twilight .CodeMirror-selected { background: #323232 !important; } /**/
+
+.cm-s-twilight .CodeMirror-gutters { background: #222; border-right: 1px solid #aaa; }
+.cm-s-twilight .CodeMirror-linenumber { color: #aaa; }
+.cm-s-twilight .CodeMirror-cursor { border-left: 1px solid white !important; }
+
+.cm-s-twilight .cm-keyword {  color: #f9ee98; } /**/
+.cm-s-twilight .cm-atom { color: #FC0; }
+.cm-s-twilight .cm-number { color:  #ca7841; } /**/
+.cm-s-twilight .cm-def { color: #8DA6CE; }
+.cm-s-twilight span.cm-variable-2, .cm-s-twilight span.cm-tag { color: #607392; } /**/
+.cm-s-twilight span.cm-variable-3, .cm-s-twilight span.cm-def { color: #607392; } /**/
+.cm-s-twilight .cm-operator { color: #cda869; } /**/
+.cm-s-twilight .cm-comment { color:#777; font-style:italic; font-weight:normal; } /**/
+.cm-s-twilight .cm-string { color:#8f9d6a; font-style:italic; } /**/
+.cm-s-twilight .cm-string-2 { color:#bd6b18 } /*?*/
+.cm-s-twilight .cm-meta { background-color:#141414; color:#f7f7f7; } /*?*/
+.cm-s-twilight .cm-error { border-bottom: 1px solid red; }
+.cm-s-twilight .cm-builtin { color: #cda869; } /*?*/
+.cm-s-twilight .cm-tag { color: #997643; } /**/
+.cm-s-twilight .cm-attribute { color: #d6bb6d; } /*?*/
+.cm-s-twilight .cm-header { color: #FF6400; }
+.cm-s-twilight .cm-hr { color: #AEAEAE; }
+.cm-s-twilight .cm-link {   color:#ad9361; font-style:italic; text-decoration:none; } /**/
+

CodeMirror-3.0/theme/vibrant-ink.css

@@ -1,10 +1,10 @@
 /* Taken from the popular Visual Studio Vibrant Ink Schema */
 
-.cm-s-vibrant-ink { background: black; color: white; }
+.cm-s-vibrant-ink.CodeMirror { background: black; color: white; }
 .cm-s-vibrant-ink .CodeMirror-selected { background: #35493c !important; }
 
-.cm-s-vibrant-ink .CodeMirror-gutter { background: #002240; border-right: 1px solid #aaa; }
-.cm-s-vibrant-ink .CodeMirror-gutter-text { color: #d0d0d0; }
+.cm-s-vibrant-ink .CodeMirror-gutters { background: #002240; border-right: 1px solid #aaa; }
+.cm-s-vibrant-ink .CodeMirror-linenumber { color: #d0d0d0; }
 .cm-s-vibrant-ink .CodeMirror-cursor { border-left: 1px solid white !important; }
 
 .cm-s-vibrant-ink .cm-keyword {  color: #CC7832; }

CodeMirror-3.0/theme/xq-dark.css

@@ -20,10 +20,10 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 */
-.cm-s-xq-dark { background: #0a001f; color: #f8f8f8; }
+.cm-s-xq-dark.CodeMirror { background: #0a001f; color: #f8f8f8; }
 .cm-s-xq-dark span.CodeMirror-selected { background: #a8f !important; }
-.cm-s-xq-dark .CodeMirror-gutter { background: #0a001f; border-right: 1px solid #aaa; }
-.cm-s-xq-dark .CodeMirror-gutter-text { color: #f8f8f8; }
+.cm-s-xq-dark .CodeMirror-gutters { background: #0a001f; border-right: 1px solid #aaa; }
+.cm-s-xq-dark .CodeMirror-linenumber { color: #f8f8f8; }
 .cm-s-xq-dark .CodeMirror-cursor { border-left: 1px solid white !important; }
 
 .cm-s-xq-dark span.cm-keyword {color: #FFBD40;}

README.md

@@ -3,6 +3,8 @@
 
 Early version of the web based IDE which allows for creation of websites in the web browser. Uses the brilliant CodeMirror for code highlighting & editing, with a slick IDE wrapped around it to make the whole thing work.
 
+<img src="http://icecoder.net/images/ice-coder-web-ide.jpg" alt="ICEcoder web IDE">
+
 ###Features you'd expect
 * Context aware code highlighting
 * Supports HTML, CSS, LESS, JavaScript, CoffeeScript, PHP & Ruby
@@ -32,9 +34,10 @@ Early version of the web based IDE which allows for creation of websites in the
 * CTRL+S+Enter opens a sticky tab to show live edits
 * ESC = Comment/Uncomment line, incl partial lines
 * Image viewer
-* Colour preview block on CSS colours, ie red, #ff0000 or  RGBA(255,0,0,0.5)
+* Colour preview block on CSS colours, ie red, #f00 or  RGBA(255,0,0,0.5)
 * MySQL Database management via Adminer plugin
 * Backs up files every 10 mins or on click of backup plugin icon
+* Github repo syncing with ICErepo plugin
 
 ###Installation
 

backups/info.txt

@@ -1 +0,0 @@
-Backups are stored in this folder every 10 mins by default

backups/readme.txt

@@ -0,0 +1 @@
+Zip It! backups are stored in this folder

editor.php

@@ -3,190 +3,221 @@
 
 <html style="margin: 0" onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'editor');top.ICEcoder.canResizeFilesW()}">
 <head>
-<title>ICEcoder editor</title>
+<title>ICEcoder v <?php echo $ICEcoder["versionNo"];?> editor</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="robots" content="noindex, nofollow">
 <link rel="stylesheet" href="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror.css">
 <!--
 codemirror-compressed.js
-includes:
-codemirror.js
-modes:
-clike, coffeescript, css, javascript, less, php, ruby & xml
-utils:
-foldcode, searchcursor, match-highlighter
+incls:	codemirror.js
+modes:	clike, coffeescript, css, javascript, less, php, ruby & xml
+utils:	foldcode, searchcursor, match-highlighter
 //-->
 <script src="<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js"></script>
 <link rel="stylesheet" href="<?php
 if ($ICEcoder["theme"]=="default") {echo 'lib/editor.css';} else {echo $ICEcoder["codeMirrorDir"].'/theme/'.$ICEcoder["theme"].'.css';};
+$activeLineBG = $ICEcoder["theme"]=="eclipse" || $ICEcoder["theme"]=="elegant" || $ICEcoder["theme"]=="neat" ? "#ccc" : "#000";
 ?>">
 <style type="text/css">
-.CodeMirror {position: absolute; width: 0; background-color: #fff; top: 0px; width: 100%; z-index: 1}
-.CodeMirror-scroll {height: 100%}
-.cm-s-activeLine {background: #000 !important;}
+.CodeMirror {position: absolute; top: 0px; width: 100%; font-size: 13px; z-index: 1}
+.CodeMirror-scroll {} // was: height: auto; overflow: visible
+/* Make sure this next one remains the 3rd item, updated with JS */
+.cm-s-activeLine {background: <?php echo $activeLineBG;?> !important}
 span.CodeMirror-matchhighlight {background: #555}
 .CodeMirror-focused span.CodeMirror-matchhighlight {color: #000; background: #555; !important}
 /* Make sure this next one remains the 6th item, updated with JS */
 .cm-tab:after {position: relative; display: inline-block; width: 0; left: -1.4em; overflow: visible; color: #aaa; content: "<?php if($ICEcoder["visibleTabs"]) {echo '\\21e5';};?>";}
+.lint-error {font-family: arial; font-size: 80%; background: #ccc; color: #b00; padding: 3px 5px}
+.lint-error-icon {background-color: #b00; color: #fff; font-weight: bold; border-radius: 50%; padding: 0 3px; margin-right: 5px}
+.snippetFrame {border: 1px; width: 100%}
 </style>
 </head>
 
 <body onLoad="top.ICEcoder.updateFileFolderCount()" style="color: #fff; margin: 0" onKeyDown="return top.ICEcoder.interceptKeys('content', event);" onKeyUp="top.ICEcoder.resetKeys(event);">
 
 <div style="margin: 32px 43px; font-family: arial; font-size: 10px; color: #ddd">
-<?php if($_SESSION['userLevel'] == 10) {
-	echo '<div style="float: left; margin-right: 50px">'.PHP_EOL;
-	echo '<h2 style="color: rgba(0,198,255,0.7)">server</h2>'.PHP_EOL;
-	echo '<span style="color:#888">Server name, OS & IP:</span><br>'.PHP_EOL;
-	echo $_SERVER['SERVER_NAME'].' &nbsp;&nbsp; '.$_SERVER['SERVER_SOFTWARE'].' &nbsp;&nbsp; '.$_SERVER['SERVER_ADDR'].'<br><br>'.PHP_EOL;
-	echo '<span style="color:#888">Root:</span><br>'.PHP_EOL;
-	echo $docRoot.'<br><br>'.PHP_EOL;
-	echo '<span style="color:#888">ICEcoder root:</span><br>'.PHP_EOL;
-	echo $docRoot.$ICEcoder['root'].'<br><br>'.PHP_EOL;
-	echo '<span style="color:#888">PHP version:</span><br>'.PHP_EOL;
-	echo phpversion().'<br><br>'.PHP_EOL;
-	echo '<span style="color:#888">Date & time:</span><br>'.PHP_EOL;
-	echo '<span id="serverDT"></span><br><br><br>'.PHP_EOL;
-	echo '</div>'.PHP_EOL;
+	<div style="float: left; margin-right: 50px">
+		<h2 style="color: rgba(0,198,255,0.7)">server</h2>
+		<span style="color:#888">Server name, OS & IP:</span><br>
+		<?php echo $_SERVER['SERVER_NAME']." &nbsp;&nbsp ".$_SERVER['SERVER_SOFTWARE']." &nbsp;&nbsp ".$_SERVER['SERVER_ADDR'];?><br><br>
+		<span style="color:#888">Root:</span><br>
+		<?php echo $docRoot;?><br><br>
+		<span style="color:#888">ICEcoder root:</span><br>
+		<?php echo $docRoot.$ICEcoder['root'];?><br><br>
+		<span style="color:#888">PHP version:</span><br>
+		<?php echo phpversion();?><br><br>
+		<span style="color:#888">Date & time:</span><br>
+		<span id="serverDT"></span><br><br><br>
+	</div>
 
-	echo '<div style="float: left">'.PHP_EOL;
-	echo '<h2 style="color: rgba(0,198,255,0.7)">files</h2>'.PHP_EOL;
-	echo '<span style="color:#888">Last 10 files opened:</span><br>'.PHP_EOL;
-	$last10FilesArray = explode(",",$ICEcoder["last10Files"]);
-	for ($i=0;$i<count($last10FilesArray);$i++) {
-		if ($ICEcoder["last10Files"]=="") {
-			echo '[none]<br><br>';
-		} else {
-			echo '<a style="cursor:pointer" onClick="top.ICEcoder.openFile(\''.str_replace("|","/",$last10FilesArray[$i]).'\')">';
-			echo str_replace($docRoot,"",str_replace("|","/",$last10FilesArray[$i]));
-			echo '</a><br>'.PHP_EOL;
-			if ($i==count($last10FilesArray)-1) {echo '<br>'.PHP_EOL;};
+	<div style="float: left">
+		<h2 style="color: rgba(0,198,255,0.7)">files</h2>
+		<span style="color:#888">Last 10 files opened:</span><br>
+		<?php
+			$last10FilesArray = explode(",",$ICEcoder["last10Files"]);
+			for ($i=0;$i<count($last10FilesArray);$i++) {
+				if ($ICEcoder["last10Files"]=="") {
+					echo '[none]<br><br>';
+				} else {
+					echo '<a style="cursor:pointer" onClick="top.ICEcoder.openFile(\''.str_replace("|","/",$last10FilesArray[$i]).'\')">';
+					echo str_replace($docRoot,"",str_replace("|","/",$last10FilesArray[$i]));
+					echo '</a><br>'.PHP_EOL;
+					if ($i==count($last10FilesArray)-1) {echo '<br>'.PHP_EOL;};
+				}
+			}
+		;?>
+		<span style="color:#888">File & folder count:</span><br>
+		<div id="fileFolderCounts"></div><br><br><br>
+	</div>
+
+	<div style="clear: both">
+		<h2 style="color: rgba(0,198,255,0.7)">your device</h2>
+		<span style="color:#888">Browser:</span><br>
+		<?php echo $_SERVER['HTTP_USER_AGENT'];?><br><br>
+		<span style="color:#888">Your IP:</span><br>
+		<?php echo $_SERVER['REMOTE_ADDR'];?>
+	</div>
+	<script>
+	var nDT=<?php echo time()*1000;?>;
+	setInterval(function(){
+		var s=(new Date(nDT+=1e3)+'').split(' '),
+		d=s[2]*1,
+		t=s[4].split(':'),
+		p=t[0]>11?'pm':'am',
+		e=d%20==1|d>30?'st':d%20==2?'nd':d%20==3?'rd':'th';
+		t[0]=--t[0]%12+1;
+		if (document.getElementById('serverDT')) {
+			document.getElementById('serverDT').innerHTML=[s[0],d+e,s[1],s[3],t.join(':')+p].join(' ');
 		}
-	}
-	echo '<span style="color:#888">File & folder count:</span><br>'.PHP_EOL;
-	echo '<div id="fileFolderCounts"></div><br><br><br>'.PHP_EOL;
-	echo '</div>'.PHP_EOL;
-
-	echo '<div style="clear: both">'.PHP_EOL;
-	echo '<h2 style="color: rgba(0,198,255,0.7)">your device</h2>'.PHP_EOL;
-	echo '<span style="color:#888">Browser:</span><br>'.PHP_EOL;
-	echo $_SERVER['HTTP_USER_AGENT'].'<br><br>'.PHP_EOL;
-	echo '<span style="color:#888">Your IP:</span><br>'.PHP_EOL;
-	echo $_SERVER['REMOTE_ADDR'].PHP_EOL;
-	echo '</div>'.PHP_EOL;
-}; ?>
-<script>
-var nDT=<?php echo time()*1000;?>;
-setInterval(function(){
-	var s=(new Date(nDT+=1e3)+'').split(' '),
-	d=s[2]*1,
-	t=s[4].split(':'),
-	p=t[0]>11?'pm':'am',
-	e=d%20==1|d>30?'st':d%20==2?'nd':d%20==3?'rd':'th';
-	t[0]=--t[0]%12+1;
-	if (document.getElementById('serverDT')) {
-		document.getElementById('serverDT').innerHTML=[s[0],d+e,s[1],s[3],t.join(':')+p].join(' ');
-	}
-},1000);
-</script>
+	},1000);
+	</script>
 </div>
 
 <script>
 function createNewCMInstance(num) {
 	var fileName = top.ICEcoder.openFiles[top.ICEcoder.selectedTab-1];
-	var codeFold		 	= CodeMirror.newFoldFunction(CodeMirror.tagRangeFinder,'<span style=\"display: inline-block; width: 13px; height: 13px; background-color: #b00; color: #fff; text-align: center; cursor: pointer\"><span style="position: relative; top: -1px">+</span></span> %N%');
-	var codeFold_JS_Coffee_PHP_Ruby = CodeMirror.newFoldFunction(CodeMirror.braceRangeFinder,'<span style=\"display: inline-block; width: 13px; height: 13px; background-color: #b00; color: #fff; text-align: center; cursor: pointer\"><span style="position: relative; top: -1px">+</span></span> %N%');
+	top.ICEcoder['cM'+num+'waiting'] = "";
+	top.ICEcoder['cM'+num+'widgets'] = [];
 
 	window['cM'+num] = CodeMirror(document.body, {
-        mode: "application/x-httpd-php",
-        lineNumbers: true,
-	lineWrapping: true,
-	indentUnit: top.tabWidth,
-	tabSize: top.tabWidth,
-        indentWithTabs: true,
-	electricChars: false,
-	onCursorActivity: function() {
-		top.ICEcoder.getCaretPosition();
-		top.ICEcoder.updateCharDisplay();
-		window['cM'+num].setLineClass(top.ICEcoder['cMActiveLine'+num], null);
-		if(!window['cM'+num].somethingSelected()) {
-			top.ICEcoder['cMActiveLine'+num] = window['cM'+num].setLineClass(window['cM'+num].getCursor().line, "cm-s-activeLine");
-		}
-		window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].matchHighlight("CodeMirror-matchhighlight");
-		top.ICEcoder.cssColorPreview();
-	},
-	onChange: function() {
-		// If we're not loading the file, it's a change, so update tab
-		if (!top.ICEcoder.loadingFile) {
-			top.ICEcoder.changedContent[top.ICEcoder.selectedTab-1] = 1;
-			top.ICEcoder.redoTabHighlight(top.ICEcoder.selectedTab);
-		}
-		top.ICEcoder.getCaretPosition();
-		top.ICEcoder.dontUpdateNest = false;
-		top.ICEcoder.updateCharDisplay();
-		top.ICEcoder.updateNestingIndicator();
-		if (top.ICEcoder.findMode) {
-			top.ICEcoder.results.splice(top.ICEcoder.findResult,1);
-			top.document.getElementById('results').innerHTML = top.ICEcoder.results.length + " results";
-			top.ICEcoder.findMode = false;
-		}
-	},
-	onKeyEvent: function(instance, e) {
-		top.ICEcoder.redoChangedContent(e);
-		top.ICEcoder.findReplace('find',true,false);
-		top.ICEcoder.getCaretPosition();
-		top.ICEcoder.updateCharDisplay();
-		tok = window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getTokenAt(window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getCursor());
-		if (tok.string!=">") {lastString=tok.string};
-		if (e.type=="keyup"&&e.keyCode=="16"&&lastKeyCode=="190") {
-			canDoEndTag=true;
-			for (i=0;i<top.ICEcoder.tagNestExceptions.length;i++) {
-				if(top.ICEcoder.tagString!="script" && top.ICEcoder.tagString==top.ICEcoder.tagNestExceptions[i]) {
-				canDoEndTag=false;
+		mode: "application/x-httpd-php",
+		lineNumbers: true,
+		lineWrapping: top.ICEcoder.lineWrapping,
+		indentUnit: top.ICEcoder.tabWidth,
+		tabSize: top.ICEcoder.tabWidth,
+		indentWithTabs: true,
+		electricChars: false,
+		onKeyEvent: function(thisCM, e) {
+			top.ICEcoder.redoChangedContent(e);
+			top.ICEcoder.findReplace('find',true,false);
+			top.ICEcoder.getCaretPosition();
+			top.ICEcoder.updateCharDisplay();
+			tok = thisCM.getTokenAt(thisCM.getCursor());
+			if (tok.string!=">") {lastString=tok.string};
+			if (e.type=="keyup"&&e.keyCode=="16"&&lastKeyCode=="190") {
+				canDoEndTag=true;
+				if (top.ICEcoder.tagString!="script" && top.ICEcoder.tagNestExceptions.indexOf(top.ICEcoder.tagString)>-1) {
+					canDoEndTag=false;
 				}
-			}
-			if(top.ICEcoder.tagString.slice(0,1)=="/"||top.ICEcoder.tagString.slice(0,1)=="?") {
-				canDoEndTag=false;
-			}
-			if (!top.ICEcoder.codeAssist||fileName && (fileName.indexOf(".js")>0||fileName.indexOf(".css")>0||fileName.indexOf(".less")>0)) {
-				canDoEndTag=false;
-			}
-			contentType = top.ICEcoder.caretLocType;
-			if (canDoEndTag && (contentType!="JavaScript"||(contentType=="JavaScript"&&top.ICEcoder.tagString=="script"))) {
-				numTabs = top.ICEcoder.htmlTagArray.length;
-				if (top.ICEcoder.htmlTagArray[0]=="html") {numTabs--};
-				tabs = "";
-				for (i=0;i<numTabs-1;i++) {
-					tabs += "\t";
+				if	(
+					top.ICEcoder.tagString.slice(0,1)=="/"||
+					top.ICEcoder.tagString.slice(0,1)=="?"||
+					!top.ICEcoder.codeAssist||
+					fileName && (fileName.indexOf(".js")>0||fileName.indexOf(".css")>0||fileName.indexOf(".less")>0)
+					) {canDoEndTag=false}
+
+				contentType = top.ICEcoder.caretLocType;
+				if (canDoEndTag && (contentType!="JavaScript"||(contentType=="JavaScript"&&top.ICEcoder.tagString=="script"))) {
+					numTabs = top.ICEcoder.htmlTagArray.length;
+					if (top.ICEcoder.htmlTagArray[0]=="html") {numTabs--};
+					tabs = "";
+					for (i=0;i<numTabs-1;i++) {
+						tabs += "\t";
+					}
+					endTag = "</" + top.ICEcoder.tagString + ">";
+					if (top.ICEcoder.tagString=="script") {endTag="</"+"script>"};
+					if(top.ICEcoder.tagString=="title"||top.ICEcoder.tagString=="a"||top.ICEcoder.tagString=="li"||top.ICEcoder.tagString=="span"||(top.ICEcoder.tagString.slice(0,1)=="h"&&parseInt(top.ICEcoder.tagString.slice(1,2),10)>=1&&parseInt(top.ICEcoder.tagString.slice(1,2),10)<=7)) {
+						thisCM.replaceSelection(endTag);
+						thisCM.setCursor(thisCM.getCursor().line,thisCM.getCursor().ch-top.ICEcoder.tagString.length-3);
+					} else if(top.ICEcoder.tagString=="html"||top.ICEcoder.tagString=="head") {
+						thisCM.replaceSelection("\n\n"+endTag);
+						thisCM.setCursor(thisCM.getCursor().line-1,numTabs);
+					} else {
+						thisCM.replaceSelection("\n"+tabs+"\t\n"+tabs+endTag);
+						thisCM.setCursor(thisCM.getCursor().line-1,numTabs);
+					}
 				}
-				//endTag = "</" + top.ICEcoder.htmlTagArray[top.ICEcoder.htmlTagArray.length-1] + ">";
-				endTag = "</" + top.ICEcoder.tagString + ">";
-				if (top.ICEcoder.tagString=="script") {endTag="</"+"script>"};
-				if(top.ICEcoder.tagString=="title"||top.ICEcoder.tagString=="a"||top.ICEcoder.tagString=="li"||top.ICEcoder.tagString=="span"||(top.ICEcoder.tagString.slice(0,1)=="h"&&parseInt(top.ICEcoder.tagString.slice(1,2),10)>=1&&parseInt(top.ICEcoder.tagString.slice(1,2),10)<=7)) {
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].replaceSelection(endTag);
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].setCursor(window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getCursor().line,window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getCursor().ch-top.ICEcoder.tagString.length-3);
-				} else if(top.ICEcoder.tagString=="html"||top.ICEcoder.tagString=="head") {
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].replaceSelection("\n\n"+endTag);
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].setCursor(window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getCursor().line-1,numTabs);
-				} else {
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].replaceSelection("\n"+tabs+"\t\n"+tabs+endTag);
-					window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].setCursor(window['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].getCursor().line-1,numTabs);
-				}
-			}
-		};
-		lastKeyCode = e.keyCode;
-	},
-	onGutterClick: !fileName || (fileName && fileName.indexOf(".js") == -1 && fileName.indexOf(".coffee") == -1 && fileName.indexOf(".php") && fileName.indexOf(".rb") == -1) ? codeFold : codeFold_JS_Coffee_PHP_Ruby,
-	extraKeys: {
-		"Tab": function(cm) {CodeMirror.commands[top.tabsIndent ? "defaultTab" : "insertTab"](cm);},
-		"Shift-Tab": "indentLess"
-	}
+			};
+			lastKeyCode = e.keyCode;
+		},
+		extraKeys: {
+			"Tab": function(cm) {CodeMirror.commands[top.ICEcoder.tabsIndent ? "defaultTab" : "insertTab"](cm);},
+			"Shift-Tab": "indentLess",
+			"Ctrl-Up": function() {},
+			"Ctrl-Down": function() {}
+		}
 	});
 
+	window['cM'+num].on("cursorActivity", function(thisCM) {
+			top.ICEcoder.getCaretPosition();
+			top.ICEcoder.updateCharDisplay();
+			window['cM'+num].removeLineClass(top.ICEcoder['cMActiveLine'+num], "background");
+			if(!window['cM'+num].somethingSelected()) {
+				top.ICEcoder['cMActiveLine'+num] = window['cM'+num].addLineClass(window['cM'+num].getCursor().line, "background","cm-s-activeLine");
+			}
+			thisCM.matchHighlight("CodeMirror-matchhighlight");
+			top.ICEcoder.cssColorPreview();
+		}
+	);
+
+	window['cM'+num].on("change", function(thisCM, changeObj) {
+			// If we're not loading the file, it's a change, so update tab
+			if (!top.ICEcoder.loadingFile) {
+				top.ICEcoder.changedContent[top.ICEcoder.selectedTab-1] = 1;
+				top.ICEcoder.redoTabHighlight(top.ICEcoder.selectedTab);
+			}
+			top.ICEcoder.getCaretPosition();
+			top.ICEcoder.dontUpdateNest = false;
+			top.ICEcoder.updateCharDisplay();
+			top.ICEcoder.updateNestingIndicator();
+			if (top.ICEcoder.findMode) {
+				top.ICEcoder.results.splice(top.ICEcoder.findResult,1);
+				top.document.getElementById('results').innerHTML = top.ICEcoder.results.length + " results";
+				top.ICEcoder.findMode = false;
+			}
+			if (top.ICEcoder.codeAssist) {
+				clearTimeout(window['cM'+num+'waiting']);
+				window['cM'+num+'waiting'] = setTimeout(top.ICEcoder.updateHints, 100);
+			}
+		}
+	);
+
+	window['cM'+num].on("scroll", function(thisCM) {
+			top.ICEcoder.mouseDown=false;
+		}
+	);
+
+	window['cM'+num].on("gutterClick", function(thisCM, line, gutter, clickEvent) {
+			["JavaScript","CoffeeScript","PHP","Ruby"].indexOf(top.ICEcoder.caretLocType) > -1
+			? codeFoldBrace(window['cM'+num], line) : codeFoldTag(window['cM'+num], line);
+			window['cM'+num].setGutterMarker(line, "CodeMirror-linenumbers", document.createTextNode("+ "+(line+1)));
+			setTimeout(function() {
+				window['cM'+num].setGutterMarker(line, "CodeMirror-linenumbers", null);
+			},1000);
+		}
+	);
+
 	// Now create the active line for this CodeMirror object
-	top.ICEcoder['cMActiveLine'+num] = window['cM'+num].setLineClass(0, "cm-s-activeLine");
+	top.ICEcoder['cMActiveLine'+num] = window['cM'+num].addLineClass(0, "background", "cm-s-activeLine");
 };
 
+	// var top.ICEcoder.foldStyle = '<span style="position: absolute; display: inline-block; width: 13px; height: 13px; left: 0; background-color: #b00; color: #fff; text-align: center; cursor: pointer"><span style="position: relative; left: -1px">+</span></span> %N%';
+	var codeFoldTag = CodeMirror.newFoldFunction(CodeMirror.tagRangeFinder);
+	var codeFoldBrace = CodeMirror.newFoldFunction(CodeMirror.braceRangeFinder);
 </script>
 
+<iframe name="snippetLoader" src="snippets/snippet-display.php" style="display: none"></iframe>
+
 </body>
 
 </html>

files.php

@@ -1,152 +1,157 @@
-<?php include("lib/settings.php");?>
-<!DOCTYPE html>
-
-<html onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'files');top.ICEcoder.canResizeFilesW()}" onContextMenu="top.ICEcoder.rightClickedFile=top.ICEcoder.thisFileFolderLink; return top.ICEcoder.showMenu()" onClick="top.ICEcoder.selectFileFolder()">
-<head>
-<title>ICEcoder file manager</title>
-<link rel="stylesheet" type="text/css" href="lib/files.css">
-<script src="lib/coder.js" type="text/javascript"></script>
-</head>
-
-<body onLoad="top.ICEcoder.fileManager()" onDblClick="top.ICEcoder.openFile()" onKeyDown="return top.ICEcoder.interceptKeys('files', event);" onKeyUp="top.ICEcoder.resetKeys(event);">
-<div title="Refresh" onClick="top.ICEcoder.refreshFileManager()" class="refresh"></div>
-
-<?php
-$ICEcoder["restrictedFiles"] = $_SESSION['restrictedFiles'];
-$ICEcoder["bannedFiles"] = $_SESSION['bannedFiles'];
-$serverType = strrpos($docRoot,":") ? "Windows" : "Linux";
-
-// Function to sort given values alphabetically
-function alphasort($a, $b) {
-	return strcasecmp($a->getPathname(), $b->getPathname());
-}
-
-// Class to put forward the values for sorting
-class SortingIterator implements IteratorAggregate {
-	private $iterator = null;
-	public function __construct(Traversable $iterator, $callback) {
-		$array = iterator_to_array($iterator);
-		usort($array, $callback);
-		$this->iterator = new ArrayIterator($array);
-	}
-	public function getIterator() {
-		return $this->iterator;
-	}
-}
-
-// Get a full list of dirs & files and begin sorting using above class & function
-$objectList = new SortingIterator(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($docRoot.$iceRoot), RecursiveIteratorIterator::SELF_FIRST), 'alphasort');
-
-// With that done, create arrays for out final ordered list and a temp container of files
-$finalArray = $tempArray =  array();
-
-// To start, push folders from object into finalArray, files into tempArray
-foreach ($objectList as $objectRef) {
-	$fileFolderName = substr($objectRef->getPathname(), strlen($docRoot.$iceRoot));
-	$canAdd = true;
-	for ($i=0;$i<count($ICEcoder["bannedFiles"]);$i++) {
-		if(strpos($fileFolderName,$ICEcoder["bannedFiles"][$i])!==false) {$canAdd = false;}
-	}
-	if ($objectRef->getFilename()!="." && $objectRef->getFilename()!=".." && $fileFolderName[strlen($fileFolderName)-1]!="/" && $canAdd) {
-		$fileFolderName!="/" && is_dir($docRoot.$iceRoot.$fileFolderName) ? array_push($finalArray,$fileFolderName) : array_push($tempArray,$fileFolderName);
-	}
-}
-
-// Now push root files onto the end of finalArray and splice from the temp, leaving only files that reside in subdirs
-for ($i=0;$i<count($tempArray);$i++) {
-	if (count(explode("/",$tempArray[$i]))==2) {
-		array_push($finalArray,$tempArray[$i]);
-		array_splice($tempArray,$i,1);
-		$i--;
-	}
-}
-
-// Lastly we push remaining files into the right subdirs in finalArray
-for ($i=0;$i<count($tempArray);$i++) {
-	$insertAt = array_search(dirname($tempArray[$i]),$finalArray)+1;
-	for ($j=$insertAt;$j<count($finalArray);$j++) {
-		if (	strcasecmp(dirname($finalArray[$j]), dirname($tempArray[$i]))==0 &&
-			strcasecmp(basename($finalArray[$j]), basename($tempArray[$i]))<0 ||
-			strstr(dirname($finalArray[$j]),dirname($tempArray[$i]))) {
-			$insertAt++;
-		}
-	}
-	array_splice($finalArray, $insertAt, 0, $tempArray[$i]);
-}
-
-// Finally, we have our ordered list, so display in a UL
-$fileAtts = "";
-if ($serverType=="Linux") {
-	$chmodInfo = substr(sprintf('%o', fileperms($docRoot.$iceRoot)), -3);
-	$fileAtts = '<span style="color: #888; font-size: 8px" id="|_perms">'.$chmodInfo.'</span>';
-}
-echo "<ul class=\"fileManager\">\n";
-echo "<li class=\"pft-directory\">";
-echo "<a nohref title=\"/\" onMouseOver=\"top.ICEcoder.overFileFolder('folder','/')\" onMouseOut=\"top.ICEcoder.overFileFolder('folder','')\" style=\"position: relative; left:-22px\">";
-echo "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; ";
-echo "<span id=\"|\">/ ";
-echo $iceRoot == "" ? "[ROOT]" : trim($iceRoot,"/");
-echo "</span> ";
-echo $fileAtts;
-echo "</a>";
-echo "</li>\n";
-$lastPath="";
-$fileCount=0;
-$fileBytes=0;
-$dirCount=0;
-for ($i=0;$i<count($finalArray);$i++) {
-	$fileFolderName = str_replace("\\","/",$finalArray[$i]);
-	$type = is_dir($docRoot.$iceRoot.$fileFolderName) ? "folder" : "file";
-	$type=="folder" ? $dirCount++ : $fileCount++;
-	if ($type=="file") {
-		$fileBytes+=filesize($docRoot.$iceRoot.$fileFolderName);
-		// Get extension (prefix 'ext-' to prevent invalid classes from extensions that begin with numbers)
-		$ext = "ext-".pathinfo($docRoot.$iceRoot.$fileFolderName, PATHINFO_EXTENSION);
-	}
-	$thisDepth = count(explode("/",$fileFolderName));
-	$lastDepth = count(explode("/",$lastPath));
-	if ($thisDepth > $lastDepth) {echo "<ul>\n";}
-	if ($thisDepth < $lastDepth) {
-		for ($j=$lastDepth;$j>$thisDepth;$j--) {
-			echo "</ul>\n";
-		}
-	}
-	$restrictedFile=false;
-	for ($j=0;$j<count($ICEcoder["restrictedFiles"]);$j++) {
-		if (strpos($fileFolderName,$ICEcoder["restrictedFiles"][$j])!="") {
-			$restrictedFile=true;
-		}
-	}
-	if ($serverType=="Linux") {
-		$chmodInfo = substr(sprintf('%o', fileperms($docRoot.$iceRoot.$fileFolderName)), -3);
-		$fileAtts = '<span style="color: #888; font-size: 8px" id="'.str_replace($docRoot,"",str_replace("/","|",$fileFolderName)).'_perms">'.$chmodInfo.'</span>';
-	}
-	$type == "folder" ? $class = 'pft-directory' : $class = 'pft-file '.strtolower($ext);
-	if ($_SESSION['userLevel'] == 10 || ($_SESSION['userLevel'] < 10 && !$restrictedFile)) {
-		echo "<li class=\"".$class."\"><a nohref title=\"$fileFolderName\" onMouseOver=\"top.ICEcoder.overFileFolder('$type','".str_replace($docRoot,"",str_replace("/","|",$fileFolderName))."')\" onMouseOut=\"top.ICEcoder.overFileFolder('$type','')\" style=\"position: relative; left:-22px\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span id=\"".str_replace($docRoot,"",str_replace("/","|",$fileFolderName))."\">".basename($fileFolderName)."</span> ".$fileAtts."</a>\n";
-	} else {
-		if ($type == "file") {$fileAtts = "<img src=\"images/padlock.png\" style=\"cursor: pointer\" onClick=\"top.ICEcoder.message('Sorry, you need higher admin level rights to view.')\">";}
-		echo "<li class=\"".$class."\" style=\"cursor: default\"><span style=\"position: relative; left:-22px; color: #888\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; [HIDDEN] ".$fileAtts."</span>";
-	}
-	if ($i<count($finalArray)) {echo "</li>\n";}
-	$lastPath = $fileFolderName;
-}
-echo "</ul>\n</ul>\n";
-
-	echo "<script>\n";
-	$varOutput = "top.ICEcoder.dirCount=";
-	$varOutput .= $dirCount ? $dirCount : "0";
-	$varOutput .= ";\ntop.ICEcoder.fileCount=";
-	$varOutput .= $fileCount ? $fileCount : "0";
-	$varOutput .= ";\ntop.ICEcoder.fileBytes=";
-	$varOutput .= $fileBytes ? $fileBytes : "0";
-	// Output the JS vars
-	echo $varOutput;
-	echo ";\n</script>";
-?>
-
-<iframe name="fileControl" style="display: none"></iframe>
-		
-</body>
-	
+<?php include("lib/settings.php");?>
+<!DOCTYPE html>
+
+<html onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'files');top.ICEcoder.canResizeFilesW()}" onContextMenu="top.ICEcoder.rightClickedFile=top.ICEcoder.thisFileFolderLink; return top.ICEcoder.showMenu()" onClick="top.ICEcoder.selectFileFolder()">
+<head>
+<title>ICEcoder v <?php echo $ICEcoder["versionNo"];?> file manager</title>
+<meta name="robots" content="noindex, nofollow">
+<link rel="stylesheet" type="text/css" href="lib/files.css">
+<script src="lib/ice-coder.js" type="text/javascript"></script>
+</head>
+
+<body onLoad="top.ICEcoder.fileManager()" onDblClick="top.ICEcoder.openFile()" onKeyDown="return top.ICEcoder.interceptKeys('files', event);" onKeyUp="top.ICEcoder.resetKeys(event);">
+
+<div title="Refresh" onClick="top.ICEcoder.refreshFileManager()" class="refresh"></div>
+
+<?php
+// Function to sort given values alphabetically
+function alphasort($a, $b) {
+	return strcasecmp($a->getPathname(), $b->getPathname());
+}
+
+// Class to put forward the values for sorting
+class SortingIterator implements IteratorAggregate {
+	private $iterator = null;
+	public function __construct(Traversable $iterator, $callback) {
+		$array = iterator_to_array($iterator);
+		usort($array, $callback);
+		$this->iterator = new ArrayIterator($array);
+	}
+	public function getIterator() {
+		return $this->iterator;
+	}
+}
+
+class IgnorantRecursiveDirectoryIterator extends RecursiveDirectoryIterator {
+	function getChildren() {
+		try {
+			if (!isset($GLOBALS['ICEcoder']['bannedPaths']) || 
+			!in_array($this->key(), $GLOBALS['ICEcoder']['bannedPaths'])) {
+				return parent::getChildren();
+			} else {
+				return new RecursiveArrayIterator(array());
+			}
+    		} catch(UnexpectedValueException $e) {
+			return new RecursiveArrayIterator(array());
+		}
+	}
+}
+
+// Get a full list of dirs & files and begin sorting using above class & function
+$objectList = new SortingIterator(new RecursiveIteratorIterator(new IgnorantRecursiveDirectoryIterator($docRoot.$iceRoot), RecursiveIteratorIterator::SELF_FIRST), 'alphasort');
+
+// With that done, create arrays for out final ordered list and a temp container of files
+$finalArray = $tempArray =  array();
+
+// To start, push folders from object into finalArray, files into tempArray
+foreach ($objectList as $objectRef) {
+	$fileFolderName = substr($objectRef->getPathname(), strlen($docRoot.$iceRoot));
+	$canAdd = true;
+	for ($i=0;$i<count($_SESSION['bannedFiles']);$i++) {
+		if(strpos($fileFolderName,$_SESSION['bannedFiles'][$i])!==false) {$canAdd = false;}
+	}
+	if ($objectRef->getFilename()!="." && $objectRef->getFilename()!=".." && $fileFolderName[strlen($fileFolderName)-1]!="/" && $canAdd) {
+		$fileFolderName!="/" && is_dir($docRoot.$iceRoot.$fileFolderName)
+		? array_push($finalArray,$fileFolderName)
+		: array_push($tempArray,$fileFolderName);
+	}
+}
+
+// Now push root files onto the end of finalArray and splice from the temp, leaving only files that reside in subdirs
+for ($i=0;$i<count($tempArray);$i++) {
+	if (count(explode("/",$tempArray[$i]))==2) {
+		array_push($finalArray,$tempArray[$i]);
+		array_splice($tempArray,$i,1);
+		$i--;
+	}
+}
+
+// Lastly we push remaining files into the right subdirs in finalArray
+for ($i=0;$i<count($tempArray);$i++) {
+	$insertAt = array_search(dirname($tempArray[$i]),$finalArray)+1;
+	for ($j=$insertAt;$j<count($finalArray);$j++) {
+		if (	strcasecmp(dirname($finalArray[$j]), dirname($tempArray[$i]))==0 &&
+			strcasecmp(basename($finalArray[$j]), basename($tempArray[$i]))<0 ||
+			(strpos(dirname($finalArray[$j]),dirname($tempArray[$i]))===0 && substr($finalArray[$j],strlen(dirname($tempArray[$i])),1)=="/")) {
+			$insertAt++;
+		}
+	}
+	array_splice($finalArray, $insertAt, 0, $tempArray[$i]);
+}
+
+// Finally, we have our ordered list, so display in a UL
+$fileAtts = "";
+if ($serverType=="Linux") {
+	$chmodInfo = substr(sprintf('%o', fileperms($docRoot.$iceRoot)), -3);
+	$fileAtts = '<span style="color: #888; font-size: 8px" id="|_perms">'.$chmodInfo.'</span>';
+}
+?>
+<ul class="fileManager">
+<li class="pft-directory">
+<a nohref title="/" onMouseOver="top.ICEcoder.overFileFolder('folder','/')" onMouseOut="top.ICEcoder.overFileFolder('folder','')" style="position: relative; left:-22px">
+&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; 
+<span id="|">/ 
+<?php echo $iceRoot == "" ? "[ROOT]" : trim($iceRoot,"/");?>
+</span> 
+<?php echo $fileAtts;?>
+</a>
+</li>
+<?php
+$lastPath="";
+$fileCount=0;
+$fileBytes=0;
+$dirCount=0;
+for ($i=0;$i<count($finalArray);$i++) {
+	$fileFolderName = str_replace("\\","/",$finalArray[$i]);
+	$type = is_dir($docRoot.$iceRoot.$fileFolderName) ? "folder" : "file";
+	$type=="folder" ? $dirCount++ : $fileCount++;
+	if ($type=="file") {
+		$fileBytes+=filesize($docRoot.$iceRoot.$fileFolderName);
+		// Get extension (prefix 'ext-' to prevent invalid classes from extensions that begin with numbers)
+		$ext = "ext-".pathinfo($docRoot.$iceRoot.$fileFolderName, PATHINFO_EXTENSION);
+	}
+	$thisDepth = count(explode("/",$fileFolderName));
+	$lastDepth = count(explode("/",$lastPath));
+	if ($thisDepth > $lastDepth) {echo "<ul>\n";}
+	if ($thisDepth < $lastDepth) {
+		for ($j=$lastDepth;$j>$thisDepth;$j--) {
+			echo "</ul>\n";
+		}
+	}
+	if ($serverType=="Linux") {
+		$chmodInfo = substr(sprintf('%o', fileperms($docRoot.$iceRoot.$fileFolderName)), -3);
+		$fileAtts = '<span style="color: #888; font-size: 8px" id="'.str_replace($docRoot,"",str_replace("/","|",$fileFolderName)).'_perms">'.$chmodInfo.'</span>';
+	}
+	$type == "folder" ? $class = 'pft-directory' : $class = 'pft-file '.strtolower($ext);
+	echo "<li class=\"".$class."\"><a nohref title=\"$fileFolderName\" onMouseOver=\"top.ICEcoder.overFileFolder('$type','".str_replace($docRoot,"",str_replace("/","|",$fileFolderName))."')\" onMouseOut=\"top.ICEcoder.overFileFolder('$type','')\" style=\"position: relative; left:-22px\">&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp; <span id=\"".str_replace($docRoot,"",str_replace("/","|",$fileFolderName))."\">".basename($fileFolderName)."</span> ".$fileAtts."</a>\n";
+	if ($i<count($finalArray)) {echo "</li>\n";}
+	$lastPath = $fileFolderName;
+}
+echo "</ul>\n</ul>\n";
+
+	// Output the JS vars
+	echo "<script>\n";
+	echo "top.ICEcoder.dirCount=";
+	echo $dirCount ? $dirCount : "0";
+	echo ";\ntop.ICEcoder.fileCount=";
+	echo $fileCount ? $fileCount : "0";
+	echo ";\ntop.ICEcoder.fileBytes=";
+	echo $fileBytes ? $fileBytes : "0";
+	echo ";\n</script>";
+?>
+
+<iframe name="fileControl" style="display: none"></iframe>
+		
+</body>
+	
 </html>

index.php

@@ -1,191 +1,182 @@
-<?php
-include("lib/settings.php");
-$allowedIP = false;
-for($i=0;$i<count($_SESSION['allowedIPs']);$i++) {
-	if ($_SESSION['allowedIPs'][$i]==$_SERVER["REMOTE_ADDR"]||$_SESSION['allowedIPs'][$i]=="*") {
-		$allowedIP = true;
-	}
-}
-if (!$allowedIP) {
-	header('Location: /');
-};
-
-// Check for updates of ICEcoder & CodeMirror
-if ($ICEcoder["checkUpdates"]) {
-	$ICEcoderLatestVer = json_encode(file_get_contents("http://icecoder.net/latest-version.txt"));
-	$ICEcoderLatestVer = rtrim(ltrim($ICEcoderLatestVer,"\""),"\"\\n");
-	if (ltrim($ICEcoder["versionNo"],"v ")<ltrim($ICEcoderLatestVer,"v ")) {
-		echo '<script>top.ICEcoder.message(\'ICEcoder '.$ICEcoderLatestVer.' now released\n\nPlease upgrade\');</script>';
-	} else {
-		$cMLatestVer = json_encode(file_get_contents("http://codemirror.net/latest-version.txt"));
-		$cMLatestVer = rtrim(ltrim($cMLatestVer,"\""),"\"\\n");
-		if ($ICEcoder["cMThisVer"]<$cMLatestVer) {
-			echo '<script>top.ICEcoder.message(\'CodeMirror '.$cMLatestVer.' now released\n\nPlease upgrade\');</script>';
-		}
-	}
-}
-?>
-<!DOCTYPE html>
-
-<html onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'top');top.ICEcoder.canResizeFilesW()}">
-<head>
-<title>ICEcoder <?php echo $ICEcoder["versionNo"];?></title>
-<meta name="robots" content="noindex, nofollow">
-<link rel="stylesheet" type="text/css" href="lib/coder.css">
-<script>
-theme = "<?php echo $ICEcoder["theme"]=="default" ? 'icecoder' : $ICEcoder["theme"];?>";
-tabsIndent = <?php echo $ICEcoder["tabsIndent"] ? 'true' : 'false';?>;
-openLastFiles = <?php echo $ICEcoder["openLastFiles"] ? 'true' : 'false';?>;
-tabWidth = <?php echo $ICEcoder["tabWidth"]; ?>;
-<?php
-echo 'iceRoot = "'.$ICEcoder["root"].'";'.PHP_EOL;
-?>
-window.onbeforeunload = function() {
-	for (var i=0; i<=top.ICEcoder.changedContent.length; i++) {
-		if (top.ICEcoder.changedContent[i]==1) {
-			return "You have some unsaved changes.";
-		}
-	}
-}
-
-previousFiles = [<?php
-	if ($ICEcoder["previousFiles"]!="" && $_SESSION['userLevel'] == 10) {
-		$openFilesArray = explode(",",$ICEcoder["previousFiles"]);
-		for ($i=0;$i<count($openFilesArray);$i++) {
-			echo "'".$openFilesArray[$i]."'";
-			if ($i<count($openFilesArray)-1) {echo ",";};
-		}
-	}
-?>];
-</script>
-<script language="JavaScript" src="lib/coder.js"></script>
-</head>
-
-<body onLoad="ICEcoder.init(<?php if ($_SESSION['userLevel'] == 10) {echo "'login'";} ?>)<?php echo $onLoadExtras;?>" onResize="ICEcoder.setLayout()" onKeyDown="return ICEcoder.interceptKeys('coder', event);" onKeyUp="parent.ICEcoder.resetKeys(event);">
-
-<div id="blackMask" class="blackMask" onClick="ICEcoder.showHide('hide',this)">
-	<div class="popupVCenter">
-		<div class="popup" id="mediaContainer"></div>
-	</div>
-</div>
-
-<div id="loadingMask" class="blackMask" style="visibility: visible">
-	<span class="progressBar"></span>
-	<div class="popupVCenter">
-		<div class="popup">
-			<div class="circleOutside"></div>
-			<div class="circleInside"></div>
-			&nbsp;&nbsp;&nbsp;working...
-		</div>
-	</div>
-</div>
-
-<div id="fileMenu" class="fileMenu" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract');this.style.display='none'">
-	<span id="folderMenuItems">
-		<a href="javascript:top.ICEcoder.newFile()" onMouseOver="document.getElementById('fileMenu').style.display='inline-block'">New File</a>
-		<a href="javascript:top.ICEcoder.newFolder()" onMouseOver="document.getElementById('fileMenu').style.display='inline-block'">New Folder</a>
-	</span>
-	<a href="javascript:top.ICEcoder.deleteFile(top.ICEcoder.rightClickedFile)" onMouseOver="document.getElementById('fileMenu').style.display='inline-block'">Delete</a>
-	<span id="singleFileMenuItems">
-		<a href="javascript:top.ICEcoder.renameFile(top.ICEcoder.rightClickedFile)" onMouseOver="document.getElementById('fileMenu').style.display='inline-block'">Rename</a>
-		<a href="javascript:window.open(top.ICEcoder.rightClickedFile)" onMouseOver="document.getElementById('fileMenu').style.display='inline-block'">View Webpage</a>
-	</span>
-	<a href="javascript:top.ICEcoder.zipIt(top.ICEcoder.rightClickedFile)" onMouseOver="document.getElementById('fileMenu').style.display='inline-block'">Zip It!</a>
-	<a href="javascript:top.ICEcoder.propertiesScreen(top.ICEcoder.rightClickedFile)" onMouseOver="document.getElementById('fileMenu').style.display='inline-block'">Properties</a>
-</div>
-
-<div id="header" class="header" onContextMenu="return false">
-	<div class="plugins" id="pluginsContainer">
-	<?php echo $pluginsDisplay; ?>
-	</div>
-	<div class="version"><?php echo $ICEcoder["versionNo"];?></div><img src="images/full-screen.gif" id="screenMode" class="screenModeIcon" onClick="top.ICEcoder.fullScreenSwitcher()">
-	<img src="images/ice-coder.png" class="logo" onClick="ICEcoder.helpScreen()" onContextMenu="ICEcoder.settingsScreen()">
-</div>
-
-<div id="files" class="files" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract'); top.document.getElementById('fileMenu').style.display='none';">
-	<div class="account" id="account">
-		<div class="accountLoginContainer" id="accountLoginContainer">
-			<div class="accountLogin" id="accountLogin">
-				<form name="login" action="lib/settings.php" method="POST" target="ff">
-				<input type="password" name="loginPassword" class="accountPassword">
-				<input type="submit" name="submit" value="Login" class="button">
-				</form>
-			</div>
-		</div>
-		<div class="accountOptions">
-			<div title="Save" onClick="ICEcoder.fMIcon('save')" id="fMSave" style="width: 30px; height: 32px; opacity: 0.3"></div>
-			<div title="Open" onClick="ICEcoder.fMIcon('open')" id="fMOpen" style="width: 25px; height: 32px; background-position: -32px -3px; margin: 3px 0 0 7px; opacity: 0.3"></div>
-			<div title="New File" onClick="ICEcoder.fMIcon('newFile')" id="fMNewFile" style="width: 15px; height: 16px; background-position: -64px 0; margin: 8px 0 0 10px; opacity: 0.3"></div>
-			<div title="New Folder" onClick="ICEcoder.fMIcon('newFolder')" id="fMNewFolder" style="width: 20px; height: 16px; background-position: -80px 0; margin: 8px 0 0 5px; opacity: 0.3"></div>
-			<div title="Delete" onClick="ICEcoder.fMIcon('delete')" id="fMDelete" style="width: 16px; height: 16px; background-position: -100px 0; margin: 8px 0 0 5px; opacity: 0.3"></div>
-			<div title="Rename" onClick="ICEcoder.fMIcon('rename')" id="fMRename" style="width: 16px; height: 16px; background-position: -116px 0; margin: 8px 0 0 5px; opacity: 0.3"></div>
-			<div title="View" onClick="ICEcoder.fMIcon('view')" id="fMView" style="width: 16px; height: 16px; background-position: -132px 0; margin: 8px 0 0 5px; opacity: 0.3"></div>
-
-			<div title="Lock" onClick="ICEcoder.lockUnlockNav()" id="fmLock" style="position: relative; margin-left: 208px; margin-top: -27px; width: 12px; height: 16px; background-position: -64px -16px; z-index: 1"></div>
-		</div>
-	</div>
-	<iframe id="filesFrame" class="frame" name="ff" src="files.php" style="opacity: 0" onLoad="this.style.opacity='1'"></iframe>
-	<div class="serverMessage" id="serverMessage"></div>
-</div>
-
-<div id="editor" class="editor">
-	<div id="tabsBar" class="tabsBar" onContextMenu="return false">
-		<?php
-		for ($i=1;$i<=10;$i++) {
-			echo '<div id="tab'.$i.'" class="tab" draggable="true" onClick="if(ICEcoder.canSwitchTabs) {ICEcoder.switchTab('.$i.')} else {ICEcoder.canSwitchTabs=true}"></div>';
-		}
-		?><div class="newTab" onClick="ICEcoder.newTab()"><img src="images/nav-new.png"></div>
-	</div>
-	<div id="findBar" class="findBar" onContextMenu="return false">
-		<form name="findAndReplace">
-			<div class="findReplace">
-				<div class="findText">Find</div>
-				<input type="text" name="find" value="" id="find" class="textbox find" onKeyUp="ICEcoder.findReplace('find',true,false)">
-				
-				<select name="connector" onChange="ICEcoder.findReplaceOptions()">
-				<option>in</option>
-				<option>and</option>
-				</select>
-				<div class="replaceText" id="rText" style="display: none">
-					<select name="replaceAction" class="replaceAction">
-					<option>replace</option>
-					<option>replace all</option>
-					</select>
-					 with
-				</div>
-				<input type="text" name="replace" value="" id="replace" class="textbox replace" style="display: none">
-				<div class="targetText" id="rTarget" style="display: none">in</div>
-				<select name="target" onChange="ICEcoder.updateResultsDisplay(this.value=='this document' ? 'show' : 'hide')">
-				<option>this document</option>
-				<option>open documents</option>
-				<option>all files</option>
-				<option>all filenames</option>
-				</select>
-				<input type="button" name="submit" value="&gt;&gt;" class="submit" onClick="ICEcoder.findReplace('findReplace',false,true)">
-				<div class="results" id="results"></div>
-			</div>
-		</form>
-		<form onSubmit="return ICEcoder.goToLine()">
-		<div class="codeAssist"><input type="checkbox" name="codeAssist" id="codeAssist" checked onClick="top.ICEcoder.codeAssistToggle()">Code Assist</div>
-		<div class="goLine">Go to Line<input type="text" name="goToLine" value="" id="goToLineNo" class="textbox goToLine">
-		</form>
-	</div>
-	<iframe name="contentFrame" id="content" src="editor.php" class="code">
-	</iframe>
-</div>
-
-<div class="footer" id="footer" onContextMenu="return false">
-	<div class="nesting" id="nestValid">Nesting OK</div>
-	<div class="nestLoc">Cursor nest location</div>
-	<div class="nestDisplay" id="nestDisplay"></div>
-	<div class="charDisplay" id="charDisplay"><span id="char"></span></div>
-</div>
-
-<script>
-ICEcoder.initAliases();
-ICEcoder.setLayout('dontSetEditor');
-</script>
-
-</body>
-
+<?php include("lib/settings.php");
+
+// Check IP permissions
+if (!in_array($_SERVER["REMOTE_ADDR"], $_SESSION['allowedIPs']) && !in_array("*", $_SESSION['allowedIPs'])) {
+	header('Location: /');
+};
+
+$updateMsg = '';
+// Check for updates
+if ($ICEcoder["checkUpdates"]) {
+	$icv = json_encode(file_get_contents("http://icecoder.net/latest-version.txt"));
+	$icv = rtrim(ltrim($icv,'"'),'"\\n');
+	if ($ICEcoder["versionNo"]<$icv) {
+		$updateMsg = ';top.ICEcoder.message(\'ICEcoder '.$icv.' now released\n\nPlease upgrade\')';
+	}
+}
+?>
+<!DOCTYPE html>
+
+<html onMouseDown="top.ICEcoder.mouseDown=true" onMouseUp="top.ICEcoder.mouseDown=false" onMouseMove="if(top.ICEcoder) {top.ICEcoder.getMouseXY(event,'top');top.ICEcoder.canResizeFilesW()}">
+<head>
+<title>ICEcoder v <?php echo $ICEcoder["versionNo"];?></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="robots" content="noindex, nofollow">
+<link rel="stylesheet" type="text/css" href="lib/ice-coder.css">
+<link rel="icon" type="image/png" href="favicon.png">
+<script>
+iceRoot = "<?php echo $ICEcoder["root"]; ?>";
+
+window.onbeforeunload = function() {
+	if (top.ICEcoder.changedContent.indexOf(1)>-1) {
+		return "You have some unsaved changes.";
+	}
+}
+
+</script>
+<script language="JavaScript" src="lib/ice-coder.js"></script>
+<?php
+if (file_exists(dirname(__FILE__)."/plugins/jshint/jshint.js")) {
+	echo '<script src="plugins/jshint/jshint.js"></script>';
+}
+?>
+</head>
+
+<body onLoad="<?php
+	echo 'top.ICEcoder.previousFiles = [';
+	if ($ICEcoder["previousFiles"]!="") {
+		$openFilesArray = explode(",",$ICEcoder["previousFiles"]);
+		echo "'".implode("','",$openFilesArray)."'";
+	}
+	echo "];top.ICEcoder.theme = '";
+	echo $ICEcoder["theme"]=="default" ? 'icecoder' : $ICEcoder["theme"];
+	echo "'";
+	echo ';top.ICEcoder.tabsIndent = ';
+	echo $ICEcoder["tabsIndent"] ? 'true' : 'false';
+	echo ';top.ICEcoder.openLastFiles = ';
+	echo $ICEcoder["openLastFiles"] ? 'true' : 'false';
+	echo ';top.ICEcoder.lineWrapping = ';
+	echo $ICEcoder["lineWrapping"] ? 'true' : 'false';
+	echo ';top.ICEcoder.tabWidth = ';
+	echo $ICEcoder["tabWidth"];
+?>;ICEcoder.init()<?php echo $updateMsg.$onLoadExtras;?>" onResize="ICEcoder.setLayout()" onKeyDown="return ICEcoder.interceptKeys('coder',event);" onKeyUp="parent.ICEcoder.resetKeys(event);">
+
+<div id="blackMask" class="blackMask" onClick="ICEcoder.showHide('hide',this)" onContextMenu="return false">
+	<div class="popupVCenter">
+		<div class="popup" id="mediaContainer"></div>
+	</div>
+</div>
+
+<div id="loadingMask" class="blackMask" style="visibility: visible" onContextMenu="return false">
+	<span class="progressBar" id="progressBar" style="-webkit-animation:fullexpand 10s ease-out; -moz-animation:fullexpand 10s ease-out"></span>
+	<div class="popupVCenter">
+		<div class="popup">
+			<div class="circleOutside"></div>
+			<div class="circleInside"></div>
+			&nbsp;&nbsp;&nbsp;working...
+		</div>
+	</div>
+</div>
+
+<div id="fileMenu" class="fileMenu" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract');this.style.display='none'" onContextMenu="return false">
+	<span id="folderMenuItems">
+		<a href="javascript:top.ICEcoder.newFile()" onMouseOver="ICEcoder.showFileMenu()">New File</a>
+		<a href="javascript:top.ICEcoder.newFolder()" onMouseOver="ICEcoder.showFileMenu()">New Folder</a>
+		<a href="javascript:top.ICEcoder.pasteFile(top.ICEcoder.rightClickedFile)" onMouseOver="ICEcoder.showFileMenu()">Paste</a>
+	</span>
+	<a href="javascript:top.ICEcoder.deleteFile(top.ICEcoder.rightClickedFile)" onMouseOver="ICEcoder.showFileMenu()">Delete</a>
+	<span id="singleFileMenuItems">
+		<a href="javascript:top.ICEcoder.copyFile(top.ICEcoder.rightClickedFile)" onMouseOver="ICEcoder.showFileMenu()">Copy</a>
+		<a href="javascript:top.ICEcoder.renameFile(top.ICEcoder.rightClickedFile)" onMouseOver="ICEcoder.showFileMenu()">Rename</a>
+		<a href="javascript:window.open(top.ICEcoder.rightClickedFile)" onMouseOver="ICEcoder.showFileMenu()">View Webpage</a>
+	</span>
+	<a href="javascript:top.ICEcoder.zipIt(top.ICEcoder.rightClickedFile)" onMouseOver="ICEcoder.showFileMenu()">Zip It!</a>
+	<a href="javascript:top.ICEcoder.propertiesScreen(top.ICEcoder.rightClickedFile)" onMouseOver="ICEcoder.showFileMenu()">Properties</a>
+</div>
+
+<div id="header" class="header" onContextMenu="return false">
+	<div class="plugins" id="pluginsContainer">
+	<?php echo $pluginsDisplay; ?>
+	</div>
+	<div class="version">v <?php echo $ICEcoder["versionNo"];?></div><img src="images/full-screen.gif" id="screenMode" class="screenModeIcon" onClick="top.ICEcoder.fullScreenSwitcher()">
+	<img src="images/ice-coder.png" class="logo" onClick="ICEcoder.helpScreen()" onContextMenu="ICEcoder.settingsScreen()">
+</div>
+
+<div id="files" class="files" onMouseOver="ICEcoder.changeFilesW('expand')" onMouseOut="ICEcoder.changeFilesW('contract'); top.document.getElementById('fileMenu').style.display='none';">
+	<div class="account" id="account">
+		<div class="accountOptions">
+			<div title="Save" onClick="ICEcoder.fMIcon('save')" id="fMSave" class="save"></div>
+			<div title="Open" onClick="ICEcoder.fMIcon('open')" id="fMOpen" class="open"></div>
+			<div title="New File" onClick="ICEcoder.fMIcon('newFile')" id="fMNewFile" class="newFile"></div>
+			<div title="New Folder" onClick="ICEcoder.fMIcon('newFolder')" id="fMNewFolder" class="newFolder"></div>
+			<div title="Delete" onClick="ICEcoder.fMIcon('delete')" id="fMDelete" class="delete"></div>
+			<div title="Rename" onClick="ICEcoder.fMIcon('rename')" id="fMRename" class="rename"></div>
+			<div title="View" onClick="ICEcoder.fMIcon('view')" id="fMView" class="view"></div>
+
+			<div title="Lock" onClick="ICEcoder.lockUnlockNav()" id="fmLock" class="lock"></div>
+		</div>
+	</div>
+	<iframe id="filesFrame" class="frame" name="ff" src="files.php" style="opacity: 0" onLoad="this.style.opacity='1';this.contentWindow.onscroll=function(){top.ICEcoder.mouseDown=false}"></iframe>
+	<div class="serverMessage" id="serverMessage"></div>
+</div>
+
+<div id="editor" class="editor">
+	<div id="tabsBar" class="tabsBar" onContextMenu="return false">
+		<?php
+		for ($i=1;$i<=100;$i++) {
+			echo '<div id="tab'.$i.'" class="tab" draggable="true" onClick="ICEcoder.canSwitchTabs ? ICEcoder.switchTab('.$i.') : ICEcoder.canSwitchTabs=true; thisColor=\'#000\'" onMouseOver="thisColor=this.style.color;this.style.color=\'#000\'" onMouseOut="this.style.color=thisColor"></div>';
+		}
+		?><div class="newTab" onClick="ICEcoder.newTab()"><img src="images/nav-new.png"></div>
+	</div>
+	<div id="findBar" class="findBar" onContextMenu="return false">
+		<form name="findAndReplace" onSubmit="ICEcoder.findReplace('findReplace',false,true);return false">
+			<div class="findReplace">
+				<div class="findText">Find</div>
+				<input type="text" name="find" value="" id="find" class="textbox find" onKeyUp="ICEcoder.findReplace('find',true,false)">
+				
+				<select name="connector" onChange="ICEcoder.findReplaceOptions()">
+				<option>in</option>
+				<option>and</option>
+				</select>
+				<div class="replaceText" id="rText" style="display: none">
+					<select name="replaceAction" class="replaceAction">
+					<option>replace</option>
+					<option>replace all</option>
+					</select>
+					 with
+				</div>
+				<input type="text" name="replace" value="" id="replace" class="textbox replace" style="display: none">
+				<div class="targetText" id="rTarget" style="display: none">in</div>
+				<select name="target" onChange="ICEcoder.updateResultsDisplay(this.value=='this document' ? 'show' : 'hide')">
+				<option>this document</option>
+				<option>open documents</option>
+				<option>all files</option>
+				<option>all filenames</option>
+				</select>
+				<input type="submit" name="submit" value="&gt;&gt;" class="submit">
+				<div class="results" id="results"></div>
+			</div>
+		</form>
+		<form onSubmit="return ICEcoder.goToLine()">
+		<div class="codeAssist"><input type="checkbox" name="codeAssist" id="codeAssist" checked onClick="top.ICEcoder.codeAssistToggle()">Code Assist</div>
+		<div class="goLine">Go to Line<input type="text" name="goToLine" value="" id="goToLineNo" class="textbox goToLine">
+		</form>
+	</div>
+	<iframe name="contentFrame" id="content" src="editor.php" class="code"></iframe>
+</div>
+
+<div class="footer" id="footer" onContextMenu="return false">
+	<div class="nesting" id="nestValid">Nesting OK</div>
+	<div class="nestLoc">cursor nest location</div>
+	<div class="nestDisplay" id="nestDisplay"></div>
+	<div class="charDisplay" id="charDisplay"><span id="char"></span></div>
+</div>
+
+<script>
+ICEcoder.initAliases();
+ICEcoder.setLayout('dontSetEditor');
+</script>
+
+</body>
+
 </html>

lib/config.php

@@ -1,24 +1,29 @@
-<?php
-$ICEcoder = array(
-"root"			=> "",
-"tabsIndent"		=> true,
-"checkUpdates"		=> false,
-"openLastFiles"		=> true,
-"findFilesExclude"	=> array("_coder",".doc",".gif",".jpg",".jpeg",".pdf",".png",".swf",".xml",".zip"),
-"codeAssist"		=> true,
-"visibleTabs"		=> false,
-"lockedNav"		=> true,
-"accountPassword"	=> "",
-"restrictedFiles"	=> array("wp-",".php",".rb",".sql"),
-"bannedFiles"		=> array("_coder","wp-",".exe"),
-"allowedIPs"		=> array("*"),
-"plugins"		=> array(
-			array("Database Admin","images/database.png","margin-top: 3px","plugins/adminer/adminer-3.4.0-mysql-en.php","_blank",""),
-			array("Zip It!","images/zip-it.png","margin-top: 3px","plugins/zip-it/?zip=|&exclude=*.doc*.gif*.jpg*.jpeg*.pdf*.png*.swf*.xml*.zip","fileControl:<b>Zipping Files</b>","30")
-			),
-"theme"			=> "default",
-"tabWidth"		=> 4,
-"previousFiles"		=> "",
-"last10Files"		=> ""
-);
+<?php
+$ICEcoder = array(
+"root"			=> "",
+"tabsIndent"		=> true,
+"checkUpdates"		=> true,
+"openLastFiles"		=> true,
+"findFilesExclude"	=> array("_coder","ICEcoder",".doc",".gif",".jpg",".jpeg",".pdf",".png",".swf",".xml",".zip"),
+"codeAssist"		=> true,
+"visibleTabs"		=> false,
+"lockedNav"		=> true,
+"accountPassword"	=> "",
+"bannedFiles"		=> array("_coder","ICEcoder"),
+"bannedPaths"		=> array("/var/www/.git","/var/www/sites/all/modules","/var/www/sites/default/files"),
+"allowedIPs"		=> array("*"),
+"plugins"		=> array(
+			array("Adminer","plugins/adminer/icon.png","margin-top: 3px","plugins/adminer/adminer-3.4.0-mysql-en.php","_blank",""),
+			array("Zip It!","plugins/zip-it/icon.png","margin-top: 3px; margin-left: 3px","plugins/zip-it/?zip=|&exclude=*.doc*.gif*.jpg*.jpeg*.pdf*.png*.swf*.xml*.zip","fileControl:<b>Zipping Files</b>","30"),
+			array("ICErepo","plugins/ice-repo/icon.png","margin-top: 3px","plugins/ice-repo","_blank",""),
+			array("Dochub","plugins/dochub/icon.png","margin-top: 3px","http://dochub.io","_blank",""),
+			array("Terminal","plugins/terminal/icon.gif","margin-top: 3px","plugins/terminal","_blank",""),
+			array("JS Hint","plugins/jshint/icon.png","margin-top: 3px","http://www.jshint.com","_blank","")
+			),
+"theme"			=> "default",
+"lineWrapping"		=> true,
+"tabWidth"		=> 4,
+"previousFiles"		=> "",
+"last10Files"		=> ""
+);
 ?>

lib/editor.css

@@ -1,40 +1,40 @@
 /* ICE coder default theme: Based VERY loosely on Monokai */
 
-.cm-s-icecoder {font-size: 12px; color: #666; background: #1c1c19;}
+.cm-s-icecoder {color: #666; background: #1c1c19}
 
-.cm-s-icecoder span.cm-keyword {color: #f8f8f8; font-weight:bold;}
-.cm-s-icecoder span.cm-atom {color: #ae81ff;}
-.cm-s-icecoder span.cm-number {color: #0a0;}
-.cm-s-icecoder span.cm-def {color: #fd971f;}
+.cm-s-icecoder span.cm-keyword {color: #f8f8f8; font-weight:bold}
+.cm-s-icecoder span.cm-atom {color: #ae81ff}
+.cm-s-icecoder span.cm-number {color: #0a0}
+.cm-s-icecoder span.cm-def {color: #fd971f}
 
-.cm-s-icecoder span.cm-variable {color: #a6e22e;}
-.cm-s-icecoder span.cm-variable-2 {color: #f92672;}			
-.cm-s-icecoder span.cm-variable-3 {color: #0a0;}
+.cm-s-icecoder span.cm-variable {color: #a6e22e}
+.cm-s-icecoder span.cm-variable-2 {color: #f92672}			
+.cm-s-icecoder span.cm-variable-3 {color: #0a0}
 
-.cm-s-icecoder span.cm-property {color: #a6e22e;}
-.cm-s-icecoder span.cm-operator {color: #0a0;}
-.cm-s-icecoder span.cm-comment {color: #444;}
+.cm-s-icecoder span.cm-property {color: #a6e22e}
+.cm-s-icecoder span.cm-operator {color: #0a0}
+.cm-s-icecoder span.cm-comment {color: #444}
 
-.cm-s-icecoder span.cm-string {color: #fd0;}
-.cm-s-icecoder span.cm-string-2 {color: #f80;}
+.cm-s-icecoder span.cm-string {color: #fd0}
+.cm-s-icecoder span.cm-string-2 {color: #f80}
 
-.cm-s-icecoder span.cm-meta {color: #555;}
-.cm-s-icecoder span.cm-error {color: #f00;}
+.cm-s-icecoder span.cm-meta {color: #555}
+.cm-s-icecoder span.cm-error {color: #f00}
 
-.cm-s-icecoder span.cm-qualifier {color: #555;}
-.cm-s-icecoder span.cm-builtin {color: #06c;}
-.cm-s-icecoder span.cm-bracket {color: #cc7;}
+.cm-s-icecoder span.cm-qualifier {color: #555}
+.cm-s-icecoder span.cm-builtin {color: #06c}
+.cm-s-icecoder span.cm-bracket {color: #cc7}
 
-.cm-s-icecoder span.cm-tag {color: #e8e8e8;}
-.cm-s-icecoder span.cm-attribute {color: #00b8bb;}
+.cm-s-icecoder span.cm-tag {color: #e8e8e8}
+.cm-s-icecoder span.cm-attribute {color: #00b8bb}
 
-.cm-s-icecoder span.cm-header {color: #a0a;}
-.cm-s-icecoder span.cm-quote {color: #090;}
-.cm-s-icecoder span.cm-hr {color: #999;}
-.cm-s-icecoder span.cm-link {color: #ff0;}
+.cm-s-icecoder span.cm-header {color: #a0a}
+.cm-s-icecoder span.cm-quote {color: #090}
+.cm-s-icecoder span.cm-hr {color: #999}
+.cm-s-icecoder span.cm-link {color: #ff0}
 
-.cm-s-icecoder .CodeMirror-cursor {border-left: 1px solid white !important;}
-.cm-s-icecoder .CodeMirror-selected {background: #037 !important;}
+.cm-s-icecoder .CodeMirror-cursor {border-left: 1px solid white !important}
+.cm-s-icecoder .CodeMirror-selected {background: #037 !important}
 .cm-s-icecoder .CodeMirror-gutter {background: #333; border-right: 1px solid #e8e8e8}
 .cm-s-icecoder .CodeMirror-gutter-text {color: #999; width: 35px; cursor: default}
-.cm-s-icecoder .CodeMirror-matchingbracket {border: 1px solid grey; color: black !important;}
+.cm-s-icecoder .CodeMirror-matchingbracket {border: 1px solid grey; color: black !important}

lib/file-control.php

@@ -1,287 +1,307 @@
-<?php include("settings.php");?>
-<?php
-// Get the save type if any
-if (isset($_GET['saveType'])) {$saveType = strClean($_GET['saveType']);};
-
-// Establish the filename/new filename
-$file = str_replace("|","/",strClean(
-	isset($_POST['newFileName']) && $_POST['newFileName']!=""
-	? $_POST['newFileName']
-	: $_GET['file']
-	));
-
-// Make $file a full path and establish the $fileLoc and $fileName
-if (strpos($file,$docRoot)===false) {$file=str_replace("|","/",$docRoot.$iceRoot.$file);};
-$fileLoc = substr(str_replace($docRoot,"",$file),0,strrpos(str_replace($docRoot,"",$file),"/"));
-$fileName = basename($file);
-
-// If we're due to open a file...
-if ($_GET['action']=="load") {
-	echo '<script>action="load";</script>';
-
-	// Determine what to do based on filename
-	// Everything is opened as text in the editor unless specified otherwise
-	$fileType="text";
-	if (strpos($fileName,".jpg")>0||strpos($fileName,".jpeg")>0||strpos($fileName,".gif")>0||strpos($fileName,".png")>0) {$fileType="image";};
-
-	if ($fileType=="text") {
-		$bannedFile=false;
-		for ($i=0;$i<count($ICEcoder["restrictedFiles"]);$i++) {
-			if (strpos($fileName,$ICEcoder["restrictedFiles"][$i])!="") {
-				$bannedFile=true;
-			}
-		}
-		if (file_exists($file) && ($_SESSION['userLevel'] > 0 || ($_SESSION['userLevel'] == 0 && !$bannedFile))) {
-			echo '<script>fileType="text";';
-			echo 'top.ICEcoder.shortURL = top.ICEcoder.rightClickedFile = top.ICEcoder.thisFileFolderLink = "'.$fileLoc."/".$fileName.'";';
-			echo '</script>';
-			$loadedFile = file_get_contents($file);
-			echo '<textarea name="loadedFile" id="loadedFile">'.str_replace("</textarea>","<ICEcoder:/:textarea>",htmlentities($loadedFile)).'</textarea>';
-		} else if (!file_exists($file)) {
-			echo '<script>fileType="nothing";</script>';
-			echo '<script>top.ICEcoder.message(\'Sorry, '.$fileLoc."/".$fileName.' doesn\\\'t seem to exist on the server\');</script>';
-		} else {
-			echo '<script>fileType="nothing";</script>';
-			echo '<script>top.ICEcoder.message(\'Sorry, you need a higher admin level to view this file\');</script>';
-		}
-	};
-
-	if ($fileType=="image") {
-		echo '<script>fileType="image";fileName=\''.$fileLoc."/".$fileName.'\'</script>';
-	};
-};
-
-// If we're due to add a new folder...
-if ($_GET['action']=="newFolder") {
-	if (is_writable($docRoot.$fileLoc) && $_SESSION['userLevel'] > 0) {
-		mkdir($file, 0705);
-		// Reload file manager
-		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.$fileLoc.'\',\''.$fileName.'\');action="newFolder";</script>';
-	} else {
-		echo "<script>top.ICEcoder.message('";
-		if (!is_writable($docRoot.$fileLoc)) {
-			echo "Sorry, cannot create folder at\\n".$fileLoc;
-		} else {
-			echo "Sorry, you need to be logged in to add folders";
-		}
-		echo "');action='nothing';</script>";
-	}
-	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
-}
-
-// If we're due to rename a file/folder...
-if ($_GET['action']=="rename") {
-	if ($_SESSION['userLevel'] > 0 && is_writable($docRoot.$iceRoot.str_replace("|","/",strClean($_GET['oldFileName'])))) {
-		rename($docRoot.$iceRoot.str_replace("|","/",strClean($_GET['oldFileName'])),$docRoot.$fileLoc."/".$fileName);
-		// Reload file manager
-		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'rename\',\''.$fileLoc.'\',\''.$fileName.'\',\'\',\''.str_replace($iceRoot,"",strClean($_GET['oldFileName'])).'\');';
-		echo 'action="rename";</script>';
-	} else {
-		if (!is_writable($_GET['oldFileName'])) {
-			echo "<script>top.ICEcoder.message('Sorry, cannot rename\\n".strClean($_GET['oldFileName'])."');</script>";
-		} else {
-			echo '<script>top.ICEcoder.message(\'Sorry, you need to be logged in to rename\');</script>';
-		}
-		echo '<script>action="nothing";</script>';
-	}
-	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
-}
-
-// If we're due to change permissions on a file/folder...
-if ($_GET['action']=="perms") {
-	if ($_SESSION['userLevel'] > 0 && is_writable($file)) {
-		chmod($file,octdec(numClean($_GET['perms'])));
-		// Reload file manager
-		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'chmod\',\''.$fileLoc.'\',\''.$fileName.'\',\''.numClean($_GET['perms']).'\');';
-		echo 'action="perms";</script>';
-	} else {
-		if (!is_writable($file)) {
-			echo "<script>top.ICEcoder.message('Sorry, cannot change permissions on \\n".strClean($file)."');</script>";
-		} else {
-			echo '<script>top.ICEcoder.message(\'Sorry, you need to be logged in to change permissions\');</script>';
-		}
-		echo '<script>action="nothing";</script>';
-	}
-	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
-}
-
-// If we're due to delete a file...
-if ($_GET['action']=="delete") {
-	if ($_SESSION['userLevel'] > 0) {
-		$filesArray = split(";",$file); // May contain more than one file here
-		for ($i=0;$i<=count($filesArray)-1;$i++) {
-			if (is_writable($iceRoot.$filesArray[$i])) {
-				if (is_dir($iceRoot.$filesArray[$i])) { 
-					rrmdir($iceRoot.$filesArray[$i]);
-				} else {
-					unlink($iceRoot.$filesArray[$i]);
-				}
-				// Reload file manager
-				echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'delete\',\''.$fileLoc.'\',\''.$fileName.'\');';
-				echo 'action="delete";</script>';
-			} else {
-				echo "<script>top.ICEcoder.message('Sorry can\\'t delete\\n".$filesArray[$i]."');</script>";
-			}
-			echo '<script>action="nothing";</script>';
-		}
-	} else {
-		if (!is_writable($iceRoot.$filesArray[$i])) {
-			echo "<script>top.ICEcoder.message('Sorry, cannot delete\\n".$iceRoot.$filesArray[$i]."');</script>";
-		} else {
-			echo '<script>top.ICEcoder.message(\'Sorry, you need to be logged in to delete\');</script>';
-		}
-		echo '<script>action="nothing";</script>';
-	}
-	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
-}
-
-// The function to recursively remove folders & files
-function rrmdir($dir) { 
-	if (is_dir($dir)) { 
-		$objects = scandir($dir); 
-		foreach ($objects as $object) { 
-			if ($object != "." && $object != "..") { 
-				if (filetype($dir."/".$object) == "dir") rrmdir($dir."/".$object); else unlink($dir."/".$object); 
-			} 
-		} 
-		reset($objects); 
-	rmdir($dir); 
-	} 
-} 
-
-if ($_GET['action']=="save") {
-	echo '<script>action="save";</script>';
-	// on the form posting via a reload, save the file
-	if (isset($_POST['contents'])) {
-		if ($_SESSION['userLevel'] > 0) {
-			if ((file_exists($file) && is_writable($file)) || isset($_POST['newFileName']) && $_POST['newFileName']!="") {
-				if (filemtime($file)==$_GET['fileMDT']||!(isset($_GET['fileMDT']))) {
-					$fh = fopen($file, 'w') or die("Sorry, cannot save");
-					fwrite($fh, $_POST['contents']);
-					fclose($fh);
-					clearstatcache();
-					echo '<script>top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1]="'.filemtime($file).'";</script>';
-					// Reload file manager & rename tab if it was a new file
-					if (isset($_POST['newFileName']) && $_POST['newFileName']!="") {
-						echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.$fileLoc.'\',\''.$fileName.'\');</script>';
-						echo '<script>top.ICEcoder.renameTab(top.ICEcoder.selectedTab,\''.$fileLoc."/".$fileName.'\');</script>';
-					}
-					// Reload stickytab window
-					echo '<script>if (top.ICEcoder.stickyTabWindow.location) {top.ICEcoder.stickyTabWindow.location.reload()};action="doneSave";</script>';
-				} else {
-					$loadedFile = file_get_contents($file);
-					echo '<textarea name="loadedFile" id="loadedFile">'.str_replace("</textarea>","<ICEcoder:/:textarea>",htmlentities($loadedFile)).'</textarea>';
-					echo '<textarea name="userVersionFile" id="userVersionFile"></textarea>';
-					?>
-					<script>
-					var refreshFile = top.ICEcoder.ask('Sorry, this file has changed, cannot save\n<?php echo $file;?>\n\nReload this file and copy your version to a new document?');
-					if (refreshFile) {
-						var cM = top.ICEcoder.getcMInstance();
-						var thisTab = top.ICEcoder.selectedTab;
-						document.getElementById('userVersionFile').value = cM.getValue();
-						// Revert back to original
-						cM.setValue(document.getElementById('loadedFile').value);
-						top.ICEcoder.changedContent[thisTab-1] = 0;
-						top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1] = "<?php echo filemtime($file); ?>";
-						cM.clearHistory();
-						// Now for the new file
-						top.ICEcoder.newTab();
-						cM = top.ICEcoder.getcMInstance();
-						cM.setValue(document.getElementById('userVersionFile').value);
-						cM.clearHistory();
-						// Finally, switch back to original tab
-						top.ICEcoder.switchTab(thisTab);
-					}
-					</script>
-					<?php
-					echo "<script>action='nothing';</script>";
-				}
-        		} else {
-				echo "<script>top.ICEcoder.message('Sorry, cannot write\\n".$file."');action='nothing';</script>";
-			}
-		} else {
-			echo "<script>top.ICEcoder.message('Sorry, you need to be logged in to save');action='nothing';</script>";
-		}
-	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
-	}
-};
-?>
-<script>
-if (action=="load") {
-	if (fileType=="text") {
-		top.ICEcoder.loadingFile = true;
-		// Reset the various states back to their initial setting
-		selectedTab = top.ICEcoder.openFiles.length;	// The tab that's currently selected
-
-		// Finally, store all data, show tabs etc
-		top.ICEcoder.createNewTab();
-		top.ICEcoder.cMInstances.push(top.ICEcoder.nextcMInstance);
-		window.onload=top.ICEcoder.content.contentWindow.createNewCMInstance(top.ICEcoder.nextcMInstance);
-
-		// Set the value & innerHTML of the code textarea to that of our loaded file plus make it visible (it's hidden on _coder's load)
-		top.ICEcoder.switchMode();
-		cM = top.ICEcoder.getcMInstance();
-		cM.setValue(document.getElementById('loadedFile').value);
-		top.document.getElementById('content').style.visibility='visible';
-		top.ICEcoder.switchTab(top.ICEcoder.selectedTab);
-		cM.focus();
-
-		// Then clean it up, set the text cursor, update the display and get the character data
-		top.ICEcoder.contentCleanUp();
-		top.ICEcoder.content.contentWindow['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].setLineClass(top.ICEcoder['cMActiveLine'+top.ICEcoder.selectedTab], null);
-		top.ICEcoder['cMActiveLine'+top.ICEcoder.selectedTab] = top.ICEcoder.content.contentWindow['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].setLineClass(0, "cm-s-activeLine");
-		top.ICEcoder.nextcMInstance++;
-		top.ICEcoder.openFileMDTs.push('<?php echo filemtime($file); ?>');
-		top.ICEcoder.loadingFile = false;
-	}
-
-	if (fileType=="image") {
-		top.document.getElementById('blackMask').style.visibility = "visible";
-		top.document.getElementById('mediaContainer').innerHTML = "<img src=\"<?php echo $fileLoc."/".$fileName;?>\" class=\"whiteGlow\" style=\"border: solid 10px #fff; max-width: 700px; max-height: 500px\" onClick=\"return false\"><br><span class=\"whiteGlow\" style=\"border: solid 10px #fff; color: #000; background-color: #fff\" onClick=\"return false\"><?php echo $fileLoc."/".$fileName;?></span>";
-	}
-
-	top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);
-}
-</script>
-
-<form name="saveFile" action="file-control.php?action=save&file=<?php if (isset($file)) {echo $file;}; if (isset($_GET['fileMDT']) && $_GET['fileMDT']!="undefined") {echo "&fileMDT=".numClean($_GET['fileMDT']);};?>" method="POST">
-<textarea name="contents"></textarea>
-<input type="hidden" name="newFileName" value="">
-</form>
-
-<script>
-if (action=="save") {
-	<?php
-	if (strpos($file,"[NEW]")>0||$saveType=="saveAs") {
-		if (strpos($fileName,"[NEW]")>0) {echo "fileLoc = '".$fileLoc."';";} else {echo "fileLoc = '';";};
-	?>
-		newFileName = top.ICEcoder.getInput(fileLoc != ""
-			? 'Enter filename to save at '+fileLoc
-			: 'Enter filename (including path, prefixed with /)'
-			,'');
-		if (newFileName.substr(0,1)!="/") {newFileName = "/" + newFileName}
-		if (newFileName) {
-			newFileName = fileLoc == "" ? newFileName : fileLoc + "/" + fileName;
-		}
-		if (newFileName && top.document.getElementById('filesFrame').contentWindow.document.getElementById(newFileName.replace(/\//g,"|"))) {
-			overwriteOK = top.ICEcoder.ask('That file exists already, overwrite?');
-		}
-		document.saveFile.newFileName.value = '<?php echo $docRoot; ?>' + newFileName;
-	<?php ;};?>
-	if ("undefined" == typeof newFileName || (newFileName && "undefined" == typeof overwriteOK) || ("undefined" != typeof overwriteOK && overwriteOK)) {
-		top.ICEcoder.serverMessage('<b>Saving</b><br>'+ <?php echo strpos($file,"[NEW]")>0 ? "newFileName" : "'$file'"; ?>);
-		document.saveFile.contents.value = top.document.getElementById('saveTemp1').value;
-		document.saveFile.submit();
-	} else {
-		top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);
-		action=="nothing";
-	}
-}
-</script>
-
-<script>
-if (action=="doneSave") {
-	top.ICEcoder.changedContent[top.ICEcoder.selectedTab-1] = 0;
-	top.ICEcoder.redoTabHighlight(top.ICEcoder.selectedTab);
-}
+<?php include("settings.php");?>
+<?php
+// Get the save type if any
+$saveType = "";
+if (isset($_GET['saveType'])) {$saveType = strClean($_GET['saveType']);};
+
+// Establish the filename/new filename
+$file = str_replace("|","/",strClean(
+	isset($_POST['newFileName']) && $_POST['newFileName']!=""
+	? $_POST['newFileName']
+	: $_GET['file']
+	));
+
+// Make $file a full path and establish the $fileLoc and $fileName
+if (strpos($file,$docRoot)===false) {$file=str_replace("|","/",$docRoot.$iceRoot.$file);};
+$fileLoc = substr(str_replace($docRoot,"",$file),0,strrpos(str_replace($docRoot,"",$file),"/"));
+$fileName = basename($file);
+
+// If we're due to open a file...
+if ($_GET['action']=="load") {
+	echo '<script>action="load";</script>';
+
+	if (file_exists($file)) {
+		// Determine what to do based on mime type
+		$finfo = finfo_open(FILEINFO_MIME_TYPE);
+		if (strpos(finfo_file($finfo, $file),"text")===0) {
+			echo '<script>fileType="text";';
+			echo 'top.ICEcoder.shortURL = top.ICEcoder.rightClickedFile = top.ICEcoder.thisFileFolderLink = "'.$fileLoc."/".$fileName.'";';
+			echo '</script>';
+			$loadedFile = file_get_contents($file);
+			echo '<textarea name="loadedFile" id="loadedFile">'.str_replace("</textarea>","<ICEcoder:/:textarea>",htmlentities($loadedFile)).'</textarea>';
+		} else if (strpos(finfo_file($finfo, $file),"image")===0) {
+			echo '<script>fileType="image";fileName=\''.$fileLoc."/".$fileName.'\'</script>';
+		} else {
+			echo '<script>fileType="other";window.open(\'http://'.$_SERVER['SERVER_NAME'].$fileLoc."/".$fileName.'\');</script>';
+		};
+	} else {
+		echo '<script>fileType="nothing"; top.ICEcoder.message(\'Sorry, '.$fileLoc."/".$fileName.' doesn\\\'t seem to exist on the server\');</script>';
+	}
+	finfo_close($finfo);
+};
+
+// If we're due to add a new folder...
+if ($_GET['action']=="newFolder") {
+	if (!$demoMode && is_writable($docRoot.$fileLoc)) {
+		mkdir($file, 0705);
+		// Reload file manager
+		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.$fileLoc.'\',\''.$fileName.'\');action="newFolder";</script>';
+	} else {
+		echo "<script>action='nothing'; top.ICEcoder.message('Sorry, cannot create folder at\\n".$fileLoc."')</script>";
+	}
+	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
+}
+
+// If we're due to paste a new file...
+if ($_GET['action']=="paste") {
+	$source = $file;
+	$dest = $docRoot.strClean(str_replace("|","/",$_GET['location']))."/".basename($source);
+	if (!$demoMode && is_writable(dirname($dest))) {
+		if (is_dir($source)) {
+			if (!is_dir($dest)) {
+				mkdir($dest, 0705);
+			}
+			foreach ($iterator = new RecursiveIteratorIterator(
+				new RecursiveDirectoryIterator($source, RecursiveDirectoryIterator::SKIP_DOTS),
+				RecursiveIteratorIterator::SELF_FIRST) as $item
+				) {
+				if ($item->isDir()) {
+					mkdir($dest.DIRECTORY_SEPARATOR.$iterator->getSubPathName(), 0705);
+				} else {
+					copy($item, $dest.DIRECTORY_SEPARATOR.$iterator->getSubPathName());
+				}
+			}
+		} else {
+			copy($source, $dest);
+		}
+		// Reload file manager
+		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.strClean(str_replace("|","/",$_GET['location'])).'\',\''.$fileName.'\');action="pasteFile";</script>';
+	} else {
+		echo "<script>action='nothing'; top.ICEcoder.message('Sorry, cannot copy \\n".str_replace($docRoot,"",$source)."\\n into \\n".str_replace($docRoot,"",$dest)."')</script>";
+	}
+	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
+}
+
+// If we're due to rename a file/folder...
+if ($_GET['action']=="rename") {
+	if (!$demoMode && is_writable($docRoot.$iceRoot.str_replace("|","/",strClean($_GET['oldFileName'])))) {
+		rename($docRoot.$iceRoot.str_replace("|","/",strClean($_GET['oldFileName'])),$docRoot.$fileLoc."/".$fileName);
+		// Reload file manager
+		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'rename\',\''.$fileLoc.'\',\''.$fileName.'\',\'\',\''.str_replace($iceRoot,"",strClean($_GET['oldFileName'])).'\');';
+		echo 'action="rename";</script>';
+	} else {
+		echo "<script>action='nothing'; top.ICEcoder.message('Sorry, cannot rename\\n".strClean($_GET['oldFileName'])."');</script>";
+	}
+	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
+}
+
+// If we're due to replace text in a file...
+if ($_GET['action']=="replaceText") {
+	if (!$demoMode && is_writable(str_replace("|","/",strClean($_GET['fileRef'])))) {
+		$file = str_replace("|","/",strClean($_GET['fileRef']));
+		$loadedFile = file_get_contents($file);
+		$newContent = str_replace(strClean($_GET['find']),strClean($_GET['replace']),$loadedFile);
+		$fh = fopen($file, 'w') or die("Sorry, cannot save");
+		fwrite($fh, $newContent);
+		fclose($fh);
+		echo '<script>action="replaceText";</script>';
+	} else {
+		echo "<script>action='nothing'; top.ICEcoder.message('Sorry, cannot replace text in\\n".strClean($_GET['fileRef'])."');</script>";
+	}
+	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
+}
+
+// If we're due to change permissions on a file/folder...
+if ($_GET['action']=="perms") {
+	if (!$demoMode && is_writable($file)) {
+		chmod($file,octdec(numClean($_GET['perms'])));
+		// Reload file manager
+		echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'chmod\',\''.$fileLoc.'\',\''.$fileName.'\',\''.numClean($_GET['perms']).'\');';
+		echo 'action="perms";</script>';
+	} else {
+		echo "<script>action='nothing'; top.ICEcoder.message('Sorry, cannot change permissions on \\n".strClean($file)."');</script>";
+	}
+	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
+}
+
+// If we're due to delete a file...
+if ($_GET['action']=="delete") {
+	$filesArray = explode(";",$file); // May contain more than one file here
+	for ($i=0;$i<=count($filesArray)-1;$i++) {
+		if (!$demoMode && is_writable($iceRoot.$filesArray[$i])) {
+			is_dir($iceRoot.$filesArray[$i])
+				? rrmdir($iceRoot.$filesArray[$i])
+				: unlink($iceRoot.$filesArray[$i]);
+			// Reload file manager
+			echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'delete\',\''.$fileLoc.'\',\''.$fileName.'\');';
+			echo 'action="delete";</script>';
+		} else {
+			echo "<script>top.ICEcoder.message('Sorry can\\'t delete\\n".$filesArray[$i]."');</script>";
+		}
+		echo '<script>action="nothing";</script>';
+	}
+	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
+}
+
+// The function to recursively remove folders & files
+function rrmdir($dir) { 
+	if (is_dir($dir)) { 
+		$objects = scandir($dir); 
+		foreach ($objects as $object) { 
+			if ($object != "." && $object != "..") { 
+				filetype($dir."/".$object) == "dir" 
+					? rrmdir($dir."/".$object)
+					: unlink($dir."/".$object); 
+			} 
+		} 
+		reset($objects); 
+	rmdir($dir); 
+	} 
+} 
+
+if ($_GET['action']=="save") {
+	echo '<script>action="save";</script>';
+	// on the form posting via a reload, save the file
+	if (isset($_POST['contents'])) {
+		if (!$demoMode && ((file_exists($file) && is_writable($file)) || isset($_POST['newFileName']) && $_POST['newFileName']!="")) {
+			if (filemtime($file)==$_GET['fileMDT']||!(isset($_GET['fileMDT']))) {
+				$fh = fopen($file, 'w') or die("Sorry, cannot save");
+				fwrite($fh, $_POST['contents']);
+				fclose($fh);
+				clearstatcache();
+				echo '<script>top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1]="'.filemtime($file).'";</script>';
+				// Reload file manager & rename tab if it was a new file
+				if (isset($_POST['newFileName']) && $_POST['newFileName']!="") {
+					echo '<script>top.ICEcoder.selectedFiles=[];top.ICEcoder.updateFileManagerList(\'add\',\''.$fileLoc.'\',\''.$fileName.'\');';
+					echo 'top.ICEcoder.renameTab(top.ICEcoder.selectedTab,\''.$fileLoc."/".$fileName.'\');</script>';
+				}
+				// Reload stickytab window
+				echo '<script>if (top.ICEcoder.stickyTab.location) {top.ICEcoder.stickyTab.location.reload()};action="doneSave";</script>';
+			} else {
+				$loadedFile = file_get_contents($file);
+				echo '<textarea name="loadedFile" id="loadedFile">'.str_replace("</textarea>","<ICEcoder:/:textarea>",htmlentities($loadedFile)).'</textarea>';
+				echo '<textarea name="userVersionFile" id="userVersionFile"></textarea>';
+				?>
+				<script>
+				var refreshFile = top.ICEcoder.ask('Sorry, this file has changed, cannot save\n<?php echo $file;?>\n\nReload this file and copy your version to a new document?');
+				if (refreshFile) {
+					var cM = top.ICEcoder.getcMInstance();
+					var thisTab = top.ICEcoder.selectedTab;
+					document.getElementById('userVersionFile').value = cM.getValue();
+					// Revert back to original
+					cM.setValue(document.getElementById('loadedFile').value);
+					top.ICEcoder.changedContent[thisTab-1] = 0;
+					top.ICEcoder.openFileMDTs[top.ICEcoder.selectedTab-1] = "<?php echo filemtime($file); ?>";
+					cM.clearHistory();
+					// Now for the new file
+					top.ICEcoder.newTab();
+					cM = top.ICEcoder.getcMInstance();
+					cM.setValue(document.getElementById('userVersionFile').value);
+					cM.clearHistory();
+					// Finally, switch back to original tab
+					top.ICEcoder.switchTab(thisTab);
+				}
+				action='nothing';
+				</script>
+				<?php
+			}
+        	} else {
+			echo "<script>action='nothing';top.ICEcoder.message('Sorry, cannot write\\n".$file."')</script>";
+		}
+	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
+	}
+};
+?>
+<script>
+if (action=="load") {
+	if (fileType=="text") {
+		setTimeout(function() {
+			if (!top.ICEcoder.content.contentWindow.createNewCMInstance) {
+				console.log('There was tech hiccup, likely something wasn\'t quite ready. So ICEcoder reloaded it\'s file control again.');
+				window.location.reload();
+			<?php
+			if (file_exists($file)) {
+			?>
+			} else {
+				top.ICEcoder.loadingFile = true;
+				// Reset the various states back to their initial setting
+				selectedTab = top.ICEcoder.openFiles.length;	// The tab that's currently selected
+
+				// Finally, store all data, show tabs etc
+				top.ICEcoder.createNewTab();
+				top.ICEcoder.cMInstances.push(top.ICEcoder.nextcMInstance);
+				top.ICEcoder.setLayout();
+				top.ICEcoder.content.contentWindow.createNewCMInstance(top.ICEcoder.nextcMInstance);
+
+				// Set the value & innerHTML of the code textarea to that of our loaded file plus make it visible (it's hidden on _coder's load)
+				top.ICEcoder.switchMode();
+				cM = top.ICEcoder.getcMInstance();
+				cM.setValue(document.getElementById('loadedFile').value);
+				top.document.getElementById('content').style.visibility='visible';
+				top.ICEcoder.switchTab(top.ICEcoder.selectedTab);
+				cM.focus();
+
+				// Then clean it up, set the text cursor, update the display and get the character data
+				top.ICEcoder.contentCleanUp();
+				top.ICEcoder.content.contentWindow['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].removeLineClass(top.ICEcoder['cMActiveLine'+top.ICEcoder.selectedTab], "background");
+				top.ICEcoder['cMActiveLine'+top.ICEcoder.selectedTab] = top.ICEcoder.content.contentWindow['cM'+top.ICEcoder.cMInstances[top.ICEcoder.selectedTab-1]].addLineClass(0, "background", "cm-s-activeLine");
+				top.ICEcoder.nextcMInstance++;
+				top.ICEcoder.openFileMDTs.push('<?php echo filemtime($file); ?>');
+				top.ICEcoder.loadingFile = false;
+			<?php
+			;};
+			?>
+			}
+		},4);
+	}
+
+	if (fileType=="image") {
+		top.document.getElementById('blackMask').style.visibility = "visible";
+		top.document.getElementById('mediaContainer').innerHTML = "<img src=\"<?php echo $fileLoc."/".$fileName;?>\" class=\"whiteGlow\" style=\"border: solid 10px #fff; max-width: 700px; max-height: 500px\" onClick=\"return false\"><br><span class=\"whiteGlow\" style=\"border: solid 10px #fff; color: #000; background-color: #fff\" onClick=\"return false\"><?php echo $fileLoc."/".$fileName;?></span>";
+	}
+
+	top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);
+}
+</script>
+
+<form name="saveFile" action="file-control.php?action=save&file=<?php if (isset($file)) {echo $file;}; if (isset($_GET['fileMDT']) && $_GET['fileMDT']!="undefined") {echo "&fileMDT=".numClean($_GET['fileMDT']);};?>" method="POST">
+	<textarea name="contents"></textarea>
+	<input type="hidden" name="newFileName" value="">
+</form>
+
+<script>
+if (action=="save") {
+	<?php
+	if (strpos($file,"[NEW]")>0||$saveType=="saveAs") {
+		if (strpos($fileName,"[NEW]")>0) {echo "fileLoc = '".$fileLoc."';";} else {echo "fileLoc = '';";};
+	?>
+		newFileName = top.ICEcoder.getInput(fileLoc != ""
+			? 'Enter filename to save at '+fileLoc
+			: 'Enter filename (including path, prefixed with /)'
+			,'');
+		if (newFileName.substr(0,1)!="/") {newFileName = "/" + newFileName}
+		if (newFileName) {
+			newFileName = fileLoc == "" ? newFileName : fileLoc + "/" + fileName;
+		}
+		if (newFileName && top.document.getElementById('filesFrame').contentWindow.document.getElementById(newFileName.replace(/\//g,"|"))) {
+			overwriteOK = top.ICEcoder.ask('That file exists already, overwrite?');
+		}
+		document.saveFile.newFileName.value = '<?php echo $docRoot; ?>' + newFileName;
+	<?php ;};?>
+	if ("undefined" == typeof newFileName || (newFileName && "undefined" == typeof overwriteOK) || ("undefined" != typeof overwriteOK && overwriteOK)) {
+		top.ICEcoder.serverMessage('<b>Saving</b><br>'+ <?php echo strpos($file,"[NEW]")>0 ? "newFileName" : "'$file'"; ?>);
+		document.saveFile.contents.value = top.document.getElementById('saveTemp1').value;
+		document.saveFile.submit();
+	} else {
+		top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);
+		action=="nothing";
+	}
+}
+</script>
+
+<script>
+if (action=="doneSave") {
+	top.ICEcoder.changedContent[top.ICEcoder.selectedTab-1] = 0;
+	top.ICEcoder.redoTabHighlight(top.ICEcoder.selectedTab);
+}
 </script>

lib/files.css

@@ -51,21 +51,12 @@ body {margin: 0; overflow: auto}
 .fileManager LI.ext-coffee:before {background-position: -48px 0}
 .fileManager LI.ext-css:before {background-position: -64px 0}
 .fileManager LI.ext-gif:before {background-position: -80px 0}
-.fileManager LI.ext-htm:before {background-position: -96px 0}
-.fileManager LI.ext-html:before {background-position: -96px 0}
-.fileManager LI.ext-jpg:before {background-position: -112px 0}
-.fileManager LI.ext-jpeg:before {background-position: -112px 0}
+.fileManager LI.ext-htm:before, .fileManager LI.ext-html:before {background-position: -96px 0}
+.fileManager LI.ext-jpg:before, .fileManager LI.ext-jpeg:before {background-position: -112px 0}
 .fileManager LI.ext-js:before {background-position: -128px 0}
-/*.fileManager LI.ext-pdf:before {background-position: -???px 0} */
 .fileManager LI.ext-less:before {background-position: -144px 0}
 .fileManager LI.ext-php:before {background-position: -160px 0}
 .fileManager LI.ext-png:before {background-position: -176px 0}
-.fileManager LI.ext-rb:before {background-position: -192px 0}
-.fileManager LI.ext-rbx:before {background-position: -192px 0}
-.fileManager LI.ext-rhtml:before {background-position: -192px 0}
-.fileManager LI.ext-ruby:before {background-position: -192px 0}
-/*.fileManager LI.ext-sql:before {background-position: -???px 0} */
-/*.fileManager LI.ext-swf:before {background-position: -???px 0} */
+.fileManager LI.ext-rb:before, .fileManager LI.ext-ruby:before {background-position: -192px 0}
 .fileManager LI.ext-txt:before {background-position: -208px 0}
-/*.fileManager LI.ext-xml:before {background-position: -???px 0} */
 .fileManager LI.ext-zip:before {background-position: -224px 0}

lib/help.php

@@ -1,38 +1,45 @@
-<?php include("settings.php");?>
-<!DOCTYPE html>
-
-<html>
-<head>
-<title>ICE Coder - <?php echo $ICEcoder["versionNo"];?> :: Help & Shortcuts</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel="stylesheet" type="text/css" href="help.css">
-</head>
-
-<body class="help">
-
-<h1 id="title">help</h1>
-
-<h2>In file manager</h2>
-<span class="key">Delete</span> <span class="shortcut">Delete file</span><br><br>
-
-<h2>Within document</h2>
-<span class="key">CTRL <span class="plus">+</span> I</span> <span class="shortcut">Search selected text</span><br>
-<span class="key">Esc</span> <span class="shortcut">Comment / uncomment text</span><br>
-<span class="key">Tab</span> <span class="shortcut">Insert tab / indent selected text</span><br><br>
-
-<h2>Anywhere</h2>
-<span class="key">CTRL <span class="plus">+</span> F</span> <span class="shortcut">Find</span><br>
-<span class="key">CTRL <span class="plus">+</span> G</span> <span class="shortcut">Go to line</span><br>
-<span class="key">CTRL <span class="plus">+</span> S</span> <span class="shortcut">Save</span><br>
-<span class="key">CTRL <span class="plus">+</span> Shift <span class="plus">+</span> S</span> <span class="shortcut">Save as...</span><br>
-<span class="key">CTRL <span class="plus">+</span> Enter</span> <span class="shortcut">View webpage</span><br>
-<span class="key">CTRL <span class="plus">+</span> S <span class="plus">+</span> Enter</span> <span class="shortcut">Save & create sticky tab</span><br>
-<span class="key">Esc</span> <span class="shortcut">Cancel tasks</span><br><br>
-
-<h2>Clicking logo</h2>
-<span class="key">Left click</span> <span class="shortcut">Help</span><br>
-<span class="key">Right click</span> <span class="shortcut">Settings</span><br>
-
-</body>
-
+<?php include("settings.php");?>
+<!DOCTYPE html>
+
+<html>
+<head>
+<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> help</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="robots" content="noindex, nofollow">
+<link rel="stylesheet" type="text/css" href="help.css">
+</head>
+
+<body class="help">
+
+<h1 id="title">help</h1>
+
+<h2>In file manager</h2>
+<span class="key">Delete</span> <span class="shortcut">Delete file</span><br><br>
+
+<h2>Within document</h2>
+<span class="key">CTRL <span class="plus">+</span> &uarr;</span> <span class="shortcut">Move line up</span><br>
+<span class="key">CTRL <span class="plus">+</span> &darr;</span> <span class="shortcut">Move line down</span><br>
+<span class="key">CTRL <span class="plus">+</span> I</span> <span class="shortcut">Search selected text</span><br>
+<span class="key">Esc</span> <span class="shortcut">Comment / uncomment text</span><br>
+<span class="key">Tab</span> <span class="shortcut">Insert tab / indent selected text</span><br><br>
+
+<h2>Anywhere</h2>
+<span class="key">CTRL <span class="plus">+</span> &rarr;</span> <span class="shortcut">Next tab</span><br>
+<span class="key">CTRL <span class="plus">+</span> &larr;</span> <span class="shortcut">Previous tab</span><br>
+<span class="key">CTRL <span class="plus">+</span> +</span> <span class="shortcut">New tab</span><br>
+<span class="key">CTRL <span class="plus">+</span> -</span> <span class="shortcut">Close current tab</span><br>
+<span class="key">CTRL <span class="plus">+</span> F</span> <span class="shortcut">Find</span><br>
+<span class="key">CTRL <span class="plus">+</span> G</span> <span class="shortcut">Go to line</span><br>
+<span class="key">CTRL <span class="plus">+</span> S</span> <span class="shortcut">Save</span><br>
+<span class="key">CTRL <span class="plus">+</span> Shift <span class="plus">+</span> S</span> <span class="shortcut">Save as...</span><br>
+<span class="key">CTRL <span class="plus">+</span> Enter</span> <span class="shortcut">View webpage</span><br>
+<span class="key">CTRL <span class="plus">+</span> S <span class="plus">+</span> Enter</span> <span class="shortcut">Save & create sticky tab</span><br>
+<span class="key">Esc</span> <span class="shortcut">Cancel tasks</span><br><br>
+
+<h2>Logo</h2>
+<span class="key">Left click</span> <span class="shortcut">Help</span><br>
+<span class="key">Right click</span> <span class="shortcut">Settings</span><br>
+
+</body>
+
 </html>

lib/ice-coder.css

@@ -1,145 +1,146 @@
-/* First, reset everything to a standard */
-html, body, div, span, applet, object, iframe,
-h1, h2, h3, h4, h5, h6, p, blockquote, pre,
-a, abbr, acronym, address, big, cite, code,
-del, dfn, em, font, img, ins, kbd, q, s, samp,
-small, strike, strong, sub, sup, tt, var,
-b, u, i, center,
-dl, dt, dd, ol, ul, li,
-fieldset, form, label, legend,
-table, caption, tbody, tfoot, thead, tr, th, td {
-	font-family: arial, verdana, helvetica, sans-serif;
-	border: 0;
-	margin: 0;
-	padding: 0;
-	outline: 0;
-	font-size: 12px;
-	vertical-align: top;
-}
-
-body {overflow: hidden;
-	-webkit-user-select: none;
-	-moz-user-select: none;
-	user-select: none;
-	background-color: #222;
-}
-
-h1 {font-size: 36px; font-weight: normal; color: #888; margin-bottom: 20px}
-h2 {font-size: 18px; font-weight: normal; color: #fff}
-
-.blackMask {position: fixed; display: table; width: 100%; height: 100%; top: 0; left: 0; visibility: hidden; background-color: rgba(0,0,0,0.8); text-align: center; z-index: 100}
-.blackMask .popupVCenter {#position: absolute; display: table-cell; #top: 50%; vertical-align: middle; text-align: center}
-.popupVCenter .popup {#position: relative; #top: -50%; text-align: center; color: #fff; font-size: 10px}
-.whiteGlow {box-shadow: 0 0 8px 2px rgba(255,255,255,0.6)}
-
-.circleOutside {background-color: rgba(0,0,0,0); border:5px solid rgba(0,183,229,0.9); opacity:.9; border-top:5px solid rgba(0,0,0,0); border-left:5px solid rgba(0,0,0,0); border-radius:50px; box-shadow: 0 0 35px #2187e7;
-	width:50px; height:50px; margin:0 auto; -moz-animation:spin .5s infinite linear; -webkit-animation:spin .5s infinite linear;
-}
-.circleInside {background-color: rgba(0,0,0,0); border:5px solid rgba(0,183,229,0.9); opacity:.9; border-top:5px solid rgba(0,0,0,0); border-left:5px solid rgba(0,0,0,0); border-radius:50px; box-shadow: 0 0 15px #2187e7;
-	width:30px; height:30px; margin:0 auto; position:relative; top:-50px; -moz-animation:spinoff .5s infinite linear; -webkit-animation:spinoff .5s infinite linear;
-}
-@-moz-keyframes spin {
-	0% { -moz-transform:rotate(0deg);}
-	100% { -moz-transform:rotate(360deg);}
-}
-@-moz-keyframes spinoff {
-	0% { -moz-transform:rotate(0deg);}
-	100% { -moz-transform:rotate(-360deg);}
-}
-@-webkit-keyframes spin {
-	0% { -webkit-transform:rotate(0deg);}
-	100% { -webkit-transform:rotate(360deg);}
-}
-@-webkit-keyframes spinoff {
-	0% { -webkit-transform:rotate(0deg); }
-	100% { -webkit-transform:rotate(-360deg);}
-}
-
-.progressBar {top: 0; left: 0; width:100%; height:1px; margin:2px 0; background:#2187e7; position:absolute; box-shadow:0 0 10px 1px rgba(0,198,255,0.7);
-	-moz-animation:fullexpand 10s ease-out; -webkit-animation:fullexpand 10s ease-out;
-}
-@-moz-keyframes fullexpand {
-	0%  { width:0;}
-	100%{ width:100%;}	
-}
-@-webkit-keyframes fullexpand {
-	0%  { width:0;}
-	100%{ width:100%;}	
-}
-
-.header {position: absolute; display: inline-block; top: 0; left: 0; width: 100%; height: 40px; background-color: #fff; text-align: right; z-index: 2}
-.header .plugins {position: absolute; display: inline-block; left: 15px; top: 3px}
-.header .plugins img {position: relative; display: inline-block; margin-right: 15px}
-.header .screenModeIcon {position: absolute; top: 5px; right: 178px; cursor: pointer}
-.header .version {position: relative; display: inline-block; margin-top: 25px; font-size: 10px; color: #bbb}
-.header .logo {position: relative; margin: 5px 10px 0 5px; cursor: pointer}
-
-.files {position: absolute; display: inline-block; top: 0; left: 0; height: 100%; width: 250px; background-color: #444; background-image: url('../images/files-arrow.gif'); background-repeat: no-repeat; background-position: 100% 50%; overflow: hidden; z-index: 1;
-	box-shadow: 0 0 10px 4px rgba(0,0,0,0.4);
-}
-.files .account {display: inline-block; height: 50px; width: 250px; margin-top: 40px; background-color: #888}
-.files .accountLoginContainer {position: absolute; width: 250px; height: 50px; z-index: 1}
-.files .accountLoginContainer .accountLogin {position: absolute; width: 250px; height: 50px; top: 0; background-color: #666;
-	-webkit-transition: top 0.3s;
-	-moz-transition: top 0.3s;
-	transition: top 0.3s;
-}
-.files .accountOptions {position: relative; height: 32px; width: 100%; margin-left: 15px; margin-top: 8px}
-.files .accountOptions div {display: inline-block; background: url('../images/file-manager-icons.png') 0 0 no-repeat; cursor: pointer}
-.files .accountPassword {position: relative; border: 0; background-color: #333; color: #fff; height: 18px; width: 140px; margin-left: 14px; margin-top: 16px}
-.files input:focus, .findReplace input:focus, .findReplace select:focus, .accountPassword:focus {outline: none; box-shadow: 0 0 10px 1px rgba(0,198,255,0.7)}
-.files .button {position: absolute; border: 0; background: #444; color: #eee; height:20px; margin-top: 16px; margin-left: 5px; font-size: 11px; cursor: pointer}
-.files .button:hover {background-color: #222; color: #eee}
-.files .frame {display: inline-block; width: 250px}
-.files .serverMessage {position: absolute; display: inline-block; width: 450px; bottom: 0; margin-bottom: 30px; background-color: rgba(255,255,255,0.8); font-size: 10px; padding: 7px 12px; opacity: 0;
-	-webkit-transition: all 0.2s;
-	-moz-transition: all 0.2s;
-	transition: all 0.2s;
-}
-.files .serverMessage b {font-size: 10px}
-
-.editor {position: absolute; display: inline-block; top: 0; left: 15px; width: 2400px}
-.editor .tabsBar {display: inline-block; height: 22px; width: 2400px; margin-top: 40px; padding-left: 41px; background-color: #888;}
-.tabsBar .tab {display: inline-block; display: none; background-image: url('../images/nav-bg.gif'); background-repeat: repeat-x; background-position: 0 0; padding: 5px 8px 2px 8px; font-size: 10px; border-left: solid 1px #fff; border-right: solid 1px #777; color: #fff; cursor: pointer;
-	-webkit-transition: all 0.15s;
-	-moz-transition: all 0.15s;
-	transition: all 0.15s;
-}
-.tabsBar .tab .closeTab {margin: 1px 0 0 5px; border-radius: 6px}
-.tabsBar .newTab {display: inline-block; background-image: url('../images/nav-bg.gif'); background-repeat: repeat-x; background-position: 0 0; padding: 6px 5px 1px 5px; border-left: solid 1px #fff; border-right: solid 1px #777; cursor: pointer;}
-.editor .findBar {display: inline-block; height: 28px; width: 2400px; color: #fff; background-color: #141414}
-.findBar .findReplace {position: absolute; z-index: 1}
-.findReplace select {position: relative; font-size: 10px; margin: 8px 2px 0 2px; top: -2px;}
-.findReplace .findText {display: inline-block; height: 21px; font-size: 10px; margin: 8px 2px 0 2px; margin-left: 43px}
-.findReplace .find {position: relative; width: 120px; height: 14px; border: 0; top: -2px; font-size: 10px; padding-left: 5px; margin-right: 3px}
-.findReplace .replaceAction {margin: 0 2px 0 0; top: -2px}
-.findReplace .replaceText {height: 21px; font-size: 10px; margin: 8px 2px 0 2px}
-.findReplace .replace {position: relative; width: 120px; height: 16px; border: 0; top: -2px; font-size: 10px; padding-left: 5px}
-.findReplace .targetText {height: 21px; font-size: 10px; margin: 8px 2px 0 2px}
-.findReplace .submit {position: relative; top: -2px; height: 17px; border: 1px solid #bbb; background-color: #f8f8f8; font-size: 10px; cursor: pointer}
-.findReplace .results {position: relative; display: inline-block; width: 200px; height: 20px; font-size: 10px; margin: 8px 0 0 20px}
-.findBar .codeAssist {position: fixed; display: inline-block; width: 100px; right: 74px; top: 70px; height: 21px; font-size: 10px; z-index: 1}
-.findBar .codeAssist input {margin-top: -1px}
-.findBar .goLine {position: fixed; display: inline-block; width: 100px; right: -10px; top: 70px; height: 21px; font-size: 10px; z-index: 1}
-.goLine .goToLine {width: 25px; height: 16px; border: 0; font-size: 10px; margin: -3px 0 0 3px}
-.editor .code {position: relative; display: inline-block; top: 28px; width: 600px; height: 600px; visibility: hidden}
-
-.footer {position: fixed; display: inline-block; width: 100%; height: 30px; bottom: 0; background-color: rgba(0,0,0,0.7); left: 0; z-index: 2}
-.footer .nesting {display: inline-block; padding: 5px 8px; margin: 4px 0 0 15px; font-weight: bold; font-size: 10px; color: #fff; background-color: #0b0}
-.footer .nestLoc {position: absolute; display: inline-block; width: 120px; padding: 5px 0 0 8px; margin-top: 3px; left: 112px; font-weight: bold; font-size: 12px; color: #fff; text-align: right}
-.footer .nestDisplay {position: absolute; display: inline-block; padding: 5px 0 0 8px; margin-top: 3px; left: 255px; font-size: 12px; color: #fff; text-align: right}
-.footer .charDisplay {position: absolute; display: inline-block; padding: 5px 0 0 8px; margin-top: 3px; left: 100%; font-weight: bold; font-size: 12px; color: #fff; text-align: right; width: 200px; text-align: right; margin-left: -220px}
-
-.textbox {box-shadow: inset 1px 1px 2px 0 rgba(0,0,0,0.4)}
-
-.fileMenu {position: absolute; display: none; left: 0; top: 0; background-color: #333; z-index: 10}
-.fileMenu a {display: block; padding: 2px 5px; background-color: #333; color: #eee; text-decoration: none}
-.fileMenu a:hover {background-color: #666}
-
-.screenContainer {position: absolute; display: table; width: 100%; height: 100%; top: 0; left: 0; text-align: center}
-.screenContainer .screenVCenter {#position: absolute; display: table-cell; #top: 50%; vertical-align: middle; text-align: center}
-.screenVCenter .screenCenter {#position: relative; #top: -50%; text-align: center; display: inline}
-.screenCenter .version {position: relative; display: block; margin: 5px 0 15px 0; font-size: 10px; color: #bbb}
-.screenCenter .accountPassword {border: 0; background-color: #333; color: #fff; height: 20px}
-.screenCenter .button {border: 0; background: #444; color: #eee; height: 22px; cursor: pointer}
-.screenCenter .button:hover {background-color: #333; color: #eee}
+/* First, reset everything to a standard */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	font-family: arial, verdana, helvetica, sans-serif;
+	border: 0;
+	margin: 0;
+	padding: 0;
+	outline: 0;
+	font-size: 12px;
+	vertical-align: top;
+}
+
+body {overflow: hidden;
+	-webkit-user-select: none;
+	-moz-user-select: none;
+	user-select: none;
+	background-color: #222;
+}
+
+h1 {font-size: 36px; font-weight: normal; color: #888; margin-bottom: 20px}
+h2 {font-size: 18px; font-weight: normal; color: #fff}
+
+.blackMask {position: fixed; display: table; width: 100%; height: 100%; top: 0; left: 0; visibility: hidden; background-color: rgba(0,0,0,0.8); text-align: center; z-index: 100}
+.blackMask .popupVCenter {#position: absolute; display: table-cell; #top: 50%; vertical-align: middle; text-align: center}
+.popupVCenter .popup {#position: relative; #top: -50%; text-align: center; color: #fff; font-size: 10px}
+.whiteGlow {box-shadow: 0 0 8px 2px rgba(255,255,255,0.6)}
+
+.circleOutside {background-color: rgba(0,0,0,0); border:5px solid rgba(0,183,229,0.9); opacity:.9; border-top:5px solid rgba(0,0,0,0); border-left:5px solid rgba(0,0,0,0); border-radius:50px; box-shadow: 0 0 35px #2187e7;
+	width:50px; height:50px; margin:0 auto; -moz-animation:spin .5s infinite linear; -webkit-animation:spin .5s infinite linear;
+}
+.circleInside {background-color: rgba(0,0,0,0); border:5px solid rgba(0,183,229,0.9); opacity:.9; border-top:5px solid rgba(0,0,0,0); border-left:5px solid rgba(0,0,0,0); border-radius:50px; box-shadow: 0 0 15px #2187e7;
+	width:30px; height:30px; margin:0 auto; position:relative; top:-50px; -moz-animation:spinoff .5s infinite linear; -webkit-animation:spinoff .5s infinite linear;
+}
+@-moz-keyframes spin {
+	0% {-moz-transform:rotate(0deg)}
+	100% {-moz-transform:rotate(360deg)}
+}
+@-moz-keyframes spinoff {
+	0% {-moz-transform:rotate(0deg)}
+	100% {-moz-transform:rotate(-360deg)}
+}
+@-webkit-keyframes spin {
+	0% {-webkit-transform:rotate(0deg)}
+	100% {-webkit-transform:rotate(360deg)}
+}
+@-webkit-keyframes spinoff {
+	0% {-webkit-transform:rotate(0deg)}
+	100% {-webkit-transform:rotate(-360deg)}
+}
+
+.progressBar {position:absolute; top: 0; left: 0; width:100%; height:1px; margin:2px 0; background:#2187e7; box-shadow:0 0 10px 1px rgba(0,198,255,0.7)}
+@-moz-keyframes fullexpand {
+	0%  {width:0}
+	100%{width:100%}	
+}
+@-webkit-keyframes fullexpand {
+	0%  {width:0}
+	100%{width:100%}	
+}
+
+.header {position: absolute; display: inline-block; top: 0; left: 0; width: 100%; height: 40px; background-color: #fff; text-align: right; z-index: 2}
+.header .plugins {position: absolute; display: inline-block; left: 15px; top: 3px}
+.header .plugins img {position: relative; display: inline-block; margin-right: 15px}
+.header .screenModeIcon {position: absolute; top: 5px; right: 178px; cursor: pointer}
+.header .version {position: relative; display: inline-block; margin-top: 25px; font-size: 10px; color: #bbb}
+.header .logo {position: relative; margin: 5px 10px 0 5px; cursor: pointer}
+
+.files {position: absolute; display: inline-block; top: 0; left: 0; height: 100%; width: 250px; background-color: #444; background-image: url('../images/files-arrow.png'); background-repeat: no-repeat; background-position: 100% 50%; overflow: hidden; z-index: 1;
+	box-shadow: 0 0 10px 4px rgba(0,0,0,0.4);
+}
+.files .account {display: inline-block; height: 50px; width: 250px; margin-top: 40px; background-color: #888}
+.files .accountOptions {position: relative; height: 32px; width: 100%; margin-left: 15px; margin-top: 8px}
+.files .accountOptions div {display: inline-block; background: url('../images/file-manager-icons.png') 0 0 no-repeat; cursor: pointer}
+.files .accountOptions .save {width: 30px; height: 32px; opacity: 0.3}
+.files .accountOptions .open {width: 25px; height: 32px; background-position: -32px -3px; margin: 3px 0 0 7px; opacity: 0.3}
+.files .accountOptions .newFile {width: 15px; height: 16px; background-position: -64px 0; margin: 8px 0 0 10px; opacity: 0.3}
+.files .accountOptions .newFolder {width: 20px; height: 16px; background-position: -80px 0; margin: 8px 0 0 5px; opacity: 0.3}
+.files .accountOptions .delete {width: 16px; height: 16px; background-position: -100px 0; margin: 8px 0 0 5px; opacity: 0.3}
+.files .accountOptions .rename {width: 16px; height: 16px; background-position: -116px 0; margin: 8px 0 0 5px; opacity: 0.3}
+.files .accountOptions .view {width: 16px; height: 16px; background-position: -132px 0; margin: 8px 0 0 5px; opacity: 0.3}
+.files .accountOptions .lock {position: relative; margin-left: 208px; margin-top: -27px; width: 12px; height: 16px; background-position: -64px -16px; z-index: 1}
+.files input:focus, .findReplace input:focus, .findReplace select:focus, .accountPassword:focus {outline: none; box-shadow: 0 0 10px 1px rgba(0,198,255,1)}
+.files .button {position: absolute; border: 0; background: #444; color: #eee; height:20px; margin-top: 16px; margin-left: 5px; font-size: 11px; cursor: pointer}
+.files .button:hover {background-color: #222; color: #eee}
+.files .frame {display: inline-block; width: 250px}
+.files .serverMessage {position: absolute; display: none; width: 450px; bottom: 0; margin-bottom: 30px; background-color: rgba(255,255,255,0.8); font-size: 10px; padding: 7px 12px; opacity: 0;
+	-webkit-transition: opacity 0.2s;
+	-moz-transition: opacity 0.2s;
+	transition: opacity 0.2s;
+}
+.files .serverMessage b {font-size: 10px}
+
+.editor {position: absolute; display: inline-block; top: 0; left: 15px; width: 2400px}
+.editor .tabsBar {display: inline-block; height: 22px; width: 2400px; margin-top: 40px; padding-left: 41px; background-color: #888;}
+.tabsBar .tab {display: none; background-image: url('../images/nav-bg.jpg'); background-repeat: repeat-x; background-position: 0 0; padding: 5px 8px 2px 8px; font-size: 10px; border-left: solid 1px #fff; border-right: solid 1px #777; color: #fff; direction: rtl; text-align: right; white-space: nowrap; overflow: hidden; cursor: pointer;
+	-webkit-transition: all 0.15s;
+	-moz-transition: all 0.15s;
+	transition: all 0.15s;
+}
+.tabsBar .tab .closeTab {margin: 1px 0 0 5px; border-radius: 6px}
+.tabsBar .newTab {display: inline-block; background-image: url('../images/nav-bg.jpg'); background-repeat: repeat-x; background-position: 0 0; padding: 6px 5px 5px 5px; border-left: solid 1px #fff; border-right: solid 1px #777; cursor: pointer;}
+.editor .findBar {display: inline-block; height: 28px; width: 2400px; color: #fff; background-color: #141414}
+.findBar .findReplace {position: absolute; z-index: 1}
+.findReplace select {position: relative; font-size: 10px; margin: 8px 2px 0 2px; top: -2px;}
+.findReplace .findText {display: inline-block; height: 21px; font-size: 10px; margin: 8px 2px 0 2px; margin-left: 43px}
+.findReplace .find {position: relative; width: 120px; height: 16px; border: 0; top: -3px; font-size: 10px; padding-left: 5px; margin-right: 3px}
+.findReplace .replaceAction {margin: 0 2px 0 0; top: -2px}
+.findReplace .replaceText {height: 21px; font-size: 10px; margin: 8px 2px 0 2px}
+.findReplace .replace {position: relative; width: 120px; height: 16px; border: 0; top: -3px; font-size: 10px; padding-left: 5px}
+.findReplace .targetText {height: 21px; font-size: 10px; margin: 8px 2px 0 2px}
+.findReplace .submit {position: relative; top: -2px; height: 17px; border: 0; background-color: #444; color: #eee; font-size: 10px; margin-left: 2px; cursor: pointer}
+.findReplace .submit:hover {background-color: #2187e7; color: #eee}
+.findReplace .results {position: relative; display: inline-block; width: 200px; height: 20px; font-size: 10px; margin: 8px 0 0 20px}
+.findBar .codeAssist {position: fixed; display: inline-block; width: 100px; right: 74px; top: 70px; height: 21px; font-size: 10px; z-index: 1}
+.findBar .codeAssist input {margin-top: -1px}
+.findBar .goLine {position: fixed; display: inline-block; width: 100px; right: -10px; top: 70px; height: 21px; font-size: 10px; z-index: 1}
+.goLine .goToLine {width: 25px; height: 16px; border: 0; font-size: 10px; margin: -3px 0 0 3px}
+.goLine .goToLine:focus {outline: none; box-shadow: 0 0 10px 1px rgba(0,198,255,1)}
+.editor .code {position: relative; display: inline-block; top: 28px; width: 600px; height: 600px; visibility: hidden}
+
+.footer {position: fixed; display: inline-block; width: 100%; height: 30px; bottom: 0; background-color: rgba(0,0,0,0.7); left: 0; z-index: 2}
+.footer .nesting {display: inline-block; padding: 5px 8px; margin: 4px 0 0 15px; font-weight: bold; font-size: 10px; color: #fff; background-color: #0b0}
+.footer .nestLoc {position: absolute; display: inline-block; width: 120px; padding: 5px 0 0 8px; margin-top: 2px; left: 112px; font-weight: bold; font-size: 12px; color: #fff; text-align: right}
+.footer .nestDisplay {position: absolute; display: inline-block; padding: 5px 0 0 8px; margin-top: 0px; left: 255px; font-size: 12px; color: #fff; text-align: right}
+.footer .charDisplay {position: absolute; display: inline-block; padding: 5px 0 0 8px; margin-top: 3px; left: 100%; font-weight: bold; font-size: 12px; color: #fff; text-align: right; width: 200px; text-align: right; margin-left: -220px}
+
+.textbox {box-shadow: inset 1px 1px 2px 0 rgba(0,0,0,0.4)}
+
+.fileMenu {position: absolute; display: none; left: 0; top: 0; background-color: #333; z-index: 10}
+.fileMenu a {display: block; padding: 2px 5px; background-color: #333; color: #eee; text-decoration: none}
+.fileMenu a:hover {background-color: #666}
+
+.screenContainer {position: absolute; display: table; width: 100%; height: 100%; top: 0; left: 0; text-align: center}
+.screenContainer .screenVCenter {#position: absolute; display: table-cell; #top: 50%; vertical-align: middle; text-align: center}
+.screenVCenter .screenCenter {#position: relative; #top: -50%; text-align: center; display: inline}
+.screenCenter .version {position: relative; display: block; margin: 5px 0 15px 0; font-size: 10px; color: #bbb}
+.screenCenter .accountPassword {border: 0; background-color: #333; color: #fff; height: 20px}
+.screenCenter .button {border: 0; background: #444; color: #eee; height: 22px; cursor: pointer}
+.screenCenter .button:hover {background: #2187e7; color: #eee}

lib/multiple-results.php

@@ -1,126 +1,217 @@
-<?php include("settings.php");?>
-<!DOCTYPE html>
-
-<html>
-<head>
-<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> multiple results screen</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel="stylesheet" type="text/css" href="multiple-results.css">
-</head>
-
-<body class="results">
-
-<h1 id="title"></h1>
-<div class="resultsPane">
-	<div id="results"></div>
-</div>
-<?php if (isset($_GET['replace'])) { ?>
-<div class="replaceAll" id="replaceAll" onClick="<?php echo isset($_GET['target']) ? 'renameAll()' : 'replaceAll()';?>" style="opacity: 0.1"><?php echo isset($_GET['target']) ? 'rename all' : 'replace all';?></div>
-<?php ;}; ?>
-
-<script>
-var resultsDisplay = "";
-var foundArray = [];
-foundInSelected = false;
-userTarget = top.document.findAndReplace.target.value;
-<?php
-// Find in open docs?
-if (!isset($_GET['target'])) {
-$targetName = "document";
-?>
-var startTab = top.ICEcoder.selectedTab;
-var rExp = new RegExp("<?php echo strClean($_GET['find']); ?>","g");
-for (var i=1;i<=top.ICEcoder.openFiles.length;i++) {
-	top.ICEcoder.switchTab(i);
-	var cM = top.ICEcoder.getcMInstance();
-	var content = cM.getValue();
-	if (content.match(rExp)) {
-		resultsDisplay += '<a href="javascript:gotoTab('+i+')">'+ top.ICEcoder.openFiles[i-1]+ '</a><br><div id="foundCount'+i+'">Found '+content.match(rExp).length+' times</div>';
-		<?php if (isset($_GET['replace'])) { ?>
-		resultsDisplay += '<div class="replace" id="replace" onClick="replaceSingle('+i+');this.style.display=\'none\'">replace</div>';
-		<?php ;}; ?>
-		resultsDisplay += '<hr>';
-		foundArray.push(i);
-	}
-}
-if (startTab!=top.ICEcoder.selectedTab) {
-	top.ICEcoder.switchTab(startTab);
-}
-<?php
-// Find in files or filenames
-} else {
-$targetName = "file/folder";
-?>
-	var spansArray = top.ICEcoder.filesFrame.contentWindow.document.getElementsByTagName('span');
-	for (var i=0;i<spansArray.length;i++) {
-		targetURL = spansArray[i].id.replace(/\|/g,"/");
-		if (targetURL.indexOf('<?php echo strClean($_GET['find']); ?>')>-1 && targetURL.indexOf('_perms')>-1) {
-			if (userTarget.indexOf("selected")>-1) {
-				for (var j=0;j<top.ICEcoder.selectedFiles.length;j++) {
-					if (top.ICEcoder.selectedFiles[j].indexOf(targetURL.replace(/\//g,"|").replace(/_perms/g,""))>-1) {
-						foundInSelected = true;
-					}
-				}
-			}
-			if (userTarget.indexOf("all")>-1 || (userTarget.indexOf("selected")>-1 && foundInSelected)) {
-				resultsDisplay += '<a href="javascript:top.ICEcoder.openFile(\'<?php echo $docRoot;?>'+targetURL.replace(/\|/g,"/").replace(/_perms/g,"")+'\');top.ICEcoder.showHide(\'hide\',top.document.getElementById(\'blackMask\'))">'+ targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",strClean($_GET['find'])); ?>/g,"<b><?php echo strClean($_GET['find']); ?></b>")+ '</a><br><div id="foundCount'+i+'">'+spansArray[i].innerHTML+', rename to '+targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",strClean($_GET['find'])); ?>/g,"<b><?php echo strClean($_GET['replace']);?></b>")+'</div>';
-				<?php if (isset($_GET['replace'])) { ?>
-				resultsDisplay += '<div class="replace" id="replace" onClick="renameSingle('+i+');this.style.display=\'none\'">rename</div>';
-				<?php ;}; ?>
-				resultsDisplay += '<hr>';
-				foundArray.push(i);
-			}
-		}
-	}
-<?php
-;}
-?>
-foundArray.length==0 ? showHide = "hide" : showHide = "show";
-top.ICEcoder.showHide(showHide,top.document.getElementById('blackMask'));
-if (foundArray.length==0) {top.ICEcoder.message('No matches found')};
-<?php if (isset($_GET['replace'])) { ?>
-if (foundArray.length!=0) {document.getElementById('replaceAll').style.opacity = 1};
-<?php ;}; ?>
-foundArray.length >= 2 ? plural = "s" : plural = "";
-targetName = "<?php echo $targetName;?>";
-foundInSelected ? selectedText = "selected " : selectedText = "";
-document.getElementById('title').innerHTML = "'<?php echo strClean($_GET['find']); ?>' found in "+foundArray.length+" "+selectedText+targetName+plural;
-document.getElementById('results').innerHTML = resultsDisplay;
-
-var gotoTab = function(tab) {
-	top.ICEcoder.switchTab(tab);
-	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
-}
-
-var replaceSingle = function(tab) {
-	top.ICEcoder.switchTab(tab);
-	cM = top.ICEcoder.getcMInstance();
-	content = cM.getValue();
-	cM.setValue(cM.getValue().replace(rExp,top.document.getElementById('replace').value));
-	document.getElementById('foundCount'+tab).innerHTML = document.getElementById('foundCount'+tab).innerHTML.replace('Found','Replaced');
-}
-
-var replaceAll = function() {
-	for (var i=0;i<=foundArray.length-1;i++) {
-		replaceSingle(foundArray[i]);
-	}
-	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
-}
-
-var renameSingle = function(arrayRef) {
-	fileRef = spansArray[arrayRef].id.replace(/\|/g,"/").replace(/_perms/g,"");
-	newName = spansArray[arrayRef].id.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",strClean($_GET['find'])); ?>/g,"<?php echo strClean($_GET['replace']); ?>");
-	top.ICEcoder.renameFile(fileRef,newName);
-}
-
-var renameAll = function() {
-	for (var i=0;i<=foundArray.length-1;i++) {
-		renameSingle(foundArray[i]);
-	}
-	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
-}
-</script>
-
-</body>
-
+<?php include("settings.php");?>
+<?php
+	if(isset($_GET['selectedFiles'])) {
+		$selectedFiles=explode(":",strClean($_GET['selectedFiles']));
+		echo $selectedFiles[0].".....".$selectedFiles[1];
+	}
+?>
+<!DOCTYPE html>
+
+<html>
+<head>
+<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> multiple results screen</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="robots" content="noindex, nofollow">
+<link rel="stylesheet" type="text/css" href="multiple-results.css">
+</head>
+
+<body class="results" onLoad="top.document.getElementById('loadingMask').style.visibility = 'hidden'">
+
+<h1 id="title"></h1>
+<div class="resultsPane" id="resultsPane">
+	<div id="results"></div>
+</div>
+<?php if (isset($_GET['replace'])) { ?>
+	<div class="replaceAll" id="replaceAll" onClick="<?php
+	if (isset($_GET['target']) && strpos($_GET['target'],"filenames")) {
+		echo 'renameAll()';
+	} else if (isset($_GET['target']) && strpos($_GET['target'],"files")) {
+		echo 'replaceInFilesAll()';
+	} else {
+		echo 'replaceAll()';
+	}
+	?>" style="opacity: 0.1"><?php echo isset($_GET['target']) && strpos($_GET['target'],"filenames") ? 'rename all' : 'replace all';?></div>
+<?php ;}; ?>
+
+<script>
+<?php if (!isset($_GET['replace'])) { ?>
+	document.getElementById('resultsPane').style.height = "380px";
+<?php ;}; ?>
+var resultsDisplay = "";
+var foundArray = [];
+foundInSelected = false;
+userTarget = top.document.findAndReplace.target.value;
+findText = top.findAndReplace.find.value.toLowerCase();
+<?php
+$findText = str_replace("ICEcoder:","",str_replace("&#39;","\'",$_GET['find']));
+// Find in open docs?
+if (!isset($_GET['target'])) {
+$targetName = "document";
+?>
+var startTab = top.ICEcoder.selectedTab;
+var rExp = new RegExp(findText,"gi");
+for (var i=1;i<=top.ICEcoder.openFiles.length;i++) {
+	top.ICEcoder.switchTab(i);
+	var cM = top.ICEcoder.getcMInstance();
+	var content = cM.getValue();
+	if (content.match(rExp)) {
+		resultsDisplay += '<a href="javascript:gotoTab('+i+')">'+ top.ICEcoder.openFiles[i-1]+ '</a><br><div id="foundCount'+i+'">Found '+content.match(rExp).length+' times</div>';
+		<?php if (isset($_GET['replace'])) { ?>
+		resultsDisplay += '<div class="replace" id="replace" onClick="replaceSingle('+i+');this.style.display=\'none\'">replace</div>';
+		<?php ;}; ?>
+		resultsDisplay += '<hr>';
+		foundArray.push(i);
+	}
+}
+if (startTab!=top.ICEcoder.selectedTab) {
+	top.ICEcoder.switchTab(startTab);
+}
+<?php
+// Find in files or filenames
+} else {
+	if (strpos($_GET['target'],"filenames")>0) {
+	$targetName = "file/folder";
+?>
+		var spansArray = top.ICEcoder.filesFrame.contentWindow.document.getElementsByTagName('span');
+		for (var i=0;i<spansArray.length;i++) {
+			foundInSelected = false;
+			targetURL = spansArray[i].id.replace(/\|/g,"/").toLowerCase();
+			if (	targetURL.lastIndexOf(findText.toLowerCase()) > targetURL.lastIndexOf("/") 
+				&& targetURL.indexOf(findText.toLowerCase())>-1 && targetURL.indexOf('_perms')>-1) {
+				if (userTarget.indexOf("selected")>-1) {
+					for (var j=0;j<top.ICEcoder.selectedFiles.length;j++) {
+						if (
+							targetURL.replace(/\//g,"|").indexOf(top.ICEcoder.selectedFiles[j].replace(/\//g,"|").replace(/_perms/g,""))==0
+							&& (
+								targetURL.replace(/\|/g,"/").replace(/_perms/g,"")==top.ICEcoder.selectedFiles[j].replace(/\|/g,"/").replace(/_perms/g,"")
+								||
+								(targetURL.replace(/\|/g,"/").split("/").length > top.ICEcoder.selectedFiles[j].replace(/\|/g,"/").split("/").length && targetURL.charAt(top.ICEcoder.selectedFiles[j].length)=="/"))) {
+							foundInSelected = true;
+						}
+					}
+				}
+				if (userTarget.indexOf("all")>-1 || (userTarget.indexOf("selected")>-1 && foundInSelected)) {
+					resultsDisplay += '<a href="javascript:top.ICEcoder.openFile(\'<?php echo $docRoot;?>'+targetURL.replace(/\|/g,"/").replace(/_perms/g,"")+'\');top.ICEcoder.showHide(\'hide\',top.document.getElementById(\'blackMask\'))">';
+					resultsDisplay += targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",strtolower($findText)); ?>/g,"<b>"+findText.toLowerCase()+"</b>");
+					resultsDisplay += '</a><br>';
+					<?php if (!isset($_GET['replace'])) { ?>
+						resultsDisplay += '<div id="foundCount'+i+'">'+spansArray[i].innerHTML+'</div>';
+					<?php ;} else { ?>
+						resultsDisplay += '<div id="foundCount'+i+'">'+spansArray[i].innerHTML+', rename to '+targetURL.replace(/\|/g,"/").replace(/_perms/g,"").replace(/<?php echo str_replace("/","\/",strtolower($findText)); ?>/g,"<b><?php if(isset($_GET['replace'])) {echo strtolower(strClean($_GET['replace']));};?></b>")+'</div>';
+					<?php
+					;};
+					if (isset($_GET['replace'])) { ?>
+					resultsDisplay += '<div class="replace" id="replace" onClick="renameSingle('+i+');this.style.display=\'none\'">rename</div>';
+					<?php ;}; ?>
+					resultsDisplay += '<hr>';
+					foundArray.push(i);
+				}
+			}
+		}
+<?php
+	} else {
+	$targetName = "file";
+	$r = 0;
+	function phpGrep($q, $path, $base) {
+		$fp = opendir($path);
+		global $r, $ICEcoder, $serverType, $selectedFiles;
+		if (!isset($ret)) {$ret="";};
+		$slash = $serverType == "Windows" ? "\\" : "/";
+		while($f = readdir($fp)) {
+			if(preg_match("#^\.+$#", $f)) continue;
+			$fullPath = $path.$slash.$f;
+			if(is_dir($fullPath)) {
+				$ret .= phpGrep($q, $fullPath, $base);
+			} else if(stristr(file_get_contents($fullPath), $q)) {
+				$bFile = false;
+				for ($i=0;$i<count($ICEcoder['bannedFiles']);$i++) {
+					if (strpos($f,$ICEcoder['bannedFiles'][$i])>0) {$bFile = true;};
+				}
+				$findPath = str_replace($base,"",$fullPath);
+				for ($i=0;$i<count($selectedFiles);$i++) {
+					if (strpos($findPath,str_replace("|","/",$selectedFiles[$i]))!==0) {
+						$bFile = true;
+					}
+				}
+				if (!$bFile) {
+					$ret .= "<a href=\\\"javascript:top.ICEcoder.openFile('".$fullPath."');top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'))\\\">";
+					$ret .= str_replace($base,"",$fullPath)."</a><div id=\\\"foundCount".$r."\\\">Found ".substr_count(strtolower(file_get_contents($fullPath)),$q)." times</div>";
+					if (isset($_GET['replace'])) {
+						$ret .= "<div class=\\\"replace\\\" id=\\\"replace\\\" onClick=\\\"replaceInFileSingle('".$fullPath."');this.style.display=\'none\'\\\">replace</div>";
+					};
+					$ret .= '<hr>';
+					echo 'foundArray.push("'.$fullPath.'");';
+					$r++;
+				}
+			}
+		}
+		return $ret;
+	}
+
+	$results = phpGrep($findText, $docRoot.$iceRoot, $docRoot.$iceRoot);
+	echo 'resultsDisplay += "'.$results.'";';
+?>
+<?php
+	}
+}
+?>
+showHide = foundArray.length==0 ? "hide" : "show";
+top.ICEcoder.showHide(showHide,top.document.getElementById('blackMask'));
+if (foundArray.length==0) {top.ICEcoder.message('No matches found')};
+<?php if (isset($_GET['replace'])) { ?>
+if (foundArray.length!=0) {document.getElementById('replaceAll').style.opacity = 1};
+<?php ;}; ?>
+plural = foundArray.length >= 2 ? "s" : "";
+targetName = "<?php echo $targetName;?>";
+selectedText = foundInSelected ? "selected " : "";
+document.getElementById('title').innerHTML = findText.replace(/&/g,"&amp;").replace(/>/g,"&gt;").replace(/</g,"&lt;").replace(/"/g,"&quot;").replace(/'/g,"&apos;")+" found in "+foundArray.length+" "+selectedText+targetName+plural;
+document.getElementById('results').innerHTML = resultsDisplay;
+
+var gotoTab = function(tab) {
+	top.ICEcoder.switchTab(tab);
+	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
+}
+
+var replaceSingle = function(tab) {
+	top.ICEcoder.switchTab(tab);
+	cM = top.ICEcoder.getcMInstance();
+	content = cM.getValue();
+	cM.setValue(cM.getValue().replace(rExp,top.document.getElementById('replace').value));
+	document.getElementById('foundCount'+tab).innerHTML = document.getElementById('foundCount'+tab).innerHTML.replace('Found','Replaced');
+}
+
+var replaceAll = function() {
+	for (var i=0;i<=foundArray.length-1;i++) {
+		replaceSingle(foundArray[i]);
+	}
+	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
+}
+
+var replaceInFileSingle = function(fileRef) {
+	top.ICEcoder.replaceInFile(fileRef,findText,'<?php if(isset($_GET['replace'])) {echo strClean($_GET['replace']);}; ?>');
+}
+
+var replaceInFilesAll = function() {
+	for (var i=0;i<=foundArray.length-1;i++) {
+		replaceInFileSingle(foundArray[i]);
+	}
+	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
+}
+
+var renameSingle = function(arrayRef) {
+	fileRef = spansArray[arrayRef].id.replace(/\|/g,"/").replace(/_perms/g,"");
+	newName = spansArray[arrayRef].id.replace(/\|/g,"/").replace(/_perms/g,"").replace(find,"<?php if(isset($_GET['replace'])) {echo strClean($_GET['replace']);}; ?>");
+	top.ICEcoder.renameFile(fileRef,newName);
+}
+
+var renameAll = function() {
+	for (var i=0;i<=foundArray.length-1;i++) {
+		renameSingle(foundArray[i]);
+	}
+	top.ICEcoder.showHide('hide',top.document.getElementById('blackMask'));
+}
+</script>
+
+</body>
+
 </html>

lib/properties.php

@@ -1,159 +1,148 @@
-<?php include("settings.php");?>
-<!DOCTYPE html>
-
-<html onContextMenu="return false">
-<head>
-<title>ICE Coder - <?php echo $ICEcoder["versionNo"];?> :: File/Folder Properties</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel="stylesheet" type="text/css" href="file-folder-properties.css">
-</head>
-
-<body class="properties">
-
-<h1 id="title">properties</h1>
-
-<?php
-$fileName=$docRoot.$iceRoot.str_replace("|","/",strClean($_GET['fileName']));
-?>
-<h2><?php echo basename($fileName); ?></h2><br>
-<span class="column" style="width: 180px">Size: <?php
-$bytes = filesize($fileName);
-// If it's a dir, get the dir size
-if (is_dir($fileName)) {
-	$io = popen('/usr/bin/du -sb '.$fileName, 'r');
-	$bytes = intval(fgets($io,80));
-	pclose($io);
-}
-// Change into kilobytes
-$outputSize = ($bytes/1024);
-$outputUnit = "kb";
-// Maybe we should show in megabytes?
-if ($outputSize >= 1024) {
-	$outputSize = ($outputSize/1024);
-	$outputUnit = "mb";
-}
-echo number_format($outputSize, 2, '.', '').$outputUnit." (".number_format($bytes)." bytes)";
-?></span>
-<span class="column" style="margin: 0 10px">Modified: <?php echo date( "D d M Y g:i:sa", filemtime($fileName)); ?></span>
-<span class="column">Last access: <?php echo date( "D d M Y g:i:sa", fileatime($fileName)); ?></span>
-<br><br>
-<span class="column" style="width: 180px">Type: <?php echo is_dir($fileName) ? "Folder" : "File"; ?></span>
-<span class="column" style="margin: 0 10px">Readable / Writeable: <?php
-if ($_SESSION['userLevel'] == 10) {
-	echo is_readable($fileName) ? "Yes" : "No"; ?> / <?php echo is_writeable($fileName) ? "Yes" : "No";
-} else {
-	echo '[HIDDEN]';
-}
-?></span>
-<span class="column">Relative path: <?php echo str_replace($docRoot,"",$fileName);?></span>
-<span style="font-size:10px">
-<br><br>
-Absolute path:<br><?php
-echo $_SESSION['userLevel'] == 10 ? $fileName : '[HIDDEN]';
-?>
-<br><br>
-</span>
-<span class="column" style="width: 180px">
-Permissions:
-<?
-$chmodInfo = substr(sprintf('%o', fileperms($fileName)), -4);
-echo $chmodInfo;
-?>
-</span>
-<span class="column" style="margin: 0 10px">
-<?php
-$perms = str_split(substr($chmodInfo,1,3)); // reduces 0705 down to 705
-$readVars  = array(4,5,6,7);
-$writeVars = array(2,3,6,7);
-$execVars  = array(1,3,5,7);
-?>
-<table>
-<tr><th>Owner</th><th>Group</th><th>Public</th></tr>
-<tr>
-<td><input type="checkbox" name="ownerR" id="owner4"<?php if(in_array($perms[0],$readVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Read</td>
-<td><input type="checkbox" name="groupR" id="group4"<?php if(in_array($perms[1],$readVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Read</td>
-<td><input type="checkbox" name="publicR" id="public4"<?php if(in_array($perms[2],$readVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Read</td>
-</tr>
-<tr>
-<td><input type="checkbox" name="ownerW" id="owner2"<?php if(in_array($perms[0],$writeVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Write</td>
-<td><input type="checkbox" name="groupW" id="group2"<?php if(in_array($perms[1],$writeVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Write</td>
-<td><input type="checkbox" name="publicW" id="public2"<?php if(in_array($perms[2],$writeVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Write</td>
-</tr>
-<tr>
-<td><input type="checkbox" name="ownerE" id="owner1"<?php if(in_array($perms[0],$execVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Execute</td>
-<td><input type="checkbox" name="groupE" id="group1"<?php if(in_array($perms[1],$execVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Execute</td>
-<td><input type="checkbox" name="publicE" id="public1"<?php if(in_array($perms[2],$execVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Execute</td>
-</tr>
-</table>
-</span>
-<span class="column">
-Change to:<br>
-<form name="chmod" action="#" method="GET">
-<input type="text" name="chmod" id="permText" style="width: 30px; border: 0; background-color: #444; font-size: 10px; color: #fff" maxlength="3" value="<?php echo substr($chmodInfo,1,3); ?>" onKeyUp="changePerms(this.value);showButton()" onChange="changePerms(this.value);showButton()">
-</form>
-</span>
-
-<div class="update" id="updateButton" onClick="validatePerms()">update</div>
-
-<script>
-readVars   = [4,5,6,7];
-writeVars  = [2,3,6,7];
-execVars   = [1,3,5,7];
-permGroups = ['owner','group','public'];
-permValues = [4,2,1];
-permTypes  = ['read','write','exec'];
-
-function changePerms(val) {
-	var permText = document.getElementById('permText').value;
-	// change checkboxes
-	if (val) {
-		// set values
-		if (permText.length==3) {
-			for (var i=0;i<=2;i++) {
-				for (var j=0;j<=2;j++) {
-				document.getElementById(permGroups[i]+permValues[j]).checked = window[permTypes[j]+'Vars'].indexOf(permText.split("")[i]*1)>-1;
-				}
-			}
-		// clear values
-		} else {
-			for (var i=0;i<=2;i++) {
-				for (var j=0;j<=2;j++) {
-					document.getElementById(permGroups[i]+permValues[j]).checked  = false;
-				}
-			}
-		}
-	// change text value
-	} else {
-		ownerPerms = (document.getElementById('owner4').checked*4)+(document.getElementById('owner2').checked*2)+(document.getElementById('owner1').checked*1);
-		groupPerms = (document.getElementById('group4').checked*4)+(document.getElementById('group2').checked*2)+(document.getElementById('group1').checked*1);
-		publicPerms = (document.getElementById('public4').checked*4)+(document.getElementById('public2').checked*2)+(document.getElementById('public1').checked*1);
-		document.getElementById('permText').value = ownerPerms.toString() + groupPerms.toString() + publicPerms.toString();
-	}
-}
-
-var showButton = function() {
-	document.getElementById('updateButton').style.opacity = 1;
-}
-
-var validatePerms = function() {
-	var permText = document.getElementById('permText').value;
-	canUpdate = true;
-	if (permText.length!=3 || isNaN(permText)) {canUpdate = false};
-	if (	permText.split("")[0]*1 <0 || permText.split("")[0]*1 >7 ||
-		permText.split("")[1]*1 <0 || permText.split("")[1]*1 >7 ||
-		permText.split("")[2]*1 <0 || permText.split("")[2]*1 >7) {
-		canUpdate = false;
-	}
-	<?php
-	if ($_SESSION['userLevel'] == 10) {
-	?>
-	if (canUpdate) {top.ICEcoder.chmod('<?php echo str_replace($docRoot,"",$fileName);?>',permText)};
-	<?php
-	;};
-	?>
-}
-</script>
-
-</body>
-
+<?php include("settings.php");?>
+<!DOCTYPE html>
+
+<html onContextMenu="return false">
+<head>
+<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> file/folder properties</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="robots" content="noindex, nofollow">
+<link rel="stylesheet" type="text/css" href="properties.css">
+</head>
+
+<body class="properties">
+
+<h1 id="title">properties</h1>
+
+<?php
+$fileName=$docRoot.$iceRoot.str_replace("|","/",strClean($_GET['fileName']));
+?>
+<h2><?php echo basename($fileName); ?></h2><br>
+<span class="column" style="width: 180px">Size: <?php
+$bytes = filesize($fileName);
+// If it's a dir, get the dir size
+if (is_dir($fileName)) {
+	$io = popen('/usr/bin/du -sb '.$fileName, 'r');
+	$bytes = intval(fgets($io,80));
+	pclose($io);
+}
+// Change into kilobytes
+$outputSize = ($bytes/1024);
+$outputUnit = "kb";
+// Maybe we should show in megabytes?
+if ($outputSize >= 1024) {
+	$outputSize = ($outputSize/1024);
+	$outputUnit = "mb";
+}
+echo number_format($outputSize, 2, '.', '').$outputUnit." (".number_format($bytes)." bytes)";
+?></span>
+<span class="column" style="margin: 0 10px">Modified: <?php echo date( "D d M Y g:i:sa", filemtime($fileName)); ?></span>
+<span class="column">Last access: <?php echo date( "D d M Y g:i:sa", fileatime($fileName)); ?></span>
+<br><br>
+<span class="column" style="width: 180px">Type: <?php echo is_dir($fileName) ? "Folder" : "File"; ?></span>
+<span class="column" style="margin: 0 10px">Readable / Writeable: 
+<?php echo is_readable($fileName) ? "Yes" : "No"; ?> / <?php echo is_writeable($fileName) ? "Yes" : "No";?>
+</span>
+<span class="column">Relative path: <?php echo str_replace($docRoot,"",$fileName);?></span>
+<span style="font-size:10px">
+<br><br>
+Absolute path:<br><?php echo $fileName;?>
+<br><br>
+</span>
+<span class="column" style="width: 180px">
+Permissions:
+<?php
+$chmodInfo = substr(sprintf('%o', fileperms($fileName)), -4);
+echo $chmodInfo;
+?>
+</span>
+<span class="column" style="margin: 0 10px">
+<?php
+$perms = str_split(substr($chmodInfo,1,3)); // reduces 0705 down to 705
+$readVars  = array(4,5,6,7);
+$writeVars = array(2,3,6,7);
+$execVars  = array(1,3,5,7);
+?>
+<table>
+<tr><th>Owner</th><th>Group</th><th>Public</th></tr>
+<tr>
+<td><input type="checkbox" name="ownerR" id="owner4"<?php if(in_array($perms[0],$readVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Read</td>
+<td><input type="checkbox" name="groupR" id="group4"<?php if(in_array($perms[1],$readVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Read</td>
+<td><input type="checkbox" name="publicR" id="public4"<?php if(in_array($perms[2],$readVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Read</td>
+</tr>
+<tr>
+<td><input type="checkbox" name="ownerW" id="owner2"<?php if(in_array($perms[0],$writeVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Write</td>
+<td><input type="checkbox" name="groupW" id="group2"<?php if(in_array($perms[1],$writeVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Write</td>
+<td><input type="checkbox" name="publicW" id="public2"<?php if(in_array($perms[2],$writeVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Write</td>
+</tr>
+<tr>
+<td><input type="checkbox" name="ownerE" id="owner1"<?php if(in_array($perms[0],$execVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Execute</td>
+<td><input type="checkbox" name="groupE" id="group1"<?php if(in_array($perms[1],$execVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Execute</td>
+<td><input type="checkbox" name="publicE" id="public1"<?php if(in_array($perms[2],$execVars)!="") {echo ' checked';};?> onClick="changePerms();showButton()"> Execute</td>
+</tr>
+</table>
+</span>
+<span class="column">
+Change to:<br>
+<form name="chmod" action="#" method="GET">
+<input type="text" name="chmod" id="permText" style="width: 30px; border: 0; background-color: #444; font-size: 10px; color: #fff" maxlength="3" value="<?php echo substr($chmodInfo,1,3); ?>" onKeyUp="changePerms(this.value);showButton()" onChange="changePerms(this.value);showButton()">
+</form>
+</span>
+
+<div class="update" id="updateButton" onClick="validatePerms()">update</div>
+
+<script>
+readVars   = [4,5,6,7];
+writeVars  = [2,3,6,7];
+execVars   = [1,3,5,7];
+permGroups = ['owner','group','public'];
+permValues = [4,2,1];
+permTypes  = ['read','write','exec'];
+
+function changePerms(val) {
+	var permText = document.getElementById('permText').value;
+	// change checkboxes
+	if (val) {
+		// set values
+		if (permText.length==3) {
+			for (var i=0;i<=2;i++) {
+				for (var j=0;j<=2;j++) {
+				document.getElementById(permGroups[i]+permValues[j]).checked = window[permTypes[j]+'Vars'].indexOf(permText.split("")[i]*1)>-1;
+				}
+			}
+		// clear values
+		} else {
+			for (var i=0;i<=2;i++) {
+				for (var j=0;j<=2;j++) {
+					document.getElementById(permGroups[i]+permValues[j]).checked  = false;
+				}
+			}
+		}
+	// change text value
+	} else {
+		ownerPerms = (document.getElementById('owner4').checked*4)+(document.getElementById('owner2').checked*2)+(document.getElementById('owner1').checked*1);
+		groupPerms = (document.getElementById('group4').checked*4)+(document.getElementById('group2').checked*2)+(document.getElementById('group1').checked*1);
+		publicPerms = (document.getElementById('public4').checked*4)+(document.getElementById('public2').checked*2)+(document.getElementById('public1').checked*1);
+		document.getElementById('permText').value = ownerPerms.toString() + groupPerms.toString() + publicPerms.toString();
+	}
+}
+
+var showButton = function() {
+	document.getElementById('updateButton').style.opacity = 1;
+}
+
+var validatePerms = function() {
+	var permText = document.getElementById('permText').value;
+	canUpdate = true;
+	if (permText.length!=3 || isNaN(permText)) {canUpdate = false};
+	if (	permText.split("")[0]*1 <0 || permText.split("")[0]*1 >7 ||
+		permText.split("")[1]*1 <0 || permText.split("")[1]*1 >7 ||
+		permText.split("")[2]*1 <0 || permText.split("")[2]*1 >7) {
+		canUpdate = false;
+	}
+	if (canUpdate) {top.ICEcoder.chmod('<?php echo str_replace($docRoot,"",$fileName);?>',permText)};
+}
+</script>
+
+</body>
+
 </html>

lib/settings-screen.php

@@ -1,223 +1,227 @@
-<?php include("settings.php");?>
-
-<!DOCTYPE html>
-
-<html>
-<head>
-<title>ICEcoder settings screen</title>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
-<link rel="stylesheet" type="text/css" href="settings-screen.css">
-<link rel="stylesheet" href="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror.css">
-<script src="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js"></script>
-
-<style type="text/css">
-.CodeMirror {position: absolute; width: 0; background-color: #fff; font-family: monospace; width: 420px}
-.CodeMirror-scroll {height: 240px; overflow: hidden}
-/* Make sure this next one remains the 3rd item, updated with JS */
-.cm-tab:after {position: relative; display: inline-block; width: 0; left: -1.4em; overflow: visible; color: #aaa; content: "<?php if($ICEcoder["visibleTabs"]) {echo '\21e5';};?>";}
-</style>
-
-<link rel="stylesheet" href="editor.css">
-<?php
-$themeArray = array("ambiance","blackboard","cobalt","eclipse","elegant","erlang-dark","lesser-dark","monokai","neat","night","rubyblue","vibrant-ink","xq-dark");
-for ($i=0;$i<count($themeArray)-1;$i++) {
-	echo '<link rel="stylesheet" href="../'.$ICEcoder["codeMirrorDir"].'/theme/'.$themeArray[$i].'.css">'.PHP_EOL;
-}
-?>
-</head>
-
-<body class="settings">
-
-<div class="infoPane">
-	<img src="../images/ice-coder.png" class="logo">
-	<div class="version"><?php echo $ICEcoder["versionNo"];?></div>
-
-	<p>
-	git:<br>
-	<a href="http://github.com/mattpass/ICEcoder" target="_blank">http://github.com/mattpass/ICEcoder</a>
-	<br><br>
-
-	codemirror dir:<br>
-	<?php echo $ICEcoder["codeMirrorDir"]; ?>
-	<br><br>
-
-	codemirror version:<br>
-	<?php echo $ICEcoder["cMThisVer"]; ?>
-	<br><br>
-
-	file manager root:<br>
-	<?php echo $_SESSION['userLevel']==10 ? $ICEcoder['root'] : '[HIDDEN]';?>
-	<br><br><br><br>
-
-	<div style="font-size: 10px; line-height: 12px">ICE coder by Matt Pass (<a href="http://www.twitter.com/mattpass" style="font-size: 10px" target="_blank">@mattpass</a>)<br><br>
-		Free to use it for your own purposes, commercial or not, just let me know of any cool uses or customisations. :)<br><br>
-		No warranty or liability accepted for anything, all responsibility of use is your own.<br><br>
-
-		Thanks go to the following people who have inspired me to create this and in the odd case, provided feedback or code:<br>
-		<?php
-			$peopleArray = array("marijnjh", "maettig", "wimtibackx", "jakubvrana", "_higg_", "yandle", "davidwalshblog", "kuvos", "mathias", "rem");
-			for ($i=0;$i<count($peopleArray)-1;$i++) {
-				echo '<a href="http://www.twitter.com/'.$peopleArray[$i].'" style="font-size: 10px" target="_blank">@'.$peopleArray[$i].'</a>';
-				if ($i<count($peopleArray)-2) {
-					echo ", ";
-				}
-			}			
-		?>
-		
-	</div>
-	</p>
-</div>
-
-<form name="settings" action="settings.php" method="POST">
-<div class="settingsColumn1">
-<h1>settings</h1>
-<h2>functionality</h2>
-<input type="checkbox" onclick="showButton()" name="tabsIndent" value="true"<?php if($ICEcoder["tabsIndent"]) {echo ' checked';};?>> tab indents selection<br>
-<input type="checkbox" onclick="showButton()" name="checkUpdates" value="true"<?php if($ICEcoder["checkUpdates"]) {echo ' checked';};?>> check for updates on load<br>
-<input type="checkbox" onclick="showButton()" name="openLastFiles" value="true"<?php if($ICEcoder["openLastFiles"]) {echo ' checked';};?>> auto open last files on login<br>
-<br>
-when finding in files, exclude:<br>
-<input type="text" onkeydown="showButton()" name="findFilesExclude" value="<?php for($i=0;$i<=count($ICEcoder["findFilesExclude"])-1;$i++) {echo $ICEcoder["findFilesExclude"][$i]; if ($i<count($ICEcoder["findFilesExclude"])-1) {echo ', ';};}; ?>"><br>
-<br>
-
-<h2>assisting</h2>
-<input type="checkbox" onclick="showButton()" name="codeAssist" value="true"<?php if($ICEcoder["codeAssist"]) {echo ' checked';};?>> code assist<br>
-<input type="checkbox" onclick="showButton();showHideTabs()" name="visibleTabs" value="true"<?php if($ICEcoder["visibleTabs"]) {echo ' checked';};?>> visible tabs<br>
-<input type="checkbox" onclick="showButton()" name="lockedNav" value="true"<?php if($ICEcoder["lockedNav"]) {echo ' checked';};?>> locked nav<br>
-<br>
-
-<h2>security</h2>
-new password <span style="font-size: 10px; color: #888">8 chars</span><br>
-<input type="password" name="accountPassword" onkeydown="showButton()"><br>
-confirm password<br>
-<input type="password" name="confirmPassword" onkeydown="showButton()"><br>
-<br>
-restricted files/folders<br>
-<input type="text" onkeydown="document.settings.changedFileSettings.value='true';showButton()" name="restrictedFiles" value="<?php for($i=0;$i<=count($ICEcoder["restrictedFiles"])-1;$i++) {echo $ICEcoder["restrictedFiles"][$i]; if ($i<count($ICEcoder["restrictedFiles"])-1) {echo ', ';};}; ?>"><br>
-banned files/folders<br>
-<input type="text" onkeydown="document.settings.changedFileSettings.value='true';showButton()" name="bannedFiles" value="<?php for($i=0;$i<=count($ICEcoder["bannedFiles"])-1;$i++) {echo $ICEcoder["bannedFiles"][$i]; if ($i<count($ICEcoder["bannedFiles"])-1) {echo ', ';};}; ?>"><br>
-<input type="hidden" name="changedFileSettings" value="false">
-<br>
-ip addresses<br>
-<input type="text" onkeydown="showButton()" name="allowedIPs" value="<?php for($i=0;$i<=count($ICEcoder["allowedIPs"])-1;$i++) {echo $ICEcoder["allowedIPs"][$i]; if ($i<count($ICEcoder["allowedIPs"])-1) {echo ', ';};}; ?>"><br>
-</div>
-
-<div class="settingsColumn2">
-<h2>plugins</h2>
-plugins array <span style="font-size: 10px; color: #888">name, img src, style, url, target, setInterval (mins)</span><br>
-<textarea name="plugins" class="plugins" onkeydown="showButton()"><?php
-for($i=0;$i<count($ICEcoder["plugins"]);$i++) {
-	for($j=0;$j<count($ICEcoder["plugins"][$i]);$j++) {
-		echo '"'.$ICEcoder["plugins"][$i][$j].'"';
-		if ($j<count($ICEcoder["plugins"][$i])-1) {
-			echo ',';
-		};
-		if (!($i==count($ICEcoder["plugins"])-1 && $j==count($ICEcoder["plugins"][$i])-1)) {
-			echo PHP_EOL;
-		}
-		if (($i<count($ICEcoder["plugins"])-1 && $j==count($ICEcoder["plugins"][$i])-1)) {
-			echo "====================".PHP_EOL;
-		}
-	}
-}
-?></textarea>
-<br><br>
-
-<h2>style</h2>
-theme<br>
-<select onchange="selectTheme();showButton()" id="select" name="theme">
-    <option<?php if ($ICEcoder["theme"]=="default") {echo ' selected';}; ?>>default</option>
-<?php
-for ($i=0;$i<count($themeArray)-1;$i++) {
-	$optionSelected = $ICEcoder["theme"]==$themeArray[$i] ? ' selected' : '';
-	echo '<option'.$optionSelected.'>'.$themeArray[$i].'</option>'.PHP_EOL;
-}
-?>
-</select>
-
-<span style="position: absolute; margin: -18px 0 0 30px">
-	tab width <span style="font-size: 10px; color: #888">chars</span><br>
-	<input type="text" name="tabWidth" id="tabWidth" style="width: 30px" onkeydown="showButton()" onkeyup="changeTabWidth()" value="<?php echo $ICEcoder["tabWidth"];?>">
-</span>
-<br><br>
-
-<textarea id="code" name="code">
-function findSequence(goal) {
-	function find(start,history) {
-		if (start==goal)
-			return history;
-		else if (start>goal)
-			return null;
-		else
-			return find(start+5,"("+history+"+5)") ||
-			find(start*3,"("+history+"*3)");
-	}
-	return find(1,"1");
-}</textarea>
-<br>
-
-<span style="position: absolute; top: 510px">
-	<h2>file manager</h2>
-	root <span style="font-size: 10px; color: #888">slash prefixed</span><br>
-	<input type="text" name="root" style="width: 250px" onkeydown="document.settings.changedFileSettings.value='true';showButton()" value="<?php echo $ICEcoder["root"];?>">
-</span>
-
-<script>
-var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
-	lineNumbers: true,
-	readOnly: "nocursor",
-	indentUnit: top.tabWidth,
-	tabSize: top.tabWidth,
-	mode: "javascript",
-	theme: "<?php echo $ICEcoder["theme"]=="default" ? 'icecoder' : $ICEcoder["theme"];?>"
-	});
-
-var input = document.getElementById("select");
-function selectTheme() {
-	var theme = input.options[input.selectedIndex].innerHTML;
-	if (theme=="default") {theme = "icecoder"};
-	editor.setOption("theme", theme);
-}
-
-function changeTabWidth() {
-	var tabWidth = document.getElementById("tabWidth").value;
-	editor.setOption("indentUnit", tabWidth);
-	editor.setOption("tabSize", tabWidth);
-}
-
-var showButton = function() {
-	document.getElementById('updateButton').style.opacity = 1;
-}
-
-var showHideTabs = function() {
-	cMCSS = document.styleSheets[2];
-	cMCSS.rules ? strCSS = 'rules' : strCSS = 'cssRules';
-	document.settings.visibleTabs.checked ? cMCSS[strCSS][2].style['content'] = '"\\21e5"' : cMCSS[strCSS][2].style['content'] = '" "';
-}
-
-var validatePasswords = function() {
-	<?php if($_SESSION['userLevel']==10) { ?>
-	if (document.settings.accountPassword.value != 0 && document.settings.accountPassword.value.length<8) {
-		top.ICEcoder.message('Please use at least 8 chars in the password');
-	} else {
-		if (document.settings.accountPassword.value != document.settings.confirmPassword.value) {
-			top.ICEcoder.message('Sorry, your passwords don\'t match')
-		} else {
-			document.settings.submit();
-		}
-	}
-	<?php } else { ?>
-		top.ICEcoder.message('Sorry, you need to be logged in to change settings');
-	<?php ;}; ?>
-}
-</script>
-
-<div class="update" id="updateButton" onClick="validatePasswords()">update</div>
-
-</div>
-
-</form>
-
-</body>
-
+<?php include("settings.php");?>
+<!DOCTYPE html>
+
+<html>
+<head>
+<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> settings screen</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="robots" content="noindex, nofollow">
+<link rel="stylesheet" type="text/css" href="settings-screen.css">
+<link rel="stylesheet" href="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror.css">
+<script src="../<?php echo $ICEcoder["codeMirrorDir"]; ?>/lib/codemirror-compressed.js"></script>
+
+<style type="text/css">
+.CodeMirror {position: absolute; width: 0; background-color: #fff; color: #000; font-family: monospace; width: 420px}
+.CodeMirror-scroll {height: 240px; overflow: hidden}
+/* Make sure this next one remains the 3rd item, updated with JS */
+.cm-tab:after {position: relative; display: inline-block; width: 0; left: -1.4em; overflow: visible; color: #aaa; content: "<?php if($ICEcoder["visibleTabs"]) {echo '\21e5';};?>";}
+</style>
+
+<link rel="stylesheet" href="editor.css">
+<?php
+$themeArray = array();
+$handle = opendir('../'.$ICEcoder["codeMirrorDir"].'/theme/');
+while (false !== ($file = readdir($handle))) {
+	if ($file !== "." && $file != "..") {
+		array_push($themeArray,basename($file,".css"));
+	}
+}
+sort($themeArray);
+for ($i=0;$i<count($themeArray);$i++) {
+	echo '<link rel="stylesheet" href="../'.$ICEcoder["codeMirrorDir"].'/theme/'.$themeArray[$i].'.css">'.PHP_EOL;
+}
+?>
+</head>
+
+<body class="settings">
+
+<div class="infoPane">
+	<img src="../images/ice-coder.png" class="logo">
+	<div class="version">v <?php echo $ICEcoder["versionNo"];?></div>
+
+	<p>
+	git:<br>
+	<a href="http://github.com/mattpass/ICEcoder" target="_blank">http://github.com/mattpass/ICEcoder</a>
+	<br><br>
+
+	codemirror dir:<br>
+	<?php echo $ICEcoder["codeMirrorDir"]; ?>
+	<br><br>
+
+	codemirror version:<br>
+	<script>
+	document.write(CodeMirror.version);
+	</script>
+	<br><br>
+
+	file manager root:<br>
+	<?php echo $ICEcoder['root'];?>
+	<br><br><br><br>
+
+	<div style="font-size: 10px; line-height: 12px">ICE coder by Matt Pass (<a href="http://www.twitter.com/mattpass" style="font-size: 10px" target="_blank">@mattpass</a>)<br><br>
+		Free to use it for your own purposes, commercial or not, just let me know of any cool uses or customisations. :)<br><br>
+		No warranty or liability accepted for anything, all responsibility of use is your own.<br><br>
+
+		Thanks go to the following people who have inspired me to create this and in the odd case, provided feedback or code:<br>
+		<?php
+			$peopleArray = array("marijnjh", "maettig", "wimtibackx", "jakubvrana", "_higg_", "yandle", "davidwalshblog", "kuvos", "mathias", "rem");
+			for ($i=0;$i<count($peopleArray)-1;$i++) {
+				echo '<a href="http://www.twitter.com/'.$peopleArray[$i].'" style="font-size: 10px" target="_blank">@'.$peopleArray[$i].'</a>';
+				if ($i<count($peopleArray)-2) {
+					echo ", ";
+				}
+			}			
+		?>
+		
+	</div>
+	</p>
+</div>
+
+<form name="settings" action="settings.php" method="POST">
+<div class="settingsColumn1">
+<h1>settings</h1>
+<h2>functionality</h2>
+<input type="checkbox" onclick="showButton()" name="tabsIndent" value="true"<?php if($ICEcoder["tabsIndent"]) {echo ' checked';};?>> tab indents selection<br>
+<input type="checkbox" onclick="showButton()" name="checkUpdates" value="true"<?php if($ICEcoder["checkUpdates"]) {echo ' checked';};?>> check for updates on load<br>
+<input type="checkbox" onclick="showButton()" name="openLastFiles" value="true"<?php if($ICEcoder["openLastFiles"]) {echo ' checked';};?>> auto open last files on login<br>
+<br>
+when finding in files, exclude:<br>
+<input type="text" onkeydown="showButton()" name="findFilesExclude" value="<?php for($i=0;$i<=count($ICEcoder["findFilesExclude"])-1;$i++) {echo $ICEcoder["findFilesExclude"][$i]; if ($i<count($ICEcoder["findFilesExclude"])-1) {echo ', ';};}; ?>"><br>
+<br>
+
+<h2>assisting</h2>
+<input type="checkbox" onclick="showButton()" name="codeAssist" value="true"<?php if($ICEcoder["codeAssist"]) {echo ' checked';};?>> code assist<br>
+<input type="checkbox" onclick="showButton();showHideTabs()" name="visibleTabs" value="true"<?php if($ICEcoder["visibleTabs"]) {echo ' checked';};?>> visible tabs<br>
+<input type="checkbox" onclick="showButton()" name="lockedNav" value="true"<?php if($ICEcoder["lockedNav"]) {echo ' checked';};?>> locked nav<br>
+<br>
+
+<h2>security</h2>
+new password <span style="font-size: 10px; color: #888">8 chars</span><br>
+<input type="password" name="accountPassword" onkeydown="showButton()"><br>
+confirm password<br>
+<input type="password" name="confirmPassword" onkeydown="showButton()"><br>
+<br>
+banned files/folders<br>
+<input type="text" onkeydown="document.settings.changedFileSettings.value='true';showButton()" name="bannedFiles" value="<?php for($i=0;$i<=count($ICEcoder["bannedFiles"])-1;$i++) {echo $ICEcoder["bannedFiles"][$i]; if ($i<count($ICEcoder["bannedFiles"])-1) {echo ', ';};}; ?>"><br>
+banned paths<br>
+<input type="text" onkeydown="document.settings.changedFileSettings.value='true';showButton()" name="bannedPaths" value="<?php for($i=0;$i<=count($ICEcoder["bannedPaths"])-1;$i++) {echo $ICEcoder["bannedPaths"][$i]; if ($i<count($ICEcoder["bannedPaths"])-1) {echo ', ';};}; ?>"><br>
+<input type="hidden" name="changedFileSettings" value="false">
+ip addresses<br>
+<input type="text" onkeydown="showButton()" name="allowedIPs" value="<?php for($i=0;$i<=count($ICEcoder["allowedIPs"])-1;$i++) {echo $ICEcoder["allowedIPs"][$i]; if ($i<count($ICEcoder["allowedIPs"])-1) {echo ', ';};}; ?>"><br>
+</div>
+
+<div class="settingsColumn2">
+<h2>plugins</h2>
+plugins array <span style="font-size: 10px; color: #888">name, img src, style, url, target, setInterval (mins)</span><br>
+<textarea name="plugins" class="plugins" onkeydown="showButton()"><?php
+for($i=0;$i<count($ICEcoder["plugins"]);$i++) {
+	echo '"'.implode('",'.PHP_EOL.'"', $ICEcoder["plugins"][$i]).'"';
+	if ($i<count($ICEcoder["plugins"])-1) {
+		echo PHP_EOL."====================".PHP_EOL;
+	}
+}
+?></textarea>
+<br><br>
+
+<h2>style</h2>
+theme<br>
+<select onchange="selectTheme();showButton()" id="select" name="theme">
+    <option<?php if ($ICEcoder["theme"]=="default") {echo ' selected';}; ?>>default</option>
+<?php
+for ($i=0;$i<count($themeArray);$i++) {
+	$optionSelected = $ICEcoder["theme"]==$themeArray[$i] ? ' selected' : '';
+	echo '<option'.$optionSelected.'>'.$themeArray[$i].'</option>'.PHP_EOL;
+}
+?>
+</select>
+
+<span style="position: absolute; margin: -15px 0 0 20px">
+	line wrapping<br>
+	<select onchange="showButton()" name="lineWrapping">
+		<option value="true"<?php if($ICEcoder["lineWrapping"]) {echo " selected";};?>>yes</option>
+		<option value="false"<?php if(!$ICEcoder["lineWrapping"]) {echo " selected";};?>>no</option>
+	</select>
+</span>
+
+<span style="position: absolute; margin: -15px 0 0 120px">
+	tab width <span style="font-size: 10px; color: #888">chars</span><br>
+	<input type="text" name="tabWidth" id="tabWidth" style="width: 30px" onkeydown="showButton()" onkeyup="changeTabWidth()" value="<?php echo $ICEcoder["tabWidth"];?>">
+</span>
+<br><br>
+
+<textarea id="code" name="code">
+function findSequence(goal) {
+	function find(start,history) {
+		if (start==goal)
+			return history;
+		else if (start>goal)
+			return null;
+		else
+			return find(start+5,"("+history+"+5)") ||
+			find(start*3,"("+history+"*3)");
+	}
+	return find(1,"1");
+}</textarea>
+<br>
+
+<span style="position: absolute; top: 510px">
+	<h2>file manager</h2>
+	root <span style="font-size: 10px; color: #888">slash prefixed</span><br>
+	<input type="text" name="root" style="width: 250px" onkeydown="document.settings.changedFileSettings.value='true';showButton()" value="<?php echo $ICEcoder["root"];?>">
+</span>
+
+<script>
+var editor = CodeMirror.fromTextArea(document.getElementById("code"), {
+	lineNumbers: true,
+	readOnly: "nocursor",
+	indentUnit: top.ICEcoder.tabWidth,
+	tabSize: top.ICEcoder.tabWidth,
+	mode: "javascript",
+	theme: "<?php echo $ICEcoder["theme"]=="default" ? 'icecoder' : $ICEcoder["theme"];?>"
+	});
+
+var input = document.getElementById("select");
+function selectTheme() {
+	var theme = input.options[input.selectedIndex].innerHTML;
+	if (theme=="default") {theme = "icecoder"};
+	editor.setOption("theme", theme);
+}
+
+function changeTabWidth() {
+	var tabWidth = document.getElementById("tabWidth").value;
+	editor.setOption("indentUnit", tabWidth);
+	editor.setOption("tabSize", tabWidth);
+}
+
+var showButton = function() {
+	document.getElementById('updateButton').style.opacity = 1;
+}
+
+var showHideTabs = function() {
+	cMCSS = document.styleSheets[2];
+	cMCSS.rules ? strCSS = 'rules' : strCSS = 'cssRules';
+	document.settings.visibleTabs.checked ? cMCSS[strCSS][2].style['content'] = '"\\21e5"' : cMCSS[strCSS][2].style['content'] = '" "';
+}
+
+var validatePasswords = function() {
+	if (document.settings.accountPassword.value != 0 && document.settings.accountPassword.value.length<8) {
+		top.ICEcoder.message('Please use at least 8 chars in the password');
+	} else {
+		if (document.settings.accountPassword.value != document.settings.confirmPassword.value) {
+			top.ICEcoder.message('Sorry, your passwords don\'t match')
+		} else {
+			document.settings.submit();
+		}
+	}
+}
+</script>
+
+<div class="update" id="updateButton" onClick="validatePasswords()">update</div>
+
+</div>
+
+</form>
+
+</body>
+
 </html>

lib/settings.php

@@ -1,4 +1,13 @@
 <?php
+// Display & log all errors
+ini_set('display_errors', 1);
+ini_set('log_errors', 1);
+ini_set('error_log', dirname(__FILE__).'/../error-log.txt');
+error_reporting(-1);
+
+// Set our default timezone and supress warning with @
+@date_default_timezone_set(date_default_timezone_get());
+
 // Start a session if we haven't already
 if(!isset($_SESSION)) {session_start();}
 
@@ -29,13 +38,19 @@ include($settingsFile);
 
 // Add ICEcoder settings to beginning of $ICEcoder array
 $ICEcoder = array(
-	"versionNo"		=> "v 0.8.0",
-	"codeMirrorDir"		=> "CodeMirror-2.32",
-	"cMThisVer"		=> 2.32
+	"versionNo"		=> "1.3",
+	"codeMirrorDir"		=> "CodeMirror-3.0",
+	"demoMode"		=> false
 )+$ICEcoder;
 
+$onLoadExtras = "";
+$pluginsDisplay = "";
+
+if ($ICEcoder['demoMode'] && $ICEcoder['accountPassword']!="") {$_SESSION['loggedIn']=true;};
+$demoMode = $ICEcoder['demoMode'];
+
 // Update this config file?
-if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
+if (!$demoMode && isset($_SESSION['loggedIn']) && $_SESSION['loggedIn'] && isset($_POST["theme"]) && $_POST["theme"]) {
 	$settingsContents = file_get_contents($settingsFile);
 	// Replace our settings vars
 	$repPosStart = strpos($settingsContents,'"root"');
@@ -43,22 +58,23 @@ if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
 
 	// Prepare all our vars
 	$ICEcoder["root"]			= strClean($_POST['root']);
-	$ICEcoder["tabsIndent"]			= $_POST['tabsIndent'] ? "true" : "false";
-	$ICEcoder["checkUpdates"]		= $_POST['checkUpdates'] ? "true" : "false";
-	$ICEcoder["openLastFiles"]		= $_POST['openLastFiles'] ? "true" : "false";
-	$ICEcoder["findFilesExclude"]		= 'array("'.str_replace(', ','","',strClean($_POST['findFilesExclude'])).'")';
-	$ICEcoder["codeAssist"]			= $_POST['codeAssist'] ? "true" : "false";
-	$ICEcoder["visibleTabs"]		= $_POST['visibleTabs'] ? "true" : "false";
-	$ICEcoder["lockedNav"]			= $_POST['lockedNav'] ? "true" : "false";
+	$ICEcoder["tabsIndent"]			= isset($_POST['tabsIndent']) && $_POST['tabsIndent'] ? "true" : "false";
+	$ICEcoder["checkUpdates"]		= isset($_POST['checkUpdates']) && $_POST['checkUpdates'] ? "true" : "false";
+	$ICEcoder["openLastFiles"]		= isset($_POST['openLastFiles']) && $_POST['openLastFiles'] ? "true" : "false";
+	$ICEcoder["findFilesExclude"]		= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['findFilesExclude']))).'")';
+	$ICEcoder["codeAssist"]			= isset($_POST['codeAssist']) && $_POST['codeAssist'] ? "true" : "false";
+	$ICEcoder["visibleTabs"]		= isset($_POST['visibleTabs']) && $_POST['visibleTabs'] ? "true" : "false";
+	$ICEcoder["lockedNav"]			= isset($_POST['lockedNav']) && $_POST['lockedNav'] ? "true" : "false";
 	if ($_POST['accountPassword']!="")	{$ICEcoder["accountPassword"] = generateHash(strClean($_POST['accountPassword']));};
-	$ICEcoder["restrictedFiles"]		= 'array("'.str_replace(', ','","',strClean($_POST['restrictedFiles'])).'")';
-	$ICEcoder["bannedFiles"]		= 'array("'.str_replace(', ','","',strClean($_POST['bannedFiles'])).'")';
-	$ICEcoder["allowedIPs"]			= 'array("'.str_replace(', ','","',strClean($_POST['allowedIPs'])).'")';
+	$ICEcoder["bannedFiles"]		= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['bannedFiles']))).'")';
+	$ICEcoder["bannedPaths"]		= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['bannedPaths']))).'")';
+	$ICEcoder["allowedIPs"]			= 'array("'.str_replace(',','","',str_replace(" ","",strClean($_POST['allowedIPs']))).'")';
 	$ICEcoder["plugins"]			= 'array('.PHP_EOL.'	array('.PHP_EOL.'	'.str_replace('====================','),'.PHP_EOL.'	array(',$_POST['plugins']).'))';
 	$ICEcoder["theme"]			= strClean($_POST['theme']);
+	$ICEcoder["lineWrapping"]		= strClean($_POST['lineWrapping']);
 	$ICEcoder["tabWidth"]			= numClean($_POST['tabWidth']);
 
-	$settingsArray = array("root","tabsIndent","checkUpdates","openLastFiles","findFilesExclude","codeAssist","visibleTabs","lockedNav","accountPassword","restrictedFiles","bannedFiles","allowedIPs","plugins","theme","tabWidth");
+	$settingsArray = array("root","tabsIndent","checkUpdates","openLastFiles","findFilesExclude","codeAssist","visibleTabs","lockedNav","accountPassword","bannedFiles","bannedPaths","allowedIPs","plugins","theme","lineWrapping","tabWidth");
 	$settingsNew = "";
 	for ($i=0;$i<count($settingsArray);$i++) {
 		$settingsNew .= '"'.$settingsArray[$i].'"'.PHP_EOL.'	=> ';
@@ -74,29 +90,33 @@ if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
 	fclose($fh);
 
 	// OK, now the config file has been updated, update our current session with new arrays
-	$settingsArray = array("findFilesExclude","restrictedFiles","bannedFiles","allowedIPs");
+	$settingsArray = array("findFilesExclude","bannedFiles","allowedIPs");
 	for ($i=0;$i<count($settingsArray);$i++) {
-		$_SESSION[$settingsArray[$i]] = $ICEcoder[$settingsArray[$i]] = explode(", ",strClean($_POST[$settingsArray[$i]]));
+		$_SESSION[$settingsArray[$i]] = $ICEcoder[$settingsArray[$i]] = explode(",",str_replace(" ","",strClean($_POST[$settingsArray[$i]])));
 	}
 	// Work out the theme to use now
 	$ICEcoder["theme"]=="default" ? $themeURL = 'lib/editor.css' : $themeURL = $ICEcoder["codeMirrorDir"].'/theme/'.$ICEcoder["theme"].'.css';
 	// Do we need a file manager refresh?
 	$refreshFM = $_POST['changedFileSettings']=="true" ? "true" : "false";
 	// With all that worked out, we can now hide the settings screen and apply the new settings
-	echo "<script>top.ICEcoder.settingsScreen('hide');top.ICEcoder.useNewSettings('".$themeURL."',".$ICEcoder["tabsIndent"].",".$ICEcoder["codeAssist"].",".$ICEcoder["lockedNav"].",".$ICEcoder["visibleTabs"].",".$ICEcoder["tabWidth"].",".$refreshFM.");</script>";
+	echo "<script>top.ICEcoder.settingsScreen('hide');top.ICEcoder.useNewSettings('".$themeURL."',".$ICEcoder["tabsIndent"].",".$ICEcoder["codeAssist"].",".$ICEcoder["lockedNav"].",".$ICEcoder["visibleTabs"].",".$ICEcoder["lineWrapping"].",".$ICEcoder["tabWidth"].",".$refreshFM.");</script>";
 }
 
-// Define the docRoot & iceRoot
+// Establish our user level
+if (!isset($_SESSION['loggedIn'])) {$_SESSION['loggedIn'] = false;};
+if(isset($_POST['loginPassword']) && generateHash(strClean($_POST['loginPassword']),$ICEcoder["accountPassword"])==$ICEcoder["accountPassword"]) {$_SESSION['loggedIn'] = true; header('Location: ../');};
+$_SESSION['loggedIn'] = $_SESSION['loggedIn'];
+
+// Define the serverType, docRoot & iceRoot
+$serverType = stristr($_SERVER['SERVER_SOFTWARE'], "win") ? "Windows" : "Linux";
 $docRoot = rtrim(str_replace("\\","/",$_SERVER['DOCUMENT_ROOT']));
 $iceRoot = rtrim(str_replace("\\","/",$ICEcoder["root"]));
-
-// Establish our user level
-if (!isset($_SESSION['userLevel'])) {$_SESSION['userLevel'] = 0;};
-if(isset($_POST['loginPassword']) && generateHash(strClean($_POST['loginPassword']),$ICEcoder["accountPassword"])==$ICEcoder["accountPassword"]) {$_SESSION['userLevel'] = 10;};
-$_SESSION['userLevel'] = $_SESSION['userLevel'];
+if ($_SESSION['loggedIn']) {
+	echo "<script>top.docRoot='".$docRoot."';top.iceRoot='".$iceRoot."'</script>";
+}
 
 // Setup our file security vars
-$settingsArray = array("findFilesExclude","restrictedFiles","bannedFiles","allowedIPs");
+$settingsArray = array("findFilesExclude","bannedFiles","allowedIPs");
 for ($i=0;$i<count($settingsArray);$i++) {
 	if (!isset($_SESSION[$settingsArray[$i]])) {$_SESSION[$settingsArray[$i]] = $ICEcoder[$settingsArray[$i]];}
 }
@@ -114,41 +134,39 @@ if (!$allowedIP) {
 };
 
 // Save the currently opened files for next time
-if (isset($_GET["saveFiles"]) && $_GET['saveFiles']) {
-	if ($_SESSION['userLevel'] == 10) {
-		$settingsContents = file_get_contents($settingsFile);
+if ($_SESSION['loggedIn'] && isset($_GET["saveFiles"]) && $_GET['saveFiles']) {
+	$settingsContents = file_get_contents($settingsFile);
 
-		// Replace our previousFiles var with the the current
-		$repPosStart = strpos($settingsContents,'previousFiles"		=> "')+20;
-		$repPosEnd = strpos($settingsContents,'",',$repPosStart)-$repPosStart;
-		if ($_GET['saveFiles']!="CLEAR") {
-			$saveFiles=strClean($_GET['saveFiles']);
-			$saveFilesArray = explode(",",$saveFiles);
-			$saveFiles="";
-			for ($i=0;$i<count($saveFilesArray);$i++) {
-				$saveFilesArray[$i] = str_replace("/","|",$docRoot).$saveFilesArray[$i];
-				$saveFiles .= $saveFilesArray[$i].",";
-			}
-			$saveFiles = rtrim($saveFiles,",");
-			$settingsContents = substr($settingsContents,0,$repPosStart).$saveFiles.substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
-			// Now update the config file
-			$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on lib/".$settingsFile);
-			fwrite($fh, $settingsContents);
+	// Replace our previousFiles var with the the current
+	$repPosStart = strpos($settingsContents,'previousFiles"		=> "')+20;
+	$repPosEnd = strpos($settingsContents,'",',$repPosStart)-$repPosStart;
+	if (!$demoMode && $_GET['saveFiles']!="CLEAR") {
+		$saveFiles=strClean($_GET['saveFiles']);
+		$saveFilesArray = explode(",",$saveFiles);
+		$saveFiles="";
+		for ($i=0;$i<count($saveFilesArray);$i++) {
+			$saveFilesArray[$i] = str_replace("/","|",$docRoot).$saveFilesArray[$i];
+			$saveFiles .= $saveFilesArray[$i].",";
+		}
+		$saveFiles = rtrim($saveFiles,",");
+		$settingsContents = substr($settingsContents,0,$repPosStart).$saveFiles.substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
+		// Now update the config file
+		$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on lib/".$settingsFile." and press refresh");
+		fwrite($fh, $settingsContents);
 
-			// Update our last10Files var?
-			$last10FilesArray = explode(",",$ICEcoder["last10Files"]);
-			for ($i=0;$i<count($saveFilesArray);$i++) {
-				$inLast10Files = in_array($saveFilesArray[$i],$last10FilesArray);
-				if (!$inLast10Files && $saveFilesArray[$i] !="") {
-					$repPosStart = strpos($settingsContents,'last10Files"		=> "')+18;
-					$repPosEnd = strpos($settingsContents,'"',$repPosStart)-$repPosStart;
-					$commaExtra = $ICEcoder["last10Files"]!="" ? "," : "";
-					if (count($last10FilesArray)>=10) {$ICEcoder["last10Files"]=substr($ICEcoder["last10Files"],0,strrpos($ICEcoder["last10Files"],','));};
-					$settingsContents = substr($settingsContents,0,$repPosStart).$saveFilesArray[$i].$commaExtra.$ICEcoder["last10Files"].substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
-					// Now update the config file
-					$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on lib/".$settingsFile);
-					fwrite($fh, $settingsContents);
-				}
+		// Update our last10Files var?
+		$last10FilesArray = explode(",",$ICEcoder["last10Files"]);
+		for ($i=0;$i<count($saveFilesArray);$i++) {
+			$inLast10Files = in_array($saveFilesArray[$i],$last10FilesArray);
+			if (!$inLast10Files && $saveFilesArray[$i] !="") {
+				$repPosStart = strpos($settingsContents,'last10Files"		=> "')+18;
+				$repPosEnd = strpos($settingsContents,'"',$repPosStart)-$repPosStart;
+				$commaExtra = $ICEcoder["last10Files"]!="" ? "," : "";
+				if (count($last10FilesArray)>=10) {$ICEcoder["last10Files"]=substr($ICEcoder["last10Files"],0,strrpos($ICEcoder["last10Files"],','));};
+				$settingsContents = substr($settingsContents,0,$repPosStart).$saveFilesArray[$i].$commaExtra.$ICEcoder["last10Files"].substr($settingsContents,($repPosStart+$repPosEnd),strlen($settingsContents));
+				// Now update the config file
+				$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on lib/".$settingsFile." and press refresh");
+				fwrite($fh, $settingsContents);
 			}
 		}
 		fclose($fh);
@@ -156,10 +174,10 @@ if (isset($_GET["saveFiles"]) && $_GET['saveFiles']) {
 	echo '<script>top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);</script>';
 }
 
-// If we're updating or calling from the index.php page, do/redo plugins
-if ((isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) || strpos($_SERVER['PHP_SELF'],"index.php")>0) {
+// If we're updating, do/redo plugins
+if ($_SESSION['loggedIn']) {
 	// If we're updating, we need to recreate the plugins array
-	if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
+	if (isset($_POST["theme"]) && $_POST["theme"]) {
 		$ICEcoder["plugins"] = array();
 		$pluginsArray = explode("====================",str_replace("\"","",str_replace("\r","",str_replace("\n","",$_POST['plugins']))));
 		for ($i=0;$i<count($pluginsArray);$i++) {
@@ -175,9 +193,7 @@ if ((isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10)
 	};
 
 	// If we're updating, replace the plugin display with our newly established one
-	if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
-		echo "<script>top.document.getElementById('pluginsContainer').innerHTML = '".$pluginsDisplay."';</script>";
-	}
+	echo "<script>if(top.document.getElementById('pluginsContainer')) {top.document.getElementById('pluginsContainer').innerHTML = '".$pluginsDisplay."'};</script>";
 
 	// Work out what plugins we'll need to set on a setInterval
 	$onLoadExtras = "";
@@ -188,7 +204,7 @@ if ((isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10)
 	};
 
 	// If we're updating our settings, clear existing setIntervals & the array refs, then start new ones
-	if (isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10) {
+	if (isset($_POST["theme"]) && $_POST["theme"]) {
 		?>
 		<script>
 		for (i=0;i<=top.ICEcoder.pluginIntervalRefs.length-1;i++) {
@@ -200,87 +216,65 @@ if ((isset($_POST["theme"]) && $_POST["theme"] && $_SESSION['userLevel'] == 10)
 		<?php
 	}
 
-	// Finally, show server data if we're logged in
-	if ($_SESSION['userLevel'] == 10) {
-		$onLoadExtras .= ";top.ICEcoder.content.style.visibility='visible'";
-	}
+	// Finally, show server data
+	$onLoadExtras .= ";top.ICEcoder.content.style.visibility='visible'";
 }
 
 // If we're due to show the settings screen
-if ($ICEcoder["accountPassword"] == "" && isset($_GET['settings'])) {
+if (!$_SESSION['loggedIn']) {
+	// If the password hasn't been set and we're setting it
+	if ($ICEcoder["accountPassword"] == "" && isset($_POST['accountPassword'])) {
+		$password = generateHash(strClean($_POST['accountPassword']));
+		$settingsFile = $settingsFile;
+		$settingsContents = file_get_contents($settingsFile);
+		// Replace our empty password with the one submitted by user
+		$settingsContents = str_replace('"accountPassword"	=> "",','"accountPassword"	=> "'.$password.'",',$settingsContents);
+		// Now update the config file
+		$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on ".$settingsFile." and press refresh");
+		fwrite($fh, $settingsContents);
+		fclose($fh);
+		// Set the session user level
+		$_SESSION['loggedIn'] = true;
+		// Finally, load again as now this file has changed and auto login
+		header('Location: ../');
+	}
 ?>
-	<!DOCTYPE html>
+<!DOCTYPE html>
 
-	<html>
-	<head>
-	<title>ICEcoder <?php echo $ICEcoder["versionNo"];?> setup</title>
-	<link rel="stylesheet" type="text/css" href="coder.css">
-	</head>
+<html>
+<head>
+<title>ICEcoder <?php
+echo $ICEcoder["versionNo"]." : ";
+echo $ICEcoder["accountPassword"] == "" ? "Setup" : "Login";
+?></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="robots" content="noindex, nofollow">
+<link rel="stylesheet" type="text/css" href="ice-coder.css">
+<link rel="icon" type="image/png" href="../favicon.png">
+</head>
 
-	<body onLoad="document.settingsUpdate.accountPassword.focus()">
+<body onLoad="document.settingsUpdate.<?php echo $ICEcoder["accountPassword"] == "" ? "account" : "login"; ?>Password.focus()">
 	
-	<div class="screenContainer" style="background-color: #141414">
-		<div class="screenVCenter">
-			<div class="screenCenter">
-			<img src="../images/ice-coder.png">
-			<div class="version"><?php echo $ICEcoder["versionNo"];?></div>
-			<form name="settingsUpdate" action="../" method="POST">
-			<input type="password" name="accountPassword" class="accountPassword">
-			<input type="submit" name="submit" value="Set Password" class="button">
-			</form>
-			</div>
+<div class="screenContainer" style="background-color: #141414">
+	<div class="screenVCenter">
+		<div class="screenCenter">
+		<img src="../images/ice-coder.png">
+		<div class="version">v <?php echo $ICEcoder["versionNo"];?></div>
+		<form name="settingsUpdate" action="settings.php" method="POST">
+		<input type="password" name="<?php echo $ICEcoder["accountPassword"] == "" ? "account" : "login"; ?>Password" class="accountPassword"><br><br>
+		<input type="submit" name="submit" value="<?php echo $ICEcoder["accountPassword"] == "" ? "Set Password" : "Login"; ?>" class="button">
+		</form>
 		</div>
 	</div>
+</div>
 
-	</body>
+</body>
 
-	</html>
+</html>
 <?php
-} else {
-	// If the password hasn't been set, set it, but only if we're including
-	// from the index.php file (as this file is included from multiple places)
-	if ($ICEcoder["accountPassword"] == "" && strpos($_SERVER['PHP_SELF'],"index.php")>0) {
-		// If we're setting a password
+}
 
-		if (isset($_POST['accountPassword'])) {
-			$password = generateHash(strClean($_POST['accountPassword']));
-			$settingsFile = 'lib/'.$settingsFile;
-			$settingsContents = file_get_contents($settingsFile);
-			// Replace our empty password with the one submitted by user
-			$settingsContents = str_replace('"accountPassword"	=> "",','"accountPassword"	=> "'.$password.'",',$settingsContents);
-			// Now update the config file
-			$fh = fopen($settingsFile, 'w') or die("Can't update config file. Please set public write permissions on ".$settingsFile);
-			fwrite($fh, $settingsContents);
-			fclose($fh);
-			// Set the session user level
-			$_SESSION['userLevel'] = 10;
-			// Finally, load again as now this file has changed and auto login
-			header('Location: index.php');
-		} else {
-			// We need to set the password
-			header('Location: lib/settings.php?settings=set');
-		}
-	}
-
-	// If we're logging in, refresh the file manager and show icons if login is correct
-	if(isset($_POST['loginPassword'])) {
-		if(isset($_POST['loginPassword']) && generateHash(strClean($_POST['loginPassword']),$ICEcoder["accountPassword"])==$ICEcoder["accountPassword"]) {
-			$loginAttempt = 'loginOK';
-			if ($ICEcoder["previousFiles"]!="") {
-				$openFilesArray = explode(",",$ICEcoder["previousFiles"]);
-				echo '<script>';
-				echo 'top.previousFiles = [';
-				for ($i=0;$i<count($openFilesArray);$i++) {
-					echo "'".$openFilesArray[$i]."'";
-					if ($i<count($openFilesArray)-1) {echo ",";};
-				}
-				echo '];';
-				echo '</script>';
-			}
-		} else {
-			$loginAttempt = 'loginFailed';
-		}
-		echo "<script>top.ICEcoder.refreshFileManager('".$loginAttempt."');</script>";
-	}
+if ((!$_SESSION['loggedIn'] || $ICEcoder["accountPassword"] == "") && !strpos($_SERVER['SCRIPT_NAME'],"lib/settings.php")) {
+	header('Location: lib/settings.php');
 }
 ?>

plugins/ice-repo/LICENSE.md

@@ -0,0 +1,24 @@
+Copyright (C) 2012 Matt Pass  
+Website: mattpass.com  
+Email:   matt@mattpass.com  
+Twitter: @mattpass
+
+#ICErepo License
+##Standard Open Source Initiative MIT License
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

plugins/ice-repo/README.md

@@ -0,0 +1,61 @@
+ICErepo
+=======
+
+Show diffs, push, pull & sync your site and Github repo's.
+
+While Github has a fantastic website, mobile app, desktop app and of course bash system, there's no web based UI I can find to sync your website code with Github repo's or vice versa. That's what ICErepo provides.
+
+Originally intended to be a plugin for ICEcoder (https://github.com/mattpass/ICEcoder), I have decided to make it a standalone lib so it can run by itself or easily be integrated into any existing system.
+
+The aim is a simple UI to view diffs between your server dir's and related Github repo's. This list will consist of new files (those only on server), deleted files (those only on Github) and changed files (files that exist in both places but are different). Files that exist in both locations and the same are not shown to keep things minimalist.
+
+Users can then to pick & choose the files & folder they'd like to commit, provide a title and message, then commit to Github. As each file is synced by the user to match the server it dissapears from the UI list. Alternatively you can pull files & folders from Github to sync your server dir's with the repo itself.
+
+Cool huh?
+
+**Current screnshot:**
+
+<img src="http://www.icecoder.net/github/screenshot.jpg" alt="ICErepo screenshot">
+
+This lib uses customised & minified versions of these brilliant and time tested repos:
+
+Github API lib: https://github.com/michael/github
+
+JS Diff lib:    https://github.com/cemerick/jsdifflib
+
+###Installation
+
+####Step 1: Clone the repo
+
+```
+$ git clone git@github:mattpass/ICErepo
+```
+
+####Step 2: Enter your auth settings
+```
+Open index.php and enter either your Github oauth token or username & password
+oauth is recommended here, view http://developer.github.com/v3/oauth/ for info
+(If using oauth ensure you have repo scope & your app is granted the URL you'll run under)
+```
+
+####Step 3: Enter your repo & server dir settings
+```
+Also in index.php, enter the repo & corresponding server paths
+Enter 'selected' as a 3rd param next to your default repo/server option to autoload that
+Finally, set $_SESSION['userLevel'] to be > 0 with your own login system, or simply uncomment line 3
+Upload ICErepo, visit in a web browser & enjoy
+```
+
+**Dev schedule:**
+
+**v0.8**
+Bug testing, refactoring & optimisation
+
+**v0.9**
+Alpha testing
+
+**v0.95**
+Beta testing
+
+**v1.0**
+Version 1 released

plugins/ice-repo/contents.php

@@ -0,0 +1,127 @@
+<?php
+session_start();
+if (!$_SESSION['loggedIn']) {
+	die("Sorry, you need to be logged in to use ICErepo");
+}
+
+function strClean($var) {
+	// returns converted entities where there are HTML entity equivalents
+	return htmlentities($var, ENT_QUOTES, "UTF-8");
+}
+
+function numClean($var) {
+	// returns a number, whole or decimal or null
+	return is_numeric($var) ? floatval($var) : false;
+}
+?>
+<!DOCTYPE html>
+<html>
+<head>
+<title>ICErepo v<?php echo $version;?></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<script src="lib/base64.js"></script>
+<script src="lib/github.js"></script>
+<script src="lib/difflib.js"></script>
+<script src="ice-repo.js"></script>
+<link rel="stylesheet" type="text/css" href="ice-repo.css">
+</head>
+
+<body>
+	
+<?php
+// Function to sort given values alphabetically
+function alphasort($a, $b) {
+	return strcmp($a->getPathname(), $b->getPathname());
+}
+
+// Class to put forward the values for sorting
+class SortingIterator implements IteratorAggregate {
+	private $iterator = null;
+	public function __construct(Traversable $iterator, $callback) {
+		$array = iterator_to_array($iterator);
+		usort($array, $callback);
+		$this->iterator = new ArrayIterator($array);
+	}
+	public function getIterator() {
+	return $this->iterator;
+	}
+}
+
+// Get a full list of dirs & files and begin sorting using above class & function
+$repoPath = explode("@",strClean($_POST['repo']));
+$repo = $repoPath[0];
+$path = $repoPath[1];
+$objectList = new SortingIterator(new RecursiveIteratorIterator(new RecursiveDirectoryIterator($path), RecursiveIteratorIterator::SELF_FIRST), 'alphasort');
+
+// Finally, we have our ordered list, so display
+$i=0;
+$dirListArray = array();
+$dirSHAArray = array();
+$dirTypeArray = array();
+$finfo = finfo_open(FILEINFO_MIME_TYPE);
+foreach ($objectList as $objectRef) {
+	$fileFolderName = rtrim(substr($objectRef->getPathname(), strlen($path)),"..");
+	if ($objectRef->getFilename()!="." && $fileFolderName[strlen($fileFolderName)-1]!="/") {
+			$contents = file_get_contents($path.$fileFolderName);
+			if (strpos(finfo_file($finfo, $path.$fileFolderName),"text")===0) {
+				$contents = str_replace("\r","",$contents);
+			};
+			$store = "blob ".strlen($contents)."\000".$contents;
+			$i++;
+			array_push($dirListArray,ltrim($fileFolderName,"/"));
+			array_push($dirSHAArray,sha1($store));
+			$type = is_dir($path.$fileFolderName) ? "dir" : "file";
+			array_push($dirTypeArray,$type);
+	}
+}
+finfo_close($finfo);
+?>
+
+<script>
+top.repo = '<?php echo $repo;?>';
+top.path = '<?php echo $path;?>';
+dirListArray = [<?php echo "'".implode("','", $dirListArray)."'";?>];
+dirSHAArray  = [<?php echo "'".implode("','", $dirSHAArray)."'";?>];
+dirTypeArray = [<?php echo "'".implode("','", $dirTypeArray)."'";?>];
+</script>
+	
+<div id="compareList" class="mainContainer"></div>
+	
+<div id="commitPane" class="commitPane">
+<b style='font-size: 18px'>COMMIT CHANGES:</b><br><br>
+<form name="fcForm" action="file-control.php" target="fileControl" method="POST">
+<input type="text" name="title" value="Title..." style="width: 260px; border: 0; background: #f8f8f8; margin-bottom: 10px" onFocus="titleDefault='Title...'; if(this.value==titleDefault) {this.value=''}" onBlur="if(this.value=='') {this.value=titleDefault}"><br>
+<textarea name="message" style="width: 260px; height: 180px; border: 0; background: #f8f8f8; margin-bottom: 5px" onFocus="messageDefault='Message...'; if(this.value==messageDefault) {this.value=''}" onBlur="if(this.value=='') {this.value=messageDefault}">Message...</textarea>
+<input type="hidden" name="token" value="<?php echo strClean($_POST['token']);?>">
+<input type="hidden" name="username" value="<?php echo strClean($_POST['username']);?>">
+<input type="hidden" name="password" value="<?php echo strClean($_POST['password']);?>">
+<input type="hidden" name="path" value="<?php echo $path; ?>">	
+<input type="hidden" name="rowID" value="">
+<input type="hidden" name="gitRepo" value="<?php echo $repo; ?>">
+<input type="hidden" name="repo" value="">
+<input type="hidden" name="dir" value="">
+<input type="hidden" name="action" value="">
+<input type="submit" name="commit" value="Commit changes" onClick="return commitChanges()" style="border: 0; background: #555; color: #fff; cursor: pointer">
+</form>
+</div>
+	
+<div id="infoPane" class="infoPane"></div>
+	
+<script>
+top.fcFormAlias = document.fcForm;
+var github = new Github(<?php
+if ($_POST['token']!="") {
+	echo '{token: "'.strClean($_POST['token']).'", auth: "oauth"}';
+} else{
+	echo '{username: "'.strClean($_POST['username']).'", password: "'.strClean($_POST['password']).'", auth: "basic"}';
+}?>);
+repoListArray = [];
+repoSHAArray = [];
+window.onLoad=gitCommand('repo.show','<?php echo strClean($_POST['repo']);?>');
+</script>
+	
+<iframe name="fileControl" style="display: none"></iframe>
+	
+</body>
+	
+</html>

plugins/ice-repo/file-control.php

@@ -0,0 +1,144 @@
+<?php
+session_start();
+if (!$_SESSION['loggedIn']) {
+	die("Sorry, you need to be logged in to use ICErepo");
+}
+// returns converted entities where there are HTML entity equivalents
+function strClean($var) {
+	return htmlentities($var, ENT_QUOTES, "UTF-8");
+}
+
+// returns a number, whole or decimal or null
+function numClean($var) {
+	return is_numeric($var) ? floatval($var) : false;
+}
+
+$repoPath = strClean($_POST['repoPath']);
+$gitRepo = strClean($_POST['gitRepo']);
+$path = strClean($_POST['path']);
+$rowID = strClean($_POST['rowID']);
+$repo = strClean($_POST['repo']);
+$dir = strClean($_POST['dir']);
+$action = str_replace("PULL:","",str_replace("SAVEPULLS:","",strClean($_POST['action'])));
+$rowIDArray = explode(",",$rowID);
+$repoArray = explode(",",$repo);
+$dirArray = explode(",",$dir);
+$actionArray = explode(",",$action);
+?>
+<!DOCTYPE html>
+<html>
+<head>
+<title>ICErepo v<?php echo $version;?></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<script src="lib/underscore-min.js"></script>
+<script src="lib/base64.js"></script>
+<script src="lib/github.js"></script>
+<script src="lib/difflib.js"></script>
+<script src="ice-repo.js"></script>
+<link rel="stylesheet" type="text/css" href="ice-repo.css">
+</head>
+
+<body>
+	
+<script>
+	fullRepoPath='<?php echo $repo;?>';
+	gitRepo='<?php echo $gitRepo;?>';
+	var github = new Github(<?php
+	if ($_POST['token']!="") {
+		echo '{token: "'.strClean($_POST['token']).'", auth: "oauth"}';
+	} else{
+		echo '{username: "'.strClean($_POST['username']).'", password: "'.strClean($_POST['password']).'", auth: "basic"}';
+	}?>);
+	repoUser = gitRepo.split('/')[0];
+	repoName = gitRepo.split('/')[1];
+	filePath = fullRepoPath.replace(repoUser+"/"+repoName+"/","");
+	var repo = github.getRepo(repoUser,repoName);
+</script>
+
+<?php if ($_POST['action']=="view") {?>
+	<form name="fcForm">
+	<textarea name="fileContents"><?php echo htmlentities(file_get_contents($dir)); ?></textarea>
+	</form>
+	<script>
+	rowID = <?php echo $rowID; ?>;
+		
+	baseTextName = "Server:     <?php echo str_replace($_SERVER['DOCUMENT_ROOT']."/","",$dir);?>     ";
+	newTextName = "Github:     <?php echo $repo;?>";
+	window.onLoad = sendData(baseTextName,newTextName);
+	</script>
+<?php } else if (substr($_POST['action'],0,5)=="PULL:") { ?>
+	<form name="fcForm" action="file-control.php" method="POST">
+	<?php
+	echo '<input type="hidden" name="rowID" value="'.$rowID.'">';
+	echo '<input type="hidden" name="repo" value="'.$repo.'">';
+	echo '<input type="hidden" name="dir" value="'.$dir.'">';
+	echo '<input type="hidden" name="action" value="SAVEPULLS:'.$action.'">';
+	echo '<input type="hidden" name="path" value="'.$path.'">';
+	for ($i=0;$i<count($rowIDArray);$i++) {
+		if ($repoArray[$i]!="") {
+			echo '<textarea name="repoContents'.$rowIDArray[$i].'"></textarea>';
+		}
+	}
+	?>
+	</form>
+	<script>
+	rowIDArray = [<?php echo implode(",", $rowIDArray);?>];
+	repoArray = [<?php echo "'".implode("','", $repoArray)."'";?>];
+	dirArray = [<?php echo "'".implode("','", $dirArray)."'";?>];
+	actionArray = [<?php echo "'".implode("','", $actionArray)."'";?>];
+	window.onLoad = getData();
+	</script>
+<?php } else if (substr($_POST['action'],0,10)=="SAVEPULLS:") {?>
+	<script>
+	<?php
+		for ($i=0;$i<count($rowIDArray);$i++) {
+			if ($actionArray[$i]!="new") {
+				$dirs = explode("/",$repoArray[$i]);
+				$relDir = "";
+				for ($j=0;$j<count($dirs)-1;$j++) {
+					$relDir .= "/".$dirs[$j];
+					if (!is_dir($path.$relDir)) {
+						mkdir($path.$relDir, 0755);
+					}
+				}
+				$fh = fopen($path."/".$repoArray[$i], 'w') or die("alert('Sorry, there was a problem pulling ".$repoArray[$i].". Either the file is unavailable on Github or server permissions aren\'t allowing it to be created/updated.');get('blackMask','top').style.display='none';");
+				fwrite($fh, $_POST['repoContents'.$rowIDArray[$i]]);
+				fclose($fh);
+				echo "hideRow(".$rowIDArray[$i].");top.newCount--;";
+			} else {
+				is_dir($dir) ? $success = rmdir($dir) : $success = unlink($dir);
+				if (!$success) {
+					echo "alert('Sorry, couldn\'t delete ".$dir."\\n\\n";
+					echo "Maybe you need to give file permissions for it to be deleted?');";
+				} else {
+					echo "hideRow(".$rowIDArray[$i].");top.deletedCount--;";
+				}
+			}
+		}
+		echo "get('blackMask','top').style.display = 'none';";
+	?>
+	</script>
+<?php } else { ?>
+	<form name="fcForm">
+	<?php
+	for ($i=0;$i<count($rowIDArray);$i++) {
+		if ($dirArray[$i]!="") {
+			echo '<textarea name="fileContents'.$rowIDArray[$i].'">';
+			echo htmlentities(file_get_contents($dirArray[$i]));
+			echo '</textarea>';
+		}
+	}
+	?>
+	</form>
+	<script>
+	rowIDArray = [<?php echo implode(",", $rowIDArray);?>];
+	repoArray = [<?php echo "'".implode("','", $repoArray)."'";?>];
+	dirArray = [<?php echo "'".implode("','", $dirArray)."'";?>];
+	actionArray = [<?php echo "'".implode("','", $actionArray)."'";?>];
+	window.onLoad = startProcess();
+	</script>
+<?php } ?>
+	
+</body>
+	
+</html>

plugins/ice-repo/ice-repo.css

@@ -0,0 +1,79 @@
+/* First, reset everything to a standard */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	font-family: arial, verdana, helvetica, sans-serif;
+	border: 0px;
+	margin: 0px;
+	padding: 0px;
+	outline: 0px;
+	font-size: 12px;
+	vertical-align: top;
+}
+
+html, body {background-color: #fff; width: 100%}
+p {color: #444}
+textarea, input {font-family: arial, verdana, helvetica, sans-serif; padding: 4px}
+
+.header {position: absolute; width: 100%; height: 60px; background: #444; z-index: 1}
+
+.mainContainer {position: relative; display: block; width: 900px; padding: 20px}
+
+.blackMask {position: absolute; width: 100%; height: 100%; background: rgba(0,0,0,0.9); z-index: 200}
+.loadingMsgCenter {position: absolute; display: inline-block; left: 50%; top: 50%; width: 1px; height: 1px}
+.loadingMsgContainer {position: absolute; display: inline-block; left: -30px; top: -7px; width: 60px; height: 14px; background-color: #bbb; color: #222; font-weight: bold; text-align: center; padding: 15px; z-index: 201;
+	-webkit-box-shadow: 8px 8px 8px 8px rgba(0,0,0,0.4);
+	-moz-box-shadow: 8px 8px 8px 8px rgba(0,0,0,0.4);
+	box-shadow: 4px 4px 8px 4px rgba(0,0,0,0.4)}
+
+.repoFrame {position: absolute; width: 100%; height: 90%; left: 0px; margin-top: 60px}
+
+.row {position: relative; display: inline-block; background: #ccc; color: #000; width: 880px; padding: 10px 7px; margin-bottom: 2px; cursor: pointer; padding-left: 35px}
+.row:hover {background: #888; color: #fff}
+.row .icon {display: inline-block; width: 16px; height: 16px; margin-right: 7px; background-image:url('../../images/file-folder-icons.png'); background-repeat: no-repeat}
+.row .checkbox {position: absolute; display: inline-block; height: 38px; width: 30px; top: -4px; left: 0px}
+.rowContent {position: relative; display: none; background: #eee; width: 100%; height: 300px; padding: 7px; margin-bottom: 10px; overflow: auto}
+.pullGithub {position: absolute; display: inline-block; top: 7px; left: 822px; padding: 5px; background: #bbb; color: #444; font-size: 10px; cursor: pointer}
+.pullGithubSel {position: absolute; display: inline-block; top: 7px; left: 822px; margin-top: 12px; margin-left: -22px; padding: 5px; background: #bbb; color: #444; font-size: 10px; cursor: pointer}
+.version {position: absolute; display: inline-block; width: 100px; left: 1000px; top: 33px; font-size: 10px; color: #bbb; text-align: right}
+.logo {position: absolute; left: 1107px; top: 12px}
+
+.commitPane {position: fixed; background: #ccc; width: 270px; height: 300px; left: 960px; top: 0px; padding: 20px 10px 10px 10px; z-index: 100}
+.infoPane {position: fixed; width: 270px; height: 100px; left: 960px; top: 340px; padding: 20px 10px 10px 10px; z-index: 100}
+
+/* Folder */
+.ext-folder {background-position: 0 0}
+
+/* Additional file types */
+.ext-coffee {background-position: -48px 0}
+.ext-css {background-position: -64px 0}
+.ext-gif {background-position: -80px 0}
+.ext-htm {background-position: -96px 0}
+.ext-html {background-position: -96px 0}
+.ext-jpg {background-position: -112px 0}
+.ext-jpeg {background-position: -112px 0}
+.ext-js {background-position: -128px 0}
+.ext-less {background-position: -144px 0}
+.ext-php {background-position: -160px 0}
+.ext-png {background-position: -176px 0}
+.ext-rb {background-position: -192px 0}
+.ext-rbx {background-position: -192px 0}
+.ext-rhtml {background-position: -192px 0}
+.ext-ruby {background-position: -192px 0}
+.ext-txt {background-position: -208px 0}
+.ext-zip {background-position: -224px 0}
+.ext-file {background-position: -32px 0}
+
+table.diff {color: #888; border: 0; white-space: pre-wrap}
+table.diff tbody th {color:#888; font-size: 11px; font-weight: normal; padding: 2px; vertical-align:top}
+table.diff thead th.texttitle {background: #444; color: #fff; text-align:left; padding: 2px}
+table.diff tbody td {width: 100%; font-family: Courier, monospace; vertical-align: top}
+table.diff .delete {background: #0b0; color: #fff}
+table.diff .insert {background: #b00; color: #fff}
+table.diff th.author {display: none}

plugins/ice-repo/ice-repo.js

@@ -0,0 +1,336 @@
+top.selRowArray = [];
+top.selRepoDirArray = [];
+top.selActionArray = [];
+top.filetypesArray = ['coffee','css','gif','htm','html','jpg','jpeg','js','less','php','png','rb','rbx','rhtml','ruby','txt','zip'];
+
+doRepo = function(repo) {
+	document.showRepo.repo.value = repo;
+	document.showRepo.submit();
+}
+
+updateSelection = function(elem,row,repoDir,action) {
+	if (elem.checked) {
+		top.selRowArray.push(row);
+		top.selRepoDirArray.push(repoDir);
+		top.selActionArray.push(action);
+	} else {
+		arrayIndex = top.selRowArray.indexOf(row);
+		top.selRowArray.splice(arrayIndex,1);
+		top.selRepoDirArray.splice(arrayIndex,1);
+		top.selActionArray.splice(arrayIndex,1);
+	};
+}
+
+getContent = function(thisRow,path) {
+	if("undefined" == typeof overOption || !overOption) {
+		if ("undefined" == typeof lastRow || lastRow!=thisRow || get('row'+thisRow+'Content').innerHTML=="") {
+			for (i=1;i<=rowID;i++) {
+				get('row'+i+'Content').innerHTML = "";
+				get('row'+i+'Content').style.display = "none";
+			}
+			repo = top.repo + "/" + path;
+			dir = top.path + "/" + path;
+			document.fcForm.rowID.value = thisRow;
+			document.fcForm.repo.value = repo;
+			document.fcForm.dir.value = dir;
+			document.fcForm.action.value = "view";
+			document.fcForm.submit();
+		} else {
+			get('row'+thisRow+'Content').innerHTML = "";
+			get('row'+thisRow+'Content').style.display = "none";
+		}
+		lastRow = thisRow;
+	}
+}
+	
+commitChanges = function() {
+	if(top.selRowArray.length>0) {
+		if (document.fcForm.title.value!="Title..." && document.fcForm.message.value!="Message...") {
+			get('blackMask','top').style.display = "block";
+			top.selRowValue = "";
+			top.selDirValue = "";
+			top.selRepoValue = "";
+			top.selActionValue = "";
+			for (i=0;i<top.selRowArray.length;i++) {
+				top.selRowValue += top.selRowArray[i];
+				if (top.selActionArray[i]=="changed") {
+					top.selDirValue += top.selRepoDirArray[i].split('@')[0];
+					top.selRepoValue += top.selRepoDirArray[i].split('@')[1];
+				}
+				if (top.selActionArray[i]=="new") {
+					top.selDirValue += top.selRepoDirArray[i];
+					top.selRepoValue += "";
+				}
+				if (top.selActionArray[i]=="deleted") {
+					top.selDirValue += "";
+					top.selRepoValue += top.selRepoDirArray[i];
+				}
+				top.selActionValue += top.selActionArray[i];
+				if (i<top.selRowArray.length-1) {
+					top.selRowValue += ",";
+					top.selDirValue += ",";
+					top.selRepoValue += ",";
+					top.selActionValue += ",";
+				}
+			}
+			document.fcForm.rowID.value = top.selRowValue;
+			document.fcForm.dir.value = top.selDirValue;
+			document.fcForm.repo.value = top.selRepoValue;
+			document.fcForm.action.value = top.selActionValue;
+			document.fcForm.submit();
+		} else {
+			alert('Please enter a title & message for the commit');		
+		}
+	} else {
+		alert('Please select some files/folders to commit');
+	}
+	return false;
+}
+
+pullContent = function(thisRow,thisPath,thisRepo,thisAction) {
+	get('blackMask','top').style.display = "block";
+	if (thisRow=="selected") {
+		top.selRowValue = "";
+		top.selDirValue = "";
+		top.selRepoValue = "";
+		top.selActionValue = "";
+		for (i=0;i<top.selRowArray.length;i++) {
+			top.selRowValue += top.selRowArray[i];
+			if (top.selActionArray[i]=="changed") {
+				repoUser = top.selRepoDirArray[i].split('@')[1].split('/')[0];
+				repoName = top.selRepoDirArray[i].split('@')[1].split('/')[1];
+				top.selDirValue += top.selRepoDirArray[i].split('@')[0];
+				top.selRepoValue += top.selRepoDirArray[i].split('@')[1].replace(repoUser+"/"+repoName+"/","");
+			}
+			if (top.selActionArray[i]=="new") {
+				top.selDirValue += top.selRepoDirArray[i];
+				top.selRepoValue += "";
+			}
+			if (top.selActionArray[i]=="deleted") {
+				repoUser = top.selRepoDirArray[i].split('/')[0];
+				repoName = top.selRepoDirArray[i].split('/')[1];
+				top.selDirValue += "";
+				top.selRepoValue += top.selRepoDirArray[i].replace(repoUser+"/"+repoName+"/","");
+			}
+			top.selActionValue += top.selActionArray[i];
+			if (i<top.selRowArray.length-1) {
+				top.selRowValue += ",";
+				top.selDirValue += ",";
+				top.selRepoValue += ",";
+				top.selActionValue += ",";
+			}
+		}
+	} else {
+		top.selRowValue = thisRow;
+		top.selDirValue = thisPath;
+		top.selRepoValue = thisRepo;
+		top.selActionValue = thisAction;
+	}
+	top.fcFormAlias.rowID.value = top.selRowValue;
+	top.fcFormAlias.dir.value = top.selDirValue;
+	top.fcFormAlias.repo.value = top.selRepoValue;
+	top.fcFormAlias.action.value = "PULL:"+top.selActionValue;
+	top.fcFormAlias.submit();
+}
+
+getData = function() {
+	if (actionArray[0]!="new") {
+		repo.read('master', repoArray[0], function(err, data) {
+			document.fcForm['repoContents'+rowIDArray[0]].innerHTML=data;
+			if(!err) {
+				removeFirstArrayItems();
+				rowIDArray.length>0 ? getData() : document.fcForm.submit();
+			} else {
+				alert('Sorry, there was an error reading '+repoArray[0]);
+			}
+		});
+	} else {
+		removeFirstArrayItems();
+		rowIDArray.length>0 ? getData() : document.fcForm.submit();
+	}
+}
+	
+sendData = function(baseTextName,newTextName) {
+	repo.read('master', filePath, function(err, data) {
+		dirContent = document.fcForm.fileContents.value;
+		repoContent = data;
+		diffUsingJS(dirContent,repoContent,baseTextName,newTextName);
+		get("row"+rowID+"Content","parent").style.display = "inline-block";
+	});
+}
+	
+removeFirstArrayItems = function() {
+	rowIDArray.splice(0,1);
+	repoArray.splice(0,1);
+	dirArray.splice(0,1);
+	actionArray.splice(0,1);	
+}
+	
+hideRow = function(row) {
+	top.rowCount--;
+	updateInfo('parent');
+	get('checkbox'+row,'parent').checked=false;
+	parent.updateSelection(get('checkbox'+row,'parent'));
+	get('row'+row,'parent').style.display = get('row'+row+'Content','parent').style.display = "none";
+}
+
+function diffUsingJS (dirContent,repoContent,baseTextName,newTextName) {
+	var base = difflib.stringAsLines(dirContent);
+	var newtxt = difflib.stringAsLines(repoContent);
+	var sm = new difflib.SequenceMatcher(base, newtxt);
+	var opcodes = sm.get_opcodes();
+	var diffoutputdiv = get("row"+rowID+"Content","parent");
+	while (diffoutputdiv.firstChild) diffoutputdiv.removeChild(diffoutputdiv.firstChild);
+	var contextSize = ""; // optional
+	contextSize = contextSize ? contextSize : null;
+	diffoutputdiv.appendChild(
+		diffview.buildView(
+			{
+			baseTextLines:base,
+			newTextLines:newtxt,
+			opcodes:opcodes,
+			baseTextName:baseTextName,
+			newTextName:newTextName,
+			contextSize:contextSize,
+			viewType: 1 // 0 = side by side, 1 = inline
+			}
+		)
+	)
+}
+	
+// Add or Update files...
+ffAddOrUpdate = function(row,gitRepo,action) {
+	repo.write('master', gitRepo, document.fcForm['fileContents'+row].value,parent.document.fcForm.title.value+ '\n\n'+parent.document.fcForm.message.value, function(err) {
+		if(!err) {
+			removeFirstArrayItems();
+			hideRow(row);
+			top.newCount--;
+			rowIDArray.length>0 ? startProcess() : get('blackMask','top').style.display = "none";
+		} else {
+			alert('Sorry, there was an error adding '+gitRepo);
+		}
+	});
+}
+// Delete files...
+ffDelete = function(row,gitRepo,action) {
+	repo.remove('master', gitRepo, function(err) {
+		if(!err) {
+			removeFirstArrayItems();
+			hideRow(row);
+			top.deletedCount--;
+			rowIDArray.length>0 ? startProcess() : get('blackMask','top').style.display = "none";
+		} else {
+			alert('Sorry, there was an error deleting '+gitRepo);
+		}
+	});
+}
+
+startProcess = function() {
+	if(actionArray[0]=="changed"||actionArray[0]=="new") {
+		if(actionArray[0]=="changed")	{repoLoc = repoArray[0].replace(repoUser+"/"+repoName+"/","")}
+		if(actionArray[0]=="new")		{repoLoc = dirArray[0].replace(top.path,'')}
+		ffAddOrUpdate(rowIDArray[0],repoLoc,actionArray[0]);
+	}
+	if(actionArray[0]=="deleted") {
+		repoLoc = repoArray[0].replace(repoUser+"/"+repoName+"/","");
+		ffDelete(rowIDArray[0],repoLoc,actionArray[0]);
+	}
+}	
+
+get = function(elem,context) {
+	return context ? window[context].document.getElementById(elem) : document.getElementById(elem);
+}
+	
+updateInfo = function(context) {
+	get('infoPane',context).innerHTML = "<b style='font-size: 18px'>INFO:</b><br><br><b>"+top.rowCount+" files</b><br><br>"+top.changedCount+" changed<br>"+top.newCount+" new<br>"+top.deletedCount+" deleted";		
+}
+	
+gitCommand = function(comm,value) {
+	if (comm=="repo.show") {
+		userRepo = value.split("@")[0].split("/");
+		dir = value.split("@")[1];		
+		var repo = github.getRepo(userRepo[0],userRepo[1]);
+		rowID = 0;
+ 		repo.getTree('master?recursive=true', function(err, tree) {
+			for (i=0;i<tree.length;i++) {
+				repoListArray.push(tree[i].path);
+				repoSHAArray.push(tree[i].sha);
+			}
+			var c = "", n = "", d = "";
+			top.rowCount=0, top.changedCount=0, top.newCount=0, top.deletedCount=0;
+			for (i=0;i<dirListArray.length;i++) {
+				repoArrayPos = repoListArray.indexOf(dirListArray[i]);
+				ext = dirTypeArray[i]=="dir"
+					? "folder"
+					: dirListArray[i].substr(dirListArray[i].lastIndexOf('.')+1);
+				if (repoArrayPos == "-1") {
+					rowID++;
+					sE = ext == 'folder' ? ' style="cursor: default"' : '';
+					cE = ext != 'folder' ? ' onClick="getContent('+rowID+',\''+dirListArray[i]+'\')"' : '';
+					gE = 'onClick="pullContent('+rowID+',\''+top.path+'/'+dirListArray[i]+'\',\''+dirListArray[i]+'\',\'new\')"';
+					
+					n += "<div class='row' id='row"+rowID+"'"+cE+sE+">";
+					n += "<input type='checkbox' class='checkbox' id='checkbox"+rowID+"' onMouseOver='overOption=true' onMouseOut='overOption=false' onClick='updateSelection(this,"+rowID+",\""+top.path+"/"+dirListArray[i]+"\",\"new\")'>";
+					if (ext != 'folder' && top.filetypesArray.indexOf(ext)==-1) {ext = 'file'};
+					n += "<div class='icon ext-"+ext+"'></div>"+dirListArray[i];
+					n += "<div class='pullGithub' style='left: 815px' onMouseOver='overOption=true' onMouseOut='overOption=false' "+gE+">Delete from server</div><br>";
+					n += "</div>";
+					
+					n += "<span class='rowContent' id='row"+rowID+"Content'></span>";
+					top.rowCount++;
+					top.newCount++;
+					
+				} else if (dirTypeArray[i] == "file" && dirSHAArray[i] != repoSHAArray[repoArrayPos]) {
+					rowID++;
+					sE = ext == 'folder' ? ' style="cursor: default"' : '';
+					cE = ext != 'folder' ? ' onClick="getContent('+rowID+',\''+dirListArray[i]+'\')"' : '';
+					gE = 'onClick="pullContent('+rowID+',\''+top.path+'/'+dirListArray[i]+'\',\''+dirListArray[i]+'\',\'changed\')"';
+					
+					c += "<div class='row' id='row"+rowID+"'"+cE+sE+">";
+					c += "<input type='checkbox' class='checkbox' id='checkbox"+rowID+"' onMouseOver='overOption=true' onMouseOut='overOption=false' onClick='updateSelection(this,"+rowID+",\""+top.path+"/"+dirListArray[i]+"@"+top.repo+"/"+dirListArray[i]+"\",\"changed\")'>";
+					if (ext != 'folder' && top.filetypesArray.indexOf(ext)==-1) {ext = 'file'};
+					c += "<div class='icon ext-"+ext+"'></div>"+dirListArray[i];
+					c += "<div class='pullGithub' onMouseOver='overOption=true' onMouseOut='overOption=false' "+gE+">Pull from Github</div><br>";
+					c += "</div>";
+					
+					c += "<span class='rowContent' id='row"+rowID+"Content'></span>";
+					top.rowCount++;
+					top.changedCount++;
+				}
+			}
+			
+			for (i=0;i<repoListArray.length;i++) {
+				dirArrayPos = dirListArray.indexOf(repoListArray[i]);
+				ext = repoListArray[i].lastIndexOf('/') > repoListArray[i].lastIndexOf('.')
+					? "folder"
+					: repoListArray[i].substr(repoListArray[i].lastIndexOf('.')+1);
+				if (dirArrayPos == "-1") {
+					rowID++;
+					sE = ext == 'folder' ? ' style="cursor: default"' : '';
+					cE = ext != 'folder' ? ' onClick="getContent('+rowID+',\''+repoListArray[i]+'\')"' : '';
+					gE = 'onClick="pullContent('+rowID+',\''+top.path+'/'+repoListArray[i]+'\',\''+repoListArray[i]+'\',\'deleted\')"';
+					
+					d += "<div class='row' id='row"+rowID+"'"+cE+sE+">";
+					d += "<input type='checkbox' class='checkbox' id='checkbox"+rowID+"' onMouseOver='overOption=true' onMouseOut='overOption=false' onClick='updateSelection(this,"+rowID+",\""+top.repo+"/"+repoListArray[i]+"\",\"deleted\")'>";
+					if (ext != 'folder' && top.filetypesArray.indexOf(ext)==-1) {ext = 'file'};
+					d += "<div class='icon ext-"+ext+"'></div>"+repoListArray[i];
+					d += "<div class='pullGithub' onMouseOver='overOption=true' onMouseOut='overOption=false' "+gE+">Pull from Github</div><br>";
+					d += "</div>";
+					
+					d += "<span class='rowContent' id='row"+rowID+"Content'></span>";
+					top.rowCount++;
+					top.deletedCount++;
+				}
+			}
+			
+			c = "<b style='font-size: 18px'>CHANGED FILES:</b><br><br>"+c;
+			n = "<b style='font-size: 18px'>NEW FILES:</b><br><br>"+n;
+			d = "<b style='font-size: 18px'>DELETED FILES:</b><br><br>"+d
+			
+			get('compareList').innerHTML = c+"<br><br>"+n+"<br><br>"+d;
+			updateInfo();
+			get('blackMask','top').style.display='none';
+			}
+		)
+	}
+}

plugins/ice-repo/index.php

@@ -0,0 +1,75 @@
+<?php
+session_start();
+// $_SESSION['loggedIn'] = true;
+if (!$_SESSION['loggedIn']) {
+	die("Sorry, you need to be logged in to use ICErepo");
+}
+
+$docRoot = $_SERVER['DOCUMENT_ROOT'];
+$version = "0.7.2";
+
+// AUTHENTICATION
+// Can either be done by oauth, or username & password.
+// oauth
+$token = "";
+// Basic
+$username = "username";
+$password = "password";
+
+// REPOS & SERVER DIRS
+// Here you identify the repo location and related path on your server
+// (the last param is to identify which dropdown option to select by default).
+$repos = array(
+		"mattpass/dirTree",$docRoot."/dirTree","",
+		"mattpass/CodeMirror2",$docRoot."/CodeMirror2","selected"
+		);
+?>
+<!DOCTYPE html>
+<html>
+<head>
+<title>ICErepo v<?php echo $version;?></title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<script src="lib/base64.js"></script>
+<script src="lib/github.js"></script>
+<script src="ice-repo.js"></script>
+<link rel="stylesheet" type="text/css" href="ice-repo.css">
+</head>
+
+<body style="margin: 0; overflow: hidden" onLoad="doRepo(get('repos').value)">
+	
+<div class="blackMask" id="blackMask" style="display: block">
+	<div id="loadingMsgCenter" class="loadingMsgCenter">
+		<div id="loadingMsgContainer" class="loadingMsgContainer">
+		WORKING...
+		</div>
+	</div>
+</div>
+
+<div class="header">
+	<select name="repos" id="repos" onChange="doRepo(this.value)" style="margin: 20px 0 0 20px">
+	<?php
+	for ($i=0;$i<count($repos);$i+=3) {
+		echo '<option id="repo'.($i/3).'" value="'.$repos[$i].'@'.$repos[$i+1].'"';
+		echo $repos[$i+2]=="selected" ? ' selected' : '';
+		echo '>'.$repos[$i]."</option>\n";
+	}
+	?>
+	</select>
+	
+	<div class="pullGithubSel" onClick="pullContent('selected')">Pull selected from Github</div>
+	<div class="version"><?php echo $version;?></div>
+	<img src="images/ice-repo.gif" alt="ICErepo" class="logo">
+</div>
+
+<form name="showRepo" action="contents.php" target="repo" method="POST">
+<input type="hidden" name="token" value="<?php echo $token;?>">
+<input type="hidden" name="username" value="<?php echo $username;?>">
+<input type="hidden" name="password" value="<?php echo $password;?>">
+<input type="hidden" name="repo" value="">
+</form>
+
+<iframe id="repo" class="repoFrame" frameborder="0"></iframe>
+	
+</body>
+
+</html>

plugins/ice-repo/lib/base64.js

@@ -0,0 +1,5 @@
+// This code was written by Tyler Akins and has been placed in the
+// public domain.  It would be nice if you left this header intact.
+// Base64 code from Tyler Akins -- http://rumkin.com
+
+var Base64=function(){var e="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",t={encode:function(t){var n="",r,i,s,o,u,a,f,l=0;do r=t.charCodeAt(l++),i=t.charCodeAt(l++),s=t.charCodeAt(l++),o=r>>2,u=(r&3)<<4|i>>4,a=(i&15)<<2|s>>6,f=s&63,isNaN(i)?a=f=64:isNaN(s)&&(f=64),n=n+e.charAt(o)+e.charAt(u)+e.charAt(a)+e.charAt(f);while(l<t.length);return n},decode:function(t){var n="",r,i,s,o,u,a,f,l=0;t=t.replace(/[^A-Za-z0-9\+\/\=]/g,"");do o=e.indexOf(t.charAt(l++)),u=e.indexOf(t.charAt(l++)),a=e.indexOf(t.charAt(l++)),f=e.indexOf(t.charAt(l++)),r=o<<2|u>>4,i=(u&15)<<4|a>>2,s=(a&3)<<6|f,n+=String.fromCharCode(r),a!=64&&(n+=String.fromCharCode(i)),f!=64&&(n+=String.fromCharCode(s));while(l<t.length);return n}};return t}();window.Base64=Base64

plugins/ice-repo/lib/github.js

@@ -0,0 +1,11 @@
+// This file contains the HTTP Req Abs, Repo API and getRepo
+// portions of Top Level API from github.com/michael/github.js
+
+// ORIGINAL LIB:
+// Github.js 0.7.0
+// (c) 2012 Michael Aufreiter, Development Seed
+// Github.js is freely distributable under the MIT license.
+// For all details and documentation:
+// http://substance.io/michael/github
+
+(function(){var e,t="https://api.github.com";e=window.Github=function(n){function r(e,r,i,s,o){function u(){var e=t+r;return e+(/\?/.test(e)?"&":"?")+(new Date).getTime()}var a=new XMLHttpRequest;o||(a.dataType="json"),a.open(e,u()),a.onreadystatechange=function(){this.readyState==4&&(this.status>=200&&this.status<300||this.status===304?s(null,o?this.responseText:this.responseText?JSON.parse(this.responseText):!0):s({request:this,error:this.status}))},a.setRequestHeader("Accept","application/vnd.github.raw"),a.setRequestHeader("Content-Type","application/json;charset=UTF-8"),(n.auth=="oauth"&&n.token||n.auth=="basic"&&n.username&&n.password)&&a.setRequestHeader("Authorization",n.auth=="oauth"?"token "+n.token:"Basic "+Base64.encode(n.username+":"+n.password)),i?a.send(JSON.stringify(i)):a.send()}e.Repository=function(e){function u(e,t){if(e===o.branch&&o.sha)return t(null,o.sha);i.getRef("heads/"+e,function(n,r){o.branch=e,o.sha=r,t(n,r)})}var t=e.name,n=e.user,i=this,s="/repos/"+n+"/"+t,o={branch:null,sha:null};this.getRef=function(e,t){r("GET",s+"/git/refs/"+e,null,function(e,n){if(e)return t(e);t(null,n.object.sha)})},this.createRef=function(e,t){r("POST",s+"/git/refs",e,t)},this.deleteRef=function(t,n){r("DELETE",s+"/git/refs/"+t,e,n)},this.listBranches=function(e){r("GET",s+"/git/refs/heads",null,function(t,n){if(t)return e(t);e(null,_.map(n,function(e){return _.last(e.ref.split("/"))}))})},this.getBlob=function(e,t){r("GET",s+"/git/blobs/"+e,null,t,"raw")},this.getSha=function(e,t,n){if(t==="")return i.getRef("heads/"+e,n);i.getTree(e+"?recursive=true",function(e,r){var i=_.select(r,function(e){return e.path===t})[0];n(null,i?i.sha:null)})},this.getTree=function(e,t){r("GET",s+"/git/trees/"+e,null,function(e,n){if(e)return t(e);t(null,n.tree)})},this.postBlob=function(e,t){typeof e=="string"&&(e={content:e,encoding:"utf-8"}),r("POST",s+"/git/blobs",e,function(e,n){if(e)return t(e);t(null,n.sha)})},this.updateTree=function(e,t,n,i){var o={base_tree:e,tree:[{path:t,mode:"100644",type:"blob",sha:n}]};r("POST",s+"/git/trees",o,function(e,t){if(e)return i(e);i(null,t.sha)})},this.postTree=function(e,t){r("POST",s+"/git/trees",{tree:e},function(e,n){if(e)return t(e);t(null,n.sha)})},this.commit=function(t,n,i,u){var a={message:i,author:{name:e.username},parents:[t],tree:n};r("POST",s+"/git/commits",a,function(e,t){o.sha=t.sha;if(e)return u(e);u(null,t.sha)})},this.updateHead=function(e,t,n){r("PATCH",s+"/git/refs/heads/"+e,{sha:t},function(e,t){n(e)})},this.show=function(e){r("GET",s,null,e)},this.contents=function(e,t){r("GET",s+"/contents",{path:e},t)},this.fork=function(e){r("POST",s+"/forks",null,e)},this.createPullRequest=function(e,t){r("POST",s+"/pulls",e,t)},this.read=function(e,t,n){i.getSha(e,t,function(e,t){if(!t)return n("not found",null);i.getBlob(t,function(e,r){n(e,r,t)})})},this.remove=function(e,t,n){u(e,function(r,s){i.getTree(s+"?recursive=true",function(r,o){var u=_.reject(o,function(e){return e.path===t});_.each(u,function(e){e.type==="tree"&&delete e.sha}),i.postTree(u,function(r,o){i.commit(s,o,"Deleted "+t,function(t,r){i.updateHead(e,r,function(e){n(e)})})})})})},this.move=function(e,t,n,r){u(e,function(s,o){i.getTree(o+"?recursive=true",function(s,u){_.each(u,function(e){e.path===t&&(e.path=n),e.type==="tree"&&delete e.sha}),i.postTree(u,function(n,s){i.commit(o,s,"Deleted "+t,function(t,n){i.updateHead(e,n,function(e){r(e)})})})})})},this.write=function(e,t,n,r,s){u(e,function(o,u){if(o)return s(o);i.postBlob(n,function(n,o){if(n)return s(n);i.updateTree(u,t,o,function(t,n){if(t)return s(t);i.commit(u,n,r,function(t,n){if(t)return s(t);i.updateHead(e,n,s)})})})})}},e.Gist=function(e){var t=e.id,n=this,i="/gists/"+t;this.read=function(e){r("GET",i,null,function(t,n){e(t,n)})},this.delete=function(e){r("DELETE",i,null,function(t,n){e(t,n)})},this.fork=function(e){r("POST",i+"/fork",null,function(t,n){e(t,n)})},this.update=function(e,t){r("PATCH",i,e,function(e,n){t(e,n)})}},this.getRepo=function(t,n){return new e.Repository({user:t,name:n})}}}).call(this)

plugins/ice-repo/lib/underscore-min.js

@@ -0,0 +1,12 @@
+//     This file contains the select, reject, forEach and has functions
+//     from underscore.js, then minified to make it extra tiny
+
+//     Underscore.js 1.3.3
+//     (c) 2009-2012 Jeremy Ashkenas, DocumentCloud Inc.
+//     Underscore may be freely distributed under the MIT license.
+//     Portions of Underscore are inspired or borrowed from Prototype,
+//     Oliver Steele's Functional, and John Resig's Micro-Templating.
+//     For all details and documentation:
+//     http://documentcloud.github.com/underscore
+
+(function(){var e=this,t=Array.prototype,n=Object.prototype,r=t.forEach,i=t.filter,s=n.hasOwnProperty,o={};_=function(obj) {return new wrapper(obj);};_.filter=_.select=function(e,t,n){var r=[];return e==null?r:i&&e.filter===i?e.filter(t,n):(u(e,function(e,i,s){t.call(n,e,i,s)&&(r[r.length]=e)}),r)},_.reject=function(e,t,n){var r=[];return e==null?r:(u(e,function(e,i,s){t.call(n,e,i,s)||(r[r.length]=e)}),r)};var u=_.each=_.forEach=function(e,t,n){if(e==null)return;if(r&&e.forEach===r)e.forEach(t,n);else if(e.length===+e.length){for(var i=0,s=e.length;i<s;i++)if(i in e&&t.call(n,e[i],i,e)===o)return}else for(var u in e)if(_.has(e,u)&&t.call(n,e[u],u,e)===o)return};_.has=function(e,t){return s.call(e,t)}}).call(this)

plugins/terminal/index.php

@@ -0,0 +1,201 @@
+<?php
+include("../../lib/settings.php");
+if ($demoMode || !$_SESSION['loggedIn']) {
+	die("You must be logged in to access Terminal");
+}
+
+error_reporting(E_ALL);
+@session_start();
+
+if (isset($_SERVER['PHP_AUTH_USER'])) {
+	$_SESSION['user'] = $_SERVER['PHP_AUTH_USER'];
+	$_SESSION['pass'] = generateHash(strClean($_SERVER['PHP_AUTH_PW']),$ICEcoder["accountPassword"]);
+}
+$passwd = array($_SESSION['user'] => $ICEcoder["accountPassword"]);
+$aliases = array('la' 	=> 'ls -la',
+		'll' 	=> 'ls -lvhF',
+		'dir'	=> 'ls' );
+
+class phpTerm {
+	function phpTerm() {} // constructor
+
+	function formatPrompt() {
+		$user=shell_exec("whoami");
+		$host=explode(".", shell_exec("uname -n"));
+		$_SESSION['prompt'] = "".rtrim($user).""."@"."".rtrim($host[0])."";
+	}
+
+	function checkPassword($passwd) {
+		if(	!isset($_SERVER['PHP_AUTH_USER'])||
+			!isset($_SERVER['PHP_AUTH_PW']) ||
+			!isset($passwd[$_SERVER['PHP_AUTH_USER']]) ||
+			$passwd[$_SERVER['PHP_AUTH_USER']] != $_SESSION['pass']) 	{
+			return false;
+		} else {
+			return true;
+		}
+	}
+
+	function logout() {
+		header('WWW-Authenticate: Basic realm="Terminal"');
+		header('HTTP/1.0 401 Unauthorized');
+		exit();
+	}
+
+	function initVars() {
+		if (empty($_SESSION['cwd']) || @!empty($_GET['reset'])) {
+			$_SESSION['cwd'] = getcwd();
+			$_SESSION['history'] = array();
+			$_SESSION['output'] = '';
+			$_REQUEST['command'] ='';
+		}
+	}
+
+	function buildCommandHistory() {
+		if(!empty($_REQUEST['command'])) {
+			if(get_magic_quotes_gpc()) {
+				$_REQUEST['command'] = stripslashes($_REQUEST['command']);
+			}
+	
+			// drop old commands from list if exists
+			if (($i = array_search($_REQUEST['command'], $_SESSION['history'])) !== false) {
+				unset($_SESSION['history'][$i]);
+			}
+			array_unshift($_SESSION['history'], $_REQUEST['command']);
+
+			// append commmand */
+			$_SESSION['output'] .= "{$_SESSION['prompt']}".":>"."{$_REQUEST['command']}"."\n";
+		}
+	}
+
+	function buildJavaHistory() {
+		// build command history for use in the JavaScript 
+		if (empty($_SESSION['history'])) {
+			$_SESSION['js_command_hist'] = '""';
+		} else {
+			$escaped = array_map('addslashes', $_SESSION['history']);
+			$_SESSION['js_command_hist'] = '"", "' . implode('", "', $escaped) . '"';
+		}
+	}
+
+	function outputHandle($aliases) {
+		if (preg_match('/^[[:blank:]]*cd[[:blank:]]*$/', @$_REQUEST['command']))
+		{
+			$_SESSION['cwd'] = getcwd(); //dirname(__FILE__);
+		}
+		elseif(preg_match('/^[[:blank:]]*cd[[:blank:]]+([^;]+)$/', @$_REQUEST['command'], $regs)) {
+			// The current command is 'cd', which we have to handle as an internal shell command. 
+			// absolute/relative path ?"
+			($regs[1][0] == '/') ? $new_dir = $regs[1] : $new_dir = $_SESSION['cwd'] . '/' . $regs[1];
+		
+			// cosmetics 
+			while (strpos($new_dir, '/./') !== false) {
+				$new_dir = str_replace('/./', '/', $new_dir);
+			}
+			while (strpos($new_dir, '//') !== false) {
+				$new_dir = str_replace('//', '/', $new_dir);
+			}
+			while (preg_match('|/\.\.(?!\.)|', $new_dir)) {
+				$new_dir = preg_replace('|/?[^/]+/\.\.(?!\.)|', '', $new_dir);
+			}
+
+			if(empty($new_dir)): $new_dir = "/"; endif;
+
+			(@chdir($new_dir)) ? $_SESSION['cwd'] = $new_dir : $_SESSION['output'] .= "could not change to: $new_dir\n";
+		} else {
+			/* The command is not a 'cd' command, so we execute it after
+			changing the directory and save the output. */
+			chdir($_SESSION['cwd']);
+
+			/* Alias expansion. */
+			$length = strcspn(@$_REQUEST['command'], " \t");
+			$token = substr(@$_REQUEST['command'], 0, $length);
+			if (isset($aliases[$token]))
+			$_REQUEST['command'] = $aliases[$token] . substr($_REQUEST['command'], $length);
+		
+			$p = proc_open(@$_REQUEST['command'],
+				array(1 => array('pipe', 'w'),
+				2 => array('pipe', 'w')), $io);
+	
+			/* Read output sent to stdout. */
+			while (!feof($io[1])) {
+				$_SESSION['output'] .= htmlspecialchars(fgets($io[1]),ENT_COMPAT, 'UTF-8');
+			}
+			/* Read output sent to stderr. */
+			while (!feof($io[2])) {
+				$_SESSION['output'] .= htmlspecialchars(fgets($io[2]),ENT_COMPAT, 'UTF-8');
+			}
+			
+			fclose($io[1]);
+			fclose($io[2]);
+			proc_close($p);
+		}
+	}
+}
+
+$terminal = new phpTerm;
+
+if ($_REQUEST['command']=="logout") {
+	$terminal->logout();
+}
+
+if(!$terminal->checkPassword($passwd)) {
+	header('WWW-Authenticate: Basic realm="Terminal"');
+	header('HTTP/1.0 401 Unauthorized');
+} else {
+	$terminal->initVars();
+	$terminal->buildCommandHistory();
+	$terminal->buildJavaHistory();
+	if(!isset($_SESSION['prompt'])):$terminal->formatPrompt(); endif;
+	$terminal->outputHandle($aliases);
+?>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+<title>PHP Terminal</title>
+<link rel="stylesheet" type="text/css" href="terminal.css" />  
+<script type="text/javascript" language="JavaScript">
+var current_line = 0;
+var command_hist = new Array(<?php echo $_SESSION['js_command_hist']; ?>);
+var last = 0;
+	
+function key(e) {
+	if (!e) var e = window.event;
+	if (e.keyCode == 38 && current_line < command_hist.length-1) {
+		command_hist[current_line] = document.shell.command.value;
+		current_line++;
+		document.shell.command.value = command_hist[current_line];
+	}
+	if (e.keyCode == 40 && current_line > 0) {
+		command_hist[current_line] = document.shell.command.value;
+		current_line--;
+		document.shell.command.value = command_hist[current_line];
+	}
+}
+
+function init() {
+	document.shell.setAttribute("autocomplete", "off");
+	document.shell.output.scrollTop = document.shell.output.scrollHeight;
+	document.shell.command.focus();
+}
+
+</script>
+</head>
+
+<body onload="init()">
+
+<div class="head"><?php echo $_SESSION['prompt'].":"."$_SESSION[cwd]"; ?></div>
+
+<form name="shell" action="<?php echo $_SERVER['PHP_SELF'];?>" method="post">
+	<textarea name="output" readonly="readonly" rows="24"><?php
+		$lines = substr_count($_SESSION['output'], "\n");
+		$padding = str_repeat("\n", max(0, 25 - $lines));
+		echo "\n\n".trim($padding . $_SESSION['output'])."\n";
+	?>
+	</textarea>
+	<p class="commandLine">$&gt; <input class="command" name="command" type="text"  size='50' onkeyup="key(event)" tabindex="1"></p>
+</form>
+
+</body>
+</html>
+<?php } ?>

plugins/terminal/terminal.css

@@ -0,0 +1,28 @@
+/* First, reset everything to a standard */
+html, body, div, span, applet, object, iframe,
+h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+a, abbr, acronym, address, big, cite, code,
+del, dfn, em, font, img, ins, kbd, q, s, samp,
+small, strike, strong, sub, sup, tt, var,
+b, u, i, center,
+dl, dt, dd, ol, ul, li,
+fieldset, form, input, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td {
+	font-family: verdana, arial, monospace, sans-serif;
+	border: 0;
+	margin: 0;
+	padding: 0;
+	outline: 0;
+	font-size: 12px;
+	vertical-align: top;
+}
+
+html, body {width: 100%; height: 100%; background: #000}
+
+.head {position: fixed; top: 0; padding: 2px; background: rgba(124,124,124,0.8); color: #fff; font-weight: bold; z-index: 1}
+textarea {position: absolute; display: block; top: 0; padding: 0; width: 100%; height: 100%; min-height: 100%; border: 0; background: #000; color: #0c0}
+textarea:focus {outline: none}
+p {color: #0c0}
+.commandLine {position: fixed; width: 100%; bottom: 0; padding: 2px; background: rgba(32,32,32,0.9); z-index: 1}
+.command {width: 95%; font-family: verdana, arial, monospace, sans-serif; border: none; background: transparent; color: #0c0}
+.command:focus {outline: none}

plugins/zip-it/index.php

@@ -1,6 +1,6 @@
 <?php
 // -----------------------------------------------
-// Zip-It! for ICEcoder v0.9.3 by Matt Pass
+// Zip-It! for ICEcoder v0.9.5 by Matt Pass
 // Will backup requested files/folders in ICEcoder
 // and remove old backups older than $keepLastDays
 // -----------------------------------------------
@@ -13,12 +13,12 @@ include("../../lib/settings.php");
 </head>
 <body>
 <?
-$zipItSaveLocation = '../../backups/';
-if ($_GET['zip']=="|") {$zipItFileName = "root";} else {$zipItFileName = str_replace("|","_",strClean($_GET['zip']));};
-$zipItFileName .= '-'.time().'.zip';
+$saveLocation = '../../backups/';
+$_GET['zip']=="|" ? $fileName = "root" : $fileName = str_replace("|","_",strClean($_GET['zip']));
+$fileName .= '-'.time().'.zip';
 $keepLastDays = 7;
 
-if (!is_dir($zipItSaveLocation)) {mkdir($zipItSaveLocation, 0777);}
+if (!is_dir($saveLocation)) {mkdir($saveLocation, 0777);}
 Class zipIt {
 	public function zipFilesUp($zipDir,$zipFile,$keepLastDays,$docRoot) {
 		$zipName = $zipDir.$zipFile;
@@ -34,7 +34,7 @@ Class zipIt {
 				$dir = dir($currentDir);
 				while (false !== ($node = $dir->read())) {
 					if (($node == '.') || ($node == '..')) {continue;}
-					if (is_dir($currentDir.$node) && !strpos($currentDir.$node,"_coder")) { 
+					if (is_dir($currentDir.$node) && !strpos($currentDir.$node,"_coder") && !strpos($currentDir.$node,"ICEcoder")) { 
 						array_push($dirStack,$currentDir.$node.'/'); 
 					}
 					if (is_file($currentDir.$node)) {$zipFiles[] = $currentDir.$node;} 
@@ -62,7 +62,7 @@ Class zipIt {
 			foreach($zipFiles as $file) {
 				$canAdd=true;
 				for ($i=0;$i<count($excludeFilesFolders);$i++) {
-					if(strpos($file,$excludeFilesFolders[$i])!==false) {$canAdd=false;};
+					if($excludeFilesFolders[$i] && strpos($file,$excludeFilesFolders[$i])!==false) {$canAdd=false;};
 				}
 				if ($canAdd==true) {
 					$zip->addFile($file,str_replace($docRoot."/","",$file));
@@ -76,15 +76,15 @@ Class zipIt {
 		}
 	}
 }
-if($_SESSION['userLevel']==10) {
-	$zipItDoZip = new zipIt();
+if($_SESSION['loggedIn']) {
+	$doZip = new zipIt();
 	echo '<script>top.ICEcoder.serverMessage("<b>Zipping Files</b>");</script>';
-	$zipItAddToZip = $zipItDoZip->zipFilesUp($zipItSaveLocation,$zipItFileName,$keepLastDays,$docRoot);
-	if (!$zipItAddToZip) {
-		echo '<script>top.ICEcoder.message("Could not zip files up!");</script>';
-	} else {
-		echo '<script>setTimeout(function(){top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);},500);</script>';
-	}
+	$addToZip = $doZip->zipFilesUp($saveLocation,$fileName,$keepLastDays,$docRoot);
+	echo '<script>';
+	echo !$addToZip
+		? 'top.ICEcoder.message("Could not zip files up!");'
+		: 'setTimeout(function(){top.ICEcoder.serverMessage();top.ICEcoder.serverQueue("del",0);},500);';
+	echo '</script>';
 }
 ?>
 </body>

snippets/snippet-display.php

@@ -0,0 +1,41 @@
+<?php include("lib/settings.php");?>
+<!DOCTYPE html>
+
+<html style="margin: 0">
+<head>
+<title>ICEcoder v <?php echo $ICEcoder["versionNo"];?> snippet display</title>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<meta name="robots" content="noindex, nofollow">
+<style type="text/css">
+body {background: #fff}
+</style>
+</head>
+
+<body>
+
+<?php
+$snippets = array(
+array(
+	"name"		=> "Function",
+	"replace"	=> "f ",
+	"with"		=> "function ::var::() {\\n\\t::|::\\n}"
+),
+array(
+	"name"		=> "If",
+	"replace"	=> "if",
+	"with"		=> "if (::|::) {\\n\\t\\n}"
+)
+);
+?>
+
+<?php
+for ($i=0;$i<count($snippets);$i++) {
+	echo '<div style="cursor: pointer" onClick="top.ICEcoder.doSnippet(\''.$snippets[$i]['replace'].'\',\''.$snippets[$i]['with'].'\')">'.$snippets[$i]['name'].'</div>';
+}
+;?>
+
+</script>
+
+</body>
+
+</html>