Menu
▾
▴
xoops-svn
|
From: <luc...@us...> - 2013-05-28 19:19:28
|
Revision: 11603
http://sourceforge.net/p/xoops/svn/11603
Author: luciorota
Date: 2013-05-28 19:19:24 +0000 (Tue, 28 May 2013)
Log Message:
-----------
system module uses image.php instead of phpThumb.php to resize images and avatars
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/images/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_avatars.html
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_images.html
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/images/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/images/main.php 2013-05-28 19:11:00 UTC (rev 11602)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/images/main.php 2013-05-28 19:19:24 UTC (rev 11603)
@@ -309,11 +309,7 @@
$xoBreadCrumb->addLink( $image_cat->getVar('imgcat_name'), system_adminVersion('images', 'adminpath') . '&op=listimg&imgcat_id=' .$image->getVar('imgcat_id') );
$xoBreadCrumb->addLink( _AM_SYSTEM_IMAGES_EDITIMG );
$xoBreadCrumb->render();
- if ($image_cat->getVar('imgcat_storetype') == 'db') {
- $msg = '<div class="txtcenter"><img class="tooltip" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '" alt="' . $image->getVar('image_nicename') . '" title="' . $image->getVar('image_nicename') . '" style="max-width:120px; max-height:120px;"/></div>';
- } else {
- $msg = '<div class="txtcenter"><img src="./class/thumbs/phpThumb.php?src=' . XOOPS_UPLOAD_PATH . '/' . $image->getVar('image_name') . '&h=120" alt="" /></div>';
- }
+ $msg = '<div class="txtcenter"><img class="tooltip" src="' . XOOPS_URL . '/image.php?id=' . $image->getVar('image_id') . '&width=120&height=120" alt="' . $image->getVar('image_nicename') . '" title="' . $image->getVar('image_nicename') . '" style="max-width:120px; max-height:120px;"/></div>';
$xoopsTpl->assign('edit_thumbs', $msg );
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_avatars.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_avatars.html 2013-05-28 19:11:00 UTC (rev 11602)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_avatars.html 2013-05-28 19:19:24 UTC (rev 11603)
@@ -38,7 +38,7 @@
<div class="floatleft">
<div class="ui-corner-all xo-thumb txtcenter">
<div class="xo-thumbimg">
- <img class="tooltip" src="class/thumbs/phpThumb.php?src=<{$xoops_rootpath}>/uploads/<{$avatar.avatar_file}>&h=120&w=120" alt="<{$avatar.avatar_name}>" title="<{$avatar.avatar_name}>" />
+ <img class="tooltip" src="<{$xoops_url}>/image.php?src=<{$xoops_url}>/uploads/<{$avatar.avatar_file}>&height=120&width=120" alt="<{$avatar.avatar_name}>" title="<{$avatar.avatar_name}>" />
</div>
<div class="xo-actions txtcenter">
<div class="spacer bold"><{$avatar.avatar_name}></div>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_images.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_images.html 2013-05-28 19:11:00 UTC (rev 11602)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_images.html 2013-05-28 19:19:24 UTC (rev 11603)
@@ -77,11 +77,7 @@
<div class="floatleft">
<div class="ui-corner-all xo-thumb txtcenter">
<div class="xo-thumbimg">
- <{if !$db_store}>
- <img class="tooltip" src="class/thumbs/phpThumb.php?src=<{$xoops_rootpath}>/uploads/<{$img.image_name}>&h=120&w=120" alt="<{$img.image_nicename}>" title="<{$img.image_nicename}>" />
- <{else}>
- <img class="tooltip" src="<{$xoops_url}>/image.php?id=<{$img.image_id}>" alt="<{$img.image_nicename}>" title="<{$img.image_nicename}>" style="max-width:120px; max-height:120px;" />
- <{/if}>
+ <img class="tooltip" src="<{$xoops_url}>/image.php?id=<{$img.image_id}>&width=120&height=120" alt="<{$img.image_nicename}>" title="<{$img.image_nicename}>" style="max-width:120px; max-height:120px;" />
</div>
<div class="xo-actions txtcenter">
<div class="spacer bold"><{$img.image_nicename}></div>
|
|
From: <be...@us...> - 2013-09-17 12:12:05
|
Revision: 12064
http://sourceforge.net/p/xoops/svn/12064
Author: beckmi
Date: 2013-09-17 12:12:00 +0000 (Tue, 17 Sep 2013)
Log Message:
-----------
re-added link to individual module's Admin after "Update" (was accidentally overwritten in previous commit)
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/xoops_version.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2013-09-16 18:46:15 UTC (rev 12063)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/modulesadmin/main.php 2013-09-17 12:12:00 UTC (rev 12064)
@@ -239,7 +239,7 @@
$modifs_mods = array();
$module = empty($_POST['module']) ? array() : $_POST['module'];
foreach ($module as $mid) {
- $mid = (int)$mid;
+ $mid = (int) $mid;
$modifs_mods[$i]['mid'] = $mid;
$modifs_mods[$i]['oldname'] = $myts->htmlspecialchars($myts->stripSlashesGPC($oldname[$mid]));
$modifs_mods[$i]['newname'] = $myts->htmlspecialchars(trim($myts->stripslashesGPC($newname[$mid])));
@@ -544,13 +544,13 @@
$tplfile_handler =& xoops_gethandler('tplfile');
// irmtfan bug fix: remove codes for delete templates
/*
- $deltpl = $tplfile_handler->find('default', 'module', $module->getVar('mid'));
- $delng = array();
+ $deltpl = $tplfile_handler->find('default', 'module', $module->getVar('mid'));
+ $delng = array();
if (is_array($deltpl)) {
// delete template file entry in db
$dcount = count($deltpl);
for ($i = 0; $i < $dcount; $i++) {
- if ( !$tplfile_handler->delete( $deltpl[$i] ) ) {
+ if (!$tplfile_handler->delete($deltpl[$i])) {
$delng[] = $deltpl[$i]->getVar('tpl_file');
}
}
@@ -564,7 +564,7 @@
$tpl['file'] = trim($tpl['file']);
// START irmtfan solve templates duplicate issue
// if (!in_array($tpl['file'], $delng)) { // irmtfan bug fix: remove codes for delete templates
- $type = (isset($tpl['type']) ? $tpl['type'] : 'module');
+ $type = (isset($tpl['type']) ? $tpl['type'] : 'module');
if (preg_match("/\.css$/i", $tpl['file'])) {
$type = 'css';
}
@@ -576,44 +576,44 @@
$criteria->add(new Criteria("tpl_type", $type), "AND");
$tplfiles = $tplfile_handler->getObjects($criteria);
- $tpldata =& xoops_module_gettemplate($dirname, $tpl['file'], $type);
+ $tpldata =& xoops_module_gettemplate($dirname, $tpl['file'], $type);
$tplfile = empty($tplfiles) ? $tplfile_handler->create() : $tplfiles[0];
// END irmtfan solve templates duplicate issue
- $tplfile->setVar('tpl_refid', $newmid);
- $tplfile->setVar('tpl_lastimported', 0);
- $tplfile->setVar('tpl_lastmodified', time());
- $tplfile->setVar('tpl_type', $type);
- $tplfile->setVar('tpl_source', $tpldata, true);
- $tplfile->setVar('tpl_module', $dirname);
- $tplfile->setVar('tpl_tplset', 'default');
- $tplfile->setVar('tpl_file', $tpl['file'], true);
- $tplfile->setVar('tpl_desc', $tpl['description'], true);
- if (!$tplfile_handler->insert($tplfile)) {
- $msgs[] = ' <span style="color:#ff0000;">' . sprintf(
- _AM_SYSTEM_MODULES_TEMPLATE_ADD_ERROR,
- "<strong>" . $tpl['file'] . "</strong>"
- ) . '</span>';
- } else {
- $newid = $tplfile->getVar('tpl_id');
- $msgs[] = ' ' . sprintf(
- _AM_SYSTEM_MODULES_TEMPLATE_INSERT_DATA,
- "<strong>" . $tpl['file'] . "</strong>"
- );
- if ($xoopsConfig['template_set'] == 'default') {
- if (!xoops_template_touch($newid)) {
- $msgs[] = ' <span style="color:#ff0000;">' . sprintf(
- _AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE_ERROR,
- "<strong>" . $tpl['file'] . "</strong>"
- ) . '</span>';
- } else {
- $msgs[] = ' <span>' . sprintf(
- _AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE,
- "<strong>" . $tpl['file'] . "</strong>"
- ) . '</span>';
+ $tplfile->setVar('tpl_refid', $newmid);
+ $tplfile->setVar('tpl_lastimported', 0);
+ $tplfile->setVar('tpl_lastmodified', time());
+ $tplfile->setVar('tpl_type', $type);
+ $tplfile->setVar('tpl_source', $tpldata, true);
+ $tplfile->setVar('tpl_module', $dirname);
+ $tplfile->setVar('tpl_tplset', 'default');
+ $tplfile->setVar('tpl_file', $tpl['file'], true);
+ $tplfile->setVar('tpl_desc', $tpl['description'], true);
+ if (!$tplfile_handler->insert($tplfile)) {
+ $msgs[] = ' <span style="color:#ff0000;">' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_ADD_ERROR,
+ "<strong>" . $tpl['file'] . "</strong>"
+ ) . '</span>';
+ } else {
+ $newid = $tplfile->getVar('tpl_id');
+ $msgs[] = ' ' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_INSERT_DATA,
+ "<strong>" . $tpl['file'] . "</strong>"
+ );
+ if ($xoopsConfig['template_set'] == 'default') {
+ if (!xoops_template_touch($newid)) {
+ $msgs[] = ' <span style="color:#ff0000;">' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE_ERROR,
+ "<strong>" . $tpl['file'] . "</strong>"
+ ) . '</span>';
+ } else {
+ $msgs[] = ' <span>' . sprintf(
+ _AM_SYSTEM_MODULES_TEMPLATE_RECOMPILE,
+ "<strong>" . $tpl['file'] . "</strong>"
+ ) . '</span>';
+ }
}
}
- }
- unset($tpldata);
+ unset($tpldata);
// irmtfan bug fix: remove codes for delete templates
/*
} else {
@@ -1101,6 +1101,7 @@
$msgs[] = sprintf(_AM_SYSTEM_MODULES_OKUPD, '<strong>' . $module->getVar('name', 's') . '</strong>');
$msgs[] = '</div></div>';
$msgs[] = '<div class="center"><a href="admin.php?fct=modulesadmin">' . _AM_SYSTEM_MODULES_BTOMADMIN
+ . '</a> | <a href="' . XOOPS_URL . '/modules/' . $module->getInfo('dirname', 'e') . '/' . $module->getInfo('adminindex') . '">' . _AM_SYSTEM_MODULES_ADMIN
. '</a></div>';
foreach ($msgs as $msg) {
echo $msg . '<br />';
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/xoops_version.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/xoops_version.php 2013-09-16 18:46:15 UTC (rev 12063)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/xoops_version.php 2013-09-17 12:12:00 UTC (rev 12064)
@@ -452,5 +452,3 @@
$modversion['config'][$i]['formtype'] = 'hidden';
$modversion['config'][$i]['valuetype'] = 'int';
$modversion['config'][$i]['default'] = 0;
-
-?>
\ No newline at end of file
|
|
From: <rgr...@us...> - 2014-02-14 04:30:53
|
Revision: 12309
http://sourceforge.net/p/xoops/svn/12309
Author: rgriffith
Date: 2014-02-14 04:30:50 +0000 (Fri, 14 Feb 2014)
Log Message:
-----------
Add cleanup of unused avatar resources to admin maintenance page - #1292
The user delete workflow needs to be corrected to include related resources like avatars, but for now this will provide a way to clean up any unneeded avatar file and database resources. The overall delete workflow issue will be more fully addressed in 2.6. The clean up code itself will be important going forward as part of conversion and upgrade processes.
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/maintenance/main.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/maintenance.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/maintenance.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_maintenance.html
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/maintenance/main.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/maintenance/main.php 2014-02-14 04:08:02 UTC (rev 12308)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/admin/maintenance/main.php 2014-02-14 04:30:50 UTC (rev 12309)
@@ -70,6 +70,8 @@
$tables_tray->addElement($choice, false);
$form_maintenance->addElement($tables_tray);
+ $form_maintenance->addElement(new XoopsFormRadioYN(_AM_SYSTEM_MAINTENANCE_AVATAR, 'avatar', '', _YES, _NO));
+
$form_maintenance->addElement(new XoopsFormHidden("op", "maintenance_save"));
$form_maintenance->addElement(new XoopsFormButton("", "maintenance_save", _SEND, "submit"));
@@ -115,12 +117,15 @@
$session = system_CleanVars ( $_REQUEST, 'session', 1, 'int' );
$cache = system_CleanVars ( $_REQUEST, 'cache', array(), 'array' );
$tables = system_CleanVars ( $_REQUEST, 'tables', array(), 'array' );
+ $avatar = system_CleanVars ( $_REQUEST, 'avatar', 1, 'int' );
$tables_op = system_CleanVars ( $_REQUEST, 'maintenance', array(), 'array' );
$verif_cache = false;
$verif_session = false;
+ $verif_avatar = false;
$verif_maintenance = false;
$result_cache = false;
$result_session = false;
+ $result_avatar = false;
$result_maintenance = false;
$maintenance = new SystemMaintenance();
@@ -148,15 +153,25 @@
}
}
- if( $result_cache == false && $result_session == false && $result_maintenance == false ) {
+ // Purge unused avatars
+ if ( $avatar == 1 ) {
+ $verif_avatar = true;
+ if($maintenance->CleanAvatar()) {
+ $result_avatar = true;
+ }
+ }
+
+ if ($result_cache == false && $result_session == false && $result_maintenance == false && $result_avatar == false) {
redirect_header("admin.php?fct=maintenance", 2, _AM_SYSTEM_MAINTENANCE_ERROR_MAINTENANCE);
}
$xoopsTpl->assign('verif_cache', $verif_cache);
$xoopsTpl->assign('verif_session', $verif_session);
+ $xoopsTpl->assign('verif_avatar', $verif_avatar);
$xoopsTpl->assign('verif_maintenance', $verif_maintenance);
$xoopsTpl->assign('result_cache', $result_cache);
$xoopsTpl->assign('result_session', $result_session);
+ $xoopsTpl->assign('result_avatar', $result_avatar);
$xoopsTpl->assign('result_maintenance', $result_maintenance);
$xoopsTpl->assign('maintenance', true);
break;
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/maintenance.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/maintenance.php 2014-02-14 04:08:02 UTC (rev 12308)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/class/maintenance.php 2014-02-14 04:30:50 UTC (rev 12309)
@@ -74,6 +74,43 @@
}
/**
+ * CleanAvatar
+ *
+ * Clean up orphaned custom avatars left when a user is deleted.
+ *
+ * @author slider84 of Team FrXoops
+ *
+ * @return boolean
+ */
+ function CleanAvatar()
+ {
+ $result = $this->db->queryF(
+ 'SELECT avatar_id, avatar_file FROM ' . $this->db->prefix('avatar')
+ . " WHERE avatar_type='C' AND avatar_id IN ("
+ . 'SELECT t1.avatar_id FROM ' . $this->db->prefix('avatar_user_link') .' AS t1 '
+ . 'LEFT JOIN '.$this->db->prefix('users').' AS t2 ON t2.uid=t1.user_id '
+ . 'WHERE t2.uid IS NULL)'
+ );
+
+ while ($myrow = $this->db->fetchArray($result)) {
+ //delete file
+ @unlink(XOOPS_UPLOAD_PATH.'/'.$myrow['avatar_file']);
+ //clean avatar table
+ $result1 = $this->db->queryF(
+ 'DELETE FROM '.$this->db->prefix('avatar')
+ . ' WHERE avatar_id='.$myrow['avatar_id']
+ );
+ }
+ //clean any deleted users from avatar_user_link table
+ $result2 = $this->db->queryF(
+ 'DELETE FROM '.$this->db->prefix('avatar_user_link')
+ . ' WHERE user_id NOT IN (SELECT uid FROM ' . $this->db->prefix('users') . ')'
+ );
+
+ return true;
+ }
+
+ /**
* Clean cache 'xoops_data/caches/smarty_cache'
*
* @param array cache
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/maintenance.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/maintenance.php 2014-02-14 04:08:02 UTC (rev 12308)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/maintenance.php 2014-02-14 04:30:50 UTC (rev 12309)
@@ -13,6 +13,7 @@
define('_AM_SYSTEM_MAINTENANCE_SESSION',"Empty the sessions table");
define('_AM_SYSTEM_MAINTENANCE_SESSION_OK',"Session maintenance : OK");
define('_AM_SYSTEM_MAINTENANCE_SESSION_NOTOK',"Session maintenance : Error");
+define('_AM_SYSTEM_MAINTENANCE_AVATAR',"Purge unused custom avatars");
define('_AM_SYSTEM_MAINTENANCE_CACHE',"Clean cache folder");
define('_AM_SYSTEM_MAINTENANCE_CACHE_OK',"Cache maintenance : OK");
define('_AM_SYSTEM_MAINTENANCE_CACHE_NOTOK',"Cache maintenance : Error");
@@ -26,7 +27,7 @@
define('_AM_SYSTEM_MAINTENANCE_CHOICE2',"Check table(s)");
define('_AM_SYSTEM_MAINTENANCE_CHOICE3',"Repair table(s)");
define('_AM_SYSTEM_MAINTENANCE_CHOICE4',"Analyze table(s)");
-define('_AM_SYSTEM_MAINTENANCE_TABLES_DESC',
+define('_AM_SYSTEM_MAINTENANCE_TABLES_DESC',
"ANALYZE TABLE analyzes and stores the key distribution for a table. During the analysis, the table is locked with a read lock.<br />
CHECK TABLE checks a table or tables for errors.<br />
OPTIMIZE TABLE to reclaim the unused space and to defragment the data file.<br />
@@ -36,10 +37,11 @@
define('_AM_SYSTEM_MAINTENANCE_RESULT_CACHE',"Clean Cache task");
define('_AM_SYSTEM_MAINTENANCE_RESULT_SESSION',"Clean sessions table task");
define('_AM_SYSTEM_MAINTENANCE_RESULT_QUERY',"Database task");
+define('_AM_SYSTEM_MAINTENANCE_RESULT_AVATAR',"Purge unused avatars task");
define('_AM_SYSTEM_MAINTENANCE_ERROR_MAINTENANCE',"No choice for maintenance");
define('_AM_SYSTEM_MAINTENANCE_TABLES1',"Tables");
define('_AM_SYSTEM_MAINTENANCE_TABLES_OPTIMIZE',"Optimize");
-define('_AM_SYSTEM_MAINTENANCE_TABLES_CHECK',"Check");
+define('_AM_SYSTEM_MAINTENANCE_TABLES_CHECK',"Check");
define('_AM_SYSTEM_MAINTENANCE_TABLES_REPAIR',"Repair");
define('_AM_SYSTEM_MAINTENANCE_TABLES_ANALYZE',"Analyze");
//Dump
@@ -57,7 +59,7 @@
define('_AM_SYSTEM_MAINTENANCE_DUMP_RESULT',"Result");
define('_AM_SYSTEM_MAINTENANCE_DUMP_RECORDS',"record(s)");
// Tips
-define('_AM_SYSTEM_MAINTENANCE_TIPS',
+define('_AM_SYSTEM_MAINTENANCE_TIPS',
"<ul>
<li>You can do a simple maintenance of your XOOPS Installation: clear your cache and session table, and do maintenance of your tables</li>
</ul>");
\ No newline at end of file
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_maintenance.html
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_maintenance.html 2014-02-14 04:08:02 UTC (rev 12308)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/templates/admin/system_maintenance.html 2014-02-14 04:30:50 UTC (rev 12309)
@@ -1,35 +1,42 @@
-<!--maintenance-->
-<{includeq file="db:system_header.html"}>
-<!-- Display mailusers form -->
-<br />
-<{if $form_maintenance}>
- <div class="spacer"><{$form_maintenance}></div><br />
- <div class="spacer"><{$form_dump}></div>
-<{elseif $maintenance}>
- <{if $verif_cache || $verif_session}>
- <table class="outer ui-corner-all" cellspacing="1">
- <tr>
- <th><{$smarty.const._AM_SYSTEM_MAINTENANCE}></th>
- <th><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT}></th>
- </tr>
- <{if $verif_cache}>
- <tr>
- <td class="aligntop txtcenter"><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT_CACHE}></td>
- <td class="aligntop txtcenter"><{if $result_cache}><img width="16" src="<{xoAdminIcons success.png}>" /><{else}><img style="width:16px;" src="<{xoAdminIcons cancel.png}>" alt="Cancel"/><{/if}></td>
- </tr>
- <{/if}>
-
- <{if $verif_session}>
- <tr>
- <td class="aligntop" align="center"><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT_SESSION}></td>
- <td class="aligntop" align="center"><{if $result_session}><img style="width:16px;" src="<{xoAdminIcons success.png}>" alt="Success"/><{else}><img style="width:16px;" src="<{xoAdminIcons cancel.png}>" alt="Cancel"/><{/if}></td>
- </tr>
- <{/if}>
- </table><br />
- <{/if}>
- <{if $verif_maintenance}>
- <{$result_maintenance}>
- <{/if}>
-<{else}>
- <{$result_dump}>
+<!--maintenance-->
+<{includeq file="db:system_header.html"}>
+<!-- Display mailusers form -->
+<br />
+<{if $form_maintenance}>
+ <div class="spacer"><{$form_maintenance}></div><br />
+ <div class="spacer"><{$form_dump}></div>
+<{elseif $maintenance}>
+ <{if $verif_cache || $verif_session || $verif_avatar}>
+ <table class="outer ui-corner-all" cellspacing="1">
+ <tr>
+ <th><{$smarty.const._AM_SYSTEM_MAINTENANCE}></th>
+ <th><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT}></th>
+ </tr>
+ <{if $verif_cache}>
+ <tr>
+ <td class="aligntop txtcenter"><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT_CACHE}></td>
+ <td class="aligntop txtcenter"><{if $result_cache}><img width="16" src="<{xoAdminIcons success.png}>" /><{else}><img style="width:16px;" src="<{xoAdminIcons cancel.png}>" alt="Cancel"/><{/if}></td>
+ </tr>
+ <{/if}>
+
+ <{if $verif_session}>
+ <tr>
+ <td class="aligntop" align="center"><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT_SESSION}></td>
+ <td class="aligntop" align="center"><{if $result_session}><img style="width:16px;" src="<{xoAdminIcons success.png}>" alt="Success"/><{else}><img style="width:16px;" src="<{xoAdminIcons cancel.png}>" alt="Cancel"/><{/if}></td>
+ </tr>
+ <{/if}>
+
+ <{if $verif_avatar}>
+ <tr>
+ <td class="aligntop" align="center"><{$smarty.const._AM_SYSTEM_MAINTENANCE_RESULT_AVATAR}></td>
+ <td class="aligntop" align="center"><{if $result_avatar}><img style="width:16px;" src="<{xoAdminIcons success.png}>" alt="Success"/><{else}><img style="width:16px;" src="<{xoAdminIcons cancel.png}>" alt="Cancel"/><{/if}></td>
+ </tr>
+ <{/if}>
+ </table><br />
+ <{/if}>
+ <{if $verif_maintenance}>
+ <{$result_maintenance}>
+ <{/if}>
+<{else}>
+ <{$result_dump}>
<{/if}>
\ No newline at end of file
|
|
From: <be...@us...> - 2014-06-14 17:05:54
|
Revision: 12596
http://sourceforge.net/p/xoops/svn/12596
Author: beckmi
Date: 2014-06-14 17:05:46 +0000 (Sat, 14 Jun 2014)
Log Message:
-----------
Removing spaces before "?"
Modified Paths:
--------------
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/avatars.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/images.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/preferences.php
XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/language/english/admin.php
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/avatars.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/avatars.php 2014-06-14 16:49:56 UTC (rev 12595)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/avatars.php 2014-06-14 17:05:46 UTC (rev 12596)
@@ -21,7 +21,7 @@
define('_AM_SYSTEM_AVATAR_UPLOAD',"Upload:");
// Messages
define('_AM_SYSTEM_AVATAR_FAILDEL',"Failed deleting avatar %s from the database");
-define('_AM_SYSTEM_AVATAR_SUREDEL',"Are you sure to delete this avatar image ?");
+define('_AM_SYSTEM_AVATAR_SUREDEL',"Are you sure to delete this avatar image?");
// Tips
define('_AM_SYSTEM_AVATAR_TIPS',"
<ul id='newsticker' class='newsticker'>
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/images.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/images.php 2014-06-14 16:49:56 UTC (rev 12595)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/images.php 2014-06-14 17:05:46 UTC (rev 12596)
@@ -29,7 +29,7 @@
define('_AM_SYSTEM_IMAGES_IMGCATNAME',"Category Name:");
define('_AM_SYSTEM_IMAGES_IMGCATRGRP','Select groups for image manager use:<br /><br /><span style="font-weight: normal;">These are groups allowed to use the image manager for selecting images but not uploading. Webmaster has automatic access.</span>');
define('_AM_SYSTEM_IMAGES_IMGCATWGRP','Select groups allowed to upload images:<br /><br /><span style="font-weight: normal;">Typical usage is for moderator and admin groups.</span>');
-define('_AM_SYSTEM_IMAGES_IMGCATDISPLAY',"Display this category ?");
+define('_AM_SYSTEM_IMAGES_IMGCATDISPLAY',"Display this category?");
define('_AM_SYSTEM_IMAGES_IMGCATSTRTYPE',"Images are uploaded to:");
define('_AM_SYSTEM_IMAGES_STRTYOPENG',"This can not be changed afterwards!");
define('_AM_SYSTEM_IMAGES_IMGCATWEIGHT',"Display order in image manager:");
@@ -37,7 +37,7 @@
define('_AM_SYSTEM_IMAGES_ON',"Does not display in image manager");
define('_AM_SYSTEM_IMAGES_URL',"Show image URL");
// Messages
-define('_AM_SYSTEM_IMAGES_RUDELIMG',"Are you sure that you want to delete this images file ?");
+define('_AM_SYSTEM_IMAGES_RUDELIMG',"Are you sure that you want to delete this images file?");
define('_AM_SYSTEM_IMAGES_FAILSAVE',"Failed save image %s into the database");
define('_AM_SYSTEM_IMAGES_RUDELIMGCAT',"Are you sure that you want to delete this category and all of its images files?");
define('_AM_SYSTEM_IMAGES_FAILDEL',"Failed deleting image %s from the database");
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/preferences.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/preferences.php 2014-06-14 16:49:56 UTC (rev 12595)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/language/english/admin/preferences.php 2014-06-14 17:05:46 UTC (rev 12596)
@@ -168,7 +168,7 @@
define('_MD_AM_REGDSCLMRDSC',"Enter text to be displayed as registration disclaimer");
define('_MD_AM_ALLOWREG',"Allow new user registration?");
define('_MD_AM_ALLOWREGDSC',"Select yes to accept new user registration");
-define('_MD_AM_THEMEFILE',"Check templates for modifications ?");
+define('_MD_AM_THEMEFILE',"Check templates for modifications?");
define('_MD_AM_THEMEFILEDSC',"If this option is enabled, modified templates will be automatically recompiled when they are displayed. You must turn this option off on a production site.");
define('_MD_AM_CLOSESITE',"Turn your site off?");
define('_MD_AM_CLOSESITEDSC',"Select yes to turn your site off so that only users in selected groups have access to the site. ");
Modified: XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/language/english/admin.php
===================================================================
--- XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/language/english/admin.php 2014-06-14 16:49:56 UTC (rev 12595)
+++ XoopsCore/branches/2.5.x/2.5.7/htdocs/modules/system/themes/default/language/english/admin.php 2014-06-14 17:05:46 UTC (rev 12596)
@@ -46,7 +46,7 @@
define('_OXYGEN_ADMINISTRATION',"XOOPS Administration");
define('_OXYGEN_UPTOP',"Up Top");
//Add help
-define('_OXYGEN_HELP_1',"How can I make content ?");
+define('_OXYGEN_HELP_1',"How can I make content?");
define('_OXYGEN_HELP_DESC_1','To make content you must first install some module, like the <a href="http://xoops.svn.sourceforge.net/viewvc/xoops/XoopsModules/fmcontent/trunk/?view=tar" rel="external">fmContent</a> or the <a href="https://sourceforge.net/projects/xoops/files/XOOPS%20Module%20Repository/XOOPS2/Content/XOOPS2.5_mod_content_1.4_kerkyra.zip/download" rel="external">Content</a> module. To learn more about modules <a href="modules/system/help.php?mid=1&page=modulesadmin">click here</a>' );
define('_OXYGEN_HELP_2',"What is the Block?");
define('_OXYGEN_HELP_DESC_2','Blocks can provide additional/specific content from the installed modules. There can be and custom blocks which can contain text, JS Code, HTML formatted text, pictures, etc. The content in these blocks may be formatted individually or can inherit formatting from the Website. (<a href="modules/system/help.php?mid=1&page=blocksadmin">more ...</a>)');
|
Thanks for helping keep SourceForge clean.
X