Merge remote-tracking branch 'origin/develop' into fragementOnAccessDriver

c12simple · c12simple · commit f0ed3c866514 · 2015-10-26T12:28:00.000+01:00
diff --git a/core/src/plugins/access.smb/manifest.xml b/core/src/plugins/access.smb/manifest.xml
@@ -22,6 +22,11 @@
 		<external_file filename="plugins/access.fs/manifest.xml" include="registry_contributions/client_configs/*" exclude=""/>
 		<external_file filename="plugins/access.fs/fsActions.xml" include="client_configs/*" exclude=""/>
 		<external_file filename="plugins/access.fs/manifest.xml" include="registry_contributions/hooks/*" exclude=""/>
+        <client_configs>
+            <component_config className="FoldersTree">
+                <property name="display" value="d"/>
+            </component_config>
+        </client_configs>
 	</registry_contributions>
 	<dependencies>
 		<pluginClass pluginName="access.fs"/>
diff --git a/core/src/plugins/core.access/class.AbstractAccessDriver.php b/core/src/plugins/core.access/class.AbstractAccessDriver.php
@@ -550,7 +550,9 @@ public function filterUserSelectionToHidden($files)
     public function filterNodeName($nodePath, $nodeName, &$isLeaf, $lsOptions)
     {
         $showHiddenFiles = $this->getFilteredOption("SHOW_HIDDEN_FILES", $this->repository->getId());
-        $isLeaf = (is_file($nodePath."/".$nodeName) || AJXP_Utils::isBrowsableArchive($nodeName));
+        if($isLeaf === ""){
+            $isLeaf = (is_file($nodePath."/".$nodeName) || AJXP_Utils::isBrowsableArchive($nodeName));
+        }
         if (AJXP_Utils::isHidden($nodeName) && !$showHiddenFiles) {
             return false;
         }
diff --git a/core/src/plugins/core.conf/class.AbstractConfDriver.php b/core/src/plugins/core.conf/class.AbstractConfDriver.php
@@ -1240,8 +1240,10 @@ public function switchAction($action, $httpVars, $fileVars)
                 } else if (isSet($httpVars["binary_id"])) {
                     if (isSet($httpVars["user_id"]) && AuthService::getLoggedUser() != null && AuthService::getLoggedUser()->isAdmin()) {
                         $context = array("USER" => $httpVars["user_id"]);
-                    } else {
+                    } else if(AuthService::getLoggedUser() !== null) {
                         $context = array("USER" => AuthService::getLoggedUser()->getId());
+                    } else {
+                        $context = array();
                     }
                     $this->loadBinary($context, $httpVars["binary_id"]);
                 }
diff --git a/core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php b/core/src/plugins/core.notifications/class.AJXP_NotificationCenter.php
@@ -202,7 +202,7 @@ public function loadUserFeed($actionName, $httpVars, $fileVars)
                         continue;
                     }
                     try {
-                        $node->loadNodeInfo();
+                        @$node->loadNodeInfo();
                     } catch (Exception $e) {
                         continue;
                     }
diff --git a/core/src/plugins/core.notifications/manifest.xml b/core/src/plugins/core.notifications/manifest.xml
@@ -105,12 +105,12 @@
                 <processing>
                     <clientCallback><![CDATA[
                         if(window.Notification){
-                            alert('Depending on your browser, this will ask for a specific permission. To disable, go through your browser preferences and exceptions. If you have already enabled this feature, probably nothing will hapen.');
+                            alert(pydio.MessageHash["notification_center.12"]);
                             window.Notification.requestPermission(function(grant) {
                                 ['default', 'granted', 'denied'].indexOf(grant) === true
                             });
                         }else{
-                            alert('Your browser does not seem to support Desktop Notifications yet.');
+                            alert(pydio.MessageHash["notification_center.13"]);
                         }
                     ]]></clientCallback>
                 </processing>
diff --git a/core/src/plugins/core.notifications/res/i18n/de.php b/core/src/plugins/core.notifications/res/i18n/de.php
@@ -37,4 +37,6 @@
 "9" => "Aktivit&auml;ten Arbeitsumgebungen",
 "10" => "Ordner-Aktivit&auml;ten",
 "11" => "Datei-Aktivit&auml;ten",
+    "12" => "Depending on your browser, this will ask for a specific permission. To disable, go through your browser preferences and exceptions. If you have already enabled this feature, probably nothing will happen.",
+    "13" => "Your browser does not seem to support Desktop Notifications yet."
 );
