andre 4 vuotta sitten
vanhempi
commit
ae9983fb3e
2 muutettua tiedostoa jossa 177 lisäystä ja 155 poistoa
  1. 140 135
      clientarea.tpl
  2. 37 20
      seafile.php

+ 140 - 135
clientarea.tpl

@@ -21,7 +21,7 @@
   {/if}
 {/if}
 {if $pendingcancellation}
-    {include file="$template/includes/alert.tpl" type="error" msg=$LANG.cancellationrequestedexplanation textcenter=true idname="alertPendingCancellation"}
+  {include file="$template/includes/alert.tpl" type="error" msg=$LANG.cancellationrequestedexplanation textcenter=true idname="alertPendingCancellation"}
 {/if}
 {if $unpaidInvoice}
   <div class="alert alert-{if $unpaidInvoiceOverdue}danger{else}warning{/if}" id="alert{if $unpaidInvoiceOverdue}Overdue{else}Unpaid{/if}Invoice">
@@ -53,7 +53,7 @@
                       {/if}
                     </div>
                   </div>
-                  <h4><small>SeaFile Account:</small> {$mailaddress}</h4>
+                  <h4><small>SeaFile Account:</small> {$user}</h4>
                   <div class="status-sticker-wrapper">
                     <div class="status-sticker product-status-{$rawstatus|strtolower}">
                       {$status}
@@ -66,62 +66,64 @@
               <div class="product-info" style="min-height: unset; height:210px;">
                 <table width="100%" border="0">
             	    <tr>
-            		<td class="list-heading" style="font-size: 85%;">{$LANG.clientareahostingregdate}</td>
-            		<td class="list-text"  style="font-size: 85%;">{$regdate}</td>
-            	    </tr>
-            	    {if $billingcycle != 'Gratis-Account'}
-            		<tr>
-            		    <td class="list-heading" style="font-size: 85%;">{$LANG.firstpaymentamount}</td>
-            		    <td class="list-text"  style="font-size: 85%;">{$firstpaymentamount}</td>
-            		</tr>
-            		<tr>
-            		    <td class="list-heading" style="font-size: 85%;">{$LANG.recurringamount}</td>
-            		    <td class="list-text"  style="font-size: 85%;">{$recurringamount}</td>
-            		</tr>
-            		<tr>
-            		    <td class="list-heading" style="font-size: 85%;">{$LANG.orderbillingcycle}</td>
-            		    <td class="list-text"  style="font-size: 85%;">{$billingcycle}</td>
-            		</tr>
-			<tr>
-			    <td class="list-heading" style="font-size: 85%;">{$LANG.clientareahostingnextduedate}</td>
-			    <td class="list-text"  style="font-size: 85%;">{$nextduedate}</td>
-			</tr>
-			<tr>
-			    <td class="list-heading" style="font-size: 85%;">{$LANG.orderpaymentmethod}</td>
-			    <td class="list-text"  style="font-size: 85%;">{$paymentmethod}</td>
-			</tr>
+                    <td class="list-heading" style="font-size: 85%;">{$LANG.clientareahostingregdate}</td>
+                    <td class="list-text"  style="font-size: 85%;">{$regdate}</td>
+                  </tr>
+                  {if $billingcycle != 'Gratis-Account'}
+                    <tr>
+                      <td class="list-heading" style="font-size: 85%;">{$LANG.firstpaymentamount}</td>
+                      <td class="list-text"  style="font-size: 85%;">{$firstpaymentamount}</td>
+                    </tr>
+                    <tr>
+                      <td class="list-heading" style="font-size: 85%;">{$LANG.recurringamount}</td>
+                      <td class="list-text"  style="font-size: 85%;">{$recurringamount}</td>
+                    </tr>
+                    <tr>
+                      <td class="list-heading" style="font-size: 85%;">{$LANG.orderbillingcycle}</td>
+                      <td class="list-text"  style="font-size: 85%;">{$billingcycle}</td>
+                    </tr>
+                    <tr>
+                      <td class="list-heading" style="font-size: 85%;">{$LANG.clientareahostingnextduedate}</td>
+                      <td class="list-text"  style="font-size: 85%;">{$nextduedate}</td>
+                    </tr>
+                    <tr>
+                      <td class="list-heading" style="font-size: 85%;">{$LANG.orderpaymentmethod}</td>
+                      <td class="list-text"  style="font-size: 85%;">{$paymentmethod}</td>
+                    </tr>
                   {else}
