jaws-project-commits Mailing List for Jaws (Page 3)
Status: Alpha
Brought to you by:
ionmx
Menu
▾
▴
jaws-project-commits — CVS Commits
You can subscribe to this list here.
| 2004 |
Jan
|
Feb
|
Mar
|
Apr
|
May
(40) |
Jun
(188) |
Jul
(287) |
Aug
(53) |
Sep
(101) |
Oct
(48) |
Nov
(102) |
Dec
(129) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2005 |
Jan
(181) |
Feb
(458) |
Mar
(489) |
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jonathan H. <io...@us...> - 2005-03-15 19:52:10
|
Update of /cvsroot/jaws-project/jaws/html/gadgets/ControlPanel/languages/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3407/languages/en Modified Files: ControlPanel.php Log Message: Bug fix (when update an user) Index: ControlPanel.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/gadgets/ControlPanel/languages/en/ControlPanel.php,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** ControlPanel.php 12 Mar 2005 22:14:45 -0000 1.10 --- ControlPanel.php 15 Mar 2005 19:51:57 -0000 1.11 *************** *** 96,99 **** --- 96,100 ---- define ("_EN_CONTROLPANEL_USERS_INCOMPLETE_FIELDS","Some fields havn't been filled in."); define ("_EN_CONTROLPANEL_USERS_CREATED","User {0} has been created."); + define ("_EN_CONTROLPANEL_USERS_UPDATED","User {0} has been updated."); define ("_EN_CONTROLPANEL_MYACCOUNT","My Account"); define ("_EN_CONTROLPANEL_USER_NOT_EXIST","The requested user does not exist."); |
|
From: Jonathan H. <io...@us...> - 2005-03-15 19:52:10
|
Update of /cvsroot/jaws-project/jaws/html/gadgets/ControlPanel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3407 Modified Files: ControlPanel.php Log Message: Bug fix (when update an user) Index: ControlPanel.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/gadgets/ControlPanel/ControlPanel.php,v retrieving revision 1.31 retrieving revision 1.32 diff -C2 -d -r1.31 -r1.32 *** ControlPanel.php 15 Mar 2005 13:10:40 -0000 1.31 --- ControlPanel.php 15 Mar 2005 19:51:56 -0000 1.32 *************** *** 786,790 **** header ("Location: admin.php?gadget=ControlPanel&action=Users"); } else { ! $userModel->Add ($_POST["username"], $_POST["name"], $_POST["email"], md5($_POST["pass1"])); $GLOBALS["session"]->PushLastResponse (_t("_CONTROLPANEL_USERS_CREATED", $_POST["username"])); header ("Location: admin.php?gadget=ControlPanel&action=Users"); --- 786,790 ---- header ("Location: admin.php?gadget=ControlPanel&action=Users"); } else { ! $userModel->Add ($_POST["username"], $_POST["name"], $_POST["email"], $_POST["pass1"]); $GLOBALS["session"]->PushLastResponse (_t("_CONTROLPANEL_USERS_CREATED", $_POST["username"])); header ("Location: admin.php?gadget=ControlPanel&action=Users"); *************** *** 880,884 **** header ("Location: admin.php?gadget=ControlPanel&action=MyAccount"); } else { ! $userModel->Update ($_POST["id"], $_POST["name"], $_POST["email"], md5($_POST["pass1"]), md5($_POST["pass2"])); $GLOBALS["session"]->PushLastResponse (_t("_CONTROLPANEL_MYACCOUNT_UPDATED")); header ("Location: admin.php?gadget=ControlPanel&action=MyAccount"); --- 880,884 ---- header ("Location: admin.php?gadget=ControlPanel&action=MyAccount"); } else { ! $userModel->Update ($_POST["id"], $_POST["name"], $_POST["email"], $_POST["pass1"], $_POST["pass2"]); $GLOBALS["session"]->PushLastResponse (_t("_CONTROLPANEL_MYACCOUNT_UPDATED")); header ("Location: admin.php?gadget=ControlPanel&action=MyAccount"); *************** *** 1029,1039 **** if ((trim($_POST["username"]) == "") || (trim($_POST["name"]) == "") || ! (trim($_POST["email"]) == "") || ! (trim($_POST["pass1"]) == "")) { $GLOBALS["session"]->PushLastResponse (_t("_CONTROLPANEL_USERS_INCOMPLETE_FIELDS")); header ("Location: admin.php?gadget=ControlPanel&action=Users"); } else { ! $userModel->Add ($_POST["username"], $_POST["name"], $_POST["email"], md5($_POST["pass1"])); ! $GLOBALS["session"]->PushLastResponse (_t("_CONTROLPANEL_USERS_CREATED", $_POST["username"])); header ("Location: admin.php?gadget=ControlPanel&action=Users"); } --- 1029,1038 ---- if ((trim($_POST["username"]) == "") || (trim($_POST["name"]) == "") || ! (trim($_POST["email"]) == "")) { $GLOBALS["session"]->PushLastResponse (_t("_CONTROLPANEL_USERS_INCOMPLETE_FIELDS")); header ("Location: admin.php?gadget=ControlPanel&action=Users"); } else { ! $userModel->Update ($_POST["id"], $_POST["name"], $_POST["email"], $_POST["pass1"], $_POST["pass2"]); ! $GLOBALS["session"]->PushLastResponse (_t("_CONTROLPANEL_USERS_UPDATED", $_POST["username"])); header ("Location: admin.php?gadget=ControlPanel&action=Users"); } *************** *** 1251,1255 **** $tpl->SetVariable("gadget_name_tr",$gadget->_Info->GetName()); $tpl->SetVariable("gadget_name",$gadget->GetName()); - // FIXME: Get gadget description $tpl->SetVariable("gadget_description",$gadget->_Info->GetDescription()); $cancelButton =& new Button ("cancel", _t("_GLOBAL_CANCEL"), STOCK_CANCEL); --- 1250,1253 ---- |
|
From: Jonathan H. <io...@us...> - 2005-03-15 19:06:30
|
Update of /cvsroot/jaws-project/jaws/html/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23449 Modified Files: JawsDB.php Log Message: Remove redeclaration Index: JawsDB.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/include/JawsDB.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JawsDB.php 14 Mar 2005 19:33:38 -0000 1.4 --- JawsDB.php 15 Mar 2005 19:06:18 -0000 1.5 *************** *** 20,31 **** /** - * Driver of JawsDB - * - * @var JawsDriver - * @access private - */ - var $_Driver; - - /** * Initializes the JawsDB * --- 20,23 ---- |
|
From: Mirco B. <me...@us...> - 2005-03-15 13:53:07
|
Update of /cvsroot/jaws-project/jaws/html/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4034/html/include Modified Files: JawsSession.php Log Message: - added isset() checks in SetAttribute(). Index: JawsSession.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/include/JawsSession.php,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** JawsSession.php 15 Mar 2005 13:27:24 -0000 1.9 --- JawsSession.php 15 Mar 2005 13:52:57 -0000 1.10 *************** *** 339,343 **** function SetAttribute ($name, $value) { ! if ($this->_Attributes[$name] != $value) { $this->_Attributes[$name] = $value; $this->_HasChanged = true; --- 339,344 ---- function SetAttribute ($name, $value) { ! if (!isset($this->_Attributes[$name]) || ! (isset($this->_Attributes[$name]) && ($this->_Attributes[$name] != $value))) { $this->_Attributes[$name] = $value; $this->_HasChanged = true; |
|
From: Jon W. <jel...@us...> - 2005-03-15 13:41:15
|
Update of /cvsroot/jaws-project/jaws/html/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1233/include Modified Files: JawsTemplate.php Log Message: Check if $block exists before trying to use it. Index: JawsTemplate.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/include/JawsTemplate.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JawsTemplate.php 6 Mar 2005 06:50:01 -0000 1.6 --- JawsTemplate.php 15 Mar 2005 13:41:03 -0000 1.7 *************** *** 279,287 **** function InitializeSubBlock (&$block) { ! if (preg_match_all($this->IsBlockRegExp, $block->Content, $regs, PREG_SET_ORDER)) ! foreach ($regs as $subBlock) { ! $block->InnerBlock[$subBlock[1]]->Parsed = ""; ! $this->InitializeSubBlock ($subblock); ! } } --- 279,288 ---- function InitializeSubBlock (&$block) { ! if (!is_null($block)) ! if (preg_match_all($this->IsBlockRegExp, $block->Content, $regs, PREG_SET_ORDER)) ! foreach ($regs as $subBlock) { ! $block->InnerBlock[$subBlock[1]]->Parsed = ""; ! $this->InitializeSubBlock ($subblock); ! } } |
|
From: Mirco B. <me...@us...> - 2005-03-15 13:27:36
|
Update of /cvsroot/jaws-project/jaws/html/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30314/html/include Modified Files: JawsSession.php Log Message: - GetAttribute() may return an empty string, we should not try to use such as an array, checking this with is_array() now. Index: JawsSession.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/include/JawsSession.php,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** JawsSession.php 14 Mar 2005 19:33:39 -0000 1.8 --- JawsSession.php 15 Mar 2005 13:27:24 -0000 1.9 *************** *** 253,257 **** $acl =& new JawsACL(); $aclAttrib = $this->GetAttribute ("acl"); ! if ($aclAttrib["/last_update"] != $acl->GetLastUpdate()) { $aclPermissions = $acl->GetAclPermissions($this->GetAttribute("username")); $aclAttrib["/last_update"] = $acl->GetLastUpdate(); --- 253,257 ---- $acl =& new JawsACL(); $aclAttrib = $this->GetAttribute ("acl"); ! if (is_array($aclAttrib) && ($aclAttrib["/last_update"] != $acl->GetLastUpdate())) { $aclPermissions = $acl->GetAclPermissions($this->GetAttribute("username")); $aclAttrib["/last_update"] = $acl->GetLastUpdate(); |
|
From: Mirco B. <me...@us...> - 2005-03-15 13:10:51
|
Update of /cvsroot/jaws-project/jaws/html/gadgets/ControlPanel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24760/html/gadgets/ControlPanel Modified Files: ControlPanel.php Log Message: - code cleanup. - added exit calls after header() in admin.php, there is no need to continue the PHP script with running into error states when we want to leave the script/page anyhow... this should become part of JAWS Coding Standards. Index: ControlPanel.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/gadgets/ControlPanel/ControlPanel.php,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** ControlPanel.php 12 Mar 2005 22:14:45 -0000 1.30 --- ControlPanel.php 15 Mar 2005 13:10:40 -0000 1.31 *************** *** 240,247 **** $tpl->SetVariable("lost_password", _t("_CONTROLPANEL_LOGIN_LOST_PASSWORD")); $tpl->SetVariable("back", _t("_CONTROLPANEL_LOGIN_BACK_TO_SITE")); - - - $form =& new Form ("admin.php", "POST"); $form->Add (new HiddenEntry ("gadget", "ControlPanel")); $form->Add (new HiddenEntry ("action", "Login")); --- 240,246 ---- $tpl->SetVariable("lost_password", _t("_CONTROLPANEL_LOGIN_LOST_PASSWORD")); $tpl->SetVariable("back", _t("_CONTROLPANEL_LOGIN_BACK_TO_SITE")); + $form =& new Form ("admin.php", "POST"); + $form->Add (new HiddenEntry ("gadget", "ControlPanel")); $form->Add (new HiddenEntry ("action", "Login")); *************** *** 249,253 **** $fieldsetLogin =& new FieldSet (_t("_CONTROLPANEL_LOGIN")); $fieldsetLogin->SetDirection ("vertical"); ! $usernameEntry =& new Entry ("username", $_REQUEST["username"]); $usernameEntry->SetTitle (_t("_CONTROLPANEL_LOGIN_USERNAME")); --- 248,252 ---- $fieldsetLogin =& new FieldSet (_t("_CONTROLPANEL_LOGIN")); $fieldsetLogin->SetDirection ("vertical"); ! $usernameEntry =& new Entry ("username", isset($_REQUEST["username"]) ? $_REQUEST["username"] : ''); $usernameEntry->SetTitle (_t("_CONTROLPANEL_LOGIN_USERNAME")); |
|
From: Mirco B. <me...@us...> - 2005-03-15 13:10:51
|
Update of /cvsroot/jaws-project/jaws/html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv24760/html Modified Files: admin.php Log Message: - code cleanup. - added exit calls after header() in admin.php, there is no need to continue the PHP script with running into error states when we want to leave the script/page anyhow... this should become part of JAWS Coding Standards. Index: admin.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/admin.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** admin.php 15 Mar 2005 12:09:48 -0000 1.12 --- admin.php 15 Mar 2005 13:10:39 -0000 1.13 *************** *** 37,43 **** --- 37,45 ---- if ($GLOBALS["session"]->GetPermission ("ControlPanel","default")) { header ("Location: admin.php"); + exit; } else { $GLOBALS["session"]->Logout(); header ("Location: admin.php?msg=NOTCP"); + exit; } } else { |
|
From: Jon W. <jel...@us...> - 2005-03-15 12:45:07
|
Update of /cvsroot/jaws-project/jaws/html/gadgets/ControlPanel In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18932/gadgets/ControlPanel Modified Files: ControlPanelModel.php Log Message: Don't list CVS as a valid theme. Index: ControlPanelModel.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/gadgets/ControlPanel/ControlPanelModel.php,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** ControlPanelModel.php 13 Mar 2005 19:54:47 -0000 1.14 --- ControlPanelModel.php 15 Mar 2005 12:44:53 -0000 1.15 *************** *** 37,41 **** $adr = dir($theme_path); while ($file = $adr->read()) ! if (!ereg("\.", $file)) $result[$file] = $file; sort($result); --- 37,41 ---- $adr = dir($theme_path); while ($file = $adr->read()) ! if (!ereg("\.", $file) && ($file != 'CVS')) $result[$file] = $file; sort($result); |
|
From: Jon W. <jel...@us...> - 2005-03-15 12:12:24
|
Update of /cvsroot/jaws-project/jaws/html/plugins/GlossaGlossy In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv10576/html/plugins/GlossaGlossy Modified Files: GlossaGlossy.php Log Message: Added a missing h in html that was causing nothing to be returned. Index: GlossaGlossy.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/plugins/GlossaGlossy/GlossaGlossy.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** GlossaGlossy.php 12 Mar 2005 19:53:03 -0000 1.2 --- GlossaGlossy.php 15 Mar 2005 12:12:12 -0000 1.3 *************** *** 101,105 **** $new_html = str_replace ("[term]", "", $html); $new_html = str_replace ("[/term]", "", $html); ! return $new_tml; } } --- 101,105 ---- $new_html = str_replace ("[term]", "", $html); $new_html = str_replace ("[/term]", "", $html); ! return $new_html; } } |
|
From: Mirco B. <me...@us...> - 2005-03-15 12:10:31
|
Update of /cvsroot/jaws-project/jaws/html/gadgets/Friends In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9370/html/gadgets/Friends Modified Files: Friends.php Log Message: - moved the PHP settings for E_ALL to a more central and early executed place. - removed a few newline at end of files. Index: Friends.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Friends/Friends.php,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** Friends.php 10 Mar 2005 17:58:28 -0000 1.16 --- Friends.php 15 Mar 2005 12:09:50 -0000 1.17 *************** *** 25,29 **** $this->LayoutAction ("Display", _t("_FRIENDS_ACTION_DISPLAY"), ! _t("FRIENDS_ACTION_DISPLAY_DESC")); $this->AdminAction ("Admin"); --- 25,29 ---- $this->LayoutAction ("Display", _t("_FRIENDS_ACTION_DISPLAY"), ! _t("_FRIENDS_ACTION_DISPLAY_DESC")); $this->AdminAction ("Admin"); |
|
From: Mirco B. <me...@us...> - 2005-03-15 12:10:30
|
Update of /cvsroot/jaws-project/jaws/html In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9370/html Modified Files: admin.php index.php Log Message: - moved the PHP settings for E_ALL to a more central and early executed place. - removed a few newline at end of files. Index: admin.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/admin.php,v retrieving revision 1.11 retrieving revision 1.12 diff -C2 -d -r1.11 -r1.12 *** admin.php 13 Mar 2005 21:29:09 -0000 1.11 --- admin.php 15 Mar 2005 12:09:48 -0000 1.12 *************** *** 116,123 **** if (DEBUG_ACTIVATED) { $GLOBALS["log"]->LogStackToScreen(); - error_reporting(E_ALL); - ini_set('display_errors', true); } //ob_end_flush(); //flush (); ! ?> --- 116,121 ---- if (DEBUG_ACTIVATED) { $GLOBALS["log"]->LogStackToScreen(); } //ob_end_flush(); //flush (); ! ?> \ No newline at end of file Index: index.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/index.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** index.php 6 Mar 2005 17:17:50 -0000 1.6 --- index.php 15 Mar 2005 12:09:49 -0000 1.7 *************** *** 58,63 **** if (DEBUG_ACTIVATED) { $GLOBALS["log"]->LogStackToScreen(); - error_reporting(E_ALL); - ini_set('display_errors', true); } ! ?> --- 58,61 ---- if (DEBUG_ACTIVATED) { $GLOBALS["log"]->LogStackToScreen(); } ! ?> \ No newline at end of file |
|
From: Mirco B. <me...@us...> - 2005-03-15 12:10:15
|
Update of /cvsroot/jaws-project/jaws/html/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9370/html/include Modified Files: JawsInitApplication.php Log Message: - moved the PHP settings for E_ALL to a more central and early executed place. - removed a few newline at end of files. Index: JawsInitApplication.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/include/JawsInitApplication.php,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** JawsInitApplication.php 15 Mar 2005 06:17:59 -0000 1.4 --- JawsInitApplication.php 15 Mar 2005 12:10:00 -0000 1.5 *************** *** 5,9 **** require_once $GLOBALS["path"]."include/JawsApplication.php"; - // initialize the logger $GLOBALS["log"] =& new JawsLog (); --- 5,8 ---- *************** *** 12,18 **** // Check if data/ is writable if (!is_writable($GLOBALS["path"]."data")) ! JawsError::Fatal ("{$GLOBALS["path"]}data/ directory needs to be web writable, please set the appropiate permissions",__file__,__line__); ! //Create application $GLOBALS["app"] =& new JawsApplication (); $GLOBALS["app"]->Create ($db['user'], $db['password'], $db['name'], $db['host'], $db['driver'], $db['prefix']); --- 11,17 ---- // Check if data/ is writable if (!is_writable($GLOBALS["path"]."data")) ! JawsError::Fatal ("{$GLOBALS['path']}data/ directory needs to be web writable, please set the appropiate permissions",__file__,__line__); ! // Create application $GLOBALS["app"] =& new JawsApplication (); $GLOBALS["app"]->Create ($db['user'], $db['password'], $db['name'], $db['host'], $db['driver'], $db['prefix']); *************** *** 20,22 **** // Destroy $db parameters array unset ($db); ! ?> --- 19,27 ---- // Destroy $db parameters array unset ($db); ! ! // setup proper PHP settings for development ! if (DEBUG_ACTIVATED) { ! error_reporting(E_ALL); ! ini_set('display_errors', true); ! } ! ?> \ No newline at end of file |
|
From: Mirco B. <me...@us...> - 2005-03-15 12:10:14
|
Update of /cvsroot/jaws-project/jaws/html/gadgets/Phoo In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9370/html/gadgets/Phoo Modified Files: Phoo.php Log Message: - moved the PHP settings for E_ALL to a more central and early executed place. - removed a few newline at end of files. Index: Phoo.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Phoo/Phoo.php,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** Phoo.php 13 Mar 2005 21:25:58 -0000 1.12 --- Phoo.php 15 Mar 2005 12:09:51 -0000 1.13 *************** *** 395,399 **** } if ($album = $this->_Model->GetAlbum($albumId, $month, $year)) { ! if ( (!is_array($album["images"])) && (count($album["images"]) == 0) && (checkdate ($month, 1, $year))) { --- 395,399 ---- } if ($album = $this->_Model->GetAlbum($albumId, $month, $year)) { ! if ((!is_array($album["images"])) && (count($album["images"]) == 0) && (checkdate ($month, 1, $year))) { |
|
From: Jon W. <jel...@us...> - 2005-03-15 11:41:36
|
Update of /cvsroot/jaws-project/jaws/html/include/JawsTypes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3300/include/JawsTypes Modified Files: JawsTranslate.php Log Message: Don't require the _ at the beginning. It's ugly :P Index: JawsTranslate.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/include/JawsTypes/JawsTranslate.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** JawsTranslate.php 14 Mar 2005 23:12:45 -0000 1.6 --- JawsTranslate.php 15 Mar 2005 11:41:22 -0000 1.7 *************** *** 27,30 **** --- 27,34 ---- function Translate ($string, $replacements = array()) { + // Quick hack until we can _ from the beginning of translation IDs. + if (substr($string, 0, 1) != "_") + $string = "_".$string; + $not_translated = true; $id = $string; *************** *** 54,58 **** if ($not_translated) ! $string = $string."*"; return $string; --- 58,62 ---- if ($not_translated) ! $string = substr($string."*", 1); return $string; |
|
From: Jonathan H. <io...@us...> - 2005-03-15 08:16:13
|
Update of /cvsroot/jaws-project/jaws/html/gadgets/Banner In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16652/Banner Modified Files: BannerModel.php Log Message: Add search method Index: BannerModel.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Banner/BannerModel.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** BannerModel.php 14 Mar 2005 17:48:34 -0000 1.7 --- BannerModel.php 15 Mar 2005 08:15:58 -0000 1.8 *************** *** 367,370 **** return true; } } ! ?> \ No newline at end of file --- 367,406 ---- return true; } + + /** + * Get banner entries that match with a word + * + * @access public + * @param string $match Match word + * @return array An array of entries that matches a certain pattern + */ + function Search ($match) + { + if (strlen(trim($match)) < 3) return false; + $sql = "SELECT id, url, title, image, updatetime + FROM [[banner]] WHERE"; + $data = explode (" ", $match); + + foreach ($data as $v) { + $v = $GLOBALS["app"]->DB->EscapeString ($v); + $sql .= " (title LIKE '%$v%' OR image LIKE '%$v%') AND"; + } + $sql = substr($sql, 0, -3); + $sql .= " ORDER BY updatetime DESC"; + $entries = array(); + if ($rs = $GLOBALS["app"]->DB->Execute ($sql)) { + while ($r = $rs->FetchRow()) { + $entry = array(); + $entry["Title"] = $r["title"]; + $entry["URL"] = $r["url"]; + $entry["Image"] = "data/banners/{$r["image"]}"; + $entry["Snippet"] = "<a href=\"{$r["url"]}\">{$r["url"]}</a>"; + $entry["Date"] = JawsDateConvert::ToISO($r["updatetime"]); + $date = str_replace("-","",str_replace(":","",str_replace(" ","",$r["updatetime"]))); + $entries[$date] = $entry; + } + } + return $entries; + } } ! ?> |
|
From: Jonathan H. <io...@us...> - 2005-03-15 08:15:35
|
Update of /cvsroot/jaws-project/jaws/html/gadgets/Glossary In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv16515/Glossary Modified Files: GlossaryModel.php Log Message: Small fix Index: GlossaryModel.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Glossary/GlossaryModel.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** GlossaryModel.php 15 Mar 2005 07:45:16 -0000 1.6 --- GlossaryModel.php 15 Mar 2005 08:15:25 -0000 1.7 *************** *** 227,232 **** foreach ($data as $v) { $v = $GLOBALS["app"]->DB->EscapeString ($v); ! $sql .= " (term LIKE '%$v%' OR description LIKE '%$v%')"; } $sql .= " ORDER BY createtime DESC"; $entries = array(); --- 227,233 ---- foreach ($data as $v) { $v = $GLOBALS["app"]->DB->EscapeString ($v); ! $sql .= " (term LIKE '%$v%' OR description LIKE '%$v%') AND"; } + $sql = substr($sql, 0, -3); $sql .= " ORDER BY createtime DESC"; $entries = array(); |
|
From: Jonathan H. <io...@us...> - 2005-03-15 07:48:59
|
Update of /cvsroot/jaws-project/jaws/html/gadgets/Glossary/sql In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9925/sql Modified Files: MySQL.sql Log Message: Add now() Index: MySQL.sql =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Glossary/sql/MySQL.sql,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MySQL.sql 14 Mar 2005 19:36:58 -0000 1.3 --- MySQL.sql 15 Mar 2005 07:48:49 -0000 1.4 *************** *** 13,15 **** -- ! INSERT INTO [[term]] VALUES (1,0,'jaws','Jaws is a Framework and Content Management System for building dynamic web sites. It aims to be User Friendly giving ease of use and lots of ways to customize web sites, but at the same time is Developer Frendly, it offers a simple and powerful framework to hack your own modules.','0000-00-00 00:00:00',20040825154839); --- 13,15 ---- -- ! INSERT INTO [[term]] VALUES (1,0,'jaws','Jaws is a Framework and Content Management System for building dynamic web sites. It aims to be User Friendly giving ease of use and lots of ways to customize web sites, but at the same time is Developer Frendly, it offers a simple and powerful framework to hack your own modules.',now(),now()); |
|
From: Jonathan H. <io...@us...> - 2005-03-15 07:45:37
|
Update of /cvsroot/jaws-project/jaws/html/gadgets/Glossary In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9145 Modified Files: GlossaryModel.php Log Message: Add search method Index: GlossaryModel.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Glossary/GlossaryModel.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** GlossaryModel.php 14 Mar 2005 19:36:56 -0000 1.5 --- GlossaryModel.php 15 Mar 2005 07:45:16 -0000 1.6 *************** *** 211,217 **** return false; } } - ?> --- 211,250 ---- return false; } + + /** + * Get glossary entries that match with a word + * + * @access public + * @param string $match Match word + * @return array An array of entries that matches a certain pattern + */ + function Search ($match) + { + if (strlen(trim($match)) < 3) return false; + $sql = "SELECT id, term, description, createtime FROM [[term]] WHERE"; + $data = explode (" ", $match); + + foreach ($data as $v) { + $v = $GLOBALS["app"]->DB->EscapeString ($v); + $sql .= " (term LIKE '%$v%' OR description LIKE '%$v%')"; + } + $sql .= " ORDER BY createtime DESC"; + $entries = array(); + if ($rs = $GLOBALS["app"]->DB->Execute ($sql)) { + while ($r = $rs->FetchRow()) { + $entry = array(); + $entry["Title"] = $r["term"]; + $entry["URL"] = "index.php?gadget=Glossary&action=View&id={$r["id"]}"; + $entry["Image"] = "gadgets/Glossary/images/Glossary.png"; + $entry["Snippet"] = JawsGadget::ParseText($r["description"], $this->_Name); + $entry["Date"] = JawsDateConvert::ToISO($r["createtime"]); + $date = str_replace("-","",str_replace(":","",str_replace(" ","",$r["createtime"]))); + $entries[$date] = $entry; + } + } + return $entries; + } } ?> |
|
From: Jonathan H. <io...@us...> - 2005-03-15 07:26:41
|
Update of /cvsroot/jaws-project/jaws/html/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv3774/include Modified Files: JawsLayoutModel.php Log Message: Fix in GetLayoutSections Index: JawsLayoutModel.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/include/JawsLayoutModel.php,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** JawsLayoutModel.php 14 Mar 2005 19:33:38 -0000 1.2 --- JawsLayoutModel.php 15 Mar 2005 07:26:28 -0000 1.3 *************** *** 139,143 **** $sql = "SELECT id, name, width FROM [[layout_section]] ! WHERE id in ({sections}) ORDER BY id"; } else { --- 139,143 ---- $sql = "SELECT id, name, width FROM [[layout_section]] ! WHERE id in ($sections) ORDER BY id"; } else { *************** *** 146,154 **** ORDER BY id"; } ! $rs = $GLOBALS["app"]->DB->Execute ($sql, array ("sections" => $sections)); ! if ($rs) return $rs->GetRows (); ! else return false; } --- 146,154 ---- ORDER BY id"; } ! $rs = $GLOBALS["app"]->DB->Execute ($sql); ! if ($rs) { return $rs->GetRows (); ! } else return false; } |
|
From: Jonathan H. <io...@us...> - 2005-03-15 07:01:28
|
Update of /cvsroot/jaws-project/jaws/html/gadgets/Friends/languages/en In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30905 Modified Files: Friends.php Log Message: Remove duplicate entry Index: Friends.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Friends/languages/en/Friends.php,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** Friends.php 10 Mar 2005 17:58:29 -0000 1.1 --- Friends.php 15 Mar 2005 07:01:03 -0000 1.2 *************** *** 6,10 **** define ("_EN_FRIENDS_PROPERTIES", "Friends Properties"); define ("_EN_FRIENDS_LIMIT_RANDOM", "Limit random of friends"); - define ("_EN_FRIENDS_PROPERTIES", "Friend Properties"); define ("_EN_FRIENDS_INFO", "Friend Information"); --- 6,9 ---- *************** *** 22,24 **** define ("_EN_FRIENDS_PROPERTIES_UPDATED","The properties have been updated"); define ("_EN_FRIENDS_PROPERTIES_NOT_UPDATED","There was a problem updating the properties"); ! ?> \ No newline at end of file --- 21,23 ---- define ("_EN_FRIENDS_PROPERTIES_UPDATED","The properties have been updated"); define ("_EN_FRIENDS_PROPERTIES_NOT_UPDATED","There was a problem updating the properties"); ! ?> |
|
From: Jonathan H. <io...@us...> - 2005-03-15 06:59:10
|
Update of /cvsroot/jaws-project/jaws/html/gadgets/RssReader In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30371/gadgets/RssReader Modified Files: RssReaderInfo.php Log Message: Small fix Index: RssReaderInfo.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/gadgets/RssReader/RssReaderInfo.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RssReaderInfo.php 11 Mar 2005 22:32:53 -0000 1.5 --- RssReaderInfo.php 15 Mar 2005 06:59:00 -0000 1.6 *************** *** 8,11 **** --- 8,12 ---- $this->GadgetDescription(_t("A fast RSS reader to have your friends RSS in your site")); $this->GadgetVersion("0.4"); + $this->RequiresJaws ("0.4"); $this->ACLKey ("/ACL/gadgets/RssReader/default", _t("Administer RssReader"), |
|
From: Jonathan H. <io...@us...> - 2005-03-15 06:18:10
|
Update of /cvsroot/jaws-project/jaws/html/include In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv20051/include Modified Files: JawsRegistry.php JawsInitApplication.php Log Message: Just some verifications Index: JawsInitApplication.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/include/JawsInitApplication.php,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** JawsInitApplication.php 14 Mar 2005 18:29:37 -0000 1.3 --- JawsInitApplication.php 15 Mar 2005 06:17:59 -0000 1.4 *************** *** 5,12 **** require_once $GLOBALS["path"]."include/JawsApplication.php"; // initialize the logger $GLOBALS["log"] =& new JawsLog (); ! $GLOBALS["log"]->Log(JAWS_LOG_INFO, ! "[Jaws Start] ".date("M/d/Y H:i:s").":".__file__.":". __line__); //Create application --- 5,16 ---- require_once $GLOBALS["path"]."include/JawsApplication.php"; + // initialize the logger $GLOBALS["log"] =& new JawsLog (); ! $GLOBALS["log"]->Log(JAWS_LOG_INFO, "[Jaws Start] ".date("M/d/Y H:i:s").":".__file__.":". __line__); ! ! // Check if data/ is writable ! if (!is_writable($GLOBALS["path"]."data")) ! JawsError::Fatal ("{$GLOBALS["path"]}data/ directory needs to be web writable, please set the appropiate permissions",__file__,__line__); //Create application *************** *** 16,18 **** // Destroy $db parameters array unset ($db); ! ?> \ No newline at end of file --- 20,22 ---- // Destroy $db parameters array unset ($db); ! ?> Index: JawsRegistry.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/include/JawsRegistry.php,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** JawsRegistry.php 14 Mar 2005 19:33:39 -0000 1.7 --- JawsRegistry.php 15 Mar 2005 06:17:58 -0000 1.8 *************** *** 74,78 **** { if ($this->_UseSimpleArray) { ! $sql = "SELECT [[registry]] FROM {$this->_Table}_simple"; $rs = $this->_DB->Execute ($sql); if ($row = $rs->FetchRow ()) { --- 74,78 ---- { if ($this->_UseSimpleArray) { ! $sql = "SELECT [[registry]] FROM [[{$this->_Table}_simple]]"; $rs = $this->_DB->Execute ($sql); if ($row = $rs->FetchRow ()) { *************** *** 272,278 **** $resultArray = array (); $sql = "SELECT name, value FROM [[{$this->_Table}]] ORDER BY name"; ! $rs = $this->_DB->Execute ($sql); ! while ($row = $rs->FetchRow ()) ! $resultArray[$row["name"]] = $row["value"]; return $resultArray; } --- 272,281 ---- $resultArray = array (); $sql = "SELECT name, value FROM [[{$this->_Table}]] ORDER BY name"; ! if (($rs = $this->_DB->Execute ($sql)) && ($rs->Success())) { ! while ($row = $rs->FetchRow ()) ! $resultArray[$row["name"]] = $row["value"]; ! } else { ! JawsError::Fatal ("Can't create Registry SimpleArray",__file__,__line__); ! } return $resultArray; } |
|
From: Pablo F. <pab...@us...> - 2005-03-14 23:13:23
|
Update of /cvsroot/jaws-project/jaws/html/gadgets/Chatbox In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14072/gadgets/Chatbox Modified Files: ChatboxModel.php Log Message: Small fixes and features :-), make a good JawsConfig in few steps! :-P Index: ChatboxModel.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/gadgets/Chatbox/ChatboxModel.php,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** ChatboxModel.php 14 Mar 2005 19:36:50 -0000 1.6 --- ChatboxModel.php 14 Mar 2005 23:12:41 -0000 1.7 *************** *** 65,71 **** $sql = "SELECT id, name, email, ip_address, url, message, updatetime ! FROM [[chatbox]] ! ORDER BY id DESC LIMIT ${limit}"; ! $rs = $GLOBALS["app"]->DB->Query ($sql); if ($rs) return $rs->GetRows (); --- 65,71 ---- $sql = "SELECT id, name, email, ip_address, url, message, updatetime ! FROM chatbox ! ORDER BY id DESC LIMIT {limit}"; ! $rs = $GLOBALS["app"]->DB->Execute ($sql, array ("limit" => $limit)); if ($rs) return $rs->GetRows (); |
|
From: Pablo F. <pab...@us...> - 2005-03-14 23:13:02
|
Update of /cvsroot/jaws-project/jaws/html/include/JawsTypes In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14072/include/JawsTypes Modified Files: JawsTranslate.php Log Message: Small fixes and features :-), make a good JawsConfig in few steps! :-P Index: JawsTranslate.php =================================================================== RCS file: /cvsroot/jaws-project/jaws/html/include/JawsTypes/JawsTranslate.php,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** JawsTranslate.php 11 Mar 2005 07:31:30 -0000 1.5 --- JawsTranslate.php 14 Mar 2005 23:12:45 -0000 1.6 *************** *** 86,90 **** require_once($fallback); } else { ! $GLOBALS["log"]->Log(JAWS_LOG_DEBUG,"No translation could be found for $module for language en."); } } --- 86,90 ---- require_once($fallback); } else { ! $GLOBALS["log"]->Log(JAWS_LOG_DEBUG,"No fallback translation could be found for $module for language en."); } } |