diff --git a/core/src/plugins/core.notifications/res/i18n/en.php b/core/src/plugins/core.notifications/res/i18n/en.php
@@ -19,15 +19,17 @@
 * The latest code can be found at <http://pyd.io/>.
 */
 $mess=array(
-"1" => "Notifications",
-"2" => "Notifications feed",
-"3" => "Alerts",
-"4" => "Notifications",
-"5" => "All Events",
-"6" => "Go to ...",
-"7" => "Dismiss",
-"8" => "No alerts",
-"9" => "Workspace Activity",
-"10"=> "Folder Activity",
-"11"=> "File Activity",
+    "1" => "Notifications",
+    "2" => "Notifications feed",
+    "3" => "Alerts",
+    "4" => "Notifications",
+    "5" => "All Events",
+    "6" => "Go to ...",
+    "7" => "Dismiss",
+    "8" => "No alerts",
+    "9" => "Workspace Activity",
+    "10"=> "Folder Activity",
+    "11"=> "File Activity",
+    "12" => "Depending on your browser, this will ask for a specific permission. To disable, go through your browser preferences and exceptions. If you have already enabled this feature, probably nothing will happen.",
+    "13" => "Your browser does not seem to support Desktop Notifications yet."
 );
diff --git a/core/src/plugins/core.notifications/res/i18n/es.php b/core/src/plugins/core.notifications/res/i18n/es.php
@@ -30,4 +30,6 @@
 "9" => "Workspace Activity",
 "10" => "Folder Activity",
 "11" => "File Activity",
+    "12" => "Depending on your browser, this will ask for a specific permission. To disable, go through your browser preferences and exceptions. If you have already enabled this feature, probably nothing will happen.",
+    "13" => "Your browser does not seem to support Desktop Notifications yet."
 );
diff --git a/core/src/plugins/core.notifications/res/i18n/fr.php b/core/src/plugins/core.notifications/res/i18n/fr.php
@@ -30,4 +30,6 @@
 "9" => "Activité du dépôt",
 "10" => "Activité du dossier",
 "11" => "Activité du fichier",
+    "12" => "En fonction de votre navigateur, une demande de permission devrait apparaître. Cette fonctionnalité affichera des notifications sur votre bureau lorsqu'un nouveau fichier est modifié. Pour la désactiver, rendez vous dans les préférences de votre navigateur.",
+    "13" => "Votre navigateur ne supporte pas les notifications sur le bureau."
 );
diff --git a/core/src/plugins/core.notifications/res/i18n/it.php b/core/src/plugins/core.notifications/res/i18n/it.php
@@ -30,4 +30,6 @@
 "9" => "Attività Workspace",
 "10"=> "Attività Cartella",
 "11"=> "Attività File",
+    "12" => "Depending on your browser, this will ask for a specific permission. To disable, go through your browser preferences and exceptions. If you have already enabled this feature, probably nothing will happen.",
+    "13" => "Your browser does not seem to support Desktop Notifications yet."
 );
diff --git a/core/src/plugins/core.notifications/res/i18n/pt.php b/core/src/plugins/core.notifications/res/i18n/pt.php
@@ -30,4 +30,6 @@
 "9" => "Workspace Activity",
 "10" => "Folder Activity",
 "11" => "File Activity",
+    "12" => "Depending on your browser, this will ask for a specific permission. To disable, go through your browser preferences and exceptions. If you have already enabled this feature, probably nothing will happen.",
+    "13" => "Your browser does not seem to support Desktop Notifications yet."
 );
diff --git a/core/src/plugins/core.notifications/res/i18n/ru.php b/core/src/plugins/core.notifications/res/i18n/ru.php
@@ -30,4 +30,6 @@
 "9" => "Активность по рабочему пространству",
 "10"=> "Активность по папке",
 "11"=> "Активность по файлу",
+    "12" => "Depending on your browser, this will ask for a specific permission. To disable, go through your browser preferences and exceptions. If you have already enabled this feature, probably nothing will happen.",
+    "13" => "Your browser does not seem to support Desktop Notifications yet."
 );
diff --git a/core/src/plugins/gui.ajax/manifest.xml b/core/src/plugins/gui.ajax/manifest.xml
@@ -120,6 +120,19 @@
                       label="CONF_MESSAGE[Background Attributes (6)]" description="CONF_MESSAGE[Attributes of the image used as a background]"
                       mandatory="false" expose="true" default="background-repeat:repeat;background-size:140%;background-position:50% 50%;"/>
 