-                	<tr>
-                	    <td class="list-heading" style="font-size:85%"><strong>Trial Account</strong></td>
-                            {if $status == "Beendet"}
-                              <td class="list-text" style="font-size:85%;">
-                                Abgelaufen seit {((($smarty.now - ($regdate|@strtotime)) / 86400)|round) - 14} Tagen
-                              </td>
-                            {elseif ($smarty.now - ($regdate|@strtotime)) > 1123200} {* wenn Heute - RegisterDatum > 13 Tage *}
-                              <td class="list-text" style="color:red;font-size:85%;">
-                                <span class="w-hidden">{$normalisedNextDueDate}</span>
-                                Letzter Tag der Trial Periode
-                              </td>
-                            {elseif ($smarty.now - ($regdate|@strtotime)) > 950400} {* wenn Heute - RegisterDatum > 11 Tage *}
-                              <td class="list-text" style="color:orange;font-size:85%;">
-                                <span class="w-hidden">{$normalisedNextDueDate}</span>
-                                Endet in {(14 - (($smarty.now - ($regdate|@strtotime)) / 86400)|round)} Tagen
-                              </td>
-                            {else}
-                              <td class="list-text" style="font-size:85%;">
-                                Endet in {(14 - (($smarty.now - ($regdate|@strtotime)) / 86400)|round)} Tagen
-                              </td>
-                            {/if}
-            		</tr>
-            		<tr>
+                  	<tr>
+                      <td class="list-heading" style="font-size:85%">
+                        <strong>Trial Account</strong>
+                      </td>
+                      {if $status == "Beendet"}
+                        <td class="list-text" style="font-size:85%;">
+                          Abgelaufen seit {((($smarty.now - ($regdate|@strtotime)) / 86400)|round) - 14} Tagen
+                        </td>
+                      {elseif ($smarty.now - ($regdate|@strtotime)) > 1123200} {* wenn Heute - RegisterDatum > 13 Tage *}
+                        <td class="list-text" style="color:red;font-size:85%;">
+                          <span class="w-hidden">{$normalisedNextDueDate}</span>
+                          Letzter Tag der Trial Periode
+                        </td>
+                      {elseif ($smarty.now - ($regdate|@strtotime)) > 950400} {* wenn Heute - RegisterDatum > 11 Tage *}
+                        <td class="list-text" style="color:orange;font-size:85%;">
+                          <span class="w-hidden">{$normalisedNextDueDate}</span>
+                          Endet in {(14 - (($smarty.now - ($regdate|@strtotime)) / 86400)|round)} Tagen
+                        </td>
+                      {else}
+                        <td class="list-text" style="font-size:85%;">
+                          Endet in {(14 - (($smarty.now - ($regdate|@strtotime)) / 86400)|round)} Tagen
+                        </td>
+                      {/if}
+                  	</tr>
+                		<tr>
                 	    <td colspan="2"><br /><br /></td>
-                	</tr>
-            		<tr>
-            		    <td></td>
-            		    <td><a href="/upgrade.php?type=package&id={$id}" class="btn btn-block btn-primary">Jetzt upgraden</a></td>
-            		</tr>
+                	  </tr>
+            		    <tr>
+                      <td></td>
+                      <td><a href="/upgrade.php?type=package&id={$id}" class="btn btn-block btn-primary">Jetzt upgraden</a></td>
+            		    </tr>
                   {/if}
-		</table> 
+            		</table> 
               </div>
             </div>
           </div>
