@@ -43,10 +43,10 @@ |
||
| 43 | 43 | var chk = document.install.rminstaller; |
| 44 | 44 | if(chk && chk.checked) { |
| 45 | 45 | // remove install folder and files |
| 46 | - window.location.href = "../<?php echo MGR_DIR;?>/processors/remove_installer.processor.php?rminstall=1"; |
|
| 46 | + window.location.href = "../<?php echo MGR_DIR; ?>/processors/remove_installer.processor.php?rminstall=1"; |
|
| 47 | 47 | } |
| 48 | 48 | else { |
| 49 | - window.location.href = "../<?php echo MGR_DIR;?>/"; |
|
| 49 | + window.location.href = "../<?php echo MGR_DIR; ?>/"; |
|
| 50 | 50 | } |
| 51 | 51 | } |
| 52 | 52 | /* ]]> */ |
@@ -6,12 +6,12 @@ discard block |
||
| 6 | 6 | $installMode = $_POST['installMode']; |
| 7 | 7 | |
| 8 | 8 | $self = 'install/connection.databasetest.php'; |
| 9 | -$base_path = str_replace($self,'',str_replace('\\','/', __FILE__)); |
|
| 9 | +$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__)); |
|
| 10 | 10 | if (is_file("{$base_path}assets/cache/siteManager.php")) { |
| 11 | 11 | include_once("{$base_path}assets/cache/siteManager.php"); |
| 12 | 12 | } |
| 13 | -if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) { |
|
| 14 | - define('MGR_DIR','manager'); |
|
| 13 | +if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) { |
|
| 14 | + define('MGR_DIR', 'manager'); |
|
| 15 | 15 | } |
| 16 | 16 | require_once("lang.php"); |
| 17 | 17 | |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | $database_charset = substr($database_collation, 0, strpos($database_collation, '_')); |
| 32 | 32 | $query = "CREATE DATABASE `".$database_name."` CHARACTER SET ".$database_charset." COLLATE ".$database_collation.";"; |
| 33 | 33 | |
| 34 | - if (! mysqli_query($conn, $query)){ |
|
| 34 | + if (!mysqli_query($conn, $query)) { |
|
| 35 | 35 | $output .= '<span id="database_fail" style="color:#FF0000;">'.$_lang['status_failed_could_not_create_database'].'</span>'; |
| 36 | 36 | } |
| 37 | 37 | else { |
@@ -9,7 +9,7 @@ discard block |
||
| 9 | 9 | } |
| 10 | 10 | |
| 11 | 11 | $self = 'install/index.php'; |
| 12 | -$base_path = str_replace($self,'',str_replace('\\','/', __FILE__)); |
|
| 12 | +$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__)); |
|
| 13 | 13 | require_once("{$base_path}install/functions.php"); |
| 14 | 14 | |
| 15 | 15 | // set error reporting |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | if (is_file("{$base_path}assets/cache/siteManager.php")) { |
| 19 | 19 | include_once("{$base_path}assets/cache/siteManager.php"); |
| 20 | 20 | } |
| 21 | -if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) { |
|
| 21 | +if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) { |
|
| 22 | 22 | define('MGR_DIR', 'manager'); |
| 23 | 23 | } |
| 24 | 24 | |
@@ -38,26 +38,26 @@ discard block |
||
| 38 | 38 | $moduleSQLDataFile = "setup.data.sql"; |
| 39 | 39 | $moduleSQLResetFile = "setup.data.reset.sql"; |
| 40 | 40 | |
| 41 | -$moduleChunks = array (); // chunks - array : name, description, type - 0:file or 1:content, file or content |
|
| 42 | -$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content |
|
| 43 | -$moduleSnippets = array (); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 44 | -$modulePlugins = array (); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid |
|
| 45 | -$moduleModules = array (); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid |
|
| 46 | -$moduleTemplates = array (); // templates - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 47 | -$moduleTVs = array (); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 41 | +$moduleChunks = array(); // chunks - array : name, description, type - 0:file or 1:content, file or content |
|
| 42 | +$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content |
|
| 43 | +$moduleSnippets = array(); // snippets - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 44 | +$modulePlugins = array(); // plugins - array : name, description, type - 0:file or 1:content, file or content,properties, events,guid |
|
| 45 | +$moduleModules = array(); // modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid |
|
| 46 | +$moduleTemplates = array(); // templates - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 47 | +$moduleTVs = array(); // template variables - array : name, description, type - 0:file or 1:content, file or content,properties |
|
| 48 | 48 | $moduleDependencies = array(); // module depedencies - array : module, table, column, type, name |
| 49 | 49 | |
| 50 | -$errors= 0; |
|
| 50 | +$errors = 0; |
|
| 51 | 51 | |
| 52 | 52 | // get post back status |
| 53 | 53 | $isPostBack = (count($_POST)); |
| 54 | 54 | |
| 55 | 55 | $ph = ph(); |
| 56 | -$ph = array_merge($ph,$_lang); |
|
| 56 | +$ph = array_merge($ph, $_lang); |
|
| 57 | 57 | $ph['install_language'] = $install_language; |
| 58 | 58 | |
| 59 | 59 | ob_start(); |
| 60 | -$action= isset ($_GET['action']) ? trim(strip_tags($_GET['action'])) : 'language'; |
|
| 60 | +$action = isset ($_GET['action']) ? trim(strip_tags($_GET['action'])) : 'language'; |
|
| 61 | 61 | if (!@include_once("actions/action_{$action}.php")) { |
| 62 | 62 | die ("Invalid install action attempted. [action={$action}]"); |
| 63 | 63 | } |
@@ -65,5 +65,5 @@ discard block |
||
| 65 | 65 | ob_end_clean(); |
| 66 | 66 | |
| 67 | 67 | $tpl = file_get_contents("{$base_path}install/template.tpl"); |
| 68 | -echo parse($tpl,$ph); |
|
| 68 | +echo parse($tpl, $ph); |
|
| 69 | 69 | |
@@ -6,8 +6,8 @@ discard block |
||
| 6 | 6 | <tr> |
| 7 | 7 | <td nowrap class="warning"><?php echo $_lang['rb_title']?><br><small>[(use_browser)]</small></td> |
| 8 | 8 | <td> |
| 9 | - <?php echo wrap_label($_lang['yes'],form_radio('use_browser', 1, 'id="rbRowOn"'));?><br />
|
|
| 10 | - <?php echo wrap_label($_lang['no'], form_radio('use_browser', 0, 'id="rbRowOff"'));?>
|
|
| 9 | + <?php echo wrap_label($_lang['yes'], form_radio('use_browser', 1, 'id="rbRowOn"')); ?><br />
|
|
| 10 | + <?php echo wrap_label($_lang['no'], form_radio('use_browser', 0, 'id="rbRowOff"')); ?>
|
|
| 11 | 11 | </td> |
| 12 | 12 | </tr> |
| 13 | 13 | <tr> |
@@ -18,7 +18,7 @@ discard block |
||
| 18 | 18 | <td colspan="2"><div class="split"></div></td> |
| 19 | 19 | </tr> |
| 20 | 20 | |
| 21 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 21 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 22 | 22 | <td nowrap class="warning"><?php echo $_lang['which_browser_default_title']?><br><small>[(which_browser)]</small></td> |
| 23 | 23 | <td> |
| 24 | 24 | <select name="which_browser" size="1" class="inputBox" onchange="documentDirty=true;"> |
@@ -27,206 +27,206 @@ discard block |
||
| 27 | 27 | $dir = str_replace('\\', '/', $dir);
|
| 28 | 28 | $browser_name = substr($dir, strrpos($dir, '/') + 1); |
| 29 | 29 | $selected = $browser_name == $which_browser ? ' selected="selected"' : ''; |
| 30 | - echo '<option value="' . $browser_name . '"' . $selected . '>' . "{$browser_name}</option>\n";
|
|
| 30 | + echo '<option value="'.$browser_name.'"'.$selected.'>'."{$browser_name}</option>\n";
|
|
| 31 | 31 | } |
| 32 | 32 | ?> |
| 33 | 33 | </select> |
| 34 | 34 | </td> |
| 35 | 35 | </tr> |
| 36 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 36 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 37 | 37 | <td width="200"> </td> |
| 38 | 38 | <td class="comment"><?php echo $_lang['which_browser_default_msg']?></td> |
| 39 | 39 | </tr> |
| 40 | 40 | <tr> |
| 41 | 41 | <td colspan="2"><div class="split"></div></td> |
| 42 | 42 | </tr> |
| 43 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 43 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 44 | 44 | <td nowrap class="warning"><?php echo $_lang['rb_webuser_title']?><br><small>[(rb_webuser)]</small></td> |
| 45 | 45 | <td> |
| 46 | - <label><input type="radio" name="rb_webuser" value="1" <?php echo $rb_webuser=='1' ? 'checked="checked"' : "" ; ?> /> |
|
| 46 | + <label><input type="radio" name="rb_webuser" value="1" <?php echo $rb_webuser == '1' ? 'checked="checked"' : ""; ?> /> |
|
| 47 | 47 | <?php echo $_lang['yes']?></label><br /> |
| 48 | - <label><input type="radio" name="rb_webuser" value="0" <?php echo $rb_webuser=='0' ? 'checked="checked"' : "" ; ?> /> |
|
| 48 | + <label><input type="radio" name="rb_webuser" value="0" <?php echo $rb_webuser == '0' ? 'checked="checked"' : ""; ?> /> |
|
| 49 | 49 | <?php echo $_lang['no']?></label> |
| 50 | 50 | </td> |
| 51 | 51 | </tr> |
| 52 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 52 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 53 | 53 | <td width="200"> </td> |
| 54 | 54 | <td class="comment"><?php echo $_lang['rb_webuser_message']?></td> |
| 55 | 55 | </tr> |
| 56 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 56 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 57 | 57 | <td colspan="2"><div class="split"></div></td> |
| 58 | 58 | </tr> |
| 59 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 59 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 60 | 60 | <td nowrap class="warning"><?php echo $_lang['rb_base_dir_title']?><br><small>[(rb_base_dir)]</small></td> |
| 61 | 61 | <td> |
| 62 | 62 | <?php echo $_lang['default']; ?> <span id="default_rb_base_dir">[(base_path)]assets/</span><br /> |
| 63 | 63 | <input onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" name="rb_base_dir" id="rb_base_dir" value="<?php echo $rb_base_dir; ?>" /> <input type="button" onclick="reset_path('rb_base_dir');" value="<?php echo $_lang['reset']; ?>" name="reset_rb_base_dir">
|
| 64 | 64 | </td> |
| 65 | 65 | </tr> |
| 66 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 66 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 67 | 67 | <td width="200"> </td> |
| 68 | 68 | <td class="comment"><?php echo $_lang['rb_base_dir_message']?></td> |
| 69 | 69 | </tr> |
| 70 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 70 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 71 | 71 | <td colspan="2"><div class="split"></div></td> |
| 72 | 72 | </tr> |
| 73 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 73 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 74 | 74 | <td nowrap class="warning"><?php echo $_lang['rb_base_url_title']?><br><small>[(rb_base_url)]</small></td> |
| 75 | 75 | <td> |
| 76 | 76 | <input onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" name="rb_base_url" value="<?php echo $rb_base_url; ?>" /> |
| 77 | 77 | </td> |
| 78 | 78 | </tr> |
| 79 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 79 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 80 | 80 | <td width="200"> </td> |
| 81 | 81 | <td class="comment"><?php echo $_lang['rb_base_url_message']?></td> |
| 82 | 82 | </tr> |
| 83 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 83 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 84 | 84 | <td colspan="2"><div class="split"></div></td> |
| 85 | 85 | </tr> |
| 86 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 86 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 87 | 87 | <td nowrap class="warning"><?php echo $_lang['clean_uploaded_filename']?><br><small>[(clean_uploaded_filename)]</small></td> |
| 88 | 88 | <td> |
| 89 | - <label><input type="radio" name="clean_uploaded_filename" value="1" <?php echo $clean_uploaded_filename=='1' ? 'checked="checked"' : "" ; ?> /> |
|
| 89 | + <label><input type="radio" name="clean_uploaded_filename" value="1" <?php echo $clean_uploaded_filename == '1' ? 'checked="checked"' : ""; ?> /> |
|
| 90 | 90 | <?php echo $_lang['yes']?></label><br /> |
| 91 | - <label><input type="radio" name="clean_uploaded_filename" value="0" <?php echo $clean_uploaded_filename=='0' ? 'checked="checked"' : "" ; ?> /> |
|
| 91 | + <label><input type="radio" name="clean_uploaded_filename" value="0" <?php echo $clean_uploaded_filename == '0' ? 'checked="checked"' : ""; ?> /> |
|
| 92 | 92 | <?php echo $_lang['no']?></label> |
| 93 | 93 | </td> |
| 94 | 94 | </tr> |
| 95 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 95 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 96 | 96 | <td width="200"> </td> |
| 97 | - <td class="comment"><?php echo $_lang['clean_uploaded_filename_message'];?></td> |
|
| 97 | + <td class="comment"><?php echo $_lang['clean_uploaded_filename_message']; ?></td> |
|
| 98 | 98 | </tr> |
| 99 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 99 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 100 | 100 | <td colspan="2"><div class="split"></div></td> |
| 101 | 101 | </tr> |
| 102 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 102 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 103 | 103 | <td nowrap class="warning"><?php echo $_lang['settings_strip_image_paths_title']?><br><small>[(strip_image_paths)]</small></td> |
| 104 | 104 | <td> |
| 105 | - <label><input type="radio" name="strip_image_paths" value="1" <?php echo $strip_image_paths=='1' ? 'checked="checked"' : "" ; ?> /> |
|
| 105 | + <label><input type="radio" name="strip_image_paths" value="1" <?php echo $strip_image_paths == '1' ? 'checked="checked"' : ""; ?> /> |
|
| 106 | 106 | <?php echo $_lang['yes']?></label><br /> |
| 107 | - <label><input type="radio" name="strip_image_paths" value="0" <?php echo $strip_image_paths=='0' ? 'checked="checked"' : "" ; ?> /> |
|
| 107 | + <label><input type="radio" name="strip_image_paths" value="0" <?php echo $strip_image_paths == '0' ? 'checked="checked"' : ""; ?> /> |
|
| 108 | 108 | <?php echo $_lang['no']?></label> |
| 109 | 109 | </td> |
| 110 | 110 | </tr> |
| 111 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 111 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 112 | 112 | <td width="200"> </td> |
| 113 | 113 | <td class="comment"><?php echo $_lang['settings_strip_image_paths_message']?></td> |
| 114 | 114 | </tr> |
| 115 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 115 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 116 | 116 | <td colspan="2"><div class="split"></div></td> |
| 117 | 117 | </tr> |
| 118 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 118 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 119 | 119 | <td nowrap class="warning"><?php echo $_lang['maxImageWidth']?><br><small>[(maxImageWidth)]</small></td> |
| 120 | 120 | <td> |
| 121 | 121 | <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="maxImageWidth" value="<?php echo $maxImageWidth; ?>" /> |
| 122 | 122 | </td> |
| 123 | 123 | </tr> |
| 124 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 124 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 125 | 125 | <td width="200"> </td> |
| 126 | 126 | <td class="comment"><?php echo $_lang['maxImageWidth_message']?></td> |
| 127 | 127 | </tr> |
| 128 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 128 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 129 | 129 | <td colspan="2"><div class="split"></div></td> |
| 130 | 130 | </tr> |
| 131 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 131 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 132 | 132 | <td nowrap class="warning"><?php echo $_lang['maxImageHeight']?><br><small>[(maxImageHeight)]</small></td> |
| 133 | 133 | <td> |
| 134 | 134 | <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="maxImageHeight" value="<?php echo $maxImageHeight; ?>" /> |
| 135 | 135 | </td> |
| 136 | 136 | </tr> |
| 137 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 137 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 138 | 138 | <td width="200"> </td> |
| 139 | 139 | <td class="comment"><?php echo $_lang['maxImageHeight_message']?></td> |
| 140 | 140 | </tr> |
| 141 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 141 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 142 | 142 | <td colspan="2"><div class="split"></div></td> |
| 143 | 143 | </tr> |
| 144 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 144 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 145 | 145 | <td nowrap class="warning"><?php echo $_lang['thumbWidth']?><br><small>[(thumbWidth)]</small></td> |
| 146 | 146 | <td> |
| 147 | 147 | <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="thumbWidth" value="<?php echo $thumbWidth; ?>" /> |
| 148 | 148 | </td> |
| 149 | 149 | </tr> |
| 150 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 150 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 151 | 151 | <td width="200"> </td> |
| 152 | 152 | <td class="comment"><?php echo $_lang['thumbWidth_message']?></td> |
| 153 | 153 | </tr> |
| 154 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 154 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 155 | 155 | <td colspan="2"><div class="split"></div></td> |
| 156 | 156 | </tr> |
| 157 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 157 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 158 | 158 | <td nowrap class="warning"><?php echo $_lang['thumbHeight']?><br><small>[(thumbHeight)]</small></td> |
| 159 | 159 | <td> |
| 160 | 160 | <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="thumbHeight" value="<?php echo $thumbHeight; ?>" /> |
| 161 | 161 | </td> |
| 162 | 162 | </tr> |
| 163 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 163 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 164 | 164 | <td width="200"> </td> |
| 165 | 165 | <td class="comment"><?php echo $_lang['thumbHeight_message']?></td> |
| 166 | 166 | </tr> |
| 167 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 167 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 168 | 168 | <td colspan="2"><div class="split"></div></td> |
| 169 | 169 | </tr> |
| 170 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 170 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 171 | 171 | <td nowrap class="warning"><?php echo $_lang['thumbsDir']?><br><small>[(thumbsDir)]</small></td> |
| 172 | 172 | <td> |
| 173 | 173 | <input onchange="documentDirty=true;" type="text" maxlength="255" style="width: 250px;" name="thumbsDir" value="<?php echo $thumbsDir; ?>" /> |
| 174 | 174 | </td> |
| 175 | 175 | </tr> |
| 176 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 176 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 177 | 177 | <td width="200"> </td> |
| 178 | 178 | <td class="comment"><?php echo $_lang['thumbsDir_message']?></td> |
| 179 | 179 | </tr> |
| 180 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 180 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 181 | 181 | <td colspan="2"><div class="split"></div></td> |
| 182 | 182 | </tr> |
| 183 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 183 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 184 | 184 | <td nowrap class="warning"><?php echo $_lang['jpegQuality']?><br><small>[(jpegQuality)]</small></td> |
| 185 | 185 | <td> |
| 186 | 186 | <input onchange="documentDirty=true;" type="text" maxlength="4" style="width: 50px;" name="jpegQuality" value="<?php echo $jpegQuality; ?>" /> |
| 187 | 187 | </td> |
| 188 | 188 | </tr> |
| 189 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 189 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 190 | 190 | <td width="200"> </td> |
| 191 | 191 | <td class="comment"><?php echo $_lang['jpegQuality_message']?></td> |
| 192 | 192 | </tr> |
| 193 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 193 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 194 | 194 | <td colspan="2"><div class="split"></div></td> |
| 195 | 195 | </tr> |
| 196 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 196 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 197 | 197 | <td nowrap class="warning"><?php echo $_lang['denyZipDownload'] ?><br><small>[(denyZipDownload)]</small></td> |
| 198 | 198 | <td> |
| 199 | - <label><input type="radio" name="denyZipDownload" value="0" <?php echo $denyZipDownload=='0' ? 'checked="checked"' : ""; ?> /> |
|
| 199 | + <label><input type="radio" name="denyZipDownload" value="0" <?php echo $denyZipDownload == '0' ? 'checked="checked"' : ""; ?> /> |
|
| 200 | 200 | <?php echo $_lang['no']?></label><br /> |
| 201 | - <label><input type="radio" name="denyZipDownload" value="1" <?php echo $denyZipDownload=='1' ? 'checked="checked"' : ""; ?> /> |
|
| 201 | + <label><input type="radio" name="denyZipDownload" value="1" <?php echo $denyZipDownload == '1' ? 'checked="checked"' : ""; ?> /> |
|
| 202 | 202 | <?php echo $_lang['yes']?></label> |
| 203 | 203 | </td> |
| 204 | 204 | </tr> |
| 205 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 205 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 206 | 206 | <td colspan="2"><div class="split"></div></td> |
| 207 | 207 | </tr> |
| 208 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 208 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 209 | 209 | <td nowrap class="warning"><?php echo $_lang['denyExtensionRename'] ?><br><small>[(denyExtensionRename)]</small></td> |
| 210 | 210 | <td> |
| 211 | - <label><input type="radio" name="denyExtensionRename" value="0" <?php echo $denyExtensionRename=='0' ? 'checked="checked"' : ""; ?> /> |
|
| 211 | + <label><input type="radio" name="denyExtensionRename" value="0" <?php echo $denyExtensionRename == '0' ? 'checked="checked"' : ""; ?> /> |
|
| 212 | 212 | <?php echo $_lang['no']?></label><br /> |
| 213 | - <label><input type="radio" name="denyExtensionRename" value="1" <?php echo $denyExtensionRename=='1' ? 'checked="checked"' : ""; ?> /> |
|
| 213 | + <label><input type="radio" name="denyExtensionRename" value="1" <?php echo $denyExtensionRename == '1' ? 'checked="checked"' : ""; ?> /> |
|
| 214 | 214 | <?php echo $_lang['yes']?></label> |
| 215 | 215 | </td> |
| 216 | 216 | </tr> |
| 217 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 217 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 218 | 218 | <td colspan="2"><div class="split"></div></td> |
| 219 | 219 | </tr> |
| 220 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 220 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 221 | 221 | <td nowrap class="warning"><?php echo $_lang['showHiddenFiles'] ?><br><small>[(showHiddenFiles)]</small></td> |
| 222 | 222 | <td> |
| 223 | - <label><input type="radio" name="showHiddenFiles" value="0" <?php echo $showHiddenFiles=='0' ? 'checked="checked"' : ""; ?> /> |
|
| 223 | + <label><input type="radio" name="showHiddenFiles" value="0" <?php echo $showHiddenFiles == '0' ? 'checked="checked"' : ""; ?> /> |
|
| 224 | 224 | <?php echo $_lang['no']?></label><br /> |
| 225 | - <label><input type="radio" name="showHiddenFiles" value="1" <?php echo $showHiddenFiles=='1' ? 'checked="checked"' : ""; ?> /> |
|
| 225 | + <label><input type="radio" name="showHiddenFiles" value="1" <?php echo $showHiddenFiles == '1' ? 'checked="checked"' : ""; ?> /> |
|
| 226 | 226 | <?php echo $_lang['yes']?></label> |
| 227 | 227 | </td> |
| 228 | 228 | </tr> |
| 229 | - <tr class="rbRow" <?php echo showHide($use_browser==1);?>> |
|
| 229 | + <tr class="rbRow" <?php echo showHide($use_browser == 1); ?>> |
|
| 230 | 230 | <td colspan="2"><div class="split"></div></td> |
| 231 | 231 | </tr> |
| 232 | 232 | |
@@ -235,7 +235,7 @@ discard block |
||
| 235 | 235 | <?php |
| 236 | 236 | // invoke OnMiscSettingsRender event |
| 237 | 237 | $evtOut = $modx->invokeEvent('OnMiscSettingsRender');
|
| 238 | - if(is_array($evtOut)) echo implode("",$evtOut);
|
|
| 238 | + if (is_array($evtOut)) echo implode("", $evtOut);
|
|
| 239 | 239 | ?> |
| 240 | 240 | </td> |
| 241 | 241 | </tr> |
@@ -2,8 +2,8 @@ discard block |
||
| 2 | 2 | <tr> |
| 3 | 3 | <td><?php echo $_lang['smtp_auth_title'] ?></td> |
| 4 | 4 | <td> |
| 5 | - <?php echo wrap_label($_lang['yes'],form_radio('smtp_auth','1' ));?><br />
|
|
| 6 | - <?php echo wrap_label($_lang['no'],form_radio('smtp_auth','0' ));?>
|
|
| 5 | + <?php echo wrap_label($_lang['yes'], form_radio('smtp_auth', '1')); ?><br />
|
|
| 6 | + <?php echo wrap_label($_lang['no'], form_radio('smtp_auth', '0')); ?>
|
|
| 7 | 7 | </td> |
| 8 | 8 | </tr> |
| 9 | 9 | <tr> |
@@ -15,8 +15,8 @@ discard block |
||
| 15 | 15 | <td > |
| 16 | 16 | <select name="smtp_secure" size="1" class="inputBox"> |
| 17 | 17 | <option value="none" ><?php echo $_lang['no'] ?></option> |
| 18 | - <option value="ssl" <?php if($smtp_secure == 'ssl') echo "selected='selected'"; ?> >SSL</option> |
|
| 19 | - <option value="tls" <?php if($smtp_secure == 'tls') echo "selected='selected'"; ?> >TLS</option> |
|
| 18 | + <option value="ssl" <?php if ($smtp_secure == 'ssl') echo "selected='selected'"; ?> >SSL</option> |
|
| 19 | + <option value="tls" <?php if ($smtp_secure == 'tls') echo "selected='selected'"; ?> >TLS</option> |
|
| 20 | 20 | </select> |
| 21 | 21 | <br /> |
| 22 | 22 | </td> |
@@ -6,8 +6,8 @@ discard block |
||
| 6 | 6 | <tr> |
| 7 | 7 | <td nowrap class="warning" valign="top"><?php echo $_lang['friendlyurls_title'] ?><br><small>[(friendly_urls)]</small></td> |
| 8 | 8 | <td> |
| 9 | - <?php echo wrap_label($_lang['yes'],form_radio('friendly_urls', 1, 'id="furlRowOn"'));?><br />
|
|
| 10 | - <?php echo wrap_label($_lang['no'], form_radio('friendly_urls', 0, 'id="furlRowOff"'));?>
|
|
| 9 | + <?php echo wrap_label($_lang['yes'], form_radio('friendly_urls', 1, 'id="furlRowOn"')); ?><br />
|
|
| 10 | + <?php echo wrap_label($_lang['no'], form_radio('friendly_urls', 0, 'id="furlRowOff"')); ?>
|
|
| 11 | 11 | </td> |
| 12 | 12 | </tr> |
| 13 | 13 | <tr> |
@@ -20,8 +20,8 @@ discard block |
||
| 20 | 20 | <tr> |
| 21 | 21 | <td nowrap class="warning"><?php echo $_lang['xhtml_urls_title'] ?><br><small>[(xhtml_urls)]</small></td> |
| 22 | 22 | <td> |
| 23 | - <?php echo wrap_label($_lang['yes'],form_radio('xhtml_urls', 1));?><br />
|
|
| 24 | - <?php echo wrap_label($_lang['no'], form_radio('xhtml_urls', 0));?>
|
|
| 23 | + <?php echo wrap_label($_lang['yes'], form_radio('xhtml_urls', 1)); ?><br />
|
|
| 24 | + <?php echo wrap_label($_lang['no'], form_radio('xhtml_urls', 0)); ?>
|
|
| 25 | 25 | </td> |
| 26 | 26 | </tr> |
| 27 | 27 | <tr> |
@@ -31,135 +31,135 @@ discard block |
||
| 31 | 31 | <tr> |
| 32 | 32 | <td colspan="2"><div class="split"></div></td> |
| 33 | 33 | </tr> |
| 34 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 34 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 35 | 35 | <td nowrap class="warning" valign="top"><?php echo $_lang['friendlyurlsprefix_title'] ?><br><small>[(friendly_url_prefix)]</small></td> |
| 36 | 36 | <td><input onchange="documentDirty=true;" type="text" maxlength="50" style="width: 200px;" name="friendly_url_prefix" value="<?php echo $friendly_url_prefix; ?>" /></td> |
| 37 | 37 | </tr> |
| 38 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 38 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 39 | 39 | <td width="200"> </td> |
| 40 | 40 | <td class="comment"><?php echo $_lang['friendlyurlsprefix_message'] ?></td> |
| 41 | 41 | </tr> |
| 42 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 42 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 43 | 43 | <td colspan="2"><div class="split"></div></td> |
| 44 | 44 | </tr> |
| 45 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 45 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 46 | 46 | <td nowrap class="warning" valign="top"><?php echo $_lang['friendlyurlsuffix_title'] ?><br><small>[(friendly_url_suffix)]</small></td> |
| 47 | 47 | <td><input onchange="documentDirty=true;" type="text" maxlength="50" style="width: 200px;" name="friendly_url_suffix" value="<?php echo $friendly_url_suffix; ?>" /></td> |
| 48 | 48 | </tr> |
| 49 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 49 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 50 | 50 | <td width="200"> </td> |
| 51 | 51 | <td class="comment"><?php echo $_lang['friendlyurlsuffix_message'] ?></td> |
| 52 | 52 | </tr> |
| 53 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 53 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 54 | 54 | <td colspan="2"><div class="split"></div></td> |
| 55 | 55 | </tr> |
| 56 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 56 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 57 | 57 | <th><?php echo $_lang['make_folders_title'] ?><br><small>[(make_folders)]</small></th> |
| 58 | 58 | <td> |
| 59 | - <?php echo wrap_label($_lang['yes'],form_radio('make_folders','1'));?><br />
|
|
| 60 | - <?php echo wrap_label($_lang['no'],form_radio('make_folders','0'));?>
|
|
| 59 | + <?php echo wrap_label($_lang['yes'], form_radio('make_folders', '1')); ?><br />
|
|
| 60 | + <?php echo wrap_label($_lang['no'], form_radio('make_folders', '0')); ?>
|
|
| 61 | 61 | </td> |
| 62 | 62 | </tr> |
| 63 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 63 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 64 | 64 | <td width="200"> </td> |
| 65 | 65 | <td class="comment"><?php echo $_lang['make_folders_message'] ?></td> |
| 66 | 66 | </tr> |
| 67 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 67 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 68 | 68 | <td colspan="2"><div class="split"></div></td> |
| 69 | 69 | </tr> |
| 70 | 70 | |
| 71 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 71 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 72 | 72 | <th><?php echo $_lang['seostrict_title'] ?><br><small>[(seostrict)]</small></th> |
| 73 | 73 | <td> |
| 74 | - <?php echo wrap_label($_lang['yes'],form_radio('seostrict','1'));?><br />
|
|
| 75 | - <?php echo wrap_label($_lang['no'],form_radio('seostrict','0'));?>
|
|
| 74 | + <?php echo wrap_label($_lang['yes'], form_radio('seostrict', '1')); ?><br />
|
|
| 75 | + <?php echo wrap_label($_lang['no'], form_radio('seostrict', '0')); ?>
|
|
| 76 | 76 | </td> |
| 77 | 77 | </tr> |
| 78 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 78 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 79 | 79 | <td width="200"> </td> |
| 80 | 80 | <td class="comment"><?php echo $_lang['seostrict_message'] ?></td> |
| 81 | 81 | </tr> |
| 82 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 82 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 83 | 83 | <td colspan="2"><div class="split"></div></td> |
| 84 | 84 | </tr> |
| 85 | 85 | |
| 86 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 86 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 87 | 87 | <th><?php echo $_lang['aliaslistingfolder_title'] ?><br><small>[(aliaslistingfolder)]</small></th> |
| 88 | 88 | <td> |
| 89 | - <?php echo wrap_label($_lang['yes'],form_radio('aliaslistingfolder','1'));?><br />
|
|
| 90 | - <?php echo wrap_label($_lang['no'],form_radio('aliaslistingfolder','0'));?>
|
|
| 89 | + <?php echo wrap_label($_lang['yes'], form_radio('aliaslistingfolder', '1')); ?><br />
|
|
| 90 | + <?php echo wrap_label($_lang['no'], form_radio('aliaslistingfolder', '0')); ?>
|
|
| 91 | 91 | </td> |
| 92 | 92 | </tr> |
| 93 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 93 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 94 | 94 | <td width="200"> </td> |
| 95 | 95 | <td class="comment"><?php echo $_lang['aliaslistingfolder_message'] ?></td> |
| 96 | 96 | </tr> |
| 97 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 97 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 98 | 98 | <td colspan="2"><div class="split"></div></td> |
| 99 | 99 | </tr> |
| 100 | 100 | |
| 101 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 101 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 102 | 102 | <td nowrap class="warning" valign="top"><?php echo $_lang['friendly_alias_title'] ?><br><small>[(friendly_alias_urls)]</small></td> |
| 103 | 103 | <td> |
| 104 | - <?php echo wrap_label($_lang['yes'],form_radio('friendly_alias_urls','1'));?><br />
|
|
| 105 | - <?php echo wrap_label($_lang['no'],form_radio('friendly_alias_urls','0'));?>
|
|
| 104 | + <?php echo wrap_label($_lang['yes'], form_radio('friendly_alias_urls', '1')); ?><br />
|
|
| 105 | + <?php echo wrap_label($_lang['no'], form_radio('friendly_alias_urls', '0')); ?>
|
|
| 106 | 106 | </td> |
| 107 | 107 | </tr> |
| 108 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 108 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 109 | 109 | <td width="200"> </td> |
| 110 | 110 | <td class="comment"><?php echo $_lang['friendly_alias_message'] ?></td> |
| 111 | 111 | </tr> |
| 112 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 112 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 113 | 113 | <td colspan="2"><div class="split"></div></td> |
| 114 | 114 | </tr> |
| 115 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 115 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 116 | 116 | <td nowrap class="warning" valign="top"><?php echo $_lang['use_alias_path_title'] ?><br><small>[(use_alias_path)]</small></td> |
| 117 | 117 | <td> |
| 118 | - <?php echo wrap_label($_lang['yes'],form_radio('use_alias_path','1'));?><br />
|
|
| 119 | - <?php echo wrap_label($_lang['no'],form_radio('use_alias_path','0'));?>
|
|
| 118 | + <?php echo wrap_label($_lang['yes'], form_radio('use_alias_path', '1')); ?><br />
|
|
| 119 | + <?php echo wrap_label($_lang['no'], form_radio('use_alias_path', '0')); ?>
|
|
| 120 | 120 | </td> |
| 121 | 121 | </tr> |
| 122 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 122 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 123 | 123 | <td width="200"> </td> |
| 124 | 124 | <td class="comment"><?php echo $_lang['use_alias_path_message'] ?></td> |
| 125 | 125 | </tr> |
| 126 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 126 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 127 | 127 | <td colspan="2"><div class="split"></div></td> |
| 128 | 128 | </tr> |
| 129 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 129 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 130 | 130 | <td nowrap class="warning" valign="top"><?php echo $_lang['duplicate_alias_title'] ?><br><small>[(allow_duplicate_alias)]</small></td> |
| 131 | 131 | <td> |
| 132 | - <?php echo wrap_label($_lang['yes'],form_radio('allow_duplicate_alias','1'));?><br />
|
|
| 133 | - <?php echo wrap_label($_lang['no'],form_radio('allow_duplicate_alias','0'));?>
|
|
| 132 | + <?php echo wrap_label($_lang['yes'], form_radio('allow_duplicate_alias', '1')); ?><br />
|
|
| 133 | + <?php echo wrap_label($_lang['no'], form_radio('allow_duplicate_alias', '0')); ?>
|
|
| 134 | 134 | </td> |
| 135 | 135 | </tr> |
| 136 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 136 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 137 | 137 | <td width="200"> </td> |
| 138 | 138 | <td class="comment"><?php echo $_lang['duplicate_alias_message'] ?></td> |
| 139 | 139 | </tr> |
| 140 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 140 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 141 | 141 | <td colspan="2"><div class="split"></div></td> |
| 142 | 142 | </tr> |
| 143 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 143 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 144 | 144 | <td nowrap class="warning" valign="top"><?php echo $_lang['automatic_alias_title'] ?><br><small>[(automatic_alias)]</small></td> |
| 145 | 145 | <td> |
| 146 | - <?php echo wrap_label($_lang['yes'],form_radio('automatic_alias','1'));?><br />
|
|
| 147 | - <?php echo wrap_label($_lang['no'],form_radio('automatic_alias','0'));?>
|
|
| 146 | + <?php echo wrap_label($_lang['yes'], form_radio('automatic_alias', '1')); ?><br />
|
|
| 147 | + <?php echo wrap_label($_lang['no'], form_radio('automatic_alias', '0')); ?>
|
|
| 148 | 148 | </td> |
| 149 | 149 | </tr> |
| 150 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 150 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 151 | 151 | <td width="200"> </td> |
| 152 | 152 | <td class="comment"><?php echo $_lang['automatic_alias_message'] ?></td> |
| 153 | 153 | </tr> |
| 154 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 154 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 155 | 155 | <td colspan="2"><div class="split"></div></td> |
| 156 | 156 | </tr> |
| 157 | -<tr class="furlRow" <?php echo showHide($friendly_urls==1);?>> |
|
| 157 | +<tr class="furlRow" <?php echo showHide($friendly_urls == 1); ?>> |
|
| 158 | 158 | <td colspan="2"> |
| 159 | 159 | <?php |
| 160 | 160 | // invoke OnFriendlyURLSettingsRender event |
| 161 | 161 | $evtOut = $modx->invokeEvent('OnFriendlyURLSettingsRender');
|
| 162 | - if(is_array($evtOut)) echo implode("",$evtOut);
|
|
| 162 | + if (is_array($evtOut)) echo implode("", $evtOut);
|
|
| 163 | 163 | ?> |
| 164 | 164 | </td> |
| 165 | 165 | </tr> |
@@ -12,9 +12,9 @@ |
||
| 12 | 12 | * @link http://kcfinder.sunhater.com |
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | -class type_img { |
|
| 15 | +class type_img{ |
|
| 16 | 16 | |
| 17 | - public function checkFile($file, array $config) { |
|
| 17 | + public function checkFile($file, array $config){ |
|
| 18 | 18 | |
| 19 | 19 | $driver = isset($config['imageDriversPriority']) |
| 20 | 20 | ? image::getDriver(explode(" ", $config['imageDriversPriority'])) : "gd"; |
@@ -12,9 +12,9 @@ discard block |
||
| 12 | 12 | * @link http://kcfinder.sunhater.com |
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | -class type_mime { |
|
| 15 | +class type_mime{ |
|
| 16 | 16 | |
| 17 | - public function checkFile($file, array $config) { |
|
| 17 | + public function checkFile($file, array $config){ |
|
| 18 | 18 | if (!class_exists("finfo")) |
| 19 | 19 | return "Fileinfo PECL extension is missing."; |
| 20 | 20 | |
@@ -33,12 +33,12 @@ discard block |
||
| 33 | 33 | $mimes = $config['params']; |
| 34 | 34 | if (substr($mimes, 0, 1) == "!") { |
| 35 | 35 | $mimes = trim(substr($mimes, 1)); |
| 36 | - return in_array($type , explode(" ", $mimes)) |
|
| 36 | + return in_array($type, explode(" ", $mimes)) |
|
| 37 | 37 | ? "You can't upload such files." |
| 38 | 38 | : true; |
| 39 | 39 | } |
| 40 | 40 | |
| 41 | - return !in_array($type , explode(" ", $mimes)) |
|
| 41 | + return !in_array($type, explode(" ", $mimes)) |
|
| 42 | 42 | ? "You can't upload such files." |
| 43 | 43 | : true; |
| 44 | 44 | } |
@@ -12,12 +12,12 @@ discard block |
||
| 12 | 12 | * @link http://kcfinder.sunhater.com |
| 13 | 13 | */ |
| 14 | 14 | |
| 15 | -class browser extends uploader { |
|
| 15 | +class browser extends uploader{ |
|
| 16 | 16 | protected $action; |
| 17 | 17 | protected $thumbsDir; |
| 18 | 18 | protected $thumbsTypeDir; |
| 19 | 19 | |
| 20 | - public function __construct($modx) { |
|
| 20 | + public function __construct($modx){ |
|
| 21 | 21 | parent::__construct($modx); |
| 22 | 22 | |
| 23 | 23 | if (isset($this->post['dir'])) { |
@@ -32,7 +32,7 @@ discard block |
||
| 32 | 32 | $this->get['dir'] = $dir; |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | - $thumbsDir = $this->config['uploadDir'] . "/" . $this->config['thumbsDir']; |
|
| 35 | + $thumbsDir = $this->config['uploadDir']."/".$this->config['thumbsDir']; |
|
| 36 | 36 | if (( |
| 37 | 37 | !is_dir($thumbsDir) && |
| 38 | 38 | !@mkdir($thumbsDir, $this->config['dirPerms']) |
@@ -70,9 +70,9 @@ discard block |
||
| 70 | 70 | $this->config['theme'] = $this->get['theme']; |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - public function action() { |
|
| 73 | + public function action(){ |
|
| 74 | 74 | $act = isset($this->get['act']) ? $this->get['act'] : "browser"; |
| 75 | - if(!preg_match('@^[0-9a-zA-Z_]+$@', $act)) $this->errorMsg("Unknown error."); |
|
| 75 | + if (!preg_match('@^[0-9a-zA-Z_]+$@', $act)) $this->errorMsg("Unknown error."); |
|
| 76 | 76 | if (!method_exists($this, "act_$act")) |
| 77 | 77 | $act = "browser"; |
| 78 | 78 | $this->action = $act; |
@@ -94,7 +94,7 @@ discard block |
||
| 94 | 94 | $this->session['dir'] = $this->type; |
| 95 | 95 | else { |
| 96 | 96 | $type = $this->getTypeFromPath($this->session['dir']); |
| 97 | - $dir = $this->config['uploadDir'] . "/" . $this->session['dir']; |
|
| 97 | + $dir = $this->config['uploadDir']."/".$this->session['dir']; |
|
| 98 | 98 | if (($type != $this->type) || !is_dir($dir) || !is_readable($dir)) |
| 99 | 99 | $this->session['dir'] = $this->type; |
| 100 | 100 | } |
@@ -115,7 +115,7 @@ discard block |
||
| 115 | 115 | : $return; |
| 116 | 116 | } |
| 117 | 117 | |
| 118 | - protected function act_browser() { |
|
| 118 | + protected function act_browser(){ |
|
| 119 | 119 | if (isset($this->get['dir']) && |
| 120 | 120 | is_dir("{$this->typeDir}/{$this->get['dir']}") && |
| 121 | 121 | is_readable("{$this->typeDir}/{$this->get['dir']}") |
@@ -125,7 +125,7 @@ discard block |
||
| 125 | 125 | return $this->output(); |
| 126 | 126 | } |
| 127 | 127 | |
| 128 | - protected function act_init() { |
|
| 128 | + protected function act_init(){ |
|
| 129 | 129 | $tree = $this->getDirInfo($this->typeDir); |
| 130 | 130 | $tree['dirs'] = $this->getTree($this->session['dir']); |
| 131 | 131 | if (!is_array($tree['dirs']) || !count($tree['dirs'])) |
@@ -140,7 +140,7 @@ discard block |
||
| 140 | 140 | return json_encode($data); |
| 141 | 141 | } |
| 142 | 142 | |
| 143 | - protected function act_thumb() { |
|
| 143 | + protected function act_thumb(){ |
|
| 144 | 144 | $this->getDir($this->get['dir'], true); |
| 145 | 145 | if (!isset($this->get['file']) || !isset($this->get['dir'])) |
| 146 | 146 | $this->sendDefaultThumb(); |
@@ -149,7 +149,7 @@ discard block |
||
| 149 | 149 | $this->sendDefaultThumb(); |
| 150 | 150 | $file = "{$this->thumbsDir}/{$this->type}/{$this->get['dir']}/$file"; |
| 151 | 151 | if (!is_file($file) || !is_readable($file)) { |
| 152 | - $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/" . basename($file); |
|
| 152 | + $file = "{$this->config['uploadDir']}/{$this->type}/{$this->get['dir']}/".basename($file); |
|
| 153 | 153 | if (!is_file($file) || !is_readable($file)) |
| 154 | 154 | $this->sendDefaultThumb($file); |
| 155 | 155 | $image = image::factory($this->imageDriver, $file); |
@@ -171,13 +171,13 @@ discard block |
||
| 171 | 171 | httpCache::file($file, "image/jpeg"); |
| 172 | 172 | } |
| 173 | 173 | |
| 174 | - protected function act_expand() { |
|
| 174 | + protected function act_expand(){ |
|
| 175 | 175 | return json_encode(array('dirs' => $this->getDirs($this->postDir()))); |
| 176 | 176 | } |
| 177 | 177 | |
| 178 | - protected function act_chDir() { |
|
| 178 | + protected function act_chDir(){ |
|
| 179 | 179 | $this->postDir(); // Just for existing check |
| 180 | - $this->session['dir'] = $this->type . "/" . $this->post['dir']; |
|
| 180 | + $this->session['dir'] = $this->type."/".$this->post['dir']; |
|
| 181 | 181 | $dirWritable = dir::isWritable("{$this->config['uploadDir']}/{$this->session['dir']}"); |
| 182 | 182 | return json_encode(array( |
| 183 | 183 | 'files' => $this->getFiles($this->session['dir']), |
@@ -185,7 +185,7 @@ discard block |
||
| 185 | 185 | )); |
| 186 | 186 | } |
| 187 | 187 | |
| 188 | - protected function act_newDir() { |
|
| 188 | + protected function act_newDir(){ |
|
| 189 | 189 | if (!$this->config['access']['dirs']['create'] || |
| 190 | 190 | !isset($this->post['dir']) || |
| 191 | 191 | !isset($this->post['newDir']) |
@@ -207,7 +207,7 @@ discard block |
||
| 207 | 207 | return true; |
| 208 | 208 | } |
| 209 | 209 | |
| 210 | - protected function act_renameDir() { |
|
| 210 | + protected function act_renameDir(){ |
|
| 211 | 211 | if (!$this->config['access']['dirs']['rename'] || |
| 212 | 212 | !isset($this->post['dir']) || |
| 213 | 213 | !isset($this->post['newName']) |
@@ -222,15 +222,15 @@ discard block |
||
| 222 | 222 | $this->errorMsg("Unallowable characters in folder name."); |
| 223 | 223 | if (substr($newName, 0, 1) == ".") |
| 224 | 224 | $this->errorMsg("Folder name shouldn't begins with '.'"); |
| 225 | - if (!@rename($dir, dirname($dir) . "/$newName")) |
|
| 225 | + if (!@rename($dir, dirname($dir)."/$newName")) |
|
| 226 | 226 | $this->errorMsg("Cannot rename the folder."); |
| 227 | 227 | $thumbDir = "$this->thumbsTypeDir/{$this->post['dir']}"; |
| 228 | 228 | if (is_dir($thumbDir)) |
| 229 | - @rename($thumbDir, dirname($thumbDir) . "/$newName"); |
|
| 229 | + @rename($thumbDir, dirname($thumbDir)."/$newName"); |
|
| 230 | 230 | return json_encode(array('name' => $newName)); |
| 231 | 231 | } |
| 232 | 232 | |
| 233 | - protected function act_deleteDir() { |
|
| 233 | + protected function act_deleteDir(){ |
|
| 234 | 234 | if (!$this->config['access']['dirs']['delete'] || |
| 235 | 235 | !isset($this->post['dir']) || |
| 236 | 236 | !strlen(trim($this->post['dir'])) |
@@ -250,7 +250,7 @@ discard block |
||
| 250 | 250 | return true; |
| 251 | 251 | } |
| 252 | 252 | |
| 253 | - protected function act_upload() { |
|
| 253 | + protected function act_upload(){ |
|
| 254 | 254 | if (!$this->config['access']['files']['upload'] || |
| 255 | 255 | !isset($this->post['dir']) |
| 256 | 256 | ) |
@@ -275,11 +275,11 @@ discard block |
||
| 275 | 275 | return $this->moveUploadFile($this->file, $dir); |
| 276 | 276 | } |
| 277 | 277 | |
| 278 | - protected function act_download() { |
|
| 278 | + protected function act_download(){ |
|
| 279 | 279 | $dir = $this->postDir(); |
| 280 | 280 | if (!isset($this->post['dir']) || |
| 281 | 281 | !isset($this->post['file']) || |
| 282 | - strpos($this->post['file'],'../')!==false || |
|
| 282 | + strpos($this->post['file'], '../') !== false || |
|
| 283 | 283 | (false === ($file = "$dir/{$this->post['file']}")) || |
| 284 | 284 | !file_exists($file) || !is_readable($file) |
| 285 | 285 | ) |
@@ -290,19 +290,19 @@ discard block |
||
| 290 | 290 | header("Cache-Control: must-revalidate, post-check=0, pre-check=0"); |
| 291 | 291 | header("Cache-Control: private", false); |
| 292 | 292 | header("Content-Type: application/octet-stream"); |
| 293 | - header('Content-Disposition: attachment; filename="' . str_replace('"', "_", $this->post['file']) . '"'); |
|
| 293 | + header('Content-Disposition: attachment; filename="'.str_replace('"', "_", $this->post['file']).'"'); |
|
| 294 | 294 | header("Content-Transfer-Encoding: binary"); |
| 295 | - header("Content-Length: " . filesize($file)); |
|
| 295 | + header("Content-Length: ".filesize($file)); |
|
| 296 | 296 | readfile($file); |
| 297 | 297 | die; |
| 298 | 298 | } |
| 299 | 299 | |
| 300 | - protected function act_rename() { |
|
| 300 | + protected function act_rename(){ |
|
| 301 | 301 | $dir = $this->postDir(); |
| 302 | 302 | if (!$this->config['access']['files']['rename'] || |
| 303 | 303 | !isset($this->post['dir']) || |
| 304 | 304 | !isset($this->post['file']) || |
| 305 | - strpos($this->post['file'],'../')!==false || |
|
| 305 | + strpos($this->post['file'], '../') !== false || |
|
| 306 | 306 | !isset($this->post['newName']) || |
| 307 | 307 | (false === ($file = "$dir/{$this->post['file']}")) || |
| 308 | 308 | !file_exists($file) || !is_readable($file) || !file::isWritable($file) |
@@ -337,16 +337,16 @@ discard block |
||
| 337 | 337 | $thumbFile = "$thumbDir/{$this->post['file']}"; |
| 338 | 338 | |
| 339 | 339 | if (file_exists($thumbFile)) |
| 340 | - @rename($thumbFile, "$thumbDir/" . basename($newName)); |
|
| 340 | + @rename($thumbFile, "$thumbDir/".basename($newName)); |
|
| 341 | 341 | return true; |
| 342 | 342 | } |
| 343 | 343 | |
| 344 | - protected function act_delete() { |
|
| 344 | + protected function act_delete(){ |
|
| 345 | 345 | $dir = $this->postDir(); |
| 346 | 346 | if (!$this->config['access']['files']['delete'] || |
| 347 | 347 | !isset($this->post['dir']) || |
| 348 | 348 | !isset($this->post['file']) || |
| 349 | - strpos($this->post['file'],'../')!==false || |
|
| 349 | + strpos($this->post['file'], '../') !== false || |
|
| 350 | 350 | (false === ($file = "$dir/{$this->post['file']}")) || |
| 351 | 351 | !file_exists($file) || !is_readable($file) || !file::isWritable($file) || |
| 352 | 352 | !@unlink($file) |
@@ -358,7 +358,7 @@ discard block |
||
| 358 | 358 | return true; |
| 359 | 359 | } |
| 360 | 360 | |
| 361 | - protected function act_cp_cbd() { |
|
| 361 | + protected function act_cp_cbd(){ |
|
| 362 | 362 | $dir = $this->postDir(); |
| 363 | 363 | if (!$this->config['access']['files']['copy'] || |
| 364 | 364 | !isset($this->post['dir']) || |
@@ -369,7 +369,7 @@ discard block |
||
| 369 | 369 | $this->errorMsg("Unknown error."); |
| 370 | 370 | |
| 371 | 371 | $error = array(); |
| 372 | - foreach($this->post['files'] as $file) { |
|
| 372 | + foreach ($this->post['files'] as $file) { |
|
| 373 | 373 | $file = path::normalize($file); |
| 374 | 374 | if (substr($file, 0, 1) == ".") continue; |
| 375 | 375 | $type = explode("/", $file); |
@@ -382,11 +382,11 @@ discard block |
||
| 382 | 382 | if (!file_exists($path)) |
| 383 | 383 | $error[] = $this->label("The file '{file}' does not exist.", $replace); |
| 384 | 384 | elseif (substr($base, 0, 1) == ".") |
| 385 | - $error[] = "$base: " . $this->label("File name shouldn't begins with '.'"); |
|
| 385 | + $error[] = "$base: ".$this->label("File name shouldn't begins with '.'"); |
|
| 386 | 386 | elseif (!$this->validateExtension($ext, $type)) |
| 387 | - $error[] = "$base: " . $this->label("Denied file extension."); |
|
| 387 | + $error[] = "$base: ".$this->label("Denied file extension."); |
|
| 388 | 388 | elseif (file_exists("$dir/$base")) |
| 389 | - $error[] = "$base: " . $this->label("A file or folder with that name already exists."); |
|
| 389 | + $error[] = "$base: ".$this->label("A file or folder with that name already exists."); |
|
| 390 | 390 | elseif (!is_readable($path) || !is_file($path)) |
| 391 | 391 | $error[] = $this->label("Cannot read '{file}'.", $replace); |
| 392 | 392 | elseif (!@copy($path, "$dir/$base")) |
@@ -409,7 +409,7 @@ discard block |
||
| 409 | 409 | return true; |
| 410 | 410 | } |
| 411 | 411 | |
| 412 | - protected function act_mv_cbd() { |
|
| 412 | + protected function act_mv_cbd(){ |
|
| 413 | 413 | $dir = $this->postDir(); |
| 414 | 414 | if (!$this->config['access']['files']['move'] || |
| 415 | 415 | !isset($this->post['dir']) || |
@@ -420,7 +420,7 @@ discard block |
||
| 420 | 420 | $this->errorMsg("Unknown error."); |
| 421 | 421 | |
| 422 | 422 | $error = array(); |
| 423 | - foreach($this->post['files'] as $file) { |
|
| 423 | + foreach ($this->post['files'] as $file) { |
|
| 424 | 424 | $file = path::normalize($file); |
| 425 | 425 | if (substr($file, 0, 1) == ".") continue; |
| 426 | 426 | $type = explode("/", $file); |
@@ -433,11 +433,11 @@ discard block |
||
| 433 | 433 | if (!file_exists($path)) |
| 434 | 434 | $error[] = $this->label("The file '{file}' does not exist.", $replace); |
| 435 | 435 | elseif (substr($base, 0, 1) == ".") |
| 436 | - $error[] = "$base: " . $this->label("File name shouldn't begins with '.'"); |
|
| 436 | + $error[] = "$base: ".$this->label("File name shouldn't begins with '.'"); |
|
| 437 | 437 | elseif (!$this->validateExtension($ext, $type)) |
| 438 | - $error[] = "$base: " . $this->label("Denied file extension."); |
|
| 438 | + $error[] = "$base: ".$this->label("Denied file extension."); |
|
| 439 | 439 | elseif (file_exists("$dir/$base")) |
| 440 | - $error[] = "$base: " . $this->label("A file or folder with that name already exists."); |
|
| 440 | + $error[] = "$base: ".$this->label("A file or folder with that name already exists."); |
|
| 441 | 441 | elseif (!is_readable($path) || !is_file($path)) |
| 442 | 442 | $error[] = $this->label("Cannot read '{file}'.", $replace); |
| 443 | 443 | elseif (!file::isWritable($path) || !@rename($path, "$dir/$base")) |
@@ -460,7 +460,7 @@ discard block |
||
| 460 | 460 | return true; |
| 461 | 461 | } |
| 462 | 462 | |
| 463 | - protected function act_rm_cbd() { |
|
| 463 | + protected function act_rm_cbd(){ |
|
| 464 | 464 | if (!$this->config['access']['files']['delete'] || |
| 465 | 465 | !isset($this->post['files']) || |
| 466 | 466 | !is_array($this->post['files']) || |
@@ -469,7 +469,7 @@ discard block |
||
| 469 | 469 | $this->errorMsg("Unknown error."); |
| 470 | 470 | |
| 471 | 471 | $error = array(); |
| 472 | - foreach($this->post['files'] as $file) { |
|
| 472 | + foreach ($this->post['files'] as $file) { |
|
| 473 | 473 | $file = path::normalize($file); |
| 474 | 474 | if (substr($file, 0, 1) == ".") continue; |
| 475 | 475 | $type = explode("/", $file); |
@@ -492,25 +492,25 @@ discard block |
||
| 492 | 492 | return true; |
| 493 | 493 | } |
| 494 | 494 | |
| 495 | - protected function act_downloadDir() { |
|
| 495 | + protected function act_downloadDir(){ |
|
| 496 | 496 | $dir = $this->postDir(); |
| 497 | 497 | if (!isset($this->post['dir']) || $this->config['denyZipDownload']) |
| 498 | 498 | $this->errorMsg("Unknown error."); |
| 499 | - $filename = basename($dir) . ".zip"; |
|
| 499 | + $filename = basename($dir).".zip"; |
|
| 500 | 500 | do { |
| 501 | - $file = md5(time() . session_id()); |
|
| 501 | + $file = md5(time().session_id()); |
|
| 502 | 502 | $file = "{$this->config['uploadDir']}/$file.zip"; |
| 503 | 503 | } while (file_exists($file)); |
| 504 | 504 | new zipFolder($file, $dir); |
| 505 | 505 | header("Content-Type: application/x-zip"); |
| 506 | - header('Content-Disposition: attachment; filename="' . str_replace('"', "_", $filename) . '"'); |
|
| 507 | - header("Content-Length: " . filesize($file)); |
|
| 506 | + header('Content-Disposition: attachment; filename="'.str_replace('"', "_", $filename).'"'); |
|
| 507 | + header("Content-Length: ".filesize($file)); |
|
| 508 | 508 | readfile($file); |
| 509 | 509 | unlink($file); |
| 510 | 510 | die; |
| 511 | 511 | } |
| 512 | 512 | |
| 513 | - protected function act_downloadSelected() { |
|
| 513 | + protected function act_downloadSelected(){ |
|
| 514 | 514 | $dir = $this->postDir(); |
| 515 | 515 | if (!isset($this->post['dir']) || |
| 516 | 516 | !isset($this->post['files']) || |
@@ -531,7 +531,7 @@ discard block |
||
| 531 | 531 | } |
| 532 | 532 | |
| 533 | 533 | do { |
| 534 | - $file = md5(time() . session_id()); |
|
| 534 | + $file = md5(time().session_id()); |
|
| 535 | 535 | $file = "{$this->config['uploadDir']}/$file.zip"; |
| 536 | 536 | } while (file_exists($file)); |
| 537 | 537 | |
@@ -543,14 +543,14 @@ discard block |
||
| 543 | 543 | $zip->close(); |
| 544 | 544 | } |
| 545 | 545 | header("Content-Type: application/x-zip"); |
| 546 | - header('Content-Disposition: attachment; filename="selected_files_' . basename($file) . '"'); |
|
| 547 | - header("Content-Length: " . filesize($file)); |
|
| 546 | + header('Content-Disposition: attachment; filename="selected_files_'.basename($file).'"'); |
|
| 547 | + header("Content-Length: ".filesize($file)); |
|
| 548 | 548 | readfile($file); |
| 549 | 549 | unlink($file); |
| 550 | 550 | die; |
| 551 | 551 | } |
| 552 | 552 | |
| 553 | - protected function act_downloadClipboard() { |
|
| 553 | + protected function act_downloadClipboard(){ |
|
| 554 | 554 | if (!isset($this->post['files']) || |
| 555 | 555 | !is_array($this->post['files']) || |
| 556 | 556 | $this->config['denyZipDownload'] |
@@ -566,14 +566,14 @@ discard block |
||
| 566 | 566 | $type = $type[0]; |
| 567 | 567 | if ($type != $this->type) |
| 568 | 568 | continue; |
| 569 | - $file = $this->config['uploadDir'] . "/$file"; |
|
| 569 | + $file = $this->config['uploadDir']."/$file"; |
|
| 570 | 570 | if (!is_file($file) || !is_readable($file)) |
| 571 | 571 | continue; |
| 572 | 572 | $zipFiles[] = $file; |
| 573 | 573 | } |
| 574 | 574 | |
| 575 | 575 | do { |
| 576 | - $file = md5(time() . session_id()); |
|
| 576 | + $file = md5(time().session_id()); |
|
| 577 | 577 | $file = "{$this->config['uploadDir']}/$file.zip"; |
| 578 | 578 | } while (file_exists($file)); |
| 579 | 579 | |
@@ -585,14 +585,14 @@ discard block |
||
| 585 | 585 | $zip->close(); |
| 586 | 586 | } |
| 587 | 587 | header("Content-Type: application/x-zip"); |
| 588 | - header('Content-Disposition: attachment; filename="clipboard_' . basename($file) . '"'); |
|
| 589 | - header("Content-Length: " . filesize($file)); |
|
| 588 | + header('Content-Disposition: attachment; filename="clipboard_'.basename($file).'"'); |
|
| 589 | + header("Content-Length: ".filesize($file)); |
|
| 590 | 590 | readfile($file); |
| 591 | 591 | unlink($file); |
| 592 | 592 | die; |
| 593 | 593 | } |
| 594 | 594 | |
| 595 | - protected function act_check4Update() { |
|
| 595 | + protected function act_check4Update(){ |
|
| 596 | 596 | if ($this->config['denyUpdateCheck']) |
| 597 | 597 | return json_encode(array('version' => false)); |
| 598 | 598 | |
@@ -632,24 +632,24 @@ discard block |
||
| 632 | 632 | // Curl extension |
| 633 | 633 | ) {} elseif ( |
| 634 | 634 | function_exists("curl_init") && |
| 635 | - (false !== ( $curl = @curl_init($url) )) && |
|
| 636 | - ( @ob_start() || (@curl_close($curl) && false)) && |
|
| 637 | - ( @curl_exec($curl) || (@curl_close($curl) && false)) && |
|
| 638 | - ((false !== ( $ver = @ob_get_clean() )) || (@curl_close($curl) && false)) && |
|
| 639 | - ( @curl_close($curl) || true ) && |
|
| 635 | + (false !== ($curl = @curl_init($url))) && |
|
| 636 | + (@ob_start() || (@curl_close($curl) && false)) && |
|
| 637 | + (@curl_exec($curl) || (@curl_close($curl) && false)) && |
|
| 638 | + ((false !== ($ver = @ob_get_clean())) || (@curl_close($curl) && false)) && |
|
| 639 | + (@curl_close($curl) || true) && |
|
| 640 | 640 | preg_match($pattern, $ver) |
| 641 | 641 | |
| 642 | 642 | // Socket extension |
| 643 | 643 | ) {} elseif (function_exists('socket_create')) { |
| 644 | 644 | $cmd = |
| 645 | - "GET $path " . strtoupper($protocol) . "/1.1\r\n" . |
|
| 646 | - "Host: $host\r\n" . |
|
| 645 | + "GET $path ".strtoupper($protocol)."/1.1\r\n". |
|
| 646 | + "Host: $host\r\n". |
|
| 647 | 647 | "Connection: Close\r\n\r\n"; |
| 648 | 648 | |
| 649 | - if ((false !== ( $socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP) )) && |
|
| 650 | - (false !== @socket_connect($socket, $host, $port) ) && |
|
| 651 | - (false !== @socket_write($socket, $cmd, strlen($cmd)) ) && |
|
| 652 | - (false !== ( $ver = @socket_read($socket, 2048) )) && |
|
| 649 | + if ((false !== ($socket = @socket_create(AF_INET, SOCK_STREAM, SOL_TCP))) && |
|
| 650 | + (false !== @socket_connect($socket, $host, $port)) && |
|
| 651 | + (false !== @socket_write($socket, $cmd, strlen($cmd))) && |
|
| 652 | + (false !== ($ver = @socket_read($socket, 2048))) && |
|
| 653 | 653 | preg_match($responsePattern, $ver, $match) |
| 654 | 654 | ) |
| 655 | 655 | $ver = $match[2]; |
@@ -666,7 +666,7 @@ discard block |
||
| 666 | 666 | return json_encode(array('version' => false)); |
| 667 | 667 | } |
| 668 | 668 | |
| 669 | - protected function moveUploadFile($file, $dir) { |
|
| 669 | + protected function moveUploadFile($file, $dir){ |
|
| 670 | 670 | $message = $this->checkUploadedFile($file); |
| 671 | 671 | |
| 672 | 672 | if ($message !== true) { |
@@ -676,28 +676,28 @@ discard block |
||
| 676 | 676 | } |
| 677 | 677 | |
| 678 | 678 | $filename = $this->normalizeFilename($file['name']); |
| 679 | - $target = "$dir/" . file::getInexistantFilename($filename, $dir); |
|
| 679 | + $target = "$dir/".file::getInexistantFilename($filename, $dir); |
|
| 680 | 680 | |
| 681 | 681 | if (!@move_uploaded_file($file['tmp_name'], $target) && |
| 682 | 682 | !@rename($file['tmp_name'], $target) && |
| 683 | 683 | !@copy($file['tmp_name'], $target) |
| 684 | 684 | ) { |
| 685 | 685 | @unlink($file['tmp_name']); |
| 686 | - return "{$file['name']}: " . $this->label("Cannot move uploaded file to target folder."); |
|
| 686 | + return "{$file['name']}: ".$this->label("Cannot move uploaded file to target folder."); |
|
| 687 | 687 | } elseif (function_exists('chmod')) |
| 688 | 688 | chmod($target, $this->config['filePerms']); |
| 689 | 689 | |
| 690 | - $this->modx->invokeEvent('OnFileBrowserUpload',array( |
|
| 690 | + $this->modx->invokeEvent('OnFileBrowserUpload', array( |
|
| 691 | 691 | 'filepath'=>realpath($dir), |
| 692 | - 'filename'=>str_replace("/","",str_replace($dir,"",realpath($target))) |
|
| 692 | + 'filename'=>str_replace("/", "", str_replace($dir, "", realpath($target))) |
|
| 693 | 693 | )); |
| 694 | 694 | |
| 695 | 695 | $this->makeThumb($target); |
| 696 | 696 | |
| 697 | - return "/" . basename($target); |
|
| 697 | + return "/".basename($target); |
|
| 698 | 698 | } |
| 699 | 699 | |
| 700 | - protected function sendDefaultThumb($file=null) { |
|
| 700 | + protected function sendDefaultThumb($file = null){ |
|
| 701 | 701 | if ($file !== null) { |
| 702 | 702 | $ext = file::getExtension($file); |
| 703 | 703 | $thumb = "themes/{$this->config['theme']}/img/files/big/$ext.png"; |
@@ -709,7 +709,7 @@ discard block |
||
| 709 | 709 | die; |
| 710 | 710 | } |
| 711 | 711 | |
| 712 | - protected function getFiles($dir) { |
|
| 712 | + protected function getFiles($dir){ |
|
| 713 | 713 | $thumbDir = "{$this->config['uploadDir']}/{$this->config['thumbsDir']}/$dir"; |
| 714 | 714 | $dir = "{$this->config['uploadDir']}/$dir"; |
| 715 | 715 | $return = array(); |
@@ -720,10 +720,10 @@ discard block |
||
| 720 | 720 | foreach ($files as $file) { |
| 721 | 721 | $ext = file::getExtension($file); |
| 722 | 722 | $smallThumb = false; |
| 723 | - if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg' )) ) { |
|
| 723 | + if (in_array(strtolower($ext), array('png', 'jpg', 'gif', 'jpeg'))) { |
|
| 724 | 724 | $size = @getimagesize($file); |
| 725 | 725 | if (is_array($size) && count($size)) { |
| 726 | - $thumb_file = "$thumbDir/" . basename($file); |
|
| 726 | + $thumb_file = "$thumbDir/".basename($file); |
|
| 727 | 727 | if (!is_file($thumb_file) || filemtime($file) > filemtime($thumb_file)) |
| 728 | 728 | $this->makeThumb($file); |
| 729 | 729 | $smallThumb = |
@@ -736,9 +736,9 @@ discard block |
||
| 736 | 736 | if ($stat === false) continue; |
| 737 | 737 | $name = basename($file); |
| 738 | 738 | $types = $this->config['types']; |
| 739 | - $types = explode(' ',$types['images'].' '.$types['image']); |
|
| 740 | - if (substr($name,0,1) == '.' && !$this->config['showHiddenFiles']) continue; |
|
| 741 | - if ($this->type == 'images' && !in_array(strtolower($ext),$types)) continue; |
|
| 739 | + $types = explode(' ', $types['images'].' '.$types['image']); |
|
| 740 | + if (substr($name, 0, 1) == '.' && !$this->config['showHiddenFiles']) continue; |
|
| 741 | + if ($this->type == 'images' && !in_array(strtolower($ext), $types)) continue; |
|
| 742 | 742 | $bigIcon = file_exists("themes/{$this->config['theme']}/img/files/big/$ext.png"); |
| 743 | 743 | $smallIcon = file_exists("themes/{$this->config['theme']}/img/files/small/$ext.png"); |
| 744 | 744 | $thumb = file_exists("$thumbDir/$name"); |
@@ -758,7 +758,7 @@ discard block |
||
| 758 | 758 | return $return; |
| 759 | 759 | } |
| 760 | 760 | |
| 761 | - protected function getTree($dir, $index=0) { |
|
| 761 | + protected function getTree($dir, $index = 0){ |
|
| 762 | 762 | $path = explode("/", $dir); |
| 763 | 763 | |
| 764 | 764 | $pdir = ""; |
@@ -793,25 +793,25 @@ discard block |
||
| 793 | 793 | return $dirs; |
| 794 | 794 | } |
| 795 | 795 | |
| 796 | - protected function postDir($existent=true) { |
|
| 796 | + protected function postDir($existent = true){ |
|
| 797 | 797 | $dir = $this->typeDir; |
| 798 | 798 | if (isset($this->post['dir'])) |
| 799 | - $dir .= "/" . $this->post['dir']; |
|
| 799 | + $dir .= "/".$this->post['dir']; |
|
| 800 | 800 | if ($existent && (!is_dir($dir) || !is_readable($dir))) |
| 801 | 801 | $this->errorMsg("Inexistant or inaccessible folder."); |
| 802 | 802 | return $dir; |
| 803 | 803 | } |
| 804 | 804 | |
| 805 | - protected function getDir($existent=true) { |
|
| 805 | + protected function getDir($existent = true){ |
|
| 806 | 806 | $dir = $this->typeDir; |
| 807 | 807 | if (isset($this->get['dir'])) |
| 808 | - $dir .= "/" . $this->get['dir']; |
|
| 808 | + $dir .= "/".$this->get['dir']; |
|
| 809 | 809 | if ($existent && (!is_dir($dir) || !is_readable($dir))) |
| 810 | 810 | $this->errorMsg("Inexistant or inaccessible folder."); |
| 811 | 811 | return $dir; |
| 812 | 812 | } |
| 813 | 813 | |
| 814 | - protected function getDirs($dir) { |
|
| 814 | + protected function getDirs($dir){ |
|
| 815 | 815 | $dirs = dir::content($dir, array('types' => "dir")); |
| 816 | 816 | $return = array(); |
| 817 | 817 | if (is_array($dirs)) { |
@@ -826,7 +826,7 @@ discard block |
||
| 826 | 826 | return $return; |
| 827 | 827 | } |
| 828 | 828 | |
| 829 | - protected function getDirInfo($dir, $removable=false) { |
|
| 829 | + protected function getDirInfo($dir, $removable = false){ |
|
| 830 | 830 | if ((substr(basename($dir), 0, 1) == ".") || !is_dir($dir) || !is_readable($dir)) |
| 831 | 831 | return false; |
| 832 | 832 | $dirs = dir::content($dir, array('types' => "dir")); |
@@ -853,7 +853,7 @@ discard block |
||
| 853 | 853 | return $info; |
| 854 | 854 | } |
| 855 | 855 | |
| 856 | - protected function output($data=null, $template=null) { |
|
| 856 | + protected function output($data = null, $template = null){ |
|
| 857 | 857 | if (!is_array($data)) $data = array(); |
| 858 | 858 | if ($template === null) |
| 859 | 859 | $template = $this->action; |
@@ -873,7 +873,7 @@ discard block |
||
| 873 | 873 | return ""; |
| 874 | 874 | } |
| 875 | 875 | |
| 876 | - protected function errorMsg($message, array $data=null) { |
|
| 876 | + protected function errorMsg($message, array $data = null){ |
|
| 877 | 877 | if (in_array($this->action, array("thumb", "upload", "download", "downloadDir"))) |
| 878 | 878 | die($this->label($message, $data)); |
| 879 | 879 | if (($this->action === null) || ($this->action == "browser")) |