diff --git a/web/login.php b/web/login.php index 1fafff46..cf34325c 100644 --- a/web/login.php +++ b/web/login.php @@ -89,7 +89,7 @@ if ($w=='lo') { } else { session_unset(); session_destroy(); - redirect($page_url.'/'. $ewInstallPath); + redirect($page_url. '/'. $ewInstallPath); } } else if ($w=='ba') { $sus=$sprache->banned; diff --git a/web/protectioncheck.php b/web/protectioncheck.php index b2b39b34..36a59ab7 100644 --- a/web/protectioncheck.php +++ b/web/protectioncheck.php @@ -103,7 +103,7 @@ if ($ui->ipport('serveraddress', 'post') or ($ui->ip('ip', 'get') and $ui->port( if ($default_language == 'de') { $time=explode(' ', $row['logdate']); $time2=explode('-', $time[0]); - $time3=$time2[2].".".$time2[1].".".$time2[0]." ".$time[1]; + $time3=$time2[2].".".$time2[1].".".$time2[0] . ' ' . $time[1]; } else { $time3=$row['logdate']; } diff --git a/web/serverallocation.php b/web/serverallocation.php index 632664c3..24598435 100644 --- a/web/serverallocation.php +++ b/web/serverallocation.php @@ -91,7 +91,7 @@ if ($ui->smallletters('w',5,'get')=='check') { $ram=$row['ram']; $maxserver=$row['maxserver']; $esxi=$row['esxi']; - $besthostcpu=$row['cpu']." ".$cores."x".$mhz." MHz"; + $besthostcpu=$row['cpu'] . ' ' . $cores."x".$mhz." MHz"; if ($row['thin']=="Y") { $percent=$row['thinquota']; } else { @@ -333,8 +333,8 @@ if ($ui->smallletters('w',5,'get')=='check') { } ?> ".$param." ".$vosprache->isnot." ".$default[$param]; + $rulebreak .="
".$param . ' ' . $vosprache->isnot . ' ' . $default[$param]; } else { - $rulebreak=$param." ".$vosprache->isnot." ".$default[$param]; + $rulebreak=$param . ' ' . $vosprache->isnot . ' ' . $default[$param]; } } } @@ -891,9 +891,9 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR']==$ip) { $modbadserver[$param]=$default[$param]; print $vrow['type']." server $address $param != ".$default[$param].". The name converted to ISO-8859-1 is ".iconv('UTF-8','ISO-8859-1//TRANSLIT',$server['virtualserver_name'])."\r\n"; if (isset($rulebreak)) { - $rulebreak .="
".$param." ".$vosprache->isnot." ".$default[$param]; + $rulebreak .="
".$param . ' ' . $vosprache->isnot . ' ' . $default[$param]; } else { - $rulebreak=$param." ".$vosprache->isnot." ".$default[$param]; + $rulebreak=$param . ' ' . $vosprache->isnot . ' ' . $default[$param]; } } } @@ -902,17 +902,17 @@ if (!isset($ip) or $_SERVER['SERVER_ADDR']==$ip) { $modbadserver['virtualserver_welcomemessage']=$default['defaultwelcome']; print $vrow['type']." server $address $param != ".$default['defaultwelcome'].". The name converted to ISO-8859-1 is ".iconv('UTF-8','ISO-8859-1//TRANSLIT',$server['virtualserver_name'])."\r\n"; if (isset($rulebreak)) { - $rulebreak .="
virtualserver_welcomemessage ".$vosprache->isnot." ".$default['defaultwelcome']; + $rulebreak .="
virtualserver_welcomemessage ".$vosprache->isnot . ' ' . $default['defaultwelcome']; } else { - $rulebreak="virtualserver_welcomemessage ".$vosprache->isnot." ".$default['defaultwelcome']; + $rulebreak="virtualserver_welcomemessage ".$vosprache->isnot . ' ' . $default['defaultwelcome']; } } if (isset($ts3id,$lendserver) and $lendserver=='N' and $slots<$server['virtualserver_maxclients']) { print $vrow['type']." server $address virtualserver_maxclients ${sd['virtualserver_maxclients']}!= ".$slots.". The name converted to ISO-8859-1 is ".iconv('UTF-8','ISO-8859-1//TRANSLIT',$server['virtualserver_name'])."\r\n"; if (isset($rulebreak)) { - $rulebreak .="
virtualserver_maxclients ".$vosprache->isnot." ".$slots; + $rulebreak .="
virtualserver_maxclients ".$vosprache->isnot . ' ' . $slots; } else { - $rulebreak="virtualserver_maxclients ".$vosprache->isnot." ".$slots; + $rulebreak="virtualserver_maxclients ".$vosprache->isnot . ' ' . $slots; } } if (isset($ts3id) and $password=='Y' and $sd['virtualserver_flag_password']!='1') { diff --git a/web/stuff/api_import_users.php b/web/stuff/api_import_users.php index 0c754de0..65b96631 100644 --- a/web/stuff/api_import_users.php +++ b/web/stuff/api_import_users.php @@ -141,7 +141,7 @@ if ($ui->w('action',4,'post') and !token(true)) { } else { $query=$sql->prepare("UPDATE `api_import` SET `active`=?,`fetchUpdates`=?,`token`=?,`groupID`=?,`chunkSize`=?,`ssl`=?,`domain`=?,`file`=? WHERE `importID`=? AND `resellerID`=? LIMIT 1"); $query->execute(array($ui->active('active','post'),$ui->active('fetchUpdates','post'),$ui->password('accessToken',255,'post'),$ui->id('groupID',19,'post'),$ui->id('chunkSize',19,'post'),$ui->active('ssl','post'),$ui->domain('domain','post'),$ui->startparameter('file','post'),$id,$reseller_id)); - $loguseraction='%mod% %apiimport% '.$ui->domain('domain','post').'/'. $ui->startparameter('file','post'); + $loguseraction='%mod% %apiimport% '.$ui->domain('domain','post'). '/'. $ui->startparameter('file','post'); } } else if ($ui->st('d','get')=='ad') { $query=$sql->prepare("SELECT `importID` FROM `api_import` WHERE `domain`=? AND `file`=? AND `resellerID`=? LIMIT 1"); @@ -152,7 +152,7 @@ if ($ui->w('action',4,'post') and !token(true)) { $query=$sql->prepare("INSERT INTO `api_import` (`active`,`fetchUpdates`,`token`,`groupID`,`chunkSize`,`ssl`,`domain`,`file`,`lastID`,`lastCheck`,`resellerID`) VALUES (?,?,?,?,?,?,?,?,0,'0000-00-00 00:00:00',?)"); $query->execute(array($ui->active('active','post'),$ui->active('fetchUpdates','post'),$ui->password('accessToken',255,'post'),$ui->id('groupID',19,'post'),$ui->id('chunkSize',19,'post'),$ui->active('ssl','post'),$ui->domain('domain','post'),$ui->startparameter('file','post'),$reseller_id)); } - $loguseraction='%add% %apiimport% '.$ui->domain('domain','post').'/'. $ui->startparameter('file','post'); + $loguseraction='%add% %apiimport% '.$ui->domain('domain','post'). '/'. $ui->startparameter('file','post'); } else { $template_file='admin_404.tpl'; } @@ -193,7 +193,7 @@ if ($ui->w('action',4,'post') and !token(true)) { $query=$sql->prepare("DELETE FROM `api_import` WHERE `importID`=? AND `resellerID`=? LIMIT 1"); $query->execute(array($id,$reseller_id)); if ($query->rowCount()>0) { - $loguseraction='%del% %apiimport% '.$domain.'/'. $file; + $loguseraction='%del% %apiimport% '.$domain. '/'. $file; $insertlog->execute(); $template_file=$spracheResponse->table_del; } else { @@ -260,7 +260,7 @@ if ($ui->w('action',4,'post') and !token(true)) { } else { $ssl='http://'; } - $table[]=array('id'=>$row['importID'],'img'=>$imgName,'alt'=>$imgAlt,'domain'=>$ssl.$row['domain'].'/'. $row['file'],'lastID'=>$row['lastID'],'lastCheck'=>$row['lastCheck'],'active'=>$row['active']); + $table[]=array('id'=>$row['importID'],'img'=>$imgName,'alt'=>$imgAlt,'domain'=>$ssl.$row['domain']. '/'. $row['file'],'lastID'=>$row['lastID'],'lastCheck'=>$row['lastCheck'],'active'=>$row['active']); } $pageamount=ceil($colcount/$amount); $link='execute(array($ID)); $title=$query->fetchColumn(); - $addToUrl=($s=='news') ? '/'. $this->language.'/'. $this->NameToLink($gsprache->news).'/'. $this->NameToLink($title).'/' : '/'. $this->language.'/'. $this->NameToLink($title).'/'; + $addToUrl=($s=='news') ? '/'. $this->language. '/'. $this->NameToLink($gsprache->news). '/'. $this->NameToLink($title).'/' : '/'. $this->language. '/'. $this->NameToLink($title).'/'; } else if ($this->seo=='Y' and in_array($s,array('imprint','lendserver','news'))) { - $addToUrl='/'. $this->language.'/'. $this->NameToLink($gsprache->$s).'/'; + $addToUrl='/'. $this->language. '/'. $this->NameToLink($gsprache->$s).'/'; } else if ($this->seo=='Y') { - $addToUrl='/'. $this->language.'/'. $this->NameToLink($page_sprache->$s).'/'; + $addToUrl='/'. $this->language. '/'. $this->NameToLink($page_sprache->$s).'/'; } else if ($ID!=null) { $addToUrl='?s='.$s.'&id='.$ID; } else { @@ -197,7 +197,7 @@ class PageSettings { global $languages; foreach ($languages as $l) { if ($this->seo=='Y') { - $this->languageLinks[$l]=(isset($links[$l])) ? $this->pageurl.'/'. $l.'/'. $links[$l].'/' : $this->pageurl.'/'. $l.'/'; + $this->languageLinks[$l]=(isset($links[$l])) ? $this->pageurl. '/'. $l. '/'. $links[$l].'/' : $this->pageurl. '/'. $l.'/'; } else { $this->languageLinks[$l]=(isset($links[$l])) ? $this->pageurl.'/index.php'.$links[$l].'&l='.$l : $this->pageurl.'/index.php?l='.$l; } diff --git a/web/stuff/class_rest.php b/web/stuff/class_rest.php index 4e3f49f9..3f8e4f96 100644 --- a/web/stuff/class_rest.php +++ b/web/stuff/class_rest.php @@ -111,7 +111,7 @@ class easyWiRest { fclose($this->handle); $ex=explode("\r\n\r\n",$buffer); if (strpos($ex[0],'404')!==false) { - return 'file not found: '.$url.'/'. $file; + return 'file not found: '.$url. '/'. $file; } else { return true; } diff --git a/web/stuff/class_rootserver.php b/web/stuff/class_rootserver.php index c9cd658a..9d0798bb 100644 --- a/web/stuff/class_rootserver.php +++ b/web/stuff/class_rootserver.php @@ -270,8 +270,8 @@ class rootServer { $connect_ssh2=($v['publickey']=='Y' and isset($pubkey,$key)) ? @ssh2_auth_pubkey_file($ssh2,$v['user'],$pubkey,$key) : @ssh2_auth_password($ssh2,$v['user'],$v['pass']); if ($connect_ssh2==true) { $sftp=ssh2_sftp($ssh2); - $file=(substr($v['dhcpFile'],0,1)=='/') ? 'ssh2.sftp://'.$sftp.$v['dhcpFile'] : 'ssh2.sftp://'.$sftp.'/home/'.$v['user'].'/'. $v['dhcpFile']; - $fileErrorOutput=(substr($v['dhcpFile'],0,1)=='/') ? $v['dhcpFile'] : '/home/'.$v['user'].'/'. $v['dhcpFile']; + $file=(substr($v['dhcpFile'],0,1)=='/') ? 'ssh2.sftp://'.$sftp.$v['dhcpFile'] : 'ssh2.sftp://'.$sftp.'/home/'.$v['user']. '/'. $v['dhcpFile']; + $fileErrorOutput=(substr($v['dhcpFile'],0,1)=='/') ? $v['dhcpFile'] : '/home/'.$v['user']. '/'. $v['dhcpFile']; $buffer=''; $fp=@fopen($file,'r'); if ($fp) { @@ -335,8 +335,8 @@ class rootServer { foreach($v['actions'] as $a) { $extraSlash=(substr($v['PXEFolder'],-1)!='/' and strlen($v['PXEFolder'])>0) ? '/' : ''; $pathWithPXEMac=$v['PXEFolder'].$extraSlash.'01-'.str_replace(':','-',$this->ID[$a['type']][$a['id']]['mac']); - $file=(substr($v['PXEFolder'],0,1)=='/') ? 'ssh2.sftp://'.$sftp.$pathWithPXEMac : 'ssh2.sftp://'.$sftp.'/home/'.$v['user'].'/'. $pathWithPXEMac; - $fileWithPath=(substr($v['PXEFolder'],0,1)=='/') ? $pathWithPXEMac : '/home/'.$v['user'].'/'. $pathWithPXEMac; + $file=(substr($v['PXEFolder'],0,1)=='/') ? 'ssh2.sftp://'.$sftp.$pathWithPXEMac : 'ssh2.sftp://'.$sftp.'/home/'.$v['user']. '/'. $pathWithPXEMac; + $fileWithPath=(substr($v['PXEFolder'],0,1)=='/') ? $pathWithPXEMac : '/home/'.$v['user']. '/'. $pathWithPXEMac; if (in_array($a['action'],array('dl','rt','md'))) { @ssh2_sftp_unlink($sftp,$fileWithPath); } else if (in_array($a['action'],array('ri','rc'))) { @@ -469,18 +469,18 @@ class rootServer { $cmd='vim-cmd vmsvc/getallvms | grep \'Skipping\' | while read line; do vim-cmd vmsvc/unregister `echo $line | grep \'Skipping\' | awk -F "\'" \'{print $2}\'`; done'; $this->execCmd($cmd,$ssh2); foreach ($h['actions'] as $v) { - $dir='/vmfs/volumes/'.$this->ID['vmware'][$v['id']]['mountpoint'].'/'. $this->ID['vmware'][$v['id']]['hostname']; + $dir='/vmfs/volumes/'.$this->ID['vmware'][$v['id']]['mountpoint']. '/'. $this->ID['vmware'][$v['id']]['hostname']; if(in_array($v['action'],array('md','dl','st','ri','re'))) { print "Step 1: Stop and remove if needed\r\n"; $cmd="i(){ echo `vim-cmd vmsvc/getallvms 2> /dev/null | grep -v 'Skipping' | grep '".$this->ID['vmware'][$v['id']]['hostname'].".vmx' | awk '{print $1}'`;}; o(){ vim-cmd vmsvc/power.off `i ".$this->ID['vmware'][$v['id']]['hostname']."`; vim-cmd vmsvc/unregister `i ".$this->ID['vmware'][$v['id']]['hostname']."`;}; o;"; - if (in_array($v['action'],array('dl','ri','re'))) $cmd.=" rm -rf /vmfs/volumes/".$this->ID['vmware'][$v['id']]['mountpoint'].'/'. $this->ID['vmware'][$v['id']]['hostname']; + if (in_array($v['action'],array('dl','ri','re'))) $cmd.=" rm -rf /vmfs/volumes/".$this->ID['vmware'][$v['id']]['mountpoint']. '/'. $this->ID['vmware'][$v['id']]['hostname']; $this->execCmd($cmd,$ssh2); } if (in_array($v['action'],array('md','ad','ri','re'))) { $harddisk=($this->ID['vmware'][$v['id']]['distro']=='windows7srv-64') ? 'lsisas1068' : 'lsilogic'; $sftp=ssh2_sftp($ssh2); ssh2_sftp_mkdir($sftp,rtrim($dir, '/'),0774,true); - $fp=fopen('ssh2.sftp://'.$sftp.'/vmfs/volumes/'.$this->ID['vmware'][$v['id']]['mountpoint'].'/'. $this->ID['vmware'][$v['id']]['hostname'].'/'. $this->ID['vmware'][$v['id']]['hostname'].'.vmx','w'); + $fp=fopen('ssh2.sftp://'.$sftp.'/vmfs/volumes/'.$this->ID['vmware'][$v['id']]['mountpoint']. '/'. $this->ID['vmware'][$v['id']]['hostname']. '/'. $this->ID['vmware'][$v['id']]['hostname'].'.vmx','w'); if ($fp) { $vmxFile='.encoding = "UTF-8"'."\n"; $vmxFile.='config.version = "8"'."\n"; @@ -549,7 +549,7 @@ class rootServer { } unset($fp); } else { - print 'could not open: /vmfs/volumes/'.$this->ID['vmware'][$v['id']]['mountpoint'].'/'. $this->ID['vmware'][$v['id']]['hostname'].'/'. $this->ID['vmware'][$v['id']]['hostname'].'.vmx'."\r\n"; + print 'could not open: /vmfs/volumes/'.$this->ID['vmware'][$v['id']]['mountpoint']. '/'. $this->ID['vmware'][$v['id']]['hostname']. '/'. $this->ID['vmware'][$v['id']]['hostname'].'.vmx'."\r\n"; } if(is_resource($sftp)) fclose($sftp); else unset ($sftp); diff --git a/web/stuff/class_voice.php b/web/stuff/class_voice.php index 39475616..385ee00e 100644 --- a/web/stuff/class_voice.php +++ b/web/stuff/class_voice.php @@ -740,7 +740,7 @@ function tsdns ($action,$sship,$sshport,$sshuser,$keyuse,$sshkey,$sshpw,$notifie if (substr($path,0,1)=='/') { $file='ssh2.sftp://'.$sftp.$folders.'tsdns_settings.ini'; } else { - $file='ssh2.sftp://'.$sftp.'/home/'.$sshuser.'/'. $folders.'tsdns_settings.ini'; + $file='ssh2.sftp://'.$sftp.'/home/'.$sshuser. '/'. $folders.'tsdns_settings.ini'; } if ($action!='rs') { $tsdns_read= @fopen($file,'r'); diff --git a/web/stuff/functions.php b/web/stuff/functions.php index f264768d..38f70ea7 100644 --- a/web/stuff/functions.php +++ b/web/stuff/functions.php @@ -262,17 +262,17 @@ if (!function_exists('passwordgenerate')) { foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { $default_language=$row['language']; $template=$row['template']; - if (file_exists(EASYWIDIR . '/languages/'.$template.'/'. $user_language.'/'. $filename.'.xml')) { - $sprache=simplexml_load_file(EASYWIDIR . '/languages/'.$template.'/'. $user_language.'/'. $filename.'.xml'); - } else if (file_exists(EASYWIDIR . '/languages/'.$template.'/'. $default_language.'/'. $filename.'.xml')) { - $sprache=simplexml_load_file(EASYWIDIR . '/languages/'.$template.'/'. $default_language.'/'. $filename.'.xml'); - } else if (file_exists(EASYWIDIR . '/languages/default/'.$user_language.'/'. $filename.'.xml')) { - $sprache=simplexml_load_file(EASYWIDIR . '/languages/default/'.$user_language.'/'. $filename.'.xml'); - } else if (file_exists(EASYWIDIR . '/languages/default/'.$default_language.'/'. $filename.'.xml')) { - $sprache=simplexml_load_file(EASYWIDIR . '/languages/default/'.$default_language.'/'. $filename.'.xml'); - } else if (file_exists(EASYWIDIR . '/languages/'.$user_language.'/'. $filename.'.xml')) { + if (file_exists(EASYWIDIR . '/languages/'. $template. '/'. $user_language. '/'. $filename.'.xml')) { + $sprache=simplexml_load_file(EASYWIDIR . '/languages/'. $template. '/'. $user_language. '/'. $filename.'.xml'); + } else if (file_exists(EASYWIDIR . '/languages/'. $template. '/'. $default_language. '/'. $filename.'.xml')) { + $sprache=simplexml_load_file(EASYWIDIR . '/languages/'. $template. '/'. $default_language. '/'. $filename.'.xml'); + } else if (file_exists(EASYWIDIR . '/languages/default/'.$user_language. '/'. $filename.'.xml')) { + $sprache=simplexml_load_file(EASYWIDIR . '/languages/default/'.$user_language. '/'. $filename.'.xml'); + } else if (file_exists(EASYWIDIR . '/languages/default/'.$default_language. '/'. $filename.'.xml')) { + $sprache=simplexml_load_file(EASYWIDIR . '/languages/default/'.$default_language. '/'. $filename.'.xml'); + } else if (file_exists(EASYWIDIR . '/languages/'. $user_language. '/'. $filename.'.xml')) { $sprache=simplexml_load_file(EASYWIDIR."/languages/$user_language/$filename.xml"); - } else if (file_exists(EASYWIDIR . '/languages/'.$default_language.'/'. $filename.'.xml')) { + } else if (file_exists(EASYWIDIR . '/languages/'. $default_language. '/'. $filename.'.xml')) { $sprache=simplexml_load_file(EASYWIDIR."/languages/$default_language/$filename.xml"); } } @@ -461,7 +461,7 @@ if (!function_exists('passwordgenerate')) { $pserver="server/"; $absolutepath="/home/".$customer."/server/".$gsip."_"."$port/$folder"; } - $bindir=$absolutepath.'/'. $binarydir; + $bindir=$absolutepath. '/'. $binarydir; $cvarprotect=array(); if ($qstat=='hla2s' and $tvenable=='Y') $slots++; $modsCmds=array(); @@ -700,9 +700,9 @@ if (!function_exists('passwordgenerate')) { if ($cfgtype=='cfg' and preg_match("/^(.*)".strtolower($cvar)."\s+(.*)$/",$lline)) { $splitline=preg_split("/$cvar/",$lline,-1,PREG_SPLIT_NO_EMPTY); if (isset($splitline[1])) { - fwrite($temp2,$splitline[0].$cvar." ".$value); + fwrite($temp2,$splitline[0].$cvar . ' ' . $value); } else { - fwrite($temp2,$cvar." ".$value); + fwrite($temp2,$cvar . ' ' . $value); } $edited=true; } else if ($cfgtype=='ini' and preg_match("/^(.*)".strtolower($cvar)."(\=|\s+\=\s+|\s+\=|\=\s+)(.*)$/",$lline)) { @@ -833,7 +833,7 @@ if (!function_exists('passwordgenerate')) { $query->execute(array($userid)); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { $usermail=$row['mail']; - $username=$row['vname']." ".$row['name']; + $username=$row['vname'] . ' ' . $row['name']; if ($username==' ' or $username=='') { $username=$row['cname']; } @@ -947,12 +947,12 @@ if (!function_exists('passwordgenerate')) { } } function IncludeTemplate($use,$file) { - if (is_file(EASYWIDIR . '/template/'.$use.'/'. $file) and preg_match('/^(.*)\.[\w]{1,}$/',$file)) { - return EASYWIDIR . '/template/'.$use.'/'. $file; + if (is_file(EASYWIDIR . '/template/' . $use. '/'. $file) and preg_match('/^(.*)\.[\w]{1,}$/',$file)) { + return EASYWIDIR . '/template/' . $use. '/'. $file; } else if (is_file(EASYWIDIR . '/template/default/'.$file) and preg_match('/^(.*)\.[\w]{1,}$/',$file)) { return EASYWIDIR . '/template/default/'.$file; } else if (preg_match('/^(.*)\.[\w]{1,}$/',$file)) { - return EASYWIDIR . '/template/'.$file; + return EASYWIDIR . '/template/' . $file; } } function User_Permissions($id) { @@ -1056,7 +1056,7 @@ if (!function_exists('passwordgenerate')) { fclose($fp); $ex=explode("\r\n\r\n",$buffer); if (strpos($ex[0],'404')!==false) { - return 'file not found: '.$domain.'/'. $file; + return 'file not found: '.$domain. '/'. $file; } else if (isset($ex[1])) { return $ex[1]; } else { diff --git a/web/stuff/gserver.php b/web/stuff/gserver.php index cb3c6527..b63c84ab 100644 --- a/web/stuff/gserver.php +++ b/web/stuff/gserver.php @@ -941,7 +941,7 @@ if ($ui->st('d','get')=='ad' and is_numeric($licenceDetails['lG']) and $licenceD } $query=$sql->prepare("UPDATE `serverlist` SET `fps`=?,`map`=?,`mapGroup`=?,`cmd`=?,`owncmd`=?,`tic`=?,`userfps`=?,`usertick`=?,`usermap`=?,`user_uploaddir`=?,`upload`=?,`uploaddir`=AES_ENCRYPT(?,?) WHERE `id`=? AND `resellerid`=? LIMIT 1"); $query->execute(array($fps,$map,$mapGroup,$cmd,$owncmd,$tic,$userfps,$usertick,$usermap,$user_uploaddir,$upload,$uploaddir,$aeskey,$id,$reseller_id)); - $template_file .=$shorten." ".$serverip_new.":".$port_new.": ".$sprache->server_ud."
"; + $template_file .=$shorten . ' ' . $serverip_new.":".$port_new.": ".$sprache->server_ud."
"; $i++; } if (isset($updateGo)) { diff --git a/web/stuff/lendserver.php b/web/stuff/lendserver.php index e9bfe244..91752708 100644 --- a/web/stuff/lendserver.php +++ b/web/stuff/lendserver.php @@ -279,8 +279,8 @@ if ($ui->w('action',4,'post') and !token(true)) { $query->execute(array($reseller_id)); $nextcheck=$query->fetchColumn(); $nextcheck=($nextcheck>0) ? ceil($nextcheck) : ceil($nextcheck)*-1; - $used[]='Teamspeak 3: '.$voused.'/'. $voTotalCount; - foreach ($gscounts as $key=>$value) $used[]=$key.': '.$gsused[$key].'/'. $value; + $used[]='Teamspeak 3: '.$voused. '/'. $voTotalCount; + foreach ($gscounts as $key=>$value) $used[]=$key.': '.$gsused[$key]. '/'. $value; $template_file="admin_lendserver_list.tpl"; } } \ No newline at end of file diff --git a/web/stuff/page_comments.php b/web/stuff/page_comments.php index b417a078..f4221e23 100644 --- a/web/stuff/page_comments.php +++ b/web/stuff/page_comments.php @@ -195,7 +195,7 @@ if ($ui->w('action',4,'post') and !token(true)) { if ($seo=='N') { $link=$page_url.'/index.php?site=news&id='.$row['pageid']; } else { - $link=$page_url.'/'. $row['language'].'/'.szrp($titleLanguages[$row['language']]['general']->news).'/'.szrp($row['title']).'/'; + $link=$page_url. '/'. $row['language'].'/'.szrp($titleLanguages[$row['language']]['general']->news).'/'.szrp($row['title']).'/'; } $table[]=array('pageid'=>$row['pageid'],'title'=>htmlentities($row['title']),'comment'=>htmlentities($row['comment']),'commentID'=>$row['commentID'],'date'=>date($commentDate,strtotime($row['date'])),'authorname'=>htmlentities($row['authorname']),'moderated'=>$moderated,'spam'=>$spam,'spamReason'=>$row['spamReason'],'link'=>$link); } diff --git a/web/stuff/page_news.php b/web/stuff/page_news.php index 12c20f22..0b3b0ce9 100644 --- a/web/stuff/page_news.php +++ b/web/stuff/page_news.php @@ -66,11 +66,11 @@ if ((isset($page_name) and $page_name!=szrp($page_sprache->older) and isset($pag foreach ($query2->fetchAll(PDO::FETCH_ASSOC) as $row2) { $page_data->AddData('keywords',$row2['name']); if ($seo=='Y' and $row2['type']=='tag') { - $tagLink=$page_url.'/'. $user_language.'/'.szrp($page_sprache->tag).'/'.szrp($row2['name']).'/'; + $tagLink=$page_url. '/'. $user_language.'/'.szrp($page_sprache->tag).'/'.szrp($row2['name']).'/'; } else if ($row2['type']=='tag') { $tagLink=$page_url.'/index.php?site=tag&tag='.szrp($row2['name']); } else if ($seo=='Y' and $row2['type']=='category') { - $categoryLink=$page_url.'/'. $user_language.'/'.szrp($page_sprache->categories).'/'.szrp($row2['name']).'/'; + $categoryLink=$page_url. '/'. $user_language.'/'.szrp($page_sprache->categories).'/'.szrp($row2['name']).'/'; } else if ($row2['type']=='category') { $categoryLink=$page_url.'/index.php?site=categories&tag='.szrp($row2['name']); } @@ -240,7 +240,7 @@ if ((isset($page_name) and $page_name!=szrp($page_sprache->older) and isset($pag $page_title=$row['title']; $page_text=nl2br($row['text']); if ($seo=='Y') { - $link=$page_url.'/'. $user_language.'/'.szrp($gsprache->news).'/'.szrp($row['title']).'/'; + $link=$page_url. '/'. $user_language.'/'.szrp($gsprache->news).'/'.szrp($row['title']).'/'; } else { $link=$page_url.'/index.php?site=news&id='.$row['id']; } @@ -249,11 +249,11 @@ if ((isset($page_name) and $page_name!=szrp($page_sprache->older) and isset($pag foreach ($query2->fetchAll(PDO::FETCH_ASSOC) as $row2) { $page_data->AddData('keywords',$row2['name']); if ($seo=='Y' and $row2['type']=='tag') { - $tagLink=$page_url.'/'. $user_language.'/'.szrp($page_sprache->tag).'/'.szrp($row2['name']).'/'; + $tagLink=$page_url. '/'. $user_language.'/'.szrp($page_sprache->tag).'/'.szrp($row2['name']).'/'; } else if ($row2['type']=='tag') { $tagLink=$page_url.'/index.php?site=tag&tag='.szrp($row2['name']); } else if ($seo=='Y' and $row2['type']=='category') { - $categoryLink=$page_url.'/'. $user_language.'/'.szrp($page_sprache->categories).'/'.szrp($row2['name']).'/'; + $categoryLink=$page_url. '/'. $user_language.'/'.szrp($page_sprache->categories).'/'.szrp($row2['name']).'/'; } else if ($row2['type']=='category') { $categoryLink=$page_url.'/index.php?site=categories&tag='.szrp($row2['name']); } @@ -280,7 +280,7 @@ if ((isset($page_name) and $page_name!=szrp($page_sprache->older) and isset($pag $news[]=array('date'=>$date,'title'=>$page_title,'text'=>$page_text,'href'=>$href,'link'=>$link,'tags'=>$tag_tags,'categories'=>$category_tags,'comments'=>$row['comments'],'commentCount'=>$commentCount,'authorname'=>$row['authorname']); } if ($seo=='Y') { - $paginationLink=$page_url.'/'. $user_language.'/'.szrp($gsprache->news).'/'.szrp($page_sprache->older).'/'; + $paginationLink=$page_url. '/'. $user_language.'/'.szrp($gsprache->news).'/'.szrp($page_sprache->older).'/'; } else { $paginationLink=$page_url.'/index.php?site=news&start='; } diff --git a/web/stuff/page_news_edit.php b/web/stuff/page_news_edit.php index 1643fa11..63a5087d 100644 --- a/web/stuff/page_news_edit.php +++ b/web/stuff/page_news_edit.php @@ -465,17 +465,17 @@ if ($ui->w('action',4,'post') and !token(true)) { $link=$page_url.'/index.php?site=page&id='.$row['id']; } else { if ($row['language']==$user_language) { - $link=$page_url.'/'. $user_language.'/'.szrp($titleLanguages[$row['language']]['general']->news).'/'.strtolower(szrp($row['title'])).'/'; + $link=$page_url. '/'. $user_language.'/'.szrp($titleLanguages[$row['language']]['general']->news).'/'.strtolower(szrp($row['title'])).'/'; } else { - $link=$page_url.'/'. $row['language'].'/'.szrp($titleLanguages[$row['language']]['general']->news).'/'.strtolower(szrp($row['title'])).'/'; + $link=$page_url. '/'. $row['language'].'/'.szrp($titleLanguages[$row['language']]['general']->news).'/'.strtolower(szrp($row['title'])).'/'; } } $explodedtime=explode(' ', $row['date']); $explodedtime2=explode('-', $explodedtime[0]); if ($user_language=='de') { - $date=$explodedtime2[2].".".$explodedtime2[1].".".$explodedtime2[0]." ".$explodedtime[1]; + $date=$explodedtime2[2].".".$explodedtime2[1].".".$explodedtime2[0] . ' ' . $explodedtime[1]; } else { - $date=$explodedtime2[1].".".$explodedtime2[2].".".$explodedtime2[0]." ".$explodedtime[1]; + $date=$explodedtime2[1].".".$explodedtime2[2].".".$explodedtime2[0] . ' ' . $explodedtime[1]; } $table[]=array('id'=>$row['id'],'author'=>$author,'date'=>$date,'released'=>$released,'title'=>$page_title,'link'=>$link,'languages'=>$p_languages); } diff --git a/web/stuff/page_page.php b/web/stuff/page_page.php index ef06d7e8..d618f8bc 100644 --- a/web/stuff/page_page.php +++ b/web/stuff/page_page.php @@ -64,7 +64,7 @@ if (isset($page_id) and is_numeric($page_id)) { $query2->execute(array($row['id'])); foreach ($query2->fetchAll(PDO::FETCH_ASSOC) as $row2) { $page_data->AddData('keywords',$row2['name']); - $tag_tags[]=($seo=='Y') ? 'tag.'/'.strtolower(szrp($row2['name'])).'/>'.$row2['name'].'' : ''.$row2['name'].''; + $tag_tags[]=($seo=='Y') ? 'tag.'/'.strtolower(szrp($row2['name'])).'/>'.$row2['name'].'' : ''.$row2['name'].''; } } $breadcrumbs=array(); @@ -73,7 +73,7 @@ if (isset($page_id) and is_numeric($page_id)) { $query->execute(array($breadcrumbID,$user_language)); unset($breadcrumbID); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - $link=(isset($seo) and $seo=='Y') ? $page_data->pageurl.'/'. $user_language.'/'.szrp($row['title']).'/' : $page_data->pageurl.'?s=page&l='.$user_language.'&id='.$row['id']; + $link=(isset($seo) and $seo=='Y') ? $page_data->pageurl. '/'. $user_language.'/'.szrp($row['title']).'/' : $page_data->pageurl.'?s=page&l='.$user_language.'&id='.$row['id']; $breadcrumbs[]=array('href'=>''.$row['title'].'','link'=>$link); $breadcrumbID=$row['subpage']; $breadcrumbPageID=$row['id']; @@ -132,20 +132,20 @@ if (isset($page_id) and is_numeric($page_id)) { $title=$row['title']; if ($row['type']=='news' and isset($seo) and $seo=='Y') { $type=(string)$titleLanguages[$row['language']]['general']->news; - $link=$page_data->pageurl.'/'. $row['language'].'/'.szrp($titleLanguages[$row['language']]['general']->news).'/'.szrp($row['title']).'/'; + $link=$page_data->pageurl. '/'. $row['language'].'/'.szrp($titleLanguages[$row['language']]['general']->news).'/'.szrp($row['title']).'/'; } else if ($row['type']=='news') { $type=(string)$titleLanguages[$row['language']]['general']->news; $link=$page_data->pageurl.'?s=news&l='.$row['language'].'&id='.$row['pageID']; } else if ($row['type']=='page' and isset($seo) and $seo=='Y') { $type=(string)$titleLanguages[$row['language']]['general']->page; - $link=$page_data->pageurl.'/'. $row['language'].'/'.szrp($row['title']).'/'; + $link=$page_data->pageurl. '/'. $row['language'].'/'.szrp($row['title']).'/'; } else if ($row['type']=='page') { $type=(string)$titleLanguages[$row['language']]['general']->page; $link=$page_data->pageurl.'?s=page&l='.$row['language'].'&id='.$row['pageID']; } else if ($row['type']=='about' and isset($seo) and $seo=='Y') { $type=(string)$titleLanguages[$row['language']]['page']->about; $title=(string)$titleLanguages[$row['language']]['page']->about; - $link=$page_data->pageurl.'/'. $row['language'].'/'.szrp($titleLanguages[$row['language']]['page']->about).'/'; + $link=$page_data->pageurl. '/'. $row['language'].'/'.szrp($titleLanguages[$row['language']]['page']->about).'/'; } else if ($row['type']=='about') { $type=(string)$titleLanguages[$row['language']]['page']->about; $title=(string)$titleLanguages[$row['language']]['page']->about; diff --git a/web/stuff/page_pages.php b/web/stuff/page_pages.php index 28a0263d..c658c05e 100644 --- a/web/stuff/page_pages.php +++ b/web/stuff/page_pages.php @@ -445,17 +445,17 @@ if ($ui->w('action',4,'post') and !token(true)) { $link=$page_url.'/index.php?site=page&id='.$row['id']; } else { if ($row['language']==$user_language) { - $link=$page_url.'/'. $user_language.'/'.strtolower(szrp($row['title'])).'/'; + $link=$page_url. '/'. $user_language.'/'.strtolower(szrp($row['title'])).'/'; } else { - $link=$page_url.'/'. $row['language'].'/'.strtolower(szrp($row['title'])).'/'; + $link=$page_url. '/'. $row['language'].'/'.strtolower(szrp($row['title'])).'/'; } } $explodedtime=explode(' ', $row['date']); $explodedtime2=explode('-', $explodedtime[0]); if ($user_language=='de') { - $date=$explodedtime2[2].".".$explodedtime2[1].".".$explodedtime2[0]." ".$explodedtime[1]; + $date=$explodedtime2[2].".".$explodedtime2[1].".".$explodedtime2[0] . ' ' . $explodedtime[1]; } else { - $date=$explodedtime2[1].".".$explodedtime2[2].".".$explodedtime2[0]." ".$explodedtime[1]; + $date=$explodedtime2[1].".".$explodedtime2[2].".".$explodedtime2[0] . ' ' . $explodedtime[1]; } array_push($table,array('id'=>$row['id'],'author'=>$author,'date'=>$date,'released'=>$released,'title'=>$page_title,'link'=>$link,'languages'=>$p_languages,'sort'=>$row['sort'])); } diff --git a/web/stuff/page_tag.php b/web/stuff/page_tag.php index 7607092c..57431c86 100644 --- a/web/stuff/page_tag.php +++ b/web/stuff/page_tag.php @@ -40,7 +40,7 @@ if ($seo=='Y') { if (!isset($page_count)) { $page_count=1; } - $current_page_link='/'. $user_language.'/'.szrp($page_sprache->$s).'/'. $page_name.'/'. $page_count.'/'; + $current_page_link='/'. $user_language.'/'.szrp($page_sprache->$s). '/'. $page_name. '/'. $page_count.'/'; } else { $search_tag=strtolower($ui->username('tag','255','get')); if ($ui->id('older','30','get')) { @@ -75,19 +75,19 @@ if (isset($search_tag) and $search_tag!='' and $search_tag!=null) { $limit=($maxnews*$page_count)-$maxnews.','.($maxnews*$page_count); } if ($max_old>$page_count and $seo=='Y') { - $older=$page_url.'/'. $user_language.'/'. $page_sprache->$s.'/'. $search_tag.'/'.($page_count+1).'/'; + $older=$page_url. '/'. $user_language. '/'. $page_sprache->$s. '/'. $search_tag.'/'.($page_count+1).'/'; } else if ($max_old>$page_count and $seo=='N') { $older=$page_url.'/index.php?site='.$s.'&tag='.strtolower(szrp($row2['name'])).'&older='.($page_count+1); } } else if ($page_row_count>$maxnews and !isset($page_count)) { if ($seo=='Y') { - $older=$page_url.'/'. $user_language.'/'. $page_sprache->$s.'/'. $search_tag.'/2/'; + $older=$page_url. '/'. $user_language. '/'. $page_sprache->$s. '/'. $search_tag.'/2/'; } else { $older=$page_url.'/index.php?site='.$s.'&tag='.strtolower(szrp($row2['name'])).'&older=2'; } } if (isset($page_count) and $page_count>1 and $seo=='Y') { - $newer=$page_url.'/'. $user_language.'/'. $page_sprache->$s.'/'. $search_tag.'/'.($page_count-1).'/'; + $newer=$page_url. '/'. $user_language. '/'. $page_sprache->$s. '/'. $search_tag.'/'.($page_count-1).'/'; } else if (isset($page_count) and $page_count>1 and $seo=='N') { $newer=$page_url.'/index.php?site='.$s.'&tag='.strtolower(szrp($row2['name'])).'&older='.($page_count-1); } @@ -97,7 +97,7 @@ if (isset($search_tag) and $search_tag!='' and $search_tag!=null) { if ($seo=='Y') { $type=''; if ($row['type']=='news') $type=szrp($gsprache->news).'/'; - $row_link=$page_url.'/'. $user_language.'/'. $type.szrp($row['title']).'/'; + $row_link=$page_url. '/'. $user_language. '/'. $type.szrp($row['title']).'/'; } else { $row_link=$page_url.'/index.php?site='.$row['type'].'&id='.$row['id']; } diff --git a/web/stuff/root_virtual_hosts.php b/web/stuff/root_virtual_hosts.php index 28b4272f..ac92b2e9 100644 --- a/web/stuff/root_virtual_hosts.php +++ b/web/stuff/root_virtual_hosts.php @@ -138,9 +138,9 @@ if ($ui->w('action',4,'post') and !token(true)) { $hddamount=str_replace('TB,', '', $space)*1000; } if(isset($hdd)){ - $hdd .="\r\n".$uid." ".$hddamount; + $hdd .="\r\n".$uid . ' ' . $hddamount; } else { - $hdd=$uid." ".$hddamount; + $hdd=$uid . ' ' . $hddamount; } $i++; } diff --git a/web/stuff/root_virtual_server.php b/web/stuff/root_virtual_server.php index fe37b359..9fb207fe 100644 --- a/web/stuff/root_virtual_server.php +++ b/web/stuff/root_virtual_server.php @@ -166,7 +166,7 @@ if ($ui->st('d','get')=='ad' and is_numeric($licenceDetails['lVs']) and $licence foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { $mhz=$row['mhz']; $ram=$row['ram']; - $besthostcpu=$row['cpu']." ".$row['cores']."x".$row['mhz']." MHz"; + $besthostcpu=$row['cpu'] . ' ' . $row['cores']."x".$row['mhz']." MHz"; $maxserver=$row['maxserver']; $esxi=$row['esxi']; $core=''; @@ -213,7 +213,7 @@ if ($ui->st('d','get')=='ad' and is_numeric($licenceDetails['lVs']) and $licence $notexclusive=1; $mhz=$row['mhz']; $ram=$row['ram']; - $besthostcpu=$row['cpu']." ".$row['cores']."x".$row['mhz']." MHz"; + $besthostcpu=$row['cpu'] . ' ' . $row['cores']."x".$row['mhz']." MHz"; $maxserver=$row['maxserver']; $core=''; $hdd=''; @@ -305,7 +305,7 @@ if ($ui->st('d','get')=='ad' and is_numeric($licenceDetails['lVs']) and $licence $query=$sql->prepare("SELECT `id`,`description`,`bitversion` FROM `resellerimages` ORDER BY `distro`,`bitversion`,`description`"); $query->execute(); foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { - $templates[]=array('id'=>$row['id'],'description'=>$row['description']." ".$row['bitversion']." Bit"); + $templates[]=array('id'=>$row['id'],'description'=>$row['description'] . ' ' . $row['bitversion']." Bit"); } $template_file="admin_root_vserver_add.tpl"; } else if ($ui->smallletters('action',2,'post')=='ad'){ diff --git a/web/stuff/traffic.php b/web/stuff/traffic.php index 8c6d89e8..c1f2e73a 100644 --- a/web/stuff/traffic.php +++ b/web/stuff/traffic.php @@ -147,7 +147,7 @@ if ($d=='se' and $reseller_id==0) { $kind="su"; if (isips($ui->post['what'])) { $whichdata="&ips=".$ui->post['what']; - $display=$sprache->subnet." ".$ui->post['what']; + $display=$sprache->subnet . ' ' . $ui->post['what']; } if ($reseller_id==0) { $pselect=$sql->prepare("SELECT `ips` FROM `resellerdata`"); @@ -221,7 +221,7 @@ if ($d=='se' and $reseller_id==0) { $pselect->execute(array(':id'=>$ui->post['what'],':reseller_id'=>$reseller_id)); } foreach ($pselect->fetchAll(PDO::FETCH_ASSOC) as $row) { - $display=$extra." ".$row['cname']; + $display=$extra . ' ' . $row['cname']; } } else if ($ui->post['kind']=="se") { $kind="se"; @@ -239,7 +239,7 @@ if ($d=='se' and $reseller_id==0) { $pselect->execute(array(':id' =>$ui->post['what'],':admin_id' => $admin_id,':reseller_id' => $reseller_id)); } foreach ($pselect->fetchAll(PDO::FETCH_ASSOC) as $row) { - $display=$sprache->server." ".$row['cname'].'-'.$ui->post['what']; + $display=$sprache->server . ' ' . $row['cname'].'-'.$ui->post['what']; } if ($reseller_id==0) { $pselect=$sql->prepare("SELECT c.`id`,u.`cname` FROM `virtualcontainer` c LEFT JOIN `userdata` u ON c.`userid`=u.`id` ORDER BY u.`id`,c.`id`"); @@ -262,7 +262,7 @@ if ($d=='se' and $reseller_id==0) { $kind="ip"; if (isip($ui->post['what'],'all')) { $whichdata="&ip=".$ui->post['what']; - $display=$sprache->ip." ".$ui->post['what']; + $display=$sprache->ip . ' ' . $ui->post['what']; } if ($reseller_id==0) { $pselect=$sql->prepare("SELECT `ips` FROM `resellerdata`"); diff --git a/web/stuff/userpanel_ao.php b/web/stuff/userpanel_ao.php index ab529890..2f5aa5e9 100644 --- a/web/stuff/userpanel_ao.php +++ b/web/stuff/userpanel_ao.php @@ -104,9 +104,9 @@ if ($ui->id('id',10,'get') and $ui->id('adid',10,'get') and in_array($ui->smalll $customer=$customer.'-'.$gameserverid; } if ($protected=="N") { - $serverfolder=$customer.'/server/'.$serverip.'_'.$port.'/'. $shorten; + $serverfolder=$customer.'/server/'.$serverip.'_'.$port. '/'. $shorten; } else { - $serverfolder=$customer.'/pserver/'.$serverip.'_'.$port.'/'. $shorten; + $serverfolder=$customer . '/pserver/' . $serverip.'_'.$port. '/'. $shorten; $ftppass=$ppassword; $customer=$customer."-p"; } diff --git a/web/stuff/userpanel_backup.php b/web/stuff/userpanel_backup.php index e7aa5da0..6cf58cf5 100644 --- a/web/stuff/userpanel_backup.php +++ b/web/stuff/userpanel_backup.php @@ -78,7 +78,7 @@ if ($ui->id('id',10,'get') and (!isset($_SESSION['sID']) or in_array($ui->id('id else $shortens=$row['shorten']; } $webhostdomain=webhostdomain($reseller_id); - $template_file=(ssh2_execute('gs',$rootid,"sudo -u $customer ./control.sh backup $gsfolder \"$shortens\" \"$webhostdomain\" \"$ftpbackup\"")===false) ? "Error: ".$ssh_reply: $template_file=$gsprache->backup." ".$sprache->create; + $template_file=(ssh2_execute('gs',$rootid,"sudo -u $customer ./control.sh backup $gsfolder \"$shortens\" \"$webhostdomain\" \"$ftpbackup\"")===false) ? "Error: ".$ssh_reply: $template_file=$gsprache->backup . ' ' . $sprache->create; } else if ($ui->w('action',3,'post')=='md'){ $template_file="userpanel_gserver_backup_md.tpl"; } else if ($ui->w('action',3,'post')=='md2') { @@ -111,7 +111,7 @@ if ($ui->id('id',10,'get') and (!isset($_SESSION['sID']) or in_array($ui->id('id $i++; } $webhostdomain=(isset($ui->server['HTTPS'])) ? "https://".$ui->server['HTTP_HOST'].$path : $webhostdomain="http://".$ui->server['HTTP_HOST'].$path; - $template_file=(ssh2_execute('gs',$rootid,"sudo -u $customer ./control.sh restore $gsfolder \"".$ui->gamestring('template','post')."\" \"$webhostdomain\" \"$ftpbackup\"")===false) ? "Error: ".$ssh_reply: $template_file=$gsprache->backup." ".$sprache->recover; + $template_file=(ssh2_execute('gs',$rootid,"sudo -u $customer ./control.sh restore $gsfolder \"".$ui->gamestring('template','post')."\" \"$webhostdomain\" \"$ftpbackup\"")===false) ? "Error: ".$ssh_reply: $template_file=$gsprache->backup . ' ' . $sprache->recover; } else { $template_file='userpanel_404.tpl'; } diff --git a/web/stuff/userpanel_gserver.php b/web/stuff/userpanel_gserver.php index e591ec2b..d5602dd8 100644 --- a/web/stuff/userpanel_gserver.php +++ b/web/stuff/userpanel_gserver.php @@ -599,7 +599,7 @@ if ($ui->w('action',4,'post') and !token(true)) { $split_config=preg_split('/\//', $config, -1, PREG_SPLIT_NO_EMPTY); $folderfilecount=count($split_config)-1; $i=0; - $folders=$pserver.$serverip.'_'.$port.'/'. $ftpshorten; + $folders=$pserver.$serverip.'_'.$port. '/'. $ftpshorten; while ($i<$folderfilecount) { $folders .="/".$split_config[$i]; $i++; @@ -607,7 +607,7 @@ if ($ui->w('action',4,'post') and !token(true)) { $uploadfile=$split_config[$i]; ftp_chdir($ftp_connect,$folders); $checkupload=@ftp_fput($ftp_connect,$uploadfile,$temp,FTP_ASCII); - $template_file=($checkupload) ? $sprache->updated." ".$uploadfile : $sprache->failed." ".$folders.'/'. $uploadfile; + $template_file=($checkupload) ? $sprache->updated . ' ' . $uploadfile : $sprache->failed . ' ' . $folders. '/'. $uploadfile; } else { $template_file='Error: Logindata'; } diff --git a/web/stuff/userpanel_migration.php b/web/stuff/userpanel_migration.php index da6c5114..f1acd1a1 100644 --- a/web/stuff/userpanel_migration.php +++ b/web/stuff/userpanel_migration.php @@ -82,7 +82,7 @@ foreach ($query->fetchAll(PDO::FETCH_ASSOC) as $row) { if ($row2['gamebinary']=='hlds_run' or ($row2['gamebinary']=='srcds_run' and ($row2['appID']==740 or $row2['appID']==730))) { $search='/'. $row2['modfolder']; } else if ($row2['gamebinary']=='srcds_run' and $row2['appID']!=740 and $row2['appID']!=730) { - $search='/'. $row2['binarydir'].'/'. $row2['modfolder']; + $search='/'. $row2['binarydir']. '/'. $row2['modfolder']; } $temp[$row2['shorten']]=array('shorten'=>$row2['shorten'],'description'=>$row2['description'],'searchFor'=>$search,'modfolder'=>$row2['modfolder']); } @@ -214,7 +214,7 @@ if ($ui->w('action',4,'post') and !token(true)) { } else { $ftpConnect='ftps://'; } - $ftpConnect.=str_replace('//','/',$ftpAddress.':'.$ftpPort.'/'. $ftpPath); + $ftpConnect.=str_replace('//','/',$ftpAddress.':'.$ftpPort. '/'. $ftpPath); ssh2_execute('gs',$rootID,"sudo -u ${customer} ./control.sh migrateserver ${customer} 1_${shorten} ${gsfolder} ${template} ${ftpUser} ${ftpPassword} ${ftpConnect} ${modFolder}"); $loguseraction="%import% %gserver% ${address}"; $template_file=$sprache->import_start; diff --git a/web/stuff/userpanel_voice.php b/web/stuff/userpanel_voice.php index d426ebbe..030c675c 100644 --- a/web/stuff/userpanel_voice.php +++ b/web/stuff/userpanel_voice.php @@ -647,7 +647,7 @@ if ($ui->st('d','get')=='bu' and $ui->id('id',10,'get') and (!isset($_SESSION['s } else if ($row['flexSlots']=='Y') { $flexSlots=$row['flexSlotsCurrent'].'/'; } - $usage=$usedSlots.'/'. $flexSlots.$row['slots']; + $usage=$usedSlots. '/'. $flexSlots.$row['slots']; if ($row['uptime']==0) { $imgName='16_error'; $imgAlt='error'; diff --git a/web/stuff/versioncheck.php b/web/stuff/versioncheck.php index 58f0c759..206d6487 100644 --- a/web/stuff/versioncheck.php +++ b/web/stuff/versioncheck.php @@ -73,10 +73,10 @@ if ($ui->st('d','get')=='ud' and $reseller_id==0 and $pa['updateEW'] and ($ewVer if (is_dir($dir)) { $dircontent=scandir($dir); foreach ($dircontent as $c) { - if ($c!='.' and $c!='..' and is_dir($dir.'/'. $c)) { - rmr($dir.'/'. $c); + if ($c!='.' and $c!='..' and is_dir($dir. '/'. $c)) { + rmr($dir. '/'. $c); } else if ($c!='.' and $c!='..') { - unlink($dir.'/'. $c); + unlink($dir. '/'. $c); } } rmdir($dir); diff --git a/web/stuff/voice.php b/web/stuff/voice.php index 184a5c4a..2ee41126 100644 --- a/web/stuff/voice.php +++ b/web/stuff/voice.php @@ -745,7 +745,7 @@ if ($ui->st('d','get')=='ad' and is_numeric($licenceDetails['lVo']) and $licence $flexSlots=''; if ($row['flexSlots']=='Y' and $row['flexSlotsCurrent']==null) $flexSlots=$row['slots'].'/'; else if ($row['flexSlots']=='Y') $flexSlots=$row['flexSlotsCurrent'].'/'; - $usage=$usedSlots.'/'. $flexSlots.$row['slots']; + $usage=$usedSlots. '/'. $flexSlots.$row['slots']; $days=floor($row['uptime']/86400); $hours=floor(($row['uptime']-($days*86400))/3600); $minutes=floor(($row['uptime']-($days*86400)-($hours*3600))/60); diff --git a/web/stuff/voice_usage.php b/web/stuff/voice_usage.php index d3e42a95..9055ccbf 100644 --- a/web/stuff/voice_usage.php +++ b/web/stuff/voice_usage.php @@ -117,7 +117,7 @@ if ($ui->w('action',4,'post') and !token(true)) { $pselect=$sql->prepare("SELECT `cname` FROM `userdata` WHERE `accounttype`='r' AND `id`=? AND `resellerid`=? LIMIT 1"); $pselect->execute(array($ui->post['what'],$reseller_id)); foreach ($pselect->fetchall(PDO::FETCH_ASSOC) as $row) { - $display=$extra." ".$row['cname']; + $display=$extra . ' ' . $row['cname']; } } else if (isid($ui->post['what'],'30') and $ui->st('kind','post')=="se") { $kind='se'; @@ -125,7 +125,7 @@ if ($ui->w('action',4,'post') and !token(true)) { $pselect=$sql->prepare("SELECT v.`id`,v.`ip`,v.`port`,v.`dns`,m.`usedns` FROM `voice_server` v INNER JOIN `voice_masterserver` m ON v.`masterserver`=m.`id` WHERE v.`id`=? AND v.`resellerid`=? LIMIT 1"); $pselect->execute(array($ui->post['what'],$reseller_id)); foreach ($pselect->fetchall(PDO::FETCH_ASSOC) as $row) { - $display=$sprache->server." ".$row['ip'].':'.$row['port']; + $display=$sprache->server . ' ' . $row['ip'].':'.$row['port']; } $pselect=$sql->prepare("SELECT v.`id`,v.`ip`,v.`port`,v.`dns`,m.`usedns` FROM `voice_server` v INNER JOIN `voice_masterserver` m ON v.`masterserver`=m.`id` WHERE v.`resellerid`=? ORDER BY v.`ip`,v.`port`"); $pselect->execute(array($reseller_id)); @@ -143,7 +143,7 @@ if ($ui->w('action',4,'post') and !token(true)) { $pselect=$sql->prepare("SELECT `ssh2ip` FROM `voice_masterserver` WHERE `id`=? AND `resellerid`=? LIMIT 1"); $pselect->execute(array($ui->post['what'],$reseller_id)); foreach ($pselect->fetchall(PDO::FETCH_ASSOC) as $row) { - $display=$sprache->server." ".$row['ssh2ip']; + $display=$sprache->server . ' ' . $row['ssh2ip']; } $pselect=$sql->prepare("SELECT `id`,`ssh2ip` FROM `voice_masterserver` WHERE `resellerid`=? ORDER BY `ssh2ip`"); $pselect->execute(array($reseller_id)); diff --git a/web/trafficdata.php b/web/trafficdata.php index 950b002d..8f2b7207 100644 --- a/web/trafficdata.php +++ b/web/trafficdata.php @@ -151,7 +151,7 @@ if (!isset($remoteip) or $_SERVER['SERVER_ADDR']==$remoteip) { $stamp_updated=$row[$column_date]; $date=explode(' ',$row[$column_date]); $hour=explode(':',$date[1]); - $day=$date[0]." ".$hour[0].":00:00"; + $day=$date[0] . ' ' . $hour[0].":00:00"; if (searchinnerarray($ip_src,$vserverips) or searchinnerarray($ip_dst,$vserverips)) { if (searchinnerarray($ip_src,$vserverips)) { $direction="out";