@@ -174,7 +176,7 @@
                   {/if}
                   {if $customfields}
                     <li class="nav-item">
-                      <a href="#additionalinfo" data-toggle="tab" class="nav-link{if !$moduleclientarea && !$metricStats && !$configurableoptions} active{/if}"><i class="fas fa-info fa-fw"></i>Zugangsdaten</a>
+                      <a href="#additionalinfo" data-toggle="tab" class="nav-link{if !$moduleclientarea && !$metricStats && !$configurableoptions} active{/if}"><i class="fas fa-info fa-fw"></i>Informationen</a>
                     </li>
                   {/if}
                   {if $lastupdate}
@@ -232,14 +234,15 @@
                           <th width="50%"></th>
                           <th width="50%"></th>
                         </tr>
+                        {if $moduleParams.configoption3 == 'on'}
                         <tr>
-                          <td align='center'>Seafile URL</td>
-                          <td align="center"><a href="{$webmailurl}" target="_blank">{$webmailurl}</a></td>
+                          <td align='right'>Seafile URL: </td>
+                          <td align="left"><a href="{$moduleParams.configoption4}" target="_blank"> {$moduleParams.configoption4}</a></td>
                         </tr>
-                        {if $moduleParams.configoption3 == 'on'}
+                        {else}
                         <tr>
-                          <td align='center'>Seafile URL</td>
-                          <td align="center"><a href="{$moduleParams.configoption4}" target="_blank">{$moduleParams.configoption4}</a></td>
+                          <br>
+                          <td colspan="2" align='left'><strong>Seafile URL:&nbsp;<a href="{$url}" target="_blank">{$url}</a></strong></td>
                         </tr>
                         {/if}
                         <tr>
@@ -249,12 +252,12 @@
                             <br />
                           </td>
                         <tr>
-                          <td colspan=2 align='center'>
+                          <td colspan=2 align='left'>
                             <h6 class="heading">Integrieren Sie Seafile auf Ihr Mobiltelefon oder Ihren PC</h6>
                           </td>
                         </tr>
                         <tr>
-                          <td colspan=2 align='center'>
+                          <td colspan=2 align='left'>
                             <h6 class="heading">Als Benutzernamen verwenden Sie immer Ihren Seafile Account</h6>
                           </td>
                         </tr>
@@ -267,18 +270,18 @@
                         </tr>
                         <tr>
                           <td align='center'>
-                        	<strong>Windows Drive Client</strong><br />
-                        	Zugriff auf die Daten über ein<br />
-                        	eingebundenes Netzlaufwerk.<br />
-                        	<br />
-                                <a href="https://s3.eu-central-1.amazonaws.com/download.seadrive.org/seadrive-2.0.5-en.msi" target="_blank"><img src="modules/servers/seafile/seadrive-win.png" /><a/>
+                            <strong>Windows Drive Client</strong><br />
+                            Zugriff auf die Daten über ein<br />
+                            eingebundenes Netzlaufwerk.<br />
+                            <br />
+                            <a href="{$drivewin}" target="_blank"><img src="modules/servers/seafile/seadrive-win.png" /></a>
                           </td>
                           <td align="center">
-                        	<strong>Windows Client</strong><br />
-                        	Synchronisierung Ihrer Dateien mit Seafile<br />
-                        	Mehrere Konten auf veschiedenen Servern<br />
-                        	<br />
-                                <a href="https://s3.eu-central-1.amazonaws.com/download.seadrive.org/seafile-7.0.9-en.msi" target="_blank"><img src="modules/servers/seafile/windows.png" /><a/>
+                            <strong>Windows Client</strong><br />
+                            Synchronisierung Ihrer Dateien mit Seafile<br />
+                            Mehrere Konten auf veschiedenen Servern<br />
+                            <br />
+                            <a href="{$winclient}" target="_blank"><img src="modules/servers/seafile/windows.png" /></a>
                           </td>
                         </tr>
                           <td colspan=2 align='left'>
