Skip to content

Google workspace policy update #72

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Emrio wants to merge 4 commits into
base: xorg/maint
Choose a base branch
from
Open

Google workspace policy update #72

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d36ee6f
feat(googleapps): always show sensitive info warning
Emrio Apr 16, 2025
ec5a8b1
feat(googleapps): gdrive 100 Go limit
Emrio Apr 16, 2025
6c42684
feat(googleapps): rename to Google Workspace
Emrio Apr 17, 2025
72467cd
fix(googleapps): always show privacy warning
Emrio Apr 18, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion htdocs/javascript/xorg.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ function addSearchEngine()
title: 'Ajouter à Google Calendar'},
{url_prefix: 'https://www.google.com/calendar/hosted/polytechnique.org/render?cid=',
img: 'images/goodies/add-google-calendar.gif',
title: 'Ajouter à Google Apps / Calendar'}
title: 'Ajouter à Google Workspace / Calendar'}
]
},

Expand Down
2 changes: 1 addition & 1 deletion include/emails.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -476,7 +476,7 @@ class Email
// Shortname to realname mapping for known mail storage backends.
static private $display_names = array(
'imap' => 'Accès de secours aux emails (IMAP)',
'googleapps' => 'Compte Google Apps',
'googleapps' => 'Compte Google Workspace',
);
static private $storage_domains = array(
'imap' => 'imap',
Expand Down
2 changes: 1 addition & 1 deletion include/reminder/gapps.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ public function template()
}
public function title()
{
return "Création d'un compte Google Apps";
return "Création d'un compte Google Workspace";
}
public function info()
{
Expand Down
4 changes: 2 additions & 2 deletions include/validations/googleapps.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,13 +48,13 @@ public function formu()

public function _mail_subj()
{
return "[Polytechnique.org] Demande de réactivation de ton compte Google Apps";
return "[Polytechnique.org] Demande de réactivation de ton compte Google Workspace";
}

public function _mail_body($isok)
{
if (!$isok) {
return " La demande que tu avais faite de réactivation de compte Google Apps a été refusée.";
return " La demande que tu avais faite de réactivation de compte Google Workspace a été refusée.";
}
}

Expand Down
2 changes: 1 addition & 1 deletion include/validations/names.inc.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ public function _mail_body($isok)
require_once 'googleapps.inc.php';
$account = new GoogleAppsAccount($this->profileOwner);
if ($account->active()) {
$res .= "\n\n Si tu utilises Google Apps, tu peux changer ton nom d'usage sur https://mail.google.com/a/polytechnique.org/#settings/accounts.";
$res .= "\n\n Si tu utilises Google Workspace, tu peux changer ton nom d'usage sur https://mail.google.com/a/polytechnique.org/#settings/accounts.";
}
}
}
Expand Down
14 changes: 7 additions & 7 deletions modules/googleapps.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function handler_index($page, $action = null)
require_once 'emails.inc.php';
require_once 'googleapps.inc.php';
$page->changeTpl('googleapps/index.tpl');
$page->setTitle('Compte Google Apps');
$page->setTitle('Compte Google Workspace');

$user = S::user();
$account = new GoogleAppsAccount($user);
Expand Down Expand Up @@ -87,9 +87,9 @@ function handler_index($page, $action = null)
} else {
if (!$redirect_active || $redirect->modify_one_email($gapps_email, false) == SUCCESS) {
$account->suspend();
$page->trigSuccess("Ton compte Google Apps est dorénavant désactivé.");
$page->trigSuccess("Ton compte Google Workspace est dorénavant désactivé.");
} else {
$page->trigError("Ton compte Google Apps est ta seule adresse de redirection. Ton compte ne peux pas être désactivé.");
$page->trigError("Ton compte Google Workspace est ta seule adresse de redirection. Ton compte ne peux pas être désactivé.");
}
}
} elseif ($action == 'unsuspend' && Post::has('unsuspend') && $account->suspended()) {
Expand All @@ -113,7 +113,7 @@ function handler_index($page, $action = null)
}

$account->create($password_sync, $password, $redirect_mails);
$page->trigSuccess("La demande de création de ton compte Google Apps a bien été enregistrée.");
$page->trigSuccess("La demande de création de ton compte Google Workspace a bien été enregistrée.");
}
}

