evolution-cms /
evolution
@@ -8,8 +8,8 @@ |
||
| 8 | 8 | ******************************************************* |
| 9 | 9 | */ |
| 10 | 10 | |
| 11 | -use PHPMailer\PHPMailer\PHPMailer; |
|
| 12 | 11 | use PHPMailer\PHPMailer\Exception; |
| 12 | +use PHPMailer\PHPMailer\PHPMailer; |
|
| 13 | 13 | |
| 14 | 14 | require MODX_MANAGER_PATH . 'includes/controls/phpmailer/Exception.php'; |
| 15 | 15 | require MODX_MANAGER_PATH . 'includes/controls/phpmailer/PHPMailer.php'; |
@@ -11,9 +11,9 @@ discard block |
||
| 11 | 11 | use PHPMailer\PHPMailer\PHPMailer; |
| 12 | 12 | use PHPMailer\PHPMailer\Exception; |
| 13 | 13 | |
| 14 | -require MODX_MANAGER_PATH . 'includes/controls/phpmailer/Exception.php'; |
|
| 15 | -require MODX_MANAGER_PATH . 'includes/controls/phpmailer/PHPMailer.php'; |
|
| 16 | -require MODX_MANAGER_PATH . 'includes/controls/phpmailer/SMTP.php'; |
|
| 14 | +require MODX_MANAGER_PATH.'includes/controls/phpmailer/Exception.php'; |
|
| 15 | +require MODX_MANAGER_PATH.'includes/controls/phpmailer/PHPMailer.php'; |
|
| 16 | +require MODX_MANAGER_PATH.'includes/controls/phpmailer/SMTP.php'; |
|
| 17 | 17 | |
| 18 | 18 | /** |
| 19 | 19 | * Class MODxMailer |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | public function init(\DocumentParser $modx) |
| 32 | 32 | { |
| 33 | 33 | $this->modx = $modx; |
| 34 | - $this->PluginDir = MODX_MANAGER_PATH . 'includes/controls/phpmailer/'; |
|
| 34 | + $this->PluginDir = MODX_MANAGER_PATH.'includes/controls/phpmailer/'; |
|
| 35 | 35 | |
| 36 | 36 | switch ($modx->config['email_method']) { |
| 37 | 37 | case 'smtp': |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | mb_language($this->mb_language); |
| 96 | 96 | mb_internal_encoding($modx->config['modx_charset']); |
| 97 | 97 | } |
| 98 | - $exconf = MODX_MANAGER_PATH . 'includes/controls/phpmailer/config.inc.php'; |
|
| 98 | + $exconf = MODX_MANAGER_PATH.'includes/controls/phpmailer/config.inc.php'; |
|
| 99 | 99 | if (is_file($exconf)) { |
| 100 | 100 | include($exconf); |
| 101 | 101 | } |
@@ -163,12 +163,12 @@ discard block |
||
| 163 | 163 | } |
| 164 | 164 | |
| 165 | 165 | if ($this->modx->debug) { |
| 166 | - $debug_info = 'CharSet = ' . $this->CharSet . "\n"; |
|
| 167 | - $debug_info .= 'Encoding = ' . $this->Encoding . "\n"; |
|
| 168 | - $debug_info .= 'mb_language = ' . $this->mb_language . "\n"; |
|
| 169 | - $debug_info .= 'encode_header_method = ' . $this->encode_header_method . "\n"; |
|
| 166 | + $debug_info = 'CharSet = '.$this->CharSet."\n"; |
|
| 167 | + $debug_info .= 'Encoding = '.$this->Encoding."\n"; |
|
| 168 | + $debug_info .= 'mb_language = '.$this->mb_language."\n"; |
|
| 169 | + $debug_info .= 'encode_header_method = '.$this->encode_header_method."\n"; |
|
| 170 | 170 | $debug_info .= "send_mode = {$mode}\n"; |
| 171 | - $debug_info .= 'Subject = ' . $this->Subject . "\n"; |
|
| 171 | + $debug_info .= 'Subject = '.$this->Subject."\n"; |
|
| 172 | 172 | $log = "<pre>{$debug_info}\n{$header}\n{$org_body}</pre>"; |
| 173 | 173 | $this->modx->logEvent(1, 1, $log, 'MODxMailer debug information'); |
| 174 | 174 | |
@@ -228,7 +228,7 @@ discard block |
||
| 228 | 228 | ini_set('sendmail_from', $old_from); |
| 229 | 229 | } |
| 230 | 230 | if (!$rt) { |
| 231 | - $msg = $this->Lang('instantiate') . "<br />\n"; |
|
| 231 | + $msg = $this->Lang('instantiate')."<br />\n"; |
|
| 232 | 232 | $msg .= "{$this->Subject}<br />\n"; |
| 233 | 233 | $msg .= "{$this->FromName}<{$this->From}><br />\n"; |
| 234 | 234 | $msg .= mb_convert_encoding($body, $this->modx->config['modx_charset'], $this->CharSet); |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | */ |
| 248 | 248 | public function SetError($msg) |
| 249 | 249 | { |
| 250 | - $msg .= '<pre>' . print_r(get_object_vars($this), true) . '</pre>'; |
|
| 250 | + $msg .= '<pre>'.print_r(get_object_vars($this), true).'</pre>'; |
|
| 251 | 251 | $this->modx->config['send_errormail'] = '0'; |
| 252 | 252 | $this->modx->logEvent(0, 3, $msg, 'phpmailer'); |
| 253 | 253 | |
@@ -276,14 +276,14 @@ discard block |
||
| 276 | 276 | /** |
| 277 | 277 | * @return string |
| 278 | 278 | */ |
| 279 | - public function getMIMEHeader() { |
|
| 279 | + public function getMIMEHeader(){ |
|
| 280 | 280 | return $this->MIMEHeader; |
| 281 | 281 | } |
| 282 | 282 | |
| 283 | 283 | /** |
| 284 | 284 | * @return string |
| 285 | 285 | */ |
| 286 | - public function getMIMEBody() { |
|
| 286 | + public function getMIMEBody(){ |
|
| 287 | 287 | return $this->MIMEBody; |
| 288 | 288 | } |
| 289 | 289 | |
@@ -292,7 +292,7 @@ discard block |
||
| 292 | 292 | * |
| 293 | 293 | * @return $this |
| 294 | 294 | */ |
| 295 | - public function setMIMEHeader($header = '') { |
|
| 295 | + public function setMIMEHeader($header = ''){ |
|
| 296 | 296 | $this->MIMEHeader = $header; |
| 297 | 297 | |
| 298 | 298 | return $this; |
@@ -303,7 +303,7 @@ discard block |
||
| 303 | 303 | * |
| 304 | 304 | * @return $this |
| 305 | 305 | */ |
| 306 | - public function setMIMEBody($body = '') { |
|
| 306 | + public function setMIMEBody($body = ''){ |
|
| 307 | 307 | $this->MIMEBody = $body; |
| 308 | 308 | |
| 309 | 309 | return $this; |
@@ -314,7 +314,7 @@ discard block |
||
| 314 | 314 | * |
| 315 | 315 | * @return $this |
| 316 | 316 | */ |
| 317 | - public function setMailHeader($header = '') { |
|
| 317 | + public function setMailHeader($header = ''){ |
|
| 318 | 318 | $this->mailHeader = $header; |
| 319 | 319 | |
| 320 | 320 | return $this; |
@@ -323,7 +323,7 @@ discard block |
||
| 323 | 323 | /** |
| 324 | 324 | * @return string |
| 325 | 325 | */ |
| 326 | - public function getMessageID() { |
|
| 327 | - return trim($this->lastMessageID,'<>'); |
|
| 326 | + public function getMessageID(){ |
|
| 327 | + return trim($this->lastMessageID, '<>'); |
|
| 328 | 328 | } |
| 329 | 329 | } |
@@ -1,33 +1,32 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | //:: EVO Installer Setup file |
| 3 | 3 | //::::::::::::::::::::::::::::::::::::::::: |
| 4 | -if (is_file($base_path . 'assets/cache/siteManager.php')) { |
|
| 5 | - include_once($base_path . 'assets/cache/siteManager.php'); |
|
| 4 | +if (is_file($base_path.'assets/cache/siteManager.php')) { |
|
| 5 | + include_once($base_path.'assets/cache/siteManager.php'); |
|
| 6 | 6 | } |
| 7 | -if(!defined('MGR_DIR')) define('MGR_DIR', 'manager'); |
|
| 7 | +if (!defined('MGR_DIR')) define('MGR_DIR', 'manager'); |
|
| 8 | 8 | |
| 9 | 9 | require_once('../'.MGR_DIR.'/includes/version.inc.php'); |
| 10 | 10 | |
| 11 | -$chunkPath = $base_path .'install/assets/chunks'; |
|
| 12 | -$snippetPath = $base_path .'install/assets/snippets'; |
|
| 13 | -$pluginPath = $base_path .'install/assets/plugins'; |
|
| 14 | -$modulePath = $base_path .'install/assets/modules'; |
|
| 15 | -$templatePath = $base_path .'install/assets/templates'; |
|
| 16 | -$tvPath = $base_path .'install/assets/tvs'; |
|
| 11 | +$chunkPath = $base_path.'install/assets/chunks'; |
|
| 12 | +$snippetPath = $base_path.'install/assets/snippets'; |
|
| 13 | +$pluginPath = $base_path.'install/assets/plugins'; |
|
| 14 | +$modulePath = $base_path.'install/assets/modules'; |
|
| 15 | +$templatePath = $base_path.'install/assets/templates'; |
|
| 16 | +$tvPath = $base_path.'install/assets/tvs'; |
|
| 17 | 17 | |
| 18 | 18 | // setup Template template files - array : name, description, type - 0:file or 1:content, parameters, category |
| 19 | 19 | $mt = &$moduleTemplates; |
| 20 | -if(is_dir($templatePath) && is_readable($templatePath)) { |
|
| 20 | +if (is_dir($templatePath) && is_readable($templatePath)) { |
|
| 21 | 21 | $d = dir($templatePath); |
| 22 | 22 | while (false !== ($tplfile = $d->read())) |
| 23 | 23 | { |
| 24 | - if(substr($tplfile, -4) != '.tpl') continue; |
|
| 24 | + if (substr($tplfile, -4) != '.tpl') continue; |
|
| 25 | 25 | $params = parse_docblock($templatePath, $tplfile); |
| 26 | - if(is_array($params) && (count($params)>0)) |
|
| 26 | + if (is_array($params) && (count($params) > 0)) |
|
| 27 | 27 | { |
| 28 | 28 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 29 | - $mt[] = array |
|
| 30 | - ( |
|
| 29 | + $mt[] = array( |
|
| 31 | 30 | $params['name'], |
| 32 | 31 | $description, |
| 33 | 32 | // Don't think this is gonna be used ... but adding it just in case 'type' |
@@ -45,12 +44,12 @@ discard block |
||
| 45 | 44 | |
| 46 | 45 | // setup Template Variable template files |
| 47 | 46 | $mtv = &$moduleTVs; |
| 48 | -if(is_dir($tvPath) && is_readable($tvPath)) { |
|
| 47 | +if (is_dir($tvPath) && is_readable($tvPath)) { |
|
| 49 | 48 | $d = dir($tvPath); |
| 50 | 49 | while (false !== ($tplfile = $d->read())) { |
| 51 | - if(substr($tplfile, -4) != '.tpl') continue; |
|
| 50 | + if (substr($tplfile, -4) != '.tpl') continue; |
|
| 52 | 51 | $params = parse_docblock($tvPath, $tplfile); |
| 53 | - if(is_array($params) && (count($params)>0)) { |
|
| 52 | + if (is_array($params) && (count($params) > 0)) { |
|
| 54 | 53 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 55 | 54 | $mtv[] = array( |
| 56 | 55 | $params['name'], |
@@ -62,9 +61,9 @@ discard block |
||
| 62 | 61 | $params['output_widget'], |
| 63 | 62 | $params['output_widget_params'], |
| 64 | 63 | "$templatePath/{$params['filename']}", /* not currently used */ |
| 65 | - $params['template_assignments']!="*"?$params['template_assignments']:implode(",",array_map(create_function('$v','return $v[0];'),$mt)), /* comma-separated list of template names */ |
|
| 64 | + $params['template_assignments'] != "*" ? $params['template_assignments'] : implode(",", array_map(create_function('$v', 'return $v[0];'), $mt)), /* comma-separated list of template names */ |
|
| 66 | 65 | $params['modx_category'], |
| 67 | - $params['lock_tv'], /* value should be 1 or 0 */ |
|
| 66 | + $params['lock_tv'], /* value should be 1 or 0 */ |
|
| 68 | 67 | array_key_exists('installset', $params) ? preg_split("/\s*,\s*/", $params['installset']) : false |
| 69 | 68 | ); |
| 70 | 69 | } |
@@ -74,14 +73,14 @@ discard block |
||
| 74 | 73 | |
| 75 | 74 | // setup chunks template files - array : name, description, type - 0:file or 1:content, file or content |
| 76 | 75 | $mc = &$moduleChunks; |
| 77 | -if(is_dir($chunkPath) && is_readable($chunkPath)) { |
|
| 76 | +if (is_dir($chunkPath) && is_readable($chunkPath)) { |
|
| 78 | 77 | $d = dir($chunkPath); |
| 79 | 78 | while (false !== ($tplfile = $d->read())) { |
| 80 | - if(substr($tplfile, -4) != '.tpl') { |
|
| 79 | + if (substr($tplfile, -4) != '.tpl') { |
|
| 81 | 80 | continue; |
| 82 | 81 | } |
| 83 | 82 | $params = parse_docblock($chunkPath, $tplfile); |
| 84 | - if(is_array($params) && count($params) > 0) { |
|
| 83 | + if (is_array($params) && count($params) > 0) { |
|
| 85 | 84 | $mc[] = array( |
| 86 | 85 | $params['name'], |
| 87 | 86 | $params['description'], |
@@ -97,14 +96,14 @@ discard block |
||
| 97 | 96 | |
| 98 | 97 | // setup snippets template files - array : name, description, type - 0:file or 1:content, file or content,properties |
| 99 | 98 | $ms = &$moduleSnippets; |
| 100 | -if(is_dir($snippetPath) && is_readable($snippetPath)) { |
|
| 99 | +if (is_dir($snippetPath) && is_readable($snippetPath)) { |
|
| 101 | 100 | $d = dir($snippetPath); |
| 102 | 101 | while (false !== ($tplfile = $d->read())) { |
| 103 | - if(substr($tplfile, -4) != '.tpl') { |
|
| 102 | + if (substr($tplfile, -4) != '.tpl') { |
|
| 104 | 103 | continue; |
| 105 | 104 | } |
| 106 | 105 | $params = parse_docblock($snippetPath, $tplfile); |
| 107 | - if(is_array($params) && count($params) > 0) { |
|
| 106 | + if (is_array($params) && count($params) > 0) { |
|
| 108 | 107 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 109 | 108 | $ms[] = array( |
| 110 | 109 | $params['name'], |
@@ -121,14 +120,14 @@ discard block |
||
| 121 | 120 | |
| 122 | 121 | // setup plugins template files - array : name, description, type - 0:file or 1:content, file or content,properties |
| 123 | 122 | $mp = &$modulePlugins; |
| 124 | -if(is_dir($pluginPath) && is_readable($pluginPath)) { |
|
| 123 | +if (is_dir($pluginPath) && is_readable($pluginPath)) { |
|
| 125 | 124 | $d = dir($pluginPath); |
| 126 | 125 | while (false !== ($tplfile = $d->read())) { |
| 127 | - if(substr($tplfile, -4) != '.tpl') { |
|
| 126 | + if (substr($tplfile, -4) != '.tpl') { |
|
| 128 | 127 | continue; |
| 129 | 128 | } |
| 130 | 129 | $params = parse_docblock($pluginPath, $tplfile); |
| 131 | - if(is_array($params) && count($params) > 0) { |
|
| 130 | + if (is_array($params) && count($params) > 0) { |
|
| 132 | 131 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 133 | 132 | $mp[] = array( |
| 134 | 133 | $params['name'], |
@@ -150,14 +149,14 @@ discard block |
||
| 150 | 149 | // setup modules - array : name, description, type - 0:file or 1:content, file or content,properties, guid,enable_sharedparams |
| 151 | 150 | $mm = &$moduleModules; |
| 152 | 151 | $mdp = &$moduleDependencies; |
| 153 | -if(is_dir($modulePath) && is_readable($modulePath)) { |
|
| 152 | +if (is_dir($modulePath) && is_readable($modulePath)) { |
|
| 154 | 153 | $d = dir($modulePath); |
| 155 | 154 | while (false !== ($tplfile = $d->read())) { |
| 156 | - if(substr($tplfile, -4) != '.tpl') { |
|
| 155 | + if (substr($tplfile, -4) != '.tpl') { |
|
| 157 | 156 | continue; |
| 158 | 157 | } |
| 159 | 158 | $params = parse_docblock($modulePath, $tplfile); |
| 160 | - if(is_array($params) && count($params) > 0) { |
|
| 159 | + if (is_array($params) && count($params) > 0) { |
|
| 161 | 160 | $description = empty($params['version']) ? $params['description'] : "<strong>{$params['version']}</strong> {$params['description']}"; |
| 162 | 161 | $mm[] = array( |
| 163 | 162 | $params['name'], |
@@ -241,109 +240,109 @@ discard block |
||
| 241 | 240 | // setup callback function |
| 242 | 241 | $callBackFnc = "clean_up"; |
| 243 | 242 | |
| 244 | -function clean_up($sqlParser) { |
|
| 243 | +function clean_up($sqlParser){ |
|
| 245 | 244 | $ids = array(); |
| 246 | 245 | $mysqlVerOk = -1; |
| 247 | 246 | |
| 248 | - if(function_exists("mysqli_get_server_info")) { |
|
| 249 | - $mysqlVerOk = (version_compare(mysqli_get_server_info($sqlParser->conn),"4.0.2")>=0); |
|
| 247 | + if (function_exists("mysqli_get_server_info")) { |
|
| 248 | + $mysqlVerOk = (version_compare(mysqli_get_server_info($sqlParser->conn), "4.0.2") >= 0); |
|
| 250 | 249 | } |
| 251 | 250 | |
| 252 | 251 | // secure web documents - privateweb |
| 253 | - mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1"); |
|
| 254 | - $sql = "SELECT DISTINCT sc.id |
|
| 252 | + mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 0 WHERE privateweb = 1"); |
|
| 253 | + $sql = "SELECT DISTINCT sc.id |
|
| 255 | 254 | FROM `".$sqlParser->prefix."site_content` sc |
| 256 | 255 | LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id |
| 257 | 256 | LEFT JOIN `".$sqlParser->prefix."webgroup_access` wga ON wga.documentgroup = dg.document_group |
| 258 | 257 | WHERE wga.id>0"; |
| 259 | - $ds = mysqli_query($sqlParser->conn,$sql); |
|
| 260 | - if(!$ds) { |
|
| 258 | + $ds = mysqli_query($sqlParser->conn, $sql); |
|
| 259 | + if (!$ds) { |
|
| 261 | 260 | echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn); |
| 262 | 261 | } |
| 263 | 262 | else { |
| 264 | - while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"]; |
|
| 265 | - if(count($ids)>0) { |
|
| 266 | - mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ",$ids).")"); |
|
| 263 | + while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"]; |
|
| 264 | + if (count($ids) > 0) { |
|
| 265 | + mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privateweb = 1 WHERE id IN (".implode(", ", $ids).")"); |
|
| 267 | 266 | unset($ids); |
| 268 | 267 | } |
| 269 | 268 | } |
| 270 | 269 | |
| 271 | 270 | // secure manager documents privatemgr |
| 272 | - mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1"); |
|
| 273 | - $sql = "SELECT DISTINCT sc.id |
|
| 271 | + mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 0 WHERE privatemgr = 1"); |
|
| 272 | + $sql = "SELECT DISTINCT sc.id |
|
| 274 | 273 | FROM `".$sqlParser->prefix."site_content` sc |
| 275 | 274 | LEFT JOIN `".$sqlParser->prefix."document_groups` dg ON dg.document = sc.id |
| 276 | 275 | LEFT JOIN `".$sqlParser->prefix."membergroup_access` mga ON mga.documentgroup = dg.document_group |
| 277 | 276 | WHERE mga.id>0"; |
| 278 | - $ds = mysqli_query($sqlParser->conn,$sql); |
|
| 279 | - if(!$ds) { |
|
| 277 | + $ds = mysqli_query($sqlParser->conn, $sql); |
|
| 278 | + if (!$ds) { |
|
| 280 | 279 | echo "An error occurred while executing a query: ".mysqli_error($sqlParser->conn); |
| 281 | 280 | } |
| 282 | 281 | else { |
| 283 | - while($r = mysqli_fetch_assoc($ds)) $ids[]=$r["id"]; |
|
| 284 | - if(count($ids)>0) { |
|
| 285 | - mysqli_query($sqlParser->conn,"UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ",$ids).")"); |
|
| 282 | + while ($r = mysqli_fetch_assoc($ds)) $ids[] = $r["id"]; |
|
| 283 | + if (count($ids) > 0) { |
|
| 284 | + mysqli_query($sqlParser->conn, "UPDATE `".$sqlParser->prefix."site_content` SET privatemgr = 1 WHERE id IN (".implode(", ", $ids).")"); |
|
| 286 | 285 | unset($ids); |
| 287 | 286 | } |
| 288 | 287 | } |
| 289 | 288 | } |
| 290 | 289 | |
| 291 | -function parse_docblock($element_dir, $filename) { |
|
| 290 | +function parse_docblock($element_dir, $filename){ |
|
| 292 | 291 | $params = array(); |
| 293 | - $fullpath = $element_dir . '/' . $filename; |
|
| 294 | - if(is_readable($fullpath)) { |
|
| 292 | + $fullpath = $element_dir.'/'.$filename; |
|
| 293 | + if (is_readable($fullpath)) { |
|
| 295 | 294 | $tpl = @fopen($fullpath, "r"); |
| 296 | - if($tpl) { |
|
| 295 | + if ($tpl) { |
|
| 297 | 296 | $params['filename'] = $filename; |
| 298 | 297 | $docblock_start_found = false; |
| 299 | 298 | $name_found = false; |
| 300 | 299 | $description_found = false; |
| 301 | 300 | $docblock_end_found = false; |
| 302 | 301 | |
| 303 | - while(!feof($tpl)) { |
|
| 302 | + while (!feof($tpl)) { |
|
| 304 | 303 | $line = fgets($tpl); |
| 305 | - if(!$docblock_start_found) { |
|
| 304 | + if (!$docblock_start_found) { |
|
| 306 | 305 | // find docblock start |
| 307 | - if(strpos($line, '/**') !== false) { |
|
| 306 | + if (strpos($line, '/**') !== false) { |
|
| 308 | 307 | $docblock_start_found = true; |
| 309 | 308 | } |
| 310 | 309 | continue; |
| 311 | - } elseif(!$name_found) { |
|
| 310 | + } elseif (!$name_found) { |
|
| 312 | 311 | // find name |
| 313 | 312 | $ma = null; |
| 314 | - if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) { |
|
| 313 | + if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) { |
|
| 315 | 314 | $params['name'] = trim($ma[1]); |
| 316 | 315 | $name_found = !empty($params['name']); |
| 317 | 316 | } |
| 318 | 317 | continue; |
| 319 | - } elseif(!$description_found) { |
|
| 318 | + } elseif (!$description_found) { |
|
| 320 | 319 | // find description |
| 321 | 320 | $ma = null; |
| 322 | - if(preg_match("/^\s+\*\s+(.+)/", $line, $ma)) { |
|
| 321 | + if (preg_match("/^\s+\*\s+(.+)/", $line, $ma)) { |
|
| 323 | 322 | $params['description'] = trim($ma[1]); |
| 324 | 323 | $description_found = !empty($params['description']); |
| 325 | 324 | } |
| 326 | 325 | continue; |
| 327 | 326 | } else { |
| 328 | 327 | $ma = null; |
| 329 | - if(preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) { |
|
| 328 | + if (preg_match("/^\s+\*\s+\@([^\s]+)\s+(.+)/", $line, $ma)) { |
|
| 330 | 329 | $param = trim($ma[1]); |
| 331 | 330 | $val = trim($ma[2]); |
| 332 | - if(!empty($param) && !empty($val)) { |
|
| 333 | - if($param == 'internal') { |
|
| 331 | + if (!empty($param) && !empty($val)) { |
|
| 332 | + if ($param == 'internal') { |
|
| 334 | 333 | $ma = null; |
| 335 | - if(preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) { |
|
| 334 | + if (preg_match("/\@([^\s]+)\s+(.+)/", $val, $ma)) { |
|
| 336 | 335 | $param = trim($ma[1]); |
| 337 | 336 | $val = trim($ma[2]); |
| 338 | 337 | } |
| 339 | 338 | //if($val !== '0' && (empty($param) || empty($val))) { |
| 340 | - if(empty($param)) { |
|
| 339 | + if (empty($param)) { |
|
| 341 | 340 | continue; |
| 342 | 341 | } |
| 343 | 342 | } |
| 344 | 343 | $params[$param] = $val; |
| 345 | 344 | } |
| 346 | - } elseif(preg_match("/^\s*\*\/\s*$/", $line)) { |
|
| 345 | + } elseif (preg_match("/^\s*\*\/\s*$/", $line)) { |
|
| 347 | 346 | $docblock_end_found = true; |
| 348 | 347 | break; |
| 349 | 348 | } |
@@ -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 { |
@@ -4,9 +4,9 @@ discard block |
||
| 4 | 4 | global $_lang; |
| 5 | 5 | |
| 6 | 6 | // session loop-back tester |
| 7 | - if(!isset($_GET['action']) || $_GET['action']!=='mode') |
|
| 7 | + if (!isset($_GET['action']) || $_GET['action'] !== 'mode') |
|
| 8 | 8 | { |
| 9 | - if(!isset($_SESSION['test']) || $_SESSION['test']!=1) |
|
| 9 | + if (!isset($_SESSION['test']) || $_SESSION['test'] != 1) |
|
| 10 | 10 | { |
| 11 | 11 | echo ' |
| 12 | 12 | <html> |
@@ -22,8 +22,8 @@ discard block |
||
| 22 | 22 | </head> |
| 23 | 23 | <body> |
| 24 | 24 | <div class="install"> |
| 25 | - <p>' . $_lang["session_problem"] . '</p> |
|
| 26 | - <p><a href="./">' .$_lang["session_problem_try_again"] . '</a></p> |
|
| 25 | + <p>' . $_lang["session_problem"].'</p> |
|
| 26 | + <p><a href="./">' .$_lang["session_problem_try_again"].'</a></p> |
|
| 27 | 27 | </div> |
| 28 | 28 | </body> |
| 29 | 29 | </html>'; |
@@ -32,28 +32,28 @@ discard block |
||
| 32 | 32 | } |
| 33 | 33 | } |
| 34 | 34 | |
| 35 | -function parse($src,$ph,$left='[+',$right='+]') |
|
| 35 | +function parse($src, $ph, $left = '[+', $right = '+]') |
|
| 36 | 36 | { |
| 37 | - foreach($ph as $k=>$v) |
|
| 37 | + foreach ($ph as $k=>$v) |
|
| 38 | 38 | { |
| 39 | - $k = $left . $k . $right; |
|
| 40 | - $src = str_replace($k,$v,$src); |
|
| 39 | + $k = $left.$k.$right; |
|
| 40 | + $src = str_replace($k, $v, $src); |
|
| 41 | 41 | } |
| 42 | 42 | return $src; |
| 43 | 43 | } |
| 44 | 44 | |
| 45 | 45 | function ph() |
| 46 | 46 | { |
| 47 | - global $_lang,$moduleName,$moduleVersion,$modx_textdir,$modx_release_date; |
|
| 47 | + global $_lang, $moduleName, $moduleVersion, $modx_textdir, $modx_release_date; |
|
| 48 | 48 | |
| 49 | - if(isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode']; |
|
| 49 | + if (isset($_SESSION['installmode'])) $installmode = $_SESSION['installmode']; |
|
| 50 | 50 | else $installmode = get_installmode(); |
| 51 | 51 | |
| 52 | 52 | $ph['pagetitle'] = $_lang['modx_install']; |
| 53 | - $ph['textdir'] = $modx_textdir ? ' id="rtl"':''; |
|
| 53 | + $ph['textdir'] = $modx_textdir ? ' id="rtl"' : ''; |
|
| 54 | 54 | $ph['help_link'] = $installmode == 0 ? $_lang['help_link_new'] : $_lang['help_link_upd']; |
| 55 | 55 | $ph['version'] = $moduleVersion; |
| 56 | - $ph['release_date'] = ($modx_textdir ? '‏':'') . $modx_release_date; |
|
| 56 | + $ph['release_date'] = ($modx_textdir ? '‏' : '').$modx_release_date; |
|
| 57 | 57 | $ph['footer1'] = $_lang['modx_footer1']; |
| 58 | 58 | $ph['footer2'] = $_lang['modx_footer2']; |
| 59 | 59 | $ph['current_year'] = date('Y'); |
@@ -62,20 +62,20 @@ discard block |
||
| 62 | 62 | |
| 63 | 63 | function get_installmode() |
| 64 | 64 | { |
| 65 | - global $base_path,$database_server, $database_user, $database_password, $dbase, $table_prefix; |
|
| 65 | + global $base_path, $database_server, $database_user, $database_password, $dbase, $table_prefix; |
|
| 66 | 66 | |
| 67 | 67 | $conf_path = "{$base_path}manager/includes/config.inc.php"; |
| 68 | 68 | if (!is_file($conf_path)) $installmode = 0; |
| 69 | - elseif(isset($_POST['installmode'])) $installmode = $_POST['installmode']; |
|
| 69 | + elseif (isset($_POST['installmode'])) $installmode = $_POST['installmode']; |
|
| 70 | 70 | else |
| 71 | 71 | { |
| 72 | 72 | include_once("{$base_path}manager/includes/config.inc.php"); |
| 73 | 73 | |
| 74 | - if(!isset($dbase) || empty($dbase)) $installmode = 0; |
|
| 74 | + if (!isset($dbase) || empty($dbase)) $installmode = 0; |
|
| 75 | 75 | else |
| 76 | 76 | { |
| 77 | 77 | $conn = mysqli_connect($database_server, $database_user, $database_password); |
| 78 | - if($conn) |
|
| 78 | + if ($conn) |
|
| 79 | 79 | { |
| 80 | 80 | $_SESSION['database_server'] = $database_server; |
| 81 | 81 | $_SESSION['database_user'] = $database_user; |
@@ -86,7 +86,7 @@ discard block |
||
| 86 | 86 | } |
| 87 | 87 | else $rs = false; |
| 88 | 88 | |
| 89 | - if($rs) |
|
| 89 | + if ($rs) |
|
| 90 | 90 | { |
| 91 | 91 | $_SESSION['dbase'] = $dbase; |
| 92 | 92 | $_SESSION['table_prefix'] = $table_prefix; |
@@ -95,7 +95,7 @@ discard block |
||
| 95 | 95 | |
| 96 | 96 | $tbl_system_settings = "`{$dbase}`.`{$table_prefix}system_settings`"; |
| 97 | 97 | $rs = mysqli_query($conn, "SELECT setting_value FROM {$tbl_system_settings} WHERE setting_name='settings_version'"); |
| 98 | - if($rs) |
|
| 98 | + if ($rs) |
|
| 99 | 99 | { |
| 100 | 100 | $row = mysqli_fetch_assoc($rs); |
| 101 | 101 | $settings_version = $row['setting_value']; |
@@ -5,12 +5,12 @@ discard block |
||
| 5 | 5 | $pwd = $_POST['pwd']; |
| 6 | 6 | |
| 7 | 7 | $self = 'install/connection.servertest.php'; |
| 8 | -$base_path = str_replace($self,'',str_replace('\\','/', __FILE__)); |
|
| 8 | +$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__)); |
|
| 9 | 9 | if (is_file("{$base_path}assets/cache/siteManager.php")) { |
| 10 | 10 | include_once("{$base_path}assets/cache/siteManager.php"); |
| 11 | 11 | } |
| 12 | -if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) { |
|
| 13 | - define('MGR_DIR','manager'); |
|
| 12 | +if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) { |
|
| 13 | + define('MGR_DIR', 'manager'); |
|
| 14 | 14 | } |
| 15 | 15 | require_once("lang.php"); |
| 16 | 16 | |
@@ -22,12 +22,12 @@ discard block |
||
| 22 | 22 | $output .= '<span id="server_pass" style="color:#80c000;"> '.$_lang['status_passed_server'].'</span>'; |
| 23 | 23 | |
| 24 | 24 | // Mysql version check |
| 25 | - if ( version_compare(mysqli_get_server_info($conn), '5.0.51', '=') ) { |
|
| 25 | + if (version_compare(mysqli_get_server_info($conn), '5.0.51', '=')) { |
|
| 26 | 26 | $output .= '<br /><span style="color:#FF0000;"> '.$_lang['mysql_5051'].'</span>'; |
| 27 | 27 | } |
| 28 | 28 | // Mode check |
| 29 | 29 | $mysqlmode = mysqli_query($conn, "SELECT @@session.sql_mode"); |
| 30 | - if (@mysqli_num_rows($mysqlmode) > 0){ |
|
| 30 | + if (@mysqli_num_rows($mysqlmode) > 0) { |
|
| 31 | 31 | $modes = mysqli_fetch_array($mysqlmode, MYSQLI_NUM); |
| 32 | 32 | $strictMode = false; |
| 33 | 33 | foreach ($modes as $mode) { |
@@ -5,17 +5,17 @@ discard block |
||
| 5 | 5 | $pwd = $_POST['pwd']; |
| 6 | 6 | |
| 7 | 7 | $self = 'install/connection.collation.php'; |
| 8 | -$base_path = str_replace($self,'',str_replace('\\','/', __FILE__)); |
|
| 8 | +$base_path = str_replace($self, '', str_replace('\\', '/', __FILE__)); |
|
| 9 | 9 | if (is_file("{$base_path}assets/cache/siteManager.php")) { |
| 10 | 10 | include_once("{$base_path}assets/cache/siteManager.php"); |
| 11 | 11 | } |
| 12 | -if(!defined('MGR_DIR') && is_dir("{$base_path}manager")) { |
|
| 13 | - define('MGR_DIR','manager'); |
|
| 12 | +if (!defined('MGR_DIR') && is_dir("{$base_path}manager")) { |
|
| 13 | + define('MGR_DIR', 'manager'); |
|
| 14 | 14 | } |
| 15 | 15 | require_once('lang.php'); |
| 16 | 16 | |
| 17 | 17 | $conn = mysqli_connect($host, $uid, $pwd); |
| 18 | -if(!$conn) exit('can not connect'); |
|
| 18 | +if (!$conn) exit('can not connect'); |
|
| 19 | 19 | |
| 20 | 20 | // get collation |
| 21 | 21 | $rs = mysqli_query($conn, "SHOW COLLATION"); |
@@ -29,20 +29,20 @@ discard block |
||
| 29 | 29 | $database_collation = htmlentities($_POST['database_collation']); |
| 30 | 30 | $recommend_collation = $_lang['recommend_collation']; |
| 31 | 31 | |
| 32 | - if (isset($_[$recommend_collation])) $_[$recommend_collation] = ' selected'; |
|
| 33 | - elseif(isset($_['utf8mb4_general_ci'])) $_['utf8mb4_general_ci'] = ' selected'; |
|
| 34 | - elseif(isset($_['utf8_general_ci'])) $_['utf8_general_ci'] = ' selected'; |
|
| 35 | - elseif(isset($_[$database_collation])) $_[$database_collation] = ' selected'; |
|
| 32 | + if (isset($_[$recommend_collation])) $_[$recommend_collation] = ' selected'; |
|
| 33 | + elseif (isset($_['utf8mb4_general_ci'])) $_['utf8mb4_general_ci'] = ' selected'; |
|
| 34 | + elseif (isset($_['utf8_general_ci'])) $_['utf8_general_ci'] = ' selected'; |
|
| 35 | + elseif (isset($_[$database_collation])) $_[$database_collation] = ' selected'; |
|
| 36 | 36 | |
| 37 | - $_ = sortItem($_,$_lang['recommend_collations_order']); |
|
| 37 | + $_ = sortItem($_, $_lang['recommend_collations_order']); |
|
| 38 | 38 | |
| 39 | - foreach($_ as $collation=>$selected) { |
|
| 39 | + foreach ($_ as $collation=>$selected) { |
|
| 40 | 40 | $collation = htmlentities($collation); |
| 41 | 41 | // if(substr($collation,0,4)!=='utf8') continue; |
| 42 | - if(strpos($collation,'sjis')===0) continue; |
|
| 43 | - if($collation=='recommend') |
|
| 42 | + if (strpos($collation, 'sjis') === 0) continue; |
|
| 43 | + if ($collation == 'recommend') |
|
| 44 | 44 | $output .= '<optgroup label="recommend">'; |
| 45 | - elseif($collation=='unrecommend') |
|
| 45 | + elseif ($collation == 'unrecommend') |
|
| 46 | 46 | $output .= '</optgroup><optgroup label="unrecommend">'; |
| 47 | 47 | else |
| 48 | 48 | $output .= sprintf('<option value="%s" %s>%s</option>', $collation, $selected, $collation); |
@@ -55,17 +55,17 @@ discard block |
||
| 55 | 55 | |
| 56 | 56 | |
| 57 | 57 | |
| 58 | -function sortItem($array=array(),$order='utf8mb4,utf8') { |
|
| 58 | +function sortItem($array = array(), $order = 'utf8mb4,utf8'){ |
|
| 59 | 59 | $rs = array('recommend'=>''); |
| 60 | 60 | $order = explode(',', $order); |
| 61 | - foreach($order as $v) { |
|
| 62 | - foreach($array as $name=>$sel) { |
|
| 63 | - if(strpos($name,$v)!==false) { |
|
| 61 | + foreach ($order as $v) { |
|
| 62 | + foreach ($array as $name=>$sel) { |
|
| 63 | + if (strpos($name, $v) !== false) { |
|
| 64 | 64 | $rs[$name] = $array[$name]; |
| 65 | 65 | unset($array[$name]); |
| 66 | 66 | } |
| 67 | 67 | } |
| 68 | 68 | } |
| 69 | - $rs['unrecommend']=''; |
|
| 69 | + $rs['unrecommend'] = ''; |
|
| 70 | 70 | return $rs + $array; |
| 71 | 71 | } |
@@ -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 | |
@@ -1,7 +1,7 @@ discard block |
||
| 1 | 1 | <?php |
| 2 | 2 | if (file_exists(dirname(__FILE__)."/../assets/cache/siteManager.php")) { |
| 3 | 3 | include_once(dirname(__FILE__)."/../assets/cache/siteManager.php"); |
| 4 | -}else{ |
|
| 4 | +} else { |
|
| 5 | 5 | define('MGR_DIR', 'manager'); |
| 6 | 6 | } |
| 7 | 7 | |
@@ -28,7 +28,7 @@ discard block |
||
| 28 | 28 | |
| 29 | 29 | echo "<p>{$_lang['setup_database']}</p>\n"; |
| 30 | 30 | |
| 31 | -$installMode= intval($_POST['installmode']); |
|
| 31 | +$installMode = intval($_POST['installmode']); |
|
| 32 | 32 | $installData = $_POST['installdata'] == "1" ? 1 : 0; |
| 33 | 33 | |
| 34 | 34 | //if ($installMode == 1) { |
@@ -42,7 +42,7 @@ discard block |
||
| 42 | 42 | $database_charset = substr($database_collation, 0, strpos($database_collation, '_')); |
| 43 | 43 | $database_connection_charset = $_POST['database_connection_charset']; |
| 44 | 44 | $database_connection_method = $_POST['database_connection_method']; |
| 45 | -$dbase = "`" . $_POST['database_name'] . "`"; |
|
| 45 | +$dbase = "`".$_POST['database_name']."`"; |
|
| 46 | 46 | $table_prefix = $_POST['tableprefix']; |
| 47 | 47 | $adminname = $_POST['cmsadmin']; |
| 48 | 48 | $adminemail = $_POST['cmsadminemail']; |
@@ -53,7 +53,7 @@ discard block |
||
| 53 | 53 | |
| 54 | 54 | // set session name variable |
| 55 | 55 | if (!isset ($site_sessionname)) { |
| 56 | - $site_sessionname = 'SN' . uniqid(''); |
|
| 56 | + $site_sessionname = 'SN'.uniqid(''); |
|
| 57 | 57 | } |
| 58 | 58 | |
| 59 | 59 | // get base path and url |
@@ -67,11 +67,11 @@ discard block |
||
| 67 | 67 | array_pop($a); |
| 68 | 68 | $pth = implode("install", $a); |
| 69 | 69 | unset ($a); |
| 70 | -$base_url = $url . (substr($url, -1) != "/" ? "/" : ""); |
|
| 71 | -$base_path = $pth . (substr($pth, -1) != "/" ? "/" : ""); |
|
| 70 | +$base_url = $url.(substr($url, -1) != "/" ? "/" : ""); |
|
| 71 | +$base_path = $pth.(substr($pth, -1) != "/" ? "/" : ""); |
|
| 72 | 72 | |
| 73 | 73 | // connect to the database |
| 74 | -echo "<p>". $_lang['setup_database_create_connection']; |
|
| 74 | +echo "<p>".$_lang['setup_database_create_connection']; |
|
| 75 | 75 | if (!$conn = mysqli_connect($database_server, $database_user, $database_password)) { |
| 76 | 76 | echo '<span class="notok">'.$_lang["setup_database_create_connection_failed"]."</span></p><p>".$_lang['setup_database_create_connection_failed_note']."</p>"; |
| 77 | 77 | return; |
@@ -80,7 +80,7 @@ discard block |
||
| 80 | 80 | } |
| 81 | 81 | |
| 82 | 82 | // select database |
| 83 | -echo "<p>".$_lang['setup_database_selection']. str_replace("`", "", $dbase) . "`: "; |
|
| 83 | +echo "<p>".$_lang['setup_database_selection'].str_replace("`", "", $dbase)."`: "; |
|
| 84 | 84 | if (!mysqli_select_db($conn, str_replace("`", "", $dbase))) { |
| 85 | 85 | echo "<span class=\"notok\" style='color:#707070'>".$_lang['setup_database_selection_failed']."</span>".$_lang['setup_database_selection_failed_note']."</p>"; |
| 86 | 86 | $create = true; |
@@ -92,9 +92,9 @@ discard block |
||
| 92 | 92 | |
| 93 | 93 | // try to create the database |
| 94 | 94 | if ($create) { |
| 95 | - echo "<p>".$_lang['setup_database_creation']. str_replace("`", "", $dbase) . "`: "; |
|
| 95 | + echo "<p>".$_lang['setup_database_creation'].str_replace("`", "", $dbase)."`: "; |
|
| 96 | 96 | // if(!@mysqli_create_db(str_replace("`","",$dbase), $conn)) { |
| 97 | - if (! mysqli_query($conn, "CREATE DATABASE $dbase DEFAULT CHARACTER SET $database_charset COLLATE $database_collation")) { |
|
| 97 | + if (!mysqli_query($conn, "CREATE DATABASE $dbase DEFAULT CHARACTER SET $database_charset COLLATE $database_collation")) { |
|
| 98 | 98 | echo '<span class="notok">'.$_lang['setup_database_creation_failed']."</span>".$_lang['setup_database_creation_failed_note']."</p>"; |
| 99 | 99 | $errors += 1; |
| 100 | 100 | ?> |
@@ -113,33 +113,33 @@ discard block |
||
| 113 | 113 | |
| 114 | 114 | // check table prefix |
| 115 | 115 | if ($installMode == 0) { |
| 116 | - echo "<p>" . $_lang['checking_table_prefix'] . $table_prefix . "`: "; |
|
| 117 | - if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`" . $table_prefix . "site_content`")) { |
|
| 118 | - echo '<span class="notok">' . $_lang['failed'] . "</span>" . $_lang['table_prefix_already_inuse'] . "</p>"; |
|
| 116 | + echo "<p>".$_lang['checking_table_prefix'].$table_prefix."`: "; |
|
| 117 | + if (@ $rs = mysqli_query($conn, "SELECT COUNT(*) FROM $dbase.`".$table_prefix."site_content`")) { |
|
| 118 | + echo '<span class="notok">'.$_lang['failed']."</span>".$_lang['table_prefix_already_inuse']."</p>"; |
|
| 119 | 119 | $errors += 1; |
| 120 | - echo "<p>" . $_lang['table_prefix_already_inuse_note'] . "</p>"; |
|
| 120 | + echo "<p>".$_lang['table_prefix_already_inuse_note']."</p>"; |
|
| 121 | 121 | return; |
| 122 | 122 | } else { |
| 123 | 123 | echo '<span class="ok">'.$_lang['ok']."</span></p>"; |
| 124 | 124 | } |
| 125 | 125 | } |
| 126 | 126 | |
| 127 | -if(!function_exists('parseProperties')) { |
|
| 127 | +if (!function_exists('parseProperties')) { |
|
| 128 | 128 | // parses a resource property string and returns the result as an array |
| 129 | 129 | // duplicate of method in documentParser class |
| 130 | - function parseProperties($propertyString) { |
|
| 131 | - $parameter= array (); |
|
| 130 | + function parseProperties($propertyString){ |
|
| 131 | + $parameter = array(); |
|
| 132 | 132 | if (!empty ($propertyString)) { |
| 133 | - $tmpParams= explode("&", $propertyString); |
|
| 134 | - for ($x= 0; $x < count($tmpParams); $x++) { |
|
| 133 | + $tmpParams = explode("&", $propertyString); |
|
| 134 | + for ($x = 0; $x < count($tmpParams); $x++) { |
|
| 135 | 135 | if (strpos($tmpParams[$x], '=', 0)) { |
| 136 | - $pTmp= explode("=", $tmpParams[$x]); |
|
| 137 | - $pvTmp= explode(";", trim($pTmp[1])); |
|
| 136 | + $pTmp = explode("=", $tmpParams[$x]); |
|
| 137 | + $pvTmp = explode(";", trim($pTmp[1])); |
|
| 138 | 138 | if ($pvTmp[1] == 'list' && $pvTmp[3] != "") |
| 139 | - $parameter[trim($pTmp[0])]= $pvTmp[3]; //list default |
|
| 139 | + $parameter[trim($pTmp[0])] = $pvTmp[3]; //list default |
|
| 140 | 140 | else |
| 141 | 141 | if ($pvTmp[1] != 'list' && $pvTmp[2] != "") |
| 142 | - $parameter[trim($pTmp[0])]= $pvTmp[2]; |
|
| 142 | + $parameter[trim($pTmp[0])] = $pvTmp[2]; |
|
| 143 | 143 | } |
| 144 | 144 | } |
| 145 | 145 | } |
@@ -150,20 +150,20 @@ discard block |
||
| 150 | 150 | // check status of Inherit Parent Template plugin |
| 151 | 151 | $auto_template_logic = 'parent'; |
| 152 | 152 | if ($installMode != 0) { |
| 153 | - $rs = mysqli_query($conn, "SELECT properties, disabled FROM $dbase.`" . $table_prefix . "site_plugins` WHERE name='Inherit Parent Template'"); |
|
| 153 | + $rs = mysqli_query($conn, "SELECT properties, disabled FROM $dbase.`".$table_prefix."site_plugins` WHERE name='Inherit Parent Template'"); |
|
| 154 | 154 | $row = mysqli_fetch_row($rs); |
| 155 | - if(!$row) { |
|
| 155 | + if (!$row) { |
|
| 156 | 156 | // not installed |
| 157 | 157 | $auto_template_logic = 'system'; |
| 158 | 158 | } else { |
| 159 | - if($row[1] == 1) { |
|
| 159 | + if ($row[1] == 1) { |
|
| 160 | 160 | // installed but disabled |
| 161 | 161 | $auto_template_logic = 'system'; |
| 162 | 162 | } else { |
| 163 | 163 | // installed, enabled .. see how it's configured |
| 164 | 164 | $properties = parseProperties($row[0]); |
| 165 | - if(isset($properties['inheritTemplate'])) { |
|
| 166 | - if($properties['inheritTemplate'] == 'From First Sibling') { |
|
| 165 | + if (isset($properties['inheritTemplate'])) { |
|
| 166 | + if ($properties['inheritTemplate'] == 'From First Sibling') { |
|
| 167 | 167 | $auto_template_logic = 'sibling'; |
| 168 | 168 | } |
| 169 | 169 | } |
@@ -187,20 +187,20 @@ discard block |
||
| 187 | 187 | $sqlParser->connect(); |
| 188 | 188 | |
| 189 | 189 | // install/update database |
| 190 | -echo "<p>" . $_lang['setup_database_creating_tables']; |
|
| 190 | +echo "<p>".$_lang['setup_database_creating_tables']; |
|
| 191 | 191 | if ($moduleSQLBaseFile) { |
| 192 | 192 | $sqlParser->process($moduleSQLBaseFile); |
| 193 | 193 | // display database results |
| 194 | 194 | if ($sqlParser->installFailed == true) { |
| 195 | 195 | $errors += 1; |
| 196 | - echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>"; |
|
| 197 | - echo "<p>" . $_lang['setup_couldnt_install'] . "</p>"; |
|
| 198 | - echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />"; |
|
| 196 | + echo "<span class=\"notok\"><b>".$_lang['database_alerts']."</span></p>"; |
|
| 197 | + echo "<p>".$_lang['setup_couldnt_install']."</p>"; |
|
| 198 | + echo "<p>".$_lang['installation_error_occured']."<br /><br />"; |
|
| 199 | 199 | for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) { |
| 200 | - echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />"; |
|
| 200 | + echo "<em>".$sqlParser->mysqlErrors[$i]["error"]."</em>".$_lang['during_execution_of_sql']."<span class='mono'>".strip_tags($sqlParser->mysqlErrors[$i]["sql"])."</span>.<hr />"; |
|
| 201 | 201 | } |
| 202 | 202 | echo "</p>"; |
| 203 | - echo "<p>" . $_lang['some_tables_not_updated'] . "</p>"; |
|
| 203 | + echo "<p>".$_lang['some_tables_not_updated']."</p>"; |
|
| 204 | 204 | return; |
| 205 | 205 | } else { |
| 206 | 206 | echo '<span class="ok">'.$_lang['ok']."</span></p>"; |
@@ -210,12 +210,12 @@ discard block |
||
| 210 | 210 | // custom or not |
| 211 | 211 | if (file_exists(dirname(__FILE__)."/../../assets/cache/siteManager.php")) { |
| 212 | 212 | $mgrdir = 'include_once(dirname(__FILE__)."/../../assets/cache/siteManager.php");'; |
| 213 | -}else{ |
|
| 213 | +} else { |
|
| 214 | 214 | $mgrdir = 'define(\'MGR_DIR\', \'manager\');'; |
| 215 | 215 | } |
| 216 | 216 | |
| 217 | 217 | // write the config.inc.php file if new installation |
| 218 | -echo "<p>" . $_lang['writing_config_file']; |
|
| 218 | +echo "<p>".$_lang['writing_config_file']; |
|
| 219 | 219 | |
| 220 | 220 | $confph = array(); |
| 221 | 221 | $confph['database_server'] = $database_server; |
@@ -247,7 +247,7 @@ discard block |
||
| 247 | 247 | $chmodSuccess = @chmod($filename, 0404); |
| 248 | 248 | |
| 249 | 249 | if ($configFileFailed == true) { |
| 250 | - echo '<span class="notok">' . $_lang['failed'] . "</span></p>"; |
|
| 250 | + echo '<span class="notok">'.$_lang['failed']."</span></p>"; |
|
| 251 | 251 | $errors += 1; |
| 252 | 252 | ?> |
| 253 | 253 | <p><?php echo $_lang['cant_write_config_file']?><span class="mono"><?php echo MGR_DIR; ?>/includes/config.inc.php</span></p> |
@@ -264,35 +264,35 @@ discard block |
||
| 264 | 264 | // generate new site_id and set manager theme to default |
| 265 | 265 | if ($installMode == 0) { |
| 266 | 266 | $siteid = uniqid(''); |
| 267 | - mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`" . $table_prefix . "system_settings` (setting_name,setting_value) VALUES('site_id','$siteid'),('manager_theme','default')"); |
|
| 267 | + mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid'),('manager_theme','default')"); |
|
| 268 | 268 | } else { |
| 269 | 269 | // update site_id if missing |
| 270 | - $ds = mysqli_query($sqlParser->conn, "SELECT setting_name,setting_value FROM $dbase.`" . $table_prefix . "system_settings` WHERE setting_name='site_id'"); |
|
| 270 | + $ds = mysqli_query($sqlParser->conn, "SELECT setting_name,setting_value FROM $dbase.`".$table_prefix."system_settings` WHERE setting_name='site_id'"); |
|
| 271 | 271 | if ($ds) { |
| 272 | 272 | $r = mysqli_fetch_assoc($ds); |
| 273 | 273 | $siteid = $r['setting_value']; |
| 274 | 274 | if ($siteid == '' || $siteid = 'MzGeQ2faT4Dw06+U49x3') { |
| 275 | 275 | $siteid = uniqid(''); |
| 276 | - mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`" . $table_prefix . "system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')"); |
|
| 276 | + mysqli_query($sqlParser->conn, "REPLACE INTO $dbase.`".$table_prefix."system_settings` (setting_name,setting_value) VALUES('site_id','$siteid')"); |
|
| 277 | 277 | } |
| 278 | 278 | } |
| 279 | 279 | } |
| 280 | 280 | |
| 281 | 281 | // Reset database for installation of demo-site |
| 282 | 282 | if ($installData && $moduleSQLDataFile && $moduleSQLResetFile) { |
| 283 | - echo "<p>" . $_lang['resetting_database']; |
|
| 283 | + echo "<p>".$_lang['resetting_database']; |
|
| 284 | 284 | $sqlParser->process($moduleSQLResetFile); |
| 285 | 285 | // display database results |
| 286 | 286 | if ($sqlParser->installFailed == true) { |
| 287 | 287 | $errors += 1; |
| 288 | - echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>"; |
|
| 289 | - echo "<p>" . $_lang['setup_couldnt_install'] . "</p>"; |
|
| 290 | - echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />"; |
|
| 288 | + echo "<span class=\"notok\"><b>".$_lang['database_alerts']."</span></p>"; |
|
| 289 | + echo "<p>".$_lang['setup_couldnt_install']."</p>"; |
|
| 290 | + echo "<p>".$_lang['installation_error_occured']."<br /><br />"; |
|
| 291 | 291 | for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) { |
| 292 | - echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />"; |
|
| 292 | + echo "<em>".$sqlParser->mysqlErrors[$i]["error"]."</em>".$_lang['during_execution_of_sql']."<span class='mono'>".strip_tags($sqlParser->mysqlErrors[$i]["sql"])."</span>.<hr />"; |
|
| 293 | 293 | } |
| 294 | 294 | echo "</p>"; |
| 295 | - echo "<p>" . $_lang['some_tables_not_updated'] . "</p>"; |
|
| 295 | + echo "<p>".$_lang['some_tables_not_updated']."</p>"; |
|
| 296 | 296 | return; |
| 297 | 297 | } else { |
| 298 | 298 | echo '<span class="ok">'.$_lang['ok']."</span></p>"; |
@@ -301,11 +301,11 @@ discard block |
||
| 301 | 301 | |
| 302 | 302 | // Install Templates |
| 303 | 303 | if (isset ($_POST['template']) || $installData) { |
| 304 | - echo "<h3>" . $_lang['templates'] . ":</h3> "; |
|
| 304 | + echo "<h3>".$_lang['templates'].":</h3> "; |
|
| 305 | 305 | $selTemplates = $_POST['template']; |
| 306 | 306 | foreach ($moduleTemplates as $k=>$moduleTemplate) { |
| 307 | 307 | $installSample = in_array('sample', $moduleTemplate[6]) && $installData == 1; |
| 308 | - if($installSample || in_array($k, $selTemplates)) { |
|
| 308 | + if ($installSample || in_array($k, $selTemplates)) { |
|
| 309 | 309 | $name = mysqli_real_escape_string($conn, $moduleTemplate[0]); |
| 310 | 310 | $desc = mysqli_real_escape_string($conn, $moduleTemplate[1]); |
| 311 | 311 | $category = mysqli_real_escape_string($conn, $moduleTemplate[4]); |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | $filecontent = $moduleTemplate[3]; |
| 314 | 314 | $save_sql_id_as = $moduleTemplate[7]; // Nessecary for demo-site |
| 315 | 315 | if (!file_exists($filecontent)) { |
| 316 | - echo "<p> $name: <span class=\"notok\">" . $_lang['unable_install_template'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>"; |
|
| 316 | + echo "<p> $name: <span class=\"notok\">".$_lang['unable_install_template']." '$filecontent' ".$_lang['not_found'].".</span></p>"; |
|
| 317 | 317 | } else { |
| 318 | 318 | // Create the category if it does not already exist |
| 319 | 319 | $category_id = getCreateDbCategory($category, $sqlParser); |
@@ -323,31 +323,31 @@ discard block |
||
| 323 | 323 | $template = mysqli_real_escape_string($conn, $template); |
| 324 | 324 | |
| 325 | 325 | // See if the template already exists |
| 326 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name'"); |
|
| 326 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$name'"); |
|
| 327 | 327 | |
| 328 | 328 | if (mysqli_num_rows($rs)) { |
| 329 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked' WHERE templatename='$name' LIMIT 1;")) { |
|
| 329 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_templates` SET content='$template', description='$desc', category=$category_id, locked='$locked' WHERE templatename='$name' LIMIT 1;")) { |
|
| 330 | 330 | $errors += 1; |
| 331 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 331 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 332 | 332 | return; |
| 333 | 333 | } |
| 334 | - if(!is_null($save_sql_id_as)) { |
|
| 334 | + if (!is_null($save_sql_id_as)) { |
|
| 335 | 335 | $sql_id = @mysqli_insert_id($sqlParser->conn); |
| 336 | - if(!$sql_id) { |
|
| 337 | - $idQuery = mysqli_fetch_assoc(mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`" . $table_prefix . "site_templates` WHERE templatename='$name' LIMIT 1;")); |
|
| 336 | + if (!$sql_id) { |
|
| 337 | + $idQuery = mysqli_fetch_assoc(mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_templates` WHERE templatename='$name' LIMIT 1;")); |
|
| 338 | 338 | $sql_id = $idQuery['id']; |
| 339 | 339 | } |
| 340 | 340 | $custom_placeholders[$save_sql_id_as] = $sql_id; |
| 341 | 341 | } |
| 342 | - echo "<p> $name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>"; |
|
| 342 | + echo "<p> $name: <span class=\"ok\">".$_lang['upgraded']."</span></p>"; |
|
| 343 | 343 | } else { |
| 344 | - if (!@ mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');")) { |
|
| 344 | + if (!@ mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_templates` (templatename,description,content,category,locked) VALUES('$name','$desc','$template',$category_id,'$locked');")) { |
|
| 345 | 345 | $errors += 1; |
| 346 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 346 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 347 | 347 | return; |
| 348 | 348 | } |
| 349 | - if(!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn); |
|
| 350 | - echo "<p> $name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>"; |
|
| 349 | + if (!is_null($save_sql_id_as)) $custom_placeholders[$save_sql_id_as] = @mysqli_insert_id($sqlParser->conn); |
|
| 350 | + echo "<p> $name: <span class=\"ok\">".$_lang['installed']."</span></p>"; |
|
| 351 | 351 | } |
| 352 | 352 | } |
| 353 | 353 | } |
@@ -356,11 +356,11 @@ discard block |
||
| 356 | 356 | |
| 357 | 357 | // Install Template Variables |
| 358 | 358 | if (isset ($_POST['tv']) || $installData) { |
| 359 | - echo "<h3>" . $_lang['tvs'] . ":</h3> "; |
|
| 359 | + echo "<h3>".$_lang['tvs'].":</h3> "; |
|
| 360 | 360 | $selTVs = $_POST['tv']; |
| 361 | 361 | foreach ($moduleTVs as $k=>$moduleTV) { |
| 362 | 362 | $installSample = in_array('sample', $moduleTV[12]) && $installData == 1; |
| 363 | - if($installSample || in_array($k, $selTVs)) { |
|
| 363 | + if ($installSample || in_array($k, $selTVs)) { |
|
| 364 | 364 | $name = mysqli_real_escape_string($conn, $moduleTV[0]); |
| 365 | 365 | $caption = mysqli_real_escape_string($conn, $moduleTV[1]); |
| 366 | 366 | $desc = mysqli_real_escape_string($conn, $moduleTV[2]); |
@@ -378,25 +378,25 @@ discard block |
||
| 378 | 378 | // Create the category if it does not already exist |
| 379 | 379 | $category = getCreateDbCategory($category, $sqlParser); |
| 380 | 380 | |
| 381 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_tmplvars` WHERE name='$name'"); |
|
| 381 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name'"); |
|
| 382 | 382 | if (mysqli_num_rows($rs)) { |
| 383 | 383 | $insert = true; |
| 384 | - while($row = mysqli_fetch_assoc($rs)) { |
|
| 385 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};")) { |
|
| 386 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 384 | + while ($row = mysqli_fetch_assoc($rs)) { |
|
| 385 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_tmplvars` SET type='$input_type', caption='$caption', description='$desc', category=$category, locked=$locked, elements='$input_options', display='$output_widget', display_params='$output_widget_params', default_text='$input_default' WHERE id={$row['id']};")) { |
|
| 386 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 387 | 387 | return; |
| 388 | 388 | } |
| 389 | 389 | $insert = false; |
| 390 | 390 | } |
| 391 | - echo "<p> $name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>"; |
|
| 391 | + echo "<p> $name: <span class=\"ok\">".$_lang['upgraded']."</span></p>"; |
|
| 392 | 392 | } else { |
| 393 | 393 | //$q = "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',(SELECT (CASE COUNT(*) WHEN 0 THEN 0 ELSE `id` END) `id` FROM $dbase.`" . $table_prefix . "categories` WHERE `category` = '$category'),$locked,'$input_options','$output_widget','$output_widget_params','$input_default');"; |
| 394 | - $q = "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',$category,$locked,'$input_options','$output_widget','$output_widget_params','$input_default');"; |
|
| 394 | + $q = "INSERT INTO $dbase.`".$table_prefix."site_tmplvars` (type,name,caption,description,category,locked,elements,display,display_params,default_text) VALUES('$input_type','$name','$caption','$desc',$category,$locked,'$input_options','$output_widget','$output_widget_params','$input_default');"; |
|
| 395 | 395 | if (!mysqli_query($sqlParser->conn, $q)) { |
| 396 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 396 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 397 | 397 | return; |
| 398 | 398 | } |
| 399 | - echo "<p> $name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>"; |
|
| 399 | + echo "<p> $name: <span class=\"ok\">".$_lang['installed']."</span></p>"; |
|
| 400 | 400 | } |
| 401 | 401 | |
| 402 | 402 | // add template assignments |
@@ -405,10 +405,10 @@ discard block |
||
| 405 | 405 | if (count($assignments) > 0) { |
| 406 | 406 | |
| 407 | 407 | // remove existing tv -> template assignments |
| 408 | - $ds=mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name' AND description='$desc';"); |
|
| 408 | + $ds = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_tmplvars` WHERE name='$name' AND description='$desc';"); |
|
| 409 | 409 | $row = mysqli_fetch_assoc($ds); |
| 410 | 410 | $id = $row["id"]; |
| 411 | - mysqli_query($sqlParser->conn, 'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_tmplvar_templates` WHERE tmplvarid = \'' . $id . '\''); |
|
| 411 | + mysqli_query($sqlParser->conn, 'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_tmplvar_templates` WHERE tmplvarid = \''.$id.'\''); |
|
| 412 | 412 | |
| 413 | 413 | // add tv -> template assignments |
| 414 | 414 | foreach ($assignments as $assignment) { |
@@ -417,7 +417,7 @@ discard block |
||
| 417 | 417 | if ($ds && $ts) { |
| 418 | 418 | $tRow = mysqli_fetch_assoc($ts); |
| 419 | 419 | $templateId = $tRow['id']; |
| 420 | - mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)"); |
|
| 420 | + mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_tmplvar_templates` (tmplvarid, templateid) VALUES($id, $templateId)"); |
|
| 421 | 421 | } |
| 422 | 422 | } |
| 423 | 423 | } |
@@ -427,12 +427,12 @@ discard block |
||
| 427 | 427 | |
| 428 | 428 | // Install Chunks |
| 429 | 429 | if (isset ($_POST['chunk']) || $installData) { |
| 430 | - echo "<h3>" . $_lang['chunks'] . ":</h3> "; |
|
| 430 | + echo "<h3>".$_lang['chunks'].":</h3> "; |
|
| 431 | 431 | $selChunks = $_POST['chunk']; |
| 432 | 432 | foreach ($moduleChunks as $k=>$moduleChunk) { |
| 433 | 433 | $installSample = in_array('sample', $moduleChunk[5]) && $installData == 1; |
| 434 | 434 | $count_new_name = 0; |
| 435 | - if($installSample || in_array($k, $selChunks)) { |
|
| 435 | + if ($installSample || in_array($k, $selChunks)) { |
|
| 436 | 436 | |
| 437 | 437 | $name = mysqli_real_escape_string($conn, $moduleChunk[0]); |
| 438 | 438 | $desc = mysqli_real_escape_string($conn, $moduleChunk[1]); |
@@ -441,7 +441,7 @@ discard block |
||
| 441 | 441 | $filecontent = $moduleChunk[2]; |
| 442 | 442 | |
| 443 | 443 | if (!file_exists($filecontent)) |
| 444 | - echo "<p> $name: <span class=\"notok\">" . $_lang['unable_install_chunk'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>"; |
|
| 444 | + echo "<p> $name: <span class=\"notok\">".$_lang['unable_install_chunk']." '$filecontent' ".$_lang['not_found'].".</span></p>"; |
|
| 445 | 445 | else { |
| 446 | 446 | |
| 447 | 447 | // Create the category if it does not already exist |
@@ -449,31 +449,31 @@ discard block |
||
| 449 | 449 | |
| 450 | 450 | $chunk = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', file_get_contents($filecontent), 1); |
| 451 | 451 | $chunk = mysqli_real_escape_string($conn, $chunk); |
| 452 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$name'"); |
|
| 452 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_htmlsnippets` WHERE name='$name'"); |
|
| 453 | 453 | $count_original_name = mysqli_num_rows($rs); |
| 454 | - if($overwrite == 'false') { |
|
| 455 | - $newname = $name . '-' . str_replace('.', '_', $modx_version); |
|
| 456 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_htmlsnippets` WHERE name='$newname'"); |
|
| 454 | + if ($overwrite == 'false') { |
|
| 455 | + $newname = $name.'-'.str_replace('.', '_', $modx_version); |
|
| 456 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_htmlsnippets` WHERE name='$newname'"); |
|
| 457 | 457 | $count_new_name = mysqli_num_rows($rs); |
| 458 | 458 | } |
| 459 | 459 | $update = $count_original_name > 0 && $overwrite == 'true'; |
| 460 | 460 | if ($update) { |
| 461 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) { |
|
| 461 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_htmlsnippets` SET snippet='$chunk', description='$desc', category=$category_id WHERE name='$name';")) { |
|
| 462 | 462 | $errors += 1; |
| 463 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 463 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 464 | 464 | return; |
| 465 | 465 | } |
| 466 | - echo "<p> $name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>"; |
|
| 467 | - } elseif($count_new_name == 0) { |
|
| 468 | - if($count_original_name > 0 && $overwrite == 'false') { |
|
| 466 | + echo "<p> $name: <span class=\"ok\">".$_lang['upgraded']."</span></p>"; |
|
| 467 | + } elseif ($count_new_name == 0) { |
|
| 468 | + if ($count_original_name > 0 && $overwrite == 'false') { |
|
| 469 | 469 | $name = $newname; |
| 470 | 470 | } |
| 471 | - if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);")) { |
|
| 471 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_htmlsnippets` (name,description,snippet,category) VALUES('$name','$desc','$chunk',$category_id);")) { |
|
| 472 | 472 | $errors += 1; |
| 473 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 473 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 474 | 474 | return; |
| 475 | 475 | } |
| 476 | - echo "<p> $name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>"; |
|
| 476 | + echo "<p> $name: <span class=\"ok\">".$_lang['installed']."</span></p>"; |
|
| 477 | 477 | } |
| 478 | 478 | } |
| 479 | 479 | } |
@@ -482,11 +482,11 @@ discard block |
||
| 482 | 482 | |
| 483 | 483 | // Install Modules |
| 484 | 484 | if (isset ($_POST['module']) || $installData) { |
| 485 | - echo "<h3>" . $_lang['modules'] . ":</h3> "; |
|
| 485 | + echo "<h3>".$_lang['modules'].":</h3> "; |
|
| 486 | 486 | $selModules = $_POST['module']; |
| 487 | 487 | foreach ($moduleModules as $k=>$moduleModule) { |
| 488 | 488 | $installSample = in_array('sample', $moduleModule[7]) && $installData == 1; |
| 489 | - if($installSample || in_array($k, $selModules)) { |
|
| 489 | + if ($installSample || in_array($k, $selModules)) { |
|
| 490 | 490 | $name = mysqli_real_escape_string($conn, $moduleModule[0]); |
| 491 | 491 | $desc = mysqli_real_escape_string($conn, $moduleModule[1]); |
| 492 | 492 | $filecontent = $moduleModule[2]; |
@@ -495,7 +495,7 @@ discard block |
||
| 495 | 495 | $shared = mysqli_real_escape_string($conn, $moduleModule[5]); |
| 496 | 496 | $category = mysqli_real_escape_string($conn, $moduleModule[6]); |
| 497 | 497 | if (!file_exists($filecontent)) |
| 498 | - echo "<p> $name: <span class=\"notok\">" . $_lang['unable_install_module'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>"; |
|
| 498 | + echo "<p> $name: <span class=\"notok\">".$_lang['unable_install_module']." '$filecontent' ".$_lang['not_found'].".</span></p>"; |
|
| 499 | 499 | else { |
| 500 | 500 | |
| 501 | 501 | // Create the category if it does not already exist |
@@ -504,22 +504,22 @@ discard block |
||
| 504 | 504 | $module = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent), 2)); |
| 505 | 505 | // $module = removeDocblock($module, 'module'); // Modules have no fileBinding, keep docblock for info-tab |
| 506 | 506 | $module = mysqli_real_escape_string($conn, $module); |
| 507 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_modules` WHERE name='$name'"); |
|
| 507 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_modules` WHERE name='$name'"); |
|
| 508 | 508 | if (mysqli_num_rows($rs)) { |
| 509 | 509 | $row = mysqli_fetch_assoc($rs); |
| 510 | - $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
|
| 511 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) { |
|
| 512 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 510 | + $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
|
| 511 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_modules` SET modulecode='$module', description='$desc', properties='$props', enable_sharedparams='$shared' WHERE name='$name';")) { |
|
| 512 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 513 | 513 | return; |
| 514 | 514 | } |
| 515 | - echo "<p> $name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>"; |
|
| 515 | + echo "<p> $name: <span class=\"ok\">".$_lang['upgraded']."</span></p>"; |
|
| 516 | 516 | } else { |
| 517 | 517 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 518 | - if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_modules` (name,description,modulecode,properties,guid,enable_sharedparams,category) VALUES('$name','$desc','$module','$properties','$guid','$shared', $category);")) { |
|
| 519 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 518 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_modules` (name,description,modulecode,properties,guid,enable_sharedparams,category) VALUES('$name','$desc','$module','$properties','$guid','$shared', $category);")) { |
|
| 519 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 520 | 520 | return; |
| 521 | 521 | } |
| 522 | - echo "<p> $name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>"; |
|
| 522 | + echo "<p> $name: <span class=\"ok\">".$_lang['installed']."</span></p>"; |
|
| 523 | 523 | } |
| 524 | 524 | } |
| 525 | 525 | } |
@@ -528,11 +528,11 @@ discard block |
||
| 528 | 528 | |
| 529 | 529 | // Install Plugins |
| 530 | 530 | if (isset ($_POST['plugin']) || $installData) { |
| 531 | - echo "<h3>" . $_lang['plugins'] . ":</h3> "; |
|
| 531 | + echo "<h3>".$_lang['plugins'].":</h3> "; |
|
| 532 | 532 | $selPlugs = $_POST['plugin']; |
| 533 | 533 | foreach ($modulePlugins as $k=>$modulePlugin) { |
| 534 | 534 | $installSample = in_array('sample', $modulePlugin[8]) && $installData == 1; |
| 535 | - if($installSample || in_array($k, $selPlugs)) { |
|
| 535 | + if ($installSample || in_array($k, $selPlugs)) { |
|
| 536 | 536 | $name = mysqli_real_escape_string($conn, $modulePlugin[0]); |
| 537 | 537 | $desc = mysqli_real_escape_string($conn, $modulePlugin[1]); |
| 538 | 538 | $filecontent = $modulePlugin[2]; |
@@ -542,17 +542,17 @@ discard block |
||
| 542 | 542 | $category = mysqli_real_escape_string($conn, $modulePlugin[6]); |
| 543 | 543 | $leg_names = ''; |
| 544 | 544 | $disabled = $modulePlugin[9]; |
| 545 | - if(array_key_exists(7, $modulePlugin)) { |
|
| 545 | + if (array_key_exists(7, $modulePlugin)) { |
|
| 546 | 546 | // parse comma-separated legacy names and prepare them for sql IN clause |
| 547 | - $leg_names = "'" . implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7]))) . "'"; |
|
| 547 | + $leg_names = "'".implode("','", preg_split('/\s*,\s*/', mysqli_real_escape_string($conn, $modulePlugin[7])))."'"; |
|
| 548 | 548 | } |
| 549 | 549 | if (!file_exists($filecontent)) |
| 550 | - echo "<p> $name: <span class=\"notok\">" . $_lang['unable_install_plugin'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>"; |
|
| 550 | + echo "<p> $name: <span class=\"notok\">".$_lang['unable_install_plugin']." '$filecontent' ".$_lang['not_found'].".</span></p>"; |
|
| 551 | 551 | else { |
| 552 | 552 | |
| 553 | 553 | // disable legacy versions based on legacy_names provided |
| 554 | - if(!empty($leg_names)) { |
|
| 555 | - $update_query = "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE name IN ($leg_names);"; |
|
| 554 | + if (!empty($leg_names)) { |
|
| 555 | + $update_query = "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE name IN ($leg_names);"; |
|
| 556 | 556 | $rs = mysqli_query($sqlParser->conn, $update_query); |
| 557 | 557 | } |
| 558 | 558 | |
@@ -562,50 +562,50 @@ discard block |
||
| 562 | 562 | $plugin = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent), 2)); |
| 563 | 563 | $plugin = removeDocblock($plugin, 'plugin'); |
| 564 | 564 | $plugin = mysqli_real_escape_string($conn, $plugin); |
| 565 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_plugins` WHERE name='$name'"); |
|
| 565 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name'"); |
|
| 566 | 566 | if (mysqli_num_rows($rs)) { |
| 567 | 567 | $insert = true; |
| 568 | - while($row = mysqli_fetch_assoc($rs)) { |
|
| 569 | - $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
|
| 570 | - if($row['description'] == $desc){ |
|
| 571 | - if (! mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) { |
|
| 572 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 568 | + while ($row = mysqli_fetch_assoc($rs)) { |
|
| 569 | + $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
|
| 570 | + if ($row['description'] == $desc) { |
|
| 571 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_plugins` SET plugincode='$plugin', description='$desc', properties='$props' WHERE id={$row['id']};")) { |
|
| 572 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 573 | 573 | return; |
| 574 | 574 | } |
| 575 | 575 | $insert = false; |
| 576 | 576 | } else { |
| 577 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_plugins` SET disabled='1' WHERE id={$row['id']};")) { |
|
| 577 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_plugins` SET disabled='1' WHERE id={$row['id']};")) { |
|
| 578 | 578 | echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
| 579 | 579 | return; |
| 580 | 580 | } |
| 581 | 581 | } |
| 582 | 582 | } |
| 583 | - if($insert === true) { |
|
| 584 | - $properties = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
|
| 585 | - if(!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$guid','0',$category);")) { |
|
| 583 | + if ($insert === true) { |
|
| 584 | + $properties = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
|
| 585 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,disabled,category) VALUES('$name','$desc','$plugin','$properties','$guid','0',$category);")) { |
|
| 586 | 586 | echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
| 587 | 587 | return; |
| 588 | 588 | } |
| 589 | 589 | } |
| 590 | - echo "<p> $name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>"; |
|
| 590 | + echo "<p> $name: <span class=\"ok\">".$_lang['upgraded']."</span></p>"; |
|
| 591 | 591 | } else { |
| 592 | 592 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 593 | - if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_plugins` (name,description,plugincode,properties,moduleguid,category,disabled) VALUES('$name','$desc','$plugin','$properties','$guid',$category,$disabled);")) { |
|
| 594 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 593 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugins` (name,description,plugincode,properties,moduleguid,category,disabled) VALUES('$name','$desc','$plugin','$properties','$guid',$category,$disabled);")) { |
|
| 594 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 595 | 595 | return; |
| 596 | 596 | } |
| 597 | - echo "<p> $name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>"; |
|
| 597 | + echo "<p> $name: <span class=\"ok\">".$_lang['installed']."</span></p>"; |
|
| 598 | 598 | } |
| 599 | 599 | // add system events |
| 600 | 600 | if (count($events) > 0) { |
| 601 | - $ds=mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name' AND description='$desc';"); |
|
| 601 | + $ds = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."site_plugins` WHERE name='$name' AND description='$desc';"); |
|
| 602 | 602 | if ($ds) { |
| 603 | 603 | $row = mysqli_fetch_assoc($ds); |
| 604 | 604 | $id = $row["id"]; |
| 605 | 605 | // remove existing events |
| 606 | - mysqli_query($sqlParser->conn, 'DELETE FROM ' . $dbase . '.`' . $table_prefix . 'site_plugin_events` WHERE pluginid = \'' . $id . '\''); |
|
| 606 | + mysqli_query($sqlParser->conn, 'DELETE FROM '.$dbase.'.`'.$table_prefix.'site_plugin_events` WHERE pluginid = \''.$id.'\''); |
|
| 607 | 607 | // add new events |
| 608 | - mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_plugin_events` (pluginid, evtid) SELECT '$id' as 'pluginid',se.id as 'evtid' FROM $dbase.`" . $table_prefix . "system_eventnames` se WHERE name IN ('" . implode("','", $events) . "')"); |
|
| 608 | + mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_plugin_events` (pluginid, evtid) SELECT '$id' as 'pluginid',se.id as 'evtid' FROM $dbase.`".$table_prefix."system_eventnames` se WHERE name IN ('".implode("','", $events)."')"); |
|
| 609 | 609 | } |
| 610 | 610 | } |
| 611 | 611 | } |
@@ -615,18 +615,18 @@ discard block |
||
| 615 | 615 | |
| 616 | 616 | // Install Snippets |
| 617 | 617 | if (isset ($_POST['snippet']) || $installData) { |
| 618 | - echo "<h3>" . $_lang['snippets'] . ":</h3> "; |
|
| 618 | + echo "<h3>".$_lang['snippets'].":</h3> "; |
|
| 619 | 619 | $selSnips = $_POST['snippet']; |
| 620 | 620 | foreach ($moduleSnippets as $k=>$moduleSnippet) { |
| 621 | 621 | $installSample = in_array('sample', $moduleSnippet[5]) && $installData == 1; |
| 622 | - if($installSample || in_array($k, $selSnips)) { |
|
| 622 | + if ($installSample || in_array($k, $selSnips)) { |
|
| 623 | 623 | $name = mysqli_real_escape_string($conn, $moduleSnippet[0]); |
| 624 | 624 | $desc = mysqli_real_escape_string($conn, $moduleSnippet[1]); |
| 625 | 625 | $filecontent = $moduleSnippet[2]; |
| 626 | 626 | $properties = $moduleSnippet[3]; |
| 627 | 627 | $category = mysqli_real_escape_string($conn, $moduleSnippet[4]); |
| 628 | 628 | if (!file_exists($filecontent)) |
| 629 | - echo "<p> $name: <span class=\"notok\">" . $_lang['unable_install_snippet'] . " '$filecontent' " . $_lang['not_found'] . ".</span></p>"; |
|
| 629 | + echo "<p> $name: <span class=\"notok\">".$_lang['unable_install_snippet']." '$filecontent' ".$_lang['not_found'].".</span></p>"; |
|
| 630 | 630 | else { |
| 631 | 631 | |
| 632 | 632 | // Create the category if it does not already exist |
@@ -635,22 +635,22 @@ discard block |
||
| 635 | 635 | $snippet = end(preg_split("/(\/\/)?\s*\<\?php/", file_get_contents($filecontent))); |
| 636 | 636 | $snippet = removeDocblock($snippet, 'snippet'); |
| 637 | 637 | $snippet = mysqli_real_escape_string($conn, $snippet); |
| 638 | - $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`" . $table_prefix . "site_snippets` WHERE name='$name'"); |
|
| 638 | + $rs = mysqli_query($sqlParser->conn, "SELECT * FROM $dbase.`".$table_prefix."site_snippets` WHERE name='$name'"); |
|
| 639 | 639 | if (mysqli_num_rows($rs)) { |
| 640 | 640 | $row = mysqli_fetch_assoc($rs); |
| 641 | - $props = mysqli_real_escape_string($conn, propUpdate($properties,$row['properties'])); |
|
| 642 | - if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`" . $table_prefix . "site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) { |
|
| 643 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 641 | + $props = mysqli_real_escape_string($conn, propUpdate($properties, $row['properties'])); |
|
| 642 | + if (!mysqli_query($sqlParser->conn, "UPDATE $dbase.`".$table_prefix."site_snippets` SET snippet='$snippet', description='$desc', properties='$props' WHERE name='$name';")) { |
|
| 643 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 644 | 644 | return; |
| 645 | 645 | } |
| 646 | - echo "<p> $name: <span class=\"ok\">" . $_lang['upgraded'] . "</span></p>"; |
|
| 646 | + echo "<p> $name: <span class=\"ok\">".$_lang['upgraded']."</span></p>"; |
|
| 647 | 647 | } else { |
| 648 | 648 | $properties = mysqli_real_escape_string($conn, parseProperties($properties, true)); |
| 649 | - if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`" . $table_prefix . "site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) { |
|
| 650 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 649 | + if (!mysqli_query($sqlParser->conn, "INSERT INTO $dbase.`".$table_prefix."site_snippets` (name,description,snippet,properties,category) VALUES('$name','$desc','$snippet','$properties',$category);")) { |
|
| 650 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 651 | 651 | return; |
| 652 | 652 | } |
| 653 | - echo "<p> $name: <span class=\"ok\">" . $_lang['installed'] . "</span></p>"; |
|
| 653 | + echo "<p> $name: <span class=\"ok\">".$_lang['installed']."</span></p>"; |
|
| 654 | 654 | } |
| 655 | 655 | } |
| 656 | 656 | } |
@@ -659,24 +659,24 @@ discard block |
||
| 659 | 659 | |
| 660 | 660 | // Install demo-site |
| 661 | 661 | if ($installData && $moduleSQLDataFile) { |
| 662 | - echo "<p>" . $_lang['installing_demo_site']; |
|
| 662 | + echo "<p>".$_lang['installing_demo_site']; |
|
| 663 | 663 | $sqlParser->process($moduleSQLDataFile); |
| 664 | 664 | // display database results |
| 665 | 665 | if ($sqlParser->installFailed == true) { |
| 666 | 666 | $errors += 1; |
| 667 | - echo "<span class=\"notok\"><b>" . $_lang['database_alerts'] . "</span></p>"; |
|
| 668 | - echo "<p>" . $_lang['setup_couldnt_install'] . "</p>"; |
|
| 669 | - echo "<p>" . $_lang['installation_error_occured'] . "<br /><br />"; |
|
| 667 | + echo "<span class=\"notok\"><b>".$_lang['database_alerts']."</span></p>"; |
|
| 668 | + echo "<p>".$_lang['setup_couldnt_install']."</p>"; |
|
| 669 | + echo "<p>".$_lang['installation_error_occured']."<br /><br />"; |
|
| 670 | 670 | for ($i = 0; $i < count($sqlParser->mysqlErrors); $i++) { |
| 671 | - echo "<em>" . $sqlParser->mysqlErrors[$i]["error"] . "</em>" . $_lang['during_execution_of_sql'] . "<span class='mono'>" . strip_tags($sqlParser->mysqlErrors[$i]["sql"]) . "</span>.<hr />"; |
|
| 671 | + echo "<em>".$sqlParser->mysqlErrors[$i]["error"]."</em>".$_lang['during_execution_of_sql']."<span class='mono'>".strip_tags($sqlParser->mysqlErrors[$i]["sql"])."</span>.<hr />"; |
|
| 672 | 672 | } |
| 673 | 673 | echo "</p>"; |
| 674 | - echo "<p>" . $_lang['some_tables_not_updated'] . "</p>"; |
|
| 674 | + echo "<p>".$_lang['some_tables_not_updated']."</p>"; |
|
| 675 | 675 | return; |
| 676 | 676 | } else { |
| 677 | 677 | $sql = sprintf("SELECT id FROM `%ssite_templates` WHERE templatename='EVO startup - Bootstrap'", $sqlParser->prefix); |
| 678 | 678 | $rs = mysqli_query($sqlParser->conn, $sql); |
| 679 | - if(mysqli_num_rows($rs)) { |
|
| 679 | + if (mysqli_num_rows($rs)) { |
|
| 680 | 680 | $row = mysqli_fetch_assoc($rs); |
| 681 | 681 | $sql = sprintf('UPDATE `%ssite_content` SET template=%s WHERE template=4', $sqlParser->prefix, $row['id']); |
| 682 | 682 | mysqli_query($sqlParser->conn, $sql); |
@@ -687,9 +687,9 @@ discard block |
||
| 687 | 687 | |
| 688 | 688 | // Install Dependencies |
| 689 | 689 | foreach ($moduleDependencies as $dependency) { |
| 690 | - $ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_modules` WHERE name="' . $dependency['module'] . '"'); |
|
| 690 | + $ds = mysqli_query($sqlParser->conn, 'SELECT id, guid FROM '.$dbase.'`'.$sqlParser->prefix.'site_modules` WHERE name="'.$dependency['module'].'"'); |
|
| 691 | 691 | if (!$ds) { |
| 692 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 692 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 693 | 693 | return; |
| 694 | 694 | } else { |
| 695 | 695 | $row = mysqli_fetch_assoc($ds); |
@@ -697,37 +697,37 @@ discard block |
||
| 697 | 697 | $moduleGuid = $row["guid"]; |
| 698 | 698 | } |
| 699 | 699 | // get extra id |
| 700 | - $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE ' . $dependency['column'] . '="' . $dependency['name'] . '"'); |
|
| 700 | + $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE '.$dependency['column'].'="'.$dependency['name'].'"'); |
|
| 701 | 701 | if (!$ds) { |
| 702 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 702 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 703 | 703 | return; |
| 704 | 704 | } else { |
| 705 | 705 | $row = mysqli_fetch_assoc($ds); |
| 706 | 706 | $extraId = $row["id"]; |
| 707 | 707 | } |
| 708 | 708 | // setup extra as module dependency |
| 709 | - $ds = mysqli_query($sqlParser->conn, 'SELECT module FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type'] . ' LIMIT 1'); |
|
| 709 | + $ds = mysqli_query($sqlParser->conn, 'SELECT module FROM '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` WHERE module='.$moduleId.' AND resource='.$extraId.' AND type='.$dependency['type'].' LIMIT 1'); |
|
| 710 | 710 | if (!$ds) { |
| 711 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 711 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 712 | 712 | return; |
| 713 | 713 | } else { |
| 714 | 714 | if (mysqli_num_rows($ds) === 0) { |
| 715 | - mysqli_query($sqlParser->conn, 'INSERT INTO ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` (module, resource, type) VALUES(' . $moduleId . ',' . $extraId . ',' . $dependency['type'] . ')'); |
|
| 716 | - echo '<p> ' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_create'] . '</span></p>'; |
|
| 715 | + mysqli_query($sqlParser->conn, 'INSERT INTO '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` (module, resource, type) VALUES('.$moduleId.','.$extraId.','.$dependency['type'].')'); |
|
| 716 | + echo '<p> '.$dependency['module'].' Module: <span class="ok">'.$_lang['depedency_create'].'</span></p>'; |
|
| 717 | 717 | } else { |
| 718 | - mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_module_depobj` SET module = ' . $moduleId . ', resource = ' . $extraId . ', type = ' . $dependency['type'] . ' WHERE module=' . $moduleId . ' AND resource=' . $extraId . ' AND type=' . $dependency['type']); |
|
| 719 | - echo '<p> ' . $dependency['module'] . ' Module: <span class="ok">' . $_lang['depedency_update'] . '</span></p>'; |
|
| 718 | + mysqli_query($sqlParser->conn, 'UPDATE '.$dbase.'`'.$sqlParser->prefix.'site_module_depobj` SET module = '.$moduleId.', resource = '.$extraId.', type = '.$dependency['type'].' WHERE module='.$moduleId.' AND resource='.$extraId.' AND type='.$dependency['type']); |
|
| 719 | + echo '<p> '.$dependency['module'].' Module: <span class="ok">'.$_lang['depedency_update'].'</span></p>'; |
|
| 720 | 720 | } |
| 721 | 721 | if ($dependency['type'] == 30 || $dependency['type'] == 40) { |
| 722 | 722 | // set extra guid for plugins and snippets |
| 723 | - $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` WHERE id=' . $extraId . ' LIMIT 1'); |
|
| 723 | + $ds = mysqli_query($sqlParser->conn, 'SELECT id FROM '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` WHERE id='.$extraId.' LIMIT 1'); |
|
| 724 | 724 | if (!$ds) { |
| 725 | - echo "<p>" . mysqli_error($sqlParser->conn) . "</p>"; |
|
| 725 | + echo "<p>".mysqli_error($sqlParser->conn)."</p>"; |
|
| 726 | 726 | return; |
| 727 | 727 | } else { |
| 728 | 728 | if (mysqli_num_rows($ds) != 0) { |
| 729 | - mysqli_query($sqlParser->conn, 'UPDATE ' . $dbase . '`' . $sqlParser->prefix . 'site_' . $dependency['table'] . '` SET moduleguid = ' . $moduleGuid . ' WHERE id=' . $extraId); |
|
| 730 | - echo '<p> ' . $dependency['name'] . ': <span class="ok">' . $_lang['guid_set'] . '</span></p>'; |
|
| 729 | + mysqli_query($sqlParser->conn, 'UPDATE '.$dbase.'`'.$sqlParser->prefix.'site_'.$dependency['table'].'` SET moduleguid = '.$moduleGuid.' WHERE id='.$extraId); |
|
| 730 | + echo '<p> '.$dependency['name'].': <span class="ok">'.$_lang['guid_set'].'</span></p>'; |
|
| 731 | 731 | } |
| 732 | 732 | } |
| 733 | 733 | } |
@@ -736,7 +736,7 @@ discard block |
||
| 736 | 736 | |
| 737 | 737 | // call back function |
| 738 | 738 | if ($callBackFnc != "") |
| 739 | - $callBackFnc ($sqlParser); |
|
| 739 | + $callBackFnc($sqlParser); |
|
| 740 | 740 | |
| 741 | 741 | // Setup the MODX API -- needed for the cache processor |
| 742 | 742 | define('MODX_API_MODE', true); |
@@ -771,20 +771,20 @@ discard block |
||
| 771 | 771 | } |
| 772 | 772 | |
| 773 | 773 | // setup completed! |
| 774 | -echo "<p><b>" . $_lang['installation_successful'] . "</b></p>"; |
|
| 775 | -echo "<p>" . $_lang['to_log_into_content_manager'] . "</p>"; |
|
| 774 | +echo "<p><b>".$_lang['installation_successful']."</b></p>"; |
|
| 775 | +echo "<p>".$_lang['to_log_into_content_manager']."</p>"; |
|
| 776 | 776 | if ($installMode == 0) { |
| 777 | - echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />" . $_lang['installation_note'] . "</p>"; |
|
| 777 | + echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />".$_lang['installation_note']."</p>"; |
|
| 778 | 778 | } else { |
| 779 | - echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />" . $_lang['upgrade_note'] . "</p>"; |
|
| 779 | + echo "<p><img src=\"img/ico_info.png\" width=\"40\" height=\"42\" align=\"left\" style=\"margin-right:10px;\" />".$_lang['upgrade_note']."</p>"; |
|
| 780 | 780 | } |
| 781 | 781 | |
| 782 | 782 | // Property Update function |
| 783 | -function propUpdate($new,$old){ |
|
| 783 | +function propUpdate($new, $old){ |
|
| 784 | 784 | $newArr = parseProperties($new); |
| 785 | 785 | $oldArr = parseProperties($old); |
| 786 | - foreach ($oldArr as $k => $v){ |
|
| 787 | - if (isset($v['0']['options'])){ |
|
| 786 | + foreach ($oldArr as $k => $v) { |
|
| 787 | + if (isset($v['0']['options'])) { |
|
| 788 | 788 | $oldArr[$k]['0']['options'] = $newArr[$k]['0']['options']; |
| 789 | 789 | } |
| 790 | 790 | } |
@@ -794,22 +794,22 @@ discard block |
||
| 794 | 794 | return $return; |
| 795 | 795 | } |
| 796 | 796 | |
| 797 | -function parseProperties($propertyString, $json=false) { |
|
| 798 | - $propertyString = str_replace('{}', '', $propertyString ); |
|
| 799 | - $propertyString = str_replace('} {', ',', $propertyString ); |
|
| 797 | +function parseProperties($propertyString, $json = false){ |
|
| 798 | + $propertyString = str_replace('{}', '', $propertyString); |
|
| 799 | + $propertyString = str_replace('} {', ',', $propertyString); |
|
| 800 | 800 | |
| 801 | - if(empty($propertyString)) return array(); |
|
| 802 | - if($propertyString=='{}' || $propertyString=='[]') return array(); |
|
| 801 | + if (empty($propertyString)) return array(); |
|
| 802 | + if ($propertyString == '{}' || $propertyString == '[]') return array(); |
|
| 803 | 803 | |
| 804 | 804 | $jsonFormat = isJson($propertyString, true); |
| 805 | 805 | $property = array(); |
| 806 | 806 | // old format |
| 807 | - if ( $jsonFormat === false) { |
|
| 808 | - $props= explode('&', $propertyString); |
|
| 807 | + if ($jsonFormat === false) { |
|
| 808 | + $props = explode('&', $propertyString); |
|
| 809 | 809 | $arr = array(); |
| 810 | 810 | $key = array(); |
| 811 | 811 | foreach ($props as $prop) { |
| 812 | - if ($prop != ''){ |
|
| 812 | + if ($prop != '') { |
|
| 813 | 813 | $arr = explode(';', $prop); |
| 814 | 814 | $key = explode('=', $arr['0']); |
| 815 | 815 | $property[$key['0']]['0']['label'] = trim($key['1']); |
@@ -833,7 +833,7 @@ discard block |
||
| 833 | 833 | |
| 834 | 834 | } |
| 835 | 835 | // new json-format |
| 836 | - } else if(!empty($jsonFormat)){ |
|
| 836 | + } else if (!empty($jsonFormat)) { |
|
| 837 | 837 | $property = $jsonFormat; |
| 838 | 838 | } |
| 839 | 839 | if ($json) { |
@@ -843,25 +843,25 @@ discard block |
||
| 843 | 843 | return $property; |
| 844 | 844 | } |
| 845 | 845 | |
| 846 | -function isJson($string, $returnData=false) { |
|
| 846 | +function isJson($string, $returnData = false){ |
|
| 847 | 847 | $data = json_decode($string, true); |
| 848 | 848 | return (json_last_error() == JSON_ERROR_NONE) ? ($returnData ? $data : true) : false; |
| 849 | 849 | } |
| 850 | 850 | |
| 851 | -function getCreateDbCategory($category, $sqlParser) { |
|
| 851 | +function getCreateDbCategory($category, $sqlParser){ |
|
| 852 | 852 | $dbase = $sqlParser->dbname; |
| 853 | - $dbase = '`' . trim($dbase,'`') . '`'; |
|
| 853 | + $dbase = '`'.trim($dbase, '`').'`'; |
|
| 854 | 854 | $table_prefix = $sqlParser->prefix; |
| 855 | 855 | $category_id = 0; |
| 856 | - if(!empty($category)) { |
|
| 856 | + if (!empty($category)) { |
|
| 857 | 857 | $category = mysqli_real_escape_string($sqlParser->conn, $category); |
| 858 | 858 | $rs = mysqli_query($sqlParser->conn, "SELECT id FROM $dbase.`".$table_prefix."categories` WHERE category = '".$category."'"); |
| 859 | - if(mysqli_num_rows($rs) && ($row = mysqli_fetch_assoc($rs))) { |
|
| 859 | + if (mysqli_num_rows($rs) && ($row = mysqli_fetch_assoc($rs))) { |
|
| 860 | 860 | $category_id = $row['id']; |
| 861 | 861 | } else { |
| 862 | 862 | $q = "INSERT INTO $dbase.`".$table_prefix."categories` (`category`) VALUES ('{$category}');"; |
| 863 | 863 | $rs = mysqli_query($sqlParser->conn, $q); |
| 864 | - if($rs) { |
|
| 864 | + if ($rs) { |
|
| 865 | 865 | $category_id = mysqli_insert_id($sqlParser->conn); |
| 866 | 866 | } |
| 867 | 867 | } |
@@ -870,12 +870,12 @@ discard block |
||
| 870 | 870 | } |
| 871 | 871 | |
| 872 | 872 | // Remove installer Docblock only from components using plugin FileSource / fileBinding |
| 873 | -function removeDocblock($code, $type) { |
|
| 873 | +function removeDocblock($code, $type){ |
|
| 874 | 874 | |
| 875 | 875 | $cleaned = preg_replace("/^.*?\/\*\*.*?\*\/\s+/s", '', $code, 1); |
| 876 | 876 | |
| 877 | 877 | // Procedure taken from plugin.filesource.php |
| 878 | - switch($type) { |
|
| 878 | + switch ($type) { |
|
| 879 | 879 | case 'snippet': |
| 880 | 880 | $elm_name = 'snippets'; |
| 881 | 881 | $include = 'return require'; |
@@ -891,7 +891,7 @@ discard block |
||
| 891 | 891 | default: |
| 892 | 892 | return $cleaned; |
| 893 | 893 | }; |
| 894 | - if(substr(trim($cleaned),0,$count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/') |
|
| 894 | + if (substr(trim($cleaned), 0, $count) == $include.' MODX_BASE_PATH.\'assets/'.$elm_name.'/') |
|
| 895 | 895 | return $cleaned; |
| 896 | 896 | |
| 897 | 897 | // fileBinding not found - return code incl docblock |