@@ -289,19 +292,19 @@
                         </tr>
                         <tr>
                           <td align='center'>
-                        	<strong>Apple Drive Client</strong><br />
-                        	Zugriff auf Ihre Daten über eine im Finder
-                        	direkt eingebundene Freigabe.
-                        	Mehrere Konten auf veschiedenen Servern<br />
-                        	<br />
-                                <a href="https://s3.eu-central-1.amazonaws.com/download.seadrive.org/seadrive-2.0.5.dmg" target="_blank"><img src="modules/servers/seafile/apple.png" /><a/>
+                            <strong>Apple Drive Client</strong><br />
+                            Zugriff auf Ihre Daten über eine im Finder
+                            direkt eingebundene Freigabe.
+                            Mehrere Konten auf veschiedenen Servern<br />
+                            <br />
+                            <a href="{$drivemac}" target="_blank"><img src="modules/servers/seafile/apple.png" /></a>
                           </td>
                           <td align="center">
-                                <strong>Apple Client</strong><br />
-                                Zugriff auf die Dateien via <br />
-                                Desktop Applikation<br />
-                                <br />
-                                <a href="https://s3.eu-central-1.amazonaws.com/download.seadrive.org/seafile-client-7.0.9.dmg" target="_blank"><img src="modules/servers/seafile/apple.png" /><a/>
+                            <strong>Apple Client</strong><br />
+                            Zugriff auf die Dateien via <br />
+                            Desktop Applikation<br />
+                            <br />
+                            <a href="{$macclient}" target="_blank"><img src="modules/servers/seafile/apple.png" /></a>
                           </td>
                         </tr>
                           <td colspan=2 align='left'>
@@ -312,22 +315,22 @@
                         </tr>
                         <tr>
                           <td align='center'>
-                        	<strong>App für Android</strong><br />
-                        	Mit dem Seafile-Client für Android<br />
-                        	können Sie Ihre Dateien über eine <br />
-                        	verschlüsselte Verbindung völlig <br />
-                        	sicher synchronisieren, bearbeiten und teilen.<br />
-                        	<br />
-                                <a href="https://play.google.com/store/apps/details?id=com.seafile.seadroid2" target="_blank"><img src="modules/servers/seafile/google_play.png" /><a/>
+                            <strong>App für Android</strong><br />
+                            Mit dem Seafile-Client für Android<br />
+                            können Sie Ihre Dateien über eine <br />
+                            verschlüsselte Verbindung völlig <br />
+                            sicher synchronisieren, bearbeiten und teilen.<br />
+                            <br />
+                            <a href="{$mobile2}" target="_blank"><img src="modules/servers/seafile/google_play.png" /></a>
                           </td>
                           <td align="center">
-                        	<strong>App für iPhone</strong><br />
-                        	Mit dem Seafile-Client für iPhone<br />
-                        	können Sie Ihre Dateien über eine <br />
-                        	verschlüsselte Verbindung völlig <br />
-                        	sicher synchronisieren, bearbeiten und teilen.<br />
-                        	<br />
-                        	<a href="https://itunes.apple.com/cn/app/seafile-pro/id639202512?l=en&mt=8" target="_blank"><img src="modules/servers/seafile/apple_store.png" /><a/>
+                            <strong>App für iPhone</strong><br />
+                            Mit dem Seafile-Client für iPhone<br />
+                            können Sie Ihre Dateien über eine <br />
+                            verschlüsselte Verbindung völlig <br />
+                            sicher synchronisieren, bearbeiten und teilen.<br />
+                            <br />
+                          	<a href="{$mobile1}" target="_blank"><img src="modules/servers/seafile/apple_store.png" /></a>
                           </td>
                         </tr>
                       </table>
@@ -356,7 +359,9 @@
                         });
                       </script>
                       <div class="col-xs-{if $showcancelbutton}6{else}12{/if}">
