Merge branch 'master' into FS#2388

3 files changed, 29 insertions, 36 deletions

diff --git a/lib/exe/ajax.php b/lib/exe/ajax.php
index 6e2011cd9..1000094bc 100644
--- a/lib/exe/ajax.php
+++ b/lib/exe/ajax.php
@@ -41,7 +41,6 @@ if(function_exists($callfn)){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function ajax_qsearch(){
-    global $conf;
     global $lang;
     global $INPUT;
 
@@ -89,15 +88,12 @@ function ajax_qsearch(){
  * @author Mike Frysinger <vapier@gentoo.org>
  */
 function ajax_suggestions() {
-    global $conf;
-    global $lang;
     global $INPUT;
 
     $query = cleanID($INPUT->post->str('q'));
     if(empty($query)) $query = cleanID($INPUT->get->str('q'));
     if(empty($query)) return;
 
-    $data = array();
     $data = ft_pageLookup($query);
     if(!count($data)) return;
     $data = array_keys($data);
@@ -214,7 +210,6 @@ function ajax_medians(){
  * @author Andreas Gohr <andi@splitbrain.org>
  */
 function ajax_medialist(){
-    global $conf;
     global $NS;
     global $INPUT;
 
@@ -234,13 +229,15 @@ function ajax_medialist(){
  * @author Kate Arzamastseva <pshns@ukr.net>
  */
 function ajax_mediadetails(){
-    global $DEL, $NS, $IMG, $AUTH, $JUMPTO, $REV, $lang, $fullscreen, $conf, $INPUT;
+    global $IMG, $JUMPTO, $REV, $fullscreen, $INPUT;
     $fullscreen = true;
     require_once(DOKU_INC.'lib/exe/mediamanager.php');
 
+    $image = '';
     if ($INPUT->has('image')) $image = cleanID($INPUT->str('image'));
     if (isset($IMG)) $image = $IMG;
     if (isset($JUMPTO)) $image = $JUMPTO;
+    $rev = false;
     if (isset($REV) && !$JUMPTO) $rev = $REV;
 
     html_msgarea();
@@ -255,6 +252,7 @@ function ajax_mediadiff(){
     global $NS;
     global $INPUT;
 
+    $image = '';
     if ($INPUT->has('image')) $image = cleanID($INPUT->str('image'));
     $NS = $INPUT->post->str('ns');
     $auth = auth_quickaclcheck("$NS:*");
@@ -264,6 +262,7 @@ function ajax_mediadiff(){
 function ajax_mediaupload(){
     global $NS, $MSG, $INPUT;
 
+    $id = '';
     if ($_FILES['qqfile']['tmp_name']) {
         $id = $INPUT->post->str('mediaid', $_FILES['qqfile']['name']);
     } elseif ($INPUT->get->has('qqfile')) {
@@ -280,44 +279,33 @@ function ajax_mediaupload(){
 
     if ($_FILES['qqfile']['error']) unset($_FILES['qqfile']);
 
+    $res = false;
     if ($_FILES['qqfile']['tmp_name']) $res = media_upload($NS, $AUTH, $_FILES['qqfile']);
     if ($INPUT->get->has('qqfile')) $res = media_upload_xhr($NS, $AUTH);
 
-    if ($res) $result = array('success' => true,
-        'link' => media_managerURL(array('ns' => $ns, 'image' => $NS.':'.$id), '&'),
-        'id' => $NS.':'.$id, 'ns' => $NS);
-
-    if (!$result) {
+    if($res) {
+        $result = array(
+            'success' => true,
+            'link' => media_managerURL(array('ns' => $ns, 'image' => $NS . ':' . $id), '&'),
+            'id' => $NS . ':' . $id,
+            'ns' => $NS
+        );
+    } else {
         $error = '';
-        if (isset($MSG)) {
-            foreach($MSG as $msg) $error .= $msg['msg'];
+        if(isset($MSG)) {
+            foreach($MSG as $msg) {
+                $error .= $msg['msg'];
+            }
         }
-        $result = array('error' => $msg['msg'], 'ns' => $NS);
+        $result = array(
+            'error' => $error,
+            'ns' => $NS
+        );
     }
     $json = new JSON;
     echo htmlspecialchars($json->encode($result), ENT_NOQUOTES);
 }
 
-function dir_delete($path) {
-    if (!is_string($path) || $path == "") return false;
-
-    if (is_dir($path) && !is_link($path)) {
-        if (!$dh = @opendir($path)) return false;
-
-        while ($f = readdir($dh)) {
-            if ($f == '..' || $f == '.') continue;
-            dir_delete("$path/$f");
-        }
-
-        closedir($dh);
-        return @rmdir($path);
-    } else {
-        return @unlink($path);
-    }
-
-    return false;
-}
-
 /**
  * Return sub index for index view
  *
@@ -359,13 +347,11 @@ function ajax_linkwiz(){
     $id = cleanID($id);
 
     $nsd  = utf8_encodeFN(str_replace(':','/',$ns));
-    $idd  = utf8_encodeFN(str_replace(':','/',$id));
 
     $data = array();
     if($q && !$ns){
 
         // use index to lookup matching pages
-        $pages = array();
         $pages = ft_pageLookup($id,true);
 
         // result contains matches in pages and namespaces
diff --git a/lib/exe/css.php b/lib/exe/css.php
index f273b7ee4..cab7384b2 100644
--- a/lib/exe/css.php
+++ b/lib/exe/css.php
@@ -70,6 +70,7 @@ function css_out(){
         $files[$mediatype] = array();
         // load core styles
         $files[$mediatype][DOKU_INC.'lib/styles/'.$mediatype.'.css'] = DOKU_BASE.'lib/styles/';
+
         // load jQuery-UI theme
         if ($mediatype == 'screen') {
             $files[$mediatype][DOKU_INC.'lib/scripts/jquery/jquery-ui-theme/smoothness.css'] = DOKU_BASE.'lib/scripts/jquery/jquery-ui-theme/';
diff --git a/lib/exe/js.php b/lib/exe/js.php
index 04413b409..8f16f4a96 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -220,6 +220,12 @@ function js_pluginstrings() {
     return $pluginstrings;
 }
 
+/**
+ * Return an two-dimensional array with strings from the language file of current active template.
+ *
+ * - $lang['js'] must be an array.
+ * - Nothing is returned for template without an entry for $lang['js']
+ */
 function js_templatestrings() {
     global $conf;
     $templatestrings = array();