[Jaws-commits] r13292 - in branches/0.8/html/gadgets: FileBrowser Phoo

afz at jaws-project.com afz at jaws-project.com
Sun Aug 5 21:42:00 UTC 2012


Author: afz
Date: 2012-08-05 21:42:00 +0000 (Sun, 05 Aug 2012)
New Revision: 13292

Modified:
   branches/0.8/html/gadgets/FileBrowser/AdminHTML.php
   branches/0.8/html/gadgets/Phoo/AdminHTML.php
Log:
cosmetics for last commit

Modified: branches/0.8/html/gadgets/FileBrowser/AdminHTML.php
===================================================================
--- branches/0.8/html/gadgets/FileBrowser/AdminHTML.php	2012-08-05 21:37:25 UTC (rev 13291)
+++ branches/0.8/html/gadgets/FileBrowser/AdminHTML.php	2012-08-05 21:42:00 UTC (rev 13292)
@@ -381,17 +381,17 @@
         $dir = _t('GLOBAL_LANG_DIRECTION');
         $tpl->SetVariable('.dir', ($dir == 'rtl')? '.' . $dir : '');
 
-        $extraParam = '';
+        $extraParams = '';
         $editor = $GLOBALS['app']->GetEditor();
         if ($editor === 'TinyMCE') {
             $tpl->SetBlock('browse/script');
             $tpl->ParseBlock('browse/script');
         } elseif ($editor === 'CKEditor') {
-            $extraParam = $request->get(array('CKEditor', 'CKEditorFuncNum', 'langCode'), 'get');
-            $extraParam = '&CKEditor='.$extraParam['CKEditor'].
-                          '&CKEditorFuncNum='.$extraParam['CKEditorFuncNum'].
-                          '&langCode='.$extraParam['langCode'];
-            $tpl->SetVariable('ckFuncIndex', $request->get('CKEditorFuncNum', 'get'));
+            $getParams = $request->get(array('CKEditor', 'CKEditorFuncNum', 'langCode'), 'get');
+            $extraParams = '&CKEditor='.$getParams['CKEditor'].
+                           '&CKEditorFuncNum='.$getParams['CKEditorFuncNum'].
+                           '&langCode='.$getParams['langCode'];
+            $tpl->SetVariable('ckFuncIndex', $getParams['CKEditorFuncNum']);
         }
 
         $model = $GLOBALS['app']->LoadGadget('FileBrowser', 'AdminModel');
@@ -436,7 +436,7 @@
 
                 // Directory / File
                 if ($file['is_dir']) {
-                    $url = BASE_SCRIPT. '?gadget=FileBrowser&action=BrowseFile&path='. $file['relative']. $extraParam;
+                    $url = BASE_SCRIPT. '?gadget=FileBrowser&action=BrowseFile&path='. $file['relative']. $extraParams;
                     $link =& Piwi::CreateWidget('Link', $file['filename'], $url);
                     $link->SetID('');
                     $link->SetTitle($file['title']);

Modified: branches/0.8/html/gadgets/Phoo/AdminHTML.php
===================================================================
--- branches/0.8/html/gadgets/Phoo/AdminHTML.php	2012-08-05 21:37:25 UTC (rev 13291)
+++ branches/0.8/html/gadgets/Phoo/AdminHTML.php	2012-08-05 21:42:00 UTC (rev 13292)
@@ -1537,10 +1537,10 @@
         $extraParams = '';
         $editor = $GLOBALS['app']->GetEditor();
         if ($editor === 'CKEditor') {
-            $extraParams = $request->get(array('CKEditor', 'CKEditorFuncNum', 'langCode'), 'get');
-            $extraParams = '&CKEditor='.$extraParam['CKEditor'].
-                           '&CKEditorFuncNum='.$extraParam['CKEditorFuncNum'].
-                           '&langCode='.$extraParam['langCode'];
+            $getParams = $request->get(array('CKEditor', 'CKEditorFuncNum', 'langCode'), 'get');
+            $extraParams = '&CKEditor='.$getParams['CKEditor'].
+                           '&CKEditorFuncNum='.$getParams['CKEditorFuncNum'].
+                           '&langCode='.$getParams['langCode'];
         }
 
         if (!Jaws_Error::IsError($albums) && !empty($albums)) {



More information about the Jaws-commits mailing list