-                        <a href="upgrade.php?type=configoptions&amp;id={$id}" class="btn btn-block btn-primary">Weiteren Speicher hinzubuchen</a>
+                        {if $billingcycle != 'Gratis-Account'}
+                          <a href="upgrade.php?type=configoptions&amp;id={$id}" class="btn btn-block btn-primary">Weiteren Speicher hinzubuchen</a>
+                        {/if}
                       </div>
                     </div>
                   {/if}
@@ -386,48 +391,48 @@
     {/if}
   </div>
   <div class="tab-pane fade in" id="tabChangepw">
-  <div class="section">
-    <div class="section-header">
-      <h3>{$LANG.serverchangepassword}</h3>
-      <p class="desc">Hier können Sie Ihr Passwort für {$mailaddress} ändern</p>
-    </div>
-    <div class="section-body">
-      <div class="row">
-        <div class="col-sm-7">
-          <form class=" using-password-strength" method="post" action="{$smarty.server.PHP_SELF}?action=productdetails&id={$id}" role="form">
-            <input type="hidden" name="id" value="{$id}" />
-            <input type="hidden" name="modulechangepassword" value="true" />
-            <div class="TM-card">
-              <div id="newPassword1" class="form-group has-feedback">
-                <label for="inputNewPassword1" class="control-label">{$LANG.newpassword}</label>
-                <input type="password" class="form-control" id="inputNewPassword1" name="newpw" autocomplete="off" />
-                <span class="form-control-feedback glyphicon"></span>
-                {include file="$template/thurdata/thurpwcheck.tpl"}
-              </div>
-              <div class="alert alert-info">
+    <div class="section">
+      <div class="section-header">
+        <h3>{$LANG.serverchangepassword}</h3>
+        <p class="desc">Hier können Sie Ihr Passwort für {$mailaddress} ändern</p>
+      </div>
+      <div class="section-body">
+        <div class="row">
+          <div class="col-sm-7">
+            <form class=" using-password-strength" method="post" action="{$smarty.server.PHP_SELF}?action=productdetails&id={$id}" role="form">
+              <input type="hidden" name="id" value="{$id}" />
+              <input type="hidden" name="modulechangepassword" value="true" />
+              <div class="TM-card">
+                <div id="newPassword1" class="form-group has-feedback">
+                  <label for="inputNewPassword1" class="control-label">{$LANG.newpassword}</label>
+                  <input type="password" class="form-control" id="inputNewPassword1" name="newpw" autocomplete="off" />
+                  <span class="form-control-feedback glyphicon"></span>
+                  {include file="$template/thurdata/thurpwcheck.tpl"}
+                </div>
+                <div class="alert alert-info">
                   <div id='hints'>
-                      <strong id='hint2Head'></strong>
-                      <div id='hintLength'></div>
-                      <div id='hintNumeric'></div>
-                      <div id='hintSymbols'></div>
-                      <div id='hintUpperLower'></div>
+                    <strong id='hint2Head'></strong>
+                    <div id='hintLength'></div>
+                    <div id='hintNumeric'></div>
+                    <div id='hintSymbols'></div>
+                    <div id='hintUpperLower'></div>
+                  </div>
+                </div>
+                <div id="newPassword2" class="form-group has-feedback">
+                  <label for="inputNewPassword2" class="control-label">{$LANG.confirmnewpassword}</label>
+                  <input type="password" class="form-control" id="inputNewPassword2" name="confirmpw" autocomplete="off" />
+                  <span class="form-control-feedback glyphicon"></span>
+                  <div id="inputNewPassword2Msg">
                   </div>
-              </div>
-              <div id="newPassword2" class="form-group has-feedback">
-                <label for="inputNewPassword2" class="control-label">{$LANG.confirmnewpassword}</label>
-                <input type="password" class="form-control" id="inputNewPassword2" name="confirmpw" autocomplete="off" />
-                <span class="form-control-feedback glyphicon"></span>
-                <div id="inputNewPassword2Msg">
                 </div>
               </div>