+        <global_param name="WELCOME_PAGE_BACKGROUND_LOWRES" group="CONF_MESSAGE[Page Background Images]" type="image" label="CONF_MESSAGE[Low-Resolution Background]" description="CONF_MESSAGE[Make sure to use a smaller resolution image, otherwise mobile loading is very slow.]" mandatory="false"
+                      editable="true"
+                      uploadAction="store_binary_temp"
+                      loadAction="get_global_binary_param"
+                      defaultImage="plugins/gui.ajax/res/themes/orbit/images/hires-photos/03-mobile.jpg"
+                      expose="true"
+                />
+
+        <global_param name="WELCOME_PAGE_BACKGROUND_ATTRIBUTES_LOWRES" group="CONF_MESSAGE[Page Background Images]" type="select"
+                      choices="background-repeat:no-repeat;background-position:50% 50%;|CONF_MESSAGE[Center in Page (no-repeat)],background-repeat:repeat;background-size:140%;background-position:50% 50%;|CONF_MESSAGE[Fetch Window (repeat vertically)],background-repeat:no-repeat;background-size:100%; background-position:center center;|CONF_MESSAGE[Fetch Window (no repeat)],background-repeat:repeat;|CONF_MESSAGE[Tile (repeat both directions)]"
+                      label="CONF_MESSAGE[Background Attributes (Low Resolution)]" description="CONF_MESSAGE[Attributes of the image used as a background]"
+                      mandatory="false" expose="true" default="background-repeat:repeat;background-size:140%;background-position:50% 50%;"/>
+
         <global_param name="CUSTOM_SHAREPAGE_BACKGROUND_1" group="CONF_MESSAGE[Minisite]" type="image" label="CONF_MESSAGE[Custom Background (1)]" description="CONF_MESSAGE[Image used as a background]" mandatory="false"
                       editable="true"
                       uploadAction="store_binary_temp"
diff --git a/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpPane.js b/core/src/plugins/gui.ajax/res/js/ui/prototype/class.AjxpPane.js
@@ -519,6 +519,10 @@ Class.create("AjxpPane", {
             bStyles.push("background-image:url('"+bgrounds[paramPrefix+index]+"');" + (bgrounds[paramPrefix + 'ATTRIBUTES_'+index]?bgrounds[paramPrefix + 'ATTRIBUTES_'+index]:''));
             index++;
         }
+        if(document.viewport.getWidth() < 600 && bgrounds[paramPrefix+'LOWRES']){
+            // This is probably a mobile, let's force switching to low res.
+            bStyles = ["background-image:url('"+bgrounds[paramPrefix+'LOWRES']+"');" + (bgrounds[paramPrefix + 'ATTRIBUTES_'+'LOWRES']?bgrounds[paramPrefix + 'ATTRIBUTES_'+'LOWRES']:'')];
+        }
         if (bStyles.length) {
             i = Math.floor( Math.random() * bStyles.length);
             var bg = bStyles[i];
diff --git a/core/src/plugins/gui.ajax/res/themes/orbit/css/media.css b/core/src/plugins/gui.ajax/res/themes/orbit/css/media.css
@@ -180,13 +180,7 @@ and (max-width : 420px){
         font-size: 20px;
         font-weight: lighter;
         text-transform: uppercase;
-        margin: 0px 0;
-    }
-
-    div#background-imager{
-        background-image: url(../images/hires-photos/03-mobile.jpg) !important;
-        background-position: 50% 50%;
-        background-repeat: repeat repeat;
+        margin: 0 0;
     }
 
     div.dialogBox{
diff --git a/core/src/plugins/gui.mobile/ajxp-mobile.css b/core/src/plugins/gui.mobile/ajxp-mobile.css
@@ -104,12 +104,6 @@ a.m-2.disabled {
     background-image: url('../gui.ajax/res/themes/vision/images/grid_t.png');
 }
 
-.ajxp_theme_orbit div#background-imager{
-    background-image: url(../gui.ajax/res/themes/orbit/images/hires-photos/03-mobile.jpg) !important;
-    background-position: 50% 50%;
-    background-repeat: repeat repeat;
-}
-
 #uploadBrowseButton{
     display: none !important;
 }
