Merge branch 'master' into feature/integrate-uikit

Geeklog-Core · Jan 5, 2017 · 39e43e7 · 39e43e7
2 parents 762b256 + 6437625
commit 39e43e7
Show file tree

Hide file tree

Showing 855 changed files with 12,199 additions and 15,455 deletions.
diff --git a/.gitignore b/.gitignore
@@ -7,7 +7,7 @@ public_html/siteconfig.php
 system/lib-custom.php
 
 public_html/sitemap.xml
-public_html/filemanager/scripts/filemanager.config.js
+public_html/filemanager/scripts/filemanager.config.json
 
 # cache files
 data/layout_cache/**

diff --git a/build.xml b/build.xml
@@ -84,6 +84,9 @@
         <copy file="${srcDir}/system/lib-custom.php.dist" tofile="${dstDir}/system/lib-custom.php"/>
         <copy file="${srcDir}/public_html/siteconfig.php.dist" tofile="${dstDir}/public_html/siteconfig.php"/>
 
+        <!-- Move filemanager configuration file -->
+        <copy file="${srcDir}/public_html/filemanager/scripts/filemanager.config.default.json" tofile="${dstDir}/public_html/filemanager/scripts/filemanager.config.json" overwrite="true"/>
+
         <!-- Change permissions -->
         <echo msg="Changing directory and file permissions..."/>
         <chmod file="${dstDir}/emailgeeklogstories" mode="0755"/>
@@ -128,6 +131,7 @@
         <chmod file="${dstDir}/public_html/images/_thumbs/articles" mode="0775"/>
         <chmod file="${dstDir}/public_html/images/_thumbs/library/Image" mode="0775"/>
         <chmod file="${dstDir}/public_html/images/_thumbs/userphotos" mode="0775"/>
+        <chmod file="${dstDir}/public_html/filemanager/scripts/filemanager.config.json" mode="0644"/>
     </target>
 
     <!-- ============================== -->

diff --git a/language/afrikaans.php b/language/afrikaans.php
@@ -1162,6 +1162,8 @@
     41 => 'Comment Submissions',
     42 => 'Username',
     43 => 'Auto-publish Comments?',
+    44 => 'Results of your moderation',
+    45 => 'Approved %1$d items and deleted %2$d items of user submissions.',
     'core' => 'Core',
     'plugins' => 'Plugins',
     'tools' => 'Tools',
@@ -1275,7 +1277,7 @@
     67 => 'The directory "%s" is not writable.',
     68 => 'You do not have the required permissions to install plugins.',
     69 => 'You do not have the required permissions to upload plugins.',
-    99 => 'An unknown error occured',
+    99 => 'An unknown error occurred',
     100 => 'Ok.',
     101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
     102 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
@@ -2512,4 +2514,3 @@
 );
 
 
-?>
diff --git a/language/afrikaans_utf-8.php b/language/afrikaans_utf-8.php
@@ -1162,6 +1162,8 @@
     41 => 'Comment Submissions',
     42 => 'Username',
     43 => 'Auto-publish Comments?',
+    44 => 'Results of your moderation',
+    45 => 'Approved %1$d items and deleted %2$d items of user submissions.',
     'core' => 'Core',
     'plugins' => 'Plugins',
     'tools' => 'Tools',
@@ -1275,7 +1277,7 @@
     67 => 'The directory "%s" is not writable.',
     68 => 'You do not have the required permissions to install plugins.',
     69 => 'You do not have the required permissions to upload plugins.',
-    99 => 'An unknown error occured',
+    99 => 'An unknown error occurred',
     100 => 'Ok.',
     101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
     102 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
@@ -2512,4 +2514,3 @@
 );
 
 
-?>
diff --git a/language/bosnian.php b/language/bosnian.php
@@ -930,7 +930,7 @@
     52 => '',
     53 => 'nije koristena. Morate ukljuciti ovu sliku u intro ili body prije nego spasite vase izmjene',
     54 => 'Ukljucene slike nisu koristene',
-    55 => 'The following errors occured while trying to save your story.  Please correct these errors before saving',
+    55 => 'The following errors occurred while trying to save your story.  Please correct these errors before saving',
     56 => 'Prikazi ikonu teme',
     57 => 'View unscaled image',
     58 => 'Story Management',
@@ -1166,6 +1166,8 @@
     41 => 'Comment Submissions',
     42 => 'Username',
     43 => 'Auto-publish Comments?',
+    44 => 'Results of your moderation',
+    45 => 'Approved %1$d items and deleted %2$d items of user submissions.',
     'core' => 'Core',
     'plugins' => 'Plugins',
     'tools' => 'Tools',
@@ -1279,7 +1281,7 @@
     67 => 'The directory "%s" is not writable.',
     68 => 'You do not have the required permissions to install plugins.',
     69 => 'You do not have the required permissions to upload plugins.',
-    99 => 'An unknown error occured',
+    99 => 'An unknown error occurred',
     100 => 'Ok.',
     101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
     102 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
@@ -1462,8 +1464,8 @@
     69 => 'Your account has been blocked!',
     70 => 'Your account is awaiting administrator approval.',
     71 => 'Your account has now been confirmed and is awaiting administrator approval.',
-    72 => 'An error occured while attempting to install the plugin. See error.log for details.',
-    73 => 'An error occured while attempting to uninstall the plugin. See error.log for details.',
+    72 => 'An error occurred while attempting to install the plugin. See error.log for details.',
+    73 => 'An error occurred while attempting to uninstall the plugin. See error.log for details.',
     74 => 'The pingback has been successfully sent.',
     75 => 'Trackbacks must be sent using a POST request.',
     76 => 'Do you really want to delete this item?',
@@ -2516,4 +2518,3 @@
 );
 
 
-?>
diff --git a/language/bosnian_utf-8.php b/language/bosnian_utf-8.php
@@ -930,7 +930,7 @@
     52 => '',
     53 => 'nije koristena. Morate ukljuciti ovu sliku u intro ili body prije nego spasite vase izmjene',
     54 => 'Ukljucene slike nisu koristene',
-    55 => 'The following errors occured while trying to save your story.  Please correct these errors before saving',
+    55 => 'The following errors occurred while trying to save your story.  Please correct these errors before saving',
     56 => 'Prikazi ikonu teme',
     57 => 'View unscaled image',
     58 => 'Story Management',
@@ -1166,6 +1166,8 @@
     41 => 'Comment Submissions',
     42 => 'Username',
     43 => 'Auto-publish Comments?',
+    44 => 'Results of your moderation',
+    45 => 'Approved %1$d items and deleted %2$d items of user submissions.',
     'core' => 'Core',
     'plugins' => 'Plugins',
     'tools' => 'Tools',
@@ -1279,7 +1281,7 @@
     67 => 'The directory "%s" is not writable.',
     68 => 'You do not have the required permissions to install plugins.',
     69 => 'You do not have the required permissions to upload plugins.',
-    99 => 'An unknown error occured',
+    99 => 'An unknown error occurred',
     100 => 'Ok.',
     101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
     102 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
@@ -1462,8 +1464,8 @@
     69 => 'Your account has been blocked!',
     70 => 'Your account is awaiting administrator approval.',
     71 => 'Your account has now been confirmed and is awaiting administrator approval.',
-    72 => 'An error occured while attempting to install the plugin. See error.log for details.',
-    73 => 'An error occured while attempting to uninstall the plugin. See error.log for details.',
+    72 => 'An error occurred while attempting to install the plugin. See error.log for details.',
+    73 => 'An error occurred while attempting to uninstall the plugin. See error.log for details.',
     74 => 'The pingback has been successfully sent.',
     75 => 'Trackbacks must be sent using a POST request.',
     76 => 'Do you really want to delete this item?',
@@ -2516,4 +2518,3 @@
 );
 
 
-?>
diff --git a/language/bulgarian.php b/language/bulgarian.php
@@ -926,7 +926,7 @@
     52 => '',
     53 => 'was not used.  You must include this image in the intro or body before you can save your changes',
     54 => 'Attached Images Not Used',
-    55 => 'The following errors occured while trying to save your story.  Please correct these errors before saving',
+    55 => 'The following errors occurred while trying to save your story.  Please correct these errors before saving',
     56 => 'Show Topic Icon',
     57 => 'View unscaled image',
     58 => 'Story Management',
@@ -1162,6 +1162,8 @@
     41 => 'Comment Submissions',
     42 => 'Username',
     43 => 'Auto-publish Comments?',
+    44 => 'Results of your moderation',
+    45 => 'Approved %1$d items and deleted %2$d items of user submissions.',
     'core' => 'Core',
     'plugins' => 'Plugins',
     'tools' => 'Tools',
@@ -1275,7 +1277,7 @@
     67 => 'The directory "%s" is not writable.',
     68 => 'You do not have the required permissions to install plugins.',
     69 => 'You do not have the required permissions to upload plugins.',
-    99 => 'An unknown error occured',
+    99 => 'An unknown error occurred',
     100 => 'Ok.',
     101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
     102 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
@@ -1458,8 +1460,8 @@
     69 => 'Your account has been blocked!',
     70 => 'Your account is awaiting administrator approval.',
     71 => 'Your account has now been confirmed and is awaiting administrator approval.',
-    72 => 'An error occured while attempting to install the plugin. See error.log for details.',
-    73 => 'An error occured while attempting to uninstall the plugin. See error.log for details.',
+    72 => 'An error occurred while attempting to install the plugin. See error.log for details.',
+    73 => 'An error occurred while attempting to uninstall the plugin. See error.log for details.',
     74 => 'The pingback has been successfully sent.',
     75 => 'Trackbacks must be sent using a POST request.',
     76 => 'Do you really want to delete this item?',
@@ -2512,4 +2514,3 @@
 );
 
 
-?>
diff --git a/language/bulgarian_utf-8.php b/language/bulgarian_utf-8.php
@@ -926,7 +926,7 @@
     52 => '',
     53 => 'was not used.  You must include this image in the intro or body before you can save your changes',
     54 => 'Attached Images Not Used',
-    55 => 'The following errors occured while trying to save your story.  Please correct these errors before saving',
+    55 => 'The following errors occurred while trying to save your story.  Please correct these errors before saving',
     56 => 'Show Topic Icon',
     57 => 'View unscaled image',
     58 => 'Story Management',
@@ -1162,6 +1162,8 @@
     41 => 'Comment Submissions',
     42 => 'Username',
     43 => 'Auto-publish Comments?',
+    44 => 'Results of your moderation',
+    45 => 'Approved %1$d items and deleted %2$d items of user submissions.',
     'core' => 'Core',
     'plugins' => 'Plugins',
     'tools' => 'Tools',
@@ -1275,7 +1277,7 @@
     67 => 'The directory "%s" is not writable.',
     68 => 'You do not have the required permissions to install plugins.',
     69 => 'You do not have the required permissions to upload plugins.',
-    99 => 'An unknown error occured',
+    99 => 'An unknown error occurred',
     100 => 'Ok.',
     101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
     102 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
@@ -1458,8 +1460,8 @@
     69 => 'Your account has been blocked!',
     70 => 'Your account is awaiting administrator approval.',
     71 => 'Your account has now been confirmed and is awaiting administrator approval.',
-    72 => 'An error occured while attempting to install the plugin. See error.log for details.',
-    73 => 'An error occured while attempting to uninstall the plugin. See error.log for details.',
+    72 => 'An error occurred while attempting to install the plugin. See error.log for details.',
+    73 => 'An error occurred while attempting to uninstall the plugin. See error.log for details.',
     74 => 'The pingback has been successfully sent.',
     75 => 'Trackbacks must be sent using a POST request.',
     76 => 'Do you really want to delete this item?',
@@ -2512,4 +2514,3 @@
 );
 
 
-?>
diff --git a/language/catalan.php b/language/catalan.php
@@ -1160,6 +1160,8 @@
     41 => 'Comment Submissions',
     42 => 'Username',
     43 => 'Auto-publish Comments?',
+    44 => 'Results of your moderation',
+    45 => 'Approved %1$d items and deleted %2$d items of user submissions.',
     'core' => 'Core',
     'plugins' => 'Plugins',
     'tools' => 'Tools',
@@ -1273,7 +1275,7 @@
     67 => 'The directory "%s" is not writable.',
     68 => 'You do not have the required permissions to install plugins.',
     69 => 'You do not have the required permissions to upload plugins.',
-    99 => 'An unknown error occured',
+    99 => 'An unknown error occurred',
     100 => 'Ok.',
     101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
     102 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
@@ -1456,8 +1458,8 @@
     69 => 'Your account has been blocked!',
     70 => 'Your account is awaiting administrator approval.',
     71 => 'Your account has now been confirmed and is awaiting administrator approval.',
-    72 => 'An error occured while attempting to install the plugin. See error.log for details.',
-    73 => 'An error occured while attempting to uninstall the plugin. See error.log for details.',
+    72 => 'An error occurred while attempting to install the plugin. See error.log for details.',
+    73 => 'An error occurred while attempting to uninstall the plugin. See error.log for details.',
     74 => 'The pingback has been successfully sent.',
     75 => 'Trackbacks must be sent using a POST request.',
     76 => 'Do you really want to delete this item?',
@@ -2510,4 +2512,3 @@
 );
 
 
-?>
diff --git a/language/catalan_utf-8.php b/language/catalan_utf-8.php
@@ -1160,6 +1160,8 @@
     41 => 'Comment Submissions',
     42 => 'Username',
     43 => 'Auto-publish Comments?',
+    44 => 'Results of your moderation',
+    45 => 'Approved %1$d items and deleted %2$d items of user submissions.',
     'core' => 'Core',
     'plugins' => 'Plugins',
     'tools' => 'Tools',
@@ -1273,7 +1275,7 @@
     67 => 'The directory "%s" is not writable.',
     68 => 'You do not have the required permissions to install plugins.',
     69 => 'You do not have the required permissions to upload plugins.',
-    99 => 'An unknown error occured',
+    99 => 'An unknown error occurred',
     100 => 'Ok.',
     101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
     102 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
@@ -1456,8 +1458,8 @@
     69 => 'Your account has been blocked!',
     70 => 'Your account is awaiting administrator approval.',
     71 => 'Your account has now been confirmed and is awaiting administrator approval.',
-    72 => 'An error occured while attempting to install the plugin. See error.log for details.',
-    73 => 'An error occured while attempting to uninstall the plugin. See error.log for details.',
+    72 => 'An error occurred while attempting to install the plugin. See error.log for details.',
+    73 => 'An error occurred while attempting to uninstall the plugin. See error.log for details.',
     74 => 'The pingback has been successfully sent.',
     75 => 'Trackbacks must be sent using a POST request.',
     76 => 'Do you really want to delete this item?',
@@ -2510,4 +2512,3 @@
 );
 
 
-?>
diff --git a/language/chinese_simplified_utf-8.php b/language/chinese_simplified_utf-8.php
@@ -1165,6 +1165,8 @@
     41 => 'Comment Submissions',
     42 => 'Username',
     43 => 'Auto-publish Comments?',
+    44 => 'Results of your moderation',
+    45 => 'Approved %1$d items and deleted %2$d items of user submissions.',
     'core' => 'Core',
     'plugins' => 'Plugins',
     'tools' => 'Tools',
@@ -1278,7 +1280,7 @@
     67 => 'The directory "%s" is not writable.',
     68 => 'You do not have the required permissions to install plugins.',
     69 => 'You do not have the required permissions to upload plugins.',
-    99 => 'An unknown error occured',
+    99 => 'An unknown error occurred',
     100 => 'Ok.',
     101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
     102 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
@@ -2515,4 +2517,3 @@
 );
 
 
-?>
diff --git a/language/chinese_traditional_utf-8.php b/language/chinese_traditional_utf-8.php
@@ -1165,6 +1165,8 @@
     41 => 'Comment Submissions',
     42 => 'Username',
     43 => 'Auto-publish Comments?',
+    44 => 'Results of your moderation',
+    45 => 'Approved %1$d items and deleted %2$d items of user submissions.',
     'core' => 'Core',
     'plugins' => 'Plugins',
     'tools' => 'Tools',
@@ -1278,7 +1280,7 @@
     67 => 'The directory "%s" is not writable.',
     68 => 'You do not have the required permissions to install plugins.',
     69 => 'You do not have the required permissions to upload plugins.',
-    99 => 'An unknown error occured',
+    99 => 'An unknown error occurred',
     100 => 'Ok.',
     101 => 'The uploaded file exceeds the upload_max_filesize directive in php.ini.',
     102 => 'The uploaded file exceeds the MAX_FILE_SIZE directive that was specified in the HTML form.',
@@ -2515,4 +2517,3 @@
 );
 
 
-?>