-            </div>
-            <div class="form-actions">
-              <input class="btn btn-primary" type="submit" value="{$LANG.clientareasavechanges}" />
-            </div>
-          </form>
+              <div class="form-actions">
+                <input class="btn btn-primary" type="submit" value="{$LANG.clientareasavechanges}" />
+              </div>
+            </form>
+          </div>
         </div>
       </div>
     </div>
   </div>
-  </div>
 </div>

+ 37 - 20
seafile.php

@@ -188,26 +188,43 @@ function seafile_ClientArea($params) {
 			$seafileURL = $params['serverhttpprefix'] . '://' . $params['serverhostname'] . ':' . $params['serverport'];
 			break;
 	};
-        $clientInfo['basequota']        = $params['configoption1'] ? $params['configoption1'] : 1;
-        $clientInfo['addonquota']       = $params['configoptions']['addonQuota'] ? $params['configoptions']['addonQuota'] : 0;
-        $clientInfo['userquota']        = $clientInfo['basequota'] + $clientInfo['addonquota'];
-        $clientInfo['mailaddress']      = $params['username'];
-        $clientInfo['webmailurl']       = $seafileURL;
-        $clientInfo['zimbraserver']     = parse_url($clientInfo['webmailurl'], PHP_URL_HOST);
-        $clientinfo['url']              = $seafileURL;
-        $clientinfo['user']             = $user;
-        $clientinfo['mobile1']          = $app;
-        $clientinfo['mobile2']          = $google;
-        $clientinfo['winclient']        = $winClient;
-        $clientinfo['macclient']        = $macClient;
-        $clientinfo['linClient']        = $linClient;
-        $clientinfo['stitle']           = $params['model']['product']['name'];
-
-
-        return array(
-            'tabOverviewReplacementTemplate' => 'clientarea',
-            'vars' => $clientInfo,
-        );
+	$app = 'https://itunes.apple.com/cn/app/seafile-pro/id639202512?l=en&mt=8';
+	$google = 'https://play.google.com/store/apps/details?id=com.seafile.seadroid2';
+	$driveWin = 'https://s3.eu-central-1.amazonaws.com/download.seadrive.org/seadrive-2.0.5-en.msi';
+	$winClient = 'https://s3.eu-central-1.amazonaws.com/download.seadrive.org/seafile-7.0.9-en.msi';
+	$macClient = 'https://s3.eu-central-1.amazonaws.com/download.seadrive.org/seafile-client-7.0.9.dmg';
+	$driveMac = 'https://s3.eu-central-1.amazonaws.com/download.seadrive.org/seadrive-2.0.5.dmg';
+	$linClient = 'https://download.seafile.com/published/seafile-user-manual/syncing_client/install_linux_client.md';
+	$clientInfo['basequota']        = $params['configoption1'] ? $params['configoption1'] : 1;
+	$clientInfo['addonquota']       = $params['configoptions']['addonQuota'] ? $params['configoptions']['addonQuota'] : 0;
+	$clientInfo['userquota']        = $clientInfo['basequota'] + $clientInfo['addonquota'];
+	$clientInfo['mailaddress']      = $params['username'];
+	$clientinfo['stitle']           = $params['model']['product']['name'];
+    $langObj = Capsule::table('tblconfiguration')
+        ->select('value')
+        ->where('setting', '=', 'Language')
+        ->get();
+	$lla = $_SESSION['Language'] ? trim($_SESSION['Language']) : strtolower($langObj[0]->value);
+	$slang = array();
+	include_once dirname(__FILE__).'/lang/'.$lla.'.php';
+	return array(
+		'tabOverviewReplacementTemplate' => 'clientarea',
+		'vars' => array_merge(
+			array(
+				'url' => $seafileURL,
+				'user' => $user,
+				'mobile1' => $app,
+				'mobile2' => $google,
+				'drivewin' => $driveWin,
+				'winclient' => $winClient,
+				'macclient' => $macClient,
+				'drivemac' => $driveMac,
+				'linClient' => $linClient,
+			),
+			$slang,
+			$clientInfo
+		),
+	);
 }
 
 /**