diff --git a/core/src/plugins/index.lucene/class.AjxpLuceneIndexer.php b/core/src/plugins/index.lucene/class.AjxpLuceneIndexer.php
@@ -193,6 +193,9 @@ public function applyAction($actionName, $httpVars, $fileVars)
                 $hit->node_url = preg_replace("#ajxp\.[a-z_]+://#", "pydio://", $hit->node_url);
                 if ($hit->serialized_metadata!=null) {
                     $meta = unserialize(base64_decode($hit->serialized_metadata));
+                    if(isSet($meta["ajxp_modiftime"])){
+                        $meta["ajxp_relativetime"] = $meta["ajxp_description"] = $messages[4]." ".AJXP_Utils::relativeDate($meta["ajxp_modiftime"], $messages);
+                    }
                     $tmpNode = new AJXP_Node(SystemTextEncoding::fromUTF8($hit->node_url), $meta);
                 } else {
                     $tmpNode = new AJXP_Node(SystemTextEncoding::fromUTF8($hit->node_url), array());
@@ -212,6 +215,10 @@ public function applyAction($actionName, $httpVars, $fileVars)
                 if (!is_readable($tmpNode->getUrl())){
                     continue;
                 }
+                $basename = basename($tmpNode->getPath());
+                if (!$this->accessDriver->filterNodeName($tmpNode->getPath(), $basename, $tmpNode->isLeaf(), array("d" => true, "f" => true))){
+                    continue;
+                }
                 $tmpNode->search_score = sprintf("%0.2f", $hit->score);
                 if (isSet($returnNodes)) {
                     $returnNodes[] = $tmpNode;
@@ -286,6 +293,10 @@ public function applyAction($actionName, $httpVars, $fileVars)
                 if (!is_readable($tmpNode->getUrl())){
                     continue;
                 }
+                $basename = basename($tmpNode->getPath());
+                if (!$this->accessDriver->filterNodeName($tmpNode->getPath(), $basename, $tmpNode->isLeaf(), array("d"=>true, "f"=>true))){
+                    continue;
+                }
                 $tmpNode->search_score = sprintf("%0.2f", $hit->score);
                 if (isSet($returnNodes)) {
                     $returnNodes[] = $tmpNode;

Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,9 @@ public function filterUserSelectionToHidden($files)`
`550`	`550`	`public function filterNodeName($nodePath, $nodeName, &$isLeaf, $lsOptions)`
`551`	`551`	`{`
`552`	`552`	`$showHiddenFiles = $this->getFilteredOption("SHOW_HIDDEN_FILES", $this->repository->getId());`
`553`		`- $isLeaf = (is_file($nodePath."/".$nodeName) \|\| AJXP_Utils::isBrowsableArchive($nodeName));`
	`553`	`+ if($isLeaf === ""){`
	`554`	`+ $isLeaf = (is_file($nodePath."/".$nodeName) \|\| AJXP_Utils::isBrowsableArchive($nodeName));`
	`555`	`+ }`
`554`	`556`	`if (AJXP_Utils::isHidden($nodeName) && !$showHiddenFiles) {`
`555`	`557`	`return false;`
`556`	`558`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1240,8 +1240,10 @@ public function switchAction($action, $httpVars, $fileVars)`
`1240`	`1240`	`} else if (isSet($httpVars["binary_id"])) {`
`1241`	`1241`	`if (isSet($httpVars["user_id"]) && AuthService::getLoggedUser() != null && AuthService::getLoggedUser()->isAdmin()) {`
`1242`	`1242`	`$context = array("USER" => $httpVars["user_id"]);`
`1243`		`- } else {`
	`1243`	`+ } else if(AuthService::getLoggedUser() !== null) {`
`1244`	`1244`	`$context = array("USER" => AuthService::getLoggedUser()->getId());`
	`1245`	`+ } else {`
	`1246`	`+ $context = array();`
`1245`	`1247`	`}`
`1246`	`1248`	`$this->loadBinary($context, $httpVars["binary_id"]);`
`1247`	`1249`	`}`
Original file line number	Diff line number	Diff line change
`@@ -202,7 +202,7 @@ public function loadUserFeed($actionName, $httpVars, $fileVars)`
`202`	`202`	`continue;`
`203`	`203`	`}`
`204`	`204`	`try {`
`205`		`- $node->loadNodeInfo();`
	`205`	`+ @$node->loadNodeInfo();`
`206`	`206`	`} catch (Exception $e) {`
`207`	`207`	`continue;`
`208`	`208`	`}`