Expand All @@ -123,7 +123,7 @@ function handler_index($page, $action = null)
function handler_admin($page, $action = null) {
require_once 'googleapps.inc.php';
$page->changeTpl('googleapps/admin.tpl');
$page->setTitle('Administration Google Apps');
$page->setTitle('Administration Google Workspace');
$page->assign('googleapps_admin', GoogleAppsAccount::is_administrator(S::v('uid')));

if ($action == 'ack') {
Expand Down Expand Up @@ -169,7 +169,7 @@ function handler_admin($page, $action = null) {
function handler_admin_job($page, $job = null) {
require_once 'googleapps.inc.php';
$page->changeTpl('googleapps/admin.job.tpl');
$page->setTitle('Administration Google Apps');
$page->setTitle('Administration Google Workspace');
$page->assign('googleapps_admin', GoogleAppsAccount::is_administrator(S::v('uid')));

if ($job) {
Expand All @@ -189,7 +189,7 @@ function handler_admin_user($page, $user = null) {
require_once 'emails.inc.php';
require_once 'googleapps.inc.php';
$page->changeTpl('googleapps/admin.user.tpl');
$page->setTitle('Administration Google Apps');
$page->setTitle('Administration Google Workspace');
$page->assign('googleapps_admin', GoogleAppsAccount::is_administrator(S::v('uid')));

if (!$user && Post::has('login')) {
Expand Down
2 changes: 1 addition & 1 deletion templates/admin/index.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@
  |  
<a href="admin/account/watch">Administrateurs/Désactivations</a>
&nbsp;&nbsp;|&nbsp;&nbsp;
<a href="admin/googleapps">Google Apps</a>
<a href="admin/googleapps">Google Workspace</a>
</td>
</tr>
<tr class="impair">
Expand Down
4 changes: 2 additions & 2 deletions templates/emails/antispam.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
var id = $(this).attr('name').replace('filter_status_', '');
var redirection = $('#bogo_' + id).val();
$(':radio[name=filter_status]').removeAttr('checked');
$("#bogo-msg-mult").successMessage(url + $(this).val() + "/" + redirection, msg + redirection.replace('googleapps', 'ton compte Google Apps') + ".");
$("#bogo-msg-mult").successMessage(url + $(this).val() + "/" + redirection, msg + redirection.replace('googleapps', 'ton compte Google Workspace') + ".");
});
});
{/literal}
Expand Down Expand Up @@ -97,7 +97,7 @@
{foreach from=$redirections key=i item=redirection}
<tr>
<td class="titre">
{$redirection.redirect|replace:'googleapps':'Compte Google Apps'}
{$redirection.redirect|replace:'googleapps':'Compte Google Workspace'}
<input id="bogo_{$i}" type="hidden" value="{$redirection.redirect}" />
</td>
<td class="center">
Expand Down
12 changes: 6 additions & 6 deletions templates/emails/redirect.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@
<br />
<p id="googleapps">
Grâce à un partenariat avec Google, Polytechnique.org te propose également un compte
<b>Google Apps</b>, qui te permet de disposer des services Google (GMail pour
<b>Google Workspace</b> (ex <b>Google Apps</b>), qui te permet de disposer des services Google (Gmail pour
tes emails, Google Calendar, Google Docs&hellip;) sur une adresse polytechnique.org.
</p>

Expand All @@ -275,19 +275,19 @@
{if $googleapps eq 'active'}
<td>
<a href="googleapps">
<strong>Compte Google Apps / Polytechnique.org</strong>
<strong>Compte Google Workspace / Polytechnique.org</strong>
</a><br />Hébergé par Google
</td>
<td style="text-align: center; vertical-align: middle">
Ton compte Google Apps est actif.<br />
<a href="emails/redirect#line_googleapps">Voir l'état de la redirection vers GMail</a>
Ton compte Google Workspace est actif.<br />
<a href="emails/redirect#line_googleapps">Voir l'état de la redirection vers Gmail</a>
</td>
{else}
<td colspan="2">
{if $googleapps eq 'disabled'}
Ton compte Google Apps est actuellement inactif.<br />
Ton compte Google Workspace est actuellement inactif.<br />
{else}
Tu n'as pas encore de compte Google Apps pour Polytechnique.org.<br />
Tu n'as pas encore de compte Google Workspace pour Polytechnique.org.<br />
{/if}
<a href="googleapps">Plus d'informations &hellip;</a>
</td>
Expand Down
4 changes: 2 additions & 2 deletions templates/googleapps/admin.job.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
{* *}
{**************************************************************************}

<h1>Requête de la queue Google Apps</h1>
<h1>Requête de la queue Google Workspace</h1>

{if $job}
<table class="bicol">
Expand Down Expand Up @@ -81,6 +81,6 @@
<p><strong>Aucune requête n'a été trouvée.</strong></p>
{/if}

<p>Retourner à la <a href="admin/googleapps">page d'administration de Google Apps</a>.</p>
<p>Retourner à la <a href="admin/googleapps">page d'administration de Google Workspace</a>.</p>

{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *}
16 changes: 8 additions & 8 deletions templates/googleapps/admin.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<form method="post" action="admin/googleapps/user">
<table class="tinybicol" cellspacing="0" cellpadding="2">
<tr>
<th>Administrer un utilisateur (Google Apps)</th>
<th>Administrer un utilisateur (Google Workspace)</th>
</tr>
<tr>
<td class="center"><input type="text" name="login" size="40" maxlength="255" value="" /></td>
Expand All @@ -36,11 +36,11 @@
</table>
</form>

<h1>Queue de requêtes vers Google Apps</h1>
<h1>Queue de requêtes vers Google Workspace</h1>

<p>
Requête nécessitant <a href="Equipe/Infra-GoogleApps#admin-cli">l'intervention manuelle</a>
d'un administrateur Google Apps {if $googleapps_admin}(tu en es un){/if}&nbsp;:
d'un administrateur Google Workspace {if $googleapps_admin}(tu en es un){/if}&nbsp;:
</p>
<table class="bicol" style="text-align: center">
<tr>
Expand Down Expand Up @@ -85,21 +85,21 @@
{/iterate}
</table>

<h1>Statistiques d'utilisation de Google Apps</h1>
<h1>Statistiques d'utilisation de Google Workspace</h1>

<div style="text-align: center">
<img src="images/googleapps/activity-monthly.png" alt="Activité Google Apps - 1 mois" width="500" height="250" />
<br /><em>Utilisation des comptes Google Apps sur les 31 derniers jours</em>.
<img src="images/googleapps/activity-monthly.png" alt="Activité Google Workspace - 1 mois" width="500" height="250" />
<br /><em>Utilisation des comptes Google Workspace sur les 31 derniers jours</em>.
</div>

<div style="text-align: center">
<img src="images/googleapps/activity-yearly.png" alt="Activité Google Apps - 1 an" width="500" height="250" />
<img src="images/googleapps/activity-yearly.png" alt="Activité Google Workspace - 1 an" width="500" height="250" />
<br /><em>Utilisation disque des comptes sur les 12 derniers mois</em>.
</div>

<div style="text-align: center">
<img src="images/googleapps/usage-monthly.png" alt="Utilisation disque - 1 mois" width="500" height="250" />
<br /><em>Utilisation des comptes Google Apps sur les 31 derniers jours</em>.
<br /><em>Utilisation des comptes Google Workspace sur les 31 derniers jours</em>.
</div>

<div style="text-align: center">
Expand Down
8 changes: 4 additions & 4 deletions templates/googleapps/admin.user.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
{* *}
{**************************************************************************}

<h1>Compte Google Apps</h1>
<h1>Compte Google Workspace</h1>

{if $account && $account->provisioned()}
{assign var=a value=$account}
Expand All @@ -43,7 +43,7 @@
<td class="titre">Statut du compte</td>
<td>
<strong>{$a->g_status}</strong>
{if $admin_account}<br /><strong>Compte administrateur de Google Apps</strong>{/if}
{if $admin_account}<br /><strong>Compte administrateur de Google Workspace</strong>{/if}
</td>
</tr>
{if $a->suspended()}
Expand Down Expand Up @@ -142,11 +142,11 @@
{/iterate}
</table>
{elseif $account}
<p><strong>Cet utilisateur n'a pas de compte Google Apps.</strong></p>
<p><strong>Cet utilisateur n'a pas de compte Google Workspace.</strong></p>
{else}
<p><strong>Aucun utilisateur n'a été trouvé.</strong></p>
{/if}

<p>Retourner à la <a href="admin/googleapps">page d'administration de Google Apps</a>.</p>
<p>Retourner à la <a href="admin/googleapps">page d'administration de Google Workspace</a>.</p>

{* vim:set et sw=2 sts=2 sws=2 fenc=utf-8: *}
12 changes: 6 additions & 6 deletions templates/googleapps/create.mail.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,18 @@
{from full=#from#}
{to addr=$email}
{cc full=#cc#}
{subject text="[Polytechnique.org] Création de ton compte Google Apps"}
{subject text="[Polytechnique.org] Création de ton compte Google Workspace"}
{elseif $mail_part eq 'wiki'}
{if $sexe}Chère{else}Cher{/if} {$prenom},

Ton compte Google Apps pour Polytechnique.org vient d'être crée.
Ton compte Google Workspace pour Polytechnique.org vient d'être crée.

Tu peux accèder aux services offerts par Google Apps aux adresses suivantes:
* [[http://google.polytechnique.org/|iGoogle, le portail des services Google Apps]] ;
Tu peux accèder aux services offerts par Google Workspace aux adresses suivantes:
* [[http://google.polytechnique.org/|iGoogle, le portail des services Google Workspace]] ;
{if $account->activate_mail_redirection}
* [[https://mail.google.com/a/{$googleapps_domain}/|GMail, pour accéder à tes emails Polytechnique.org]] ;
* [[https://mail.google.com/a/{$googleapps_domain}/|Gmail, pour accéder à tes emails Polytechnique.org]] ;
{/if}
* [[https://www.polytechnique.org/googleapps|Polytechnique.org, pour modifier les préférences de ton compte Google Apps]].
* [[https://www.polytechnique.org/googleapps|Polytechnique.org, pour modifier les préférences de ton compte Google Workspace]].

Ton nom d'utilisateur pour ces services Google est '''{$account->g_account_name}'''
{if $account->sync_password}
Expand Down
Loading