2.1.18

#320 - Enabling LDAP prevents local admin login #317 - server expected extensions are tested #318 - Upgrade process badly creates sk.php file
nilsteampassnet · Apr 9, 2013 · 95b603d · 95b603d
1 parent be0bfe6
commit 95b603d
Show file tree

Hide file tree

Showing 9 changed files with 128 additions and 85 deletions.
diff --git a/admin.settings.php b/admin.settings.php
@@ -414,7 +414,7 @@ function updateSettings ($setting, $val, $type = '')
     if (@$_SESSION['settings']['can_create_root_folder'] != $_POST['can_create_root_folder']) {
         updateSettings('can_create_root_folder', $_POST['can_create_root_folder']);
     }
-    
+
 }
 
 echo '
@@ -788,6 +788,7 @@ function updateSettings ($setting, $val, $type = '')
             <tr><td>
                 <span class="ui-icon ui-icon-disk" style="float: left; margin-right: .3em;">&nbsp;</span>
                 <label>'.$txt['enable_personal_folder_feature'].'</label>
+                <span style="margin-left:0px;"><img src="includes/images/question-small-white.png" class="tip" alt="" title="'.$txt['enable_personal_folder_feature_tip'].'" /></span>
             </td><td>
             <div class="div_radio">
                 <input type="radio" id="enable_pf_feature_radio1" name="enable_pf_feature" onclick="changeSettingStatus($(this).attr(\'name\'), 1) " value="1"', isset($_SESSION['settings']['enable_pf_feature']) && $_SESSION['settings']['enable_pf_feature'] == 1 ? ' checked="checked"' : '', ' /><label for="enable_pf_feature_radio1">'.$txt['yes'].'</label>

diff --git a/includes/language/english.php b/includes/language/english.php
@@ -5,6 +5,12 @@
 } else {
     $TeamPass_url = $_SESSION['settings']['cpassman_url'];
 }
+$txt['channel_encryption_no_iconv'] = "Extension ICONV is not loaded! Encryption can't be initiated!";
+$txt['channel_encryption_no_bcmath'] = "Extension BCMATH is not loaded! Encryption can't be initiated!";
+$txt['admin_action_check_pf'] = "Actualize Personal Folders for all users (creates them if not existing)";
+$txt['admin_actions_title'] = "Specific Actions";
+$txt['enable_personal_folder_feature_tip'] = "Once activated, you need to manually run a script that will create the personal folders for the existing users. Notice that this will only create personal folders for Users that do not have such a folder. The script '".$txt['admin_action_check_pf']."' is available in tab '".$txt['admin_actions_title']."'";
+
 $txt['is_administrated_by_role'] = "User is administrated by";
 $txt['administrators_only'] = "Administrators only";
 $txt['managers_of'] = "Managers of role";
@@ -203,8 +209,6 @@
 $txt['add_role_tip'] = "Add a new role.";
 $txt['admin'] = "Administration";
 $txt['admin_action'] = "Please validate your action";
-$txt['admin_actions_title'] = "Specific Actions";
-$txt['admin_action_check_pf'] = "Actualize Personal Folders for all users (creates them if not existing)";
 $txt['admin_action_db_backup'] = "Create a backup of the database";
 $txt['admin_action_db_backup_key_tip'] = "Please enter the encryption key. Save it somewhere, it will be asked when restoring. (leave empty to not encrypt)";
 $txt['admin_action_db_backup_start_tip'] = "Start";

diff --git a/includes/libraries/jCryption/encrypt.php b/includes/libraries/jCryption/encrypt.php
@@ -24,11 +24,25 @@
 if (isset($_GET["generateKeypair"])) {
     // Do some tests on server
     if (!file_exists(SECUREPATH."/100_1024_keys.inc.php")) {
-        echo '{"e":"encryption_cfg_error","msg":"'.htmlspecialchars(strip_tags($txt['channel_encryption_no_file']), ENT_QUOTES).'"}';
+        echo '{"e":"encryption_cfg_error","msg":"'.
+            htmlspecialchars(strip_tags($txt['channel_encryption_no_file']), ENT_QUOTES).
+            '"}';
     } elseif (!extension_loaded('openssl')) {
-        echo '{"e":"encryption_cfg_error","msg":"'.htmlspecialchars(strip_tags($txt['channel_encryption_no_openssl']), ENT_QUOTES).'"}';
+        echo '{"e":"encryption_cfg_error","msg":"'.
+            htmlspecialchars(strip_tags($txt['channel_encryption_no_openssl']), ENT_QUOTES).
+            '"}';
     } elseif (!extension_loaded('gmp')) {
-        echo '{"e":"encryption_cfg_error","msg":"'.htmlspecialchars(strip_tags($txt['channel_encryption_no_gmp']), ENT_QUOTES).'"}';
+        echo '{"e":"encryption_cfg_error","msg":"'.
+            htmlspecialchars(strip_tags($txt['channel_encryption_no_gmp']), ENT_QUOTES).
+            '"}';
+    } elseif (!extension_loaded('bcmath')) {
+        echo '{"e":"encryption_cfg_error","msg":"'.
+            htmlspecialchars(strip_tags($txt['channel_encryption_no_bcmath']), ENT_QUOTES).
+            '"}';
+    } elseif (!extension_loaded('iconv')) {
+        echo '{"e":"encryption_cfg_error","msg":"'.
+            htmlspecialchars(strip_tags($txt['channel_encryption_no_iconv']), ENT_QUOTES).
+            '"}';
     } else {
     	// Include some RSA keys
     	require_once(SECUREPATH."/100_1024_keys.inc.php");

diff --git a/install/install.php b/install/install.php
@@ -272,6 +272,8 @@ function suggestKey(passwd_form) {
                     <span style="padding-left:30px;font-size:13pt;">PHP extension "mcrypt" is loaded</span><br />
                     <span style="padding-left:30px;font-size:13pt;">PHP extension "openssl" is loaded</span><br />
                     <span style="padding-left:30px;font-size:13pt;">PHP extension "gmp" is loaded</span><br />
+                    <span style="padding-left:30px;font-size:13pt;">PHP extension "bcmath" is loaded</span><br />
+                    <span style="padding-left:30px;font-size:13pt;">PHP extension "iconv" is loaded</span><br />
                     <span style="padding-left:30px;font-size:13pt;">PHP version is gretter or equal to 5.3.0</span><br />
                     </div>
                     <div style="margin-top:20px;font-weight:bold;text-align:center;height:27px;" id="status_step1"></div>';